diff --git a/docs/ideas/codeboarding-integration.md b/docs/ideas/codeboarding-integration.md
new file mode 100644
index 00000000..9de4df84
--- /dev/null
+++ b/docs/ideas/codeboarding-integration.md
@@ -0,0 +1,273 @@
+# CodeBoarding Integration Idea
+
+Дата проверки: 2026-05-03.
+
+## Короткий вывод
+
+CodeBoarding полезен для Agent Teams как опциональная визуализация архитектурного влияния агентских изменений. Он не выглядит как готовый embeddable real-time daemon для нашего Electron UI, но у него есть достаточная база для near real-time режима:
+
+- baseline анализ через `codeboarding full --local <project>`;
+- incremental анализ через `codeboarding incremental --local <project>`;
+- partial обновление компонента через `codeboarding partial --local <project> --component-id <id>`;
+- выходные артефакты в `.codeboarding/`, включая `analysis.json`, Markdown и Mermaid;
+- method/component change tracking в VS Code extension.
+
+Практичный продуктовый вариант: делаем CodeBoarding optional dependency, даём пользователю install/detect/setup в UI, запускаем full один раз, а дальше показываем live-ish overlay по изменениям агентов. Быструю подсветку делаем сами по git diff/task change ledger, а CodeBoarding incremental используем как более точный фоновый refresh.
+
+## Что проверено
+
+- GitHub repo: [CodeBoarding/CodeBoarding](https://github.com/CodeBoarding/CodeBoarding)
+- Website: [codeboarding.org](https://www.codeboarding.org/)
+- PyPI JSON: [pypi.org/pypi/codeboarding/json](https://pypi.org/pypi/codeboarding/json)
+- Release: [v0.11.0](https://github.com/CodeBoarding/CodeBoarding/releases/tag/v0.11.0)
+- VS Code Marketplace: [CodeBoarding extension](https://marketplace.visualstudio.com/items?itemName=Codeboarding.codeboarding)
+- MCP repo: [CodeBoarding/CodeBoarding-MCP](https://github.com/CodeBoarding/CodeBoarding-MCP)
+
+На момент проверки:
+
+- Latest GitHub release: `v0.11.0`, published 2026-04-29.
+- Latest PyPI version: `0.11.0`, requires Python `>=3.12,<3.14`.
+- License: MIT.
+- Repo активный: последний push был 2026-05-03.
+- Основной стек CodeBoarding: Python CLI, static analysis, LSP, tree-sitter, LLM providers.
+- Поддерживаемые языки из README/PyPI: Python, TypeScript, JavaScript, Java, Go, PHP, Rust, C#.
+- LLM providers из README/PyPI: OpenAI, Anthropic, Google, Vercel AI Gateway, AWS Bedrock, Ollama, OpenRouter и другие.
+
+## Что CodeBoarding умеет
+
+Из README и CLI:
+
+- генерирует high-level architecture diagrams;
+- генерирует deeper component diagrams;
+- пишет Markdown документацию в `.codeboarding/`;
+- пишет Mermaid output, который удобно показывать в нашем Markdown/Mermaid viewer;
+- умеет incremental updates, когда есть предыдущий analysis;
+- умеет partial update одного component id;
+- для private repos использует `GITHUB_TOKEN`;
+- конфиг LLM ключей хранит в `~/.codeboarding/config.toml`, но env vars имеют приоритет.
+
+Публичные команды CLI:
+
+```bash
+codeboarding full --local /path/to/repo
+codeboarding incremental --local /path/to/repo
+codeboarding partial --local /path/to/repo --component-id "1.2"
+```
+
+Установка из README/PyPI:
+
+```bash
+pipx install codeboarding --python python3.12
+codeboarding-setup
+codeboarding full --local /path/to/repo
+```
+
+Важно: `codeboarding-setup` скачивает language server binaries в `~/.codeboarding/servers/`. Node.js/npm нужен для Python, TypeScript, JavaScript и PHP language servers; если Node/npm не найден, CodeBoarding может скачать pinned Node runtime в `~/.codeboarding/servers/nodeenv/`.
+
+## Real-time оценка
+
+В VS Code Marketplace заявлено:
+
+- `Realtime Component Change tracking` - можно видеть, в каких компонентах есть file edits.
+- `0.11.0` - Git Commit Diff View, timeline slider, подсветка components/files/methods по recent commits.
+- `0.11.0` - Faster Incremental Analysis, refresh переиспользует прошлые результаты и анализирует только затронутое.
+- `0.10.0` - Method-Level Change Tracking.
+- `0.10.0` - Real-time Method Updates.
+- `0.10.2` - Smoother Real-time Updates.
+
+Но в open-source CLI я не нашёл отдельного публичного `watch`/daemon режима. В коде есть incremental pipeline, worktree diff, `incrementalDelta`, method-level statuses, comments про IDE/wrapper integration и snapshot target refs, но публичный CLI остаётся командным.
+
+Вывод: CodeBoarding позволяет сделать near real-time визуализацию, но real-time orchestration надо делать нам:
+
+1. watcher ловит изменения файлов от агента;
+2. debounce, например 2-10 секунд;
+3. быстрый overlay строится по git diff/task change ledger и текущему `.codeboarding/analysis.json`;
+4. CodeBoarding incremental запускается фоном реже или на завершение task;
+5. UI обновляет Mermaid/architecture map и affected components.
+
+## Что можно показать пользователю
+
+Хорошо подходит:
+
+- 🟢 новый файл попал в конкретный компонент;
+- 🟡 метод или файл изменён внутри компонента;
+- 🔴 файл/метод удалён;
+- какие компоненты трогает конкретный агент;
+- какие компоненты трогает конкретная task;
+- архитектурный контекст рядом с code review;
+- diff timeline по commits или task snapshots;
+- Markdown/Mermaid docs прямо в нашем Project Editor/Review UI.
+
+Сложно или рискованно:
+
+- мгновенная перестройка диаграммы на каждый символ;
+- точная визуализация rename/copy, потому что incremental pipeline сейчас может требовать full analysis для rename/copy;
+- стабильная работа на очень больших репах без очереди, debounce и cancellation;
+- full/incremental анализ без настроенного LLM provider;
+- автоматическая установка Python 3.12/3.13 на всех OS без отдельного installer UX.
+
+## Варианты интеграции
+
+### 1. Optional CLI Runner + просмотр `.codeboarding/`
+
+🎯 9   🛡️ 8   🧠 4  
+Примерно `250-450` строк.
+
+Суть: в Settings/Integrations добавляем CodeBoarding detect/install/run. Первый MVP только запускает `full`/`incremental`, показывает статус, открывает `.codeboarding/analysis.json` и Markdown/Mermaid в существующем viewer.
+
+Плюсы:
+
+- быстро проверить реальную пользу;
+- почти не вмешивается в team/review lifecycle;
+- опирается на уже существующие Markdown/Mermaid возможности;
+- безопаснее, потому что dependency optional.
+
+Минусы:
+
+- это не live UX;
+- пользователь сам интерпретирует изменения;
+- нет красивой связки с задачами агентов.
+
+Когда выбирать: если хотим дешёвый probe перед большой фичей.
+
+### 2. Live-ish Overlay поверх baseline анализа
+
+🎯 9   🛡️ 8   🧠 5  
+Примерно `900-1400` строк.
+
+Суть: CodeBoarding делает baseline `.codeboarding/analysis.json`. Дальше наш watcher/git status/task change ledger быстро мапит изменённые файлы на компоненты из baseline и подсвечивает affected components почти в реальном времени. CodeBoarding `incremental` запускается фоном по debounce, на завершение task или по кнопке refresh.
+
+Плюсы:
+
+- даёт пользователю ощущение real-time;
+- не заставляет LLM работать на каждое маленькое изменение;
+- хорошо ложится на агентские изменения и task review;
+- можно показывать impact до завершения задачи.
+
+Минусы:
+
+- нужна собственная модель overlay state;
+- baseline mapping может быть устаревшим до следующего incremental;
+- для новых файлов компонент может определяться эвристикой до refresh.
+
+Когда выбирать: лучший первый продуктовый вариант.
+
+### 3. Architecture Review per Task
+
+🎯 8   🛡️ 7   🧠 8  
+Примерно `1600-2500` строк.
+
+Суть: связываем CodeBoarding с review flow. Для каждой task показываем impacted components, changed methods, old/new architecture map, summary риска и ссылки на файлы. Можно добавить отдельную вкладку в task detail или review dialog.
+
+Плюсы:
+
+- максимальная ценность для Agent Teams;
+- помогает ревьюить AI-generated changes не только по diff, но и по архитектурному влиянию;
+- можно использовать как сильный selling point.
+
+Минусы:
+
+- крупная фича;
+- нужны тесты на task-change mapping, IPC, persistence и UI;
+- есть риск перегрузить review screen.
+
+Когда выбирать: после MVP и подтверждения, что карты реально помогают пользователям.
+
+## Варианты установки optional dependency
+
+### A. pipx install в user environment
+
+🎯 8   🛡️ 7   🧠 4  
+Примерно `350-600` строк.
+
+UI проверяет `python3.12`/`python3.13`, `pipx`, `codeboarding`. Если нет, предлагает install через `pipx install codeboarding --python python3.12`, затем `codeboarding-setup`.
+
+Плюсы: соответствует README, изолированная среда, меньше конфликтов с системным Python.
+
+Минусы: надо отдельно вести UX для отсутствующего Python/pipx.
+
+### B. Скачать packaged binary из GitHub Release
+
+🎯 7   🛡️ 7   🧠 6  
+Примерно `600-1000` строк.
+
+У CodeBoarding release `v0.11.0` содержит assets для macOS/Linux/Windows. Можно скачивать бинарь под OS, проверять sha256 asset и хранить в app-managed tools dir.
+
+Плюсы: меньше зависимости от Python/pipx у пользователя.
+
+Минусы: нужно аккуратно делать download, checksum, permissions, updates, notarization/security prompts.
+
+### C. Встроить Python package в наш app bundle
+
+🎯 4   🛡️ 5   🧠 9  
+Примерно `1200-2200` строк.
+
+Пакуем CodeBoarding и Python runtime вместе с приложением.
+
+Плюсы: самый гладкий UX после установки.
+
+Минусы: тяжёлый bundle, OS-specific packaging, LSP binaries, security/update burden. Для optional feature это слишком дорого.
+
+Рекомендация: начать с A, потом рассмотреть B для packaged app.
+
+## Как это ложится на нашу архитектуру
+
+Так как фича пересекает main/preload/renderer и запускает внешний инструмент, её лучше делать по `docs/FEATURE_ARCHITECTURE_STANDARD.md`:
+
+```text
+src/features/codeboarding/
+  contracts/
+  core/
+  main/
+    adapters/
+    infrastructure/
+  preload/
+  renderer/
+```
+
+Основные части:
+
+- contracts: DTO для status, install state, run request, run result, affected components;
+- core: правила выбора режима `full`/`incremental`, debounce policy, overlay merge policy;
+- main/infrastructure: binary detection, installer, command runner, output parser, `.codeboarding` reader;
+- main/adapters/input: IPC handlers;
+- preload: bridge;
+- renderer: settings panel, project action, architecture map panel, task/review badges.
+
+Надо использовать path validation и не давать CodeBoarding работать вне выбранного project root.
+
+## MVP flow
+
+1. Пользователь открывает project.
+2. UI показывает “Enable CodeBoarding architecture map”.
+3. App проверяет наличие `codeboarding`.
+4. Если нет, предлагает install.
+5. После install запускает `codeboarding-setup`.
+6. Первый запуск: `codeboarding full --local <project>`.
+7. App читает `.codeboarding/analysis.json`.
+8. Показывает diagram/docs.
+9. Когда агент меняет файлы, app быстро подсвечивает affected components по baseline mapping.
+10. После debounce или завершения task запускает `codeboarding incremental --local <project>`.
+11. Если incremental возвращает `requiresFullAnalysis`, UI предлагает full refresh.
+
+## Риски
+
+- 🟠 LLM keys: без provider key full/incremental может не пройти. Нужен понятный setup и read-only detect.
+- 🟠 Performance: full analysis может быть долгим. Нужны cancellation, queue, progress, timeout.
+- 🟠 Dirty worktree: incremental умеет работать с worktree, но target refs и snapshots надо использовать аккуратно.
+- 🟠 Cost: LLM вызовы могут стоить денег. Нужен явный opt-in и возможно “run on task complete” вместо постоянного refresh.
+- 🟡 Security: не отправлять код в неизвестный сервис. CodeBoarding заявляет local processing plus direct provider API calls, но UX должен прямо показывать выбранный provider.
+- 🟡 Generated files: `.codeboarding/` не всегда надо коммитить. Нужно дать настройку ignore/commit.
+- 🟡 MCP: CodeBoarding-MCP выглядит сырым, поэтому не стоит брать его как основную интеграцию.
+
+## Рекомендация
+
+Делать поэтапно:
+
+1. MVP optional CLI runner и viewer.
+2. Live-ish overlay на базе нашего task change ledger и CodeBoarding baseline.
+3. Background incremental refresh.
+4. Architecture Review per Task.
+5. Только потом MCP/context tools для агентов.
+
+Самое ценное для пользователя: видеть не “агент изменил 12 файлов”, а “агент сейчас меняет Auth Runtime Detection и это затрагивает Provider Connection + Team Provisioning”. CodeBoarding может дать основу для такой карты, но realtime UX должен быть нашим.
diff --git a/landing/assets/styles/brand-tokens.css b/landing/assets/styles/brand-tokens.css
new file mode 100644
index 00000000..ee4ec4da
--- /dev/null
+++ b/landing/assets/styles/brand-tokens.css
@@ -0,0 +1,136 @@
+:root {
+  color-scheme: light dark;
+
+  --at-font-sans: "Inter", "Segoe UI", system-ui, -apple-system, BlinkMacSystemFont, sans-serif;
+  --at-font-mono: "JetBrains Mono", "Fira Code", ui-monospace, SFMono-Regular, Menlo, monospace;
+
+  --at-c-cyan: #00f0ff;
+  --at-c-cyan-strong: #00d4e6;
+  --at-c-cyan-deep: #0891b2;
+  --at-c-magenta: #ff00ff;
+  --at-c-green: #39ff14;
+  --at-c-gold: #ffd700;
+  --at-c-red: #ff4757;
+
+  --at-c-dark-0: #05070b;
+  --at-c-dark-1: #0a0a0f;
+  --at-c-dark-2: #12121a;
+  --at-c-dark-3: #1e293b;
+  --at-c-light-0: #ffffff;
+  --at-c-light-1: #f8fafc;
+  --at-c-light-2: #f0f2f5;
+
+  --at-c-text-dark-1: #e0e6ff;
+  --at-c-text-dark-2: #c8d6e5;
+  --at-c-text-dark-3: #a0a8c0;
+  --at-c-text-dark-muted: #8892b0;
+  --at-c-text-light-1: #1e293b;
+  --at-c-text-light-2: #475569;
+  --at-c-text-light-3: #64748b;
+
+  --at-c-bg: var(--at-c-dark-1);
+  --at-c-bg-soft: rgba(10, 10, 15, 0.8);
+  --at-c-surface: var(--at-c-dark-2);
+  --at-c-surface-soft: rgba(10, 10, 15, 0.6);
+  --at-c-surface-raised: rgba(30, 41, 59, 0.78);
+  --at-c-text: var(--at-c-text-dark-1);
+  --at-c-text-soft: var(--at-c-text-dark-2);
+  --at-c-text-muted: var(--at-c-text-dark-muted);
+  --at-c-border: rgba(0, 240, 255, 0.12);
+  --at-c-border-strong: rgba(0, 240, 255, 0.28);
+  --at-c-focus: rgba(0, 240, 255, 0.55);
+
+  --at-gradient-brand: linear-gradient(135deg, var(--at-c-cyan), var(--at-c-magenta));
+  --at-gradient-brand-text: linear-gradient(135deg, #e0e6ff 0%, var(--at-c-cyan) 50%, var(--at-c-magenta) 100%);
+  --at-gradient-success: linear-gradient(135deg, var(--at-c-cyan), var(--at-c-green));
+  --at-gradient-cyan-text: linear-gradient(135deg, #e0e6ff 0%, var(--at-c-cyan) 100%);
+  --at-gradient-panel: linear-gradient(135deg, rgba(0, 240, 255, 0.06), rgba(255, 0, 255, 0.035));
+
+  --at-radius-xs: 6px;
+  --at-radius-sm: 8px;
+  --at-radius-md: 10px;
+  --at-radius-lg: 12px;
+  --at-radius-xl: 16px;
+  --at-radius-2xl: 20px;
+  --at-radius-preview: 22px;
+  --at-radius-pill: 999px;
+
+  --at-shadow-cyan-sm: 0 4px 20px rgba(0, 240, 255, 0.3);
+  --at-shadow-cyan-md: 0 8px 32px rgba(0, 240, 255, 0.08);
+  --at-shadow-cyan-lg: 0 20px 60px rgba(0, 0, 0, 0.55), 0 0 30px rgba(0, 240, 255, 0.06);
+  --at-shadow-card: 0 16px 32px -10px rgba(0, 0, 0, 0.35);
+
+  --at-blur-sm: 8px;
+  --at-blur-md: 12px;
+  --at-blur-lg: 20px;
+  --at-glass-bg: rgba(10, 10, 15, 0.78);
+  --at-glass-bg-hover: rgba(10, 10, 15, 0.9);
+  --at-glass-border: 1px solid var(--at-c-border);
+  --at-glass-border-strong: 1px solid var(--at-c-border-strong);
+
+  --at-grid-line: rgba(0, 240, 255, 0.03);
+  --at-scanline: rgba(0, 240, 255, 0.008);
+  --at-transition-fast: 0.15s ease;
+  --at-transition-base: 0.25s ease;
+  --at-transition-smooth: 0.35s cubic-bezier(0.4, 0, 0.2, 1);
+
+  --at-z-header: 1000;
+}
+
+.v-theme--light,
+:root:not(.dark) {
+  --at-c-bg: var(--at-c-light-2);
+  --at-c-bg-soft: rgba(255, 255, 255, 0.82);
+  --at-c-surface: var(--at-c-light-0);
+  --at-c-surface-soft: rgba(255, 255, 255, 0.78);
+  --at-c-surface-raised: rgba(255, 255, 255, 0.92);
+  --at-c-text: var(--at-c-text-light-1);
+  --at-c-text-soft: var(--at-c-text-light-2);
+  --at-c-text-muted: var(--at-c-text-light-3);
+  --at-c-border: rgba(0, 0, 0, 0.08);
+  --at-c-border-strong: rgba(0, 139, 178, 0.3);
+  --at-c-focus: rgba(8, 145, 178, 0.5);
+  --at-glass-bg: rgba(255, 255, 255, 0.78);
+  --at-glass-bg-hover: rgba(255, 255, 255, 0.92);
+  --at-glass-border: 1px solid rgba(0, 0, 0, 0.08);
+  --at-glass-border-strong: 1px solid rgba(0, 139, 178, 0.25);
+  --at-shadow-card: 0 16px 32px -10px rgba(0, 0, 0, 0.12);
+  --at-shadow-cyan-lg: 0 20px 60px rgba(0, 180, 200, 0.12);
+  --at-grid-line: rgba(8, 145, 178, 0.045);
+}
+
+.v-theme--dark,
+.dark {
+  --at-c-bg: var(--at-c-dark-1);
+  --at-c-bg-soft: rgba(10, 10, 15, 0.8);
+  --at-c-surface: var(--at-c-dark-2);
+  --at-c-surface-soft: rgba(10, 10, 15, 0.6);
+  --at-c-surface-raised: rgba(30, 41, 59, 0.78);
+  --at-c-text: var(--at-c-text-dark-1);
+  --at-c-text-soft: var(--at-c-text-dark-2);
+  --at-c-text-muted: var(--at-c-text-dark-muted);
+  --at-c-border: rgba(0, 240, 255, 0.12);
+  --at-c-border-strong: rgba(0, 240, 255, 0.28);
+  --at-glass-bg: rgba(10, 10, 15, 0.78);
+  --at-glass-bg-hover: rgba(10, 10, 15, 0.92);
+}
+
+.at-gradient-text {
+  background: var(--at-gradient-brand-text);
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.at-glass {
+  background: var(--at-glass-bg);
+  border: var(--at-glass-border);
+  backdrop-filter: blur(var(--at-blur-md));
+  -webkit-backdrop-filter: blur(var(--at-blur-md));
+  box-shadow: var(--at-shadow-cyan-md);
+}
+
+.at-focus-ring:focus-visible {
+  outline: 2px solid var(--at-c-focus);
+  outline-offset: 3px;
+}
diff --git a/landing/assets/styles/main.scss b/landing/assets/styles/main.scss
index 4f1ead04..85428476 100644
--- a/landing/assets/styles/main.scss
+++ b/landing/assets/styles/main.scss
@@ -1,10 +1,12 @@
+@import "./brand-tokens.css";
+
 :root {
   color-scheme: light dark;
 }
 
 body {
   margin: 0;
-  font-family: "Inter", "Segoe UI", system-ui, -apple-system, sans-serif;
+  font-family: var(--at-font-sans);
   background: rgb(var(--v-theme-background));
   color: rgb(var(--v-theme-on-background));
 }
@@ -32,7 +34,7 @@ body {
 
 /* Monospace accent font for technical elements */
 .mono {
-  font-family: "JetBrains Mono", "Fira Code", monospace;
+  font-family: var(--at-font-mono);
 }
 
 @media (max-width: 960px) {
@@ -72,5 +74,5 @@ body {
 }
 
 .app-header {
-  backdrop-filter: blur(10px);
+  backdrop-filter: blur(var(--at-blur-md));
 }
diff --git a/landing/components/PageBackground.vue b/landing/components/PageBackground.vue
index 6fa18bdc..2071bb88 100644
--- a/landing/components/PageBackground.vue
+++ b/landing/components/PageBackground.vue
@@ -26,8 +26,8 @@
   position: absolute;
   inset: 0;
   background-image:
-    linear-gradient(rgba(0, 240, 255, 0.03) 1px, transparent 1px),
-    linear-gradient(90deg, rgba(0, 240, 255, 0.03) 1px, transparent 1px);
+    linear-gradient(var(--at-grid-line) 1px, transparent 1px),
+    linear-gradient(90deg, var(--at-grid-line) 1px, transparent 1px);
   background-size: 60px 60px;
   z-index: 1;
 }
@@ -40,8 +40,8 @@
     0deg,
     transparent,
     transparent 2px,
-    rgba(0, 240, 255, 0.008) 2px,
-    rgba(0, 240, 255, 0.008) 4px
+    var(--at-scanline) 2px,
+    var(--at-scanline) 4px
   );
   z-index: 2;
 }
@@ -56,7 +56,7 @@
 .page-bg__orb--1 {
   width: 900px;
   height: 900px;
-  background: #00f0ff;
+  background: var(--at-c-cyan);
   top: -200px;
   right: -150px;
   animation: orbDrift1 20s ease-in-out infinite;
@@ -65,7 +65,7 @@
 .page-bg__orb--2 {
   width: 700px;
   height: 700px;
-  background: #ff00ff;
+  background: var(--at-c-magenta);
   top: 300px;
   left: -200px;
   animation: orbDrift2 25s ease-in-out infinite;
@@ -74,7 +74,7 @@
 .page-bg__orb--3 {
   width: 800px;
   height: 800px;
-  background: #39ff14;
+  background: var(--at-c-green);
   top: 1200px;
   right: -100px;
   opacity: 0.05;
@@ -84,7 +84,7 @@
 .page-bg__orb--4 {
   width: 700px;
   height: 700px;
-  background: #00f0ff;
+  background: var(--at-c-cyan);
   top: 2100px;
   left: -150px;
   opacity: 0.06;
@@ -94,7 +94,7 @@
 .page-bg__orb--5 {
   width: 750px;
   height: 750px;
-  background: #ff00ff;
+  background: var(--at-c-magenta);
   top: 2900px;
   right: -120px;
   opacity: 0.05;
@@ -104,7 +104,7 @@
 .page-bg__orb--6 {
   width: 700px;
   height: 700px;
-  background: #ffd700;
+  background: var(--at-c-gold);
   top: 3600px;
   left: -100px;
   opacity: 0.04;
@@ -114,7 +114,7 @@
 .page-bg__orb--7 {
   width: 650px;
   height: 650px;
-  background: #00f0ff;
+  background: var(--at-c-cyan);
   top: 4300px;
   right: -80px;
   opacity: 0.05;
diff --git a/landing/components/layout/AppFooter.vue b/landing/components/layout/AppFooter.vue
index 74cb7a7d..76c83732 100644
--- a/landing/components/layout/AppFooter.vue
+++ b/landing/components/layout/AppFooter.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const { repoUrl } = useGithubRepo();
+const { baseURL } = useRuntimeConfig().app;
 const year = new Date().getFullYear();
+const docsHref = computed(() => {
+  const base = baseURL.replace(/\/?$/, '/');
+  return `${base}${locale.value === 'ru' ? 'docs/ru/' : 'docs/'}`;
+});
 </script>
 
 <template>
@@ -14,6 +19,8 @@ const year = new Date().getFullYear();
         <a class="app-footer__link" href="https://github.com/777genius" target="_blank">Author</a>
         <span class="app-footer__divider" />
         <a class="app-footer__link" :href="repoUrl" target="_blank">GitHub</a>
+        <span class="app-footer__divider" />
+        <a class="app-footer__link" :href="docsHref">{{ t('footer.links.docs') }}</a>
       </div>
     </v-container>
   </footer>
@@ -21,7 +28,7 @@ const year = new Date().getFullYear();
 
 <style scoped>
 .app-footer {
-  border-top: 1px solid rgba(0, 240, 255, 0.08);
+  border-top: 1px solid var(--at-c-border);
   padding: 20px 0;
 }
 
@@ -34,7 +41,7 @@ const year = new Date().getFullYear();
 .app-footer__copy {
   font-size: 13px;
   opacity: 0.5;
-  font-family: 'JetBrains Mono', monospace;
+  font-family: var(--at-font-mono);
 }
 
 .app-footer__links {
@@ -44,12 +51,12 @@ const year = new Date().getFullYear();
 }
 
 .app-footer__link {
-  color: #00f0ff;
+  color: var(--at-c-cyan);
   text-decoration: none;
   font-size: 13px;
   opacity: 0.7;
   transition: opacity 0.2s ease;
-  font-family: 'JetBrains Mono', monospace;
+  font-family: var(--at-font-mono);
 }
 
 .app-footer__link:hover {
@@ -59,11 +66,11 @@ const year = new Date().getFullYear();
 .app-footer__divider {
   width: 1px;
   height: 14px;
-  background: rgba(0, 240, 255, 0.2);
+  background: var(--at-c-border-strong);
 }
 
 .v-theme--light .app-footer {
-  border-top-color: rgba(0, 0, 0, 0.08);
+  border-top-color: var(--at-c-border);
 }
 
 @media (max-width: 600px) {
diff --git a/landing/components/layout/AppHeader.vue b/landing/components/layout/AppHeader.vue
index c5602e15..16e3a4eb 100644
--- a/landing/components/layout/AppHeader.vue
+++ b/landing/components/layout/AppHeader.vue
@@ -1,16 +1,21 @@
 <script setup lang="ts">
 import { mdiMenu, mdiClose, mdiGithub } from '@mdi/js';
 
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const { repoUrl } = useGithubRepo();
+const { baseURL } = useRuntimeConfig().app;
 const menuOpen = ref(false);
 
+const withBase = (path: string) => `${baseURL.replace(/\/?$/, '/')}${path.replace(/^\/+/, '')}`;
+const docsHref = computed(() => withBase(locale.value === 'ru' ? 'docs/ru/' : 'docs/'));
+
 const navItems = computed(() => [
-  { id: 'screenshots', label: t('nav.screenshots') },
-  { id: 'download', label: t('nav.download') },
-  { id: 'comparison', label: t('nav.comparison') },
-  { id: 'pricing', label: t('nav.pricing') },
-  { id: 'faq', label: t('nav.faq') },
+  { href: '#screenshots', label: t('nav.screenshots') },
+  { href: docsHref.value, label: t('nav.docs') },
+  { href: '#download', label: t('nav.download') },
+  { href: '#comparison', label: t('nav.comparison') },
+  { href: '#pricing', label: t('nav.pricing') },
+  { href: '#faq', label: t('nav.faq') },
 ]);
 </script>
 
@@ -19,7 +24,7 @@ const navItems = computed(() => [
     <v-container class="app-header__inner">
       <AppLogo />
       <nav class="app-header__nav">
-        <v-btn v-for="item in navItems" :key="item.id" variant="text" :href="`#${item.id}`">
+        <v-btn v-for="item in navItems" :key="item.href" variant="text" :href="item.href">
           {{ item.label }}
         </v-btn>
       </nav>
@@ -49,12 +54,12 @@ const navItems = computed(() => [
                   <div style="flex: 1" />
                   <v-btn :icon="mdiClose" variant="text" @click="menuOpen = false" />
                 </div>
-                <hr class="mobile-menu__divider" />
+                <hr class="mobile-menu__divider">
                 <nav class="mobile-menu__list">
                   <a
                     v-for="item in navItems"
-                    :key="item.id"
-                    :href="`#${item.id}`"
+                    :key="item.href"
+                    :href="item.href"
                     class="mobile-menu__link"
                     @click="menuOpen = false"
                   >
@@ -69,7 +74,7 @@ const navItems = computed(() => [
                     GitHub
                   </a>
                 </nav>
-                <hr class="mobile-menu__divider" />
+                <hr class="mobile-menu__divider">
                 <div class="mobile-menu__actions">
                   <LanguageSwitcher compact />
                   <ThemeToggle />
@@ -89,18 +94,18 @@ const navItems = computed(() => [
   top: 0;
   left: 0;
   right: 0;
-  z-index: 1000;
+  z-index: var(--at-z-header);
   height: 64px;
   display: flex;
   align-items: center;
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
-  border-bottom: 1px solid rgba(0, 240, 255, 0.08);
+  backdrop-filter: blur(var(--at-blur-md));
+  -webkit-backdrop-filter: blur(var(--at-blur-md));
+  border-bottom: 1px solid var(--at-c-border);
 }
 
 .v-theme--light .app-header {
   background: rgba(255, 255, 255, 0.9);
-  border-bottom-color: rgba(0, 0, 0, 0.06);
+  border-bottom-color: var(--at-c-border);
 }
 
 .v-theme--dark .app-header {
@@ -136,15 +141,15 @@ const navItems = computed(() => [
 }
 
 .app-header__github-btn {
-  border-color: rgba(0, 240, 255, 0.25) !important;
-  color: #00f0ff !important;
+  border-color: var(--at-c-border-strong) !important;
+  color: var(--at-c-cyan) !important;
   font-weight: 600 !important;
   font-size: 12px !important;
   letter-spacing: 0.02em !important;
 }
 
 .app-header__github-btn:hover {
-  border-color: rgba(0, 240, 255, 0.5) !important;
+  border-color: var(--at-c-focus) !important;
   background: rgba(0, 240, 255, 0.06) !important;
 }
 
diff --git a/landing/components/sections/DownloadSection.vue b/landing/components/sections/DownloadSection.vue
index f6c10f36..b1f4e1c9 100644
--- a/landing/components/sections/DownloadSection.vue
+++ b/landing/components/sections/DownloadSection.vue
@@ -8,7 +8,7 @@ const { t, locale } = useI18n();
 const downloadStore = useDownloadStore();
 const { data: releaseData, resolve } = useReleaseDownloads();
 const { trackDownloadClick } = useAnalytics();
-const { releaseDownloadUrl } = useGithubRepo();
+const { repoUrl, releaseDownloadUrl } = useGithubRepo();
 
 onMounted(() => downloadStore.init());
 
@@ -62,6 +62,13 @@ const releaseDate = computed(() => {
     day: 'numeric',
   });
 });
+
+const devBranchUrl = computed(() => `${repoUrl.value}/tree/dev`);
+const devBranchNote = computed(() =>
+  locale.value === 'ru'
+    ? 'Самая свежая версия доступна в ветке dev - можно развернуть локально.'
+    : 'Freshest version is available on the dev branch - clone and run it locally.',
+);
 </script>
 
 <template>
@@ -133,6 +140,15 @@ const releaseDate = computed(() => {
         </div>
       </div>
 
+      <a
+        class="download-section__dev-note"
+        :href="devBranchUrl"
+        target="_blank"
+        rel="noopener"
+      >
+        {{ devBranchNote }}
+      </a>
+
       <p v-if="releaseVersion" class="download-section__release-info">
         v{{ releaseVersion }} · {{ releaseDate }}
       </p>
@@ -374,6 +390,38 @@ const releaseDate = computed(() => {
   font-family: 'JetBrains Mono', monospace;
 }
 
+.download-section__dev-note {
+  display: flex;
+  width: fit-content;
+  max-width: min(620px, calc(100vw - 32px));
+  margin: 18px auto 0;
+  padding: 8px 12px;
+  border: 1px solid rgba(0, 240, 255, 0.12);
+  border-radius: 10px;
+  background: rgba(0, 240, 255, 0.035);
+  color: #00f0ff;
+  font-family: 'JetBrains Mono', monospace;
+  font-size: 0.76rem;
+  line-height: 1.55;
+  text-align: center;
+  text-decoration: none;
+  opacity: 0.82;
+  position: relative;
+  z-index: 1;
+  transition:
+    border-color 0.2s ease,
+    background 0.2s ease,
+    color 0.2s ease,
+    opacity 0.2s ease;
+}
+
+.download-section__dev-note:hover {
+  border-color: rgba(57, 255, 20, 0.24);
+  background: rgba(57, 255, 20, 0.045);
+  color: #39ff14;
+  opacity: 1;
+}
+
 @keyframes downloadFadeUp {
   from {
     opacity: 0;
@@ -423,6 +471,12 @@ const releaseDate = computed(() => {
   color: #94a3b8;
 }
 
+.v-theme--light .download-section__dev-note {
+  background: rgba(8, 145, 178, 0.06);
+  border-color: rgba(8, 145, 178, 0.16);
+  color: #0891b2;
+}
+
 .v-theme--light .download-section__card-indicator {
   color: #16a34a;
 }
diff --git a/landing/components/sections/HeroSection.vue b/landing/components/sections/HeroSection.vue
index b269f2d5..3cf730fb 100644
--- a/landing/components/sections/HeroSection.vue
+++ b/landing/components/sections/HeroSection.vue
@@ -1,13 +1,20 @@
 <script setup lang="ts">
-import { mdiRobotOutline, mdiViewDashboardOutline, mdiOpenSourceInitiative } from '@mdi/js';
+import {
+  mdiBookOpenPageVariantOutline,
+  mdiRobotOutline,
+  mdiViewDashboardOutline,
+  mdiOpenSourceInitiative,
+} from '@mdi/js';
 
 const { content } = useLandingContent();
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const { baseURL } = useRuntimeConfig().app;
+const workflowVideoSrc = 'https://github.com/user-attachments/assets/35e27989-726d-4059-8662-bae610e46b42';
 
 const downloadStore = useDownloadStore();
 const { resolve, data: releaseData } = useReleaseDownloads();
-const { latestReleaseUrl, releaseDownloadUrl } = useGithubRepo();
+const { repoUrl, latestReleaseUrl, releaseDownloadUrl } = useGithubRepo();
+const withBase = (path: string) => `${baseURL.replace(/\/?$/, '/')}${path.replace(/^\/+/, '')}`;
 
 const releaseVersion = computed(() => releaseData.value?.version || null);
 const releaseDate = computed(() => {
@@ -28,14 +35,38 @@ const heroDownloadUrl = computed(() => {
   const arch = asset.os === 'macos' ? downloadStore.macArch : asset.arch;
   return resolve(asset.os, arch)?.url || releaseDownloadUrl(asset.fileName);
 });
+
+const devBranchUrl = computed(() => `${repoUrl.value}/tree/dev`);
+const docsHref = computed(() => withBase(locale.value === 'ru' ? 'docs/ru/' : 'docs/'));
+const devBranchNote = computed(() =>
+  locale.value === 'ru'
+    ? 'Самая свежая версия в ветке dev - можно развернуть локально.'
+    : 'Freshest version is on the dev branch - clone and run it locally.',
+);
 </script>
 
 <template>
   <section id="hero" class="hero-section section anchor-offset">
+    <div class="hero-section__video-bg" aria-hidden="true">
+      <video
+        class="hero-section__video-bg-player"
+        autoplay
+        muted
+        loop
+        playsinline
+        preload="metadata"
+        :poster="`${baseURL}screenshots/1.jpg`"
+      >
+        <source :src="workflowVideoSrc" type="video/mp4">
+      </video>
+      <div class="hero-section__video-bg-wash" />
+      <div class="hero-section__video-bg-edge" />
+    </div>
+
     <v-container class="hero-section__container">
       <v-row align="center" justify="space-between">
         <!-- Left: Text content -->
-        <v-col cols="12" md="6" class="hero-section__content">
+        <v-col cols="12" md="7" class="hero-section__content">
           <h1 class="hero-section__title">
             <img
               :src="`${baseURL}logo-192.png`"
@@ -61,6 +92,15 @@ const heroDownloadUrl = computed(() => {
             >
               {{ t('hero.downloadNow') }}
             </v-btn>
+            <v-btn
+              variant="outlined"
+              size="large"
+              :href="docsHref"
+              class="hero-section__btn-docs"
+              :prepend-icon="mdiBookOpenPageVariantOutline"
+            >
+              {{ t('hero.ctaDocs') }}
+            </v-btn>
             <v-btn
               variant="outlined"
               size="large"
@@ -71,6 +111,15 @@ const heroDownloadUrl = computed(() => {
             </v-btn>
           </div>
 
+          <a
+            class="hero-section__dev-note"
+            :href="devBranchUrl"
+            target="_blank"
+            rel="noopener"
+          >
+            {{ devBranchNote }}
+          </a>
+
           <!-- Release version badge -->
           <div v-if="releaseVersion" class="hero-section__release-badge">
             v{{ releaseVersion }}<template v-if="releaseDate"> · {{ releaseDate }}</template>
@@ -123,15 +172,63 @@ const heroDownloadUrl = computed(() => {
   min-height: 85vh;
   display: flex;
   align-items: center;
+  isolation: isolate;
+}
+
+.hero-section__video-bg {
+  position: absolute;
+  inset: -120px 0 -110px;
+  z-index: 0;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.hero-section__video-bg-player {
+  position: absolute;
+  inset: 0;
+  display: block;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  filter: blur(1px) saturate(1.22) contrast(1.08);
+  opacity: 0.95;
+  mix-blend-mode: normal;
+  transform: scale(1.04);
+}
+
+.hero-section__video-bg-wash {
+  position: absolute;
+  inset: 0;
+  background:
+    linear-gradient(90deg, rgb(var(--v-theme-background)) 0%, rgba(var(--v-theme-background), 0.82) 34%, rgba(var(--v-theme-background), 0.08) 64%, rgba(var(--v-theme-background), 0.34) 100%),
+    linear-gradient(180deg, rgba(var(--v-theme-background), 0.28) 0%, rgba(var(--v-theme-background), 0.52) 58%, rgb(var(--v-theme-background)) 96%);
+}
+
+.hero-section__video-bg-edge {
+  position: absolute;
+  inset: auto 0 0;
+  height: 42%;
+  background: linear-gradient(180deg, transparent, rgb(var(--v-theme-background)));
+}
+
+.v-theme--light .hero-section__video-bg-player {
+  mix-blend-mode: multiply;
+}
+
+.v-theme--light .hero-section__video-bg-wash {
+  background:
+    linear-gradient(90deg, rgb(var(--v-theme-background)) 0%, rgba(var(--v-theme-background), 0.86) 34%, rgba(var(--v-theme-background), 0.16) 64%, rgba(var(--v-theme-background), 0.36) 100%),
+    linear-gradient(180deg, rgba(var(--v-theme-background), 0.36) 0%, rgba(var(--v-theme-background), 0.54) 58%, rgb(var(--v-theme-background)) 96%);
 }
 
 .hero-section__container {
   position: relative;
-  z-index: 1;
+  z-index: 2;
 }
 
 .hero-section__content {
   animation: heroFadeIn 0.8s ease both;
+  text-shadow: 0 2px 18px rgba(0, 0, 0, 0.55);
 }
 
 /* ─── Title ─── */
@@ -169,8 +266,8 @@ const heroDownloadUrl = computed(() => {
 .hero-section__subtitle {
   font-size: 1.2rem;
   line-height: 1.7;
-  color: #8892b0;
-  opacity: 0.9;
+  color: #aeb8d4;
+  opacity: 0.96;
   max-width: 480px;
   margin-bottom: 36px;
   animation: heroFadeIn 0.8s ease both;
@@ -180,13 +277,42 @@ const heroDownloadUrl = computed(() => {
 /* ─── Actions ─── */
 .hero-section__actions {
   display: flex;
-  gap: 14px;
+  gap: 10px;
   flex-wrap: wrap;
-  margin-bottom: 16px;
+  margin-bottom: 12px;
   animation: heroFadeIn 0.8s ease both;
   animation-delay: 0.4s;
 }
 
+.hero-section__actions :deep(.v-btn) {
+  min-width: 0 !important;
+  height: 44px !important;
+  padding-inline: 18px !important;
+  font-size: 0.92rem !important;
+}
+
+.hero-section__dev-note {
+  display: inline-flex;
+  max-width: 460px;
+  margin-bottom: 14px;
+  font-family: 'JetBrains Mono', monospace;
+  font-size: 0.74rem;
+  line-height: 1.55;
+  color: #00f0ff;
+  opacity: 0.78;
+  text-decoration: none;
+  transition:
+    color 0.2s ease,
+    opacity 0.2s ease;
+  animation: heroFadeIn 0.8s ease both;
+  animation-delay: 0.43s;
+}
+
+.hero-section__dev-note:hover {
+  color: #39ff14;
+  opacity: 1;
+}
+
 /* ─── Release badge ─── */
 .hero-section__release-badge {
   font-size: 0.78rem;
@@ -225,6 +351,29 @@ const heroDownloadUrl = computed(() => {
   background: rgba(0, 240, 255, 0.06) !important;
 }
 
+.hero-section__btn-docs {
+  border-color: rgba(57, 255, 20, 0.38) !important;
+  color: #d6ffe1 !important;
+  font-weight: 700 !important;
+  letter-spacing: 0.02em !important;
+  background: rgba(57, 255, 20, 0.05) !important;
+  box-shadow: inset 0 0 0 1px rgba(57, 255, 20, 0.06) !important;
+  transition: all 0.3s ease !important;
+}
+
+.hero-section__btn-docs:hover {
+  border-color: rgba(57, 255, 20, 0.62) !important;
+  color: #39ff14 !important;
+  background: rgba(57, 255, 20, 0.09) !important;
+  transform: translateY(-1px) !important;
+}
+
+.v-theme--light .hero-section__btn-docs {
+  color: #0d5f2c !important;
+  border-color: rgba(13, 95, 44, 0.32) !important;
+  background: rgba(255, 255, 255, 0.6) !important;
+}
+
 /* ─── Trust indicators ─── */
 .hero-section__trust {
   display: flex;
@@ -346,6 +495,20 @@ const heroDownloadUrl = computed(() => {
     padding-top: 40px;
   }
 
+  .hero-section__video-bg {
+    inset: -90px 0 -90px;
+  }
+
+  .hero-section__video-bg-player {
+    opacity: 0.82;
+  }
+
+  .hero-section__video-bg-wash {
+    background:
+      linear-gradient(90deg, rgb(var(--v-theme-background)) 0%, rgba(var(--v-theme-background), 0.9) 50%, rgba(var(--v-theme-background), 0.54) 100%),
+      linear-gradient(180deg, rgba(var(--v-theme-background), 0.42) 0%, rgba(var(--v-theme-background), 0.72) 58%, rgb(var(--v-theme-background)) 96%);
+  }
+
   .hero-section__title {
     font-size: 2rem;
     white-space: nowrap;
@@ -372,6 +535,11 @@ const heroDownloadUrl = computed(() => {
 }
 
 @media (max-width: 600px) {
+  .hero-section__content {
+    flex: 0 0 calc(100vw - 48px);
+    max-width: calc(100vw - 48px);
+  }
+
   .hero-section__title {
     font-size: 1.6rem;
     white-space: nowrap;
@@ -387,10 +555,28 @@ const heroDownloadUrl = computed(() => {
   .hero-section__subtitle {
     font-size: 0.95rem;
     margin-bottom: 28px;
+    width: 100%;
+    max-width: 330px;
+    word-break: normal;
+    overflow-wrap: normal;
+    hyphens: none;
   }
 
   .hero-section__actions {
-    margin-bottom: 28px;
+    flex-direction: column;
+    align-items: stretch;
+    max-width: 320px;
+    margin-bottom: 12px;
+  }
+
+  .hero-section__actions :deep(.v-btn) {
+    width: 100%;
+  }
+
+  .hero-section__dev-note {
+    max-width: 320px;
+    margin-bottom: 20px;
+    font-size: 0.7rem;
   }
 
   .hero-section__trust {
diff --git a/landing/components/sections/PricingSection.vue b/landing/components/sections/PricingSection.vue
index 1cabc101..dea74ea7 100644
--- a/landing/components/sections/PricingSection.vue
+++ b/landing/components/sections/PricingSection.vue
@@ -40,7 +40,7 @@ function onGetStarted() {
               <h3 class="pricing-card__name">{{ plan.name }}</h3>
               <div class="pricing-card__price-wrap">
                 <span class="pricing-card__price">{{ plan.price }}</span>
-                <span class="pricing-card__period">/ {{ plan.period }}</span>
+                <span v-if="plan.period" class="pricing-card__period">/ {{ plan.period }}</span>
               </div>
               <p class="pricing-card__description">{{ plan.description }}</p>
             </div>
diff --git a/landing/content/ar.json b/landing/content/ar.json
index 4d315e6e..7ab6568c 100644
--- a/landing/content/ar.json
+++ b/landing/content/ar.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "هل هو مجاني فعلاً؟",
-      "answer": "نعم. التطبيق مجاني 100% ومفتوح المصدر. التطبيق نفسه لا يملك خطة مدفوعة. لتشغيل الوكلاء تحتاج فقط إلى وصول إلى مزود أو runtime مدعوم مثل Anthropic أو Codex."
+      "answer": "نعم. التطبيق مجاني ومفتوح المصدر. التطبيق نفسه لا يملك خطة مدفوعة. لتشغيل الوكلاء تحتاج فقط إلى وصول إلى مزود أو runtime مدعوم مثل Anthropic أو Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "مجاني للأبد",
+      "name": "مجاني",
       "price": "$0",
-      "period": "للأبد",
+      "period": "",
       "description": "كل شيء متضمن. بدون حدود، بدون مفاتيح API، بدون بطاقة ائتمان.",
       "features": [
         "فرق وكلاء غير محدودة",
diff --git a/landing/content/de.json b/landing/content/de.json
index 3a0ed2bd..47506809 100644
--- a/landing/content/de.json
+++ b/landing/content/de.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "Ist es wirklich kostenlos?",
-      "answer": "Ja. Die App ist 100% kostenlos und Open Source. Die App selbst hat kein Bezahlmodell. Um Agenten auszuführen, brauchen Sie nur Zugriff auf einen unterstützten Provider bzw. Runtime wie Anthropic oder Codex."
+      "answer": "Ja. Die App ist kostenlos und Open Source. Die App selbst hat kein Bezahlmodell. Um Agenten auszuführen, brauchen Sie nur Zugriff auf einen unterstützten Provider bzw. Runtime wie Anthropic oder Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Für immer kostenlos",
+      "name": "Kostenlos",
       "price": "0€",
-      "period": "für immer",
+      "period": "",
       "description": "Alles inklusive. Keine Limits, keine API-Schlüssel, keine Kreditkarte.",
       "features": [
         "Unbegrenzte Agenten-Teams",
diff --git a/landing/content/en.json b/landing/content/en.json
index d7cf1ecc..c5758412 100644
--- a/landing/content/en.json
+++ b/landing/content/en.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "Is it really free?",
-      "answer": "Yes. The app itself is 100% free and open source. The app has no paid tier of its own. To run agents, you only need access to a supported provider/runtime, such as Anthropic or Codex."
+      "answer": "Yes. The app itself is free and open source. The app has no paid tier of its own. To run agents, you only need access to a supported provider/runtime, such as Anthropic or Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Free Forever",
+      "name": "Free",
       "price": "$0",
-      "period": "forever",
+      "period": "",
       "description": "Everything included. No limits, no API keys, no credit card.",
       "features": [
         "Unlimited agent teams",
diff --git a/landing/content/es.json b/landing/content/es.json
index ef46068f..31886f18 100644
--- a/landing/content/es.json
+++ b/landing/content/es.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "¿Es realmente gratis?",
-      "answer": "Sí. La app es 100% gratuita y de código abierto. La app no tiene un plan de pago propio. Para ejecutar agentes solo necesitas acceso a un proveedor/runtime compatible, como Anthropic o Codex."
+      "answer": "Sí. La app es gratuita y de código abierto. La app no tiene un plan de pago propio. Para ejecutar agentes solo necesitas acceso a un proveedor/runtime compatible, como Anthropic o Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Gratis para siempre",
+      "name": "Gratis",
       "price": "$0",
-      "period": "para siempre",
+      "period": "",
       "description": "Todo incluido. Sin límites, sin claves API, sin tarjeta de crédito.",
       "features": [
         "Equipos de agentes ilimitados",
diff --git a/landing/content/fr.json b/landing/content/fr.json
index 34c5a311..831006bb 100644
--- a/landing/content/fr.json
+++ b/landing/content/fr.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "C'est vraiment gratuit ?",
-      "answer": "Oui. L'application est 100% gratuite et open source. L'application n'a pas d'offre payante. Pour exécuter des agents, vous avez seulement besoin d'un accès à un provider/runtime pris en charge, comme Anthropic ou Codex."
+      "answer": "Oui. L'application est gratuite et open source. L'application n'a pas d'offre payante. Pour exécuter des agents, vous avez seulement besoin d'un accès à un provider/runtime pris en charge, comme Anthropic ou Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Gratuit pour toujours",
+      "name": "Gratuit",
       "price": "0€",
-      "period": "pour toujours",
+      "period": "",
       "description": "Tout inclus. Sans limites, sans clés API, sans carte bancaire.",
       "features": [
         "Équipes d'agents illimitées",
diff --git a/landing/content/hi.json b/landing/content/hi.json
index f31a8f1e..b1e4f81e 100644
--- a/landing/content/hi.json
+++ b/landing/content/hi.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "क्या यह सच में मुफ़्त है?",
-      "answer": "हाँ। ऐप 100% मुफ़्त और ओपन सोर्स है। ऐप का अपना कोई paid plan नहीं है। agents चलाने के लिए आपको सिर्फ़ किसी supported provider/runtime, जैसे Anthropic या Codex, का access चाहिए।"
+      "answer": "हाँ। ऐप मुफ़्त और ओपन सोर्स है। ऐप का अपना कोई paid plan नहीं है। agents चलाने के लिए आपको सिर्फ़ किसी supported provider/runtime, जैसे Anthropic या Codex, का access चाहिए।"
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "हमेशा मुफ़्त",
+      "name": "मुफ़्त",
       "price": "$0",
-      "period": "हमेशा",
+      "period": "",
       "description": "सब कुछ शामिल। कोई लिमिट नहीं, कोई API कुंजी नहीं, कोई क्रेडिट कार्ड नहीं।",
       "features": [
         "असीमित एजेंट टीमें",
diff --git a/landing/content/ja.json b/landing/content/ja.json
index 5c923c6d..d18336c0 100644
--- a/landing/content/ja.json
+++ b/landing/content/ja.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "本当に無料ですか？",
-      "answer": "はい。アプリは100%無料のオープンソースです。アプリ自体に有料プランはありません。エージェントを実行するには、Anthropic や Codex など対応する provider/runtime へのアクセスだけが必要です。"
+      "answer": "はい。アプリは無料のオープンソースです。アプリ自体に有料プランはありません。エージェントを実行するには、Anthropic や Codex など対応する provider/runtime へのアクセスだけが必要です。"
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "永久無料",
+      "name": "無料",
       "price": "¥0",
-      "period": "永久",
+      "period": "",
       "description": "すべて含まれています。制限なし、APIキー不要、クレジットカード不要。",
       "features": [
         "無制限のエージェントチーム",
diff --git a/landing/content/pt.json b/landing/content/pt.json
index aeb6531f..9d7d8497 100644
--- a/landing/content/pt.json
+++ b/landing/content/pt.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "É realmente grátis?",
-      "answer": "Sim. O app é 100% gratuito e open source. O app não tem plano pago próprio. Para rodar agentes, você só precisa de acesso a um provider/runtime compatível, como Anthropic ou Codex."
+      "answer": "Sim. O app é gratuito e open source. O app não tem plano pago próprio. Para rodar agentes, você só precisa de acesso a um provider/runtime compatível, como Anthropic ou Codex."
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Grátis para sempre",
+      "name": "Grátis",
       "price": "$0",
-      "period": "para sempre",
+      "period": "",
       "description": "Tudo incluído. Sem limites, sem chaves de API, sem cartão de crédito.",
       "features": [
         "Equipes de agentes ilimitadas",
diff --git a/landing/content/ru.json b/landing/content/ru.json
index 0620238a..2eb6b4a7 100644
--- a/landing/content/ru.json
+++ b/landing/content/ru.json
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "Бесплатно навсегда",
+      "name": "Бесплатно",
       "price": "$0",
-      "period": "навсегда",
+      "period": "",
       "description": "Всё включено. Без лимитов, без API-ключей, без кредитной карты.",
       "features": [
         "Безлимитные команды агентов",
diff --git a/landing/content/zh.json b/landing/content/zh.json
index 49cf58db..2fea952f 100644
--- a/landing/content/zh.json
+++ b/landing/content/zh.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "真的免费吗？",
-      "answer": "是的。应用本身 100% 免费且开源。应用没有自己的付费方案。要运行智能体，你只需要接入受支持的 provider/runtime，例如 Anthropic 或 Codex。"
+      "answer": "是的。应用本身免费且开源。应用没有自己的付费方案。要运行智能体，你只需要接入受支持的 provider/runtime，例如 Anthropic 或 Codex。"
     },
     {
       "id": "platforms",
@@ -82,9 +82,9 @@
   "pricing": [
     {
       "id": "free",
-      "name": "永久免费",
+      "name": "免费",
       "price": "$0",
-      "period": "永久",
+      "period": "",
       "description": "全部功能。无限制，无需 API 密钥，无需信用卡。",
       "features": [
         "无限智能体团队",
diff --git a/landing/locales/ar.json b/landing/locales/ar.json
index e75db3ba..316ffad0 100644
--- a/landing/locales/ar.json
+++ b/landing/locales/ar.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "المميزات",
     "screenshots": "لقطات الشاشة",
+    "docs": "التوثيق",
     "comparison": "المقارنة",
     "download": "تحميل",
     "pricing": "مجاني",
@@ -13,6 +14,7 @@
     "downloadNow": "حمّل الآن",
     "ctaPrimary": "تحميل لـ {platform}",
     "ctaSecondary": "مقارنة",
+    "ctaDocs": "التوثيق",
     "preview": "معاينة المنتج",
     "trust": {
       "agentTeams": "فرق الوكلاء",
@@ -44,8 +46,8 @@
     "sectionTitle": "مجاني 100%. بدون شروط.",
     "sectionSubtitle": "مفتوح المصدر، بدون مفاتيح API، بدون إعدادات. فقط ثبّت وابدأ.",
     "getStarted": "حمّل الآن",
-    "popular": "مجاني للأبد",
-    "note": "مفتوح المصدر 100%. بدون مفاتيح API. بدون إعدادات. يعمل محلياً بالكامل."
+    "popular": "مجاني",
+    "note": "مفتوح المصدر. بدون مفاتيح API. بدون إعدادات. يعمل محلياً بالكامل."
   },
   "testimonials": {
     "sectionTitle": "ماذا يقول المطورون",
diff --git a/landing/locales/de.json b/landing/locales/de.json
index b797ea14..7373d66b 100644
--- a/landing/locales/de.json
+++ b/landing/locales/de.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Funktionen",
     "screenshots": "Screenshots",
+    "docs": "Dokumentation",
     "comparison": "Vergleich",
     "download": "Download",
     "pricing": "Kostenlos",
@@ -13,6 +14,7 @@
     "downloadNow": "Herunterladen",
     "ctaPrimary": "Für {platform} herunterladen",
     "ctaSecondary": "Vergleichen",
+    "ctaDocs": "Dokumentation",
     "preview": "Produktvorschau",
     "trust": {
       "agentTeams": "Agenten-Teams",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Kostenlos. Ohne Haken.",
     "sectionSubtitle": "Open Source, keine API-Schlüssel, keine Konfiguration. Einfach installieren und loslegen.",
     "getStarted": "Herunterladen",
-    "popular": "Für immer kostenlos",
-    "note": "100% Open Source. Keine API-Schlüssel. Keine Konfiguration. Läuft vollständig lokal."
+    "popular": "Kostenlos",
+    "note": "Open Source. Keine API-Schlüssel. Keine Konfiguration. Läuft vollständig lokal."
   },
   "testimonials": {
     "sectionTitle": "Was Entwickler sagen",
diff --git a/landing/locales/en.json b/landing/locales/en.json
index 2e381bf7..dc79746f 100644
--- a/landing/locales/en.json
+++ b/landing/locales/en.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Features",
     "screenshots": "Screenshots",
+    "docs": "Documentation",
     "comparison": "Compare",
     "download": "Download",
     "pricing": "Free",
@@ -13,6 +14,7 @@
     "downloadNow": "Download Now",
     "ctaPrimary": "Download for {platform}",
     "ctaSecondary": "Compare",
+    "ctaDocs": "Documentation",
     "preview": "Product preview",
     "trust": {
       "agentTeams": "Agent Teams",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Free. No strings attached.",
     "sectionSubtitle": "Open source, no API keys, no configuration. Just install and go.",
     "getStarted": "Download Now",
-    "popular": "Free Forever",
-    "note": "100% open source. No API keys. No configuration. Runs entirely locally."
+    "popular": "Free",
+    "note": "Open source. No API keys. No configuration. Runs entirely locally."
   },
   "testimonials": {
     "sectionTitle": "What developers say",
diff --git a/landing/locales/es.json b/landing/locales/es.json
index 52942486..f911ff4f 100644
--- a/landing/locales/es.json
+++ b/landing/locales/es.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Funciones",
     "screenshots": "Capturas",
+    "docs": "Documentación",
     "comparison": "Comparar",
     "download": "Descargar",
     "pricing": "Gratis",
@@ -13,6 +14,7 @@
     "downloadNow": "Descargar ahora",
     "ctaPrimary": "Descargar para {platform}",
     "ctaSecondary": "Comparar",
+    "ctaDocs": "Documentación",
     "preview": "Vista previa del producto",
     "trust": {
       "agentTeams": "Equipos de agentes",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Gratis. Sin letra pequeña.",
     "sectionSubtitle": "Código abierto, sin claves API, sin configuración. Instala y empieza.",
     "getStarted": "Descargar ahora",
-    "popular": "Gratis para siempre",
-    "note": "100% código abierto. Sin claves API. Sin configuración. Funciona completamente en local."
+    "popular": "Gratis",
+    "note": "Código abierto. Sin claves API. Sin configuración. Funciona completamente en local."
   },
   "testimonials": {
     "sectionTitle": "Lo que dicen los desarrolladores",
diff --git a/landing/locales/fr.json b/landing/locales/fr.json
index bb38045b..0af848a1 100644
--- a/landing/locales/fr.json
+++ b/landing/locales/fr.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Fonctionnalités",
     "screenshots": "Captures d'écran",
+    "docs": "Documentation",
     "comparison": "Comparer",
     "download": "Télécharger",
     "pricing": "Gratuit",
@@ -13,6 +14,7 @@
     "downloadNow": "Télécharger",
     "ctaPrimary": "Télécharger pour {platform}",
     "ctaSecondary": "Comparer",
+    "ctaDocs": "Documentation",
     "preview": "Aperçu du produit",
     "trust": {
       "agentTeams": "Équipes d'agents",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Gratuit. Sans conditions.",
     "sectionSubtitle": "Open source, sans clé API, sans configuration. Installez et c'est parti.",
     "getStarted": "Télécharger",
-    "popular": "Gratuit pour toujours",
-    "note": "100% open source. Sans clé API. Sans configuration. Fonctionne entièrement en local."
+    "popular": "Gratuit",
+    "note": "Open source. Sans clé API. Sans configuration. Fonctionne entièrement en local."
   },
   "testimonials": {
     "sectionTitle": "Ce que disent les développeurs",
diff --git a/landing/locales/hi.json b/landing/locales/hi.json
index 0f7e2337..4fb4ad8a 100644
--- a/landing/locales/hi.json
+++ b/landing/locales/hi.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "सुविधाएँ",
     "screenshots": "स्क्रीनशॉट",
+    "docs": "दस्तावेज़",
     "comparison": "तुलना",
     "download": "डाउनलोड",
     "pricing": "मुफ़्त",
@@ -13,6 +14,7 @@
     "downloadNow": "अभी डाउनलोड करें",
     "ctaPrimary": "{platform} के लिए डाउनलोड करें",
     "ctaSecondary": "तुलना करें",
+    "ctaDocs": "दस्तावेज़",
     "preview": "प्रोडक्ट प्रीव्यू",
     "trust": {
       "agentTeams": "एजेंट टीमें",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% मुफ़्त। कोई शर्त नहीं।",
     "sectionSubtitle": "ओपन सोर्स, कोई API कुंजी नहीं, कोई कॉन्फ़िगरेशन नहीं। बस इंस्टॉल करें और शुरू करें।",
     "getStarted": "अभी डाउनलोड करें",
-    "popular": "हमेशा मुफ़्त",
-    "note": "100% ओपन सोर्स। कोई API कुंजी नहीं। कोई कॉन्फ़िगरेशन नहीं। पूरी तरह लोकल चलता है।"
+    "popular": "मुफ़्त",
+    "note": "ओपन सोर्स। कोई API कुंजी नहीं। कोई कॉन्फ़िगरेशन नहीं। पूरी तरह लोकल चलता है।"
   },
   "testimonials": {
     "sectionTitle": "डेवलपर्स क्या कहते हैं",
diff --git a/landing/locales/ja.json b/landing/locales/ja.json
index 86d4ef24..efe26554 100644
--- a/landing/locales/ja.json
+++ b/landing/locales/ja.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "機能",
     "screenshots": "スクリーンショット",
+    "docs": "ドキュメント",
     "comparison": "比較",
     "download": "ダウンロード",
     "pricing": "無料",
@@ -13,6 +14,7 @@
     "downloadNow": "ダウンロード",
     "ctaPrimary": "{platform}版をダウンロード",
     "ctaSecondary": "比較する",
+    "ctaDocs": "ドキュメント",
     "preview": "製品プレビュー",
     "trust": {
       "agentTeams": "エージェントチーム",
@@ -44,8 +46,8 @@
     "sectionTitle": "100%無料。制約なし。",
     "sectionSubtitle": "オープンソース、APIキー不要、設定不要。インストールするだけ。",
     "getStarted": "ダウンロード",
-    "popular": "永久無料",
-    "note": "100%オープンソース。APIキー不要。設定不要。完全にローカルで動作。"
+    "popular": "無料",
+    "note": "オープンソース。APIキー不要。設定不要。完全にローカルで動作。"
   },
   "testimonials": {
     "sectionTitle": "開発者の声",
diff --git a/landing/locales/pt.json b/landing/locales/pt.json
index de136030..ba1c26ca 100644
--- a/landing/locales/pt.json
+++ b/landing/locales/pt.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Recursos",
     "screenshots": "Capturas",
+    "docs": "Documentação",
     "comparison": "Comparar",
     "download": "Baixar",
     "pricing": "Grátis",
@@ -13,6 +14,7 @@
     "downloadNow": "Baixar agora",
     "ctaPrimary": "Baixar para {platform}",
     "ctaSecondary": "Comparar",
+    "ctaDocs": "Documentação",
     "preview": "Prévia do produto",
     "trust": {
       "agentTeams": "Equipes de agentes",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Grátis. Sem pegadinhas.",
     "sectionSubtitle": "Código aberto, sem chaves de API, sem configuração. Instale e comece.",
     "getStarted": "Baixar agora",
-    "popular": "Grátis para sempre",
-    "note": "100% código aberto. Sem chaves de API. Sem configuração. Roda totalmente local."
+    "popular": "Grátis",
+    "note": "Código aberto. Sem chaves de API. Sem configuração. Roda totalmente local."
   },
   "testimonials": {
     "sectionTitle": "O que os desenvolvedores dizem",
diff --git a/landing/locales/ru.json b/landing/locales/ru.json
index 0af96cd6..f57612bf 100644
--- a/landing/locales/ru.json
+++ b/landing/locales/ru.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "Возможности",
     "screenshots": "Скриншоты",
+    "docs": "Документация",
     "comparison": "Сравнение",
     "download": "Скачать",
     "pricing": "Бесплатно",
@@ -13,6 +14,7 @@
     "downloadNow": "Скачать",
     "ctaPrimary": "Скачать для {platform}",
     "ctaSecondary": "Сравнить",
+    "ctaDocs": "Документация",
     "preview": "Превью продукта",
     "trust": {
       "agentTeams": "Команды агентов",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% Бесплатно. Без подвоха.",
     "sectionSubtitle": "Открытый код, без API-ключей, без конфигурации. Просто установите и работайте.",
     "getStarted": "Скачать",
-    "popular": "Бесплатно навсегда",
-    "note": "100% открытый код. Без API-ключей. Без конфигурации. Работает полностью локально."
+    "popular": "Бесплатно",
+    "note": "Открытый код. Без API-ключей. Без конфигурации. Работает полностью локально."
   },
   "testimonials": {
     "sectionTitle": "Что говорят разработчики",
diff --git a/landing/locales/zh.json b/landing/locales/zh.json
index 977114f2..bd56e97f 100644
--- a/landing/locales/zh.json
+++ b/landing/locales/zh.json
@@ -2,6 +2,7 @@
   "nav": {
     "features": "功能",
     "screenshots": "截图",
+    "docs": "文档",
     "comparison": "对比",
     "download": "下载",
     "pricing": "免费",
@@ -13,6 +14,7 @@
     "downloadNow": "立即下载",
     "ctaPrimary": "下载 {platform} 版",
     "ctaSecondary": "对比",
+    "ctaDocs": "文档",
     "preview": "产品预览",
     "trust": {
       "agentTeams": "智能体团队",
@@ -44,8 +46,8 @@
     "sectionTitle": "100% 免费，没有附加条件。",
     "sectionSubtitle": "开源，无需 API 密钥，无需配置。安装即用。",
     "getStarted": "立即下载",
-    "popular": "永久免费",
-    "note": "100% 开源。无需 API 密钥。无需配置。完全本地运行。"
+    "popular": "免费",
+    "note": "开源。无需 API 密钥。无需配置。完全本地运行。"
   },
   "testimonials": {
     "sectionTitle": "开发者怎么说",
diff --git a/landing/nuxt.config.ts b/landing/nuxt.config.ts
index 927e5604..240275d0 100644
--- a/landing/nuxt.config.ts
+++ b/landing/nuxt.config.ts
@@ -55,6 +55,10 @@ export default defineNuxtConfig({
   nitro: {
     compressPublicAssets: true,
     prerender: {
+      ignore: [
+        "/docs",
+        "/docs/**"
+      ],
       routes: [
         ...generateI18nRoutes(),
         "/sitemap.xml",
diff --git a/landing/package-lock.json b/landing/package-lock.json
index 1b556da7..de38bab3 100644
--- a/landing/package-lock.json
+++ b/landing/package-lock.json
@@ -22,10 +22,15 @@
       "devDependencies": {
         "@mdi/font": "^7.4.47",
         "@nuxt/eslint": "^1.12.1",
+        "@shikijs/transformers": "3.22.0",
         "eslint": "^9.39.2",
+        "medium-zoom": "^1.1.0",
         "prettier": "^3.8.0",
         "sass": "^1.97.2",
-        "vite-plugin-vuetify": "^2.1.3"
+        "vite-plugin-vuetify": "^2.1.3",
+        "vitepress": "2.0.0-alpha.17",
+        "vitepress-codeblock-collapse": "^1.0.0",
+        "vitepress-plugin-llms": "^1.12.2"
       }
     },
     "node_modules/@antfu/install-pkg": {
@@ -515,6 +520,27 @@
         "node": ">=18.0.0"
       }
     },
+    "node_modules/@docsearch/css": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-4.6.3.tgz",
+      "integrity": "sha512-nlOwcXcsNAptQl4vlL4MA78qNJKO0Qlds5GuBjCoePgkebTXLSf8Qt1oyZ3YBshYupKXG9VRGEsk1zr23d+bzQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@docsearch/js": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-4.6.3.tgz",
+      "integrity": "sha512-qUIX2b4Apew3tv4F0qhmgShsl/Lfw4m6mqv/5/5dWNxwTcDdLMp2s3YwZ+NMGh3IKCg0pBaXm7Q5VdyU5Rj+cQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@docsearch/sidepanel-js": {
+      "version": "4.6.3",
+      "resolved": "https://registry.npmjs.org/@docsearch/sidepanel-js/-/sidepanel-js-4.6.3.tgz",
+      "integrity": "sha512-grGSmvXzG0if+mrzdIKykvpIAuEQ9u0sEJ2eLRRCaQfJvsWqh2C2/aY04bIzWvDh7myi5rvl8D+tUNsVrjYQ3A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@dxup/nuxt": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/@dxup/nuxt/-/nuxt-0.3.2.tgz",
@@ -1321,6 +1347,16 @@
         "url": "https://github.com/sponsors/nzakas"
       }
     },
+    "node_modules/@iconify-json/simple-icons": {
+      "version": "1.2.80",
+      "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.80.tgz",
+      "integrity": "sha512-iglncJJ6X/dVuzFDU32MrHwwo4RBwivGf108dgyYg+HKS78ifx0h7sTenpDZMVT+UhdS6CSgZcvY/SvRXlIEUg==",
+      "dev": true,
+      "license": "CC0-1.0",
+      "dependencies": {
+        "@iconify/types": "*"
+      }
+    },
     "node_modules/@iconify/collections": {
       "version": "1.0.645",
       "resolved": "https://registry.npmjs.org/@iconify/collections/-/collections-1.0.645.tgz",
@@ -4452,9 +4488,9 @@
       "license": "MIT"
     },
     "node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-beta.53",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.53.tgz",
-      "integrity": "sha512-vENRlFU4YbrwVqNDZ7fLvy+JR1CRkyr01jhSiDpE1u6py3OMzQfztQU2jxykW3ALNxO4kSlqIDeYyD0Y9RcQeQ==",
+      "version": "1.0.0-rc.13",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.13.tgz",
+      "integrity": "sha512-3ngTAv6F/Py35BsYbeeLeecvhMKdsKm4AoOETVhAA+Qc8nrA2I0kF7oa93mE9qnIurngOSpMnQ0x2nQY2FPviA==",
       "license": "MIT"
     },
     "node_modules/@rollup/plugin-alias": {
@@ -4996,6 +5032,135 @@
         "win32"
       ]
     },
+    "node_modules/@shikijs/core": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.22.0.tgz",
+      "integrity": "sha512-iAlTtSDDbJiRpvgL5ugKEATDtHdUVkqgHDm/gbD2ZS9c88mx7G1zSYjjOxp5Qa0eaW0MAQosFRmJSk354PRoQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.22.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.5"
+      }
+    },
+    "node_modules/@shikijs/engine-javascript": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-3.23.0.tgz",
+      "integrity": "sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.23.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "oniguruma-to-es": "^4.3.4"
+      }
+    },
+    "node_modules/@shikijs/engine-javascript/node_modules/@shikijs/types": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/engine-oniguruma": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-3.23.0.tgz",
+      "integrity": "sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.23.0",
+        "@shikijs/vscode-textmate": "^10.0.2"
+      }
+    },
+    "node_modules/@shikijs/engine-oniguruma/node_modules/@shikijs/types": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/langs": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-3.23.0.tgz",
+      "integrity": "sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.23.0"
+      }
+    },
+    "node_modules/@shikijs/langs/node_modules/@shikijs/types": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/themes": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-3.23.0.tgz",
+      "integrity": "sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.23.0"
+      }
+    },
+    "node_modules/@shikijs/themes/node_modules/@shikijs/types": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/transformers": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-3.22.0.tgz",
+      "integrity": "sha512-E7eRV7mwDBjueLF6852n2oYeJYxBq3NSsDk+uyruYAXONv4U8holGmIrT+mPRJQ1J1SNOH6L8G19KRzmBawrFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/core": "3.22.0",
+        "@shikijs/types": "3.22.0"
+      }
+    },
+    "node_modules/@shikijs/types": {
+      "version": "3.22.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.22.0.tgz",
+      "integrity": "sha512-491iAekgKDBFE67z70Ok5a8KBMsQ2IJwOWw3us/7ffQkIBCyOQfm/aNwVMBUriP02QshIfgHCBSIYAl3u2eWjg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/@shikijs/vscode-textmate": {
+      "version": "10.0.2",
+      "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz",
+      "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@sindresorhus/base62": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@sindresorhus/base62/-/base62-1.0.0.tgz",
@@ -5083,18 +5248,80 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@types/debug": {
+      "version": "4.1.13",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.13.tgz",
+      "integrity": "sha512-KSVgmQmzMwPlmtljOomayoR89W4FynCAi3E8PPs7vmDVPe84hT+vGPKkJfThkmXs0x0jAaa9U8uW8bbfyS2fWw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
       "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
       "license": "MIT"
     },
+    "node_modules/@types/hast": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz",
+      "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
       "license": "MIT"
     },
+    "node_modules/@types/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/markdown-it": {
+      "version": "14.1.2",
+      "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz",
+      "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/linkify-it": "^5",
+        "@types/mdurl": "^2"
+      }
+    },
+    "node_modules/@types/mdast": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz",
+      "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "*"
+      }
+    },
+    "node_modules/@types/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/parse-path": {
       "version": "7.0.3",
       "resolved": "https://registry.npmjs.org/@types/parse-path/-/parse-path-7.0.3.tgz",
@@ -5107,6 +5334,13 @@
       "integrity": "sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==",
       "license": "MIT"
     },
+    "node_modules/@types/unist": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz",
+      "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.20",
       "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.20.tgz",
@@ -5339,6 +5573,13 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/@ungap/structured-clone": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
+      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/@unhead/vue": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@unhead/vue/-/vue-2.1.2.tgz",
@@ -5685,18 +5926,18 @@
       }
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.3.tgz",
-      "integrity": "sha512-TlGPkLFLVOY3T7fZrwdvKpjprR3s4fxRln0ORDo1VQ7HHyxJwTlrjKU3kpVWTlaAjIEuCTokmjkZnr8Tpc925w==",
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.6.tgz",
+      "integrity": "sha512-u9HHgfrq3AjXlysn0eINFnWQOJQLO9WN6VprZ8FXl7A2bYisv3Hui9Ij+7QZ41F/WYWarHjwBbXtD7dKg3uxbg==",
       "license": "MIT",
       "dependencies": {
-        "@rolldown/pluginutils": "1.0.0-beta.53"
+        "@rolldown/pluginutils": "1.0.0-rc.13"
       },
       "engines": {
         "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0",
         "vue": "^3.2.25"
       }
     },
@@ -5720,12 +5961,6 @@
         "vue": "^3.0.0"
       }
     },
-    "node_modules/@vitejs/plugin-vue-jsx/node_modules/@rolldown/pluginutils": {
-      "version": "1.0.0-rc.2",
-      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.2.tgz",
-      "integrity": "sha512-izyXV/v+cHiRfozX62W9htOAvwMo4/bXKDrQ+vom1L1qRuexPock/7VZDAhnpHCLNejd3NJ6hiab+tO0D44Rgw==",
-      "license": "MIT"
-    },
     "node_modules/@volar/language-core": {
       "version": "2.4.27",
       "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.27.tgz",
@@ -5935,28 +6170,22 @@
       }
     },
     "node_modules/@vue/devtools-kit": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.0.5.tgz",
-      "integrity": "sha512-q2VV6x1U3KJMTQPUlRMyWEKVbcHuxhqJdSr6Jtjz5uAThAIrfJ6WVZdGZm5cuO63ZnSUz0RCsVwiUUb0mDV0Yg==",
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.1.1.tgz",
+      "integrity": "sha512-gVBaBv++i+adg4JpH71k9ppl4soyR7Y2McEqO5YNgv0BI1kMZ7BDX5gnwkZ5COYgiCyhejZG+yGNrBAjj6Coqg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/devtools-shared": "^8.0.5",
+        "@vue/devtools-shared": "^8.1.1",
         "birpc": "^2.6.1",
         "hookable": "^5.5.3",
-        "mitt": "^3.0.1",
-        "perfect-debounce": "^2.0.0",
-        "speakingurl": "^14.0.1",
-        "superjson": "^2.2.2"
+        "perfect-debounce": "^2.0.0"
       }
     },
     "node_modules/@vue/devtools-shared": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.0.5.tgz",
-      "integrity": "sha512-bRLn6/spxpmgLk+iwOrR29KrYnJjG9DGpHGkDFG82UM21ZpJ39ztUT9OXX3g+usW7/b2z+h46I9ZiYyB07XMXg==",
-      "license": "MIT",
-      "dependencies": {
-        "rfdc": "^1.4.1"
-      }
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.1.1.tgz",
+      "integrity": "sha512-+h4ttmJYl/txpxHKaoZcaKpC+pvckgLzIDiSQlaQ7kKthKh8KuwoLW2D8hPJEnqKzXOvu15UHEoGyngAXCz0EQ==",
+      "license": "MIT"
     },
     "node_modules/@vue/language-core": {
       "version": "3.2.4",
@@ -6078,6 +6307,121 @@
         }
       }
     },
+    "node_modules/@vueuse/integrations": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-14.3.0.tgz",
+      "integrity": "sha512-76I5FT2ESvCmCaSwapI+a/u/CFtNXmzl9f9lNp1hRtx8vKB8hfiokJr8IvQqcQG5ckGXElyXK516b54ozV3MvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vueuse/core": "14.3.0",
+        "@vueuse/shared": "14.3.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "async-validator": "^4",
+        "axios": "^1",
+        "change-case": "^5",
+        "drauu": "^0.4",
+        "focus-trap": "^7 || ^8",
+        "fuse.js": "^7",
+        "idb-keyval": "^6",
+        "jwt-decode": "^4",
+        "nprogress": "^0.2",
+        "qrcode": "^1.5",
+        "sortablejs": "^1",
+        "universal-cookie": "^7 || ^8",
+        "vue": "^3.5.0"
+      },
+      "peerDependenciesMeta": {
+        "async-validator": {
+          "optional": true
+        },
+        "axios": {
+          "optional": true
+        },
+        "change-case": {
+          "optional": true
+        },
+        "drauu": {
+          "optional": true
+        },
+        "focus-trap": {
+          "optional": true
+        },
+        "fuse.js": {
+          "optional": true
+        },
+        "idb-keyval": {
+          "optional": true
+        },
+        "jwt-decode": {
+          "optional": true
+        },
+        "nprogress": {
+          "optional": true
+        },
+        "qrcode": {
+          "optional": true
+        },
+        "sortablejs": {
+          "optional": true
+        },
+        "universal-cookie": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/core": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.3.0.tgz",
+      "integrity": "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "14.3.0",
+        "@vueuse/shared": "14.3.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/metadata": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.3.0.tgz",
+      "integrity": "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/@vueuse/integrations/node_modules/@vueuse/shared": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.3.0.tgz",
+      "integrity": "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
     "node_modules/@vueuse/metadata": {
       "version": "10.11.1",
       "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.11.1.tgz",
@@ -6572,6 +6916,17 @@
         }
       }
     },
+    "node_modules/bail": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/bail/-/bail-2.0.2.tgz",
+      "integrity": "sha512-0xO6mYd7JB2YesxDKplafRpsiOzPt9V02ddPCLbY1xYGPOX24NTyN50qnUxgCPcSoYMhKpAuBTjQoRZCAkUDRw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
@@ -6860,6 +7215,17 @@
       ],
       "license": "CC-BY-4.0"
     },
+    "node_modules/ccount": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz",
+      "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
@@ -6883,6 +7249,39 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/character-entities": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz",
+      "integrity": "sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-html4": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz",
+      "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/character-entities-legacy": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz",
+      "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/chokidar": {
       "version": "5.0.0",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
@@ -7019,6 +7418,17 @@
       "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
       "license": "MIT"
     },
+    "node_modules/comma-separated-tokens": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz",
+      "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/commander": {
       "version": "13.1.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-13.1.0.tgz",
@@ -7444,6 +7854,20 @@
         }
       }
     },
+    "node_modules/decode-named-character-reference": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/decode-named-character-reference/-/decode-named-character-reference-1.3.0.tgz",
+      "integrity": "sha512-GtpQYB283KrPp6nRw50q3U9/VfOutZOe103qlN7BPP6Ad27xYnOIWv4lPzo8HCAL+mMZofJ9KEy30fq6MfaK6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -7520,6 +7944,16 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/dequal": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz",
+      "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/destr": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/destr/-/destr-2.0.5.tgz",
@@ -7541,6 +7975,20 @@
       "integrity": "sha512-nPRkjWzzDQlsejL1WVifk5rvcFi/y1onBRxjaFMjZeR9mFpqu2gmAZ9xUB9/IEanEP/vBtGeGganC/GO1fmufg==",
       "license": "MIT"
     },
+    "node_modules/devlop": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz",
+      "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "dequal": "^2.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/diff": {
       "version": "8.0.3",
       "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz",
@@ -8517,6 +8965,26 @@
       "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==",
       "license": "MIT"
     },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/externality": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/externality/-/externality-1.0.2.tgz",
@@ -8605,6 +9073,20 @@
         "reusify": "^1.0.4"
       }
     },
+    "node_modules/fault": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/fault/-/fault-2.0.1.tgz",
+      "integrity": "sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "format": "^0.2.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/fdir": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
@@ -8701,6 +9183,16 @@
       "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "license": "ISC"
     },
+    "node_modules/focus-trap": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-8.2.0.tgz",
+      "integrity": "sha512-CaBdQ9P4fa/yCA6pDf/3aJd8bf9IOG5QGK21/E+86o2V4V8kzXaR4A9E6tNR7KkkS1+T5ZIU1tJDBDLwsucz9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "tabbable": "^6.4.0"
+      }
+    },
     "node_modules/foreground-child": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
@@ -8717,6 +9209,15 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/format": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/format/-/format-0.2.2.tgz",
+      "integrity": "sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "5.3.4",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz",
@@ -8966,6 +9467,46 @@
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "license": "ISC"
     },
+    "node_modules/gray-matter": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz",
+      "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "js-yaml": "^3.13.1",
+        "kind-of": "^6.0.2",
+        "section-matter": "^1.0.0",
+        "strip-bom-string": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6.0"
+      }
+    },
+    "node_modules/gray-matter/node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/gray-matter/node_modules/js-yaml": {
+      "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz",
+      "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
     "node_modules/gzip-size": {
       "version": "7.0.0",
       "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-7.0.0.tgz",
@@ -9019,6 +9560,44 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/hast-util-to-html": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz",
+      "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/unist": "^3.0.0",
+        "ccount": "^2.0.0",
+        "comma-separated-tokens": "^2.0.0",
+        "hast-util-whitespace": "^3.0.0",
+        "html-void-elements": "^3.0.0",
+        "mdast-util-to-hast": "^13.0.0",
+        "property-information": "^7.0.0",
+        "space-separated-tokens": "^2.0.0",
+        "stringify-entities": "^4.0.0",
+        "zwitch": "^2.0.4"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/hast-util-whitespace": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz",
+      "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/hookable": {
       "version": "5.5.3",
       "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
@@ -9042,6 +9621,17 @@
       ],
       "license": "MIT"
     },
+    "node_modules/html-void-elements": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz",
+      "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/http-errors": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
@@ -9299,6 +9889,16 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-extglob": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -9390,6 +9990,19 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-plain-obj": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
+      "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-reference": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz",
@@ -9623,6 +10236,16 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/kleur": {
       "version": "3.0.3",
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
@@ -9724,6 +10347,16 @@
         "url": "https://github.com/sponsors/antonk52"
       }
     },
+    "node_modules/linkify-it": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz",
+      "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "uc.micro": "^2.0.0"
+      }
+    },
     "node_modules/listhen": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/listhen/-/listhen-1.9.0.tgz",
@@ -9839,6 +10472,17 @@
       "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==",
       "license": "MIT"
     },
+    "node_modules/longest-streak": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/longest-streak/-/longest-streak-3.1.0.tgz",
+      "integrity": "sha512-9Ri+o0JYgehTaVBBDoMqIl8GXtbWg711O3srftcHhZ0dqnETqLaoIK0x17fUw9rFSlK/0NlsKe0Ahhyl5pXE2g==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/lru-cache": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@@ -9898,12 +10542,204 @@
         "source-map-js": "^1.2.1"
       }
     },
+    "node_modules/mark.js": {
+      "version": "8.11.1",
+      "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz",
+      "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/markdown-it": {
+      "version": "14.1.1",
+      "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz",
+      "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^2.0.1",
+        "entities": "^4.4.0",
+        "linkify-it": "^5.0.0",
+        "mdurl": "^2.0.0",
+        "punycode.js": "^2.3.1",
+        "uc.micro": "^2.1.0"
+      },
+      "bin": {
+        "markdown-it": "bin/markdown-it.mjs"
+      }
+    },
+    "node_modules/markdown-it/node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/markdown-title": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/markdown-title/-/markdown-title-1.0.2.tgz",
+      "integrity": "sha512-MqIQVVkz+uGEHi3TsHx/czcxxCbRIL7sv5K5DnYw/tI+apY54IbPefV/cmgxp6LoJSEx/TqcHdLs/298afG5QQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/mdast-util-from-markdown": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-2.0.3.tgz",
+      "integrity": "sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "micromark": "^4.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-frontmatter": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-frontmatter/-/mdast-util-frontmatter-2.0.1.tgz",
+      "integrity": "sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "devlop": "^1.0.0",
+        "escape-string-regexp": "^5.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "micromark-extension-frontmatter": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-frontmatter/node_modules/escape-string-regexp": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
+      "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/mdast-util-phrasing": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-phrasing/-/mdast-util-phrasing-4.1.0.tgz",
+      "integrity": "sha512-TqICwyvJJpBwvGAMZjj4J2n0X8QWp21b9l0o7eXyVJ25YNWYbJDVIyD1bZXE6WtV6RmKJVYmQAKWa0zWOABz2w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-hast": {
+      "version": "13.2.1",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz",
+      "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/hast": "^3.0.0",
+        "@types/mdast": "^4.0.0",
+        "@ungap/structured-clone": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "trim-lines": "^3.0.0",
+        "unist-util-position": "^5.0.0",
+        "unist-util-visit": "^5.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-markdown": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-2.1.2.tgz",
+      "integrity": "sha512-xj68wMTvGXVOKonmog6LwyJKrYXZPvlwabaryTjLh9LuvovB/KAH+kvi8Gjj+7rJjsFi23nkUxRQv1KqSroMqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "@types/unist": "^3.0.0",
+        "longest-streak": "^3.0.0",
+        "mdast-util-phrasing": "^4.0.0",
+        "mdast-util-to-string": "^4.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-decode-string": "^2.0.0",
+        "unist-util-visit": "^5.0.0",
+        "zwitch": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/mdast-util-to-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-4.0.0.tgz",
+      "integrity": "sha512-0H44vDimn51F0YwvxSJSm0eCDOJTRlmN0R1yBh4HLj9wiV1Dn0QoXGbvFAWj2hSItVTlCmBF1hqKlIyUBVFLPg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/mdn-data": {
       "version": "2.12.2",
       "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz",
       "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==",
       "license": "CC0-1.0"
     },
+    "node_modules/mdurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz",
+      "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/medium-zoom": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/medium-zoom/-/medium-zoom-1.1.0.tgz",
+      "integrity": "sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -9919,6 +10755,486 @@
         "node": ">= 8"
       }
     },
+    "node_modules/micromark": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/micromark/-/micromark-4.0.2.tgz",
+      "integrity": "sha512-zpe98Q6kvavpCr1NPVSCMebCKfD7CA2NqZ+rykeNhONIJBpc1tFKt9hucLGwha3jNTNI8lHpctWJWoimVF4PfA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@types/debug": "^4.0.0",
+        "debug": "^4.0.0",
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-core-commonmark": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-combine-extensions": "^2.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-sanitize-uri": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-core-commonmark": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/micromark-core-commonmark/-/micromark-core-commonmark-2.0.3.tgz",
+      "integrity": "sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "devlop": "^1.0.0",
+        "micromark-factory-destination": "^2.0.0",
+        "micromark-factory-label": "^2.0.0",
+        "micromark-factory-space": "^2.0.0",
+        "micromark-factory-title": "^2.0.0",
+        "micromark-factory-whitespace": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-classify-character": "^2.0.0",
+        "micromark-util-html-tag-name": "^2.0.0",
+        "micromark-util-normalize-identifier": "^2.0.0",
+        "micromark-util-resolve-all": "^2.0.0",
+        "micromark-util-subtokenize": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-extension-frontmatter": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/micromark-extension-frontmatter/-/micromark-extension-frontmatter-2.0.0.tgz",
+      "integrity": "sha512-C4AkuM3dA58cgZha7zVnuVxBhDsbttIMiytjgsM2XbHAB2faRVaHRle40558FBN+DJcrLNCoqG5mlrpdU4cRtg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fault": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/micromark-factory-destination": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-destination/-/micromark-factory-destination-2.0.1.tgz",
+      "integrity": "sha512-Xe6rDdJlkmbFRExpTOmRj9N3MaWmbAgdpSrBQvCFqhezUn4AHqJHbaEnfbVYYiexVSs//tqOdY/DxhjdCiJnIA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-label": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-label/-/micromark-factory-label-2.0.1.tgz",
+      "integrity": "sha512-VFMekyQExqIW7xIChcXn4ok29YE3rnuyveW3wZQWWqF4Nv9Wk5rgJ99KzPvHjkmPXF93FXIbBp6YdW3t71/7Vg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-space": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-space/-/micromark-factory-space-2.0.1.tgz",
+      "integrity": "sha512-zRkxjtBxxLd2Sc0d+fbnEunsTj46SWXgXciZmHq0kDYGnck/ZSGj9/wULTV95uoeYiK5hRXP2mJ98Uo4cq/LQg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-title": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-title/-/micromark-factory-title-2.0.1.tgz",
+      "integrity": "sha512-5bZ+3CjhAd9eChYTHsjy6TGxpOFSKgKKJPJxr293jTbfry2KDoWkhBb6TcPVB4NmzaPhMs1Frm9AZH7OD4Cjzw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-factory-whitespace": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-factory-whitespace/-/micromark-factory-whitespace-2.0.1.tgz",
+      "integrity": "sha512-Ob0nuZ3PKt/n0hORHyvoD9uZhr+Za8sFoP+OnMcnWK5lngSzALgQYKMr9RJVOWLqQYuyn6ulqGWSXdwf6F80lQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-factory-space": "^2.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-character": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz",
+      "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-chunked": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-chunked/-/micromark-util-chunked-2.0.1.tgz",
+      "integrity": "sha512-QUNFEOPELfmvv+4xiNg2sRYeS/P84pTW0TCgP5zc9FpXetHY0ab7SxKyAQCNCc1eK0459uoLI1y5oO5Vc1dbhA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-classify-character": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-classify-character/-/micromark-util-classify-character-2.0.1.tgz",
+      "integrity": "sha512-K0kHzM6afW/MbeWYWLjoHQv1sgg2Q9EccHEDzSkxiP/EaagNzCm7T/WMKZ3rjMbvIpvBiZgwR3dKMygtA4mG1Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-combine-extensions": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-combine-extensions/-/micromark-util-combine-extensions-2.0.1.tgz",
+      "integrity": "sha512-OnAnH8Ujmy59JcyZw8JSbK9cGpdVY44NKgSM7E9Eh7DiLS2E9RNQf0dONaGDzEG9yjEl5hcqeIsj4hfRkLH/Bg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-numeric-character-reference": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-numeric-character-reference/-/micromark-util-decode-numeric-character-reference-2.0.2.tgz",
+      "integrity": "sha512-ccUbYk6CwVdkmCQMyr64dXz42EfHGkPQlBj5p7YVGzq8I7CtjXZJrubAYezf7Rp+bjPseiROqe7G6foFd+lEuw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-decode-string": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-decode-string/-/micromark-util-decode-string-2.0.1.tgz",
+      "integrity": "sha512-nDV/77Fj6eH1ynwscYTOsbK7rR//Uj0bZXBwJZRfaLEJ1iGBR6kIfNmlNqaqJf649EP0F3NWNdeJi03elllNUQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "decode-named-character-reference": "^1.0.0",
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-decode-numeric-character-reference": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-encode": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz",
+      "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-html-tag-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-html-tag-name/-/micromark-util-html-tag-name-2.0.1.tgz",
+      "integrity": "sha512-2cNEiYDhCWKI+Gs9T0Tiysk136SnR13hhO8yW6BGNyhOC4qYFnwF1nKfD3HFAIXA5c45RrIG1ub11GiXeYd1xA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-normalize-identifier": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-normalize-identifier/-/micromark-util-normalize-identifier-2.0.1.tgz",
+      "integrity": "sha512-sxPqmo70LyARJs0w2UclACPUUEqltCkJ6PhKdMIDuJ3gSf/Q+/GIe3WKl0Ijb/GyH9lOpUkRAO2wp0GVkLvS9Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-resolve-all": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-resolve-all/-/micromark-util-resolve-all-2.0.1.tgz",
+      "integrity": "sha512-VdQyxFWFT2/FGJgwQnJYbe1jjQoNTS4RjglmSjTUlpUMa95Htx9NHeYW4rGDJzbjvCsl9eLjMQwGeElsqmzcHg==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-sanitize-uri": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz",
+      "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "micromark-util-character": "^2.0.0",
+        "micromark-util-encode": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-subtokenize": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/micromark-util-subtokenize/-/micromark-util-subtokenize-2.1.0.tgz",
+      "integrity": "sha512-XQLu552iSctvnEcgXw6+Sx75GflAPNED1qx7eBJ+wydBb2KCbRZe+NwvIEEMM83uml1+2WSXpBAcp9IUCgCYWA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "devlop": "^1.0.0",
+        "micromark-util-chunked": "^2.0.0",
+        "micromark-util-symbol": "^2.0.0",
+        "micromark-util-types": "^2.0.0"
+      }
+    },
+    "node_modules/micromark-util-symbol": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz",
+      "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/micromark-util-types": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz",
+      "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "GitHub Sponsors",
+          "url": "https://github.com/sponsors/unifiedjs"
+        },
+        {
+          "type": "OpenCollective",
+          "url": "https://opencollective.com/unified"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/micromatch": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
@@ -9944,6 +11260,19 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/millify": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/millify/-/millify-6.1.0.tgz",
+      "integrity": "sha512-H/E3J6t+DQs/F2YgfDhxUVZz/dF8JXPPKTLHL/yHCcLZLtCXJDUaqvhJXQwqOVBvbyNn4T0WjLpIHd7PAw7fBA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "yargs": "^17.0.1"
+      },
+      "bin": {
+        "millify": "bin/millify"
+      }
+    },
     "node_modules/mime": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.0.tgz",
@@ -9995,6 +11324,13 @@
         "node": ">=16 || 14 >=14.17"
       }
     },
+    "node_modules/minisearch": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz",
+      "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/minizlib": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
@@ -11122,6 +12458,25 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/oniguruma-parser": {
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/oniguruma-parser/-/oniguruma-parser-0.12.2.tgz",
+      "integrity": "sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/oniguruma-to-es": {
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-4.3.6.tgz",
+      "integrity": "sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "oniguruma-parser": "^0.12.2",
+        "regex": "^6.1.0",
+        "regex-recursion": "^6.0.2"
+      }
+    },
     "node_modules/open": {
       "version": "8.4.2",
       "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
@@ -11450,6 +12805,13 @@
         "node": "20 || >=22"
       }
     },
+    "node_modules/path-to-regexp": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz",
+      "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/pathe": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -12063,6 +13425,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/property-information": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz",
+      "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/protocols": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/protocols/-/protocols-2.0.2.tgz",
@@ -12078,6 +13451,16 @@
         "node": ">=6"
       }
     },
+    "node_modules/punycode.js": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz",
+      "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/quansync": {
       "version": "0.2.11",
       "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
@@ -12232,6 +13615,33 @@
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
+    "node_modules/regex": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/regex/-/regex-6.1.0.tgz",
+      "integrity": "sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-recursion": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz",
+      "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "regex-utilities": "^2.3.0"
+      }
+    },
+    "node_modules/regex-utilities": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz",
+      "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/regexp-ast-analysis": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/regexp-ast-analysis/-/regexp-ast-analysis-0.7.1.tgz",
@@ -12268,6 +13678,73 @@
         "regjsparser": "bin/parser"
       }
     },
+    "node_modules/remark": {
+      "version": "15.0.1",
+      "resolved": "https://registry.npmjs.org/remark/-/remark-15.0.1.tgz",
+      "integrity": "sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "remark-parse": "^11.0.0",
+        "remark-stringify": "^11.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-frontmatter": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-5.0.0.tgz",
+      "integrity": "sha512-XTFYvNASMe5iPN0719nPrdItC9aU0ssC4v14mH1BCi1u0n1gAocqcujWUrByftZTbLhRtiKRyjYTSIOcr69UVQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-frontmatter": "^2.0.0",
+        "micromark-extension-frontmatter": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-parse": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-11.0.0.tgz",
+      "integrity": "sha512-FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-from-markdown": "^2.0.0",
+        "micromark-util-types": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/remark-stringify": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-11.0.0.tgz",
+      "integrity": "sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/mdast": "^4.0.0",
+        "mdast-util-to-markdown": "^2.0.0",
+        "unified": "^11.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -12576,6 +14053,20 @@
       "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
       "license": "MIT"
     },
+    "node_modules/section-matter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz",
+      "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "kind-of": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/semver": {
       "version": "7.7.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
@@ -12724,6 +14215,47 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/shiki": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/shiki/-/shiki-3.23.0.tgz",
+      "integrity": "sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/core": "3.23.0",
+        "@shikijs/engine-javascript": "3.23.0",
+        "@shikijs/engine-oniguruma": "3.23.0",
+        "@shikijs/langs": "3.23.0",
+        "@shikijs/themes": "3.23.0",
+        "@shikijs/types": "3.23.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
+    "node_modules/shiki/node_modules/@shikijs/core": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-3.23.0.tgz",
+      "integrity": "sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/types": "3.23.0",
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4",
+        "hast-util-to-html": "^9.0.5"
+      }
+    },
+    "node_modules/shiki/node_modules/@shikijs/types": {
+      "version": "3.23.0",
+      "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-3.23.0.tgz",
+      "integrity": "sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@shikijs/vscode-textmate": "^10.0.2",
+        "@types/hast": "^3.0.4"
+      }
+    },
     "node_modules/signal-exit": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
@@ -12817,6 +14349,17 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/space-separated-tokens": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz",
+      "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/spdx-exceptions": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
@@ -12851,6 +14394,13 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
     "node_modules/srvx": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/srvx/-/srvx-0.10.1.tgz",
@@ -12943,6 +14493,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/stringify-entities": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz",
+      "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "character-entities-html4": "^2.0.0",
+        "character-entities-legacy": "^3.0.0"
+      },
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
@@ -12968,6 +14533,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-bom-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz",
+      "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/strip-final-newline": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
@@ -13146,6 +14721,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/tabbable": {
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.4.0.tgz",
+      "integrity": "sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tagged-tag": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz",
@@ -13309,6 +14891,13 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/tokenx": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/tokenx/-/tokenx-1.3.0.tgz",
+      "integrity": "sha512-NLdXTEZkKiO0gZuLtMoZKjCXTREXeZZt8nnnNeyoXtNZAfG/GKGSbQtLU5STspc0rMSwcA+UJfWZkbNU01iKmQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/tosource": {
       "version": "2.0.0-alpha.3",
       "resolved": "https://registry.npmjs.org/tosource/-/tosource-2.0.0-alpha.3.tgz",
@@ -13332,6 +14921,28 @@
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
       "license": "MIT"
     },
+    "node_modules/trim-lines": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz",
+      "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
+    "node_modules/trough": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/trough/-/trough-2.2.0.tgz",
+      "integrity": "sha512-tmMpK00BjZiUyVyvrBK7knerNgmgvcV/KLVyuma/SC+TQN167GrMRciANTz09+k3zW8L8t60jWO1GpfkZdjTaw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
+    },
     "node_modules/ts-api-utils": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz",
@@ -13397,6 +15008,13 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/uc.micro": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz",
+      "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/ufo": {
       "version": "1.6.3",
       "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.3.tgz",
@@ -13466,6 +15084,26 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/unified": {
+      "version": "11.0.5",
+      "resolved": "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz",
+      "integrity": "sha512-xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "bail": "^2.0.0",
+        "devlop": "^1.0.0",
+        "extend": "^3.0.0",
+        "is-plain-obj": "^4.0.0",
+        "trough": "^2.0.0",
+        "vfile": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/unimport": {
       "version": "5.6.0",
       "resolved": "https://registry.npmjs.org/unimport/-/unimport-5.6.0.tgz",
@@ -13519,6 +15157,95 @@
         "url": "https://github.com/sponsors/sxzz"
       }
     },
+    "node_modules/unist-util-is": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz",
+      "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-position": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz",
+      "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-remove": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-remove/-/unist-util-remove-4.0.0.tgz",
+      "integrity": "sha512-b4gokeGId57UVRX/eVKej5gXqGlc9+trkORhFJpu9raqZkZhU0zm8Doi05+HaiBsMEIJowL+2WtQ5ItjsngPXg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-stringify-position": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz",
+      "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.1.0.tgz",
+      "integrity": "sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0",
+        "unist-util-visit-parents": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/unist-util-visit-parents": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz",
+      "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-is": "^6.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/unplugin": {
       "version": "2.3.11",
       "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-2.3.11.tgz",
@@ -13861,6 +15588,36 @@
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
       "license": "MIT"
     },
+    "node_modules/vfile": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz",
+      "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "vfile-message": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
+    "node_modules/vfile-message": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz",
+      "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/unist": "^3.0.0",
+        "unist-util-stringify-position": "^4.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/unified"
+      }
+    },
     "node_modules/vite": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz",
@@ -14222,6 +15979,189 @@
         "vuetify": ">=3"
       }
     },
+    "node_modules/vitepress": {
+      "version": "2.0.0-alpha.17",
+      "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-2.0.0-alpha.17.tgz",
+      "integrity": "sha512-Z3VPUpwk/bHYqt1uMVOOK1/4xFiWQov1GNc2FvMdz6kvje4JRXEOngVI9C+bi5jeedMSHiA4dwKkff1NCvbZ9Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@docsearch/css": "^4.5.3",
+        "@docsearch/js": "^4.5.3",
+        "@docsearch/sidepanel-js": "^4.5.3",
+        "@iconify-json/simple-icons": "^1.2.69",
+        "@shikijs/core": "^3.22.0",
+        "@shikijs/transformers": "^3.22.0",
+        "@shikijs/types": "^3.22.0",
+        "@types/markdown-it": "^14.1.2",
+        "@vitejs/plugin-vue": "^6.0.4",
+        "@vue/devtools-api": "^8.0.5",
+        "@vue/shared": "^3.5.27",
+        "@vueuse/core": "^14.2.0",
+        "@vueuse/integrations": "^14.2.0",
+        "focus-trap": "^8.0.0",
+        "mark.js": "8.11.1",
+        "minisearch": "^7.2.0",
+        "shiki": "^3.22.0",
+        "vite": "^7.3.1",
+        "vue": "^3.5.27"
+      },
+      "bin": {
+        "vitepress": "bin/vitepress.js"
+      },
+      "peerDependencies": {
+        "markdown-it-mathjax3": "^4",
+        "oxc-minify": "*",
+        "postcss": "^8"
+      },
+      "peerDependenciesMeta": {
+        "markdown-it-mathjax3": {
+          "optional": true
+        },
+        "oxc-minify": {
+          "optional": true
+        },
+        "postcss": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/vitepress-codeblock-collapse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/vitepress-codeblock-collapse/-/vitepress-codeblock-collapse-1.0.0.tgz",
+      "integrity": "sha512-nTWQWItWhzSFy+3q2bdcLDimN9L9CXpNJCyqSOV7LVdD1+2G7PYbm+q4DlnMgu4H1yVBlxpUHo7snqSXCl6XsA==",
+      "dev": true,
+      "license": "MIT",
+      "peerDependencies": {
+        "vue": "^3.3.0"
+      }
+    },
+    "node_modules/vitepress-plugin-llms": {
+      "version": "1.12.2",
+      "resolved": "https://registry.npmjs.org/vitepress-plugin-llms/-/vitepress-plugin-llms-1.12.2.tgz",
+      "integrity": "sha512-hdklo7di6E2/MwlYstH7R5QgdPHX+f5G/fp8QBq6MCiw4DWi3IOKMaous0S839FIGsPjK3QHwK6KcFwCf/XzjA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "gray-matter": "^4.0.3",
+        "markdown-it": "^14.1.0",
+        "markdown-title": "^1.0.2",
+        "mdast-util-from-markdown": "^2.0.3",
+        "millify": "^6.1.0",
+        "minimatch": "^10.2.5",
+        "path-to-regexp": "^6.3.0",
+        "picocolors": "^1.1.1",
+        "pretty-bytes": "^7.1.0",
+        "remark": "^15.0.1",
+        "remark-frontmatter": "^5.0.0",
+        "tokenx": "^1.3.0",
+        "unist-util-remove": "^4.0.0",
+        "unist-util-visit": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/okineadev"
+      }
+    },
+    "node_modules/vitepress-plugin-llms/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/vitepress-plugin-llms/node_modules/brace-expansion": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz",
+      "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "node_modules/vitepress-plugin-llms/node_modules/minimatch": {
+      "version": "10.2.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
+      "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.5"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/vitepress/node_modules/@types/web-bluetooth": {
+      "version": "0.0.21",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz",
+      "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/vitepress/node_modules/@vue/devtools-api": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.1.1.tgz",
+      "integrity": "sha512-bsDMJ07b3GN1puVwJb/fyFnj/U2imyswK5UQVLZwVl7O05jDrt6BHxeG5XffmOOdasOj/bOmIjxJvGPxU7pcqw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^8.1.1"
+      }
+    },
+    "node_modules/vitepress/node_modules/@vueuse/core": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-14.3.0.tgz",
+      "integrity": "sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.21",
+        "@vueuse/metadata": "14.3.0",
+        "@vueuse/shared": "14.3.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
+    "node_modules/vitepress/node_modules/@vueuse/metadata": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-14.3.0.tgz",
+      "integrity": "sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/vitepress/node_modules/@vueuse/shared": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-14.3.0.tgz",
+      "integrity": "sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "vue": "^3.5.0"
+      }
+    },
     "node_modules/vscode-uri": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.1.0.tgz",
@@ -14674,6 +16614,17 @@
       "engines": {
         "node": ">= 14"
       }
+    },
+    "node_modules/zwitch": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz",
+      "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==",
+      "dev": true,
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/wooorm"
+      }
     }
   }
 }
diff --git a/landing/package.json b/landing/package.json
index e33aa4f3..0a12a7f0 100644
--- a/landing/package.json
+++ b/landing/package.json
@@ -6,7 +6,12 @@
     "dev": "nuxt dev",
     "build": "nuxt build",
     "generate": "nuxt generate",
+    "generate:docs": "vitepress build product-docs --outDir .output/public/docs",
+    "generate:all": "nuxt generate && vitepress build product-docs --outDir .output/public/docs",
     "preview": "nuxt preview",
+    "docs:dev": "vitepress dev product-docs",
+    "docs:build": "vitepress build product-docs",
+    "docs:preview": "vitepress preview product-docs",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "format": "prettier . --check",
@@ -29,9 +34,14 @@
   "devDependencies": {
     "@mdi/font": "^7.4.47",
     "@nuxt/eslint": "^1.12.1",
+    "@shikijs/transformers": "3.22.0",
     "eslint": "^9.39.2",
+    "medium-zoom": "^1.1.0",
     "prettier": "^3.8.0",
     "sass": "^1.97.2",
-    "vite-plugin-vuetify": "^2.1.3"
+    "vite-plugin-vuetify": "^2.1.3",
+    "vitepress": "2.0.0-alpha.17",
+    "vitepress-codeblock-collapse": "^1.0.0",
+    "vitepress-plugin-llms": "^1.12.2"
   }
 }
diff --git a/landing/plugins/vuetify.ts b/landing/plugins/vuetify.ts
index 2fbde537..e5b712a9 100644
--- a/landing/plugins/vuetify.ts
+++ b/landing/plugins/vuetify.ts
@@ -2,6 +2,15 @@ import "vuetify/styles";
 import { createVuetify } from "vuetify";
 import { aliases, mdi } from "vuetify/iconsets/mdi-svg";
 
+const brand = {
+  cyan: "#00f0ff",
+  magenta: "#ff00ff",
+  lightBackground: "#f0f2f5",
+  lightSurface: "#ffffff",
+  darkBackground: "#0a0a0f",
+  darkSurface: "#12121a"
+};
+
 export default defineNuxtPlugin({
   name: "vuetify",
   setup(nuxtApp) {
@@ -16,18 +25,18 @@ export default defineNuxtPlugin({
         themes: {
           light: {
             colors: {
-              primary: "#00f0ff",
-              secondary: "#ff00ff",
-              background: "#f0f2f5",
-              surface: "#ffffff"
+              primary: brand.cyan,
+              secondary: brand.magenta,
+              background: brand.lightBackground,
+              surface: brand.lightSurface
             }
           },
           dark: {
             colors: {
-              primary: "#00f0ff",
-              secondary: "#ff00ff",
-              background: "#0a0a0f",
-              surface: "#12121a"
+              primary: brand.cyan,
+              secondary: brand.magenta,
+              background: brand.darkBackground,
+              surface: brand.darkSurface
             }
           }
         }
diff --git a/landing/product-docs/.vitepress/config.ts b/landing/product-docs/.vitepress/config.ts
new file mode 100644
index 00000000..e1c00dbf
--- /dev/null
+++ b/landing/product-docs/.vitepress/config.ts
@@ -0,0 +1,212 @@
+import {
+  transformerNotationDiff,
+  transformerNotationErrorLevel,
+  transformerNotationFocus,
+  transformerNotationHighlight
+} from "@shikijs/transformers";
+import { fileURLToPath } from "node:url";
+import { defineConfig, type DefaultTheme } from "vitepress";
+import llmstxt, { copyOrDownloadAsMarkdownButtons } from "vitepress-plugin-llms";
+
+const REPO = "777genius/claude_agent_teams_ui";
+const SITE_TITLE = "Agent Teams Docs";
+const SITE_DESCRIPTION = "Documentation for Agent Teams, a local desktop app for AI agent orchestration.";
+
+const trimTrailingSlash = (value: string) => value.replace(/\/+$/, "");
+const normalizeBase = (value: string) => {
+  const trimmed = value.trim();
+  if (!trimmed || trimmed === "/") return "/";
+  return `/${trimmed.replace(/^\/+|\/+$/g, "")}/`;
+};
+const withTrailingSlash = (value: string) => `${trimTrailingSlash(value)}/`;
+
+const appBase = normalizeBase(process.env.NUXT_APP_BASE_URL || "/");
+const base = appBase === "/" ? "/docs/" : `${appBase}docs/`;
+const siteUrl = trimTrailingSlash(
+  process.env.NUXT_PUBLIC_SITE_URL || "https://777genius.github.io/claude_agent_teams_ui"
+);
+const publicBaseUrl =
+  appBase === "/" || siteUrl.endsWith(trimTrailingSlash(appBase))
+    ? withTrailingSlash(siteUrl)
+    : `${withTrailingSlash(siteUrl)}${appBase.replace(/^\/+/, "")}`;
+const docsUrl = `${publicBaseUrl}docs/`;
+const downloadUrl = `${publicBaseUrl}download/`;
+const ruDownloadUrl = `${publicBaseUrl}ru/download/`;
+const landingPublicDir = fileURLToPath(new URL("../../public", import.meta.url));
+
+const rootGuide: DefaultTheme.SidebarItem[] = [
+  {
+    text: "Start",
+    items: [
+      { text: "Quickstart", link: "/guide/quickstart" },
+      { text: "Installation", link: "/guide/installation" },
+      { text: "Create a team", link: "/guide/create-team" }
+    ]
+  },
+  {
+    text: "Workflows",
+    items: [
+      { text: "Runtime setup", link: "/guide/runtime-setup" },
+      { text: "Agent workflow", link: "/guide/agent-workflow" },
+      { text: "Code review", link: "/guide/code-review" },
+      { text: "Troubleshooting", link: "/guide/troubleshooting" }
+    ]
+  },
+  {
+    text: "Reference",
+    items: [
+      { text: "Concepts", link: "/reference/concepts" },
+      { text: "Providers and runtimes", link: "/reference/providers-runtimes" },
+      { text: "Privacy and local data", link: "/reference/privacy-local-data" },
+      { text: "FAQ", link: "/reference/faq" }
+    ]
+  }
+];
+
+const ruGuide: DefaultTheme.SidebarItem[] = [
+  {
+    text: "Старт",
+    items: [
+      { text: "Быстрый старт", link: "/ru/guide/quickstart" },
+      { text: "Установка", link: "/ru/guide/installation" },
+      { text: "Создание команды", link: "/ru/guide/create-team" }
+    ]
+  },
+  {
+    text: "Рабочие процессы",
+    items: [
+      { text: "Настройка рантайма", link: "/ru/guide/runtime-setup" },
+      { text: "Работа агентов", link: "/ru/guide/agent-workflow" },
+      { text: "Код-ревью", link: "/ru/guide/code-review" },
+      { text: "Диагностика", link: "/ru/guide/troubleshooting" }
+    ]
+  },
+  {
+    text: "Справочник",
+    items: [
+      { text: "Концепции", link: "/ru/reference/concepts" },
+      { text: "Провайдеры и рантаймы", link: "/ru/reference/providers-runtimes" },
+      { text: "Приватность и локальные данные", link: "/ru/reference/privacy-local-data" },
+      { text: "FAQ", link: "/ru/reference/faq" }
+    ]
+  }
+];
+
+const rootNav: DefaultTheme.NavItem[] = [
+  { text: "Guide", link: "/guide/quickstart" },
+  { text: "Reference", link: "/reference/concepts" },
+  { text: "Troubleshooting", link: "/guide/troubleshooting" },
+  { text: "Download", link: downloadUrl, target: "_self" }
+];
+
+const ruNav: DefaultTheme.NavItem[] = [
+  { text: "Руководство", link: "/ru/guide/quickstart" },
+  { text: "Справочник", link: "/ru/reference/concepts" },
+  { text: "Диагностика", link: "/ru/guide/troubleshooting" },
+  { text: "Скачать", link: ruDownloadUrl, target: "_self" }
+];
+
+export default defineConfig({
+  lang: "en-US",
+  title: SITE_TITLE,
+  description: SITE_DESCRIPTION,
+  base,
+  cleanUrls: true,
+  lastUpdated: true,
+  sitemap: {
+    hostname: docsUrl
+  },
+  head: [
+    ["link", { rel: "icon", type: "image/png", href: `${base}logo-192.png` }],
+    ["meta", { name: "theme-color", content: "#00f0ff" }],
+    ["meta", { property: "og:type", content: "website" }],
+    ["meta", { property: "og:title", content: SITE_TITLE }],
+    ["meta", { property: "og:description", content: SITE_DESCRIPTION }],
+    ["meta", { property: "og:url", content: docsUrl }],
+    ["meta", { property: "og:image", content: `${publicBaseUrl}og-image.png` }],
+    ["meta", { name: "twitter:card", content: "summary_large_image" }]
+  ],
+  vite: {
+    publicDir: landingPublicDir,
+    plugins: [llmstxt()],
+    optimizeDeps: {
+      include: ["medium-zoom", "vitepress-codeblock-collapse"]
+    }
+  },
+  markdown: {
+    codeTransformers: [
+      transformerNotationDiff(),
+      transformerNotationFocus(),
+      transformerNotationHighlight(),
+      transformerNotationErrorLevel()
+    ],
+    config(md) {
+      md.use(copyOrDownloadAsMarkdownButtons);
+    }
+  },
+  themeConfig: {
+    logo: "/logo-192.png",
+    siteTitle: "Agent Teams",
+    outline: {
+      level: [2, 3],
+      label: "On this page"
+    },
+    search: {
+      provider: "local"
+    },
+    nav: rootNav,
+    sidebar: {
+      "/ru/": ruGuide,
+      "/": rootGuide
+    },
+    socialLinks: [{ icon: "github", link: `https://github.com/${REPO}` }],
+    editLink: {
+      pattern: `https://github.com/${REPO}/edit/main/landing/product-docs/:path`,
+      text: "Edit this page on GitHub"
+    },
+    footer: {
+      message: "Free and open source.",
+      copyright: "Copyright © 777genius"
+    }
+  },
+  locales: {
+    root: {
+      label: "English",
+      lang: "en-US",
+      themeConfig: {
+        nav: rootNav,
+        sidebar: rootGuide,
+        docFooter: {
+          prev: "Previous",
+          next: "Next"
+        }
+      }
+    },
+    ru: {
+      label: "Русский",
+      lang: "ru-RU",
+      title: "Документация Agent Teams",
+      description: "Документация Agent Teams, локального desktop-приложения для оркестрации AI-агентов.",
+      themeConfig: {
+        nav: ruNav,
+        sidebar: ruGuide,
+        outline: {
+          level: [2, 3],
+          label: "На этой странице"
+        },
+        editLink: {
+          pattern: `https://github.com/${REPO}/edit/main/landing/product-docs/:path`,
+          text: "Редактировать на GitHub"
+        },
+        docFooter: {
+          prev: "Назад",
+          next: "Дальше"
+        },
+        footer: {
+          message: "Бесплатно и с открытым кодом.",
+          copyright: "Copyright © 777genius"
+        }
+      }
+    }
+  }
+});
diff --git a/landing/product-docs/.vitepress/theme/DocsCardGrid.vue b/landing/product-docs/.vitepress/theme/DocsCardGrid.vue
new file mode 100644
index 00000000..8ca77e3c
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/DocsCardGrid.vue
@@ -0,0 +1,117 @@
+<script setup lang="ts">
+import { useData, withBase } from "vitepress";
+import { computed } from "vue";
+
+const props = withDefaults(defineProps<{ type?: "start" | "reference" }>(), {
+  type: "start"
+});
+
+const { page } = useData();
+const isRu = computed(() => page.value.relativePath.startsWith("ru/"));
+
+const cards = computed(() => {
+  if (isRu.value) {
+    return props.type === "reference"
+      ? [
+          { icon: "◈", title: "Концепции", desc: "Команды, задачи, роли и уровни автономности.", link: "/ru/reference/concepts" },
+          { icon: "⌁", title: "Рантаймы", desc: "Claude, Codex, OpenCode и multimodel-режим.", link: "/ru/reference/providers-runtimes" },
+          { icon: "⌘", title: "Локальные данные", desc: "Что хранится на машине и что уходит провайдерам.", link: "/ru/reference/privacy-local-data" },
+          { icon: "?", title: "FAQ", desc: "Короткие ответы на частые вопросы.", link: "/ru/reference/faq" }
+        ]
+      : [
+          { icon: "01", title: "Быстрый старт", desc: "Поставить приложение и создать первую команду.", link: "/ru/guide/quickstart" },
+          { icon: "02", title: "Установка", desc: "Платформы, релизы и запуск из исходников.", link: "/ru/guide/installation" },
+          { icon: "03", title: "Создание команды", desc: "Роли, lead prompt и границы работы.", link: "/ru/guide/create-team" },
+          { icon: "04", title: "Код-ревью", desc: "Проверка изменений по задачам и hunk-level decisions.", link: "/ru/guide/code-review" }
+        ];
+  }
+
+  return props.type === "reference"
+    ? [
+        { icon: "◈", title: "Concepts", desc: "Teams, tasks, roles, and autonomy levels.", link: "/reference/concepts" },
+        { icon: "⌁", title: "Runtimes", desc: "Claude, Codex, OpenCode, and multimodel mode.", link: "/reference/providers-runtimes" },
+        { icon: "⌘", title: "Local data", desc: "What stays on disk and what providers receive.", link: "/reference/privacy-local-data" },
+        { icon: "?", title: "FAQ", desc: "Short answers to common questions.", link: "/reference/faq" }
+      ]
+    : [
+        { icon: "01", title: "Quickstart", desc: "Install the app and create your first team.", link: "/guide/quickstart" },
+        { icon: "02", title: "Installation", desc: "Platforms, releases, and running from source.", link: "/guide/installation" },
+        { icon: "03", title: "Create a team", desc: "Roles, lead prompt, and task boundaries.", link: "/guide/create-team" },
+        { icon: "04", title: "Code review", desc: "Review task changes with hunk-level decisions.", link: "/guide/code-review" }
+      ];
+});
+</script>
+
+<template>
+  <div class="docs-card-grid">
+    <a v-for="card in cards" :key="card.link" class="docs-card" :href="withBase(card.link)">
+      <span class="docs-card__icon">{{ card.icon }}</span>
+      <strong>{{ card.title }}</strong>
+      <span>{{ card.desc }}</span>
+    </a>
+  </div>
+</template>
+
+<style scoped>
+.docs-card-grid {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 14px;
+  margin: 24px 0;
+}
+
+.docs-card {
+  display: grid;
+  grid-template-columns: auto 1fr;
+  grid-template-rows: auto auto;
+  column-gap: 12px;
+  row-gap: 4px;
+  padding: 18px;
+  border: var(--at-glass-border);
+  border-radius: var(--at-radius-xl);
+  background: var(--at-c-surface-soft);
+  color: var(--at-c-text);
+  text-decoration: none !important;
+  transition:
+    border-color var(--at-transition-base),
+    background-color var(--at-transition-base),
+    transform var(--at-transition-base);
+}
+
+.docs-card:hover {
+  border-color: var(--at-c-border-strong);
+  background: var(--at-glass-bg-hover);
+  transform: translateY(-2px);
+}
+
+.docs-card__icon {
+  grid-row: 1 / -1;
+  display: grid;
+  place-items: center;
+  width: 36px;
+  height: 36px;
+  border-radius: var(--at-radius-md);
+  background: var(--at-gradient-panel);
+  color: var(--at-c-cyan);
+  font-family: var(--at-font-mono);
+  font-size: 13px;
+  border: 1px solid rgba(0, 240, 255, 0.14);
+}
+
+.docs-card strong {
+  color: var(--at-c-text);
+  font-size: 15px;
+}
+
+.docs-card span:last-child {
+  color: var(--at-c-text-muted);
+  font-size: 13px;
+  line-height: 1.45;
+}
+
+@media (max-width: 640px) {
+  .docs-card-grid {
+    grid-template-columns: 1fr;
+  }
+}
+</style>
diff --git a/landing/product-docs/.vitepress/theme/DocsHeroVisual.vue b/landing/product-docs/.vitepress/theme/DocsHeroVisual.vue
new file mode 100644
index 00000000..56dd7377
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/DocsHeroVisual.vue
@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { withBase } from "vitepress";
+
+const workflowVideoSrc = "https://github.com/user-attachments/assets/35e27989-726d-4059-8662-bae610e46b42";
+</script>
+
+<template>
+  <div class="docs-hero-visual">
+    <video
+      class="docs-hero-visual__video no-zoom"
+      autoplay
+      muted
+      loop
+      playsinline
+      preload="metadata"
+      :poster="withBase('/screenshots/1.jpg')"
+    >
+      <source :src="workflowVideoSrc" type="video/mp4">
+    </video>
+    <div class="docs-hero-visual__wash" />
+    <div class="docs-hero-visual__edge" />
+  </div>
+</template>
+
+<style scoped>
+.docs-hero-visual {
+  position: absolute;
+  inset: -130px -120px -110px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.docs-hero-visual__video {
+  position: absolute;
+  inset: 0;
+  display: block;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  filter: blur(1px) saturate(1.22) contrast(1.08);
+  opacity: 0.95;
+  mix-blend-mode: multiply;
+  transform: scale(1.04);
+}
+
+.docs-hero-visual__wash {
+  position: absolute;
+  inset: 0;
+  background:
+    linear-gradient(90deg, var(--vp-c-bg) 0%, color-mix(in srgb, var(--vp-c-bg) 82%, transparent) 34%, color-mix(in srgb, var(--vp-c-bg) 8%, transparent) 64%, color-mix(in srgb, var(--vp-c-bg) 26%, transparent) 100%),
+    linear-gradient(180deg, color-mix(in srgb, var(--vp-c-bg) 32%, transparent) 0%, color-mix(in srgb, var(--vp-c-bg) 44%, transparent) 58%, var(--vp-c-bg) 96%);
+}
+
+.docs-hero-visual__edge {
+  position: absolute;
+  inset: auto 0 0;
+  height: 42%;
+  background: linear-gradient(180deg, transparent, var(--vp-c-bg));
+}
+
+.dark .docs-hero-visual__video {
+  opacity: 0.95;
+  filter: blur(1px) saturate(1.24) contrast(1.08);
+  mix-blend-mode: normal;
+}
+
+.dark .docs-hero-visual__wash {
+  background:
+    linear-gradient(90deg, var(--vp-c-bg) 0%, color-mix(in srgb, var(--vp-c-bg) 76%, transparent) 34%, color-mix(in srgb, var(--vp-c-bg) 8%, transparent) 64%, color-mix(in srgb, var(--vp-c-bg) 34%, transparent) 100%),
+    linear-gradient(180deg, color-mix(in srgb, var(--vp-c-bg) 28%, transparent) 0%, color-mix(in srgb, var(--vp-c-bg) 52%, transparent) 58%, var(--vp-c-bg) 96%);
+}
+
+@media (max-width: 768px) {
+  .docs-hero-visual {
+    inset: -90px -72px -80px;
+  }
+
+  .docs-hero-visual__video {
+    opacity: 0.95;
+    filter: blur(1px) saturate(1.2) contrast(1.06);
+  }
+}
+</style>
diff --git a/landing/product-docs/.vitepress/theme/DocsLayout.vue b/landing/product-docs/.vitepress/theme/DocsLayout.vue
new file mode 100644
index 00000000..ef740d1f
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/DocsLayout.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import mediumZoom, { type Zoom } from "medium-zoom";
+import { useData } from "vitepress";
+import DefaultTheme from "vitepress/theme";
+import { useCodeblockCollapse } from "vitepress-codeblock-collapse";
+import "vitepress-codeblock-collapse/style.css";
+import { computed, nextTick, onMounted, onUnmounted, provide, watch } from "vue";
+import DocsHeroVisual from "./DocsHeroVisual.vue";
+
+const { Layout } = DefaultTheme;
+const { isDark, page } = useData();
+
+const pagePath = computed(() => page.value.relativePath);
+useCodeblockCollapse(pagePath);
+
+let zoom: Zoom | null = null;
+
+type ViewTransitionHandle = {
+  ready: Promise<void>;
+};
+
+type ViewTransitionDocument = Document & {
+  startViewTransition?: (callback: () => Promise<void>) => ViewTransitionHandle;
+};
+
+const refreshImageZoom = async () => {
+  await nextTick();
+  zoom?.detach();
+  zoom = mediumZoom(".vp-doc img:not(.no-zoom), .docs-zoom-image", {
+    background: isDark.value ? "rgba(10, 10, 15, 0.94)" : "rgba(248, 250, 252, 0.94)",
+    margin: 24,
+    scrollOffset: 0
+  });
+};
+
+const enableTransitions = () =>
+  typeof document !== "undefined" &&
+  "startViewTransition" in document &&
+  window.matchMedia("(prefers-reduced-motion: no-preference)").matches;
+
+provide("toggle-appearance", async ({ clientX: x, clientY: y }: MouseEvent) => {
+  if (!enableTransitions()) {
+    isDark.value = !isDark.value;
+    return;
+  }
+
+  const radius = Math.hypot(Math.max(x, innerWidth - x), Math.max(y, innerHeight - y));
+  const clipPath = [`circle(0px at ${x}px ${y}px)`, `circle(${radius}px at ${x}px ${y}px)`];
+
+  const transitionDocument = document as ViewTransitionDocument;
+  const transition = transitionDocument.startViewTransition?.(async () => {
+    isDark.value = !isDark.value;
+    await nextTick();
+  });
+
+  if (!transition) return;
+
+  await transition.ready;
+
+  document.documentElement.animate(
+    { clipPath: isDark.value ? clipPath.reverse() : clipPath },
+    {
+      duration: 300,
+      easing: "ease-in",
+      pseudoElement: `::view-transition-${isDark.value ? "old" : "new"}(root)`
+    }
+  );
+});
+
+onMounted(() => {
+  void refreshImageZoom();
+});
+
+watch([pagePath, isDark], () => {
+  void refreshImageZoom();
+});
+
+onUnmounted(() => {
+  zoom?.detach();
+});
+</script>
+
+<template>
+  <Layout>
+    <template #home-hero-image>
+      <DocsHeroVisual />
+    </template>
+  </Layout>
+</template>
diff --git a/landing/product-docs/.vitepress/theme/InstallBlock.vue b/landing/product-docs/.vitepress/theme/InstallBlock.vue
new file mode 100644
index 00000000..e9854148
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/InstallBlock.vue
@@ -0,0 +1,76 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+
+const props = withDefaults(
+  defineProps<{
+    command?: string;
+    label?: string;
+    copiedLabel?: string;
+  }>(),
+  {
+    command: "git clone https://github.com/777genius/claude_agent_teams_ui.git",
+    label: "Click to copy",
+    copiedLabel: "Copied"
+  }
+);
+
+const copied = ref(false);
+const copyLabel = computed(() => (copied.value ? props.copiedLabel : props.label));
+
+async function copy() {
+  await navigator.clipboard.writeText(props.command);
+  copied.value = true;
+  window.setTimeout(() => {
+    copied.value = false;
+  }, 1800);
+}
+</script>
+
+<template>
+  <button class="install-block" type="button" @click="copy">
+    <code>$ {{ command }}</code>
+    <span>{{ copyLabel }}</span>
+  </button>
+</template>
+
+<style scoped>
+.install-block {
+  display: inline-flex;
+  align-items: center;
+  max-width: 100%;
+  gap: 12px;
+  margin: 12px 0 4px;
+  padding: 12px 16px;
+  border: var(--at-glass-border);
+  border-radius: var(--at-radius-lg);
+  background: var(--at-c-surface-soft);
+  color: var(--at-c-text);
+  cursor: pointer;
+  transition:
+    border-color var(--at-transition-base),
+    background-color var(--at-transition-base),
+    transform var(--at-transition-base);
+}
+
+.install-block:hover {
+  border-color: var(--at-c-border-strong);
+  background: var(--at-glass-bg-hover);
+  transform: translateY(-1px);
+}
+
+.install-block code {
+  overflow: hidden;
+  color: var(--at-c-text);
+  font-family: var(--at-font-mono);
+  font-size: 13px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.install-block span {
+  flex-shrink: 0;
+  color: var(--at-c-cyan);
+  font-family: var(--at-font-mono);
+  font-size: 12px;
+}
+</style>
diff --git a/landing/product-docs/.vitepress/theme/ZoomImage.vue b/landing/product-docs/.vitepress/theme/ZoomImage.vue
new file mode 100644
index 00000000..93a4d8f0
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/ZoomImage.vue
@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { withBase } from "vitepress";
+
+defineProps<{
+  src: string;
+  alt: string;
+  caption?: string;
+}>();
+</script>
+
+<template>
+  <figure class="zoom-image">
+    <img class="docs-zoom-image" :src="withBase(src)" :alt="alt" loading="lazy" decoding="async">
+    <figcaption v-if="caption">{{ caption }}</figcaption>
+  </figure>
+</template>
+
+<style scoped>
+.zoom-image {
+  margin: 24px 0;
+}
+
+.zoom-image img {
+  display: block;
+  width: 100%;
+  border: var(--at-glass-border);
+  border-radius: var(--at-radius-xl);
+  background: var(--at-c-dark-1);
+  box-shadow: var(--at-shadow-card);
+  cursor: zoom-in;
+}
+
+.zoom-image figcaption {
+  margin-top: 8px;
+  color: var(--at-c-text-muted);
+  font-size: 13px;
+  text-align: center;
+}
+</style>
diff --git a/landing/product-docs/.vitepress/theme/custom.css b/landing/product-docs/.vitepress/theme/custom.css
new file mode 100644
index 00000000..3bfc5526
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/custom.css
@@ -0,0 +1,400 @@
+:root {
+  --vp-font-family-base: var(--at-font-sans);
+  --vp-font-family-mono: var(--at-font-mono);
+  --vp-c-brand-1: var(--at-c-cyan);
+  --vp-c-brand-2: var(--at-c-cyan-strong);
+  --vp-c-brand-3: var(--at-c-cyan-deep);
+  --vp-c-brand-soft: rgba(0, 240, 255, 0.12);
+  --vp-c-bg: var(--at-c-light-2);
+  --vp-c-bg-alt: var(--at-c-light-1);
+  --vp-c-bg-elv: var(--at-c-light-0);
+  --vp-c-bg-soft: rgba(255, 255, 255, 0.74);
+  --vp-c-text-1: var(--at-c-text-light-1);
+  --vp-c-text-2: var(--at-c-text-light-2);
+  --vp-c-text-3: var(--at-c-text-light-3);
+  --vp-c-divider: rgba(0, 0, 0, 0.08);
+  --vp-c-border: rgba(0, 0, 0, 0.08);
+  --vp-nav-bg-color: rgba(255, 255, 255, 0.82);
+  --vp-home-hero-name-color: transparent;
+  --vp-home-hero-name-background: linear-gradient(135deg, #111827 0%, #047f94 54%, #7c2d8f 100%);
+  --vp-button-brand-bg: var(--at-c-cyan);
+  --vp-button-brand-text: var(--at-c-dark-1);
+  --vp-button-brand-hover-bg: var(--at-c-green);
+  --vp-button-alt-bg: rgba(255, 255, 255, 0.72);
+  --vp-button-alt-hover-bg: rgba(255, 255, 255, 0.92);
+  --vp-code-bg: rgba(8, 145, 178, 0.08);
+  --vp-code-color: var(--at-c-cyan-deep);
+  --vp-code-block-bg: #0a0a0f;
+}
+
+.dark {
+  --vp-c-bg: var(--at-c-dark-1);
+  --vp-c-bg-alt: var(--at-c-dark-2);
+  --vp-c-bg-elv: rgba(18, 18, 26, 0.96);
+  --vp-c-bg-soft: rgba(10, 10, 15, 0.72);
+  --vp-c-text-1: var(--at-c-text-dark-1);
+  --vp-c-text-2: var(--at-c-text-dark-2);
+  --vp-c-text-3: var(--at-c-text-dark-muted);
+  --vp-c-divider: rgba(0, 240, 255, 0.1);
+  --vp-c-border: rgba(0, 240, 255, 0.12);
+  --vp-nav-bg-color: rgba(10, 10, 15, 0.82);
+  --vp-home-hero-name-background: var(--at-gradient-brand-text);
+  --vp-button-alt-bg: rgba(0, 240, 255, 0.08);
+  --vp-button-alt-hover-bg: rgba(0, 240, 255, 0.14);
+  --vp-code-bg: rgba(0, 240, 255, 0.1);
+  --vp-code-color: var(--at-c-cyan);
+}
+
+html {
+  background: var(--vp-c-bg);
+}
+
+body {
+  letter-spacing: 0;
+}
+
+.Layout {
+  position: relative;
+  isolation: isolate;
+}
+
+.Layout::before {
+  content: "";
+  position: fixed;
+  inset: 0;
+  z-index: -2;
+  pointer-events: none;
+  background:
+    linear-gradient(180deg, rgba(0, 240, 255, 0.08), transparent 320px),
+    linear-gradient(135deg, rgba(255, 0, 255, 0.055), transparent 42%),
+    var(--vp-c-bg);
+}
+
+.Layout::after {
+  content: "";
+  position: fixed;
+  inset: 0;
+  z-index: -1;
+  pointer-events: none;
+  background:
+    linear-gradient(180deg, transparent 0%, color-mix(in srgb, var(--vp-c-bg) 72%, transparent) 58%, var(--vp-c-bg) 100%);
+  opacity: 0.8;
+}
+
+.VPNavBar {
+  border-bottom: 1px solid var(--vp-c-divider) !important;
+  background: var(--vp-nav-bg-color) !important;
+  backdrop-filter: blur(var(--at-blur-md)) !important;
+  -webkit-backdrop-filter: blur(var(--at-blur-md)) !important;
+}
+
+.VPNavBarTitle .logo {
+  width: 34px;
+  height: 34px;
+  border-radius: var(--at-radius-sm);
+}
+
+.VPNavBarTitle .title {
+  font-family: var(--at-font-mono);
+  font-size: 14px;
+  letter-spacing: 0;
+}
+
+.VPHero .name.clip {
+  background: var(--vp-home-hero-name-background) !important;
+  -webkit-background-clip: text !important;
+  background-clip: text !important;
+  -webkit-text-fill-color: transparent !important;
+}
+
+.VPHero .text {
+  max-width: 760px;
+}
+
+.VPHero .tagline {
+  max-width: 680px;
+  color: var(--vp-c-text-2);
+}
+
+.VPHero .actions {
+  align-items: center;
+  gap: 12px;
+  margin-top: 28px;
+}
+
+.VPHero.has-image {
+  position: relative;
+  overflow: hidden;
+  min-height: 560px;
+  padding: 96px 24px 76px;
+}
+
+.VPHero.has-image .container {
+  position: relative;
+  z-index: 1;
+  display: block !important;
+  max-width: 1180px;
+  margin: 0 auto;
+}
+
+.VPHero.has-image .main {
+  position: relative;
+  z-index: 2;
+  max-width: 820px !important;
+  padding: 38px 0;
+}
+
+.VPHero.has-image .image {
+  position: absolute !important;
+  inset: 0 !important;
+  z-index: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  margin: 0 !important;
+  transform: none !important;
+  pointer-events: none;
+}
+
+.VPHero.has-image .image-container {
+  position: absolute !important;
+  inset: 0 !important;
+  width: 100% !important;
+  height: 100% !important;
+  transform: none !important;
+}
+
+.VPHero.has-image .image-bg {
+  display: none !important;
+}
+
+.VPButton {
+  border-radius: var(--at-radius-lg) !important;
+  display: inline-flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  min-width: 118px;
+  min-height: 42px;
+  padding: 0 18px !important;
+  font-family: var(--at-font-mono);
+  font-size: 13px !important;
+  font-weight: 700 !important;
+  line-height: 1 !important;
+  border: 1px solid transparent !important;
+  transition:
+    transform var(--at-transition-base),
+    border-color var(--at-transition-base),
+    box-shadow var(--at-transition-base),
+    background-color var(--at-transition-base) !important;
+}
+
+.VPButton:hover {
+  transform: translateY(-1px);
+}
+
+.VPButton.brand {
+  background: var(--at-gradient-brand) !important;
+  color: #061018 !important;
+  border-color: rgba(0, 240, 255, 0.38) !important;
+  box-shadow: var(--at-shadow-cyan-sm);
+}
+
+.VPButton.alt {
+  color: var(--vp-c-text-1) !important;
+  border-color: var(--vp-c-border) !important;
+  box-shadow: 0 12px 28px -22px rgba(15, 23, 42, 0.55);
+}
+
+.VPButton.brand:hover,
+.VPButton.alt:hover {
+  border-color: var(--at-c-border-strong) !important;
+}
+
+.VPFeature {
+  border: var(--at-glass-border) !important;
+  border-radius: var(--at-radius-xl) !important;
+  background: var(--vp-c-bg-soft) !important;
+  backdrop-filter: blur(var(--at-blur-sm));
+  transition:
+    transform var(--at-transition-base),
+    border-color var(--at-transition-base),
+    box-shadow var(--at-transition-base) !important;
+}
+
+.VPFeature:hover {
+  border-color: var(--at-c-border-strong) !important;
+  box-shadow: var(--at-shadow-cyan-md);
+  transform: translateY(-2px);
+}
+
+.VPFeature .box {
+  display: grid !important;
+  grid-template-columns: 42px 1fr !important;
+  grid-template-rows: auto auto !important;
+  column-gap: 12px !important;
+  align-items: center !important;
+}
+
+.VPFeature .box > .icon {
+  grid-row: 1 !important;
+  grid-column: 1 !important;
+  display: grid;
+  place-items: center;
+  width: 36px;
+  height: 36px;
+  margin-bottom: 0 !important;
+  border-radius: var(--at-radius-md);
+  background: var(--at-gradient-panel);
+  border: 1px solid rgba(0, 240, 255, 0.14);
+  font-family: var(--at-font-mono);
+  font-size: 16px;
+}
+
+.VPFeature .box > .title {
+  grid-row: 1 !important;
+  grid-column: 2 !important;
+}
+
+.VPFeature .box > .details {
+  grid-row: 2 !important;
+  grid-column: 1 / -1 !important;
+}
+
+.VPFeature .box > .link-text {
+  grid-row: 3 !important;
+  grid-column: 1 / -1 !important;
+  margin-top: 8px !important;
+}
+
+.VPFeature .box > .link-text .link-text-value {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.VPSidebar {
+  background: color-mix(in srgb, var(--vp-c-bg) 86%, transparent) !important;
+  backdrop-filter: blur(var(--at-blur-md));
+}
+
+.VPSidebarItem .item .text,
+.VPDocAsideOutline .outline-link {
+  letter-spacing: 0;
+}
+
+.vp-doc h1,
+.vp-doc h2,
+.vp-doc h3 {
+  letter-spacing: 0;
+}
+
+.vp-doc h1 {
+  color: var(--vp-c-text-1);
+  font-weight: 800;
+}
+
+.dark .vp-doc h1 {
+  background: var(--at-gradient-brand-text);
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+}
+
+.vp-doc p,
+.vp-doc li {
+  line-height: 1.75;
+}
+
+.vp-doc a {
+  text-underline-offset: 4px;
+}
+
+.VPNavBarMenuLink[target="_self"].vp-external-link-icon::after,
+.VPNavScreenMenuLink[target="_self"].vp-external-link-icon::after {
+  display: none;
+}
+
+.vp-doc table {
+  display: table;
+  width: 100%;
+  border: var(--at-glass-border);
+  border-radius: var(--at-radius-xl);
+  overflow: hidden;
+  background: var(--vp-c-bg-soft);
+}
+
+.vp-doc th {
+  font-family: var(--at-font-mono);
+  font-size: 12px;
+  color: var(--at-c-cyan);
+  background: rgba(0, 240, 255, 0.05);
+}
+
+.vp-doc :not(pre) > code {
+  border: 1px solid rgba(0, 240, 255, 0.1);
+  border-radius: var(--at-radius-xs);
+  font-size: 0.9em;
+}
+
+.vp-doc div[class*="language-"] {
+  border: 1px solid rgba(0, 240, 255, 0.12);
+  border-radius: var(--at-radius-xl);
+  box-shadow: var(--at-shadow-card);
+}
+
+.vp-doc .custom-block {
+  border-radius: var(--at-radius-xl);
+}
+
+.vp-doc .custom-block.tip {
+  border-color: rgba(57, 255, 20, 0.22);
+  background: rgba(57, 255, 20, 0.07);
+}
+
+.vp-doc .custom-block.warning {
+  border-color: rgba(255, 215, 0, 0.26);
+  background: rgba(255, 215, 0, 0.07);
+}
+
+.medium-zoom-overlay {
+  z-index: 10000;
+}
+
+.medium-zoom-image--opened {
+  z-index: 10001;
+  border-radius: var(--at-radius-lg);
+}
+
+::view-transition-old(root),
+::view-transition-new(root) {
+  animation: none;
+  mix-blend-mode: normal;
+}
+
+::view-transition-old(root),
+.dark::view-transition-new(root) {
+  z-index: 1;
+}
+
+::view-transition-new(root),
+.dark::view-transition-old(root) {
+  z-index: 9999;
+}
+
+@media (max-width: 768px) {
+  .VPHero.has-image {
+    min-height: 520px;
+    padding: 72px 20px 56px;
+  }
+
+  .VPHero.has-image .main {
+    padding: 24px 0;
+  }
+
+  .VPFeature .box {
+    grid-template-columns: 36px 1fr !important;
+  }
+
+  .VPHero .text {
+    font-size: 34px;
+  }
+}
diff --git a/landing/product-docs/.vitepress/theme/index.ts b/landing/product-docs/.vitepress/theme/index.ts
new file mode 100644
index 00000000..60bacd65
--- /dev/null
+++ b/landing/product-docs/.vitepress/theme/index.ts
@@ -0,0 +1,28 @@
+import type { Theme } from "vitepress";
+import DefaultTheme from "vitepress/theme";
+import CopyOrDownloadAsMarkdownButtons from "vitepress-plugin-llms/vitepress-components/CopyOrDownloadAsMarkdownButtons.vue";
+import DocsCardGrid from "./DocsCardGrid.vue";
+import DocsHeroVisual from "./DocsHeroVisual.vue";
+import InstallBlock from "./InstallBlock.vue";
+import Layout from "./DocsLayout.vue";
+import ZoomImage from "./ZoomImage.vue";
+import "../../../assets/styles/brand-tokens.css";
+import "./custom.css";
+
+export default {
+  extends: DefaultTheme,
+  Layout,
+  enhanceApp({ app }) {
+    app.component("CopyOrDownloadAsMarkdownButtons", CopyOrDownloadAsMarkdownButtons);
+    app.component("DocsCardGrid", DocsCardGrid);
+    app.component("DocsHeroVisual", DocsHeroVisual);
+    app.component("InstallBlock", InstallBlock);
+    app.component("ZoomImage", ZoomImage);
+
+    if (typeof window !== "undefined") {
+      window.addEventListener("vite:preloadError", () => {
+        window.location.reload();
+      });
+    }
+  }
+} satisfies Theme;
diff --git a/landing/product-docs/guide/agent-workflow.md b/landing/product-docs/guide/agent-workflow.md
new file mode 100644
index 00000000..0817b1f7
--- /dev/null
+++ b/landing/product-docs/guide/agent-workflow.md
@@ -0,0 +1,35 @@
+# Agent Workflow
+
+Agent Teams makes agent work visible as task state, messages, logs, and reviewable code changes.
+
+## Lifecycle
+
+| Stage | What happens |
+| --- | --- |
+| Provisioning | The app starts the team and confirms runtime readiness |
+| Planning | The lead creates tasks and may assign teammates |
+| In progress | Agents work in parallel and update task state |
+| Review | Changes are reviewed by agents or by you |
+| Done | Accepted work stays linked to its task history |
+
+## Kanban board
+
+The board is the primary operating surface. It lets you scan work, spot blocked tasks, open task detail, inspect logs, and review changes without reading raw session files.
+
+## Messages and comments
+
+Use direct messages when you need to redirect an agent. Use task comments when the note belongs to a specific piece of work. Comments preserve context for later review.
+
+## Task logs
+
+Task-specific logs isolate runtime output, actions, and messages for one assignment. Use them when you need to answer:
+
+- what did this agent run?
+- why did it change this file?
+- did it ask another teammate for help?
+- which task produced this diff?
+
+## Live processes
+
+The live process section shows URLs and running processes when agents start local servers or tools. Open URLs directly from the app to inspect results.
+
diff --git a/landing/product-docs/guide/code-review.md b/landing/product-docs/guide/code-review.md
new file mode 100644
index 00000000..8c1fb48e
--- /dev/null
+++ b/landing/product-docs/guide/code-review.md
@@ -0,0 +1,35 @@
+# Code Review
+
+Code review in Agent Teams is task-centered. You inspect what changed for a specific task instead of hunting through a large unstructured diff.
+
+## Review surface
+
+Use the review UI to:
+
+- inspect changed files
+- accept or reject individual hunks
+- leave comments
+- connect the diff back to the task and agent logs
+
+## Hunk-level decisions
+
+Accept small correct changes and reject isolated mistakes without throwing away the whole task. This is useful when an agent mostly solved the task but overreached in one file.
+
+## Agent review workflow
+
+Teams can review each other's work before you make the final call. This catches obvious regressions and keeps the board honest, but you should still review risky areas yourself.
+
+## What to check manually
+
+Prioritize:
+
+- provider auth and runtime detection
+- IPC, preload, and filesystem boundaries
+- Git and worktree behavior
+- parsing and task lifecycle logic
+- persistence and code review flows
+
+## Verification
+
+Prefer focused verification commands. Broad formatting or lint-fix commands should not be used unless the task explicitly intends broad formatting churn.
+
diff --git a/landing/product-docs/guide/create-team.md b/landing/product-docs/guide/create-team.md
new file mode 100644
index 00000000..85ffe963
--- /dev/null
+++ b/landing/product-docs/guide/create-team.md
@@ -0,0 +1,51 @@
+# Create a Team
+
+A team is a named group of agents with roles, a lead, a target project, and a coordination prompt.
+
+## Recommended first team
+
+Start with a small team:
+
+| Role | Purpose |
+| --- | --- |
+| Lead | Splits work, creates tasks, coordinates teammates |
+| Builder | Implements scoped tasks |
+| Reviewer | Reviews output, catches regressions, asks for fixes |
+
+This shape gives you enough coordination to see the product value without making the first launch noisy.
+
+## Write a good team brief
+
+The team brief should include:
+
+- the outcome you want
+- the files or feature areas that matter
+- risk boundaries, such as "do not refactor unrelated modules"
+- review expectations
+- verification commands when you know them
+
+Example:
+
+```text
+Build a focused improvement to the download flow. Keep changes inside the landing app unless a shared helper is clearly needed. Create tasks before implementation, review each task diff, and run landing lint/build checks.
+```
+
+## Choose autonomy
+
+Agent Teams supports different levels of control. Use more autonomy for routine changes and tighter review for risky areas like provider auth, IPC, persistence, Git workflows, and release tooling.
+
+## Add context
+
+Attach files, screenshots, or specific notes when they materially change the task. Agents can use task descriptions, comments, and attachments as durable context.
+
+## Watch for task quality
+
+Good teams create tasks that are:
+
+- specific enough to review
+- small enough to finish
+- linked to visible output
+- backed by a verification path
+
+If the lead creates vague tasks, send a direct message asking for smaller, testable tasks.
+
diff --git a/landing/product-docs/guide/installation.md b/landing/product-docs/guide/installation.md
new file mode 100644
index 00000000..301f5ad9
--- /dev/null
+++ b/landing/product-docs/guide/installation.md
@@ -0,0 +1,45 @@
+# Installation
+
+Agent Teams is distributed as a desktop app for macOS, Windows, and Linux.
+
+## Download builds
+
+Use the latest GitHub release when you want the packaged app:
+
+- macOS Apple Silicon: `.dmg`
+- macOS Intel: `.dmg`
+- Windows: `.exe`
+- Linux: `.AppImage`, `.deb`, `.rpm`, or `.pacman`
+
+::: warning Windows SmartScreen
+Unsigned or newly published open-source apps can trigger SmartScreen. If you trust the release source, choose **More info** and then **Run anyway**.
+:::
+
+## Requirements
+
+The packaged app is designed for zero-setup onboarding. It can guide runtime detection and provider authentication from the UI.
+
+For source development, use:
+
+| Tool | Version |
+| --- | --- |
+| Node.js | 20+ |
+| pnpm | 10+ |
+
+## Run from source
+
+<InstallBlock command="git clone https://github.com/777genius/claude_agent_teams_ui.git && cd claude_agent_teams_ui && pnpm install && pnpm dev" />
+
+```bash
+git clone https://github.com/777genius/claude_agent_teams_ui.git
+cd claude_agent_teams_ui
+pnpm install
+pnpm dev
+```
+
+If you want the freshest local version, use the repository branch that currently carries active development.
+
+## Updating
+
+Use the latest release for packaged builds. If you run from source, pull the branch you use and rerun install when dependencies change.
+
diff --git a/landing/product-docs/guide/quickstart.md b/landing/product-docs/guide/quickstart.md
new file mode 100644
index 00000000..119ade51
--- /dev/null
+++ b/landing/product-docs/guide/quickstart.md
@@ -0,0 +1,50 @@
+# Quickstart
+
+This guide gets you from a fresh install to a running team.
+
+## 1. Install Agent Teams
+
+Download the latest release for your platform from the landing page or GitHub releases.
+
+::: tip
+The app is free and open source. The agent runtime you choose may still require provider access, such as Claude, Codex, OpenCode, or API-key based providers.
+:::
+
+## 2. Open or create a project
+
+Launch the app and select the project directory you want agents to work in. Agent Teams reads local project files and runtime/session state so the UI can show tasks, logs, diffs, and teammate activity.
+
+## 3. Choose a runtime path
+
+Use the setup flow to detect available runtimes. A common first setup is:
+
+| Runtime | Good for |
+| --- | --- |
+| Claude | Claude Code users and existing Anthropic access |
+| Codex | Codex-native workflows and OpenAI access |
+| OpenCode | Multimodel teams and many provider backends |
+
+## 4. Create your first team
+
+Create a team with a lead and one or more specialists. Keep the first team small: one lead, one implementation agent, and one review-oriented agent is enough to validate the workflow.
+
+## 5. Give the lead a concrete goal
+
+Write the goal like you would brief an engineering lead:
+
+```text
+Improve the onboarding flow. Split the work into tasks, keep changes small, and ask for review before broad refactors.
+```
+
+The lead should create tasks, assign work, and coordinate teammates. You can watch progress on the kanban board and intervene with comments or direct messages.
+
+## 6. Review results
+
+Open completed or review-ready tasks, inspect the diff, and accept, reject, or comment on individual changes. Use task logs when you need to understand why an agent made a choice.
+
+## Next steps
+
+- [Create a team](/guide/create-team)
+- [Runtime setup](/guide/runtime-setup)
+- [Code review](/guide/code-review)
+
diff --git a/landing/product-docs/guide/runtime-setup.md b/landing/product-docs/guide/runtime-setup.md
new file mode 100644
index 00000000..b89edd0c
--- /dev/null
+++ b/landing/product-docs/guide/runtime-setup.md
@@ -0,0 +1,33 @@
+# Runtime Setup
+
+Agent Teams is a coordination layer. The actual model work runs through supported local runtimes and providers.
+
+## Supported paths
+
+| Path | Use when |
+| --- | --- |
+| Claude | You already use Claude Code or Anthropic-backed workflows |
+| Codex | You want Codex-native runtime integration |
+| OpenCode | You want multimodel routing and broad provider coverage |
+
+The app detects supported runtimes and guides setup from the UI when possible.
+
+## Provider access
+
+Agent Teams has no paid tier of its own. You bring the provider access you already have: subscriptions, local runtime auth, or API keys depending on the path you choose.
+
+## Multimodel mode
+
+Multimodel mode can route work through many provider backends via OpenCode-compatible configuration. Use it when you need provider flexibility or want teammates to use different model lanes.
+
+## Operational advice
+
+- Keep the first runtime setup simple.
+- Confirm one team can launch before adding many providers.
+- Treat auth, provider model names, and runtime PATH issues as setup problems, not team-prompt problems.
+- If launch hangs, check the troubleshooting page before changing code.
+
+## When to switch runtime paths
+
+Switch when the current path is blocked by model availability, rate limits, provider capabilities, or team role needs. Keep the same project and team workflow, but validate one small task after switching.
+
diff --git a/landing/product-docs/guide/troubleshooting.md b/landing/product-docs/guide/troubleshooting.md
new file mode 100644
index 00000000..efbb372b
--- /dev/null
+++ b/landing/product-docs/guide/troubleshooting.md
@@ -0,0 +1,40 @@
+# Troubleshooting
+
+Most team issues fall into one of four buckets: runtime setup, launch confirmation, task parsing, or provider limits.
+
+## Team does not launch
+
+Check:
+
+- the selected runtime is installed or authenticated
+- the runtime is available in the environment PATH
+- the provider has access to the requested model
+- the project path exists and is readable
+
+If OpenCode shows `registered` but bootstrap is unconfirmed, inspect launch logs before changing team prompts.
+
+## Agent replies are missing
+
+Open task logs and teammate messages. Missing replies often come from runtime delivery, parsing, or task filtering issues. Do not assume the model ignored the message until logs confirm it.
+
+## Tasks are not linked to changes
+
+Use task-specific logs and code review links. If a diff appears detached, check whether the task id or task reference was included in the agent output.
+
+## Rate limits
+
+If a provider reports a known reset time, Agent Teams can nudge the lead to continue after cooldown. If reset time is unknown, wait or switch provider/runtime path.
+
+## When to collect evidence
+
+Collect:
+
+- task id
+- team name
+- runtime path
+- launch log excerpt
+- provider/model
+- exact time window
+
+This is enough to debug most launch and task lifecycle issues.
+
diff --git a/landing/product-docs/index.md b/landing/product-docs/index.md
new file mode 100644
index 00000000..e9de982b
--- /dev/null
+++ b/landing/product-docs/index.md
@@ -0,0 +1,67 @@
+---
+layout: home
+hero:
+  name: Agent Teams Docs
+  text: Run AI agent teams from a local desktop app
+  tagline: Create teams, watch work move across a kanban board, review code changes, and coordinate Claude, Codex, OpenCode, and multimodel workflows without giving up local control.
+  actions:
+    - theme: brand
+      text: Quickstart
+      link: /guide/quickstart
+    - theme: alt
+      text: Install
+      link: /guide/installation
+    - theme: alt
+      text: Concepts
+      link: /reference/concepts
+features:
+  - icon: "01"
+    title: Team-first workflow
+    details: Define roles, launch a lead, and let agents split, claim, and coordinate tasks.
+    link: /guide/create-team
+    linkText: Create a team
+  - icon: "02"
+    title: Live kanban board
+    details: Watch tasks move through todo, progress, review, blocked, and done as agents work.
+    link: /guide/agent-workflow
+    linkText: Understand workflow
+  - icon: "03"
+    title: Built-in code review
+    details: Inspect task-scoped diffs, accept or reject hunks, and comment where agents need direction.
+    link: /guide/code-review
+    linkText: Review changes
+  - icon: "04"
+    title: Runtime-aware setup
+    details: Use Claude, Codex, OpenCode, or multimodel providers through the access you already have.
+    link: /guide/runtime-setup
+    linkText: Configure runtimes
+  - icon: "05"
+    title: Local-first control
+    details: The desktop app reads local project and runtime state. Your code stays on your machine unless a selected provider receives prompt context.
+    link: /reference/privacy-local-data
+    linkText: Privacy model
+  - icon: "06"
+    title: Debuggable teams
+    details: Trace task logs, runtime output, teammate messages, and live processes when a launch or task gets stuck.
+    link: /guide/troubleshooting
+    linkText: Troubleshoot
+---
+
+<InstallBlock />
+
+## Start here
+
+Agent Teams is a free desktop app for orchestrating AI agent teams. You are not just sending isolated prompts to one agent: you create a team, assign roles, and watch agents coordinate work through a task board.
+
+<DocsCardGrid />
+
+## Reference
+
+Use the reference pages when you need exact terminology, provider behavior, or privacy boundaries.
+
+<DocsCardGrid type="reference" />
+
+## Product preview
+
+<ZoomImage src="/screenshots/1.jpg" alt="Agent Teams kanban board" caption="Task status, teammate activity, and review workflow stay visible in one workspace." />
+
diff --git a/landing/product-docs/reference/concepts.md b/landing/product-docs/reference/concepts.md
new file mode 100644
index 00000000..63477792
--- /dev/null
+++ b/landing/product-docs/reference/concepts.md
@@ -0,0 +1,32 @@
+# Concepts
+
+This page defines the core terms used across Agent Teams.
+
+## Team
+
+A team is a group of agents configured for a project. A team usually has a lead and one or more teammates with specialized roles.
+
+## Lead
+
+The lead coordinates work. It should break goals into tasks, assign teammates, track blockers, and ask for review when needed.
+
+## Task
+
+A task is the durable unit of work. It has status, description, comments, logs, attachments, and reviewable changes.
+
+## Solo mode
+
+Solo mode runs a one-member team. It is useful for quick work, lower token usage, and validating a prompt before expanding to a full team.
+
+## Cross-team communication
+
+Agents can message within and across teams. Use this when separate teams own related work and need to coordinate.
+
+## Autonomy level
+
+Autonomy controls how much agents can do before asking. Higher autonomy is faster; lower autonomy is safer for sensitive code paths.
+
+## Runtime
+
+A runtime is the local execution path that connects Agent Teams to a model/provider workflow, such as Claude, Codex, or OpenCode.
+
diff --git a/landing/product-docs/reference/faq.md b/landing/product-docs/reference/faq.md
new file mode 100644
index 00000000..c32c2722
--- /dev/null
+++ b/landing/product-docs/reference/faq.md
@@ -0,0 +1,29 @@
+# FAQ
+
+## Is Agent Teams free?
+
+Yes. The app is free and open source. Provider or runtime access may still cost money depending on what you use.
+
+## Do I need to install Claude or Codex first?
+
+Not always. The app guides runtime detection and setup from the UI. Some paths still require external runtime auth.
+
+## Does it upload my code to Agent Teams servers?
+
+No. Agent Teams is not a cloud code-sync service. Provider-backed model calls may receive prompt context depending on your selected runtime.
+
+## Can agents talk to each other?
+
+Yes. Agents can message teammates, comment on tasks, and coordinate across teams.
+
+## Can I review code before accepting it?
+
+Yes. The review flow is built around task-scoped diffs and hunk-level decisions.
+
+## What is solo mode?
+
+Solo mode is a one-agent team. It is useful for smaller tasks and lower coordination overhead.
+
+## What should I do when a launch hangs?
+
+Open troubleshooting, collect runtime logs, and verify provider auth before changing prompts.
diff --git a/landing/product-docs/reference/privacy-local-data.md b/landing/product-docs/reference/privacy-local-data.md
new file mode 100644
index 00000000..feacac2e
--- /dev/null
+++ b/landing/product-docs/reference/privacy-local-data.md
@@ -0,0 +1,30 @@
+# Privacy and Local Data
+
+Agent Teams is local-first, but the selected provider path still matters.
+
+## What stays local
+
+The desktop app runs on your machine and reads local project/runtime data to power the UI:
+
+- project files
+- task metadata
+- runtime/session logs
+- review state
+- local app settings
+
+## What can leave your machine
+
+When an agent asks a provider-backed model to work, prompt context and tool results may be sent through that provider/runtime path. This depends on the runtime and provider you choose.
+
+## Practical guidance
+
+- Do not attach secrets to tasks.
+- Review provider policies for sensitive projects.
+- Use lower autonomy for risky repositories.
+- Keep task scope narrow when working with private code.
+- Prefer local evidence and logs when debugging.
+
+## Open source model
+
+The app itself is open source and free. You can inspect how local orchestration, task tracking, and review flows work in the repository.
+
diff --git a/landing/product-docs/reference/providers-runtimes.md b/landing/product-docs/reference/providers-runtimes.md
new file mode 100644
index 00000000..5044ccda
--- /dev/null
+++ b/landing/product-docs/reference/providers-runtimes.md
@@ -0,0 +1,40 @@
+# Providers and Runtimes
+
+Agent Teams separates orchestration from model access.
+
+## What the app provides
+
+Agent Teams provides:
+
+- team and task orchestration
+- kanban board UI
+- teammate messaging
+- task logs
+- review UI
+- local project integration
+
+## What the runtime provides
+
+The runtime provides:
+
+- model execution
+- provider authentication
+- tool execution behavior
+- model-specific rate limits and capabilities
+
+## Common choices
+
+| Runtime | Notes |
+| --- | --- |
+| Claude | Good for Claude Code users and Anthropic access |
+| Codex | Good for Codex-native workflows and OpenAI access |
+| OpenCode | Good for multimodel routing and broad provider coverage |
+
+## Provider costs
+
+Agent Teams is free. Provider usage is governed by the runtime/provider you select.
+
+## Capability checks
+
+During setup, the app may perform access and capability checks. This helps detect missing runtime auth before a team launch fails halfway through provisioning.
+
diff --git a/landing/product-docs/ru/guide/agent-workflow.md b/landing/product-docs/ru/guide/agent-workflow.md
new file mode 100644
index 00000000..d16c60cf
--- /dev/null
+++ b/landing/product-docs/ru/guide/agent-workflow.md
@@ -0,0 +1,35 @@
+# Работа агентов
+
+Agent Teams делает работу агентов видимой через task state, messages, logs и reviewable code changes.
+
+## Lifecycle
+
+| Этап | Что происходит |
+| --- | --- |
+| Provisioning | Приложение запускает команду и проверяет готовность runtime |
+| Planning | Lead создаёт задачи и назначает teammates |
+| In progress | Агенты работают параллельно и обновляют статус задач |
+| Review | Изменения проверяют агенты или вы |
+| Done | Принятая работа остаётся связанной с историей задачи |
+
+## Канбан-доска
+
+Доска - основной рабочий экран. Через неё удобно смотреть работу, находить blocked tasks, открывать task detail, читать logs и ревьюить changes без ручного чтения session files.
+
+## Messages и comments
+
+Direct messages подходят для перенаправления агента. Task comments лучше использовать, когда заметка относится к конкретной работе. Комментарии сохраняют контекст для review.
+
+## Task logs
+
+Task-specific logs изолируют runtime output, actions и messages по одному assignment. Они помогают понять:
+
+- что агент запускал?
+- почему он изменил этот файл?
+- просил ли он помощи у teammate?
+- какая задача породила diff?
+
+## Live processes
+
+Live process section показывает URLs и running processes, когда агенты поднимают локальные servers или tools. Открывайте URL прямо из приложения.
+
diff --git a/landing/product-docs/ru/guide/code-review.md b/landing/product-docs/ru/guide/code-review.md
new file mode 100644
index 00000000..0a94d37c
--- /dev/null
+++ b/landing/product-docs/ru/guide/code-review.md
@@ -0,0 +1,35 @@
+# Код-ревью
+
+Code review в Agent Teams строится вокруг задачи. Вы смотрите изменения конкретной задачи, а не огромный неструктурированный diff.
+
+## Review surface
+
+Через review UI можно:
+
+- смотреть changed files
+- принимать или отклонять отдельные hunks
+- оставлять comments
+- связывать diff с task logs и агентом
+
+## Hunk-level decisions
+
+Принимайте маленькие правильные изменения и отклоняйте отдельные ошибки без удаления всей работы. Это полезно, когда агент в целом решил задачу, но переборщил в одном файле.
+
+## Agent review workflow
+
+Команды могут ревьюить работу друг друга до вашего финального решения. Это ловит очевидные регрессии, но risky areas всё равно стоит проверять вручную.
+
+## Что проверять вручную
+
+Приоритет:
+
+- provider auth и runtime detection
+- IPC, preload и filesystem boundaries
+- Git и worktree behavior
+- parsing и task lifecycle logic
+- persistence и code review flows
+
+## Verification
+
+Лучше запускать focused verification commands. Broad formatting или lint-fix команды не стоит использовать, если задача явно не про форматирование.
+
diff --git a/landing/product-docs/ru/guide/create-team.md b/landing/product-docs/ru/guide/create-team.md
new file mode 100644
index 00000000..c99a382e
--- /dev/null
+++ b/landing/product-docs/ru/guide/create-team.md
@@ -0,0 +1,51 @@
+# Создание команды
+
+Команда - это группа агентов с ролями, lead-агентом, целевым проектом и coordination prompt.
+
+## Первая команда
+
+Начните с малого:
+
+| Роль | Задача |
+| --- | --- |
+| Lead | Делит работу, создаёт задачи, координирует teammates |
+| Builder | Реализует scoped tasks |
+| Reviewer | Проверяет результат, ловит регрессии, просит fixes |
+
+Такая форма даёт достаточно координации, но не создаёт лишний шум на первом запуске.
+
+## Хороший team brief
+
+В brief стоит указать:
+
+- нужный outcome
+- важные files или feature areas
+- границы риска, например "не refactor unrelated modules"
+- ожидания по review
+- verification commands, если они известны
+
+Пример:
+
+```text
+Улучши download flow. Держи изменения внутри landing app, если shared helper явно не нужен. Создай задачи до реализации, проверь diff каждой задачи и запусти landing lint/build checks.
+```
+
+## Уровень автономности
+
+Agent Teams поддерживает разные уровни контроля. Больше автономности подходит для рутинных изменений, меньше - для provider auth, IPC, persistence, Git workflows и release tooling.
+
+## Контекст
+
+Прикладывайте файлы, screenshots или заметки, если они реально меняют задачу. Task descriptions, comments и attachments становятся устойчивым контекстом.
+
+## Качество задач
+
+Хорошие задачи:
+
+- конкретны для review
+- достаточно малы для завершения
+- связаны с видимым результатом
+- имеют verification path
+
+Если lead создаёт размытые задачи, напишите ему direct message и попросите сделать задачи меньше и проверяемее.
+
diff --git a/landing/product-docs/ru/guide/installation.md b/landing/product-docs/ru/guide/installation.md
new file mode 100644
index 00000000..5bf577c5
--- /dev/null
+++ b/landing/product-docs/ru/guide/installation.md
@@ -0,0 +1,45 @@
+# Установка
+
+Agent Teams распространяется как desktop-приложение для macOS, Windows и Linux.
+
+## Готовые сборки
+
+Берите последний GitHub release:
+
+- macOS Apple Silicon: `.dmg`
+- macOS Intel: `.dmg`
+- Windows: `.exe`
+- Linux: `.AppImage`, `.deb`, `.rpm` или `.pacman`
+
+::: warning Windows SmartScreen
+Новые open-source приложения могут вызывать SmartScreen. Если вы доверяете источнику релиза, выберите **More info**, затем **Run anyway**.
+:::
+
+## Требования
+
+Пакетная сборка рассчитана на zero-setup onboarding. Приложение само помогает с runtime detection и provider authentication.
+
+Для запуска из исходников:
+
+| Инструмент | Версия |
+| --- | --- |
+| Node.js | 20+ |
+| pnpm | 10+ |
+
+## Запуск из исходников
+
+<InstallBlock command="git clone https://github.com/777genius/claude_agent_teams_ui.git && cd claude_agent_teams_ui && pnpm install && pnpm dev" label="Скопировать" copied-label="Скопировано" />
+
+```bash
+git clone https://github.com/777genius/claude_agent_teams_ui.git
+cd claude_agent_teams_ui
+pnpm install
+pnpm dev
+```
+
+Если нужна самая свежая локальная версия, используйте ветку репозитория, где сейчас идёт активная разработка.
+
+## Обновления
+
+Для packaged builds берите последний release. Для запуска из исходников подтяните нужную ветку и повторите install, если поменялись зависимости.
+
diff --git a/landing/product-docs/ru/guide/quickstart.md b/landing/product-docs/ru/guide/quickstart.md
new file mode 100644
index 00000000..d1ac7dd1
--- /dev/null
+++ b/landing/product-docs/ru/guide/quickstart.md
@@ -0,0 +1,50 @@
+# Быстрый старт
+
+Этот гайд проводит от свежей установки до первой запущенной команды.
+
+## 1. Установите Agent Teams
+
+Скачайте последний релиз под вашу платформу на лендинге или в GitHub releases.
+
+::: tip
+Приложение бесплатное и с открытым кодом. Выбранный runtime может требовать доступ к провайдеру, например Claude, Codex, OpenCode или API-key based providers.
+:::
+
+## 2. Откройте проект
+
+Запустите приложение и выберите директорию проекта, где агенты будут работать. Agent Teams читает локальные project files и runtime/session state, чтобы показывать задачи, логи, diffs и активность команды.
+
+## 3. Выберите runtime path
+
+Стандартные варианты:
+
+| Runtime | Когда подходит |
+| --- | --- |
+| Claude | Если вы уже используете Claude Code или Anthropic access |
+| Codex | Для Codex-native workflows и OpenAI access |
+| OpenCode | Для multimodel teams и большого числа provider backends |
+
+## 4. Создайте первую команду
+
+Начните с маленькой команды: lead, implementation agent и review-oriented agent. Этого достаточно, чтобы проверить workflow без лишнего шума.
+
+## 5. Дайте lead-агенту конкретную цель
+
+Пишите задачу как инженерному лиду:
+
+```text
+Улучши onboarding flow. Разбей работу на задачи, держи изменения маленькими и проси review перед широкими refactor.
+```
+
+Lead должен создать задачи, назначить работу и координировать teammates. Вы следите за прогрессом на канбан-доске и вмешиваетесь через комментарии или direct messages.
+
+## 6. Проверьте результат
+
+Откройте задачи в review/done, посмотрите diff, примите или отклоните изменения. Если нужно понять мотивацию агента, откройте task logs.
+
+## Дальше
+
+- [Создание команды](/ru/guide/create-team)
+- [Настройка рантайма](/ru/guide/runtime-setup)
+- [Код-ревью](/ru/guide/code-review)
+
diff --git a/landing/product-docs/ru/guide/runtime-setup.md b/landing/product-docs/ru/guide/runtime-setup.md
new file mode 100644
index 00000000..5b3e5fa6
--- /dev/null
+++ b/landing/product-docs/ru/guide/runtime-setup.md
@@ -0,0 +1,33 @@
+# Настройка рантайма
+
+Agent Teams - coordination layer. Model work выполняется через локальные runtimes и providers.
+
+## Поддерживаемые пути
+
+| Путь | Когда использовать |
+| --- | --- |
+| Claude | Если вы уже используете Claude Code или Anthropic access |
+| Codex | Для Codex-native workflows и OpenAI access |
+| OpenCode | Для multimodel routing и широкой provider coverage |
+
+Приложение по возможности определяет доступные runtimes и ведёт настройку через UI.
+
+## Provider access
+
+У Agent Teams нет своего платного тарифа. Вы используете доступ к провайдеру, который у вас уже есть: subscription, local runtime auth или API keys в зависимости от выбранного пути.
+
+## Multimodel mode
+
+Multimodel mode может направлять работу через разные provider backends в OpenCode-compatible конфигурации. Используйте его, когда нужна гибкость провайдеров или разные model lanes для teammates.
+
+## Практические советы
+
+- Первый runtime setup держите простым.
+- Подтвердите запуск одной команды до добавления многих providers.
+- Auth, model names и PATH issues считайте setup-проблемами, а не проблемами team prompt.
+- Если запуск завис, сначала откройте диагностику.
+
+## Когда менять runtime path
+
+Меняйте путь, когда текущий упирается в availability модели, rate limits, provider capabilities или роли команды. После смены проверьте одну маленькую задачу.
+
diff --git a/landing/product-docs/ru/guide/troubleshooting.md b/landing/product-docs/ru/guide/troubleshooting.md
new file mode 100644
index 00000000..b5b3a6e1
--- /dev/null
+++ b/landing/product-docs/ru/guide/troubleshooting.md
@@ -0,0 +1,40 @@
+# Диагностика
+
+Большинство проблем команды попадает в четыре группы: runtime setup, launch confirmation, task parsing или provider limits.
+
+## Команда не запускается
+
+Проверьте:
+
+- выбранный runtime установлен или авторизован
+- runtime доступен в environment PATH
+- у провайдера есть доступ к нужной модели
+- project path существует и читается
+
+Если OpenCode показывает `registered`, но bootstrap не подтверждён, сначала смотрите launch logs.
+
+## Не видны ответы агента
+
+Откройте task logs и teammate messages. Пропавшие replies часто связаны с runtime delivery, parsing или task filtering. Не считайте, что модель проигнорировала сообщение, пока это не подтверждено логами.
+
+## Changes не связаны с tasks
+
+Используйте task-specific logs и code review links. Если diff выглядит detached, проверьте, был ли task id или task reference в output агента.
+
+## Rate limits
+
+Если провайдер сообщает reset time, Agent Teams может подтолкнуть lead продолжить после cooldown. Если reset time неизвестен, подождите или смените provider/runtime path.
+
+## Какие данные собрать
+
+Соберите:
+
+- task id
+- team name
+- runtime path
+- launch log excerpt
+- provider/model
+- точный time window
+
+Этого обычно хватает для диагностики launch и task lifecycle issues.
+
diff --git a/landing/product-docs/ru/index.md b/landing/product-docs/ru/index.md
new file mode 100644
index 00000000..2143cde3
--- /dev/null
+++ b/landing/product-docs/ru/index.md
@@ -0,0 +1,67 @@
+---
+layout: home
+hero:
+  name: Документация Agent Teams
+  text: Запускайте команды AI-агентов из локального desktop-приложения
+  tagline: Создавайте команды, наблюдайте за канбан-доской, ревьюйте изменения и координируйте Claude, Codex, OpenCode и multimodel workflows без потери локального контроля.
+  actions:
+    - theme: brand
+      text: Быстрый старт
+      link: /ru/guide/quickstart
+    - theme: alt
+      text: Установка
+      link: /ru/guide/installation
+    - theme: alt
+      text: Концепции
+      link: /ru/reference/concepts
+features:
+  - icon: "01"
+    title: Командный workflow
+    details: Опишите роли, запустите lead-агента и дайте команде разбивать, брать и координировать задачи.
+    link: /ru/guide/create-team
+    linkText: Создать команду
+  - icon: "02"
+    title: Живая канбан-доска
+    details: Видно, как задачи проходят todo, progress, review, blocked и done во время работы агентов.
+    link: /ru/guide/agent-workflow
+    linkText: Разобрать workflow
+  - icon: "03"
+    title: Встроенное код-ревью
+    details: Проверяйте diff по задаче, принимайте или отклоняйте hunks и оставляйте комментарии.
+    link: /ru/guide/code-review
+    linkText: Ревью изменений
+  - icon: "04"
+    title: Runtime-aware setup
+    details: Используйте Claude, Codex, OpenCode или multimodel-провайдеры через доступ, который у вас уже есть.
+    link: /ru/guide/runtime-setup
+    linkText: Настроить рантаймы
+  - icon: "05"
+    title: Local-first контроль
+    details: Приложение читает локальный проект и runtime-состояние. Код остаётся у вас, если выбранный провайдер не получает контекст для model call.
+    link: /ru/reference/privacy-local-data
+    linkText: Модель приватности
+  - icon: "06"
+    title: Диагностируемые команды
+    details: Отслеживайте task logs, runtime output, сообщения агентов и live processes, когда запуск или задача застряли.
+    link: /ru/guide/troubleshooting
+    linkText: Диагностика
+---
+
+<InstallBlock label="Скопировать" copied-label="Скопировано" />
+
+## С чего начать
+
+Agent Teams - бесплатное desktop-приложение для оркестрации команд AI-агентов. Это не просто одиночные промпты одному агенту: вы создаёте команду, задаёте роли и смотрите, как агенты координируют работу через task board.
+
+<DocsCardGrid />
+
+## Справочник
+
+Используйте справочник, когда нужны точные термины, поведение провайдеров или границы приватности.
+
+<DocsCardGrid type="reference" />
+
+## Превью продукта
+
+<ZoomImage src="/screenshots/1.jpg" alt="Канбан-доска Agent Teams" caption="Статусы задач, активность агентов и review workflow видны в одном рабочем пространстве." />
+
diff --git a/landing/product-docs/ru/reference/concepts.md b/landing/product-docs/ru/reference/concepts.md
new file mode 100644
index 00000000..0ee1b06c
--- /dev/null
+++ b/landing/product-docs/ru/reference/concepts.md
@@ -0,0 +1,32 @@
+# Концепции
+
+Основные термины Agent Teams.
+
+## Team
+
+Team - группа агентов, настроенная для проекта. Обычно есть lead и один или несколько teammates со специализированными ролями.
+
+## Lead
+
+Lead координирует работу: разбивает цель на tasks, назначает teammates, отслеживает blockers и просит review.
+
+## Task
+
+Task - устойчивая единица работы. У неё есть status, description, comments, logs, attachments и reviewable changes.
+
+## Solo mode
+
+Solo mode запускает команду из одного агента. Полезно для маленьких задач, меньшего token usage и проверки prompt перед расширением до команды.
+
+## Cross-team communication
+
+Агенты могут писать внутри и между командами. Это нужно, когда разные teams владеют связанными частями работы.
+
+## Autonomy level
+
+Autonomy определяет, сколько агент может делать до запроса подтверждения. Больше автономности быстрее, меньше - безопаснее для sensitive code paths.
+
+## Runtime
+
+Runtime - локальный execution path, который соединяет Agent Teams с model/provider workflow, например Claude, Codex или OpenCode.
+
diff --git a/landing/product-docs/ru/reference/faq.md b/landing/product-docs/ru/reference/faq.md
new file mode 100644
index 00000000..dcebc8b8
--- /dev/null
+++ b/landing/product-docs/ru/reference/faq.md
@@ -0,0 +1,29 @@
+# FAQ
+
+## Agent Teams бесплатный?
+
+Да. Приложение бесплатное и open source. Provider или runtime access может стоить денег в зависимости от выбранного пути.
+
+## Нужно ли заранее ставить Claude или Codex?
+
+Не всегда. Приложение ведёт runtime detection и setup через UI. Некоторые пути всё равно требуют внешнюю авторизацию runtime.
+
+## Приложение загружает мой код на серверы Agent Teams?
+
+Нет. Agent Teams не является cloud code-sync сервисом. Но provider-backed model calls могут получать prompt context в зависимости от выбранного runtime.
+
+## Агенты могут общаться друг с другом?
+
+Да. Агенты могут писать teammates, комментировать tasks и координироваться между teams.
+
+## Можно ревьюить код перед принятием?
+
+Да. Review flow построен вокруг task-scoped diffs и hunk-level decisions.
+
+## Что такое solo mode?
+
+Solo mode - команда из одного агента. Подходит для небольших задач и меньшего coordination overhead.
+
+## Что делать, если launch завис?
+
+Откройте диагностику, соберите runtime logs и проверьте provider auth до изменения prompts.
diff --git a/landing/product-docs/ru/reference/privacy-local-data.md b/landing/product-docs/ru/reference/privacy-local-data.md
new file mode 100644
index 00000000..52f0b9f5
--- /dev/null
+++ b/landing/product-docs/ru/reference/privacy-local-data.md
@@ -0,0 +1,30 @@
+# Приватность и локальные данные
+
+Agent Teams local-first, но выбранный provider path всё равно важен.
+
+## Что остаётся локально
+
+Desktop app работает на вашей машине и читает локальные project/runtime data для UI:
+
+- project files
+- task metadata
+- runtime/session logs
+- review state
+- local app settings
+
+## Что может выйти с машины
+
+Когда агент обращается к provider-backed model, prompt context и tool results могут отправляться через выбранный provider/runtime path. Это зависит от runtime и provider.
+
+## Практические правила
+
+- Не прикладывайте secrets к tasks.
+- Проверяйте provider policies для sensitive projects.
+- Используйте меньшую autonomy для risky repositories.
+- Держите task scope узким при работе с private code.
+- Для диагностики опирайтесь на local evidence и logs.
+
+## Open source
+
+Само приложение open source и бесплатное. В репозитории можно посмотреть, как устроены local orchestration, task tracking и review flows.
+
diff --git a/landing/product-docs/ru/reference/providers-runtimes.md b/landing/product-docs/ru/reference/providers-runtimes.md
new file mode 100644
index 00000000..31783d3e
--- /dev/null
+++ b/landing/product-docs/ru/reference/providers-runtimes.md
@@ -0,0 +1,40 @@
+# Провайдеры и рантаймы
+
+Agent Teams отделяет orchestration от model access.
+
+## Что даёт приложение
+
+Agent Teams даёт:
+
+- orchestration команд и задач
+- kanban board UI
+- teammate messaging
+- task logs
+- review UI
+- local project integration
+
+## Что даёт runtime
+
+Runtime отвечает за:
+
+- model execution
+- provider authentication
+- tool execution behavior
+- rate limits и capabilities конкретной модели
+
+## Частые варианты
+
+| Runtime | Заметки |
+| --- | --- |
+| Claude | Хорошо для Claude Code users и Anthropic access |
+| Codex | Хорошо для Codex-native workflows и OpenAI access |
+| OpenCode | Хорошо для multimodel routing и широкой provider coverage |
+
+## Стоимость providers
+
+Agent Teams бесплатен. Стоимость provider usage зависит от выбранного runtime/provider.
+
+## Capability checks
+
+Во время setup приложение может выполнять access и capability checks. Это помогает найти отсутствующую авторизацию до того, как team launch застрянет в provisioning.
+
diff --git a/landing/server/routes/robots.txt.ts b/landing/server/routes/robots.txt.ts
index 1a5e13c8..35860311 100644
--- a/landing/server/routes/robots.txt.ts
+++ b/landing/server/routes/robots.txt.ts
@@ -7,5 +7,6 @@ export default defineEventHandler((event) => {
   return `User-agent: *
 Allow: /
 Sitemap: ${siteUrl}/sitemap.xml
+Sitemap: ${siteUrl}/docs/sitemap.xml
 `;
 });
diff --git a/mcp-server/src/tools/messageTools.ts b/mcp-server/src/tools/messageTools.ts
index 2c63b023..260931eb 100644
--- a/mcp-server/src/tools/messageTools.ts
+++ b/mcp-server/src/tools/messageTools.ts
@@ -14,7 +14,7 @@ export function registerMessageTools(server: Pick<FastMCP, 'addTool'>) {
   server.addTool({
     name: 'message_send',
     description:
-      'Send a visible team/user message into team inbox. OpenCode teammates should use this for normal replies to the human user, lead, or same-team teammates. from is required and must be your configured teammate name; user is reserved for app-owned writes. When replying to an app-delivered OpenCode runtime message, include source="runtime_delivery" and relayOfMessageId with the inbound app messageId. Do not invent placeholder task refs. If the message is not about a real board task, omit # task labels; never use #00000000.',
+      'Send a visible team/user message into team inbox. OpenCode teammates should use this for normal replies to the human user, lead, or same-team teammates. from is required and must be your configured teammate name; user is reserved for app-owned writes. When replying to an app-delivered OpenCode runtime message, include source="runtime_delivery" and relayOfMessageId with the inbound app messageId. After a successful app-delivered runtime reply, stop and do not send the same answer again. Do not invent placeholder task refs. If the message is not about a real board task, omit # task labels; never use #00000000.',
     parameters: z.object({
       ...toolContextSchema,
       to: z.string().min(1),
@@ -58,21 +58,26 @@ export function registerMessageTools(server: Pick<FastMCP, 'addTool'>) {
       taskRefs,
     }) => {
       assertConfiguredTeam(teamName, claudeDir);
-      return await Promise.resolve(
-        jsonTextContent(
-          getController(teamName, claudeDir).messages.sendMessage({
-            to,
-            text,
-            ...(from ? { from } : {}),
-            ...(summary ? { summary } : {}),
-            ...(source ? { source } : {}),
-            ...(relayOfMessageId ? { relayOfMessageId } : {}),
-            ...(leadSessionId ? { leadSessionId } : {}),
-            ...(attachments?.length ? { attachments } : {}),
-            ...(taskRefs?.length ? { taskRefs } : {}),
-          })
-        )
-      );
+      const result = getController(teamName, claudeDir).messages.sendMessage({
+        to,
+        text,
+        ...(from ? { from } : {}),
+        ...(summary ? { summary } : {}),
+        ...(source ? { source } : {}),
+        ...(relayOfMessageId ? { relayOfMessageId } : {}),
+        ...(leadSessionId ? { leadSessionId } : {}),
+        ...(attachments?.length ? { attachments } : {}),
+        ...(taskRefs?.length ? { taskRefs } : {}),
+      });
+      const protocolInstruction =
+        source === 'runtime_delivery' || relayOfMessageId
+          ? 'Delivered as an app-delivered runtime reply. Stop this turn now; do not call message_send again for the same inbound message.'
+          : 'Delivered. If this answered one app/user instruction, do not call message_send again for the same answer.';
+      const payload =
+        result && typeof result === 'object' && !Array.isArray(result)
+          ? { ...(result as Record<string, unknown>), protocolInstruction }
+          : { result, protocolInstruction };
+      return await Promise.resolve(jsonTextContent(payload));
     },
   });
 }
diff --git a/mcp-server/test/tools.test.ts b/mcp-server/test/tools.test.ts
index df98328f..a5f04b8f 100644
--- a/mcp-server/test/tools.test.ts
+++ b/mcp-server/test/tools.test.ts
@@ -1427,6 +1427,7 @@ describe('agent-teams-mcp tools', () => {
     );
 
     expect(sent.deliveredToInbox).toBe(true);
+    expect(sent.protocolInstruction).toContain('do not call message_send again');
     const inboxPath = path.join(claudeDir, 'teams', teamName, 'inboxes', 'alice.json');
     const rows = JSON.parse(fs.readFileSync(inboxPath, 'utf8'));
     expect(rows[0].source).toBe('system_notification');
diff --git a/package.json b/package.json
index ffb89ac9..0c0df825 100644
--- a/package.json
+++ b/package.json
@@ -247,6 +247,10 @@
         "from": "resources/runtime",
         "to": "runtime"
       },
+      {
+        "from": "src/renderer/assets/participant-avatars",
+        "to": "participant-avatars"
+      },
       {
         "from": "mcp-server/dist/index.js",
         "to": "mcp-server/index.js"
diff --git a/packages/agent-graph/src/canvas/draw-agents.ts b/packages/agent-graph/src/canvas/draw-agents.ts
index a14dbcd2..9c2715cd 100644
--- a/packages/agent-graph/src/canvas/draw-agents.ts
+++ b/packages/agent-graph/src/canvas/draw-agents.ts
@@ -264,6 +264,7 @@ function drawLaunchStage(
 
   ctx.save();
   switch (visualState) {
+    case 'queued':
     case 'waiting': {
       const ringR = r + 8 + Math.sin(time * 3.2) * 1.4;
       const pulseAlpha = 0.28 + 0.18 * (0.5 + 0.5 * Math.sin(time * 3.2));
@@ -778,6 +779,7 @@ function truncateSubLabel(ctx: CanvasRenderingContext2D, label: string, r: numbe
 
 function getLaunchStatusColor(visualState: GraphNode['launchVisualState']): string {
   switch (visualState) {
+    case 'queued':
     case 'waiting':
       return hexWithAlpha('#d4d4d8', 0.8);
     case 'spawning':
diff --git a/packages/agent-graph/src/ports/types.ts b/packages/agent-graph/src/ports/types.ts
index e0f566d0..8a990dbb 100644
--- a/packages/agent-graph/src/ports/types.ts
+++ b/packages/agent-graph/src/ports/types.ts
@@ -27,6 +27,7 @@ export type GraphLaunchVisualState =
   | 'registered_only'
   | 'stale_runtime'
   | 'settling'
+  | 'queued'
   | 'error'
   | 'skipped';
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e5b3e08f..eb8e67f5 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -356,7 +356,7 @@ importers:
         version: 40.3.0
       electron-builder:
         specifier: ^26.8.1
-        version: 26.8.1(electron-builder-squirrel-windows@24.13.3)
+        version: 26.8.1(electron-builder-squirrel-windows@26.8.1)
       electron-vite:
         specifier: ^5.0.0
         version: 5.0.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
@@ -457,13 +457,13 @@ importers:
         version: 0.11.3(magicast@0.5.2)(pinia@3.0.4(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3)))
       '@vueuse/nuxt':
         specifier: ^10.11.1
-        version: 10.11.1(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
+        version: 10.11.1(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
       nuxt:
         specifier: ^3.20.2
-        version: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2)
+        version: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2)
       nuxt-icon:
         specifier: ^0.6.10
-        version: 0.6.10(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))
+        version: 0.6.10(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
       pinia:
         specifier: ^3.0.4
         version: 3.0.4(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3))
@@ -488,10 +488,16 @@ importers:
         version: 7.4.47
       '@nuxt/eslint':
         specifier: ^1.12.1
-        version: 1.15.2(@typescript-eslint/utils@8.57.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.30)(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+        version: 1.15.2(@typescript-eslint/utils@8.57.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.30)(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+      '@shikijs/transformers':
+        specifier: 3.22.0
+        version: 3.22.0
       eslint:
         specifier: ^9.39.2
         version: 9.39.2(jiti@2.6.1)
+      medium-zoom:
+        specifier: ^1.1.0
+        version: 1.1.0
       prettier:
         specifier: ^3.8.0
         version: 3.8.1
@@ -500,7 +506,16 @@ importers:
         version: 1.98.0
       vite-plugin-vuetify:
         specifier: ^2.1.3
-        version: 2.1.3(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3)
+        version: 2.1.3(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3)
+      vitepress:
+        specifier: 2.0.0-alpha.17
+        version: 2.0.0-alpha.17(@types/node@25.0.7)(axios@1.13.6)(change-case@5.4.4)(fuse.js@7.1.0)(idb-keyval@6.2.2)(jiti@2.6.1)(oxc-minify@0.117.0)(postcss@8.5.8)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2)
+      vitepress-codeblock-collapse:
+        specifier: ^1.0.0
+        version: 1.0.0(vue@3.5.30(typescript@5.9.3))
+      vitepress-plugin-llms:
+        specifier: ^1.12.2
+        version: 1.12.2
 
   mcp-server:
     dependencies:
@@ -907,6 +922,15 @@ packages:
     peerDependencies:
       react: '>=16.8.0'
 
+  '@docsearch/css@4.6.3':
+    resolution: {integrity: sha512-nlOwcXcsNAptQl4vlL4MA78qNJKO0Qlds5GuBjCoePgkebTXLSf8Qt1oyZ3YBshYupKXG9VRGEsk1zr23d+bzQ==}
+
+  '@docsearch/js@4.6.3':
+    resolution: {integrity: sha512-qUIX2b4Apew3tv4F0qhmgShsl/Lfw4m6mqv/5/5dWNxwTcDdLMp2s3YwZ+NMGh3IKCg0pBaXm7Q5VdyU5Rj+cQ==}
+
+  '@docsearch/sidepanel-js@4.6.3':
+    resolution: {integrity: sha512-grGSmvXzG0if+mrzdIKykvpIAuEQ9u0sEJ2eLRRCaQfJvsWqh2C2/aY04bIzWvDh7myi5rvl8D+tUNsVrjYQ3A==}
+
   '@dxup/nuxt@0.4.0':
     resolution: {integrity: sha512-28LDotpr9G2knUse3cQYsOo6NJq5yhABv4ByRVRYJUmzf9Q31DI7rpRek4POlKy1aAcYyKgu5J2616pyqLohYg==}
     peerDependencies:
@@ -932,19 +956,10 @@ packages:
     resolution: {integrity: sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==}
     engines: {node: '>=14'}
 
-  '@electron/notarize@2.2.1':
-    resolution: {integrity: sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==}
-    engines: {node: '>= 10.0.0'}
-
   '@electron/notarize@2.5.0':
     resolution: {integrity: sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==}
     engines: {node: '>= 10.0.0'}
 
-  '@electron/osx-sign@1.0.5':
-    resolution: {integrity: sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==}
-    engines: {node: '>=12.0.0'}
-    hasBin: true
-
   '@electron/osx-sign@1.3.3':
     resolution: {integrity: sha512-KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==}
     engines: {node: '>=12.0.0'}
@@ -955,14 +970,15 @@ packages:
     engines: {node: '>=22.12.0'}
     hasBin: true
 
-  '@electron/universal@1.5.1':
-    resolution: {integrity: sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==}
-    engines: {node: '>=8.6'}
-
   '@electron/universal@2.0.3':
     resolution: {integrity: sha512-Wn9sPYIVFRFl5HmwMJkARCCf7rqK/EurkfQ/rJZ14mHP3iYTjZSIOSVonEAnhWeAXwtw7zOekGRlc6yTtZ0t+g==}
     engines: {node: '>=16.4'}
 
+  '@electron/windows-sign@1.2.2':
+    resolution: {integrity: sha512-dfZeox66AvdPtb2lD8OsIIQh12Tp0GNCRUDfBHIKGpbmopZto2/A8nSpYYLoedPIHpqkeblZ/k8OV0Gy7PYuyQ==}
+    engines: {node: '>=14.14'}
+    hasBin: true
+
   '@emnapi/core@1.8.1':
     resolution: {integrity: sha512-AvT9QFpxK0Zd8J0jopedNm+w/2fIzvtPKPjqyw9jwvBaReTTqPBk9Hixaz7KbjimP+QNz605/XnjFcDAL2pqBg==}
 
@@ -1729,6 +1745,9 @@ packages:
     resolution: {integrity: sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==}
     engines: {node: '>=18.18'}
 
+  '@iconify-json/simple-icons@1.2.80':
+    resolution: {integrity: sha512-iglncJJ6X/dVuzFDU32MrHwwo4RBwivGf108dgyYg+HKS78ifx0h7sTenpDZMVT+UhdS6CSgZcvY/SvRXlIEUg==}
+
   '@iconify/collections@1.0.665':
     resolution: {integrity: sha512-S5Qb/jy+aa4vRdFEX5l9u6QIfGB4H4BkCwOSNXjHjRTQI0lPKKeRriThSrWudaP3TsSE0B6g0MxbcPMlTwo3NQ==}
 
@@ -1929,10 +1948,6 @@ packages:
     resolution: {integrity: sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==}
     engines: {node: '>=8'}
 
-  '@malept/cross-spawn-promise@1.1.1':
-    resolution: {integrity: sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==}
-    engines: {node: '>= 10'}
-
   '@malept/cross-spawn-promise@2.0.0':
     resolution: {integrity: sha512-1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==}
     engines: {node: '>= 12.13.0'}
@@ -2362,48 +2377,56 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-minify/binding-linux-arm64-musl@0.117.0':
     resolution: {integrity: sha512-C3zapJconWpl2Y7LR3GkRkH6jxpuV2iVUfkFcHT5Ffn4Zu7l88mZa2dhcfdULZDybN1Phka/P34YUzuskUUrXw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-minify/binding-linux-ppc64-gnu@0.117.0':
     resolution: {integrity: sha512-2T/Bm+3/qTfuNS4gKSzL8qbiYk+ErHW2122CtDx+ilZAzvWcJ8IbqdZIbEWOlwwe03lESTxPwTBLFqVgQU2OeQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-minify/binding-linux-riscv64-gnu@0.117.0':
     resolution: {integrity: sha512-MKLjpldYkeoB4T+yAi4aIAb0waifxUjLcKkCUDmYAY3RqBJTvWK34KtfaKZL0IBMIXfD92CbKkcxQirDUS9Xcg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-minify/binding-linux-riscv64-musl@0.117.0':
     resolution: {integrity: sha512-UFVcbPvKUStry6JffriobBp8BHtjmLLPl4bCY+JMxIn/Q3pykCpZzRwFTcDurG/kY8tm+uSNfKKdRNa5Nh9A7g==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-minify/binding-linux-s390x-gnu@0.117.0':
     resolution: {integrity: sha512-B9GyPQ1NKbvpETVAMyJMfRlD3c6UJ7kiuFUAlx9LTYiQL+YIyT6vpuRlq1zgsXxavZluVrfeJv6x0owV4KDx4Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-minify/binding-linux-x64-gnu@0.117.0':
     resolution: {integrity: sha512-fXfhtr+WWBGNy4M5GjAF5vu/lpulR4Me34FjTyaK9nDrTZs7LM595UDsP1wliksqp4hD/KdoqHGmbCrC+6d4vA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-minify/binding-linux-x64-musl@0.117.0':
     resolution: {integrity: sha512-jFBgGbx1oLadb83ntJmy1dWlAHSQanXTS21G4PgkxyONmxZdZ/UMKr7KsADzMuoPsd2YhJHxzRpwJd9U+4BFBw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-minify/binding-openharmony-arm64@0.117.0':
     resolution: {integrity: sha512-nxPd9vx1vYz8IlIMdl9HFdOK/ood1H5hzbSFsyO8JU55tkcJoBL8TLCbuFf9pHpOy27l2gcPyV6z3p4eAcTH5Q==}
@@ -2511,84 +2534,98 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-arm64-gnu@0.70.0':
     resolution: {integrity: sha512-tDzHWKexJPHR+qSiuAFoZ1v8EgCd4ggBNbjJHkcIHsoYKnsKaT1+uE9xfW9UhI1mhv2lo1JJ9n9og2yDTGxSeA==}
     engines: {node: '>=14.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-arm64-musl@0.117.0':
     resolution: {integrity: sha512-QagKTDF4lrz8bCXbUi39Uq5xs7C7itAseKm51f33U+Dyar9eJY/zGKqfME9mKLOiahX7Fc1J3xMWVS0AdDXLPg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-parser/binding-linux-arm64-musl@0.70.0':
     resolution: {integrity: sha512-BJ+N25UWmHU624558ojSTnht3uFL00jV1c8qk1hnKf4cl6+ovFcoktRWAWSBlgLEP8tLlu8qgIhz875tMj2PkQ==}
     engines: {node: '>=14.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-parser/binding-linux-ppc64-gnu@0.117.0':
     resolution: {integrity: sha512-RPddpcE/0xxWaommWy0c5i/JdrXcXAkxBS2GOrAUh5LKmyCh03hpJedOAWszG4ADsKQwoUQQ1/tZVGRhZIWtKA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-riscv64-gnu@0.117.0':
     resolution: {integrity: sha512-ur/WVZF9FSOiZGxyP+nfxZzuv6r5OJDYoVxJnUR7fM/hhXLh4V/be6rjbzm9KLCDBRwYCEKJtt+XXNccwd06IA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-riscv64-gnu@0.70.0':
     resolution: {integrity: sha512-nxu22nVuPA2xy1cxvBC0D5mVl0myqStOw3XBkVkDViNL01iPyuEFJd5VsM0GqsgrXvF95H/jrbMd+XWnto924g==}
     engines: {node: '>=14.0.0'}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-riscv64-musl@0.117.0':
     resolution: {integrity: sha512-ujGcAx8xAMvhy7X5sBFi3GXML1EtyORuJZ5z2T6UV3U416WgDX/4OCi3GnoteeenvxIf6JgP45B+YTHpt71vpA==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-parser/binding-linux-s390x-gnu@0.117.0':
     resolution: {integrity: sha512-hbsfKjUwRjcMZZvvmpZSc+qS0bHcHRu8aV/I3Ikn9BzOA0ZAgUE7ctPtce5zCU7bM8dnTLi4sJ1Pi9YHdx6Urw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-s390x-gnu@0.70.0':
     resolution: {integrity: sha512-AQ6Xj97lYRxHZl94cZIHJxT5M1qkeEi+vQe+e7M2lAtjcURl8cwhZmWKSv4rt4BQRVfO3ys0bY8AgIh4eFJiqw==}
     engines: {node: '>=14.0.0'}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-x64-gnu@0.117.0':
     resolution: {integrity: sha512-1QrTrf8rige7UPJrYuDKJLQOuJlgkt+nRSJLBMHWNm9TdivzP48HaK3f4q18EjNlglKtn03lgjMu4fryDm8X4A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-x64-gnu@0.70.0':
     resolution: {integrity: sha512-RIxaVsIxtG90CoX6/Okij8itaMrJp4SEJm1pSL0pz3hGo0yur3Il9M1mmGvOpW+avY8uHdwXIvf2qMnnTKZuoQ==}
     engines: {node: '>=14.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-parser/binding-linux-x64-musl@0.117.0':
     resolution: {integrity: sha512-gRvK6HPzF5ITRL68fqb2WYYs/hGviPIbkV84HWCgiJX+LkaOpp+HIHQl3zVZdyKHwopXToTbXbtx/oFjDjl8pg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-parser/binding-linux-x64-musl@0.70.0':
     resolution: {integrity: sha512-B3S0G4TlZ+WLdQq4mSQtt2ZW0MAkKWc8dla17tZY86kcXvvCWwACvj7I27Z/nSlb7uJOdRZS9/r6Gw0uAARNVQ==}
     engines: {node: '>=14.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-parser/binding-openharmony-arm64@0.117.0':
     resolution: {integrity: sha512-QPJvFbnnDZZY7xc+xpbIBWLThcGBakwaYA9vKV8b3+oS5MGfAZUoTFJcix5+Zg2Ri46sOfrUim6Y6jsKNcssAQ==}
@@ -2688,41 +2725,49 @@ packages:
     resolution: {integrity: sha512-qNQk0H6q1CnwS9cnvyjk9a+JN8BTbxK7K15Bb5hYfJcKTG1hfloQf6egndKauYOO0wu9ldCMPBrEP1FNIQEhaA==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-resolver/binding-linux-arm64-musl@11.16.4':
     resolution: {integrity: sha512-wEXSaEaYxGGoVSbw0i2etjDDWcqErKr8xSkTdwATP798efsZmodUAcLYJhN0Nd4W35Oq6qAvFGHpKwFrrhpTrA==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-resolver/binding-linux-ppc64-gnu@11.16.4':
     resolution: {integrity: sha512-CUFOlpb07DVOFLoYiaTfbSBRPIhNgwc/MtlYeg3p6GJJw+kEm/vzc9lohPSjzF2MLPB5hzsJdk+L/GjrTT3UPw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-resolver/binding-linux-riscv64-gnu@11.16.4':
     resolution: {integrity: sha512-d8It4AH8cN9ReK1hW6ZO4x3rMT0hB2LYH0RNidGogV9xtnjLRU+Y3MrCeClLyOSGCibmweJJAjnwB7AQ31GEhg==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-resolver/binding-linux-riscv64-musl@11.16.4':
     resolution: {integrity: sha512-d09dOww9iKyEHSxuOQ/Iu2aYswl0j7ExBcyy14D6lJ5ijQSP9FXcJYJsJ3yvzboO/PDEFjvRuF41f8O1skiPVg==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-resolver/binding-linux-s390x-gnu@11.16.4':
     resolution: {integrity: sha512-lhjyGmUzTWHduZF3MkdUSEPMRIdExnhsqv8u1upX3A15epVn6YVwv4msFQPJl1x1wszkACPeDHGOtzHsITXGdw==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-resolver/binding-linux-x64-gnu@11.16.4':
     resolution: {integrity: sha512-ZtqqiI5rzlrYBm/IMMDIg3zvvVj4WO/90Dg/zX+iA8lWaLN7K5nroXb17MQ4WhI5RqlEAgrnYDXW+hok1D9Kaw==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-resolver/binding-linux-x64-musl@11.16.4':
     resolution: {integrity: sha512-LM424h7aaKcMlqHnQWgTzO+GRNLyjcNnMpqm8SygEtFRVW693XS+XGXYvjORlmJtsyjo84ej1FMb3U2HE5eyjg==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-resolver/binding-openharmony-arm64@11.16.4':
     resolution: {integrity: sha512-8w8U6A5DDWTBv3OUxSD9fNk37liZuEC5jnAc9wQRv9DeYKAXvuUtBfT09aIZ58swaci0q1WS48/CoMVEO6jdCA==}
@@ -2796,48 +2841,56 @@ packages:
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-transform/binding-linux-arm64-musl@0.117.0':
     resolution: {integrity: sha512-ykxpPQp0eAcSmhy0Y3qKvdanHY4d8THPonDfmCoktUXb6r0X6qnjpJB3V+taN1wevW55bOEZd97kxtjTKjqhmg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-transform/binding-linux-ppc64-gnu@0.117.0':
     resolution: {integrity: sha512-Rvspti4Kr7eq6zSrURK5WjscfWQPvmy/KjJZV45neRKW8RLonE3r9+NgrwSLGoHvQ3F24fbqlkplox1RtlhH5A==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-transform/binding-linux-riscv64-gnu@0.117.0':
     resolution: {integrity: sha512-Dr2ZW9ZZ4l1eQ5JUEUY3smBh4JFPCPuybWaDZTLn3ADZjyd8ZtNXEjeMT8rQbbhbgSL9hEgbwaqraole3FNThQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-transform/binding-linux-riscv64-musl@0.117.0':
     resolution: {integrity: sha512-oD1Bnes1bIC3LVBSrWEoSUBj6fvatESPwAVWfJVGVQlqWuOs/ZBn1e4Nmbipo3KGPHK7DJY75r/j7CQCxhrOFQ==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-transform/binding-linux-s390x-gnu@0.117.0':
     resolution: {integrity: sha512-qT//IAPLvse844t99Kff5j055qEbXfwzWgvCMb0FyjisnB8foy25iHZxZIocNBe6qwrCYWUP1M8rNrB/WyfS1Q==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-transform/binding-linux-x64-gnu@0.117.0':
     resolution: {integrity: sha512-2YEO5X+KgNzFqRVO5dAkhjcI5gwxus4NSWVl/+cs2sI6P0MNPjqE3VWPawl4RTC11LvetiiZdHcujUCPM8aaUw==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@oxc-transform/binding-linux-x64-musl@0.117.0':
     resolution: {integrity: sha512-3wqWbTSaIFZvDr1aqmTul4cg8PRWYh6VC52E8bLI7ytgS/BwJLW+sDUU2YaGIds4sAf/1yKeJRmudRCDPW9INg==}
     engines: {node: ^20.19.0 || >=22.12.0}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@oxc-transform/binding-openharmony-arm64@0.117.0':
     resolution: {integrity: sha512-Ebxx6NPqhzlrjvx4+PdSqbOq+li0f7X59XtJljDghkbJsbnkHvhLmPR09ifHt5X32UlZN63ekjwcg/nbmHLLlA==}
@@ -2900,36 +2953,42 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm-musl@2.5.6':
     resolution: {integrity: sha512-Ve3gUCG57nuUUSyjBq/MAM0CzArtuIOxsBdQ+ftz6ho8n7s1i9E1Nmk/xmP323r2YL0SONs1EuwqBp2u1k5fxg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-arm64-glibc@2.5.6':
     resolution: {integrity: sha512-f2g/DT3NhGPdBmMWYoxixqYr3v/UXcmLOYy16Bx0TM20Tchduwr4EaCbmxh1321TABqPGDpS8D/ggOTaljijOA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.5.6':
     resolution: {integrity: sha512-qb6naMDGlbCwdhLj6hgoVKJl2odL34z2sqkC7Z6kzir8b5W65WYDpLB6R06KabvZdgoHI/zxke4b3zR0wAbDTA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.5.6':
     resolution: {integrity: sha512-kbT5wvNQlx7NaGjzPFu8nVIW1rWqV780O7ZtkjuWaPUgpv2NMFpjYERVi0UYj1msZNyCzGlaCWEtzc+exjMGbQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.5.6':
     resolution: {integrity: sha512-1JRFeC+h7RdXwldHzTsmdtYR/Ku8SylLgTU/reMuqdVD7CtLwf0VR1FqeprZ0eHQkO0vqsbvFLXUmYm/uNKJBg==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-wasm@2.5.6':
     resolution: {integrity: sha512-byAiBZ1t3tXQvc8dMD/eoyE7lTXYorhn+6uVW5AC+JGI1KtJC/LvDche5cfUE+qiefH+Ybq0bUCJU0aB1cSHUA==}
@@ -3588,131 +3647,157 @@ packages:
     resolution: {integrity: sha512-Rn3n+FUk2J5VWx+ywrG/HGPTD9jXNbicRtTM11e/uorplArnXZYsVifnPPqNNP5BsO3roI4n8332ukpY/zN7rQ==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-gnueabihf@4.60.0':
     resolution: {integrity: sha512-RzeBwv0B3qtVBWtcuABtSuCzToo2IEAIQrcyB/b2zMvBWVbjo8bZDjACUpnaafaxhTw2W+imQbP2BD1usasK4g==}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm-musleabihf@4.55.1':
     resolution: {integrity: sha512-grPNWydeKtc1aEdrJDWk4opD7nFtQbMmV7769hiAaYyUKCT1faPRm2av8CX1YJsZ4TLAZcg9gTR1KvEzoLjXkg==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm-musleabihf@4.60.0':
     resolution: {integrity: sha512-Sf7zusNI2CIU1HLzuu9Tc5YGAHEZs5Lu7N1ssJG4Tkw6e0MEsN7NdjUDDfGNHy2IU+ENyWT+L2obgWiguWibWQ==}
     cpu: [arm]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-gnu@4.55.1':
     resolution: {integrity: sha512-a59mwd1k6x8tXKcUxSyISiquLwB5pX+fJW9TkWU46lCqD/GRDe9uDN31jrMmVP3feI3mhAdvcCClhV8V5MhJFQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-gnu@4.60.0':
     resolution: {integrity: sha512-DX2x7CMcrJzsE91q7/O02IJQ5/aLkVtYFryqCjduJhUfGKG6yJV8hxaw8pZa93lLEpPTP/ohdN4wFz7yp/ry9A==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-arm64-musl@4.55.1':
     resolution: {integrity: sha512-puS1MEgWX5GsHSoiAsF0TYrpomdvkaXm0CofIMG5uVkP6IBV+ZO9xhC5YEN49nsgYo1DuuMquF9+7EDBVYu4uA==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-arm64-musl@4.60.0':
     resolution: {integrity: sha512-09EL+yFVbJZlhcQfShpswwRZ0Rg+z/CsSELFCnPt3iK+iqwGsI4zht3secj5vLEs957QvFFXnzAT0FFPIxSrkQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-gnu@4.55.1':
     resolution: {integrity: sha512-r3Wv40in+lTsULSb6nnoudVbARdOwb2u5fpeoOAZjFLznp6tDU8kd+GTHmJoqZ9lt6/Sys33KdIHUaQihFcu7g==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-gnu@4.60.0':
     resolution: {integrity: sha512-i9IcCMPr3EXm8EQg5jnja0Zyc1iFxJjZWlb4wr7U2Wx/GrddOuEafxRdMPRYVaXjgbhvqalp6np07hN1w9kAKw==}
     cpu: [loong64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-loong64-musl@4.55.1':
     resolution: {integrity: sha512-MR8c0+UxAlB22Fq4R+aQSPBayvYa3+9DrwG/i1TKQXFYEaoW3B5b/rkSRIypcZDdWjWnpcvxbNaAJDcSbJU3Lw==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-loong64-musl@4.60.0':
     resolution: {integrity: sha512-DGzdJK9kyJ+B78MCkWeGnpXJ91tK/iKA6HwHxF4TAlPIY7GXEvMe8hBFRgdrR9Ly4qebR/7gfUs9y2IoaVEyog==}
     cpu: [loong64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-ppc64-gnu@4.55.1':
     resolution: {integrity: sha512-3KhoECe1BRlSYpMTeVrD4sh2Pw2xgt4jzNSZIIPLFEsnQn9gAnZagW9+VqDqAHgm1Xc77LzJOo2LdigS5qZ+gw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-gnu@4.60.0':
     resolution: {integrity: sha512-RwpnLsqC8qbS8z1H1AxBA1H6qknR4YpPR9w2XX0vo2Sz10miu57PkNcnHVaZkbqyw/kUWfKMI73jhmfi9BRMUQ==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-ppc64-musl@4.55.1':
     resolution: {integrity: sha512-ziR1OuZx0vdYZZ30vueNZTg73alF59DicYrPViG0NEgDVN8/Jl87zkAPu4u6VjZST2llgEUjaiNl9JM6HH1Vdw==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-ppc64-musl@4.60.0':
     resolution: {integrity: sha512-Z8pPf54Ly3aqtdWC3G4rFigZgNvd+qJlOE52fmko3KST9SoGfAdSRCwyoyG05q1HrrAblLbk1/PSIV+80/pxLg==}
     cpu: [ppc64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-gnu@4.55.1':
     resolution: {integrity: sha512-uW0Y12ih2XJRERZ4jAfKamTyIHVMPQnTZcQjme2HMVDAHY4amf5u414OqNYC+x+LzRdRcnIG1YodLrrtA8xsxw==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-gnu@4.60.0':
     resolution: {integrity: sha512-3a3qQustp3COCGvnP4SvrMHnPQ9d1vzCakQVRTliaz8cIp/wULGjiGpbcqrkv0WrHTEp8bQD/B3HBjzujVWLOA==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-riscv64-musl@4.55.1':
     resolution: {integrity: sha512-u9yZ0jUkOED1BFrqu3BwMQoixvGHGZ+JhJNkNKY/hyoEgOwlqKb62qu+7UjbPSHYjiVy8kKJHvXKv5coH4wDeg==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-riscv64-musl@4.60.0':
     resolution: {integrity: sha512-pjZDsVH/1VsghMJ2/kAaxt6dL0psT6ZexQVrijczOf+PeP2BUqTHYejk3l6TlPRydggINOeNRhvpLa0AYpCWSQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-s390x-gnu@4.55.1':
     resolution: {integrity: sha512-/0PenBCmqM4ZUd0190j7J0UsQ/1nsi735iPRakO8iPciE7BQ495Y6msPzaOmvx0/pn+eJVVlZrNrSh4WSYLxNg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-s390x-gnu@4.60.0':
     resolution: {integrity: sha512-3ObQs0BhvPgiUVZrN7gqCSvmFuMWvWvsjG5ayJ3Lraqv+2KhOsp+pUbigqbeWqueGIsnn+09HBw27rJ+gYK4VQ==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.55.1':
     resolution: {integrity: sha512-a8G4wiQxQG2BAvo+gU6XrReRRqj+pLS2NGXKm8io19goR+K8lw269eTrPkSdDTALwMmJp4th2Uh0D8J9bEV1vg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-gnu@4.60.0':
     resolution: {integrity: sha512-EtylprDtQPdS5rXvAayrNDYoJhIz1/vzN2fEubo3yLE7tfAw+948dO0g4M0vkTVFhKojnF+n6C8bDNe+gDRdTg==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@rollup/rollup-linux-x64-musl@4.55.1':
     resolution: {integrity: sha512-bD+zjpFrMpP/hqkfEcnjXWHMw5BIghGisOKPj+2NaNDuVT+8Ds4mPf3XcPHuat1tz89WRL+1wbcxKY3WSbiT7w==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-linux-x64-musl@4.60.0':
     resolution: {integrity: sha512-k09oiRCi/bHU9UVFqD17r3eJR9bn03TyKraCrlz5ULFJGdJGi7VOmm9jl44vOJvRJ6P7WuBi/s2A97LxxHGIdw==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@rollup/rollup-openbsd-x64@4.55.1':
     resolution: {integrity: sha512-eLXw0dOiqE4QmvikfQ6yjgkg/xDM+MdU9YJuP4ySTibXU0oAvnEWXt7UDJmD4UkYialMfOGFPJnIHSe/kdzPxg==}
@@ -3953,6 +4038,36 @@ packages:
     resolution: {integrity: sha512-i6NWUDi2SDikfSUeMJvJTRdwEKYSfTd+mvBO2Ja51S1YK+hnickBuDfD+RvPerIXLuyRu3GamgNPbNqgCGUg/Q==}
     engines: {node: '>= 18'}
 
+  '@shikijs/core@3.22.0':
+    resolution: {integrity: sha512-iAlTtSDDbJiRpvgL5ugKEATDtHdUVkqgHDm/gbD2ZS9c88mx7G1zSYjjOxp5Qa0eaW0MAQosFRmJSk354PRoQA==}
+
+  '@shikijs/core@3.23.0':
+    resolution: {integrity: sha512-NSWQz0riNb67xthdm5br6lAkvpDJRTgB36fxlo37ZzM2yq0PQFFzbd8psqC2XMPgCzo1fW6cVi18+ArJ44wqgA==}
+
+  '@shikijs/engine-javascript@3.23.0':
+    resolution: {integrity: sha512-aHt9eiGFobmWR5uqJUViySI1bHMqrAgamWE1TYSUoftkAeCCAiGawPMwM+VCadylQtF4V3VNOZ5LmfItH5f3yA==}
+
+  '@shikijs/engine-oniguruma@3.23.0':
+    resolution: {integrity: sha512-1nWINwKXxKKLqPibT5f4pAFLej9oZzQTsby8942OTlsJzOBZ0MWKiwzMsd+jhzu8YPCHAswGnnN1YtQfirL35g==}
+
+  '@shikijs/langs@3.23.0':
+    resolution: {integrity: sha512-2Ep4W3Re5aB1/62RSYQInK9mM3HsLeB91cHqznAJMuylqjzNVAVCMnNWRHFtcNHXsoNRayP9z1qj4Sq3nMqYXg==}
+
+  '@shikijs/themes@3.23.0':
+    resolution: {integrity: sha512-5qySYa1ZgAT18HR/ypENL9cUSGOeI2x+4IvYJu4JgVJdizn6kG4ia5Q1jDEOi7gTbN4RbuYtmHh0W3eccOrjMA==}
+
+  '@shikijs/transformers@3.22.0':
+    resolution: {integrity: sha512-E7eRV7mwDBjueLF6852n2oYeJYxBq3NSsDk+uyruYAXONv4U8holGmIrT+mPRJQ1J1SNOH6L8G19KRzmBawrFw==}
+
+  '@shikijs/types@3.22.0':
+    resolution: {integrity: sha512-491iAekgKDBFE67z70Ok5a8KBMsQ2IJwOWw3us/7ffQkIBCyOQfm/aNwVMBUriP02QshIfgHCBSIYAl3u2eWjg==}
+
+  '@shikijs/types@3.23.0':
+    resolution: {integrity: sha512-3JZ5HXOZfYjsYSk0yPwBrkupyYSLpAE26Qc0HLghhZNGTZg/SKxXIIgoxOpmmeQP0RRSDJTk1/vPfw9tbw+jSQ==}
+
+  '@shikijs/vscode-textmate@10.0.2':
+    resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
+
   '@sindresorhus/base62@1.0.0':
     resolution: {integrity: sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==}
     engines: {node: '>=18'}
@@ -4166,10 +4281,6 @@ packages:
   '@tokenizer/token@0.3.0':
     resolution: {integrity: sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==}
 
-  '@tootallnate/once@2.0.0':
-    resolution: {integrity: sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==}
-    engines: {node: '>= 10'}
-
   '@tybys/wasm-util@0.10.1':
     resolution: {integrity: sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==}
 
@@ -4403,6 +4514,9 @@ packages:
   '@types/web-bluetooth@0.0.20':
     resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
 
+  '@types/web-bluetooth@0.0.21':
+    resolution: {integrity: sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==}
+
   '@types/whatwg-mimetype@3.0.2':
     resolution: {integrity: sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==}
 
@@ -4574,41 +4688,49 @@ packages:
     resolution: {integrity: sha512-34gw7PjDGB9JgePJEmhEqBhWvCiiWCuXsL9hYphDF7crW7UgI05gyBAi6MF58uGcMOiOqSJ2ybEeCvHcq0BCmQ==}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-arm64-musl@1.11.1':
     resolution: {integrity: sha512-RyMIx6Uf53hhOtJDIamSbTskA99sPHS96wxVE/bJtePJJtpdKGXO1wY90oRdXuYOGOTuqjT8ACccMc4K6QmT3w==}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-linux-ppc64-gnu@1.11.1':
     resolution: {integrity: sha512-D8Vae74A4/a+mZH0FbOkFJL9DSK2R6TFPC9M+jCWYia/q2einCubX10pecpDiTmkJVUH+y8K3BZClycD8nCShA==}
     cpu: [ppc64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-gnu@1.11.1':
     resolution: {integrity: sha512-frxL4OrzOWVVsOc96+V3aqTIQl1O2TjgExV4EKgRY09AJ9leZpEg8Ak9phadbuX0BA4k8U5qtvMSQQGGmaJqcQ==}
     cpu: [riscv64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-riscv64-musl@1.11.1':
     resolution: {integrity: sha512-mJ5vuDaIZ+l/acv01sHoXfpnyrNKOk/3aDoEdLO/Xtn9HuZlDD6jKxHlkN8ZhWyLJsRBxfv9GYM2utQ1SChKew==}
     cpu: [riscv64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-linux-s390x-gnu@1.11.1':
     resolution: {integrity: sha512-kELo8ebBVtb9sA7rMe1Cph4QHreByhaZ2QEADd9NzIQsYNQpt9UkM9iqr2lhGr5afh885d/cB5QeTXSbZHTYPg==}
     cpu: [s390x]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-gnu@1.11.1':
     resolution: {integrity: sha512-C3ZAHugKgovV5YvAMsxhq0gtXuwESUKc5MhEtjBpLoHPLYM+iuwSj3lflFwK3DPm68660rZ7G8BMcwSro7hD5w==}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@unrs/resolver-binding-linux-x64-musl@1.11.1':
     resolution: {integrity: sha512-rV0YSoyhK2nZ4vEswT/QwqzqQXw5I6CjoaYMOX0TqBlWhojUf8P94mvI7nuJTeaCkkds3QE4+zS8Ko+GdXuZtA==}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@unrs/resolver-binding-wasm32-wasi@1.11.1':
     resolution: {integrity: sha512-5u4RkfxJm+Ng7IWgkzi3qrFOvLvQYnPBmjmZQ8+szTK/b31fQCnleNl1GgEt7nIsZRIf5PLhPwT0WM+q45x/UQ==}
@@ -4751,6 +4873,9 @@ packages:
   '@vue/devtools-api@7.7.9':
     resolution: {integrity: sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==}
 
+  '@vue/devtools-api@8.1.1':
+    resolution: {integrity: sha512-bsDMJ07b3GN1puVwJb/fyFnj/U2imyswK5UQVLZwVl7O05jDrt6BHxeG5XffmOOdasOj/bOmIjxJvGPxU7pcqw==}
+
   '@vue/devtools-core@8.1.0':
     resolution: {integrity: sha512-LvD1VgDpoHmYL00IgKRLKktF6SsPAb0yaV8wB8q2jRwsAWvqhS8+vsMLEGKNs7uoKyymXhT92dhxgf/wir6YGQ==}
     peerDependencies:
@@ -4762,12 +4887,18 @@ packages:
   '@vue/devtools-kit@8.1.0':
     resolution: {integrity: sha512-/NZlS4WtGIB54DA/z10gzk+n/V7zaqSzYZOVlg2CfdnpIKdB61bd7JDIMxf/zrtX41zod8E2/bbEBoW/d7x70Q==}
 
+  '@vue/devtools-kit@8.1.1':
+    resolution: {integrity: sha512-gVBaBv++i+adg4JpH71k9ppl4soyR7Y2McEqO5YNgv0BI1kMZ7BDX5gnwkZ5COYgiCyhejZG+yGNrBAjj6Coqg==}
+
   '@vue/devtools-shared@7.7.9':
     resolution: {integrity: sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==}
 
   '@vue/devtools-shared@8.1.0':
     resolution: {integrity: sha512-h8uCb4Qs8UT8VdTT5yjY6tOJ//qH7EpxToixR0xqejR55t5OdISIg7AJ7eBkhBs8iu1qG5gY3QQNN1DF1EelAA==}
 
+  '@vue/devtools-shared@8.1.1':
+    resolution: {integrity: sha512-+h4ttmJYl/txpxHKaoZcaKpC+pvckgLzIDiSQlaQ7kKthKh8KuwoLW2D8hPJEnqKzXOvu15UHEoGyngAXCz0EQ==}
+
   '@vue/language-core@3.2.6':
     resolution: {integrity: sha512-xYYYX3/aVup576tP/23sEUpgiEnujrENaoNRbaozC1/MA9I6EGFQRJb4xrt/MmUCAGlxTKL2RmT8JLTPqagCkg==}
 
@@ -4797,9 +4928,59 @@ packages:
   '@vueuse/core@10.11.1':
     resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
 
+  '@vueuse/core@14.3.0':
+    resolution: {integrity: sha512-aHfz47g0ZhMtTVHmIzMVpJy8ePhhOy68GY5bv110+5DVtZ+W7BsOx+m61UNQqfrWyPztIHIanWa3E2tib3NFIw==}
+    peerDependencies:
+      vue: ^3.5.0
+
+  '@vueuse/integrations@14.3.0':
+    resolution: {integrity: sha512-76I5FT2ESvCmCaSwapI+a/u/CFtNXmzl9f9lNp1hRtx8vKB8hfiokJr8IvQqcQG5ckGXElyXK516b54ozV3MvA==}
+    peerDependencies:
+      async-validator: ^4
+      axios: ^1
+      change-case: ^5
+      drauu: ^0.4
+      focus-trap: ^7 || ^8
+      fuse.js: ^7
+      idb-keyval: ^6
+      jwt-decode: ^4
+      nprogress: ^0.2
+      qrcode: ^1.5
+      sortablejs: ^1
+      universal-cookie: ^7 || ^8
+      vue: ^3.5.0
+    peerDependenciesMeta:
+      async-validator:
+        optional: true
+      axios:
+        optional: true
+      change-case:
+        optional: true
+      drauu:
+        optional: true
+      focus-trap:
+        optional: true
+      fuse.js:
+        optional: true
+      idb-keyval:
+        optional: true
+      jwt-decode:
+        optional: true
+      nprogress:
+        optional: true
+      qrcode:
+        optional: true
+      sortablejs:
+        optional: true
+      universal-cookie:
+        optional: true
+
   '@vueuse/metadata@10.11.1':
     resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
 
+  '@vueuse/metadata@14.3.0':
+    resolution: {integrity: sha512-BwxmbAzwAVF50+MW57GXOUEV61nFBGnlBvrTqj49PqWJu3uw7hdu72ztXeZ33RdZtDY6kO+bfCAE1PCn88Tktw==}
+
   '@vueuse/nuxt@10.11.1':
     resolution: {integrity: sha512-UiaYSIwOkmUVn8Gl1AqtLWYR12flO+8sEu9X0Y1fNjSR7EWy9jMuiCvOGqwtoeTsqfHrivl0d5HfMzr11GFnMA==}
     peerDependencies:
@@ -4808,6 +4989,11 @@ packages:
   '@vueuse/shared@10.11.1':
     resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
 
+  '@vueuse/shared@14.3.0':
+    resolution: {integrity: sha512-bZpge9eSXwa4ToSiqJ7j6KRwhAsneMFoSz3LMWKQDkqimm3D/tbFlrklrs/IOqC8tEcYmXQZJ6N0UrjhBirVCg==}
+    peerDependencies:
+      vue: ^3.5.0
+
   '@xmldom/xmldom@0.8.11':
     resolution: {integrity: sha512-cQzWCtO6C8TQiYl1ruKNn2U6Ao4o4WBBcbL61yJl84x+j5sOWWFU9X7DpND8XZG3daDppSsigMdfAIl2upQBRw==}
     engines: {node: '>=10.0.0'}
@@ -4917,19 +5103,9 @@ packages:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
     engines: {node: '>= 8'}
 
-  app-builder-bin@4.0.0:
-    resolution: {integrity: sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==}
-
   app-builder-bin@5.0.0-alpha.12:
     resolution: {integrity: sha512-j87o0j6LqPL3QRr8yid6c+Tt5gC7xNfYo6uQIQkorAC6MpeayVMZrEDzKmJJ/Hlv7EnOQpaRm53k6ktDYZyB6w==}
 
-  app-builder-lib@24.13.3:
-    resolution: {integrity: sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      dmg-builder: 24.13.3
-      electron-builder-squirrel-windows: 24.13.3
-
   app-builder-lib@26.8.1:
     resolution: {integrity: sha512-p0Im/Dx5C4tmz8QEE1Yn4MkuPC8PrnlRneMhWJj7BBXQfNTJUshM/bp3lusdEsDbvvfJZpXWnYesgSLvwtM2Zw==}
     engines: {node: '>=14.0.0'}
@@ -4937,22 +5113,10 @@ packages:
       dmg-builder: 26.8.1
       electron-builder-squirrel-windows: 26.8.1
 
-  archiver-utils@2.1.0:
-    resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
-    engines: {node: '>= 6'}
-
-  archiver-utils@3.0.4:
-    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
-    engines: {node: '>= 10'}
-
   archiver-utils@5.0.2:
     resolution: {integrity: sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==}
     engines: {node: '>= 14'}
 
-  archiver@5.3.2:
-    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
-    engines: {node: '>= 10'}
-
   archiver@7.0.1:
     resolution: {integrity: sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==}
     engines: {node: '>= 14'}
@@ -4964,6 +5128,9 @@ packages:
   arg@5.0.2:
     resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
 
+  argparse@1.0.10:
+    resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
+
   argparse@2.0.1:
     resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
 
@@ -5183,12 +5350,6 @@ packages:
   bl@4.1.0:
     resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
 
-  bluebird-lst@1.0.9:
-    resolution: {integrity: sha512-7B1Rtx82hjnSD4PGLAjVWeYH3tHAcVUmChh85a3lltKQm6FresXh9ErQo6oAv6CqxttczC3/kEg8SY5NluPuUw==}
-
-  bluebird@3.7.2:
-    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-
   body-parser@2.2.2:
     resolution: {integrity: sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==}
     engines: {node: '>=18'}
@@ -5210,6 +5371,10 @@ packages:
     resolution: {integrity: sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==}
     engines: {node: 20 || >=22}
 
+  brace-expansion@5.0.5:
+    resolution: {integrity: sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==}
+    engines: {node: 18 || 20 || >=22}
+
   braces@3.0.3:
     resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
     engines: {node: '>=8'}
@@ -5226,10 +5391,6 @@ packages:
     resolution: {integrity: sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==}
     engines: {node: '>=8.0.0'}
 
-  buffer-equal@1.0.1:
-    resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==}
-    engines: {node: '>=0.4'}
-
   buffer-from@1.1.2:
     resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
 
@@ -5243,17 +5404,10 @@ packages:
     resolution: {integrity: sha512-lHblz4ahamxpTmnsk+MNTRWsjYKv965MwOrSJyeD588rR3Jcu7swE+0wN5F+PbL5cjgu/9ObkhfzEPuofEMwLA==}
     engines: {node: '>=10.0.0'}
 
-  builder-util-runtime@9.2.4:
-    resolution: {integrity: sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==}
-    engines: {node: '>=12.0.0'}
-
   builder-util-runtime@9.5.1:
     resolution: {integrity: sha512-qt41tMfgHTllhResqM5DcnHyDIWNgzHvuY2jDcYP9iaGpkWxTUzV6GQjDeLnlR1/DtdlcsWQbA7sByMpmJFTLQ==}
     engines: {node: '>=12.0.0'}
 
-  builder-util@24.13.1:
-    resolution: {integrity: sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==}
-
   builder-util@26.8.1:
     resolution: {integrity: sha512-pm1lTYbGyc90DHgCDO7eo8Rl4EqKLciayNbZqGziqnH9jrlKe8ZANGdityLZU+pJh16dfzjAx2xQq9McuIPEtw==}
 
@@ -5386,10 +5540,6 @@ packages:
     resolution: {integrity: sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==}
     engines: {node: '>= 20.19.0'}
 
-  chownr@2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: '>=10'}
-
   chownr@3.0.0:
     resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
     engines: {node: '>=18'}
@@ -5397,10 +5547,6 @@ packages:
   chromium-pickle-js@0.2.0:
     resolution: {integrity: sha512-1R5Fho+jBq0DDydt+/vHWj5KJNJCKdARKOCwZUen84I5BreWoLqRLANH1U87eJy1tiASPtMnGqJJq0ZsLoRPOw==}
 
-  ci-info@3.9.0:
-    resolution: {integrity: sha512-NIxF55hv4nSqQswkAeiOi1r83xy8JldOFDTWiug55KBu9Jnblncd2U6ViHmYgHf01TPZS77NJBhBMKdWj9HQMQ==}
-    engines: {node: '>=8'}
-
   ci-info@4.3.1:
     resolution: {integrity: sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==}
     engines: {node: '>=8'}
@@ -5525,6 +5671,10 @@ packages:
     resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
     engines: {node: '>= 12'}
 
+  commander@9.5.0:
+    resolution: {integrity: sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==}
+    engines: {node: ^12.20.0 || >=14}
+
   comment-parser@1.4.5:
     resolution: {integrity: sha512-aRDkn3uyIlCFfk5NUA+VdwMmMsh8JGhc4hapfV4yxymHGQ3BVskMQfoXGpCo5IoBuQ9tS5iiVKhCpTcB4pW4qw==}
     engines: {node: '>= 12.0.0'}
@@ -5539,10 +5689,6 @@ packages:
   compatx@0.2.0:
     resolution: {integrity: sha512-6gLRNt4ygsi5NyMVhceOCFv14CIdDFN7fQjX1U4+47qVE/+kjPoXMK65KWK+dWxmFzMTuKazoQ9sch6pM0p5oA==}
 
-  compress-commons@4.1.2:
-    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
-    engines: {node: '>= 10'}
-
   compress-commons@6.0.2:
     resolution: {integrity: sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==}
     engines: {node: '>= 14'}
@@ -5556,9 +5702,6 @@ packages:
   confbox@0.2.4:
     resolution: {integrity: sha512-ysOGlgTFbN2/Y6Cg3Iye8YKulHw+R2fNXHrgSmXISQdMnomY6eNDprVdW9R5xBguEqI954+S6709UyiO7B+6OQ==}
 
-  config-file-ts@0.2.6:
-    resolution: {integrity: sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==}
-
   consola@3.4.2:
     resolution: {integrity: sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==}
     engines: {node: ^14.18.0 || >=16.10.0}
@@ -5628,10 +5771,6 @@ packages:
     engines: {node: '>=0.8'}
     hasBin: true
 
-  crc32-stream@4.0.3:
-    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
-    engines: {node: '>= 10'}
-
   crc32-stream@6.0.0:
     resolution: {integrity: sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==}
     engines: {node: '>= 14'}
@@ -5650,6 +5789,9 @@ packages:
     resolution: {integrity: sha512-M06cKwRIN46AyuM8BOmF1HUkBTkd3/h7uYImnrH1T3wtRKBGOibVo3jZ42VheEvx8LtgZbG/4GI35vfIxYxMug==}
     hasBin: true
 
+  cross-dirname@0.1.0:
+    resolution: {integrity: sha512-+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==}
+
   cross-spawn@7.0.6:
     resolution: {integrity: sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==}
     engines: {node: '>= 8'}
@@ -6032,9 +6174,6 @@ packages:
     resolution: {integrity: sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==}
     engines: {node: '>=0.3.1'}
 
-  dir-compare@3.3.0:
-    resolution: {integrity: sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==}
-
   dir-compare@4.2.0:
     resolution: {integrity: sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==}
 
@@ -6078,9 +6217,6 @@ packages:
     resolution: {integrity: sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==}
     engines: {node: '>=12'}
 
-  dotenv-expand@5.1.0:
-    resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==}
-
   dotenv@16.6.1:
     resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
     engines: {node: '>=12'}
@@ -6089,10 +6225,6 @@ packages:
     resolution: {integrity: sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==}
     engines: {node: '>=12'}
 
-  dotenv@9.0.2:
-    resolution: {integrity: sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==}
-    engines: {node: '>=10'}
-
   dunder-proto@1.0.1:
     resolution: {integrity: sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==}
     engines: {node: '>= 0.4'}
@@ -6111,17 +6243,14 @@ packages:
     engines: {node: '>=0.10.0'}
     hasBin: true
 
-  electron-builder-squirrel-windows@24.13.3:
-    resolution: {integrity: sha512-oHkV0iogWfyK+ah9ZIvMDpei1m9ZRpdXcvde1wTpra2U8AFDNNpqJdnin5z+PM1GbQ5BoaKCWas2HSjtR0HwMg==}
+  electron-builder-squirrel-windows@26.8.1:
+    resolution: {integrity: sha512-o288fIdgPLHA76eDrFADHPoo7VyGkDCYbLV1GzndaMSAVBoZrGvM9m2IehdcVMzdAZJ2eV9bgyissQXHv5tGzA==}
 
   electron-builder@26.8.1:
     resolution: {integrity: sha512-uWhx1r74NGpCagG0ULs/P9Nqv2nsoo+7eo4fLUOB8L8MdWltq9odW/uuLXMFCDGnPafknYLZgjNX0ZIFRzOQAw==}
     engines: {node: '>=14.0.0'}
     hasBin: true
 
-  electron-publish@24.13.1:
-    resolution: {integrity: sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==}
-
   electron-publish@26.8.1:
     resolution: {integrity: sha512-q+jrSTIh/Cv4eGZa7oVR+grEJo/FoLMYBAnSL5GCtqwUpr1T+VgKB/dn1pnzxIxqD8S/jP1yilT9VrwCqINR4w==}
 
@@ -6142,6 +6271,10 @@ packages:
       '@swc/core':
         optional: true
 
+  electron-winstaller@5.4.0:
+    resolution: {integrity: sha512-bO3y10YikuUwUuDUQRM4KfwNkKhnpVO7IPdbsrejwN9/AABJzzTQ4GeHwyzNSrVO+tEH3/Np255a3sVZpZDjvg==}
+    engines: {node: '>=8.0.0'}
+
   electron@40.3.0:
     resolution: {integrity: sha512-ZaDkTZpNHr863tyZHieoqbaiLI0e3RVCXoEC5y1Ld70/Q5H1mPV9d5TK0h1dWtaSFVOW0w8iDvtdLwAXtasXpg==}
     engines: {node: '>= 12.20.55'}
@@ -6596,6 +6729,10 @@ packages:
   exsolve@1.0.8:
     resolution: {integrity: sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==}
 
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
   extend@3.0.2:
     resolution: {integrity: sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==}
 
@@ -6668,6 +6805,9 @@ packages:
   fastq@1.20.1:
     resolution: {integrity: sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==}
 
+  fault@2.0.1:
+    resolution: {integrity: sha512-WtySTkS4OKev5JtpHXnib4Gxiurzh5NCGvWrFaZ34m6JehfTUhKZvn9njTfw48t6JumVQOmrKqpmGcdwxnhqBQ==}
+
   fd-package-json@2.0.0:
     resolution: {integrity: sha512-jKmm9YtsNXN789RS/0mSzOC1NUq9mkVd65vbSSVsKdjGvYXBuE4oWe2QOEoFeRmJg+lPuZxpmrfFclNhoRMneQ==}
 
@@ -6735,6 +6875,9 @@ packages:
   flatted@3.3.3:
     resolution: {integrity: sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==}
 
+  focus-trap@8.2.0:
+    resolution: {integrity: sha512-CaBdQ9P4fa/yCA6pDf/3aJd8bf9IOG5QGK21/E+86o2V4V8kzXaR4A9E6tNR7KkkS1+T5ZIU1tJDBDLwsucz9g==}
+
   follow-redirects@1.15.11:
     resolution: {integrity: sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==}
     engines: {node: '>=4.0'}
@@ -6756,6 +6899,10 @@ packages:
     resolution: {integrity: sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==}
     engines: {node: '>= 6'}
 
+  format@0.2.2:
+    resolution: {integrity: sha512-wzsgA6WOq+09wrU1tsJ09udeR/YZRaeArL9e1wPbFg3GG2yDnC2ldKpxs4xunpFF9DgqCqOIra3bc1HWrJ37Ww==}
+    engines: {node: '>=0.4.x'}
+
   formatly@0.3.0:
     resolution: {integrity: sha512-9XNj/o4wrRFyhSMJOvsuyMwy8aUfBaZ1VrqHVfohyXf0Sw0e+yfKG+xZaY3arGCOMdwFsqObtzVOc1gU9KiT9w==}
     engines: {node: '>=18.3.0'}
@@ -6793,9 +6940,6 @@ packages:
     resolution: {integrity: sha512-Rx/WycZ60HOaqLKAi6cHRKKI7zxWbJ31MhntmtwMoaTeF7XFH9hhBp8vITaMidfljRQ6eYWCKkaTK+ykVJHP2A==}
     engines: {node: '>= 0.8'}
 
-  fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-
   fs-extra@10.1.0:
     resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
     engines: {node: '>=12'}
@@ -6804,6 +6948,10 @@ packages:
     resolution: {integrity: sha512-VWSRii4t0AFm6ixFFmLLx1t7wS1gh+ckoa84aOeapGum0h+EZd1EhEumSB+ZdDLnEPuucsVB9oB7cxJHap6Afg==}
     engines: {node: '>=14.14'}
 
+  fs-extra@7.0.1:
+    resolution: {integrity: sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==}
+    engines: {node: '>=6 <7 || >=8'}
+
   fs-extra@8.1.0:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
@@ -6812,10 +6960,6 @@ packages:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
 
-  fs-minipass@2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: '>= 8'}
-
   fs-minipass@3.0.3:
     resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -6978,6 +7122,10 @@ packages:
   graceful-fs@4.2.11:
     resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
 
+  gray-matter@4.0.3:
+    resolution: {integrity: sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==}
+    engines: {node: '>=6.0'}
+
   gzip-size@7.0.0:
     resolution: {integrity: sha512-O1Ld7Dr+nqPnmGpdhzLmMTQ4vAsD+rHwMm1NLUmoUFFymBOMKxCCrtDxqdBRYXdeEPEi3SyoR4TizJLQrnKBNA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
@@ -7039,6 +7187,9 @@ packages:
   hast-util-sanitize@5.0.2:
     resolution: {integrity: sha512-3yTWghByc50aGS7JlGhk61SPenfE/p1oaFeNwkOOyrscaOkMGrcW9+Cy/QAIOBpZxP1yqDIzFMR0+Np0i0+usg==}
 
+  hast-util-to-html@9.0.5:
+    resolution: {integrity: sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==}
+
   hast-util-to-jsx-runtime@2.3.6:
     resolution: {integrity: sha512-zl6s8LwNyo1P9uw+XJGvZtdFF1GdAkOg8ujOw+4Pyb76874fLps4ueHXDhXWdk6YHQ6OgUtinliG7RsYvCbbBg==}
 
@@ -7105,10 +7256,6 @@ packages:
     resolution: {integrity: sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==}
     engines: {node: '>= 0.8'}
 
-  http-proxy-agent@5.0.0:
-    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
-    engines: {node: '>= 6'}
-
   http-proxy-agent@7.0.2:
     resolution: {integrity: sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==}
     engines: {node: '>= 14'}
@@ -7284,10 +7431,6 @@ packages:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
 
-  is-ci@3.0.1:
-    resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
-    hasBin: true
-
   is-core-module@2.16.1:
     resolution: {integrity: sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==}
     engines: {node: '>= 0.4'}
@@ -7308,6 +7451,10 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     hasBin: true
 
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
   is-extglob@2.1.1:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
@@ -7531,6 +7678,10 @@ packages:
   js-tokens@9.0.1:
     resolution: {integrity: sha512-mxa9E9ITFOt0ban3j6L5MpjwegGz6lBQmM1IJkWeBZGcMxto50+eWdjC/52xDbS2vy0k7vIMK0Fe2wfL9OQSpQ==}
 
+  js-yaml@3.14.2:
+    resolution: {integrity: sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==}
+    hasBin: true
+
   js-yaml@4.1.1:
     resolution: {integrity: sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==}
     hasBin: true
@@ -7609,6 +7760,10 @@ packages:
   khroma@2.1.0:
     resolution: {integrity: sha512-Ls993zuzfayK269Svk9hzpeGUKob/sIgZzyHYdjQoAdQetRKpOLj+k/QQQ/6Qi0Yz65mlROrfd+Ev+1+7dz9Kw==}
 
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
   kleur@4.1.5:
     resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
     engines: {node: '>=6'}
@@ -7729,15 +7884,9 @@ packages:
   lodash.defaults@4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
 
-  lodash.difference@4.5.0:
-    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
-
   lodash.escaperegexp@4.1.2:
     resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
 
-  lodash.flatten@4.4.0:
-    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
-
   lodash.isarguments@3.1.0:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
 
@@ -7745,18 +7894,12 @@ packages:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
     deprecated: This package is deprecated. Use require('node:util').isDeepStrictEqual instead.
 
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
   lodash.memoize@4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
 
   lodash.merge@4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
-  lodash.union@4.6.0:
-    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
-
   lodash.uniq@4.5.0:
     resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
 
@@ -7835,6 +7978,9 @@ packages:
     resolution: {integrity: sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==}
     engines: {node: ^18.17.0 || >=20.5.0}
 
+  mark.js@8.11.1:
+    resolution: {integrity: sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==}
+
   markdown-it@14.1.1:
     resolution: {integrity: sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==}
     hasBin: true
@@ -7842,6 +7988,10 @@ packages:
   markdown-table@3.0.4:
     resolution: {integrity: sha512-wiYz4+JrLyb/DqW2hkFJxP7Vd7JuTDm77fvbM8VfEQdmSMqcImWeeRbHwZjBjIFki/VaMK2BhFi7oUUZeM5bqw==}
 
+  markdown-title@1.0.2:
+    resolution: {integrity: sha512-MqIQVVkz+uGEHi3TsHx/czcxxCbRIL7sv5K5DnYw/tI+apY54IbPefV/cmgxp6LoJSEx/TqcHdLs/298afG5QQ==}
+    engines: {node: '>=6'}
+
   marked@16.4.2:
     resolution: {integrity: sha512-TI3V8YYWvkVf3KJe1dRkpnjs68JUPyEa5vjKrp1XEEJUAOaQc+Qj+L1qWbPd0SJuAdQkFU0h73sXXqwDYxsiDA==}
     engines: {node: '>= 20'}
@@ -7870,6 +8020,12 @@ packages:
   mdast-util-from-markdown@2.0.2:
     resolution: {integrity: sha512-uZhTV/8NBuw0WHkPTrCqDOl0zVe1BIng5ZtHoDk49ME1qqcjYmmLmOf0gELgcRMxN4w2iuIeVso5/6QymSrgmA==}
 
+  mdast-util-from-markdown@2.0.3:
+    resolution: {integrity: sha512-W4mAWTvSlKvf8L6J+VN9yLSqQ9AOAAvHuoDAmPkz4dHf553m5gVj2ejadHJhoJmcmxEnOv6Pa8XJhpxE93kb8Q==}
+
+  mdast-util-frontmatter@2.0.1:
+    resolution: {integrity: sha512-LRqI9+wdgC25P0URIJY9vwocIzCcksduHQ9OF2joxQoyTNVduwLAFUzjoopuRJbJAReaKrNQKAZKL3uCMugWJA==}
+
   mdast-util-gfm-autolink-literal@2.0.1:
     resolution: {integrity: sha512-5HVP2MKaP6L+G6YaxPNjuL0BPrq9orG3TsrZ9YXbA3vDw/ACI4MEsnoDpn6ZNm7GnZgtAcONJyPhOP8tNJQavQ==}
 
@@ -7922,6 +8078,9 @@ packages:
     resolution: {integrity: sha512-aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw==}
     engines: {node: '>= 0.8'}
 
+  medium-zoom@1.1.0:
+    resolution: {integrity: sha512-ewyDsp7k4InCUp3jRmwHBRFGyjBimKps/AJLjRSox+2q/2H4p/PNpQf+pwONWlJiOudkBXtbdmVbFjqyybfTmQ==}
+
   merge-descriptors@2.0.0:
     resolution: {integrity: sha512-Snk314V5ayFLhp3fkUREub6WtjBfPdCPY1Ln8/8munuLuiYhsABgBVWsozAG+MWMbVEvcdcpbi9R7ww22l9Q3g==}
     engines: {node: '>=18'}
@@ -7939,6 +8098,9 @@ packages:
   micromark-core-commonmark@2.0.3:
     resolution: {integrity: sha512-RDBrHEMSxVFLg6xvnXmb1Ayr2WzLAWjeSATAoxwKYJV94TeNavgoIdA0a9ytzDSVzBy2YKFK+emCPOEibLeCrg==}
 
+  micromark-extension-frontmatter@2.0.0:
+    resolution: {integrity: sha512-C4AkuM3dA58cgZha7zVnuVxBhDsbttIMiytjgsM2XbHAB2faRVaHRle40558FBN+DJcrLNCoqG5mlrpdU4cRtg==}
+
   micromark-extension-gfm-autolink-literal@2.1.0:
     resolution: {integrity: sha512-oOg7knzhicgQ3t4QCjCWgTmfNhvQbDDnJeVu9v81r7NltNCVmhPy1fJRX27pISafdjL+SVc4d3l48Gb6pbRypw==}
 
@@ -8024,6 +8186,10 @@ packages:
     resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
     engines: {node: '>=8.6'}
 
+  millify@6.1.0:
+    resolution: {integrity: sha512-H/E3J6t+DQs/F2YgfDhxUVZz/dF8JXPPKTLHL/yHCcLZLtCXJDUaqvhJXQwqOVBvbyNn4T0WjLpIHd7PAw7fBA==}
+    hasBin: true
+
   mime-db@1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
@@ -8083,6 +8249,10 @@ packages:
     resolution: {integrity: sha512-+G4CpNBxa5MprY+04MbgOw1v7So6n5JY166pFi9KfYwT78fxScCeSNQSNzp6dpPSW2rONOps6Ocam1wFhCgoVw==}
     engines: {node: 18 || 20 || >=22}
 
+  minimatch@10.2.5:
+    resolution: {integrity: sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==}
+    engines: {node: 18 || 20 || >=22}
+
   minimatch@3.1.3:
     resolution: {integrity: sha512-M2GCs7Vk83NxkUyQV1bkABc4yxgz9kILhHImZiBPAZ9ybuvCb0/H7lEl5XvIg3g+9d4eNotkZA5IWwYl0tibaA==}
 
@@ -8121,10 +8291,6 @@ packages:
     resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==}
     engines: {node: '>=8'}
 
-  minipass@5.0.0:
-    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
-    engines: {node: '>=8'}
-
   minipass@7.1.2:
     resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
     engines: {node: '>=16 || 14 >=14.17'}
@@ -8133,9 +8299,8 @@ packages:
     resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minizlib@2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: '>= 8'}
+  minisearch@7.2.0:
+    resolution: {integrity: sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==}
 
   minizlib@3.1.0:
     resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
@@ -8144,9 +8309,8 @@ packages:
   mitt@3.0.1:
     resolution: {integrity: sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==}
 
-  mkdirp@1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
+  mkdirp@0.5.6:
+    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
 
   mlly@1.8.2:
@@ -8409,6 +8573,12 @@ packages:
     resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
     engines: {node: '>=18'}
 
+  oniguruma-parser@0.12.2:
+    resolution: {integrity: sha512-6HVa5oIrgMC6aA6WF6XyyqbhRPJrKR02L20+2+zpDtO5QAzGHAUGw5TKQvwi5vctNnRHkJYmjAhRVQF2EKdTQw==}
+
+  oniguruma-to-es@4.3.6:
+    resolution: {integrity: sha512-csuQ9x3Yr0cEIs/Zgx/OEt9iBw9vqIunAPQkx19R/fiMq2oGVTgcMqO/V3Ybqefr1TBvosI6jU539ksaBULJyA==}
+
   open@10.2.0:
     resolution: {integrity: sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==}
     engines: {node: '>=18'}
@@ -8547,6 +8717,9 @@ packages:
     resolution: {integrity: sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==}
     engines: {node: 18 || 20 || >=22}
 
+  path-to-regexp@6.3.0:
+    resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
+
   path-to-regexp@8.3.0:
     resolution: {integrity: sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==}
 
@@ -8901,6 +9074,11 @@ packages:
     resolution: {integrity: sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==}
     engines: {node: '>=0.10.0'}
 
+  postject@1.0.0-alpha.6:
+    resolution: {integrity: sha512-b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
   powershell-utils@0.1.0:
     resolution: {integrity: sha512-dM0jVuXJPsDN6DvRpea484tCUaMiXWjuCn++HGTqUWzGDjv5tZkEZldAJ/UMlqRYGFrD/etByo4/xOuC/snX2A==}
     engines: {node: '>=20'}
@@ -9214,10 +9392,6 @@ packages:
   read-cache@1.0.0:
     resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
 
-  read-config-file@6.3.2:
-    resolution: {integrity: sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==}
-    engines: {node: '>=12.0.0'}
-
   readable-stream@2.3.8:
     resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
 
@@ -9264,6 +9438,15 @@ packages:
     resolution: {integrity: sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==}
     engines: {node: '>= 0.4'}
 
+  regex-recursion@6.0.2:
+    resolution: {integrity: sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==}
+
+  regex-utilities@2.3.0:
+    resolution: {integrity: sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==}
+
+  regex@6.1.0:
+    resolution: {integrity: sha512-6VwtthbV4o/7+OaAF9I5L5V3llLEsoPyq9P1JVXkedTP33c7MfCG0/5NOPcSJn0TzXcG9YUrR0gQSWioew3LDg==}
+
   regexp-ast-analysis@0.7.1:
     resolution: {integrity: sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
@@ -9289,6 +9472,9 @@ packages:
   rehype-sanitize@6.0.0:
     resolution: {integrity: sha512-CsnhKNsyI8Tub6L4sm5ZFsme4puGfc6pYylvXo1AeqaGbjOYyzNv3qZPwvs0oMJ39eryyeOdmxwUIo94IpEhqg==}
 
+  remark-frontmatter@5.0.0:
+    resolution: {integrity: sha512-XTFYvNASMe5iPN0719nPrdItC9aU0ssC4v14mH1BCi1u0n1gAocqcujWUrByftZTbLhRtiKRyjYTSIOcr69UVQ==}
+
   remark-gfm@4.0.1:
     resolution: {integrity: sha512-1quofZ2RQ9EWdeN34S79+KExV1764+wCUGop5CPL1WGdD0ocPpu91lzPGbwWMECpEpd42kJGQwzRfyov9j4yNg==}
 
@@ -9301,6 +9487,9 @@ packages:
   remark-stringify@11.0.0:
     resolution: {integrity: sha512-1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==}
 
+  remark@15.0.1:
+    resolution: {integrity: sha512-Eht5w30ruCXgFmxVUSlNWQ9iiimq07URKeFS3hNc8cUWy1llX4KDWfyEDZRycMc+znsN9Ux5/tJ/BFdgdOwA3A==}
+
   require-directory@2.1.1:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
@@ -9373,6 +9562,11 @@ packages:
   rfdc@1.4.1:
     resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
 
+  rimraf@2.6.3:
+    resolution: {integrity: sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
   roarr@2.15.4:
     resolution: {integrity: sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==}
     engines: {node: '>=8.0'}
@@ -9479,6 +9673,10 @@ packages:
   scule@1.3.0:
     resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}
 
+  section-matter@1.0.0:
+    resolution: {integrity: sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==}
+    engines: {node: '>=4'}
+
   secure-json-parse@4.1.0:
     resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
 
@@ -9556,6 +9754,9 @@ packages:
     resolution: {integrity: sha512-ObmnIF4hXNg1BqhnHmgbDETF8dLPCggZWBjkQfhZpbszZnYur5DUljTcCHii5LC3J5E0yeO/1LIMyH+UvHQgyw==}
     engines: {node: '>= 0.4'}
 
+  shiki@3.23.0:
+    resolution: {integrity: sha512-55Dj73uq9ZXL5zyeRPzHQsK7Nbyt6Y10k5s7OjuFZGMhpp4r/rsLBH0o/0fstIzX1Lep9VxefWljK/SKCzygIA==}
+
   side-channel-list@1.0.0:
     resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
     engines: {node: '>= 0.4'}
@@ -9669,6 +9870,9 @@ packages:
     resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
     engines: {node: '>= 10.x'}
 
+  sprintf-js@1.0.3:
+    resolution: {integrity: sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==}
+
   sprintf-js@1.1.3:
     resolution: {integrity: sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==}
 
@@ -9786,6 +9990,10 @@ packages:
     resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==}
     engines: {node: '>=12'}
 
+  strip-bom-string@1.0.0:
+    resolution: {integrity: sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==}
+    engines: {node: '>=0.10.0'}
+
   strip-bom@3.0.0:
     resolution: {integrity: sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==}
     engines: {node: '>=4'}
@@ -9879,6 +10087,9 @@ packages:
     resolution: {integrity: sha512-ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==}
     engines: {node: '>=18'}
 
+  tabbable@6.4.0:
+    resolution: {integrity: sha512-05PUHKSNE8ou2dwIxTngl4EzcnsCDZGJ/iCLtDflR/SHB/ny14rXc+qU5P4mG9JkusiV7EivzY9Mhm55AzAvCg==}
+
   tagged-tag@1.0.0:
     resolution: {integrity: sha512-yEFYrVhod+hdNyx7g5Bnkkb0G6si8HJurOoOEgC8B/O0uXLHlaey/65KRv6cuWBNhBgHKAROVpc7QyYqE5gFng==}
     engines: {node: '>=20'}
@@ -9900,18 +10111,9 @@ packages:
     resolution: {integrity: sha512-b+u3CEM6FjDHru+nhUSjDofpWSBp2rINziJWgApm72wwGasQ/wKXftZe4tI2Y5HPv6OpzXSZHOFq87H4vfsgsw==}
     engines: {node: '>=6'}
 
-  tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
-
   tar-stream@3.1.8:
     resolution: {integrity: sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==}
 
-  tar@6.2.1:
-    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
-    engines: {node: '>=10'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
-
   tar@7.5.9:
     resolution: {integrity: sha512-BTLcK0xsDh2+PUe9F6c2TlRp4zOOBMTkoQHQIWSIzI0R7KG46uEwq4OPk2W7bZcprBMsuaeFsqwYr7pjh6CuHg==}
     engines: {node: '>=18'}
@@ -9922,6 +10124,10 @@ packages:
   temp-file@3.4.0:
     resolution: {integrity: sha512-C5tjlC/HCtVUOi3KWVokd4vHVViOmGjtLwIh4MuzPo/nMYTV/p1urt3RnMz2IWXDdKEGJH3k5+KPxtqRsUYGtg==}
 
+  temp@0.9.4:
+    resolution: {integrity: sha512-yYrrsWnrXMcdsnu/7YMYAofM1ktpL5By7vZhf15CrXijWWrEYZks5AXBudalfSWJLlnen/QUJUB5aoB0kqZUGA==}
+    engines: {node: '>=6.0.0'}
+
   terser@5.46.0:
     resolution: {integrity: sha512-jTwoImyr/QbOWFFso3YoU3ik0jBBDJ6JTOQiy/J2YxVJdZCc+5u7skhNwiOR3FQIygFqVUPHl7qbbxtjW2K3Qg==}
     engines: {node: '>=10'}
@@ -10015,6 +10221,9 @@ packages:
     resolution: {integrity: sha512-dRXchy+C0IgK8WPC6xvCHFRIWYUbqqdEIKPaKo/AcTUNzwLTK6AH7RjdLWsEZcAN/TBdtfUw3PYEgPr5VPr6ww==}
     engines: {node: '>=14.16'}
 
+  tokenx@1.3.0:
+    resolution: {integrity: sha512-NLdXTEZkKiO0gZuLtMoZKjCXTREXeZZt8nnnNeyoXtNZAfG/GKGSbQtLU5STspc0rMSwcA+UJfWZkbNU01iKmQ==}
+
   tosource@2.0.0-alpha.3:
     resolution: {integrity: sha512-KAB2lrSS48y91MzFPFuDg4hLbvDiyTjOVgaK7Erw+5AmZXNq4sFRVn8r6yxSLuNs15PaokrDRpS61ERY9uZOug==}
     engines: {node: '>=10'}
@@ -10219,6 +10428,9 @@ packages:
   unist-util-position@5.0.0:
     resolution: {integrity: sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==}
 
+  unist-util-remove@4.0.0:
+    resolution: {integrity: sha512-b4gokeGId57UVRX/eVKej5gXqGlc9+trkORhFJpu9raqZkZhU0zm8Doi05+HaiBsMEIJowL+2WtQ5ItjsngPXg==}
+
   unist-util-stringify-position@4.0.0:
     resolution: {integrity: sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==}
 
@@ -10228,6 +10440,9 @@ packages:
   unist-util-visit@5.0.0:
     resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
 
+  unist-util-visit@5.1.0:
+    resolution: {integrity: sha512-m+vIdyeCOpdr/QeQCu2EzxX/ohgS8KbnPDgFni4dQsfSCtpz8UqDyY5GjRru8PDKuYn7Fq19j1CQ+nJSsGKOzg==}
+
   universalify@0.1.2:
     resolution: {integrity: sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==}
     engines: {node: '>= 4.0.0'}
@@ -10578,6 +10793,30 @@ packages:
       yaml:
         optional: true
 
+  vitepress-codeblock-collapse@1.0.0:
+    resolution: {integrity: sha512-nTWQWItWhzSFy+3q2bdcLDimN9L9CXpNJCyqSOV7LVdD1+2G7PYbm+q4DlnMgu4H1yVBlxpUHo7snqSXCl6XsA==}
+    peerDependencies:
+      vue: ^3.3.0
+
+  vitepress-plugin-llms@1.12.2:
+    resolution: {integrity: sha512-hdklo7di6E2/MwlYstH7R5QgdPHX+f5G/fp8QBq6MCiw4DWi3IOKMaous0S839FIGsPjK3QHwK6KcFwCf/XzjA==}
+    engines: {node: '>=18.0.0'}
+
+  vitepress@2.0.0-alpha.17:
+    resolution: {integrity: sha512-Z3VPUpwk/bHYqt1uMVOOK1/4xFiWQov1GNc2FvMdz6kvje4JRXEOngVI9C+bi5jeedMSHiA4dwKkff1NCvbZ9Q==}
+    hasBin: true
+    peerDependencies:
+      markdown-it-mathjax3: ^4
+      oxc-minify: '*'
+      postcss: ^8
+    peerDependenciesMeta:
+      markdown-it-mathjax3:
+        optional: true
+      oxc-minify:
+        optional: true
+      postcss:
+        optional: true
+
   vitest@3.2.4:
     resolution: {integrity: sha512-LUCP5ev3GURDysTWiP47wRRUpLKMOfPh+yKTx3kVIEiu5KOMeqzpnYNsKyOoVrULivR8tLcks4+lga33Whn90A==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
@@ -10903,10 +11142,6 @@ packages:
   youch@4.1.0:
     resolution: {integrity: sha512-cYekNh2tUoU+voS11X0D0UQntVCSO6LQ1h10VriQGmfbpf0mnGTruwZICts23UUNiZCXm8H8hQBtRrdsbhuNNg==}
 
-  zip-stream@4.1.1:
-    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
-    engines: {node: '>= 10'}
-
   zip-stream@6.0.1:
     resolution: {integrity: sha512-zK7YHHz4ZXpW89AHXUPbQVGKI7uvkd3hzusTdotCg1UxyaVtg0zFJSTfW/Dq5f7OBBVnq6cZIaC8Ti4hb6dtCA==}
     engines: {node: '>= 14'}
@@ -11556,6 +11791,12 @@ snapshots:
       react: 19.2.4
       tslib: 2.8.1
 
+  '@docsearch/css@4.6.3': {}
+
+  '@docsearch/js@4.6.3': {}
+
+  '@docsearch/sidepanel-js@4.6.3': {}
+
   '@dxup/nuxt@0.4.0(magicast@0.5.2)(typescript@5.9.3)':
     dependencies:
       '@dxup/unimport': 0.1.2
@@ -11609,14 +11850,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/notarize@2.2.1':
-    dependencies:
-      debug: 4.4.3
-      fs-extra: 9.1.0
-      promise-retry: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
-
   '@electron/notarize@2.5.0':
     dependencies:
       debug: 4.4.3
@@ -11625,17 +11858,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/osx-sign@1.0.5':
-    dependencies:
-      compare-version: 0.1.2
-      debug: 4.4.3
-      fs-extra: 10.1.0
-      isbinaryfile: 4.0.10
-      minimist: 1.2.8
-      plist: 3.1.0
-    transitivePeerDependencies:
-      - supports-color
-
   '@electron/osx-sign@1.3.3':
     dependencies:
       compare-version: 0.1.2
@@ -11665,18 +11887,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@electron/universal@1.5.1':
-    dependencies:
-      '@electron/asar': 3.4.1
-      '@malept/cross-spawn-promise': 1.1.1
-      debug: 4.4.3
-      dir-compare: 3.3.0
-      fs-extra: 9.1.0
-      minimatch: 3.1.3
-      plist: 3.1.0
-    transitivePeerDependencies:
-      - supports-color
-
   '@electron/universal@2.0.3':
     dependencies:
       '@electron/asar': 3.4.1
@@ -11689,6 +11899,17 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  '@electron/windows-sign@1.2.2':
+    dependencies:
+      cross-dirname: 0.1.0
+      debug: 4.4.3
+      fs-extra: 11.3.3
+      minimist: 1.2.8
+      postject: 1.0.0-alpha.6
+    transitivePeerDependencies:
+      - supports-color
+    optional: true
+
   '@emnapi/core@1.8.1':
     dependencies:
       '@emnapi/wasi-threads': 1.1.0
@@ -12195,6 +12416,10 @@ snapshots:
 
   '@humanwhocodes/retry@0.4.3': {}
 
+  '@iconify-json/simple-icons@1.2.80':
+    dependencies:
+      '@iconify/types': 2.0.0
+
   '@iconify/collections@1.0.665':
     dependencies:
       '@iconify/types': 2.0.0
@@ -12454,10 +12679,6 @@ snapshots:
 
   '@lukeed/ms@2.0.2': {}
 
-  '@malept/cross-spawn-promise@1.1.1':
-    dependencies:
-      cross-spawn: 7.0.6
-
   '@malept/cross-spawn-promise@2.0.0':
     dependencies:
       cross-spawn: 7.0.6
@@ -12602,20 +12823,20 @@ snapshots:
 
   '@nuxt/devalue@2.0.2': {}
 
-  '@nuxt/devtools-kit@1.7.0(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))':
+  '@nuxt/devtools-kit@1.7.0(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
       '@nuxt/schema': 3.21.2
       execa: 7.2.0
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/devtools-kit@3.2.4(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))':
+  '@nuxt/devtools-kit@3.2.4(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@nuxt/kit': 4.4.2(magicast@0.5.2)
       execa: 8.0.1
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
     transitivePeerDependencies:
       - magicast
 
@@ -12630,9 +12851,9 @@ snapshots:
       pkg-types: 2.3.0
       semver: 7.7.4
 
-  '@nuxt/devtools@3.2.4(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))':
+  '@nuxt/devtools@3.2.4(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))':
     dependencies:
-      '@nuxt/devtools-kit': 3.2.4(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+      '@nuxt/devtools-kit': 3.2.4(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       '@nuxt/devtools-wizard': 3.2.4
       '@nuxt/kit': 4.4.2(magicast@0.5.2)
       '@vue/devtools-core': 8.1.0(vue@3.5.30(typescript@5.9.3))
@@ -12660,9 +12881,9 @@ snapshots:
       sirv: 3.0.2
       structured-clone-es: 2.0.0
       tinyglobby: 0.2.15
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
-      vite-plugin-inspect: 11.3.3(@nuxt/kit@4.4.2(magicast@0.5.2))(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
-      vite-plugin-vue-tracer: 1.3.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite-plugin-inspect: 11.3.3(@nuxt/kit@4.4.2(magicast@0.5.2))(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
+      vite-plugin-vue-tracer: 1.3.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
       which: 6.0.1
       ws: 8.20.0
     transitivePeerDependencies:
@@ -12711,10 +12932,10 @@ snapshots:
       - supports-color
       - typescript
 
-  '@nuxt/eslint@1.15.2(@typescript-eslint/utils@8.57.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.30)(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))':
+  '@nuxt/eslint@1.15.2(@typescript-eslint/utils@8.57.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.30)(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))':
     dependencies:
       '@eslint/config-inspector': 1.5.0(eslint@9.39.2(jiti@2.6.1))
-      '@nuxt/devtools-kit': 3.2.4(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+      '@nuxt/devtools-kit': 3.2.4(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       '@nuxt/eslint-config': 1.15.2(@typescript-eslint/utils@8.57.1(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3))(@vue/compiler-sfc@3.5.30)(eslint-import-resolver-node@0.3.9)(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@nuxt/eslint-plugin': 1.15.2(eslint@9.39.2(jiti@2.6.1))(typescript@5.9.3)
       '@nuxt/kit': 4.4.2(magicast@0.5.2)
@@ -12790,7 +13011,7 @@ snapshots:
     transitivePeerDependencies:
       - magicast
 
-  '@nuxt/nitro-server@3.21.2(db0@0.3.4)(encoding@0.1.13)(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(typescript@5.9.3)':
+  '@nuxt/nitro-server@3.21.2(db0@0.3.4)(encoding@0.1.13)(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(typescript@5.9.3)':
     dependencies:
       '@nuxt/devalue': 2.0.2
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
@@ -12808,7 +13029,7 @@ snapshots:
       klona: 2.0.6
       mocked-exports: 0.1.1
       nitropack: 2.13.2(encoding@0.1.13)(idb-keyval@6.2.2)
-      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2)
+      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2)
       ohash: 2.0.11
       pathe: 2.0.3
       pkg-types: 2.3.0
@@ -12873,7 +13094,7 @@ snapshots:
       rc9: 3.0.0
       std-env: 3.10.0
 
-  '@nuxt/vite-builder@3.21.2(@types/node@25.0.7)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3))(yaml@2.8.2)':
+  '@nuxt/vite-builder@3.21.2(@types/node@25.0.7)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3))(yaml@2.8.2)':
     dependencies:
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
       '@rollup/plugin-replace': 6.0.3(rollup@4.60.0)
@@ -12892,7 +13113,7 @@ snapshots:
       magic-string: 0.30.21
       mlly: 1.8.2
       mocked-exports: 0.1.1
-      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2)
+      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2)
       nypm: 0.6.5
       ohash: 2.0.11
       pathe: 2.0.3
@@ -14538,6 +14759,56 @@ snapshots:
       - rollup
       - supports-color
 
+  '@shikijs/core@3.22.0':
+    dependencies:
+      '@shikijs/types': 3.22.0
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+      hast-util-to-html: 9.0.5
+
+  '@shikijs/core@3.23.0':
+    dependencies:
+      '@shikijs/types': 3.23.0
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+      hast-util-to-html: 9.0.5
+
+  '@shikijs/engine-javascript@3.23.0':
+    dependencies:
+      '@shikijs/types': 3.23.0
+      '@shikijs/vscode-textmate': 10.0.2
+      oniguruma-to-es: 4.3.6
+
+  '@shikijs/engine-oniguruma@3.23.0':
+    dependencies:
+      '@shikijs/types': 3.23.0
+      '@shikijs/vscode-textmate': 10.0.2
+
+  '@shikijs/langs@3.23.0':
+    dependencies:
+      '@shikijs/types': 3.23.0
+
+  '@shikijs/themes@3.23.0':
+    dependencies:
+      '@shikijs/types': 3.23.0
+
+  '@shikijs/transformers@3.22.0':
+    dependencies:
+      '@shikijs/core': 3.22.0
+      '@shikijs/types': 3.22.0
+
+  '@shikijs/types@3.22.0':
+    dependencies:
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+
+  '@shikijs/types@3.23.0':
+    dependencies:
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+
+  '@shikijs/vscode-textmate@10.0.2': {}
+
   '@sindresorhus/base62@1.0.0': {}
 
   '@sindresorhus/is@4.6.0': {}
@@ -14773,8 +15044,6 @@ snapshots:
 
   '@tokenizer/token@0.3.0': {}
 
-  '@tootallnate/once@2.0.0': {}
-
   '@tybys/wasm-util@0.10.1':
     dependencies:
       tslib: 2.8.1
@@ -15059,6 +15328,8 @@ snapshots:
 
   '@types/web-bluetooth@0.0.20': {}
 
+  '@types/web-bluetooth@0.0.21': {}
+
   '@types/whatwg-mimetype@3.0.2': {}
 
   '@types/yauzl@2.10.3':
@@ -15529,6 +15800,10 @@ snapshots:
     dependencies:
       '@vue/devtools-kit': 7.7.9
 
+  '@vue/devtools-api@8.1.1':
+    dependencies:
+      '@vue/devtools-kit': 8.1.1
+
   '@vue/devtools-core@8.1.0(vue@3.5.30(typescript@5.9.3))':
     dependencies:
       '@vue/devtools-kit': 8.1.0
@@ -15552,12 +15827,21 @@ snapshots:
       hookable: 5.5.3
       perfect-debounce: 2.1.0
 
+  '@vue/devtools-kit@8.1.1':
+    dependencies:
+      '@vue/devtools-shared': 8.1.1
+      birpc: 2.9.0
+      hookable: 5.5.3
+      perfect-debounce: 2.1.0
+
   '@vue/devtools-shared@7.7.9':
     dependencies:
       rfdc: 1.4.1
 
   '@vue/devtools-shared@8.1.0': {}
 
+  '@vue/devtools-shared@8.1.1': {}
+
   '@vue/language-core@3.2.6':
     dependencies:
       '@volar/language-core': 2.4.28
@@ -15608,15 +15892,36 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
+  '@vueuse/core@14.3.0(vue@3.5.30(typescript@5.9.3))':
+    dependencies:
+      '@types/web-bluetooth': 0.0.21
+      '@vueuse/metadata': 14.3.0
+      '@vueuse/shared': 14.3.0(vue@3.5.30(typescript@5.9.3))
+      vue: 3.5.30(typescript@5.9.3)
+
+  '@vueuse/integrations@14.3.0(axios@1.13.6)(change-case@5.4.4)(focus-trap@8.2.0)(fuse.js@7.1.0)(idb-keyval@6.2.2)(vue@3.5.30(typescript@5.9.3))':
+    dependencies:
+      '@vueuse/core': 14.3.0(vue@3.5.30(typescript@5.9.3))
+      '@vueuse/shared': 14.3.0(vue@3.5.30(typescript@5.9.3))
+      vue: 3.5.30(typescript@5.9.3)
+    optionalDependencies:
+      axios: 1.13.6(debug@4.4.3)
+      change-case: 5.4.4
+      focus-trap: 8.2.0
+      fuse.js: 7.1.0
+      idb-keyval: 6.2.2
+
   '@vueuse/metadata@10.11.1': {}
 
-  '@vueuse/nuxt@10.11.1(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))':
+  '@vueuse/metadata@14.3.0': {}
+
+  '@vueuse/nuxt@10.11.1(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))':
     dependencies:
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
       '@vueuse/core': 10.11.1(vue@3.5.30(typescript@5.9.3))
       '@vueuse/metadata': 10.11.1
       local-pkg: 0.5.1
-      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2)
+      nuxt: 3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2)
       vue-demi: 0.14.10(vue@3.5.30(typescript@5.9.3))
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -15630,6 +15935,10 @@ snapshots:
       - '@vue/composition-api'
       - vue
 
+  '@vueuse/shared@14.3.0(vue@3.5.30(typescript@5.9.3))':
+    dependencies:
+      vue: 3.5.30(typescript@5.9.3)
+
   '@xmldom/xmldom@0.8.11': {}
 
   '@xterm/addon-fit@0.11.0': {}
@@ -15721,45 +16030,9 @@ snapshots:
       normalize-path: 3.0.0
       picomatch: 2.3.1
 
-  app-builder-bin@4.0.0: {}
-
   app-builder-bin@5.0.0-alpha.12: {}
 
-  app-builder-lib@24.13.3(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3):
-    dependencies:
-      '@develar/schema-utils': 2.6.5
-      '@electron/notarize': 2.2.1
-      '@electron/osx-sign': 1.0.5
-      '@electron/universal': 1.5.1
-      '@malept/flatpak-bundler': 0.4.0
-      '@types/fs-extra': 9.0.13
-      async-exit-hook: 2.0.1
-      bluebird-lst: 1.0.9
-      builder-util: 24.13.1
-      builder-util-runtime: 9.2.4
-      chromium-pickle-js: 0.2.0
-      debug: 4.4.3
-      dmg-builder: 26.8.1(electron-builder-squirrel-windows@24.13.3)
-      ejs: 3.1.10
-      electron-builder-squirrel-windows: 24.13.3(dmg-builder@26.8.1)
-      electron-publish: 24.13.1
-      form-data: 4.0.5
-      fs-extra: 10.1.0
-      hosted-git-info: 4.1.0
-      is-ci: 3.0.1
-      isbinaryfile: 5.0.7
-      js-yaml: 4.1.1
-      lazy-val: 1.0.5
-      minimatch: 5.1.7
-      read-config-file: 6.3.2
-      sanitize-filename: 1.6.3
-      semver: 7.7.4
-      tar: 6.2.1
-      temp-file: 3.4.0
-    transitivePeerDependencies:
-      - supports-color
-
-  app-builder-lib@26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3):
+  app-builder-lib@26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@26.8.1):
     dependencies:
       '@develar/schema-utils': 2.6.5
       '@electron/asar': 3.4.1
@@ -15777,11 +16050,11 @@ snapshots:
       chromium-pickle-js: 0.2.0
       ci-info: 4.3.1
       debug: 4.4.3
-      dmg-builder: 26.8.1(electron-builder-squirrel-windows@24.13.3)
+      dmg-builder: 26.8.1(electron-builder-squirrel-windows@26.8.1)
       dotenv: 16.6.1
       dotenv-expand: 11.0.7
       ejs: 3.1.10
-      electron-builder-squirrel-windows: 24.13.3(dmg-builder@26.8.1)
+      electron-builder-squirrel-windows: 26.8.1(dmg-builder@26.8.1)
       electron-publish: 26.8.1
       fs-extra: 10.1.0
       hosted-git-info: 4.1.0
@@ -15802,32 +16075,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  archiver-utils@2.1.0:
-    dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
-      normalize-path: 3.0.0
-      readable-stream: 2.3.8
-
-  archiver-utils@3.0.4:
-    dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
-      normalize-path: 3.0.0
-      readable-stream: 3.6.2
-
   archiver-utils@5.0.2:
     dependencies:
       glob: 10.5.0
@@ -15838,16 +16085,6 @@ snapshots:
       normalize-path: 3.0.0
       readable-stream: 4.7.0
 
-  archiver@5.3.2:
-    dependencies:
-      archiver-utils: 2.1.0
-      async: 3.2.6
-      buffer-crc32: 0.2.13
-      readable-stream: 3.6.2
-      readdir-glob: 1.1.3
-      tar-stream: 2.2.0
-      zip-stream: 4.1.1
-
   archiver@7.0.1:
     dependencies:
       archiver-utils: 5.0.2
@@ -15866,6 +16103,10 @@ snapshots:
 
   arg@5.0.2: {}
 
+  argparse@1.0.10:
+    dependencies:
+      sprintf-js: 1.0.3
+
   argparse@2.0.1: {}
 
   aria-hidden@1.2.6:
@@ -16099,12 +16340,6 @@ snapshots:
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  bluebird-lst@1.0.9:
-    dependencies:
-      bluebird: 3.7.2
-
-  bluebird@3.7.2: {}
-
   body-parser@2.2.2:
     dependencies:
       bytes: 3.1.2
@@ -16137,6 +16372,10 @@ snapshots:
     dependencies:
       balanced-match: 4.0.3
 
+  brace-expansion@5.0.5:
+    dependencies:
+      balanced-match: 4.0.3
+
   braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
@@ -16153,8 +16392,6 @@ snapshots:
 
   buffer-crc32@1.0.0: {}
 
-  buffer-equal@1.0.1: {}
-
   buffer-from@1.1.2: {}
 
   buffer@5.7.1:
@@ -16170,13 +16407,6 @@ snapshots:
   buildcheck@0.0.7:
     optional: true
 
-  builder-util-runtime@9.2.4:
-    dependencies:
-      debug: 4.4.3
-      sax: 1.6.0
-    transitivePeerDependencies:
-      - supports-color
-
   builder-util-runtime@9.5.1:
     dependencies:
       debug: 4.4.3
@@ -16184,27 +16414,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  builder-util@24.13.1:
-    dependencies:
-      7zip-bin: 5.2.0
-      '@types/debug': 4.1.12
-      app-builder-bin: 4.0.0
-      bluebird-lst: 1.0.9
-      builder-util-runtime: 9.2.4
-      chalk: 4.1.2
-      cross-spawn: 7.0.6
-      debug: 4.4.3
-      fs-extra: 10.1.0
-      http-proxy-agent: 5.0.0
-      https-proxy-agent: 5.0.1
-      is-ci: 3.0.1
-      js-yaml: 4.1.1
-      source-map-support: 0.5.21
-      stat-mode: 1.0.0
-      temp-file: 3.4.0
-    transitivePeerDependencies:
-      - supports-color
-
   builder-util@26.8.1:
     dependencies:
       7zip-bin: 5.2.0
@@ -16387,14 +16596,10 @@ snapshots:
     dependencies:
       readdirp: 5.0.0
 
-  chownr@2.0.0: {}
-
   chownr@3.0.0: {}
 
   chromium-pickle-js@0.2.0: {}
 
-  ci-info@3.9.0: {}
-
   ci-info@4.3.1: {}
 
   ci-info@4.4.0: {}
@@ -16506,6 +16711,9 @@ snapshots:
 
   commander@8.3.0: {}
 
+  commander@9.5.0:
+    optional: true
+
   comment-parser@1.4.5: {}
 
   commondir@1.0.1: {}
@@ -16514,13 +16722,6 @@ snapshots:
 
   compatx@0.2.0: {}
 
-  compress-commons@4.1.2:
-    dependencies:
-      buffer-crc32: 0.2.13
-      crc32-stream: 4.0.3
-      normalize-path: 3.0.0
-      readable-stream: 3.6.2
-
   compress-commons@6.0.2:
     dependencies:
       crc-32: 1.2.2
@@ -16535,11 +16736,6 @@ snapshots:
 
   confbox@0.2.4: {}
 
-  config-file-ts@0.2.6:
-    dependencies:
-      glob: 10.5.0
-      typescript: 5.9.3
-
   consola@3.4.2: {}
 
   content-disposition@1.0.1: {}
@@ -16597,11 +16793,6 @@ snapshots:
 
   crc-32@1.2.2: {}
 
-  crc32-stream@4.0.3:
-    dependencies:
-      crc-32: 1.2.2
-      readable-stream: 3.6.2
-
   crc32-stream@6.0.0:
     dependencies:
       crc-32: 1.2.2
@@ -16618,6 +16809,9 @@ snapshots:
 
   cronstrue@3.13.0: {}
 
+  cross-dirname@0.1.0:
+    optional: true
+
   cross-spawn@7.0.6:
     dependencies:
       path-key: 3.1.1
@@ -17004,11 +17198,6 @@ snapshots:
 
   diff@8.0.3: {}
 
-  dir-compare@3.3.0:
-    dependencies:
-      buffer-equal: 1.0.1
-      minimatch: 3.1.3
-
   dir-compare@4.2.0:
     dependencies:
       minimatch: 3.1.3
@@ -17016,9 +17205,9 @@ snapshots:
 
   dlv@1.1.3: {}
 
-  dmg-builder@26.8.1(electron-builder-squirrel-windows@24.13.3):
+  dmg-builder@26.8.1(electron-builder-squirrel-windows@26.8.1):
     dependencies:
-      app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3)
+      app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@26.8.1)
       builder-util: 26.8.1
       fs-extra: 10.1.0
       iconv-lite: 0.6.3
@@ -17075,14 +17264,10 @@ snapshots:
     dependencies:
       dotenv: 16.6.1
 
-  dotenv-expand@5.1.0: {}
-
   dotenv@16.6.1: {}
 
   dotenv@17.3.1: {}
 
-  dotenv@9.0.2: {}
-
   dunder-proto@1.0.1:
     dependencies:
       call-bind-apply-helpers: 1.0.2
@@ -17099,24 +17284,23 @@ snapshots:
     dependencies:
       jake: 10.9.4
 
-  electron-builder-squirrel-windows@24.13.3(dmg-builder@26.8.1):
+  electron-builder-squirrel-windows@26.8.1(dmg-builder@26.8.1):
     dependencies:
-      app-builder-lib: 24.13.3(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3)
-      archiver: 5.3.2
-      builder-util: 24.13.1
-      fs-extra: 10.1.0
+      app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@26.8.1)
+      builder-util: 26.8.1
+      electron-winstaller: 5.4.0
     transitivePeerDependencies:
       - dmg-builder
       - supports-color
 
-  electron-builder@26.8.1(electron-builder-squirrel-windows@24.13.3):
+  electron-builder@26.8.1(electron-builder-squirrel-windows@26.8.1):
     dependencies:
-      app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@24.13.3)
+      app-builder-lib: 26.8.1(dmg-builder@26.8.1)(electron-builder-squirrel-windows@26.8.1)
       builder-util: 26.8.1
       builder-util-runtime: 9.5.1
       chalk: 4.1.2
       ci-info: 4.4.0
-      dmg-builder: 26.8.1(electron-builder-squirrel-windows@24.13.3)
+      dmg-builder: 26.8.1(electron-builder-squirrel-windows@26.8.1)
       fs-extra: 10.1.0
       lazy-val: 1.0.5
       simple-update-notifier: 2.0.0
@@ -17125,18 +17309,6 @@ snapshots:
       - electron-builder-squirrel-windows
       - supports-color
 
-  electron-publish@24.13.1:
-    dependencies:
-      '@types/fs-extra': 9.0.13
-      builder-util: 24.13.1
-      builder-util-runtime: 9.2.4
-      chalk: 4.1.2
-      fs-extra: 10.1.0
-      lazy-val: 1.0.5
-      mime: 2.6.0
-    transitivePeerDependencies:
-      - supports-color
-
   electron-publish@26.8.1:
     dependencies:
       '@types/fs-extra': 9.0.13
@@ -17177,6 +17349,18 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  electron-winstaller@5.4.0:
+    dependencies:
+      '@electron/asar': 3.4.1
+      debug: 4.4.3
+      fs-extra: 7.0.1
+      lodash: 4.17.23
+      temp: 0.9.4
+    optionalDependencies:
+      '@electron/windows-sign': 1.2.2
+    transitivePeerDependencies:
+      - supports-color
+
   electron@40.3.0:
     dependencies:
       '@electron/get': 2.0.3
@@ -18004,6 +18188,10 @@ snapshots:
 
   exsolve@1.0.8: {}
 
+  extend-shallow@2.0.1:
+    dependencies:
+      is-extendable: 0.1.1
+
   extend@3.0.2: {}
 
   externality@1.0.2:
@@ -18113,6 +18301,10 @@ snapshots:
     dependencies:
       reusify: 1.1.0
 
+  fault@2.0.1:
+    dependencies:
+      format: 0.2.2
+
   fd-package-json@2.0.0:
     dependencies:
       walk-up-path: 4.0.0
@@ -18194,6 +18386,10 @@ snapshots:
 
   flatted@3.3.3: {}
 
+  focus-trap@8.2.0:
+    dependencies:
+      tabbable: 6.4.0
+
   follow-redirects@1.15.11(debug@4.4.3):
     optionalDependencies:
       debug: 4.4.3
@@ -18215,6 +18411,8 @@ snapshots:
       hasown: 2.0.2
       mime-types: 2.1.35
 
+  format@0.2.2: {}
+
   formatly@0.3.0:
     dependencies:
       fd-package-json: 2.0.0
@@ -18238,8 +18436,6 @@ snapshots:
 
   fresh@2.0.0: {}
 
-  fs-constants@1.0.0: {}
-
   fs-extra@10.1.0:
     dependencies:
       graceful-fs: 4.2.11
@@ -18252,6 +18448,12 @@ snapshots:
       jsonfile: 6.2.0
       universalify: 2.0.1
 
+  fs-extra@7.0.1:
+    dependencies:
+      graceful-fs: 4.2.11
+      jsonfile: 4.0.0
+      universalify: 0.1.2
+
   fs-extra@8.1.0:
     dependencies:
       graceful-fs: 4.2.11
@@ -18265,10 +18467,6 @@ snapshots:
       jsonfile: 6.2.0
       universalify: 2.0.1
 
-  fs-minipass@2.1.0:
-    dependencies:
-      minipass: 3.3.6
-
   fs-minipass@3.0.3:
     dependencies:
       minipass: 7.1.3
@@ -18453,6 +18651,13 @@ snapshots:
 
   graceful-fs@4.2.11: {}
 
+  gray-matter@4.0.3:
+    dependencies:
+      js-yaml: 3.14.2
+      kind-of: 6.0.3
+      section-matter: 1.0.0
+      strip-bom-string: 1.0.0
+
   gzip-size@7.0.0:
     dependencies:
       duplexer: 0.1.2
@@ -18549,6 +18754,20 @@ snapshots:
       '@ungap/structured-clone': 1.3.0
       unist-util-position: 5.0.0
 
+  hast-util-to-html@9.0.5:
+    dependencies:
+      '@types/hast': 3.0.4
+      '@types/unist': 3.0.3
+      ccount: 2.0.1
+      comma-separated-tokens: 2.0.3
+      hast-util-whitespace: 3.0.0
+      html-void-elements: 3.0.0
+      mdast-util-to-hast: 13.2.1
+      property-information: 7.1.0
+      space-separated-tokens: 2.0.2
+      stringify-entities: 4.0.4
+      zwitch: 2.0.4
+
   hast-util-to-jsx-runtime@2.3.6:
     dependencies:
       '@types/estree': 1.0.8
@@ -18647,14 +18866,6 @@ snapshots:
       statuses: 2.0.2
       toidentifier: 1.0.1
 
-  http-proxy-agent@5.0.0:
-    dependencies:
-      '@tootallnate/once': 2.0.0
-      agent-base: 6.0.2
-      debug: 4.4.3
-    transitivePeerDependencies:
-      - supports-color
-
   http-proxy-agent@7.0.2:
     dependencies:
       agent-base: 7.1.4
@@ -18834,10 +19045,6 @@ snapshots:
 
   is-callable@1.2.7: {}
 
-  is-ci@3.0.1:
-    dependencies:
-      ci-info: 3.9.0
-
   is-core-module@2.16.1:
     dependencies:
       hasown: 2.0.2
@@ -18857,6 +19064,8 @@ snapshots:
 
   is-docker@3.0.0: {}
 
+  is-extendable@0.1.1: {}
+
   is-extglob@2.1.1: {}
 
   is-finalizationregistry@1.1.1:
@@ -19048,6 +19257,11 @@ snapshots:
 
   js-tokens@9.0.1: {}
 
+  js-yaml@3.14.2:
+    dependencies:
+      argparse: 1.0.10
+      esprima: 4.0.1
+
   js-yaml@4.1.1:
     dependencies:
       argparse: 2.0.1
@@ -19124,6 +19338,8 @@ snapshots:
 
   khroma@2.1.0: {}
 
+  kind-of@6.0.3: {}
+
   kleur@4.1.5: {}
 
   klona@2.0.6: {}
@@ -19296,24 +19512,16 @@ snapshots:
 
   lodash.defaults@4.2.0: {}
 
-  lodash.difference@4.5.0: {}
-
   lodash.escaperegexp@4.1.2: {}
 
-  lodash.flatten@4.4.0: {}
-
   lodash.isarguments@3.1.0: {}
 
   lodash.isequal@4.5.0: {}
 
-  lodash.isplainobject@4.0.6: {}
-
   lodash.memoize@4.1.2: {}
 
   lodash.merge@4.6.2: {}
 
-  lodash.union@4.6.0: {}
-
   lodash.uniq@4.5.0: {}
 
   lodash@4.17.23: {}
@@ -19417,6 +19625,8 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  mark.js@8.11.1: {}
+
   markdown-it@14.1.1:
     dependencies:
       argparse: 2.0.1
@@ -19428,6 +19638,8 @@ snapshots:
 
   markdown-table@3.0.4: {}
 
+  markdown-title@1.0.2: {}
+
   marked@16.4.2: {}
 
   marked@17.0.4: {}
@@ -19469,6 +19681,34 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
+  mdast-util-from-markdown@2.0.3:
+    dependencies:
+      '@types/mdast': 4.0.4
+      '@types/unist': 3.0.3
+      decode-named-character-reference: 1.2.0
+      devlop: 1.1.0
+      mdast-util-to-string: 4.0.0
+      micromark: 4.0.2
+      micromark-util-decode-numeric-character-reference: 2.0.2
+      micromark-util-decode-string: 2.0.1
+      micromark-util-normalize-identifier: 2.0.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+      unist-util-stringify-position: 4.0.0
+    transitivePeerDependencies:
+      - supports-color
+
+  mdast-util-frontmatter@2.0.1:
+    dependencies:
+      '@types/mdast': 4.0.4
+      devlop: 1.1.0
+      escape-string-regexp: 5.0.0
+      mdast-util-from-markdown: 2.0.3
+      mdast-util-to-markdown: 2.1.2
+      micromark-extension-frontmatter: 2.0.0
+    transitivePeerDependencies:
+      - supports-color
+
   mdast-util-gfm-autolink-literal@2.0.1:
     dependencies:
       '@types/mdast': 4.0.4
@@ -19606,6 +19846,8 @@ snapshots:
 
   media-typer@1.1.0: {}
 
+  medium-zoom@1.1.0: {}
+
   merge-descriptors@2.0.0: {}
 
   merge-stream@2.0.0: {}
@@ -19654,6 +19896,13 @@ snapshots:
       micromark-util-symbol: 2.0.1
       micromark-util-types: 2.0.2
 
+  micromark-extension-frontmatter@2.0.0:
+    dependencies:
+      fault: 2.0.1
+      micromark-util-character: 2.1.1
+      micromark-util-symbol: 2.0.1
+      micromark-util-types: 2.0.2
+
   micromark-extension-gfm-autolink-literal@2.1.0:
     dependencies:
       micromark-util-character: 2.1.1
@@ -19831,6 +20080,10 @@ snapshots:
       braces: 3.0.3
       picomatch: 2.3.1
 
+  millify@6.1.0:
+    dependencies:
+      yargs: 17.7.2
+
   mime-db@1.52.0: {}
 
   mime-db@1.54.0: {}
@@ -19867,6 +20120,10 @@ snapshots:
     dependencies:
       brace-expansion: 5.0.2
 
+  minimatch@10.2.5:
+    dependencies:
+      brace-expansion: 5.0.5
+
   minimatch@3.1.3:
     dependencies:
       brace-expansion: 1.1.12
@@ -19909,16 +20166,11 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  minipass@5.0.0: {}
-
   minipass@7.1.2: {}
 
   minipass@7.1.3: {}
 
-  minizlib@2.1.2:
-    dependencies:
-      minipass: 3.3.6
-      yallist: 4.0.0
+  minisearch@7.2.0: {}
 
   minizlib@3.1.0:
     dependencies:
@@ -19926,7 +20178,9 @@ snapshots:
 
   mitt@3.0.1: {}
 
-  mkdirp@1.0.4: {}
+  mkdirp@0.5.6:
+    dependencies:
+      minimist: 1.2.8
 
   mlly@1.8.2:
     dependencies:
@@ -20158,27 +20412,27 @@ snapshots:
     dependencies:
       boolbase: 1.0.0
 
-  nuxt-icon@0.6.10(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3)):
+  nuxt-icon@0.6.10(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3)):
     dependencies:
       '@iconify/collections': 1.0.665
       '@iconify/vue': 4.3.0(vue@3.5.30(typescript@5.9.3))
-      '@nuxt/devtools-kit': 1.7.0(magicast@0.5.2)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+      '@nuxt/devtools-kit': 1.7.0(magicast@0.5.2)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
     transitivePeerDependencies:
       - magicast
       - vite
       - vue
 
-  nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2):
+  nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2):
     dependencies:
       '@dxup/nuxt': 0.4.0(magicast@0.5.2)(typescript@5.9.3)
       '@nuxt/cli': 3.34.0(@nuxt/schema@3.21.2)(cac@6.7.14)(magicast@0.5.2)
-      '@nuxt/devtools': 3.2.4(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))
+      '@nuxt/devtools': 3.2.4(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
       '@nuxt/kit': 3.21.2(magicast@0.5.2)
-      '@nuxt/nitro-server': 3.21.2(db0@0.3.4)(encoding@0.1.13)(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(typescript@5.9.3)
+      '@nuxt/nitro-server': 3.21.2(db0@0.3.4)(encoding@0.1.13)(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(typescript@5.9.3)
       '@nuxt/schema': 3.21.2
       '@nuxt/telemetry': 2.7.0(@nuxt/kit@3.21.2(magicast@0.5.2))
-      '@nuxt/vite-builder': 3.21.2(@types/node@25.0.7)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(yaml@2.8.2))(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3))(yaml@2.8.2)
+      '@nuxt/vite-builder': 3.21.2(@types/node@25.0.7)(eslint@9.39.2(jiti@2.6.1))(magicast@0.5.2)(nuxt@3.21.2(@parcel/watcher@2.5.6)(@types/node@25.0.7)(@vue/compiler-sfc@3.5.30)(cac@6.7.14)(db0@0.3.4)(encoding@0.1.13)(eslint@9.39.2(jiti@2.6.1))(idb-keyval@6.2.2)(ioredis@5.10.1)(magicast@0.5.2)(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(yaml@2.8.2))(optionator@0.9.4)(rollup-plugin-visualizer@7.0.1(rollup@4.60.0))(rollup@4.60.0)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(vue@3.5.30(typescript@5.9.3))(yaml@2.8.2)
       '@unhead/vue': 2.1.12(vue@3.5.30(typescript@5.9.3))
       '@vue/shared': 3.5.30
       c12: 3.3.3(magicast@0.5.2)
@@ -20382,6 +20636,14 @@ snapshots:
     dependencies:
       mimic-function: 5.0.1
 
+  oniguruma-parser@0.12.2: {}
+
+  oniguruma-to-es@4.3.6:
+    dependencies:
+      oniguruma-parser: 0.12.2
+      regex: 6.1.0
+      regex-recursion: 6.0.2
+
   open@10.2.0:
     dependencies:
       default-browser: 5.5.0
@@ -20626,6 +20888,8 @@ snapshots:
       lru-cache: 11.2.6
       minipass: 7.1.3
 
+  path-to-regexp@6.3.0: {}
+
   path-to-regexp@8.3.0: {}
 
   pathe@1.1.2: {}
@@ -20964,6 +21228,11 @@ snapshots:
     dependencies:
       xtend: 4.0.2
 
+  postject@1.0.0-alpha.6:
+    dependencies:
+      commander: 9.5.0
+    optional: true
+
   powershell-utils@0.1.0: {}
 
   prelude-ls@1.2.1: {}
@@ -21268,15 +21537,6 @@ snapshots:
     dependencies:
       pify: 2.3.0
 
-  read-config-file@6.3.2:
-    dependencies:
-      config-file-ts: 0.2.6
-      dotenv: 9.0.2
-      dotenv-expand: 5.1.0
-      js-yaml: 4.1.1
-      json5: 2.2.3
-      lazy-val: 1.0.5
-
   readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
@@ -21336,6 +21596,16 @@ snapshots:
       get-proto: 1.0.1
       which-builtin-type: 1.2.1
 
+  regex-recursion@6.0.2:
+    dependencies:
+      regex-utilities: 2.3.0
+
+  regex-utilities@2.3.0: {}
+
+  regex@6.1.0:
+    dependencies:
+      regex-utilities: 2.3.0
+
   regexp-ast-analysis@0.7.1:
     dependencies:
       '@eslint-community/regexpp': 4.12.2
@@ -21375,6 +21645,15 @@ snapshots:
       '@types/hast': 3.0.4
       hast-util-sanitize: 5.0.2
 
+  remark-frontmatter@5.0.0:
+    dependencies:
+      '@types/mdast': 4.0.4
+      mdast-util-frontmatter: 2.0.1
+      micromark-extension-frontmatter: 2.0.0
+      unified: 11.0.5
+    transitivePeerDependencies:
+      - supports-color
+
   remark-gfm@4.0.1:
     dependencies:
       '@types/mdast': 4.0.4
@@ -21409,6 +21688,15 @@ snapshots:
       mdast-util-to-markdown: 2.1.2
       unified: 11.0.5
 
+  remark@15.0.1:
+    dependencies:
+      '@types/mdast': 4.0.4
+      remark-parse: 11.0.0
+      remark-stringify: 11.0.0
+      unified: 11.0.5
+    transitivePeerDependencies:
+      - supports-color
+
   require-directory@2.1.1: {}
 
   require-from-string@2.0.2: {}
@@ -21470,6 +21758,10 @@ snapshots:
 
   rfdc@1.4.1: {}
 
+  rimraf@2.6.3:
+    dependencies:
+      glob: 7.2.3
+
   roarr@2.15.4:
     dependencies:
       boolean: 3.2.0
@@ -21641,6 +21933,11 @@ snapshots:
 
   scule@1.3.0: {}
 
+  section-matter@1.0.0:
+    dependencies:
+      extend-shallow: 2.0.1
+      kind-of: 6.0.3
+
   secure-json-parse@4.1.0: {}
 
   semver-compare@1.0.0:
@@ -21726,6 +22023,17 @@ snapshots:
 
   shell-quote@1.8.3: {}
 
+  shiki@3.23.0:
+    dependencies:
+      '@shikijs/core': 3.23.0
+      '@shikijs/engine-javascript': 3.23.0
+      '@shikijs/engine-oniguruma': 3.23.0
+      '@shikijs/langs': 3.23.0
+      '@shikijs/themes': 3.23.0
+      '@shikijs/types': 3.23.0
+      '@shikijs/vscode-textmate': 10.0.2
+      '@types/hast': 3.0.4
+
   side-channel-list@1.0.0:
     dependencies:
       es-errors: 1.3.0
@@ -21851,6 +22159,8 @@ snapshots:
 
   split2@4.2.0: {}
 
+  sprintf-js@1.0.3: {}
+
   sprintf-js@1.1.3:
     optional: true
 
@@ -21998,6 +22308,8 @@ snapshots:
     dependencies:
       ansi-regex: 6.2.2
 
+  strip-bom-string@1.0.0: {}
+
   strip-bom@3.0.0: {}
 
   strip-final-newline@3.0.0: {}
@@ -22084,6 +22396,8 @@ snapshots:
 
   system-architecture@0.1.0: {}
 
+  tabbable@6.4.0: {}
+
   tagged-tag@1.0.0: {}
 
   tailwind-merge@3.5.0: {}
@@ -22122,14 +22436,6 @@ snapshots:
 
   tapable@2.3.1: {}
 
-  tar-stream@2.2.0:
-    dependencies:
-      bl: 4.1.0
-      end-of-stream: 1.4.5
-      fs-constants: 1.0.0
-      inherits: 2.0.4
-      readable-stream: 3.6.2
-
   tar-stream@3.1.8:
     dependencies:
       b4a: 1.8.0
@@ -22141,15 +22447,6 @@ snapshots:
       - bare-buffer
       - react-native-b4a
 
-  tar@6.2.1:
-    dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 5.0.0
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
-
   tar@7.5.9:
     dependencies:
       '@isaacs/fs-minipass': 4.0.1
@@ -22170,6 +22467,11 @@ snapshots:
       async-exit-hook: 2.0.1
       fs-extra: 10.1.0
 
+  temp@0.9.4:
+    dependencies:
+      mkdirp: 0.5.6
+      rimraf: 2.6.3
+
   terser@5.46.0:
     dependencies:
       '@jridgewell/source-map': 0.3.11
@@ -22257,6 +22559,8 @@ snapshots:
       '@tokenizer/token': 0.3.0
       ieee754: 1.2.1
 
+  tokenx@1.3.0: {}
+
   tosource@2.0.0-alpha.3: {}
 
   totalist@3.0.1: {}
@@ -22506,6 +22810,12 @@ snapshots:
     dependencies:
       '@types/unist': 3.0.3
 
+  unist-util-remove@4.0.0:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.1
+      unist-util-visit-parents: 6.0.2
+
   unist-util-stringify-position@4.0.0:
     dependencies:
       '@types/unist': 3.0.3
@@ -22521,6 +22831,12 @@ snapshots:
       unist-util-is: 6.0.1
       unist-util-visit-parents: 6.0.2
 
+  unist-util-visit@5.1.0:
+    dependencies:
+      '@types/unist': 3.0.3
+      unist-util-is: 6.0.1
+      unist-util-visit-parents: 6.0.2
+
   universalify@0.1.2: {}
 
   universalify@2.0.1: {}
@@ -22729,15 +23045,15 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.3
 
-  vite-dev-rpc@1.1.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)):
+  vite-dev-rpc@1.1.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
       birpc: 2.9.0
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
-      vite-hot-client: 2.1.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite-hot-client: 2.1.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
 
-  vite-hot-client@2.1.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)):
+  vite-hot-client@2.1.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
 
   vite-node@3.2.4(@types/node@22.19.15)(sass@1.98.0)(terser@5.46.0):
     dependencies:
@@ -22811,7 +23127,7 @@ snapshots:
       optionator: 0.9.4
       typescript: 5.9.3
 
-  vite-plugin-inspect@11.3.3(@nuxt/kit@4.4.2(magicast@0.5.2))(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)):
+  vite-plugin-inspect@11.3.3(@nuxt/kit@4.4.2(magicast@0.5.2))(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)):
     dependencies:
       ansis: 4.2.0
       debug: 4.4.3
@@ -22821,29 +23137,29 @@ snapshots:
       perfect-debounce: 2.1.0
       sirv: 3.0.2
       unplugin-utils: 0.3.1
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
-      vite-dev-rpc: 1.1.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vite-dev-rpc: 1.1.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))
     optionalDependencies:
       '@nuxt/kit': 4.4.2(magicast@0.5.2)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-tracer@1.3.0(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3)):
+  vite-plugin-vue-tracer@1.3.0(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3)):
     dependencies:
       estree-walker: 3.0.3
       exsolve: 1.0.8
       magic-string: 0.30.21
       pathe: 2.0.3
       source-map-js: 1.2.1
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
       vue: 3.5.30(typescript@5.9.3)
 
-  vite-plugin-vuetify@2.1.3(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3):
+  vite-plugin-vuetify@2.1.3(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3):
     dependencies:
       '@vuetify/loader-shared': 2.1.2(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3)
       debug: 4.4.3
       upath: 2.0.1
-      vite: 5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0)
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
       vue: 3.5.30(typescript@5.9.3)
       vuetify: 3.12.3(typescript@5.9.3)(vite-plugin-vuetify@2.1.3)(vue@3.5.30(typescript@5.9.3))
     transitivePeerDependencies:
@@ -22888,6 +23204,78 @@ snapshots:
       tsx: 4.21.0
       yaml: 2.8.2
 
+  vitepress-codeblock-collapse@1.0.0(vue@3.5.30(typescript@5.9.3)):
+    dependencies:
+      vue: 3.5.30(typescript@5.9.3)
+
+  vitepress-plugin-llms@1.12.2:
+    dependencies:
+      gray-matter: 4.0.3
+      markdown-it: 14.1.1
+      markdown-title: 1.0.2
+      mdast-util-from-markdown: 2.0.3
+      millify: 6.1.0
+      minimatch: 10.2.5
+      path-to-regexp: 6.3.0
+      picocolors: 1.1.1
+      pretty-bytes: 7.1.0
+      remark: 15.0.1
+      remark-frontmatter: 5.0.0
+      tokenx: 1.3.0
+      unist-util-remove: 4.0.0
+      unist-util-visit: 5.1.0
+    transitivePeerDependencies:
+      - supports-color
+
+  vitepress@2.0.0-alpha.17(@types/node@25.0.7)(axios@1.13.6)(change-case@5.4.4)(fuse.js@7.1.0)(idb-keyval@6.2.2)(jiti@2.6.1)(oxc-minify@0.117.0)(postcss@8.5.8)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(typescript@5.9.3)(yaml@2.8.2):
+    dependencies:
+      '@docsearch/css': 4.6.3
+      '@docsearch/js': 4.6.3
+      '@docsearch/sidepanel-js': 4.6.3
+      '@iconify-json/simple-icons': 1.2.80
+      '@shikijs/core': 3.23.0
+      '@shikijs/transformers': 3.22.0
+      '@shikijs/types': 3.23.0
+      '@types/markdown-it': 14.1.2
+      '@vitejs/plugin-vue': 6.0.5(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))
+      '@vue/devtools-api': 8.1.1
+      '@vue/shared': 3.5.30
+      '@vueuse/core': 14.3.0(vue@3.5.30(typescript@5.9.3))
+      '@vueuse/integrations': 14.3.0(axios@1.13.6)(change-case@5.4.4)(focus-trap@8.2.0)(fuse.js@7.1.0)(idb-keyval@6.2.2)(vue@3.5.30(typescript@5.9.3))
+      focus-trap: 8.2.0
+      mark.js: 8.11.1
+      minisearch: 7.2.0
+      shiki: 3.23.0
+      vite: 7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2)
+      vue: 3.5.30(typescript@5.9.3)
+    optionalDependencies:
+      oxc-minify: 0.117.0
+      postcss: 8.5.8
+    transitivePeerDependencies:
+      - '@types/node'
+      - async-validator
+      - axios
+      - change-case
+      - drauu
+      - fuse.js
+      - idb-keyval
+      - jiti
+      - jwt-decode
+      - less
+      - lightningcss
+      - nprogress
+      - qrcode
+      - sass
+      - sass-embedded
+      - sortablejs
+      - stylus
+      - sugarss
+      - terser
+      - tsx
+      - typescript
+      - universal-cookie
+      - yaml
+
   vitest@3.2.4(@types/debug@4.1.12)(@types/node@22.19.15)(happy-dom@20.0.2)(sass@1.98.0)(terser@5.46.0):
     dependencies:
       '@types/chai': 5.2.3
@@ -23042,7 +23430,7 @@ snapshots:
       vue: 3.5.30(typescript@5.9.3)
     optionalDependencies:
       typescript: 5.9.3
-      vite-plugin-vuetify: 2.1.3(vite@5.4.21(@types/node@25.0.7)(sass@1.98.0)(terser@5.46.0))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3)
+      vite-plugin-vuetify: 2.1.3(vite@7.3.1(@types/node@25.0.7)(jiti@2.6.1)(sass@1.98.0)(terser@5.46.0)(tsx@4.21.0)(yaml@2.8.2))(vue@3.5.30(typescript@5.9.3))(vuetify@3.12.3)
 
   w3c-keyname@2.2.8: {}
 
@@ -23239,12 +23627,6 @@ snapshots:
       cookie-es: 2.0.0
       youch-core: 0.3.3
 
-  zip-stream@4.1.1:
-    dependencies:
-      archiver-utils: 3.0.4
-      compress-commons: 4.1.2
-      readable-stream: 3.6.2
-
   zip-stream@6.0.1:
     dependencies:
       archiver-utils: 5.0.2
diff --git a/runtime.lock.json b/runtime.lock.json
index 05d7d288..481af2ff 100644
--- a/runtime.lock.json
+++ b/runtime.lock.json
@@ -1,27 +1,27 @@
 {
-  "version": "0.0.15",
-  "sourceRef": "v0.0.15",
+  "version": "0.0.17",
+  "sourceRef": "v0.0.17",
   "sourceRepository": "777genius/agent_teams_orchestrator",
   "releaseRepository": "777genius/claude_agent_teams_ui",
   "releaseTag": "v1.2.0",
   "assets": {
     "darwin-arm64": {
-      "file": "agent-teams-runtime-darwin-arm64-v0.0.15.tar.gz",
+      "file": "agent-teams-runtime-darwin-arm64-v0.0.17.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "darwin-x64": {
-      "file": "agent-teams-runtime-darwin-x64-v0.0.15.tar.gz",
+      "file": "agent-teams-runtime-darwin-x64-v0.0.17.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "linux-x64": {
-      "file": "agent-teams-runtime-linux-x64-v0.0.15.tar.gz",
+      "file": "agent-teams-runtime-linux-x64-v0.0.17.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "win32-x64": {
-      "file": "agent-teams-runtime-win32-x64-v0.0.15.zip",
+      "file": "agent-teams-runtime-win32-x64-v0.0.17.zip",
       "archiveKind": "zip",
       "binaryName": "claude-multimodel.exe"
     }
diff --git a/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts b/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
index eefda424..8dbf3086 100644
--- a/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
+++ b/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
@@ -72,6 +72,12 @@ export interface TeamGraphData extends TeamViewSnapshot {
   messageFeed: InboxMessage[];
 }
 
+function toGraphLaunchVisualState(
+  visualState: ReturnType<typeof buildMemberLaunchPresentation>['launchVisualState'] | undefined
+): GraphNode['launchVisualState'] {
+  return visualState === 'bootstrap_stalled' ? 'runtime_pending' : (visualState ?? undefined);
+}
+
 export class TeamGraphAdapter {
   // ─── ES #private fields ──────────────────────────────────────────────────
   #lastTeamName = '';
@@ -430,6 +436,7 @@ export class TeamGraphAdapter {
           spawnLaunchState: undefined,
           spawnLivenessSource: undefined,
           spawnRuntimeAlive: undefined,
+          spawnBootstrapStalled: undefined,
           runtimeAdvisory: leadMember.runtimeAdvisory,
           isLaunchSettling: false,
           isTeamAlive: data.isAlive,
@@ -462,7 +469,7 @@ export class TeamGraphAdapter {
         leadMember?.model,
         leadMember?.effort
       ),
-      launchVisualState: leadLaunchPresentation?.launchVisualState ?? undefined,
+      launchVisualState: toGraphLaunchVisualState(leadLaunchPresentation?.launchVisualState),
       launchStatusLabel: leadLaunchPresentation?.launchStatusLabel ?? undefined,
       contextUsage: percent != null ? Math.max(0, Math.min(1, percent / 100)) : undefined,
       avatarUrl: leadMember
@@ -538,6 +545,8 @@ export class TeamGraphAdapter {
         spawnLaunchState: spawn?.launchState,
         spawnLivenessSource: spawn?.livenessSource,
         spawnRuntimeAlive: spawn?.runtimeAlive,
+        spawnBootstrapConfirmed: spawn?.bootstrapConfirmed,
+        spawnBootstrapStalled: spawn?.bootstrapStalled,
         runtimeAdvisory: member.runtimeAdvisory,
         isLaunchSettling,
         isTeamAlive: data.isAlive,
@@ -562,7 +571,7 @@ export class TeamGraphAdapter {
         ),
         spawnStatus: isTeamVisualOnline ? spawn?.status : undefined,
         launchVisualState: isTeamVisualOnline
-          ? (launchPresentation.launchVisualState ?? undefined)
+          ? toGraphLaunchVisualState(launchPresentation.launchVisualState)
           : undefined,
         launchStatusLabel: isTeamVisualOnline
           ? (launchPresentation.launchStatusLabel ?? undefined)
diff --git a/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx b/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
index f6794aa1..6c762279 100644
--- a/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
@@ -325,6 +325,8 @@ const MemberPopoverContent = ({
         spawnLaunchState: spawnEntry?.launchState,
         spawnLivenessSource: spawnEntry?.livenessSource,
         spawnRuntimeAlive: spawnEntry?.runtimeAlive,
+        spawnBootstrapConfirmed: spawnEntry?.bootstrapConfirmed,
+        spawnBootstrapStalled: spawnEntry?.bootstrapStalled,
         runtimeAdvisory: member.runtimeAdvisory,
         isLaunchSettling: provisioningPresentation?.hasMembersStillJoining ?? false,
         isTeamAlive: teamData?.isAlive,
diff --git a/src/features/agent-graph/renderer/ui/GraphProvisioningHud.tsx b/src/features/agent-graph/renderer/ui/GraphProvisioningHud.tsx
index 34574126..fd3bad8b 100644
--- a/src/features/agent-graph/renderer/ui/GraphProvisioningHud.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphProvisioningHud.tsx
@@ -90,6 +90,7 @@ export const GraphProvisioningHud = ({
           <StepProgressBar
             steps={MINI_STEPS}
             currentIndex={presentation.currentStepIndex}
+            active={presentation.isActive}
             errorIndex={errorStepIndex}
             className="w-full origin-top scale-[0.88]"
           />
diff --git a/src/features/member-work-sync/main/adapters/output/TeamTaskAgendaSource.ts b/src/features/member-work-sync/main/adapters/output/TeamTaskAgendaSource.ts
index e8d79580..b1b01a5a 100644
--- a/src/features/member-work-sync/main/adapters/output/TeamTaskAgendaSource.ts
+++ b/src/features/member-work-sync/main/adapters/output/TeamTaskAgendaSource.ts
@@ -22,7 +22,7 @@ import type { TeamTaskReader } from '@main/services/team/TeamTaskReader';
 import type { TeamMember } from '@shared/types';
 
 export interface TeamTaskAgendaSourceDeps {
-  configReader: TeamConfigReader;
+  configReader: Pick<TeamConfigReader, 'getConfig'>;
   taskReader: TeamTaskReader;
   kanbanManager: TeamKanbanManager;
   membersMetaStore: TeamMembersMetaStore;
diff --git a/src/features/member-work-sync/main/composition/createMemberWorkSyncFeature.ts b/src/features/member-work-sync/main/composition/createMemberWorkSyncFeature.ts
index abf29074..1d758fc5 100644
--- a/src/features/member-work-sync/main/composition/createMemberWorkSyncFeature.ts
+++ b/src/features/member-work-sync/main/composition/createMemberWorkSyncFeature.ts
@@ -124,8 +124,18 @@ export function createMemberWorkSyncFeature(deps: {
 }): MemberWorkSyncFeatureFacade {
   const clock = new SystemClockAdapter();
   const hash = new NodeHashAdapter();
+  const configReaderForReadOnlySync = {
+    listTeams: () =>
+      typeof deps.configReader.listTeams === 'function'
+        ? deps.configReader.listTeams()
+        : Promise.resolve([]),
+    getConfig: (teamName: string) =>
+      typeof deps.configReader.getConfigSnapshot === 'function'
+        ? deps.configReader.getConfigSnapshot(teamName)
+        : deps.configReader.getConfig(teamName),
+  };
   const agendaSource = new TeamTaskAgendaSource({
-    configReader: deps.configReader,
+    configReader: configReaderForReadOnlySync,
     taskReader: deps.taskReader,
     kanbanManager: deps.kanbanManager,
     membersMetaStore: deps.membersMetaStore,
@@ -150,7 +160,7 @@ export function createMemberWorkSyncFeature(deps: {
   const runtimeTurnSettledTargetResolver =
     deps.runtimeTurnSettledTargetResolver ??
     new TeamRuntimeTurnSettledTargetResolver({
-      teamSource: deps.configReader,
+      teamSource: configReaderForReadOnlySync,
       membersMetaStore: deps.membersMetaStore,
     });
   const reportToken = new HmacMemberWorkSyncReportTokenAdapter(storePaths);
diff --git a/src/features/team-runtime-lanes/core/domain/buildMixedPersistedLaunchSnapshot.ts b/src/features/team-runtime-lanes/core/domain/buildMixedPersistedLaunchSnapshot.ts
index ffbe971d..96e92971 100644
--- a/src/features/team-runtime-lanes/core/domain/buildMixedPersistedLaunchSnapshot.ts
+++ b/src/features/team-runtime-lanes/core/domain/buildMixedPersistedLaunchSnapshot.ts
@@ -47,6 +47,8 @@ export interface MixedSecondaryLaneMemberStateInput {
     pidSource?: TeamAgentRuntimePidSource;
     runtimeDiagnostic?: string;
     runtimeDiagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+    bootstrapStalled?: boolean;
+    firstSpawnAcceptedAt?: string;
     diagnostics?: string[];
   } | null;
   pendingReason?: string;
@@ -87,15 +89,90 @@ function preservesStrongRuntimeAlive(value: {
   );
 }
 
+function hasMaterializedOpenCodeRuntimeMarker(value: {
+  runtimeAlive?: boolean;
+  runtimePid?: number;
+  runtimeSessionId?: string;
+  sessionId?: string;
+  livenessKind?: TeamAgentRuntimeLivenessKind;
+}): boolean {
+  return (
+    value.runtimeAlive === true ||
+    (typeof value.runtimePid === 'number' &&
+      Number.isFinite(value.runtimePid) &&
+      value.runtimePid > 0) ||
+    (typeof value.runtimeSessionId === 'string' && value.runtimeSessionId.trim().length > 0) ||
+    (typeof value.sessionId === 'string' && value.sessionId.trim().length > 0) ||
+    value.livenessKind === 'runtime_process' ||
+    value.livenessKind === 'runtime_process_candidate' ||
+    value.livenessKind === 'registered_only'
+  );
+}
+
+const OPENCODE_MEMBER_SESSION_RECORDED_AT_PATTERN =
+  /\bmember_session_recorded\s+at\s+([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9:.+-]+Z?)\b/i;
+
+function normalizeIsoTimestamp(value: unknown): string | null {
+  if (typeof value !== 'string') {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const parsed = Date.parse(trimmed);
+  return Number.isFinite(parsed) ? new Date(parsed).toISOString() : null;
+}
+
+function selectEarliestIsoTimestamp(values: readonly unknown[]): string | undefined {
+  let selected: { value: string; timeMs: number } | null = null;
+  for (const value of values) {
+    const normalized = normalizeIsoTimestamp(value);
+    if (!normalized) {
+      continue;
+    }
+    const timeMs = Date.parse(normalized);
+    if (!selected || timeMs < selected.timeMs) {
+      selected = { value: normalized, timeMs };
+    }
+  }
+  return selected?.value;
+}
+
+function extractOpenCodeMemberSessionRecordedAt(
+  diagnostics: readonly string[] | undefined
+): string[] {
+  return (diagnostics ?? []).flatMap((diagnostic) => {
+    const match = OPENCODE_MEMBER_SESSION_RECORDED_AT_PATTERN.exec(diagnostic);
+    return match?.[1] ? [match[1]] : [];
+  });
+}
+
+function resolveOpenCodeSecondaryFirstSpawnAcceptedAt(
+  evidence: NonNullable<MixedSecondaryLaneMemberStateInput['evidence']>,
+  fallbackUpdatedAt: string
+): string | undefined {
+  if (evidence.agentToolAccepted !== true) {
+    return undefined;
+  }
+  return selectEarliestIsoTimestamp([
+    evidence.firstSpawnAcceptedAt,
+    ...extractOpenCodeMemberSessionRecordedAt(evidence.diagnostics),
+    fallbackUpdatedAt,
+  ]);
+}
+
 function buildDiagnostics(
   member: Pick<
     PersistedTeamLaunchMemberState,
     | 'agentToolAccepted'
     | 'runtimeAlive'
     | 'bootstrapConfirmed'
+    | 'hardFailure'
     | 'hardFailureReason'
     | 'sources'
     | 'pendingPermissionRequestIds'
+    | 'bootstrapStalled'
   >
 ): string[] {
   const diagnostics: string[] = [];
@@ -104,6 +181,10 @@ function buildDiagnostics(
   if (member.bootstrapConfirmed) diagnostics.push('late heartbeat received');
   if ((member.pendingPermissionRequestIds?.length ?? 0) > 0) {
     diagnostics.push('waiting for permission approval');
+  } else if (member.bootstrapStalled) {
+    diagnostics.push('opencode_bootstrap_stalled');
+  } else if (member.hardFailure && member.runtimeAlive && !member.bootstrapConfirmed) {
+    diagnostics.push('bootstrap failed while runtime process was still alive');
   } else if (member.runtimeAlive && !member.bootstrapConfirmed) {
     diagnostics.push('waiting for teammate check-in');
   }
@@ -225,6 +306,9 @@ function createSecondaryLaneMemberState(
     });
   const hardFailure = evidence?.hardFailure === true || launchState === 'failed_to_start';
   const hardFailureReason = hardFailure ? evidence?.hardFailureReason : undefined;
+  const firstSpawnAcceptedAt = evidence
+    ? resolveOpenCodeSecondaryFirstSpawnAcceptedAt(evidence, params.updatedAt)
+    : undefined;
   const base: PersistedTeamLaunchMemberState = {
     name: params.member.name.trim(),
     providerId,
@@ -268,7 +352,16 @@ function createSecondaryLaneMemberState(
     pidSource: evidence?.pidSource,
     runtimeDiagnostic: evidence?.runtimeDiagnostic,
     runtimeDiagnosticSeverity: evidence?.runtimeDiagnosticSeverity,
-    firstSpawnAcceptedAt: evidence?.agentToolAccepted ? params.updatedAt : undefined,
+    bootstrapStalled:
+      providerId === 'opencode' &&
+      evidence?.bootstrapStalled === true &&
+      launchState === 'runtime_pending_bootstrap' &&
+      hasMaterializedOpenCodeRuntimeMarker(evidence) &&
+      evidence.bootstrapConfirmed !== true &&
+      hardFailure !== true
+        ? true
+        : undefined,
+    firstSpawnAcceptedAt,
     lastHeartbeatAt: evidence?.bootstrapConfirmed ? params.updatedAt : undefined,
     runtimeLastSeenAt: strongRuntimeAlive ? params.updatedAt : undefined,
     lastRuntimeAliveAt: strongRuntimeAlive ? params.updatedAt : undefined,
diff --git a/src/main/http/teams.ts b/src/main/http/teams.ts
index 906d0915..19adbfa3 100644
--- a/src/main/http/teams.ts
+++ b/src/main/http/teams.ts
@@ -1,4 +1,5 @@
 import { validateTeammateName, validateTeamName } from '@main/ipc/guards';
+import { TeamConfigReader } from '@main/services/team/TeamConfigReader';
 import { getTeamsBasePath } from '@main/utils/pathDecoder';
 import { extractUserFlags, PROTECTED_CLI_FLAGS } from '@shared/utils/cliArgsParser';
 import {
@@ -551,6 +552,7 @@ export function registerTeamRoutes(app: FastifyInstance, services: HttpServices)
               parseLaunchRequest(teamName, request.body),
               () => undefined
             );
+        TeamConfigReader.invalidateListTeamsCache();
         return reply.send(response);
       } catch (error) {
         const statusCode = getStatusCode(error);
diff --git a/src/main/index.ts b/src/main/index.ts
index a7ab29af..c9ee0254 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -67,6 +67,7 @@ import {
   resolveAgentTeamsMcpLaunchSpec,
   TeamMcpConfigBuilder,
 } from '@main/services/team/TeamMcpConfigBuilder';
+import { TeamTranscriptProjectResolver } from '@main/services/team/TeamTranscriptProjectResolver';
 import { killTrackedCliProcesses } from '@main/utils/childProcess';
 import { resolveInteractiveShellEnv } from '@main/utils/shellEnv';
 import {
@@ -119,6 +120,7 @@ import {
 import { startEventLoopLagMonitor } from './services/infrastructure/EventLoopLagMonitor';
 import { HttpServer } from './services/infrastructure/HttpServer';
 import { clearAutoResumeService } from './services/team/AutoResumeService';
+import { LaunchIoGovernor } from './services/team/LaunchIoGovernor';
 import { OpenCodeBridgeCommandClient } from './services/team/opencode/bridge/OpenCodeBridgeCommandClient';
 import {
   createOpenCodeBridgeCommandLeaseStore,
@@ -135,6 +137,8 @@ import {
   clearTeamControlApiState,
   writeTeamControlApiState,
 } from './services/team/TeamControlApiState';
+import { getTeamDataWorkerClient } from './services/team/TeamDataWorkerClient';
+import { getTeamFsWorkerClient } from './services/team/TeamFsWorkerClient';
 import { TeamInboxReader } from './services/team/TeamInboxReader';
 import { TeamMemberRuntimeAdvisoryService } from './services/team/TeamMemberRuntimeAdvisoryService';
 import {
@@ -494,6 +498,9 @@ async function notifyNewInboxMessages(teamName: string, detail: string): Promise
           summary,
           body: extracted.body,
           dedupeKey: `inbox:${teamName}:${memberName}:${msgId}`,
+          target: isCrossTeam
+            ? { kind: 'team', teamName, section: 'messages' }
+            : { kind: 'member', teamName, memberName: fromLabel, focus: 'messages' },
           suppressToast: effectiveSuppressToast,
         })
         .catch(() => undefined);
@@ -553,6 +560,7 @@ async function notifyNewSentMessages(teamName: string): Promise<void> {
           summary,
           body: extracted.body,
           dedupeKey: `sent:${teamName}:${msg.timestamp ?? String(prevCount + i)}`,
+          target: { kind: 'member', teamName, memberName: fromLabel, focus: 'messages' },
           suppressToast,
         })
         .catch(() => undefined);
@@ -588,6 +596,7 @@ let runtimeProviderManagementFeature: RuntimeProviderManagementFeatureFacade;
 let memberWorkSyncFeature: MemberWorkSyncFeatureFacade | null = null;
 let teamDataService: TeamDataService;
 let teamProvisioningService: TeamProvisioningService;
+let launchIoGovernor: LaunchIoGovernor | null = null;
 let cliInstallerService: CliInstallerService;
 let ptyTerminalService: PtyTerminalService;
 let httpServer: HttpServer;
@@ -608,6 +617,8 @@ let shutdownComplete = false;
 const startupTimers = new Set<ReturnType<typeof setTimeout>>();
 
 const SHUTDOWN_STEP_TIMEOUT_MS = 5_000;
+const STARTUP_RECOVERY_DELAY_MS = 10_000;
+const STARTUP_RECOVERY_CONCURRENCY = 1;
 
 function isShutdownStarted(): boolean {
   return shutdownComplete || shutdownPromise !== null;
@@ -625,6 +636,23 @@ function scheduleStartupTask(action: () => void, delayMs: number): void {
   startupTimers.add(timer);
 }
 
+async function runStartupJobsBounded<T>(
+  items: readonly T[],
+  concurrency: number,
+  run: (item: T) => Promise<void>
+): Promise<void> {
+  const workerCount = Math.max(1, Math.min(concurrency, items.length));
+  const workers = Array.from({ length: workerCount }, async (_, workerIndex) => {
+    for (let index = workerIndex; index < items.length; index += workerCount) {
+      if (isShutdownStarted()) {
+        return;
+      }
+      await run(items[index]);
+    }
+  });
+  await Promise.allSettled(workers);
+}
+
 function clearStartupTimers(): void {
   for (const timer of startupTimers) {
     clearTimeout(timer);
@@ -805,13 +833,31 @@ function wireFileWatcherEvents(context: ServiceContext): void {
       if (typeof row.teamName !== 'string' || row.teamName.trim().length === 0) return;
       const teamName = row.teamName.trim();
       const detail = typeof row.detail === 'string' ? row.detail : '';
+      launchIoGovernor?.noteTeamChange(row as TeamChangeEvent);
       memberWorkSyncFeature?.noteTeamChange(row as TeamChangeEvent);
 
+      if (row.type === 'config') {
+        if (detail === 'config.json') {
+          TeamConfigReader.invalidateTeam(teamName);
+          getTeamDataWorkerClient().invalidateTeamConfig(teamName);
+        } else if (detail === 'team.meta.json' || detail === 'members.meta.json') {
+          TeamConfigReader.invalidateListTeamsCache();
+          getTeamDataWorkerClient().invalidateTeamConfig(teamName);
+        }
+      }
+
+      if (row.type === 'task') {
+        TeamTaskReader.invalidateAllTasksCache();
+      }
+
       if (
         teamDataService &&
         (row.type === 'inbox' || row.type === 'lead-message' || row.type === 'config')
       ) {
         teamDataService.invalidateMessageFeed(teamName);
+        if (row.type === 'inbox' || row.type === 'lead-message') {
+          getTeamDataWorkerClient().invalidateTeamMessageFeed(teamName);
+        }
       }
 
       // --- Inbox change events: relay to lead + native OS notifications ---
@@ -1032,6 +1078,10 @@ async function initializeServices(): Promise<void> {
   // Set notification manager on local context's file watcher
   localContext.fileWatcher.setNotificationManager(notificationManager);
 
+  launchIoGovernor = new LaunchIoGovernor({
+    logger: createLogger('Service:LaunchIoGovernor'),
+  });
+
   // Wire file watcher events for local context
   wireFileWatcherEvents(localContext);
 
@@ -1054,7 +1104,12 @@ async function initializeServices(): Promise<void> {
   ptyTerminalService = new PtyTerminalService();
   const teamMemberLogsFinder = new TeamMemberLogsFinder();
   const teamLogSourceTracker = new TeamLogSourceTracker(teamMemberLogsFinder);
-  const teamTranscriptSourceLocator = new TeamTranscriptSourceLocator();
+  const taskLogConfigReader = new TeamConfigReader();
+  const teamTranscriptSourceLocator = new TeamTranscriptSourceLocator(
+    new TeamTranscriptProjectResolver({
+      getConfig: (teamName) => taskLogConfigReader.getConfigSnapshot(teamName),
+    })
+  );
   teamLogSourceTracker.onLogSourceChange((teamName) => {
     teamTranscriptSourceLocator.invalidateTeam(teamName);
   });
@@ -1197,11 +1252,27 @@ async function initializeServices(): Promise<void> {
   });
 
   const forwardTeamChange = (event: TeamChangeEvent): void => {
+    launchIoGovernor?.noteTeamChange(event);
+    if (event.type === 'config') {
+      if (event.detail === 'config.json') {
+        TeamConfigReader.invalidateTeam(event.teamName);
+        getTeamDataWorkerClient().invalidateTeamConfig(event.teamName);
+      } else if (event.detail === 'team.meta.json' || event.detail === 'members.meta.json') {
+        TeamConfigReader.invalidateListTeamsCache();
+        getTeamDataWorkerClient().invalidateTeamConfig(event.teamName);
+      }
+    }
+    if (event.type === 'task') {
+      TeamTaskReader.invalidateAllTasksCache();
+    }
     if (
       teamDataService &&
       (event.type === 'inbox' || event.type === 'lead-message' || event.type === 'config')
     ) {
       teamDataService.invalidateMessageFeed(event.teamName);
+      if (event.type === 'inbox' || event.type === 'lead-message') {
+        getTeamDataWorkerClient().invalidateTeamMessageFeed(event.teamName);
+      }
     }
     safeSendToRenderer(mainWindow, TEAM_CHANGE, event);
     httpServer?.broadcast('team-change', event);
@@ -1225,18 +1296,25 @@ async function initializeServices(): Promise<void> {
   teamLogSourceTracker.onLogSourceChange((teamName) => {
     teammateToolTracker?.handleLogSourceChange(teamName);
   });
-  void teamDataService
-    .listTeams()
-    .then(async (teams) => {
-      await Promise.all(
-        teams.map((team) =>
-          teamProvisioningService.scanOpenCodePromptDeliveryWatchdog(team.teamName)
-        )
+  scheduleStartupTask(() => {
+    void teamDataService
+      .listTeams()
+      .then(async (teams) => {
+        const activeTeamNames = teams
+          .filter((team) => !team.deletedAt)
+          .map((team) => team.teamName);
+        await runStartupJobsBounded(
+          activeTeamNames,
+          STARTUP_RECOVERY_CONCURRENCY,
+          async (teamName) => {
+            await teamProvisioningService.scanOpenCodePromptDeliveryWatchdog(teamName);
+          }
+        );
+      })
+      .catch((error: unknown) =>
+        logger.warn(`[Init] OpenCode prompt delivery watchdog recovery failed: ${String(error)}`)
       );
-    })
-    .catch((error: unknown) =>
-      logger.warn(`[Init] OpenCode prompt delivery watchdog recovery failed: ${String(error)}`)
-    );
+  }, STARTUP_RECOVERY_DELAY_MS);
   teamTaskStallMonitor.start();
 
   // Allow SchedulerService to push schedule events to renderer
@@ -1291,16 +1369,25 @@ async function initializeServices(): Promise<void> {
       ? memberWorkSyncFeature.buildRuntimeTurnSettledEnvironment(input)
       : Promise.resolve(null)
   );
-  void teamDataService
-    .listTeams()
-    .then(async (teams) => {
-      const activeTeamNames = teams.filter((team) => !team.deletedAt).map((team) => team.teamName);
-      await memberWorkSyncFeature?.replayPendingReports(activeTeamNames);
-      await memberWorkSyncFeature?.enqueueStartupScan(activeTeamNames);
-    })
-    .catch((error: unknown) =>
-      logger.warn(`[Init] Member work sync startup scan failed: ${String(error)}`)
-    );
+  scheduleStartupTask(() => {
+    void teamDataService
+      .listTeams()
+      .then(async (teams) => {
+        const lifecycleActiveTeamNames = teams
+          .filter(
+            (team) =>
+              !team.deletedAt &&
+              (teamProvisioningService.isTeamAlive(team.teamName) ||
+                teamProvisioningService.hasProvisioningRun(team.teamName))
+          )
+          .map((team) => team.teamName);
+        await memberWorkSyncFeature?.replayPendingReports(lifecycleActiveTeamNames);
+        await memberWorkSyncFeature?.enqueueStartupScan(lifecycleActiveTeamNames);
+      })
+      .catch((error: unknown) =>
+        logger.warn(`[Init] Member work sync startup scan failed: ${String(error)}`)
+      );
+  }, STARTUP_RECOVERY_DELAY_MS + 2_000);
   codexAccountFeature = createCodexAccountFeature({
     logger: createLogger('Feature:CodexAccount'),
     configManager,
@@ -1363,7 +1450,8 @@ async function initializeServices(): Promise<void> {
     skillsMutationService,
     skillsWatcherService,
     crossTeamService,
-    teamBackupService ?? undefined
+    teamBackupService ?? undefined,
+    launchIoGovernor ?? undefined
   );
   registerCodexAccountIpc(ipcMain, codexAccountFeature);
   registerRecentProjectsIpc(ipcMain, recentProjectsFeature);
@@ -1758,6 +1846,30 @@ function createWindow(): void {
         updaterService.startPeriodicCheck(60 * 60 * 1000);
       }
 
+      scheduleStartupTask(
+        () => {
+          void getTeamFsWorkerClient()
+            .prewarm()
+            .catch((error: unknown) =>
+              logger.debug(
+                `[startup] team-fs-worker prewarm skipped: ${
+                  error instanceof Error ? error.message : String(error)
+                }`
+              )
+            );
+          void getTeamDataWorkerClient()
+            .prewarm()
+            .catch((error: unknown) =>
+              logger.debug(
+                `[startup] team-data-worker prewarm skipped: ${
+                  error instanceof Error ? error.message : String(error)
+                }`
+              )
+            );
+        },
+        process.platform === 'win32' ? 2500 : 1000
+      );
+
       // Defer non-critical startup work to avoid thread pool contention.
       // The window is now visible and responsive; these run in the background.
       scheduleStartupTask(() => {
@@ -2001,6 +2113,8 @@ app.on('before-quit', (event) => {
 
   event.preventDefault();
 
+  notificationManager.closeActiveNativeNotifications('app-before-quit');
+
   for (const win of BrowserWindow.getAllWindows()) {
     if (!win.isDestroyed()) {
       win.hide();
diff --git a/src/main/ipc/handlers.ts b/src/main/ipc/handlers.ts
index b7636889..da77da67 100644
--- a/src/main/ipc/handlers.ts
+++ b/src/main/ipc/handlers.ts
@@ -123,6 +123,7 @@ import type { McpHealthDiagnosticsService } from '../services/extensions/state/M
 import type { HttpServer } from '../services/infrastructure/HttpServer';
 import type { SchedulerService } from '../services/schedule/SchedulerService';
 import type { CrossTeamService } from '../services/team/CrossTeamService';
+import type { LaunchIoGovernor } from '../services/team/LaunchIoGovernor';
 import type { TeamBackupService } from '../services/team/TeamBackupService';
 
 /**
@@ -169,7 +170,8 @@ export function initializeIpcHandlers(
   skillsMutationService?: SkillsMutationService,
   skillsWatcherService?: SkillsWatcherService,
   crossTeamService?: CrossTeamService,
-  teamBackupService?: TeamBackupService
+  teamBackupService?: TeamBackupService,
+  launchIoGovernor?: LaunchIoGovernor
 ): void {
   // Initialize domain handlers with registry
   initializeProjectHandlers(registry);
@@ -192,7 +194,8 @@ export function initializeIpcHandlers(
     boardTaskActivityDetailService,
     boardTaskLogStreamService,
     boardTaskExactLogsService,
-    boardTaskExactLogDetailService
+    boardTaskExactLogDetailService,
+    launchIoGovernor
   );
   initializeConfigHandlers({
     onClaudeRootPathUpdated: contextCallbacks.onClaudeRootPathUpdated,
diff --git a/src/main/ipc/teams.ts b/src/main/ipc/teams.ts
index cd160691..31831d5b 100644
--- a/src/main/ipc/teams.ts
+++ b/src/main/ipc/teams.ts
@@ -29,6 +29,7 @@ import {
   TEAM_GET_MEMBER_LOGS,
   TEAM_GET_MEMBER_STATS,
   TEAM_GET_MESSAGES_PAGE,
+  TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS,
   TEAM_GET_PROJECT_BRANCH,
   TEAM_GET_SAVED_REQUEST,
   TEAM_GET_TASK_ACTIVITY,
@@ -60,6 +61,7 @@ import {
   TEAM_RESTART_MEMBER,
   TEAM_RESTORE,
   TEAM_RESTORE_TASK,
+  TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES,
   TEAM_SAVE_TASK_ATTACHMENT,
   TEAM_SEND_MESSAGE,
   TEAM_SET_CHANGE_PRESENCE_TRACKING,
@@ -123,7 +125,12 @@ import {
 import {
   getAutoResumeService,
   initializeAutoResumeService,
+  planRateLimitAutoResume,
 } from '../services/team/AutoResumeService';
+import {
+  cloneLaunchIoGovernorPayload,
+  type LaunchIoGovernor,
+} from '../services/team/LaunchIoGovernor';
 import {
   buildReplaceMembersDiff,
   buildReplaceMembersSummaryMessage,
@@ -183,6 +190,8 @@ import type {
   MemberLogSummary,
   MemberSpawnStatusesSnapshot,
   MessagesPage,
+  OpenCodeRuntimeDeliveryStatus,
+  RetryFailedOpenCodeSecondaryLanesResult,
   SendMessageRequest,
   SendMessageResult,
   TaskAttachmentMeta,
@@ -197,6 +206,7 @@ import type {
   TeamCreateRequest,
   TeamCreateResponse,
   TeamFastMode,
+  TeamGetDataOptions,
   TeamLaunchRequest,
   TeamLaunchResponse,
   TeamMemberActivityMeta,
@@ -221,6 +231,61 @@ import type { CliArgsValidationResult } from '@shared/utils/cliArgsParser';
 const logger = createLogger('IPC:teams');
 const OPENCODE_RUNTIME_DELIVERY_UI_TIMEOUT_MS = 12_000;
 
+type VisibleDirectReplyProtocol = 'send_message' | 'agent_teams_message_send';
+
+function resolveVisibleDirectReplyProtocol(input: {
+  providerId?: TeamProviderId;
+  isLeadRecipient: boolean;
+  replyRecipient: string;
+}): VisibleDirectReplyProtocol {
+  if (
+    !input.isLeadRecipient &&
+    input.replyRecipient.trim().toLowerCase() === 'user' &&
+    input.providerId === 'codex'
+  ) {
+    return 'agent_teams_message_send';
+  }
+
+  return 'send_message';
+}
+const TEAM_DATA_DRAFT_CLASSIFICATION_ACCESS_TIMEOUT_MS = 250;
+
+function isPlainObject(value: unknown): value is Record<string, unknown> {
+  if (value == null || typeof value !== 'object') {
+    return false;
+  }
+  const prototype = Object.getPrototypeOf(value);
+  return prototype === Object.prototype || prototype === null;
+}
+
+function validateTeamGetDataOptions(
+  value: unknown
+): { valid: true; value: TeamGetDataOptions | undefined } | { valid: false; error: string } {
+  if (value === undefined) {
+    return { valid: true, value: undefined };
+  }
+  if (!isPlainObject(value)) {
+    return { valid: false, error: 'options must be an object' };
+  }
+
+  const allowed = new Set(['includeMemberBranches']);
+  for (const key of Object.keys(value)) {
+    if (!allowed.has(key)) {
+      return { valid: false, error: `Unknown getData option: ${key}` };
+    }
+  }
+
+  const includeMemberBranches = value.includeMemberBranches;
+  if (includeMemberBranches !== undefined && typeof includeMemberBranches !== 'boolean') {
+    return { valid: false, error: 'includeMemberBranches must be a boolean' };
+  }
+
+  return {
+    valid: true,
+    value: includeMemberBranches === false ? { includeMemberBranches: false } : undefined,
+  };
+}
+
 /**
  * In-memory set of rate-limit message keys already processed.
  * Independent of NotificationManager storage — survives notification deletion/pruning.
@@ -359,6 +424,21 @@ function buildLeadDirectDelegateAckBlock(actionMode?: AgentActionMode): string |
 const seenApiErrorKeys = new Set<string>();
 const SEEN_API_ERROR_KEYS_MAX = 500;
 
+function formatNotificationClockTime(date: Date): string {
+  return new Intl.DateTimeFormat(undefined, {
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: false,
+  }).format(date);
+}
+
+function buildRateLimitNotificationBody(plan: ReturnType<typeof planRateLimitAutoResume>): string {
+  if (plan.kind === 'scheduled') {
+    return `Auto-resume scheduled at ${formatNotificationClockTime(new Date(plan.fireAtMs))}`;
+  }
+  return 'Manual restart needed';
+}
+
 /**
  * Check messages for rate limit indicators and fire notifications for new ones.
  * Uses both in-memory seenRateLimitKeys (to prevent resurrection after deletion)
@@ -390,6 +470,18 @@ function checkRateLimitMessages(
 
     const rawKey = msg.messageId ?? `${msg.from}:${msg.timestamp}`;
     const dedupeKey = `rate-limit:${teamName}:${rawKey}`;
+    const isLeadAutoResumeCandidate =
+      !msg.to && (msg.source === 'lead_process' || msg.source === 'lead_session');
+    const autoResumeSessionMatches =
+      msg.source !== 'lead_session' ||
+      (Boolean(currentLeadSessionId) && msg.leadSessionId === currentLeadSessionId);
+    const autoResumePlan = planRateLimitAutoResume({
+      enabled: autoResumeEnabled,
+      canAutoResume: teamIsAlive && isLeadAutoResumeCandidate && autoResumeSessionMatches,
+      messageText: msg.text,
+      observedAt,
+      messageTimestamp: new Date(msg.timestamp),
+    });
 
     // In-memory guard: prevents resurrection after user deletes the notification.
     if (!seenRateLimitKeys.has(dedupeKey)) {
@@ -407,9 +499,10 @@ function checkRateLimitMessages(
           teamName,
           teamDisplayName,
           from: msg.from,
-          summary: `Rate limit: ${msg.from}`,
-          body: msg.text.slice(0, 200),
+          summary: 'Rate limit',
+          body: buildRateLimitNotificationBody(autoResumePlan),
           dedupeKey,
+          target: { kind: 'member', teamName, memberName: msg.from, focus: 'logs' },
           projectPath,
         })
         .catch(() => undefined);
@@ -419,18 +512,10 @@ function checkRateLimitMessages(
     // Persisted history for an offline/stopped team may still contain the old
     // rate-limit message, but arming a new timer from that stale history would
     // resurrect the nudge into a later manual restart.
-    const isLeadAutoResumeCandidate =
-      !msg.to && (msg.source === 'lead_process' || msg.source === 'lead_session');
-
-    if (autoResumeEnabled && teamIsAlive && isLeadAutoResumeCandidate) {
+    if (autoResumePlan.kind === 'scheduled') {
       // Only let persisted lead_session history rebuild auto-resume when it
       // clearly belongs to the currently running lead session. Otherwise an old
       // rate-limit from a previous manual run can resurrect into a newer restart.
-      if (msg.source === 'lead_session') {
-        if (!currentLeadSessionId) continue;
-        if (msg.leadSessionId !== currentLeadSessionId) continue;
-      }
-
       // Pass the original message timestamp so relative reset windows survive restarts
       // and old history does not rebuild a fresh auto-resume timer from "now".
       getAutoResumeService().handleRateLimitMessage(
@@ -477,13 +562,14 @@ function checkApiErrorMessages(
 
     void NotificationManager.getInstance()
       .addTeamNotification({
-        teamEventType: 'rate_limit', // reuse rate_limit type — closest fit
+        teamEventType: 'api_error',
         teamName,
         teamDisplayName,
         from: msg.from,
-        summary: `API Error ${statusCode}: ${msg.from}`,
-        body: msg.text.slice(0, 400),
+        summary: `API Error ${statusCode}`,
+        body: 'Manual restart needed',
         dedupeKey,
+        target: { kind: 'member', teamName, memberName: msg.from, focus: 'logs' },
         projectPath,
       })
       .catch(() => undefined);
@@ -511,6 +597,7 @@ let teamBackupService: TeamBackupService | null = null;
 let teammateToolTracker: TeammateToolTracker | null = null;
 let teamLogSourceTracker: TeamLogSourceTracker | null = null;
 let branchStatusService: BranchStatusService | null = null;
+let launchIoGovernor: LaunchIoGovernor | null = null;
 let boardTaskActivityService: BoardTaskActivityService | null = null;
 let boardTaskActivityDetailService: BoardTaskActivityDetailService | null = null;
 let boardTaskLogStreamService: BoardTaskLogStreamService | null = null;
@@ -563,7 +650,8 @@ export function initializeTeamHandlers(
   taskActivityDetailService?: BoardTaskActivityDetailService,
   taskLogStreamService?: BoardTaskLogStreamService,
   taskExactLogsService?: BoardTaskExactLogsService,
-  taskExactLogDetailService?: BoardTaskExactLogDetailService
+  taskExactLogDetailService?: BoardTaskExactLogDetailService,
+  ioGovernor?: LaunchIoGovernor
 ): void {
   teamDataService = service;
   teamProvisioningService = provisioningService;
@@ -574,6 +662,7 @@ export function initializeTeamHandlers(
   teammateToolTracker = toolTracker ?? null;
   teamLogSourceTracker = logSourceTracker ?? null;
   branchStatusService = branchTracker ?? null;
+  launchIoGovernor = ioGovernor ?? null;
   boardTaskActivityService = taskActivityService ?? null;
   boardTaskActivityDetailService = taskActivityDetailService ?? null;
   boardTaskLogStreamService = taskLogStreamService ?? null;
@@ -599,6 +688,7 @@ export function registerTeamHandlers(ipcMain: IpcMain): void {
   ipcMain.handle(TEAM_PROVISIONING_STATUS, handleProvisioningStatus);
   ipcMain.handle(TEAM_CANCEL_PROVISIONING, handleCancelProvisioning);
   ipcMain.handle(TEAM_SEND_MESSAGE, handleSendMessage);
+  ipcMain.handle(TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS, handleGetOpenCodeRuntimeDeliveryStatus);
   ipcMain.handle(TEAM_GET_MESSAGES_PAGE, handleGetMessagesPage);
   ipcMain.handle(TEAM_GET_MEMBER_ACTIVITY_META, handleGetMemberActivityMeta);
   ipcMain.handle(TEAM_CREATE_TASK, handleCreateTask);
@@ -641,6 +731,10 @@ export function registerTeamHandlers(ipcMain: IpcMain): void {
   ipcMain.handle(TEAM_LEAD_CONTEXT, handleLeadContext);
   ipcMain.handle(TEAM_MEMBER_SPAWN_STATUSES, handleMemberSpawnStatuses);
   ipcMain.handle(TEAM_GET_AGENT_RUNTIME, handleGetAgentRuntime);
+  ipcMain.handle(
+    TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES,
+    handleRetryFailedOpenCodeSecondaryLanes
+  );
   ipcMain.handle(TEAM_RESTART_MEMBER, handleRestartMember);
   ipcMain.handle(TEAM_SKIP_MEMBER_FOR_LAUNCH, handleSkipMemberForLaunch);
   ipcMain.handle(TEAM_SOFT_DELETE_TASK, handleSoftDeleteTask);
@@ -680,6 +774,7 @@ export function removeTeamHandlers(ipcMain: IpcMain): void {
   ipcMain.removeHandler(TEAM_PROVISIONING_STATUS);
   ipcMain.removeHandler(TEAM_CANCEL_PROVISIONING);
   ipcMain.removeHandler(TEAM_SEND_MESSAGE);
+  ipcMain.removeHandler(TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS);
   ipcMain.removeHandler(TEAM_GET_MESSAGES_PAGE);
   ipcMain.removeHandler(TEAM_GET_MEMBER_ACTIVITY_META);
   ipcMain.removeHandler(TEAM_CREATE_TASK);
@@ -722,6 +817,7 @@ export function removeTeamHandlers(ipcMain: IpcMain): void {
   ipcMain.removeHandler(TEAM_LEAD_CONTEXT);
   ipcMain.removeHandler(TEAM_MEMBER_SPAWN_STATUSES);
   ipcMain.removeHandler(TEAM_GET_AGENT_RUNTIME);
+  ipcMain.removeHandler(TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES);
   ipcMain.removeHandler(TEAM_RESTART_MEMBER);
   ipcMain.removeHandler(TEAM_SKIP_MEMBER_FOR_LAUNCH);
   ipcMain.removeHandler(TEAM_SOFT_DELETE_TASK);
@@ -895,7 +991,14 @@ async function handleListTeams(_event: IpcMainInvokeEvent): Promise<IpcResult<Te
   setCurrentMainOp('team:list');
   const startedAt = Date.now();
   try {
-    return await wrapTeamHandler('list', () => getTeamDataService().listTeams());
+    return await wrapTeamHandler('list', () => {
+      const loadFresh = () => getTeamDataService().listTeams();
+      return launchIoGovernor
+        ? launchIoGovernor.runSummaryOperation('teams:list', loadFresh, {
+            clone: cloneLaunchIoGovernorPayload,
+          })
+        : loadFresh();
+    });
   } finally {
     const ms = Date.now() - startedAt;
     if (ms >= 1500) {
@@ -907,44 +1010,74 @@ async function handleListTeams(_event: IpcMainInvokeEvent): Promise<IpcResult<Te
 
 async function handleGetData(
   _event: IpcMainInvokeEvent,
-  teamName: unknown
+  teamName: unknown,
+  rawOptions?: unknown
 ): Promise<IpcResult<TeamViewSnapshot>> {
   const validated = validateTeamName(teamName);
   if (!validated.valid) {
     return { success: false, error: validated.error ?? 'Invalid teamName' };
   }
+  const optionsResult = validateTeamGetDataOptions(rawOptions);
+  if (!optionsResult.valid) {
+    return { success: false, error: optionsResult.error };
+  }
   const tn = validated.value!;
+  const getDataOptions = optionsResult.value;
   const startedAt = Date.now();
   let data: TeamViewSnapshot;
+  let dataSource: 'worker' | 'main-fallback' | 'main-unavailable' = 'main-unavailable';
+  let workerAvailable = false;
+  const readFromMain = (): Promise<TeamViewSnapshot> =>
+    getDataOptions === undefined
+      ? getTeamDataService().getTeamData(tn)
+      : getTeamDataService().getTeamData(tn, getDataOptions);
   setCurrentMainOp('team:getData');
   try {
     // Prefer worker thread to keep main event loop responsive
     const worker = getTeamDataWorkerClient();
-    if (worker.isAvailable()) {
+    workerAvailable = worker.isAvailable();
+    const missingState = await classifyMissingTeamData(tn);
+    if (missingState === 'provisioning') {
+      return { success: false, error: 'TEAM_PROVISIONING' };
+    }
+    if (missingState === 'draft') {
+      return { success: false, error: 'TEAM_DRAFT' };
+    }
+
+    if (workerAvailable) {
       try {
-        data = await worker.getTeamData(tn);
+        data =
+          getDataOptions === undefined
+            ? await worker.getTeamData(tn)
+            : await worker.getTeamData(tn, getDataOptions);
+        dataSource = 'worker';
       } catch (workerErr) {
         logger.warn(
           `[teams:getData] worker failed, falling back: ${workerErr instanceof Error ? workerErr.message : workerErr}`
         );
         noteHeavyTeamDataWorkerFallback('teams:getData');
-        data = await getTeamDataService().getTeamData(tn);
+        data = await readFromMain();
+        dataSource = 'main-fallback';
       }
     } else {
       noteHeavyTeamDataWorkerFallback('teams:getData');
-      data = await getTeamDataService().getTeamData(tn);
+      data = await readFromMain();
     }
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
     if (
       message === `Team not found: ${tn}` &&
-      getTeamProvisioningService().hasProvisioningRun(tn)
+      getTeamProvisioningService().hasProvisioningRun?.(tn) === true
     ) {
       return { success: false, error: 'TEAM_PROVISIONING' };
     }
     // Draft team: team.meta.json exists but config.json doesn't (provisioning failed before TeamCreate)
     if (message === `Team not found: ${tn}`) {
-      const meta = await teamMetaStore.getMeta(tn);
+      const meta = await withTimeoutValue(
+        teamMetaStore.getMeta(tn).catch(() => null),
+        TEAM_DATA_DRAFT_CLASSIFICATION_ACCESS_TIMEOUT_MS,
+        null
+      );
       if (meta) {
         return { success: false, error: 'TEAM_DRAFT' };
       }
@@ -957,7 +1090,10 @@ async function handleGetData(
   const getDataMs = Date.now() - startedAt;
 
   if (getDataMs >= 1500) {
-    logger.warn(`[teams:getData] slow team=${tn} ms=${getDataMs}`);
+    const branchMode = getDataOptions?.includeMemberBranches === false ? 'skipped' : 'full';
+    logger.warn(
+      `[teams:getData] slow team=${tn} ms=${getDataMs} source=${dataSource} workerAvailable=${workerAvailable} branchMode=${branchMode}`
+    );
   }
   const teamDataService = getTeamDataService();
   if (data.processes.some((process) => !process.stoppedAt)) {
@@ -1015,6 +1151,33 @@ async function handleGetData(
   return { success: true, data: { ...data, isAlive } };
 }
 
+async function classifyMissingTeamData(teamName: string): Promise<'provisioning' | 'draft' | null> {
+  const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
+  const configExists = await withTimeoutValue(
+    fs.promises
+      .access(configPath, fs.constants.F_OK)
+      .then(() => true)
+      .catch((error: unknown) => {
+        const code = typeof error === 'object' && error ? (error as { code?: unknown }).code : null;
+        return code === 'ENOENT' ? false : null;
+      }),
+    TEAM_DATA_DRAFT_CLASSIFICATION_ACCESS_TIMEOUT_MS,
+    null
+  );
+  if (configExists !== false) {
+    return null;
+  }
+  if (getTeamProvisioningService().hasProvisioningRun?.(teamName) === true) {
+    return 'provisioning';
+  }
+  const meta = await withTimeoutValue(
+    teamMetaStore.getMeta(teamName).catch(() => null),
+    TEAM_DATA_DRAFT_CLASSIFICATION_ACCESS_TIMEOUT_MS,
+    null
+  );
+  return meta ? 'draft' : null;
+}
+
 async function handleGetTaskChangePresence(
   _event: IpcMainInvokeEvent,
   teamName: unknown
@@ -1116,6 +1279,7 @@ async function handleDeleteTeam(
     getAutoResumeService().cancelPendingAutoResume(validated.value!);
     await getTeamProvisioningService().stopTeam(validated.value!);
     await getTeamDataService().deleteTeam(validated.value!);
+    getTeamDataWorkerClient().invalidateTeamConfig(validated.value!);
   });
 }
 
@@ -1127,7 +1291,10 @@ async function handleRestoreTeam(
   if (!validated.valid) {
     return { success: false, error: validated.error ?? 'Invalid teamName' };
   }
-  return wrapTeamHandler('restoreTeam', () => getTeamDataService().restoreTeam(validated.value!));
+  return wrapTeamHandler('restoreTeam', async () => {
+    await getTeamDataService().restoreTeam(validated.value!);
+    getTeamDataWorkerClient().invalidateTeamConfig(validated.value!);
+  });
 }
 
 async function handlePermanentlyDeleteTeam(
@@ -1141,6 +1308,7 @@ async function handlePermanentlyDeleteTeam(
   return wrapTeamHandler('permanentlyDeleteTeam', async () => {
     getAutoResumeService().cancelPendingAutoResume(validated.value!);
     await getTeamDataService().permanentlyDeleteTeam(validated.value!);
+    getTeamDataWorkerClient().invalidateTeamConfig(validated.value!);
     // Clean up app-owned data (attachments, task-attachments) that lives outside ~/.claude/
     const appData = getAppDataPath();
     await fs.promises
@@ -1208,6 +1376,7 @@ async function handleUpdateConfig(
       }
     }
 
+    getTeamDataWorkerClient().invalidateTeamConfig(tn);
     return result;
   });
 }
@@ -1797,6 +1966,21 @@ function sendProvisioningProgress(
   safeSendToRenderer(targetWindow, TEAM_PROVISIONING_PROGRESS, progress);
 }
 
+function noteLaunchIntentFailed(teamName: string, source: string): void {
+  if (!launchIoGovernor) {
+    return;
+  }
+  const now = new Date().toISOString();
+  launchIoGovernor.noteProvisioningProgress({
+    runId: `${source}:failed-before-progress`,
+    teamName,
+    state: 'failed',
+    message: 'Launch failed before provisioning progress',
+    startedAt: now,
+    updatedAt: now,
+  } as TeamProvisioningProgress);
+}
+
 async function handleCreateTeam(
   event: IpcMainInvokeEvent,
   request: unknown
@@ -1807,11 +1991,18 @@ async function handleCreateTeam(
   }
   const progressTargetWindow = BrowserWindow.fromWebContents(event.sender);
 
-  return wrapTeamHandler('create', () => {
+  return wrapTeamHandler('create', async () => {
     addMainBreadcrumb('team', 'create', { teamName: validation.value.teamName });
-    return getTeamProvisioningService().createTeam(validation.value, (progress) => {
-      sendProvisioningProgress(progressTargetWindow, progress);
-    });
+    launchIoGovernor?.noteLaunchIntent(validation.value.teamName, 'create');
+    try {
+      return await getTeamProvisioningService().createTeam(validation.value, (progress) => {
+        launchIoGovernor?.noteProvisioningProgress(progress);
+        sendProvisioningProgress(progressTargetWindow, progress);
+      });
+    } catch (error) {
+      noteLaunchIntentFailed(validation.value.teamName, 'create');
+      throw error;
+    }
   });
 }
 
@@ -1944,11 +2135,18 @@ async function handleLaunchTeam(
       members: savedRequest.members,
     };
 
-    return wrapTeamHandler('create', () =>
-      getTeamProvisioningService().createTeam(createRequest, (progress) => {
-        sendProvisioningProgress(progressTargetWindow, progress);
-      })
-    );
+    return wrapTeamHandler('create', async () => {
+      launchIoGovernor?.noteLaunchIntent(tn, 'draft-launch');
+      try {
+        return await getTeamProvisioningService().createTeam(createRequest, (progress) => {
+          launchIoGovernor?.noteProvisioningProgress(progress);
+          sendProvisioningProgress(progressTargetWindow, progress);
+        });
+      } catch (error) {
+        noteLaunchIntentFailed(tn, 'draft-launch');
+        throw error;
+      }
+    });
   }
 
   const persistedMeta = await teamMetaStore.getMeta(tn).catch(() => null);
@@ -1986,33 +2184,41 @@ async function handleLaunchTeam(
   const launchLimitContext =
     typeof payload.limitContext === 'boolean' ? payload.limitContext : persistedMeta?.limitContext;
 
-  return wrapTeamHandler('launch', () => {
+  return wrapTeamHandler('launch', async () => {
     addMainBreadcrumb('team', 'launch', { teamName: validatedTeamName.value! });
-    return getTeamProvisioningService().launchTeam(
-      {
-        teamName: validatedTeamName.value!,
-        cwd,
-        prompt: typeof payload.prompt === 'string' ? payload.prompt.trim() || undefined : undefined,
-        providerId: launchProviderId,
-        providerBackendId: launchProviderBackendValidation.value,
-        model: rawLaunchModel,
-        effort: effortValidation.value,
-        fastMode: fastModeValidation.value,
-        limitContext: launchLimitContext,
-        clearContext: payload.clearContext === true ? true : undefined,
-        skipPermissions:
-          typeof payload.skipPermissions === 'boolean' ? payload.skipPermissions : undefined,
-        worktree:
-          typeof payload.worktree === 'string' ? payload.worktree.trim() || undefined : undefined,
-        extraCliArgs:
-          typeof payload.extraCliArgs === 'string'
-            ? payload.extraCliArgs.trim() || undefined
-            : undefined,
-      },
-      (progress) => {
-        sendProvisioningProgress(progressTargetWindow, progress);
-      }
-    );
+    launchIoGovernor?.noteLaunchIntent(validatedTeamName.value!, 'launch');
+    try {
+      return await getTeamProvisioningService().launchTeam(
+        {
+          teamName: validatedTeamName.value!,
+          cwd,
+          prompt:
+            typeof payload.prompt === 'string' ? payload.prompt.trim() || undefined : undefined,
+          providerId: launchProviderId,
+          providerBackendId: launchProviderBackendValidation.value,
+          model: rawLaunchModel,
+          effort: effortValidation.value,
+          fastMode: fastModeValidation.value,
+          limitContext: launchLimitContext,
+          clearContext: payload.clearContext === true ? true : undefined,
+          skipPermissions:
+            typeof payload.skipPermissions === 'boolean' ? payload.skipPermissions : undefined,
+          worktree:
+            typeof payload.worktree === 'string' ? payload.worktree.trim() || undefined : undefined,
+          extraCliArgs:
+            typeof payload.extraCliArgs === 'string'
+              ? payload.extraCliArgs.trim() || undefined
+              : undefined,
+        },
+        (progress) => {
+          launchIoGovernor?.noteProvisioningProgress(progress);
+          sendProvisioningProgress(progressTargetWindow, progress);
+        }
+      );
+    } catch (error) {
+      noteLaunchIntentFailed(validatedTeamName.value!, 'launch');
+      throw error;
+    }
   });
 }
 
@@ -2289,7 +2495,11 @@ function buildMessageDeliveryText(
   opts: {
     actionMode?: AgentActionMode;
     isLeadRecipient: boolean;
+    memberName?: string;
+    messageId?: string;
+    protocol?: VisibleDirectReplyProtocol;
     replyRecipient?: string;
+    teamName?: string;
   }
 ): string {
   const hiddenBlocks: string[] = [];
@@ -2298,22 +2508,49 @@ function buildMessageDeliveryText(
     hiddenBlocks.push(actionModeBlock);
   }
   if (!opts.isLeadRecipient) {
-    const replyRecipient =
+    const rawReplyRecipient =
       typeof opts.replyRecipient === 'string' && opts.replyRecipient.trim().length > 0
         ? opts.replyRecipient.trim()
         : 'user';
-    const senderDescriptor = replyRecipient === 'user' ? 'the human user' : `"${replyRecipient}"`;
+    const isUserReplyRecipient = rawReplyRecipient.toLowerCase() === 'user';
+    const replyRecipient = isUserReplyRecipient ? 'user' : rawReplyRecipient;
+    const senderDescriptor = isUserReplyRecipient ? 'the human user' : `"${replyRecipient}"`;
+    const protocol = opts.protocol ?? 'send_message';
+    const canUseAgentTeamsMessageSend =
+      protocol === 'agent_teams_message_send' &&
+      isUserReplyRecipient &&
+      typeof opts.teamName === 'string' &&
+      opts.teamName.trim().length > 0 &&
+      typeof opts.memberName === 'string' &&
+      opts.memberName.trim().length > 0 &&
+      typeof opts.messageId === 'string' &&
+      opts.messageId.trim().length > 0;
+    const replyInstructionLines = canUseAgentTeamsMessageSend
+      ? [
+          'CRITICAL: Reply using the Agent Teams MCP message_send tool, not SendMessage.',
+          'Use tool agent-teams_message_send or mcp__agent-teams__message_send, whichever exposed name is available.',
+          `CRITICAL: The tool input must include teamName="${opts.teamName!.trim()}", to="user", from="${opts.memberName!.trim()}", text, summary, source="runtime_delivery", and relayOfMessageId="${opts.messageId!.trim()}".`,
+          'Do NOT answer only with normal assistant text when the Agent Teams message_send tool is available because that will not appear in the UI message thread.',
+        ]
+      : [
+          'CRITICAL: Reply using the SendMessage tool, not plain assistant text.',
+          `CRITICAL: The destination must be exactly to="${replyRecipient}".`,
+          'CRITICAL: The SendMessage tool input must use the exact field names `to`, `summary`, and `message`.',
+          'Do NOT answer only with normal assistant text because that will not appear in the UI message thread.',
+        ];
     hiddenBlocks.push(
       [
         AGENT_BLOCK_OPEN,
         `You received a direct message from ${senderDescriptor} via the UI.`,
-        'CRITICAL: Reply using the SendMessage tool, not plain assistant text.',
-        `CRITICAL: The destination must be exactly to="${replyRecipient}".`,
-        'CRITICAL: The SendMessage tool input must use the exact field names `to`, `summary`, and `message`.',
-        'Do NOT answer only with normal assistant text because that will not appear in the UI message thread.',
+        ...replyInstructionLines,
         `Please reply back to recipient "${replyRecipient}" with a short, human-readable answer.`,
         'If you cannot respond now, reply with a brief status (e.g. "Busy, will reply later").',
-        ...(replyRecipient === 'user'
+        ...(canUseAgentTeamsMessageSend
+          ? [
+              'If neither Agent Teams MCP message_send tool name is available before any visible-message tool attempt, write exactly the concise reply text as normal assistant text so the runtime can relay it.',
+            ]
+          : []),
+        ...(isUserReplyRecipient
           ? [
               'CRITICAL: If the user asks you to check with the lead or another teammate before you can fully answer, FIRST send a short acknowledgement to "user" so the human sees you started (for example: "Принял, сейчас уточню и вернусь с ответом.").',
               'Only after that first acknowledgement may you message the lead or another teammate.',
@@ -2352,35 +2589,47 @@ async function handleGetMessagesPage(
 
   return wrapTeamHandler('getMessagesPage', async () => {
     let page: MessagesPage;
-    const notificationContext = await getTeamDataService().getTeamNotificationContext(vTeam.value!);
+    const teamName = vTeam.value!;
+    const scanNotifications = (messagesPage: MessagesPage): void => {
+      const notificationContextPromise: Promise<{ displayName: string; projectPath?: string }> =
+        getTeamDataService()
+          .getTeamNotificationContext(teamName)
+          .catch(() => ({ displayName: teamName }));
+      void notificationContextPromise
+        .then((notificationContext) => {
+          scanTeamMessageNotifications(
+            messagesPage.messages,
+            teamName,
+            notificationContext.displayName,
+            notificationContext.projectPath
+          );
+        })
+        .catch((error: unknown) => {
+          logger.debug(
+            `[teams:getMessagesPage] notification scan skipped team=${teamName}: ${
+              error instanceof Error ? error.message : String(error)
+            }`
+          );
+        });
+    };
     const liveMessages =
-      cursor == null ? getTeamProvisioningService().getLiveLeadProcessMessages(vTeam.value!) : [];
+      cursor == null ? getTeamProvisioningService().getLiveLeadProcessMessages(teamName) : [];
 
     if (liveMessages.length > 0) {
-      page = await getTeamDataService().getMessagesPage(vTeam.value!, {
+      page = await getTeamDataService().getMessagesPage(teamName, {
         cursor,
         limit,
         liveMessages,
       });
-      scanTeamMessageNotifications(
-        page.messages,
-        vTeam.value!,
-        notificationContext.displayName,
-        notificationContext.projectPath
-      );
+      scanNotifications(page);
       return page;
     }
 
     const worker = getTeamDataWorkerClient();
     if (worker.isAvailable()) {
       try {
-        page = await worker.getMessagesPage(vTeam.value!, { cursor, limit });
-        scanTeamMessageNotifications(
-          page.messages,
-          vTeam.value!,
-          notificationContext.displayName,
-          notificationContext.projectPath
-        );
+        page = await worker.getMessagesPage(teamName, { cursor, limit });
+        scanNotifications(page);
         return page;
       } catch (workerErr) {
         logger.warn(
@@ -2391,13 +2640,8 @@ async function handleGetMessagesPage(
       }
     }
     noteHeavyTeamDataWorkerFallback('teams:getMessagesPage');
-    page = await getTeamDataService().getMessagesPage(vTeam.value!, { cursor, limit });
-    scanTeamMessageNotifications(
-      page.messages,
-      vTeam.value!,
-      notificationContext.displayName,
-      notificationContext.projectPath
-    );
+    page = await getTeamDataService().getMessagesPage(teamName, { cursor, limit });
+    scanNotifications(page);
     return page;
   });
 }
@@ -2657,22 +2901,37 @@ async function handleSendMessage(
       typeof payload.from === 'string' && payload.from.trim().length > 0
         ? payload.from.trim()
         : 'user';
-    const isOpenCodeRecipient =
-      !isLeadRecipient && (await provisioning.isOpenCodeRuntimeRecipient(tn, memberName));
+    const storedFrom = replyRecipient.toLowerCase() === 'user' ? 'user' : replyRecipient;
+    const recipientProviderId = !isLeadRecipient
+      ? await provisioning.resolveRuntimeRecipientProviderId(tn, memberName)
+      : undefined;
+    const isOpenCodeRecipient = recipientProviderId === 'opencode';
+    const directReplyProtocol = resolveVisibleDirectReplyProtocol({
+      isLeadRecipient,
+      replyRecipient,
+      ...(recipientProviderId ? { providerId: recipientProviderId } : {}),
+    });
+    const inboxMessageId =
+      directReplyProtocol === 'agent_teams_message_send' ? crypto.randomUUID() : undefined;
     const memberDeliveryText = buildMessageDeliveryText(baseText, {
       actionMode,
       isLeadRecipient,
+      memberName,
+      protocol: directReplyProtocol,
       replyRecipient,
+      teamName: tn,
+      ...(inboxMessageId ? { messageId: inboxMessageId } : {}),
     });
     const inboxText = isOpenCodeRecipient ? baseText : memberDeliveryText;
     const result = await getTeamDataService().sendMessage(tn, {
       member: memberName,
       text: inboxText,
       summary: payload.summary,
-      from: payload.from,
+      from: storedFrom,
       actionMode,
       source: 'user_sent',
       taskRefs: validatedTaskRefs.value,
+      ...(inboxMessageId ? { messageId: inboxMessageId } : {}),
     });
 
     // Teammate inbox relay DISABLED (2026-03-23).
@@ -2779,6 +3038,30 @@ async function handleSendMessage(
   });
 }
 
+async function handleGetOpenCodeRuntimeDeliveryStatus(
+  _event: IpcMainInvokeEvent,
+  teamName: unknown,
+  messageId: unknown
+): Promise<IpcResult<OpenCodeRuntimeDeliveryStatus | null>> {
+  const validatedTeamName = validateTeamName(teamName);
+  if (!validatedTeamName.valid) {
+    return { success: false, error: validatedTeamName.error ?? 'Invalid teamName' };
+  }
+  if (typeof messageId !== 'string' || messageId.trim().length === 0) {
+    return { success: false, error: 'messageId must be a non-empty string' };
+  }
+  const safeMessageId = messageId.trim();
+  if (safeMessageId.includes('/') || safeMessageId.includes('\\') || safeMessageId.includes('..')) {
+    return { success: false, error: 'Invalid messageId' };
+  }
+  return wrapTeamHandler('getOpenCodeRuntimeDeliveryStatus', async () =>
+    getTeamProvisioningService().getOpenCodeRuntimeDeliveryStatus(
+      validatedTeamName.value!,
+      safeMessageId
+    )
+  );
+}
+
 async function handleCreateTask(
   _event: IpcMainInvokeEvent,
   teamName: unknown,
@@ -3307,8 +3590,8 @@ async function handleCreateConfig(
     });
   }
 
-  return wrapTeamHandler('createConfig', () =>
-    getTeamDataService().createTeamConfig({
+  return wrapTeamHandler('createConfig', async () => {
+    await getTeamDataService().createTeamConfig({
       teamName,
       displayName: payload.displayName?.trim() || undefined,
       description: payload.description?.trim() || undefined,
@@ -3332,8 +3615,9 @@ async function handleCreateConfig(
         typeof payload.extraCliArgs === 'string' && payload.extraCliArgs.trim()
           ? payload.extraCliArgs.trim()
           : undefined,
-    })
-  );
+    });
+    getTeamDataWorkerClient().invalidateTeamConfig(teamName);
+  });
 }
 
 function getTeamMemberLogsFinder(): TeamMemberLogsFinder {
@@ -3643,8 +3927,28 @@ async function handleRestartMember(
   if (!validatedMemberName.valid) {
     return { success: false, error: validatedMemberName.error ?? 'Invalid memberName' };
   }
-  return wrapTeamHandler('restartMember', async () =>
-    getTeamProvisioningService().restartMember(validatedTeamName.value!, validatedMemberName.value!)
+  return wrapTeamHandler('restartMember', async () => {
+    try {
+      await getTeamProvisioningService().restartMember(
+        validatedTeamName.value!,
+        validatedMemberName.value!
+      );
+    } finally {
+      getTeamDataService().invalidateMessageFeed(validatedTeamName.value!);
+    }
+  });
+}
+
+async function handleRetryFailedOpenCodeSecondaryLanes(
+  _event: IpcMainInvokeEvent,
+  teamName: unknown
+): Promise<IpcResult<RetryFailedOpenCodeSecondaryLanesResult>> {
+  const validatedTeamName = validateTeamName(teamName);
+  if (!validatedTeamName.valid) {
+    return { success: false, error: validatedTeamName.error ?? 'Invalid teamName' };
+  }
+  return wrapTeamHandler('retryFailedOpenCodeSecondaryLanes', async () =>
+    getTeamProvisioningService().retryFailedOpenCodeSecondaryLanes(validatedTeamName.value!)
   );
 }
 
@@ -3724,7 +4028,14 @@ async function handleGetAllTasks(_event: IpcMainInvokeEvent): Promise<IpcResult<
   setCurrentMainOp('team:getAllTasks');
   const startedAt = Date.now();
   try {
-    return await wrapTeamHandler('getAllTasks', () => getTeamDataService().getAllTasks());
+    return await wrapTeamHandler('getAllTasks', () => {
+      const loadFresh = () => getTeamDataService().getAllTasks();
+      return launchIoGovernor
+        ? launchIoGovernor.runSummaryOperation('teams:getAllTasks', loadFresh, {
+            clone: cloneLaunchIoGovernorPayload,
+          })
+        : loadFresh();
+    });
   } finally {
     const ms = Date.now() - startedAt;
     if (ms >= 1500) {
@@ -4021,6 +4332,7 @@ async function handleReplaceMembers(
       : [];
 
     await teamDataService.replaceMembers(tn, { members });
+    teamDataService.invalidateMessageFeed(tn);
 
     if (!isTeamAlive) {
       return;
@@ -4324,6 +4636,7 @@ async function handleShowMessageNotification(
       summary: d.summary ?? `${d.from} → ${d.to ?? 'team'}`,
       body: d.body,
       dedupeKey,
+      target: d.target,
       suppressToast: d.suppressToast,
     })
     .catch(() => undefined);
diff --git a/src/main/services/discovery/ProjectScanner.ts b/src/main/services/discovery/ProjectScanner.ts
index e95fb9e1..784aa15e 100644
--- a/src/main/services/discovery/ProjectScanner.ts
+++ b/src/main/services/discovery/ProjectScanner.ts
@@ -39,7 +39,11 @@ import {
   type SessionsPaginationOptions,
   type WorktreeSource,
 } from '@main/types';
-import { analyzeSessionFileMetadata, extractCwd } from '@main/utils/jsonl';
+import {
+  analyzeSessionFileMetadata,
+  extractCwd,
+  type SessionFileMetadata,
+} from '@main/utils/jsonl';
 import {
   buildSessionPath,
   buildSubagentsPath,
@@ -60,6 +64,7 @@ import { LocalFileSystemProvider } from '../infrastructure/LocalFileSystemProvid
 import { ProjectPathResolver } from './ProjectPathResolver';
 import { resolveProjectStorageDir as resolveProjectStorageDirFromCandidates } from './projectStorageDir';
 import { SessionContentFilter } from './SessionContentFilter';
+import { type SessionFileSignature, SessionMetadataIndex } from './SessionMetadataIndex';
 import { SessionSearcher } from './SessionSearcher';
 import { SubagentLocator } from './SubagentLocator';
 import { subprojectRegistry } from './SubprojectRegistry';
@@ -77,10 +82,24 @@ const SEARCH_PROJECT_CACHE_TTL_MS = 30_000;
 // for lookups and navigation; a small cap preserves that behavior without huge payloads.
 const MAX_SESSION_IDS_EXPORTED = 200;
 
+export interface ProjectScannerOptions {
+  /**
+   * Directory for the persisted session-list metadata index.
+   * Defaults to a sibling of the configured projects directory.
+   */
+  sessionIndexDir?: string;
+  /** Test hook: set to 0 to persist index files without debounce. */
+  sessionIndexPersistDelayMs?: number;
+}
+
 function splitPathSegments(value: string): string[] {
   return value.split(/[/\\]+/).filter(Boolean);
 }
 
+function getDefaultSessionIndexDir(projectsDir: string): string {
+  return path.join(path.dirname(projectsDir), '.agent-teams-session-index');
+}
+
 /**
  * Fast, zero-I/O worktree detection based on path patterns only.
  * Used by scanWithWorktreeGrouping to provide accurate worktree metadata
@@ -164,8 +183,14 @@ export class ProjectScanner {
   private readonly subagentLocator: SubagentLocator;
   private readonly sessionSearcher: SessionSearcher;
   private readonly projectPathResolver: ProjectPathResolver;
+  private readonly sessionMetadataIndex: SessionMetadataIndex | null;
 
-  constructor(projectsDir?: string, todosDir?: string, fsProvider?: FileSystemProvider) {
+  constructor(
+    projectsDir?: string,
+    todosDir?: string,
+    fsProvider?: FileSystemProvider,
+    options?: ProjectScannerOptions
+  ) {
     this.projectsDir = projectsDir ?? getProjectsBasePath();
     this.todosDir = todosDir ?? getTodosBasePath();
     this.fsProvider = fsProvider ?? new LocalFileSystemProvider();
@@ -175,6 +200,13 @@ export class ProjectScanner {
     this.subagentLocator = new SubagentLocator(this.projectsDir, this.fsProvider);
     this.sessionSearcher = new SessionSearcher(this.projectsDir, this.fsProvider);
     this.projectPathResolver = new ProjectPathResolver(this.projectsDir, this.fsProvider);
+    this.sessionMetadataIndex =
+      this.fsProvider.type === 'local'
+        ? new SessionMetadataIndex({
+            rootDir: options?.sessionIndexDir ?? getDefaultSessionIndexDir(this.projectsDir),
+            persistDelayMs: options?.sessionIndexPersistDelayMs,
+          })
+        : null;
   }
 
   // ===========================================================================
@@ -643,7 +675,14 @@ export class ProjectScanner {
       }
 
       const entries = await this.fsProvider.readdir(projectPath);
-      let sessionFiles = entries.filter((entry) => entry.isFile() && entry.name.endsWith('.jsonl'));
+      const allSessionFiles = entries.filter(
+        (entry) => entry.isFile() && entry.name.endsWith('.jsonl')
+      );
+      await this.pruneSessionMetadataIndex(
+        projectPath,
+        new Set(allSessionFiles.map((file) => path.join(projectPath, file.name)))
+      );
+      let sessionFiles = allSessionFiles;
 
       // Filter to only sessions belonging to this subproject
       if (sessionFilter) {
@@ -733,7 +772,14 @@ export class ProjectScanner {
 
       // Step 1: Get all session files with their timestamps (lightweight stat calls)
       const entries = await this.fsProvider.readdir(projectPath);
-      let sessionFiles = entries.filter((entry) => entry.isFile() && entry.name.endsWith('.jsonl'));
+      const allSessionFiles = entries.filter(
+        (entry) => entry.isFile() && entry.name.endsWith('.jsonl')
+      );
+      await this.pruneSessionMetadataIndex(
+        projectPath,
+        new Set(allSessionFiles.map((file) => path.join(projectPath, file.name)))
+      );
+      let sessionFiles = allSessionFiles;
 
       // Filter to only sessions belonging to this subproject
       if (sessionFilter) {
@@ -967,18 +1013,14 @@ export class ProjectScanner {
     const effectiveMtime = prefetchedMtimeMs ?? stats?.mtimeMs ?? Date.now();
     const effectiveSize = prefetchedSize ?? stats?.size ?? -1;
     const birthtimeMs = prefetchedBirthtimeMs ?? stats?.birthtimeMs ?? effectiveMtime;
-    const cachedMetadata = this.sessionMetadataCache.get(filePath);
-    const metadata =
-      cachedMetadata?.mtimeMs === effectiveMtime && cachedMetadata.size === effectiveSize
-        ? cachedMetadata.metadata
-        : await analyzeSessionFileMetadata(filePath, this.fsProvider);
-    if (cachedMetadata?.mtimeMs !== effectiveMtime || cachedMetadata.size !== effectiveSize) {
-      this.sessionMetadataCache.set(filePath, {
-        mtimeMs: effectiveMtime,
-        size: effectiveSize,
-        metadata,
-      });
-    }
+    const signature = this.buildSessionFileSignature(
+      sessionId,
+      filePath,
+      effectiveMtime,
+      effectiveSize,
+      birthtimeMs
+    );
+    const metadata = await this.getSessionFileMetadata(signature);
 
     // Check for subagents (todoData skipped here — loaded on-demand in detail view)
     const hasSubagents = await this.subagentLocator.hasSubagents(projectId, sessionId);
@@ -1035,28 +1077,25 @@ export class ProjectScanner {
     const effectiveMtime = prefetchedMtimeMs ?? stats?.mtimeMs ?? Date.now();
     const effectiveSize = prefetchedSize ?? stats?.size ?? -1;
     const birthtimeMs = prefetchedBirthtimeMs ?? stats?.birthtimeMs ?? effectiveMtime;
-    let metadata: Awaited<ReturnType<typeof analyzeSessionFileMetadata>>;
-    const cachedMetadata = this.sessionMetadataCache.get(filePath);
-    if (cachedMetadata?.mtimeMs === effectiveMtime && cachedMetadata.size === effectiveSize) {
-      metadata = cachedMetadata.metadata;
-    } else {
-      try {
-        metadata = await analyzeSessionFileMetadata(filePath, this.fsProvider);
-        this.sessionMetadataCache.set(filePath, {
-          mtimeMs: effectiveMtime,
-          size: effectiveSize,
-          metadata,
-        });
-      } catch (error) {
-        logger.debug(`Failed to analyze session metadata for ${filePath}:`, error);
-        metadata = {
-          firstUserMessage: null,
-          messageCount: 0,
-          isOngoing: false,
-          gitBranch: null,
-          model: null,
-        };
-      }
+    let metadata: SessionFileMetadata;
+    const signature = this.buildSessionFileSignature(
+      sessionId,
+      filePath,
+      effectiveMtime,
+      effectiveSize,
+      birthtimeMs
+    );
+    try {
+      metadata = await this.getSessionFileMetadata(signature);
+    } catch (error) {
+      logger.debug(`Failed to analyze session metadata for ${filePath}:`, error);
+      metadata = {
+        firstUserMessage: null,
+        messageCount: 0,
+        isOngoing: false,
+        gitBranch: null,
+        model: null,
+      };
     }
     const metadataLevel: SessionMetadataLevel = 'light';
     const previewTimestampMs = this.parseTimestampMs(metadata.firstUserMessage?.timestamp);
@@ -1421,6 +1460,94 @@ export class ProjectScanner {
     }
   }
 
+  async flushSessionMetadataIndexForTesting(): Promise<void> {
+    await this.sessionMetadataIndex?.flushForTesting();
+  }
+
+  private buildSessionFileSignature(
+    sessionId: string,
+    filePath: string,
+    mtimeMs: number,
+    size: number,
+    birthtimeMs?: number
+  ): SessionFileSignature {
+    return {
+      sessionId,
+      filePath,
+      mtimeMs,
+      size,
+      birthtimeMs,
+    };
+  }
+
+  private async getSessionFileMetadata(
+    signature: SessionFileSignature
+  ): Promise<SessionFileMetadata> {
+    const cachedMetadata = this.sessionMetadataCache.get(signature.filePath);
+    if (cachedMetadata?.mtimeMs === signature.mtimeMs && cachedMetadata.size === signature.size) {
+      return cachedMetadata.metadata;
+    }
+
+    let indexedMetadata: SessionFileMetadata | undefined;
+    if (this.sessionMetadataIndex) {
+      try {
+        indexedMetadata = await this.sessionMetadataIndex.getMetadata(signature);
+      } catch (error) {
+        logger.debug(
+          `Failed to read session metadata index for ${signature.filePath}: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      }
+    }
+    if (indexedMetadata) {
+      this.sessionMetadataCache.set(signature.filePath, {
+        mtimeMs: signature.mtimeMs,
+        size: signature.size,
+        metadata: indexedMetadata,
+      });
+      return indexedMetadata;
+    }
+
+    const metadata = await analyzeSessionFileMetadata(signature.filePath, this.fsProvider);
+    this.sessionMetadataCache.set(signature.filePath, {
+      mtimeMs: signature.mtimeMs,
+      size: signature.size,
+      metadata,
+    });
+    if (this.sessionMetadataIndex) {
+      try {
+        await this.sessionMetadataIndex.setMetadata(signature, metadata);
+      } catch (error) {
+        logger.debug(
+          `Failed to update session metadata index for ${signature.filePath}: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      }
+    }
+    return metadata;
+  }
+
+  private async pruneSessionMetadataIndex(
+    projectStorageDir: string,
+    existingFilePaths: Set<string>
+  ): Promise<void> {
+    if (!this.sessionMetadataIndex) {
+      return;
+    }
+
+    try {
+      await this.sessionMetadataIndex.pruneMissing(projectStorageDir, existingFilePaths);
+    } catch (error) {
+      logger.debug(
+        `Failed to prune session metadata index for ${projectStorageDir}: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    }
+  }
+
   /**
    * Resolve best-available file timestamps from directory entry metadata or stat fallback.
    */
@@ -1545,11 +1672,39 @@ export class ProjectScanner {
       const stats = hasPrefetched ? null : await this.fsProvider.stat(filePath);
       const effectiveMtime = mtimeMs ?? stats?.mtimeMs ?? Date.now();
       const effectiveSize = size ?? stats?.size ?? -1;
+      const signature = this.buildSessionFileSignature(
+        extractSessionId(path.basename(filePath)),
+        filePath,
+        effectiveMtime,
+        effectiveSize,
+        stats?.birthtimeMs
+      );
       const cached = this.contentPresenceCache.get(filePath);
       if (cached?.mtimeMs === effectiveMtime && cached.size === effectiveSize) {
         return cached.hasContent;
       }
 
+      let indexed: boolean | undefined;
+      if (this.sessionMetadataIndex) {
+        try {
+          indexed = await this.sessionMetadataIndex.getContentPresence(signature);
+        } catch (error) {
+          logger.debug(
+            `Failed to read content-presence index for ${filePath}: ${
+              error instanceof Error ? error.message : String(error)
+            }`
+          );
+        }
+      }
+      if (typeof indexed === 'boolean') {
+        this.contentPresenceCache.set(filePath, {
+          mtimeMs: effectiveMtime,
+          size: effectiveSize,
+          hasContent: indexed,
+        });
+        return indexed;
+      }
+
       const hasContent = await this.sessionContentFilter.hasNonNoiseMessages(
         filePath,
         this.fsProvider
@@ -1559,6 +1714,17 @@ export class ProjectScanner {
         size: effectiveSize,
         hasContent,
       });
+      if (this.sessionMetadataIndex) {
+        try {
+          await this.sessionMetadataIndex.setContentPresence(signature, hasContent);
+        } catch (error) {
+          logger.debug(
+            `Failed to update content-presence index for ${filePath}: ${
+              error instanceof Error ? error.message : String(error)
+            }`
+          );
+        }
+      }
       return hasContent;
     } catch {
       return false;
diff --git a/src/main/services/discovery/SessionMetadataIndex.ts b/src/main/services/discovery/SessionMetadataIndex.ts
new file mode 100644
index 00000000..d3e2ddb4
--- /dev/null
+++ b/src/main/services/discovery/SessionMetadataIndex.ts
@@ -0,0 +1,511 @@
+/**
+ * SessionMetadataIndex - persisted read-through cache for session listing metadata.
+ *
+ * The index is never a source of truth. Callers may use an entry only when the
+ * current file signature (mtimeMs + size) matches the indexed signature.
+ */
+
+import * as crypto from 'node:crypto';
+import * as fs from 'node:fs/promises';
+import * as path from 'node:path';
+
+import { createLogger } from '@shared/utils/logger';
+
+import type { SessionFileMetadata } from '@main/utils/jsonl';
+
+const logger = createLogger('Discovery:SessionMetadataIndex');
+
+const SESSION_METADATA_INDEX_SCHEMA_VERSION = 1;
+const DEFAULT_PERSIST_DELAY_MS = 250;
+
+export interface SessionMetadataIndexOptions {
+  rootDir: string;
+  persistDelayMs?: number;
+}
+
+export interface SessionFileSignature {
+  sessionId: string;
+  filePath: string;
+  mtimeMs: number;
+  size: number;
+  birthtimeMs?: number;
+}
+
+interface SessionMetadataIndexEntry extends SessionFileSignature {
+  hasContent?: boolean;
+  metadata?: SessionFileMetadata;
+  updatedAt: number;
+}
+
+interface SessionMetadataIndexFile {
+  schemaVersion: number;
+  projectStorageDir: string;
+  updatedAt: number;
+  sessions: Record<string, SessionMetadataIndexEntry>;
+}
+
+interface LoadedProjectIndex {
+  file: SessionMetadataIndexFile;
+  dirty: boolean;
+  persistTimer: ReturnType<typeof setTimeout> | null;
+  persistPromise: Promise<void> | null;
+}
+
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+function hasOwnProperty(value: Record<string, unknown>, property: string): boolean {
+  return Object.prototype.hasOwnProperty.call(value, property);
+}
+
+function isFiniteNumber(value: unknown): value is number {
+  return typeof value === 'number' && Number.isFinite(value);
+}
+
+function isNonNegativeFiniteNumber(value: unknown): value is number {
+  return isFiniteNumber(value) && value >= 0;
+}
+
+function isNonNegativeInteger(value: unknown): value is number {
+  return typeof value === 'number' && Number.isSafeInteger(value) && value >= 0;
+}
+
+function sanitizePathSegment(value: string): string {
+  const replaced = value.replace(/[^a-zA-Z0-9._-]/g, '-');
+  let start = 0;
+  let end = replaced.length;
+  while (start < end && replaced[start] === '-') {
+    start += 1;
+  }
+  while (end > start && replaced[end - 1] === '-') {
+    end -= 1;
+  }
+  const sanitized = replaced.slice(start, end);
+  return sanitized.length > 0 ? sanitized.slice(0, 80) : 'project';
+}
+
+function hashProjectStorageDir(projectStorageDir: string): string {
+  return crypto.createHash('sha256').update(projectStorageDir).digest('hex').slice(0, 16);
+}
+
+function createEmptyIndex(projectStorageDir: string): SessionMetadataIndexFile {
+  return {
+    schemaVersion: SESSION_METADATA_INDEX_SCHEMA_VERSION,
+    projectStorageDir,
+    updatedAt: Date.now(),
+    sessions: {},
+  };
+}
+
+function normalizeFirstUserMessage(
+  value: unknown
+): SessionFileMetadata['firstUserMessage'] | undefined {
+  if (value === null) {
+    return null;
+  }
+  if (isRecord(value) && typeof value.text === 'string' && typeof value.timestamp === 'string') {
+    return {
+      text: value.text,
+      timestamp: value.timestamp,
+    };
+  }
+  return undefined;
+}
+
+function normalizePhaseBreakdown(
+  value: unknown
+): SessionFileMetadata['phaseBreakdown'] | undefined {
+  if (!Array.isArray(value)) {
+    return undefined;
+  }
+
+  const phases: NonNullable<SessionFileMetadata['phaseBreakdown']> = [];
+  for (const phase of value) {
+    if (
+      !isRecord(phase) ||
+      !isNonNegativeInteger(phase.phaseNumber) ||
+      !isNonNegativeInteger(phase.contribution) ||
+      !isNonNegativeInteger(phase.peakTokens) ||
+      (hasOwnProperty(phase, 'postCompaction') && !isNonNegativeInteger(phase.postCompaction))
+    ) {
+      return undefined;
+    }
+
+    phases.push({
+      phaseNumber: phase.phaseNumber,
+      contribution: phase.contribution,
+      peakTokens: phase.peakTokens,
+      ...(isNonNegativeInteger(phase.postCompaction)
+        ? { postCompaction: phase.postCompaction }
+        : {}),
+    });
+  }
+
+  return phases;
+}
+
+function normalizeMetadata(value: unknown): SessionFileMetadata | undefined {
+  if (!isRecord(value)) {
+    return undefined;
+  }
+
+  const firstUserMessage = normalizeFirstUserMessage(value.firstUserMessage);
+  if (
+    firstUserMessage === undefined ||
+    !isNonNegativeInteger(value.messageCount) ||
+    typeof value.isOngoing !== 'boolean' ||
+    !(value.gitBranch === null || typeof value.gitBranch === 'string')
+  ) {
+    return undefined;
+  }
+
+  const metadata: SessionFileMetadata = {
+    firstUserMessage,
+    messageCount: value.messageCount,
+    isOngoing: value.isOngoing,
+    gitBranch: value.gitBranch,
+  };
+
+  if (hasOwnProperty(value, 'model')) {
+    if (!(value.model === null || typeof value.model === 'string')) {
+      return undefined;
+    }
+    metadata.model = value.model;
+  }
+  if (hasOwnProperty(value, 'contextConsumption')) {
+    if (!isNonNegativeInteger(value.contextConsumption)) {
+      return undefined;
+    }
+    metadata.contextConsumption = value.contextConsumption;
+  }
+  if (hasOwnProperty(value, 'compactionCount')) {
+    if (!isNonNegativeInteger(value.compactionCount)) {
+      return undefined;
+    }
+    metadata.compactionCount = value.compactionCount;
+  }
+
+  if (hasOwnProperty(value, 'phaseBreakdown')) {
+    const phaseBreakdown = normalizePhaseBreakdown(value.phaseBreakdown);
+    if (!phaseBreakdown) {
+      return undefined;
+    }
+    metadata.phaseBreakdown = phaseBreakdown;
+  }
+
+  return metadata;
+}
+
+function normalizeEntry(value: unknown): SessionMetadataIndexEntry | null {
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (
+    typeof value.sessionId !== 'string' ||
+    typeof value.filePath !== 'string' ||
+    !isNonNegativeFiniteNumber(value.mtimeMs) ||
+    !isNonNegativeInteger(value.size) ||
+    !isNonNegativeFiniteNumber(value.updatedAt)
+  ) {
+    return null;
+  }
+
+  const entry: SessionMetadataIndexEntry = {
+    sessionId: value.sessionId,
+    filePath: value.filePath,
+    mtimeMs: value.mtimeMs,
+    size: value.size,
+    updatedAt: value.updatedAt,
+  };
+
+  if (hasOwnProperty(value, 'birthtimeMs')) {
+    if (!isNonNegativeFiniteNumber(value.birthtimeMs)) {
+      return null;
+    }
+    entry.birthtimeMs = value.birthtimeMs;
+  }
+  if (hasOwnProperty(value, 'hasContent')) {
+    if (typeof value.hasContent !== 'boolean') {
+      return null;
+    }
+    entry.hasContent = value.hasContent;
+  }
+  const metadata = normalizeMetadata(value.metadata);
+  if (metadata) {
+    entry.metadata = metadata;
+  } else if (hasOwnProperty(value, 'metadata')) {
+    return null;
+  }
+
+  return entry;
+}
+
+function normalizeIndexFile(
+  value: unknown,
+  projectStorageDir: string
+): SessionMetadataIndexFile | null {
+  if (!isRecord(value)) {
+    return null;
+  }
+  if (
+    value.schemaVersion !== SESSION_METADATA_INDEX_SCHEMA_VERSION ||
+    value.projectStorageDir !== projectStorageDir ||
+    !isRecord(value.sessions)
+  ) {
+    return null;
+  }
+
+  const sessions: Record<string, SessionMetadataIndexEntry> = {};
+  for (const [key, rawEntry] of Object.entries(value.sessions)) {
+    const entry = normalizeEntry(rawEntry);
+    if (key === entry?.filePath) {
+      sessions[key] = entry;
+    }
+  }
+
+  return {
+    schemaVersion: SESSION_METADATA_INDEX_SCHEMA_VERSION,
+    projectStorageDir,
+    updatedAt: isNonNegativeFiniteNumber(value.updatedAt) ? value.updatedAt : Date.now(),
+    sessions,
+  };
+}
+
+function isFreshEntry(
+  entry: SessionMetadataIndexEntry | undefined,
+  signature: Pick<SessionFileSignature, 'sessionId' | 'filePath' | 'mtimeMs' | 'size'>
+): entry is SessionMetadataIndexEntry {
+  return (
+    Boolean(entry) &&
+    entry!.sessionId === signature.sessionId &&
+    entry!.filePath === signature.filePath &&
+    entry!.mtimeMs === signature.mtimeMs &&
+    entry!.size === signature.size
+  );
+}
+
+export class SessionMetadataIndex {
+  private readonly rootDir: string;
+  private readonly persistDelayMs: number;
+  private readonly indexes = new Map<string, LoadedProjectIndex>();
+  private readonly loads = new Map<string, Promise<LoadedProjectIndex>>();
+
+  constructor(options: SessionMetadataIndexOptions) {
+    this.rootDir = options.rootDir;
+    this.persistDelayMs = options.persistDelayMs ?? DEFAULT_PERSIST_DELAY_MS;
+  }
+
+  static getIndexPath(rootDir: string, projectStorageDir: string): string {
+    const basename = sanitizePathSegment(path.basename(projectStorageDir));
+    const hash = hashProjectStorageDir(projectStorageDir);
+    return path.join(rootDir, `${basename}-${hash}.json`);
+  }
+
+  async getContentPresence(signature: SessionFileSignature): Promise<boolean | undefined> {
+    const index = await this.loadProjectIndex(path.dirname(signature.filePath));
+    const entry = index.file.sessions[signature.filePath];
+    if (!isFreshEntry(entry, signature)) {
+      return undefined;
+    }
+    return typeof entry.hasContent === 'boolean' ? entry.hasContent : undefined;
+  }
+
+  async setContentPresence(signature: SessionFileSignature, hasContent: boolean): Promise<void> {
+    const projectStorageDir = path.dirname(signature.filePath);
+    const index = await this.loadProjectIndex(projectStorageDir);
+    const entry = this.getOrCreateEntry(index.file, signature);
+    entry.hasContent = hasContent;
+    entry.updatedAt = Date.now();
+    this.markDirty(projectStorageDir, index);
+  }
+
+  async getMetadata(signature: SessionFileSignature): Promise<SessionFileMetadata | undefined> {
+    const index = await this.loadProjectIndex(path.dirname(signature.filePath));
+    const entry = index.file.sessions[signature.filePath];
+    if (!isFreshEntry(entry, signature)) {
+      return undefined;
+    }
+    return entry.metadata;
+  }
+
+  async setMetadata(signature: SessionFileSignature, metadata: SessionFileMetadata): Promise<void> {
+    const projectStorageDir = path.dirname(signature.filePath);
+    const index = await this.loadProjectIndex(projectStorageDir);
+    const entry = this.getOrCreateEntry(index.file, signature);
+    entry.metadata = metadata;
+    entry.updatedAt = Date.now();
+    this.markDirty(projectStorageDir, index);
+  }
+
+  async pruneMissing(projectStorageDir: string, existingFilePaths: Set<string>): Promise<void> {
+    const index = await this.loadProjectIndex(projectStorageDir);
+    let changed = false;
+    for (const filePath of Object.keys(index.file.sessions)) {
+      if (!existingFilePaths.has(filePath)) {
+        delete index.file.sessions[filePath];
+        changed = true;
+      }
+    }
+    if (changed) {
+      this.markDirty(projectStorageDir, index);
+    }
+  }
+
+  async flushForTesting(): Promise<void> {
+    for (const [projectStorageDir, index] of this.indexes.entries()) {
+      if (index.persistTimer) {
+        clearTimeout(index.persistTimer);
+        index.persistTimer = null;
+      }
+
+      while (index.dirty || index.persistPromise) {
+        if (index.dirty) {
+          this.startPersist(projectStorageDir, index);
+        }
+        await (index.persistPromise ?? Promise.resolve());
+      }
+    }
+  }
+
+  private getOrCreateEntry(
+    index: SessionMetadataIndexFile,
+    signature: SessionFileSignature
+  ): SessionMetadataIndexEntry {
+    const existing = index.sessions[signature.filePath];
+    if (isFreshEntry(existing, signature)) {
+      if (isNonNegativeFiniteNumber(signature.birthtimeMs)) {
+        existing.birthtimeMs = signature.birthtimeMs;
+      }
+      return existing;
+    }
+
+    const entry: SessionMetadataIndexEntry = {
+      sessionId: signature.sessionId,
+      filePath: signature.filePath,
+      mtimeMs: signature.mtimeMs,
+      size: signature.size,
+      updatedAt: Date.now(),
+    };
+    if (isNonNegativeFiniteNumber(signature.birthtimeMs)) {
+      entry.birthtimeMs = signature.birthtimeMs;
+    }
+    index.sessions[signature.filePath] = entry;
+    return entry;
+  }
+
+  private async loadProjectIndex(projectStorageDir: string): Promise<LoadedProjectIndex> {
+    const cached = this.indexes.get(projectStorageDir);
+    if (cached) {
+      return cached;
+    }
+
+    const existingLoad = this.loads.get(projectStorageDir);
+    if (existingLoad) {
+      return existingLoad;
+    }
+
+    const load = this.readProjectIndex(projectStorageDir).finally(() => {
+      this.loads.delete(projectStorageDir);
+    });
+    this.loads.set(projectStorageDir, load);
+    return load;
+  }
+
+  private async readProjectIndex(projectStorageDir: string): Promise<LoadedProjectIndex> {
+    const indexPath = SessionMetadataIndex.getIndexPath(this.rootDir, projectStorageDir);
+    let file = createEmptyIndex(projectStorageDir);
+    try {
+      const raw = await fs.readFile(indexPath, 'utf8');
+      const parsed = normalizeIndexFile(JSON.parse(raw), projectStorageDir);
+      if (parsed) {
+        file = parsed;
+      }
+    } catch (error) {
+      const code = isRecord(error) ? error.code : undefined;
+      if (code !== 'ENOENT') {
+        logger.debug(
+          `Ignoring unreadable session metadata index ${indexPath}: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      }
+    }
+
+    const loaded: LoadedProjectIndex = {
+      file,
+      dirty: false,
+      persistTimer: null,
+      persistPromise: null,
+    };
+    this.indexes.set(projectStorageDir, loaded);
+    return loaded;
+  }
+
+  private markDirty(projectStorageDir: string, index: LoadedProjectIndex): void {
+    index.file.updatedAt = Date.now();
+    index.dirty = true;
+
+    if (this.persistDelayMs <= 0) {
+      this.startPersist(projectStorageDir, index);
+      return;
+    }
+
+    if (index.persistTimer) {
+      return;
+    }
+
+    index.persistTimer = setTimeout(() => {
+      index.persistTimer = null;
+      this.startPersist(projectStorageDir, index);
+    }, this.persistDelayMs);
+    index.persistTimer.unref?.();
+  }
+
+  private startPersist(projectStorageDir: string, index: LoadedProjectIndex): void {
+    if (index.persistPromise) {
+      return;
+    }
+
+    const promise = this.persistProjectIndex(projectStorageDir, index).finally(() => {
+      if (index.persistPromise === promise) {
+        index.persistPromise = null;
+      }
+      if (index.dirty) {
+        this.markDirty(projectStorageDir, index);
+      }
+    });
+    index.persistPromise = promise;
+  }
+
+  private async persistProjectIndex(
+    projectStorageDir: string,
+    index: LoadedProjectIndex
+  ): Promise<void> {
+    if (!index.dirty) {
+      return;
+    }
+
+    const indexPath = SessionMetadataIndex.getIndexPath(this.rootDir, projectStorageDir);
+    const tmpPath = `${indexPath}.${process.pid}.${Date.now()}.${crypto.randomUUID()}.tmp`;
+    const serialized = `${JSON.stringify(index.file)}\n`;
+    index.dirty = false;
+
+    try {
+      await fs.mkdir(this.rootDir, { recursive: true, mode: 0o700 });
+      await fs.writeFile(tmpPath, serialized, { encoding: 'utf8', mode: 0o600 });
+      await fs.rename(tmpPath, indexPath);
+    } catch (error) {
+      try {
+        await fs.unlink(tmpPath);
+      } catch {
+        // ignore
+      }
+      logger.debug(
+        `Failed to persist session metadata index ${indexPath}: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    }
+  }
+}
diff --git a/src/main/services/error/ErrorMessageBuilder.ts b/src/main/services/error/ErrorMessageBuilder.ts
index 1fdfe40b..b8f1c3f3 100644
--- a/src/main/services/error/ErrorMessageBuilder.ts
+++ b/src/main/services/error/ErrorMessageBuilder.ts
@@ -14,7 +14,7 @@ import { randomUUID } from 'crypto';
 import { type ExtractedToolResult } from '../analysis/ToolResultExtractor';
 
 import type { TriggerColor } from '@shared/constants/triggerColors';
-import type { TeamEventType } from '@shared/types/notifications';
+import type { NotificationTarget, TeamEventType } from '@shared/types/notifications';
 
 // =============================================================================
 // Types
@@ -54,6 +54,8 @@ export interface DetectedError {
   category?: 'error' | 'team';
   /** For team notifications: specific event sub-type */
   teamEventType?: TeamEventType;
+  /** Structured destination for notification clicks. */
+  target?: NotificationTarget;
   /** Explicit key for storage deduplication. Two notifications with the same dedupeKey won't be stored twice. */
   dedupeKey?: string;
   /** Additional context about the error */
diff --git a/src/main/services/infrastructure/FileWatcher.ts b/src/main/services/infrastructure/FileWatcher.ts
index 1146cf47..e3664fac 100644
--- a/src/main/services/infrastructure/FileWatcher.ts
+++ b/src/main/services/infrastructure/FileWatcher.ts
@@ -1008,7 +1008,8 @@ export class FileWatcher extends EventEmitter {
     if (
       relative === 'config.json' ||
       relative === 'kanban-state.json' ||
-      relative === 'team.meta.json'
+      relative === 'team.meta.json' ||
+      relative === 'members.meta.json'
     ) {
       const event: TeamChangeEvent = {
         type: 'config',
diff --git a/src/main/services/infrastructure/NotificationManager.ts b/src/main/services/infrastructure/NotificationManager.ts
index 3ebc49e6..1d6633e4 100644
--- a/src/main/services/infrastructure/NotificationManager.ts
+++ b/src/main/services/infrastructure/NotificationManager.ts
@@ -16,15 +16,19 @@
  */
 
 import { getAppIconPath } from '@main/utils/appIcon';
-import { getHomeDir } from '@main/utils/pathDecoder';
+import { getAppDataPath, getHomeDir, getTeamsBasePath } from '@main/utils/pathDecoder';
 import { safeSendToRenderer } from '@main/utils/safeWebContentsSend';
 import { stripMarkdown } from '@main/utils/textFormatting';
 import { stripAgentBlocks } from '@shared/constants/agentBlocks';
+import { getMemberColorByName, MEMBER_COLOR_HUE } from '@shared/constants/memberColors';
+import { isLeadMember } from '@shared/utils/leadDetection';
 import { createLogger } from '@shared/utils/logger';
-import { Notification as ElectronNotification } from 'electron';
+import { nativeImage, Notification as ElectronNotification } from 'electron';
 import { EventEmitter } from 'events';
+import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import * as fsp from 'fs/promises';
 import * as path from 'path';
+import { pathToFileURL } from 'url';
 
 import { type DetectedError } from '../error/ErrorMessageBuilder';
 
@@ -101,6 +105,16 @@ const LEGACY_NOTIFICATION_FILENAMES = [
 const LEGACY_NOTIFICATION_PATHS = LEGACY_NOTIFICATION_FILENAMES.map((filename) =>
   path.join(getHomeDir(), '.claude', filename)
 );
+const SENDER_ICON_CACHE = new Map<string, NotificationConstructorOptions['icon'] | undefined>();
+const WINDOWS_TOAST_AVATAR_CACHE = new Map<string, string | undefined>();
+const PARTICIPANT_AVATAR_COUNT = 13;
+const LEAD_PARTICIPANT_AVATAR_NUMBER = 1;
+
+interface TeamNotificationAvatarMember {
+  name: string;
+  removedAt?: number | string | null;
+  agentType?: string;
+}
 
 interface LegacyNotificationData {
   path: string;
@@ -123,6 +137,412 @@ function getNotificationClass(): NotificationClass | null {
   return (ElectronNotification as NotificationClass | undefined) ?? null;
 }
 
+function getNativeImage(): typeof nativeImage | null {
+  return nativeImage && typeof nativeImage.createFromPath === 'function' ? nativeImage : null;
+}
+
+function hashStringToIndex(str: string): number {
+  let hash = 5381;
+  for (let i = 0; i < str.length; i++) {
+    hash = ((hash << 5) + hash + str.charCodeAt(i)) | 0;
+  }
+  return Math.abs(hash);
+}
+
+function getParticipantAvatarNumberByIndex(index: number): number {
+  const normalized =
+    ((Math.trunc(index) % PARTICIPANT_AVATAR_COUNT) + PARTICIPANT_AVATAR_COUNT) %
+    PARTICIPANT_AVATAR_COUNT;
+  return normalized + 1;
+}
+
+function getFallbackParticipantAvatarNumber(name: string): number {
+  const normalized = name.trim().toLowerCase();
+  if (normalized === 'team-lead' || normalized === 'lead') {
+    return LEAD_PARTICIPANT_AVATAR_NUMBER;
+  }
+  return getParticipantAvatarNumberByIndex(hashStringToIndex(normalized));
+}
+
+function getParticipantAvatarNumber(
+  sender: string,
+  members: readonly TeamNotificationAvatarMember[]
+): number {
+  const senderName = sender.trim();
+  if (!senderName) return getFallbackParticipantAvatarNumber(sender);
+
+  const map = new Map<string, number>();
+  const activeMembers = members.filter((member) => !member.removedAt);
+  const leadMembers = activeMembers.filter((member) => isLeadMember(member));
+  const teammateMembers = activeMembers.filter((member) => !isLeadMember(member));
+
+  for (const [index, member] of leadMembers.entries()) {
+    map.set(
+      member.name,
+      index === 0 ? LEAD_PARTICIPANT_AVATAR_NUMBER : getFallbackParticipantAvatarNumber(member.name)
+    );
+  }
+
+  for (const [index, member] of teammateMembers.entries()) {
+    map.set(member.name, 2 + (index % (PARTICIPANT_AVATAR_COUNT - 1)));
+  }
+
+  for (const member of members) {
+    if (!map.has(member.name)) {
+      map.set(
+        member.name,
+        isLeadMember(member)
+          ? LEAD_PARTICIPANT_AVATAR_NUMBER
+          : getFallbackParticipantAvatarNumber(member.name)
+      );
+    }
+  }
+
+  map.set('user', getFallbackParticipantAvatarNumber('user'));
+  map.set('system', getFallbackParticipantAvatarNumber('system'));
+
+  return map.get(senderName) ?? getFallbackParticipantAvatarNumber(senderName);
+}
+
+function readTeamNotificationMembers(teamName: string): TeamNotificationAvatarMember[] {
+  try {
+    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
+    if (!existsSync(configPath)) return [];
+
+    const parsed = JSON.parse(readFileSync(configPath, 'utf8')) as {
+      members?: unknown;
+    };
+    if (!Array.isArray(parsed.members)) return [];
+
+    return parsed.members
+      .map((member): TeamNotificationAvatarMember | null => {
+        if (!member || typeof member !== 'object') return null;
+        const record = member as Record<string, unknown>;
+        const name = typeof record.name === 'string' ? record.name.trim() : '';
+        if (!name) return null;
+        return {
+          name,
+          removedAt:
+            typeof record.removedAt === 'number' || typeof record.removedAt === 'string'
+              ? record.removedAt
+              : null,
+          agentType: typeof record.agentType === 'string' ? record.agentType : undefined,
+        };
+      })
+      .filter((member): member is TeamNotificationAvatarMember => Boolean(member));
+  } catch (error) {
+    logger.debug(`[team-toast] failed to read team members for avatar: ${String(error)}`);
+    return [];
+  }
+}
+
+function resolveParticipantAvatarPath(avatarNumber: number): string | undefined {
+  const filename = `${String(avatarNumber).padStart(2, '0')}.png`;
+  const resourceRoot =
+    typeof process.resourcesPath === 'string' && process.resourcesPath.length > 0
+      ? process.resourcesPath
+      : null;
+  const candidates = [
+    path.join(process.cwd(), 'src/renderer/assets/participant-avatars', filename),
+    ...(resourceRoot ? [path.join(resourceRoot, 'participant-avatars', filename)] : []),
+  ];
+
+  return candidates.find((candidate) => existsSync(candidate));
+}
+
+function escapeXmlAttribute(value: string): string {
+  return value
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;');
+}
+
+function escapeXmlText(value: string): string {
+  return value.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+
+function formatSenderLabel(sender: string): string | null {
+  const trimmed = sender.trim();
+  if (!trimmed) return null;
+  if (trimmed.toLowerCase() === 'system') return 'System';
+  return trimmed.startsWith('@') ? trimmed : `@${trimmed}`;
+}
+
+function cleanNotificationText(value: string): string {
+  return stripMarkdown(stripAgentBlocks(value)).replace(/\s+/g, ' ').trim();
+}
+
+function truncateNotificationText(value: string, maxLength: number): string {
+  if (value.length <= maxLength) return value;
+  return `${value.slice(0, Math.max(0, maxLength - 3)).trimEnd()}...`;
+}
+
+function extractTaskRef(summary: string): string | null {
+  const match = /#([A-Za-z0-9][A-Za-z0-9-]*)/.exec(summary);
+  return match ? `#${match[1]}` : null;
+}
+
+function extractTaskSubject(summary: string): string {
+  return summary
+    .replace(/^Comment on\s+#[^:]+:\s*/i, '')
+    .replace(/^Comment on\s+#[^\s]+/i, '')
+    .replace(/^Clarification needed\s+[-–—]\s+Task\s+#[^:]+:\s*/i, '')
+    .replace(/^Clarification needed\s+[-–—]\s+Task\s+#[^\s]+/i, '')
+    .replace(/^Review requested\s+#[^:]+:\s*/i, '')
+    .replace(/^Review requested\s+#[^\s]+/i, '')
+    .replace(/^Blocked\s+#[^:]+:\s*/i, '')
+    .replace(/^Blocked\s+#[^\s]+/i, '')
+    .replace(/^New task\s+#[^:]+:\s*/i, '')
+    .replace(/^New task\s+#[^\s]+/i, '')
+    .replace(/^Task\s+#[^:]+:\s*/i, '')
+    .trim();
+}
+
+function getTeamNotificationAction(
+  payload: TeamNotificationPayload,
+  taskRef: string | null
+): string {
+  switch (payload.teamEventType) {
+    case 'task_comment':
+      return taskRef ? `commented on ${taskRef}` : 'commented on a task';
+    case 'task_clarification':
+      return taskRef ? `needs your reply on ${taskRef}` : 'needs your reply';
+    case 'task_review_requested':
+      return taskRef ? `requested review on ${taskRef}` : 'requested review';
+    case 'task_blocked': {
+      const sender = payload.from.trim().toLowerCase();
+      if (sender === 'system') return taskRef ? `Task is blocked on ${taskRef}` : 'Task is blocked';
+      return taskRef ? `is blocked on ${taskRef}` : 'is blocked';
+    }
+    case 'task_status_change':
+      return taskRef ? `changed ${taskRef}` : 'changed task status';
+    case 'task_created':
+      return taskRef ? `created ${taskRef}` : 'created a task';
+    case 'all_tasks_completed':
+      return 'completed all tasks';
+    case 'lead_inbox':
+    case 'user_inbox':
+      return 'sent a message';
+    case 'cross_team_message':
+      return 'sent a cross-team message';
+    case 'rate_limit':
+      return 'paused: rate limit';
+    case 'api_error':
+      return 'paused: API error';
+    case 'schedule_completed':
+      return 'completed a schedule';
+    case 'schedule_failed':
+      return 'schedule failed';
+    case 'team_launched':
+      return 'launched a team';
+    default:
+      return 'sent an update';
+  }
+}
+
+function getTeamNotificationWhere(
+  payload: TeamNotificationPayload,
+  taskRef: string | null
+): string {
+  const team = cleanNotificationText(payload.teamDisplayName) || payload.teamDisplayName;
+  const summary = cleanNotificationText(payload.summary);
+
+  if (payload.teamEventType.startsWith('task_')) {
+    const subject = extractTaskSubject(summary);
+    const taskContext = subject || taskRef;
+    return taskContext ? `${taskContext} - ${team}` : team;
+  }
+
+  return team;
+}
+
+function buildTeamNotificationPresentation(
+  payload: TeamNotificationPayload,
+  body: string
+): { title: string; where: string; body: string } {
+  const who = formatSenderLabel(payload.from) ?? cleanNotificationText(payload.teamDisplayName);
+  const summary = cleanNotificationText(payload.summary);
+  const taskRef = extractTaskRef(summary);
+  const action = getTeamNotificationAction(payload, taskRef);
+  const where = getTeamNotificationWhere(payload, taskRef);
+  const normalizedBody = cleanNotificationText(body);
+
+  if (payload.teamEventType === 'team_launch_incomplete') {
+    return {
+      title: 'Team launch incomplete',
+      where: truncateNotificationText(where, 120),
+      body: truncateNotificationText(normalizedBody || summary, 300),
+    };
+  }
+
+  if (payload.teamEventType === 'task_blocked' && payload.from.trim().toLowerCase() === 'system') {
+    return {
+      title: truncateNotificationText(action, 96),
+      where: truncateNotificationText(where, 120),
+      body: truncateNotificationText(normalizedBody || summary, 300),
+    };
+  }
+
+  return {
+    title: truncateNotificationText(`${who} ${action}`.trim(), 96),
+    where: truncateNotificationText(where, 120),
+    body: truncateNotificationText(normalizedBody || summary, 300),
+  };
+}
+
+function getSenderInitials(sender: string): string {
+  const trimmed = sender.trim().replace(/^@+/, '');
+  if (!trimmed) return '?';
+
+  const parts = trimmed.split(/[\s._:-]+/).filter(Boolean);
+  const initials =
+    parts.length >= 2
+      ? `${parts[0]?.[0] ?? ''}${parts[1]?.[0] ?? ''}`
+      : trimmed.replace(/[\s._:-]+/g, '').slice(0, 2);
+
+  return initials.toLocaleUpperCase() || '?';
+}
+
+function resolveSenderParticipantAvatarPath(
+  sender: string,
+  teamName: string,
+  members: readonly TeamNotificationAvatarMember[] | undefined
+): string | undefined {
+  const senderLabel = sender.trim();
+  if (!senderLabel || senderLabel.toLowerCase() === 'system') return undefined;
+
+  const roster = members && members.length > 0 ? members : readTeamNotificationMembers(teamName);
+  const avatarNumber = getParticipantAvatarNumber(senderLabel, roster);
+  return resolveParticipantAvatarPath(avatarNumber);
+}
+
+function getWindowsToastAvatarPath(avatarPath: string): string {
+  const cached = WINDOWS_TOAST_AVATAR_CACHE.get(avatarPath);
+  if (cached) return cached;
+
+  const NativeImage = getNativeImage();
+  if (!NativeImage) {
+    WINDOWS_TOAST_AVATAR_CACHE.set(avatarPath, avatarPath);
+    return avatarPath;
+  }
+
+  try {
+    const source = NativeImage.createFromPath(avatarPath);
+    if (source.isEmpty()) {
+      WINDOWS_TOAST_AVATAR_CACHE.set(avatarPath, avatarPath);
+      return avatarPath;
+    }
+
+    const resized = source.resize({ width: 96, height: 96 });
+    if (resized.isEmpty()) {
+      WINDOWS_TOAST_AVATAR_CACHE.set(avatarPath, avatarPath);
+      return avatarPath;
+    }
+
+    const cacheDir = path.join(getAppDataPath(), 'notification-avatars');
+    mkdirSync(cacheDir, { recursive: true });
+
+    const parsed = path.parse(avatarPath);
+    const outPath = path.join(cacheDir, `${parsed.name}-96.png`);
+    writeFileSync(outPath, resized.toPNG());
+    WINDOWS_TOAST_AVATAR_CACHE.set(avatarPath, outPath);
+    return outPath;
+  } catch (error) {
+    logger.debug(`[team-toast] failed to prepare Windows toast avatar: ${String(error)}`);
+    WINDOWS_TOAST_AVATAR_CACHE.set(avatarPath, avatarPath);
+    return avatarPath;
+  }
+}
+
+function buildSenderNotificationIcon(
+  sender: string,
+  teamName: string,
+  members: readonly TeamNotificationAvatarMember[] | undefined
+): NotificationConstructorOptions['icon'] {
+  const senderLabel = sender.trim();
+  if (!senderLabel || senderLabel.toLowerCase() === 'system') return getAppIconPath();
+
+  const senderAvatarPath = resolveSenderParticipantAvatarPath(senderLabel, teamName, members);
+  const cacheKey = `${teamName}:${senderLabel}:${senderAvatarPath ?? 'generated'}`.toLowerCase();
+  if (SENDER_ICON_CACHE.has(cacheKey)) {
+    return SENDER_ICON_CACHE.get(cacheKey);
+  }
+
+  try {
+    if (senderAvatarPath) {
+      const NativeImage = getNativeImage();
+      if (NativeImage) {
+        const avatarIcon = NativeImage.createFromPath(senderAvatarPath);
+        if (!avatarIcon.isEmpty()) {
+          SENDER_ICON_CACHE.set(cacheKey, avatarIcon);
+          return avatarIcon;
+        }
+      }
+    }
+
+    const colorName = getMemberColorByName(senderLabel);
+    const hue = MEMBER_COLOR_HUE[colorName] ?? 210;
+    const initials = escapeXmlAttribute(getSenderInitials(senderLabel));
+    const svg = [
+      '<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">',
+      `<rect width="256" height="256" rx="72" fill="hsl(${hue}, 68%, 38%)"/>`,
+      `<circle cx="128" cy="128" r="102" fill="hsl(${hue}, 74%, 46%)"/>`,
+      `<circle cx="91" cy="86" r="20" fill="hsl(${hue}, 84%, 72%)" opacity="0.9"/>`,
+      `<path d="M54 178c23-31 48-46 74-46s51 15 74 46" fill="none" stroke="hsl(${hue}, 88%, 78%)" stroke-width="18" stroke-linecap="round" opacity="0.5"/>`,
+      `<text x="128" y="148" text-anchor="middle" font-family="Arial, Helvetica, sans-serif" font-size="78" font-weight="700" fill="#fff">${initials}</text>`,
+      '</svg>',
+    ].join('');
+    const NativeImage = getNativeImage();
+    const icon = NativeImage?.createFromDataURL(
+      `data:image/svg+xml;charset=utf-8,${encodeURIComponent(svg)}`
+    );
+    const resolvedIcon = icon && !icon.isEmpty() ? icon : getAppIconPath();
+    SENDER_ICON_CACHE.set(cacheKey, resolvedIcon);
+    return resolvedIcon;
+  } catch (error) {
+    logger.debug(`[team-toast] sender icon fallback for "${senderLabel}": ${String(error)}`);
+    const fallbackIcon = getAppIconPath();
+    SENDER_ICON_CACHE.set(cacheKey, fallbackIcon);
+    return fallbackIcon;
+  }
+}
+
+function buildWindowsTeamToastXml(input: {
+  title: string;
+  summary?: string;
+  body: string;
+  sender: string;
+  avatarPath?: string;
+  silent: boolean;
+}): string {
+  const textRows = [
+    `<text>${escapeXmlText(input.title)}</text>`,
+    input.summary ? `<text>${escapeXmlText(input.summary)}</text>` : null,
+    input.body ? `<text>${escapeXmlText(input.body)}</text>` : null,
+  ].filter(Boolean);
+
+  const avatarRow = input.avatarPath
+    ? `<image placement="appLogoOverride" hint-crop="circle" src="${escapeXmlAttribute(
+        pathToFileURL(input.avatarPath).href
+      )}" alt="${escapeXmlAttribute(`${input.sender} avatar`)}"/>`
+    : null;
+
+  return [
+    '<toast>',
+    '<visual>',
+    '<binding template="ToastGeneric">',
+    ...textRows,
+    avatarRow,
+    '</binding>',
+    '</visual>',
+    input.silent ? '<audio silent="true"/>' : null,
+    '</toast>',
+  ]
+    .filter(Boolean)
+    .join('');
+}
+
 async function migrateLegacyNotificationPath(): Promise<string> {
   try {
     await fsp.readFile(NOTIFICATIONS_PATH, 'utf8');
@@ -603,7 +1023,7 @@ export class NotificationManager extends EventEmitter {
 
   /**
    * Shows a native notification for a team event.
-   * Uses team-specific formatting (title = team name, subtitle = summary).
+   * Uses a consistent who + what + where presentation for all team events.
    */
   private showTeamNativeNotification(
     stored: StoredNotification,
@@ -618,20 +1038,45 @@ export class NotificationManager extends EventEmitter {
     try {
       const config = this.configManager.getConfig();
       const isMac = process.platform === 'darwin';
-      const truncatedBody = stripMarkdown(stripAgentBlocks(payload.body)).slice(0, 300);
-      const iconPath = isMac ? undefined : getAppIconPath();
+      const presentation = buildTeamNotificationPresentation(payload, payload.body);
+      const senderAvatarPath = resolveSenderParticipantAvatarPath(
+        payload.from,
+        payload.teamName,
+        payload.members
+      );
+      const toastXml =
+        process.platform === 'win32' && senderAvatarPath
+          ? buildWindowsTeamToastXml({
+              title: presentation.title,
+              summary: presentation.where,
+              body: presentation.body,
+              sender: payload.from,
+              avatarPath: getWindowsToastAvatarPath(senderAvatarPath),
+              silent: !config.notifications.soundEnabled,
+            })
+          : undefined;
+      const senderIcon = toastXml
+        ? undefined
+        : buildSenderNotificationIcon(payload.from, payload.teamName, payload.members);
 
       logger.debug(
-        `[team-toast] creating: title="${payload.teamDisplayName}" summary="${payload.summary ?? ''}" bodyLen=${truncatedBody.length}`
+        `[team-toast] creating: title="${presentation.title}" where="${presentation.where}" bodyLen=${presentation.body.length}`
       );
 
-      const notification = new NotificationClass({
-        title: payload.teamDisplayName,
-        ...(isMac ? { subtitle: payload.summary } : {}),
-        body: !isMac && payload.summary ? `${payload.summary}\n${truncatedBody}` : truncatedBody,
-        sound: config.notifications.soundEnabled ? 'default' : undefined,
-        ...(iconPath ? { icon: iconPath } : {}),
-      });
+      const notificationOptions: NotificationConstructorOptions = toastXml
+        ? { toastXml }
+        : {
+            title: presentation.title,
+            ...(isMac ? { subtitle: presentation.where } : {}),
+            body:
+              !isMac && presentation.where
+                ? `${presentation.where}\n${presentation.body}`
+                : presentation.body,
+            sound: config.notifications.soundEnabled ? 'default' : undefined,
+            ...(senderIcon ? { icon: senderIcon } : {}),
+          };
+
+      const notification = new NotificationClass(notificationOptions);
 
       // Hold a strong reference to prevent GC from collecting the notification
       this.activeNotifications.add(notification);
@@ -647,7 +1092,7 @@ export class NotificationManager extends EventEmitter {
 
       notification.on('show', () => {
         logger.debug(
-          `[team-toast] OS confirmed show: "${payload.teamDisplayName}" — ${payload.summary ?? ''}`
+          `[team-toast] OS confirmed show: "${presentation.title}" - ${presentation.where}`
         );
       });
       notification.on('failed', (_, error) => {
@@ -666,6 +1111,17 @@ export class NotificationManager extends EventEmitter {
    * Shared click handler for native notifications — focuses window and emits deep-link.
    */
   private handleNativeNotificationClick(stored: StoredNotification): void {
+    const isDevRuntime =
+      process.env.NODE_ENV !== 'production' ||
+      Boolean((process as typeof process & { defaultApp?: boolean }).defaultApp);
+    if (isDevRuntime) {
+      const notificationType = stored.teamEventType ?? stored.category ?? 'error';
+      const notificationTitle = stored.triggerName ?? stored.message;
+      logger.info(
+        `[notification-click] delivered in-process id=${stored.id} type=${notificationType} title="${notificationTitle}"`
+      );
+    }
+
     if (this.mainWindow && !this.mainWindow.isDestroyed()) {
       this.mainWindow.show();
       this.mainWindow.focus();
@@ -674,6 +1130,30 @@ export class NotificationManager extends EventEmitter {
     this.emit('notification-clicked', stored);
   }
 
+  /**
+   * Closes active OS notifications so macOS does not keep stale dev toasts that
+   * can relaunch raw Electron without the app path.
+   */
+  closeActiveNativeNotifications(reason: string = 'manual'): number {
+    const notifications = Array.from(this.activeNotifications);
+    for (const notification of notifications) {
+      try {
+        (notification as NotificationInstance & { close?: () => void }).close?.();
+      } catch (error) {
+        logger.debug(
+          `[notification] failed to close active notification during ${reason}: ${String(error)}`
+        );
+      }
+    }
+    this.activeNotifications.clear();
+    if (notifications.length > 0) {
+      logger.debug(
+        `[notification] closed ${notifications.length} active notification(s): ${reason}`
+      );
+    }
+    return notifications.length;
+  }
+
   /**
    * Guard: checks if Electron's Notification API is available.
    */
diff --git a/src/main/services/runtime/ProviderConnectionService.ts b/src/main/services/runtime/ProviderConnectionService.ts
index 2d7bf80f..67ac3e0b 100644
--- a/src/main/services/runtime/ProviderConnectionService.ts
+++ b/src/main/services/runtime/ProviderConnectionService.ts
@@ -68,6 +68,7 @@ const PROVIDER_API_KEY_ENV_VARS: Partial<Record<CliProviderId, string>> = {
 const CODEX_NATIVE_API_KEY_ENV_VAR = 'CODEX_API_KEY';
 const CODEX_CLI_PATH_ENV_VAR = 'CODEX_CLI_PATH';
 const CODEX_HOME_ENV_VAR = 'CODEX_HOME';
+const CODEX_FORCED_LOGIN_METHOD_ENV_VAR = 'CLAUDE_CODE_CODEX_FORCED_LOGIN_METHOD';
 const CODEX_NATIVE_BACKEND_ID = 'codex-native';
 
 function isCodexExecBinary(binaryPath?: string | null): boolean {
@@ -106,6 +107,18 @@ function applyCodexRuntimeContextEnv(
   }
 }
 
+function applyCodexForcedLoginMethodEnv(
+  env: NodeJS.ProcessEnv,
+  loginMethod: 'chatgpt' | 'api' | null
+): void {
+  if (loginMethod) {
+    env[CODEX_FORCED_LOGIN_METHOD_ENV_VAR] = loginMethod;
+    return;
+  }
+
+  delete env[CODEX_FORCED_LOGIN_METHOD_ENV_VAR];
+}
+
 export class ProviderConnectionService {
   private static instance: ProviderConnectionService | null = null;
   private codexAccountFeature: Pick<CodexAccountFeatureFacade, 'getSnapshot'> | null = null;
@@ -162,6 +175,20 @@ export class ProviderConnectionService {
     return null;
   }
 
+  async getConfiguredAnthropicApiKeyForTeamRuntime(env: NodeJS.ProcessEnv): Promise<string | null> {
+    if (this.getConfiguredAuthMode('anthropic') !== 'api_key') {
+      return null;
+    }
+
+    const storedKey = await this.apiKeyService.lookupPreferred('ANTHROPIC_API_KEY');
+    if (storedKey?.value.trim()) {
+      return storedKey.value.trim();
+    }
+
+    const envKey = env.ANTHROPIC_API_KEY?.trim();
+    return envKey || null;
+  }
+
   async applyConfiguredConnectionEnv(
     env: NodeJS.ProcessEnv,
     providerId: CliProviderId,
@@ -213,6 +240,7 @@ export class ProviderConnectionService {
     if (readiness.effectiveAuthMode === 'chatgpt') {
       delete env.OPENAI_API_KEY;
       delete env[CODEX_NATIVE_API_KEY_ENV_VAR];
+      applyCodexForcedLoginMethodEnv(env, 'chatgpt');
       return env;
     }
 
@@ -220,6 +248,7 @@ export class ProviderConnectionService {
     if (readiness.effectiveAuthMode === 'api_key' && resolvedApiKey) {
       env.OPENAI_API_KEY = resolvedApiKey;
       env[CODEX_NATIVE_API_KEY_ENV_VAR] = resolvedApiKey;
+      applyCodexForcedLoginMethodEnv(env, 'api');
       return env;
     }
 
@@ -227,6 +256,7 @@ export class ProviderConnectionService {
       delete env.OPENAI_API_KEY;
     }
     delete env[CODEX_NATIVE_API_KEY_ENV_VAR];
+    applyCodexForcedLoginMethodEnv(env, null);
 
     return env;
   }
@@ -274,6 +304,7 @@ export class ProviderConnectionService {
     if (readiness.effectiveAuthMode === 'chatgpt') {
       delete env.OPENAI_API_KEY;
       delete env[CODEX_NATIVE_API_KEY_ENV_VAR];
+      applyCodexForcedLoginMethodEnv(env, 'chatgpt');
       return env;
     }
 
@@ -281,8 +312,11 @@ export class ProviderConnectionService {
     if (readiness.effectiveAuthMode === 'api_key' && resolvedApiKey) {
       env.OPENAI_API_KEY = resolvedApiKey;
       env[CODEX_NATIVE_API_KEY_ENV_VAR] = resolvedApiKey;
+      applyCodexForcedLoginMethodEnv(env, 'api');
+      return env;
     }
 
+    applyCodexForcedLoginMethodEnv(env, null);
     return env;
   }
 
diff --git a/src/main/services/runtime/anthropicTeamApiKeyHelper.ts b/src/main/services/runtime/anthropicTeamApiKeyHelper.ts
new file mode 100644
index 00000000..db9388d8
--- /dev/null
+++ b/src/main/services/runtime/anthropicTeamApiKeyHelper.ts
@@ -0,0 +1,353 @@
+import { execFile, execFileSync } from 'child_process';
+import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
+import { promisify } from 'util';
+
+const execFileAsync = promisify(execFile);
+
+export const CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV = 'CLAUDE_TEAM_ANTHROPIC_AUTH_MODE';
+export const CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_API_KEY_HELPER = 'api_key_helper';
+export const CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV =
+  'CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH';
+export const DISABLE_ANTHROPIC_TEAM_API_KEY_HELPER_ENV =
+  'CLAUDE_TEAM_DISABLE_ANTHROPIC_API_KEY_HELPER';
+
+export const ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS = [
+  'ANTHROPIC_API_KEY',
+  'ANTHROPIC_AUTH_TOKEN',
+  'CLAUDE_CODE_API_KEY_FILE_DESCRIPTOR',
+  'CLAUDE_CODE_OAUTH_TOKEN',
+  'CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR',
+] as const;
+
+export interface AnthropicTeamApiKeyHelperMaterial {
+  teamName: string;
+  directory: string;
+  helperPath: string;
+  keyPath: string;
+  settingsPath: string;
+  settingsObject: { apiKeyHelper: string };
+  settingsArgs: string[];
+  envPatch: NodeJS.ProcessEnv;
+}
+
+function shellQuote(value: string): string {
+  if (value.length === 0) {
+    return "''";
+  }
+  return `'${value.replace(/'/g, `'\\''`)}'`;
+}
+
+function isOwnedPathSegment(value: string): boolean {
+  return /^[a-zA-Z0-9._-]{1,128}$/.test(value) && value !== '.' && value !== '..';
+}
+
+function safePathSegment(value: string): string {
+  const trimmed = value.trim();
+  if (isOwnedPathSegment(trimmed)) {
+    return trimmed;
+  }
+  return crypto.createHash('sha256').update(value).digest('hex').slice(0, 32);
+}
+
+export function buildAnthropicTeamAuthDirectoryName(teamName: string): string {
+  const slug =
+    teamName
+      .normalize('NFKD')
+      .replace(/[^a-zA-Z0-9._-]+/g, '_')
+      .replace(/^_+|_+$/g, '')
+      .slice(0, 80) || 'team';
+  const hash = crypto.createHash('sha256').update(teamName).digest('hex').slice(0, 12);
+  return `${slug}-${hash}`;
+}
+
+function resolveInside(basePath: string, ...segments: string[]): string {
+  const resolvedBase = path.resolve(basePath);
+  const resolvedPath = path.resolve(resolvedBase, ...segments);
+  const relative = path.relative(resolvedBase, resolvedPath);
+  if (relative === '' || (!relative.startsWith('..') && !path.isAbsolute(relative))) {
+    return resolvedPath;
+  }
+  throw new Error('Refusing to write Anthropic team auth material outside the auth root');
+}
+
+async function ensureOwnedDirectory(dirPath: string): Promise<void> {
+  try {
+    const stat = await fs.promises.lstat(dirPath);
+    if (!stat.isDirectory() || stat.isSymbolicLink()) {
+      throw new Error(`Unsafe Anthropic team auth directory: ${dirPath}`);
+    }
+  } catch (error) {
+    if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+      throw error;
+    }
+    await fs.promises.mkdir(dirPath, { recursive: true, mode: 0o700 });
+  }
+  if (process.platform !== 'win32') {
+    await fs.promises.chmod(dirPath, 0o700).catch(() => undefined);
+  }
+}
+
+async function assertRegularOwnedFile(filePath: string, mode: number): Promise<void> {
+  const stat = await fs.promises.lstat(filePath);
+  if (!stat.isFile() || stat.isSymbolicLink()) {
+    throw new Error(`Unsafe Anthropic team auth file: ${filePath}`);
+  }
+  if (process.platform !== 'win32') {
+    await fs.promises.chmod(filePath, mode).catch(() => undefined);
+  }
+}
+
+function readLiveProcessCommandsForReferenceCheck(): string | null {
+  if (process.platform === 'win32') {
+    return null;
+  }
+  try {
+    return execFileSync('ps', ['-ax', '-o', 'command='], {
+      encoding: 'utf8',
+      timeout: 2000,
+      maxBuffer: 5 * 1024 * 1024,
+    });
+  } catch {
+    return null;
+  }
+}
+
+function liveProcessMayReferencePath(targetPath: string, processCommands?: string | null): boolean {
+  const output =
+    processCommands !== undefined ? processCommands : readLiveProcessCommandsForReferenceCheck();
+  return typeof output === 'string' && output.includes(targetPath);
+}
+
+async function writeFileAtomic(filePath: string, contents: string, mode: number): Promise<void> {
+  const dir = path.dirname(filePath);
+  await ensureOwnedDirectory(dir);
+  const existing = await fs.promises.lstat(filePath).catch((error: NodeJS.ErrnoException) => {
+    if (error.code === 'ENOENT') return null;
+    throw error;
+  });
+  if (existing?.isSymbolicLink()) {
+    throw new Error(`Refusing to replace symlinked Anthropic team auth file: ${filePath}`);
+  }
+  const tmpPath = path.join(dir, `.tmp.${crypto.randomUUID()}`);
+  try {
+    await fs.promises.writeFile(tmpPath, contents, { encoding: 'utf8', mode });
+    if (process.platform !== 'win32') {
+      await fs.promises.chmod(tmpPath, mode).catch(() => undefined);
+    }
+    await fs.promises.rename(tmpPath, filePath);
+    await assertRegularOwnedFile(filePath, mode);
+  } catch (error) {
+    await fs.promises.rm(tmpPath, { force: true }).catch(() => undefined);
+    throw error;
+  }
+}
+
+function buildHelperScript(keyPath: string): string {
+  return [
+    '#!/bin/sh',
+    'set -eu',
+    `KEY_FILE=${shellQuote(keyPath)}`,
+    'if [ ! -r "$KEY_FILE" ]; then',
+    "  echo 'app-managed Anthropic API key is unavailable' >&2",
+    '  exit 1',
+    'fi',
+    'key="$(cat "$KEY_FILE")"',
+    'if [ -z "$key" ]; then',
+    "  echo 'app-managed Anthropic API key is empty' >&2",
+    '  exit 1',
+    'fi',
+    'printf \'%s\\n\' "$key"',
+    '',
+  ].join('\n');
+}
+
+function buildAuthMaterialPaths(input: {
+  teamName: string;
+  authMaterialId: string;
+  baseClaudeDir: string;
+}): { authRoot: string; teamDir: string; runDir: string } {
+  const authRoot = path.resolve(input.baseClaudeDir, 'team-runtime-auth');
+  const teamDirName = buildAnthropicTeamAuthDirectoryName(input.teamName);
+  const authMaterialSegment = safePathSegment(input.authMaterialId);
+  const teamDir = resolveInside(authRoot, teamDirName);
+  const runDir = resolveInside(authRoot, teamDirName, 'runs', authMaterialSegment);
+  return { authRoot, teamDir, runDir };
+}
+
+export async function materializeAnthropicTeamApiKeyHelper(input: {
+  teamName: string;
+  authMaterialId: string;
+  apiKey: string;
+  baseClaudeDir: string;
+}): Promise<AnthropicTeamApiKeyHelperMaterial> {
+  const normalizedApiKey = input.apiKey.trim();
+  if (!normalizedApiKey) {
+    throw new Error('Cannot materialize Anthropic team API-key helper without an API key');
+  }
+
+  const { authRoot, teamDir, runDir } = buildAuthMaterialPaths(input);
+  await ensureOwnedDirectory(authRoot);
+  await ensureOwnedDirectory(teamDir);
+  await ensureOwnedDirectory(path.join(teamDir, 'runs'));
+  await ensureOwnedDirectory(runDir);
+
+  const keyPath = path.join(runDir, 'key');
+  const helperPath = path.join(runDir, 'helper.sh');
+  const settingsPath = path.join(runDir, 'settings.json');
+  const settingsObject = { apiKeyHelper: shellQuote(helperPath) };
+
+  await writeFileAtomic(keyPath, `${normalizedApiKey}\n`, 0o600);
+  await writeFileAtomic(helperPath, buildHelperScript(keyPath), 0o700);
+  await writeFileAtomic(settingsPath, `${JSON.stringify(settingsObject, null, 2)}\n`, 0o600);
+
+  return {
+    teamName: input.teamName,
+    directory: runDir,
+    helperPath,
+    keyPath,
+    settingsPath,
+    settingsObject,
+    settingsArgs: ['--settings', settingsPath],
+    envPatch: {
+      [CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV]: CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_API_KEY_HELPER,
+      [CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV]: settingsPath,
+    },
+  };
+}
+
+export async function verifyAnthropicTeamApiKeyHelperMaterial(input: {
+  helperPath: string;
+  expectedApiKey: string;
+  timeoutMs?: number;
+}): Promise<void> {
+  const result = await execFileAsync('/bin/sh', ['-c', shellQuote(input.helperPath)], {
+    timeout: input.timeoutMs ?? 5000,
+    maxBuffer: 1024 * 1024,
+  });
+  if (result.stdout.trim() !== input.expectedApiKey.trim()) {
+    throw new Error('App-managed Anthropic API-key helper verification failed');
+  }
+}
+
+export async function cleanupAnthropicTeamApiKeyHelperMaterial(input: {
+  directory: string;
+  skipIfLiveProcessReferences?: boolean;
+}): Promise<void> {
+  if (input.skipIfLiveProcessReferences === true && liveProcessMayReferencePath(input.directory)) {
+    return;
+  }
+  const entries = await fs.promises
+    .readdir(input.directory, { withFileTypes: true })
+    .catch(() => []);
+  const expected = new Set(['helper.sh', 'key', 'settings.json']);
+  for (const entry of entries) {
+    if (!entry.isFile()) {
+      continue;
+    }
+    const fileName = entry.name;
+    const isExpected =
+      expected.has(fileName) || /^runtime-settings-[a-zA-Z0-9._-]+\.json$/.test(fileName);
+    if (!isExpected) {
+      continue;
+    }
+    const filePath = path.join(input.directory, fileName);
+    const stat = await fs.promises.lstat(filePath).catch(() => null);
+    if (!stat || stat.isSymbolicLink() || !stat.isFile()) {
+      continue;
+    }
+    await fs.promises.rm(filePath, { force: true }).catch(() => undefined);
+  }
+  await fs.promises.rmdir(input.directory).catch(() => undefined);
+}
+
+export async function cleanupAnthropicTeamApiKeyHelperForTeam(input: {
+  teamName: string;
+  baseClaudeDir: string;
+}): Promise<void> {
+  const { teamDir } = buildAuthMaterialPaths({
+    teamName: input.teamName,
+    authMaterialId: 'cleanup-placeholder',
+    baseClaudeDir: input.baseClaudeDir,
+  });
+  const stat = await fs.promises.lstat(teamDir).catch(() => null);
+  if (!stat || stat.isSymbolicLink() || !stat.isDirectory()) {
+    return;
+  }
+  const processCommands = readLiveProcessCommandsForReferenceCheck();
+  const runsDir = path.join(teamDir, 'runs');
+  const runsStat = await fs.promises.lstat(runsDir).catch(() => null);
+  if (runsStat?.isDirectory() && !runsStat.isSymbolicLink()) {
+    const entries = await fs.promises.readdir(runsDir, { withFileTypes: true }).catch(() => []);
+    for (const entry of entries) {
+      if (!entry.isDirectory() || !isOwnedPathSegment(entry.name)) {
+        continue;
+      }
+      const runDir = path.join(runsDir, entry.name);
+      const runStat = await fs.promises.lstat(runDir).catch(() => null);
+      if (!runStat?.isDirectory() || runStat.isSymbolicLink()) {
+        continue;
+      }
+      if (liveProcessMayReferencePath(runDir, processCommands)) {
+        continue;
+      }
+      await cleanupAnthropicTeamApiKeyHelperMaterial({ directory: runDir });
+    }
+    await fs.promises.rmdir(runsDir).catch(() => undefined);
+  }
+  await fs.promises.rmdir(teamDir).catch(() => undefined);
+}
+
+export async function cleanupStaleAnthropicTeamApiKeyHelpers(input: {
+  baseClaudeDir: string;
+  maxAgeMs: number;
+}): Promise<void> {
+  const authRoot = path.resolve(input.baseClaudeDir, 'team-runtime-auth');
+  const rootStat = await fs.promises.lstat(authRoot).catch(() => null);
+  if (!rootStat?.isDirectory() || rootStat.isSymbolicLink()) {
+    return;
+  }
+
+  const now = Date.now();
+  const processCommands = readLiveProcessCommandsForReferenceCheck();
+  if (processCommands === null) {
+    return;
+  }
+  const teamEntries = await fs.promises.readdir(authRoot, { withFileTypes: true }).catch(() => []);
+  for (const teamEntry of teamEntries) {
+    if (!teamEntry.isDirectory() || !isOwnedPathSegment(teamEntry.name)) {
+      continue;
+    }
+    const teamDir = path.join(authRoot, teamEntry.name);
+    const teamStat = await fs.promises.lstat(teamDir).catch(() => null);
+    if (!teamStat?.isDirectory() || teamStat.isSymbolicLink()) {
+      continue;
+    }
+    const runsDir = path.join(teamDir, 'runs');
+    const runsStat = await fs.promises.lstat(runsDir).catch(() => null);
+    if (!runsStat?.isDirectory() || runsStat.isSymbolicLink()) {
+      continue;
+    }
+    const runEntries = await fs.promises.readdir(runsDir, { withFileTypes: true }).catch(() => []);
+    for (const runEntry of runEntries) {
+      if (!runEntry.isDirectory() || !isOwnedPathSegment(runEntry.name)) {
+        continue;
+      }
+      const runDir = path.join(runsDir, runEntry.name);
+      const runStat = await fs.promises.lstat(runDir).catch(() => null);
+      if (!runStat?.isDirectory() || runStat.isSymbolicLink()) {
+        continue;
+      }
+      if (now - runStat.mtimeMs < input.maxAgeMs) {
+        continue;
+      }
+      if (liveProcessMayReferencePath(runDir, processCommands)) {
+        continue;
+      }
+      await cleanupAnthropicTeamApiKeyHelperMaterial({ directory: runDir });
+    }
+    await fs.promises.rmdir(runsDir).catch(() => undefined);
+    await fs.promises.rmdir(teamDir).catch(() => undefined);
+  }
+}
diff --git a/src/main/services/runtime/cliSettingsArgs.ts b/src/main/services/runtime/cliSettingsArgs.ts
index 6b75b7ad..9184ecaa 100644
--- a/src/main/services/runtime/cliSettingsArgs.ts
+++ b/src/main/services/runtime/cliSettingsArgs.ts
@@ -1,4 +1,4 @@
-type JsonObject = Record<string, unknown>;
+export type JsonObject = Record<string, unknown>;
 
 type JsonArray = unknown[];
 
@@ -6,7 +6,7 @@ function isJsonObject(value: unknown): value is JsonObject {
   return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
 
-function parseJsonSettingsObject(raw: string): JsonObject | null {
+export function parseJsonSettingsObject(raw: string): JsonObject | null {
   try {
     const parsed = JSON.parse(raw) as unknown;
     return isJsonObject(parsed) ? parsed : null;
@@ -73,7 +73,7 @@ function mergeHooksObject(target: JsonObject, source: JsonObject): JsonObject {
       continue;
     }
     if (isJsonObject(currentValue) && isJsonObject(sourceValue)) {
-      merged[hookName] = deepMergeJsonObjects(currentValue, sourceValue);
+      merged[hookName] = mergeJsonSettingsObjects(currentValue, sourceValue);
       continue;
     }
     merged[hookName] = sourceValue;
@@ -81,7 +81,7 @@ function mergeHooksObject(target: JsonObject, source: JsonObject): JsonObject {
   return merged;
 }
 
-function deepMergeJsonObjects(target: JsonObject, source: JsonObject): JsonObject {
+export function mergeJsonSettingsObjects(target: JsonObject, source: JsonObject): JsonObject {
   const merged: JsonObject = { ...target };
   for (const [key, value] of Object.entries(source)) {
     const current = merged[key];
@@ -90,7 +90,7 @@ function deepMergeJsonObjects(target: JsonObject, source: JsonObject): JsonObjec
       continue;
     }
     if (isJsonObject(current) && isJsonObject(value)) {
-      merged[key] = deepMergeJsonObjects(current, value);
+      merged[key] = mergeJsonSettingsObjects(current, value);
       continue;
     }
     merged[key] = value;
@@ -120,7 +120,7 @@ export function mergeJsonSettingsArgs(args: string[]): string[] {
           if (firstSettingsIndex === null) {
             firstSettingsIndex = output.length;
           }
-          mergedSettings = deepMergeJsonObjects(mergedSettings ?? {}, parsed);
+          mergedSettings = mergeJsonSettingsObjects(mergedSettings ?? {}, parsed);
           i += 2;
           continue;
         }
@@ -137,7 +137,7 @@ export function mergeJsonSettingsArgs(args: string[]): string[] {
         if (firstSettingsIndex === null) {
           firstSettingsIndex = output.length;
         }
-        mergedSettings = deepMergeJsonObjects(mergedSettings ?? {}, parsed);
+        mergedSettings = mergeJsonSettingsObjects(mergedSettings ?? {}, parsed);
         i += 1;
         continue;
       }
diff --git a/src/main/services/runtime/teamRuntimeSettingsBundle.ts b/src/main/services/runtime/teamRuntimeSettingsBundle.ts
new file mode 100644
index 00000000..99bda9d9
--- /dev/null
+++ b/src/main/services/runtime/teamRuntimeSettingsBundle.ts
@@ -0,0 +1,162 @@
+import { randomUUID } from 'crypto';
+import fs from 'fs';
+import path from 'path';
+
+import { mergeJsonSettingsObjects, parseJsonSettingsObject } from './cliSettingsArgs';
+
+import type { AnthropicTeamApiKeyHelperMaterial } from './anthropicTeamApiKeyHelper';
+import type { TeamProviderId } from '@shared/types';
+
+export type TeamRuntimeSettingsJson = Record<string, unknown>;
+
+export interface TeamRuntimeSettingsBundle {
+  settingsPath: string;
+  settingsObject: TeamRuntimeSettingsJson;
+  args: string[];
+}
+
+export interface SplitSettingsJsonArgsResult {
+  settingsFragments: TeamRuntimeSettingsJson[];
+  passthroughArgs: string[];
+}
+
+export function splitSettingsJsonArgs(args: string[]): SplitSettingsJsonArgsResult {
+  const settingsFragments: TeamRuntimeSettingsJson[] = [];
+  const passthroughArgs: string[] = [];
+
+  let index = 0;
+  while (index < args.length) {
+    const arg = args[index];
+    if (arg === '--settings') {
+      const value = args[index + 1];
+      if (typeof value === 'string') {
+        const parsed = parseJsonSettingsObject(value);
+        if (parsed) {
+          settingsFragments.push(parsed);
+          index += 2;
+          continue;
+        }
+        passthroughArgs.push(arg, value);
+        index += 2;
+        continue;
+      }
+    }
+
+    const settingsPrefix = '--settings=';
+    if (arg.startsWith(settingsPrefix)) {
+      const value = arg.slice(settingsPrefix.length);
+      const parsed = parseJsonSettingsObject(value);
+      if (parsed) {
+        settingsFragments.push(parsed);
+        continue;
+      }
+    }
+
+    passthroughArgs.push(arg);
+    index += 1;
+  }
+
+  return { settingsFragments, passthroughArgs };
+}
+
+function sanitizeProviderId(providerId: TeamProviderId): string {
+  return providerId.replace(/[^a-zA-Z0-9._-]+/g, '_') || 'provider';
+}
+
+function stripCompetingAnthropicEnv(settings: TeamRuntimeSettingsJson): TeamRuntimeSettingsJson {
+  const env = settings.env;
+  if (!env || typeof env !== 'object' || Array.isArray(env)) {
+    return settings;
+  }
+  const nextEnv = { ...(env as Record<string, unknown>) };
+  delete nextEnv.ANTHROPIC_API_KEY;
+  delete nextEnv.ANTHROPIC_AUTH_TOKEN;
+  delete nextEnv.CLAUDE_CODE_API_KEY_FILE_DESCRIPTOR;
+  delete nextEnv.CLAUDE_CODE_OAUTH_TOKEN;
+  delete nextEnv.CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR;
+  return { ...settings, env: nextEnv };
+}
+
+async function writeSettingsFile(
+  filePath: string,
+  settings: TeamRuntimeSettingsJson
+): Promise<void> {
+  const dir = path.dirname(filePath);
+  await fs.promises.mkdir(dir, { recursive: true, mode: 0o700 });
+  if (process.platform !== 'win32') {
+    await fs.promises.chmod(dir, 0o700).catch(() => undefined);
+  }
+  const existing = await fs.promises.lstat(filePath).catch((error: NodeJS.ErrnoException) => {
+    if (error.code === 'ENOENT') {
+      return null;
+    }
+    throw error;
+  });
+  if (existing?.isSymbolicLink()) {
+    throw new Error(`Refusing to replace symlinked team runtime settings file: ${filePath}`);
+  }
+  const tmpPath = path.join(dir, `.tmp.settings.${randomUUID()}`);
+  try {
+    await fs.promises.writeFile(tmpPath, `${JSON.stringify(settings, null, 2)}\n`, {
+      encoding: 'utf8',
+      mode: 0o600,
+    });
+    if (process.platform !== 'win32') {
+      await fs.promises.chmod(tmpPath, 0o600).catch(() => undefined);
+    }
+    await fs.promises.rename(tmpPath, filePath);
+    const written = await fs.promises.lstat(filePath);
+    if (!written.isFile() || written.isSymbolicLink()) {
+      throw new Error(`Unsafe team runtime settings file: ${filePath}`);
+    }
+    if (process.platform !== 'win32') {
+      await fs.promises.chmod(filePath, 0o600).catch(() => undefined);
+    }
+  } catch (error) {
+    await fs.promises.rm(tmpPath, { force: true }).catch(() => undefined);
+    throw error;
+  }
+}
+
+export async function materializeTeamRuntimeSettingsBundle(input: {
+  teamName: string;
+  providerId: TeamProviderId;
+  baseSettings?: (TeamRuntimeSettingsJson | null | undefined)[];
+  anthropicHelper?: AnthropicTeamApiKeyHelperMaterial | null;
+}): Promise<TeamRuntimeSettingsBundle | null> {
+  const fragments = [...(input.baseSettings ?? [])].filter(
+    (fragment): fragment is TeamRuntimeSettingsJson =>
+      !!fragment && typeof fragment === 'object' && !Array.isArray(fragment)
+  );
+  if (input.anthropicHelper) {
+    fragments.push(input.anthropicHelper.settingsObject);
+  }
+  if (fragments.length === 0) {
+    return null;
+  }
+
+  const settingsObject = stripCompetingAnthropicEnv(
+    fragments.reduce<TeamRuntimeSettingsJson>(
+      (merged, fragment) => mergeJsonSettingsObjects(merged, fragment),
+      {}
+    )
+  );
+  if (Object.keys(settingsObject).length === 0) {
+    return null;
+  }
+
+  const baseDirectory = input.anthropicHelper?.directory;
+  if (!baseDirectory) {
+    return null;
+  }
+  const settingsPath = path.join(
+    baseDirectory,
+    `runtime-settings-${sanitizeProviderId(input.providerId)}.json`
+  );
+  await writeSettingsFile(settingsPath, settingsObject);
+  return {
+    settingsPath,
+    settingsObject,
+    args: ['--settings', settingsPath],
+  };
+}
diff --git a/src/main/services/schedule/ScheduledTaskExecutor.ts b/src/main/services/schedule/ScheduledTaskExecutor.ts
index 34cd0761..849250d5 100644
--- a/src/main/services/schedule/ScheduledTaskExecutor.ts
+++ b/src/main/services/schedule/ScheduledTaskExecutor.ts
@@ -178,7 +178,9 @@ export class ScheduledTaskExecutor {
       cwd: request.config.cwd,
       // shellEnv spread after buildEnrichedEnv ensures freshly-resolved values
       // take precedence over the cached snapshot inside buildEnrichedEnv.
-      env,
+      // CLAUDECODE stripped last to prevent nested-session detection regardless
+      // of what buildProviderAwareCliEnv merges in.
+      env: { ...env, CLAUDECODE: undefined },
       stdio: ['ignore', 'pipe', 'pipe'],
     });
 
diff --git a/src/main/services/team/AutoResumeService.ts b/src/main/services/team/AutoResumeService.ts
index 0ec6f237..604b74d3 100644
--- a/src/main/services/team/AutoResumeService.ts
+++ b/src/main/services/team/AutoResumeService.ts
@@ -20,6 +20,64 @@ interface PendingAutoResumeEntry {
   sourceRunId: string | null;
 }
 
+export type RateLimitAutoResumePlan =
+  | {
+      kind: 'scheduled';
+      resetTime: Date;
+      delayMs: number;
+      fireAtMs: number;
+      rawDelayMs: number;
+    }
+  | {
+      kind: 'manual';
+      reason: 'disabled' | 'not_resumable' | 'reset_unparseable' | 'stale' | 'too_far';
+    };
+
+export function planRateLimitAutoResume(input: {
+  enabled: boolean;
+  canAutoResume: boolean;
+  messageText: string;
+  observedAt: Date;
+  messageTimestamp?: Date;
+}): RateLimitAutoResumePlan {
+  if (!input.enabled) return { kind: 'manual', reason: 'disabled' };
+  if (!input.canAutoResume) return { kind: 'manual', reason: 'not_resumable' };
+
+  const observedAtMs = input.observedAt.getTime();
+  const messageTimestamp = input.messageTimestamp ?? input.observedAt;
+  const messageAtMs = Number.isFinite(messageTimestamp.getTime())
+    ? messageTimestamp.getTime()
+    : observedAtMs;
+  const parseReferenceTime = Number.isFinite(messageTimestamp.getTime())
+    ? messageTimestamp
+    : input.observedAt;
+
+  const resetTime = parseRateLimitResetTime(input.messageText, parseReferenceTime);
+  if (!resetTime) return { kind: 'manual', reason: 'reset_unparseable' };
+
+  const resetAtMs = resetTime.getTime();
+  const rawDelayMs = resetAtMs - observedAtMs;
+  const targetFireAtMs = resetAtMs + AUTO_RESUME_BUFFER_MS;
+  const messageAgeMs = Math.max(0, observedAtMs - messageAtMs);
+
+  if (targetFireAtMs <= observedAtMs && messageAgeMs > AUTO_RESUME_HISTORY_FRESH_MS) {
+    return { kind: 'manual', reason: 'stale' };
+  }
+
+  const delayMs = Math.max(0, targetFireAtMs - observedAtMs);
+  if (delayMs > AUTO_RESUME_MAX_DELAY_MS) {
+    return { kind: 'manual', reason: 'too_far' };
+  }
+
+  return {
+    kind: 'scheduled',
+    resetTime,
+    delayMs,
+    fireAtMs: observedAtMs + delayMs,
+    rawDelayMs,
+  };
+}
+
 type AutoResumeProvisioning = Pick<
   TeamProvisioningService,
   'getCurrentRunId' | 'isTeamAlive' | 'sendMessageToTeam'
@@ -40,31 +98,13 @@ export class AutoResumeService {
     observedAt: Date = new Date(),
     messageTimestamp: Date = observedAt
   ): void {
-    const cfg = this.configManager.getConfig();
-    if (!cfg.notifications.autoResumeOnRateLimit) return;
-
     const observedAtMs = observedAt.getTime();
     const messageAtMs = Number.isFinite(messageTimestamp.getTime())
       ? messageTimestamp.getTime()
       : observedAtMs;
-    const parseReferenceTime = Number.isFinite(messageTimestamp.getTime())
-      ? messageTimestamp
-      : observedAt;
-
-    const resetTime = parseRateLimitResetTime(messageText, parseReferenceTime);
-    if (!resetTime) {
-      logger.info(
-        `[auto-resume] Rate limit detected for "${teamName}" but reset time was not parseable - skipping auto-resume`
-      );
-      return;
-    }
-
-    const resetAtMs = resetTime.getTime();
-    const rawDelayMs = resetAtMs - observedAtMs;
-    const targetFireAtMs = resetAtMs + AUTO_RESUME_BUFFER_MS;
-    const messageAgeMs = Math.max(0, observedAtMs - messageAtMs);
     const existing = this.pendingTimers.get(teamName);
     const sourceRunId = this.provisioningService.getCurrentRunId(teamName);
+    const cfg = this.configManager.getConfig();
 
     if (existing && messageAtMs < existing.sourceMessageAtMs) {
       logger.info(
@@ -73,35 +113,37 @@ export class AutoResumeService {
       return;
     }
 
-    if (targetFireAtMs <= observedAtMs && messageAgeMs > AUTO_RESUME_HISTORY_FRESH_MS) {
-      logger.info(
-        `[auto-resume] Parsed reset time for "${teamName}" passed its buffered fire deadline ${Math.round((observedAtMs - targetFireAtMs) / 1000)}s ago - skipping stale history replay`
-      );
-      return;
-    }
+    const plan = planRateLimitAutoResume({
+      enabled: cfg.notifications.autoResumeOnRateLimit,
+      canAutoResume: true,
+      messageText,
+      observedAt,
+      messageTimestamp,
+    });
 
-    if (rawDelayMs < 0) {
-      logger.warn(
-        `[auto-resume] Parsed reset time for "${teamName}" is ${Math.round(-rawDelayMs / 1000)}s in the past - using remaining buffered delay`
-      );
-    }
-
-    const delayMs = Math.max(0, targetFireAtMs - observedAtMs);
-    const fireAtMs = observedAtMs + delayMs;
-
-    if (delayMs > AUTO_RESUME_MAX_DELAY_MS) {
-      if (existing) {
+    if (plan.kind === 'manual') {
+      if (plan.reason === 'too_far' && existing) {
         clearTimeout(existing.timer);
         this.pendingTimers.delete(teamName);
       }
-      logger.warn(
-        `[auto-resume] Parsed reset time for "${teamName}" is ${Math.round(delayMs / 60000)}m away - exceeds ceiling, skipping`
+      if (plan.reason === 'too_far') {
+        logger.warn(`[auto-resume] Parsed reset time for "${teamName}" exceeds ceiling - skipping`);
+        return;
+      }
+      logger.info(
+        `[auto-resume] Rate limit detected for "${teamName}" but auto-resume is manual (${plan.reason})`
       );
       return;
     }
 
+    if (plan.rawDelayMs < 0) {
+      logger.warn(
+        `[auto-resume] Parsed reset time for "${teamName}" is ${Math.round(-plan.rawDelayMs / 1000)}s in the past - using remaining buffered delay`
+      );
+    }
+
     if (
-      existing?.fireAtMs === fireAtMs &&
+      existing?.fireAtMs === plan.fireAtMs &&
       existing.sourceMessageAtMs === messageAtMs &&
       existing.sourceRunId === sourceRunId
     ) {
@@ -112,22 +154,22 @@ export class AutoResumeService {
       clearTimeout(existing.timer);
       this.pendingTimers.delete(teamName);
       logger.info(
-        `[auto-resume] Rescheduling resume for "${teamName}" to ${resetTime.toISOString()}`
+        `[auto-resume] Rescheduling resume for "${teamName}" to ${plan.resetTime.toISOString()}`
       );
     } else {
       logger.info(
-        `[auto-resume] Scheduling resume for "${teamName}" at ${resetTime.toISOString()} (in ${Math.round(delayMs / 1000)}s)`
+        `[auto-resume] Scheduling resume for "${teamName}" at ${plan.resetTime.toISOString()} (in ${Math.round(plan.delayMs / 1000)}s)`
       );
     }
 
     const timer = setTimeout(() => {
       this.pendingTimers.delete(teamName);
       void this.fireResumeNudge(teamName, sourceRunId);
-    }, delayMs);
+    }, plan.delayMs);
 
     this.pendingTimers.set(teamName, {
       timer,
-      fireAtMs,
+      fireAtMs: plan.fireAtMs,
       sourceMessageAtMs: messageAtMs,
       sourceRunId,
     });
diff --git a/src/main/services/team/ChangeExtractorService.ts b/src/main/services/team/ChangeExtractorService.ts
index 6b84d7c6..143c76b7 100644
--- a/src/main/services/team/ChangeExtractorService.ts
+++ b/src/main/services/team/ChangeExtractorService.ts
@@ -123,6 +123,12 @@ export class ChangeExtractorService {
     this.taskChangeComputer = new TaskChangeComputer(logsFinder, boundaryParser);
   }
 
+  private readConfigForObservation(teamName: string) {
+    return typeof this.configReader.getConfigSnapshot === 'function'
+      ? this.configReader.getConfigSnapshot(teamName)
+      : this.configReader.getConfig(teamName);
+  }
+
   setTaskChangePresenceServices(
     repository: TaskChangePresenceRepository,
     tracker: TeamLogSourceTracker
@@ -671,7 +677,7 @@ export class ChangeExtractorService {
     try {
       const [meta, config] = await Promise.all([
         this.teamMetaStore.getMeta(teamName).catch(() => null),
-        this.configReader.getConfig(teamName).catch(() => null),
+        this.readConfigForObservation(teamName).catch(() => null),
       ]);
       const hasOpenCodeMember = (config?.members ?? []).some(
         (member) => member.providerId === 'opencode'
@@ -996,7 +1002,7 @@ export class ChangeExtractorService {
   /** Получить projectPath из конфига команды */
   private async resolveProjectPath(teamName: string): Promise<string | undefined> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await this.readConfigForObservation(teamName);
       return config?.projectPath?.trim() || undefined;
     } catch {
       return undefined;
diff --git a/src/main/services/team/CrossTeamService.ts b/src/main/services/team/CrossTeamService.ts
index f41c4c15..6377deb4 100644
--- a/src/main/services/team/CrossTeamService.ts
+++ b/src/main/services/team/CrossTeamService.ts
@@ -1,10 +1,9 @@
-import { getClaudeBasePath, getTeamsBasePath } from '@main/utils/pathDecoder';
+import { getClaudeBasePath } from '@main/utils/pathDecoder';
 import { CROSS_TEAM_SENT_SOURCE, CROSS_TEAM_SOURCE, formatCrossTeamText } from '@shared/constants';
 import { isLeadMember } from '@shared/utils/leadDetection';
 import { createLogger } from '@shared/utils/logger';
 import * as agentTeamsControllerModule from 'agent-teams-controller';
 import { randomUUID } from 'crypto';
-import * as fs from 'fs';
 
 import { buildActionModeAgentBlock } from './actionModeInstructions';
 import { CascadeGuard } from './CascadeGuard';
@@ -117,8 +116,11 @@ export class CrossTeamService {
       throw new Error(`Target team not found: ${toTeam}`);
     }
 
-    // 2. Resolve lead
-    const leadName = (await this.dataService.getLeadMemberName(toTeam)) ?? 'team-lead';
+    // 2. Resolve lead. Reuse the verified target config before falling back to meta storage.
+    const leadName =
+      targetConfig.members?.find((m) => isLeadMember(m))?.name?.trim() ||
+      (await this.dataService.getLeadMemberName(toTeam)) ||
+      'team-lead';
 
     // 3. Format
     const from = `${fromTeam}.${fromMember}`;
@@ -203,39 +205,34 @@ export class CrossTeamService {
   }
 
   async listAvailableTargets(excludeTeam?: string): Promise<CrossTeamTarget[]> {
-    const teamsDir = getTeamsBasePath();
-    let entries: string[];
+    let teams: Awaited<ReturnType<TeamDataService['listTeams']>>;
     try {
-      entries = await fs.promises.readdir(teamsDir);
+      teams = await this.dataService.listTeams();
     } catch {
       return [];
     }
 
-    const targets: CrossTeamTarget[] = [];
-    for (const entry of entries) {
-      if (excludeTeam && entry === excludeTeam) continue;
-      if (!TEAM_NAME_PATTERN.test(entry)) continue;
-
-      let config: TeamConfig | null;
-      try {
-        config = await this.configReader.getConfig(entry);
-      } catch {
-        continue;
-      }
-      if (!config || config.deletedAt) continue;
-
-      const lead = config.members?.find((m) => isLeadMember(m));
-
-      targets.push({
-        teamName: entry,
-        displayName: config.name || entry,
-        description: config.description,
-        color: config.color,
-        leadName: lead?.name,
-        leadColor: lead?.color,
-        isOnline: this.provisioning?.isTeamAlive(entry) ?? false,
+    const targets: CrossTeamTarget[] = teams
+      .filter((team) => {
+        if (excludeTeam && team.teamName === excludeTeam) return false;
+        if (!TEAM_NAME_PATTERN.test(team.teamName)) return false;
+        return !team.deletedAt && !team.pendingCreate;
+      })
+      .map((team) => {
+        const summaryLead =
+          team.leadName || team.leadColor
+            ? { name: team.leadName, color: team.leadColor }
+            : team.members?.find((member) => isLeadMember(member));
+        return {
+          teamName: team.teamName,
+          displayName: team.displayName || team.teamName,
+          description: team.description,
+          color: team.color,
+          ...(summaryLead?.name ? { leadName: summaryLead.name } : {}),
+          ...(summaryLead?.color ? { leadColor: summaryLead.color } : {}),
+          isOnline: this.provisioning?.isTeamAlive(team.teamName) ?? false,
+        };
       });
-    }
 
     return targets.sort((a, b) => {
       if (a.isOnline && !b.isOnline) return -1;
diff --git a/src/main/services/team/LaunchIoGovernor.ts b/src/main/services/team/LaunchIoGovernor.ts
new file mode 100644
index 00000000..c7fafa1e
--- /dev/null
+++ b/src/main/services/team/LaunchIoGovernor.ts
@@ -0,0 +1,366 @@
+import type {
+  GlobalTask,
+  TeamChangeEvent,
+  TeamProvisioningProgress,
+  TeamSummary,
+} from '@shared/types';
+
+export type LaunchIoGovernorOperationKey = 'teams:list' | 'teams:getAllTasks';
+
+type GovernedPayload = TeamSummary[] | GlobalTask[];
+type CloneFn<T> = (value: T) => T;
+
+interface LaunchIoGovernorLogger {
+  debug?: (message: string) => void;
+  warn?: (message: string) => void;
+}
+
+export interface LaunchIoGovernorOptions {
+  quietWindowMs?: number;
+  maxStaleAgeMs?: number;
+  stuckLaunchPressureMs?: number;
+  warningCooldownMs?: number;
+  now?: () => number;
+  logger?: LaunchIoGovernorLogger;
+}
+
+interface ActiveLaunch {
+  teamName: string;
+  source: string;
+  startedAt: number;
+  updatedAt: number;
+}
+
+interface CachedValue<T> {
+  value: T;
+  cachedAt: number;
+}
+
+interface OperationState<T> {
+  key: LaunchIoGovernorOperationKey;
+  cache: CachedValue<T> | null;
+  dirty: boolean;
+  generation: number;
+  inFlight: Promise<T> | null;
+  loadFresh: (() => Promise<T>) | null;
+  clone: CloneFn<T> | null;
+  scheduledRefresh: ReturnType<typeof setTimeout> | null;
+  lastWarningAt: number;
+}
+
+export const DEFAULT_LAUNCH_IO_QUIET_WINDOW_MS = 3_000;
+export const DEFAULT_LAUNCH_IO_MAX_STALE_AGE_MS = 15_000;
+export const DEFAULT_LAUNCH_IO_STUCK_PRESSURE_MS = 10 * 60_000;
+const DEFAULT_WARNING_COOLDOWN_MS = 10_000;
+
+const TERMINAL_PROVISIONING_STATES = new Set(['ready', 'failed', 'cancelled', 'disconnected']);
+
+export function cloneLaunchIoGovernorPayload<T extends GovernedPayload>(value: T): T {
+  if (typeof structuredClone === 'function') {
+    return structuredClone(value);
+  }
+  return JSON.parse(JSON.stringify(value)) as T;
+}
+
+export class LaunchIoGovernor {
+  private readonly quietWindowMs: number;
+  private readonly maxStaleAgeMs: number;
+  private readonly stuckLaunchPressureMs: number;
+  private readonly warningCooldownMs: number;
+  private readonly now: () => number;
+  private readonly logger: LaunchIoGovernorLogger;
+  private readonly activeLaunches = new Map<string, ActiveLaunch>();
+  private readonly operations = new Map<
+    LaunchIoGovernorOperationKey,
+    OperationState<GovernedPayload>
+  >();
+  private quietUntil = 0;
+
+  constructor(options: LaunchIoGovernorOptions = {}) {
+    this.quietWindowMs = options.quietWindowMs ?? DEFAULT_LAUNCH_IO_QUIET_WINDOW_MS;
+    this.maxStaleAgeMs = options.maxStaleAgeMs ?? DEFAULT_LAUNCH_IO_MAX_STALE_AGE_MS;
+    this.stuckLaunchPressureMs =
+      options.stuckLaunchPressureMs ?? DEFAULT_LAUNCH_IO_STUCK_PRESSURE_MS;
+    this.warningCooldownMs = options.warningCooldownMs ?? DEFAULT_WARNING_COOLDOWN_MS;
+    this.now = options.now ?? (() => Date.now());
+    this.logger = options.logger ?? {};
+    this.operations.set('teams:list', this.createOperationState('teams:list'));
+    this.operations.set('teams:getAllTasks', this.createOperationState('teams:getAllTasks'));
+  }
+
+  noteLaunchIntent(teamName: string, source = 'unknown'): void {
+    const normalized = this.normalizeTeamName(teamName);
+    if (!normalized) {
+      return;
+    }
+    const now = this.now();
+    this.pruneStuckLaunches(now);
+    this.activeLaunches.set(normalized, {
+      teamName: normalized,
+      source,
+      startedAt: now,
+      updatedAt: now,
+    });
+    this.markDirty('teams:list');
+    this.scheduleDirtyRefreshes(false);
+  }
+
+  noteProvisioningProgress(progress: TeamProvisioningProgress): void {
+    const teamName = this.normalizeTeamName(progress.teamName);
+    if (!teamName) {
+      return;
+    }
+    const now = this.now();
+    this.pruneStuckLaunches(now);
+    this.markDirty('teams:list');
+
+    if (TERMINAL_PROVISIONING_STATES.has(String(progress.state))) {
+      this.activeLaunches.delete(teamName);
+      this.quietUntil = Math.max(this.quietUntil, now + this.quietWindowMs);
+      this.scheduleDirtyRefreshes(true);
+      return;
+    }
+
+    const existing = this.activeLaunches.get(teamName);
+    this.activeLaunches.set(teamName, {
+      teamName,
+      source: existing?.source ?? 'progress',
+      startedAt: existing?.startedAt ?? now,
+      updatedAt: now,
+    });
+    this.scheduleDirtyRefreshes(false);
+  }
+
+  noteTeamChange(event: TeamChangeEvent): void {
+    if (event.type === 'config') {
+      this.markDirty('teams:list');
+      this.markDirty('teams:getAllTasks');
+    } else if (event.type === 'task') {
+      this.markDirty('teams:getAllTasks');
+    }
+    if (this.hasLaunchPressure(this.now())) {
+      this.scheduleDirtyRefreshes(false);
+    }
+  }
+
+  async runSummaryOperation<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey,
+    loadFresh: () => Promise<T>,
+    options: { clone: CloneFn<T> }
+  ): Promise<T> {
+    const state = this.getOperationState<T>(key);
+    state.loadFresh = loadFresh;
+    state.clone = options.clone;
+
+    if (this.canServeStale(state)) {
+      if (state.dirty) {
+        this.scheduleDeferredRefresh(key, state, false);
+      }
+      return options.clone(state.cache!.value);
+    }
+
+    return this.runFresh(key, state, false);
+  }
+
+  clearForTests(): void {
+    for (const state of this.operations.values()) {
+      if (state.scheduledRefresh) {
+        clearTimeout(state.scheduledRefresh);
+      }
+    }
+    this.activeLaunches.clear();
+    this.quietUntil = 0;
+    this.operations.clear();
+    this.operations.set('teams:list', this.createOperationState('teams:list'));
+    this.operations.set('teams:getAllTasks', this.createOperationState('teams:getAllTasks'));
+  }
+
+  hasLaunchPressureForTests(): boolean {
+    return this.hasLaunchPressure(this.now());
+  }
+
+  private createOperationState<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey
+  ): OperationState<T> {
+    return {
+      key,
+      cache: null,
+      dirty: false,
+      generation: 0,
+      inFlight: null,
+      loadFresh: null,
+      clone: null,
+      scheduledRefresh: null,
+      lastWarningAt: Number.NEGATIVE_INFINITY,
+    };
+  }
+
+  private getOperationState<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey
+  ): OperationState<T> {
+    const state = this.operations.get(key);
+    if (!state) {
+      throw new Error(`Unknown launch IO governor operation: ${key}`);
+    }
+    return state as unknown as OperationState<T>;
+  }
+
+  private canServeStale<T extends GovernedPayload>(state: OperationState<T>): boolean {
+    const now = this.now();
+    if (!this.hasLaunchPressure(now) || !state.cache) {
+      return false;
+    }
+    return now - state.cache.cachedAt <= this.maxStaleAgeMs;
+  }
+
+  private async runFresh<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey,
+    state: OperationState<T>,
+    background: boolean
+  ): Promise<T> {
+    if (!state.loadFresh || !state.clone) {
+      throw new Error(`Launch IO governor operation ${key} has no loader`);
+    }
+
+    if (state.inFlight) {
+      try {
+        const joined = await state.inFlight;
+        return state.clone(joined);
+      } catch (error) {
+        if (background) {
+          this.warnRefreshFailure(key, state, error);
+        }
+        throw error;
+      }
+    }
+
+    const generationAtStart = state.generation;
+    const loadFresh = state.loadFresh;
+    const clone = state.clone;
+    const promise = loadFresh();
+    state.inFlight = promise;
+
+    try {
+      const fresh = await promise;
+      if (state.generation === generationAtStart) {
+        state.cache = {
+          value: clone(fresh),
+          cachedAt: this.now(),
+        };
+        state.dirty = false;
+      }
+      return clone(fresh);
+    } catch (error) {
+      if (background) {
+        this.warnRefreshFailure(key, state, error);
+      }
+      throw error;
+    } finally {
+      if (state.inFlight === promise) {
+        state.inFlight = null;
+      }
+    }
+  }
+
+  private markDirty(key: LaunchIoGovernorOperationKey): void {
+    const state = this.getOperationState(key);
+    state.dirty = true;
+    state.generation += 1;
+  }
+
+  private scheduleDirtyRefreshes(force: boolean): void {
+    for (const [key, state] of this.operations) {
+      if (state.dirty) {
+        this.scheduleDeferredRefresh(key, state, force);
+      }
+    }
+  }
+
+  private scheduleDeferredRefresh<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey,
+    state: OperationState<T>,
+    force: boolean
+  ): void {
+    if (!state.loadFresh || !state.clone) {
+      return;
+    }
+    if (state.scheduledRefresh) {
+      if (!force) {
+        return;
+      }
+      clearTimeout(state.scheduledRefresh);
+      state.scheduledRefresh = null;
+    }
+
+    const delayMs = this.getDelayUntilFreshAllowed(this.now());
+    state.scheduledRefresh = setTimeout(() => {
+      state.scheduledRefresh = null;
+      void this.flushOperation(key);
+    }, delayMs);
+    state.scheduledRefresh.unref?.();
+  }
+
+  private async flushOperation(key: LaunchIoGovernorOperationKey): Promise<void> {
+    const state = this.getOperationState(key);
+    const now = this.now();
+    if (this.hasLaunchPressure(now)) {
+      this.scheduleDeferredRefresh(key, state, true);
+      return;
+    }
+    if (!state.dirty || !state.loadFresh || !state.clone) {
+      return;
+    }
+    try {
+      await this.runFresh(key, state, true);
+    } catch {
+      // runFresh already emitted a bounded warning. Keep dirty=true so the next
+      // request or quiet-window timer can retry without losing the last-good cache.
+    }
+  }
+
+  private getDelayUntilFreshAllowed(now: number): number {
+    this.pruneStuckLaunches(now);
+    if (this.activeLaunches.size > 0) {
+      return this.quietWindowMs;
+    }
+    return Math.max(0, this.quietUntil - now);
+  }
+
+  private hasLaunchPressure(now: number): boolean {
+    this.pruneStuckLaunches(now);
+    return this.activeLaunches.size > 0 || now < this.quietUntil;
+  }
+
+  private pruneStuckLaunches(now: number): void {
+    for (const [teamName, launch] of this.activeLaunches) {
+      if (now - launch.updatedAt > this.stuckLaunchPressureMs) {
+        this.activeLaunches.delete(teamName);
+        this.logger.warn?.(
+          `[LaunchIoGovernor] launch pressure expired team=${teamName} source=${launch.source} ageMs=${now - launch.startedAt}`
+        );
+      }
+    }
+  }
+
+  private warnRefreshFailure<T extends GovernedPayload>(
+    key: LaunchIoGovernorOperationKey,
+    state: OperationState<T>,
+    error: unknown
+  ): void {
+    const now = this.now();
+    if (now - state.lastWarningAt < this.warningCooldownMs) {
+      return;
+    }
+    state.lastWarningAt = now;
+    const ageMs = state.cache ? now - state.cache.cachedAt : null;
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    this.logger.warn?.(
+      `[LaunchIoGovernor] deferred refresh failed op=${key} ageMs=${ageMs ?? 'none'} dirty=${state.dirty} activeLaunchCount=${this.activeLaunches.size} error=${errorMessage}`
+    );
+  }
+
+  private normalizeTeamName(teamName: string | undefined | null): string | null {
+    const normalized = teamName?.trim();
+    return normalized && normalized.length > 0 ? normalized : null;
+  }
+}
diff --git a/src/main/services/team/TeamBackupService.ts b/src/main/services/team/TeamBackupService.ts
index 8035e045..8d57d674 100644
--- a/src/main/services/team/TeamBackupService.ts
+++ b/src/main/services/team/TeamBackupService.ts
@@ -11,6 +11,8 @@ import {
 } from '@main/utils/pathDecoder';
 import { createLogger } from '@shared/utils/logger';
 
+import { TeamConfigReader } from './TeamConfigReader';
+
 const logger = createLogger('TeamBackupService');
 
 // ---------------------------------------------------------------------------
@@ -602,6 +604,7 @@ export class TeamBackupService {
       if (config._backupIdentityId === identityId) return;
       config._backupIdentityId = identityId;
       await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+      TeamConfigReader.invalidateTeam(teamName);
     } catch {
       // best-effort — config may not exist yet
     }
@@ -661,6 +664,7 @@ export class TeamBackupService {
       await fs.promises.mkdir(path.dirname(configDest), { recursive: true });
       const content = await fs.promises.readFile(configBackup, 'utf8');
       await atomicWriteAsync(configDest, content);
+      TeamConfigReader.invalidateTeam(teamName);
       count++;
     } catch (err: unknown) {
       logger.warn(`[Backup] Failed to restore config.json for ${teamName}: ${String(err)}`);
diff --git a/src/main/services/team/TeamConfigReader.ts b/src/main/services/team/TeamConfigReader.ts
index 3b1fbc38..aaf73ca3 100644
--- a/src/main/services/team/TeamConfigReader.ts
+++ b/src/main/services/team/TeamConfigReader.ts
@@ -37,25 +37,67 @@ const LARGE_CONFIG_BYTES = 512 * 1024;
 const CONFIG_HEAD_BYTES = 64 * 1024;
 const MAX_CONFIG_READ_BYTES = 10 * 1024 * 1024; // 10MB hard limit for full config reads
 const PER_TEAM_READ_TIMEOUT_MS = 5_000;
-const GET_CONFIG_CACHE_TTL_MS = 750;
 const GET_CONFIG_SLOW_READ_WARN_MS = 500;
+const CONFIG_SNAPSHOT_RECENT_STAT_FAILURE_FALLBACK_MS = 5_000;
+const COARSE_FS_FULL_VERIFY_MS = 1_500;
+const LIST_TEAMS_CACHE_TTL_MS = 5_000;
 const MAX_SESSION_HISTORY_IN_SUMMARY = 2000;
 const MAX_PROJECT_PATH_HISTORY_IN_SUMMARY = 200;
 const MAX_LAUNCH_STATE_BYTES = 32 * 1024;
 const TEAM_LAUNCH_STATE_FILE = 'launch-state.json';
 
+export interface TeamConfigFingerprint {
+  size: string;
+  mode: string;
+  dev?: string;
+  ino?: string;
+  mtimeNs?: string;
+  ctimeNs?: string;
+  birthtimeNs?: string;
+  mtimeMs: number;
+  ctimeMs: number;
+  birthtimeMs: number;
+}
+
+interface InternalTeamConfigFingerprint extends TeamConfigFingerprint {
+  isFile: boolean;
+  highResolution: boolean;
+  numericSize: number;
+}
+
 interface CachedTeamConfig {
   value: TeamConfig;
-  expiresAt: number;
+  fingerprint: InternalTeamConfigFingerprint | null;
+  verifiedAt: number;
+  fullVerifiedAt: number;
 }
 
+type TeamConfigReadMode = 'verified' | 'snapshot';
+
 interface ConfigReadTiming {
   teamName: string;
+  mode: TeamConfigReadMode;
+  configPath: string;
   size: number | null;
   statMs: number | null;
   readMs: number | null;
   parseMs: number | null;
   totalMs: number;
+  likelyCause: string;
+  fingerprintHighResolution: boolean | null;
+  cacheGeneration: number | null;
+  currentGeneration: number;
+  caller: string | null;
+}
+
+interface CachedTeamList {
+  value: TeamSummary[];
+  expiresAt: number;
+}
+
+interface InFlightTeamList {
+  promise: Promise<TeamSummary[]>;
+  generationAtStart: number;
 }
 
 function normalizeProjectPathCandidate(value: unknown): string | undefined {
@@ -175,13 +217,130 @@ function cloneConfig(config: TeamConfig): TeamConfig {
   return structuredClone(config);
 }
 
+function cloneTeamSummaries(teams: readonly TeamSummary[]): TeamSummary[] {
+  return structuredClone([...teams]);
+}
+
+function classifyConfigReadTiming(timing: {
+  statMs: number | null;
+  readMs: number | null;
+  parseMs: number | null;
+}): string {
+  const statMs = timing.statMs ?? 0;
+  const readMs = timing.readMs ?? 0;
+  const parseMs = timing.parseMs ?? 0;
+  if (readMs >= 1_000 && readMs >= statMs * 2 && readMs >= parseMs * 2) {
+    return 'io_read_slow';
+  }
+  if (statMs >= 1_000 && statMs >= readMs * 2 && statMs >= parseMs * 2) {
+    return 'io_stat_slow';
+  }
+  if (parseMs >= 500 && parseMs >= readMs && parseMs >= statMs) {
+    return 'json_parse_slow';
+  }
+  if (statMs + readMs >= 1_000) {
+    return 'filesystem_pressure';
+  }
+  return 'mixed_or_unknown';
+}
+
+function captureConfigReadCaller(): string | null {
+  const stack = new Error().stack?.split('\n').slice(2) ?? [];
+  const frame = stack.find((line) => {
+    const normalized = line.trim();
+    return (
+      normalized.length > 0 &&
+      !normalized.includes('TeamConfigReader.') &&
+      !normalized.includes('TeamConfigReader.ts') &&
+      !normalized.includes('captureConfigReadCaller') &&
+      !normalized.includes('node:internal')
+    );
+  });
+  return frame?.trim().slice(0, 240) ?? null;
+}
+
 export class TeamConfigReader {
   private static readonly configCacheByPath = new Map<string, CachedTeamConfig>();
   private static readonly configReadInFlightByPath = new Map<string, Promise<TeamConfig | null>>();
+  private static readonly configStatInFlightByPath = new Map<
+    string,
+    Promise<InternalTeamConfigFingerprint | null>
+  >();
+  private static readonly configGenerationByPath = new Map<string, number>();
+  private static readonly listTeamsCacheByBasePath = new Map<string, CachedTeamList>();
+  private static readonly listTeamsInFlightByBasePath = new Map<string, InFlightTeamList>();
+  private static listTeamsGeneration = 0;
 
   static clearCacheForTests(): void {
     TeamConfigReader.configCacheByPath.clear();
     TeamConfigReader.configReadInFlightByPath.clear();
+    TeamConfigReader.configStatInFlightByPath.clear();
+    TeamConfigReader.configGenerationByPath.clear();
+    TeamConfigReader.listTeamsCacheByBasePath.clear();
+    TeamConfigReader.listTeamsInFlightByBasePath.clear();
+    TeamConfigReader.listTeamsGeneration = 0;
+  }
+
+  static invalidateTeam(teamName: string): void {
+    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
+    TeamConfigReader.invalidatePath(configPath);
+  }
+
+  static invalidatePath(configPath: string): void {
+    TeamConfigReader.configCacheByPath.delete(configPath);
+    TeamConfigReader.configReadInFlightByPath.delete(configPath);
+    TeamConfigReader.configStatInFlightByPath.delete(configPath);
+    TeamConfigReader.bumpConfigGeneration(configPath);
+    TeamConfigReader.invalidateListTeamsCache();
+  }
+
+  static invalidateListTeamsCache(): void {
+    TeamConfigReader.listTeamsCacheByBasePath.clear();
+    // Do not clear in-flight scans here. Config writes can arrive while a global
+    // team scan is already running; dropping the in-flight entry starts a second
+    // full scan over all teams and amplifies launch-time filesystem pressure.
+    // The generation check below prevents the stale in-flight result from being
+    // cached after invalidation.
+    TeamConfigReader.listTeamsGeneration += 1;
+  }
+
+  private static invalidatePathForGeneration(
+    configPath: string,
+    expectedGeneration?: number
+  ): void {
+    if (
+      typeof expectedGeneration === 'number' &&
+      TeamConfigReader.getConfigGeneration(configPath) !== expectedGeneration
+    ) {
+      return;
+    }
+    TeamConfigReader.invalidatePath(configPath);
+  }
+
+  static async primeConfig(
+    teamName: string,
+    config: TeamConfig,
+    fingerprint?: TeamConfigFingerprint | null
+  ): Promise<void> {
+    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
+    const generation = TeamConfigReader.bumpConfigGeneration(configPath);
+    TeamConfigReader.configReadInFlightByPath.delete(configPath);
+    TeamConfigReader.configStatInFlightByPath.delete(configPath);
+    let internalFingerprint: InternalTeamConfigFingerprint | null = null;
+    if (fingerprint) {
+      internalFingerprint = {
+        ...fingerprint,
+        isFile: true,
+        highResolution: Boolean(fingerprint.mtimeNs || fingerprint.ctimeNs),
+        numericSize: Number(fingerprint.size),
+      };
+    } else {
+      internalFingerprint = await TeamConfigReader.readConfigFingerprint(configPath).catch(
+        () => null
+      );
+    }
+    TeamConfigReader.storeConfigCache(configPath, config, internalFingerprint, true, generation);
+    TeamConfigReader.invalidateListTeamsCache();
   }
 
   constructor(
@@ -190,6 +349,44 @@ export class TeamConfigReader {
   ) {}
 
   async listTeams(): Promise<TeamSummary[]> {
+    const teamsBasePath = getTeamsBasePath();
+    const cached = TeamConfigReader.listTeamsCacheByBasePath.get(teamsBasePath);
+    if (cached && cached.expiresAt > Date.now()) {
+      return cloneTeamSummaries(cached.value);
+    }
+
+    const existingRequest = TeamConfigReader.listTeamsInFlightByBasePath.get(teamsBasePath);
+    if (
+      existingRequest &&
+      existingRequest.generationAtStart === TeamConfigReader.listTeamsGeneration
+    ) {
+      return cloneTeamSummaries(await existingRequest.promise);
+    }
+
+    const request = this.listTeamsUncached(teamsBasePath);
+    const generationAtStart = TeamConfigReader.listTeamsGeneration;
+    TeamConfigReader.listTeamsInFlightByBasePath.set(teamsBasePath, {
+      promise: request,
+      generationAtStart,
+    });
+
+    try {
+      const teams = await request;
+      if (TeamConfigReader.listTeamsGeneration === generationAtStart) {
+        TeamConfigReader.listTeamsCacheByBasePath.set(teamsBasePath, {
+          value: cloneTeamSummaries(teams),
+          expiresAt: Date.now() + LIST_TEAMS_CACHE_TTL_MS,
+        });
+      }
+      return cloneTeamSummaries(teams);
+    } finally {
+      if (TeamConfigReader.listTeamsInFlightByBasePath.get(teamsBasePath)?.promise === request) {
+        TeamConfigReader.listTeamsInFlightByBasePath.delete(teamsBasePath);
+      }
+    }
+  }
+
+  private async listTeamsUncached(teamsBasePath: string): Promise<TeamSummary[]> {
     const worker = getTeamFsWorkerClient();
     if (worker.isAvailable()) {
       const startedAt = Date.now();
@@ -227,7 +424,7 @@ export class TeamConfigReader {
       }
     }
 
-    const teamsDir = getTeamsBasePath();
+    const teamsDir = teamsBasePath;
 
     let entries: fs.Dirent[];
     try {
@@ -336,6 +533,21 @@ export class TeamConfigReader {
       const expectedTeammateNames = new Set<string>();
       const confirmedArtifactNames = new Set<string>();
       let metaMembers: TeamMember[] = [];
+      let leadName: string | undefined;
+      let leadColor: string | undefined;
+
+      const captureLeadMember = (m: TeamMember, overwrite = false): void => {
+        if (m.removedAt) return;
+        if (!isLeadMember(m)) return;
+        const name = m.name?.trim();
+        if (name && (overwrite || !leadName)) {
+          leadName = name;
+        }
+        const colorValue = m.color?.trim();
+        if (colorValue && (overwrite || !leadColor)) {
+          leadColor = colorValue;
+        }
+      };
 
       const mergeMember = (m: TeamMember): void => {
         const name = m.name?.trim();
@@ -360,6 +572,7 @@ export class TeamConfigReader {
         for (const member of metaMembers) {
           const name = member.name?.trim();
           if (!name) continue;
+          captureLeadMember(member);
           // Summary/memberCount should represent teammates (exclude the lead process).
           if (name === 'user' || isLeadMember(member)) continue;
           const key = name.toLowerCase();
@@ -385,6 +598,7 @@ export class TeamConfigReader {
         for (const member of config.members) {
           if (member && typeof member.name === 'string') {
             const name = member.name.trim();
+            captureLeadMember(member, true);
             if (name && name !== 'user' && !isLeadMember(member)) {
               confirmedArtifactNames.add(name);
             }
@@ -460,6 +674,8 @@ export class TeamConfigReader {
         taskCount: 0,
         lastActivity: null,
         ...(members.length > 0 ? { members } : {}),
+        ...(leadName ? { leadName } : {}),
+        ...(leadColor ? { leadColor } : {}),
         ...(color ? { color } : {}),
         ...(projectPath ? { projectPath } : {}),
         ...(leadSessionId ? { leadSessionId } : {}),
@@ -501,11 +717,21 @@ export class TeamConfigReader {
           : teamName;
 
       let memberCount = 0;
+      let leadName: string | undefined;
+      let leadColor: string | undefined;
       try {
-        const metaStore = new TeamMembersMetaStore();
-        const members = await metaStore.getMembers(teamName);
+        const members = await this.membersMetaStore.getMembers(teamName);
         memberCount = members.filter((member) => {
           const name = member.name?.trim() ?? '';
+          if (!member.removedAt && isLeadMember(member)) {
+            if (name) {
+              leadName = name;
+            }
+            const color = member.color?.trim();
+            if (color) {
+              leadColor = color;
+            }
+          }
           if (!name || name === 'user' || isLeadMember(member)) {
             return false;
           }
@@ -524,6 +750,8 @@ export class TeamConfigReader {
         lastActivity:
           typeof meta.createdAt === 'number' ? new Date(meta.createdAt).toISOString() : null,
         color: typeof meta.color === 'string' ? meta.color : undefined,
+        ...(leadName ? { leadName } : {}),
+        ...(leadColor ? { leadColor } : {}),
         projectPath: typeof meta.cwd === 'string' ? meta.cwd : undefined,
         pendingCreate: true,
       };
@@ -533,27 +761,25 @@ export class TeamConfigReader {
   }
 
   async getConfig(teamName: string): Promise<TeamConfig | null> {
-    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
-    const now = Date.now();
-    const cached = TeamConfigReader.configCacheByPath.get(configPath);
-    if (cached && cached.expiresAt > now) {
-      return cloneConfig(cached.value);
-    }
+    return this.getConfigVerified(teamName);
+  }
 
+  async getConfigVerified(teamName: string): Promise<TeamConfig | null> {
+    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
     const existingRead = TeamConfigReader.configReadInFlightByPath.get(configPath);
     if (existingRead) {
       return this.resolveConfigRead(teamName, configPath, existingRead);
     }
 
-    const readPromise = this.readConfigFromDisk(teamName, configPath).then((config) => {
-      if (config) {
-        TeamConfigReader.configCacheByPath.set(configPath, {
-          value: cloneConfig(config),
-          expiresAt: Date.now() + GET_CONFIG_CACHE_TTL_MS,
-        });
-      }
-      return config;
-    });
+    const generation = TeamConfigReader.getConfigGeneration(configPath);
+    const readPromise = this.readConfigFromDisk(
+      teamName,
+      configPath,
+      null,
+      true,
+      generation,
+      'verified'
+    );
     TeamConfigReader.configReadInFlightByPath.set(configPath, readPromise);
 
     try {
@@ -565,6 +791,89 @@ export class TeamConfigReader {
     }
   }
 
+  async getConfigSnapshot(teamName: string): Promise<TeamConfig | null> {
+    const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
+
+    for (let attempt = 0; attempt < 3; attempt++) {
+      const generationAtStart = TeamConfigReader.getConfigGeneration(configPath);
+      let fingerprint: InternalTeamConfigFingerprint | null;
+
+      try {
+        fingerprint = await TeamConfigReader.getConfigFingerprint(configPath);
+      } catch (error) {
+        if (TeamConfigReader.getConfigGeneration(configPath) !== generationAtStart) {
+          continue;
+        }
+        const cached = TeamConfigReader.configCacheByPath.get(configPath);
+        if (
+          cached &&
+          Date.now() - cached.verifiedAt <= CONFIG_SNAPSHOT_RECENT_STAT_FAILURE_FALLBACK_MS
+        ) {
+          logger.warn(
+            `[getConfigSnapshot] config_snapshot_stat_failed_using_recent_cache team=${teamName} error=${
+              error instanceof Error ? error.message : String(error)
+            }`
+          );
+          return cloneConfig(cached.value);
+        }
+        return null;
+      }
+
+      if (TeamConfigReader.getConfigGeneration(configPath) !== generationAtStart) {
+        continue;
+      }
+
+      if (!fingerprint?.isFile || fingerprint.numericSize > MAX_CONFIG_READ_BYTES) {
+        TeamConfigReader.invalidatePathForGeneration(configPath, generationAtStart);
+        if (fingerprint && fingerprint.numericSize > MAX_CONFIG_READ_BYTES) {
+          logger.warn(
+            `Refusing to load oversized config.json (${fingerprint.numericSize} bytes) for team: ${teamName}`
+          );
+        }
+        return null;
+      }
+
+      const cached = TeamConfigReader.configCacheByPath.get(configPath);
+      if (
+        cached?.fingerprint &&
+        TeamConfigReader.fingerprintsEqual(cached.fingerprint, fingerprint)
+      ) {
+        const now = Date.now();
+        const mustRevalidateCoarseFingerprint =
+          !fingerprint.highResolution && now - cached.fullVerifiedAt >= COARSE_FS_FULL_VERIFY_MS;
+        if (!mustRevalidateCoarseFingerprint) {
+          cached.verifiedAt = now;
+          return cloneConfig(cached.value);
+        }
+      }
+
+      const existingRead = TeamConfigReader.configReadInFlightByPath.get(configPath);
+      if (existingRead) {
+        return this.resolveConfigRead(teamName, configPath, existingRead);
+      }
+
+      const generation = TeamConfigReader.getConfigGeneration(configPath);
+      const readPromise = this.readConfigFromDisk(
+        teamName,
+        configPath,
+        fingerprint,
+        true,
+        generation,
+        'snapshot'
+      );
+      TeamConfigReader.configReadInFlightByPath.set(configPath, readPromise);
+      try {
+        return await this.resolveConfigRead(teamName, configPath, readPromise);
+      } finally {
+        if (TeamConfigReader.configReadInFlightByPath.get(configPath) === readPromise) {
+          TeamConfigReader.configReadInFlightByPath.delete(configPath);
+        }
+      }
+    }
+
+    return null;
+  }
+
   private async resolveConfigRead(
     teamName: string,
     configPath: string,
@@ -578,38 +887,164 @@ export class TeamConfigReader {
     }
   }
 
+  private static async getConfigFingerprint(
+    configPath: string
+  ): Promise<InternalTeamConfigFingerprint | null> {
+    const existing = TeamConfigReader.configStatInFlightByPath.get(configPath);
+    if (existing) return existing;
+
+    const statPromise = TeamConfigReader.readConfigFingerprint(configPath).finally(() => {
+      if (TeamConfigReader.configStatInFlightByPath.get(configPath) === statPromise) {
+        TeamConfigReader.configStatInFlightByPath.delete(configPath);
+      }
+    });
+    TeamConfigReader.configStatInFlightByPath.set(configPath, statPromise);
+    return statPromise;
+  }
+
+  private static async readConfigFingerprint(
+    configPath: string
+  ): Promise<InternalTeamConfigFingerprint | null> {
+    let stat: fs.BigIntStats;
+    try {
+      stat = await withReadTimeout(
+        fs.promises.stat(configPath, { bigint: true }),
+        PER_TEAM_READ_TIMEOUT_MS
+      );
+    } catch (error) {
+      const code = typeof error === 'object' && error ? (error as { code?: unknown }).code : null;
+      if (code === 'ENOENT') {
+        return null;
+      }
+      throw error;
+    }
+
+    const highResStat = stat as fs.BigIntStats & {
+      mtimeNs?: bigint;
+      ctimeNs?: bigint;
+      birthtimeNs?: bigint;
+    };
+    const mtimeNs = highResStat.mtimeNs;
+    const ctimeNs = highResStat.ctimeNs;
+    const birthtimeNs = highResStat.birthtimeNs;
+
+    return {
+      size: stat.size.toString(),
+      mode: stat.mode.toString(),
+      dev: stat.dev.toString(),
+      ino: stat.ino.toString(),
+      mtimeNs: typeof mtimeNs === 'bigint' ? mtimeNs.toString() : undefined,
+      ctimeNs: typeof ctimeNs === 'bigint' ? ctimeNs.toString() : undefined,
+      birthtimeNs: typeof birthtimeNs === 'bigint' ? birthtimeNs.toString() : undefined,
+      mtimeMs: Number(stat.mtimeMs),
+      ctimeMs: Number(stat.ctimeMs),
+      birthtimeMs: Number(stat.birthtimeMs),
+      isFile: stat.isFile(),
+      highResolution: typeof mtimeNs === 'bigint' || typeof ctimeNs === 'bigint',
+      numericSize: Number(stat.size),
+    };
+  }
+
+  private static fingerprintsEqual(
+    a: InternalTeamConfigFingerprint,
+    b: InternalTeamConfigFingerprint
+  ): boolean {
+    return (
+      a.size === b.size &&
+      a.mode === b.mode &&
+      a.dev === b.dev &&
+      a.ino === b.ino &&
+      a.mtimeNs === b.mtimeNs &&
+      a.ctimeNs === b.ctimeNs &&
+      a.birthtimeNs === b.birthtimeNs &&
+      a.mtimeMs === b.mtimeMs &&
+      a.ctimeMs === b.ctimeMs &&
+      a.birthtimeMs === b.birthtimeMs
+    );
+  }
+
+  private static storeConfigCache(
+    configPath: string,
+    config: TeamConfig,
+    fingerprint: InternalTeamConfigFingerprint | null,
+    fullVerified: boolean,
+    expectedGeneration?: number
+  ): void {
+    if (
+      typeof expectedGeneration === 'number' &&
+      TeamConfigReader.getConfigGeneration(configPath) !== expectedGeneration
+    ) {
+      return;
+    }
+    const now = Date.now();
+    const previous = TeamConfigReader.configCacheByPath.get(configPath);
+    TeamConfigReader.configCacheByPath.set(configPath, {
+      value: cloneConfig(config),
+      fingerprint,
+      verifiedAt: now,
+      fullVerifiedAt: fullVerified ? now : (previous?.fullVerifiedAt ?? now),
+    });
+  }
+
+  private static getConfigGeneration(configPath: string): number {
+    return TeamConfigReader.configGenerationByPath.get(configPath) ?? 0;
+  }
+
+  private static bumpConfigGeneration(configPath: string): number {
+    const next = TeamConfigReader.getConfigGeneration(configPath) + 1;
+    TeamConfigReader.configGenerationByPath.set(configPath, next);
+    return next;
+  }
+
   private async readConfigFromDisk(
     teamName: string,
-    configPath: string
+    configPath: string,
+    knownFingerprint: InternalTeamConfigFingerprint | null = null,
+    updateCache = false,
+    cacheGeneration?: number,
+    mode: TeamConfigReadMode = 'verified'
   ): Promise<TeamConfig | null> {
     const startedAt = performance.now();
+    const caller = captureConfigReadCaller();
     let size: number | null = null;
     let statMs: number | null = null;
     let readMs: number | null = null;
     let parseMs: number | null = null;
+    let fingerprintHighResolution: boolean | null = knownFingerprint?.highResolution ?? null;
 
     const buildTiming = (): ConfigReadTiming => ({
       teamName,
+      mode,
+      configPath,
       size,
       statMs,
       readMs,
       parseMs,
       totalMs: Math.round(performance.now() - startedAt),
+      likelyCause: classifyConfigReadTiming({ statMs, readMs, parseMs }),
+      fingerprintHighResolution,
+      cacheGeneration: cacheGeneration ?? null,
+      currentGeneration: TeamConfigReader.getConfigGeneration(configPath),
+      caller,
     });
 
     try {
       const statStartedAt = performance.now();
-      const stat = await fs.promises.stat(configPath);
+      const fingerprint =
+        knownFingerprint ?? (await TeamConfigReader.getConfigFingerprint(configPath));
       statMs = Math.round(performance.now() - statStartedAt);
-      size = stat.size;
+      size = fingerprint?.numericSize ?? null;
+      fingerprintHighResolution = fingerprint?.highResolution ?? null;
 
       // Safety: refuse special files and huge/binary configs
-      if (!stat.isFile()) {
+      if (!fingerprint?.isFile) {
+        TeamConfigReader.invalidatePathForGeneration(configPath, cacheGeneration);
         return null;
       }
-      if (stat.size > MAX_CONFIG_READ_BYTES) {
+      if (fingerprint.numericSize > MAX_CONFIG_READ_BYTES) {
+        TeamConfigReader.invalidatePathForGeneration(configPath, cacheGeneration);
         logger.warn(
-          `Refusing to load oversized config.json (${stat.size} bytes) for team: ${teamName}`
+          `Refusing to load oversized config.json (${fingerprint.numericSize} bytes) for team: ${teamName}`
         );
         return null;
       }
@@ -622,6 +1057,7 @@ export class TeamConfigReader {
       const config = JSON.parse(raw) as TeamConfig;
       parseMs = Math.round(performance.now() - parseStartedAt);
       if (typeof config.name !== 'string' || config.name.trim() === '') {
+        TeamConfigReader.invalidatePathForGeneration(configPath, cacheGeneration);
         return null;
       }
       const resolvedProjectPath = resolveProjectPathFromConfig(config);
@@ -633,10 +1069,24 @@ export class TeamConfigReader {
       if (totalMs >= GET_CONFIG_SLOW_READ_WARN_MS) {
         logger.warn(`[getConfig] slow read diag=${JSON.stringify(buildTiming())}`);
       }
+      if (updateCache) {
+        TeamConfigReader.storeConfigCache(
+          configPath,
+          resolvedConfig,
+          fingerprint,
+          true,
+          cacheGeneration
+        );
+      }
       return resolvedConfig;
     } catch (error) {
+      TeamConfigReader.invalidatePathForGeneration(configPath, cacheGeneration);
       if (error instanceof FileReadTimeoutError) {
         logger.warn(`[getConfig] ${error.message} diag=${JSON.stringify(buildTiming())}`);
+      } else if (error instanceof Error && error.message === 'Team config read timeout') {
+        logger.warn(
+          `[getConfig] Timed out after ${PER_TEAM_READ_TIMEOUT_MS}ms reading ${configPath} diag=${JSON.stringify(buildTiming())}`
+        );
       }
       throw error;
     }
@@ -664,10 +1114,7 @@ export class TeamConfigReader {
     }
     const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
     await fs.promises.writeFile(configPath, JSON.stringify(config, null, 2), 'utf8');
-    TeamConfigReader.configCacheByPath.set(configPath, {
-      value: cloneConfig(config),
-      expiresAt: Date.now() + GET_CONFIG_CACHE_TTL_MS,
-    });
+    await TeamConfigReader.primeConfig(teamName, config);
     return config;
   }
 }
diff --git a/src/main/services/team/TeamDataService.ts b/src/main/services/team/TeamDataService.ts
index 054550df..a4add099 100644
--- a/src/main/services/team/TeamDataService.ts
+++ b/src/main/services/team/TeamDataService.ts
@@ -86,6 +86,7 @@ import type {
   TeamConfig,
   TeamCreateConfigRequest,
   TeamCreateRequest,
+  TeamGetDataOptions,
   TeamMember,
   TeamMemberActivityMeta,
   TeamMemberSnapshot,
@@ -112,7 +113,7 @@ const PROCESS_HEALTH_INTERVAL_MS = 2_000;
 const TASK_MAP_YIELD_EVERY = 250;
 const TASK_COMMENT_NOTIFICATION_SOURCE = 'system_notification';
 const PASSIVE_USER_REPLY_LINK_WINDOW_MS = 15_000;
-const MEMBER_RUNTIME_ADVISORY_SNAPSHOT_BUDGET_MS = 750;
+const MEMBER_RUNTIME_ADVISORY_SNAPSHOT_BUDGET_MS = 250;
 const MIXED_TEAM_LIVE_MUTATION_BLOCK_MESSAGE =
   'Live roster mutation on a running mixed team is not supported in V1. Stop the team, edit the roster, then relaunch.';
 
@@ -267,6 +268,25 @@ function extractPassiveUserPeerSummaryBody(text: string): string | null {
   return body.length > 0 ? body : null;
 }
 
+function readConfigForUiSnapshot(
+  configReader: TeamConfigReader & {
+    getConfigSnapshot?: (teamName: string) => Promise<TeamConfig | null>;
+  },
+  teamName: string
+): Promise<TeamConfig | null> {
+  return typeof configReader.getConfigSnapshot === 'function'
+    ? configReader.getConfigSnapshot(teamName)
+    : configReader.getConfig(teamName);
+}
+
+function createUiSnapshotProjectResolver(
+  configReader: TeamConfigReader
+): TeamTranscriptProjectResolver {
+  return new TeamTranscriptProjectResolver({
+    getConfig: (teamName) => readConfigForUiSnapshot(configReader, teamName),
+  });
+}
+
 function isExplicitLeadRole(role: string | undefined): boolean {
   const normalized = role?.trim().toLowerCase();
   return normalized === 'lead' || normalized === 'team lead' || normalized === 'team-lead';
@@ -385,13 +405,13 @@ export class TeamDataService {
     private readonly teamMetaStore: TeamMetaStore = new TeamMetaStore(),
     private memberRuntimeAdvisoryService: TeamMemberRuntimeAdvisoryService = new TeamMemberRuntimeAdvisoryService(),
     private readonly leadSessionParseCache: LeadSessionParseCache = new LeadSessionParseCache(),
-    private readonly projectResolver: TeamTranscriptProjectResolver = new TeamTranscriptProjectResolver(
+    private readonly projectResolver: TeamTranscriptProjectResolver = createUiSnapshotProjectResolver(
       configReader
     ),
     private readonly launchStateStore: TeamLaunchStateStore = new TeamLaunchStateStore()
   ) {
     this.messageFeedService = new TeamMessageFeedService({
-      getConfig: (teamName) => this.configReader.getConfig(teamName),
+      getConfig: (teamName) => this.readSnapshotConfig(teamName),
       getInboxMessages: (teamName) => this.inboxReader.getMessages(teamName),
       getLeadSessionMessages: (teamName, config) => this.extractLeadSessionTexts(teamName, config),
       getSentMessages: (teamName) => this.sentMessagesStore.readMessages(teamName),
@@ -399,6 +419,14 @@ export class TeamDataService {
     this.memberActivityMetaService = new MemberActivityMetaService(this.messageFeedService);
   }
 
+  private readSnapshotConfig(teamName: string): Promise<TeamConfig | null> {
+    return readConfigForUiSnapshot(this.configReader, teamName);
+  }
+
+  private invalidateGlobalTaskProjectionCache(): void {
+    TeamTaskReader.invalidateAllTasksCache();
+  }
+
   private getController(teamName: string): AgentTeamsController {
     return this.controllerFactory(teamName);
   }
@@ -491,7 +519,7 @@ export class TeamDataService {
       request.catch(() => {
         /* background advisory refresh is best-effort */
       });
-      logger.warn(
+      logger.debug(
         `getTeamData team=${teamName} member runtime advisories exceeded ${MEMBER_RUNTIME_ADVISORY_SNAPSHOT_BUDGET_MS}ms budget; continuing without advisories for this snapshot`
       );
       return new Map();
@@ -842,7 +870,7 @@ export class TeamDataService {
   }
 
   async getTaskChangePresence(teamName: string): Promise<Record<string, TaskChangePresenceState>> {
-    const config = await this.configReader.getConfig(teamName);
+    const config = await this.readSnapshotConfig(teamName);
     if (!config) {
       throw new Error(`Team not found: ${teamName}`);
     }
@@ -1077,6 +1105,7 @@ export class TeamDataService {
     config.deletedAt = new Date().toISOString();
     const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
     await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+    await TeamConfigReader.primeConfig(teamName, config);
   }
 
   async restoreTeam(teamName: string): Promise<void> {
@@ -1087,17 +1116,21 @@ export class TeamDataService {
     delete config.deletedAt;
     const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
     await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+    await TeamConfigReader.primeConfig(teamName, config);
   }
 
   async permanentlyDeleteTeam(teamName: string): Promise<void> {
     const teamsDir = path.join(getTeamsBasePath(), teamName);
     await fs.promises.rm(teamsDir, { recursive: true, force: true });
+    TeamConfigReader.invalidateTeam(teamName);
 
     const tasksDir = path.join(getTasksBasePath(), teamName);
     await fs.promises.rm(tasksDir, { recursive: true, force: true });
+    TeamTaskReader.invalidateAllTasksCache();
   }
 
-  async getTeamData(teamName: string): Promise<TeamViewSnapshot> {
+  async getTeamData(teamName: string, options?: TeamGetDataOptions): Promise<TeamViewSnapshot> {
+    const includeMemberBranches = options?.includeMemberBranches !== false;
     const startedAt = Date.now();
     const marks: Record<string, number> = {};
     const mark = (label: string): void => {
@@ -1113,7 +1146,7 @@ export class TeamDataService {
       return typeof fromTs === 'number' && typeof toTs === 'number' ? toTs - fromTs : -1;
     };
 
-    const config = await this.configReader.getConfig(teamName);
+    const config = await this.readSnapshotConfig(teamName);
     if (!config) {
       throw new Error(`Team not found: ${teamName}`);
     }
@@ -1345,8 +1378,11 @@ export class TeamDataService {
     }
     mark('runtimeAdvisories');
 
-    // Enrich members with git branch when it differs from lead's branch
-    await this.enrichMemberBranches(members, config);
+    // Enrich members with git branch when it differs from lead's branch.
+    // UI-first reads can skip this because the renderer hydrates branches through branch sync.
+    if (includeMemberBranches) {
+      await this.enrichMemberBranches(members, config);
+    }
     mark('enrichBranches');
     mark('syncComments');
 
@@ -1361,6 +1397,7 @@ export class TeamDataService {
     const totalMs = Date.now() - startedAt;
     if (totalMs >= 1500) {
       const counts = `counts=tasks:${tasks.length},inboxNames:${inboxNames.length},members:${members.length},processes:${processes.length}`;
+      const branchMode = includeMemberBranches ? 'full' : 'skipped';
       logger.warn(
         `getTeamData team=${teamName} slow total=${totalMs}ms config=${msSince('config')} tasks=${msSince('tasks')} inboxNames=${msSince(
           'inboxNames'
@@ -1381,7 +1418,7 @@ export class TeamDataService {
         )}/enrichBranches=${msBetween(
           'runtimeAdvisories',
           'enrichBranches'
-        )}/processes=${msBetween('syncComments', 'processes')} ${counts}${
+        )}/processes=${msBetween('syncComments', 'processes')} branchMode=${branchMode} ${counts}${
           warnings.length > 0 ? ` warnings=${warnings.join('|')}` : ''
         }`
       );
@@ -1867,7 +1904,7 @@ export class TeamDataService {
 
     let projectPath: string | undefined;
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await readConfigForUiSnapshot(this.configReader, teamName);
       projectPath = config?.projectPath;
     } catch {
       /* best-effort */
@@ -1889,6 +1926,7 @@ export class TeamDataService {
       ...(request.promptTaskRefs?.length ? { promptTaskRefs: request.promptTaskRefs } : {}),
       ...(shouldStart ? { startImmediately: true } : {}),
     }) as TeamTask;
+    this.invalidateGlobalTaskProjectionCache();
 
     // Controller's maybeNotifyAssignedOwner skips the lead (owner === lead).
     // For user-created tasks with startImmediately, ensure the lead also gets notified.
@@ -1917,6 +1955,7 @@ export class TeamDataService {
     }
 
     this.getController(teamName).tasks.startTask(taskId, 'user');
+    this.invalidateGlobalTaskProjectionCache();
 
     if (task.owner) {
       try {
@@ -1969,6 +2008,7 @@ export class TeamDataService {
     }
 
     this.getController(teamName).tasks.startTask(taskId, 'user');
+    this.invalidateGlobalTaskProjectionCache();
 
     if (task.owner) {
       await this.sendUserTaskStartNotification(teamName, task);
@@ -2024,6 +2064,7 @@ export class TeamDataService {
     actor?: string
   ): Promise<void> {
     this.getController(teamName).tasks.setTaskStatus(taskId, status, actor);
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   /**
@@ -2083,10 +2124,12 @@ export class TeamDataService {
 
   async softDeleteTask(teamName: string, taskId: string): Promise<void> {
     this.getController(teamName).tasks.softDeleteTask(taskId, 'user');
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async restoreTask(teamName: string, taskId: string): Promise<void> {
     this.getController(teamName).tasks.restoreTask(taskId, 'user');
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async getDeletedTasks(teamName: string): Promise<TeamTask[]> {
@@ -2095,6 +2138,7 @@ export class TeamDataService {
 
   async updateTaskOwner(teamName: string, taskId: string, owner: string | null): Promise<void> {
     this.getController(teamName).tasks.setTaskOwner(taskId, owner);
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async updateTaskFields(
@@ -2103,6 +2147,7 @@ export class TeamDataService {
     fields: { subject?: string; description?: string }
   ): Promise<void> {
     this.getController(teamName).tasks.updateTaskFields(taskId, fields);
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async addTaskAttachment(
@@ -2114,6 +2159,7 @@ export class TeamDataService {
       taskId,
       meta as unknown as Record<string, unknown>
     );
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async removeTaskAttachment(
@@ -2122,6 +2168,7 @@ export class TeamDataService {
     attachmentId: string
   ): Promise<void> {
     this.getController(teamName).tasks.removeTaskAttachment(taskId, attachmentId);
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async setTaskNeedsClarification(
@@ -2130,6 +2177,7 @@ export class TeamDataService {
     value: 'lead' | 'user' | null
   ): Promise<void> {
     this.getController(teamName).tasks.setNeedsClarification(taskId, value);
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async addTaskRelationship(
@@ -2143,6 +2191,7 @@ export class TeamDataService {
       targetId,
       type === 'blockedBy' ? 'blocked-by' : type
     );
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async removeTaskRelationship(
@@ -2156,6 +2205,7 @@ export class TeamDataService {
       targetId,
       type === 'blockedBy' ? 'blocked-by' : type
     );
+    this.invalidateGlobalTaskProjectionCache();
   }
 
   async addTaskComment(
@@ -2172,6 +2222,7 @@ export class TeamDataService {
       attachments,
       taskRefs,
     }) as { task?: TeamTask; comment?: TaskComment };
+    this.invalidateGlobalTaskProjectionCache();
     const comment =
       addResult.comment ??
       ({
@@ -2192,7 +2243,7 @@ export class TeamDataService {
     let enrichedRequest = request;
     if (!enrichedRequest.leadSessionId) {
       try {
-        const config = await this.configReader.getConfig(teamName);
+        const config = await readConfigForUiSnapshot(this.configReader, teamName);
         if (config?.leadSessionId) {
           enrichedRequest = { ...enrichedRequest, leadSessionId: config.leadSessionId };
         }
@@ -2265,7 +2316,7 @@ export class TeamDataService {
 
   private async resolveLeadName(teamName: string): Promise<string> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await readConfigForUiSnapshot(this.configReader, teamName);
       return this.resolveLeadNameFromConfig(config);
     } catch {
       return 'team-lead';
@@ -2276,7 +2327,7 @@ export class TeamDataService {
     teamName: string
   ): Promise<{ leadName: string; leadSessionId?: string }> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await readConfigForUiSnapshot(this.configReader, teamName);
       return {
         leadName: this.resolveLeadNameFromConfig(config),
         leadSessionId: config?.leadSessionId,
@@ -2593,7 +2644,7 @@ export class TeamDataService {
     const recoverPending = options?.recoverPending === true;
     let config: TeamConfig | null = null;
     try {
-      config = await this.configReader.getConfig(teamName);
+      config = await readConfigForUiSnapshot(this.configReader, teamName);
     } catch {
       return;
     }
@@ -2748,7 +2799,7 @@ export class TeamDataService {
   ): Promise<SendMessageResult> {
     let leadSessionId: string | undefined;
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await readConfigForUiSnapshot(this.configReader, teamName);
       leadSessionId = config?.leadSessionId;
     } catch {
       // non-critical — proceed without sessionId
@@ -2781,7 +2832,7 @@ export class TeamDataService {
 
   async getLeadMemberName(teamName: string): Promise<string | null> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await readConfigForUiSnapshot(this.configReader, teamName);
 
       // Check config.json members first (Claude Code-created teams)
       if (config?.members?.length) {
@@ -2806,7 +2857,7 @@ export class TeamDataService {
 
   async getTeamDisplayName(teamName: string): Promise<string> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await this.readSnapshotConfig(teamName);
       const displayName = config?.name?.trim();
       return displayName || teamName;
     } catch {
@@ -2819,7 +2870,7 @@ export class TeamDataService {
     projectPath?: string;
   }> {
     try {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await this.readSnapshotConfig(teamName);
       const displayName = config?.name?.trim() || teamName;
       const projectPath =
         typeof config?.projectPath === 'string' && config.projectPath.trim().length > 0
@@ -2917,6 +2968,7 @@ export class TeamDataService {
     await this.membersMetaStore.writeMembers(request.teamName, membersToWrite, {
       providerBackendId: request.providerBackendId,
     });
+    TeamConfigReader.invalidateListTeamsCache();
   }
 
   async reconcileTeamArtifacts(
diff --git a/src/main/services/team/TeamDataWorkerClient.ts b/src/main/services/team/TeamDataWorkerClient.ts
index 9b69cc90..c0a09973 100644
--- a/src/main/services/team/TeamDataWorkerClient.ts
+++ b/src/main/services/team/TeamDataWorkerClient.ts
@@ -17,6 +17,7 @@ import type { TeamDataWorkerRequest, TeamDataWorkerResponse } from './teamDataWo
 import type {
   MemberLogSummary,
   MessagesPage,
+  TeamGetDataOptions,
   TeamMemberActivityMeta,
   TeamViewSnapshot,
 } from '@shared/types';
@@ -59,15 +60,74 @@ function resolveWorkerPath(): string | null {
 }
 
 interface PendingEntry {
-  resolve: (v: unknown) => void;
+  resolve: (v: unknown, diag?: Extract<TeamDataWorkerResponse, { ok: true }>['diag']) => void;
   reject: (e: Error) => void;
 }
 
+function normalizeTeamGetDataOptions(options?: TeamGetDataOptions): TeamGetDataOptions | undefined {
+  return options?.includeMemberBranches === false ? { includeMemberBranches: false } : undefined;
+}
+
+function getTeamDataRequestKey(teamName: string, options?: TeamGetDataOptions): string {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
+  return `${teamName}\u0000branches:${normalizedOptions ? '0' : '1'}`;
+}
+
+function getTeamDataRequestPayload(
+  teamName: string,
+  options?: TeamGetDataOptions
+): Extract<TeamDataWorkerRequest, { op: 'getTeamData' }>['payload'] {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
+  return normalizedOptions ? { teamName, options: normalizedOptions } : { teamName };
+}
+
+function summarizeWorkerRequest(request: TeamDataWorkerRequest): Record<string, unknown> {
+  switch (request.op) {
+    case 'warmup':
+      return {};
+    case 'getTeamData': {
+      const { teamName, options } = request.payload;
+      return {
+        teamName,
+        includeMemberBranches: options?.includeMemberBranches !== false,
+      };
+    }
+    case 'getMessagesPage': {
+      const { teamName, options } = request.payload;
+      return {
+        teamName,
+        cursor: typeof options.cursor === 'string' ? options.cursor.slice(0, 24) : options.cursor,
+        limit: options.limit,
+      };
+    }
+    case 'getMemberActivityMeta':
+    case 'invalidateTeamConfig':
+    case 'invalidateTeamMessageFeed':
+      return {
+        teamName: request.payload.teamName,
+      };
+    case 'findLogsForTask':
+      return {
+        teamName: request.payload.teamName,
+        taskId: request.payload.taskId,
+        owner: request.payload.options?.owner,
+        status: request.payload.options?.status,
+        intervals: Array.isArray(request.payload.options?.intervals)
+          ? request.payload.options.intervals.length
+          : undefined,
+        since: request.payload.options?.since,
+      };
+  }
+  return {};
+}
+
 export class TeamDataWorkerClient {
   private worker: Worker | null = null;
   private readonly workerPath: string | null = resolveWorkerPath();
   private warnedUnavailable = false;
   private pending = new Map<string, PendingEntry>();
+  private getTeamDataInFlight = new Map<string, Promise<TeamViewSnapshot>>();
+  private getMessagesPageInFlight = new Map<string, Promise<MessagesPage>>();
 
   private failWorker(worker: Worker, error: Error): void {
     if (this.worker !== worker) return;
@@ -103,7 +163,7 @@ export class TeamDataWorkerClient {
       if (!entry) return;
       this.pending.delete(msg.id);
       if (msg.ok) {
-        entry.resolve(msg.result);
+        entry.resolve(msg.result, msg.diag);
       } else {
         entry.reject(new Error(msg.error));
       }
@@ -131,33 +191,132 @@ export class TeamDataWorkerClient {
   ): Promise<unknown> {
     const worker = this.ensureWorker();
     const id = makeId();
+    const request = { id, op, payload } as TeamDataWorkerRequest;
+    const startedAt = Date.now();
+    const pendingAtStart = this.pending.size;
 
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
         const timeoutError = new Error(`Worker call timeout after ${WORKER_CALL_TIMEOUT_MS}ms`);
+        logger.warn(
+          `worker call timeout op=${op} ms=${Date.now() - startedAt} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+            summarizeWorkerRequest(request)
+          )}`
+        );
         this.failWorker(worker, timeoutError);
         worker.terminate().catch(() => undefined);
         reject(timeoutError);
       }, WORKER_CALL_TIMEOUT_MS);
 
       this.pending.set(id, {
-        resolve: (value) => {
+        resolve: (value, diag) => {
           clearTimeout(timeout);
+          const ms = Date.now() - startedAt;
+          if (ms >= 1500) {
+            logger.warn(
+              `worker call slow op=${op} ms=${ms} workerTotalMs=${String(diag?.totalMs ?? 'unknown')} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+                summarizeWorkerRequest(request)
+              )}`
+            );
+          }
           resolve(value);
         },
         reject: (error) => {
           clearTimeout(timeout);
+          const ms = Date.now() - startedAt;
+          if (ms >= 1500) {
+            logger.warn(
+              `worker call failed slow op=${op} ms=${ms} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+                summarizeWorkerRequest(request)
+              )} error=${error.message}`
+            );
+          }
           reject(error);
         },
       });
 
-      worker.postMessage({ id, op, payload } as TeamDataWorkerRequest);
+      worker.postMessage(request);
     });
   }
 
-  async getTeamData(teamName: string): Promise<TeamViewSnapshot> {
+  async prewarm(): Promise<void> {
+    if (this.worker) {
+      return;
+    }
+    if (!this.isAvailable()) {
+      return;
+    }
+    const startedAt = Date.now();
+    await this.call('warmup', {});
+    const ms = Date.now() - startedAt;
+    if (ms >= 1500) {
+      logger.warn(`worker prewarm slow ms=${ms}`);
+    }
+  }
+
+  private postBestEffort(
+    op: TeamDataWorkerRequest['op'],
+    payload: TeamDataWorkerRequest['payload']
+  ): void {
+    const worker = this.worker;
+    if (!worker) return;
+    const request = { id: makeId(), op, payload } as TeamDataWorkerRequest;
+    try {
+      worker.postMessage(request);
+    } catch (error) {
+      logger.debug(
+        `worker best-effort post failed op=${op} payload=${JSON.stringify(
+          summarizeWorkerRequest(request)
+        )} error=${error instanceof Error ? error.message : String(error)}`
+      );
+    }
+  }
+
+  async getTeamData(teamName: string, options?: TeamGetDataOptions): Promise<TeamViewSnapshot> {
     if (!SAFE_NAME_RE.test(teamName)) throw new Error('Invalid teamName');
-    return this.call('getTeamData', { teamName }) as Promise<TeamViewSnapshot>;
+    const key = getTeamDataRequestKey(teamName, options);
+    const existing = this.getTeamDataInFlight.get(key);
+    if (existing) return existing;
+
+    const payload = getTeamDataRequestPayload(teamName, options);
+    const promise = (this.call('getTeamData', payload) as Promise<TeamViewSnapshot>).finally(() => {
+      if (this.getTeamDataInFlight.get(key) === promise) {
+        this.getTeamDataInFlight.delete(key);
+      }
+    });
+    this.getTeamDataInFlight.set(key, promise);
+    return promise;
+  }
+
+  invalidateTeamConfig(teamName: string): void {
+    if (!SAFE_NAME_RE.test(teamName)) return;
+    this.clearTeamDataInFlightForTeam(teamName);
+    this.clearMessagesPageInFlightForTeam(teamName);
+    this.postBestEffort('invalidateTeamConfig', { teamName });
+  }
+
+  invalidateTeamMessageFeed(teamName: string): void {
+    if (!SAFE_NAME_RE.test(teamName)) return;
+    this.clearMessagesPageInFlightForTeam(teamName);
+    this.postBestEffort('invalidateTeamMessageFeed', { teamName });
+  }
+
+  private clearMessagesPageInFlightForTeam(teamName: string): void {
+    const prefix = `{"teamName":"${teamName}",`;
+    for (const key of this.getMessagesPageInFlight.keys()) {
+      if (key.startsWith(prefix)) {
+        this.getMessagesPageInFlight.delete(key);
+      }
+    }
+  }
+
+  private clearTeamDataInFlightForTeam(teamName: string): void {
+    const prefix = `${teamName}\u0000`;
+    for (const key of this.getTeamDataInFlight.keys()) {
+      if (key.startsWith(prefix)) {
+        this.getTeamDataInFlight.delete(key);
+      }
+    }
   }
 
   async getMessagesPage(
@@ -165,7 +324,26 @@ export class TeamDataWorkerClient {
     options: { cursor?: string | null; limit: number }
   ): Promise<MessagesPage> {
     if (!SAFE_NAME_RE.test(teamName)) throw new Error('Invalid teamName');
-    return this.call('getMessagesPage', { teamName, options }) as Promise<MessagesPage>;
+    const key = JSON.stringify({
+      teamName,
+      cursor: options.cursor ?? null,
+      limit: options.limit,
+    });
+    const existing = this.getMessagesPageInFlight.get(key);
+    if (existing) return existing;
+
+    const promise = (
+      this.call('getMessagesPage', {
+        teamName,
+        options,
+      }) as Promise<MessagesPage>
+    ).finally(() => {
+      if (this.getMessagesPageInFlight.get(key) === promise) {
+        this.getMessagesPageInFlight.delete(key);
+      }
+    });
+    this.getMessagesPageInFlight.set(key, promise);
+    return promise;
   }
 
   async getMemberActivityMeta(teamName: string): Promise<TeamMemberActivityMeta> {
@@ -193,6 +371,8 @@ export class TeamDataWorkerClient {
   dispose(): void {
     this.worker?.terminate().catch(() => undefined);
     this.worker = null;
+    this.getTeamDataInFlight.clear();
+    this.getMessagesPageInFlight.clear();
     for (const [, entry] of this.pending) {
       entry.reject(new Error('Client disposed'));
     }
diff --git a/src/main/services/team/TeamFsWorkerClient.ts b/src/main/services/team/TeamFsWorkerClient.ts
index 4a2fa090..fd98fb89 100644
--- a/src/main/services/team/TeamFsWorkerClient.ts
+++ b/src/main/services/team/TeamFsWorkerClient.ts
@@ -36,6 +36,7 @@ interface GetAllTasksPayload {
 }
 
 type WorkerRequest =
+  | { id: string; op: 'warmup'; payload?: Record<string, never> }
   | { id: string; op: 'listTeams'; payload: ListTeamsPayload }
   | { id: string; op: 'getAllTasks'; payload: GetAllTasksPayload };
 
@@ -43,6 +44,33 @@ type WorkerResponse =
   | { id: string; ok: true; result: unknown; diag?: WorkerDiag }
   | { id: string; ok: false; error: string };
 
+function summarizeWorkerPayload(payload: WorkerRequest['payload']): Record<string, unknown> {
+  if (!payload) {
+    return {};
+  }
+  if ('teamsDir' in payload) {
+    return {
+      teamsDir: payload.teamsDir,
+      concurrency: payload.concurrency,
+      maxConfigReadMs: payload.maxConfigReadMs,
+      maxConfigBytes: payload.maxConfigBytes,
+    };
+  }
+  if (!('tasksBase' in payload)) {
+    return {};
+  }
+  return {
+    tasksBase: payload.tasksBase,
+    concurrency: payload.concurrency,
+    maxTaskReadMs: payload.maxTaskReadMs,
+    maxTaskBytes: payload.maxTaskBytes,
+  };
+}
+
+function getDiagTotalMs(diag: WorkerDiag | undefined): unknown {
+  return diag && typeof diag === 'object' ? diag.totalMs : undefined;
+}
+
 function makeId(): string {
   return `${Date.now()}-${crypto.randomUUID().slice(0, 12)}`;
 }
@@ -87,6 +115,18 @@ export class TeamFsWorkerClient {
     { resolve: (v: { result: unknown; diag?: WorkerDiag }) => void; reject: (e: Error) => void }
   >();
 
+  private failWorker(worker: Worker, error: Error): void {
+    if (this.worker !== worker) return;
+
+    this.worker = null;
+    const pendingEntries = Array.from(this.pending.values());
+    this.pending.clear();
+
+    for (const entry of pendingEntries) {
+      entry.reject(error);
+    }
+  }
+
   isAvailable(): boolean {
     if (!this.workerPath && !this.warnedUnavailable && shouldWarnUnavailableWorker()) {
       this.warnedUnavailable = true;
@@ -113,8 +153,9 @@ export class TeamFsWorkerClient {
       return this.worker;
     }
 
-    this.worker = new Worker(this.workerPath);
-    this.worker.on('message', (msg: WorkerResponse) => {
+    const worker = new Worker(this.workerPath);
+    this.worker = worker;
+    worker.on('message', (msg: WorkerResponse) => {
       const entry = this.pending.get(msg.id);
       if (!entry) return;
       this.pending.delete(msg.id);
@@ -124,26 +165,18 @@ export class TeamFsWorkerClient {
         entry.reject(new Error(msg.error));
       }
     });
-    this.worker.on('error', (err) => {
+    worker.on('error', (err) => {
       logger.error('Worker error', err);
-      for (const [, entry] of this.pending) {
-        entry.reject(err instanceof Error ? err : new Error(String(err)));
-      }
-      this.pending.clear();
-      this.worker = null;
+      this.failWorker(worker, err instanceof Error ? err : new Error(String(err)));
     });
-    this.worker.on('exit', (code) => {
+    worker.on('exit', (code) => {
       if (code !== 0) {
         logger.warn(`Worker exited with code ${code}`);
       }
-      for (const [, entry] of this.pending) {
-        entry.reject(new Error(`Worker exited with code ${code}`));
-      }
-      this.pending.clear();
-      this.worker = null;
+      this.failWorker(worker, new Error(`Worker exited with code ${code}`));
     });
 
-    return this.worker;
+    return worker;
   }
 
   private call(
@@ -152,27 +185,47 @@ export class TeamFsWorkerClient {
   ): Promise<{ result: unknown; diag?: WorkerDiag }> {
     const worker = this.ensureWorker();
     const id = makeId();
+    const startedAt = Date.now();
+    const pendingAtStart = this.pending.size;
     return new Promise((resolve, reject) => {
       const timeout = setTimeout(() => {
-        this.pending.delete(id);
-        try {
-          // Terminate and recreate on next call — worker may be stuck in native IO.
-          this.worker?.terminate().catch(() => undefined);
-        } catch {
-          // ignore
-        } finally {
-          this.worker = null;
-        }
-        reject(new Error(`Worker call timeout after ${WORKER_CALL_TIMEOUT_MS}ms (${op})`));
+        const timeoutError = new Error(
+          `Worker call timeout after ${WORKER_CALL_TIMEOUT_MS}ms (${op})`
+        );
+        logger.warn(
+          `worker call timeout op=${op} ms=${Date.now() - startedAt} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+            summarizeWorkerPayload(payload)
+          )}`
+        );
+        this.failWorker(worker, timeoutError);
+        // Terminate and recreate on next call - worker may be stuck in native IO.
+        void worker.terminate().catch(() => undefined);
+        reject(timeoutError);
       }, WORKER_CALL_TIMEOUT_MS);
 
       this.pending.set(id, {
         resolve: (value) => {
           clearTimeout(timeout);
+          const ms = Date.now() - startedAt;
+          if (ms >= 1500) {
+            logger.warn(
+              `worker call slow op=${op} ms=${ms} workerTotalMs=${String(getDiagTotalMs(value.diag))} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+                summarizeWorkerPayload(payload)
+              )}`
+            );
+          }
           resolve(value);
         },
         reject: (error) => {
           clearTimeout(timeout);
+          const ms = Date.now() - startedAt;
+          if (ms >= 1500) {
+            logger.warn(
+              `worker call failed slow op=${op} ms=${ms} pendingAtStart=${pendingAtStart} pendingNow=${this.pending.size} payload=${JSON.stringify(
+                summarizeWorkerPayload(payload)
+              )} error=${error.message}`
+            );
+          }
           reject(error);
         },
       });
@@ -180,6 +233,21 @@ export class TeamFsWorkerClient {
     });
   }
 
+  async prewarm(): Promise<void> {
+    if (this.worker) {
+      return;
+    }
+    if (!this.isAvailable()) {
+      return;
+    }
+    const startedAt = Date.now();
+    await this.call('warmup', {});
+    const ms = Date.now() - startedAt;
+    if (ms >= 1500) {
+      logger.warn(`worker prewarm slow ms=${ms}`);
+    }
+  }
+
   async listTeams(options: {
     largeConfigBytes: number;
     configHeadBytes: number;
diff --git a/src/main/services/team/TeamLaunchStateEvaluator.ts b/src/main/services/team/TeamLaunchStateEvaluator.ts
index 1dfc33ed..df74b5b8 100644
--- a/src/main/services/team/TeamLaunchStateEvaluator.ts
+++ b/src/main/services/team/TeamLaunchStateEvaluator.ts
@@ -46,6 +46,7 @@ type RuntimeMemberSpawnState = Pick<
   | 'livenessKind'
   | 'runtimeDiagnostic'
   | 'runtimeDiagnosticSeverity'
+  | 'bootstrapStalled'
   | 'livenessLastCheckedAt'
   | 'firstSpawnAcceptedAt'
   | 'lastHeartbeatAt'
@@ -100,6 +101,59 @@ function preservesStrongRuntimeAlive(
   );
 }
 
+function isOpenCodeSecondaryBootstrapPending(
+  member: Pick<
+    PersistedTeamLaunchMemberState,
+    | 'providerId'
+    | 'laneKind'
+    | 'laneOwnerProviderId'
+    | 'launchState'
+    | 'bootstrapConfirmed'
+    | 'hardFailure'
+  >
+): boolean {
+  return (
+    member.providerId === 'opencode' &&
+    member.laneKind === 'secondary' &&
+    member.laneOwnerProviderId === 'opencode' &&
+    member.launchState === 'runtime_pending_bootstrap' &&
+    member.bootstrapConfirmed !== true &&
+    member.hardFailure !== true
+  );
+}
+
+function isPersistedBootstrapStalled(
+  member: Pick<
+    PersistedTeamLaunchMemberState,
+    | 'providerId'
+    | 'laneKind'
+    | 'laneOwnerProviderId'
+    | 'launchState'
+    | 'runtimeAlive'
+    | 'bootstrapConfirmed'
+    | 'hardFailure'
+    | 'bootstrapStalled'
+    | 'runtimePid'
+    | 'runtimeSessionId'
+    | 'livenessKind'
+  >
+): boolean {
+  const hasMaterializedOpenCodeRuntimeMarker =
+    member.runtimeAlive === true ||
+    (typeof member.runtimePid === 'number' &&
+      Number.isFinite(member.runtimePid) &&
+      member.runtimePid > 0) ||
+    (typeof member.runtimeSessionId === 'string' && member.runtimeSessionId.trim().length > 0) ||
+    member.livenessKind === 'runtime_process' ||
+    member.livenessKind === 'runtime_process_candidate' ||
+    member.livenessKind === 'registered_only';
+  return (
+    member.bootstrapStalled === true &&
+    isOpenCodeSecondaryBootstrapPending(member) &&
+    hasMaterializedOpenCodeRuntimeMarker
+  );
+}
+
 function normalizePidSource(value: unknown): TeamAgentRuntimePidSource | undefined {
   return value === 'lead_process' ||
     value === 'tmux_pane' ||
@@ -193,11 +247,13 @@ function buildDiagnostics(
     | 'agentToolAccepted'
     | 'runtimeAlive'
     | 'bootstrapConfirmed'
+    | 'hardFailure'
     | 'hardFailureReason'
     | 'skippedForLaunch'
     | 'skipReason'
     | 'sources'
     | 'pendingPermissionRequestIds'
+    | 'bootstrapStalled'
   >
 ): string[] {
   const diagnostics: string[] = [];
@@ -206,6 +262,10 @@ function buildDiagnostics(
   if (member.bootstrapConfirmed) diagnostics.push('late heartbeat received');
   if ((member.pendingPermissionRequestIds?.length ?? 0) > 0) {
     diagnostics.push('waiting for permission approval');
+  } else if (member.bootstrapStalled) {
+    diagnostics.push('opencode_bootstrap_stalled');
+  } else if (member.hardFailure && member.runtimeAlive && !member.bootstrapConfirmed) {
+    diagnostics.push('bootstrap failed while runtime process was still alive');
   } else if (member.runtimeAlive && !member.bootstrapConfirmed) {
     diagnostics.push('waiting for teammate check-in');
   }
@@ -545,6 +605,7 @@ function normalizePersistedMemberState(
     pidSource: normalizePidSource(parsed.pidSource),
     runtimeDiagnostic: normalizeOptionalString(parsed.runtimeDiagnostic),
     runtimeDiagnosticSeverity: normalizeDiagnosticSeverity(parsed.runtimeDiagnosticSeverity),
+    bootstrapStalled: toBoolean(parsed.bootstrapStalled),
     runtimeLastSeenAt: normalizeOptionalString(parsed.runtimeLastSeenAt),
     firstSpawnAcceptedAt:
       typeof parsed.firstSpawnAcceptedAt === 'string' ? parsed.firstSpawnAcceptedAt : undefined,
@@ -571,6 +632,9 @@ function normalizePersistedMemberState(
       ? parsed.launchState
       : deriveMemberLaunchState(next);
   next.launchState = launchState;
+  if (!isPersistedBootstrapStalled(next)) {
+    next.bootstrapStalled = undefined;
+  }
   next.diagnostics = next.diagnostics?.length ? next.diagnostics : buildDiagnostics(next);
   return next;
 }
@@ -714,6 +778,7 @@ export function snapshotFromRuntimeMemberStatuses(params: {
       livenessKind: runtime?.livenessKind,
       runtimeDiagnostic: runtime?.runtimeDiagnostic,
       runtimeDiagnosticSeverity: runtime?.runtimeDiagnosticSeverity,
+      bootstrapStalled: runtime?.bootstrapStalled === true,
       runtimeLastSeenAt: runtime?.livenessLastCheckedAt,
       firstSpawnAcceptedAt: runtime?.firstSpawnAcceptedAt,
       lastHeartbeatAt: runtime?.lastHeartbeatAt,
@@ -723,6 +788,9 @@ export function snapshotFromRuntimeMemberStatuses(params: {
       diagnostics: undefined,
     };
     entry.launchState = deriveMemberLaunchState(entry);
+    if (!isPersistedBootstrapStalled(entry)) {
+      entry.bootstrapStalled = undefined;
+    }
     entry.diagnostics = buildDiagnostics(entry);
     members[name] = entry;
   }
@@ -756,6 +824,8 @@ export function snapshotToMemberSpawnStatuses(
     const skippedForLaunch =
       entry.launchState === 'skipped_for_launch' || entry.skippedForLaunch === true;
     const runtimeAlive = skippedForLaunch ? false : preservesStrongRuntimeAlive(entry);
+    const openCodeBootstrapPending = isOpenCodeSecondaryBootstrapPending(entry);
+    const bootstrapStalled = isPersistedBootstrapStalled(entry);
     if (entry.launchState === 'failed_to_start') {
       status = 'error';
     } else if (entry.launchState === 'skipped_for_launch') {
@@ -767,8 +837,10 @@ export function snapshotToMemberSpawnStatuses(
       entry.launchState === 'runtime_pending_permission' ||
       entry.launchState === 'runtime_pending_bootstrap'
     ) {
-      status = runtimeAlive ? 'online' : 'waiting';
-      livenessSource = runtimeAlive ? 'process' : undefined;
+      status =
+        runtimeAlive && !openCodeBootstrapPending && !bootstrapStalled ? 'online' : 'waiting';
+      livenessSource =
+        runtimeAlive && !openCodeBootstrapPending && !bootstrapStalled ? 'process' : undefined;
     } else {
       status = entry.agentToolAccepted ? 'waiting' : 'spawning';
     }
@@ -789,6 +861,7 @@ export function snapshotToMemberSpawnStatuses(
       livenessKind: entry.livenessKind,
       runtimeDiagnostic: entry.runtimeDiagnostic,
       runtimeDiagnosticSeverity: entry.runtimeDiagnosticSeverity,
+      bootstrapStalled,
       livenessLastCheckedAt: entry.runtimeLastSeenAt ?? entry.lastEvaluatedAt,
       firstSpawnAcceptedAt: entry.firstSpawnAcceptedAt,
       lastHeartbeatAt: entry.lastHeartbeatAt,
diff --git a/src/main/services/team/TeamLaunchSummaryProjection.ts b/src/main/services/team/TeamLaunchSummaryProjection.ts
index 48345c60..ac29deef 100644
--- a/src/main/services/team/TeamLaunchSummaryProjection.ts
+++ b/src/main/services/team/TeamLaunchSummaryProjection.ts
@@ -7,6 +7,7 @@ import { hasMixedPersistedLaunchMetadata } from './TeamLaunchStateEvaluator';
 import type { PersistedTeamLaunchSnapshot, TeamProviderId, TeamSummary } from '@shared/types';
 
 export const TEAM_LAUNCH_SUMMARY_FILE = 'launch-summary.json';
+const STALE_PENDING_SUMMARY_GRACE_MS = 5 * 60 * 1000;
 
 export interface LaunchStateSummary {
   partialLaunchFailure?: true;
@@ -32,6 +33,7 @@ export interface PersistedTeamLaunchSummaryProjection extends LaunchStateSummary
   version: 1;
   teamName: string;
   updatedAt: string;
+  launchPhase?: PersistedTeamLaunchSnapshot['launchPhase'];
   mixedAware?: true;
 }
 
@@ -101,6 +103,7 @@ export function createPersistedLaunchSummaryProjection(
     version: 1,
     teamName: snapshot.teamName,
     updatedAt: snapshot.updatedAt,
+    launchPhase: snapshot.launchPhase,
     ...(hasMixedPersistedLaunchMetadata(snapshot) ? { mixedAware: true as const } : {}),
     ...createLaunchStateSummary(snapshot),
   };
@@ -128,6 +131,13 @@ export function normalizePersistedLaunchSummaryProjection(
     updatedAt,
     ...(record.mixedAware === true ? { mixedAware: true as const } : {}),
   };
+  if (
+    record.launchPhase === 'active' ||
+    record.launchPhase === 'finished' ||
+    record.launchPhase === 'reconciled'
+  ) {
+    normalized.launchPhase = record.launchPhase;
+  }
 
   if (record.partialLaunchFailure === true) {
     normalized.partialLaunchFailure = true;
@@ -202,17 +212,55 @@ export function normalizePersistedLaunchSummaryProjection(
   return normalized;
 }
 
+function shouldIgnoreStalePendingSummaryProjection(
+  projection: PersistedTeamLaunchSummaryProjection,
+  nowMs: number = Date.now()
+): boolean {
+  if (projection.teamLaunchState !== 'partial_pending') {
+    return false;
+  }
+  if ((projection.permissionPendingCount ?? 0) > 0) {
+    return false;
+  }
+
+  const updatedAtMs = toMillis(projection.launchUpdatedAt ?? projection.updatedAt);
+  return Number.isFinite(updatedAtMs) && nowMs - updatedAtMs >= STALE_PENDING_SUMMARY_GRACE_MS;
+}
+
+function shouldIgnoreStalePendingLaunchSnapshotSummary(
+  snapshot: PersistedTeamLaunchSnapshot,
+  nowMs: number = Date.now()
+): boolean {
+  if (snapshot.teamLaunchState !== 'partial_pending') {
+    return false;
+  }
+  if ((snapshot.summary.permissionPendingCount ?? 0) > 0) {
+    return false;
+  }
+
+  const updatedAtMs = toMillis(snapshot.updatedAt);
+  return Number.isFinite(updatedAtMs) && nowMs - updatedAtMs >= STALE_PENDING_SUMMARY_GRACE_MS;
+}
+
 export function choosePreferredLaunchStateSummary(params: {
   bootstrapSnapshot?: PersistedTeamLaunchSnapshot | null;
   launchSnapshot?: PersistedTeamLaunchSnapshot | null;
   launchSummaryProjection?: PersistedTeamLaunchSummaryProjection | null;
 }): LaunchStateSummary | null {
-  if (params.launchSnapshot) {
-    return createLaunchStateSummary(params.launchSnapshot);
+  const launchSnapshot =
+    params.launchSnapshot && shouldIgnoreStalePendingLaunchSnapshotSummary(params.launchSnapshot)
+      ? null
+      : (params.launchSnapshot ?? null);
+  if (launchSnapshot) {
+    return createLaunchStateSummary(launchSnapshot);
   }
 
   const bootstrapSnapshot = params.bootstrapSnapshot ?? null;
-  const projection = params.launchSummaryProjection ?? null;
+  const projection =
+    params.launchSummaryProjection &&
+    shouldIgnoreStalePendingSummaryProjection(params.launchSummaryProjection)
+      ? null
+      : (params.launchSummaryProjection ?? null);
   if (!bootstrapSnapshot) {
     return projection;
   }
diff --git a/src/main/services/team/TeamLogSourceTracker.ts b/src/main/services/team/TeamLogSourceTracker.ts
index 9e89784c..6435907f 100644
--- a/src/main/services/team/TeamLogSourceTracker.ts
+++ b/src/main/services/team/TeamLogSourceTracker.ts
@@ -8,16 +8,27 @@ import {
   computeTaskChangePresenceProjectFingerprint,
   normalizeTaskChangePresenceFilePath,
 } from './taskChangePresenceUtils';
+import {
+  BOARD_TASK_CHANGE_FRESHNESS_DIRNAME,
+  BOARD_TASK_CHANGES_DIRNAME,
+  BOARD_TASK_LOG_FRESHNESS_DIRNAME,
+  BOARD_TASK_LOG_FRESHNESS_FILE_SUFFIX,
+  classifyLogSourceWatcherEvent,
+  getRelativeLogSourceParts,
+  isAgentTranscriptFileName,
+  MAX_PENDING_UNKNOWN_ROOT_REFRESH_ATTEMPTS,
+  MAX_PENDING_UNKNOWN_ROOT_SESSIONS,
+  normalizeLogSourceSessionId,
+  PENDING_UNKNOWN_ROOT_SESSION_TTL_MS,
+} from './teamLogSourceWatchScope';
 
-import type { TeamMemberLogsFinder } from './TeamMemberLogsFinder';
+import type { TeamLogSourceLiveContext, TeamMemberLogsFinder } from './TeamMemberLogsFinder';
 import type { TeamChangeEvent } from '@shared/types';
 import type { FSWatcher } from 'chokidar';
 
 const logger = createLogger('Service:TeamLogSourceTracker');
-const BOARD_TASK_LOG_FRESHNESS_DIRNAME = '.board-task-log-freshness';
-const BOARD_TASK_CHANGE_FRESHNESS_DIRNAME = '.board-task-change-freshness';
-const BOARD_TASK_CHANGES_DIRNAME = '.board-task-changes';
-const BOARD_TASK_LOG_FRESHNESS_FILE_SUFFIX = '.json';
+const CONTEXT_REFRESH_DEBOUNCE_MS = 300;
+const PENDING_CONTEXT_REFRESH_RETRY_MS = 1_000;
 
 interface TeamLogSourceSnapshot {
   projectFingerprint: string | null;
@@ -33,7 +44,11 @@ export type TeamLogSourceTrackingConsumer =
 interface TrackingState {
   watcher: FSWatcher | null;
   projectDir: string | null;
+  activeContext: TeamLogSourceLiveContext | null;
+  scopedSessionIds: Set<string>;
+  pendingUnknownSessionIds: Map<string, PendingUnknownSessionCandidate>;
   refreshTimer: ReturnType<typeof setTimeout> | null;
+  contextRefreshTimer: ReturnType<typeof setTimeout> | null;
   initializePromise: Promise<TeamLogSourceSnapshot> | null;
   initializeVersion: number | null;
   recomputePromise: Promise<TeamLogSourceSnapshot> | null;
@@ -43,6 +58,12 @@ interface TrackingState {
   lifecycleVersion: number;
 }
 
+interface PendingUnknownSessionCandidate {
+  sessionId: string;
+  expiresAt: number;
+  refreshAttempts: number;
+}
+
 type DecodedFreshnessTaskId =
   | { kind: 'task-id'; taskId: string }
   | { kind: 'opaque-safe-segment' }
@@ -52,14 +73,58 @@ function isOpaqueSafeTaskIdSegment(segment: string): boolean {
   return /^task-id-[0-9a-f]{32}$/.test(segment);
 }
 
-export function shouldIgnoreLogSourceWatcherPath(projectDir: string, watchedPath: string): boolean {
-  const relativePath = path.relative(projectDir, watchedPath);
-  if (!relativePath || relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+export function shouldIgnoreLogSourceWatcherPath(
+  projectDir: string,
+  watchedPath: string,
+  scope?: {
+    scopedSessionIds?: ReadonlySet<string>;
+    pendingRootSessionIds?: ReadonlySet<string>;
+  }
+): boolean {
+  const parts = getRelativeLogSourceParts(projectDir, watchedPath);
+  if (!parts) {
     return false;
   }
 
-  const parts = relativePath.split(/[/\\]+/).filter(Boolean);
-  return parts[0] === BOARD_TASK_CHANGES_DIRNAME;
+  const first = parts[0];
+  if (first === BOARD_TASK_CHANGES_DIRNAME) return true;
+  if (parts.includes('tool-results')) return true;
+  if (parts.includes('memory')) return true;
+  if (first === BOARD_TASK_LOG_FRESHNESS_DIRNAME) return false;
+  if (first === BOARD_TASK_CHANGE_FRESHNESS_DIRNAME) return false;
+
+  const scopedSessionIds = scope?.scopedSessionIds;
+  if (scopedSessionIds) {
+    if (parts.length === 1) {
+      if (first.endsWith('.jsonl')) {
+        const sessionId = normalizeLogSourceSessionId(first.slice(0, -'.jsonl'.length));
+        return (
+          !sessionId ||
+          (!scopedSessionIds.has(sessionId) && !scope?.pendingRootSessionIds?.has(sessionId))
+        );
+      }
+      return !scopedSessionIds.has(first);
+    }
+
+    if (!scopedSessionIds.has(first)) {
+      return true;
+    }
+
+    if (parts[1] === 'subagents') {
+      if (parts.length === 2) return false;
+      if (parts.length === 3) return !isAgentTranscriptFileName(parts[2]);
+    }
+
+    return true;
+  }
+
+  if (parts.length >= 2 && parts[1] === 'subagents') {
+    if (parts.length === 2) return false;
+    if (parts.length === 3) return !isAgentTranscriptFileName(parts[2]);
+    return true;
+  }
+
+  return false;
 }
 
 export class TeamLogSourceTracker {
@@ -149,7 +214,11 @@ export class TeamLogSourceTracker {
     const created: TrackingState = {
       watcher: null,
       projectDir: null,
+      activeContext: null,
+      scopedSessionIds: new Set(),
+      pendingUnknownSessionIds: new Map(),
       refreshTimer: null,
+      contextRefreshTimer: null,
       initializePromise: null,
       initializeVersion: null,
       recomputePromise: null,
@@ -205,6 +274,10 @@ export class TeamLogSourceTracker {
       clearTimeout(state.refreshTimer);
       state.refreshTimer = null;
     }
+    if (state.contextRefreshTimer) {
+      clearTimeout(state.contextRefreshTimer);
+      state.contextRefreshTimer = null;
+    }
 
     if (state.watcher) {
       await state.watcher.close().catch(() => undefined);
@@ -212,6 +285,9 @@ export class TeamLogSourceTracker {
     }
 
     state.projectDir = null;
+    state.activeContext = null;
+    state.scopedSessionIds.clear();
+    state.pendingUnknownSessionIds.clear();
     state.snapshot = { projectFingerprint: null, logSourceGeneration: null };
     return { ...state.snapshot };
   }
@@ -231,24 +307,27 @@ export class TeamLogSourceTracker {
   ): Promise<TeamLogSourceSnapshot> {
     const state = this.getOrCreateState(teamName);
     const previousGeneration = state.snapshot.logSourceGeneration;
-    const context = await this.logsFinder.getLogSourceWatchContext(teamName, {
+    const context = await this.logsFinder.getLiveLogSourceWatchContext(teamName, {
       forceRefresh: true,
     });
     if (!this.isTrackingCurrent(teamName, expectedVersion)) {
       return this.getOrCreateState(teamName).snapshot;
     }
     if (!context) {
+      state.activeContext = null;
+      state.scopedSessionIds.clear();
       state.snapshot = { projectFingerprint: null, logSourceGeneration: null };
       await this.rebuildWatcher(teamName, null, expectedVersion);
       return state.snapshot;
     }
 
+    state.activeContext = context;
     const snapshot = await this.computeSnapshot(context);
     if (!this.isTrackingCurrent(teamName, expectedVersion)) {
       return this.getOrCreateState(teamName).snapshot;
     }
     state.snapshot = snapshot;
-    await this.rebuildWatcher(teamName, context.projectDir, expectedVersion);
+    await this.rebuildWatcher(teamName, context, expectedVersion);
     if (
       this.isTrackingCurrent(teamName, expectedVersion) &&
       state.snapshot.logSourceGeneration &&
@@ -261,7 +340,7 @@ export class TeamLogSourceTracker {
 
   private async rebuildWatcher(
     teamName: string,
-    projectDir: string | null,
+    context: TeamLogSourceLiveContext | null,
     expectedVersion: number
   ): Promise<void> {
     const state = this.stateByTeam.get(teamName);
@@ -272,17 +351,15 @@ export class TeamLogSourceTracker {
     ) {
       return;
     }
-    if (state.projectDir === projectDir && state.watcher) {
-      return;
-    }
 
     if (state.watcher) {
       await state.watcher.close().catch(() => undefined);
       state.watcher = null;
     }
 
-    state.projectDir = projectDir;
-    if (!projectDir) {
+    state.projectDir = context?.projectDir ?? null;
+    state.scopedSessionIds.clear();
+    if (!context?.projectDir) {
       return;
     }
 
@@ -291,59 +368,300 @@ export class TeamLogSourceTracker {
       return;
     }
 
-    state.watcher = watch(projectDir, {
+    await this.ensureLogSourceFreshnessDirs(context.projectDir).catch((error) => {
+      logger.debug(`Failed to ensure log-source freshness dirs for ${teamName}: ${String(error)}`);
+    });
+
+    const { targets, scopedSessionIds } = await this.buildScopedWatchTargets(
+      context.projectDir,
+      context.watchSessionIds,
+      this.getPendingUnknownSessionIds(state)
+    );
+    if (!this.isTrackingCurrent(teamName, expectedVersion)) {
+      return;
+    }
+    state.scopedSessionIds = scopedSessionIds;
+
+    state.watcher = watch(targets, {
       ignoreInitial: true,
       ignorePermissionErrors: true,
       followSymlinks: false,
-      depth: 3,
-      ignored: (watchedPath) => shouldIgnoreLogSourceWatcherPath(projectDir, watchedPath),
+      depth: 0,
+      ignored: (watchedPath) =>
+        shouldIgnoreLogSourceWatcherPath(context.projectDir, watchedPath, {
+          scopedSessionIds,
+          pendingRootSessionIds: new Set(this.getPendingUnknownSessionIds(state)),
+        }),
       awaitWriteFinish: {
         stabilityThreshold: 250,
         pollInterval: 50,
       },
     });
 
-    const scheduleRecompute = (changedPath?: string): void => {
+    const handleWatcherEvent = (
+      eventName: 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir',
+      changedPath?: string
+    ): void => {
       const current = this.stateByTeam.get(teamName);
-      if (!current || this.getActiveConsumerCount(current) === 0 || !current.projectDir) {
+      if (
+        !changedPath ||
+        !current ||
+        this.getActiveConsumerCount(current) === 0 ||
+        !current.projectDir
+      ) {
         return;
       }
-      if (
-        changedPath &&
-        (this.handleTaskFreshnessSignalChange(
-          teamName,
-          current.projectDir,
-          changedPath,
-          BOARD_TASK_LOG_FRESHNESS_DIRNAME
-        ) ||
+      const action = classifyLogSourceWatcherEvent({
+        projectDir: current.projectDir,
+        changedPath,
+        eventName,
+        scopedSessionIds: current.scopedSessionIds,
+        pendingUnknownSessionIds: new Set(current.pendingUnknownSessionIds.keys()),
+      });
+
+      if (action.kind === 'task-freshness') {
+        if (
+          !this.handleTaskFreshnessSignalChange(
+            teamName,
+            current.projectDir,
+            changedPath,
+            BOARD_TASK_LOG_FRESHNESS_DIRNAME
+          )
+        ) {
           this.handleTaskFreshnessSignalChange(
             teamName,
             current.projectDir,
             changedPath,
             BOARD_TASK_CHANGE_FRESHNESS_DIRNAME
-          ))
-      ) {
+          );
+        }
         return;
       }
-      if (current.refreshTimer) {
-        clearTimeout(current.refreshTimer);
+
+      if (action.kind === 'context-refresh') {
+        this.scheduleContextRefresh(teamName, action.candidateSessionId);
+        return;
+      }
+
+      if (action.kind === 'scoped-recompute') {
+        this.scheduleScopedRecompute(teamName);
       }
-      current.refreshTimer = setTimeout(() => {
-        current.refreshTimer = null;
-        void this.recompute(teamName);
-      }, 300);
     };
 
-    state.watcher.on('add', scheduleRecompute);
-    state.watcher.on('change', scheduleRecompute);
-    state.watcher.on('unlink', scheduleRecompute);
-    state.watcher.on('addDir', scheduleRecompute);
-    state.watcher.on('unlinkDir', scheduleRecompute);
+    state.watcher.on('add', (changedPath) => handleWatcherEvent('add', changedPath));
+    state.watcher.on('change', (changedPath) => handleWatcherEvent('change', changedPath));
+    state.watcher.on('unlink', (changedPath) => handleWatcherEvent('unlink', changedPath));
+    state.watcher.on('addDir', (changedPath) => handleWatcherEvent('addDir', changedPath));
+    state.watcher.on('unlinkDir', (changedPath) => handleWatcherEvent('unlinkDir', changedPath));
     state.watcher.on('error', (error) => {
       logger.warn(`Log-source watcher error for ${teamName}: ${String(error)}`);
     });
   }
 
+  private async ensureLogSourceFreshnessDirs(projectDir: string): Promise<void> {
+    await Promise.all([
+      fs.mkdir(path.join(projectDir, BOARD_TASK_LOG_FRESHNESS_DIRNAME), { recursive: true }),
+      fs.mkdir(path.join(projectDir, BOARD_TASK_CHANGE_FRESHNESS_DIRNAME), { recursive: true }),
+    ]);
+  }
+
+  private async buildScopedWatchTargets(
+    projectDir: string,
+    confirmedSessionIds: readonly string[],
+    pendingRootSessionIds: readonly string[]
+  ): Promise<{ targets: string[]; scopedSessionIds: Set<string> }> {
+    const targets = new Set<string>();
+    const scopedSessionIds = new Set<string>();
+
+    targets.add(projectDir);
+    targets.add(path.join(projectDir, BOARD_TASK_LOG_FRESHNESS_DIRNAME));
+    targets.add(path.join(projectDir, BOARD_TASK_CHANGE_FRESHNESS_DIRNAME));
+
+    for (const rawSessionId of confirmedSessionIds) {
+      const sessionId = normalizeLogSourceSessionId(rawSessionId);
+      if (!sessionId) {
+        continue;
+      }
+      scopedSessionIds.add(sessionId);
+
+      const rootTranscript = path.join(projectDir, `${sessionId}.jsonl`);
+      const sessionDir = path.join(projectDir, sessionId);
+      const subagentsDir = path.join(sessionDir, 'subagents');
+
+      if (await this.isFile(rootTranscript)) targets.add(rootTranscript);
+      if (await this.isDirectory(sessionDir)) targets.add(sessionDir);
+      if (await this.isDirectory(subagentsDir)) targets.add(subagentsDir);
+    }
+
+    for (const rawSessionId of pendingRootSessionIds) {
+      const sessionId = normalizeLogSourceSessionId(rawSessionId);
+      if (!sessionId || scopedSessionIds.has(sessionId)) {
+        continue;
+      }
+      const rootTranscript = path.join(projectDir, `${sessionId}.jsonl`);
+      if (await this.isFile(rootTranscript)) targets.add(rootTranscript);
+    }
+
+    return { targets: [...targets], scopedSessionIds };
+  }
+
+  private async isFile(targetPath: string): Promise<boolean> {
+    try {
+      return (await fs.stat(targetPath)).isFile();
+    } catch {
+      return false;
+    }
+  }
+
+  private async isDirectory(targetPath: string): Promise<boolean> {
+    try {
+      return (await fs.stat(targetPath)).isDirectory();
+    } catch {
+      return false;
+    }
+  }
+
+  private getPendingUnknownSessionIds(state: TrackingState): string[] {
+    this.prunePendingUnknownSessions(state);
+    return [...state.pendingUnknownSessionIds.keys()];
+  }
+
+  private rememberPendingUnknownSession(
+    state: TrackingState,
+    rawSessionId: string | undefined
+  ): void {
+    const sessionId = normalizeLogSourceSessionId(rawSessionId);
+    if (!sessionId || state.scopedSessionIds.has(sessionId)) {
+      return;
+    }
+
+    const now = Date.now();
+    state.pendingUnknownSessionIds.set(sessionId, {
+      sessionId,
+      expiresAt: now + PENDING_UNKNOWN_ROOT_SESSION_TTL_MS,
+      refreshAttempts: state.pendingUnknownSessionIds.get(sessionId)?.refreshAttempts ?? 0,
+    });
+
+    while (state.pendingUnknownSessionIds.size > MAX_PENDING_UNKNOWN_ROOT_SESSIONS) {
+      const oldest = [...state.pendingUnknownSessionIds.values()].sort(
+        (left, right) => left.expiresAt - right.expiresAt
+      )[0];
+      if (!oldest) break;
+      state.pendingUnknownSessionIds.delete(oldest.sessionId);
+    }
+  }
+
+  private prunePendingUnknownSessions(state: TrackingState): void {
+    const now = Date.now();
+    for (const [sessionId, candidate] of state.pendingUnknownSessionIds.entries()) {
+      if (
+        candidate.expiresAt <= now ||
+        candidate.refreshAttempts >= MAX_PENDING_UNKNOWN_ROOT_REFRESH_ATTEMPTS
+      ) {
+        state.pendingUnknownSessionIds.delete(sessionId);
+      }
+    }
+  }
+
+  private markPendingRefreshAttempt(state: TrackingState): void {
+    for (const candidate of state.pendingUnknownSessionIds.values()) {
+      candidate.refreshAttempts += 1;
+    }
+    this.prunePendingUnknownSessions(state);
+  }
+
+  private removeConfirmedPendingSessions(
+    state: TrackingState,
+    confirmedSessionIds: readonly string[]
+  ): void {
+    for (const rawSessionId of confirmedSessionIds) {
+      const sessionId = normalizeLogSourceSessionId(rawSessionId);
+      if (sessionId) {
+        state.pendingUnknownSessionIds.delete(sessionId);
+      }
+    }
+  }
+
+  private scheduleScopedRecompute(teamName: string): void {
+    const current = this.stateByTeam.get(teamName);
+    if (!current || this.getActiveConsumerCount(current) === 0) {
+      return;
+    }
+    if (current.refreshTimer) {
+      clearTimeout(current.refreshTimer);
+    }
+    current.refreshTimer = setTimeout(() => {
+      current.refreshTimer = null;
+      void this.recompute(teamName);
+    }, 300);
+  }
+
+  private scheduleContextRefresh(
+    teamName: string,
+    candidateSessionId?: string,
+    delayMs: number = CONTEXT_REFRESH_DEBOUNCE_MS
+  ): void {
+    const state = this.stateByTeam.get(teamName);
+    if (!state || this.getActiveConsumerCount(state) === 0) {
+      return;
+    }
+    this.rememberPendingUnknownSession(state, candidateSessionId);
+    if (state.contextRefreshTimer) {
+      return;
+    }
+    state.contextRefreshTimer = setTimeout(() => {
+      const current = this.stateByTeam.get(teamName);
+      if (!current) return;
+      current.contextRefreshTimer = null;
+      if (this.getActiveConsumerCount(current) === 0) return;
+      void this.refreshContextAndWatcher(teamName, current.lifecycleVersion);
+    }, delayMs);
+  }
+
+  private async refreshContextAndWatcher(teamName: string, expectedVersion: number): Promise<void> {
+    const state = this.stateByTeam.get(teamName);
+    if (!state || !this.isTrackingCurrent(teamName, expectedVersion)) {
+      return;
+    }
+    this.markPendingRefreshAttempt(state);
+
+    const previousGeneration = state.snapshot.logSourceGeneration;
+    const context = await this.logsFinder.getLiveLogSourceWatchContext(teamName, {
+      forceRefresh: true,
+    });
+    if (!this.isTrackingCurrent(teamName, expectedVersion)) {
+      return;
+    }
+
+    state.activeContext = context;
+    if (!context) {
+      state.scopedSessionIds.clear();
+      state.snapshot = { projectFingerprint: null, logSourceGeneration: null };
+      await this.rebuildWatcher(teamName, null, expectedVersion);
+      return;
+    }
+
+    this.removeConfirmedPendingSessions(state, context.watchSessionIds);
+    state.snapshot = await this.computeSnapshot(context);
+    if (!this.isTrackingCurrent(teamName, expectedVersion)) {
+      return;
+    }
+    await this.rebuildWatcher(teamName, context, expectedVersion);
+
+    if (
+      state.snapshot.logSourceGeneration &&
+      previousGeneration !== state.snapshot.logSourceGeneration
+    ) {
+      this.emitLogSourceChange(teamName);
+    }
+    if (
+      this.isTrackingCurrent(teamName, expectedVersion) &&
+      state.pendingUnknownSessionIds.size > 0
+    ) {
+      this.scheduleContextRefresh(teamName, undefined, PENDING_CONTEXT_REFRESH_RETRY_MS);
+    }
+  }
+
   private handleTaskFreshnessSignalChange(
     teamName: string,
     projectDir: string,
@@ -440,22 +758,15 @@ export class TeamLogSourceTracker {
     const recomputeVersion = state.lifecycleVersion;
     const recomputePromise = (async () => {
       const previousGeneration = state.snapshot.logSourceGeneration;
-      const context = await this.logsFinder.getLogSourceWatchContext(teamName, {
-        forceRefresh: true,
-      });
-      if (!this.isTrackingCurrent(teamName, recomputeVersion)) {
-        return this.getOrCreateState(teamName).snapshot;
-      }
+      const context = state.activeContext;
 
       if (!context) {
         state.snapshot = { projectFingerprint: null, logSourceGeneration: null };
-        await this.rebuildWatcher(teamName, null, recomputeVersion);
       } else {
         state.snapshot = await this.computeSnapshot(context);
         if (!this.isTrackingCurrent(teamName, recomputeVersion)) {
           return this.getOrCreateState(teamName).snapshot;
         }
-        await this.rebuildWatcher(teamName, context.projectDir, recomputeVersion);
       }
 
       if (
@@ -495,23 +806,21 @@ export class TeamLogSourceTracker {
     });
   }
 
-  private async computeSnapshot(context: {
-    projectDir: string;
-    projectPath?: string;
-    leadSessionId?: string;
-    sessionIds: string[];
-  }): Promise<TeamLogSourceSnapshot> {
+  private async computeSnapshot(context: TeamLogSourceLiveContext): Promise<TeamLogSourceSnapshot> {
     const projectFingerprint = computeTaskChangePresenceProjectFingerprint(context.projectPath);
     const parts: string[] = [];
+    const sessionIds =
+      context.watchSessionIds.length > 0 ? context.watchSessionIds : context.sessionIds;
 
-    if (context.leadSessionId) {
-      const leadLogPath = path.join(context.projectDir, `${context.leadSessionId}.jsonl`);
-      parts.push(await this.describePath('lead', leadLogPath));
-    }
-
-    for (const sessionId of [...context.sessionIds].sort((a, b) => a.localeCompare(b))) {
+    for (const rawSessionId of [...sessionIds].sort((a, b) => a.localeCompare(b))) {
+      const sessionId = normalizeLogSourceSessionId(rawSessionId);
+      if (!sessionId) {
+        continue;
+      }
+      const rootLogPath = path.join(context.projectDir, `${sessionId}.jsonl`);
       const sessionDir = path.join(context.projectDir, sessionId);
       const subagentsDir = path.join(sessionDir, 'subagents');
+      parts.push(await this.describePath('root', rootLogPath));
       parts.push(await this.describePath('session', sessionDir));
       parts.push(await this.describePath('subagents', subagentsDir));
 
@@ -523,25 +832,19 @@ export class TeamLogSourceTracker {
       }
 
       for (const fileName of entries
-        .filter(
-          (entry) =>
-            entry.startsWith('agent-') &&
-            entry.endsWith('.jsonl') &&
-            !entry.startsWith('agent-acompact')
-        )
+        .filter((entry) => isAgentTranscriptFileName(entry))
         .sort((a, b) => a.localeCompare(b))) {
         parts.push(await this.describePath('subagent-log', path.join(subagentsDir, fileName)));
       }
     }
 
-    const sourceMaterial =
-      parts.length > 0
-        ? parts.join('|')
-        : `empty:${normalizeTaskChangePresenceFilePath(context.projectDir)}`;
+    if (parts.length === 0) {
+      return { projectFingerprint, logSourceGeneration: null };
+    }
 
     return {
       projectFingerprint,
-      logSourceGeneration: createHash('sha256').update(sourceMaterial).digest('hex'),
+      logSourceGeneration: createHash('sha256').update(parts.join('|')).digest('hex'),
     };
   }
 
diff --git a/src/main/services/team/TeamMcpConfigBuilder.ts b/src/main/services/team/TeamMcpConfigBuilder.ts
index 21ec5c63..32c19341 100644
--- a/src/main/services/team/TeamMcpConfigBuilder.ts
+++ b/src/main/services/team/TeamMcpConfigBuilder.ts
@@ -154,6 +154,10 @@ async function hasValidServerCopy(dir: string): Promise<boolean> {
 
 let _resolvedNodePath: string | undefined;
 
+export function clearResolvedNodePathForTests(): void {
+  _resolvedNodePath = undefined;
+}
+
 /**
  * Find the real `node` binary path. In Electron, process.execPath is the
  * Electron binary — NOT node — so we must resolve node separately.
diff --git a/src/main/services/team/TeamMemberLogsFinder.ts b/src/main/services/team/TeamMemberLogsFinder.ts
index f5ed4005..3e1828b9 100644
--- a/src/main/services/team/TeamMemberLogsFinder.ts
+++ b/src/main/services/team/TeamMemberLogsFinder.ts
@@ -10,8 +10,14 @@ import {
   canonicalizeAgentTeamsToolName,
   lineHasAgentTeamsTaskBoundaryToolName,
 } from './agentTeamsToolNames';
+import {
+  choosePreferredLaunchSnapshot,
+  readBootstrapLaunchSnapshot,
+} from './TeamBootstrapStateReader';
 import { TeamConfigReader } from './TeamConfigReader';
 import { TeamInboxReader } from './TeamInboxReader';
+import { TeamLaunchStateStore } from './TeamLaunchStateStore';
+import { buildTeamLogWatchSessionIds, extractRuntimeSessionIds } from './teamLogSourceWatchScope';
 import { TeamMembersMetaStore } from './TeamMembersMetaStore';
 import { TeamTranscriptProjectResolver } from './TeamTranscriptProjectResolver';
 
@@ -107,6 +113,14 @@ export interface MemberLogFileRef {
   mtimeMs: number;
 }
 
+export interface TeamLogSourceLiveContext {
+  projectDir: string;
+  projectPath?: string;
+  leadSessionId?: string;
+  sessionIds: string[];
+  watchSessionIds: string[];
+}
+
 async function mapLimit<T, R>(
   items: readonly T[],
   limit: number,
@@ -148,8 +162,11 @@ export class TeamMemberLogsFinder {
     private readonly inboxReader: TeamInboxReader = new TeamInboxReader(),
     private readonly membersMetaStore: TeamMembersMetaStore = new TeamMembersMetaStore(),
     private readonly projectResolver: TeamTranscriptProjectResolver = new TeamTranscriptProjectResolver(
-      configReader
-    )
+      {
+        getConfig: (teamName) => configReader.getConfigSnapshot(teamName),
+      }
+    ),
+    private readonly launchStateStore: TeamLaunchStateStore = new TeamLaunchStateStore()
   ) {}
 
   async findMemberLogs(
@@ -260,6 +277,43 @@ export class TeamMemberLogsFinder {
     };
   }
 
+  async getLiveLogSourceWatchContext(
+    teamName: string,
+    options?: { forceRefresh?: boolean }
+  ): Promise<TeamLogSourceLiveContext | null> {
+    const [launchSnapshot, bootstrapSnapshot] = await Promise.all([
+      this.launchStateStore.read(teamName).catch(() => null),
+      readBootstrapLaunchSnapshot(teamName).catch(() => null),
+    ]);
+    const preferredSnapshot = choosePreferredLaunchSnapshot(bootstrapSnapshot, launchSnapshot);
+    const extraProjectPathCandidates = Object.values(preferredSnapshot?.members ?? {}).map(
+      (member) => member.cwd
+    );
+
+    const base = await this.projectResolver.getLiveBaseContext(teamName, {
+      forceRefresh: options?.forceRefresh,
+      extraProjectPathCandidates,
+    });
+    if (!base) {
+      return null;
+    }
+
+    const watchSessionIds = buildTeamLogWatchSessionIds({
+      configLeadSessionId: base.config.leadSessionId,
+      launchLeadSessionId: preferredSnapshot?.leadSessionId,
+      sessionHistory: base.config.sessionHistory,
+      launchRuntimeSessionIds: extractRuntimeSessionIds(preferredSnapshot),
+    });
+
+    return {
+      projectDir: base.projectDir,
+      projectPath: base.config.projectPath,
+      leadSessionId: base.config.leadSessionId ?? preferredSnapshot?.leadSessionId,
+      sessionIds: watchSessionIds,
+      watchSessionIds,
+    };
+  }
+
   /**
    * Returns session logs that reference the given task (TaskCreate, TaskUpdate, comments, etc.).
    * When the task is in_progress and has an owner, also includes that owner's session logs so
diff --git a/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts b/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
index 6e843e5c..8eddcde1 100644
--- a/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
+++ b/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
@@ -27,7 +27,7 @@ interface RuntimeAdvisoryLogsFinder {
 const LOOKBACK_MS = 10 * 60 * 1000;
 const CACHE_TTL_MS = 30_000;
 const TAIL_BYTES = 64 * 1024;
-const BATCH_WARN_MS = 200;
+const BATCH_WARN_MS = 1_000;
 const ADVISORY_FETCH_CONCURRENCY = 2;
 const QUOTA_EXHAUSTED_TOKENS = [
   'exhausted your capacity',
diff --git a/src/main/services/team/TeamMessageFeedService.ts b/src/main/services/team/TeamMessageFeedService.ts
index eb34ba7a..3865ef3d 100644
--- a/src/main/services/team/TeamMessageFeedService.ts
+++ b/src/main/services/team/TeamMessageFeedService.ts
@@ -26,6 +26,11 @@ interface TeamMessageFeedCacheEntry {
   cachedAt: number;
 }
 
+interface InFlightTeamMessageFeed {
+  promise: Promise<TeamNormalizedMessageFeed>;
+  generationAtStart: number;
+}
+
 export interface TeamNormalizedMessageFeed {
   teamName: string;
   feedRevision: string;
@@ -411,11 +416,14 @@ function toFeedRevision(messages: readonly InboxMessage[]): string {
 export class TeamMessageFeedService {
   private readonly cacheByTeam = new Map<string, TeamMessageFeedCacheEntry>();
   private readonly dirtyTeams = new Set<string>();
+  private readonly inFlightByTeam = new Map<string, InFlightTeamMessageFeed>();
+  private readonly generationByTeam = new Map<string, number>();
 
   constructor(private readonly deps: TeamMessageFeedDeps) {}
 
   invalidate(teamName: string): void {
     this.dirtyTeams.add(teamName);
+    this.generationByTeam.set(teamName, this.getGeneration(teamName) + 1);
   }
 
   async getFeed(teamName: string): Promise<TeamNormalizedMessageFeed> {
@@ -431,20 +439,65 @@ export class TeamMessageFeedService {
       };
     }
 
+    const existingRequest = this.inFlightByTeam.get(teamName);
+    const generationAtStart = this.getGeneration(teamName);
+    if (existingRequest && existingRequest.generationAtStart === generationAtStart) {
+      return existingRequest.promise;
+    }
+
+    const request = this.buildFeed(
+      teamName,
+      cached,
+      now,
+      cacheDirty,
+      cacheExpired,
+      generationAtStart
+    ).finally(() => {
+      if (this.inFlightByTeam.get(teamName)?.promise === request) {
+        this.inFlightByTeam.delete(teamName);
+      }
+    });
+    this.inFlightByTeam.set(teamName, {
+      promise: request,
+      generationAtStart,
+    });
+    return request;
+  }
+
+  private getGeneration(teamName: string): number {
+    return this.generationByTeam.get(teamName) ?? 0;
+  }
+
+  private async buildFeed(
+    teamName: string,
+    cached: TeamMessageFeedCacheEntry | undefined,
+    now: number,
+    cacheDirty: boolean,
+    cacheExpired: boolean,
+    generationAtStart: number
+  ): Promise<TeamNormalizedMessageFeed> {
+    const startedAt = Date.now();
+    const configStartedAt = Date.now();
     const config = await this.deps.getConfig(teamName);
+    const configMs = Date.now() - configStartedAt;
     if (!config) {
       const emptyEntry = { feedRevision: toFeedRevision([]), messages: [], cachedAt: now };
-      this.cacheByTeam.set(teamName, emptyEntry);
-      this.dirtyTeams.delete(teamName);
+      if (this.getGeneration(teamName) === generationAtStart) {
+        this.cacheByTeam.set(teamName, emptyEntry);
+        this.dirtyTeams.delete(teamName);
+      }
       return { teamName, ...emptyEntry };
     }
 
+    const sourceStartedAt = Date.now();
     const [inboxMessages, leadTexts, sentMessages] = await Promise.all([
       this.deps.getInboxMessages(teamName).catch(() => [] as InboxMessage[]),
       this.deps.getLeadSessionMessages(teamName, config).catch(() => [] as InboxMessage[]),
       this.deps.getSentMessages(teamName).catch(() => [] as InboxMessage[]),
     ]);
+    const sourceMs = Date.now() - sourceStartedAt;
 
+    const normalizeStartedAt = Date.now();
     const syntheticMessages = buildSyntheticOpenCodeBootstrapMessages(config);
     let messages = [...inboxMessages, ...leadTexts, ...sentMessages, ...syntheticMessages];
     messages = dedupeLeadProcessCopies(messages, leadTexts);
@@ -461,6 +514,13 @@ export class TeamMessageFeedService {
     });
 
     const feedRevision = toFeedRevision(messages);
+    const normalizeMs = Date.now() - normalizeStartedAt;
+    const totalMs = Date.now() - startedAt;
+    if (totalMs >= 750) {
+      logger.warn(
+        `[${teamName}] message feed build slow totalMs=${totalMs} configMs=${configMs} sourceMs=${sourceMs} normalizeMs=${normalizeMs} inbox=${inboxMessages.length} lead=${leadTexts.length} sent=${sentMessages.length} synthetic=${syntheticMessages.length} cacheDirty=${cacheDirty} cacheExpired=${cacheExpired}`
+      );
+    }
     if (cached && !cacheDirty && cacheExpired && cached.feedRevision !== feedRevision) {
       logger.warn(
         `[${teamName}] Message feed cache expired without dirty invalidation and recovered newer durable messages`
@@ -478,8 +538,10 @@ export class TeamMessageFeedService {
             cachedAt: now,
           };
 
-    this.cacheByTeam.set(teamName, nextEntry);
-    this.dirtyTeams.delete(teamName);
+    if (this.getGeneration(teamName) === generationAtStart) {
+      this.cacheByTeam.set(teamName, nextEntry);
+      this.dirtyTeams.delete(teamName);
+    }
     return {
       teamName,
       feedRevision: nextEntry.feedRevision,
diff --git a/src/main/services/team/TeamProvisioningService.ts b/src/main/services/team/TeamProvisioningService.ts
index 89429046..b848d0fe 100644
--- a/src/main/services/team/TeamProvisioningService.ts
+++ b/src/main/services/team/TeamProvisioningService.ts
@@ -109,7 +109,20 @@ import * as path from 'path';
 import pidusage from 'pidusage';
 import * as readline from 'readline';
 
-import { mergeJsonSettingsArgs } from '../runtime/cliSettingsArgs';
+import {
+  ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS,
+  type AnthropicTeamApiKeyHelperMaterial,
+  CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV,
+  CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_API_KEY_HELPER,
+  CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV,
+  cleanupAnthropicTeamApiKeyHelperForTeam,
+  cleanupAnthropicTeamApiKeyHelperMaterial,
+  cleanupStaleAnthropicTeamApiKeyHelpers,
+  DISABLE_ANTHROPIC_TEAM_API_KEY_HELPER_ENV,
+  materializeAnthropicTeamApiKeyHelper,
+  verifyAnthropicTeamApiKeyHelperMaterial,
+} from '../runtime/anthropicTeamApiKeyHelper';
+import { mergeJsonSettingsArgs, parseJsonSettingsObject } from '../runtime/cliSettingsArgs';
 import {
   type GeminiRuntimeAuthState,
   resolveGeminiRuntimeAuth,
@@ -123,6 +136,11 @@ import {
   normalizeProviderModelProbeFailureReason,
 } from '../runtime/providerModelProbe';
 import { resolveTeamProviderId } from '../runtime/providerRuntimeEnv';
+import {
+  materializeTeamRuntimeSettingsBundle,
+  splitSettingsJsonArgs,
+  type TeamRuntimeSettingsJson,
+} from '../runtime/teamRuntimeSettingsBundle';
 
 import {
   createOpenCodePromptDeliveryLedgerStore,
@@ -313,10 +331,18 @@ interface OpenCodeRuntimeControlAck {
   observedAt: string;
 }
 
+interface LaunchStateWriteResult {
+  snapshot: PersistedTeamLaunchSnapshot;
+  wrote: boolean;
+}
+
+type BootstrapTranscriptSuccessSource = 'member_briefing' | 'assistant_text';
+
 type BootstrapTranscriptOutcome =
   | {
       kind: 'success';
       observedAt: string;
+      source: BootstrapTranscriptSuccessSource;
     }
   | {
       kind: 'failure';
@@ -338,11 +364,14 @@ import type {
   MemberSpawnLivenessSource,
   MemberSpawnStatus,
   MemberSpawnStatusEntry,
+  MemberSpawnStatusesSnapshot,
+  OpenCodeRuntimeDeliveryStatus,
   PersistedTeamLaunchMemberState,
   PersistedTeamLaunchPhase,
   PersistedTeamLaunchSnapshot,
   PersistedTeamLaunchSummary,
   ProviderModelLaunchIdentity,
+  RetryFailedOpenCodeSecondaryLanesResult,
   TaskRef,
   TeamAgentRuntimeBackendType,
   TeamAgentRuntimeDiagnosticSeverity,
@@ -672,6 +701,9 @@ const DIRECT_TMUX_RESTART_ENV_KEYS = [
   'CLAUDE_CODE_ENTRY_PROVIDER',
   'CLAUDE_CODE_GEMINI_BACKEND',
   'CLAUDE_CODE_CODEX_BACKEND',
+  'CODEX_HOME',
+  CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV,
+  CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV,
   'ANTHROPIC_BASE_URL',
   'ANTHROPIC_API_KEY',
   'ANTHROPIC_AUTH_TOKEN',
@@ -803,7 +835,7 @@ function getDirectRestartEntryProvider(providerId: TeamProviderId): string {
   return providerId === 'codex' || providerId === 'gemini' ? providerId : 'anthropic';
 }
 
-function buildDirectTmuxRestartEnvAssignments(
+export function buildDirectTmuxRestartEnvAssignments(
   env: NodeJS.ProcessEnv,
   providerId: TeamProviderId
 ): string {
@@ -823,6 +855,22 @@ function buildDirectTmuxRestartEnvAssignments(
   }
   assignments.set('CLAUDE_CODE_PROVIDER_MANAGED_BY_HOST', '1');
   assignments.set('CLAUDE_CODE_ENTRY_PROVIDER', getDirectRestartEntryProvider(providerId));
+  if (
+    providerId === 'anthropic' &&
+    env[CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV] === CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_API_KEY_HELPER
+  ) {
+    assignments.set(
+      CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_ENV,
+      CLAUDE_TEAM_ANTHROPIC_AUTH_MODE_API_KEY_HELPER
+    );
+    const settingsPath = env[CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV];
+    if (typeof settingsPath === 'string') {
+      assignments.set(CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH_ENV, settingsPath);
+    }
+    for (const key of ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS) {
+      assignments.set(key, '');
+    }
+  }
 
   return [...assignments.entries()].map(([key, value]) => `${key}=${shellQuote(value)}`).join(' ');
 }
@@ -1006,15 +1054,15 @@ function resolveCodexSelectionFromFacts(params: {
   });
 }
 
-function buildAnthropicSettingsArgs(
+function buildAnthropicSettingsObject(
   providerId: TeamProviderId,
   launchIdentity?: ProviderModelLaunchIdentity | null
-): string[] {
+): TeamRuntimeSettingsJson | null {
   if (providerId !== 'anthropic' || typeof launchIdentity?.resolvedFastMode !== 'boolean') {
-    return [];
+    return null;
   }
 
-  const settings = launchIdentity.resolvedFastMode
+  return launchIdentity.resolvedFastMode
     ? {
         fastMode: true,
         fastModePerSessionOptIn: false,
@@ -1022,6 +1070,16 @@ function buildAnthropicSettingsArgs(
     : {
         fastMode: false,
       };
+}
+
+function buildAnthropicSettingsArgs(
+  providerId: TeamProviderId,
+  launchIdentity?: ProviderModelLaunchIdentity | null
+): string[] {
+  const settings = buildAnthropicSettingsObject(providerId, launchIdentity);
+  if (!settings) {
+    return [];
+  }
 
   return ['--settings', JSON.stringify(settings)];
 }
@@ -1039,6 +1097,59 @@ function buildProviderFastModeArgs(
   return [];
 }
 
+function filterOutSettingsPathArgs(
+  args: string[],
+  settingsPath: string | null | undefined
+): string[] {
+  if (!settingsPath) {
+    return [...args];
+  }
+  const filtered: string[] = [];
+  let index = 0;
+  while (index < args.length) {
+    const arg = args[index];
+    if (arg === '--settings' && args[index + 1] === settingsPath) {
+      index += 2;
+      continue;
+    }
+    if (arg === `--settings=${settingsPath}`) {
+      index += 1;
+      continue;
+    }
+    filtered.push(arg);
+    index += 1;
+  }
+  return filtered;
+}
+
+function hasPathBasedSettingsArgs(args: string[]): boolean {
+  let index = 0;
+  while (index < args.length) {
+    const arg = args[index];
+    if (arg === '--settings') {
+      const value = args[index + 1];
+      if (typeof value === 'string') {
+        if (!parseJsonSettingsObject(value)) {
+          return true;
+        }
+        index += 2;
+        continue;
+      }
+      if (typeof value !== 'string') {
+        return true;
+      }
+      index += 1;
+      continue;
+    }
+    const prefix = '--settings=';
+    if (arg.startsWith(prefix) && !parseJsonSettingsObject(arg.slice(prefix.length))) {
+      return true;
+    }
+    index += 1;
+  }
+  return false;
+}
+
 function isProbeTimeoutMessage(message: string): boolean {
   const lower = message.toLowerCase();
   return (
@@ -1537,6 +1648,8 @@ interface ProvisioningRun {
     env: NodeJS.ProcessEnv;
     prompt: string;
   } | null;
+  /** Run-scoped helper material used by Anthropic API-key team runtimes. */
+  anthropicApiKeyHelper: AnthropicTeamApiKeyHelperMaterial | null;
   /** Pending tool approval requests awaiting user response (control_request protocol). */
   pendingApprovals: Map<string, ToolApprovalRequest>;
   /** Teammate permission_request IDs already intercepted (prevents re-processing read messages). */
@@ -1585,6 +1698,52 @@ interface MixedSecondaryRuntimeLaneState {
   result: TeamRuntimeLaunchResult | null;
   warnings: string[];
   diagnostics: string[];
+  launchScheduled?: boolean;
+  queuedAtMs?: number;
+  launchStartedAtMs?: number;
+  launchFinishedAtMs?: number;
+}
+
+interface OpenCodeSecondaryRetryCandidate {
+  memberName: string;
+  laneId: string;
+}
+
+interface OpenCodeSecondaryRetryOutcome {
+  launchState: MemberLaunchState;
+  reason?: string;
+}
+
+function formatOpenCodeLaneTimingMs(value: number | null | undefined): string {
+  return typeof value === 'number' && Number.isFinite(value)
+    ? `${Math.max(0, Math.round(value))}ms`
+    : 'n/a';
+}
+
+function appendDiagnosticOnce(diagnostics: readonly string[], diagnostic: string | null): string[] {
+  if (!diagnostic || diagnostics.includes(diagnostic)) {
+    return [...diagnostics];
+  }
+  return [...diagnostics, diagnostic];
+}
+
+function buildOpenCodeSecondaryLaneTimingDiagnostic(
+  lane: MixedSecondaryRuntimeLaneState
+): string | null {
+  if (
+    typeof lane.queuedAtMs !== 'number' ||
+    typeof lane.launchStartedAtMs !== 'number' ||
+    typeof lane.launchFinishedAtMs !== 'number'
+  ) {
+    return null;
+  }
+  return [
+    'OpenCode secondary lane timing:',
+    `member=${lane.member.name}`,
+    `queueWaitMs=${formatOpenCodeLaneTimingMs(lane.launchStartedAtMs - lane.queuedAtMs)}`,
+    `launchMs=${formatOpenCodeLaneTimingMs(lane.launchFinishedAtMs - lane.launchStartedAtMs)}`,
+    `totalMs=${formatOpenCodeLaneTimingMs(lane.launchFinishedAtMs - lane.queuedAtMs)}`,
+  ].join(' ');
 }
 
 function createUnexpectedMixedSecondaryLaneFailureResult(input: {
@@ -1619,6 +1778,7 @@ function createUnexpectedMixedSecondaryLaneFailureResult(input: {
 type LeadActivityState = 'active' | 'idle' | 'offline';
 
 type ProvisioningAuthSource =
+  | 'anthropic_api_key_helper'
   | 'anthropic_api_key'
   | 'anthropic_auth_token'
   | 'configured_api_key_missing'
@@ -1626,14 +1786,36 @@ type ProvisioningAuthSource =
   | 'gemini_runtime'
   | 'none';
 
+interface TeamRuntimeAuthContext {
+  teamName?: string;
+  authMaterialId?: string;
+  allowAnthropicApiKeyHelper?: boolean;
+}
+
 interface ProvisioningEnvResolution {
   env: NodeJS.ProcessEnv;
   authSource: ProvisioningAuthSource;
   geminiRuntimeAuth: GeminiRuntimeAuthState | null;
   providerArgs?: string[];
+  anthropicApiKeyHelper?: AnthropicTeamApiKeyHelperMaterial | null;
   warning?: string;
 }
 
+interface TeamRuntimeLaunchArgsPlan {
+  settingsArgs: string[];
+  fastModeArgs: string[];
+  runtimeTurnSettledHookArgs: string[];
+  providerArgs: string[];
+  extraArgs: string[];
+}
+
+interface CrossProviderMemberArgsResult {
+  args: string[];
+  providerArgsByProvider: Map<TeamProviderId, string[]>;
+  envPatch: NodeJS.ProcessEnv;
+  usesAnthropicApiKeyHelper: boolean;
+}
+
 interface PromptSizeSummary {
   chars: number;
   lines: number;
@@ -1641,6 +1823,11 @@ interface PromptSizeSummary {
 
 const MEMBER_LAUNCH_GRACE_MS = 120_000;
 const MEMBER_BOOTSTRAP_STALL_MS = 5 * 60_000;
+const OPENCODE_BOOTSTRAP_EVIDENCE_LOCK_OPTIONS = {
+  acquireTimeoutMs: 45_000,
+  staleTimeoutMs: 60_000,
+  retryIntervalMs: 50,
+} as const;
 
 export function shouldWarnOnUnreadableMemberAuditConfig(params: {
   nowMs: number;
@@ -1727,6 +1914,18 @@ function collectRuntimeLaunchFailureDiagnostics(
   );
 }
 
+function collectOpenCodeSecondaryLaneFailureDiagnostics(
+  result: TeamRuntimeLaunchResult,
+  memberName: string,
+  prefixDiagnostics: readonly string[]
+): string[] {
+  const diagnostics = [
+    ...prefixDiagnostics,
+    ...collectRuntimeLaunchFailureDiagnostics(result, memberName),
+  ].filter((value): value is string => typeof value === 'string' && value.trim().length > 0);
+  return diagnostics.length > 0 ? diagnostics : ['OpenCode bridge reported member launch failure'];
+}
+
 function isReconciliableOpenCodeUnknownOutcome(diagnostics: readonly string[]): boolean {
   return diagnostics.some((diagnostic) =>
     /outcome must be reconciled before retry/i.test(diagnostic)
@@ -1749,7 +1948,10 @@ function isDefinitiveOpenCodePreLaunchFailure(
     member.agentToolAccepted ||
     member.runtimeAlive ||
     member.bootstrapConfirmed ||
-    typeof member.sessionId === 'string';
+    (typeof member.sessionId === 'string' && member.sessionId.trim().length > 0) ||
+    (typeof member.runtimePid === 'number' &&
+      Number.isFinite(member.runtimePid) &&
+      member.runtimePid > 0);
   if (runtimeMaterialized) {
     return false;
   }
@@ -1758,6 +1960,123 @@ function isDefinitiveOpenCodePreLaunchFailure(
   );
 }
 
+const OPENCODE_BOOTSTRAP_PENDING_DIAGNOSTIC =
+  'opencode_bootstrap_pending_after_materialized_session';
+
+function isMaterializedOpenCodeSessionId(sessionId: unknown): boolean {
+  if (typeof sessionId !== 'string') {
+    return false;
+  }
+  const trimmed = sessionId.trim();
+  return trimmed.length > 0 && !trimmed.startsWith('failed:');
+}
+
+function hasMaterializedOpenCodeRuntimeForBootstrap(
+  member: TeamRuntimeMemberLaunchEvidence | undefined
+): member is TeamRuntimeMemberLaunchEvidence {
+  if (!member) {
+    return false;
+  }
+  if (isMaterializedOpenCodeSessionId(member.sessionId)) {
+    return true;
+  }
+  return (
+    hasOpenCodeRuntimeLivenessMarker(member) &&
+    typeof member.runtimePid === 'number' &&
+    Number.isFinite(member.runtimePid) &&
+    member.runtimePid > 0
+  );
+}
+
+function hasRecoverableOpenCodeBootstrapDiagnostic(diagnostics: readonly string[]): boolean {
+  const text = diagnostics.join('\n').toLowerCase();
+  if (!text) {
+    return false;
+  }
+  if (hasRealOpenCodeFailureDiagnostic(text)) {
+    return false;
+  }
+  return (
+    text.includes('runtime_bootstrap_checkin') ||
+    text.includes('member_briefing') ||
+    text.includes('bootstrap mcp') ||
+    text.includes('member_session_recorded') ||
+    text.includes('not connected') ||
+    text.includes('mcp not connected') ||
+    text.includes('member_launch_reconcile_pending') ||
+    text.includes('member_launch_preview_timeout')
+  );
+}
+
+function isRecoverableOpenCodeBootstrapPendingLaunchResult(
+  result: TeamRuntimeLaunchResult,
+  memberName: string
+): boolean {
+  const member = result.members[memberName];
+  if (!hasMaterializedOpenCodeRuntimeForBootstrap(member)) {
+    return false;
+  }
+  if (member.bootstrapConfirmed || member.launchState === 'confirmed_alive') {
+    return false;
+  }
+  if ((member.pendingPermissionRequestIds?.length ?? 0) > 0) {
+    return false;
+  }
+  return hasRecoverableOpenCodeBootstrapDiagnostic(
+    collectRuntimeLaunchFailureDiagnostics(result, memberName)
+  );
+}
+
+function normalizeRecoverableOpenCodeBootstrapPendingLaunchResult(
+  result: TeamRuntimeLaunchResult,
+  memberName: string,
+  diagnostics: readonly string[]
+): TeamRuntimeLaunchResult {
+  const member = result.members[memberName];
+  if (!member) {
+    return result;
+  }
+  const memberDiagnostics = Array.from(
+    new Set([
+      ...(member.diagnostics ?? []),
+      OPENCODE_BOOTSTRAP_PENDING_DIAGNOSTIC,
+      'OpenCode runtime session materialized; waiting for runtime_bootstrap_checkin.',
+      ...diagnostics,
+    ])
+  );
+  const normalizedMember: TeamRuntimeMemberLaunchEvidence = {
+    ...member,
+    launchState: 'runtime_pending_bootstrap',
+    agentToolAccepted: true,
+    runtimeAlive: true,
+    bootstrapConfirmed: false,
+    hardFailure: false,
+    hardFailureReason: undefined,
+    pendingPermissionRequestIds: undefined,
+    livenessKind:
+      member.livenessKind === 'confirmed_bootstrap'
+        ? 'runtime_process'
+        : (member.livenessKind ?? 'runtime_process'),
+    runtimeDiagnostic:
+      member.runtimeDiagnostic ??
+      'OpenCode runtime process detected; waiting for bootstrap check-in.',
+    runtimeDiagnosticSeverity: member.runtimeDiagnosticSeverity ?? 'info',
+    diagnostics: memberDiagnostics,
+  };
+  const members = {
+    ...result.members,
+    [memberName]: normalizedMember,
+  };
+  const teamLaunchState = summarizeRuntimeLaunchResultMembers(members);
+  return {
+    ...result,
+    launchPhase: teamLaunchState === 'clean_success' ? result.launchPhase : 'active',
+    teamLaunchState,
+    members,
+    diagnostics: Array.from(new Set([...result.diagnostics, ...memberDiagnostics])),
+  };
+}
+
 const OPENCODE_UNCOMMITTED_BOOTSTRAP_DIAGNOSTIC =
   'OpenCode bridge reported bootstrap confirmation, but no lane runtime evidence was committed.';
 
@@ -1902,6 +2221,148 @@ function isPersistedOpenCodeSecondaryLaneMember(
   );
 }
 
+const OPENCODE_BOOTSTRAP_CHECKIN_RETRY_SENT_PREFIX = 'opencode_bootstrap_checkin_retry_prompt_sent';
+
+function getOpenCodeBootstrapCheckinRetryMarker(runId: string, runtimeSessionId: string): string {
+  return `${OPENCODE_BOOTSTRAP_CHECKIN_RETRY_SENT_PREFIX}:${runId}:${runtimeSessionId}`;
+}
+
+const OPENCODE_MEMBER_SESSION_RECORDED_AT_PATTERN =
+  /\bmember_session_recorded\s+at\s+([0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9:.+-]+Z?)\b/i;
+
+function normalizeIsoTimestamp(value: unknown): string | null {
+  if (typeof value !== 'string') {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed) {
+    return null;
+  }
+  const parsed = Date.parse(trimmed);
+  return Number.isFinite(parsed) ? new Date(parsed).toISOString() : null;
+}
+
+function selectEarliestIsoTimestamp(values: readonly unknown[]): string | undefined {
+  let selected: { value: string; timeMs: number } | null = null;
+  for (const value of values) {
+    const normalized = normalizeIsoTimestamp(value);
+    if (!normalized) {
+      continue;
+    }
+    const timeMs = Date.parse(normalized);
+    if (!selected || timeMs < selected.timeMs) {
+      selected = { value: normalized, timeMs };
+    }
+  }
+  return selected?.value;
+}
+
+function extractOpenCodeMemberSessionRecordedAt(
+  diagnostics: readonly string[] | undefined
+): string[] {
+  return (diagnostics ?? []).flatMap((diagnostic) => {
+    const match = OPENCODE_MEMBER_SESSION_RECORDED_AT_PATTERN.exec(diagnostic);
+    return match?.[1] ? [match[1]] : [];
+  });
+}
+
+function resolveOpenCodeBootstrapAcceptedAt(
+  member: Pick<PersistedTeamLaunchMemberState, 'firstSpawnAcceptedAt' | 'diagnostics'>
+): string | undefined {
+  return selectEarliestIsoTimestamp([
+    member.firstSpawnAcceptedAt,
+    ...extractOpenCodeMemberSessionRecordedAt(member.diagnostics),
+  ]);
+}
+
+function hasOpenCodeSecondaryFatalBootstrapDiagnostic(
+  member: Pick<
+    PersistedTeamLaunchMemberState,
+    'diagnostics' | 'runtimeDiagnostic' | 'hardFailureReason'
+  >
+): boolean {
+  const text = [member.runtimeDiagnostic, member.hardFailureReason, ...(member.diagnostics ?? [])]
+    .filter((value): value is string => typeof value === 'string' && value.trim().length > 0)
+    .join('\n')
+    .toLowerCase();
+  return text.length > 0 && hasRealOpenCodeFailureDiagnostic(text);
+}
+
+function selectOpenCodeSecondaryBootstrapStallDiagnostic(
+  values: readonly unknown[]
+): string | null {
+  const normalizedValues = values
+    .filter((value): value is string => typeof value === 'string')
+    .map((value) => normalizeOpenCodePersistedFailureReason(value))
+    .filter((value): value is string => typeof value === 'string' && value.length > 0);
+
+  const runtimeCheckinDiagnostic = normalizedValues.find((value) =>
+    value.toLowerCase().includes('runtime_bootstrap_checkin')
+  );
+  if (runtimeCheckinDiagnostic) {
+    return runtimeCheckinDiagnostic;
+  }
+
+  const memberBriefingDiagnostic = normalizedValues.find((value) =>
+    value.toLowerCase().includes('member_briefing')
+  );
+  if (memberBriefingDiagnostic) {
+    return `${memberBriefingDiagnostic}; runtime_bootstrap_checkin did not complete after 5 min.`;
+  }
+
+  return null;
+}
+
+function getOpenCodeSecondaryBootstrapStallDiagnosticFromPersisted(
+  member: PersistedTeamLaunchMemberState
+): string {
+  const selected = selectOpenCodeSecondaryBootstrapStallDiagnostic([
+    member.runtimeDiagnostic,
+    ...(member.diagnostics ?? []),
+    member.hardFailureReason,
+  ]);
+  if (selected) {
+    return selected;
+  }
+
+  return 'OpenCode bootstrap did not complete runtime_bootstrap_checkin after 5 min.';
+}
+
+function shouldMarkPersistedOpenCodeBootstrapStalled(
+  member: PersistedTeamLaunchMemberState,
+  nowMs: number
+): boolean {
+  if (!isPersistedOpenCodeSecondaryLaneMember(member)) {
+    return false;
+  }
+  if (
+    member.launchState !== 'runtime_pending_bootstrap' ||
+    member.bootstrapConfirmed === true ||
+    member.hardFailure === true ||
+    member.skippedForLaunch === true ||
+    (member.pendingPermissionRequestIds?.length ?? 0) > 0
+  ) {
+    return false;
+  }
+  if (hasOpenCodeSecondaryFatalBootstrapDiagnostic(member)) {
+    return false;
+  }
+  const acceptedAt = resolveOpenCodeBootstrapAcceptedAt(member);
+  const acceptedAtMs = acceptedAt ? Date.parse(acceptedAt) : NaN;
+  if (!Number.isFinite(acceptedAtMs) || nowMs - acceptedAtMs < MEMBER_BOOTSTRAP_STALL_MS) {
+    return false;
+  }
+  return (
+    hasOpenCodeRuntimeHandle(member) ||
+    hasOpenCodeRuntimeLivenessMarker(member) ||
+    hasRecoverableOpenCodeBootstrapDiagnostic(
+      [member.runtimeDiagnostic, ...(member.diagnostics ?? [])].filter(
+        (value): value is string => typeof value === 'string'
+      )
+    )
+  );
+}
+
 function namesMatchCaseInsensitive(left: string, right: string): boolean {
   return left.trim().toLowerCase() === right.trim().toLowerCase();
 }
@@ -1957,10 +2418,16 @@ function hasStaleOpenCodeDiagnostics(values: readonly unknown[] | undefined): bo
     text.includes('registered runtime metadata without live process') ||
     text.includes('member has persisted runtime metadata only') ||
     text.includes('opencode bridge reported member launch failure') ||
+    text.includes('file lock timeout') ||
     text.includes(OPENCODE_UNCOMMITTED_BOOTSTRAP_DIAGNOSTIC.toLowerCase())
   );
 }
 
+function isFileLockTimeoutError(error: unknown): boolean {
+  const message = error instanceof Error ? error.message : String(error);
+  return message.toLowerCase().includes('file lock timeout');
+}
+
 function hasRealOpenCodeFailureDiagnostic(text: string): boolean {
   return (
     /\bauth(?:entication|orization)?\b/.test(text) ||
@@ -1983,6 +2450,105 @@ function hasRealOpenCodeFailureDiagnostic(text: string): boolean {
   );
 }
 
+const OPEN_CODE_GENERIC_MEMBER_LAUNCH_FAILURE_REASON =
+  'OpenCode bridge reported member launch failure';
+const OPEN_CODE_SECRET_FLAG_PATTERN =
+  /(--(?:api-key|token|password|secret|authorization|auth-token)(?:=|\s+))("[^"]*"|'[^']*'|\S+)/gi;
+const OPEN_CODE_BEARER_TOKEN_PATTERN = /\bBearer\s+[A-Z0-9._~+/=-]+/gi;
+const OPEN_CODE_SECRET_KEY_PATTERN = /\bsk-[A-Za-z0-9_-]{16,}\b/g;
+
+function normalizeOpenCodePersistedFailureReason(value: string | undefined): string | undefined {
+  const trimmed = value?.replace(/\s+/g, ' ').trim();
+  if (!trimmed) {
+    return undefined;
+  }
+  return trimmed
+    .replace(OPEN_CODE_SECRET_FLAG_PATTERN, '$1[redacted]')
+    .replace(OPEN_CODE_BEARER_TOKEN_PATTERN, 'Bearer [redacted]')
+    .replace(OPEN_CODE_SECRET_KEY_PATTERN, '[redacted-api-key]');
+}
+
+function isGenericOpenCodePersistedFailureReason(value: string | undefined): boolean {
+  const normalized = normalizeOpenCodePersistedFailureReason(value);
+  return (
+    normalized === OPEN_CODE_GENERIC_MEMBER_LAUNCH_FAILURE_REASON ||
+    normalized?.startsWith(`${OPEN_CODE_GENERIC_MEMBER_LAUNCH_FAILURE_REASON}:`) === true ||
+    normalized?.startsWith('OpenCode secondary lane timing:') === true ||
+    normalized?.startsWith(
+      'OpenCode bridge reported ready without all required durable checkpoints:'
+    ) === true ||
+    normalized?.startsWith(
+      'OpenCode bridge reported ready before all expected members were confirmed:'
+    ) === true ||
+    normalized?.startsWith(
+      'OpenCode bootstrap MCP did not complete required tools before assistant response:'
+    ) === true ||
+    normalized?.startsWith('info:opencode_launch_member_timing:') === true ||
+    normalized?.startsWith('info:opencode_launch_total_timing:') === true
+  );
+}
+
+function selectOpenCodePersistedFailureReasonFromDiagnostics(
+  member: PersistedTeamLaunchMemberState
+): string | undefined {
+  if (!isPersistedOpenCodeSecondaryLaneMember(member)) {
+    return undefined;
+  }
+  if (member.launchState !== 'failed_to_start' || member.hardFailure !== true) {
+    return undefined;
+  }
+  if (!isGenericOpenCodePersistedFailureReason(member.hardFailureReason)) {
+    return undefined;
+  }
+  for (const value of member.diagnostics ?? []) {
+    const normalized = normalizeOpenCodePersistedFailureReason(value);
+    if (!normalized || isGenericOpenCodePersistedFailureReason(normalized)) {
+      continue;
+    }
+    return normalized;
+  }
+  return undefined;
+}
+
+function promoteOpenCodePersistedFailureReasonsFromDiagnostics(
+  snapshot: PersistedTeamLaunchSnapshot | null
+): PersistedTeamLaunchSnapshot | null {
+  if (!snapshot) {
+    return null;
+  }
+  let changed = false;
+  const members: Record<string, PersistedTeamLaunchMemberState> = { ...snapshot.members };
+  for (const [memberName, member] of Object.entries(snapshot.members)) {
+    const promotedReason = selectOpenCodePersistedFailureReasonFromDiagnostics(member);
+    if (!promotedReason || promotedReason === member.hardFailureReason) {
+      continue;
+    }
+    members[memberName] = {
+      ...member,
+      hardFailureReason: promotedReason,
+      runtimeDiagnostic:
+        member.runtimeDiagnostic &&
+        !isGenericOpenCodePersistedFailureReason(member.runtimeDiagnostic)
+          ? member.runtimeDiagnostic
+          : promotedReason,
+      runtimeDiagnosticSeverity: member.runtimeDiagnosticSeverity ?? 'error',
+    };
+    changed = true;
+  }
+  if (!changed) {
+    return snapshot;
+  }
+  return createPersistedLaunchSnapshot({
+    teamName: snapshot.teamName,
+    expectedMembers: snapshot.expectedMembers,
+    bootstrapExpectedMembers: snapshot.bootstrapExpectedMembers,
+    leadSessionId: snapshot.leadSessionId,
+    launchPhase: snapshot.launchPhase,
+    members,
+    updatedAt: nowIso(),
+  });
+}
+
 function promoteOpenCodeSecondaryMemberFromCommittedBootstrapEvidence(input: {
   current: PersistedTeamLaunchMemberState;
   previous: PersistedTeamLaunchMemberState | null;
@@ -1996,7 +2562,12 @@ function promoteOpenCodeSecondaryMemberFromCommittedBootstrapEvidence(input: {
       'opencode_bootstrap_evidence_committed',
     ]),
   ];
-  const runtimeAlive = input.current.runtimeAlive === true;
+  const runtimeAlive = true;
+  const livenessKind =
+    input.current.livenessKind === 'runtime_process' ||
+    input.current.livenessKind === 'confirmed_bootstrap'
+      ? input.current.livenessKind
+      : 'confirmed_bootstrap';
   return {
     ...input.previous,
     ...input.current,
@@ -2008,12 +2579,7 @@ function promoteOpenCodeSecondaryMemberFromCommittedBootstrapEvidence(input: {
     hardFailureReason: undefined,
     runtimeRunId: input.session.runId ?? input.current.runtimeRunId,
     runtimeSessionId: input.session.id,
-    livenessKind: runtimeAlive
-      ? input.current.livenessKind
-      : input.current.livenessKind === 'runtime_process' ||
-          input.current.livenessKind === 'runtime_process_candidate'
-        ? input.current.livenessKind
-        : 'confirmed_bootstrap',
+    livenessKind,
     runtimeDiagnostic: 'OpenCode bootstrap evidence committed.',
     runtimeDiagnosticSeverity: 'info',
     firstSpawnAcceptedAt:
@@ -2083,6 +2649,15 @@ function isRegisteredRuntimeMetadataFailureReason(reason?: string): boolean {
   return reason?.trim() === 'registered runtime metadata without live process';
 }
 
+function isBootstrapMcpResourceReadFailureReason(reason?: string): boolean {
+  const text = reason?.trim().toLowerCase() ?? '';
+  return (
+    text.includes('resources/read failed') &&
+    text.includes('member_briefing') &&
+    (text.includes('method not found') || text.includes('mcp error'))
+  );
+}
+
 function isTmuxNoServerRunningError(error: unknown): boolean {
   const text = error instanceof Error ? error.message : String(error ?? '');
   return (
@@ -2097,7 +2672,8 @@ function isAutoClearableLaunchFailureReason(reason?: string): boolean {
     isLaunchGraceWindowFailureReason(reason) ||
     isConfigRegistrationFailureReason(reason) ||
     isRegisteredRuntimeMetadataFailureReason(reason) ||
-    isOpenCodeBridgeLaunchFailureReason(reason)
+    isOpenCodeBridgeLaunchFailureReason(reason) ||
+    isBootstrapMcpResourceReadFailureReason(reason)
   );
 }
 
@@ -2568,6 +3144,20 @@ function normalizeTeamProviderLike(providerId: unknown): TeamProviderId | undefi
   );
 }
 
+function teamRequestIncludesCodexMember(
+  request: Pick<TeamCreateRequest, 'providerId'> & Partial<Pick<TeamCreateRequest, 'members'>>
+): boolean {
+  const defaultProviderId = normalizeTeamMemberProviderId(request.providerId) ?? 'anthropic';
+  const members = Array.isArray(request.members) ? request.members : [];
+  return members.some((member) => {
+    const memberProviderId =
+      normalizeTeamMemberProviderId(member.providerId) ??
+      normalizeTeamMemberProviderId((member as { provider?: unknown }).provider) ??
+      defaultProviderId;
+    return memberProviderId === 'codex';
+  });
+}
+
 function buildEffectiveTeamMemberSpec(
   member: TeamMemberInput,
   defaults: {
@@ -2794,15 +3384,23 @@ function isBootstrapTranscriptSuccessText(
   teamName: string,
   memberName: string
 ): boolean {
+  return getBootstrapTranscriptSuccessSource(text, teamName, memberName) !== null;
+}
+
+function getBootstrapTranscriptSuccessSource(
+  text: string,
+  teamName: string,
+  memberName: string
+): BootstrapTranscriptSuccessSource | null {
   const normalizedText = text.replace(/\s+/g, ' ').trim().toLowerCase();
   if (!normalizedText) {
-    return false;
+    return null;
   }
 
   const normalizedTeamName = teamName.trim().toLowerCase();
   const normalizedMemberName = memberName.trim().toLowerCase();
   if (!normalizedTeamName || !normalizedMemberName) {
-    return false;
+    return null;
   }
 
   if (
@@ -2813,13 +3411,13 @@ function isBootstrapTranscriptSuccessText(
       `member briefing for ${normalizedMemberName} on team '${normalizedTeamName}' (${normalizedTeamName}).`
     )
   ) {
-    return true;
+    return 'member_briefing';
   }
 
-  return (
-    normalizedText.includes(`bootstrap выполнен для \`${normalizedMemberName}\``) &&
+  return normalizedText.includes(`bootstrap выполнен для \`${normalizedMemberName}\``) &&
     normalizedText.includes(`команде \`${normalizedTeamName}\``)
-  );
+    ? 'assistant_text'
+    : null;
 }
 
 function isBootstrapTranscriptContextText(
@@ -2980,7 +3578,8 @@ function buildMemberSpawnPrompt(
   member: TeamCreateRequest['members'][number],
   displayName: string,
   teamName: string,
-  leadName: string
+  leadName: string,
+  options?: { restart?: boolean }
 ): string {
   const role = member.role?.trim() || 'team member';
   const providerLine =
@@ -2994,10 +3593,13 @@ function buildMemberSpawnPrompt(
   const workflowBlock = member.workflow?.trim()
     ? `\n\nYour workflow and how you should behave:${formatWorkflowBlock(member.workflow, '')}`
     : '';
+  const restartContext = options?.restart
+    ? '\n\nThe team has already been reconnected and you are being re-attached as a persistent teammate.\nThis is a teammate restart. Repeat bootstrap exactly once, then wait for normal work instructions.'
+    : '';
   const actionModeProtocol = protocols.buildActionModeProtocolText(
     protocols.MEMBER_DELEGATE_DESCRIPTION
   );
-  return `You are ${member.name}, a ${role} on team "${displayName}" (${teamName}).${providerLine}${modelLine}${effortLine}${workflowBlock}
+  return `You are ${member.name}, a ${role} on team "${displayName}" (${teamName}).${providerLine}${modelLine}${effortLine}${workflowBlock}${restartContext}
 
 ${getAgentLanguageInstruction()}
 Your FIRST action: call MCP tool member_briefing with:
@@ -4007,6 +4609,18 @@ function buildLaunchDiagnosticsFromRun(
       });
       continue;
     }
+    if (entry.bootstrapStalled === true) {
+      items.push({
+        id: `${memberName}:bootstrap_stalled`,
+        memberName,
+        severity: 'warning',
+        code: 'bootstrap_stalled',
+        label: `${memberName} - bootstrap stalled`,
+        detail: entry.runtimeDiagnostic,
+        observedAt,
+      });
+      continue;
+    }
     if (mentionsProcessTableUnavailable(entry.runtimeDiagnostic)) {
       items.push({
         id: `${memberName}:process_table_unavailable`,
@@ -4424,6 +5038,27 @@ interface OpenCodeMemberInboxDelivery {
   diagnostics?: string[];
 }
 
+interface OpenCodeMemberDirectory {
+  config: TeamConfig | null;
+  teamMeta: Awaited<ReturnType<TeamMetaStore['getMeta']>> | null;
+  metaMembers: Awaited<ReturnType<TeamMembersMetaStore['getMembers']>>;
+}
+
+type OpenCodeMemberIdentityResolution =
+  | {
+      ok: true;
+      canonicalMemberName: string;
+      laneId: string;
+      laneIdentity: ReturnType<typeof buildPlannedMemberLaneIdentity>;
+      configMember?: TeamMember;
+      metaMember?: TeamMember;
+      memberRuntimeCwd?: string;
+    }
+  | {
+      ok: false;
+      reason: 'recipient_is_not_opencode' | 'recipient_removed' | 'opencode_recipient_unavailable';
+    };
+
 interface OpenCodeMemberInboxRelayResult {
   relayed: number;
   attempted: number;
@@ -4473,11 +5108,19 @@ export class TeamProvisioningService {
   private static readonly SAME_TEAM_RUN_START_SKEW_MS = 1_000;
   private static readonly SAME_TEAM_PERSIST_RETRY_MS = 2_000;
   private static readonly AGENT_RUNTIME_SNAPSHOT_CACHE_TTL_MS = 2_000;
+  private static readonly MEMBER_SPAWN_STATUS_SNAPSHOT_CACHE_TTL_MS = 500;
+  private static readonly LAUNCH_STATE_NOOP_REFRESH_MS = 15_000;
+  private static readonly RETAINED_PROVISIONING_PROGRESS_TTL_MS = 5 * 60_000;
 
   private readonly runs = new Map<string, ProvisioningRun>();
   private readonly provisioningRunByTeam = new Map<string, string>();
   private readonly aliveRunByTeam = new Map<string, string>();
   private readonly runtimeAdapterProgressByRunId = new Map<string, TeamProvisioningProgress>();
+  private retainedProvisioningProgressByRunId: Map<string, TeamProvisioningProgress> | undefined =
+    new Map<string, TeamProvisioningProgress>();
+  private retainedProvisioningProgressTimersByRunId:
+    | Map<string, ReturnType<typeof setTimeout>>
+    | undefined = new Map<string, ReturnType<typeof setTimeout>>();
   private readonly runtimeAdapterTraceLinesByRunId = new Map<string, string[]>();
   private readonly runtimeAdapterTraceKeyByRunId = new Map<string, string>();
   private readonly runtimeAdapterRunByTeam = new Map<
@@ -4533,12 +5176,56 @@ export class TeamProvisioningService {
     string,
     { expiresAtMs: number; snapshot: TeamAgentRuntimeSnapshot }
   >();
+  private readonly agentRuntimeSnapshotInFlightByTeam = new Map<
+    string,
+    {
+      generationAtStart: number;
+      runIdAtStart: string | null;
+      promise: Promise<TeamAgentRuntimeSnapshot>;
+    }
+  >();
   private readonly liveTeamAgentRuntimeMetadataCache = new Map<
     string,
-    { expiresAtMs: number; metadata: Map<string, LiveTeamAgentRuntimeMetadata> }
+    {
+      expiresAtMs: number;
+      metadata: Map<string, LiveTeamAgentRuntimeMetadata>;
+      runId: string | null;
+    }
   >();
+  private readonly liveTeamAgentRuntimeMetadataInFlightByTeam = new Map<
+    string,
+    {
+      generationAtStart: number;
+      runIdAtStart: string | null;
+      promise: Promise<Map<string, LiveTeamAgentRuntimeMetadata>>;
+    }
+  >();
+  private readonly runtimeSnapshotCacheGenerationByTeam = new Map<string, number>();
+  private readonly memberSpawnStatusesSnapshotCache = new Map<
+    string,
+    {
+      expiresAtMs: number;
+      generation: number;
+      runId: string;
+      snapshot: MemberSpawnStatusesSnapshot;
+    }
+  >();
+  private readonly memberSpawnStatusesInFlightByTeam = new Map<
+    string,
+    {
+      generationAtStart: number;
+      runIdAtStart: string;
+      promise: Promise<MemberSpawnStatusesSnapshot>;
+    }
+  >();
+  private readonly memberSpawnStatusesCacheGenerationByTeam = new Map<string, number>();
   private readonly launchStateStore = new TeamLaunchStateStore();
   private readonly launchStateStoreQueue = new Map<string, Promise<unknown>>();
+  private readonly launchStateWrittenRunIdByTeam = new Map<string, string>();
+  private readonly failedOpenCodeSecondaryRetryInFlightByTeam = new Map<
+    string,
+    Promise<RetryFailedOpenCodeSecondaryLanesResult>
+  >();
   private readonly memberLogsFinder: TeamMemberLogsFinder;
   private readonly transcriptProjectResolver: TeamTranscriptProjectResolver;
   private teamChangeEmitter: ((event: TeamChangeEvent) => void) | null = null;
@@ -4588,7 +5275,195 @@ export class TeamProvisioningService {
       this.inboxReader,
       this.membersMetaStore
     );
-    this.transcriptProjectResolver = new TeamTranscriptProjectResolver(this.configReader);
+    this.transcriptProjectResolver = new TeamTranscriptProjectResolver({
+      getConfig: (teamName) => this.configReader.getConfigSnapshot(teamName),
+    });
+    this.scheduleStaleAnthropicTeamApiKeyHelperCleanup();
+  }
+
+  private scheduleStaleAnthropicTeamApiKeyHelperCleanup(): void {
+    void cleanupStaleAnthropicTeamApiKeyHelpers({
+      baseClaudeDir: getClaudeBasePath(),
+      maxAgeMs: 14 * 24 * 60 * 60 * 1000,
+    }).catch((error: unknown) => {
+      logger.warn(
+        `Failed to cleanup stale Anthropic team API-key helper material: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    });
+  }
+
+  private async readConfigSnapshot(teamName: string): Promise<TeamConfig | null> {
+    const configReader = this.configReader as TeamConfigReader & {
+      getConfigSnapshot?: (name: string) => Promise<TeamConfig | null>;
+    };
+    return typeof configReader.getConfigSnapshot === 'function'
+      ? configReader.getConfigSnapshot(teamName)
+      : configReader.getConfig(teamName);
+  }
+
+  private readConfigForObservation(teamName: string): Promise<TeamConfig | null> {
+    return this.readConfigSnapshot(teamName);
+  }
+
+  private readConfigForStrictDecision(teamName: string): Promise<TeamConfig | null> {
+    return this.configReader.getConfig(teamName);
+  }
+
+  private async readOpenCodeMemberDirectory(teamName: string): Promise<OpenCodeMemberDirectory> {
+    const [config, teamMeta, metaMembers] = await Promise.all([
+      this.readConfigForObservation(teamName).catch(() => null),
+      this.teamMetaStore.getMeta(teamName).catch(() => null),
+      this.membersMetaStore.getMembers(teamName).catch(() => []),
+    ]);
+    return { config, teamMeta, metaMembers };
+  }
+
+  private getRuntimeSnapshotCacheGeneration(teamName: string): number {
+    return this.runtimeSnapshotCacheGenerationByTeam.get(teamName) ?? 0;
+  }
+
+  private getMemberSpawnStatusesCacheGeneration(teamName: string): number {
+    return this.memberSpawnStatusesCacheGenerationByTeam.get(teamName) ?? 0;
+  }
+
+  private invalidateMemberSpawnStatusesCache(teamName: string): void {
+    this.memberSpawnStatusesCacheGenerationByTeam.set(
+      teamName,
+      this.getMemberSpawnStatusesCacheGeneration(teamName) + 1
+    );
+    this.memberSpawnStatusesSnapshotCache.delete(teamName);
+    this.memberSpawnStatusesInFlightByTeam.delete(teamName);
+  }
+
+  private invalidateRuntimeSnapshotCaches(teamName: string): void {
+    this.runtimeSnapshotCacheGenerationByTeam.set(
+      teamName,
+      this.getRuntimeSnapshotCacheGeneration(teamName) + 1
+    );
+    this.agentRuntimeSnapshotCache.delete(teamName);
+    this.agentRuntimeSnapshotInFlightByTeam.delete(teamName);
+    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.liveTeamAgentRuntimeMetadataInFlightByTeam.delete(teamName);
+  }
+
+  private cloneMemberSpawnStatusesSnapshot(
+    snapshot: MemberSpawnStatusesSnapshot
+  ): MemberSpawnStatusesSnapshot {
+    return {
+      ...snapshot,
+      statuses: Object.fromEntries(
+        Object.entries(snapshot.statuses).map(([memberName, entry]) => [
+          memberName,
+          {
+            ...entry,
+            ...(entry.pendingPermissionRequestIds
+              ? { pendingPermissionRequestIds: [...entry.pendingPermissionRequestIds] }
+              : {}),
+          },
+        ])
+      ),
+      ...(snapshot.expectedMembers ? { expectedMembers: [...snapshot.expectedMembers] } : {}),
+      ...(snapshot.summary ? { summary: { ...snapshot.summary } } : {}),
+    };
+  }
+
+  private cloneLiveTeamAgentRuntimeMetadata(
+    metadata: ReadonlyMap<string, LiveTeamAgentRuntimeMetadata>
+  ): Map<string, LiveTeamAgentRuntimeMetadata> {
+    return new Map(
+      [...metadata.entries()].map(([memberName, entry]) => [
+        memberName,
+        {
+          ...entry,
+          ...(entry.diagnostics ? { diagnostics: [...entry.diagnostics] } : {}),
+        },
+      ])
+    );
+  }
+
+  private resolveOpenCodeMemberIdentityFromDirectory(
+    teamName: string,
+    memberName: string,
+    directory: OpenCodeMemberDirectory
+  ): OpenCodeMemberIdentityResolution {
+    const normalizedMemberName = memberName.trim();
+    const configMember = directory.config?.members?.find(
+      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
+    );
+    const metaMember = directory.metaMembers.find(
+      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
+    );
+    if (!configMember && !metaMember) {
+      return { ok: false, reason: 'opencode_recipient_unavailable' };
+    }
+
+    const configProvider = (configMember as { provider?: unknown } | undefined)?.provider;
+    const metaProvider = (metaMember as { provider?: unknown } | undefined)?.provider;
+    const providerId =
+      normalizeTeamProviderLike(metaMember?.providerId) ??
+      normalizeTeamProviderLike(metaProvider) ??
+      normalizeTeamProviderLike(configMember?.providerId) ??
+      normalizeTeamProviderLike(configProvider) ??
+      inferTeamProviderIdFromModel(metaMember?.model ?? configMember?.model);
+    if (providerId !== 'opencode') {
+      return { ok: false, reason: 'recipient_is_not_opencode' };
+    }
+
+    const removedAt =
+      metaMember != null
+        ? metaMember.removedAt
+        : (configMember as { removedAt?: unknown } | undefined)?.removedAt;
+    if (removedAt != null) {
+      return { ok: false, reason: 'recipient_removed' };
+    }
+
+    const canonicalMemberName =
+      metaMember?.name?.trim() || configMember?.name?.trim() || normalizedMemberName;
+    const runtimeRun = this.runtimeAdapterRunByTeam.get(teamName);
+    if (runtimeRun?.providerId === 'opencode') {
+      const laneIdentity = buildPlannedMemberLaneIdentity({
+        leadProviderId: 'opencode',
+        member: {
+          name: canonicalMemberName,
+          providerId: 'opencode',
+        },
+      });
+      const memberRuntimeCwd = metaMember?.cwd?.trim() || configMember?.cwd?.trim();
+      return {
+        ok: true,
+        canonicalMemberName,
+        laneId: laneIdentity.laneId,
+        laneIdentity,
+        ...(configMember ? { configMember } : {}),
+        ...(metaMember ? { metaMember } : {}),
+        ...(memberRuntimeCwd ? { memberRuntimeCwd } : {}),
+      };
+    }
+
+    const leadMember = directory.config?.members?.find((member) => isLeadMember(member));
+    const leadProviderId =
+      normalizeOptionalTeamProviderId(directory.teamMeta?.launchIdentity?.providerId) ??
+      normalizeOptionalTeamProviderId(directory.teamMeta?.providerId) ??
+      normalizeOptionalTeamProviderId(leadMember?.providerId);
+    const laneIdentity = buildPlannedMemberLaneIdentity({
+      leadProviderId,
+      member: {
+        name: canonicalMemberName,
+        providerId,
+      },
+    });
+    const memberRuntimeCwd = metaMember?.cwd?.trim() || configMember?.cwd?.trim();
+    return {
+      ok: true,
+      canonicalMemberName,
+      laneId: laneIdentity.laneId,
+      laneIdentity,
+      ...(configMember ? { configMember } : {}),
+      ...(metaMember ? { metaMember } : {}),
+      ...(memberRuntimeCwd ? { memberRuntimeCwd } : {}),
+    };
   }
 
   setRuntimeAdapterRegistry(registry: TeamRuntimeAdapterRegistry | null): void {
@@ -4640,23 +5515,94 @@ export class TeamProvisioningService {
   private async buildRuntimeTurnSettledHookSettingsArgs(
     providerId: TeamProviderId
   ): Promise<string[]> {
+    const settings = await this.buildRuntimeTurnSettledHookSettingsObject(providerId);
+    return settings ? ['--settings', JSON.stringify(settings)] : [];
+  }
+
+  private async buildRuntimeTurnSettledHookSettingsObject(
+    providerId: TeamProviderId
+  ): Promise<TeamRuntimeSettingsJson | null> {
     if (providerId !== 'anthropic' || !this.runtimeTurnSettledHookSettingsProvider) {
-      return [];
+      return null;
     }
 
     try {
       const settings = await this.runtimeTurnSettledHookSettingsProvider({ provider: 'claude' });
-      return settings ? ['--settings', JSON.stringify(settings)] : [];
+      return settings ?? null;
     } catch (error) {
       logger.warn(
         `Failed to build member work sync Stop hook settings: ${
           error instanceof Error ? error.message : String(error)
         }`
       );
-      return [];
+      return null;
     }
   }
 
+  private async buildTeamRuntimeLaunchArgsPlan(input: {
+    teamName: string;
+    providerId: TeamProviderId;
+    launchIdentity?: ProviderModelLaunchIdentity | null;
+    envResolution: ProvisioningEnvResolution;
+    extraArgs?: string[];
+    includeAnthropicHelper: boolean;
+    contextLabel: string;
+  }): Promise<TeamRuntimeLaunchArgsPlan> {
+    const resolvedProviderId = resolveTeamProviderId(input.providerId);
+    const helper =
+      input.includeAnthropicHelper && resolvedProviderId === 'anthropic'
+        ? (input.envResolution.anthropicApiKeyHelper ?? null)
+        : null;
+    const rawProviderArgs = input.envResolution.providerArgs ?? [];
+    const rawExtraArgs = input.extraArgs ?? [];
+
+    if (!helper) {
+      return {
+        settingsArgs: [],
+        fastModeArgs: buildProviderFastModeArgs(resolvedProviderId, input.launchIdentity),
+        runtimeTurnSettledHookArgs:
+          await this.buildRuntimeTurnSettledHookSettingsArgs(resolvedProviderId),
+        providerArgs: rawProviderArgs,
+        extraArgs: rawExtraArgs,
+      };
+    }
+
+    const providerArgsWithoutHelper = filterOutSettingsPathArgs(
+      rawProviderArgs,
+      helper.settingsPath
+    );
+    const splitProviderArgs = splitSettingsJsonArgs(providerArgsWithoutHelper);
+    const splitExtraArgs = splitSettingsJsonArgs(rawExtraArgs);
+    if (
+      hasPathBasedSettingsArgs(splitProviderArgs.passthroughArgs) ||
+      hasPathBasedSettingsArgs(splitExtraArgs.passthroughArgs)
+    ) {
+      throw new Error(
+        `${input.contextLabel}: app-managed Anthropic API-key helper cannot be combined with path-based --settings. Use inline JSON settings or remove the custom --settings path.`
+      );
+    }
+
+    const settingsBundle = await materializeTeamRuntimeSettingsBundle({
+      teamName: input.teamName,
+      providerId: resolvedProviderId,
+      baseSettings: [
+        buildAnthropicSettingsObject(resolvedProviderId, input.launchIdentity),
+        await this.buildRuntimeTurnSettledHookSettingsObject(resolvedProviderId),
+        ...splitProviderArgs.settingsFragments,
+        ...splitExtraArgs.settingsFragments,
+      ],
+      anthropicHelper: helper,
+    });
+
+    return {
+      settingsArgs: settingsBundle?.args ?? [],
+      fastModeArgs: [],
+      runtimeTurnSettledHookArgs: [],
+      providerArgs: splitProviderArgs.passthroughArgs,
+      extraArgs: splitExtraArgs.passthroughArgs,
+    };
+  }
+
   private async buildRuntimeTurnSettledEnvironment(
     providerId: TeamProviderId
   ): Promise<Record<string, string>> {
@@ -5045,6 +5991,7 @@ export class TeamProvisioningService {
       'providerId' | 'providerBackendId' | 'model' | 'effort' | 'fastMode' | 'limitContext'
     >;
     effectiveMembers: TeamCreateRequest['members'];
+    providerArgsByProvider?: Map<TeamProviderId, string[]>;
   }): Promise<ProviderModelLaunchIdentity> {
     const leadProviderId = resolveTeamProviderId(params.request.providerId);
     const factsByProvider = new Map<TeamProviderId, RuntimeProviderLaunchFacts>();
@@ -5058,6 +6005,7 @@ export class TeamProvisioningService {
         cwd: params.cwd,
         providerId,
         env: params.env,
+        providerArgs: params.providerArgsByProvider?.get(providerId),
         limitContext: params.request.limitContext,
       });
       factsByProvider.set(providerId, facts);
@@ -5261,7 +6209,7 @@ export class TeamProvisioningService {
     const adapter = this.getOpenCodeRuntimeAdapter();
     const previousLaunchState = await this.launchStateStore.read(teamName).catch(() => null);
     const [config, metaMembers] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
+      this.readConfigForObservation(teamName).catch(() => null),
       this.membersMetaStore.getMembers(teamName).catch(() => []),
     ]);
     const evidenceReader = new OpenCodeRuntimeManifestEvidenceReader({
@@ -5320,6 +6268,7 @@ export class TeamProvisioningService {
         this.runtimeAdapterRunByTeam.delete(teamName);
         this.aliveRunByTeam.delete(teamName);
         this.provisioningRunByTeam.delete(teamName);
+        this.invalidateRuntimeSnapshotCaches(teamName);
       }
     }
     if (cleaned > 0) {
@@ -5462,16 +6411,15 @@ export class TeamProvisioningService {
     };
   }
 
-  async isOpenCodeRuntimeRecipient(teamName: string, memberName: string): Promise<boolean> {
+  private resolveRuntimeRecipientProviderIdFromSources(
+    memberName: string,
+    config: TeamConfig | null | undefined,
+    metaMembers: readonly TeamMember[]
+  ): TeamProviderId | undefined {
     const normalizedMemberName = memberName.trim().toLowerCase();
     if (!normalizedMemberName) {
-      return false;
+      return undefined;
     }
-
-    const [config, metaMembers] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
-      this.membersMetaStore.getMembers(teamName).catch(() => []),
-    ]);
     const configMember = config?.members?.find(
       (member) => member.name?.trim().toLowerCase() === normalizedMemberName
     );
@@ -5480,13 +6428,48 @@ export class TeamProvisioningService {
     );
     const configProvider = (configMember as { provider?: unknown } | undefined)?.provider;
     const metaProvider = (metaMember as { provider?: unknown } | undefined)?.provider;
-    const providerId =
+    return (
       normalizeTeamProviderLike(metaMember?.providerId) ??
       normalizeTeamProviderLike(metaProvider) ??
       normalizeTeamProviderLike(configMember?.providerId) ??
       normalizeTeamProviderLike(configProvider) ??
-      inferTeamProviderIdFromModel(metaMember?.model ?? configMember?.model);
-    return providerId === 'opencode';
+      inferTeamProviderIdFromModel(metaMember?.model ?? configMember?.model)
+    );
+  }
+
+  private isOpenCodeRuntimeRecipientFromSources(
+    memberName: string,
+    config: TeamConfig | null | undefined,
+    metaMembers: readonly TeamMember[]
+  ): boolean {
+    return (
+      this.resolveRuntimeRecipientProviderIdFromSources(memberName, config, metaMembers) ===
+      'opencode'
+    );
+  }
+
+  async resolveRuntimeRecipientProviderId(
+    teamName: string,
+    memberName: string
+  ): Promise<TeamProviderId | undefined> {
+    const normalizedMemberName = memberName.trim().toLowerCase();
+    if (!normalizedMemberName) {
+      return undefined;
+    }
+
+    const [config, metaMembers] = await Promise.all([
+      this.readConfigSnapshot(teamName).catch(() => null),
+      this.membersMetaStore.getMembers(teamName).catch(() => []),
+    ]);
+    return this.resolveRuntimeRecipientProviderIdFromSources(
+      normalizedMemberName,
+      config,
+      metaMembers
+    );
+  }
+
+  async isOpenCodeRuntimeRecipient(teamName: string, memberName: string): Promise<boolean> {
+    return (await this.resolveRuntimeRecipientProviderId(teamName, memberName)) === 'opencode';
   }
 
   private isOpenCodeDeliveryResponseReadCommitAllowed(input: {
@@ -5558,6 +6541,12 @@ export class TeamProvisioningService {
     taskRefs?: TaskRef[];
     ledgerRecord?: OpenCodePromptDeliveryLedgerRecord | null;
   }): boolean {
+    if (this.isOpenCodeDirectUserPromptDelivery(input.ledgerRecord)) {
+      return Boolean(
+        input.ledgerRecord?.visibleReplyInbox?.trim() &&
+        input.ledgerRecord?.visibleReplyMessageId?.trim()
+      );
+    }
     const preview = input.ledgerRecord?.observedAssistantPreview?.trim();
     if (!preview) {
       return true;
@@ -5593,6 +6582,13 @@ export class TeamProvisioningService {
       ) {
         return 'plain_text_ack_only_still_requires_answer';
       }
+      if (
+        this.isOpenCodeDirectUserPromptDelivery(record) &&
+        !record?.visibleReplyMessageId &&
+        !record?.inboxReadCommittedAt
+      ) {
+        return 'plain_text_visible_reply_not_materialized_yet';
+      }
     }
     if (state === 'responded_visible_message' && !input.visibleReply) {
       return 'visible_reply_destination_not_found_yet';
@@ -5682,6 +6678,12 @@ export class TeamProvisioningService {
     return diagnostics.some((diagnostic) => isProbeTimeoutMessage(diagnostic));
   }
 
+  private isOpenCodeDirectUserPromptDelivery(
+    ledgerRecord?: OpenCodePromptDeliveryLedgerRecord | null
+  ): boolean {
+    return ledgerRecord?.replyRecipient?.trim().toLowerCase() === 'user';
+  }
+
   private isOpenCodePromptDeliveryWatchdogEnabled(): boolean {
     const enabled = process.env.CLAUDE_TEAM_OPENCODE_PROMPT_DELIVERY_WATCHDOG !== '0';
     if (!enabled && !this.openCodePromptDeliveryWatchdogDisabledLogged) {
@@ -5768,8 +6770,7 @@ export class TeamProvisioningService {
   }): Promise<string[]> {
     const explicitRecipient = input.replyRecipient?.trim() || 'user';
     const candidates = [explicitRecipient];
-    const configuredLeadName = await this.configReader
-      .getConfig(input.teamName)
+    const configuredLeadName = await this.readConfigForObservation(input.teamName)
       .then(
         (config) => config?.members?.find((member) => isLeadMember(member))?.name?.trim() || null
       )
@@ -5853,6 +6854,128 @@ export class TeamProvisioningService {
     return { ledgerRecord, visibleReply };
   }
 
+  private buildOpenCodePlainTextVisibleReplyMessageId(
+    record: OpenCodePromptDeliveryLedgerRecord
+  ): string {
+    const safeId = record.id.replace(/[^a-zA-Z0-9_-]/g, '-').slice(0, 96);
+    return `opencode-plain-reply-${safeId}`;
+  }
+
+  private buildOpenCodePlainTextVisibleReplySummary(text: string): string {
+    const normalized = text.replace(/\s+/g, ' ').trim();
+    return normalized.length > 120 ? `${normalized.slice(0, 117).trimEnd()}...` : normalized;
+  }
+
+  private async materializeOpenCodePlainTextReplyIfNeeded(input: {
+    ledger: OpenCodePromptDeliveryLedgerStore;
+    ledgerRecord: OpenCodePromptDeliveryLedgerRecord;
+    teamName: string;
+    memberName: string;
+    visibleReply?: OpenCodeVisibleReplyProof | null;
+  }): Promise<{
+    ledgerRecord: OpenCodePromptDeliveryLedgerRecord;
+    visibleReply: OpenCodeVisibleReplyProof | null;
+  }> {
+    if (input.visibleReply) {
+      return { ledgerRecord: input.ledgerRecord, visibleReply: input.visibleReply };
+    }
+    if (
+      input.ledgerRecord.responseState !== 'responded_plain_text' ||
+      !this.isOpenCodeDirectUserPromptDelivery(input.ledgerRecord) ||
+      input.ledgerRecord.visibleReplyMessageId ||
+      input.ledgerRecord.visibleReplyInbox
+    ) {
+      return { ledgerRecord: input.ledgerRecord, visibleReply: null };
+    }
+
+    const text = input.ledgerRecord.observedAssistantPreview?.trim();
+    if (!text) {
+      return { ledgerRecord: input.ledgerRecord, visibleReply: null };
+    }
+    const semantic = isOpenCodeVisibleReplySemanticallySufficient({
+      actionMode: input.ledgerRecord.actionMode,
+      taskRefs: input.ledgerRecord.taskRefs,
+      text,
+    });
+    if (!semantic.sufficient) {
+      return { ledgerRecord: input.ledgerRecord, visibleReply: null };
+    }
+
+    const messageId = this.buildOpenCodePlainTextVisibleReplyMessageId(input.ledgerRecord);
+    const existing = await this.findOpenCodeVisibleReplyByRelayOfMessageId({
+      teamName: input.teamName,
+      replyRecipient: 'user',
+      from: input.memberName,
+      relayOfMessageId: input.ledgerRecord.inboxMessageId,
+      expectedMessageId: messageId,
+    });
+
+    if (existing) {
+      const ledgerRecord = await input.ledger.applyDestinationProof({
+        id: input.ledgerRecord.id,
+        visibleReplyInbox: existing.inboxName,
+        visibleReplyMessageId: existing.message.messageId,
+        visibleReplyCorrelation: 'plain_assistant_text',
+        semanticallySufficient: true,
+        diagnostics: existing.missingRuntimeDeliverySource
+          ? ['plain_text_visible_reply_missing_runtime_delivery_source']
+          : [],
+        observedAt: nowIso(),
+      });
+      return { ledgerRecord, visibleReply: existing };
+    }
+
+    const timestamp =
+      input.ledgerRecord.respondedAt ??
+      input.ledgerRecord.lastObservedAt ??
+      input.ledgerRecord.updatedAt ??
+      nowIso();
+    try {
+      const written = await this.inboxWriter.sendMessage(input.teamName, {
+        member: 'user',
+        from: input.memberName,
+        to: 'user',
+        text,
+        summary: this.buildOpenCodePlainTextVisibleReplySummary(text),
+        timestamp,
+        messageId,
+        relayOfMessageId: input.ledgerRecord.inboxMessageId,
+        source: 'runtime_delivery',
+      });
+      const visibleReply: OpenCodeVisibleReplyProof = {
+        inboxName: 'user',
+        message: {
+          from: input.memberName,
+          to: 'user',
+          text,
+          timestamp,
+          read: false,
+          summary: this.buildOpenCodePlainTextVisibleReplySummary(text),
+          messageId: written.messageId,
+          relayOfMessageId: input.ledgerRecord.inboxMessageId,
+          source: 'runtime_delivery',
+        },
+      };
+      const ledgerRecord = await input.ledger.applyDestinationProof({
+        id: input.ledgerRecord.id,
+        visibleReplyInbox: 'user',
+        visibleReplyMessageId: written.messageId,
+        visibleReplyCorrelation: 'plain_assistant_text',
+        semanticallySufficient: true,
+        diagnostics: written.deduplicated
+          ? ['opencode_plain_text_reply_materialized_deduplicated']
+          : ['opencode_plain_text_reply_materialized_to_user_inbox'],
+        observedAt: nowIso(),
+      });
+      return { ledgerRecord, visibleReply };
+    } catch (error) {
+      logger.warn(
+        `[${input.teamName}] Failed to materialize OpenCode plain-text reply for ${input.memberName}/${input.ledgerRecord.inboxMessageId}: ${getErrorMessage(error)}`
+      );
+      return { ledgerRecord: input.ledgerRecord, visibleReply: null };
+    }
+  }
+
   private getOpenCodeDeliveryWatchdogKey(input: {
     teamName: string;
     memberName: string;
@@ -5962,6 +7085,22 @@ export class TeamProvisioningService {
     return OPENCODE_PROMPT_DELIVERY_RETRY_DELAY_MS;
   }
 
+  private isOpenCodePromptDeliveryWatchdogRecordTerminal(
+    record: OpenCodePromptDeliveryLedgerRecord
+  ): boolean {
+    if (record.status === 'failed_terminal') {
+      return true;
+    }
+    if (record.status !== 'responded') {
+      return false;
+    }
+    return !(
+      record.responseState === 'responded_plain_text' &&
+      !record.visibleReplyMessageId &&
+      !record.inboxReadCommittedAt
+    );
+  }
+
   private async scheduleOpenCodePromptLedgerFollowUp(input: {
     ledger: OpenCodePromptDeliveryLedgerStore;
     ledgerRecord: OpenCodePromptDeliveryLedgerRecord;
@@ -6006,6 +7145,113 @@ export class TeamProvisioningService {
     return ledgerRecord;
   }
 
+  private async rememberOpenCodeRuntimePidFromBridge(input: {
+    teamName: string;
+    memberName: string;
+    laneId: string;
+    runId?: string | null;
+    runtimeSessionId?: string | null;
+    runtimePid?: number;
+    reason: string;
+  }): Promise<void> {
+    const runtimePid = normalizeRuntimePositiveInteger(input.runtimePid);
+    if (!runtimePid) {
+      return;
+    }
+
+    const command = this.readProcessCommandByPid(runtimePid);
+    if (!command || !this.isOpenCodeServeCommand(command)) {
+      logger.debug(
+        `[${input.teamName}] Ignoring OpenCode bridge runtime pid ${runtimePid} for ${input.memberName}: process identity is not an active opencode serve host.`
+      );
+      return;
+    }
+
+    const observedAt = nowIso();
+    try {
+      const changed = await this.enqueueLaunchStateStoreOperation(input.teamName, async () => {
+        const previous = await this.launchStateStore.read(input.teamName).catch(() => null);
+        const directMember = previous?.members[input.memberName];
+        const laneMemberEntry = Object.entries(previous?.members ?? {}).find(
+          ([, member]) => member.laneId === input.laneId
+        );
+        const previousMember = directMember ?? laneMemberEntry?.[1];
+        const previousMemberKey = directMember ? input.memberName : laneMemberEntry?.[0];
+        if (!previous || !previousMember) {
+          return false;
+        }
+        if (!isPersistedOpenCodeSecondaryLaneMember(previousMember)) {
+          return false;
+        }
+        if (previousMember.laneId && previousMember.laneId !== input.laneId) {
+          return false;
+        }
+        const previousRunId = previousMember.runtimeRunId?.trim();
+        const incomingRunId = input.runId?.trim();
+        if (previousRunId && incomingRunId && previousRunId !== incomingRunId) {
+          return false;
+        }
+        const previousSessionId = previousMember.runtimeSessionId?.trim();
+        const incomingSessionId = input.runtimeSessionId?.trim();
+        if (previousSessionId && incomingSessionId && previousSessionId !== incomingSessionId) {
+          return false;
+        }
+        if (
+          previousMember.runtimePid === runtimePid &&
+          previousMember.pidSource === 'opencode_bridge'
+        ) {
+          return false;
+        }
+
+        const nextMember: PersistedTeamLaunchMemberState = {
+          ...previousMember,
+          runtimePid,
+          ...(incomingRunId ? { runtimeRunId: incomingRunId } : {}),
+          ...(incomingSessionId ? { runtimeSessionId: incomingSessionId } : {}),
+          pidSource: 'opencode_bridge',
+          lastRuntimeAliveAt: observedAt,
+          lastEvaluatedAt: observedAt,
+          sources: {
+            ...(previousMember.sources ?? {}),
+            processAlive: true,
+          },
+          diagnostics: mergeRuntimeDiagnostics(
+            previousMember.diagnostics,
+            [`runtime pid: ${runtimePid}`, input.reason],
+            previousMember.runtimeDiagnostic
+          ),
+        };
+        const nextSnapshot = createPersistedLaunchSnapshot({
+          teamName: previous.teamName,
+          expectedMembers: previous.expectedMembers,
+          bootstrapExpectedMembers: previous.bootstrapExpectedMembers,
+          leadSessionId: previous.leadSessionId,
+          launchPhase: previous.launchPhase,
+          members: {
+            ...previous.members,
+            [previousMemberKey ?? previousMember.name]: nextMember,
+          },
+          updatedAt: observedAt,
+        });
+        await this.writeLaunchStateSnapshotNow(input.teamName, nextSnapshot);
+        return true;
+      });
+      if (changed) {
+        this.invalidateRuntimeSnapshotCaches(input.teamName);
+        this.teamChangeEmitter?.({
+          type: 'member-spawn',
+          teamName: input.teamName,
+          ...(input.runId ? { runId: input.runId } : {}),
+          detail: input.memberName,
+        });
+      }
+    } catch (error) {
+      logger.debug(
+        `[${input.teamName}] Failed to persist OpenCode bridge runtime pid ${runtimePid} for ${input.memberName}: ${getErrorMessage(error)}`
+      );
+    }
+  }
+
   private logOpenCodePromptDeliveryEvent(
     event: string,
     record: OpenCodePromptDeliveryLedgerRecord,
@@ -6074,7 +7320,7 @@ export class TeamProvisioningService {
       });
       const records = await ledger.list().catch(() => []);
       for (const record of records) {
-        if (record.status === 'failed_terminal' || record.status === 'responded') {
+        if (this.isOpenCodePromptDeliveryWatchdogRecordTerminal(record)) {
           continue;
         }
         const nextAttemptMs = record.nextAttemptAt ? Date.parse(record.nextAttemptAt) : NaN;
@@ -6191,51 +7437,25 @@ export class TeamProvisioningService {
     if (!adapter) {
       return { delivered: false, reason: 'opencode_runtime_message_bridge_unavailable' };
     }
-    const [config, teamMeta, metaMembers] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
-      this.teamMetaStore.getMeta(teamName).catch(() => null),
-      this.membersMetaStore.getMembers(teamName).catch(() => []),
-    ]);
+    const directory = await this.readOpenCodeMemberDirectory(teamName);
+    const identity = this.resolveOpenCodeMemberIdentityFromDirectory(
+      teamName,
+      input.memberName,
+      directory
+    );
+    if (!identity.ok) {
+      return {
+        delivered: false,
+        reason:
+          identity.reason === 'opencode_recipient_unavailable'
+            ? 'recipient_is_not_opencode'
+            : identity.reason,
+      };
+    }
+    const { config } = directory;
+    const { canonicalMemberName, laneIdentity, configMember, metaMember, memberRuntimeCwd } =
+      identity;
     const normalizedMemberName = input.memberName.trim();
-    const configMember = config?.members?.find(
-      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
-    );
-    const metaMember = metaMembers.find(
-      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
-    );
-    const configProvider = (configMember as { provider?: unknown } | undefined)?.provider;
-    const metaProvider = (metaMember as { provider?: unknown } | undefined)?.provider;
-    const providerId =
-      normalizeTeamProviderLike(metaMember?.providerId) ??
-      normalizeTeamProviderLike(metaProvider) ??
-      normalizeTeamProviderLike(configMember?.providerId) ??
-      normalizeTeamProviderLike(configProvider) ??
-      inferTeamProviderIdFromModel(metaMember?.model ?? configMember?.model);
-    if (providerId !== 'opencode') {
-      return { delivered: false, reason: 'recipient_is_not_opencode' };
-    }
-    const removedAt =
-      metaMember != null
-        ? metaMember.removedAt
-        : (configMember as { removedAt?: unknown } | undefined)?.removedAt;
-    if (removedAt != null) {
-      return { delivered: false, reason: 'recipient_removed' };
-    }
-    const canonicalMemberName =
-      metaMember?.name?.trim() || configMember?.name?.trim() || normalizedMemberName;
-
-    const leadMember = config?.members?.find((member) => isLeadMember(member));
-    const leadProviderId =
-      normalizeOptionalTeamProviderId(teamMeta?.launchIdentity?.providerId) ??
-      normalizeOptionalTeamProviderId(teamMeta?.providerId) ??
-      normalizeOptionalTeamProviderId(leadMember?.providerId);
-    const laneIdentity = buildPlannedMemberLaneIdentity({
-      leadProviderId,
-      member: {
-        name: canonicalMemberName,
-        providerId,
-      },
-    });
     if (
       laneIdentity.laneKind === 'secondary' &&
       laneIdentity.laneOwnerProviderId === 'opencode' &&
@@ -6243,7 +7463,6 @@ export class TeamProvisioningService {
     ) {
       return { delivered: false, reason: 'opencode_runtime_not_active' };
     }
-    const memberRuntimeCwd = metaMember?.cwd?.trim() || configMember?.cwd?.trim();
     const cwd =
       laneIdentity.laneKind === 'secondary' && laneIdentity.laneOwnerProviderId === 'opencode'
         ? memberRuntimeCwd ||
@@ -6261,6 +7480,7 @@ export class TeamProvisioningService {
     let liveSecondaryLaneRunId: string | null = null;
     let trackedSecondaryLanePresent = false;
     let trackedSecondaryLaneSnapshotKnown = false;
+    let trackedSecondaryLaneBootstrapConfirmed: boolean | null = null;
     if (
       trackedRun &&
       laneIdentity.laneKind === 'secondary' &&
@@ -6275,6 +7495,15 @@ export class TeamProvisioningService {
       );
       trackedSecondaryLanePresent = liveLane != null;
       liveSecondaryLaneRunId = liveLane ? trackedRunId : null;
+      const liveLaneMember = liveLane
+        ? (liveLane.result?.members?.[canonicalMemberName] ??
+          liveLane.result?.members?.[liveLane.member.name])
+        : null;
+      if (liveLaneMember) {
+        trackedSecondaryLaneBootstrapConfirmed =
+          liveLaneMember.bootstrapConfirmed === true ||
+          liveLaneMember.launchState === 'confirmed_alive';
+      }
       if (!liveLane && trackedSecondaryLaneSnapshotKnown) {
         return { delivered: false, reason: 'opencode_runtime_not_active' };
       }
@@ -6368,6 +7597,26 @@ export class TeamProvisioningService {
       return { delivered: false, reason: 'opencode_runtime_not_active' };
     }
 
+    if (laneIdentity.laneKind === 'secondary' && laneIdentity.laneOwnerProviderId === 'opencode') {
+      const bootstrapReady =
+        trackedSecondaryLaneBootstrapConfirmed === true ||
+        (await this.hasDeliverableOpenCodeRuntimeBootstrapSessionEvidence({
+          teamName,
+          runId: runtimeRunId,
+          laneId: laneIdentity.laneId,
+          memberName: canonicalMemberName,
+        }));
+      if (!bootstrapReady) {
+        return {
+          delivered: false,
+          reason: 'opencode_runtime_not_active',
+          diagnostics: [
+            `OpenCode runtime bootstrap is not confirmed for ${canonicalMemberName}. Message was saved and will be retried after runtime check-in.`,
+          ],
+        };
+      }
+    }
+
     if (!this.isOpenCodePromptDeliveryWatchdogEnabled()) {
       const result = await adapter.sendMessageToMember({
         ...(runtimeRunId ? { runId: runtimeRunId } : {}),
@@ -6381,6 +7630,15 @@ export class TeamProvisioningService {
         actionMode: input.actionMode,
         taskRefs: input.taskRefs,
       });
+      await this.rememberOpenCodeRuntimePidFromBridge({
+        teamName,
+        memberName: canonicalMemberName,
+        laneId: laneIdentity.laneId,
+        runId: runtimeRunId,
+        runtimeSessionId: result.sessionId,
+        runtimePid: result.runtimePid,
+        reason: 'opencode_delivery_runtime_pid_observed',
+      });
       return {
         delivered: result.ok,
         accepted: result.ok,
@@ -6407,7 +7665,7 @@ export class TeamProvisioningService {
         })
       : null;
     if (active && active.inboxMessageId !== messageId && ledger) {
-      const proof = await this.applyOpenCodeVisibleDestinationProof({
+      let proof = await this.applyOpenCodeVisibleDestinationProof({
         ledger,
         ledgerRecord: active,
         teamName,
@@ -6415,6 +7673,14 @@ export class TeamProvisioningService {
         memberName: canonicalMemberName,
       });
       active = proof.ledgerRecord;
+      proof = await this.materializeOpenCodePlainTextReplyIfNeeded({
+        ledger,
+        ledgerRecord: active,
+        teamName,
+        memberName: canonicalMemberName,
+        visibleReply: proof.visibleReply,
+      });
+      active = proof.ledgerRecord;
       const activeReadAllowed = this.isOpenCodeDeliveryResponseReadCommitAllowed({
         responseState: active.responseState,
         actionMode: active.actionMode ?? undefined,
@@ -6489,6 +7755,14 @@ export class TeamProvisioningService {
         memberName: canonicalMemberName,
       });
       ledgerRecord = proof.ledgerRecord;
+      proof = await this.materializeOpenCodePlainTextReplyIfNeeded({
+        ledger,
+        ledgerRecord,
+        teamName,
+        memberName: canonicalMemberName,
+        visibleReply: proof.visibleReply,
+      });
+      ledgerRecord = proof.ledgerRecord;
       let readAllowed = this.isOpenCodeDeliveryResponseReadCommitAllowed({
         responseState: ledgerRecord.responseState,
         actionMode: ledgerRecord.actionMode ?? undefined,
@@ -6597,6 +7871,15 @@ export class TeamProvisioningService {
           taskRefs: input.taskRefs,
           prePromptCursor: ledgerRecord.prePromptCursor,
         });
+        await this.rememberOpenCodeRuntimePidFromBridge({
+          teamName,
+          memberName: canonicalMemberName,
+          laneId: laneIdentity.laneId,
+          runId: runtimeRunId,
+          runtimeSessionId: observed.sessionId,
+          runtimePid: observed.runtimePid,
+          reason: 'opencode_delivery_observe_runtime_pid_observed',
+        });
         ledgerRecord = await ledger.applyObservation({
           id: ledgerRecord.id,
           responseObservation: observed.responseObservation ?? {
@@ -6621,6 +7904,14 @@ export class TeamProvisioningService {
           memberName: canonicalMemberName,
         });
         ledgerRecord = proof.ledgerRecord;
+        proof = await this.materializeOpenCodePlainTextReplyIfNeeded({
+          ledger,
+          ledgerRecord,
+          teamName,
+          memberName: canonicalMemberName,
+          visibleReply: proof.visibleReply,
+        });
+        ledgerRecord = proof.ledgerRecord;
         readAllowed = this.isOpenCodeDeliveryResponseReadCommitAllowed({
           responseState: ledgerRecord.responseState,
           actionMode: ledgerRecord.actionMode ?? undefined,
@@ -6704,6 +7995,15 @@ export class TeamProvisioningService {
       actionMode: input.actionMode,
       taskRefs: input.taskRefs,
     });
+    await this.rememberOpenCodeRuntimePidFromBridge({
+      teamName,
+      memberName: canonicalMemberName,
+      laneId: laneIdentity.laneId,
+      runId: runtimeRunId,
+      runtimeSessionId: result.sessionId,
+      runtimePid: result.runtimePid,
+      reason: 'opencode_delivery_runtime_pid_observed',
+    });
     if (ledgerRecord && ledger) {
       ledgerRecord = await ledger.applyDeliveryResult({
         id: ledgerRecord.id,
@@ -6716,7 +8016,7 @@ export class TeamProvisioningService {
         reason: result.ok ? result.responseObservation?.reason : result.diagnostics[0],
         now: nowIso(),
       });
-      const proof = await this.applyOpenCodeVisibleDestinationProof({
+      let proof = await this.applyOpenCodeVisibleDestinationProof({
         ledger,
         ledgerRecord,
         teamName,
@@ -6724,6 +8024,14 @@ export class TeamProvisioningService {
         memberName: canonicalMemberName,
       });
       ledgerRecord = proof.ledgerRecord;
+      proof = await this.materializeOpenCodePlainTextReplyIfNeeded({
+        ledger,
+        ledgerRecord,
+        teamName,
+        memberName: canonicalMemberName,
+        visibleReply: proof.visibleReply,
+      });
+      ledgerRecord = proof.ledgerRecord;
       this.logOpenCodePromptDeliveryEvent(
         result.ok
           ? ledgerRecord.status === 'unanswered'
@@ -7105,64 +8413,18 @@ export class TeamProvisioningService {
           | 'opencode_recipient_unavailable';
       }
   > {
-    const [config, teamMeta, metaMembers] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
-      this.teamMetaStore.getMeta(teamName).catch(() => null),
-      this.membersMetaStore.getMembers(teamName).catch(() => []),
-    ]);
-    const normalizedMemberName = memberName.trim();
-    const configMember = config?.members?.find(
-      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
+    const directory = await this.readOpenCodeMemberDirectory(teamName);
+    const laneIdentity = this.resolveOpenCodeMemberIdentityFromDirectory(
+      teamName,
+      memberName,
+      directory
     );
-    const metaMember = metaMembers.find(
-      (member) => member.name?.trim().toLowerCase() === normalizedMemberName.toLowerCase()
-    );
-    if (!configMember && !metaMember) {
-      return { ok: false, reason: 'opencode_recipient_unavailable' };
+    if (!laneIdentity.ok) {
+      return laneIdentity;
     }
-    const configProvider = (configMember as { provider?: unknown } | undefined)?.provider;
-    const metaProvider = (metaMember as { provider?: unknown } | undefined)?.provider;
-    const providerId =
-      normalizeTeamProviderLike(metaMember?.providerId) ??
-      normalizeTeamProviderLike(metaProvider) ??
-      normalizeTeamProviderLike(configMember?.providerId) ??
-      normalizeTeamProviderLike(configProvider) ??
-      inferTeamProviderIdFromModel(metaMember?.model ?? configMember?.model);
-    if (providerId !== 'opencode') {
-      return { ok: false, reason: 'recipient_is_not_opencode' };
-    }
-    const removedAt =
-      metaMember != null
-        ? metaMember.removedAt
-        : (configMember as { removedAt?: unknown } | undefined)?.removedAt;
-    if (removedAt != null) {
-      return { ok: false, reason: 'recipient_removed' };
-    }
-    const canonicalMemberName =
-      metaMember?.name?.trim() || configMember?.name?.trim() || normalizedMemberName;
-    const runtimeRun = this.runtimeAdapterRunByTeam.get(teamName);
-    if (runtimeRun?.providerId === 'opencode') {
-      return {
-        ok: true,
-        canonicalMemberName,
-        laneId: 'primary',
-      };
-    }
-    const leadMember = config?.members?.find((member) => isLeadMember(member));
-    const leadProviderId =
-      normalizeOptionalTeamProviderId(teamMeta?.launchIdentity?.providerId) ??
-      normalizeOptionalTeamProviderId(teamMeta?.providerId) ??
-      normalizeOptionalTeamProviderId(leadMember?.providerId);
-    const laneIdentity = buildPlannedMemberLaneIdentity({
-      leadProviderId,
-      member: {
-        name: canonicalMemberName,
-        providerId,
-      },
-    });
     return {
       ok: true,
-      canonicalMemberName,
+      canonicalMemberName: laneIdentity.canonicalMemberName,
       laneId: laneIdentity.laneId,
     };
   }
@@ -7171,24 +8433,21 @@ export class TeamProvisioningService {
     teamName: string,
     laneId: string
   ): Promise<string[]> {
-    const [config, metaMembers] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
-      this.membersMetaStore.getMembers(teamName).catch(() => []),
-    ]);
+    const directory = await this.readOpenCodeMemberDirectory(teamName);
     const names = new Set<string>();
-    for (const member of config?.members ?? []) {
+    for (const member of directory.config?.members ?? []) {
       if (member.name?.trim()) {
         names.add(member.name.trim());
       }
     }
-    for (const member of metaMembers) {
+    for (const member of directory.metaMembers) {
       if (member.name?.trim()) {
         names.add(member.name.trim());
       }
     }
     const resolved: string[] = [];
     for (const name of names) {
-      const identity = await this.resolveOpenCodeMemberDeliveryIdentity(teamName, name);
+      const identity = this.resolveOpenCodeMemberIdentityFromDirectory(teamName, name, directory);
       if (identity.ok && identity.laneId === laneId) {
         resolved.push(identity.canonicalMemberName);
       }
@@ -7261,7 +8520,7 @@ export class TeamProvisioningService {
     }
 
     const [config, teamMeta, metaMembers, currentLaneIndex] = await Promise.all([
-      this.configReader.getConfig(teamName).catch(() => null),
+      this.readConfigForObservation(teamName).catch(() => null),
       this.teamMetaStore.getMeta(teamName).catch(() => null),
       this.membersMetaStore.getMembers(teamName).catch(() => []),
       readOpenCodeRuntimeLaneIndex(getTeamsBasePath(), teamName).catch(() => null),
@@ -7536,6 +8795,7 @@ export class TeamProvisioningService {
 
   private resetTeamScopedTransientStateForNewRun(teamName: string): void {
     peekAutoResumeService()?.cancelPendingAutoResume(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.retainedClaudeLogsByTeam.delete(teamName);
     this.persistedTranscriptClaudeLogsCache.delete(teamName);
     this.leadInboxRelayInFlight.delete(teamName);
@@ -8487,13 +9747,32 @@ export class TeamProvisioningService {
       previousMember: idempotent.previousMember,
     });
     if (idempotent.state === 'duplicate') {
-      await this.commitOpenCodeRuntimeBootstrapSessionEvidence({
+      const committed = await this.hasCommittedOpenCodeRuntimeBootstrapSessionEvidence({
         teamName,
         runId,
         laneId,
         memberName,
         runtimeSessionId,
+      });
+      if (!committed) {
+        await this.commitOpenCodeRuntimeBootstrapSessionEvidence({
+          teamName,
+          runId,
+          laneId,
+          memberName,
+          runtimeSessionId,
+          observedAt,
+        });
+      }
+      await this.updateOpenCodeRuntimeMemberLiveness({
+        teamName,
+        runId,
+        memberName,
+        runtimeSessionId,
         observedAt,
+        diagnostics: payload.diagnostics,
+        metadata: parseRuntimeToolMetadata(payload.metadata),
+        reason: 'OpenCode runtime bootstrap check-in accepted',
       });
       return {
         ok: true,
@@ -8585,25 +9864,88 @@ export class TeamProvisioningService {
     const manifestStore = createRuntimeStoreManifestStore({
       filePath: manifestPath,
       teamName: input.teamName,
+      lockOptions: OPENCODE_BOOTSTRAP_EVIDENCE_LOCK_OPTIONS,
     });
     const receiptStore = createRuntimeStoreReceiptStore({
       filePath: path.join(runtimeDirectory, 'opencode-runtime-receipts.json'),
+      lockOptions: OPENCODE_BOOTSTRAP_EVIDENCE_LOCK_OPTIONS,
     });
     const writer = new RuntimeStoreBatchWriter(runtimeDirectory, manifestStore, receiptStore);
 
-    await writer.writeBatch({
+    try {
+      await writer.writeBatch({
+        teamName: input.teamName,
+        runId: input.runId,
+        capabilitySnapshotId: null,
+        behaviorFingerprint: null,
+        reason: 'launch_checkpoint',
+        writes: [
+          {
+            descriptor,
+            data: { sessions },
+          },
+        ],
+      });
+    } catch (error) {
+      if (
+        isFileLockTimeoutError(error) &&
+        (await this.hasCommittedOpenCodeRuntimeBootstrapSessionEvidence(input))
+      ) {
+        return;
+      }
+      throw error;
+    }
+  }
+
+  private async hasCommittedOpenCodeRuntimeBootstrapSessionEvidence(input: {
+    teamName: string;
+    runId: string;
+    laneId: string;
+    memberName: string;
+    runtimeSessionId: string;
+  }): Promise<boolean> {
+    const evidence = await readCommittedOpenCodeBootstrapSessionEvidence({
+      teamsBasePath: getTeamsBasePath(),
       teamName: input.teamName,
-      runId: input.runId,
-      capabilitySnapshotId: null,
-      behaviorFingerprint: null,
-      reason: 'launch_checkpoint',
-      writes: [
-        {
-          descriptor,
-          data: { sessions },
-        },
-      ],
-    });
+      laneId: input.laneId,
+    }).catch(() => null);
+    if (!evidence?.committed) {
+      return false;
+    }
+    if (evidence.activeRunId && evidence.activeRunId.trim() !== input.runId) {
+      return false;
+    }
+    return evidence.sessions.some(
+      (session) =>
+        session.id === input.runtimeSessionId &&
+        session.runId === input.runId &&
+        namesMatchCaseInsensitive(session.memberName, input.memberName)
+    );
+  }
+
+  private async hasDeliverableOpenCodeRuntimeBootstrapSessionEvidence(input: {
+    teamName: string;
+    runId: string | null;
+    laneId: string;
+    memberName: string;
+  }): Promise<boolean> {
+    const evidence = await readCommittedOpenCodeBootstrapSessionEvidence({
+      teamsBasePath: getTeamsBasePath(),
+      teamName: input.teamName,
+      laneId: input.laneId,
+    }).catch(() => null);
+    if (!evidence?.committed) {
+      return false;
+    }
+    const activeRunId = evidence.activeRunId?.trim() || null;
+    if (activeRunId !== input.runId) {
+      return false;
+    }
+    return evidence.sessions.some(
+      (session) =>
+        session.runId === input.runId &&
+        namesMatchCaseInsensitive(session.memberName, input.memberName)
+    );
   }
 
   private async readOpenCodeRuntimeSessionStore(
@@ -8729,7 +10071,7 @@ export class TeamProvisioningService {
     memberName: string;
     previousMember?: PersistedTeamLaunchMemberState;
   }): Promise<void> {
-    const config = await this.configReader.getConfig(input.teamName).catch(() => null);
+    const config = await this.readConfigForStrictDecision(input.teamName).catch(() => null);
     const metaMembers = await this.membersMetaStore.getMembers(input.teamName).catch(() => []);
     const configuredMember = this.resolveEffectiveConfiguredMember(
       config?.members ?? [],
@@ -8918,6 +10260,24 @@ export class TeamProvisioningService {
     metadata?: RuntimeToolMetadata;
     reason: string;
   }): Promise<void> {
+    const trackedUpdate = this.applyOpenCodeRuntimeBootstrapCheckinToTrackedRun(input);
+    if (trackedUpdate) {
+      await this.persistLaunchStateSnapshot(
+        trackedUpdate.run,
+        this.getMixedSecondaryLaunchPhase(trackedUpdate.run)
+      );
+      this.invalidateRuntimeSnapshotCaches(input.teamName);
+      if (trackedUpdate.changed) {
+        this.teamChangeEmitter?.({
+          type: 'member-spawn',
+          teamName: input.teamName,
+          runId: input.runId,
+          detail: input.memberName,
+        });
+      }
+      return;
+    }
+
     const previous = await this.launchStateStore.read(input.teamName);
     const expectedMembers = previous
       ? this.getPersistedLaunchMemberNames(previous)
@@ -8955,6 +10315,7 @@ export class TeamProvisioningService {
       runtimeAlive: true,
       bootstrapConfirmed: true,
       hardFailure: false,
+      bootstrapStalled: undefined,
       runtimePid,
       runtimeRunId: input.runId,
       runtimeSessionId: input.runtimeSessionId,
@@ -8993,8 +10354,7 @@ export class TeamProvisioningService {
       updatedAt: input.observedAt,
     });
     await this.writeLaunchStateSnapshot(input.teamName, snapshot);
-    this.agentRuntimeSnapshotCache.delete(input.teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(input.teamName);
+    this.invalidateRuntimeSnapshotCaches(input.teamName);
     if (shouldEmitMemberSpawnChange) {
       this.teamChangeEmitter?.({
         type: 'member-spawn',
@@ -9005,6 +10365,138 @@ export class TeamProvisioningService {
     }
   }
 
+  private applyOpenCodeRuntimeBootstrapCheckinToTrackedRun(input: {
+    teamName: string;
+    runId: string;
+    memberName: string;
+    runtimeSessionId: string;
+    observedAt: string;
+    diagnostics: unknown;
+    metadata?: RuntimeToolMetadata;
+    reason: string;
+  }): { run: ProvisioningRun; changed: boolean } | null {
+    const trackedRunId = this.getTrackedRunId(input.teamName);
+    const run = trackedRunId ? this.runs.get(trackedRunId) : undefined;
+    if (!run || run.processKilled || run.cancelRequested) {
+      return null;
+    }
+
+    const lane = (run.mixedSecondaryLanes ?? []).find((candidate) => {
+      if (candidate.providerId !== 'opencode') {
+        return false;
+      }
+      if (!matchesTeamMemberIdentity(candidate.member.name, input.memberName)) {
+        return false;
+      }
+      return !candidate.runId || candidate.runId === input.runId;
+    });
+    if (!lane) {
+      return null;
+    }
+
+    const runtimePid = input.metadata?.runtimePid;
+    const runtimeDiagnostics = mergeRuntimeDiagnostics(
+      lane.result?.members[input.memberName]?.diagnostics ?? lane.diagnostics,
+      [
+        ...normalizeRuntimeStringArray(input.diagnostics),
+        ...buildRuntimeToolMetadataDiagnostics(input.metadata),
+        'opencode_bootstrap_evidence_committed',
+      ],
+      input.reason
+    );
+    const evidence: TeamRuntimeMemberLaunchEvidence = {
+      memberName: input.memberName,
+      providerId: 'opencode',
+      launchState: 'confirmed_alive',
+      agentToolAccepted: true,
+      runtimeAlive: true,
+      bootstrapConfirmed: true,
+      hardFailure: false,
+      sessionId: input.runtimeSessionId,
+      backendType: 'process',
+      ...(runtimePid ? { runtimePid, pidSource: 'runtime_bootstrap' as const } : {}),
+      livenessKind: 'confirmed_bootstrap',
+      runtimeDiagnostic: input.reason,
+      runtimeDiagnosticSeverity: 'info',
+      diagnostics: runtimeDiagnostics ?? [input.reason],
+    };
+
+    const previousLaneState = lane.state;
+    const previousLaneRunId = lane.runId;
+    const previousLaneMember = lane.result?.members[input.memberName];
+    lane.runId = input.runId;
+    lane.state = 'finished';
+    lane.diagnostics = runtimeDiagnostics ?? lane.diagnostics;
+    lane.result = {
+      ...(lane.result ?? {
+        runId: input.runId,
+        teamName: input.teamName,
+        launchPhase: 'finished' as const,
+        teamLaunchState: 'partial_pending' as const,
+        members: {},
+        warnings: lane.warnings,
+        diagnostics: [],
+      }),
+      runId: input.runId,
+      teamName: input.teamName,
+      launchPhase: 'finished',
+      members: {
+        ...(lane.result?.members ?? {}),
+        [input.memberName]: evidence,
+      },
+      warnings: lane.result?.warnings ?? lane.warnings,
+      diagnostics: runtimeDiagnostics ?? lane.result?.diagnostics ?? lane.diagnostics,
+    };
+    lane.result.teamLaunchState = summarizeRuntimeLaunchResultMembers(lane.result.members);
+
+    const previousStatus =
+      run.memberSpawnStatuses.get(input.memberName) ?? createInitialMemberSpawnStatusEntry();
+    const nextStatus: MemberSpawnStatusEntry = {
+      ...previousStatus,
+      status: 'online',
+      launchState: 'confirmed_alive',
+      error: undefined,
+      hardFailureReason: undefined,
+      skippedForLaunch: undefined,
+      skipReason: undefined,
+      skippedAt: undefined,
+      livenessSource: 'heartbeat',
+      agentToolAccepted: true,
+      runtimeAlive: true,
+      bootstrapConfirmed: true,
+      hardFailure: false,
+      bootstrapStalled: undefined,
+      pendingPermissionRequestIds: undefined,
+      firstSpawnAcceptedAt: previousStatus.firstSpawnAcceptedAt ?? input.observedAt,
+      lastHeartbeatAt: input.observedAt,
+      runtimeModel: lane.member.model,
+      livenessKind: 'confirmed_bootstrap',
+      runtimeDiagnostic: input.reason,
+      runtimeDiagnosticSeverity: 'info',
+      livenessLastCheckedAt: input.observedAt,
+      updatedAt: input.observedAt,
+    };
+    run.memberSpawnStatuses.set(input.memberName, nextStatus);
+    run.pendingMemberRestarts?.delete(input.memberName);
+    this.syncMemberLaunchGraceCheck(run, input.memberName, nextStatus);
+
+    const statusChanged =
+      previousStatus.status !== nextStatus.status ||
+      previousStatus.launchState !== nextStatus.launchState ||
+      previousStatus.bootstrapConfirmed !== nextStatus.bootstrapConfirmed ||
+      previousStatus.runtimeAlive !== nextStatus.runtimeAlive ||
+      previousStatus.hardFailure !== nextStatus.hardFailure ||
+      previousStatus.livenessKind !== nextStatus.livenessKind;
+    const laneChanged =
+      previousLaneState !== lane.state ||
+      previousLaneRunId !== lane.runId ||
+      previousLaneMember?.sessionId !== evidence.sessionId ||
+      previousLaneMember?.launchState !== evidence.launchState ||
+      previousLaneMember?.bootstrapConfirmed !== evidence.bootstrapConfirmed;
+
+    return { run, changed: statusChanged || laneChanged };
+  }
+
   private shouldEmitOpenCodeRuntimeLivenessMemberSpawnChange(input: {
     previousMember?: PersistedTeamLaunchMemberState;
     runtimeRunId: string;
@@ -9155,6 +10647,59 @@ export class TeamProvisioningService {
     });
   }
 
+  async getOpenCodeRuntimeDeliveryStatus(
+    teamName: string,
+    messageId: string
+  ): Promise<OpenCodeRuntimeDeliveryStatus | null> {
+    const normalizedMessageId = messageId.trim();
+    if (!normalizedMessageId) {
+      return null;
+    }
+    const laneIndex = await readOpenCodeRuntimeLaneIndex(getTeamsBasePath(), teamName).catch(
+      () => null
+    );
+    const laneIds = [
+      ...new Set(
+        Object.values(laneIndex?.lanes ?? {})
+          .map((entry) => entry.laneId.trim())
+          .filter(Boolean)
+      ),
+    ];
+    for (const laneId of laneIds) {
+      const records = await this.createOpenCodePromptDeliveryLedger(teamName, laneId)
+        .list()
+        .catch(() => []);
+      const record = records.find((candidate) => candidate.inboxMessageId === normalizedMessageId);
+      if (record) {
+        return this.toOpenCodeRuntimeDeliveryStatus(record);
+      }
+    }
+    return null;
+  }
+
+  private toOpenCodeRuntimeDeliveryStatus(
+    record: OpenCodePromptDeliveryLedgerRecord
+  ): OpenCodeRuntimeDeliveryStatus {
+    const failed = record.status === 'failed_terminal';
+    const responded =
+      record.status === 'responded' &&
+      Boolean(record.inboxReadCommittedAt || record.visibleReplyMessageId);
+    return {
+      messageId: record.inboxMessageId,
+      providerId: 'opencode',
+      attempted: true,
+      delivered: !failed,
+      responsePending: !failed && !responded,
+      responseState: record.responseState,
+      ledgerStatus: record.status,
+      visibleReplyMessageId: record.visibleReplyMessageId ?? undefined,
+      visibleReplyCorrelation: record.visibleReplyCorrelation ?? undefined,
+      acceptanceUnknown: record.acceptanceUnknown,
+      reason: record.lastReason ?? undefined,
+      diagnostics: record.diagnostics,
+    };
+  }
+
   private createOpenCodeRuntimeDeliveryPorts(): RuntimeDeliveryDestinationPort[] {
     const userMessagesPort: RuntimeDeliveryDestinationPort = {
       kind: 'user_sent_messages',
@@ -9640,8 +11185,7 @@ export class TeamProvisioningService {
               );
               return;
             }
-            this.agentRuntimeSnapshotCache.delete(run.teamName);
-            this.liveTeamAgentRuntimeMetadataCache.delete(run.teamName);
+            this.invalidateRuntimeSnapshotCaches(run.teamName);
             this.setMemberSpawnStatus(run, spawnedMemberName, 'waiting');
             this.appendMemberBootstrapDiagnostic(
               run,
@@ -9790,6 +11334,7 @@ export class TeamProvisioningService {
       next.runtimeAlive = false;
       next.bootstrapConfirmed = false;
       next.hardFailure = false;
+      next.bootstrapStalled = undefined;
       next.error = undefined;
       next.hardFailureReason = undefined;
       next.livenessSource = undefined;
@@ -9808,6 +11353,7 @@ export class TeamProvisioningService {
       next.runtimeAlive = false;
       next.bootstrapConfirmed = false;
       next.hardFailure = false;
+      next.bootstrapStalled = undefined;
       next.error = undefined;
       next.hardFailureReason = undefined;
       next.livenessSource = undefined;
@@ -9837,6 +11383,7 @@ export class TeamProvisioningService {
           : prev.lastHeartbeatAt;
       }
       next.hardFailure = false;
+      next.bootstrapStalled = undefined;
       next.error = undefined;
       next.hardFailureReason = undefined;
       next.launchState = deriveMemberLaunchState(next);
@@ -9846,6 +11393,7 @@ export class TeamProvisioningService {
       next.skippedAt = undefined;
       next.error = error;
       next.hardFailure = true;
+      next.bootstrapStalled = undefined;
       next.hardFailureReason = error;
       next.launchState = 'failed_to_start';
     } else if (status === 'skipped') {
@@ -9857,6 +11405,7 @@ export class TeamProvisioningService {
       next.runtimeAlive = false;
       next.bootstrapConfirmed = false;
       next.hardFailure = false;
+      next.bootstrapStalled = undefined;
       next.error = undefined;
       next.hardFailureReason = undefined;
       next.livenessSource = undefined;
@@ -9900,6 +11449,7 @@ export class TeamProvisioningService {
       prev.livenessKind === next.livenessKind &&
       prev.runtimeDiagnostic === next.runtimeDiagnostic &&
       prev.runtimeDiagnosticSeverity === next.runtimeDiagnosticSeverity &&
+      prev.bootstrapStalled === next.bootstrapStalled &&
       prev.firstSpawnAcceptedAt === next.firstSpawnAcceptedAt &&
       prev.lastHeartbeatAt === next.lastHeartbeatAt
     ) {
@@ -9983,6 +11533,7 @@ export class TeamProvisioningService {
       runtimeAlive: prev.runtimeAlive === true,
       bootstrapConfirmed: true,
       hardFailure: false,
+      bootstrapStalled: undefined,
       error: undefined,
       hardFailureReason: undefined,
       livenessSource: prev.livenessSource ?? 'process',
@@ -10003,6 +11554,7 @@ export class TeamProvisioningService {
       prev.runtimeAlive === next.runtimeAlive &&
       prev.bootstrapConfirmed === next.bootstrapConfirmed &&
       prev.hardFailure === next.hardFailure &&
+      prev.bootstrapStalled === next.bootstrapStalled &&
       prev.firstSpawnAcceptedAt === next.firstSpawnAcceptedAt &&
       prev.lastHeartbeatAt === next.lastHeartbeatAt
     ) {
@@ -10036,7 +11588,10 @@ export class TeamProvisioningService {
   }> {
     const readPersistedStatuses = async (resolvedRunId: string | null) => {
       const { snapshot, statuses } = await this.reconcilePersistedLaunchState(teamName);
-      const nextStatuses = await this.attachLiveRuntimeMetadataToStatuses(teamName, statuses);
+      const nextStatuses = await this.attachLiveRuntimeMetadataToStatuses(teamName, statuses, {
+        openCodeSecondaryBootstrapPendingMembers:
+          this.getOpenCodeSecondaryBootstrapPendingMemberNames(snapshot),
+      });
       const expectedMembers = snapshot ? this.getPersistedLaunchMemberNames(snapshot) : undefined;
       const summary = expectedMembers
         ? summarizeMemberSpawnStatusRecord(expectedMembers, nextStatuses)
@@ -10064,6 +11619,67 @@ export class TeamProvisioningService {
       return readPersistedStatuses(runId);
     }
 
+    if (!this.shouldCacheMemberSpawnStatusesSnapshot(run)) {
+      return this.buildMemberSpawnStatusesSnapshotForRun(run);
+    }
+
+    const generationAtStart = this.getMemberSpawnStatusesCacheGeneration(teamName);
+    const cached = this.memberSpawnStatusesSnapshotCache.get(teamName);
+    if (
+      cached &&
+      cached.expiresAtMs > Date.now() &&
+      cached.runId === run.runId &&
+      cached.generation === generationAtStart
+    ) {
+      return this.cloneMemberSpawnStatusesSnapshot(cached.snapshot);
+    }
+
+    const existingRequest = this.memberSpawnStatusesInFlightByTeam.get(teamName);
+    if (
+      existingRequest?.generationAtStart === generationAtStart &&
+      existingRequest.runIdAtStart === run.runId
+    ) {
+      const snapshot = await existingRequest.promise;
+      if (
+        this.getMemberSpawnStatusesCacheGeneration(teamName) === generationAtStart &&
+        this.getTrackedRunId(teamName) === run.runId
+      ) {
+        return this.cloneMemberSpawnStatusesSnapshot(snapshot);
+      }
+      return this.getMemberSpawnStatuses(teamName);
+    }
+
+    const request = this.buildMemberSpawnStatusesSnapshotForRun(run, generationAtStart).finally(
+      () => {
+        if (this.memberSpawnStatusesInFlightByTeam.get(teamName)?.promise === request) {
+          this.memberSpawnStatusesInFlightByTeam.delete(teamName);
+        }
+      }
+    );
+    this.memberSpawnStatusesInFlightByTeam.set(teamName, {
+      generationAtStart,
+      runIdAtStart: run.runId,
+      promise: request,
+    });
+    const snapshot = await request;
+    if (
+      this.getMemberSpawnStatusesCacheGeneration(teamName) === generationAtStart &&
+      this.getTrackedRunId(teamName) === run.runId
+    ) {
+      return this.cloneMemberSpawnStatusesSnapshot(snapshot);
+    }
+    return this.getMemberSpawnStatuses(teamName);
+  }
+
+  private shouldCacheMemberSpawnStatusesSnapshot(run: ProvisioningRun): boolean {
+    return run.isLaunch === true && run.provisioningComplete !== true;
+  }
+
+  private async buildMemberSpawnStatusesSnapshotForRun(
+    run: ProvisioningRun,
+    generationAtStart?: number
+  ): Promise<MemberSpawnStatusesSnapshot> {
+    const teamName = run.teamName;
     await this.refreshMemberSpawnStatusesFromLeadInbox(run);
     await this.maybeAuditMemberSpawnStatuses(run);
     await this.persistLaunchStateSnapshot(run, run.provisioningComplete ? 'finished' : 'active');
@@ -10083,23 +11699,41 @@ export class TeamProvisioningService {
       });
     const rawSnapshot = liveSnapshot ?? persisted;
     const metaMembers = await this.membersMetaStore.getMembers(teamName).catch(() => []);
-    const snapshot = this.filterRemovedMembersFromLaunchSnapshot(rawSnapshot, metaMembers);
+    const launchSnapshot = this.filterRemovedMembersFromLaunchSnapshot(rawSnapshot, metaMembers);
     const statuses = await this.attachLiveRuntimeMetadataToStatuses(
       teamName,
-      snapshotToMemberSpawnStatuses(snapshot)
+      snapshotToMemberSpawnStatuses(launchSnapshot),
+      {
+        openCodeSecondaryBootstrapPendingMembers:
+          this.getOpenCodeSecondaryBootstrapPendingMemberNames(launchSnapshot),
+      }
     );
-    const expectedMembers = this.getPersistedLaunchMemberNames(snapshot);
+    const expectedMembers = this.getPersistedLaunchMemberNames(launchSnapshot);
     const summary = summarizeMemberSpawnStatusRecord(expectedMembers, statuses);
-    return {
+    const spawnSnapshot: MemberSpawnStatusesSnapshot = {
       statuses,
-      runId,
+      runId: run.runId,
       teamLaunchState: deriveTeamLaunchAggregateState(summary),
-      launchPhase: snapshot.launchPhase,
+      launchPhase: launchSnapshot.launchPhase,
       expectedMembers,
-      updatedAt: snapshot.updatedAt,
+      updatedAt: launchSnapshot.updatedAt,
       summary,
       source: persisted ? 'merged' : 'live',
     };
+    if (
+      generationAtStart != null &&
+      this.shouldCacheMemberSpawnStatusesSnapshot(run) &&
+      this.getMemberSpawnStatusesCacheGeneration(teamName) === generationAtStart &&
+      this.getTrackedRunId(teamName) === run.runId
+    ) {
+      this.memberSpawnStatusesSnapshotCache.set(teamName, {
+        expiresAtMs: Date.now() + TeamProvisioningService.MEMBER_SPAWN_STATUS_SNAPSHOT_CACHE_TTL_MS,
+        generation: generationAtStart,
+        runId: run.runId,
+        snapshot: this.cloneMemberSpawnStatusesSnapshot(spawnSnapshot),
+      });
+    }
+    return spawnSnapshot;
   }
 
   async getTeamAgentRuntimeSnapshot(teamName: string): Promise<TeamAgentRuntimeSnapshot> {
@@ -10109,6 +11743,35 @@ export class TeamProvisioningService {
       return cached.snapshot;
     }
 
+    const generationAtStart = this.getRuntimeSnapshotCacheGeneration(teamName);
+    const existingRequest = this.agentRuntimeSnapshotInFlightByTeam.get(teamName);
+    if (
+      existingRequest?.generationAtStart === generationAtStart &&
+      existingRequest.runIdAtStart === runId
+    ) {
+      return existingRequest.promise;
+    }
+
+    const request = this.buildTeamAgentRuntimeSnapshot(teamName, runId, generationAtStart).finally(
+      () => {
+        if (this.agentRuntimeSnapshotInFlightByTeam.get(teamName)?.promise === request) {
+          this.agentRuntimeSnapshotInFlightByTeam.delete(teamName);
+        }
+      }
+    );
+    this.agentRuntimeSnapshotInFlightByTeam.set(teamName, {
+      generationAtStart,
+      runIdAtStart: runId,
+      promise: request,
+    });
+    return request;
+  }
+
+  private async buildTeamAgentRuntimeSnapshot(
+    teamName: string,
+    runId: string | null,
+    generationAtStart: number
+  ): Promise<TeamAgentRuntimeSnapshot> {
     const updatedAt = nowIso();
     const run = runId ? (this.runs.get(runId) ?? null) : null;
     const currentRuntimeAdapterRun = this.runtimeAdapterRunByTeam.get(teamName);
@@ -10116,7 +11779,8 @@ export class TeamProvisioningService {
 
     let configuredMembers: TeamConfig['members'] = [];
     try {
-      configuredMembers = (await this.configReader.getConfig(teamName))?.members ?? [];
+      const config = await this.readConfigSnapshot(teamName);
+      configuredMembers = config?.members ?? [];
     } catch {
       configuredMembers = [];
     }
@@ -10330,10 +11994,15 @@ export class TeamProvisioningService {
       members: snapshotMembers,
     };
 
-    this.agentRuntimeSnapshotCache.set(teamName, {
-      expiresAtMs: Date.now() + TeamProvisioningService.AGENT_RUNTIME_SNAPSHOT_CACHE_TTL_MS,
-      snapshot,
-    });
+    if (
+      this.getRuntimeSnapshotCacheGeneration(teamName) === generationAtStart &&
+      this.getTrackedRunId(teamName) === runId
+    ) {
+      this.agentRuntimeSnapshotCache.set(teamName, {
+        expiresAtMs: Date.now() + TeamProvisioningService.AGENT_RUNTIME_SNAPSHOT_CACHE_TTL_MS,
+        snapshot,
+      });
+    }
     return snapshot;
   }
 
@@ -10453,6 +12122,7 @@ export class TeamProvisioningService {
     }
     parsed.members = members;
     await atomicWriteAsync(configPath, `${JSON.stringify(parsed, null, 2)}\n`);
+    TeamConfigReader.invalidateTeam(input.teamName);
   }
 
   private enqueueDirectRestartPrompt(input: {
@@ -10476,6 +12146,37 @@ export class TeamProvisioningService {
     });
   }
 
+  private persistOpenCodeMemberRestartSystemMessage(input: {
+    teamName: string;
+    leadName: string;
+    leadSessionId: string | null;
+    displayName: string;
+    member: TeamCreateRequest['members'][number];
+    reason: 'manual_restart' | 'member_updated';
+  }): void {
+    const timestamp = nowIso();
+    const prompt = buildMemberSpawnPrompt(
+      input.member,
+      input.displayName,
+      input.teamName,
+      input.leadName,
+      { restart: true }
+    );
+    const reasonSummary =
+      input.reason === 'member_updated' ? 'after member settings update' : 'by user request';
+    this.persistSentMessage(input.teamName, {
+      from: input.leadName,
+      to: input.member.name,
+      text: prompt,
+      timestamp,
+      read: true,
+      source: 'system_notification',
+      leadSessionId: input.leadSessionId ?? undefined,
+      messageId: `member-restart:${input.teamName}:${input.member.name}:${randomUUID()}`,
+      summary: `Restarting ${input.member.name} ${reasonSummary}`,
+    });
+  }
+
   private async launchDirectTmuxMemberRestart(input: {
     run: ProvisioningRun;
     teamName: string;
@@ -10519,7 +12220,14 @@ export class TeamProvisioningService {
 
     const provisioningEnv = await this.buildProvisioningEnv(
       providerId,
-      input.configuredMember.providerBackendId
+      input.configuredMember.providerBackendId,
+      {
+        teamRuntimeAuth: {
+          teamName: input.teamName,
+          authMaterialId: `${input.run.runId}-direct-${input.configuredMember.name}-${randomUUID()}`,
+          allowAnthropicApiKeyHelper: true,
+        },
+      }
     );
     if (provisioningEnv.warning) {
       throw new Error(provisioningEnv.warning);
@@ -10546,11 +12254,19 @@ export class TeamProvisioningService {
       },
       input.displayName,
       input.teamName,
-      input.leadName
+      input.leadName,
+      { restart: true }
     );
     const bootstrapExpectedAfter = nowIso();
-    const runtimeTurnSettledHookArgs =
-      await this.buildRuntimeTurnSettledHookSettingsArgs(providerId);
+    const runtimeArgsPlan = await this.buildTeamRuntimeLaunchArgsPlan({
+      teamName: input.teamName,
+      providerId,
+      launchIdentity: null,
+      envResolution: provisioningEnv,
+      extraArgs: [],
+      includeAnthropicHelper: providerId === 'anthropic',
+      contextLabel: `Direct teammate restart (${input.configuredMember.name})`,
+    });
 
     const runtimeArgs = mergeJsonSettingsArgs([
       '--agent-id',
@@ -10576,8 +12292,10 @@ export class TeamProvisioningService {
         : ['--permission-prompt-tool', 'stdio', '--permission-mode', 'default']),
       ...(input.configuredMember.model ? ['--model', input.configuredMember.model] : []),
       ...(input.configuredMember.effort ? ['--effort', input.configuredMember.effort] : []),
-      ...runtimeTurnSettledHookArgs,
-      ...(provisioningEnv.providerArgs ?? []),
+      ...runtimeArgsPlan.fastModeArgs,
+      ...runtimeArgsPlan.runtimeTurnSettledHookArgs,
+      ...runtimeArgsPlan.providerArgs,
+      ...runtimeArgsPlan.settingsArgs,
     ]);
     const command = buildDirectTmuxRestartCommand({
       cwd,
@@ -10632,7 +12350,7 @@ export class TeamProvisioningService {
       metaMembers: Awaited<ReturnType<TeamMembersMetaStore['getMembers']>>;
       configuredMember: ReturnType<TeamProvisioningService['resolveEffectiveConfiguredMember']>;
     }> => {
-      const config = await this.configReader.getConfig(teamName);
+      const config = await this.readConfigForStrictDecision(teamName);
       const configuredMembers = config?.members ?? [];
       let metaMembers: Awaited<ReturnType<TeamMembersMetaStore['getMembers']>> = [];
       try {
@@ -10706,8 +12424,7 @@ export class TeamProvisioningService {
       );
     }
 
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     const liveRuntimeByMember = await this.getLiveTeamAgentRuntimeMetadata(teamName);
     const livePids = new Set<number>();
     let hasAliveRuntimeWithoutPid = false;
@@ -10852,8 +12569,7 @@ export class TeamProvisioningService {
       throw new Error('Lead restart is not supported from member controls');
     }
 
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.resetRuntimeToolActivity(run, memberName);
     this.clearMemberSpawnToolTracking(run, memberName);
     this.setMemberSpawnStatus(run, memberName, 'spawning');
@@ -10942,13 +12658,360 @@ export class TeamProvisioningService {
     }
   }
 
+  async retryFailedOpenCodeSecondaryLanes(
+    teamName: string
+  ): Promise<RetryFailedOpenCodeSecondaryLanesResult> {
+    const existing = this.failedOpenCodeSecondaryRetryInFlightByTeam.get(teamName);
+    if (existing) {
+      return existing;
+    }
+
+    const retry = this.retryFailedOpenCodeSecondaryLanesNow(teamName).finally(() => {
+      this.failedOpenCodeSecondaryRetryInFlightByTeam.delete(teamName);
+    });
+    this.failedOpenCodeSecondaryRetryInFlightByTeam.set(teamName, retry);
+    return retry;
+  }
+
+  private async retryFailedOpenCodeSecondaryLanesNow(
+    teamName: string
+  ): Promise<RetryFailedOpenCodeSecondaryLanesResult> {
+    const run = this.getMutableAliveRunOrThrow(teamName);
+    if (this.getProvisioningRunId(teamName)) {
+      throw new Error('Team launch is still in progress');
+    }
+
+    const result: RetryFailedOpenCodeSecondaryLanesResult = {
+      attempted: [],
+      confirmed: [],
+      pending: [],
+      failed: [],
+      skipped: [],
+    };
+    const candidates = await this.collectFailedOpenCodeSecondaryRetryCandidates(run);
+
+    for (const candidate of candidates) {
+      if (!this.isCurrentTrackedRun(run) || run.processKilled || run.cancelRequested) {
+        result.skipped.push({
+          memberName: candidate.memberName,
+          reason: 'Team stopped during retry',
+        });
+        continue;
+      }
+
+      try {
+        await this.reattachOpenCodeOwnedMemberLane(teamName, candidate.memberName, {
+          reason: 'manual_restart',
+        });
+        result.attempted.push(candidate.memberName);
+
+        const outcome = await this.readOpenCodeSecondaryRetryOutcome(
+          run,
+          candidate.memberName,
+          candidate.laneId
+        );
+        if (outcome.launchState === 'confirmed_alive') {
+          result.confirmed.push(candidate.memberName);
+        } else if (outcome.launchState === 'failed_to_start') {
+          result.failed.push({
+            memberName: candidate.memberName,
+            error: outcome.reason ?? 'OpenCode retry failed',
+          });
+        } else if (outcome.launchState === 'skipped_for_launch') {
+          result.skipped.push({
+            memberName: candidate.memberName,
+            reason: outcome.reason ?? 'Teammate is skipped for this launch',
+          });
+        } else {
+          result.pending.push(candidate.memberName);
+        }
+      } catch (error) {
+        result.failed.push({
+          memberName: candidate.memberName,
+          error: error instanceof Error ? error.message : String(error),
+        });
+      }
+    }
+
+    await this.notifyLeadAboutConfirmedOpenCodeRetries(run, result);
+    return result;
+  }
+
+  private async collectFailedOpenCodeSecondaryRetryCandidates(
+    run: ProvisioningRun
+  ): Promise<OpenCodeSecondaryRetryCandidate[]> {
+    const teamName = run.teamName;
+    const leadProviderId = resolveTeamProviderId(run.request.providerId);
+    if (leadProviderId === 'opencode') {
+      throw new Error(
+        'Retrying OpenCode secondary lanes is only supported for mixed teams with a non-OpenCode lead.'
+      );
+    }
+    if (!this.getOpenCodeRuntimeAdapter()) {
+      throw new Error('OpenCode runtime adapter is not available for secondary lane retry.');
+    }
+
+    const config = await this.readConfigForStrictDecision(teamName);
+    if (!config) {
+      throw new Error(`Team "${teamName}" configuration is no longer available`);
+    }
+    const metaMembers = await this.membersMetaStore.getMembers(teamName).catch(() => []);
+    const persistedSnapshot = await this.launchStateStore.read(teamName).catch(() => null);
+
+    const names = new Set<string>();
+    for (const member of config.members ?? []) {
+      const name = member.name?.trim();
+      if (name) {
+        names.add(name);
+      }
+    }
+    for (const member of metaMembers) {
+      const name = member.name?.trim();
+      if (name) {
+        names.add(name);
+      }
+    }
+    for (const lane of run.mixedSecondaryLanes ?? []) {
+      const name = lane.member.name?.trim();
+      if (name) {
+        names.add(name);
+      }
+    }
+    for (const name of persistedSnapshot?.expectedMembers ?? []) {
+      if (name.trim()) {
+        names.add(name.trim());
+      }
+    }
+    for (const name of Object.keys(persistedSnapshot?.members ?? {})) {
+      if (name.trim()) {
+        names.add(name.trim());
+      }
+    }
+
+    const candidates: OpenCodeSecondaryRetryCandidate[] = [];
+    for (const memberName of [...names].sort((left, right) => left.localeCompare(right))) {
+      const configuredMember = this.resolveEffectiveConfiguredMember(
+        config.members ?? [],
+        metaMembers,
+        memberName
+      );
+      if (!configuredMember || configuredMember.removedAt) {
+        continue;
+      }
+      if (isLeadMember({ name: memberName, agentType: configuredMember.agentType })) {
+        continue;
+      }
+      if (normalizeOptionalTeamProviderId(configuredMember.providerId) !== 'opencode') {
+        continue;
+      }
+
+      const laneIdentity = buildPlannedMemberLaneIdentity({
+        leadProviderId,
+        member: {
+          name: memberName,
+          providerId: 'opencode',
+        },
+      });
+      if (
+        laneIdentity.laneKind !== 'secondary' ||
+        laneIdentity.laneOwnerProviderId !== 'opencode'
+      ) {
+        continue;
+      }
+
+      const existingLane = (run.mixedSecondaryLanes ?? []).find(
+        (lane) =>
+          lane.laneId === laneIdentity.laneId ||
+          matchesTeamMemberIdentity(lane.member.name, memberName)
+      );
+      const liveEntry = run.memberSpawnStatuses.get(memberName);
+      const persistedMember =
+        persistedSnapshot?.members[memberName] ??
+        Object.values(persistedSnapshot?.members ?? {}).find(
+          (member) => member.laneId === laneIdentity.laneId
+        );
+
+      if (
+        this.isRetryableFailedOpenCodeSecondaryLane({
+          liveEntry,
+          persistedMember,
+          existingLane,
+        })
+      ) {
+        candidates.push({ memberName, laneId: laneIdentity.laneId });
+      }
+    }
+    return candidates;
+  }
+
+  private isRetryableFailedOpenCodeSecondaryLane(input: {
+    liveEntry?: MemberSpawnStatusEntry;
+    persistedMember?: PersistedTeamLaunchMemberState;
+    existingLane?: MixedSecondaryRuntimeLaneState;
+  }): boolean {
+    const { liveEntry, persistedMember, existingLane } = input;
+    if (existingLane?.state === 'queued' || existingLane?.state === 'launching') {
+      return false;
+    }
+    if (
+      liveEntry?.launchState === 'skipped_for_launch' ||
+      liveEntry?.skippedForLaunch === true ||
+      persistedMember?.launchState === 'skipped_for_launch' ||
+      persistedMember?.skippedForLaunch === true
+    ) {
+      return false;
+    }
+    if (
+      liveEntry?.launchState === 'runtime_pending_permission' ||
+      liveEntry?.launchState === 'runtime_pending_bootstrap' ||
+      persistedMember?.launchState === 'runtime_pending_permission' ||
+      persistedMember?.launchState === 'runtime_pending_bootstrap' ||
+      (liveEntry?.pendingPermissionRequestIds?.length ?? 0) > 0 ||
+      (persistedMember?.pendingPermissionRequestIds?.length ?? 0) > 0
+    ) {
+      return false;
+    }
+    if (liveEntry?.launchState === 'starting' || liveEntry?.status === 'spawning') {
+      return false;
+    }
+    if (
+      liveEntry?.launchState === 'confirmed_alive' ||
+      liveEntry?.bootstrapConfirmed === true ||
+      persistedMember?.launchState === 'confirmed_alive' ||
+      persistedMember?.bootstrapConfirmed === true
+    ) {
+      return false;
+    }
+
+    return (
+      liveEntry?.launchState === 'failed_to_start' ||
+      liveEntry?.status === 'error' ||
+      persistedMember?.launchState === 'failed_to_start' ||
+      persistedMember?.hardFailure === true
+    );
+  }
+
+  private async readOpenCodeSecondaryRetryOutcome(
+    run: ProvisioningRun,
+    memberName: string,
+    laneId: string
+  ): Promise<OpenCodeSecondaryRetryOutcome> {
+    const lane = (run.mixedSecondaryLanes ?? []).find(
+      (candidate) =>
+        candidate.laneId === laneId || matchesTeamMemberIdentity(candidate.member.name, memberName)
+    );
+    const memberEvidence =
+      lane?.result?.members[memberName] ??
+      Object.values(lane?.result?.members ?? {}).find((member) =>
+        matchesTeamMemberIdentity(member.memberName, memberName)
+      );
+    const persistedSnapshot = await this.launchStateStore.read(run.teamName).catch(() => null);
+    const persistedMember =
+      persistedSnapshot?.members[memberName] ??
+      Object.values(persistedSnapshot?.members ?? {}).find((member) => member.laneId === laneId);
+    const liveEntry = run.memberSpawnStatuses.get(memberName);
+
+    if (
+      memberEvidence?.launchState === 'confirmed_alive' ||
+      memberEvidence?.bootstrapConfirmed === true ||
+      liveEntry?.launchState === 'confirmed_alive' ||
+      liveEntry?.bootstrapConfirmed === true ||
+      persistedMember?.launchState === 'confirmed_alive' ||
+      persistedMember?.bootstrapConfirmed === true
+    ) {
+      return { launchState: 'confirmed_alive' };
+    }
+
+    if (
+      liveEntry?.launchState === 'skipped_for_launch' ||
+      liveEntry?.skippedForLaunch === true ||
+      persistedMember?.launchState === 'skipped_for_launch' ||
+      persistedMember?.skippedForLaunch === true
+    ) {
+      return {
+        launchState: 'skipped_for_launch',
+        reason: liveEntry?.skipReason ?? persistedMember?.skipReason,
+      };
+    }
+
+    if (
+      memberEvidence?.launchState === 'failed_to_start' ||
+      memberEvidence?.hardFailure === true ||
+      liveEntry?.launchState === 'failed_to_start' ||
+      liveEntry?.status === 'error' ||
+      persistedMember?.launchState === 'failed_to_start' ||
+      persistedMember?.hardFailure === true
+    ) {
+      return {
+        launchState: 'failed_to_start',
+        reason: this.selectOpenCodeSecondaryRetryFailureReason({
+          memberEvidence,
+          liveEntry,
+          persistedMember,
+        }),
+      };
+    }
+
+    return {
+      launchState:
+        memberEvidence?.launchState ??
+        liveEntry?.launchState ??
+        persistedMember?.launchState ??
+        'runtime_pending_bootstrap',
+    };
+  }
+
+  private selectOpenCodeSecondaryRetryFailureReason(input: {
+    memberEvidence?: TeamRuntimeMemberLaunchEvidence;
+    liveEntry?: MemberSpawnStatusEntry;
+    persistedMember?: PersistedTeamLaunchMemberState;
+  }): string | undefined {
+    const diagnostics = [
+      input.memberEvidence?.hardFailureReason,
+      input.memberEvidence?.runtimeDiagnostic,
+      ...(input.memberEvidence?.diagnostics ?? []),
+      input.liveEntry?.hardFailureReason,
+      input.liveEntry?.runtimeDiagnostic,
+      input.liveEntry?.error,
+      input.persistedMember?.hardFailureReason,
+      input.persistedMember?.runtimeDiagnostic,
+    ];
+    return diagnostics
+      .find(
+        (diagnostic): diagnostic is string =>
+          typeof diagnostic === 'string' && diagnostic.trim().length > 0
+      )
+      ?.trim();
+  }
+
+  private async notifyLeadAboutConfirmedOpenCodeRetries(
+    run: ProvisioningRun,
+    result: RetryFailedOpenCodeSecondaryLanesResult
+  ): Promise<void> {
+    if (result.confirmed.length === 0) {
+      return;
+    }
+    const confirmedNames = result.confirmed.map((name) => `@${name}`).join(', ');
+    const message = [
+      `Системное замечание: повторный запуск OpenCode-тиммейтов подтверждён: ${confirmedNames}.`,
+      `Их можно снова считать доступными.`,
+    ].join(' ');
+    await this.sendMessageToRun(run, message).catch((error: unknown) =>
+      logger.warn(
+        `[${run.teamName}] failed to send OpenCode retry recovery notice to lead: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      )
+    );
+  }
+
   async skipMemberForLaunch(teamName: string, memberName: string): Promise<void> {
     const normalizedMemberName = memberName.trim();
     if (!normalizedMemberName) {
       throw new Error('Member name is required');
     }
 
-    const config = await this.configReader.getConfig(teamName);
+    const config = await this.readConfigForStrictDecision(teamName);
     if (!config) {
       throw new Error(`Team "${teamName}" configuration is no longer available`);
     }
@@ -11013,8 +13076,7 @@ export class TeamProvisioningService {
       : 'Skipped by user for this launch';
 
     if (run && !run.processKilled && !run.cancelRequested) {
-      this.agentRuntimeSnapshotCache.delete(teamName);
-      this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+      this.invalidateRuntimeSnapshotCaches(teamName);
       this.resetRuntimeToolActivity(run, normalizedMemberName);
       this.clearMemberSpawnToolTracking(run, normalizedMemberName);
       this.setMemberSpawnStatus(run, normalizedMemberName, 'skipped', reason);
@@ -11076,8 +13138,7 @@ export class TeamProvisioningService {
       updatedAt,
     });
     await this.writeLaunchStateSnapshot(teamName, nextSnapshot);
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
   }
 
   private getMutableAliveRunOrThrow(teamName: string): ProvisioningRun {
@@ -11108,7 +13169,7 @@ export class TeamProvisioningService {
       throw new Error('OpenCode runtime adapter is not available for controlled lane reattach.');
     }
 
-    const config = await this.configReader.getConfig(teamName);
+    const config = await this.readConfigForStrictDecision(teamName);
     if (!config) {
       throw new Error(`Team "${teamName}" configuration is no longer available`);
     }
@@ -11191,12 +13252,22 @@ export class TeamProvisioningService {
     }
 
     this.upsertRunAllEffectiveMember(run, memberSpec);
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.resetRuntimeToolActivity(run, memberName);
     this.clearMemberSpawnToolTracking(run, memberName);
     run.pendingMemberRestarts.delete(memberName);
 
+    if (options?.reason === 'manual_restart' || options?.reason === 'member_updated') {
+      this.persistOpenCodeMemberRestartSystemMessage({
+        teamName,
+        leadName: this.getRunLeadName(run),
+        leadSessionId: run.detectedSessionId?.trim() || config.leadSessionId?.trim() || run.runId,
+        displayName: config.description?.trim() || config.name,
+        member: this.buildConfiguredProvisioningMember(configuredMember),
+        reason: options.reason,
+      });
+    }
+
     await this.launchSingleMixedSecondaryLane(run, laneState);
   }
 
@@ -11246,8 +13317,7 @@ export class TeamProvisioningService {
     );
     if (laneIndex < 0) {
       this.removeRunAllEffectiveMember(run, memberName);
-      this.agentRuntimeSnapshotCache.delete(teamName);
-      this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+      this.invalidateRuntimeSnapshotCaches(teamName);
       await this.persistLaunchStateSnapshot(run, this.getMixedSecondaryLaunchPhase(run));
       return;
     }
@@ -11255,8 +13325,7 @@ export class TeamProvisioningService {
     const [lane] = run.mixedSecondaryLanes.splice(laneIndex, 1);
     await this.stopSingleMixedSecondaryRuntimeLane(run, lane, 'cleanup');
     this.removeRunAllEffectiveMember(run, memberName);
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.resetRuntimeToolActivity(run, memberName);
     this.clearMemberSpawnToolTracking(run, memberName);
     run.pendingMemberRestarts.delete(memberName);
@@ -11347,14 +13416,46 @@ export class TeamProvisioningService {
     const elapsedMs = Number.isFinite(acceptedAtMs) ? Date.now() - acceptedAtMs : Infinity;
     const runtimeDiagnostic = metadata?.runtimeDiagnostic;
     if (metadata?.livenessKind === 'runtime_process') {
-      if (elapsedMs >= MEMBER_BOOTSTRAP_STALL_MS) {
-        run.memberSpawnStatuses.set(memberName, {
-          ...refreshed,
-          livenessKind: metadata.livenessKind,
-          runtimeDiagnostic: 'Runtime process is alive, but no bootstrap check-in after 5 min.',
-          runtimeDiagnosticSeverity: 'warning',
-          livenessLastCheckedAt: nowIso(),
+      if (this.isOpenCodeSecondaryLaneMemberInRun(run, memberName)) {
+        const bootstrapStalled = elapsedMs >= MEMBER_BOOTSTRAP_STALL_MS;
+        const stalledDiagnostic = bootstrapStalled
+          ? await this.buildOpenCodeSecondaryBootstrapStallDiagnostic(run, memberName, refreshed)
+          : null;
+        const runtimeProcessStallDiagnostic =
+          stalledDiagnostic ===
+          'OpenCode bootstrap did not complete runtime_bootstrap_checkin after 5 min.'
+            ? 'Runtime process is alive, but no bootstrap check-in after 5 min.'
+            : stalledDiagnostic;
+        this.setOpenCodeRuntimePendingBootstrapStatus(run, memberName, refreshed, {
+          bootstrapStalled,
+          runtimeDiagnostic: bootstrapStalled
+            ? (runtimeProcessStallDiagnostic ??
+              'Runtime process is alive, but no bootstrap check-in after 5 min.')
+            : (runtimeDiagnostic ??
+              'OpenCode runtime process is alive, waiting for bootstrap check-in.'),
+          runtimeDiagnosticSeverity: bootstrapStalled
+            ? 'warning'
+            : (metadata.runtimeDiagnosticSeverity ?? 'info'),
         });
+        if (bootstrapStalled) {
+          await this.maybeSendOpenCodeSecondaryBootstrapCheckinRetryPrompt({
+            run,
+            memberName,
+            current: refreshed,
+            runtimeDiagnostic:
+              runtimeProcessStallDiagnostic ??
+              'Runtime process is alive, but no bootstrap check-in after 5 min.',
+            runtimeSessionId: metadata.runtimeSessionId,
+          });
+        }
+        if (elapsedMs < MEMBER_BOOTSTRAP_STALL_MS) {
+          this.scheduleOpenCodeBootstrapStallReevaluation(
+            run,
+            memberName,
+            refreshedFirstSpawnAcceptedAt
+          );
+        }
+        return;
       }
       this.setMemberSpawnStatus(run, memberName, 'online', undefined, 'process');
       return;
@@ -11401,6 +13502,36 @@ export class TeamProvisioningService {
       }
       return;
     }
+    if (
+      this.isOpenCodeSecondaryLaneMemberInRun(run, memberName) &&
+      refreshed.launchState === 'runtime_pending_bootstrap' &&
+      refreshed.bootstrapConfirmed !== true &&
+      refreshed.hardFailure !== true &&
+      elapsedMs >= MEMBER_BOOTSTRAP_STALL_MS
+    ) {
+      const enriched = {
+        ...refreshed,
+        ...(metadata?.livenessKind ? { livenessKind: metadata.livenessKind } : {}),
+        ...(runtimeDiagnostic ? { runtimeDiagnostic } : {}),
+        ...(metadata?.runtimeDiagnosticSeverity
+          ? { runtimeDiagnosticSeverity: metadata.runtimeDiagnosticSeverity }
+          : {}),
+      };
+      const diagnostic = await this.buildOpenCodeSecondaryBootstrapStallDiagnostic(
+        run,
+        memberName,
+        enriched
+      );
+      this.setOpenCodeSecondaryBootstrapStalledStatus(run, memberName, enriched, diagnostic);
+      await this.maybeSendOpenCodeSecondaryBootstrapCheckinRetryPrompt({
+        run,
+        memberName,
+        current: enriched,
+        runtimeDiagnostic: diagnostic,
+        runtimeSessionId: metadata?.runtimeSessionId,
+      });
+      return;
+    }
     const strictReason = restartPending
       ? buildRestartGraceTimeoutReason(memberName)
       : (runtimeDiagnostic ??
@@ -11425,6 +13556,283 @@ export class TeamProvisioningService {
     this.setMemberSpawnStatus(run, memberName, 'error', strictReason);
   }
 
+  private setOpenCodeRuntimePendingBootstrapStatus(
+    run: ProvisioningRun,
+    memberName: string,
+    current: MemberSpawnStatusEntry,
+    options: {
+      bootstrapStalled: boolean;
+      runtimeDiagnostic: string;
+      runtimeDiagnosticSeverity: TeamAgentRuntimeDiagnosticSeverity;
+    }
+  ): void {
+    const observedAt = nowIso();
+    const wasBootstrapStalled = current.bootstrapStalled === true;
+    const next: MemberSpawnStatusEntry = {
+      ...current,
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      agentToolAccepted: true,
+      runtimeAlive: true,
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      error: undefined,
+      hardFailureReason: undefined,
+      livenessSource: undefined,
+      livenessKind: 'runtime_process',
+      runtimeDiagnostic: options.runtimeDiagnostic,
+      runtimeDiagnosticSeverity: options.runtimeDiagnosticSeverity,
+      bootstrapStalled: options.bootstrapStalled ? true : undefined,
+      livenessLastCheckedAt: observedAt,
+      firstSpawnAcceptedAt: current.firstSpawnAcceptedAt ?? observedAt,
+      updatedAt: observedAt,
+    };
+
+    run.memberSpawnStatuses.set(memberName, next);
+    const launchDiagnostics = boundLaunchDiagnostics(buildLaunchDiagnosticsFromRun(run));
+    if (launchDiagnostics) {
+      run.progress = {
+        ...run.progress,
+        updatedAt: observedAt,
+        launchDiagnostics,
+      };
+      run.onProgress(run.progress);
+    }
+
+    if (options.bootstrapStalled && !wasBootstrapStalled) {
+      this.appendMemberBootstrapDiagnostic(run, memberName, 'opencode_bootstrap_stalled');
+    } else if (
+      !options.bootstrapStalled &&
+      (current.status !== 'waiting' || current.livenessKind !== 'runtime_process')
+    ) {
+      this.appendMemberBootstrapDiagnostic(
+        run,
+        memberName,
+        'runtime process is alive, teammate check-in not yet received'
+      );
+    }
+    if (!this.isCurrentTrackedRun(run)) return;
+    this.emitMemberSpawnChange(run, memberName);
+    if (run.isLaunch) {
+      void this.persistLaunchStateSnapshot(run, run.provisioningComplete ? 'finished' : 'active');
+    }
+  }
+
+  private async buildOpenCodeSecondaryBootstrapStallDiagnostic(
+    run: ProvisioningRun,
+    memberName: string,
+    current: MemberSpawnStatusEntry
+  ): Promise<string> {
+    const lane = (run.mixedSecondaryLanes ?? []).find(
+      (candidate) =>
+        candidate.providerId === 'opencode' &&
+        matchesTeamMemberIdentity(candidate.member.name, memberName)
+    );
+    const selectedDiagnostic = selectOpenCodeSecondaryBootstrapStallDiagnostic([
+      current.runtimeDiagnostic,
+      ...(lane?.diagnostics ?? []),
+      ...(lane?.result?.diagnostics ?? []),
+      ...(lane?.result?.members[memberName]?.diagnostics ?? []),
+      ...Object.values(lane?.result?.members ?? {})
+        .filter((member) => matchesTeamMemberIdentity(member.memberName ?? '', memberName))
+        .flatMap((member) => member.diagnostics ?? []),
+    ]);
+    if (selectedDiagnostic) {
+      return selectedDiagnostic;
+    }
+
+    const acceptedAtMs =
+      current.firstSpawnAcceptedAt != null ? Date.parse(current.firstSpawnAcceptedAt) : NaN;
+    const transcriptOutcome = await this.findBootstrapTranscriptOutcome(
+      run.teamName,
+      memberName,
+      Number.isFinite(acceptedAtMs) ? acceptedAtMs : null
+    );
+    if (transcriptOutcome?.kind === 'success' && transcriptOutcome.source === 'member_briefing') {
+      return 'OpenCode member_briefing completed, but runtime_bootstrap_checkin did not complete after 5 min.';
+    }
+    return 'OpenCode bootstrap did not complete runtime_bootstrap_checkin after 5 min.';
+  }
+
+  private setOpenCodeSecondaryBootstrapStalledStatus(
+    run: ProvisioningRun,
+    memberName: string,
+    current: MemberSpawnStatusEntry,
+    runtimeDiagnostic: string
+  ): void {
+    const observedAt = nowIso();
+    const wasBootstrapStalled = current.bootstrapStalled === true;
+    const runtimeProcessAlive =
+      current.runtimeAlive === true && current.livenessKind === 'runtime_process';
+    const next: MemberSpawnStatusEntry = {
+      ...current,
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      agentToolAccepted: true,
+      runtimeAlive: runtimeProcessAlive,
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      error: undefined,
+      hardFailureReason: undefined,
+      livenessSource: undefined,
+      livenessKind:
+        current.livenessKind ?? (runtimeProcessAlive ? 'runtime_process' : 'registered_only'),
+      runtimeDiagnostic,
+      runtimeDiagnosticSeverity: 'warning',
+      bootstrapStalled: true,
+      livenessLastCheckedAt: observedAt,
+      firstSpawnAcceptedAt: current.firstSpawnAcceptedAt ?? observedAt,
+      updatedAt: observedAt,
+    };
+
+    run.memberSpawnStatuses.set(memberName, next);
+    const launchDiagnostics = boundLaunchDiagnostics(buildLaunchDiagnosticsFromRun(run));
+    if (launchDiagnostics) {
+      run.progress = {
+        ...run.progress,
+        updatedAt: observedAt,
+        launchDiagnostics,
+      };
+      run.onProgress(run.progress);
+    }
+
+    if (!wasBootstrapStalled) {
+      this.appendMemberBootstrapDiagnostic(run, memberName, runtimeDiagnostic);
+    }
+    if (!this.isCurrentTrackedRun(run)) return;
+    this.emitMemberSpawnChange(run, memberName);
+    if (run.isLaunch) {
+      void this.persistLaunchStateSnapshot(run, run.provisioningComplete ? 'finished' : 'active');
+    }
+  }
+
+  private async maybeSendOpenCodeSecondaryBootstrapCheckinRetryPrompt(input: {
+    run: ProvisioningRun;
+    memberName: string;
+    current: MemberSpawnStatusEntry;
+    runtimeDiagnostic: string;
+    runtimeSessionId?: string;
+  }): Promise<void> {
+    const { run, memberName, current, runtimeDiagnostic } = input;
+    if (
+      !this.isCurrentTrackedRun(run) ||
+      run.processKilled ||
+      run.cancelRequested ||
+      current.launchState !== 'runtime_pending_bootstrap' ||
+      current.bootstrapConfirmed === true ||
+      current.hardFailure === true ||
+      current.skippedForLaunch === true ||
+      (current.pendingPermissionRequestIds?.length ?? 0) > 0
+    ) {
+      return;
+    }
+
+    const lane = (run.mixedSecondaryLanes ?? []).find(
+      (candidate) =>
+        candidate.providerId === 'opencode' &&
+        matchesTeamMemberIdentity(candidate.member.name, memberName)
+    );
+    const laneRunId = lane?.runId?.trim();
+    const runtimeSessionId =
+      input.runtimeSessionId?.trim() ||
+      lane?.result?.members[memberName]?.sessionId?.trim() ||
+      Object.values(lane?.result?.members ?? {})
+        .find((member) => matchesTeamMemberIdentity(member.memberName ?? '', memberName))
+        ?.sessionId?.trim() ||
+      '';
+    if (!lane || !laneRunId || !isMaterializedOpenCodeSessionId(runtimeSessionId)) {
+      return;
+    }
+
+    const diagnostics = [
+      runtimeDiagnostic,
+      current.runtimeDiagnostic,
+      ...(lane.diagnostics ?? []),
+      ...(lane.result?.diagnostics ?? []),
+      ...(lane.result?.members[memberName]?.diagnostics ?? []),
+    ].filter((value): value is string => typeof value === 'string' && value.trim().length > 0);
+    if (hasRealOpenCodeFailureDiagnostic(diagnostics.join('\n').toLowerCase())) {
+      return;
+    }
+
+    const marker = getOpenCodeBootstrapCheckinRetryMarker(laneRunId, runtimeSessionId);
+    if (
+      run.provisioningOutputParts.some((line) => line.includes(marker)) ||
+      diagnostics.some((line) => line.includes(marker))
+    ) {
+      return;
+    }
+
+    const adapter = this.getOpenCodeRuntimeMessageAdapter();
+    if (!adapter) {
+      return;
+    }
+
+    lane.diagnostics = [...new Set([...(lane.diagnostics ?? []), marker])];
+    this.appendMemberBootstrapDiagnostic(run, memberName, marker);
+
+    try {
+      const result = await adapter.sendMessageToMember({
+        runId: laneRunId,
+        teamName: run.teamName,
+        laneId: lane.laneId,
+        memberName,
+        cwd: lane.member.cwd?.trim() || run.request.cwd,
+        text: '',
+        messageId: `bootstrap-checkin-retry-${run.runId}-${memberName}-${runtimeSessionId}`,
+        bootstrapCheckinRetry: {
+          runtimeSessionId,
+          reason: runtimeDiagnostic,
+        },
+      });
+      if (!result.ok) {
+        this.appendMemberBootstrapDiagnostic(
+          run,
+          memberName,
+          `opencode_bootstrap_checkin_retry_prompt_failed: ${
+            result.diagnostics.join('; ') || 'OpenCode bridge did not accept retry prompt'
+          }`
+        );
+      }
+    } catch (error) {
+      this.appendMemberBootstrapDiagnostic(
+        run,
+        memberName,
+        `opencode_bootstrap_checkin_retry_prompt_failed: ${getErrorMessage(error)}`
+      );
+    }
+  }
+
+  private scheduleOpenCodeBootstrapStallReevaluation(
+    run: ProvisioningRun,
+    memberName: string,
+    firstSpawnAcceptedAt: string
+  ): void {
+    const acceptedAtMs = Date.parse(firstSpawnAcceptedAt);
+    if (!Number.isFinite(acceptedAtMs)) {
+      return;
+    }
+    const stallDelayMs = Math.max(1_000, acceptedAtMs + MEMBER_BOOTSTRAP_STALL_MS - Date.now());
+    const stallKey = `${this.getMemberLaunchGraceKey(run, memberName)}:bootstrap-stall`;
+    if (this.pendingTimeouts.has(stallKey)) {
+      return;
+    }
+    const timer = setTimeout(() => {
+      this.pendingTimeouts.delete(stallKey);
+      void this.reevaluateMemberLaunchStatus(run, memberName);
+    }, stallDelayMs);
+    timer.unref?.();
+    this.pendingTimeouts.set(stallKey, timer);
+  }
+
+  private isOpenCodeBootstrapStallWindowElapsed(firstSpawnAcceptedAt: string | undefined): boolean {
+    if (!firstSpawnAcceptedAt) {
+      return false;
+    }
+    const acceptedAtMs = Date.parse(firstSpawnAcceptedAt);
+    return Number.isFinite(acceptedAtMs) && Date.now() - acceptedAtMs >= MEMBER_BOOTSTRAP_STALL_MS;
+  }
+
   private shouldSkipMemberSpawnAudit(run: ProvisioningRun): boolean {
     if (!run.expectedMembers || run.expectedMembers.length === 0) {
       return true;
@@ -12415,6 +14823,7 @@ export class TeamProvisioningService {
     };
     primaryProviderId?: TeamProviderId;
     primaryEnv?: ProvisioningEnvResolution;
+    teamRuntimeAuth?: TeamRuntimeAuthContext;
     limitContext?: boolean;
   }): Promise<TeamCreateRequest['members']> {
     const envByProvider = new Map<TeamProviderId, Promise<ProvisioningEnvResolution>>();
@@ -12431,7 +14840,9 @@ export class TeamProvisioningService {
         return cached;
       }
 
-      const created = this.buildProvisioningEnv(providerId);
+      const created = this.buildProvisioningEnv(providerId, undefined, {
+        teamRuntimeAuth: params.teamRuntimeAuth,
+      });
       envByProvider.set(providerId, created);
       return created;
     };
@@ -13458,9 +15869,16 @@ export class TeamProvisioningService {
         throw new Error('Claude CLI not found; install it or provide a valid path');
       }
 
+      const runtimeAuthMaterialId = randomUUID();
+      const teamRuntimeAuth: TeamRuntimeAuthContext = {
+        teamName: request.teamName,
+        authMaterialId: runtimeAuthMaterialId,
+        allowAnthropicApiKeyHelper: true,
+      };
       const provisioningEnv = await this.buildProvisioningEnv(
         request.providerId,
-        request.providerBackendId
+        request.providerBackendId,
+        { includeCodexTeammateAuth: teamRequestIncludesCodexMember(request), teamRuntimeAuth }
       );
       const {
         env: shellEnv,
@@ -13482,6 +15900,7 @@ export class TeamProvisioningService {
         },
         primaryProviderId: request.providerId,
         primaryEnv: provisioningEnv,
+        teamRuntimeAuth,
         limitContext: request.limitContext,
       });
       const allEffectiveMemberSpecs = await this.resolveOpenCodeMemberWorkspacesForRuntime({
@@ -13502,12 +15921,29 @@ export class TeamProvisioningService {
       const effectiveMemberSpecs = allEffectiveMemberSpecs.filter((member) =>
         primaryMemberNames.has(member.name)
       );
+      const resolvedProviderId = resolveTeamProviderId(request.providerId);
+      const crossProviderMemberArgs = await this.buildCrossProviderMemberArgs(
+        resolvedProviderId,
+        effectiveMemberSpecs,
+        { teamRuntimeAuth }
+      );
+      Object.assign(shellEnv, crossProviderMemberArgs.envPatch);
+      if (crossProviderMemberArgs.usesAnthropicApiKeyHelper) {
+        for (const key of ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS) {
+          delete shellEnv[key];
+        }
+      }
+      const providerArgsByProvider = new Map<TeamProviderId, string[]>([
+        [resolvedProviderId, providerArgs],
+        ...crossProviderMemberArgs.providerArgsByProvider,
+      ]);
       const launchIdentity = await this.resolveAndValidateLaunchIdentity({
         claudePath,
         cwd: request.cwd,
         env: shellEnv,
         request,
         effectiveMembers: effectiveMemberSpecs,
+        providerArgsByProvider,
       });
       const runId = randomUUID();
       const startedAt = nowIso();
@@ -13576,6 +16012,7 @@ export class TeamProvisioningService {
         authFailureRetried: false,
         authRetryInProgress: false,
         spawnContext: null,
+        anthropicApiKeyHelper: provisioningEnv.anthropicApiKeyHelper ?? null,
         pendingApprovals: new Map(),
         processedPermissionRequestIds: new Set(),
         pendingPostCompactReminder: false,
@@ -13660,6 +16097,11 @@ export class TeamProvisioningService {
       } catch (error) {
         this.runs.delete(runId);
         this.provisioningRunByTeam.delete(request.teamName);
+        if (provisioningEnv.anthropicApiKeyHelper) {
+          await cleanupAnthropicTeamApiKeyHelperMaterial({
+            directory: provisioningEnv.anthropicApiKeyHelper.directory,
+          }).catch(() => undefined);
+        }
         await removeDeterministicBootstrapSpecFile(run.bootstrapSpecPath).catch(() => {});
         run.bootstrapSpecPath = null;
         await removeDeterministicBootstrapUserPromptFile(run.bootstrapUserPromptPath).catch(
@@ -13673,10 +16115,16 @@ export class TeamProvisioningService {
         request.model,
         launchIdentity
       );
-      const resolvedProviderId = resolveTeamProviderId(request.providerId);
-      const providerFastModeArgs = buildProviderFastModeArgs(resolvedProviderId, launchIdentity);
-      const runtimeTurnSettledHookArgs =
-        await this.buildRuntimeTurnSettledHookSettingsArgs(resolvedProviderId);
+      const extraCliArgs = parseCliArgs(request.extraCliArgs);
+      const runtimeArgsPlan = await this.buildTeamRuntimeLaunchArgsPlan({
+        teamName: request.teamName,
+        providerId: resolvedProviderId,
+        launchIdentity,
+        envResolution: provisioningEnv,
+        extraArgs: extraCliArgs,
+        includeAnthropicHelper: resolvedProviderId === 'anthropic',
+        contextLabel: 'Team create launch',
+      });
       const spawnArgs = mergeJsonSettingsArgs([
         '--input-format',
         'stream-json',
@@ -13701,12 +16149,14 @@ export class TeamProvisioningService {
           : ['--permission-prompt-tool', 'stdio', '--permission-mode', 'default']),
         ...(launchModelArg ? ['--model', launchModelArg] : []),
         ...(launchIdentity.resolvedEffort ? ['--effort', launchIdentity.resolvedEffort] : []),
-        ...providerFastModeArgs,
-        ...runtimeTurnSettledHookArgs,
+        ...runtimeArgsPlan.fastModeArgs,
+        ...runtimeArgsPlan.runtimeTurnSettledHookArgs,
         ...(request.worktree ? ['--worktree', request.worktree] : []),
         ...buildDesktopTeammateModeCliArgs(teammateModeDecision),
-        ...parseCliArgs(request.extraCliArgs),
-        ...providerArgs,
+        ...runtimeArgsPlan.extraArgs,
+        ...runtimeArgsPlan.providerArgs,
+        ...runtimeArgsPlan.settingsArgs,
+        ...crossProviderMemberArgs.args,
       ]);
       const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
         geminiRuntimeAuth,
@@ -13788,6 +16238,11 @@ export class TeamProvisioningService {
           await this.mcpConfigBuilder.removeConfigFile(run.mcpConfigPath).catch(() => {});
           run.mcpConfigPath = null;
         }
+        if (provisioningEnv.anthropicApiKeyHelper) {
+          await cleanupAnthropicTeamApiKeyHelperMaterial({
+            directory: provisioningEnv.anthropicApiKeyHelper.directory,
+          }).catch(() => undefined);
+        }
         this.runs.delete(runId);
         this.provisioningRunByTeam.delete(request.teamName);
         throw error;
@@ -14131,6 +16586,7 @@ export class TeamProvisioningService {
         }).catch(() => undefined);
         this.runtimeAdapterRunByTeam.delete(input.request.teamName);
         this.aliveRunByTeam.delete(input.request.teamName);
+        this.invalidateRuntimeSnapshotCaches(input.request.teamName);
       } else {
         this.runtimeAdapterRunByTeam.set(input.request.teamName, {
           runId,
@@ -14139,6 +16595,7 @@ export class TeamProvisioningService {
           members: result.members,
         });
         this.aliveRunByTeam.set(input.request.teamName, runId);
+        this.invalidateRuntimeSnapshotCaches(input.request.teamName);
       }
       if (this.provisioningRunByTeam.get(input.request.teamName) === runId) {
         this.provisioningRunByTeam.delete(input.request.teamName);
@@ -14216,6 +16673,7 @@ export class TeamProvisioningService {
       ],
     };
     await atomicWriteAsync(configPath, `${JSON.stringify(config, null, 2)}\n`);
+    TeamConfigReader.invalidateTeam(request.teamName);
   }
 
   private async persistOpenCodeRuntimeAdapterLaunchResult(
@@ -14440,14 +16898,27 @@ export class TeamProvisioningService {
               member.bootstrapConfirmed !== true
             );
           };
+          const updatedAtMs = Date.parse(persistedLaunchState.updatedAt);
+          const activeLaunchLooksStale =
+            launchPhase === 'active' &&
+            (!Number.isFinite(updatedAtMs) || Date.now() - updatedAtMs >= MEMBER_LAUNCH_GRACE_MS);
+          const launchOutcomeIsSettledOrStale = launchPhase !== 'active' || activeLaunchLooksStale;
+          const hasPreviousExpectedTeammates = prevExpected.length > 0;
+          const previousTeammates = prevExpected.map((name) => prevMembers[name]);
+          const staleActiveLaunchHasNoLiveTeammates =
+            activeLaunchLooksStale &&
+            hasPreviousExpectedTeammates &&
+            !previousTeammates.some(
+              (member) => member?.runtimeAlive === true || member?.bootstrapConfirmed === true
+            );
           const allTeammatesNeverSpawned =
-            launchPhase !== 'active' &&
-            prevExpected.length > 0 &&
-            prevExpected.every((name) => teammateWasNeverSpawned(prevMembers[name]));
-          if (allTeammatesNeverSpawned) {
+            launchOutcomeIsSettledOrStale &&
+            hasPreviousExpectedTeammates &&
+            previousTeammates.every(teammateWasNeverSpawned);
+          if (allTeammatesNeverSpawned || staleActiveLaunchHasNoLiveTeammates) {
             skipResume = true;
             logger.info(
-              `[${request.teamName}] Previous launch had no teammates successfully spawned — ` +
+              `[${request.teamName}] Previous launch cannot be resumed safely - ` +
                 `skipping session resume to allow full bootstrap`
             );
           }
@@ -14547,10 +17018,16 @@ export class TeamProvisioningService {
       const teamsBasePathsToProbe = getTeamsBasePathsToProbe();
       const runId = randomUUID();
       const startedAt = nowIso();
+      const teamRuntimeAuth: TeamRuntimeAuthContext = {
+        teamName: request.teamName,
+        authMaterialId: runId,
+        allowAnthropicApiKeyHelper: true,
+      };
 
       const provisioningEnv = await this.buildProvisioningEnv(
         request.providerId,
-        request.providerBackendId
+        request.providerBackendId,
+        { includeCodexTeammateAuth: teamRequestIncludesCodexMember(request), teamRuntimeAuth }
       );
       const {
         env: shellEnv,
@@ -14573,6 +17050,7 @@ export class TeamProvisioningService {
         },
         primaryProviderId: request.providerId,
         primaryEnv: provisioningEnv,
+        teamRuntimeAuth,
         limitContext: request.limitContext,
       });
       const allEffectiveMemberSpecs = await this.resolveOpenCodeMemberWorkspacesForRuntime({
@@ -14594,12 +17072,29 @@ export class TeamProvisioningService {
         primaryMemberNames.has(member.name)
       );
       const expectedMembers = effectiveMemberSpecs.map((member) => member.name);
+      const resolvedProviderId = resolveTeamProviderId(request.providerId);
+      const crossProviderMemberArgs = await this.buildCrossProviderMemberArgs(
+        resolvedProviderId,
+        effectiveMemberSpecs,
+        { teamRuntimeAuth }
+      );
+      Object.assign(shellEnv, crossProviderMemberArgs.envPatch);
+      if (crossProviderMemberArgs.usesAnthropicApiKeyHelper) {
+        for (const key of ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS) {
+          delete shellEnv[key];
+        }
+      }
+      const providerArgsByProvider = new Map<TeamProviderId, string[]>([
+        [resolvedProviderId, providerArgs],
+        ...crossProviderMemberArgs.providerArgsByProvider,
+      ]);
       const launchIdentity = await this.resolveAndValidateLaunchIdentity({
         claudePath,
         cwd: request.cwd,
         env: shellEnv,
         request,
         effectiveMembers: effectiveMemberSpecs,
+        providerArgsByProvider,
       });
 
       // Build a synthetic TeamCreateRequest for reuse by shared infrastructure
@@ -14693,6 +17188,7 @@ export class TeamProvisioningService {
         authFailureRetried: false,
         authRetryInProgress: false,
         spawnContext: null,
+        anthropicApiKeyHelper: provisioningEnv.anthropicApiKeyHelper ?? null,
         pendingApprovals: new Map(),
         processedPermissionRequestIds: new Set(),
         pendingPostCompactReminder: false,
@@ -14801,6 +17297,11 @@ export class TeamProvisioningService {
       } catch (error) {
         this.runs.delete(runId);
         this.provisioningRunByTeam.delete(request.teamName);
+        if (provisioningEnv.anthropicApiKeyHelper) {
+          await cleanupAnthropicTeamApiKeyHelperMaterial({
+            directory: provisioningEnv.anthropicApiKeyHelper.directory,
+          }).catch(() => undefined);
+        }
         await removeDeterministicBootstrapSpecFile(run.bootstrapSpecPath).catch(() => {});
         run.bootstrapSpecPath = null;
         await removeDeterministicBootstrapUserPromptFile(run.bootstrapUserPromptPath).catch(
@@ -14844,35 +17345,38 @@ export class TeamProvisioningService {
         request.model,
         launchIdentity
       );
-      const resolvedProviderId = resolveTeamProviderId(request.providerId);
-      const providerFastModeArgs = buildProviderFastModeArgs(resolvedProviderId, launchIdentity);
-      const runtimeTurnSettledHookArgs =
-        await this.buildRuntimeTurnSettledHookSettingsArgs(resolvedProviderId);
+      const extraCliArgs = parseCliArgs(request.extraCliArgs);
+      const runtimeArgsPlan = await this.buildTeamRuntimeLaunchArgsPlan({
+        teamName: request.teamName,
+        providerId: resolvedProviderId,
+        launchIdentity,
+        envResolution: provisioningEnv,
+        extraArgs: extraCliArgs,
+        includeAnthropicHelper: resolvedProviderId === 'anthropic',
+        contextLabel: 'Team launch',
+      });
       if (launchModelArg) {
         launchArgs.push('--model', launchModelArg);
       }
       if (launchIdentity.resolvedEffort) {
         launchArgs.push('--effort', launchIdentity.resolvedEffort);
       }
-      launchArgs.push(...providerFastModeArgs);
-      launchArgs.push(...runtimeTurnSettledHookArgs);
+      launchArgs.push(...runtimeArgsPlan.fastModeArgs);
+      launchArgs.push(...runtimeArgsPlan.runtimeTurnSettledHookArgs);
       if (request.worktree) {
         launchArgs.push('--worktree', request.worktree);
       }
       launchArgs.push(...buildDesktopTeammateModeCliArgs(teammateModeDecision));
-      launchArgs.push(...parseCliArgs(request.extraCliArgs));
-      launchArgs.push(...providerArgs);
+      launchArgs.push(...runtimeArgsPlan.extraArgs);
+      launchArgs.push(...runtimeArgsPlan.providerArgs);
+      launchArgs.push(...runtimeArgsPlan.settingsArgs);
       // When the lead uses a different provider than some teammates (e.g., anthropic lead
       // with codex teammates), the lead needs the teammate provider's launch args so they
       // can be inherited by the teammate subprocess via buildInheritedCliFlags.
       // Without this, a codex teammate spawned from an anthropic lead has no way to learn
       // about the required forced_login_method (chatgpt/api) and fails to start.
       emitProvisioningCheckpoint(run, 'Resolving cross-provider member launch args');
-      const crossProviderMemberArgs = await this.buildCrossProviderMemberArgs(
-        resolvedProviderId,
-        effectiveMemberSpecs
-      );
-      launchArgs.push(...crossProviderMemberArgs);
+      launchArgs.push(...crossProviderMemberArgs.args);
       const finalLaunchArgs = mergeJsonSettingsArgs(launchArgs);
       const runtimeWarning = buildRuntimeLaunchWarning(request, shellEnv, {
         geminiRuntimeAuth,
@@ -14947,6 +17451,11 @@ export class TeamProvisioningService {
           () => {}
         );
         run.bootstrapUserPromptPath = null;
+        if (provisioningEnv.anthropicApiKeyHelper) {
+          await cleanupAnthropicTeamApiKeyHelperMaterial({
+            directory: provisioningEnv.anthropicApiKeyHelper.directory,
+          }).catch(() => undefined);
+        }
         this.runs.delete(runId);
         this.provisioningRunByTeam.delete(request.teamName);
         await this.restorePrelaunchConfig(request.teamName);
@@ -15036,9 +17545,48 @@ export class TeamProvisioningService {
     if (runtimeProgress) {
       return runtimeProgress;
     }
+    const retainedProgress = this.getRetainedProvisioningProgressMap().get(runId);
+    if (retainedProgress) {
+      return retainedProgress;
+    }
     throw new Error('Unknown runId');
   }
 
+  private getRetainedProvisioningProgressMap(): Map<string, TeamProvisioningProgress> {
+    this.retainedProvisioningProgressByRunId ??= new Map<string, TeamProvisioningProgress>();
+    return this.retainedProvisioningProgressByRunId;
+  }
+
+  private getRetainedProvisioningProgressTimersMap(): Map<string, ReturnType<typeof setTimeout>> {
+    this.retainedProvisioningProgressTimersByRunId ??= new Map<
+      string,
+      ReturnType<typeof setTimeout>
+    >();
+    return this.retainedProvisioningProgressTimersByRunId;
+  }
+
+  private retainProvisioningProgress(runId: string, progress: TeamProvisioningProgress): void {
+    const retainedProgress = this.getRetainedProvisioningProgressMap();
+    const retainedTimers = this.getRetainedProvisioningProgressTimersMap();
+    const previousTimer = retainedTimers.get(runId);
+    if (previousTimer) {
+      clearTimeout(previousTimer);
+    }
+
+    retainedProgress.set(runId, {
+      ...progress,
+      warnings: progress.warnings ? [...progress.warnings] : undefined,
+      launchDiagnostics: progress.launchDiagnostics ? [...progress.launchDiagnostics] : undefined,
+    });
+
+    const timer = setTimeout(() => {
+      retainedProgress.delete(runId);
+      retainedTimers.delete(runId);
+    }, TeamProvisioningService.RETAINED_PROVISIONING_PROGRESS_TTL_MS);
+    timer.unref?.();
+    retainedTimers.set(runId, timer);
+  }
+
   async cancelProvisioning(runId: string): Promise<void> {
     const run = this.runs.get(runId);
     if (!run) {
@@ -15100,6 +17648,7 @@ export class TeamProvisioningService {
     if (this.provisioningRunByTeam.get(teamName) === runId) {
       this.provisioningRunByTeam.delete(teamName);
     }
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.setRuntimeAdapterProgress({
       ...runtimeProgress,
       state: 'cancelled',
@@ -15179,6 +17728,7 @@ export class TeamProvisioningService {
     if (this.provisioningRunByTeam.get(teamName) === runId) {
       this.provisioningRunByTeam.delete(teamName);
     }
+    this.invalidateRuntimeSnapshotCaches(teamName);
   }
 
   private recordCancelledOpenCodeRuntimeAdapterLaunch(
@@ -15191,6 +17741,7 @@ export class TeamProvisioningService {
     this.provisioningRunByTeam.delete(teamName);
     this.runtimeAdapterRunByTeam.delete(teamName);
     this.aliveRunByTeam.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     const progress: TeamProvisioningProgress = {
       runId,
       teamName,
@@ -15542,14 +18093,18 @@ export class TeamProvisioningService {
       return { kind: 'ignored', relayed: 0 };
     }
 
-    const leadName = await this.configReader
-      .getConfig(teamName)
-      .then(
-        (config) => config?.members?.find((member) => isLeadMember(member))?.name?.trim() || null
-      )
-      .catch(() => null);
+    const [config, metaMembers] = await Promise.all([
+      this.readConfigSnapshot(teamName).catch(() => null),
+      this.membersMetaStore.getMembers(teamName).catch(() => []),
+    ]);
+    const leadName = config?.members?.find((member) => isLeadMember(member))?.name?.trim() || null;
+    const isOpenCodeRecipient = this.isOpenCodeRuntimeRecipientFromSources(
+      inboxName,
+      config,
+      metaMembers
+    );
     if (inboxName.trim().toLowerCase() === leadName?.toLowerCase()) {
-      if (await this.isOpenCodeRuntimeRecipient(teamName, inboxName)) {
+      if (isOpenCodeRecipient) {
         const diagnostic =
           'opencode_lead_runtime_session_missing: OpenCode lead inbox relay is unsupported in v1; leaving inbox unread for durable retry/diagnostics.';
         logger.warn(`[${teamName}] ${diagnostic} inbox=${inboxName}`);
@@ -15565,7 +18120,7 @@ export class TeamProvisioningService {
       };
     }
 
-    if (await this.isOpenCodeRuntimeRecipient(teamName, inboxName)) {
+    if (isOpenCodeRecipient) {
       const relayOptions: OpenCodeMemberInboxRelayOptions = {
         source: options.source ?? 'watcher',
         ...(options.onlyMessageId ? { onlyMessageId: options.onlyMessageId } : {}),
@@ -15996,7 +18551,7 @@ export class TeamProvisioningService {
       // as read after native delivery, so we must scan ALL messages (including read).
       let config: Awaited<ReturnType<TeamConfigReader['getConfig']>> | null = null;
       try {
-        config = await this.configReader.getConfig(teamName);
+        config = await this.readConfigForObservation(teamName);
       } catch {
         // config not ready yet during early provisioning — skip scan
       }
@@ -16045,7 +18600,7 @@ export class TeamProvisioningService {
       // Re-read config if needed (already fetched above but guard provisioningComplete path)
       if (!config) {
         try {
-          config = await this.configReader.getConfig(teamName);
+          config = await this.readConfigForObservation(teamName);
         } catch {
           return 0;
         }
@@ -16523,7 +19078,7 @@ export class TeamProvisioningService {
 
     for (const teamName of aliveTeams) {
       try {
-        const config = await this.configReader.getConfig(teamName);
+        const config = await this.readConfigForStrictDecision(teamName);
         if (!config) continue;
 
         const oldCode = config.language || 'system';
@@ -16770,12 +19325,69 @@ export class TeamProvisioningService {
       // registered the runtime and the OS process is still alive, treat it as
       // process-confirmed running. Keep this distinct from heartbeat-confirmed online.
       if (runtimeAlive) {
+        if (this.isOpenCodeSecondaryLaneMemberInRun(run, expected)) {
+          const base = current ?? createInitialMemberSpawnStatusEntry();
+          const bootstrapStalled =
+            base.bootstrapStalled === true ||
+            this.isOpenCodeBootstrapStallWindowElapsed(base.firstSpawnAcceptedAt);
+          const stalledDiagnostic = bootstrapStalled
+            ? await this.buildOpenCodeSecondaryBootstrapStallDiagnostic(run, expected, base)
+            : null;
+          const runtimeProcessStallDiagnostic =
+            stalledDiagnostic ===
+            'OpenCode bootstrap did not complete runtime_bootstrap_checkin after 5 min.'
+              ? 'Runtime process is alive, but no bootstrap check-in after 5 min.'
+              : stalledDiagnostic;
+          this.setOpenCodeRuntimePendingBootstrapStatus(run, expected, base, {
+            bootstrapStalled,
+            runtimeDiagnostic: bootstrapStalled
+              ? (runtimeProcessStallDiagnostic ??
+                'Runtime process is alive, but no bootstrap check-in after 5 min.')
+              : (base.runtimeDiagnostic ??
+                'OpenCode runtime process is alive, waiting for bootstrap check-in.'),
+            runtimeDiagnosticSeverity: bootstrapStalled
+              ? 'warning'
+              : (base.runtimeDiagnosticSeverity ?? 'info'),
+          });
+          if (bootstrapStalled) {
+            await this.maybeSendOpenCodeSecondaryBootstrapCheckinRetryPrompt({
+              run,
+              memberName: expected,
+              current: base,
+              runtimeDiagnostic:
+                runtimeProcessStallDiagnostic ??
+                'Runtime process is alive, but no bootstrap check-in after 5 min.',
+            });
+          }
+          continue;
+        }
         this.setMemberSpawnStatus(run, expected, 'online', undefined, 'process');
         continue;
       }
 
       if (matchedRuntimeNames.length > 0) {
         if (current?.agentToolAccepted) {
+          if (
+            this.isOpenCodeSecondaryLaneMemberInRun(run, expected) &&
+            current.launchState === 'runtime_pending_bootstrap' &&
+            current.bootstrapConfirmed !== true &&
+            current.hardFailure !== true &&
+            this.isOpenCodeBootstrapStallWindowElapsed(current.firstSpawnAcceptedAt)
+          ) {
+            const diagnostic = await this.buildOpenCodeSecondaryBootstrapStallDiagnostic(
+              run,
+              expected,
+              current
+            );
+            this.setOpenCodeSecondaryBootstrapStalledStatus(run, expected, current, diagnostic);
+            await this.maybeSendOpenCodeSecondaryBootstrapCheckinRetryPrompt({
+              run,
+              memberName: expected,
+              current,
+              runtimeDiagnostic: diagnostic,
+            });
+            continue;
+          }
           this.setMemberSpawnStatus(run, expected, 'waiting');
         }
         continue;
@@ -16856,9 +19468,59 @@ export class TeamProvisioningService {
     }
   }
 
+  private markUnconfirmedBootstrapMembersFailed(
+    run: ProvisioningRun,
+    reason: string,
+    options?: { cleanupRequested?: boolean }
+  ): void {
+    const failedAt = nowIso();
+    const baseReason = reason.trim() || 'Deterministic bootstrap failed before teammate check-in.';
+    for (const expected of run.expectedMembers) {
+      const prev = run.memberSpawnStatuses.get(expected) ?? createInitialMemberSpawnStatusEntry();
+      if (prev.bootstrapConfirmed || prev.skippedForLaunch) {
+        continue;
+      }
+
+      const runtimeWasAlive = prev.runtimeAlive === true || prev.livenessSource === 'process';
+      const hardFailureReason = runtimeWasAlive
+        ? `${baseReason} Runtime process was alive after bootstrap failure${
+            options?.cleanupRequested ? '; launch-owned cleanup requested.' : '.'
+          }`
+        : baseReason;
+      const next: MemberSpawnStatusEntry = {
+        ...prev,
+        status: 'error',
+        updatedAt: failedAt,
+        error: hardFailureReason,
+        hardFailure: true,
+        hardFailureReason,
+        bootstrapConfirmed: false,
+        bootstrapStalled: undefined,
+        runtimeAlive: options?.cleanupRequested ? false : prev.runtimeAlive,
+        livenessSource: options?.cleanupRequested ? undefined : prev.livenessSource,
+        runtimeDiagnostic: runtimeWasAlive
+          ? options?.cleanupRequested
+            ? 'Bootstrap failed before teammate check-in; launch-owned runtime cleanup requested.'
+            : 'Bootstrap failed before teammate check-in while runtime process was still alive.'
+          : prev.runtimeDiagnostic,
+        runtimeDiagnosticSeverity: runtimeWasAlive ? 'warning' : prev.runtimeDiagnosticSeverity,
+        launchState: 'failed_to_start',
+      };
+
+      run.memberSpawnStatuses.set(expected, next);
+      this.appendMemberBootstrapDiagnostic(run, expected, hardFailureReason);
+      if (this.isCurrentTrackedRun(run)) {
+        this.emitMemberSpawnChange(run, expected);
+      }
+    }
+  }
+
   private async attachLiveRuntimeMetadataToStatuses(
     teamName: string,
-    statuses: Record<string, MemberSpawnStatusEntry>
+    statuses: Record<string, MemberSpawnStatusEntry>,
+    options?: {
+      openCodeSecondaryBootstrapPendingMembers?: ReadonlySet<string>;
+    }
   ): Promise<Record<string, MemberSpawnStatusEntry>> {
     const runtimeByMember = await this.getLiveTeamAgentRuntimeMetadata(teamName);
     const nextStatuses = { ...statuses };
@@ -16879,6 +19541,15 @@ export class TeamProvisioningService {
       if (!current) {
         continue;
       }
+      const openCodeSecondaryBootstrapPending =
+        options?.openCodeSecondaryBootstrapPendingMembers?.has(resolvedStatusKey) === true &&
+        current.launchState === 'runtime_pending_bootstrap' &&
+        current.bootstrapConfirmed !== true &&
+        current.hardFailure !== true;
+      const openCodeBootstrapStalled =
+        openCodeSecondaryBootstrapPending &&
+        (current.bootstrapStalled === true ||
+          this.isOpenCodeBootstrapStallWindowElapsed(current.firstSpawnAcceptedAt));
       if (current.launchState === 'skipped_for_launch' || current.skippedForLaunch === true) {
         nextStatuses[resolvedStatusKey] = {
           ...current,
@@ -16896,10 +19567,17 @@ export class TeamProvisioningService {
         continue;
       }
       const runtimeDiagnostic = buildRuntimeDiagnosticForSpawn(metadata);
+      const metadataLivenessKind =
+        current.bootstrapConfirmed === true || current.launchState === 'confirmed_alive'
+          ? metadata.livenessKind === 'runtime_process' ||
+            metadata.livenessKind === 'confirmed_bootstrap'
+            ? metadata.livenessKind
+            : current.livenessKind
+          : metadata.livenessKind;
       const nextEntry: MemberSpawnStatusEntry = {
         ...current,
         ...(metadata.model ? { runtimeModel: metadata.model } : {}),
-        ...(metadata.livenessKind ? { livenessKind: metadata.livenessKind } : {}),
+        ...(metadataLivenessKind ? { livenessKind: metadataLivenessKind } : {}),
         ...(runtimeDiagnostic ? { runtimeDiagnostic } : {}),
         ...(metadata.runtimeDiagnosticSeverity
           ? { runtimeDiagnosticSeverity: metadata.runtimeDiagnosticSeverity }
@@ -16914,6 +19592,8 @@ export class TeamProvisioningService {
         current.bootstrapConfirmed !== true;
       if (
         hasStrongEvidence &&
+        !openCodeSecondaryBootstrapPending &&
+        current.bootstrapStalled !== true &&
         current.hardFailure !== true &&
         current.launchState !== 'failed_to_start'
       ) {
@@ -16926,6 +19606,27 @@ export class TeamProvisioningService {
         nextEntry.livenessSource = current.bootstrapConfirmed ? current.livenessSource : 'process';
         nextEntry.launchState = deriveMemberLaunchState(nextEntry);
       }
+      if (
+        (current.bootstrapStalled === true || openCodeSecondaryBootstrapPending) &&
+        hasStrongEvidence &&
+        current.bootstrapConfirmed !== true &&
+        current.launchState !== 'failed_to_start'
+      ) {
+        nextEntry.status = 'waiting';
+        nextEntry.agentToolAccepted = true;
+        nextEntry.runtimeAlive = true;
+        nextEntry.hardFailure = false;
+        nextEntry.hardFailureReason = undefined;
+        nextEntry.error = undefined;
+        nextEntry.livenessSource = undefined;
+        nextEntry.bootstrapStalled = openCodeBootstrapStalled ? true : undefined;
+        if (openCodeBootstrapStalled) {
+          nextEntry.runtimeDiagnostic =
+            'Runtime process is alive, but no bootstrap check-in after 5 min.';
+          nextEntry.runtimeDiagnosticSeverity = 'warning';
+        }
+        nextEntry.launchState = deriveMemberLaunchState(nextEntry);
+      }
       if (
         hasStrongEvidence &&
         current.launchState === 'failed_to_start' &&
@@ -16962,9 +19663,145 @@ export class TeamProvisioningService {
       }
       nextStatuses[resolvedStatusKey] = nextEntry;
     }
+    for (const [memberName, current] of Object.entries(nextStatuses)) {
+      const openCodeSecondaryBootstrapPending =
+        options?.openCodeSecondaryBootstrapPendingMembers?.has(memberName) === true &&
+        current.launchState === 'runtime_pending_bootstrap' &&
+        current.bootstrapConfirmed !== true &&
+        current.hardFailure !== true;
+      if (
+        !openCodeSecondaryBootstrapPending ||
+        current.bootstrapStalled === true ||
+        !this.isOpenCodeBootstrapStallWindowElapsed(current.firstSpawnAcceptedAt)
+      ) {
+        continue;
+      }
+      const runtimeProcessAlive =
+        current.runtimeAlive === true && current.livenessKind === 'runtime_process';
+      const runtimeDiagnostic = runtimeProcessAlive
+        ? 'Runtime process is alive, but no bootstrap check-in after 5 min.'
+        : 'OpenCode bootstrap did not complete runtime_bootstrap_checkin after 5 min.';
+      const nextEntry: MemberSpawnStatusEntry = {
+        ...current,
+        status: 'waiting',
+        launchState: 'runtime_pending_bootstrap',
+        agentToolAccepted: true,
+        runtimeAlive: runtimeProcessAlive,
+        bootstrapConfirmed: false,
+        hardFailure: false,
+        hardFailureReason: undefined,
+        error: undefined,
+        livenessSource: undefined,
+        livenessKind:
+          current.livenessKind ?? (runtimeProcessAlive ? 'runtime_process' : 'registered_only'),
+        runtimeDiagnostic,
+        runtimeDiagnosticSeverity: 'warning',
+        bootstrapStalled: true,
+        livenessLastCheckedAt: nowIso(),
+        updatedAt: nowIso(),
+      };
+      nextEntry.launchState = deriveMemberLaunchState(nextEntry);
+      nextStatuses[memberName] = nextEntry;
+    }
     return nextStatuses;
   }
 
+  private getOpenCodeSecondaryBootstrapPendingMemberNames(
+    snapshot: PersistedTeamLaunchSnapshot | null | undefined
+  ): ReadonlySet<string> {
+    if (!snapshot) {
+      return new Set();
+    }
+    const names = Object.entries(snapshot.members)
+      .filter(([, member]) => {
+        return (
+          member.providerId === 'opencode' &&
+          member.laneKind === 'secondary' &&
+          member.laneOwnerProviderId === 'opencode' &&
+          member.launchState === 'runtime_pending_bootstrap' &&
+          member.bootstrapConfirmed !== true &&
+          member.hardFailure !== true
+        );
+      })
+      .map(([name]) => name);
+    return new Set(names);
+  }
+
+  private applyOpenCodeSecondaryBootstrapStallOverlay(
+    snapshot: PersistedTeamLaunchSnapshot | null
+  ): PersistedTeamLaunchSnapshot | null {
+    if (!snapshot) {
+      return null;
+    }
+
+    const nowMs = Date.now();
+    const updatedAt = nowIso();
+    let changed = false;
+    const members: Record<string, PersistedTeamLaunchMemberState> = { ...snapshot.members };
+
+    for (const memberName of this.getPersistedLaunchMemberNames(snapshot)) {
+      let current = members[memberName];
+      if (!current) {
+        continue;
+      }
+
+      const stableFirstSpawnAcceptedAt = isPersistedOpenCodeSecondaryLaneMember(current)
+        ? resolveOpenCodeBootstrapAcceptedAt(current)
+        : undefined;
+      if (
+        stableFirstSpawnAcceptedAt &&
+        stableFirstSpawnAcceptedAt !== current.firstSpawnAcceptedAt
+      ) {
+        current = {
+          ...current,
+          firstSpawnAcceptedAt: stableFirstSpawnAcceptedAt,
+        };
+        members[memberName] = current;
+        changed = true;
+      }
+
+      if (!shouldMarkPersistedOpenCodeBootstrapStalled(current, nowMs)) {
+        continue;
+      }
+
+      const runtimeDiagnostic = getOpenCodeSecondaryBootstrapStallDiagnosticFromPersisted(current);
+      members[memberName] = {
+        ...current,
+        launchState: 'runtime_pending_bootstrap',
+        agentToolAccepted: true,
+        runtimeAlive: current.runtimeAlive === true && current.livenessKind === 'runtime_process',
+        bootstrapConfirmed: false,
+        hardFailure: false,
+        hardFailureReason: undefined,
+        livenessKind: current.livenessKind ?? 'registered_only',
+        runtimeDiagnostic,
+        runtimeDiagnosticSeverity: 'warning',
+        bootstrapStalled: true,
+        firstSpawnAcceptedAt: stableFirstSpawnAcceptedAt ?? current.firstSpawnAcceptedAt,
+        lastEvaluatedAt: updatedAt,
+        diagnostics: mergeRuntimeDiagnostics(current.diagnostics, [
+          runtimeDiagnostic,
+          'opencode_bootstrap_stalled',
+        ]),
+      };
+      changed = true;
+    }
+
+    if (!changed) {
+      return snapshot;
+    }
+
+    return createPersistedLaunchSnapshot({
+      teamName: snapshot.teamName,
+      expectedMembers: snapshot.expectedMembers,
+      bootstrapExpectedMembers: snapshot.bootstrapExpectedMembers,
+      leadSessionId: snapshot.leadSessionId,
+      launchPhase: snapshot.launchPhase,
+      members,
+      updatedAt,
+    });
+  }
+
   private async getLiveTeamAgentNames(teamName: string): Promise<Set<string>> {
     const runtimeByMember = await this.getLiveTeamAgentRuntimeMetadata(teamName);
     return new Set(
@@ -17216,17 +20053,48 @@ export class TeamProvisioningService {
   private async getLiveTeamAgentRuntimeMetadata(
     teamName: string
   ): Promise<Map<string, LiveTeamAgentRuntimeMetadata>> {
+    const runId = this.getTrackedRunId(teamName);
     const cached = this.liveTeamAgentRuntimeMetadataCache.get(teamName);
-    if (cached && cached.expiresAtMs > Date.now()) {
-      return cached.metadata;
+    if (cached && cached.expiresAtMs > Date.now() && cached.runId === runId) {
+      return this.cloneLiveTeamAgentRuntimeMetadata(cached.metadata);
     }
 
-    const runId = this.getTrackedRunId(teamName);
+    const generationAtStart = this.getRuntimeSnapshotCacheGeneration(teamName);
+    const existingRequest = this.liveTeamAgentRuntimeMetadataInFlightByTeam.get(teamName);
+    if (
+      existingRequest?.generationAtStart === generationAtStart &&
+      existingRequest.runIdAtStart === runId
+    ) {
+      return this.cloneLiveTeamAgentRuntimeMetadata(await existingRequest.promise);
+    }
+
+    const request = this.buildLiveTeamAgentRuntimeMetadata(
+      teamName,
+      runId,
+      generationAtStart
+    ).finally(() => {
+      if (this.liveTeamAgentRuntimeMetadataInFlightByTeam.get(teamName)?.promise === request) {
+        this.liveTeamAgentRuntimeMetadataInFlightByTeam.delete(teamName);
+      }
+    });
+    this.liveTeamAgentRuntimeMetadataInFlightByTeam.set(teamName, {
+      generationAtStart,
+      runIdAtStart: runId,
+      promise: request,
+    });
+    return this.cloneLiveTeamAgentRuntimeMetadata(await request);
+  }
+
+  private async buildLiveTeamAgentRuntimeMetadata(
+    teamName: string,
+    runId: string | null,
+    generationAtStart: number
+  ): Promise<Map<string, LiveTeamAgentRuntimeMetadata>> {
     const run = runId ? (this.runs.get(runId) ?? null) : null;
 
     let configuredMembers: TeamConfig['members'] = [];
     try {
-      configuredMembers = (await this.configReader.getConfig(teamName))?.members ?? [];
+      configuredMembers = (await this.readConfigSnapshot(teamName))?.members ?? [];
     } catch {
       configuredMembers = [];
     }
@@ -17562,10 +20430,16 @@ export class TeamProvisioningService {
       });
     }
 
-    this.liveTeamAgentRuntimeMetadataCache.set(teamName, {
-      expiresAtMs: Date.now() + TeamProvisioningService.AGENT_RUNTIME_SNAPSHOT_CACHE_TTL_MS,
-      metadata: metadataByMember,
-    });
+    if (
+      this.getRuntimeSnapshotCacheGeneration(teamName) === generationAtStart &&
+      this.getTrackedRunId(teamName) === runId
+    ) {
+      this.liveTeamAgentRuntimeMetadataCache.set(teamName, {
+        expiresAtMs: Date.now() + TeamProvisioningService.AGENT_RUNTIME_SNAPSHOT_CACHE_TTL_MS,
+        metadata: this.cloneLiveTeamAgentRuntimeMetadata(metadataByMember),
+        runId,
+      });
+    }
     return metadataByMember;
   }
 
@@ -17618,6 +20492,7 @@ export class TeamProvisioningService {
 
   private async clearPersistedLaunchStateNow(teamName: string): Promise<void> {
     await this.launchStateStore.clear(teamName);
+    this.launchStateWrittenRunIdByTeam.delete(teamName);
     await clearBootstrapState(teamName);
   }
 
@@ -17663,6 +20538,7 @@ export class TeamProvisioningService {
       }).catch((error: unknown) => ({
         state: 'invalid_store' as const,
         committed: false,
+        activeRunId: null,
         sessions: [],
         diagnostics: [
           `OpenCode committed bootstrap evidence read failed: ${getErrorMessage(error)}`,
@@ -17675,6 +20551,7 @@ export class TeamProvisioningService {
         previous,
         laneEntry,
         metaMembers,
+        activeRunId: evidence.activeRunId,
         sessions: evidence.committed ? evidence.sessions : [],
         diagnostics: evidence.diagnostics,
       });
@@ -17723,7 +20600,8 @@ export class TeamProvisioningService {
       return (
         previous?.launchState !== member.launchState ||
         previous?.bootstrapConfirmed !== member.bootstrapConfirmed ||
-        previous?.runtimeSessionId !== member.runtimeSessionId
+        previous?.runtimeSessionId !== member.runtimeSessionId ||
+        previous?.livenessKind !== member.livenessKind
       );
     });
   }
@@ -17756,7 +20634,9 @@ export class TeamProvisioningService {
     previous: PersistedTeamLaunchMemberState | null
   ): boolean {
     if (current.launchState === 'confirmed_alive' && current.bootstrapConfirmed) {
-      return false;
+      return (
+        current.livenessKind !== 'confirmed_bootstrap' && current.livenessKind !== 'runtime_process'
+      );
     }
     if (
       previous?.launchState === 'confirmed_alive' &&
@@ -17785,6 +20665,7 @@ export class TeamProvisioningService {
     previous: PersistedTeamLaunchMemberState | null;
     laneEntry: OpenCodeRuntimeLaneIndexEntry | null;
     metaMembers: Awaited<ReturnType<TeamMembersMetaStore['getMembers']>>;
+    activeRunId: string | null;
     sessions: OpenCodeCommittedBootstrapSessionRecord[];
     diagnostics: readonly string[];
   }): Promise<
@@ -17838,6 +20719,16 @@ export class TeamProvisioningService {
         ],
       };
     }
+    if (
+      params.activeRunId &&
+      selected.runId &&
+      params.activeRunId.trim() !== selected.runId.trim()
+    ) {
+      return {
+        kind: 'conflict',
+        diagnostics: ['opencode_overlay_session_run_mismatch'],
+      };
+    }
 
     if (selected.runId) {
       const tombstoneStore = createRuntimeRunTombstoneStore({
@@ -17866,15 +20757,17 @@ export class TeamProvisioningService {
     teamName: string,
     snapshot: PersistedTeamLaunchSnapshot
   ): Promise<PersistedTeamLaunchSnapshot> {
-    return this.enqueueLaunchStateStoreOperation(teamName, () =>
+    const result = await this.enqueueLaunchStateStoreOperation(teamName, () =>
       this.writeLaunchStateSnapshotNow(teamName, snapshot)
     );
+    return result.snapshot;
   }
 
   private async writeLaunchStateSnapshotNow(
     teamName: string,
-    snapshot: PersistedTeamLaunchSnapshot
-  ): Promise<PersistedTeamLaunchSnapshot> {
+    snapshot: PersistedTeamLaunchSnapshot,
+    options?: { allowNoopSkip?: boolean; runId?: string }
+  ): Promise<LaunchStateWriteResult> {
     const previousSnapshot = await this.launchStateStore.read(teamName).catch(() => null);
     const metaMembers = await this.membersMetaStore.getMembers(teamName).catch(() => []);
     const overlaidSnapshot = await this.applyOpenCodeSecondaryEvidenceOverlay({
@@ -17883,8 +20776,76 @@ export class TeamProvisioningService {
       previousSnapshot,
       metaMembers,
     });
-    await this.launchStateStore.write(teamName, overlaidSnapshot);
-    return overlaidSnapshot;
+    const normalizedSnapshot =
+      this.applyOpenCodeSecondaryBootstrapStallOverlay(overlaidSnapshot) ?? overlaidSnapshot;
+    if (
+      options?.allowNoopSkip === true &&
+      typeof options.runId === 'string' &&
+      this.launchStateWrittenRunIdByTeam.get(teamName) === options.runId &&
+      previousSnapshot &&
+      this.areLaunchStateSnapshotsSemanticallyEqual(previousSnapshot, normalizedSnapshot) &&
+      !this.isLaunchStateNoopRefreshDue(previousSnapshot)
+    ) {
+      return { snapshot: previousSnapshot, wrote: false };
+    }
+    await this.launchStateStore.write(teamName, normalizedSnapshot);
+    if (typeof options?.runId === 'string') {
+      this.launchStateWrittenRunIdByTeam.set(teamName, options.runId);
+    }
+    return { snapshot: normalizedSnapshot, wrote: true };
+  }
+
+  private isLaunchStateNoopRefreshDue(snapshot: PersistedTeamLaunchSnapshot): boolean {
+    const updatedAtMs = Date.parse(snapshot.updatedAt);
+    return (
+      !Number.isFinite(updatedAtMs) ||
+      Date.now() - updatedAtMs >= TeamProvisioningService.LAUNCH_STATE_NOOP_REFRESH_MS
+    );
+  }
+
+  private areLaunchStateSnapshotsSemanticallyEqual(
+    left: PersistedTeamLaunchSnapshot,
+    right: PersistedTeamLaunchSnapshot
+  ): boolean {
+    return (
+      JSON.stringify(this.toLaunchStateSemanticValue(left)) ===
+      JSON.stringify(this.toLaunchStateSemanticValue(right))
+    );
+  }
+
+  private toLaunchStateSemanticValue(snapshot: PersistedTeamLaunchSnapshot): unknown {
+    const { updatedAt: _updatedAt, members, ...rest } = snapshot;
+    const stableMembers = Object.fromEntries(
+      Object.entries(members)
+        .sort(([leftName], [rightName]) => leftName.localeCompare(rightName))
+        .map(([memberName, member]) => {
+          const {
+            lastEvaluatedAt: _lastEvaluatedAt,
+            lastRuntimeAliveAt: _lastRuntimeAliveAt,
+            ...stableMember
+          } = member;
+          return [memberName, stableMember];
+        })
+    );
+    return this.toStableJsonValue({
+      ...rest,
+      members: stableMembers,
+    });
+  }
+
+  private toStableJsonValue(value: unknown): unknown {
+    if (Array.isArray(value)) {
+      return value.map((item) => this.toStableJsonValue(item));
+    }
+    if (!value || typeof value !== 'object') {
+      return value;
+    }
+    return Object.fromEntries(
+      Object.entries(value as Record<string, unknown>)
+        .filter(([, entryValue]) => entryValue !== undefined)
+        .sort(([leftKey], [rightKey]) => leftKey.localeCompare(rightKey))
+        .map(([key, entryValue]) => [key, this.toStableJsonValue(entryValue)])
+    );
   }
 
   private async enqueueLaunchStateStoreOperation<T>(
@@ -18135,6 +21096,247 @@ export class TeamProvisioningService {
     return statuses;
   }
 
+  private async overlayPrimaryBootstrapTruthIntoRunStatusesFromBootstrapState(
+    run: ProvisioningRun
+  ): Promise<void> {
+    if (
+      !run.isLaunch ||
+      !Array.isArray(run.mixedSecondaryLanes) ||
+      run.mixedSecondaryLanes.length === 0
+    ) {
+      return;
+    }
+
+    let bootstrapSnapshot: PersistedTeamLaunchSnapshot | null = null;
+    try {
+      bootstrapSnapshot = await readBootstrapLaunchSnapshot(run.teamName);
+    } catch {
+      return;
+    }
+    if (!bootstrapSnapshot) {
+      return;
+    }
+
+    const runStartedAtMs = Date.parse(run.startedAt);
+    const bootstrapUpdatedAtMs = Date.parse(bootstrapSnapshot.updatedAt);
+    if (
+      !Number.isFinite(runStartedAtMs) ||
+      !Number.isFinite(bootstrapUpdatedAtMs) ||
+      bootstrapUpdatedAtMs < runStartedAtMs
+    ) {
+      return;
+    }
+
+    const primaryMemberNames = new Set(
+      (run.effectiveMembers ?? [])
+        .map((member) => member.name?.trim())
+        .filter((name): name is string => Boolean(name))
+    );
+    if (primaryMemberNames.size === 0) {
+      return;
+    }
+
+    const updatedAt = nowIso();
+    for (const memberName of primaryMemberNames) {
+      if (this.isOpenCodeSecondaryLaneMemberInRun(run, memberName)) {
+        continue;
+      }
+      const bootstrapMember = bootstrapSnapshot.members[memberName];
+      if (bootstrapMember?.bootstrapConfirmed !== true) {
+        continue;
+      }
+      const current =
+        run.memberSpawnStatuses.get(memberName) ?? createInitialMemberSpawnStatusEntry();
+      if (current.launchState === 'skipped_for_launch' || current.skippedForLaunch === true) {
+        continue;
+      }
+      const failureReason = current.hardFailureReason ?? current.error;
+      if (
+        current.launchState === 'failed_to_start' &&
+        !isAutoClearableLaunchFailureReason(failureReason)
+      ) {
+        continue;
+      }
+
+      const observedAt =
+        bootstrapMember.lastHeartbeatAt ??
+        bootstrapMember.lastEvaluatedAt ??
+        bootstrapSnapshot.updatedAt ??
+        updatedAt;
+      const next: MemberSpawnStatusEntry = {
+        ...current,
+        status: 'online',
+        updatedAt,
+        agentToolAccepted: true,
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        bootstrapStalled: undefined,
+        error: undefined,
+        hardFailureReason: undefined,
+        livenessSource: current.livenessSource ?? 'heartbeat',
+        firstSpawnAcceptedAt:
+          current.firstSpawnAcceptedAt ?? bootstrapMember.firstSpawnAcceptedAt ?? observedAt,
+        lastHeartbeatAt: isMemberSpawnHeartbeatTimestampNewer(current.lastHeartbeatAt, observedAt)
+          ? observedAt
+          : current.lastHeartbeatAt,
+        livenessLastCheckedAt: updatedAt,
+        launchState: 'confirmed_alive',
+      };
+      run.memberSpawnStatuses.set(memberName, next);
+      run.pendingMemberRestarts?.delete(memberName);
+      this.syncMemberLaunchGraceCheck(run, memberName, next);
+    }
+  }
+
+  private async applyPrimaryBootstrapTruthToLaunchReportingSnapshot(
+    run: ProvisioningRun,
+    snapshot: PersistedTeamLaunchSnapshot | null
+  ): Promise<PersistedTeamLaunchSnapshot | null> {
+    if (!run.isLaunch || !snapshot) {
+      return snapshot;
+    }
+
+    let bootstrapSnapshot: PersistedTeamLaunchSnapshot | null = null;
+    try {
+      bootstrapSnapshot = await readBootstrapLaunchSnapshot(run.teamName);
+    } catch {
+      return snapshot;
+    }
+    if (!bootstrapSnapshot) {
+      return snapshot;
+    }
+
+    const runStartedAtMs = Date.parse(run.startedAt);
+    const bootstrapUpdatedAtMs = Date.parse(bootstrapSnapshot.updatedAt);
+    if (
+      !Number.isFinite(runStartedAtMs) ||
+      !Number.isFinite(bootstrapUpdatedAtMs) ||
+      bootstrapUpdatedAtMs < runStartedAtMs
+    ) {
+      return snapshot;
+    }
+
+    const primaryMemberNames = new Set(
+      [
+        ...(run.effectiveMembers ?? []).map((member) => member.name?.trim() ?? ''),
+        ...(snapshot.bootstrapExpectedMembers ?? []),
+      ].filter((name): name is string => name.length > 0)
+    );
+    if (primaryMemberNames.size === 0) {
+      return snapshot;
+    }
+
+    let changed = false;
+    const updatedAt = nowIso();
+    const nextMembers: Record<string, PersistedTeamLaunchMemberState> = { ...snapshot.members };
+    for (const memberName of primaryMemberNames) {
+      const current = nextMembers[memberName];
+      const bootstrapMember = bootstrapSnapshot.members[memberName];
+      if (!current || bootstrapMember?.bootstrapConfirmed !== true) {
+        continue;
+      }
+      if (
+        current.providerId === 'opencode' ||
+        isPersistedOpenCodeSecondaryLaneMember(current) ||
+        this.isOpenCodeSecondaryLaneMemberInRun(run, memberName)
+      ) {
+        continue;
+      }
+      if (current.launchState === 'skipped_for_launch' || current.skippedForLaunch === true) {
+        continue;
+      }
+
+      const persistedError =
+        typeof (current as { error?: unknown }).error === 'string'
+          ? (current as { error?: string }).error
+          : undefined;
+      const failureReason =
+        current.hardFailureReason ?? persistedError ?? current.runtimeDiagnostic;
+      const hasFailure =
+        current.launchState === 'failed_to_start' ||
+        current.hardFailure === true ||
+        typeof current.hardFailureReason === 'string' ||
+        typeof persistedError === 'string';
+      if (hasFailure && !isAutoClearableLaunchFailureReason(failureReason)) {
+        continue;
+      }
+
+      const observedAt =
+        bootstrapMember.lastHeartbeatAt ??
+        bootstrapMember.lastEvaluatedAt ??
+        bootstrapSnapshot.updatedAt ??
+        updatedAt;
+      nextMembers[memberName] = {
+        ...current,
+        launchState: 'confirmed_alive',
+        agentToolAccepted: true,
+        runtimeAlive: current.runtimeAlive === true || bootstrapMember.runtimeAlive === true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        hardFailureReason: undefined,
+        runtimeDiagnostic: isAutoClearableLaunchFailureReason(current.runtimeDiagnostic)
+          ? undefined
+          : current.runtimeDiagnostic,
+        runtimeDiagnosticSeverity: isAutoClearableLaunchFailureReason(current.runtimeDiagnostic)
+          ? undefined
+          : current.runtimeDiagnosticSeverity,
+        bootstrapStalled: undefined,
+        firstSpawnAcceptedAt:
+          current.firstSpawnAcceptedAt ?? bootstrapMember.firstSpawnAcceptedAt ?? observedAt,
+        lastHeartbeatAt: current.lastHeartbeatAt ?? bootstrapMember.lastHeartbeatAt ?? observedAt,
+        lastRuntimeAliveAt:
+          current.lastRuntimeAliveAt ?? bootstrapMember.lastRuntimeAliveAt ?? observedAt,
+        lastEvaluatedAt: updatedAt,
+        sources: {
+          ...(current.sources ?? {}),
+          nativeHeartbeat: true,
+          hardFailureSignal: undefined,
+        },
+        diagnostics: undefined,
+      };
+      changed = true;
+    }
+
+    if (!changed) {
+      return snapshot;
+    }
+
+    return createPersistedLaunchSnapshot({
+      teamName: snapshot.teamName,
+      expectedMembers: snapshot.expectedMembers,
+      bootstrapExpectedMembers: snapshot.bootstrapExpectedMembers,
+      leadSessionId: snapshot.leadSessionId,
+      launchPhase: snapshot.launchPhase,
+      members: nextMembers,
+      updatedAt,
+    });
+  }
+
+  private async reconcileFinalLaunchReportingSnapshot(
+    run: ProvisioningRun,
+    snapshot: PersistedTeamLaunchSnapshot | null
+  ): Promise<PersistedTeamLaunchSnapshot | null> {
+    const reconciled = await this.applyPrimaryBootstrapTruthToLaunchReportingSnapshot(
+      run,
+      snapshot
+    );
+    if (!reconciled || reconciled === snapshot) {
+      return reconciled;
+    }
+    this.syncRunMemberSpawnStatusesFromSnapshot(run, reconciled);
+    try {
+      return await this.writeLaunchStateSnapshot(run.teamName, reconciled);
+    } catch (error) {
+      logger.warn(
+        `[${run.teamName}] Failed to persist reconciled launch reporting snapshot: ${getErrorMessage(
+          error
+        )}`
+      );
+      return reconciled;
+    }
+  }
+
   private syncRunMemberSpawnStatusesFromSnapshot(
     run: ProvisioningRun,
     snapshot: PersistedTeamLaunchSnapshot
@@ -18221,6 +21423,7 @@ export class TeamProvisioningService {
     run: Pick<ProvisioningRun, 'teamName' | 'runId'>,
     memberName: string
   ) {
+    this.invalidateMemberSpawnStatusesCache(run.teamName);
     this.teamChangeEmitter?.({
       type: 'member-spawn',
       teamName: run.teamName,
@@ -18337,6 +21540,13 @@ export class TeamProvisioningService {
       primaryStatuses: this.buildRuntimeSpawnStatusRecord(run),
       secondaryMembers: mixedSecondaryLanes.map((secondaryLane) => {
         const evidenceEntry = secondaryLane.result?.members[secondaryLane.member.name];
+        const currentSpawnStatus = run.memberSpawnStatuses.get(secondaryLane.member.name);
+        const laneFirstSpawnAcceptedAt =
+          currentSpawnStatus?.firstSpawnAcceptedAt ??
+          (typeof secondaryLane.launchFinishedAtMs === 'number' &&
+          Number.isFinite(secondaryLane.launchFinishedAtMs)
+            ? new Date(secondaryLane.launchFinishedAtMs).toISOString()
+            : undefined);
         const finishedWithoutRuntimeEvidence =
           secondaryLane.state === 'finished' && !secondaryLane.result;
         return {
@@ -18369,6 +21579,8 @@ export class TeamProvisioningService {
                 pidSource: evidenceEntry.pidSource,
                 runtimeDiagnostic: evidenceEntry.runtimeDiagnostic,
                 runtimeDiagnosticSeverity: evidenceEntry.runtimeDiagnosticSeverity,
+                bootstrapStalled: currentSpawnStatus?.bootstrapStalled === true ? true : undefined,
+                firstSpawnAcceptedAt: laneFirstSpawnAcceptedAt,
                 diagnostics: evidenceEntry.diagnostics,
               }
             : finishedWithoutRuntimeEvidence
@@ -18378,6 +21590,8 @@ export class TeamProvisioningService {
                   runtimeAlive: false,
                   bootstrapConfirmed: false,
                   hardFailure: false,
+                  bootstrapStalled:
+                    currentSpawnStatus?.bootstrapStalled === true ? true : undefined,
                   diagnostics:
                     secondaryLane.diagnostics.length > 0
                       ? [...secondaryLane.diagnostics]
@@ -18555,6 +21769,7 @@ export class TeamProvisioningService {
     run: ProvisioningRun,
     launchPhase: 'active' | 'finished' | 'reconciled'
   ): Promise<PersistedTeamLaunchSnapshot | null> {
+    await this.overlayPrimaryBootstrapTruthIntoRunStatusesFromBootstrapState(run);
     const snapshot = this.buildLiveLaunchSnapshotForRun(run, launchPhase);
     if (!snapshot) {
       if (run.isLaunch) {
@@ -18568,21 +21783,26 @@ export class TeamProvisioningService {
 
     if (filteredSnapshot.teamLaunchState === 'clean_success' && launchPhase !== 'active') {
       await this.clearPersistedLaunchStateNow(run.teamName);
-      this.agentRuntimeSnapshotCache.delete(run.teamName);
-      this.liveTeamAgentRuntimeMetadataCache.delete(run.teamName);
+      this.invalidateRuntimeSnapshotCaches(run.teamName);
       return null;
     }
 
-    const writtenSnapshot = await this.writeLaunchStateSnapshotNow(run.teamName, filteredSnapshot);
-    this.agentRuntimeSnapshotCache.delete(run.teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(run.teamName);
-    return writtenSnapshot;
+    const writeResult = await this.writeLaunchStateSnapshotNow(run.teamName, filteredSnapshot, {
+      allowNoopSkip: true,
+      runId: run.runId,
+    });
+    if (writeResult.wrote) {
+      this.invalidateRuntimeSnapshotCaches(run.teamName);
+    }
+    return writeResult.snapshot;
   }
 
   private async launchSingleMixedSecondaryLane(
     run: ProvisioningRun,
     lane: MixedSecondaryRuntimeLaneState
   ): Promise<void> {
+    lane.launchStartedAtMs = Date.now();
+    lane.queuedAtMs = lane.queuedAtMs ?? lane.launchStartedAtMs;
     const requestedDiagnostics = [...lane.diagnostics];
     const shouldAbortLaunch = (): boolean =>
       run.cancelRequested ||
@@ -18604,6 +21824,8 @@ export class TeamProvisioningService {
     const adapter = this.getOpenCodeRuntimeAdapter();
     if (!adapter) {
       const message = 'OpenCode runtime adapter is not registered for mixed team launch.';
+      lane.launchFinishedAtMs = Date.now();
+      const timingDiagnostic = buildOpenCodeSecondaryLaneTimingDiagnostic(lane);
       lane.state = 'finished';
       lane.result = {
         runId: lane.runId ?? randomUUID(),
@@ -18620,14 +21842,14 @@ export class TeamProvisioningService {
             bootstrapConfirmed: false,
             hardFailure: true,
             hardFailureReason: 'opencode_runtime_adapter_missing',
-            diagnostics: [message],
+            diagnostics: appendDiagnosticOnce([message], timingDiagnostic),
           },
         },
         warnings: [],
-        diagnostics: [...requestedDiagnostics, message],
+        diagnostics: appendDiagnosticOnce([...requestedDiagnostics, message], timingDiagnostic),
       };
       lane.warnings = [];
-      lane.diagnostics = [...requestedDiagnostics, message];
+      lane.diagnostics = appendDiagnosticOnce([...requestedDiagnostics, message], timingDiagnostic);
       await this.publishMixedSecondaryLaneStatusChange(run, lane);
       lane.state = 'finished';
       return;
@@ -18694,6 +21916,8 @@ export class TeamProvisioningService {
         providerId: 'opencode',
         model: lane.member.model,
         effort: lane.member.effort,
+        runtimeOnly: true,
+        skipReadinessPreflight: true,
         skipPermissions: run.request.skipPermissions !== false,
         expectedMembers: [
           {
@@ -18723,16 +21947,73 @@ export class TeamProvisioningService {
         await finishCancelledLane();
         return;
       }
-      lane.result = result;
-      lane.warnings = [...result.warnings];
-      lane.diagnostics = [...requestedDiagnostics, ...migration.diagnostics, ...result.diagnostics];
+      lane.launchFinishedAtMs = Date.now();
+      const timingDiagnostic = buildOpenCodeSecondaryLaneTimingDiagnostic(lane);
+      const memberEvidence = result.members[lane.member.name];
+      const resultWithTiming: TeamRuntimeLaunchResult = timingDiagnostic
+        ? {
+            ...result,
+            diagnostics: appendDiagnosticOnce(result.diagnostics, timingDiagnostic),
+            members: {
+              ...result.members,
+              ...(memberEvidence
+                ? {
+                    [lane.member.name]: {
+                      ...memberEvidence,
+                      diagnostics: appendDiagnosticOnce(
+                        memberEvidence.diagnostics ?? [],
+                        timingDiagnostic
+                      ),
+                    },
+                  }
+                : {}),
+            },
+          }
+        : result;
+      const baseFailureDiagnostics = appendDiagnosticOnce(
+        [...requestedDiagnostics, ...migration.diagnostics],
+        timingDiagnostic
+      );
+      const recoverableBootstrapPending = isRecoverableOpenCodeBootstrapPendingLaunchResult(
+        resultWithTiming,
+        lane.member.name
+      );
+      const normalizedResult = recoverableBootstrapPending
+        ? normalizeRecoverableOpenCodeBootstrapPendingLaunchResult(
+            resultWithTiming,
+            lane.member.name,
+            baseFailureDiagnostics
+          )
+        : resultWithTiming;
+      lane.result = normalizedResult;
+      lane.warnings = [...normalizedResult.warnings];
+      const launchDiagnostics = appendDiagnosticOnce(
+        [...requestedDiagnostics, ...migration.diagnostics, ...normalizedResult.diagnostics],
+        timingDiagnostic
+      );
+      lane.diagnostics = launchDiagnostics;
 
-      if (isDefinitiveOpenCodePreLaunchFailure(result, lane.member.name)) {
-        const diagnostics = [
-          ...requestedDiagnostics,
-          ...migration.diagnostics,
-          ...collectRuntimeLaunchFailureDiagnostics(result, lane.member.name),
-        ];
+      if (recoverableBootstrapPending) {
+        await upsertOpenCodeRuntimeLaneIndexEntry({
+          teamsBasePath: getTeamsBasePath(),
+          teamName: run.teamName,
+          laneId: lane.laneId,
+          state: 'active',
+          diagnostics: collectOpenCodeSecondaryLaneFailureDiagnostics(
+            normalizedResult,
+            lane.member.name,
+            baseFailureDiagnostics
+          ),
+        }).catch(() => undefined);
+      } else if (
+        isDefinitiveOpenCodePreLaunchFailure(normalizedResult, lane.member.name) ||
+        normalizedResult.teamLaunchState === 'partial_failure'
+      ) {
+        const diagnostics = collectOpenCodeSecondaryLaneFailureDiagnostics(
+          normalizedResult,
+          lane.member.name,
+          baseFailureDiagnostics
+        );
         await upsertOpenCodeRuntimeLaneIndexEntry({
           teamsBasePath: getTeamsBasePath(),
           teamName: run.teamName,
@@ -18741,8 +22022,6 @@ export class TeamProvisioningService {
           diagnostics,
         }).catch(() => undefined);
         this.deleteSecondaryRuntimeRun(run.teamName, lane.laneId);
-      } else if (result.teamLaunchState === 'partial_failure') {
-        this.deleteSecondaryRuntimeRun(run.teamName, lane.laneId);
       }
     } catch (error) {
       if (shouldAbortLaunch()) {
@@ -18750,6 +22029,8 @@ export class TeamProvisioningService {
         return;
       }
       const message = error instanceof Error ? error.message : String(error);
+      lane.launchFinishedAtMs = Date.now();
+      const timingDiagnostic = buildOpenCodeSecondaryLaneTimingDiagnostic(lane);
       lane.result = {
         runId: lane.runId,
         teamName: run.teamName,
@@ -18765,20 +22046,23 @@ export class TeamProvisioningService {
             bootstrapConfirmed: false,
             hardFailure: true,
             hardFailureReason: message,
-            diagnostics: [message],
+            diagnostics: appendDiagnosticOnce([message], timingDiagnostic),
           },
         },
         warnings: [],
-        diagnostics: [message],
+        diagnostics: appendDiagnosticOnce([message], timingDiagnostic),
       };
       lane.warnings = [];
-      lane.diagnostics = [...requestedDiagnostics, ...migration.diagnostics, message];
+      lane.diagnostics = appendDiagnosticOnce(
+        [...requestedDiagnostics, ...migration.diagnostics, message],
+        timingDiagnostic
+      );
       await upsertOpenCodeRuntimeLaneIndexEntry({
         teamsBasePath: getTeamsBasePath(),
         teamName: run.teamName,
         laneId: lane.laneId,
         state: 'degraded',
-        diagnostics: [message],
+        diagnostics: appendDiagnosticOnce([message], timingDiagnostic),
       }).catch(() => undefined);
       this.deleteSecondaryRuntimeRun(run.teamName, lane.laneId);
     }
@@ -18840,11 +22124,12 @@ export class TeamProvisioningService {
     run: ProvisioningRun,
     lane: MixedSecondaryRuntimeLaneState
   ): void {
-    if (lane.state !== 'queued') {
+    if (lane.state !== 'queued' || lane.launchScheduled) {
       return;
     }
 
-    lane.state = 'launching';
+    lane.queuedAtMs = lane.queuedAtMs ?? Date.now();
+    lane.launchScheduled = true;
     lane.runId = lane.runId ?? randomUUID();
 
     const launch = async () => {
@@ -18859,6 +22144,7 @@ export class TeamProvisioningService {
           lane.state = 'finished';
           return;
         }
+        lane.state = 'launching';
         await this.launchSingleMixedSecondaryLane(run, lane);
       } catch (error) {
         if (run.cancelRequested || run.processKilled) {
@@ -19035,6 +22321,7 @@ export class TeamProvisioningService {
         pidSource?: TeamAgentRuntimePidSource;
         runtimeDiagnostic?: string;
         runtimeDiagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+        firstSpawnAcceptedAt?: string;
         diagnostics?: string[];
       };
       pendingReason?: string;
@@ -19096,6 +22383,7 @@ export class TeamProvisioningService {
               pidSource: runtimeEvidence.pidSource,
               runtimeDiagnostic: runtimeEvidence.runtimeDiagnostic,
               runtimeDiagnosticSeverity: runtimeEvidence.runtimeDiagnosticSeverity,
+              firstSpawnAcceptedAt: persistedMember.firstSpawnAcceptedAt,
               diagnostics: runtimeEvidence.diagnostics,
             },
           });
@@ -19130,6 +22418,7 @@ export class TeamProvisioningService {
               pidSource: runtimeEvidence.pidSource,
               runtimeDiagnostic: runtimeEvidence.runtimeDiagnostic,
               runtimeDiagnosticSeverity: runtimeEvidence.runtimeDiagnosticSeverity,
+              firstSpawnAcceptedAt: persistedMember?.firstSpawnAcceptedAt,
               diagnostics: runtimeEvidence.diagnostics,
             },
           });
@@ -19502,14 +22791,25 @@ export class TeamProvisioningService {
           metaMembers,
         })
       : null;
-    const stableRecoveredMixedSnapshot =
-      overlaidRecoveredMixedSnapshot &&
-      this.hasCommittedOpenCodeSecondaryEvidenceOverlayDelta(
-        overlaidRecoveredMixedSnapshot,
+    const recoveredMixedSnapshotWithBootstrapStall =
+      this.applyOpenCodeSecondaryBootstrapStallOverlay(overlaidRecoveredMixedSnapshot);
+    const stableRecoveredMixedSnapshotWithCommittedEvidence =
+      recoveredMixedSnapshotWithBootstrapStall &&
+      (this.hasCommittedOpenCodeSecondaryEvidenceOverlayDelta(
+        recoveredMixedSnapshotWithBootstrapStall,
         persisted
-      )
-        ? await this.writeLaunchStateSnapshot(teamName, overlaidRecoveredMixedSnapshot)
-        : overlaidRecoveredMixedSnapshot;
+      ) ||
+        recoveredMixedSnapshotWithBootstrapStall !== overlaidRecoveredMixedSnapshot)
+        ? await this.writeLaunchStateSnapshot(teamName, recoveredMixedSnapshotWithBootstrapStall)
+        : recoveredMixedSnapshotWithBootstrapStall;
+    const promotedRecoveredMixedSnapshot = promoteOpenCodePersistedFailureReasonsFromDiagnostics(
+      stableRecoveredMixedSnapshotWithCommittedEvidence
+    );
+    const stableRecoveredMixedSnapshot =
+      promotedRecoveredMixedSnapshot &&
+      promotedRecoveredMixedSnapshot !== stableRecoveredMixedSnapshotWithCommittedEvidence
+        ? await this.writeLaunchStateSnapshot(teamName, promotedRecoveredMixedSnapshot)
+        : promotedRecoveredMixedSnapshot;
     const filteredBootstrapSnapshot = bootstrapSnapshot
       ? this.filterRemovedMembersFromLaunchSnapshot(bootstrapSnapshot, metaMembers)
       : null;
@@ -19539,17 +22839,59 @@ export class TeamProvisioningService {
           metaMembers,
         })
       : null;
+    const filteredPersistedWithBootstrapStall =
+      this.applyOpenCodeSecondaryBootstrapStallOverlay(filteredPersisted);
     const shouldPersistCommittedEvidenceOverlay =
-      this.hasCommittedOpenCodeSecondaryEvidenceOverlayDelta(filteredPersisted, persisted);
+      this.hasCommittedOpenCodeSecondaryEvidenceOverlayDelta(
+        filteredPersistedWithBootstrapStall,
+        persisted
+      );
+    const promotedPersisted = promoteOpenCodePersistedFailureReasonsFromDiagnostics(
+      filteredPersistedWithBootstrapStall
+    );
+    const shouldPersistFailureReasonPromotion =
+      promotedPersisted !== filteredPersistedWithBootstrapStall;
+    const shouldPersistBootstrapStallOverlay =
+      filteredPersistedWithBootstrapStall !== filteredPersisted;
     const persistedWithCommittedEvidence =
-      filteredPersisted && shouldPersistCommittedEvidenceOverlay
-        ? await this.writeLaunchStateSnapshot(teamName, filteredPersisted)
-        : filteredPersisted;
+      promotedPersisted &&
+      (shouldPersistCommittedEvidenceOverlay ||
+        shouldPersistFailureReasonPromotion ||
+        shouldPersistBootstrapStallOverlay)
+        ? await this.writeLaunchStateSnapshot(teamName, promotedPersisted)
+        : promotedPersisted;
     const preferredSnapshot = choosePreferredLaunchSnapshot(
       overlaidBootstrapSnapshot,
       persistedWithCommittedEvidence
     );
-    if (preferredSnapshot && preferredSnapshot === overlaidBootstrapSnapshot) {
+    const bootstrapSelectionWouldCollapseMixedLaunch =
+      preferredSnapshot &&
+      preferredSnapshot === overlaidBootstrapSnapshot &&
+      preferredSnapshot.teamLaunchState === 'clean_success' &&
+      !this.hasMixedLaunchMetadata(preferredSnapshot) &&
+      this.hasMixedLaunchMetadata(persistedWithCommittedEvidence);
+    if (
+      preferredSnapshot &&
+      preferredSnapshot === overlaidBootstrapSnapshot &&
+      !bootstrapSelectionWouldCollapseMixedLaunch
+    ) {
+      if (persistedWithCommittedEvidence) {
+        if (
+          preferredSnapshot.teamLaunchState === 'clean_success' &&
+          !this.hasMixedLaunchMetadata(preferredSnapshot)
+        ) {
+          await this.clearPersistedLaunchState(teamName);
+          return {
+            snapshot: preferredSnapshot,
+            statuses: snapshotToMemberSpawnStatuses(preferredSnapshot),
+          };
+        }
+        const writtenSnapshot = await this.writeLaunchStateSnapshot(teamName, preferredSnapshot);
+        return {
+          snapshot: writtenSnapshot,
+          statuses: snapshotToMemberSpawnStatuses(writtenSnapshot),
+        };
+      }
       return {
         snapshot: preferredSnapshot,
         statuses: snapshotToMemberSpawnStatuses(preferredSnapshot),
@@ -19677,7 +23019,7 @@ export class TeamProvisioningService {
       const currentProvesSpawnAcceptance =
         current.agentToolAccepted === true || typeof current.firstSpawnAcceptedAt === 'string';
       if (
-        isNeverSpawnedDuringLaunchReason(current.hardFailureReason) &&
+        isAutoClearableLaunchFailureReason(current.hardFailureReason) &&
         (bootstrapProvesSpawnAcceptance || currentProvesSpawnAcceptance)
       ) {
         current.hardFailure = false;
@@ -19686,6 +23028,17 @@ export class TeamProvisioningService {
           current.sources.hardFailureSignal = undefined;
         }
       }
+      if (
+        current.bootstrapConfirmed &&
+        !isOpenCodeSecondaryLaneMember &&
+        isAutoClearableLaunchFailureReason(current.hardFailureReason)
+      ) {
+        current.hardFailure = false;
+        current.hardFailureReason = undefined;
+        if (current.sources) {
+          current.sources.hardFailureSignal = undefined;
+        }
+      }
       if (heartbeatReason) {
         current.hardFailure = true;
         current.hardFailureReason = heartbeatReason;
@@ -19720,10 +23073,33 @@ export class TeamProvisioningService {
         current.agentToolAccepted === true &&
         Number.isFinite(acceptedAtMs) &&
         Date.now() - acceptedAtMs >= MEMBER_LAUNCH_GRACE_MS;
+      if (
+        isOpenCodeSecondaryLaneMember &&
+        shouldMarkPersistedOpenCodeBootstrapStalled(current, Date.now())
+      ) {
+        const runtimeDiagnostic =
+          getOpenCodeSecondaryBootstrapStallDiagnosticFromPersisted(current);
+        current.launchState = 'runtime_pending_bootstrap';
+        current.agentToolAccepted = true;
+        current.runtimeAlive =
+          current.runtimeAlive === true && current.livenessKind === 'runtime_process';
+        current.bootstrapConfirmed = false;
+        current.hardFailure = false;
+        current.hardFailureReason = undefined;
+        current.livenessKind = current.livenessKind ?? 'registered_only';
+        current.runtimeDiagnostic = runtimeDiagnostic;
+        current.runtimeDiagnosticSeverity = 'warning';
+        current.bootstrapStalled = true;
+        current.diagnostics = mergeRuntimeDiagnostics(current.diagnostics, [
+          runtimeDiagnostic,
+          'opencode_bootstrap_stalled',
+        ]);
+      }
       if (
         !current.bootstrapConfirmed &&
         !current.runtimeAlive &&
         !current.hardFailure &&
+        current.bootstrapStalled !== true &&
         graceExpired
       ) {
         current.hardFailure = true;
@@ -19920,8 +23296,9 @@ export class TeamProvisioningService {
           }
           return { kind: 'failure', observedAt, reason };
         }
-        if (isBootstrapTranscriptSuccessText(text, teamName, memberName)) {
-          return { kind: 'success', observedAt };
+        const successSource = getBootstrapTranscriptSuccessSource(text, teamName, memberName);
+        if (successSource) {
+          return { kind: 'success', observedAt, source: successSource };
         }
       }
     } catch {
@@ -19938,9 +23315,9 @@ export class TeamProvisioningService {
     memberName: string,
     sinceMs: number | null
   ): Promise<BootstrapTranscriptOutcome[]> {
-    let config: Awaited<ReturnType<TeamConfigReader['getConfig']>>;
+    let config: TeamConfig | null;
     try {
-      config = await this.configReader.getConfig(teamName);
+      config = await this.readConfigSnapshot(teamName);
     } catch {
       return [];
     }
@@ -19990,7 +23367,7 @@ export class TeamProvisioningService {
   private async collectBootstrapTranscriptProjectDirs(
     teamName: string,
     memberName: string,
-    config: Awaited<ReturnType<TeamConfigReader['getConfig']>>
+    config: TeamConfig | null
   ): Promise<string[]> {
     const pathCandidates: string[] = [];
     const pathSeen = new Set<string>();
@@ -20456,8 +23833,7 @@ export class TeamProvisioningService {
    * Always uses SIGKILL via killTeamProcess() to prevent CLI cleanup.
    */
   async stopTeam(teamName: string): Promise<void> {
-    this.agentRuntimeSnapshotCache.delete(teamName);
-    this.liveTeamAgentRuntimeMetadataCache.delete(teamName);
+    this.invalidateRuntimeSnapshotCaches(teamName);
     this.stopPersistentTeamMembers(teamName);
 
     const runId = this.getTrackedRunId(teamName);
@@ -20465,6 +23841,7 @@ export class TeamProvisioningService {
       if (this.hasSecondaryRuntimeRuns(teamName)) {
         await this.stopMixedSecondaryRuntimeLanes(teamName);
       }
+      await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
       return;
     }
     const run = this.runs.get(runId);
@@ -20472,6 +23849,7 @@ export class TeamProvisioningService {
       const runtimeProgress = this.runtimeAdapterProgressByRunId.get(runId);
       if (runtimeProgress && this.isCancellableRuntimeAdapterProgress(runtimeProgress)) {
         await this.cancelRuntimeAdapterProvisioning(runId, runtimeProgress);
+        await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
         return;
       }
       const runtimeRun = this.runtimeAdapterRunByTeam.get(teamName);
@@ -20482,6 +23860,7 @@ export class TeamProvisioningService {
             await this.stopOpenCodeRuntimeAdapterTeam(teamName, runId);
           }
         });
+        await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
         return;
       }
       if (this.hasSecondaryRuntimeRuns(teamName)) {
@@ -20489,12 +23868,14 @@ export class TeamProvisioningService {
       }
       this.provisioningRunByTeam.delete(teamName);
       this.aliveRunByTeam.delete(teamName);
+      await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
       return;
     }
     if (run.processKilled || run.cancelRequested) {
       if (this.hasSecondaryRuntimeRuns(teamName)) {
         await this.stopMixedSecondaryRuntimeLanes(teamName);
       }
+      await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
       return;
     }
     run.processKilled = true;
@@ -20508,6 +23889,7 @@ export class TeamProvisioningService {
     this.cleanupRun(run);
     logger.info(`[${teamName}] Process stopped (SIGKILL)`);
     await stopSecondaryRuntimeLanes;
+    await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
   }
 
   private getShutdownTrackedTeamNames(): string[] {
@@ -20685,6 +24067,7 @@ export class TeamProvisioningService {
       this.runtimeAdapterRunByTeam.delete(teamName);
       this.aliveRunByTeam.delete(teamName);
       this.provisioningRunByTeam.delete(teamName);
+      this.invalidateRuntimeSnapshotCaches(teamName);
       return;
     }
     const startedAt = nowIso();
@@ -20703,6 +24086,7 @@ export class TeamProvisioningService {
     if (this.provisioningRunByTeam.get(teamName) === runId) {
       this.provisioningRunByTeam.delete(teamName);
     }
+    this.invalidateRuntimeSnapshotCaches(teamName);
     try {
       await clearOpenCodeRuntimeLaneStorage({
         teamsBasePath: getTeamsBasePath(),
@@ -20779,6 +24163,23 @@ export class TeamProvisioningService {
     this.killOrphanedTeamAgentProcesses(teamName);
   }
 
+  private async cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(
+    teamName: string
+  ): Promise<void> {
+    try {
+      await cleanupAnthropicTeamApiKeyHelperForTeam({
+        teamName,
+        baseClaudeDir: getClaudeBasePath(),
+      });
+    } catch (error) {
+      logger.warn(
+        `[${teamName}] Failed to cleanup Anthropic team API-key helper material: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    }
+  }
+
   private readPersistedTeamProjectPath(teamName: string): string | null {
     const configPath = path.join(getTeamsBasePath(), teamName, 'config.json');
     try {
@@ -20929,6 +24330,7 @@ export class TeamProvisioningService {
       logger.info(`Cleaning up persisted teammate runtimes on shutdown: ${orphanOnly.join(', ')}`);
       for (const teamName of orphanOnly) {
         this.stopPersistentTeamMembers(teamName);
+        await this.cleanupAnthropicApiKeyHelperMaterialForStoppedTeam(teamName);
       }
     }
   }
@@ -21048,8 +24450,7 @@ export class TeamProvisioningService {
           );
           return true;
         }
-        this.agentRuntimeSnapshotCache.delete(run.teamName);
-        this.liveTeamAgentRuntimeMetadataCache.delete(run.teamName);
+        this.invalidateRuntimeSnapshotCaches(run.teamName);
         this.setMemberSpawnStatus(run, memberName, 'waiting');
         this.appendMemberBootstrapDiagnostic(
           run,
@@ -21104,8 +24505,37 @@ export class TeamProvisioningService {
         cliLogsTail: extractCliLogsFromRun(run),
       });
       run.onProgress(progress);
+      const hasConfirmedBootstrapMember = Array.from(run.memberSpawnStatuses.values()).some(
+        (member) => member.bootstrapConfirmed === true
+      );
+      const shouldCleanupUnconfirmedLaunchRuntimes = run.isLaunch && !hasConfirmedBootstrapMember;
+      this.markUnconfirmedBootstrapMembersFailed(run, classification.normalizedReason, {
+        cleanupRequested: shouldCleanupUnconfirmedLaunchRuntimes,
+      });
+      if (shouldCleanupUnconfirmedLaunchRuntimes) {
+        this.stopPersistentTeamMembers(run.teamName);
+        if (run.anthropicApiKeyHelper) {
+          void cleanupAnthropicTeamApiKeyHelperMaterial({
+            directory: run.anthropicApiKeyHelper.directory,
+            skipIfLiveProcessReferences: true,
+          }).catch((error: unknown) => {
+            logger.warn(
+              `[${run.teamName}] Failed to cleanup failed-run Anthropic API-key helper material: ${
+                error instanceof Error ? error.message : String(error)
+              }`
+            );
+          });
+        }
+      }
       run.processKilled = true;
       killTeamProcess(run.child);
+      void this.persistLaunchStateSnapshot(run, 'finished').catch((error: unknown) => {
+        logger.warn(
+          `[${run.teamName}] Failed to persist failed bootstrap launch snapshot: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      });
       this.cleanupRun(run);
       return true;
     }
@@ -21434,15 +24864,7 @@ export class TeamProvisioningService {
           void this.injectGeminiPostLaunchHydration(run);
         }
 
-        if (!run.provisioningComplete && !run.cancelRequested) {
-          void this.handleProvisioningTurnComplete(run).catch((err: unknown) => {
-            logger.error(
-              `[${run.teamName}] handleProvisioningTurnComplete threw unexpectedly: ${
-                err instanceof Error ? err.message : String(err)
-              }`
-            );
-          });
-        }
+        this.completeProvisioningFromSuccessfulResult(run);
       } else if (subtype === 'error') {
         const errorMsg =
           typeof msg.error === 'string' ? msg.error : JSON.stringify(msg.error ?? 'unknown');
@@ -21639,6 +25061,20 @@ export class TeamProvisioningService {
     }
   }
 
+  private completeProvisioningFromSuccessfulResult(run: ProvisioningRun): void {
+    if (run.provisioningComplete || run.cancelRequested) {
+      return;
+    }
+
+    void this.handleProvisioningTurnComplete(run).catch((err: unknown) => {
+      logger.error(
+        `[${run.teamName}] handleProvisioningTurnComplete threw unexpectedly: ${
+          err instanceof Error ? err.message : String(err)
+        }`
+      );
+    });
+  }
+
   /**
    * Injects a post-compact context reminder into the lead process via stdin.
    * Reinjects durable lead rules (constraints, communication protocol, board MCP ops)
@@ -21690,7 +25126,7 @@ export class TeamProvisioningService {
     let currentMembers: TeamCreateRequest['members'] = run.request.members;
     let leadName = 'team-lead';
     try {
-      const config = await this.configReader.getConfig(run.teamName);
+      const config = await this.readConfigForObservation(run.teamName);
       if (config?.members) {
         const configLead = config.members.find((m) => isLeadMember(m));
         leadName = configLead?.name?.trim() || 'team-lead';
@@ -21850,7 +25286,7 @@ export class TeamProvisioningService {
     let leadName =
       run.effectiveMembers.find((m) => m.role?.toLowerCase().includes('lead'))?.name || 'team-lead';
     try {
-      const config = await this.configReader.getConfig(run.teamName);
+      const config = await this.readConfigForObservation(run.teamName);
       if (config?.members) {
         const configLead = config.members.find((m) => isLeadMember(m));
         leadName = configLead?.name?.trim() || leadName;
@@ -22561,7 +25997,7 @@ export class TeamProvisioningService {
     // Resolve project cwd from team config
     let projectCwd: string | undefined;
     try {
-      const config = await this.configReader.getConfig(run.teamName);
+      const config = await this.readConfigForStrictDecision(run.teamName);
       projectCwd = config?.projectPath ?? config?.members?.[0]?.cwd;
     } catch {
       // best-effort
@@ -22842,7 +26278,10 @@ export class TeamProvisioningService {
       await this.refreshMemberSpawnStatusesFromLeadInbox(run);
       await this.maybeAuditMemberSpawnStatuses(run, { force: true });
       await this.finalizeMissingRegisteredMembersAsFailed(run);
-      const persistedLaunchSnapshot = await this.launchMixedSecondaryLaneIfNeeded(run);
+      const persistedLaunchSnapshot = await this.reconcileFinalLaunchReportingSnapshot(
+        run,
+        await this.launchMixedSecondaryLaneIfNeeded(run)
+      );
       const failedSpawnMembers = persistedLaunchSnapshot
         ? persistedLaunchSnapshot.expectedMembers
             .filter(
@@ -22897,6 +26336,13 @@ export class TeamProvisioningService {
       if (!hasSpawnFailures && !hasPendingBootstrap) {
         // Fire "Team Launched" notification only for clean launches.
         void this.fireTeamLaunchedNotification(run);
+      } else if (hasSpawnFailures) {
+        void this.fireTeamLaunchIncompleteNotification(
+          run,
+          failedSpawnMembers,
+          launchSummary,
+          persistedLaunchSnapshot
+        );
       }
 
       if (hasSpawnFailures) {
@@ -23016,7 +26462,10 @@ export class TeamProvisioningService {
     await this.refreshMemberSpawnStatusesFromLeadInbox(run);
     await this.maybeAuditMemberSpawnStatuses(run, { force: true });
     await this.finalizeMissingRegisteredMembersAsFailed(run);
-    const persistedLaunchSnapshot = await this.launchMixedSecondaryLaneIfNeeded(run);
+    const persistedLaunchSnapshot = await this.reconcileFinalLaunchReportingSnapshot(
+      run,
+      await this.launchMixedSecondaryLaneIfNeeded(run)
+    );
     const failedSpawnMembers = persistedLaunchSnapshot
       ? persistedLaunchSnapshot.expectedMembers
           .filter(
@@ -23075,6 +26524,13 @@ export class TeamProvisioningService {
     if (!hasSpawnFailures && !hasPendingBootstrap) {
       // Fire "Team Launched" notification only for clean launches.
       void this.fireTeamLaunchedNotification(run);
+    } else if (hasSpawnFailures) {
+      void this.fireTeamLaunchIncompleteNotification(
+        run,
+        failedSpawnMembers,
+        launchSummary,
+        persistedLaunchSnapshot
+      );
     }
 
     if (hasSpawnFailures) {
@@ -23130,6 +26586,7 @@ export class TeamProvisioningService {
         summary: run.isLaunch ? 'Team launched' : 'Team provisioned',
         body,
         dedupeKey: `team_launched:${run.teamName}:${run.runId}`,
+        target: { kind: 'team', teamName: run.teamName, section: 'overview' },
         projectPath: run.request.cwd,
         suppressToast,
       });
@@ -23142,6 +26599,213 @@ export class TeamProvisioningService {
     }
   }
 
+  private async fireTeamLaunchIncompleteNotification(
+    run: ProvisioningRun,
+    failedMembers: readonly { name: string }[],
+    launchSummary: {
+      confirmedCount: number;
+      pendingCount: number;
+      failedCount: number;
+      runtimeAlivePendingCount: number;
+      runtimeProcessPendingCount?: number;
+    },
+    snapshot?: PersistedTeamLaunchSnapshot | null
+  ): Promise<void> {
+    try {
+      const config = ConfigManager.getInstance().getConfig();
+      const suppressToast = !config.notifications.notifyOnTeamLaunched;
+      const displayName = run.request.displayName || run.teamName;
+      const expectedMembers = [
+        ...new Set(
+          [
+            ...(snapshot?.expectedMembers ?? []),
+            ...(run.expectedMembers ?? []),
+            ...run.allEffectiveMembers.map((member) => member.name).filter(Boolean),
+          ].filter(Boolean)
+        ),
+      ];
+      const expectedCount = expectedMembers.length;
+      if (expectedCount === 0) return;
+
+      const failedNames = this.getLaunchIncompleteFailedNames(
+        run,
+        expectedMembers,
+        failedMembers,
+        snapshot
+      );
+      if (failedNames.length === 0) {
+        return;
+      }
+      const pendingNames = this.getLaunchIncompletePendingNames(
+        run,
+        expectedMembers,
+        failedNames,
+        snapshot
+      );
+      const joinedCount = this.getLaunchIncompleteJoinedCount(
+        run,
+        expectedMembers,
+        failedNames.length + pendingNames.length,
+        launchSummary,
+        snapshot
+      );
+      const missingCount = Math.max(0, launchSummary.pendingCount + launchSummary.failedCount);
+      const bodyParts = [`${joinedCount}/${expectedCount} joined`];
+      if (failedNames.length > 0) {
+        bodyParts.push(`failed: ${this.formatLaunchIncompleteMemberMentions(failedNames)}`);
+      }
+      if (pendingNames.length > 0) {
+        bodyParts.push(`still joining: ${this.formatLaunchIncompleteMemberMentions(pendingNames)}`);
+      }
+      if (bodyParts.length === 1 && missingCount > 0 && joinedCount < expectedCount) {
+        const genericMissingCount = Math.min(missingCount, expectedCount - joinedCount);
+        bodyParts.push(
+          `${genericMissingCount} teammate${genericMissingCount === 1 ? '' : 's'} not joined yet`
+        );
+      }
+
+      await NotificationManager.getInstance().addTeamNotification({
+        teamEventType: 'team_launch_incomplete',
+        teamName: run.teamName,
+        teamDisplayName: displayName,
+        from: 'system',
+        summary: 'Team launch incomplete',
+        body: bodyParts.join(' · '),
+        dedupeKey: `team_launch_incomplete:${run.teamName}:${run.runId}`,
+        target: { kind: 'team', teamName: run.teamName, section: 'members' },
+        projectPath: run.request.cwd,
+        suppressToast,
+      });
+    } catch (error) {
+      logger.warn(
+        `[${run.teamName}] Failed to fire team_launch_incomplete notification: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+    }
+  }
+
+  private getLaunchIncompleteMemberEvidence(
+    run: ProvisioningRun,
+    snapshot: PersistedTeamLaunchSnapshot | null | undefined,
+    memberName: string
+  ): {
+    live?: MemberSpawnStatusEntry;
+    persisted?: PersistedTeamLaunchMemberState;
+  } {
+    return {
+      live: run.memberSpawnStatuses?.get(memberName),
+      persisted: snapshot?.members[memberName],
+    };
+  }
+
+  private formatLaunchIncompleteMemberMentions(names: readonly string[]): string {
+    return names.map((name) => `@${name}`).join(', ');
+  }
+
+  private getLaunchIncompleteFailedNames(
+    run: ProvisioningRun,
+    expectedMembers: readonly string[],
+    failedMembers: readonly { name: string }[],
+    snapshot?: PersistedTeamLaunchSnapshot | null
+  ): string[] {
+    const failedNames = new Set(failedMembers.map((member) => member.name).filter(Boolean));
+    for (const memberName of expectedMembers) {
+      const { live, persisted } = this.getLaunchIncompleteMemberEvidence(run, snapshot, memberName);
+      const liveResolved =
+        live?.launchState === 'confirmed_alive' ||
+        live?.bootstrapConfirmed === true ||
+        live?.launchState === 'skipped_for_launch' ||
+        live?.skippedForLaunch === true;
+      const persistedResolved =
+        persisted?.launchState === 'confirmed_alive' ||
+        persisted?.bootstrapConfirmed === true ||
+        persisted?.launchState === 'skipped_for_launch' ||
+        persisted?.skippedForLaunch === true;
+      if (liveResolved || persistedResolved) {
+        failedNames.delete(memberName);
+        continue;
+      }
+      if (
+        live?.launchState === 'failed_to_start' ||
+        persisted?.launchState === 'failed_to_start' ||
+        live?.hardFailure === true ||
+        persisted?.hardFailure === true
+      ) {
+        failedNames.add(memberName);
+      }
+    }
+    return [...failedNames].sort((left, right) => left.localeCompare(right));
+  }
+
+  private getLaunchIncompletePendingNames(
+    run: ProvisioningRun,
+    expectedMembers: readonly string[],
+    failedNames: readonly string[],
+    snapshot?: PersistedTeamLaunchSnapshot | null
+  ): string[] {
+    const failed = new Set(failedNames);
+    return expectedMembers
+      .filter((memberName) => {
+        if (failed.has(memberName)) {
+          return false;
+        }
+        const { live, persisted } = this.getLaunchIncompleteMemberEvidence(
+          run,
+          snapshot,
+          memberName
+        );
+        const hasEvidence = live !== undefined || persisted !== undefined;
+        if (!hasEvidence) {
+          return false;
+        }
+        const confirmed =
+          live?.launchState === 'confirmed_alive' ||
+          persisted?.launchState === 'confirmed_alive' ||
+          live?.bootstrapConfirmed === true ||
+          persisted?.bootstrapConfirmed === true;
+        if (confirmed) {
+          return false;
+        }
+        const skipped =
+          live?.launchState === 'skipped_for_launch' ||
+          persisted?.launchState === 'skipped_for_launch' ||
+          live?.skippedForLaunch === true ||
+          persisted?.skippedForLaunch === true;
+        return !skipped;
+      })
+      .sort((left, right) => left.localeCompare(right));
+  }
+
+  private getLaunchIncompleteJoinedCount(
+    run: ProvisioningRun,
+    expectedMembers: readonly string[],
+    namedMissingCount: number,
+    launchSummary: {
+      confirmedCount: number;
+    },
+    snapshot?: PersistedTeamLaunchSnapshot | null
+  ): number {
+    const evidenceConfirmedCount = expectedMembers.filter((memberName) => {
+      const { live, persisted } = this.getLaunchIncompleteMemberEvidence(run, snapshot, memberName);
+      return (
+        live?.launchState === 'confirmed_alive' ||
+        persisted?.launchState === 'confirmed_alive' ||
+        live?.bootstrapConfirmed === true ||
+        persisted?.bootstrapConfirmed === true
+      );
+    }).length;
+    const namedMissingUpperBound = expectedMembers.length - namedMissingCount;
+    const rawJoinedCount =
+      namedMissingCount > 0
+        ? Math.min(
+            namedMissingUpperBound,
+            Math.max(evidenceConfirmedCount, launchSummary.confirmedCount)
+          )
+        : Math.max(evidenceConfirmedCount, launchSummary.confirmedCount);
+    return Math.max(0, Math.min(expectedMembers.length, rawJoinedCount));
+  }
+
   // ---------------------------------------------------------------------------
   // Same-team native delivery dedup (Layer 2)
   // ---------------------------------------------------------------------------
@@ -23412,6 +27076,11 @@ export class TeamProvisioningService {
     }
 
     if (!hasNewerTrackedRun && run.isLaunch && !run.provisioningComplete && !run.cancelRequested) {
+      this.markUnconfirmedBootstrapMembersFailed(
+        run,
+        'Launch ended before teammate bootstrap completed.',
+        { cleanupRequested: true }
+      );
       void this.persistLaunchStateSnapshot(run, 'finished');
     }
     this.resetRuntimeToolActivity(run);
@@ -23444,8 +27113,8 @@ export class TeamProvisioningService {
       this.clearSecondaryRuntimeRuns(run.teamName);
     }
     if (!hasNewerTrackedRun) {
-      this.agentRuntimeSnapshotCache.delete(run.teamName);
-      this.liveTeamAgentRuntimeMetadataCache.delete(run.teamName);
+      this.invalidateRuntimeSnapshotCaches(run.teamName);
+      this.invalidateMemberSpawnStatusesCache(run.teamName);
       this.leadInboxRelayInFlight.delete(run.teamName);
       this.relayedLeadInboxMessageIds.delete(run.teamName);
       this.pendingCrossTeamFirstReplies.delete(run.teamName);
@@ -23530,6 +27199,9 @@ export class TeamProvisioningService {
       }
     }
     // Remove from runs Map to free memory (stdoutBuffer, stderrBuffer, claudeLogLines)
+    if (run.progress) {
+      this.retainProvisioningProgress(run.runId, run.progress);
+    }
     this.runs.delete(run.runId);
   }
 
@@ -23981,7 +27653,11 @@ export class TeamProvisioningService {
 
   private async buildProvisioningEnv(
     providerId: TeamProviderId | undefined = 'anthropic',
-    providerBackendId?: string | null
+    providerBackendId?: string | null,
+    options?: {
+      includeCodexTeammateAuth?: boolean;
+      teamRuntimeAuth?: TeamRuntimeAuthContext;
+    }
   ): Promise<ProvisioningEnvResolution> {
     const shellEnv = await resolveInteractiveShellEnv();
     // getHomeDir() uses Electron's app.getPath('home') which handles Unicode
@@ -24033,6 +27709,13 @@ export class TeamProvisioningService {
     });
     const providerConnectionIssue = providerEnvResult.connectionIssues[resolvedProviderId];
     const providerEnv = providerEnvResult.env;
+    if (options?.includeCodexTeammateAuth && resolvedProviderId !== 'codex') {
+      await this.providerConnectionService.augmentConfiguredConnectionEnv(
+        providerEnv,
+        'codex',
+        getConfiguredRuntimeBackend('codex')
+      );
+    }
     Object.assign(providerEnv, await this.buildRuntimeTurnSettledEnvironment(resolvedProviderId));
 
     const controlApiBaseUrl = await this.resolveControlApiBaseUrl();
@@ -24088,6 +27771,54 @@ export class TeamProvisioningService {
       };
     }
 
+    const teamRuntimeAuth = options?.teamRuntimeAuth;
+    const helperAllowed =
+      resolvedProviderId === 'anthropic' &&
+      teamRuntimeAuth?.allowAnthropicApiKeyHelper === true &&
+      typeof teamRuntimeAuth.teamName === 'string' &&
+      teamRuntimeAuth.teamName.trim().length > 0 &&
+      typeof teamRuntimeAuth.authMaterialId === 'string' &&
+      teamRuntimeAuth.authMaterialId.trim().length > 0 &&
+      !isWindows &&
+      process.env[DISABLE_ANTHROPIC_TEAM_API_KEY_HELPER_ENV] !== '1';
+
+    if (helperAllowed) {
+      const apiKey =
+        await this.providerConnectionService.getConfiguredAnthropicApiKeyForTeamRuntime(
+          providerEnv
+        );
+      if (apiKey) {
+        const helper = await materializeAnthropicTeamApiKeyHelper({
+          teamName: teamRuntimeAuth.teamName!,
+          authMaterialId: teamRuntimeAuth.authMaterialId!,
+          apiKey,
+          baseClaudeDir: getClaudeBasePath(),
+        });
+        try {
+          await verifyAnthropicTeamApiKeyHelperMaterial({
+            helperPath: helper.helperPath,
+            expectedApiKey: apiKey,
+          });
+        } catch (error) {
+          await cleanupAnthropicTeamApiKeyHelperMaterial({ directory: helper.directory });
+          throw error;
+        }
+
+        for (const key of ANTHROPIC_HELPER_MODE_COMPETING_AUTH_ENV_KEYS) {
+          delete providerEnv[key];
+        }
+        Object.assign(providerEnv, helper.envPatch);
+
+        return {
+          env: providerEnv,
+          authSource: 'anthropic_api_key_helper',
+          geminiRuntimeAuth: null,
+          providerArgs: [...(providerEnvResult.providerArgs ?? []), ...helper.settingsArgs],
+          anthropicApiKeyHelper: helper,
+        };
+      }
+    }
+
     // 1. Explicit ANTHROPIC_API_KEY — works with `-p` mode directly
     if (
       typeof providerEnv.ANTHROPIC_API_KEY === 'string' &&
@@ -24131,8 +27862,9 @@ export class TeamProvisioningService {
 
   private async buildCrossProviderMemberArgs(
     primaryProviderId: TeamProviderId,
-    memberSpecs: TeamCreateRequest['members']
-  ): Promise<string[]> {
+    memberSpecs: TeamCreateRequest['members'],
+    options?: { teamRuntimeAuth?: TeamRuntimeAuthContext }
+  ): Promise<CrossProviderMemberArgsResult> {
     const crossProviderIds = new Set<TeamProviderId>();
     for (const member of memberSpecs) {
       const memberId = resolveTeamProviderId(
@@ -24143,12 +27875,27 @@ export class TeamProvisioningService {
       }
     }
     const args: string[] = [];
+    const providerArgsByProvider = new Map<TeamProviderId, string[]>();
+    const envPatch: NodeJS.ProcessEnv = {};
+    let usesAnthropicApiKeyHelper = false;
     for (const providerId of crossProviderIds) {
       try {
-        const env = await this.buildProvisioningEnv(providerId);
+        const env = await this.buildProvisioningEnv(providerId, undefined, {
+          teamRuntimeAuth: options?.teamRuntimeAuth,
+        });
         args.push(...(await this.buildRuntimeTurnSettledHookSettingsArgs(providerId)));
-        if (env.providerArgs) {
-          args.push(...env.providerArgs);
+        const providerArgs = env.providerArgs ?? [];
+        providerArgsByProvider.set(providerId, providerArgs);
+        if (env.anthropicApiKeyHelper) {
+          usesAnthropicApiKeyHelper = true;
+          Object.assign(envPatch, env.anthropicApiKeyHelper.envPatch);
+        }
+        const flattenedArgs =
+          providerId === 'anthropic' && env.anthropicApiKeyHelper
+            ? filterOutSettingsPathArgs(providerArgs, env.anthropicApiKeyHelper.settingsPath)
+            : providerArgs;
+        if (flattenedArgs.length > 0) {
+          args.push(...flattenedArgs);
         }
       } catch (error) {
         console.error(
@@ -24158,7 +27905,7 @@ export class TeamProvisioningService {
         // Best-effort: don't block launch if cross-provider env resolution fails
       }
     }
-    return args;
+    return { args, providerArgsByProvider, envPatch, usesAnthropicApiKeyHelper };
   }
 
   private async resolveControlApiBaseUrl(): Promise<string | null> {
@@ -24204,6 +27951,7 @@ export class TeamProvisioningService {
       config.projectPathHistory = pathHistory.slice(-500);
 
       await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+      TeamConfigReader.invalidateTeam(teamName);
       logger.info(`[${teamName}] Updated config.projectPath immediately: ${cwd}`);
     } catch (error) {
       // Non-fatal: updateConfigPostLaunch will update it later if provisioning succeeds.
@@ -24440,6 +28188,7 @@ export class TeamProvisioningService {
       this.applyEffectiveLaunchStateToConfig(teamName, config, launchState);
 
       await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+      TeamConfigReader.invalidateTeam(teamName);
     } catch (error) {
       logger.warn(
         `[${teamName}] Failed to update config post-launch: ${
@@ -24490,6 +28239,7 @@ export class TeamProvisioningService {
           if (removedFromConfig.length > 0) {
             parsed.members = nextMembers;
             await atomicWriteAsync(configPath, JSON.stringify(parsed, null, 2));
+            TeamConfigReader.invalidateTeam(teamName);
             logger.warn(
               `[${teamName}] Removed CLI auto-suffixed members from config.json: ${removedFromConfig.join(', ')}`
             );
@@ -24746,6 +28496,7 @@ export class TeamProvisioningService {
     config.members = leadMembers;
     try {
       await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
+      TeamConfigReader.invalidateTeam(teamName);
       logger.info(
         `[${teamName}] Normalized config.json for launch: kept ${leadMembers.length} lead member(s)`
       );
@@ -24777,6 +28528,7 @@ export class TeamProvisioningService {
         return;
       }
       await atomicWriteAsync(configPath, backupRaw);
+      TeamConfigReader.invalidateTeam(teamName);
       logger.info(`[${teamName}] Restored config.json from prelaunch backup after launch failure`);
     } catch {
       logger.debug(`[${teamName}] No prelaunch backup to restore (or read failed)`);
diff --git a/src/main/services/team/TeamRuntimeLivenessResolver.ts b/src/main/services/team/TeamRuntimeLivenessResolver.ts
index 429d73e7..558ffb0c 100644
--- a/src/main/services/team/TeamRuntimeLivenessResolver.ts
+++ b/src/main/services/team/TeamRuntimeLivenessResolver.ts
@@ -267,17 +267,24 @@ export function resolveTeamMemberRuntimeLiveness(
       });
     }
     return result({
-      alive: false,
-      livenessKind: 'runtime_process_candidate',
-      pidSource: 'opencode_bridge',
-      pid: runtimePidRow.pid,
+      alive: hasConfirmedBootstrap,
+      livenessKind: hasConfirmedBootstrap ? 'confirmed_bootstrap' : 'runtime_process_candidate',
+      pidSource: hasConfirmedBootstrap ? 'runtime_bootstrap' : 'opencode_bridge',
+      pid: hasConfirmedBootstrap ? undefined : runtimePidRow.pid,
       runtimeSessionId,
-      processCommand,
-      runtimeDiagnostic: 'OpenCode runtime pid is alive, but process identity is unverified',
-      runtimeDiagnosticSeverity: 'warning',
+      processCommand: hasConfirmedBootstrap ? undefined : processCommand,
+      runtimeLastSeenAt: hasConfirmedBootstrap
+        ? (tracked?.lastHeartbeatAt ?? tracked?.updatedAt)
+        : undefined,
+      runtimeDiagnostic: hasConfirmedBootstrap
+        ? 'bootstrap confirmed; runtime pid currently points to a different process'
+        : 'OpenCode runtime pid is alive, but process identity is unverified',
+      runtimeDiagnosticSeverity: hasConfirmedBootstrap ? 'info' : 'warning',
       diagnostics: [
         ...diagnostics,
-        'matched OpenCode runtime pid without OpenCode process identity',
+        hasConfirmedBootstrap
+          ? 'bootstrap confirmed despite runtime pid identity mismatch'
+          : 'matched OpenCode runtime pid without OpenCode process identity',
       ],
     });
   }
diff --git a/src/main/services/team/TeamTaskReader.ts b/src/main/services/team/TeamTaskReader.ts
index 81f81394..a808ea48 100644
--- a/src/main/services/team/TeamTaskReader.ts
+++ b/src/main/services/team/TeamTaskReader.ts
@@ -21,13 +21,18 @@ import type {
 
 const logger = createLogger('Service:TeamTaskReader');
 const MAX_TASK_FILE_BYTES = 2 * 1024 * 1024;
-const ALL_TASKS_CACHE_TTL_MS = 500;
+const ALL_TASKS_CACHE_TTL_MS = 5_000;
 
 interface CachedAllTasks {
   value: (TeamTask & { teamName: string })[];
   expiresAt: number;
 }
 
+interface InFlightAllTasks {
+  promise: Promise<(TeamTask & { teamName: string })[]>;
+  generationAtStart: number;
+}
+
 function cloneTasks<T>(tasks: T[]): T[] {
   return structuredClone(tasks);
 }
@@ -74,7 +79,13 @@ function normalizeTaskRefs(value: unknown): TaskRef[] | undefined {
 
 export class TeamTaskReader {
   private static allTasksCache: CachedAllTasks | null = null;
-  private static allTasksInFlight: Promise<(TeamTask & { teamName: string })[]> | null = null;
+  private static allTasksInFlight: InFlightAllTasks | null = null;
+  private static allTasksGeneration = 0;
+
+  static invalidateAllTasksCache(): void {
+    TeamTaskReader.allTasksCache = null;
+    TeamTaskReader.allTasksGeneration += 1;
+  }
 
   /**
    * Returns the next available numeric task ID by scanning ALL task files
@@ -446,26 +457,55 @@ export class TeamTaskReader {
   }
 
   async getAllTasks(): Promise<(TeamTask & { teamName: string })[]> {
+    const startedAt = Date.now();
     const cached = TeamTaskReader.allTasksCache;
     if (cached && cached.expiresAt > Date.now()) {
-      return cloneTasks(cached.value);
+      const cloned = cloneTasks(cached.value);
+      const ms = Date.now() - startedAt;
+      if (ms >= 1500) {
+        logger.warn(`[getAllTasks] cache clone slow ms=${ms} tasks=${cloned.length}`);
+      }
+      return cloned;
     }
 
-    if (TeamTaskReader.allTasksInFlight) {
-      return cloneTasks(await TeamTaskReader.allTasksInFlight);
+    if (
+      TeamTaskReader.allTasksInFlight &&
+      TeamTaskReader.allTasksInFlight.generationAtStart === TeamTaskReader.allTasksGeneration
+    ) {
+      const waitedAt = Date.now();
+      const tasks = await TeamTaskReader.allTasksInFlight.promise;
+      const cloned = cloneTasks(tasks);
+      const ms = Date.now() - startedAt;
+      if (ms >= 1500) {
+        logger.warn(
+          `[getAllTasks] in-flight wait slow ms=${ms} waitMs=${Date.now() - waitedAt} tasks=${cloned.length}`
+        );
+      }
+      return cloned;
     }
 
     const request = this.readAllTasksUncached();
-    TeamTaskReader.allTasksInFlight = request;
+    const generationAtStart = TeamTaskReader.allTasksGeneration;
+    TeamTaskReader.allTasksInFlight = {
+      promise: request,
+      generationAtStart,
+    };
     try {
       const tasks = await request;
-      TeamTaskReader.allTasksCache = {
-        value: cloneTasks(tasks),
-        expiresAt: Date.now() + ALL_TASKS_CACHE_TTL_MS,
-      };
-      return cloneTasks(tasks);
+      if (TeamTaskReader.allTasksGeneration === generationAtStart) {
+        TeamTaskReader.allTasksCache = {
+          value: cloneTasks(tasks),
+          expiresAt: Date.now() + ALL_TASKS_CACHE_TTL_MS,
+        };
+      }
+      const cloned = cloneTasks(tasks);
+      const ms = Date.now() - startedAt;
+      if (ms >= 1500) {
+        logger.warn(`[getAllTasks] total slow ms=${ms} tasks=${cloned.length}`);
+      }
+      return cloned;
     } finally {
-      if (TeamTaskReader.allTasksInFlight === request) {
+      if (TeamTaskReader.allTasksInFlight?.promise === request) {
         TeamTaskReader.allTasksInFlight = null;
       }
     }
diff --git a/src/main/services/team/TeamTranscriptProjectResolver.ts b/src/main/services/team/TeamTranscriptProjectResolver.ts
index 63c1de58..e80221d4 100644
--- a/src/main/services/team/TeamTranscriptProjectResolver.ts
+++ b/src/main/services/team/TeamTranscriptProjectResolver.ts
@@ -46,6 +46,11 @@ interface SessionProjectMatch extends ProjectDirCandidate {
   matchedSessionId: string;
 }
 
+interface TeamTranscriptProjectConfigReader {
+  getConfig(teamName: string): Promise<TeamConfig | null>;
+  getConfigSnapshot?: (teamName: string) => Promise<TeamConfig | null>;
+}
+
 type ScannedSessionProjectMatch = Omit<SessionProjectMatch, 'projectPath'> & {
   projectPath?: string;
 };
@@ -180,13 +185,62 @@ export interface TeamTranscriptProjectContext {
   sessionIds: string[];
 }
 
+export interface TeamTranscriptProjectLiveBaseContext {
+  projectDir: string;
+  projectId: string;
+  config: TeamConfig;
+}
+
 export class TeamTranscriptProjectResolver {
   private readonly contextCache = new Map<
     string,
     { value: TeamTranscriptProjectContext; expiresAt: number }
   >();
 
-  constructor(private readonly configReader: TeamConfigReader = new TeamConfigReader()) {}
+  constructor(
+    private readonly configReader: TeamTranscriptProjectConfigReader = new TeamConfigReader()
+  ) {}
+
+  private readConfigForObservation(teamName: string): Promise<TeamConfig | null> {
+    return typeof this.configReader.getConfigSnapshot === 'function'
+      ? this.configReader.getConfigSnapshot(teamName)
+      : this.configReader.getConfig(teamName);
+  }
+
+  async getLiveBaseContext(
+    teamName: string,
+    options?: { forceRefresh?: boolean; extraProjectPathCandidates?: readonly unknown[] }
+  ): Promise<TeamTranscriptProjectLiveBaseContext | null> {
+    if (options?.forceRefresh) {
+      this.contextCache.delete(teamName);
+    }
+
+    const config = await this.readConfigForObservation(teamName);
+    if (!config) {
+      return null;
+    }
+
+    const projectPathCandidates = this.collectLiveProjectPathCandidates(
+      config,
+      options?.extraProjectPathCandidates ?? []
+    );
+    const resolution = await this.resolveLiveProjectDirectoryFromCandidates(projectPathCandidates);
+    if (!resolution) {
+      return null;
+    }
+
+    const resolvedConfig =
+      trimTrailingSlashes(config.projectPath ?? '') !==
+      trimTrailingSlashes(resolution.effectiveProjectPath)
+        ? { ...config, projectPath: resolution.effectiveProjectPath }
+        : config;
+
+    return {
+      projectDir: resolution.projectDir,
+      projectId: resolution.projectId,
+      config: resolvedConfig,
+    };
+  }
 
   async getContext(
     teamName: string,
@@ -201,7 +255,7 @@ export class TeamTranscriptProjectResolver {
       return cached.value;
     }
 
-    const config = await this.configReader.getConfig(teamName);
+    const config = await this.readConfigForObservation(teamName);
     if (!config) {
       return null;
     }
@@ -425,6 +479,46 @@ export class TeamTranscriptProjectResolver {
     return candidates;
   }
 
+  private collectLiveProjectPathCandidates(
+    config: TeamConfig,
+    extraCandidates: readonly unknown[]
+  ): string[] {
+    const candidates: string[] = [];
+    const seen = new Set<string>();
+    const push = (value: unknown): void => {
+      const normalized = normalizeProjectPathCandidate(value);
+      if (!normalized || seen.has(normalized)) {
+        return;
+      }
+      seen.add(normalized);
+      candidates.push(normalized);
+    };
+
+    push(config.projectPath);
+
+    const history = Array.isArray(config.projectPathHistory) ? config.projectPathHistory : [];
+    for (let index = history.length - 1; index >= Math.max(0, history.length - 5); index -= 1) {
+      push(history[index]);
+    }
+
+    push((config.members ?? []).find((member) => isLeadMember(member))?.cwd);
+
+    const distinctMemberCwds = new Set(
+      (config.members ?? [])
+        .map((member) => normalizeProjectPathCandidate(member.cwd))
+        .filter((cwd): cwd is string => Boolean(cwd))
+    );
+    if (distinctMemberCwds.size === 1) {
+      push([...distinctMemberCwds][0]);
+    }
+
+    for (const candidate of extraCandidates.slice(0, 64)) {
+      push(candidate);
+    }
+
+    return candidates;
+  }
+
   private buildProjectDirCandidates(projectPath: string): ProjectDirCandidate[] {
     const normalizedProjectPath = trimTrailingSlashes(projectPath);
     const projectId = extractBaseDir(encodePath(normalizedProjectPath));
@@ -457,6 +551,32 @@ export class TeamTranscriptProjectResolver {
       }));
   }
 
+  private async resolveLiveProjectDirectoryFromCandidates(
+    candidates: readonly string[]
+  ): Promise<{ projectDir: string; projectId: string; effectiveProjectPath: string } | null> {
+    let firstResolution: {
+      projectDir: string;
+      projectId: string;
+      effectiveProjectPath: string;
+    } | null = null;
+
+    for (const projectPath of candidates) {
+      for (const dirCandidate of this.buildProjectDirCandidates(projectPath)) {
+        const resolution = {
+          projectDir: dirCandidate.projectDir,
+          projectId: dirCandidate.projectId,
+          effectiveProjectPath: projectPath,
+        };
+        firstResolution ??= resolution;
+        if (await this.projectDirExists(dirCandidate.projectDir)) {
+          return resolution;
+        }
+      }
+    }
+
+    return null;
+  }
+
   private async findMatchInProjectPathCandidate(
     candidate: ProjectPathCandidate,
     sessionIds: string[]
@@ -605,6 +725,7 @@ export class TeamTranscriptProjectResolver {
         normalizedNextPath
       );
       await atomicWriteAsync(configPath, JSON.stringify(parsed, null, 2));
+      TeamConfigReader.invalidateTeam(teamName);
       logger.info(
         `[${teamName}] Repaired transcript projectPath via exact session match: ${normalizedNextPath}`
       );
diff --git a/src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger.ts b/src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger.ts
index b87140d0..98180867 100644
--- a/src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger.ts
+++ b/src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger.ts
@@ -141,7 +141,7 @@ export interface ApplyOpenCodePromptDestinationProofInput {
   id: string;
   visibleReplyInbox: string;
   visibleReplyMessageId: string;
-  visibleReplyCorrelation: 'relayOfMessageId';
+  visibleReplyCorrelation: OpenCodeDeliveryVisibleReplyCorrelation;
   semanticallySufficient: boolean;
   diagnostics?: string[];
   observedAt: string;
@@ -357,10 +357,14 @@ export class OpenCodePromptDeliveryLedgerStore {
   async applyDestinationProof(
     input: ApplyOpenCodePromptDestinationProofInput
   ): Promise<OpenCodePromptDeliveryLedgerRecord> {
+    const responseState =
+      input.visibleReplyCorrelation === 'plain_assistant_text'
+        ? 'responded_plain_text'
+        : 'responded_visible_message';
     return await this.updateExisting(input.id, (record) => ({
       ...record,
       status: input.semanticallySufficient ? 'responded' : record.status,
-      responseState: 'responded_visible_message',
+      responseState,
       lastObservedAt: input.observedAt,
       respondedAt: input.semanticallySufficient
         ? (record.respondedAt ?? input.observedAt)
@@ -786,6 +790,14 @@ function isTaskRefArray(value: unknown): value is TaskRef[] {
 }
 
 function isTerminalForAutomaticSelection(record: OpenCodePromptDeliveryLedgerRecord): boolean {
+  if (
+    record.status === 'responded' &&
+    record.responseState === 'responded_plain_text' &&
+    !record.visibleReplyMessageId &&
+    !record.inboxReadCommittedAt
+  ) {
+    return false;
+  }
   return record.status === 'failed_terminal' || record.status === 'responded';
 }
 
diff --git a/src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader.ts b/src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader.ts
index 4e0599e3..cbe3ebe7 100644
--- a/src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader.ts
+++ b/src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader.ts
@@ -71,6 +71,7 @@ export interface OpenCodeCommittedBootstrapSessionRecord {
 export interface OpenCodeCommittedBootstrapSessionEvidence {
   state: RuntimeStoreManifestEntryState | 'invalid_store' | 'descriptor_missing';
   committed: boolean;
+  activeRunId: string | null;
   sessions: OpenCodeCommittedBootstrapSessionRecord[];
   diagnostics: string[];
 }
@@ -497,6 +498,7 @@ export async function readCommittedOpenCodeBootstrapSessionEvidence(params: {
     return {
       state: 'descriptor_missing',
       committed: false,
+      activeRunId: null,
       sessions: [],
       diagnostics: ['OpenCode session store descriptor is not registered.'],
     };
@@ -521,6 +523,7 @@ export async function readCommittedOpenCodeBootstrapSessionEvidence(params: {
     return {
       state: 'invalid_store',
       committed: false,
+      activeRunId: null,
       sessions: [],
       diagnostics: ['OpenCode runtime manifest could not be read.'],
     };
@@ -539,6 +542,7 @@ export async function readCommittedOpenCodeBootstrapSessionEvidence(params: {
     return {
       state: inspection.state,
       committed: false,
+      activeRunId: manifest.activeRunId,
       sessions: [],
       diagnostics,
     };
@@ -561,6 +565,7 @@ export async function readCommittedOpenCodeBootstrapSessionEvidence(params: {
   return {
     state: 'healthy',
     committed: true,
+    activeRunId: manifest.activeRunId,
     sessions,
     diagnostics,
   };
diff --git a/src/main/services/team/opencode/store/RuntimeStoreManifest.ts b/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
index 99e6174e..7b1d36d7 100644
--- a/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
+++ b/src/main/services/team/opencode/store/RuntimeStoreManifest.ts
@@ -5,6 +5,8 @@ import * as path from 'path';
 
 import { VersionedJsonStore, VersionedJsonStoreError } from './VersionedJsonStore';
 
+import type { FileLockOptions } from '../../fileLock';
+
 export const OPENCODE_RUNTIME_STORE_MANIFEST_SCHEMA_VERSION = 1;
 export const OPENCODE_RUNTIME_STORE_RECEIPT_SCHEMA_VERSION = 1;
 
@@ -917,6 +919,7 @@ export function createRuntimeStoreManifestStore(options: {
   filePath: string;
   teamName: string;
   clock?: () => Date;
+  lockOptions?: FileLockOptions;
 }): RuntimeStoreManifestStore {
   const clock = options.clock ?? (() => new Date());
   return new RuntimeStoreManifestStore(
@@ -926,6 +929,7 @@ export function createRuntimeStoreManifestStore(options: {
       defaultData: () => createDefaultRuntimeStoreManifest(options.teamName, clock().toISOString()),
       validate: validateRuntimeStoreManifest,
       clock,
+      lockOptions: options.lockOptions,
     }),
     clock
   );
@@ -934,6 +938,7 @@ export function createRuntimeStoreManifestStore(options: {
 export function createRuntimeStoreReceiptStore(options: {
   filePath: string;
   clock?: () => Date;
+  lockOptions?: FileLockOptions;
 }): RuntimeStoreReceiptStore {
   const clock = options.clock ?? (() => new Date());
   return new RuntimeStoreReceiptStore(
@@ -943,6 +948,7 @@ export function createRuntimeStoreReceiptStore(options: {
       defaultData: () => [],
       validate: validateRuntimeStoreWriteBatches,
       clock,
+      lockOptions: options.lockOptions,
     }),
     clock
   );
diff --git a/src/main/services/team/opencode/store/VersionedJsonStore.ts b/src/main/services/team/opencode/store/VersionedJsonStore.ts
index 9da4a5e1..afbf1912 100644
--- a/src/main/services/team/opencode/store/VersionedJsonStore.ts
+++ b/src/main/services/team/opencode/store/VersionedJsonStore.ts
@@ -2,7 +2,7 @@ import { atomicWriteAsync } from '@main/utils/atomicWrite';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 
-import { withFileLock } from '../../fileLock';
+import { type FileLockOptions, withFileLock } from '../../fileLock';
 
 export interface VersionedJsonStoreEnvelope<TData> {
   schemaVersion: number;
@@ -45,6 +45,7 @@ export interface VersionedJsonStoreOptions<TData> {
   validate: (value: unknown) => TData;
   clock?: () => Date;
   quarantineDir?: string;
+  lockOptions?: FileLockOptions;
 }
 
 export class VersionedJsonStoreError extends Error {
@@ -65,6 +66,7 @@ export class VersionedJsonStore<TData> {
   private readonly validate: (value: unknown) => TData;
   private readonly clock: () => Date;
   private readonly quarantineDir: string | null;
+  private readonly lockOptions: FileLockOptions | undefined;
 
   constructor(options: VersionedJsonStoreOptions<TData>) {
     this.filePath = options.filePath;
@@ -73,6 +75,7 @@ export class VersionedJsonStore<TData> {
     this.validate = options.validate;
     this.clock = options.clock ?? (() => new Date());
     this.quarantineDir = options.quarantineDir ?? null;
+    this.lockOptions = options.lockOptions;
   }
 
   async read(): Promise<VersionedJsonStoreReadResult<TData>> {
@@ -82,36 +85,44 @@ export class VersionedJsonStore<TData> {
   async updateLocked(
     updater: (current: TData) => TData | Promise<TData>
   ): Promise<VersionedJsonStoreUpdateResult<TData>> {
-    return withFileLock(this.filePath, async () => {
-      const current = await this.readUnlocked();
-      if (!current.ok) {
-        throw new VersionedJsonStoreError(current.message, current.reason, current.quarantinePath);
-      }
+    return withFileLock(
+      this.filePath,
+      async () => {
+        const current = await this.readUnlocked();
+        if (!current.ok) {
+          throw new VersionedJsonStoreError(
+            current.message,
+            current.reason,
+            current.quarantinePath
+          );
+        }
 
-      const nextData = await updater(cloneJson(current.data));
-      const validatedNextData = this.validate(nextData);
-      const currentJson = stableJsonStringify(current.data);
-      const nextJson = stableJsonStringify(validatedNextData);
-      const changed = current.status === 'missing' || currentJson !== nextJson;
-      const envelope: VersionedJsonStoreEnvelope<TData> = {
-        schemaVersion: this.schemaVersion,
-        updatedAt: changed
-          ? this.clock().toISOString()
-          : (current.envelope?.updatedAt ?? this.clock().toISOString()),
-        data: changed ? validatedNextData : current.data,
-      };
+        const nextData = await updater(cloneJson(current.data));
+        const validatedNextData = this.validate(nextData);
+        const currentJson = stableJsonStringify(current.data);
+        const nextJson = stableJsonStringify(validatedNextData);
+        const changed = current.status === 'missing' || currentJson !== nextJson;
+        const envelope: VersionedJsonStoreEnvelope<TData> = {
+          schemaVersion: this.schemaVersion,
+          updatedAt: changed
+            ? this.clock().toISOString()
+            : (current.envelope?.updatedAt ?? this.clock().toISOString()),
+          data: changed ? validatedNextData : current.data,
+        };
 
-      if (changed) {
-        await fs.mkdir(path.dirname(this.filePath), { recursive: true });
-        await atomicWriteAsync(this.filePath, `${JSON.stringify(envelope, null, 2)}\n`);
-      }
+        if (changed) {
+          await fs.mkdir(path.dirname(this.filePath), { recursive: true });
+          await atomicWriteAsync(this.filePath, `${JSON.stringify(envelope, null, 2)}\n`);
+        }
 
-      return {
-        changed,
-        data: envelope.data,
-        envelope,
-      };
-    });
+        return {
+          changed,
+          data: envelope.data,
+          envelope,
+        };
+      },
+      this.lockOptions
+    );
   }
 
   private async readUnlocked(): Promise<VersionedJsonStoreReadResult<TData>> {
diff --git a/src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter.ts b/src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter.ts
index 1df7928c..b686585f 100644
--- a/src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter.ts
+++ b/src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter.ts
@@ -59,6 +59,10 @@ export interface OpenCodeTeamRuntimeMessageInput {
   replyRecipient?: string;
   actionMode?: AgentActionMode;
   taskRefs?: TaskRef[];
+  bootstrapCheckinRetry?: {
+    runtimeSessionId: string;
+    reason?: string;
+  };
 }
 
 export interface OpenCodeTeamRuntimeMessageResult {
@@ -78,6 +82,11 @@ const REQUIRED_READY_CHECKPOINTS = new Set([
   'member_ready',
   'run_ready',
 ]);
+const GENERIC_OPEN_CODE_MEMBER_FAILURE_REASON = 'OpenCode bridge reported member launch failure';
+const SECRET_FLAG_PATTERN =
+  /(--(?:api-key|token|password|secret|authorization|auth-token)(?:=|\s+))("[^"]*"|'[^']*'|\S+)/gi;
+const BEARER_TOKEN_PATTERN = /\bBearer\s+\S+/gi;
+const SECRET_KEY_PATTERN = /\bsk-[A-Za-z0-9_-]{16,}\b/g;
 
 export class OpenCodeTeamRuntimeAdapter implements TeamLaunchRuntimeAdapter {
   readonly providerId = 'opencode' as const;
@@ -132,25 +141,33 @@ export class OpenCodeTeamRuntimeAdapter implements TeamLaunchRuntimeAdapter {
       );
     }
 
-    const prepared = await this.prepare(input);
-    if (!prepared.ok) {
-      return blockedLaunchResult(input, prepared.reason, prepared.diagnostics, prepared.warnings);
+    const skipReadinessPreflight = input.skipReadinessPreflight === true;
+    let selectedModel = input.model?.trim() ?? '';
+    let launchWarnings: string[] = [];
+    if (!skipReadinessPreflight) {
+      const prepared = await this.prepare(input);
+      if (!prepared.ok) {
+        return blockedLaunchResult(input, prepared.reason, prepared.diagnostics, prepared.warnings);
+      }
+      selectedModel = prepared.modelId ?? selectedModel;
+      launchWarnings = prepared.warnings;
     }
 
     if (!this.bridge.launchOpenCodeTeam) {
       return blockedLaunchResult(input, 'opencode_launch_bridge_missing', [
-        'OpenCode readiness passed, but the state-changing launch bridge is not registered.',
+        'OpenCode state-changing launch bridge is not registered.',
       ]);
     }
 
-    const selectedModel = prepared.modelId ?? input.model?.trim() ?? '';
     if (!selectedModel) {
       return blockedLaunchResult(input, 'opencode_model_unavailable', [
         'OpenCode launch requires a selected raw model id.',
       ]);
     }
 
-    const runtimeSnapshot = this.bridge.getLastOpenCodeRuntimeSnapshot?.(input.cwd) ?? null;
+    const runtimeSnapshot = skipReadinessPreflight
+      ? null
+      : (this.bridge.getLastOpenCodeRuntimeSnapshot?.(input.cwd) ?? null);
     this.lastProjectPathByTeamName.set(input.teamName, input.cwd);
     const data = await this.bridge.launchOpenCodeTeam({
       runId: input.runId,
@@ -169,7 +186,7 @@ export class OpenCodeTeamRuntimeAdapter implements TeamLaunchRuntimeAdapter {
       manifestHighWatermark: null,
     });
 
-    return mapOpenCodeLaunchDataToRuntimeResult(input, data, prepared.warnings);
+    return mapOpenCodeLaunchDataToRuntimeResult(input, data, launchWarnings);
   }
 
   async reconcile(input: TeamRuntimeReconcileInput): Promise<TeamRuntimeReconcileResult> {
@@ -430,6 +447,9 @@ function mapOpenCodeLaunchDataToRuntimeResult(
   prepareWarnings: string[]
 ): TeamRuntimeLaunchResult {
   const bridgeDiagnostics = data.diagnostics.map(formatOpenCodeBridgeDiagnostic);
+  const memberBridgeDiagnostics = bridgeDiagnostics.filter(
+    (diagnostic) => !isOpenCodeLaunchTimingDiagnostic(diagnostic)
+  );
   const checkpointNames = extractCheckpointNames(data);
   const readyCheckpointsPresent = [...REQUIRED_READY_CHECKPOINTS].every((name) =>
     checkpointNames.has(name)
@@ -473,6 +493,23 @@ function mapOpenCodeLaunchDataToRuntimeResult(
         : data.teamLaunchState === 'failed'
           ? 'failed'
           : 'created';
+      const checkpointDiagnosticsForMember = [
+        ...checkpointDiagnostic,
+        ...(missingExpectedMembers.includes(member.name) ? incompleteReadyDiagnostic : []),
+      ];
+      const memberDiagnostics = [
+        ...(bridgeMember
+          ? []
+          : [
+              `OpenCode bridge response did not include ${member.name}; keeping the member pending until lane state materializes.`,
+            ]),
+        ...(bridgeMember?.diagnostics ?? []),
+        ...(bridgeMember?.evidence ?? []).map(
+          (evidence) => `${evidence.kind} at ${evidence.observedAt}`
+        ),
+        ...memberBridgeDiagnostics,
+        ...checkpointDiagnosticsForMember,
+      ];
       return [
         member.name,
         mapBridgeMemberToRuntimeEvidence(
@@ -482,20 +519,13 @@ function mapOpenCodeLaunchDataToRuntimeResult(
           bridgeMember?.runtimePid,
           bridgeMember?.pendingPermissionRequestIds,
           bridgeMember != null,
-          [
-            ...(bridgeMember
-              ? []
-              : [
-                  `OpenCode bridge response did not include ${member.name}; keeping the member pending until lane state materializes.`,
-                ]),
-            ...(bridgeMember?.diagnostics ?? []),
-            ...(bridgeMember?.evidence ?? []).map(
-              (evidence) => `${evidence.kind} at ${evidence.observedAt}`
-            ),
-            ...bridgeDiagnostics,
-            ...checkpointDiagnostic,
-            ...(missingExpectedMembers.includes(member.name) ? incompleteReadyDiagnostic : []),
-          ]
+          memberDiagnostics,
+          selectOpenCodeMemberFailureReason({
+            memberDiagnostics: bridgeMember?.diagnostics ?? [],
+            bridgeDiagnostics: data.diagnostics,
+            checkpointDiagnostics: checkpointDiagnosticsForMember,
+            fallback: GENERIC_OPEN_CODE_MEMBER_FAILURE_REASON,
+          })
         ),
       ];
     })
@@ -531,7 +561,8 @@ function mapBridgeMemberToRuntimeEvidence(
   runtimePid: number | undefined,
   pendingPermissionRequestIds: string[] | undefined,
   runtimeMaterialized: boolean,
-  diagnostics: string[]
+  diagnostics: string[],
+  selectedHardFailureReason: string
 ): TeamRuntimeMemberLaunchEvidence {
   const confirmed = launchState === 'confirmed_alive';
   const failed = launchState === 'failed';
@@ -579,7 +610,7 @@ function mapBridgeMemberToRuntimeEvidence(
     runtimeAlive: confirmed,
     bootstrapConfirmed: confirmed,
     hardFailure: failed,
-    hardFailureReason: failed ? 'OpenCode bridge reported member launch failure' : undefined,
+    hardFailureReason: failed ? selectedHardFailureReason : undefined,
     pendingPermissionRequestIds:
       pendingPermissionRequestIds && pendingPermissionRequestIds.length > 0
         ? [...new Set(pendingPermissionRequestIds)]
@@ -594,6 +625,83 @@ function mapBridgeMemberToRuntimeEvidence(
   };
 }
 
+function selectOpenCodeMemberFailureReason(input: {
+  memberDiagnostics: readonly string[];
+  bridgeDiagnostics: readonly {
+    code: string;
+    severity: 'info' | 'warning' | 'error';
+    message: string;
+  }[];
+  checkpointDiagnostics: readonly string[];
+  fallback: string;
+}): string {
+  return (
+    firstDisplayableOpenCodeFailureMessage(input.memberDiagnostics, { includeGeneric: false }) ??
+    firstDisplayableOpenCodeFailureMessage(
+      input.bridgeDiagnostics
+        .filter((diagnostic) => diagnostic.severity === 'error')
+        .map((diagnostic) => diagnostic.message),
+      { includeGeneric: false }
+    ) ??
+    firstDisplayableOpenCodeFailureMessage(input.memberDiagnostics, { includeGeneric: true }) ??
+    firstDisplayableOpenCodeFailureMessage(input.checkpointDiagnostics, { includeGeneric: true }) ??
+    firstDisplayableOpenCodeFailureMessage(
+      input.bridgeDiagnostics
+        .filter((diagnostic) => diagnostic.severity !== 'info')
+        .map((diagnostic) => diagnostic.message),
+      { includeGeneric: true }
+    ) ??
+    normalizeOpenCodeFailureMessage(input.fallback) ??
+    GENERIC_OPEN_CODE_MEMBER_FAILURE_REASON
+  );
+}
+
+function firstDisplayableOpenCodeFailureMessage(
+  values: readonly string[],
+  options: { includeGeneric: boolean }
+): string | undefined {
+  for (const value of values) {
+    const normalized = normalizeOpenCodeFailureMessage(value);
+    if (!normalized) {
+      continue;
+    }
+    if (!options.includeGeneric && isGenericOpenCodeFailureMessage(normalized)) {
+      continue;
+    }
+    return normalized;
+  }
+  return undefined;
+}
+
+function normalizeOpenCodeFailureMessage(value: string | undefined): string | undefined {
+  const trimmed = value?.replace(/\s+/g, ' ').trim();
+  if (!trimmed) {
+    return undefined;
+  }
+  return trimmed
+    .replace(SECRET_FLAG_PATTERN, '$1[redacted]')
+    .replace(BEARER_TOKEN_PATTERN, 'Bearer [redacted]')
+    .replace(SECRET_KEY_PATTERN, '[redacted-api-key]');
+}
+
+function isGenericOpenCodeFailureMessage(message: string): boolean {
+  return (
+    message === GENERIC_OPEN_CODE_MEMBER_FAILURE_REASON ||
+    message.startsWith(`${GENERIC_OPEN_CODE_MEMBER_FAILURE_REASON}:`) ||
+    message.startsWith('OpenCode secondary lane timing:') ||
+    message.startsWith(
+      'OpenCode bridge reported ready without all required durable checkpoints:'
+    ) ||
+    message.startsWith(
+      'OpenCode bridge reported ready before all expected members were confirmed:'
+    ) ||
+    message.startsWith(
+      'OpenCode bootstrap MCP did not complete required tools before assistant response:'
+    ) ||
+    isOpenCodeLaunchTimingDiagnostic(message)
+  );
+}
+
 function extractCheckpointNames(data: OpenCodeLaunchTeamCommandData): Set<string> {
   const names = new Set<string>();
   for (const checkpoint of data.durableCheckpoints ?? []) {
@@ -639,6 +747,30 @@ function buildMemberBootstrapPrompt(
 }
 
 function buildOpenCodeRuntimeMessageText(input: OpenCodeTeamRuntimeMessageInput): string {
+  if (input.bootstrapCheckinRetry) {
+    const runtimeSessionId = input.bootstrapCheckinRetry.runtimeSessionId.trim();
+    return [
+      '<opencode_runtime_bootstrap_checkin_retry>',
+      'The desktop app detected that this OpenCode session exists, but runtime_bootstrap_checkin has not committed durable runtime evidence yet.',
+      input.bootstrapCheckinRetry.reason
+        ? `Reason: ${input.bootstrapCheckinRetry.reason.trim()}`
+        : null,
+      'Before any other tool or message, call MCP tool agent-teams_runtime_bootstrap_checkin or mcp__agent-teams__runtime_bootstrap_checkin with exactly:',
+      JSON.stringify({
+        runId: input.runId,
+        teamName: input.teamName,
+        memberName: input.memberName,
+        runtimeSessionId,
+      }),
+      'Do not call member_briefing, task tools, message_send, or cross_team_send before runtime_bootstrap_checkin completes.',
+      'After runtime_bootstrap_checkin succeeds, stop this turn immediately and wait silently.',
+      'If runtime_bootstrap_checkin is unavailable or fails, reply with one short sentence containing the exact error text, then stop.',
+      '</opencode_runtime_bootstrap_checkin_retry>',
+    ]
+      .filter((line): line is string => line !== null)
+      .join('\n');
+  }
+
   const replyRecipient = input.replyRecipient?.trim() || 'user';
   const deliveryContext =
     input.messageId && input.taskRefs?.length
@@ -665,6 +797,7 @@ function buildOpenCodeRuntimeMessageText(input: OpenCodeTeamRuntimeMessageInput)
     input.messageId
       ? `Include relayOfMessageId="${input.messageId}" in that message_send call.`
       : null,
+    'After the message_send tool call succeeds, stop immediately. Do not send follow-up confirmations or repeat the same answer.',
     'Do not call runtime_bootstrap_checkin or member_briefing just to answer this delivered app message.',
     'Do not answer only with plain assistant text when agent-teams_message_send is available.',
     'Do not use SendMessage or runtime_deliver_message for ordinary visible replies.',
@@ -724,6 +857,13 @@ function formatOpenCodeBridgeDiagnostic(diagnostic: {
   return `${diagnostic.severity}:${diagnostic.code}: ${diagnostic.message}`;
 }
 
+function isOpenCodeLaunchTimingDiagnostic(diagnostic: string): boolean {
+  return (
+    diagnostic.startsWith('info:opencode_launch_member_timing:') ||
+    diagnostic.startsWith('info:opencode_launch_total_timing:')
+  );
+}
+
 function blockedLaunchResult(
   input: TeamRuntimeLaunchInput,
   reason: string,
diff --git a/src/main/services/team/runtime/TeamRuntimeAdapter.ts b/src/main/services/team/runtime/TeamRuntimeAdapter.ts
index 1ce62ce3..b0b5b22e 100644
--- a/src/main/services/team/runtime/TeamRuntimeAdapter.ts
+++ b/src/main/services/team/runtime/TeamRuntimeAdapter.ts
@@ -35,10 +35,15 @@ export interface TeamRuntimeLaunchInput {
   model?: string;
   effort?: EffortLevel;
   /**
-   * Runtime-only preflight skips model-scoped execution/evidence checks.
-   * Use only for warm-up diagnostics before a concrete launch model is selected.
+   * Runtime-only readiness skips extra model execution probes.
+   * Use when a separate preflight or the real launch prompt is the authority.
    */
   runtimeOnly?: boolean;
+  /**
+   * Skip the adapter-level readiness bridge before launch.
+   * Use only when the launch bridge performs equivalent runtime/provider/MCP validation.
+   */
+  skipReadinessPreflight?: boolean;
   skipPermissions: boolean;
   expectedMembers: TeamRuntimeMemberSpec[];
   previousLaunchState: PersistedTeamLaunchSnapshot | null;
diff --git a/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts b/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
index 2789c37f..b7f973dc 100644
--- a/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
+++ b/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
@@ -1669,6 +1669,12 @@ export class BoardTaskLogStreamService {
     private readonly historicalBoardMcpRawProbe: HistoricalBoardMcpRawProbe = new HistoricalBoardMcpRawProbe()
   ) {}
 
+  private readConfigForObservation(teamName: string) {
+    return typeof this.configReader.getConfigSnapshot === 'function'
+      ? this.configReader.getConfigSnapshot(teamName)
+      : this.configReader.getConfig(teamName);
+  }
+
   private buildLayoutCacheKey(teamName: string, taskId: string): string {
     return `${teamName}::${taskId}`;
   }
@@ -2199,7 +2205,7 @@ export class BoardTaskLogStreamService {
         this.taskReader.getTasks(teamName).catch(() => []),
         this.taskReader.getDeletedTasks(teamName).catch(() => []),
         this.membersMetaStore.getMembers(teamName).catch(() => []),
-        this.configReader.getConfig(teamName).catch(() => null),
+        this.readConfigForObservation(teamName).catch(() => null),
       ]);
       const task = [...activeTasks, ...deletedTasks].find((candidate) => candidate.id === taskId);
       const ownerName = task?.owner?.trim();
diff --git a/src/main/services/team/taskLogs/stream/CodexNativeTaskLogStreamSource.ts b/src/main/services/team/taskLogs/stream/CodexNativeTaskLogStreamSource.ts
index 10148c5e..74a051df 100644
--- a/src/main/services/team/taskLogs/stream/CodexNativeTaskLogStreamSource.ts
+++ b/src/main/services/team/taskLogs/stream/CodexNativeTaskLogStreamSource.ts
@@ -54,6 +54,12 @@ export class CodexNativeTaskLogStreamSource {
     private readonly chunkBuilder: BoardTaskExactLogChunkBuilder = new BoardTaskExactLogChunkBuilder()
   ) {}
 
+  private readConfigForObservation(teamName: string) {
+    return typeof this.configReader.getConfigSnapshot === 'function'
+      ? this.configReader.getConfigSnapshot(teamName)
+      : this.configReader.getConfig(teamName);
+  }
+
   async getTaskLogStream(
     teamName: string,
     taskId: string,
@@ -163,7 +169,7 @@ export class CodexNativeTaskLogStreamSource {
     const normalizedOwner = normalizeMemberName(ownerName);
     const [metaMembers, config] = await Promise.all([
       this.membersMetaStore.getMembers(teamName).catch(() => []),
-      this.configReader.getConfig(teamName).catch(() => null),
+      this.readConfigForObservation(teamName).catch(() => null),
     ]);
     const member = [...metaMembers, ...(config?.members ?? [])].find(
       (candidate) => normalizeMemberName(candidate.name) === normalizedOwner
diff --git a/src/main/services/team/teamDataWorkerTypes.ts b/src/main/services/team/teamDataWorkerTypes.ts
index ca798cc3..3a33dd64 100644
--- a/src/main/services/team/teamDataWorkerTypes.ts
+++ b/src/main/services/team/teamDataWorkerTypes.ts
@@ -5,6 +5,7 @@
 import type {
   MemberLogSummary,
   MessagesPage,
+  TeamGetDataOptions,
   TeamMemberActivityMeta,
   TeamViewSnapshot,
 } from '@shared/types';
@@ -13,6 +14,7 @@ import type {
 
 export interface GetTeamDataPayload {
   teamName: string;
+  options?: TeamGetDataOptions;
 }
 
 export interface GetMessagesPagePayload {
@@ -38,18 +40,37 @@ export interface FindLogsForTaskPayload {
   };
 }
 
+export interface InvalidateTeamConfigPayload {
+  teamName: string;
+}
+
+export interface InvalidateTeamMessageFeedPayload {
+  teamName: string;
+}
+
+export interface TeamDataWorkerDiag {
+  op: TeamDataWorkerRequest['op'];
+  teamName?: string;
+  taskId?: string;
+  totalMs: number;
+}
+
 // ── Request / Response ──
 
 export type TeamDataWorkerRequest =
+  | { id: string; op: 'warmup'; payload?: Record<string, never> }
   | { id: string; op: 'getTeamData'; payload: GetTeamDataPayload }
   | { id: string; op: 'getMessagesPage'; payload: GetMessagesPagePayload }
   | { id: string; op: 'getMemberActivityMeta'; payload: GetMemberActivityMetaPayload }
-  | { id: string; op: 'findLogsForTask'; payload: FindLogsForTaskPayload };
+  | { id: string; op: 'findLogsForTask'; payload: FindLogsForTaskPayload }
+  | { id: string; op: 'invalidateTeamConfig'; payload: InvalidateTeamConfigPayload }
+  | { id: string; op: 'invalidateTeamMessageFeed'; payload: InvalidateTeamMessageFeedPayload };
 
 export type TeamDataWorkerResponse =
   | {
       id: string;
       ok: true;
-      result: TeamViewSnapshot | MessagesPage | TeamMemberActivityMeta | MemberLogSummary[];
+      result: TeamViewSnapshot | MessagesPage | TeamMemberActivityMeta | MemberLogSummary[] | null;
+      diag?: TeamDataWorkerDiag;
     }
   | { id: string; ok: false; error: string };
diff --git a/src/main/services/team/teamLogSourceWatchScope.ts b/src/main/services/team/teamLogSourceWatchScope.ts
new file mode 100644
index 00000000..4599d359
--- /dev/null
+++ b/src/main/services/team/teamLogSourceWatchScope.ts
@@ -0,0 +1,178 @@
+import * as path from 'path';
+
+import type { PersistedTeamLaunchMemberState, PersistedTeamLaunchSnapshot } from '@shared/types';
+
+export const BOARD_TASK_LOG_FRESHNESS_DIRNAME = '.board-task-log-freshness';
+export const BOARD_TASK_CHANGE_FRESHNESS_DIRNAME = '.board-task-change-freshness';
+export const BOARD_TASK_CHANGES_DIRNAME = '.board-task-changes';
+export const BOARD_TASK_LOG_FRESHNESS_FILE_SUFFIX = '.json';
+export const MAX_LOG_SOURCE_WATCH_SESSION_IDS = 24;
+export const MAX_PENDING_UNKNOWN_ROOT_SESSIONS = 16;
+export const PENDING_UNKNOWN_ROOT_SESSION_TTL_MS = 15_000;
+export const MAX_PENDING_UNKNOWN_ROOT_REFRESH_ATTEMPTS = 4;
+
+const SAFE_SESSION_ID_RE = /^[A-Za-z0-9_-]{1,200}$/;
+const AGENT_TRANSCRIPT_RE = /^agent-(?!acompact).*\.jsonl$/;
+
+export type WatcherEventName = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir';
+
+export type LogSourceWatcherAction =
+  | { kind: 'ignore' }
+  | { kind: 'task-freshness' }
+  | { kind: 'scoped-recompute' }
+  | { kind: 'context-refresh'; candidateSessionId?: string };
+
+export interface TeamLogWatchSessionInput {
+  configLeadSessionId?: unknown;
+  launchLeadSessionId?: unknown;
+  sessionHistory?: unknown[];
+  launchRuntimeSessionIds?: unknown[];
+  bootstrapRuntimeSessionIds?: unknown[];
+}
+
+export interface ClassifyLogSourceWatcherEventInput {
+  projectDir: string;
+  changedPath: string;
+  eventName: WatcherEventName;
+  scopedSessionIds: ReadonlySet<string>;
+  pendingUnknownSessionIds: ReadonlySet<string>;
+}
+
+export function normalizeLogSourceSessionId(value: unknown): string | null {
+  if (typeof value !== 'string') {
+    return null;
+  }
+  const trimmed = value.trim();
+  if (!trimmed || !SAFE_SESSION_ID_RE.test(trimmed)) {
+    return null;
+  }
+  return trimmed;
+}
+
+function pushSessionId(ids: string[], seen: Set<string>, value: unknown, limit: number): void {
+  if (ids.length >= limit) {
+    return;
+  }
+  const normalized = normalizeLogSourceSessionId(value);
+  if (!normalized || seen.has(normalized)) {
+    return;
+  }
+  seen.add(normalized);
+  ids.push(normalized);
+}
+
+function shouldIncludeRuntimeMember(member: PersistedTeamLaunchMemberState): boolean {
+  return Boolean(
+    member.runtimeSessionId &&
+    !member.hardFailure &&
+    member.launchState !== 'skipped_for_launch' &&
+    member.launchState !== 'failed_to_start'
+  );
+}
+
+export function extractRuntimeSessionIds(
+  snapshot: PersistedTeamLaunchSnapshot | null | undefined
+): string[] {
+  if (!snapshot?.members) {
+    return [];
+  }
+
+  const ids: string[] = [];
+  const seen = new Set<string>();
+  for (const member of Object.values(snapshot.members)) {
+    if (!shouldIncludeRuntimeMember(member)) {
+      continue;
+    }
+    pushSessionId(ids, seen, member.runtimeSessionId, MAX_LOG_SOURCE_WATCH_SESSION_IDS);
+  }
+  return ids;
+}
+
+export function buildTeamLogWatchSessionIds(
+  input: TeamLogWatchSessionInput,
+  limit = MAX_LOG_SOURCE_WATCH_SESSION_IDS
+): string[] {
+  const ids: string[] = [];
+  const seen = new Set<string>();
+
+  pushSessionId(ids, seen, input.configLeadSessionId, limit);
+  pushSessionId(ids, seen, input.launchLeadSessionId, limit);
+
+  for (const sessionId of input.launchRuntimeSessionIds ?? []) {
+    pushSessionId(ids, seen, sessionId, limit);
+  }
+  for (const sessionId of input.bootstrapRuntimeSessionIds ?? []) {
+    pushSessionId(ids, seen, sessionId, limit);
+  }
+
+  const history = Array.isArray(input.sessionHistory) ? input.sessionHistory : [];
+  for (let index = history.length - 1; index >= 0; index -= 1) {
+    pushSessionId(ids, seen, history[index], limit);
+  }
+
+  return ids;
+}
+
+export function isAgentTranscriptFileName(fileName: string): boolean {
+  return AGENT_TRANSCRIPT_RE.test(fileName);
+}
+
+export function getRelativeLogSourceParts(projectDir: string, targetPath: string): string[] | null {
+  const relativePath = path.relative(projectDir, targetPath);
+  if (!relativePath || relativePath.startsWith('..') || path.isAbsolute(relativePath)) {
+    return null;
+  }
+  return relativePath.split(/[/\\]+/).filter(Boolean);
+}
+
+export function classifyLogSourceWatcherEvent(
+  input: ClassifyLogSourceWatcherEventInput
+): LogSourceWatcherAction {
+  const parts = getRelativeLogSourceParts(input.projectDir, input.changedPath);
+  if (!parts) {
+    return { kind: 'ignore' };
+  }
+
+  const first = parts[0];
+  if (first === BOARD_TASK_LOG_FRESHNESS_DIRNAME || first === BOARD_TASK_CHANGE_FRESHNESS_DIRNAME) {
+    return { kind: 'task-freshness' };
+  }
+
+  if (
+    first === BOARD_TASK_CHANGES_DIRNAME ||
+    parts.includes('tool-results') ||
+    parts.includes('memory')
+  ) {
+    return { kind: 'ignore' };
+  }
+
+  if (parts.length === 1 && first.endsWith('.jsonl')) {
+    const sessionId = normalizeLogSourceSessionId(first.slice(0, -'.jsonl'.length));
+    if (!sessionId) {
+      return { kind: 'ignore' };
+    }
+    if (input.scopedSessionIds.has(sessionId)) {
+      return { kind: 'scoped-recompute' };
+    }
+    if (input.eventName === 'add' || input.pendingUnknownSessionIds.has(sessionId)) {
+      return { kind: 'context-refresh', candidateSessionId: sessionId };
+    }
+    return { kind: 'ignore' };
+  }
+
+  if (input.scopedSessionIds.has(first)) {
+    if (parts.length === 1) {
+      return { kind: 'scoped-recompute' };
+    }
+    if (parts[1] === 'subagents') {
+      if (parts.length === 2) {
+        return { kind: 'context-refresh' };
+      }
+      if (parts.length === 3 && isAgentTranscriptFileName(parts[2])) {
+        return { kind: 'scoped-recompute' };
+      }
+    }
+  }
+
+  return { kind: 'ignore' };
+}
diff --git a/src/main/utils/teamNotificationBuilder.ts b/src/main/utils/teamNotificationBuilder.ts
index 40b5e810..ba44f842 100644
--- a/src/main/utils/teamNotificationBuilder.ts
+++ b/src/main/utils/teamNotificationBuilder.ts
@@ -10,7 +10,7 @@ import { randomUUID } from 'crypto';
 
 import type { DetectedError } from '../services/error/ErrorMessageBuilder';
 import type { TriggerColor } from '@shared/constants/triggerColors';
-import type { TeamEventType } from '@shared/types/notifications';
+import type { NotificationTarget, TeamEventType } from '@shared/types/notifications';
 
 // Re-export for callers that import TeamEventType from this module
 export type { TeamEventType } from '@shared/types/notifications';
@@ -29,10 +29,18 @@ export interface TeamNotificationPayload {
   teamDisplayName: string;
   from: string;
   to?: string;
+  /** Optional team roster for resolving the same participant avatar shown in the UI. */
+  members?: readonly {
+    name: string;
+    removedAt?: number | string | null;
+    agentType?: string;
+  }[];
   summary: string;
   body: string;
   /** Stable key for storage deduplication. REQUIRED — no fallback to Date.now(). */
   dedupeKey: string;
+  /** Structured destination used by notification click handling. */
+  target?: NotificationTarget;
   projectPath?: string;
   /**
    * When true, the notification is stored in-app but no native OS toast is shown.
@@ -53,17 +61,21 @@ interface TeamNotificationConfig {
 
 const TEAM_NOTIFICATION_CONFIG: Record<TeamEventType, TeamNotificationConfig> = {
   rate_limit: { triggerName: 'Rate Limit', triggerColor: 'red' },
+  api_error: { triggerName: 'API Error', triggerColor: 'red' },
   lead_inbox: { triggerName: 'Team Inbox', triggerColor: 'blue' },
   user_inbox: { triggerName: 'User Inbox', triggerColor: 'green' },
   task_clarification: { triggerName: 'Clarification', triggerColor: 'orange' },
   task_status_change: { triggerName: 'Status Change', triggerColor: 'purple' },
   task_comment: { triggerName: 'Task Comment', triggerColor: 'cyan' },
+  task_review_requested: { triggerName: 'Review Requested', triggerColor: 'orange' },
+  task_blocked: { triggerName: 'Task Blocked', triggerColor: 'red' },
   task_created: { triggerName: 'Task Created', triggerColor: 'green' },
   all_tasks_completed: { triggerName: 'All Done', triggerColor: 'green' },
   cross_team_message: { triggerName: 'Cross-Team', triggerColor: 'cyan' },
   schedule_completed: { triggerName: 'Schedule Done', triggerColor: 'green' },
   schedule_failed: { triggerName: 'Schedule Failed', triggerColor: 'red' },
   team_launched: { triggerName: 'Team Launched', triggerColor: 'green' },
+  team_launch_incomplete: { triggerName: 'Launch Incomplete', triggerColor: 'orange' },
 };
 
 // =============================================================================
@@ -76,6 +88,9 @@ const TEAM_NOTIFICATION_CONFIG: Record<TeamEventType, TeamNotificationConfig> =
  */
 export function buildDetectedErrorFromTeam(payload: TeamNotificationPayload): DetectedError {
   const config = TEAM_NOTIFICATION_CONFIG[payload.teamEventType];
+  const summary = stripAgentBlocks(payload.summary).replace(/\s+/g, ' ').trim();
+  const body = stripAgentBlocks(payload.body).replace(/\s+/g, ' ').trim();
+  const preview = summary && body ? `${summary}: ${body}` : summary || body;
 
   return {
     id: randomUUID(),
@@ -84,9 +99,10 @@ export function buildDetectedErrorFromTeam(payload: TeamNotificationPayload): De
     projectId: payload.teamName,
     filePath: '',
     source: payload.teamEventType,
-    message: `[${payload.from}] ${stripAgentBlocks(payload.body).trim().slice(0, 300)}`,
+    message: `[${payload.from}] ${preview.slice(0, 300)}`,
     category: 'team',
     teamEventType: payload.teamEventType,
+    target: payload.target,
     dedupeKey: payload.dedupeKey,
     triggerColor: config.triggerColor,
     triggerName: config.triggerName,
diff --git a/src/main/workers/team-data-worker.ts b/src/main/workers/team-data-worker.ts
index 871eba11..ea4d9f58 100644
--- a/src/main/workers/team-data-worker.ts
+++ b/src/main/workers/team-data-worker.ts
@@ -8,6 +8,7 @@
 
 import { parentPort } from 'node:worker_threads';
 
+import { TeamConfigReader } from '@main/services/team/TeamConfigReader';
 import { TeamDataService } from '@main/services/team/TeamDataService';
 import { TeamMemberLogsFinder } from '@main/services/team/TeamMemberLogsFinder';
 import { createLogger } from '@shared/utils/logger';
@@ -35,11 +36,22 @@ function respond(msg: TeamDataWorkerResponse): void {
 }
 
 parentPort?.on('message', async (msg: TeamDataWorkerRequest) => {
+  const startedAt = Date.now();
+  const buildDiag = (): NonNullable<Extract<TeamDataWorkerResponse, { ok: true }>['diag']> => ({
+    op: msg.op,
+    ...(msg.payload && 'teamName' in msg.payload ? { teamName: msg.payload.teamName } : {}),
+    ...(msg.payload && 'taskId' in msg.payload ? { taskId: msg.payload.taskId } : {}),
+    totalMs: Date.now() - startedAt,
+  });
   try {
     switch (msg.op) {
+      case 'warmup': {
+        respond({ id: msg.id, ok: true, result: null, diag: buildDiag() });
+        break;
+      }
       case 'getTeamData': {
-        const result = await teamDataService.getTeamData(msg.payload.teamName);
-        respond({ id: msg.id, ok: true, result });
+        const result = await teamDataService.getTeamData(msg.payload.teamName, msg.payload.options);
+        respond({ id: msg.id, ok: true, result, diag: buildDiag() });
         break;
       }
       case 'getMessagesPage': {
@@ -47,12 +59,23 @@ parentPort?.on('message', async (msg: TeamDataWorkerRequest) => {
           msg.payload.teamName,
           msg.payload.options
         );
-        respond({ id: msg.id, ok: true, result });
+        respond({ id: msg.id, ok: true, result, diag: buildDiag() });
         break;
       }
       case 'getMemberActivityMeta': {
         const result = await teamDataService.getMemberActivityMeta(msg.payload.teamName);
-        respond({ id: msg.id, ok: true, result });
+        respond({ id: msg.id, ok: true, result, diag: buildDiag() });
+        break;
+      }
+      case 'invalidateTeamConfig': {
+        TeamConfigReader.invalidateTeam(msg.payload.teamName);
+        teamDataService.invalidateMessageFeed(msg.payload.teamName);
+        respond({ id: msg.id, ok: true, result: null, diag: buildDiag() });
+        break;
+      }
+      case 'invalidateTeamMessageFeed': {
+        teamDataService.invalidateMessageFeed(msg.payload.teamName);
+        respond({ id: msg.id, ok: true, result: null, diag: buildDiag() });
         break;
       }
       case 'findLogsForTask': {
@@ -89,7 +112,7 @@ parentPort?.on('message', async (msg: TeamDataWorkerRequest) => {
           logsInFlight.set(cacheKey, promise);
         }
         const result = await promise;
-        respond({ id: msg.id, ok: true, result });
+        respond({ id: msg.id, ok: true, result, diag: buildDiag() });
         break;
       }
       default: {
diff --git a/src/main/workers/team-fs-worker.ts b/src/main/workers/team-fs-worker.ts
index 96f41db0..d3afb416 100644
--- a/src/main/workers/team-fs-worker.ts
+++ b/src/main/workers/team-fs-worker.ts
@@ -33,6 +33,7 @@ interface GetAllTasksPayload {
 }
 
 type WorkerRequest =
+  | { id: string; op: 'warmup'; payload?: Record<string, never> }
   | { id: string; op: 'listTeams'; payload: ListTeamsPayload }
   | { id: string; op: 'getAllTasks'; payload: GetAllTasksPayload };
 
@@ -75,6 +76,10 @@ interface ListTeamsDiag {
   skipped: number;
   skipReasons: Record<string, number>;
   slowest: SlowEntry[];
+  cacheHits: number;
+  cacheMisses: number;
+  cacheWriteSkips: number;
+  cacheEvictions: number;
   totalMs: number;
 }
 
@@ -87,12 +92,19 @@ interface GetAllTasksDiag {
   skipped: number;
   skipReasons: Record<string, number>;
   slowestTeams: SlowEntry[];
+  cacheHits: number;
+  cacheMisses: number;
+  cacheWriteSkips: number;
+  cacheEvictions: number;
   totalMs: number;
 }
 
 interface TaskReadDiag {
   skipped: number;
   skipReasons: Record<string, number>;
+  cacheHits: number;
+  cacheMisses: number;
+  cacheWriteSkips: number;
 }
 
 const MAX_LAUNCH_STATE_BYTES = 32 * 1024;
@@ -104,6 +116,60 @@ const REVIEW_LIFECYCLE_EVENTS = new Set([
   'review_started',
 ]);
 const REVIEW_RESET_STATUSES = new Set(['in_progress', 'deleted']);
+const TEAM_SUMMARY_CACHE_MAX_ENTRIES = 1000;
+const TASK_FILE_CACHE_MAX_ENTRIES = 10000;
+const BOOTSTRAP_STATE_FILE = 'bootstrap-state.json';
+const BOOTSTRAP_JOURNAL_FILE = 'bootstrap-journal.jsonl';
+
+interface PathFingerprint {
+  exists: boolean;
+  isFile?: boolean;
+  isDirectory?: boolean;
+  highResolution?: boolean;
+  size?: string;
+  mode?: string;
+  dev?: string;
+  ino?: string;
+  mtimeNs?: string;
+  ctimeNs?: string;
+  birthtimeNs?: string;
+  mtimeMs?: number;
+  ctimeMs?: number;
+  birthtimeMs?: number;
+  errorCode?: string;
+}
+
+interface TeamSummaryCacheEntry {
+  fingerprint: string;
+  summary: Record<string, unknown>;
+  teamsDir: string;
+  optionKey: string;
+  lastUsedAt: number;
+}
+
+type CachedTaskReadResult =
+  | { task: Record<string, unknown>; skipReason?: never }
+  | { task?: never; skipReason: string };
+
+interface TaskFileCacheEntry {
+  fingerprint: string;
+  result: CachedTaskReadResult;
+  tasksBase: string;
+  lastUsedAt: number;
+}
+
+const teamSummaryCache = new Map<string, TeamSummaryCacheEntry>();
+const taskFileCache = new Map<string, TaskFileCacheEntry>();
+
+interface TeamSummaryDependencyFingerprint {
+  value: string;
+  cacheSafe: boolean;
+}
+
+interface LaunchStateSummaryRead {
+  summary: ReturnType<typeof choosePreferredLaunchStateSummary> | null;
+  cacheable: boolean;
+}
 
 // ---------------------------------------------------------------------------
 // Parsed JSON types (loose shapes from disk)
@@ -272,6 +338,319 @@ function pushSlowest(list: SlowEntry[], entry: SlowEntry, maxLen: number): void
   if (list.length > maxLen) list.length = maxLen;
 }
 
+function cloneCached<T>(value: T): T {
+  return typeof structuredClone === 'function'
+    ? structuredClone(value)
+    : (JSON.parse(JSON.stringify(value)) as T);
+}
+
+async function statPathFingerprint(filePath: string): Promise<PathFingerprint> {
+  try {
+    const stat = await fs.promises.stat(filePath, { bigint: true });
+    const mtimeNs =
+      typeof (stat as fs.BigIntStats & { mtimeNs?: bigint }).mtimeNs === 'bigint'
+        ? (stat as fs.BigIntStats & { mtimeNs: bigint }).mtimeNs
+        : undefined;
+    const ctimeNs =
+      typeof (stat as fs.BigIntStats & { ctimeNs?: bigint }).ctimeNs === 'bigint'
+        ? (stat as fs.BigIntStats & { ctimeNs: bigint }).ctimeNs
+        : undefined;
+    const birthtimeNs =
+      typeof (stat as fs.BigIntStats & { birthtimeNs?: bigint }).birthtimeNs === 'bigint'
+        ? (stat as fs.BigIntStats & { birthtimeNs: bigint }).birthtimeNs
+        : undefined;
+    return {
+      exists: true,
+      isFile: stat.isFile(),
+      isDirectory: stat.isDirectory(),
+      highResolution: typeof mtimeNs === 'bigint' && typeof ctimeNs === 'bigint',
+      size: stat.size.toString(),
+      mode: stat.mode.toString(),
+      dev: stat.dev.toString(),
+      ino: stat.ino.toString(),
+      mtimeNs: mtimeNs?.toString(),
+      ctimeNs: ctimeNs?.toString(),
+      birthtimeNs: birthtimeNs?.toString(),
+      mtimeMs: Number(stat.mtimeMs),
+      ctimeMs: Number(stat.ctimeMs),
+      birthtimeMs: Number(stat.birthtimeMs),
+    };
+  } catch (error) {
+    return {
+      exists: false,
+      errorCode:
+        typeof (error as NodeJS.ErrnoException | undefined)?.code === 'string'
+          ? (error as NodeJS.ErrnoException).code
+          : undefined,
+    };
+  }
+}
+
+function fingerprintToString(value: unknown): string {
+  return JSON.stringify(value);
+}
+
+function isCacheSafeFingerprint(fingerprint: PathFingerprint): boolean {
+  if (fingerprint.exists) {
+    return fingerprint.highResolution === true;
+  }
+  return fingerprint.errorCode === 'ENOENT' || fingerprint.errorCode === 'ENOTDIR';
+}
+
+function makeTeamSummaryOptionKey(payload: ListTeamsPayload): string {
+  return fingerprintToString({
+    largeConfigBytes: payload.largeConfigBytes,
+    configHeadBytes: payload.configHeadBytes,
+    maxConfigBytes: payload.maxConfigBytes,
+    maxConfigReadMs: payload.maxConfigReadMs,
+    maxMembersMetaBytes: payload.maxMembersMetaBytes,
+    maxSessionHistoryInSummary: payload.maxSessionHistoryInSummary,
+    maxProjectPathHistoryInSummary: payload.maxProjectPathHistoryInSummary,
+  });
+}
+
+function makeTeamSummaryCacheKey(teamsDir: string, teamName: string, optionKey: string): string {
+  return `${teamsDir}\0${teamName}\0${optionKey}`;
+}
+
+function canCacheTeamSummary(summary: Record<string, unknown>): boolean {
+  if (summary.teamLaunchState === 'partial_pending') {
+    return false;
+  }
+  const pendingKeys = [
+    'pendingCount',
+    'runtimeAlivePendingCount',
+    'shellOnlyPendingCount',
+    'runtimeProcessPendingCount',
+    'runtimeCandidatePendingCount',
+    'noRuntimePendingCount',
+    'permissionPendingCount',
+  ];
+  return pendingKeys.every((key) => {
+    const value = summary[key];
+    return typeof value !== 'number' || value <= 0;
+  });
+}
+
+async function readInboxNamesFingerprint(inboxDir: string): Promise<{
+  dir: PathFingerprint;
+  names: string[];
+  cacheSafe: boolean;
+}> {
+  const dir = await statPathFingerprint(inboxDir);
+  if (!dir.exists || !dir.isDirectory) {
+    return { dir, names: [], cacheSafe: isCacheSafeFingerprint(dir) };
+  }
+  try {
+    const entries = await fs.promises.readdir(inboxDir, { withFileTypes: true });
+    const names = entries
+      .filter((entry) => entry.isFile() && entry.name.endsWith('.json'))
+      .map((entry) => entry.name)
+      .sort();
+    return { dir, names, cacheSafe: isCacheSafeFingerprint(dir) };
+  } catch (error) {
+    return {
+      dir: {
+        ...dir,
+        errorCode:
+          typeof (error as NodeJS.ErrnoException | undefined)?.code === 'string'
+            ? (error as NodeJS.ErrnoException).code
+            : 'READDIR_FAILED',
+      },
+      names: [],
+      cacheSafe: false,
+    };
+  }
+}
+
+async function buildTeamSummaryFingerprint(
+  teamsDir: string,
+  teamName: string,
+  optionKey: string
+): Promise<TeamSummaryDependencyFingerprint> {
+  const teamDir = path.join(teamsDir, teamName);
+  const [
+    config,
+    teamMeta,
+    membersMeta,
+    launchState,
+    launchSummary,
+    bootstrapState,
+    bootstrapJournal,
+  ] = await Promise.all([
+    statPathFingerprint(path.join(teamDir, 'config.json')),
+    statPathFingerprint(path.join(teamDir, 'team.meta.json')),
+    statPathFingerprint(path.join(teamDir, 'members.meta.json')),
+    statPathFingerprint(path.join(teamDir, TEAM_LAUNCH_STATE_FILE)),
+    statPathFingerprint(path.join(teamDir, TEAM_LAUNCH_SUMMARY_FILE)),
+    statPathFingerprint(path.join(teamDir, BOOTSTRAP_STATE_FILE)),
+    statPathFingerprint(path.join(teamDir, BOOTSTRAP_JOURNAL_FILE)),
+  ]);
+  const inbox = await readInboxNamesFingerprint(path.join(teamDir, 'inboxes'));
+
+  const dependencyFingerprint = {
+    version: 1,
+    optionKey,
+    config,
+    teamMeta,
+    membersMeta,
+    launchState,
+    launchSummary,
+    bootstrapState,
+    bootstrapJournal,
+    inbox,
+  };
+
+  return {
+    value: fingerprintToString(dependencyFingerprint),
+    cacheSafe:
+      [
+        config,
+        teamMeta,
+        membersMeta,
+        launchState,
+        launchSummary,
+        bootstrapState,
+        bootstrapJournal,
+      ].every(isCacheSafeFingerprint) && inbox.cacheSafe,
+  };
+}
+
+async function cacheTeamSummaryIfStable(
+  cacheKey: string,
+  teamsDir: string,
+  teamName: string,
+  optionKey: string,
+  fingerprintBefore: TeamSummaryDependencyFingerprint,
+  summary: Record<string, unknown>,
+  cacheAllowed: boolean,
+  diag: ListTeamsDiag
+): Promise<void> {
+  if (!cacheAllowed) {
+    teamSummaryCache.delete(cacheKey);
+    diag.cacheWriteSkips++;
+    return;
+  }
+  if (!canCacheTeamSummary(summary)) {
+    teamSummaryCache.delete(cacheKey);
+    diag.cacheWriteSkips++;
+    return;
+  }
+  if (!fingerprintBefore.cacheSafe) {
+    diag.cacheWriteSkips++;
+    return;
+  }
+  const fingerprintAfter = await buildTeamSummaryFingerprint(teamsDir, teamName, optionKey);
+  if (!fingerprintAfter.cacheSafe || fingerprintAfter.value !== fingerprintBefore.value) {
+    diag.cacheWriteSkips++;
+    return;
+  }
+  teamSummaryCache.set(cacheKey, {
+    fingerprint: fingerprintAfter.value,
+    summary: cloneCached(summary),
+    teamsDir,
+    optionKey,
+    lastUsedAt: nowMs(),
+  });
+}
+
+function pruneTeamSummaryCache(
+  teamsDir: string,
+  optionKey: string,
+  liveTeamNames: ReadonlySet<string>,
+  diag: ListTeamsDiag
+): void {
+  for (const [key, entry] of teamSummaryCache) {
+    if (entry.teamsDir === teamsDir && entry.optionKey === optionKey) {
+      const teamName = key.split('\0')[1] ?? '';
+      if (!liveTeamNames.has(teamName)) {
+        teamSummaryCache.delete(key);
+        diag.cacheEvictions++;
+      }
+    }
+  }
+  while (teamSummaryCache.size > TEAM_SUMMARY_CACHE_MAX_ENTRIES) {
+    const oldest = teamSummaryCache.keys().next().value;
+    if (typeof oldest !== 'string') break;
+    teamSummaryCache.delete(oldest);
+    diag.cacheEvictions++;
+  }
+}
+
+function makeTaskOptionKey(payload: GetAllTasksPayload): string {
+  return fingerprintToString({
+    maxTaskBytes: payload.maxTaskBytes,
+    maxTaskReadMs: payload.maxTaskReadMs,
+  });
+}
+
+function makeTaskCacheKey(
+  tasksBase: string,
+  teamName: string,
+  fileName: string,
+  optionKey: string
+): string {
+  return `${tasksBase}\0${teamName}\0${fileName}\0${optionKey}`;
+}
+
+async function cacheTaskReadResultIfStable(
+  cacheKey: string,
+  taskPath: string,
+  tasksBase: string,
+  fingerprintBefore: string,
+  fingerprintBeforeCacheSafe: boolean,
+  result: CachedTaskReadResult,
+  taskDiag: TaskReadDiag
+): Promise<void> {
+  if (!fingerprintBeforeCacheSafe) {
+    taskDiag.cacheWriteSkips++;
+    return;
+  }
+  const after = await statPathFingerprint(taskPath);
+  if (!isCacheSafeFingerprint(after) || fingerprintToString(after) !== fingerprintBefore) {
+    taskDiag.cacheWriteSkips++;
+    return;
+  }
+  taskFileCache.set(cacheKey, {
+    fingerprint: fingerprintBefore,
+    result: cloneCached(result),
+    tasksBase,
+    lastUsedAt: nowMs(),
+  });
+}
+
+function applyCachedTaskReadResult(
+  cached: CachedTaskReadResult,
+  tasks: unknown[],
+  taskDiag: TaskReadDiag
+): void {
+  if (cached.skipReason) {
+    taskDiag.skipped++;
+    bumpSkipReason(taskDiag.skipReasons, cached.skipReason);
+    return;
+  }
+  tasks.push(cloneCached(cached.task));
+}
+
+function pruneTaskFileCache(
+  tasksBase: string,
+  liveCacheKeys: ReadonlySet<string>,
+  diag: GetAllTasksDiag
+): void {
+  for (const [key, entry] of taskFileCache) {
+    if (entry.tasksBase === tasksBase && !liveCacheKeys.has(key)) {
+      taskFileCache.delete(key);
+      diag.cacheEvictions++;
+    }
+  }
+  while (taskFileCache.size > TASK_FILE_CACHE_MAX_ENTRIES) {
+    const oldest = taskFileCache.keys().next().value;
+    if (typeof oldest !== 'string') break;
+    taskFileCache.delete(oldest);
+    diag.cacheEvictions++;
+  }
+}
+
 // ---------------------------------------------------------------------------
 // listTeams
 // ---------------------------------------------------------------------------
@@ -340,7 +719,7 @@ function dropCliProvisionerMembers(
 async function readLaunchState(
   teamsDir: string,
   teamName: string
-): Promise<ReturnType<typeof choosePreferredLaunchStateSummary>> {
+): Promise<LaunchStateSummaryRead> {
   const bootstrapSnapshot = await readBootstrapLaunchSnapshot(teamName);
   const launchStatePath = path.join(teamsDir, teamName, TEAM_LAUNCH_STATE_FILE);
   const launchSummaryPath = path.join(teamsDir, teamName, TEAM_LAUNCH_SUMMARY_FILE);
@@ -371,11 +750,24 @@ async function readLaunchState(
     })(),
   ]);
 
-  return choosePreferredLaunchStateSummary({
+  const summary = choosePreferredLaunchStateSummary({
     bootstrapSnapshot,
     launchSnapshot,
     launchSummaryProjection,
   });
+  if (launchSnapshot) {
+    return { summary, cacheable: true };
+  }
+  if (!bootstrapSnapshot) {
+    return { summary, cacheable: true };
+  }
+  if (
+    bootstrapSnapshot.launchPhase === 'finished' &&
+    bootstrapSnapshot.teamLaunchState !== 'partial_pending'
+  ) {
+    return { summary, cacheable: true };
+  }
+  return { summary, cacheable: false };
 }
 
 /**
@@ -384,13 +776,14 @@ async function readLaunchState(
  */
 async function readDraftTeamMeta(
   teamsDir: string,
-  teamName: string
+  teamName: string,
+  options: { maxConfigReadMs: number; maxMembersMetaBytes: number }
 ): Promise<Record<string, unknown> | null> {
   const metaPath = path.join(teamsDir, teamName, 'team.meta.json');
   try {
     const stat = await fs.promises.stat(metaPath);
     if (!stat.isFile() || stat.size > 256 * 1024) return null;
-    const raw = await fs.promises.readFile(metaPath, 'utf8');
+    const raw = await readFileUtf8WithTimeout(metaPath, options.maxConfigReadMs);
     const meta = JSON.parse(raw) as Record<string, unknown>;
     if (meta?.version !== 1 || typeof meta?.cwd !== 'string') return null;
 
@@ -401,14 +794,29 @@ async function readDraftTeamMeta(
 
     // Read members.meta.json for member count
     let memberCount = 0;
+    let leadName: string | undefined;
+    let leadColor: string | undefined;
     try {
       const membersPath = path.join(teamsDir, teamName, 'members.meta.json');
-      const membersRaw = await fs.promises.readFile(membersPath, 'utf8');
+      const membersStat = await fs.promises.stat(membersPath);
+      if (!membersStat.isFile() || membersStat.size > options.maxMembersMetaBytes) {
+        throw new Error('members_meta_too_large');
+      }
+      const membersRaw = await readFileUtf8WithTimeout(membersPath, options.maxConfigReadMs);
       const membersData = JSON.parse(membersRaw) as { members?: unknown[] };
       if (Array.isArray(membersData?.members)) {
         memberCount = membersData.members.filter((member) => {
           if (!isRawMember(member)) return false;
           const name = typeof member.name === 'string' ? member.name.trim() : '';
+          if (!member.removedAt && isLeadMember(member)) {
+            if (name) {
+              leadName = name;
+            }
+            const color = typeof member.color === 'string' ? member.color.trim() : '';
+            if (color) {
+              leadColor = color;
+            }
+          }
           if (!name || name === 'user' || isLeadMember(member)) return false;
           return !member.removedAt;
         }).length;
@@ -426,6 +834,8 @@ async function readDraftTeamMeta(
       lastActivity:
         typeof meta.createdAt === 'number' ? new Date(meta.createdAt).toISOString() : null,
       color: typeof meta.color === 'string' ? meta.color : undefined,
+      ...(leadName ? { leadName } : {}),
+      ...(leadColor ? { leadColor } : {}),
       projectPath: typeof meta.cwd === 'string' ? meta.cwd : undefined,
       pendingCreate: true,
     };
@@ -447,6 +857,10 @@ async function listTeams(
     skipped: 0,
     skipReasons: {},
     slowest: [],
+    cacheHits: 0,
+    cacheMisses: 0,
+    cacheWriteSkips: 0,
+    cacheEvictions: 0,
     totalMs: 0,
   };
 
@@ -460,11 +874,26 @@ async function listTeams(
 
   const teamDirs = entries.filter((e) => e.isDirectory());
   diag.totalDirs = teamDirs.length;
+  const optionKey = makeTeamSummaryOptionKey(payload);
+  const liveTeamNames = new Set(teamDirs.map((entry) => entry.name));
 
   const perTeam = await mapLimit(teamDirs, payload.concurrency, async (entry) => {
     const teamName = entry.name;
     const t0 = nowMs();
     const configPath = path.join(payload.teamsDir, teamName, 'config.json');
+    const cacheKey = makeTeamSummaryCacheKey(payload.teamsDir, teamName, optionKey);
+    const dependencyFingerprint = await buildTeamSummaryFingerprint(
+      payload.teamsDir,
+      teamName,
+      optionKey
+    );
+    const cached = teamSummaryCache.get(cacheKey);
+    if (dependencyFingerprint.cacheSafe && cached?.fingerprint === dependencyFingerprint.value) {
+      cached.lastUsedAt = nowMs();
+      diag.cacheHits++;
+      return cloneCached(cached.summary);
+    }
+    diag.cacheMisses++;
 
     const skip = (reason: string): null => {
       diag.skipped++;
@@ -477,13 +906,37 @@ async function listTeams(
       stat = await fs.promises.stat(configPath);
     } catch {
       // Fallback: check for draft team (team.meta.json without config.json)
-      const draft = await readDraftTeamMeta(payload.teamsDir, teamName);
-      if (draft) return draft;
+      const draft = await readDraftTeamMeta(payload.teamsDir, teamName, payload);
+      if (draft) {
+        await cacheTeamSummaryIfStable(
+          cacheKey,
+          payload.teamsDir,
+          teamName,
+          optionKey,
+          dependencyFingerprint,
+          draft,
+          true,
+          diag
+        );
+        return draft;
+      }
       return skip('config_stat_failed');
     }
     if (!stat.isFile()) {
-      const draft = await readDraftTeamMeta(payload.teamsDir, teamName);
-      if (draft) return draft;
+      const draft = await readDraftTeamMeta(payload.teamsDir, teamName, payload);
+      if (draft) {
+        await cacheTeamSummaryIfStable(
+          cacheKey,
+          payload.teamsDir,
+          teamName,
+          optionKey,
+          dependencyFingerprint,
+          draft,
+          true,
+          diag
+        );
+        return draft;
+      }
       return skip('config_not_file');
     }
     if (stat.size > payload.maxConfigBytes) return skip('config_too_large');
@@ -557,6 +1010,21 @@ async function listTeams(
       removedAt?: unknown;
     }[] = [];
     let leadProviderId: 'anthropic' | 'codex' | 'gemini' | 'opencode' | undefined;
+    let leadName: string | undefined;
+    let leadColor: string | undefined;
+
+    const captureLeadMember = (member: RawMember, overwrite = false): void => {
+      if (member.removedAt) return;
+      if (!isLeadMember(member)) return;
+      const name = typeof member.name === 'string' ? member.name.trim() : '';
+      if (name && (overwrite || !leadName)) {
+        leadName = name;
+      }
+      const colorValue = typeof member.color === 'string' ? member.color.trim() : '';
+      if (colorValue && (overwrite || !leadColor)) {
+        leadColor = colorValue;
+      }
+    };
 
     try {
       const teamMetaPath = path.join(payload.teamsDir, teamName, 'team.meta.json');
@@ -595,6 +1063,7 @@ async function listTeams(
               : undefined;
           const name = typeof member.name === 'string' ? member.name.trim() : '';
           if (!name) continue;
+          captureLeadMember(member);
           if (isLeadMember(member)) continue;
           const key = name.toLowerCase();
           if (member.removedAt) {
@@ -623,6 +1092,7 @@ async function listTeams(
       for (const member of config.members as unknown[]) {
         if (isRawMember(member)) {
           const name = typeof member.name === 'string' ? member.name.trim() : '';
+          captureLeadMember(member, true);
           if (name && name !== 'user' && !isLeadMember(member)) {
             confirmedArtifactNames.add(name);
           }
@@ -657,32 +1127,28 @@ async function listTeams(
       leadProviderId,
       members: metaRuntimeMembers,
     });
-    const launchStateSummary =
-      (await readLaunchState(payload.teamsDir, teamName)) ??
-      (() => {
-        if (suppressLegacyLaunchArtifactHeuristic) {
-          return null;
-        }
-        if (
-          !leadSessionId ||
-          expectedTeammateNames.size === 0 ||
-          confirmedArtifactNames.size === 0
-        ) {
-          return null;
-        }
-        const missingMembers = Array.from(expectedTeammateNames).filter(
-          (name) => !confirmedArtifactNames.has(name)
-        );
-        if (missingMembers.length === 0) {
-          return null;
-        }
-        return {
-          partialLaunchFailure: true as const,
-          expectedMemberCount: expectedTeammateNames.size,
-          confirmedMemberCount: confirmedArtifactNames.size,
-          missingMembers,
-        };
-      })();
+    const launchStateRead = await readLaunchState(payload.teamsDir, teamName);
+    const fallbackLaunchStateSummary = (): ReturnType<typeof choosePreferredLaunchStateSummary> => {
+      if (suppressLegacyLaunchArtifactHeuristic) {
+        return null;
+      }
+      if (!leadSessionId || expectedTeammateNames.size === 0 || confirmedArtifactNames.size === 0) {
+        return null;
+      }
+      const missingMembers = Array.from(expectedTeammateNames).filter(
+        (name) => !confirmedArtifactNames.has(name)
+      );
+      if (missingMembers.length === 0) {
+        return null;
+      }
+      return {
+        partialLaunchFailure: true as const,
+        expectedMemberCount: expectedTeammateNames.size,
+        confirmedMemberCount: confirmedArtifactNames.size,
+        missingMembers,
+      };
+    };
+    const launchStateSummary = launchStateRead.summary ?? fallbackLaunchStateSummary();
     const summary = {
       teamName,
       displayName,
@@ -691,6 +1157,8 @@ async function listTeams(
       taskCount: 0,
       lastActivity: null,
       ...(coloredMembers.length > 0 ? { members: coloredMembers } : {}),
+      ...(leadName ? { leadName } : {}),
+      ...(leadColor ? { leadColor } : {}),
       ...(color ? { color } : {}),
       ...(projectPath ? { projectPath } : {}),
       ...(leadSessionId ? { leadSessionId } : {}),
@@ -704,10 +1172,21 @@ async function listTeams(
     if (ms >= 250) {
       pushSlowest(diag.slowest, { teamName, ms }, 10);
     }
+    await cacheTeamSummaryIfStable(
+      cacheKey,
+      payload.teamsDir,
+      teamName,
+      optionKey,
+      dependencyFingerprint,
+      summary,
+      launchStateRead.cacheable,
+      diag
+    );
     return summary;
   });
 
   const teams = perTeam.filter((t): t is NonNullable<typeof t> => t !== null);
+  pruneTeamSummaryCache(payload.teamsDir, optionKey, liveTeamNames, diag);
   diag.returned = teams.length;
   diag.totalMs = nowMs() - startedAt;
   return { teams, diag };
@@ -843,19 +1322,27 @@ async function readTasksDirForTeam(
   tasksDir: string,
   teamName: string,
   payload: GetAllTasksPayload
-): Promise<{ tasks: unknown[]; taskDiag: TaskReadDiag }> {
-  const taskDiag: TaskReadDiag = { skipped: 0, skipReasons: {} };
+): Promise<{ tasks: unknown[]; taskDiag: TaskReadDiag; liveCacheKeys: Set<string> }> {
+  const taskDiag: TaskReadDiag = {
+    skipped: 0,
+    skipReasons: {},
+    cacheHits: 0,
+    cacheMisses: 0,
+    cacheWriteSkips: 0,
+  };
   let entries: string[];
   try {
     entries = await fs.promises.readdir(tasksDir);
   } catch (error) {
     if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
-      return { tasks: [], taskDiag };
+      return { tasks: [], taskDiag, liveCacheKeys: new Set() };
     }
     throw error;
   }
 
   const tasks: unknown[] = [];
+  const liveCacheKeys = new Set<string>();
+  const optionKey = makeTaskOptionKey(payload);
   for (const file of entries) {
     if (
       !file.endsWith('.json') ||
@@ -867,25 +1354,61 @@ async function readTasksDirForTeam(
     }
 
     const taskPath = path.join(tasksDir, file);
+    const cacheKey = makeTaskCacheKey(payload.tasksBase, teamName, file, optionKey);
+    liveCacheKeys.add(cacheKey);
     try {
-      const stat = await fs.promises.stat(taskPath);
-      if (!stat.isFile() || stat.size > payload.maxTaskBytes) {
+      const pathFingerprint = await statPathFingerprint(taskPath);
+      const taskSize = Number(pathFingerprint.size ?? Number.NaN);
+      if (
+        !pathFingerprint.isFile ||
+        !Number.isFinite(taskSize) ||
+        taskSize > payload.maxTaskBytes
+      ) {
         taskDiag.skipped++;
         bumpSkipReason(taskDiag.skipReasons, 'task_not_file_or_large');
         continue;
       }
+      const fingerprint = fingerprintToString(pathFingerprint);
+      const fingerprintCacheSafe = isCacheSafeFingerprint(pathFingerprint);
+      const cached = taskFileCache.get(cacheKey);
+      if (fingerprintCacheSafe && cached?.fingerprint === fingerprint) {
+        cached.lastUsedAt = nowMs();
+        taskDiag.cacheHits++;
+        applyCachedTaskReadResult(cached.result, tasks, taskDiag);
+        continue;
+      }
+      taskDiag.cacheMisses++;
 
+      const stat = await fs.promises.stat(taskPath);
       const raw = await readFileUtf8WithTimeout(taskPath, payload.maxTaskReadMs);
       const parsed = JSON.parse(raw) as ParsedTask;
       const metadata = parsed.metadata;
       if (metadata?._internal === true) {
         taskDiag.skipped++;
         bumpSkipReason(taskDiag.skipReasons, 'task_internal');
+        await cacheTaskReadResultIfStable(
+          cacheKey,
+          taskPath,
+          payload.tasksBase,
+          fingerprint,
+          fingerprintCacheSafe,
+          { skipReason: 'task_internal' },
+          taskDiag
+        );
         continue;
       }
       if (parsed.status === 'deleted') {
         taskDiag.skipped++;
         bumpSkipReason(taskDiag.skipReasons, 'task_deleted');
+        await cacheTaskReadResultIfStable(
+          cacheKey,
+          taskPath,
+          payload.tasksBase,
+          fingerprint,
+          fingerprintCacheSafe,
+          { skipReason: 'task_deleted' },
+          taskDiag
+        );
         continue;
       }
 
@@ -925,7 +1448,7 @@ async function readTasksDirForTeam(
         deriveReviewStateFromEvents(historyEvents) ??
         normalizeFallbackReviewState(parsed.reviewState, status);
 
-      tasks.push({
+      const task = {
         id: typeof parsed.id === 'string' || typeof parsed.id === 'number' ? String(parsed.id) : '',
         displayId:
           typeof parsed.displayId === 'string' && parsed.displayId.trim().length > 0
@@ -981,7 +1504,17 @@ async function readTasksDirForTeam(
             ? (parsed.sourceMessage as Record<string, unknown>)
             : undefined,
         teamName,
-      });
+      };
+      tasks.push(task);
+      await cacheTaskReadResultIfStable(
+        cacheKey,
+        taskPath,
+        payload.tasksBase,
+        fingerprint,
+        fingerprintCacheSafe,
+        { task },
+        taskDiag
+      );
     } catch (error) {
       taskDiag.skipped++;
       const code = (error as NodeJS.ErrnoException).code;
@@ -992,11 +1525,14 @@ async function readTasksDirForTeam(
       }
     }
   }
-  return { tasks, taskDiag };
+  return { tasks, taskDiag, liveCacheKeys };
 }
 
 function mergeTaskDiag(target: GetAllTasksDiag, source: TaskReadDiag): void {
   target.skipped += source.skipped;
+  target.cacheHits += source.cacheHits;
+  target.cacheMisses += source.cacheMisses;
+  target.cacheWriteSkips += source.cacheWriteSkips;
   for (const [reason, count] of Object.entries(source.skipReasons)) {
     target.skipReasons[reason] = (target.skipReasons[reason] || 0) + count;
   }
@@ -1015,6 +1551,10 @@ async function getAllTasks(
     skipped: 0,
     skipReasons: {},
     slowestTeams: [],
+    cacheHits: 0,
+    cacheMisses: 0,
+    cacheWriteSkips: 0,
+    cacheEvictions: 0,
     totalMs: 0,
   };
 
@@ -1031,13 +1571,21 @@ async function getAllTasks(
 
   const dirs = entries.filter((e) => e.isDirectory());
   diag.teamDirs = dirs.length;
+  const liveCacheKeys = new Set<string>();
 
   const chunks = await mapLimit(dirs, payload.concurrency, async (entry) => {
     const teamName = entry.name;
     const t0 = nowMs();
     try {
       const tasksDir = path.join(payload.tasksBase, teamName);
-      const { tasks, taskDiag } = await readTasksDirForTeam(tasksDir, teamName, payload);
+      const {
+        tasks,
+        taskDiag,
+        liveCacheKeys: teamLiveCacheKeys,
+      } = await readTasksDirForTeam(tasksDir, teamName, payload);
+      for (const key of teamLiveCacheKeys) {
+        liveCacheKeys.add(key);
+      }
       mergeTaskDiag(diag, taskDiag);
       const ms = nowMs() - t0;
       if (ms >= 250) {
@@ -1052,6 +1600,7 @@ async function getAllTasks(
   });
 
   const tasks = chunks.flat();
+  pruneTaskFileCache(payload.tasksBase, liveCacheKeys, diag);
   diag.returned = tasks.length;
   diag.totalMs = nowMs() - startedAt;
   return { tasks, diag };
@@ -1068,6 +1617,19 @@ function post(msg: WorkerResponse): void {
 parentPort?.on('message', async (msg: WorkerRequest) => {
   const { id, op } = msg;
   try {
+    if (op === 'warmup') {
+      post({
+        id,
+        ok: true,
+        result: {
+          ready: true,
+          teamSummaryCacheEntries: teamSummaryCache.size,
+          taskFileCacheEntries: taskFileCache.size,
+        },
+        diag: { op, totalMs: 0 },
+      });
+      return;
+    }
     if (op === 'listTeams') {
       const { teams, diag } = await listTeams(msg.payload);
       post({ id, ok: true, result: teams, diag });
diff --git a/src/preload/constants/ipcChannels.ts b/src/preload/constants/ipcChannels.ts
index 43fadd19..c32faa37 100644
--- a/src/preload/constants/ipcChannels.ts
+++ b/src/preload/constants/ipcChannels.ts
@@ -234,6 +234,9 @@ export const TEAM_UPDATE_KANBAN_COLUMN_ORDER = 'team:updateKanbanColumnOrder';
 /** Send inbox message to team member */
 export const TEAM_SEND_MESSAGE = 'team:sendMessage';
 
+/** Read latest OpenCode runtime delivery status for a sent inbox message */
+export const TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS = 'team:getOpenCodeRuntimeDeliveryStatus';
+
 /** Paginated messages for timeline/messages panel */
 export const TEAM_GET_MESSAGES_PAGE = 'team:getMessagesPage';
 
@@ -394,6 +397,9 @@ export const TEAM_GET_AGENT_RUNTIME = 'team:getAgentRuntime';
 /** Restart a specific teammate runtime */
 export const TEAM_RESTART_MEMBER = 'team:restartMember';
 
+/** Retry failed OpenCode-owned secondary runtime lanes */
+export const TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES = 'team:retryFailedOpenCodeSecondaryLanes';
+
 /** Skip a failed teammate for the current launch */
 export const TEAM_SKIP_MEMBER_FOR_LAUNCH = 'team:skipMemberForLaunch';
 
diff --git a/src/preload/index.ts b/src/preload/index.ts
index f175881a..162a9dd4 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -136,6 +136,7 @@ import {
   TEAM_GET_MEMBER_LOGS,
   TEAM_GET_MEMBER_STATS,
   TEAM_GET_MESSAGES_PAGE,
+  TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS,
   TEAM_GET_PROJECT_BRANCH,
   TEAM_GET_SAVED_REQUEST,
   TEAM_GET_TASK_ACTIVITY,
@@ -168,6 +169,7 @@ import {
   TEAM_RESTART_MEMBER,
   TEAM_RESTORE,
   TEAM_RESTORE_TASK,
+  TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES,
   TEAM_SAVE_TASK_ATTACHMENT,
   TEAM_SEND_MESSAGE,
   TEAM_SET_CHANGE_PRESENCE_TRACKING,
@@ -280,9 +282,11 @@ import type {
   MemberSpawnStatusesSnapshot,
   MessagesPage,
   NotificationTrigger,
+  OpenCodeRuntimeDeliveryStatus,
   ProjectBranchChangeEvent,
   RejectResult,
   ReplaceMembersRequest,
+  RetryFailedOpenCodeSecondaryLanesResult,
   Schedule,
   ScheduleChangeEvent,
   ScheduleRun,
@@ -307,6 +311,7 @@ import type {
   TeamCreateConfigRequest,
   TeamCreateRequest,
   TeamCreateResponse,
+  TeamGetDataOptions,
   TeamLaunchRequest,
   TeamLaunchResponse,
   TeamMemberActivityMeta,
@@ -844,8 +849,11 @@ const electronAPI: ElectronAPI = {
     list: async () => {
       return invokeIpcWithResult<TeamSummary[]>(TEAM_LIST);
     },
-    getData: async (teamName: string) => {
-      return invokeIpcWithResult<TeamViewSnapshot>(TEAM_GET_DATA, teamName);
+    getData: async (teamName: string, options?: TeamGetDataOptions) => {
+      if (options === undefined) {
+        return invokeIpcWithResult<TeamViewSnapshot>(TEAM_GET_DATA, teamName);
+      }
+      return invokeIpcWithResult<TeamViewSnapshot>(TEAM_GET_DATA, teamName, options);
     },
     getTaskChangePresence: async (teamName: string) => {
       return invokeIpcWithResult<Record<string, TaskChangePresenceState>>(
@@ -928,6 +936,13 @@ const electronAPI: ElectronAPI = {
     sendMessage: async (teamName: string, request: SendMessageRequest) => {
       return invokeIpcWithResult<SendMessageResult>(TEAM_SEND_MESSAGE, teamName, request);
     },
+    getOpenCodeRuntimeDeliveryStatus: async (teamName: string, messageId: string) => {
+      return invokeIpcWithResult<OpenCodeRuntimeDeliveryStatus | null>(
+        TEAM_GET_OPENCODE_RUNTIME_DELIVERY_STATUS,
+        teamName,
+        messageId
+      );
+    },
     getMessagesPage: async (
       teamName: string,
       options?: { cursor?: string | null; limit?: number }
@@ -1114,6 +1129,12 @@ const electronAPI: ElectronAPI = {
     getTeamAgentRuntime: async (teamName: string) => {
       return invokeIpcWithResult<TeamAgentRuntimeSnapshot>(TEAM_GET_AGENT_RUNTIME, teamName);
     },
+    retryFailedOpenCodeSecondaryLanes: async (teamName: string) => {
+      return invokeIpcWithResult<RetryFailedOpenCodeSecondaryLanesResult>(
+        TEAM_RETRY_FAILED_OPENCODE_SECONDARY_LANES,
+        teamName
+      );
+    },
     restartMember: async (teamName: string, memberName: string) => {
       return invokeIpcWithResult<void>(TEAM_RESTART_MEMBER, teamName, memberName);
     },
diff --git a/src/renderer/api/httpClient.ts b/src/renderer/api/httpClient.ts
index 77479873..6e5ee57a 100644
--- a/src/renderer/api/httpClient.ts
+++ b/src/renderer/api/httpClient.ts
@@ -35,6 +35,7 @@ import type {
   KanbanColumnId,
   NotificationsAPI,
   NotificationTrigger,
+  OpenCodeRuntimeDeliveryStatus,
   PaginatedSessionsResult,
   Project,
   RepositoryGroup,
@@ -61,6 +62,7 @@ import type {
   TeamClaudeLogsResponse,
   TeamCreateRequest,
   TeamCreateResponse,
+  TeamGetDataOptions,
   TeamLaunchRequest,
   TeamLaunchResponse,
   TeamMemberActivityMeta,
@@ -706,7 +708,10 @@ export class HttpAPIClient implements ElectronAPI {
       console.warn('[HttpAPIClient] teams API is not available in browser mode');
       return [];
     },
-    getData: async (_teamName: string): Promise<TeamViewSnapshot> => {
+    getData: async (
+      _teamName: string,
+      _options?: TeamGetDataOptions
+    ): Promise<TeamViewSnapshot> => {
       throw new Error('Teams detail is not available in browser mode');
     },
     getTaskChangePresence: async (): Promise<
@@ -790,6 +795,12 @@ export class HttpAPIClient implements ElectronAPI {
     ): Promise<SendMessageResult> => {
       throw new Error('Team messaging is not available in browser mode');
     },
+    getOpenCodeRuntimeDeliveryStatus: async (
+      _teamName: string,
+      _messageId: string
+    ): Promise<OpenCodeRuntimeDeliveryStatus | null> => {
+      throw new Error('OpenCode runtime delivery status is not available in browser mode');
+    },
     getMessagesPage: async () => {
       return { messages: [], nextCursor: null, hasMore: false, feedRevision: 'empty' };
     },
@@ -977,6 +988,9 @@ export class HttpAPIClient implements ElectronAPI {
     restartMember: async (): Promise<void> => {
       throw new Error('Member restart is not available in browser mode');
     },
+    retryFailedOpenCodeSecondaryLanes: async () => {
+      throw new Error('OpenCode secondary retry is not available in browser mode');
+    },
     skipMemberForLaunch: async (): Promise<void> => {
       throw new Error('Member launch skip is not available in browser mode');
     },
diff --git a/src/renderer/components/chat/CompactBoundary.tsx b/src/renderer/components/chat/CompactBoundary.tsx
index d23dc752..88f44216 100644
--- a/src/renderer/components/chat/CompactBoundary.tsx
+++ b/src/renderer/components/chat/CompactBoundary.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { memo, useState } from 'react';
 import ReactMarkdown from 'react-markdown';
 
 import {
@@ -28,9 +28,9 @@ interface CompactBoundaryProps {
  * CompactBoundary displays a horizontal divider indicating where
  * the conversation was compacted. Click to expand the compacted summary.
  */
-export const CompactBoundary = ({
+export const CompactBoundary = memo(function CompactBoundary({
   compactGroup,
-}: Readonly<CompactBoundaryProps>): React.JSX.Element => {
+}: Readonly<CompactBoundaryProps>): React.JSX.Element {
   const { timestamp, message } = compactGroup;
   const [isExpanded, setIsExpanded] = useState(false);
 
@@ -166,4 +166,4 @@ export const CompactBoundary = ({
       )}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/DisplayItemList.tsx b/src/renderer/components/chat/DisplayItemList.tsx
index ec0412d5..8ae4e8c9 100644
--- a/src/renderer/components/chat/DisplayItemList.tsx
+++ b/src/renderer/components/chat/DisplayItemList.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { memo, useCallback, useState } from 'react';
 
 import {
   CODE_BG,
@@ -65,9 +65,6 @@ function buildItemMetaTooltip(
   return parts.length > 0 ? parts.join(' • ') : undefined;
 }
 
-/**
- * Truncates text to a maximum length and adds ellipsis if needed.
- */
 function truncateText(text: string, maxLength: number): string {
   if (text.length <= maxLength) {
     return text;
@@ -75,6 +72,345 @@ function truncateText(text: string, maxLength: number): string {
   return text.substring(0, maxLength) + '...';
 }
 
+function getItemKey(item: AIGroupDisplayItem, index: number): string {
+  switch (item.type) {
+    case 'thinking':
+      return `thinking-${index}`;
+    case 'output':
+      return `output-${index}`;
+    case 'tool':
+      return `tool-${item.tool.id}-${index}`;
+    case 'subagent':
+      return `subagent-${item.subagent.id}-${index}`;
+    case 'slash':
+      return `slash-${item.slash.name}-${index}`;
+    case 'teammate_message':
+      return `teammate-${item.teammateMessage.id}-${index}`;
+    case 'subagent_input':
+      return `input-${index}`;
+    case 'compact_boundary':
+      return `compact-${index}`;
+    default:
+      return `unknown-${index}`;
+  }
+}
+
+// =============================================================================
+// Per-item row — memoized to prevent re-renders from parent state changes
+// =============================================================================
+
+interface DisplayItemRowProps {
+  item: AIGroupDisplayItem;
+  index: number;
+  itemKey: string;
+  isExpanded: boolean;
+  isDimmed: boolean;
+  hasReplyLink: boolean;
+  onItemClick: (key: string) => void;
+  onReplyHover: (toolId: string | null) => void;
+  aiGroupId: string;
+  searchQueryOverride?: string;
+  highlightToolUseId?: string;
+  highlightColor?: TriggerColor;
+  notificationColorMap?: Map<string, TriggerColor>;
+  registerToolRef?: (toolId: string, el: HTMLDivElement | null) => void;
+  previewMaxLength?: number;
+  timestampFormat?: string;
+  showItemMetaTooltip?: boolean;
+}
+
+const DisplayItemRow = memo(function DisplayItemRow({
+  item,
+  index: _index,
+  itemKey,
+  isExpanded,
+  isDimmed,
+  hasReplyLink,
+  onItemClick,
+  onReplyHover,
+  aiGroupId,
+  searchQueryOverride,
+  highlightToolUseId,
+  highlightColor,
+  notificationColorMap,
+  registerToolRef,
+  previewMaxLength,
+  timestampFormat,
+  showItemMetaTooltip = false,
+}: DisplayItemRowProps): React.JSX.Element | null {
+  const handleClick = useCallback(() => onItemClick(itemKey), [onItemClick, itemKey]);
+
+  let element: React.ReactNode = null;
+
+  switch (item.type) {
+    case 'thinking': {
+      const thinkingStep = {
+        id: itemKey,
+        type: 'thinking' as const,
+        startTime: item.timestamp,
+        endTime: item.timestamp,
+        durationMs: 0,
+        content: { thinkingText: item.content, tokenCount: item.tokenCount },
+        tokens: { input: 0, output: item.tokenCount ?? 0 },
+        context: 'main' as const,
+      };
+      element = (
+        <ThinkingItem
+          step={thinkingStep}
+          preview={truncateText(item.content, previewMaxLength ?? 150)}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          timestamp={item.timestamp}
+          timestampFormat={timestampFormat}
+          titleText={
+            showItemMetaTooltip
+              ? buildItemMetaTooltip(item.timestamp, item.tokenCount, 'tokens')
+              : undefined
+          }
+          markdownItemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
+          searchQueryOverride={searchQueryOverride}
+        />
+      );
+      break;
+    }
+
+    case 'output': {
+      const textStep = {
+        id: itemKey,
+        type: 'output' as const,
+        startTime: item.timestamp,
+        endTime: item.timestamp,
+        durationMs: 0,
+        content: { outputText: item.content, tokenCount: item.tokenCount },
+        tokens: { input: 0, output: item.tokenCount ?? 0 },
+        context: 'main' as const,
+      };
+      element = (
+        <TextItem
+          step={textStep}
+          preview={truncateText(item.content, previewMaxLength ?? 150)}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          timestamp={item.timestamp}
+          timestampFormat={timestampFormat}
+          titleText={
+            showItemMetaTooltip
+              ? buildItemMetaTooltip(item.timestamp, item.tokenCount, 'tokens')
+              : undefined
+          }
+          markdownItemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
+          searchQueryOverride={searchQueryOverride}
+        />
+      );
+      break;
+    }
+
+    case 'tool': {
+      element = (
+        <LinkedToolItem
+          linkedTool={item.tool}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          timestamp={item.tool.startTime}
+          timestampFormat={timestampFormat}
+          titleText={
+            showItemMetaTooltip
+              ? buildItemMetaTooltip(item.tool.startTime, getToolContextTokens(item.tool), 'tokens')
+              : undefined
+          }
+          searchQueryOverride={searchQueryOverride}
+          isHighlighted={highlightToolUseId === item.tool.id}
+          highlightColor={highlightColor}
+          notificationDotColor={notificationColorMap?.get(item.tool.id)}
+          registerRef={registerToolRef ? (el) => registerToolRef(item.tool.id, el) : undefined}
+        />
+      );
+      break;
+    }
+
+    case 'subagent': {
+      const subagentStep = {
+        id: itemKey,
+        type: 'subagent' as const,
+        startTime: item.subagent.startTime,
+        endTime: item.subagent.endTime,
+        durationMs: item.subagent.durationMs,
+        content: {
+          subagentId: item.subagent.id,
+          subagentDescription: item.subagent.description,
+        },
+        isParallel: item.subagent.isParallel,
+        context: 'main' as const,
+      };
+      element = (
+        <SubagentItem
+          step={subagentStep}
+          subagent={item.subagent}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          aiGroupId={aiGroupId}
+          highlightToolUseId={highlightToolUseId}
+          highlightColor={highlightColor}
+          notificationColorMap={notificationColorMap}
+          registerToolRef={registerToolRef}
+        />
+      );
+      break;
+    }
+
+    case 'slash': {
+      element = (
+        <SlashItem
+          slash={item.slash}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          timestamp={item.slash.timestamp}
+          timestampFormat={timestampFormat}
+          titleText={
+            showItemMetaTooltip
+              ? buildItemMetaTooltip(
+                  item.slash.timestamp,
+                  item.slash.instructionsTokenCount,
+                  'tokens'
+                )
+              : undefined
+          }
+        />
+      );
+      break;
+    }
+
+    case 'teammate_message': {
+      element = (
+        <TeammateMessageItem
+          teammateMessage={item.teammateMessage}
+          onClick={handleClick}
+          isExpanded={isExpanded}
+          onReplyHover={onReplyHover}
+        />
+      );
+      break;
+    }
+
+    case 'subagent_input': {
+      const inputContent = item.content;
+      const inputTokenCount = item.tokenCount;
+      element = (
+        <BaseItem
+          icon={<MailOpen className="size-4" />}
+          label="Input"
+          summary={truncateText(inputContent, previewMaxLength ?? 80)}
+          tokenCount={inputTokenCount}
+          timestamp={item.timestamp}
+          timestampFormat={timestampFormat}
+          titleText={
+            showItemMetaTooltip
+              ? buildItemMetaTooltip(item.timestamp, inputTokenCount, 'tokens')
+              : undefined
+          }
+          onClick={handleClick}
+          isExpanded={isExpanded}
+        >
+          <MarkdownViewer
+            content={inputContent}
+            copyable
+            itemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
+            searchQueryOverride={searchQueryOverride}
+          />
+        </BaseItem>
+      );
+      break;
+    }
+
+    case 'compact_boundary': {
+      const compactContent = item.content;
+      element = (
+        <div>
+          <button
+            onClick={handleClick}
+            className="group flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-2 transition-all duration-200"
+            style={{
+              backgroundColor: TOOL_CALL_BG,
+              border: `1px solid ${TOOL_CALL_BORDER}`,
+            }}
+            aria-expanded={isExpanded}
+          >
+            <div className="flex shrink-0 items-center gap-1.5" style={{ color: TOOL_CALL_TEXT }}>
+              <ChevronRight
+                size={14}
+                className={`transition-transform duration-200 ${isExpanded ? 'rotate-90' : ''}`}
+              />
+              <Layers size={14} />
+            </div>
+            <span className="shrink-0 text-xs font-medium" style={{ color: TOOL_CALL_TEXT }}>
+              Compacted
+            </span>
+            {item.tokenDelta && (
+              <span
+                className="min-w-0 truncate text-[11px] tabular-nums"
+                style={{ color: COLOR_TEXT_MUTED }}
+              >
+                {formatTokensCompact(item.tokenDelta.preCompactionTokens)} →{' '}
+                {formatTokensCompact(item.tokenDelta.postCompactionTokens)}
+                <span style={{ color: '#4ade80' }}>
+                  {' '}
+                  ({formatTokensCompact(Math.abs(item.tokenDelta.delta))} freed)
+                </span>
+              </span>
+            )}
+            <span
+              className="shrink-0 rounded px-1.5 py-0.5 text-[10px]"
+              style={{
+                backgroundColor: 'rgba(99, 102, 241, 0.15)',
+                color: '#818cf8',
+              }}
+            >
+              Phase {item.phaseNumber}
+            </span>
+            <span className="ml-auto shrink-0 text-[11px]" style={{ color: COLOR_TEXT_MUTED }}>
+              {format(new Date(item.timestamp), 'h:mm:ss a')}
+            </span>
+          </button>
+          {isExpanded && compactContent && (
+            <div
+              className="mt-1 overflow-hidden rounded-lg"
+              style={{
+                backgroundColor: CODE_BG,
+                border: `1px solid ${CODE_BORDER}`,
+              }}
+            >
+              <div
+                className="max-h-64 overflow-y-auto border-l-2 px-3 py-2"
+                style={{ borderColor: 'var(--chat-ai-border)' }}
+              >
+                <MarkdownViewer content={compactContent} copyable />
+              </div>
+            </div>
+          )}
+        </div>
+      );
+      break;
+    }
+
+    default:
+      return null;
+  }
+
+  return (
+    <div
+      style={
+        hasReplyLink ? { opacity: isDimmed ? 0.2 : 1, transition: 'opacity 150ms ease' } : undefined
+      }
+    >
+      {element}
+    </div>
+  );
+});
+
+// =============================================================================
+// Main component
+// =============================================================================
+
 /**
  * Renders a flat list of AIGroupDisplayItem[] into the appropriate components.
  *
@@ -87,7 +423,7 @@ function truncateText(text: string, maxLength: number): string {
  *
  * The list is completely flat with no nested toggles or hierarchies.
  */
-export const DisplayItemList = ({
+export const DisplayItemList = React.memo(function DisplayItemList({
   items,
   onItemClick,
   expandedItemIds,
@@ -101,23 +437,13 @@ export const DisplayItemList = ({
   previewMaxLength,
   timestampFormat,
   showItemMetaTooltip = false,
-}: Readonly<DisplayItemListProps>): React.JSX.Element => {
-  // Reply-link highlight: when hovering a reply badge, dim everything except the linked pair
+}: Readonly<DisplayItemListProps>): React.JSX.Element {
   const [replyLinkToolId, setReplyLinkToolId] = useState<string | null>(null);
 
   const handleReplyHover = useCallback((toolId: string | null) => {
     setReplyLinkToolId(toolId);
   }, []);
 
-  /** Check if an item is part of the currently highlighted reply link */
-  const isItemInReplyLink = (item: AIGroupDisplayItem): boolean => {
-    if (!replyLinkToolId) return false;
-    if (item.type === 'tool' && item.tool.id === replyLinkToolId) return true;
-    if (item.type === 'teammate_message' && item.teammateMessage.replyToToolId === replyLinkToolId)
-      return true;
-    return false;
-  };
-
   if (!items || items.length === 0) {
     return (
       <div className="px-3 py-2 text-sm italic text-claude-dark-text-secondary">
@@ -133,299 +459,39 @@ export const DisplayItemList = ({
       }
     >
       {items.map((item, index) => {
-        let itemKey = '';
-        let element: React.ReactNode = null;
+        const itemKey = getItemKey(item, index);
+        const isExpanded = expandedItemIds.has(itemKey);
 
-        switch (item.type) {
-          case 'thinking': {
-            itemKey = `thinking-${index}`;
-            const thinkingStep = {
-              id: itemKey,
-              type: 'thinking' as const,
-              startTime: item.timestamp,
-              endTime: item.timestamp,
-              durationMs: 0,
-              content: { thinkingText: item.content, tokenCount: item.tokenCount },
-              tokens: { input: 0, output: item.tokenCount ?? 0 },
-              context: 'main' as const,
-            };
-            element = (
-              <ThinkingItem
-                step={thinkingStep}
-                preview={truncateText(item.content, previewMaxLength ?? 150)}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                timestamp={item.timestamp}
-                timestampFormat={timestampFormat}
-                titleText={
-                  showItemMetaTooltip
-                    ? buildItemMetaTooltip(item.timestamp, item.tokenCount, 'tokens')
-                    : undefined
-                }
-                markdownItemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
-                searchQueryOverride={searchQueryOverride}
-              />
-            );
-            break;
-          }
+        const isInReplyLink =
+          replyLinkToolId !== null &&
+          ((item.type === 'tool' && item.tool.id === replyLinkToolId) ||
+            (item.type === 'teammate_message' &&
+              item.teammateMessage.replyToToolId === replyLinkToolId));
+        const isDimmed = replyLinkToolId !== null && !isInReplyLink;
 
-          case 'output': {
-            itemKey = `output-${index}`;
-            const textStep = {
-              id: itemKey,
-              type: 'output' as const,
-              startTime: item.timestamp,
-              endTime: item.timestamp,
-              durationMs: 0,
-              content: { outputText: item.content, tokenCount: item.tokenCount },
-              tokens: { input: 0, output: item.tokenCount ?? 0 },
-              context: 'main' as const,
-            };
-            element = (
-              <TextItem
-                step={textStep}
-                preview={truncateText(item.content, previewMaxLength ?? 150)}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                timestamp={item.timestamp}
-                timestampFormat={timestampFormat}
-                titleText={
-                  showItemMetaTooltip
-                    ? buildItemMetaTooltip(item.timestamp, item.tokenCount, 'tokens')
-                    : undefined
-                }
-                markdownItemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
-                searchQueryOverride={searchQueryOverride}
-              />
-            );
-            break;
-          }
-
-          case 'tool': {
-            itemKey = `tool-${item.tool.id}-${index}`;
-            element = (
-              <LinkedToolItem
-                linkedTool={item.tool}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                timestamp={item.tool.startTime}
-                timestampFormat={timestampFormat}
-                titleText={
-                  showItemMetaTooltip
-                    ? buildItemMetaTooltip(
-                        item.tool.startTime,
-                        getToolContextTokens(item.tool),
-                        'tokens'
-                      )
-                    : undefined
-                }
-                searchQueryOverride={searchQueryOverride}
-                isHighlighted={highlightToolUseId === item.tool.id}
-                highlightColor={highlightColor}
-                notificationDotColor={notificationColorMap?.get(item.tool.id)}
-                registerRef={
-                  registerToolRef ? (el) => registerToolRef(item.tool.id, el) : undefined
-                }
-              />
-            );
-            break;
-          }
-
-          case 'subagent': {
-            itemKey = `subagent-${item.subagent.id}-${index}`;
-            const subagentStep = {
-              id: itemKey,
-              type: 'subagent' as const,
-              startTime: item.subagent.startTime,
-              endTime: item.subagent.endTime,
-              durationMs: item.subagent.durationMs,
-              content: {
-                subagentId: item.subagent.id,
-                subagentDescription: item.subagent.description,
-              },
-              isParallel: item.subagent.isParallel,
-              context: 'main' as const,
-            };
-            element = (
-              <SubagentItem
-                step={subagentStep}
-                subagent={item.subagent}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                aiGroupId={aiGroupId}
-                highlightToolUseId={highlightToolUseId}
-                highlightColor={highlightColor}
-                notificationColorMap={notificationColorMap}
-                registerToolRef={registerToolRef}
-              />
-            );
-            break;
-          }
-
-          case 'slash': {
-            itemKey = `slash-${item.slash.name}-${index}`;
-            element = (
-              <SlashItem
-                slash={item.slash}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                timestamp={item.slash.timestamp}
-                timestampFormat={timestampFormat}
-                titleText={
-                  showItemMetaTooltip
-                    ? buildItemMetaTooltip(
-                        item.slash.timestamp,
-                        item.slash.instructionsTokenCount,
-                        'tokens'
-                      )
-                    : undefined
-                }
-              />
-            );
-            break;
-          }
-
-          case 'teammate_message': {
-            itemKey = `teammate-${item.teammateMessage.id}-${index}`;
-            element = (
-              <TeammateMessageItem
-                teammateMessage={item.teammateMessage}
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-                onReplyHover={handleReplyHover}
-              />
-            );
-            break;
-          }
-
-          case 'subagent_input': {
-            itemKey = `input-${index}`;
-            const inputContent = item.content;
-            const inputTokenCount = item.tokenCount;
-            element = (
-              <BaseItem
-                icon={<MailOpen className="size-4" />}
-                label="Input"
-                summary={truncateText(inputContent, previewMaxLength ?? 80)}
-                tokenCount={inputTokenCount}
-                timestamp={item.timestamp}
-                timestampFormat={timestampFormat}
-                titleText={
-                  showItemMetaTooltip
-                    ? buildItemMetaTooltip(item.timestamp, inputTokenCount, 'tokens')
-                    : undefined
-                }
-                onClick={() => onItemClick(itemKey)}
-                isExpanded={expandedItemIds.has(itemKey)}
-              >
-                <MarkdownViewer
-                  content={inputContent}
-                  copyable
-                  itemId={searchQueryOverride ? `${aiGroupId}:${itemKey}` : undefined}
-                  searchQueryOverride={searchQueryOverride}
-                />
-              </BaseItem>
-            );
-            break;
-          }
-
-          case 'compact_boundary': {
-            itemKey = `compact-${index}`;
-            const compactContent = item.content;
-            const compactExpanded = expandedItemIds.has(itemKey);
-            element = (
-              <div>
-                <button
-                  onClick={() => onItemClick(itemKey)}
-                  className="group flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-2 transition-all duration-200"
-                  style={{
-                    backgroundColor: TOOL_CALL_BG,
-                    border: `1px solid ${TOOL_CALL_BORDER}`,
-                  }}
-                  aria-expanded={compactExpanded}
-                >
-                  <div
-                    className="flex shrink-0 items-center gap-1.5"
-                    style={{ color: TOOL_CALL_TEXT }}
-                  >
-                    <ChevronRight
-                      size={14}
-                      className={`transition-transform duration-200 ${compactExpanded ? 'rotate-90' : ''}`}
-                    />
-                    <Layers size={14} />
-                  </div>
-                  <span className="shrink-0 text-xs font-medium" style={{ color: TOOL_CALL_TEXT }}>
-                    Compacted
-                  </span>
-                  {item.tokenDelta && (
-                    <span
-                      className="min-w-0 truncate text-[11px] tabular-nums"
-                      style={{ color: COLOR_TEXT_MUTED }}
-                    >
-                      {formatTokensCompact(item.tokenDelta.preCompactionTokens)} →{' '}
-                      {formatTokensCompact(item.tokenDelta.postCompactionTokens)}
-                      <span style={{ color: '#4ade80' }}>
-                        {' '}
-                        ({formatTokensCompact(Math.abs(item.tokenDelta.delta))} freed)
-                      </span>
-                    </span>
-                  )}
-                  <span
-                    className="shrink-0 rounded px-1.5 py-0.5 text-[10px]"
-                    style={{
-                      backgroundColor: 'rgba(99, 102, 241, 0.15)',
-                      color: '#818cf8',
-                    }}
-                  >
-                    Phase {item.phaseNumber}
-                  </span>
-                  <span
-                    className="ml-auto shrink-0 text-[11px]"
-                    style={{ color: COLOR_TEXT_MUTED }}
-                  >
-                    {format(new Date(item.timestamp), 'h:mm:ss a')}
-                  </span>
-                </button>
-                {compactExpanded && compactContent && (
-                  <div
-                    className="mt-1 overflow-hidden rounded-lg"
-                    style={{
-                      backgroundColor: CODE_BG,
-                      border: `1px solid ${CODE_BORDER}`,
-                    }}
-                  >
-                    <div
-                      className="max-h-64 overflow-y-auto border-l-2 px-3 py-2"
-                      style={{ borderColor: 'var(--chat-ai-border)' }}
-                    >
-                      <MarkdownViewer content={compactContent} copyable />
-                    </div>
-                  </div>
-                )}
-              </div>
-            );
-            break;
-          }
-
-          default:
-            return null;
-        }
-
-        // Apply reply-link spotlight: dim items not in the highlighted pair
-        const isDimmed = replyLinkToolId !== null && !isItemInReplyLink(item);
         return (
-          <div
+          <DisplayItemRow
             key={itemKey}
-            style={
-              replyLinkToolId !== null
-                ? { opacity: isDimmed ? 0.2 : 1, transition: 'opacity 150ms ease' }
-                : undefined
-            }
-          >
-            {element}
-          </div>
+            item={item}
+            index={index}
+            itemKey={itemKey}
+            isExpanded={isExpanded}
+            isDimmed={isDimmed}
+            hasReplyLink={replyLinkToolId !== null}
+            onItemClick={onItemClick}
+            onReplyHover={handleReplyHover}
+            aiGroupId={aiGroupId}
+            searchQueryOverride={searchQueryOverride}
+            highlightToolUseId={highlightToolUseId}
+            highlightColor={highlightColor}
+            notificationColorMap={notificationColorMap}
+            registerToolRef={registerToolRef}
+            previewMaxLength={previewMaxLength}
+            timestampFormat={timestampFormat}
+            showItemMetaTooltip={showItemMetaTooltip}
+          />
         );
       })}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/BaseItem.tsx b/src/renderer/components/chat/items/BaseItem.tsx
index 375a832f..34b3933d 100644
--- a/src/renderer/components/chat/items/BaseItem.tsx
+++ b/src/renderer/components/chat/items/BaseItem.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { memo } from 'react';
 
 import { TOOL_ITEM_MUTED } from '@renderer/constants/cssVariables';
 import { getTriggerColorDef, type TriggerColor } from '@shared/constants/triggerColors';
@@ -57,14 +57,14 @@ interface BaseItemProps {
 /**
  * Small status dot indicator.
  */
-export const StatusDot: React.FC<{ status: ItemStatus }> = ({ status }) => {
+export const StatusDot = memo(function StatusDot({ status }: { status: ItemStatus }) {
   return (
     <span
       className="base-item-status-dot inline-block size-1.5 shrink-0 rounded-full"
       style={{ backgroundColor: getStatusDotColor(status) }}
     />
   );
-};
+});
 
 // =============================================================================
 // Main Component
@@ -79,135 +79,142 @@ export const StatusDot: React.FC<{ status: ItemStatus }> = ({ status }) => {
  *
  * Used by: ThinkingItem, TextItem, LinkedToolItem, SlashItem, SubagentItem
  */
-export const BaseItem: React.FC<BaseItemProps> = ({
-  icon,
-  label,
-  summary,
-  tokenCount,
-  tokenLabel = 'tokens',
-  status,
-  durationMs,
-  timestamp,
-  timestampFormat = 'HH:mm:ss',
-  titleText,
-  onClick,
-  isExpanded,
-  hasExpandableContent = true,
-  highlightClasses = '',
-  highlightStyle,
-  notificationDotColor,
-  children,
-}) => {
-  return (
-    <div
-      className={`rounded transition-[background-color,box-shadow] duration-300 ${highlightClasses}`}
-      style={highlightStyle}
-    >
-      {/* Clickable Header */}
+export const BaseItem = memo(
+  ({
+    icon,
+    label,
+    summary,
+    tokenCount,
+    tokenLabel = 'tokens',
+    status,
+    durationMs,
+    timestamp,
+    timestampFormat = 'HH:mm:ss',
+    titleText,
+    onClick,
+    isExpanded,
+    hasExpandableContent = true,
+    highlightClasses = '',
+    highlightStyle,
+    notificationDotColor,
+    children,
+  }: BaseItemProps): React.JSX.Element => {
+    return (
       <div
-        role="button"
-        tabIndex={0}
-        title={titleText}
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            onClick();
-          }
-        }}
-        className="group flex cursor-pointer items-center gap-2 rounded px-2 py-1.5"
-        style={{ backgroundColor: 'transparent' }}
-        onMouseEnter={(e) =>
-          Object.assign(e.currentTarget.style, { backgroundColor: 'var(--tool-item-hover-bg)' })
-        }
-        onMouseLeave={(e) =>
-          Object.assign(e.currentTarget.style, { backgroundColor: 'transparent' })
-        }
+        className={`rounded transition-[background-color,box-shadow] duration-300 ${highlightClasses}`}
+        style={highlightStyle}
       >
-        {/* Icon */}
-        <span className="size-4 shrink-0" style={{ color: TOOL_ITEM_MUTED }}>
-          {icon}
-        </span>
+        {/* Clickable Header */}
+        <div
+          role="button"
+          tabIndex={0}
+          title={titleText}
+          onClick={onClick}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault();
+              onClick();
+            }
+          }}
+          className="group flex cursor-pointer items-center gap-2 rounded px-2 py-1.5"
+          style={{ backgroundColor: 'transparent' }}
+          onMouseEnter={(e) =>
+            Object.assign(e.currentTarget.style, { backgroundColor: 'var(--tool-item-hover-bg)' })
+          }
+          onMouseLeave={(e) =>
+            Object.assign(e.currentTarget.style, { backgroundColor: 'transparent' })
+          }
+        >
+          {/* Icon */}
+          <span className="size-4 shrink-0" style={{ color: TOOL_ITEM_MUTED }}>
+            {icon}
+          </span>
 
-        {/* Label */}
-        <span className="text-sm font-medium" style={{ color: 'var(--tool-item-name)' }}>
-          {label}
-        </span>
+          {/* Label */}
+          <span className="text-sm font-medium" style={{ color: 'var(--tool-item-name)' }}>
+            {label}
+          </span>
 
-        {/* Separator and Summary */}
-        {summary && (
-          <>
-            <span className="text-sm" style={{ color: TOOL_ITEM_MUTED }}>
-              -
+          {/* Separator and Summary */}
+          {summary && (
+            <>
+              <span className="text-sm" style={{ color: TOOL_ITEM_MUTED }}>
+                -
+              </span>
+              <span
+                className="flex-1 truncate text-sm"
+                style={{ color: 'var(--tool-item-summary)' }}
+              >
+                {summary}
+              </span>
+            </>
+          )}
+
+          {/* Spacer if no summary */}
+          {!summary && <span className="flex-1" />}
+
+          {/* Token count badge */}
+          {tokenCount != null && tokenCount > 0 && (
+            <span
+              className="base-item-tokens shrink-0 rounded px-1.5 py-0.5 text-xs"
+              style={{
+                color: TOOL_ITEM_MUTED,
+                backgroundColor: 'var(--tool-item-badge-bg)',
+              }}
+            >
+              ~{formatTokens(tokenCount)} {tokenLabel}
             </span>
-            <span className="flex-1 truncate text-sm" style={{ color: 'var(--tool-item-summary)' }}>
-              {summary}
+          )}
+
+          {/* Status indicator - hidden when notification dot replaces it */}
+          {status && !notificationDotColor && <StatusDot status={status} />}
+
+          {/* Notification dot (replaces status dot when present) */}
+          {notificationDotColor && (
+            <span
+              className="base-item-notification-dot inline-block size-1.5 shrink-0 rounded-full"
+              style={{ backgroundColor: getTriggerColorDef(notificationDotColor).hex }}
+            />
+          )}
+
+          {/* Duration */}
+          {durationMs !== undefined && (
+            <span className="shrink-0 text-xs" style={{ color: TOOL_ITEM_MUTED }}>
+              {formatDuration(durationMs)}
             </span>
-          </>
-        )}
+          )}
 
-        {/* Spacer if no summary */}
-        {!summary && <span className="flex-1" />}
+          {/* Timestamp — rightmost info element */}
+          {timestamp && (
+            <span
+              className="base-item-timestamp shrink-0 text-[11px] tabular-nums"
+              style={{ color: TOOL_ITEM_MUTED }}
+            >
+              {format(timestamp, timestampFormat)}
+            </span>
+          )}
 
-        {/* Token count badge */}
-        {tokenCount != null && tokenCount > 0 && (
-          <span
-            className="base-item-tokens shrink-0 rounded px-1.5 py-0.5 text-xs"
-            style={{
-              color: TOOL_ITEM_MUTED,
-              backgroundColor: 'var(--tool-item-badge-bg)',
-            }}
+          {/* Expand/collapse chevron */}
+          {hasExpandableContent && (
+            <ChevronRight
+              className={`base-item-chevron size-3 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
+              style={{ color: TOOL_ITEM_MUTED }}
+            />
+          )}
+        </div>
+
+        {/* Expanded Content */}
+        {isExpanded && children && (
+          <div
+            className="ml-2 mt-2 min-w-0 space-y-3 pl-6"
+            style={{ borderLeft: '2px solid var(--color-border)' }}
           >
-            ~{formatTokens(tokenCount)} {tokenLabel}
-          </span>
-        )}
-
-        {/* Status indicator - hidden when notification dot replaces it */}
-        {status && !notificationDotColor && <StatusDot status={status} />}
-
-        {/* Notification dot (replaces status dot when present) */}
-        {notificationDotColor && (
-          <span
-            className="base-item-notification-dot inline-block size-1.5 shrink-0 rounded-full"
-            style={{ backgroundColor: getTriggerColorDef(notificationDotColor).hex }}
-          />
-        )}
-
-        {/* Duration */}
-        {durationMs !== undefined && (
-          <span className="shrink-0 text-xs" style={{ color: TOOL_ITEM_MUTED }}>
-            {formatDuration(durationMs)}
-          </span>
-        )}
-
-        {/* Timestamp — rightmost info element */}
-        {timestamp && (
-          <span
-            className="base-item-timestamp shrink-0 text-[11px] tabular-nums"
-            style={{ color: TOOL_ITEM_MUTED }}
-          >
-            {format(timestamp, timestampFormat)}
-          </span>
-        )}
-
-        {/* Expand/collapse chevron */}
-        {hasExpandableContent && (
-          <ChevronRight
-            className={`base-item-chevron size-3 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
-            style={{ color: TOOL_ITEM_MUTED }}
-          />
+            {children}
+          </div>
         )}
       </div>
+    );
+  }
+);
 
-      {/* Expanded Content */}
-      {isExpanded && children && (
-        <div
-          className="ml-2 mt-2 min-w-0 space-y-3 pl-6"
-          style={{ borderLeft: '2px solid var(--color-border)' }}
-        >
-          {children}
-        </div>
-      )}
-    </div>
-  );
-};
+BaseItem.displayName = 'BaseItem';
diff --git a/src/renderer/components/chat/items/ExecutionTrace.tsx b/src/renderer/components/chat/items/ExecutionTrace.tsx
index f13241fd..aaf39889 100644
--- a/src/renderer/components/chat/items/ExecutionTrace.tsx
+++ b/src/renderer/components/chat/items/ExecutionTrace.tsx
@@ -46,234 +46,241 @@ interface ExecutionTraceProps {
 // Execution Trace Component
 // =============================================================================
 
-export const ExecutionTrace: React.FC<ExecutionTraceProps> = ({
-  items,
-  aiGroupId: _aiGroupId,
-  highlightToolUseId,
-  highlightColor,
-  notificationColorMap,
-  searchExpandedItemId,
-  registerToolRef,
-}): React.JSX.Element => {
-  const [manualExpandedItemId, setManualExpandedItemId] = useState<string | null>(null);
+export const ExecutionTrace: React.FC<ExecutionTraceProps> = React.memo(
+  ({
+    items,
+    aiGroupId: _aiGroupId,
+    highlightToolUseId,
+    highlightColor,
+    notificationColorMap,
+    searchExpandedItemId,
+    registerToolRef,
+  }): React.JSX.Element => {
+    const [manualExpandedItemId, setManualExpandedItemId] = useState<string | null>(null);
 
-  // Use searchExpandedItemId if set, otherwise use manually expanded item
-  const expandedItemId = searchExpandedItemId ?? manualExpandedItemId;
+    // Use searchExpandedItemId if set, otherwise use manually expanded item
+    const expandedItemId = searchExpandedItemId ?? manualExpandedItemId;
 
-  const handleItemClick = (itemId: string): void => {
-    setManualExpandedItemId((prev) => (prev === itemId ? null : itemId));
-  };
+    const handleItemClick = (itemId: string): void => {
+      setManualExpandedItemId((prev) => (prev === itemId ? null : itemId));
+    };
+
+    if (!items || items.length === 0) {
+      return (
+        <div className="px-3 py-2 text-xs" style={{ color: CARD_ICON_MUTED }}>
+          No execution items
+        </div>
+      );
+    }
 
-  if (!items || items.length === 0) {
     return (
-      <div className="px-3 py-2 text-xs" style={{ color: CARD_ICON_MUTED }}>
-        No execution items
+      <div className="space-y-1">
+        {items.map((item, index) => {
+          switch (item.type) {
+            case 'thinking': {
+              const itemId = `subagent-thinking-${index}`;
+              const thinkingStep = {
+                id: itemId,
+                type: 'thinking' as const,
+                startTime: item.timestamp,
+                endTime: item.timestamp,
+                durationMs: 0,
+                content: { thinkingText: item.content, tokenCount: item.tokenCount },
+                tokens: { input: 0, output: item.tokenCount ?? 0 },
+                context: 'subagent' as const,
+              };
+              const preview = truncateText(item.content, 150);
+              const isExpanded = expandedItemId === itemId;
+              return (
+                <ThinkingItem
+                  key={itemId}
+                  step={thinkingStep}
+                  preview={preview}
+                  onClick={() => handleItemClick(itemId)}
+                  isExpanded={isExpanded}
+                  timestamp={item.timestamp}
+                />
+              );
+            }
+
+            case 'output': {
+              const itemId = `subagent-output-${index}`;
+              const textStep = {
+                id: itemId,
+                type: 'output' as const,
+                startTime: item.timestamp,
+                endTime: item.timestamp,
+                durationMs: 0,
+                content: { outputText: item.content, tokenCount: item.tokenCount },
+                tokens: { input: 0, output: item.tokenCount ?? 0 },
+                context: 'subagent' as const,
+              };
+              const preview = truncateText(item.content, 150);
+              const isExpanded = expandedItemId === itemId;
+              return (
+                <TextItem
+                  key={itemId}
+                  step={textStep}
+                  preview={preview}
+                  onClick={() => handleItemClick(itemId)}
+                  isExpanded={isExpanded}
+                  timestamp={item.timestamp}
+                />
+              );
+            }
+
+            case 'tool': {
+              const itemId = `subagent-tool-${item.tool.id}`;
+              const isExpanded = expandedItemId === itemId;
+              const isHighlighted = highlightToolUseId === item.tool.id;
+              return (
+                <LinkedToolItem
+                  key={itemId}
+                  linkedTool={item.tool}
+                  onClick={() => handleItemClick(itemId)}
+                  isExpanded={isExpanded}
+                  timestamp={item.tool.startTime}
+                  isHighlighted={isHighlighted}
+                  highlightColor={highlightColor}
+                  notificationDotColor={notificationColorMap?.get(item.tool.id)}
+                  registerRef={
+                    registerToolRef ? (el) => registerToolRef(item.tool.id, el) : undefined
+                  }
+                />
+              );
+            }
+
+            case 'subagent':
+              return (
+                <div
+                  key={`nested-subagent-${index}`}
+                  className="px-2 py-1 text-xs"
+                  style={{ color: CARD_ICON_MUTED }}
+                >
+                  Nested: {item.subagent.description ?? item.subagent.id}
+                </div>
+              );
+
+            case 'subagent_input': {
+              const itemId = `subagent-input-${index}`;
+              const isExpanded = expandedItemId === itemId;
+              return (
+                <BaseItem
+                  key={itemId}
+                  icon={<MailOpen className="size-4" />}
+                  label="Input"
+                  summary={truncateText(item.content, 80)}
+                  tokenCount={item.tokenCount}
+                  timestamp={item.timestamp}
+                  onClick={() => handleItemClick(itemId)}
+                  isExpanded={isExpanded}
+                >
+                  <MarkdownViewer content={item.content} copyable />
+                </BaseItem>
+              );
+            }
+
+            case 'teammate_message': {
+              const itemId = `subagent-teammate-${item.teammateMessage.id}-${index}`;
+              const isExpanded = expandedItemId === itemId;
+              return (
+                <TeammateMessageItem
+                  key={itemId}
+                  teammateMessage={item.teammateMessage}
+                  onClick={() => handleItemClick(itemId)}
+                  isExpanded={isExpanded}
+                />
+              );
+            }
+
+            case 'compact_boundary': {
+              const itemId = `subagent-compact-${index}`;
+              const isExpanded = expandedItemId === itemId;
+              return (
+                <div key={itemId}>
+                  {/* Header — matches CompactBoundary.tsx amber styling */}
+                  <button
+                    onClick={() => handleItemClick(itemId)}
+                    className="group flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-2 transition-all duration-200"
+                    style={{
+                      backgroundColor: TOOL_CALL_BG,
+                      border: `1px solid ${TOOL_CALL_BORDER}`,
+                    }}
+                    aria-expanded={isExpanded}
+                  >
+                    <div
+                      className="flex shrink-0 items-center gap-1.5"
+                      style={{ color: TOOL_CALL_TEXT }}
+                    >
+                      <ChevronRight
+                        size={14}
+                        className={`transition-transform duration-200 ${isExpanded ? 'rotate-90' : ''}`}
+                      />
+                      <Layers size={14} />
+                    </div>
+                    <span
+                      className="shrink-0 text-xs font-medium"
+                      style={{ color: TOOL_CALL_TEXT }}
+                    >
+                      Compacted
+                    </span>
+                    {item.tokenDelta && (
+                      <span
+                        className="min-w-0 truncate text-[11px] tabular-nums"
+                        style={{ color: COLOR_TEXT_MUTED }}
+                      >
+                        {formatTokensCompact(item.tokenDelta.preCompactionTokens)} →{' '}
+                        {formatTokensCompact(item.tokenDelta.postCompactionTokens)}
+                        <span style={{ color: '#4ade80' }}>
+                          {' '}
+                          ({formatTokensCompact(Math.abs(item.tokenDelta.delta))} freed)
+                        </span>
+                      </span>
+                    )}
+                    <span
+                      className="shrink-0 rounded px-1.5 py-0.5 text-[10px]"
+                      style={{
+                        backgroundColor: 'rgba(99, 102, 241, 0.15)',
+                        color: '#818cf8',
+                      }}
+                    >
+                      Phase {item.phaseNumber}
+                    </span>
+                    <span
+                      className="ml-auto shrink-0 text-[11px]"
+                      style={{ color: COLOR_TEXT_MUTED }}
+                    >
+                      {format(new Date(item.timestamp), 'h:mm:ss a')}
+                    </span>
+                  </button>
+                  {/* Expanded content */}
+                  {isExpanded && item.content && (
+                    <div
+                      className="mt-1 overflow-hidden rounded-lg"
+                      style={{
+                        backgroundColor: CODE_BG,
+                        border: `1px solid ${CODE_BORDER}`,
+                      }}
+                    >
+                      <div
+                        className="max-h-64 overflow-y-auto border-l-2 px-3 py-2"
+                        style={{ borderColor: 'var(--chat-ai-border)' }}
+                      >
+                        <MarkdownViewer content={item.content} copyable />
+                      </div>
+                    </div>
+                  )}
+                </div>
+              );
+            }
+
+            default:
+              return null;
+          }
+        })}
       </div>
     );
   }
+);
 
-  return (
-    <div className="space-y-1">
-      {items.map((item, index) => {
-        switch (item.type) {
-          case 'thinking': {
-            const itemId = `subagent-thinking-${index}`;
-            const thinkingStep = {
-              id: itemId,
-              type: 'thinking' as const,
-              startTime: item.timestamp,
-              endTime: item.timestamp,
-              durationMs: 0,
-              content: { thinkingText: item.content, tokenCount: item.tokenCount },
-              tokens: { input: 0, output: item.tokenCount ?? 0 },
-              context: 'subagent' as const,
-            };
-            const preview = truncateText(item.content, 150);
-            const isExpanded = expandedItemId === itemId;
-            return (
-              <ThinkingItem
-                key={itemId}
-                step={thinkingStep}
-                preview={preview}
-                onClick={() => handleItemClick(itemId)}
-                isExpanded={isExpanded}
-                timestamp={item.timestamp}
-              />
-            );
-          }
-
-          case 'output': {
-            const itemId = `subagent-output-${index}`;
-            const textStep = {
-              id: itemId,
-              type: 'output' as const,
-              startTime: item.timestamp,
-              endTime: item.timestamp,
-              durationMs: 0,
-              content: { outputText: item.content, tokenCount: item.tokenCount },
-              tokens: { input: 0, output: item.tokenCount ?? 0 },
-              context: 'subagent' as const,
-            };
-            const preview = truncateText(item.content, 150);
-            const isExpanded = expandedItemId === itemId;
-            return (
-              <TextItem
-                key={itemId}
-                step={textStep}
-                preview={preview}
-                onClick={() => handleItemClick(itemId)}
-                isExpanded={isExpanded}
-                timestamp={item.timestamp}
-              />
-            );
-          }
-
-          case 'tool': {
-            const itemId = `subagent-tool-${item.tool.id}`;
-            const isExpanded = expandedItemId === itemId;
-            const isHighlighted = highlightToolUseId === item.tool.id;
-            return (
-              <LinkedToolItem
-                key={itemId}
-                linkedTool={item.tool}
-                onClick={() => handleItemClick(itemId)}
-                isExpanded={isExpanded}
-                timestamp={item.tool.startTime}
-                isHighlighted={isHighlighted}
-                highlightColor={highlightColor}
-                notificationDotColor={notificationColorMap?.get(item.tool.id)}
-                registerRef={
-                  registerToolRef ? (el) => registerToolRef(item.tool.id, el) : undefined
-                }
-              />
-            );
-          }
-
-          case 'subagent':
-            return (
-              <div
-                key={`nested-subagent-${index}`}
-                className="px-2 py-1 text-xs"
-                style={{ color: CARD_ICON_MUTED }}
-              >
-                Nested: {item.subagent.description ?? item.subagent.id}
-              </div>
-            );
-
-          case 'subagent_input': {
-            const itemId = `subagent-input-${index}`;
-            const isExpanded = expandedItemId === itemId;
-            return (
-              <BaseItem
-                key={itemId}
-                icon={<MailOpen className="size-4" />}
-                label="Input"
-                summary={truncateText(item.content, 80)}
-                tokenCount={item.tokenCount}
-                timestamp={item.timestamp}
-                onClick={() => handleItemClick(itemId)}
-                isExpanded={isExpanded}
-              >
-                <MarkdownViewer content={item.content} copyable />
-              </BaseItem>
-            );
-          }
-
-          case 'teammate_message': {
-            const itemId = `subagent-teammate-${item.teammateMessage.id}-${index}`;
-            const isExpanded = expandedItemId === itemId;
-            return (
-              <TeammateMessageItem
-                key={itemId}
-                teammateMessage={item.teammateMessage}
-                onClick={() => handleItemClick(itemId)}
-                isExpanded={isExpanded}
-              />
-            );
-          }
-
-          case 'compact_boundary': {
-            const itemId = `subagent-compact-${index}`;
-            const isExpanded = expandedItemId === itemId;
-            return (
-              <div key={itemId}>
-                {/* Header — matches CompactBoundary.tsx amber styling */}
-                <button
-                  onClick={() => handleItemClick(itemId)}
-                  className="group flex w-full cursor-pointer items-center gap-2 rounded-lg px-3 py-2 transition-all duration-200"
-                  style={{
-                    backgroundColor: TOOL_CALL_BG,
-                    border: `1px solid ${TOOL_CALL_BORDER}`,
-                  }}
-                  aria-expanded={isExpanded}
-                >
-                  <div
-                    className="flex shrink-0 items-center gap-1.5"
-                    style={{ color: TOOL_CALL_TEXT }}
-                  >
-                    <ChevronRight
-                      size={14}
-                      className={`transition-transform duration-200 ${isExpanded ? 'rotate-90' : ''}`}
-                    />
-                    <Layers size={14} />
-                  </div>
-                  <span className="shrink-0 text-xs font-medium" style={{ color: TOOL_CALL_TEXT }}>
-                    Compacted
-                  </span>
-                  {item.tokenDelta && (
-                    <span
-                      className="min-w-0 truncate text-[11px] tabular-nums"
-                      style={{ color: COLOR_TEXT_MUTED }}
-                    >
-                      {formatTokensCompact(item.tokenDelta.preCompactionTokens)} →{' '}
-                      {formatTokensCompact(item.tokenDelta.postCompactionTokens)}
-                      <span style={{ color: '#4ade80' }}>
-                        {' '}
-                        ({formatTokensCompact(Math.abs(item.tokenDelta.delta))} freed)
-                      </span>
-                    </span>
-                  )}
-                  <span
-                    className="shrink-0 rounded px-1.5 py-0.5 text-[10px]"
-                    style={{
-                      backgroundColor: 'rgba(99, 102, 241, 0.15)',
-                      color: '#818cf8',
-                    }}
-                  >
-                    Phase {item.phaseNumber}
-                  </span>
-                  <span
-                    className="ml-auto shrink-0 text-[11px]"
-                    style={{ color: COLOR_TEXT_MUTED }}
-                  >
-                    {format(new Date(item.timestamp), 'h:mm:ss a')}
-                  </span>
-                </button>
-                {/* Expanded content */}
-                {isExpanded && item.content && (
-                  <div
-                    className="mt-1 overflow-hidden rounded-lg"
-                    style={{
-                      backgroundColor: CODE_BG,
-                      border: `1px solid ${CODE_BORDER}`,
-                    }}
-                  >
-                    <div
-                      className="max-h-64 overflow-y-auto border-l-2 px-3 py-2"
-                      style={{ borderColor: 'var(--chat-ai-border)' }}
-                    >
-                      <MarkdownViewer content={item.content} copyable />
-                    </div>
-                  </div>
-                )}
-              </div>
-            );
-          }
-
-          default:
-            return null;
-        }
-      })}
-    </div>
-  );
-};
+ExecutionTrace.displayName = 'ExecutionTrace';
diff --git a/src/renderer/components/chat/items/LinkedToolItem.tsx b/src/renderer/components/chat/items/LinkedToolItem.tsx
index 336ce076..2b9af00e 100644
--- a/src/renderer/components/chat/items/LinkedToolItem.tsx
+++ b/src/renderer/components/chat/items/LinkedToolItem.tsx
@@ -6,7 +6,7 @@
  * for summary generation and token calculation.
  */
 
-import React, { useRef } from 'react';
+import React, { memo, useRef } from 'react';
 
 import { CARD_ICON_MUTED } from '@renderer/constants/cssVariables';
 import { getTeamColorSet, getThemedBadge } from '@renderer/constants/teamColors';
@@ -64,173 +64,177 @@ interface LinkedToolItemProps {
   titleText?: string;
 }
 
-export const LinkedToolItem: React.FC<LinkedToolItemProps> = ({
-  linkedTool,
-  onClick,
-  isExpanded,
-  timestamp,
-  timestampFormat,
-  searchQueryOverride,
-  isHighlighted,
-  highlightColor,
-  notificationDotColor,
-  registerRef,
-  titleText,
-}) => {
-  const status = getToolStatus(linkedTool);
-  const { isLight } = useTheme();
-  const summary = getToolSummary(linkedTool.name, linkedTool.input);
-  const normalizedToolName = linkedTool.name.toLowerCase();
-  const summaryNode =
-    searchQueryOverride && searchQueryOverride.trim().length > 0
-      ? highlightQueryInText(
-          summary,
-          searchQueryOverride,
-          `${linkedTool.id ?? linkedTool.name}:summary`,
-          {
-            forceAllActive: true,
-          }
-        )
-      : summary;
-  const elementRef = useRef<HTMLDivElement>(null);
+export const LinkedToolItem = memo(
+  ({
+    linkedTool,
+    onClick,
+    isExpanded,
+    timestamp,
+    timestampFormat,
+    searchQueryOverride,
+    isHighlighted,
+    highlightColor,
+    notificationDotColor,
+    registerRef,
+    titleText,
+  }: LinkedToolItemProps): React.JSX.Element => {
+    const status = getToolStatus(linkedTool);
+    const { isLight } = useTheme();
+    const summary = getToolSummary(linkedTool.name, linkedTool.input);
+    const normalizedToolName = linkedTool.name.toLowerCase();
+    const summaryNode =
+      searchQueryOverride && searchQueryOverride.trim().length > 0
+        ? highlightQueryInText(
+            summary,
+            searchQueryOverride,
+            `${linkedTool.id ?? linkedTool.name}:summary`,
+            {
+              forceAllActive: true,
+            }
+          )
+        : summary;
+    const elementRef = useRef<HTMLDivElement>(null);
 
-  // Combined ref callback - handles both internal ref and external registration
-  const handleRef = (el: HTMLDivElement | null): void => {
-    // Update internal ref
-    (elementRef as React.MutableRefObject<HTMLDivElement | null>).current = el;
-    // Call external registration if provided
-    registerRef?.(el);
-  };
+    // Combined ref callback - handles both internal ref and external registration
+    const handleRef = (el: HTMLDivElement | null): void => {
+      // Update internal ref
+      (elementRef as React.MutableRefObject<HTMLDivElement | null>).current = el;
+      // Call external registration if provided
+      registerRef?.(el);
+    };
 
-  // Render teammate_spawned results as a minimal inline row
-  const isTeammateSpawned = linkedTool.result?.toolUseResult?.status === 'teammate_spawned';
-  if (isTeammateSpawned) {
-    const teamResult = linkedTool.result!.toolUseResult!;
-    const name = (teamResult.name as string) || 'teammate';
-    const color = (teamResult.color as string) || '';
-    const colors = getTeamColorSet(color);
-    return (
-      <div ref={handleRef} className="flex items-center gap-2 px-3 py-1.5">
-        <span className="size-2.5 rounded-full" style={{ backgroundColor: colors.border }} />
-        <span
-          className="rounded px-1.5 py-0.5 text-[10px] font-medium"
-          style={{ backgroundColor: getThemedBadge(colors, isLight), color: colors.text }}
-        >
-          {name}
-        </span>
-        <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
-          Teammate spawned
-        </span>
-      </div>
-    );
-  }
-
-  // Render SendMessage shutdown_request as a minimal inline row
-  const isShutdownRequest =
-    linkedTool.name === 'SendMessage' && linkedTool.input?.type === 'shutdown_request';
-  if (isShutdownRequest) {
-    const target = (linkedTool.input?.recipient as string) || 'teammate';
-    return (
-      <div ref={handleRef} className="flex items-center gap-2 px-3 py-1.5">
-        <span className="size-2 rounded-full bg-zinc-500" />
-        <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
-          Shutdown requested &rarr;{' '}
-          <span className="font-medium text-text-secondary">{target}</span>
-        </span>
-      </div>
-    );
-  }
-
-  // Note: We no longer scroll locally - the navigation coordinator handles this
-  // via the registered ref. This prevents double-scroll issues.
-
-  // Highlight animation for error deep linking (supports custom hex)
-  const effectiveColor = highlightColor ?? 'red';
-  let highlightClasses = '';
-  let highlightStyle: React.CSSProperties | undefined;
-  if (isHighlighted) {
-    if (isPresetColorKey(effectiveColor)) {
-      highlightClasses = TOOL_HIGHLIGHT_CLASSES[effectiveColor];
-    } else {
-      const hp = getToolHighlightProps(effectiveColor);
-      highlightClasses = hp.className;
-      highlightStyle = hp.style;
-    }
-  }
-
-  // Determine which specialized viewer to use
-  const useReadViewer =
-    normalizedToolName === 'read' && hasReadContent(linkedTool) && !linkedTool.result?.isError;
-  const useEditViewer = normalizedToolName === 'edit' && hasEditContent(linkedTool);
-  const useWriteViewer =
-    normalizedToolName === 'write' && hasWriteContent(linkedTool) && !linkedTool.result?.isError;
-  const useSkillViewer = linkedTool.name === 'Skill' && hasSkillInstructions(linkedTool);
-  const useDefaultViewer = !useReadViewer && !useEditViewer && !useWriteViewer && !useSkillViewer;
-
-  // Check if we should show error display for Read/Write tools
-  const showReadError = normalizedToolName === 'read' && linkedTool.result?.isError;
-  const showWriteError = normalizedToolName === 'write' && linkedTool.result?.isError;
-
-  return (
-    <div ref={handleRef}>
-      <BaseItem
-        icon={
-          <Wrench
-            className="size-4"
-            style={{ color: isHighlighted ? getTriggerColorDef(highlightColor).hex : undefined }}
-          />
-        }
-        label={linkedTool.name}
-        summary={summaryNode}
-        tokenCount={getToolContextTokens(linkedTool)}
-        status={status}
-        durationMs={linkedTool.durationMs}
-        timestamp={timestamp}
-        timestampFormat={timestampFormat}
-        titleText={titleText}
-        onClick={onClick}
-        isExpanded={isExpanded}
-        highlightClasses={highlightClasses}
-        highlightStyle={highlightStyle}
-        notificationDotColor={notificationDotColor}
-      >
-        {/* Read tool with CodeBlockViewer */}
-        {useReadViewer && <ReadToolViewer linkedTool={linkedTool} />}
-
-        {/* Edit tool with DiffViewer */}
-        {useEditViewer && <EditToolViewer linkedTool={linkedTool} status={status} />}
-
-        {/* Write tool */}
-        {useWriteViewer && <WriteToolViewer linkedTool={linkedTool} />}
-
-        {/* Skill tool with instructions */}
-        {useSkillViewer && <SkillToolViewer linkedTool={linkedTool} />}
-
-        {/* Default rendering for other tools */}
-        {useDefaultViewer && <DefaultToolViewer linkedTool={linkedTool} status={status} />}
-
-        {/* Error output for Read tool */}
-        {showReadError && <ToolErrorDisplay linkedTool={linkedTool} />}
-
-        {/* Error output for Write tool */}
-        {showWriteError && <ToolErrorDisplay linkedTool={linkedTool} />}
-
-        {/* Orphaned indicator */}
-        {linkedTool.isOrphaned && (
-          <div
-            className="flex items-center gap-2 text-xs italic"
-            style={{ color: 'var(--tool-item-muted)' }}
+    // Render teammate_spawned results as a minimal inline row
+    const isTeammateSpawned = linkedTool.result?.toolUseResult?.status === 'teammate_spawned';
+    if (isTeammateSpawned) {
+      const teamResult = linkedTool.result!.toolUseResult!;
+      const name = (teamResult.name as string) || 'teammate';
+      const color = (teamResult.color as string) || '';
+      const colors = getTeamColorSet(color);
+      return (
+        <div ref={handleRef} className="flex items-center gap-2 px-3 py-1.5">
+          <span className="size-2.5 rounded-full" style={{ backgroundColor: colors.border }} />
+          <span
+            className="rounded px-1.5 py-0.5 text-[10px] font-medium"
+            style={{ backgroundColor: getThemedBadge(colors, isLight), color: colors.text }}
           >
-            <StatusDot status="orphaned" />
-            No result received
-          </div>
-        )}
-
-        {/* Timing */}
-        <div className="text-xs" style={{ color: 'var(--tool-item-muted)' }}>
-          Duration: {formatDuration(linkedTool.durationMs)}
+            {name}
+          </span>
+          <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
+            Teammate spawned
+          </span>
         </div>
-      </BaseItem>
-    </div>
-  );
-};
+      );
+    }
+
+    // Render SendMessage shutdown_request as a minimal inline row
+    const isShutdownRequest =
+      linkedTool.name === 'SendMessage' && linkedTool.input?.type === 'shutdown_request';
+    if (isShutdownRequest) {
+      const target = (linkedTool.input?.recipient as string) || 'teammate';
+      return (
+        <div ref={handleRef} className="flex items-center gap-2 px-3 py-1.5">
+          <span className="size-2 rounded-full bg-zinc-500" />
+          <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
+            Shutdown requested &rarr;{' '}
+            <span className="font-medium text-text-secondary">{target}</span>
+          </span>
+        </div>
+      );
+    }
+
+    // Note: We no longer scroll locally - the navigation coordinator handles this
+    // via the registered ref. This prevents double-scroll issues.
+
+    // Highlight animation for error deep linking (supports custom hex)
+    const effectiveColor = highlightColor ?? 'red';
+    let highlightClasses = '';
+    let highlightStyle: React.CSSProperties | undefined;
+    if (isHighlighted) {
+      if (isPresetColorKey(effectiveColor)) {
+        highlightClasses = TOOL_HIGHLIGHT_CLASSES[effectiveColor];
+      } else {
+        const hp = getToolHighlightProps(effectiveColor);
+        highlightClasses = hp.className;
+        highlightStyle = hp.style;
+      }
+    }
+
+    // Determine which specialized viewer to use
+    const useReadViewer =
+      normalizedToolName === 'read' && hasReadContent(linkedTool) && !linkedTool.result?.isError;
+    const useEditViewer = normalizedToolName === 'edit' && hasEditContent(linkedTool);
+    const useWriteViewer =
+      normalizedToolName === 'write' && hasWriteContent(linkedTool) && !linkedTool.result?.isError;
+    const useSkillViewer = linkedTool.name === 'Skill' && hasSkillInstructions(linkedTool);
+    const useDefaultViewer = !useReadViewer && !useEditViewer && !useWriteViewer && !useSkillViewer;
+
+    // Check if we should show error display for Read/Write tools
+    const showReadError = normalizedToolName === 'read' && linkedTool.result?.isError;
+    const showWriteError = normalizedToolName === 'write' && linkedTool.result?.isError;
+
+    return (
+      <div ref={handleRef}>
+        <BaseItem
+          icon={
+            <Wrench
+              className="size-4"
+              style={{ color: isHighlighted ? getTriggerColorDef(highlightColor).hex : undefined }}
+            />
+          }
+          label={linkedTool.name}
+          summary={summaryNode}
+          tokenCount={getToolContextTokens(linkedTool)}
+          status={status}
+          durationMs={linkedTool.durationMs}
+          timestamp={timestamp}
+          timestampFormat={timestampFormat}
+          titleText={titleText}
+          onClick={onClick}
+          isExpanded={isExpanded}
+          highlightClasses={highlightClasses}
+          highlightStyle={highlightStyle}
+          notificationDotColor={notificationDotColor}
+        >
+          {/* Read tool with CodeBlockViewer */}
+          {useReadViewer && <ReadToolViewer linkedTool={linkedTool} />}
+
+          {/* Edit tool with DiffViewer */}
+          {useEditViewer && <EditToolViewer linkedTool={linkedTool} status={status} />}
+
+          {/* Write tool */}
+          {useWriteViewer && <WriteToolViewer linkedTool={linkedTool} />}
+
+          {/* Skill tool with instructions */}
+          {useSkillViewer && <SkillToolViewer linkedTool={linkedTool} />}
+
+          {/* Default rendering for other tools */}
+          {useDefaultViewer && <DefaultToolViewer linkedTool={linkedTool} status={status} />}
+
+          {/* Error output for Read tool */}
+          {showReadError && <ToolErrorDisplay linkedTool={linkedTool} />}
+
+          {/* Error output for Write tool */}
+          {showWriteError && <ToolErrorDisplay linkedTool={linkedTool} />}
+
+          {/* Orphaned indicator */}
+          {linkedTool.isOrphaned && (
+            <div
+              className="flex items-center gap-2 text-xs italic"
+              style={{ color: 'var(--tool-item-muted)' }}
+            >
+              <StatusDot status="orphaned" />
+              No result received
+            </div>
+          )}
+
+          {/* Timing */}
+          <div className="text-xs" style={{ color: 'var(--tool-item-muted)' }}>
+            Duration: {formatDuration(linkedTool.durationMs)}
+          </div>
+        </BaseItem>
+      </div>
+    );
+  }
+);
+
+LinkedToolItem.displayName = 'LinkedToolItem';
diff --git a/src/renderer/components/chat/items/MetricsPill.tsx b/src/renderer/components/chat/items/MetricsPill.tsx
index 22c083aa..e6a31c61 100644
--- a/src/renderer/components/chat/items/MetricsPill.tsx
+++ b/src/renderer/components/chat/items/MetricsPill.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useRef, useState } from 'react';
+import React, { memo, useEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import {
@@ -41,175 +41,179 @@ interface MetricsPillProps {
 // Unified Metrics Pill - Compact monospace pill with tooltip
 // =============================================================================
 
-export const MetricsPill = ({
-  mainSessionImpact,
-  lastUsage,
-  isolatedLabel,
-  isolatedOverride,
-  phaseBreakdown,
-}: Readonly<MetricsPillProps>): React.ReactElement | null => {
-  const [showTooltip, setShowTooltip] = useState(false);
-  const [tooltipStyle, setTooltipStyle] = useState<React.CSSProperties>({});
-  const containerRef = useRef<HTMLDivElement>(null);
-  const hideTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
+export const MetricsPill = memo(
+  ({
+    mainSessionImpact,
+    lastUsage,
+    isolatedLabel,
+    isolatedOverride,
+    phaseBreakdown,
+  }: Readonly<MetricsPillProps>): React.ReactElement | null => {
+    const [showTooltip, setShowTooltip] = useState(false);
+    const [tooltipStyle, setTooltipStyle] = useState<React.CSSProperties>({});
+    const containerRef = useRef<HTMLDivElement>(null);
+    const hideTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
-  const hasMainImpact = mainSessionImpact && mainSessionImpact.totalTokens > 0;
-  const hasIsolated =
-    isolatedOverride != null
-      ? isolatedOverride > 0
-      : lastUsage && lastUsage.input_tokens + lastUsage.output_tokens > 0;
+    const hasMainImpact = mainSessionImpact && mainSessionImpact.totalTokens > 0;
+    const hasIsolated =
+      isolatedOverride != null
+        ? isolatedOverride > 0
+        : lastUsage && lastUsage.input_tokens + lastUsage.output_tokens > 0;
 
-  const isolatedTotal =
-    isolatedOverride ??
-    (lastUsage
-      ? lastUsage.input_tokens +
-        lastUsage.output_tokens +
-        (lastUsage.cache_read_input_tokens ?? 0) +
-        (lastUsage.cache_creation_input_tokens ?? 0)
-      : 0);
+    const isolatedTotal =
+      isolatedOverride ??
+      (lastUsage
+        ? lastUsage.input_tokens +
+          lastUsage.output_tokens +
+          (lastUsage.cache_read_input_tokens ?? 0) +
+          (lastUsage.cache_creation_input_tokens ?? 0)
+        : 0);
 
-  const hasPhases = phaseBreakdown && phaseBreakdown.length > 1;
+    const hasPhases = phaseBreakdown && phaseBreakdown.length > 1;
 
-  const clearHideTimeout = (): void => {
-    if (hideTimeoutRef.current) {
-      clearTimeout(hideTimeoutRef.current);
-      hideTimeoutRef.current = null;
-    }
-  };
-
-  const handleMouseEnter = (): void => {
-    clearHideTimeout();
-    setShowTooltip(true);
-  };
-
-  const handleMouseLeave = (): void => {
-    clearHideTimeout();
-    hideTimeoutRef.current = setTimeout(() => setShowTooltip(false), 100);
-  };
-
-  useEffect(() => {
-    if (showTooltip && containerRef.current) {
-      const rect = containerRef.current.getBoundingClientRect();
-      const tooltipWidth = 220;
-      let left = rect.left + rect.width / 2 - tooltipWidth / 2;
-      if (left < 8) left = 8;
-      if (left + tooltipWidth > window.innerWidth - 8) {
-        left = window.innerWidth - tooltipWidth - 8;
+    const clearHideTimeout = (): void => {
+      if (hideTimeoutRef.current) {
+        clearTimeout(hideTimeoutRef.current);
+        hideTimeoutRef.current = null;
       }
-      setTooltipStyle({
-        position: 'fixed',
-        bottom: window.innerHeight - rect.top + 6,
-        left,
-        width: tooltipWidth,
-        zIndex: 99999,
-      });
+    };
+
+    const handleMouseEnter = (): void => {
+      clearHideTimeout();
+      setShowTooltip(true);
+    };
+
+    const handleMouseLeave = (): void => {
+      clearHideTimeout();
+      hideTimeoutRef.current = setTimeout(() => setShowTooltip(false), 100);
+    };
+
+    useEffect(() => {
+      if (showTooltip && containerRef.current) {
+        const rect = containerRef.current.getBoundingClientRect();
+        const tooltipWidth = 220;
+        let left = rect.left + rect.width / 2 - tooltipWidth / 2;
+        if (left < 8) left = 8;
+        if (left + tooltipWidth > window.innerWidth - 8) {
+          left = window.innerWidth - tooltipWidth - 8;
+        }
+        setTooltipStyle({
+          position: 'fixed',
+          bottom: window.innerHeight - rect.top + 6,
+          left,
+          width: tooltipWidth,
+          zIndex: 99999,
+        });
+      }
+    }, [showTooltip]);
+
+    useEffect(() => {
+      if (!showTooltip) return;
+      const handleScroll = (): void => setShowTooltip(false);
+      window.addEventListener('scroll', handleScroll, true);
+      return () => window.removeEventListener('scroll', handleScroll, true);
+    }, [showTooltip]);
+
+    useEffect(() => {
+      return () => clearHideTimeout();
+    }, []);
+
+    if (!hasMainImpact && !hasIsolated) {
+      return null;
     }
-  }, [showTooltip]);
 
-  useEffect(() => {
-    if (!showTooltip) return;
-    const handleScroll = (): void => setShowTooltip(false);
-    window.addEventListener('scroll', handleScroll, true);
-    return () => window.removeEventListener('scroll', handleScroll, true);
-  }, [showTooltip]);
+    const mainValue = hasMainImpact ? formatTokensCompact(mainSessionImpact.totalTokens) : null;
+    const isolatedValue = hasIsolated ? formatTokensCompact(isolatedTotal) : null;
+    const rightLabel = isolatedLabel ?? 'Subagent Context';
 
-  useEffect(() => {
-    return () => clearHideTimeout();
-  }, []);
+    return (
+      <>
+        <div
+          ref={containerRef}
+          role="tooltip"
+          className="inline-flex cursor-default items-center gap-1 rounded px-1.5 py-0.5 font-mono text-[11px]"
+          style={{
+            backgroundColor: TAG_BG,
+            border: `1px solid ${TAG_BORDER}`,
+            color: TAG_TEXT,
+          }}
+          onMouseEnter={handleMouseEnter}
+          onMouseLeave={handleMouseLeave}
+        >
+          {mainValue && <span className="tabular-nums">{mainValue}</span>}
+          {mainValue && isolatedValue && <span style={{ color: CARD_SEPARATOR }}>|</span>}
+          {isolatedValue && <span className="tabular-nums">{isolatedValue}</span>}
+        </div>
 
-  if (!hasMainImpact && !hasIsolated) {
-    return null;
-  }
-
-  const mainValue = hasMainImpact ? formatTokensCompact(mainSessionImpact.totalTokens) : null;
-  const isolatedValue = hasIsolated ? formatTokensCompact(isolatedTotal) : null;
-  const rightLabel = isolatedLabel ?? 'Subagent Context';
-
-  return (
-    <>
-      <div
-        ref={containerRef}
-        role="tooltip"
-        className="inline-flex cursor-default items-center gap-1 rounded px-1.5 py-0.5 font-mono text-[11px]"
-        style={{
-          backgroundColor: TAG_BG,
-          border: `1px solid ${TAG_BORDER}`,
-          color: TAG_TEXT,
-        }}
-        onMouseEnter={handleMouseEnter}
-        onMouseLeave={handleMouseLeave}
-      >
-        {mainValue && <span className="tabular-nums">{mainValue}</span>}
-        {mainValue && isolatedValue && <span style={{ color: CARD_SEPARATOR }}>|</span>}
-        {isolatedValue && <span className="tabular-nums">{isolatedValue}</span>}
-      </div>
-
-      {showTooltip &&
-        createPortal(
-          <div
-            role="tooltip"
-            className="rounded-md bg-surface-overlay p-2 text-[11px] shadow-xl"
-            style={{
-              ...tooltipStyle,
-              border: `1px solid ${TAG_BORDER}`,
-            }}
-            onMouseEnter={handleMouseEnter}
-            onMouseLeave={handleMouseLeave}
-          >
-            <div className="space-y-1">
-              {hasMainImpact && (
-                <div className="flex items-center justify-between gap-3">
-                  <span style={{ color: COLOR_TEXT_MUTED }}>Main Context</span>
-                  <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
-                    {mainSessionImpact.totalTokens.toLocaleString()}
-                  </span>
-                </div>
-              )}
-              {hasIsolated && (
-                <div className="flex items-center justify-between gap-3">
-                  <span style={{ color: COLOR_TEXT_MUTED }}>{rightLabel}</span>
-                  <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
-                    {isolatedTotal.toLocaleString()}
-                  </span>
-                </div>
-              )}
-              {hasPhases &&
-                phaseBreakdown.map((phase) => (
-                  <div
-                    key={phase.phaseNumber}
-                    className="flex items-center justify-between gap-3 pl-2"
-                  >
-                    <span className="text-[10px]" style={{ color: CARD_ICON_MUTED }}>
-                      Phase {phase.phaseNumber}
-                    </span>
-                    <span
-                      className="font-mono text-[10px] tabular-nums"
-                      style={{ color: CARD_ICON_MUTED }}
-                    >
-                      {formatTokensCompact(phase.peakTokens)}
-                      {phase.postCompaction != null && (
-                        <span style={{ color: '#4ade80' }}>
-                          {' '}
-                          → {formatTokensCompact(phase.postCompaction)}
-                        </span>
-                      )}
+        {showTooltip &&
+          createPortal(
+            <div
+              role="tooltip"
+              className="rounded-md bg-surface-overlay p-2 text-[11px] shadow-xl"
+              style={{
+                ...tooltipStyle,
+                border: `1px solid ${TAG_BORDER}`,
+              }}
+              onMouseEnter={handleMouseEnter}
+              onMouseLeave={handleMouseLeave}
+            >
+              <div className="space-y-1">
+                {hasMainImpact && (
+                  <div className="flex items-center justify-between gap-3">
+                    <span style={{ color: COLOR_TEXT_MUTED }}>Main Context</span>
+                    <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
+                      {mainSessionImpact.totalTokens.toLocaleString()}
                     </span>
                   </div>
-                ))}
-              <div
-                className="mt-1 pt-1.5 text-[10px]"
-                style={{ borderTop: `1px solid ${TAG_BORDER}`, color: CARD_ICON_MUTED }}
-              >
-                {hasMainImpact && hasIsolated
-                  ? 'Left: parent injection · Right: internal'
-                  : hasMainImpact
-                    ? 'Tokens injected to parent'
-                    : 'Internal token usage'}
+                )}
+                {hasIsolated && (
+                  <div className="flex items-center justify-between gap-3">
+                    <span style={{ color: COLOR_TEXT_MUTED }}>{rightLabel}</span>
+                    <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
+                      {isolatedTotal.toLocaleString()}
+                    </span>
+                  </div>
+                )}
+                {hasPhases &&
+                  phaseBreakdown.map((phase) => (
+                    <div
+                      key={phase.phaseNumber}
+                      className="flex items-center justify-between gap-3 pl-2"
+                    >
+                      <span className="text-[10px]" style={{ color: CARD_ICON_MUTED }}>
+                        Phase {phase.phaseNumber}
+                      </span>
+                      <span
+                        className="font-mono text-[10px] tabular-nums"
+                        style={{ color: CARD_ICON_MUTED }}
+                      >
+                        {formatTokensCompact(phase.peakTokens)}
+                        {phase.postCompaction != null && (
+                          <span style={{ color: '#4ade80' }}>
+                            {' '}
+                            → {formatTokensCompact(phase.postCompaction)}
+                          </span>
+                        )}
+                      </span>
+                    </div>
+                  ))}
+                <div
+                  className="mt-1 pt-1.5 text-[10px]"
+                  style={{ borderTop: `1px solid ${TAG_BORDER}`, color: CARD_ICON_MUTED }}
+                >
+                  {hasMainImpact && hasIsolated
+                    ? 'Left: parent injection · Right: internal'
+                    : hasMainImpact
+                      ? 'Tokens injected to parent'
+                      : 'Internal token usage'}
+                </div>
               </div>
-            </div>
-          </div>,
-          document.body
-        )}
-    </>
-  );
-};
+            </div>,
+            document.body
+          )}
+      </>
+    );
+  }
+);
+
+MetricsPill.displayName = 'MetricsPill';
diff --git a/src/renderer/components/chat/items/SlashItem.tsx b/src/renderer/components/chat/items/SlashItem.tsx
index c48ece0b..306b27c8 100644
--- a/src/renderer/components/chat/items/SlashItem.tsx
+++ b/src/renderer/components/chat/items/SlashItem.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { memo } from 'react';
 
 import { Slash } from 'lucide-react';
 
@@ -34,48 +34,52 @@ interface SlashItemProps {
  * - MCP commands
  * - User-defined commands
  */
-export const SlashItem: React.FC<SlashItemProps> = ({
-  slash,
-  onClick,
-  isExpanded,
-  timestamp,
-  timestampFormat,
-  highlightClasses,
-  highlightStyle,
-  notificationDotColor,
-  titleText,
-}) => {
-  const hasInstructions = !!slash.instructions;
+export const SlashItem = memo(
+  ({
+    slash,
+    onClick,
+    isExpanded,
+    timestamp,
+    timestampFormat,
+    highlightClasses,
+    highlightStyle,
+    notificationDotColor,
+    titleText,
+  }: SlashItemProps): React.JSX.Element => {
+    const hasInstructions = !!slash.instructions;
 
-  // Display args or message as the description
-  const description = slash.args ?? slash.message;
+    // Display args or message as the description
+    const description = slash.args ?? slash.message;
 
-  return (
-    <BaseItem
-      icon={<Slash className="size-4" />}
-      label={`/${slash.name}`}
-      summary={description}
-      tokenCount={slash.instructionsTokenCount}
-      tokenLabel="tokens"
-      status={hasInstructions ? 'ok' : undefined}
-      timestamp={timestamp}
-      timestampFormat={timestampFormat}
-      titleText={titleText}
-      onClick={onClick}
-      isExpanded={isExpanded}
-      hasExpandableContent={hasInstructions}
-      highlightClasses={highlightClasses}
-      highlightStyle={highlightStyle}
-      notificationDotColor={notificationDotColor}
-    >
-      {hasInstructions && (
-        <MarkdownViewer
-          content={slash.instructions!}
-          label="Slash Output"
-          maxHeight="max-h-96"
-          copyable
-        />
-      )}
-    </BaseItem>
-  );
-};
+    return (
+      <BaseItem
+        icon={<Slash className="size-4" />}
+        label={`/${slash.name}`}
+        summary={description}
+        tokenCount={slash.instructionsTokenCount}
+        tokenLabel="tokens"
+        status={hasInstructions ? 'ok' : undefined}
+        timestamp={timestamp}
+        timestampFormat={timestampFormat}
+        titleText={titleText}
+        onClick={onClick}
+        isExpanded={isExpanded}
+        hasExpandableContent={hasInstructions}
+        highlightClasses={highlightClasses}
+        highlightStyle={highlightStyle}
+        notificationDotColor={notificationDotColor}
+      >
+        {hasInstructions && (
+          <MarkdownViewer
+            content={slash.instructions!}
+            label="Slash Output"
+            maxHeight="max-h-96"
+            copyable
+          />
+        )}
+      </BaseItem>
+    );
+  }
+);
+
+SlashItem.displayName = 'SlashItem';
diff --git a/src/renderer/components/chat/items/SubagentItem.tsx b/src/renderer/components/chat/items/SubagentItem.tsx
index c2aeeca4..3125e62b 100644
--- a/src/renderer/components/chat/items/SubagentItem.tsx
+++ b/src/renderer/components/chat/items/SubagentItem.tsx
@@ -67,249 +67,178 @@ interface SubagentItemProps {
 // Main Component - Linear-style DevTools Card
 // =============================================================================
 
-export const SubagentItem: React.FC<SubagentItemProps> = ({
-  step,
-  subagent,
-  onClick,
-  isExpanded,
-  aiGroupId,
-  highlightToolUseId,
-  highlightColor,
-  notificationColorMap,
-  registerToolRef,
-}) => {
-  const description = subagent.description ?? step.content.subagentDescription ?? 'Subagent';
-  const subagentType = subagent.subagentType ?? 'Task';
-  const truncatedDesc = description.length > 60 ? description.slice(0, 60) + '...' : description;
+export const SubagentItem: React.FC<SubagentItemProps> = React.memo(
+  ({
+    step,
+    subagent,
+    onClick,
+    isExpanded,
+    aiGroupId,
+    highlightToolUseId,
+    highlightColor,
+    notificationColorMap,
+    registerToolRef,
+  }) => {
+    const description = subagent.description ?? step.content.subagentDescription ?? 'Subagent';
+    const subagentType = subagent.subagentType ?? 'Task';
+    const truncatedDesc = description.length > 60 ? description.slice(0, 60) + '...' : description;
 
-  // Agent configs from .claude/agents/ for color lookup
-  const agentConfigs = useStore(useShallow((s) => s.agentConfigs));
+    // Agent configs from .claude/agents/ for color lookup
+    const agentConfigs = useStore(useShallow((s) => s.agentConfigs));
 
-  // Team member colors (when this subagent is a team member)
-  const teamColors = subagent.team ? getTeamColorSet(subagent.team.memberColor) : null;
-  const { isLight } = useTheme();
-  // Type-based colors for non-team subagents (from agent config or deterministic hash)
-  const typeColors = !teamColors ? getSubagentTypeColorSet(subagentType, agentConfigs) : null;
+    // Team member colors (when this subagent is a team member)
+    const teamColors = subagent.team ? getTeamColorSet(subagent.team.memberColor) : null;
+    const { isLight } = useTheme();
+    // Type-based colors for non-team subagents (from agent config or deterministic hash)
+    const typeColors = !teamColors ? getSubagentTypeColorSet(subagentType, agentConfigs) : null;
 
-  // Detect shutdown-only team activations (trivial: just a shutdown_response)
-  const isShutdownOnly = useMemo(() => {
-    if (!subagent.team || !subagent.messages?.length) return false;
-    const assistantMsgs = subagent.messages.filter((m) => m.type === 'assistant');
-    if (assistantMsgs.length !== 1) return false;
-    const calls = assistantMsgs[0].toolCalls ?? [];
-    return (
-      calls.length === 1 &&
-      calls[0].name === 'SendMessage' &&
-      calls[0].input?.type === 'shutdown_response'
-    );
-  }, [subagent.team, subagent.messages]);
+    // Detect shutdown-only team activations (trivial: just a shutdown_response)
+    const isShutdownOnly = useMemo(() => {
+      if (!subagent.team || !subagent.messages?.length) return false;
+      const assistantMsgs = subagent.messages.filter((m) => m.type === 'assistant');
+      if (assistantMsgs.length !== 1) return false;
+      const calls = assistantMsgs[0].toolCalls ?? [];
+      return (
+        calls.length === 1 &&
+        calls[0].name === 'SendMessage' &&
+        calls[0].input?.type === 'shutdown_response'
+      );
+    }, [subagent.team, subagent.messages]);
 
-  // Per-tab trace expansion state (replaces local useState for true per-tab isolation)
-  const { isSubagentTraceExpanded, toggleSubagentTraceExpansion } = useTabUI();
-  const isTraceManuallyExpanded = isSubagentTraceExpanded(subagent.id);
+    // Per-tab trace expansion state (replaces local useState for true per-tab isolation)
+    const { isSubagentTraceExpanded, toggleSubagentTraceExpansion } = useTabUI();
+    const isTraceManuallyExpanded = isSubagentTraceExpanded(subagent.id);
 
-  // Check if contains highlighted error
-  // Also matches when the highlight targets the parent Task tool_use that spawned this subagent
-  const containsHighlightedError = useMemo(() => {
-    if (!highlightToolUseId) return false;
-    // Match parent Task tool_use ID (trigger matched the Task call itself)
-    if (subagent.parentTaskId === highlightToolUseId) return true;
-    // Match inner tool calls/results within the subagent
-    if (!subagent.messages) return false;
-    for (const msg of subagent.messages) {
-      if (msg.toolCalls?.some((tc) => tc.id === highlightToolUseId)) return true;
-      if (msg.toolResults?.some((tr) => tr.toolUseId === highlightToolUseId)) return true;
-    }
-    return false;
-  }, [highlightToolUseId, subagent.parentTaskId, subagent.messages]);
-
-  // Build display items
-  const displayItems = useMemo(() => {
-    if ((!isExpanded && !containsHighlightedError) || !subagent.messages?.length) {
-      return [];
-    }
-    return buildDisplayItemsFromMessages(subagent.messages, []);
-  }, [isExpanded, containsHighlightedError, subagent.messages]);
-
-  // Build summary
-  const itemsSummary = useMemo(() => {
-    if (!isExpanded && !containsHighlightedError) {
-      const toolCount =
-        subagent.messages?.filter(
-          (m) =>
-            m.type === 'assistant' &&
-            Array.isArray(m.content) &&
-            m.content.some((b) => b.type === 'tool_use')
-        ).length ?? 0;
-      return toolCount > 0 ? `${toolCount} tools` : '';
-    }
-    return buildSummary(displayItems);
-  }, [isExpanded, containsHighlightedError, displayItems, subagent.messages]);
-
-  // Model info
-  const modelInfo = useMemo(() => {
-    const msg = subagent.messages?.find(
-      (m) => m.type === 'assistant' && m.model && m.model !== '<synthetic>'
-    );
-    return msg?.model ? parseModelString(msg.model) : null;
-  }, [subagent.messages]);
-
-  // Last usage
-  const lastUsage = useMemo(() => {
-    const messages = subagent.messages ?? [];
-    for (let i = messages.length - 1; i >= 0; i--) {
-      if (messages[i].type === 'assistant' && messages[i].usage) {
-        return messages[i].usage;
+    // Check if contains highlighted error
+    // Also matches when the highlight targets the parent Task tool_use that spawned this subagent
+    const containsHighlightedError = useMemo(() => {
+      if (!highlightToolUseId) return false;
+      // Match parent Task tool_use ID (trigger matched the Task call itself)
+      if (subagent.parentTaskId === highlightToolUseId) return true;
+      // Match inner tool calls/results within the subagent
+      if (!subagent.messages) return false;
+      for (const msg of subagent.messages) {
+        if (msg.toolCalls?.some((tc) => tc.id === highlightToolUseId)) return true;
+        if (msg.toolResults?.some((tr) => tr.toolUseId === highlightToolUseId)) return true;
       }
-    }
-    return null;
-  }, [subagent.messages]);
+      return false;
+    }, [highlightToolUseId, subagent.parentTaskId, subagent.messages]);
 
-  // Multi-phase context breakdown (for subagents with compaction)
-  const phaseData = useMemo(() => {
-    if (!subagent.messages?.length) return null;
-    return computeSubagentPhaseBreakdown(subagent.messages);
-  }, [subagent.messages]);
-
-  // Search expansion
-  const searchExpandedSubagentIds = useStore(useShallow((s) => s.searchExpandedSubagentIds));
-  const searchCurrentSubagentItemId = useStore((s) => s.searchCurrentSubagentItemId);
-  const shouldExpandForSearch = searchExpandedSubagentIds.has(subagent.id);
-
-  // Combine manual expansion with auto-expansion for errors/search
-  const isTraceExpanded =
-    isTraceManuallyExpanded || containsHighlightedError || shouldExpandForSearch;
-  const [isTraceHeaderHovered, setIsTraceHeaderHovered] = useState(false);
-
-  // Outer card highlight when this subagent contains the highlighted tool
-  const outerHighlight = useMemo(() => {
-    if (!containsHighlightedError)
-      return { className: '', style: undefined as React.CSSProperties | undefined };
-    return getHighlightProps(highlightColor);
-  }, [containsHighlightedError, highlightColor]);
-
-  // Register outer card as a tool ref target for the parent Task tool_use ID
-  // so the navigation controller can scroll directly to this SubagentItem
-  const outerCardRef = useCallback(
-    (el: HTMLDivElement | null) => {
-      if (subagent.parentTaskId && registerToolRef) {
-        registerToolRef(subagent.parentTaskId, el);
+    // Build display items
+    const displayItems = useMemo(() => {
+      if ((!isExpanded && !containsHighlightedError) || !subagent.messages?.length) {
+        return [];
       }
-    },
-    [subagent.parentTaskId, registerToolRef]
-  );
+      return buildDisplayItemsFromMessages(subagent.messages, []);
+    }, [isExpanded, containsHighlightedError, subagent.messages]);
 
-  // Cumulative metrics for team members — show total output generated
-  const cumulativeMetrics = useMemo(() => {
-    if (!subagent.team || !subagent.metrics) return undefined;
-    const turnCount =
-      subagent.messages?.filter((m) => m.type === 'assistant' && m.usage).length ?? 0;
-    return {
-      outputTokens: subagent.metrics.outputTokens,
-      turnCount,
-    };
-  }, [subagent.team, subagent.metrics, subagent.messages]);
+    // Build summary
+    const itemsSummary = useMemo(() => {
+      if (!isExpanded && !containsHighlightedError) {
+        const toolCount =
+          subagent.messages?.filter(
+            (m) =>
+              m.type === 'assistant' &&
+              Array.isArray(m.content) &&
+              m.content.some((b) => b.type === 'tool_use')
+          ).length ?? 0;
+        return toolCount > 0 ? `${toolCount} tools` : '';
+      }
+      return buildSummary(displayItems);
+    }, [isExpanded, containsHighlightedError, displayItems, subagent.messages]);
 
-  // Computed values for metrics
-  const hasMainImpact = subagent.mainSessionImpact && subagent.mainSessionImpact.totalTokens > 0;
-  const hasIsolated = lastUsage && lastUsage.input_tokens + lastUsage.output_tokens > 0;
-  const isMultiPhase = phaseData != null && phaseData.compactionCount > 0;
-  const isolatedTotal = isMultiPhase
-    ? phaseData.totalConsumption
-    : lastUsage
-      ? lastUsage.input_tokens +
-        lastUsage.output_tokens +
-        (lastUsage.cache_read_input_tokens ?? 0) +
-        (lastUsage.cache_creation_input_tokens ?? 0)
-      : 0;
+    // Model info
+    const modelInfo = useMemo(() => {
+      const msg = subagent.messages?.find(
+        (m) => m.type === 'assistant' && m.model && m.model !== '<synthetic>'
+      );
+      return msg?.model ? parseModelString(msg.model) : null;
+    }, [subagent.messages]);
 
-  // Shutdown-only team activations: minimal inline row (no metrics, no expand)
-  if (isShutdownOnly && teamColors && subagent.team) {
-    return (
-      <div
-        className="flex items-center gap-2 rounded-md px-3 py-1.5"
-        style={{
-          backgroundColor: CARD_BG,
-          border: CARD_BORDER_STYLE,
-          opacity: 0.6,
-        }}
-      >
-        <span
-          className="size-2.5 shrink-0 rounded-full"
-          style={{ backgroundColor: teamColors.border }}
-        />
-        <span
-          className="rounded px-1.5 py-0.5 text-[10px] font-medium tracking-wide"
+    // Last usage
+    const lastUsage = useMemo(() => {
+      const messages = subagent.messages ?? [];
+      for (let i = messages.length - 1; i >= 0; i--) {
+        if (messages[i].type === 'assistant' && messages[i].usage) {
+          return messages[i].usage;
+        }
+      }
+      return null;
+    }, [subagent.messages]);
+
+    // Multi-phase context breakdown (for subagents with compaction)
+    const phaseData = useMemo(() => {
+      if (!subagent.messages?.length) return null;
+      return computeSubagentPhaseBreakdown(subagent.messages);
+    }, [subagent.messages]);
+
+    // Search expansion
+    const searchExpandedSubagentIds = useStore(useShallow((s) => s.searchExpandedSubagentIds));
+    const searchCurrentSubagentItemId = useStore((s) => s.searchCurrentSubagentItemId);
+    const shouldExpandForSearch = searchExpandedSubagentIds.has(subagent.id);
+
+    // Combine manual expansion with auto-expansion for errors/search
+    const isTraceExpanded =
+      isTraceManuallyExpanded || containsHighlightedError || shouldExpandForSearch;
+    const [isTraceHeaderHovered, setIsTraceHeaderHovered] = useState(false);
+
+    // Outer card highlight when this subagent contains the highlighted tool
+    const outerHighlight = useMemo(() => {
+      if (!containsHighlightedError)
+        return { className: '', style: undefined as React.CSSProperties | undefined };
+      return getHighlightProps(highlightColor);
+    }, [containsHighlightedError, highlightColor]);
+
+    // Register outer card as a tool ref target for the parent Task tool_use ID
+    // so the navigation controller can scroll directly to this SubagentItem
+    const outerCardRef = useCallback(
+      (el: HTMLDivElement | null) => {
+        if (subagent.parentTaskId && registerToolRef) {
+          registerToolRef(subagent.parentTaskId, el);
+        }
+      },
+      [subagent.parentTaskId, registerToolRef]
+    );
+
+    // Cumulative metrics for team members — show total output generated
+    const cumulativeMetrics = useMemo(() => {
+      if (!subagent.team || !subagent.metrics) return undefined;
+      const turnCount =
+        subagent.messages?.filter((m) => m.type === 'assistant' && m.usage).length ?? 0;
+      return {
+        outputTokens: subagent.metrics.outputTokens,
+        turnCount,
+      };
+    }, [subagent.team, subagent.metrics, subagent.messages]);
+
+    // Computed values for metrics
+    const hasMainImpact = subagent.mainSessionImpact && subagent.mainSessionImpact.totalTokens > 0;
+    const hasIsolated = lastUsage && lastUsage.input_tokens + lastUsage.output_tokens > 0;
+    const isMultiPhase = phaseData != null && phaseData.compactionCount > 0;
+    const isolatedTotal = isMultiPhase
+      ? phaseData.totalConsumption
+      : lastUsage
+        ? lastUsage.input_tokens +
+          lastUsage.output_tokens +
+          (lastUsage.cache_read_input_tokens ?? 0) +
+          (lastUsage.cache_creation_input_tokens ?? 0)
+        : 0;
+
+    // Shutdown-only team activations: minimal inline row (no metrics, no expand)
+    if (isShutdownOnly && teamColors && subagent.team) {
+      return (
+        <div
+          className="flex items-center gap-2 rounded-md px-3 py-1.5"
           style={{
-            backgroundColor: getThemedBadge(teamColors, isLight),
-            color: teamColors.text,
-            border: `1px solid ${teamColors.border}40`,
+            backgroundColor: CARD_BG,
+            border: CARD_BORDER_STYLE,
+            opacity: 0.6,
           }}
         >
-          {subagent.team.memberName}
-        </span>
-        <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
-          Shutdown confirmed
-        </span>
-        <span className="flex-1" />
-        <span
-          className="shrink-0 font-mono text-[11px] tabular-nums"
-          style={{ color: CARD_ICON_MUTED }}
-        >
-          {formatDuration(subagent.durationMs)}
-        </span>
-      </div>
-    );
-  }
-
-  return (
-    <div
-      ref={outerCardRef}
-      className={`overflow-hidden rounded-md transition-[background-color,box-shadow] duration-300 ${outerHighlight.className}`}
-      style={{
-        backgroundColor: CARD_BG,
-        border: CARD_BORDER_STYLE,
-        ...outerHighlight.style,
-      }}
-    >
-      {/* ========== Level 1: Clickable Header ========== */}
-      <div
-        role="button"
-        tabIndex={0}
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            onClick();
-          }
-        }}
-        className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
-        style={{
-          backgroundColor: isExpanded ? CARD_HEADER_BG : 'transparent',
-          borderBottom: isExpanded ? CARD_BORDER_STYLE : 'none',
-        }}
-      >
-        {/* Expand chevron */}
-        <ChevronRight
-          className={`size-3.5 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
-          style={{ color: CARD_ICON_MUTED }}
-        />
-
-        {/* Icon - colored dot for team members/typed subagents, Bot icon for generic */}
-        {teamColors || typeColors ? (
           <span
-            className="size-3.5 shrink-0 rounded-full"
-            style={{ backgroundColor: (teamColors ?? typeColors)!.border }}
+            className="size-2.5 shrink-0 rounded-full"
+            style={{ backgroundColor: teamColors.border }}
           />
-        ) : (
-          <Bot
-            className="size-4 shrink-0"
-            style={{ color: subagent.isOngoing ? '#3b82f6' : COLOR_TEXT_MUTED }}
-          />
-        )}
-
-        {/* Type badge - team member name or typed subagent */}
-        {teamColors && subagent.team ? (
           <span
             className="rounded px-1.5 py-0.5 text-[10px] font-medium tracking-wide"
             style={{
@@ -320,273 +249,354 @@ export const SubagentItem: React.FC<SubagentItemProps> = ({
           >
             {subagent.team.memberName}
           </span>
-        ) : (
+          <span className="text-xs" style={{ color: CARD_ICON_MUTED }}>
+            Shutdown confirmed
+          </span>
+          <span className="flex-1" />
           <span
-            className="rounded px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide"
-            style={{
-              backgroundColor: getThemedBadge(typeColors!, isLight),
-              color: typeColors!.text,
-              border: `1px solid ${typeColors!.border}40`,
-            }}
+            className="shrink-0 font-mono text-[11px] tabular-nums"
+            style={{ color: CARD_ICON_MUTED }}
           >
-            {subagentType}
+            {formatDuration(subagent.durationMs)}
           </span>
-        )}
+        </div>
+      );
+    }
 
-        {/* Model */}
-        {modelInfo && (
-          <span className={`text-[11px] ${getModelColorClass(modelInfo.family)}`}>
-            {modelInfo.name}
-          </span>
-        )}
-
-        {/* Description */}
-        <span className="flex-1 truncate text-xs" style={{ color: CARD_TEXT_LIGHT }}>
-          {truncatedDesc}
-        </span>
-
-        {/* Status indicator */}
-        {subagent.isOngoing ? (
-          <Loader2 className="size-3.5 shrink-0 animate-spin" style={{ color: '#3b82f6' }} />
-        ) : (
-          <CheckCircle2 className="size-3.5 shrink-0" style={{ color: '#22c55e' }} />
-        )}
-
-        {/* Unified Metrics Pill — team members don't show mainSessionImpact
-            (spawn cost only; real main impact comes from teammate messages) */}
-        <MetricsPill
-          mainSessionImpact={subagent.team ? undefined : subagent.mainSessionImpact}
-          lastUsage={lastUsage ?? undefined}
-          isolatedLabel={subagent.team ? 'Context Window' : undefined}
-          isolatedOverride={
-            phaseData && phaseData.compactionCount > 0 ? phaseData.totalConsumption : undefined
-          }
-          phaseBreakdown={phaseData?.phases}
-        />
-
-        {/* Duration */}
-        <span
-          className="shrink-0 font-mono text-[11px] tabular-nums"
-          style={{ color: CARD_ICON_MUTED }}
+    return (
+      <div
+        ref={outerCardRef}
+        className={`overflow-hidden rounded-md transition-[background-color,box-shadow] duration-300 ${outerHighlight.className}`}
+        style={{
+          backgroundColor: CARD_BG,
+          border: CARD_BORDER_STYLE,
+          ...outerHighlight.style,
+        }}
+      >
+        {/* ========== Level 1: Clickable Header ========== */}
+        <div
+          role="button"
+          tabIndex={0}
+          onClick={onClick}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault();
+              onClick();
+            }
+          }}
+          className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
+          style={{
+            backgroundColor: isExpanded ? CARD_HEADER_BG : 'transparent',
+            borderBottom: isExpanded ? CARD_BORDER_STYLE : 'none',
+          }}
         >
-          {formatDuration(subagent.durationMs)}
-        </span>
+          {/* Expand chevron */}
+          <ChevronRight
+            className={`size-3.5 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
+            style={{ color: CARD_ICON_MUTED }}
+          />
 
-        {/* Timestamp — rightmost info element */}
-        <span
-          className="shrink-0 font-mono text-[11px] tabular-nums"
-          style={{ color: CARD_ICON_MUTED }}
-        >
-          {format(subagent.startTime, 'HH:mm:ss')}
-        </span>
-      </div>
-
-      {/* ========== Level 1 Expanded: Dashboard Content ========== */}
-      {isExpanded && (
-        <div className="space-y-3 p-3">
-          {/* ========== Row 1: Meta Info (Horizontal Flow) ========== */}
-          <div
-            className="flex flex-wrap items-center gap-x-3 gap-y-1 text-[11px]"
-            style={{ color: COLOR_TEXT_MUTED }}
-          >
-            <span>
-              <span style={{ color: CARD_ICON_MUTED }}>Type</span>{' '}
-              <span className="font-mono" style={{ color: CARD_TEXT_LIGHT }}>
-                {subagentType}
-              </span>
-            </span>
-            <span style={{ color: CARD_SEPARATOR }}>•</span>
-            <span>
-              <span style={{ color: CARD_ICON_MUTED }}>Duration</span>{' '}
-              <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
-                {formatDuration(subagent.durationMs)}
-              </span>
-            </span>
-            {modelInfo && (
-              <>
-                <span style={{ color: CARD_SEPARATOR }}>•</span>
-                <span>
-                  <span style={{ color: CARD_ICON_MUTED }}>Model</span>{' '}
-                  <span className={`font-mono ${getModelColorClass(modelInfo.family)}`}>
-                    {modelInfo.name}
-                  </span>
-                </span>
-              </>
-            )}
-            <span style={{ color: CARD_SEPARATOR }}>•</span>
-            <span>
-              <span style={{ color: CARD_ICON_MUTED }}>ID</span>{' '}
-              <span
-                className="inline-block max-w-[120px] truncate align-bottom font-mono"
-                style={{ color: CARD_ICON_MUTED }}
-                title={subagent.id}
-              >
-                {subagent.id.slice(0, 8)}
-              </span>
-            </span>
-          </div>
-
-          {/* ========== Row 2: Context Usage (Clean List) ========== */}
-          {(hasMainImpact ?? hasIsolated) && (
-            <div className="pt-2">
-              {/* Overline title */}
-              <div
-                className="mb-2 text-[10px] font-semibold uppercase tracking-wider"
-                style={{ color: CARD_ICON_MUTED }}
-              >
-                Context Usage
-              </div>
-
-              {/* Token rows - floating alignment */}
-              <div className="space-y-1.5">
-                {hasMainImpact && !subagent.team && (
-                  <div className="flex items-center justify-between">
-                    <div className="flex items-center gap-2">
-                      <ArrowUpRight
-                        className="size-3"
-                        style={{ color: 'rgba(251, 191, 36, 0.7)' }}
-                      />
-                      <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
-                        Main Context
-                      </span>
-                    </div>
-                    <span
-                      className="font-mono text-xs font-medium tabular-nums"
-                      style={{ color: CARD_TEXT_LIGHTER }}
-                    >
-                      {subagent.mainSessionImpact!.totalTokens.toLocaleString()}
-                    </span>
-                  </div>
-                )}
-
-                {cumulativeMetrics && (
-                  <div className="flex items-center justify-between">
-                    <div className="flex items-center gap-2">
-                      <Sigma className="size-3" style={{ color: 'rgba(168, 85, 247, 0.7)' }} />
-                      <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
-                        Total Output
-                      </span>
-                    </div>
-                    <span
-                      className="font-mono text-xs font-medium tabular-nums"
-                      style={{ color: CARD_TEXT_LIGHTER }}
-                    >
-                      {cumulativeMetrics.outputTokens.toLocaleString()}
-                      <span style={{ color: CARD_ICON_MUTED }}>
-                        {' '}
-                        ({cumulativeMetrics.turnCount} turns)
-                      </span>
-                    </span>
-                  </div>
-                )}
-
-                {hasIsolated && (
-                  <div className="flex items-center justify-between">
-                    <div className="flex items-center gap-2">
-                      <CircleDot className="size-3" style={{ color: 'rgba(56, 189, 248, 0.7)' }} />
-                      <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
-                        {subagent.team ? 'Context Window' : 'Subagent Context'}
-                      </span>
-                    </div>
-                    <span
-                      className="font-mono text-xs font-medium tabular-nums"
-                      style={{ color: CARD_TEXT_LIGHTER }}
-                    >
-                      {isolatedTotal.toLocaleString()}
-                    </span>
-                  </div>
-                )}
-
-                {/* Per-phase breakdown when multi-phase */}
-                {isMultiPhase &&
-                  phaseData.phases.map((phase) => (
-                    <div key={phase.phaseNumber} className="flex items-center justify-between pl-5">
-                      <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
-                        Phase {phase.phaseNumber}
-                      </span>
-                      <span
-                        className="font-mono text-[11px] tabular-nums"
-                        style={{ color: CARD_ICON_MUTED }}
-                      >
-                        {formatTokensCompact(phase.peakTokens)}
-                        {phase.postCompaction != null && (
-                          <span style={{ color: '#4ade80' }}>
-                            {' '}
-                            → {formatTokensCompact(phase.postCompaction)}
-                          </span>
-                        )}
-                      </span>
-                    </div>
-                  ))}
-              </div>
-            </div>
+          {/* Icon - colored dot for team members/typed subagents, Bot icon for generic */}
+          {teamColors || typeColors ? (
+            <span
+              className="size-3.5 shrink-0 rounded-full"
+              style={{ backgroundColor: (teamColors ?? typeColors)!.border }}
+            />
+          ) : (
+            <Bot
+              className="size-4 shrink-0"
+              style={{ color: subagent.isOngoing ? '#3b82f6' : COLOR_TEXT_MUTED }}
+            />
           )}
 
-          {/* ========== Level 2: Execution Trace Toggle ========== */}
-          {displayItems.length > 0 && (
-            <div
-              className="overflow-hidden rounded-md"
+          {/* Type badge - team member name or typed subagent */}
+          {teamColors && subagent.team ? (
+            <span
+              className="rounded px-1.5 py-0.5 text-[10px] font-medium tracking-wide"
               style={{
-                border: CARD_BORDER_STYLE,
-                backgroundColor: CARD_HEADER_BG,
+                backgroundColor: getThemedBadge(teamColors, isLight),
+                color: teamColors.text,
+                border: `1px solid ${teamColors.border}40`,
               }}
             >
-              {/* Trace Header (clickable) */}
+              {subagent.team.memberName}
+            </span>
+          ) : (
+            <span
+              className="rounded px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide"
+              style={{
+                backgroundColor: getThemedBadge(typeColors!, isLight),
+                color: typeColors!.text,
+                border: `1px solid ${typeColors!.border}40`,
+              }}
+            >
+              {subagentType}
+            </span>
+          )}
+
+          {/* Model */}
+          {modelInfo && (
+            <span className={`text-[11px] ${getModelColorClass(modelInfo.family)}`}>
+              {modelInfo.name}
+            </span>
+          )}
+
+          {/* Description */}
+          <span className="flex-1 truncate text-xs" style={{ color: CARD_TEXT_LIGHT }}>
+            {truncatedDesc}
+          </span>
+
+          {/* Status indicator */}
+          {subagent.isOngoing ? (
+            <Loader2 className="size-3.5 shrink-0 animate-spin" style={{ color: '#3b82f6' }} />
+          ) : (
+            <CheckCircle2 className="size-3.5 shrink-0" style={{ color: '#22c55e' }} />
+          )}
+
+          {/* Unified Metrics Pill — team members don't show mainSessionImpact
+            (spawn cost only; real main impact comes from teammate messages) */}
+          <MetricsPill
+            mainSessionImpact={subagent.team ? undefined : subagent.mainSessionImpact}
+            lastUsage={lastUsage ?? undefined}
+            isolatedLabel={subagent.team ? 'Context Window' : undefined}
+            isolatedOverride={
+              phaseData && phaseData.compactionCount > 0 ? phaseData.totalConsumption : undefined
+            }
+            phaseBreakdown={phaseData?.phases}
+          />
+
+          {/* Duration */}
+          <span
+            className="shrink-0 font-mono text-[11px] tabular-nums"
+            style={{ color: CARD_ICON_MUTED }}
+          >
+            {formatDuration(subagent.durationMs)}
+          </span>
+
+          {/* Timestamp — rightmost info element */}
+          <span
+            className="shrink-0 font-mono text-[11px] tabular-nums"
+            style={{ color: CARD_ICON_MUTED }}
+          >
+            {format(subagent.startTime, 'HH:mm:ss')}
+          </span>
+        </div>
+
+        {/* ========== Level 1 Expanded: Dashboard Content ========== */}
+        {isExpanded && (
+          <div className="space-y-3 p-3">
+            {/* ========== Row 1: Meta Info (Horizontal Flow) ========== */}
+            <div
+              className="flex flex-wrap items-center gap-x-3 gap-y-1 text-[11px]"
+              style={{ color: COLOR_TEXT_MUTED }}
+            >
+              <span>
+                <span style={{ color: CARD_ICON_MUTED }}>Type</span>{' '}
+                <span className="font-mono" style={{ color: CARD_TEXT_LIGHT }}>
+                  {subagentType}
+                </span>
+              </span>
+              <span style={{ color: CARD_SEPARATOR }}>•</span>
+              <span>
+                <span style={{ color: CARD_ICON_MUTED }}>Duration</span>{' '}
+                <span className="font-mono tabular-nums" style={{ color: CARD_TEXT_LIGHT }}>
+                  {formatDuration(subagent.durationMs)}
+                </span>
+              </span>
+              {modelInfo && (
+                <>
+                  <span style={{ color: CARD_SEPARATOR }}>•</span>
+                  <span>
+                    <span style={{ color: CARD_ICON_MUTED }}>Model</span>{' '}
+                    <span className={`font-mono ${getModelColorClass(modelInfo.family)}`}>
+                      {modelInfo.name}
+                    </span>
+                  </span>
+                </>
+              )}
+              <span style={{ color: CARD_SEPARATOR }}>•</span>
+              <span>
+                <span style={{ color: CARD_ICON_MUTED }}>ID</span>{' '}
+                <span
+                  className="inline-block max-w-[120px] truncate align-bottom font-mono"
+                  style={{ color: CARD_ICON_MUTED }}
+                  title={subagent.id}
+                >
+                  {subagent.id.slice(0, 8)}
+                </span>
+              </span>
+            </div>
+
+            {/* ========== Row 2: Context Usage (Clean List) ========== */}
+            {(hasMainImpact ?? hasIsolated) && (
+              <div className="pt-2">
+                {/* Overline title */}
+                <div
+                  className="mb-2 text-[10px] font-semibold uppercase tracking-wider"
+                  style={{ color: CARD_ICON_MUTED }}
+                >
+                  Context Usage
+                </div>
+
+                {/* Token rows - floating alignment */}
+                <div className="space-y-1.5">
+                  {hasMainImpact && !subagent.team && (
+                    <div className="flex items-center justify-between">
+                      <div className="flex items-center gap-2">
+                        <ArrowUpRight
+                          className="size-3"
+                          style={{ color: 'rgba(251, 191, 36, 0.7)' }}
+                        />
+                        <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
+                          Main Context
+                        </span>
+                      </div>
+                      <span
+                        className="font-mono text-xs font-medium tabular-nums"
+                        style={{ color: CARD_TEXT_LIGHTER }}
+                      >
+                        {subagent.mainSessionImpact!.totalTokens.toLocaleString()}
+                      </span>
+                    </div>
+                  )}
+
+                  {cumulativeMetrics && (
+                    <div className="flex items-center justify-between">
+                      <div className="flex items-center gap-2">
+                        <Sigma className="size-3" style={{ color: 'rgba(168, 85, 247, 0.7)' }} />
+                        <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
+                          Total Output
+                        </span>
+                      </div>
+                      <span
+                        className="font-mono text-xs font-medium tabular-nums"
+                        style={{ color: CARD_TEXT_LIGHTER }}
+                      >
+                        {cumulativeMetrics.outputTokens.toLocaleString()}
+                        <span style={{ color: CARD_ICON_MUTED }}>
+                          {' '}
+                          ({cumulativeMetrics.turnCount} turns)
+                        </span>
+                      </span>
+                    </div>
+                  )}
+
+                  {hasIsolated && (
+                    <div className="flex items-center justify-between">
+                      <div className="flex items-center gap-2">
+                        <CircleDot
+                          className="size-3"
+                          style={{ color: 'rgba(56, 189, 248, 0.7)' }}
+                        />
+                        <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
+                          {subagent.team ? 'Context Window' : 'Subagent Context'}
+                        </span>
+                      </div>
+                      <span
+                        className="font-mono text-xs font-medium tabular-nums"
+                        style={{ color: CARD_TEXT_LIGHTER }}
+                      >
+                        {isolatedTotal.toLocaleString()}
+                      </span>
+                    </div>
+                  )}
+
+                  {/* Per-phase breakdown when multi-phase */}
+                  {isMultiPhase &&
+                    phaseData.phases.map((phase) => (
+                      <div
+                        key={phase.phaseNumber}
+                        className="flex items-center justify-between pl-5"
+                      >
+                        <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
+                          Phase {phase.phaseNumber}
+                        </span>
+                        <span
+                          className="font-mono text-[11px] tabular-nums"
+                          style={{ color: CARD_ICON_MUTED }}
+                        >
+                          {formatTokensCompact(phase.peakTokens)}
+                          {phase.postCompaction != null && (
+                            <span style={{ color: '#4ade80' }}>
+                              {' '}
+                              → {formatTokensCompact(phase.postCompaction)}
+                            </span>
+                          )}
+                        </span>
+                      </div>
+                    ))}
+                </div>
+              </div>
+            )}
+
+            {/* ========== Level 2: Execution Trace Toggle ========== */}
+            {displayItems.length > 0 && (
               <div
-                role="button"
-                tabIndex={0}
-                onClick={(e) => {
-                  e.stopPropagation();
-                  toggleSubagentTraceExpansion(subagent.id);
+                className="overflow-hidden rounded-md"
+                style={{
+                  border: CARD_BORDER_STYLE,
+                  backgroundColor: CARD_HEADER_BG,
                 }}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter' || e.key === ' ') {
-                    e.preventDefault();
+              >
+                {/* Trace Header (clickable) */}
+                <div
+                  role="button"
+                  tabIndex={0}
+                  onClick={(e) => {
                     e.stopPropagation();
                     toggleSubagentTraceExpansion(subagent.id);
-                  }
-                }}
-                className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
-                style={{
-                  borderBottom: isTraceExpanded ? CARD_BORDER_STYLE : 'none',
-                  backgroundColor: isTraceHeaderHovered ? CARD_HEADER_HOVER : 'transparent',
-                }}
-                onMouseEnter={() => setIsTraceHeaderHovered(true)}
-                onMouseLeave={() => setIsTraceHeaderHovered(false)}
-              >
-                <ChevronRight
-                  className={`size-3 shrink-0 transition-transform ${isTraceExpanded ? 'rotate-90' : ''}`}
-                  style={{ color: CARD_ICON_MUTED }}
-                />
-                <Terminal className="size-3.5" style={{ color: CARD_ICON_MUTED }} />
-                <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
-                  Execution Trace
-                </span>
-                <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
-                  · {itemsSummary}
-                </span>
-              </div>
-
-              {/* Trace Content */}
-              {isTraceExpanded && (
-                <div className="p-2">
-                  <ExecutionTrace
-                    items={displayItems}
-                    aiGroupId={aiGroupId}
-                    highlightToolUseId={highlightToolUseId}
-                    highlightColor={highlightColor}
-                    notificationColorMap={notificationColorMap}
-                    searchExpandedItemId={
-                      shouldExpandForSearch ? searchCurrentSubagentItemId : null
+                  }}
+                  onKeyDown={(e) => {
+                    if (e.key === 'Enter' || e.key === ' ') {
+                      e.preventDefault();
+                      e.stopPropagation();
+                      toggleSubagentTraceExpansion(subagent.id);
                     }
-                    registerToolRef={registerToolRef}
+                  }}
+                  className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
+                  style={{
+                    borderBottom: isTraceExpanded ? CARD_BORDER_STYLE : 'none',
+                    backgroundColor: isTraceHeaderHovered ? CARD_HEADER_HOVER : 'transparent',
+                  }}
+                  onMouseEnter={() => setIsTraceHeaderHovered(true)}
+                  onMouseLeave={() => setIsTraceHeaderHovered(false)}
+                >
+                  <ChevronRight
+                    className={`size-3 shrink-0 transition-transform ${isTraceExpanded ? 'rotate-90' : ''}`}
+                    style={{ color: CARD_ICON_MUTED }}
                   />
+                  <Terminal className="size-3.5" style={{ color: CARD_ICON_MUTED }} />
+                  <span className="text-xs" style={{ color: COLOR_TEXT_SECONDARY }}>
+                    Execution Trace
+                  </span>
+                  <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
+                    · {itemsSummary}
+                  </span>
                 </div>
-              )}
-            </div>
-          )}
-        </div>
-      )}
-    </div>
-  );
-};
+
+                {/* Trace Content */}
+                {isTraceExpanded && (
+                  <div className="p-2">
+                    <ExecutionTrace
+                      items={displayItems}
+                      aiGroupId={aiGroupId}
+                      highlightToolUseId={highlightToolUseId}
+                      highlightColor={highlightColor}
+                      notificationColorMap={notificationColorMap}
+                      searchExpandedItemId={
+                        shouldExpandForSearch ? searchCurrentSubagentItemId : null
+                      }
+                      registerToolRef={registerToolRef}
+                    />
+                  </div>
+                )}
+              </div>
+            )}
+          </div>
+        )}
+      </div>
+    );
+  }
+);
+
+SubagentItem.displayName = 'SubagentItem';
diff --git a/src/renderer/components/chat/items/TeammateMessageItem.tsx b/src/renderer/components/chat/items/TeammateMessageItem.tsx
index bd5bc904..4bc8d309 100644
--- a/src/renderer/components/chat/items/TeammateMessageItem.tsx
+++ b/src/renderer/components/chat/items/TeammateMessageItem.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import {
   CARD_BG,
@@ -75,187 +75,194 @@ function isResendMessage(message: TeammateMessage): boolean {
  *
  * Operational noise (idle/shutdown/terminated) renders as minimal inline text.
  */
-export const TeammateMessageItem: React.FC<TeammateMessageItemProps> = ({
-  teammateMessage,
-  onClick,
-  isExpanded,
-  onReplyHover,
-  highlightClasses = '',
-  highlightStyle,
-}) => {
-  const colors = getTeamColorSet(teammateMessage.color);
-  const { isLight } = useTheme();
+export const TeammateMessageItem = memo(
+  ({
+    teammateMessage,
+    onClick,
+    isExpanded,
+    onReplyHover,
+    highlightClasses = '',
+    highlightStyle,
+  }: TeammateMessageItemProps): React.JSX.Element => {
+    const colors = getTeamColorSet(teammateMessage.color);
+    const { isLight } = useTheme();
 
-  // Get team members for @mention highlighting
-  const members = useStore(
-    useShallow((s) => selectResolvedMembersForTeamName(s, s.selectedTeamName))
-  );
-  const memberColorMap = useMemo(
-    () => (members ? buildMemberColorMap(members) : new Map<string, string>()),
-    [members]
-  );
-
-  // Get team names for @team linkification
-  const teams = useStore(useShallow((s) => s.teams));
-  const teamNames = useMemo(
-    () => teams.filter((t) => !t.deletedAt).map((t) => t.teamName),
-    [teams]
-  );
-
-  // Detect operational noise
-  const noiseLabel = useMemo(
-    () => detectOperationalNoise(teammateMessage.content, teammateMessage.teammateId),
-    [teammateMessage.content, teammateMessage.teammateId]
-  );
-
-  // Detect resent/duplicate messages
-  const isResend = useMemo(() => isResendMessage(teammateMessage), [teammateMessage]);
-
-  const plainSummary = useMemo(
-    () => extractMarkdownPlainText(teammateMessage.summary),
-    [teammateMessage.summary]
-  );
-  const plainReplyToSummary = useMemo(
-    () =>
-      teammateMessage.replyToSummary
-        ? extractMarkdownPlainText(teammateMessage.replyToSummary)
-        : undefined,
-    [teammateMessage.replyToSummary]
-  );
-
-  const displayContent = useMemo(() => {
-    const stripped = stripAgentBlocks(teammateMessage.content);
-    return linkifyAllMentionsInMarkdown(stripped, memberColorMap, teamNames);
-  }, [teammateMessage.content, memberColorMap, teamNames]);
-
-  // Noise: minimal inline row (no card, no expand)
-  if (noiseLabel) {
-    return (
-      <div className="flex items-center gap-2 px-3 py-1" style={{ opacity: 0.45 }}>
-        <span className="size-2 shrink-0 rounded-full" style={{ backgroundColor: colors.border }} />
-        <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
-          {teammateMessage.teammateId}
-        </span>
-        <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
-          {noiseLabel}
-        </span>
-      </div>
+    // Get team members for @mention highlighting
+    const members = useStore(
+      useShallow((s) => selectResolvedMembersForTeamName(s, s.selectedTeamName))
+    );
+    const memberColorMap = useMemo(
+      () => (members ? buildMemberColorMap(members) : new Map<string, string>()),
+      [members]
     );
-  }
 
-  const truncatedSummary =
-    plainSummary.length > 80 ? plainSummary.slice(0, 80) + '...' : plainSummary;
+    // Get team names for @team linkification
+    const teams = useStore(useShallow((s) => s.teams));
+    const teamNames = useMemo(
+      () => teams.filter((t) => !t.deletedAt).map((t) => t.teamName),
+      [teams]
+    );
 
-  return (
-    <div
-      className={`overflow-hidden rounded-md transition-[background-color,box-shadow] duration-300 ${highlightClasses}`}
-      style={{
-        backgroundColor: CARD_BG,
-        border: CARD_BORDER_STYLE,
-        borderLeft: `3px solid ${colors.border}`,
-        opacity: isResend ? 0.6 : undefined,
-        ...highlightStyle,
-      }}
-    >
-      {/* Header */}
+    // Detect operational noise
+    const noiseLabel = useMemo(
+      () => detectOperationalNoise(teammateMessage.content, teammateMessage.teammateId),
+      [teammateMessage.content, teammateMessage.teammateId]
+    );
+
+    // Detect resent/duplicate messages
+    const isResend = useMemo(() => isResendMessage(teammateMessage), [teammateMessage]);
+
+    const plainSummary = useMemo(
+      () => extractMarkdownPlainText(teammateMessage.summary),
+      [teammateMessage.summary]
+    );
+    const plainReplyToSummary = useMemo(
+      () =>
+        teammateMessage.replyToSummary
+          ? extractMarkdownPlainText(teammateMessage.replyToSummary)
+          : undefined,
+      [teammateMessage.replyToSummary]
+    );
+
+    const displayContent = useMemo(() => {
+      const stripped = stripAgentBlocks(teammateMessage.content);
+      return linkifyAllMentionsInMarkdown(stripped, memberColorMap, teamNames);
+    }, [teammateMessage.content, memberColorMap, teamNames]);
+
+    // Noise: minimal inline row (no card, no expand)
+    if (noiseLabel) {
+      return (
+        <div className="flex items-center gap-2 px-3 py-1" style={{ opacity: 0.45 }}>
+          <span
+            className="size-2 shrink-0 rounded-full"
+            style={{ backgroundColor: colors.border }}
+          />
+          <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
+            {teammateMessage.teammateId}
+          </span>
+          <span className="text-[11px]" style={{ color: CARD_ICON_MUTED }}>
+            {noiseLabel}
+          </span>
+        </div>
+      );
+    }
+
+    const truncatedSummary =
+      plainSummary.length > 80 ? plainSummary.slice(0, 80) + '...' : plainSummary;
+
+    return (
       <div
-        role="button"
-        tabIndex={0}
-        onClick={onClick}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ') {
-            e.preventDefault();
-            onClick();
-          }
-        }}
-        className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
+        className={`overflow-hidden rounded-md transition-[background-color,box-shadow] duration-300 ${highlightClasses}`}
         style={{
-          backgroundColor: isExpanded ? CARD_HEADER_BG : 'transparent',
-          borderBottom: isExpanded ? CARD_BORDER_STYLE : 'none',
+          backgroundColor: CARD_BG,
+          border: CARD_BORDER_STYLE,
+          borderLeft: `3px solid ${colors.border}`,
+          opacity: isResend ? 0.6 : undefined,
+          ...highlightStyle,
         }}
       >
-        <ChevronRight
-          className={`size-3.5 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
-          style={{ color: CARD_ICON_MUTED }}
-        />
-
-        {/* Message icon — distinguishes from SubagentItem's Bot/dot icon */}
-        <MessageSquare className="size-3.5 shrink-0" style={{ color: colors.border }} />
-
-        {/* Teammate name badge */}
-        <span
-          className="rounded px-1.5 py-0.5 text-[10px] font-medium tracking-wide"
+        {/* Header */}
+        <div
+          role="button"
+          tabIndex={0}
+          onClick={onClick}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' || e.key === ' ') {
+              e.preventDefault();
+              onClick();
+            }
+          }}
+          className="flex cursor-pointer items-center gap-2 px-3 py-2 transition-colors"
           style={{
-            backgroundColor: getThemedBadge(colors, isLight),
-            color: colors.text,
-            border: `1px solid ${colors.border}40`,
+            backgroundColor: isExpanded ? CARD_HEADER_BG : 'transparent',
+            borderBottom: isExpanded ? CARD_BORDER_STYLE : 'none',
           }}
         >
-          {teammateMessage.teammateId}
-        </span>
-
-        {/* "Message" type label — parallels SubagentItem's model info */}
-        <span className="text-[10px] uppercase tracking-wide" style={{ color: CARD_ICON_MUTED }}>
-          Message
-        </span>
-
-        {/* Reply indicator — shows which SendMessage triggered this response */}
-        {plainReplyToSummary && (
-          <span
-            role="presentation"
-            className="flex cursor-default items-center gap-1 text-[10px]"
+          <ChevronRight
+            className={`size-3.5 shrink-0 transition-transform ${isExpanded ? 'rotate-90' : ''}`}
             style={{ color: CARD_ICON_MUTED }}
-            onMouseEnter={() => onReplyHover?.(teammateMessage.replyToToolId ?? null)}
-            onMouseLeave={() => onReplyHover?.(null)}
+          />
+
+          {/* Message icon — distinguishes from SubagentItem's Bot/dot icon */}
+          <MessageSquare className="size-3.5 shrink-0" style={{ color: colors.border }} />
+
+          {/* Teammate name badge */}
+          <span
+            className="rounded px-1.5 py-0.5 text-[10px] font-medium tracking-wide"
+            style={{
+              backgroundColor: getThemedBadge(colors, isLight),
+              color: colors.text,
+              border: `1px solid ${colors.border}40`,
+            }}
           >
-            <CornerDownLeft className="size-2.5" />
-            <span className="truncate" style={{ maxWidth: '180px' }}>
-              {plainReplyToSummary}
+            {teammateMessage.teammateId}
+          </span>
+
+          {/* "Message" type label — parallels SubagentItem's model info */}
+          <span className="text-[10px] uppercase tracking-wide" style={{ color: CARD_ICON_MUTED }}>
+            Message
+          </span>
+
+          {/* Reply indicator — shows which SendMessage triggered this response */}
+          {plainReplyToSummary && (
+            <span
+              role="presentation"
+              className="flex cursor-default items-center gap-1 text-[10px]"
+              style={{ color: CARD_ICON_MUTED }}
+              onMouseEnter={() => onReplyHover?.(teammateMessage.replyToToolId ?? null)}
+              onMouseLeave={() => onReplyHover?.(null)}
+            >
+              <CornerDownLeft className="size-2.5" />
+              <span className="truncate" style={{ maxWidth: '180px' }}>
+                {plainReplyToSummary}
+              </span>
             </span>
+          )}
+
+          {/* Resend badge — marks duplicate/resent messages */}
+          {isResend && (
+            <span
+              className="flex items-center gap-0.5 text-[10px]"
+              style={{ color: CARD_ICON_MUTED }}
+            >
+              <RefreshCw className="size-2.5" />
+              Resent
+            </span>
+          )}
+
+          {/* Summary */}
+          <span className="flex-1 truncate text-xs" style={{ color: CARD_TEXT_LIGHT }}>
+            {truncatedSummary || 'Teammate message'}
           </span>
-        )}
 
-        {/* Resend badge — marks duplicate/resent messages */}
-        {isResend && (
-          <span
-            className="flex items-center gap-0.5 text-[10px]"
-            style={{ color: CARD_ICON_MUTED }}
-          >
-            <RefreshCw className="size-2.5" />
-            Resent
-          </span>
-        )}
+          {/* Context impact — tokens injected into main session */}
+          {teammateMessage.tokenCount != null && teammateMessage.tokenCount > 0 && (
+            <span
+              className="shrink-0 font-mono text-[11px] tabular-nums"
+              style={{ color: CARD_ICON_MUTED }}
+            >
+              ~{formatTokensCompact(teammateMessage.tokenCount)} tokens
+            </span>
+          )}
 
-        {/* Summary */}
-        <span className="flex-1 truncate text-xs" style={{ color: CARD_TEXT_LIGHT }}>
-          {truncatedSummary || 'Teammate message'}
-        </span>
-
-        {/* Context impact — tokens injected into main session */}
-        {teammateMessage.tokenCount != null && teammateMessage.tokenCount > 0 && (
+          {/* Timestamp — rightmost info element */}
           <span
             className="shrink-0 font-mono text-[11px] tabular-nums"
             style={{ color: CARD_ICON_MUTED }}
           >
-            ~{formatTokensCompact(teammateMessage.tokenCount)} tokens
+            {format(teammateMessage.timestamp, 'HH:mm:ss')}
           </span>
-        )}
-
-        {/* Timestamp — rightmost info element */}
-        <span
-          className="shrink-0 font-mono text-[11px] tabular-nums"
-          style={{ color: CARD_ICON_MUTED }}
-        >
-          {format(teammateMessage.timestamp, 'HH:mm:ss')}
-        </span>
-      </div>
-
-      {/* Expanded content */}
-      {isExpanded && (
-        <div className="p-3">
-          <MarkdownViewer content={displayContent} copyable />
         </div>
-      )}
-    </div>
-  );
-};
+
+        {/* Expanded content */}
+        {isExpanded && (
+          <div className="p-3">
+            <MarkdownViewer content={displayContent} copyable />
+          </div>
+        )}
+      </div>
+    );
+  }
+);
+
+TeammateMessageItem.displayName = 'TeammateMessageItem';
diff --git a/src/renderer/components/chat/items/TextItem.tsx b/src/renderer/components/chat/items/TextItem.tsx
index 9e94e566..f9b87a2d 100644
--- a/src/renderer/components/chat/items/TextItem.tsx
+++ b/src/renderer/components/chat/items/TextItem.tsx
@@ -31,52 +31,56 @@ interface TextItemProps {
   titleText?: string;
 }
 
-export const TextItem: React.FC<TextItemProps> = ({
-  step,
-  preview,
-  onClick,
-  isExpanded,
-  timestamp,
-  timestampFormat,
-  searchQueryOverride,
-  markdownItemId,
-  highlightClasses,
-  highlightStyle,
-  notificationDotColor,
-  titleText,
-}) => {
-  const fullContent = step.content.outputText ?? preview;
-  const summary = searchQueryOverride
-    ? highlightQueryInText(preview, searchQueryOverride, `${markdownItemId ?? step.id}:summary`, {
-        forceAllActive: true,
-      })
-    : preview;
+export const TextItem: React.FC<TextItemProps> = React.memo(
+  ({
+    step,
+    preview,
+    onClick,
+    isExpanded,
+    timestamp,
+    timestampFormat,
+    searchQueryOverride,
+    markdownItemId,
+    highlightClasses,
+    highlightStyle,
+    notificationDotColor,
+    titleText,
+  }) => {
+    const fullContent = step.content.outputText ?? preview;
+    const summary = searchQueryOverride
+      ? highlightQueryInText(preview, searchQueryOverride, `${markdownItemId ?? step.id}:summary`, {
+          forceAllActive: true,
+        })
+      : preview;
 
-  // Get token count from step.tokens.output or step.content.tokenCount
-  const tokenCount = step.tokens?.output ?? step.content.tokenCount ?? 0;
+    // Get token count from step.tokens.output or step.content.tokenCount
+    const tokenCount = step.tokens?.output ?? step.content.tokenCount ?? 0;
 
-  return (
-    <BaseItem
-      icon={<MessageSquare className="size-4" />}
-      label="Output"
-      summary={summary}
-      tokenCount={tokenCount}
-      timestamp={timestamp}
-      timestampFormat={timestampFormat}
-      titleText={titleText}
-      onClick={onClick}
-      isExpanded={isExpanded}
-      highlightClasses={highlightClasses}
-      highlightStyle={highlightStyle}
-      notificationDotColor={notificationDotColor}
-    >
-      <MarkdownViewer
-        content={fullContent}
-        maxHeight="max-h-96"
-        copyable
-        itemId={markdownItemId}
-        searchQueryOverride={searchQueryOverride}
-      />
-    </BaseItem>
-  );
-};
+    return (
+      <BaseItem
+        icon={<MessageSquare className="size-4" />}
+        label="Output"
+        summary={summary}
+        tokenCount={tokenCount}
+        timestamp={timestamp}
+        timestampFormat={timestampFormat}
+        titleText={titleText}
+        onClick={onClick}
+        isExpanded={isExpanded}
+        highlightClasses={highlightClasses}
+        highlightStyle={highlightStyle}
+        notificationDotColor={notificationDotColor}
+      >
+        <MarkdownViewer
+          content={fullContent}
+          maxHeight="max-h-96"
+          copyable
+          itemId={markdownItemId}
+          searchQueryOverride={searchQueryOverride}
+        />
+      </BaseItem>
+    );
+  }
+);
+
+TextItem.displayName = 'TextItem';
diff --git a/src/renderer/components/chat/items/ThinkingItem.tsx b/src/renderer/components/chat/items/ThinkingItem.tsx
index 116a9680..03c2c1ee 100644
--- a/src/renderer/components/chat/items/ThinkingItem.tsx
+++ b/src/renderer/components/chat/items/ThinkingItem.tsx
@@ -31,52 +31,56 @@ interface ThinkingItemProps {
   titleText?: string;
 }
 
-export const ThinkingItem: React.FC<ThinkingItemProps> = ({
-  step,
-  preview,
-  onClick,
-  isExpanded,
-  timestamp,
-  timestampFormat,
-  searchQueryOverride,
-  markdownItemId,
-  highlightClasses,
-  highlightStyle,
-  notificationDotColor,
-  titleText,
-}) => {
-  const fullContent = step.content.thinkingText ?? preview;
-  const summary = searchQueryOverride
-    ? highlightQueryInText(preview, searchQueryOverride, `${markdownItemId ?? step.id}:summary`, {
-        forceAllActive: true,
-      })
-    : preview;
+export const ThinkingItem: React.FC<ThinkingItemProps> = React.memo(
+  ({
+    step,
+    preview,
+    onClick,
+    isExpanded,
+    timestamp,
+    timestampFormat,
+    searchQueryOverride,
+    markdownItemId,
+    highlightClasses,
+    highlightStyle,
+    notificationDotColor,
+    titleText,
+  }) => {
+    const fullContent = step.content.thinkingText ?? preview;
+    const summary = searchQueryOverride
+      ? highlightQueryInText(preview, searchQueryOverride, `${markdownItemId ?? step.id}:summary`, {
+          forceAllActive: true,
+        })
+      : preview;
 
-  // Get token count from step.tokens.output or step.content.tokenCount
-  const tokenCount = step.tokens?.output ?? step.content.tokenCount ?? 0;
+    // Get token count from step.tokens.output or step.content.tokenCount
+    const tokenCount = step.tokens?.output ?? step.content.tokenCount ?? 0;
 
-  return (
-    <BaseItem
-      icon={<Brain className="size-4" />}
-      label="Thinking"
-      summary={summary}
-      tokenCount={tokenCount}
-      timestamp={timestamp}
-      timestampFormat={timestampFormat}
-      titleText={titleText}
-      onClick={onClick}
-      isExpanded={isExpanded}
-      highlightClasses={highlightClasses}
-      highlightStyle={highlightStyle}
-      notificationDotColor={notificationDotColor}
-    >
-      <MarkdownViewer
-        content={fullContent}
-        maxHeight="max-h-96"
-        copyable
-        itemId={markdownItemId}
-        searchQueryOverride={searchQueryOverride}
-      />
-    </BaseItem>
-  );
-};
+    return (
+      <BaseItem
+        icon={<Brain className="size-4" />}
+        label="Thinking"
+        summary={summary}
+        tokenCount={tokenCount}
+        timestamp={timestamp}
+        timestampFormat={timestampFormat}
+        titleText={titleText}
+        onClick={onClick}
+        isExpanded={isExpanded}
+        highlightClasses={highlightClasses}
+        highlightStyle={highlightStyle}
+        notificationDotColor={notificationDotColor}
+      >
+        <MarkdownViewer
+          content={fullContent}
+          maxHeight="max-h-96"
+          copyable
+          itemId={markdownItemId}
+          searchQueryOverride={searchQueryOverride}
+        />
+      </BaseItem>
+    );
+  }
+);
+
+ThinkingItem.displayName = 'ThinkingItem';
diff --git a/src/renderer/components/chat/items/linkedTool/CollapsibleOutputSection.tsx b/src/renderer/components/chat/items/linkedTool/CollapsibleOutputSection.tsx
index de6fb699..232043fa 100644
--- a/src/renderer/components/chat/items/linkedTool/CollapsibleOutputSection.tsx
+++ b/src/renderer/components/chat/items/linkedTool/CollapsibleOutputSection.tsx
@@ -5,7 +5,7 @@
  * Shows a clickable header with label, StatusDot, and chevron toggle.
  */
 
-import React, { useState } from 'react';
+import React, { memo, useState } from 'react';
 
 import { ChevronDown, ChevronRight } from 'lucide-react';
 
@@ -18,40 +18,46 @@ interface CollapsibleOutputSectionProps {
   label?: string;
 }
 
-export const CollapsibleOutputSection: React.FC<CollapsibleOutputSectionProps> = ({
-  status,
-  children,
-  label = 'Output',
-}) => {
-  const [isExpanded, setIsExpanded] = useState(false);
+export const CollapsibleOutputSection = memo(
+  ({ status, children, label = 'Output' }: CollapsibleOutputSectionProps): React.JSX.Element => {
+    const [isExpanded, setIsExpanded] = useState(false);
 
-  return (
-    <div>
-      <button
-        type="button"
-        className="mb-1 flex items-center gap-2 text-xs"
-        style={{ color: 'var(--tool-item-muted)', background: 'none', border: 'none', padding: 0, cursor: 'pointer' }}
-        onClick={() => setIsExpanded((prev) => !prev)}
-      >
-        {isExpanded ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
-        {label}
-        <StatusDot status={status} />
-      </button>
-      {isExpanded && (
-        <div
-          className="max-h-96 overflow-auto rounded p-3 font-mono text-xs"
+    return (
+      <div>
+        <button
+          type="button"
+          className="mb-1 flex items-center gap-2 text-xs"
           style={{
-            backgroundColor: 'var(--code-bg)',
-            border: '1px solid var(--code-border)',
-            color:
-              status === 'error'
-                ? 'var(--tool-result-error-text)'
-                : 'var(--color-text-secondary)',
+            color: 'var(--tool-item-muted)',
+            background: 'none',
+            border: 'none',
+            padding: 0,
+            cursor: 'pointer',
           }}
+          onClick={() => setIsExpanded((prev) => !prev)}
         >
-          {children}
-        </div>
-      )}
-    </div>
-  );
-};
+          {isExpanded ? <ChevronDown className="size-3" /> : <ChevronRight className="size-3" />}
+          {label}
+          <StatusDot status={status} />
+        </button>
+        {isExpanded && (
+          <div
+            className="max-h-96 overflow-auto rounded p-3 font-mono text-xs"
+            style={{
+              backgroundColor: 'var(--code-bg)',
+              border: '1px solid var(--code-border)',
+              color:
+                status === 'error'
+                  ? 'var(--tool-result-error-text)'
+                  : 'var(--color-text-secondary)',
+            }}
+          >
+            {children}
+          </div>
+        )}
+      </div>
+    );
+  }
+);
+
+CollapsibleOutputSection.displayName = 'CollapsibleOutputSection';
diff --git a/src/renderer/components/chat/items/linkedTool/DefaultToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/DefaultToolViewer.tsx
index fc9ae282..8c4ba316 100644
--- a/src/renderer/components/chat/items/linkedTool/DefaultToolViewer.tsx
+++ b/src/renderer/components/chat/items/linkedTool/DefaultToolViewer.tsx
@@ -4,7 +4,7 @@
  * Default rendering for tools that don't have specialized viewers.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { type ItemStatus } from '../BaseItem';
 
@@ -23,7 +23,10 @@ interface DefaultToolViewerProps {
   status: ItemStatus;
 }
 
-export const DefaultToolViewer: React.FC<DefaultToolViewerProps> = ({ linkedTool, status }) => {
+export const DefaultToolViewer = memo(function DefaultToolViewer({
+  linkedTool,
+  status,
+}: DefaultToolViewerProps) {
   const displayOutputContent = linkedTool.result
     ? formatToolOutputForDisplay(linkedTool.name, linkedTool.result.content)
     : null;
@@ -64,4 +67,4 @@ export const DefaultToolViewer: React.FC<DefaultToolViewerProps> = ({ linkedTool
         )}
     </>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/linkedTool/EditToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/EditToolViewer.tsx
index b8a8ef7d..c537eb04 100644
--- a/src/renderer/components/chat/items/linkedTool/EditToolViewer.tsx
+++ b/src/renderer/components/chat/items/linkedTool/EditToolViewer.tsx
@@ -4,7 +4,7 @@
  * Renders the Edit tool with DiffViewer.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { DiffViewer } from '@renderer/components/chat/viewers';
 
@@ -20,7 +20,10 @@ interface EditToolViewerProps {
   status: ItemStatus;
 }
 
-export const EditToolViewer: React.FC<EditToolViewerProps> = ({ linkedTool, status }) => {
+export const EditToolViewer = memo(function EditToolViewer({
+  linkedTool,
+  status,
+}: EditToolViewerProps) {
   const toolUseResult = linkedTool.result?.toolUseResult as Record<string, unknown> | undefined;
 
   const filePath = (toolUseResult?.filePath as string) || (linkedTool.input.file_path as string);
@@ -71,4 +74,4 @@ export const EditToolViewer: React.FC<EditToolViewerProps> = ({ linkedTool, stat
       )}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/linkedTool/ReadToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/ReadToolViewer.tsx
index 4edd8c93..c2d14b6b 100644
--- a/src/renderer/components/chat/items/linkedTool/ReadToolViewer.tsx
+++ b/src/renderer/components/chat/items/linkedTool/ReadToolViewer.tsx
@@ -4,7 +4,7 @@
  * Renders the Read tool result using CodeBlockViewer.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { CodeBlockViewer, MarkdownViewer } from '@renderer/components/chat/viewers';
 
@@ -14,7 +14,7 @@ interface ReadToolViewerProps {
   linkedTool: LinkedToolItem;
 }
 
-export const ReadToolViewer: React.FC<ReadToolViewerProps> = ({ linkedTool }) => {
+export const ReadToolViewer = memo(function ReadToolViewer({ linkedTool }: ReadToolViewerProps) {
   const filePath = linkedTool.input.file_path as string;
 
   // Prefer enriched toolUseResult data
@@ -55,7 +55,9 @@ export const ReadToolViewer: React.FC<ReadToolViewerProps> = ({ linkedTool }) =>
       : undefined;
 
   const isMarkdownFile = /\.mdx?$/i.test(filePath);
-  const [viewMode, setViewMode] = React.useState<'code' | 'preview'>(isMarkdownFile ? 'preview' : 'code');
+  const [viewMode, setViewMode] = React.useState<'code' | 'preview'>(
+    isMarkdownFile ? 'preview' : 'code'
+  );
 
   return (
     <div className="space-y-2">
@@ -99,4 +101,4 @@ export const ReadToolViewer: React.FC<ReadToolViewerProps> = ({ linkedTool }) =>
       )}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/linkedTool/SkillToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/SkillToolViewer.tsx
index c6447d79..9c180b28 100644
--- a/src/renderer/components/chat/items/linkedTool/SkillToolViewer.tsx
+++ b/src/renderer/components/chat/items/linkedTool/SkillToolViewer.tsx
@@ -4,7 +4,7 @@
  * Renders the Skill tool with its instructions in a code block viewer style.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { CodeBlockViewer } from '@renderer/components/chat/viewers';
 
@@ -14,7 +14,7 @@ interface SkillToolViewerProps {
   linkedTool: LinkedToolItem;
 }
 
-export const SkillToolViewer: React.FC<SkillToolViewerProps> = ({ linkedTool }) => {
+export const SkillToolViewer = memo(function SkillToolViewer({ linkedTool }: SkillToolViewerProps) {
   const skillInstructions = linkedTool.skillInstructions;
   const skillName = (linkedTool.input.skill as string) || 'Unknown Skill';
 
@@ -64,4 +64,4 @@ export const SkillToolViewer: React.FC<SkillToolViewerProps> = ({ linkedTool })
       )}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/linkedTool/ToolErrorDisplay.tsx b/src/renderer/components/chat/items/linkedTool/ToolErrorDisplay.tsx
index 13f3fd76..c52456ef 100644
--- a/src/renderer/components/chat/items/linkedTool/ToolErrorDisplay.tsx
+++ b/src/renderer/components/chat/items/linkedTool/ToolErrorDisplay.tsx
@@ -4,7 +4,7 @@
  * Displays error output for tool results.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { StatusDot } from '../BaseItem';
 
@@ -16,7 +16,9 @@ interface ToolErrorDisplayProps {
   linkedTool: LinkedToolItem;
 }
 
-export const ToolErrorDisplay: React.FC<ToolErrorDisplayProps> = ({ linkedTool }) => {
+export const ToolErrorDisplay = memo(function ToolErrorDisplay({
+  linkedTool,
+}: ToolErrorDisplayProps) {
   if (!linkedTool.result?.isError) return null;
 
   return (
@@ -40,4 +42,4 @@ export const ToolErrorDisplay: React.FC<ToolErrorDisplayProps> = ({ linkedTool }
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx b/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx
index c2931cff..6402a880 100644
--- a/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx
+++ b/src/renderer/components/chat/items/linkedTool/WriteToolViewer.tsx
@@ -4,7 +4,7 @@
  * Renders the Write tool result.
  */
 
-import React from 'react';
+import React, { memo } from 'react';
 
 import { CodeBlockViewer, MarkdownViewer } from '@renderer/components/chat/viewers';
 
@@ -14,7 +14,7 @@ interface WriteToolViewerProps {
   linkedTool: LinkedToolItem;
 }
 
-export const WriteToolViewer: React.FC<WriteToolViewerProps> = ({ linkedTool }) => {
+export const WriteToolViewer = memo(function WriteToolViewer({ linkedTool }: WriteToolViewerProps) {
   const toolUseResult = linkedTool.result?.toolUseResult as Record<string, unknown> | undefined;
 
   const filePath =
@@ -74,4 +74,4 @@ export const WriteToolViewer: React.FC<WriteToolViewerProps> = ({ linkedTool })
       )}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/viewers/CodeBlockViewer.tsx b/src/renderer/components/chat/viewers/CodeBlockViewer.tsx
index d694f3f1..9edb7a64 100644
--- a/src/renderer/components/chat/viewers/CodeBlockViewer.tsx
+++ b/src/renderer/components/chat/viewers/CodeBlockViewer.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo, useState } from 'react';
+import React, { memo, useMemo, useState } from 'react';
 
 import { getBaseName } from '@renderer/utils/pathUtils';
 import { createLogger } from '@shared/utils/logger';
@@ -117,14 +117,14 @@ function inferLanguage(fileName: string): string {
 // Component
 // =============================================================================
 
-export const CodeBlockViewer: React.FC<CodeBlockViewerProps> = ({
+export const CodeBlockViewer = memo(function CodeBlockViewer({
   fileName,
   content,
   language,
   startLine = 1,
   endLine,
   maxHeight = 'max-h-96',
-}): React.JSX.Element => {
+}: CodeBlockViewerProps): React.JSX.Element {
   const [isCopied, setIsCopied] = useState(false);
 
   // Infer language from file extension if not provided
@@ -241,4 +241,4 @@ export const CodeBlockViewer: React.FC<CodeBlockViewerProps> = ({
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/viewers/DiffViewer.tsx b/src/renderer/components/chat/viewers/DiffViewer.tsx
index 3400051d..efb74cd6 100644
--- a/src/renderer/components/chat/viewers/DiffViewer.tsx
+++ b/src/renderer/components/chat/viewers/DiffViewer.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React, { memo, useMemo } from 'react';
 
 import {
   CODE_BG,
@@ -349,14 +349,14 @@ const DiffLineRow: React.FC<DiffLineRowProps> = ({ line, highlightedHtml }): Rea
 // Main Component
 // =============================================================================
 
-export const DiffViewer: React.FC<DiffViewerProps> = ({
+export const DiffViewer = memo(function DiffViewer({
   fileName,
   oldString,
   newString,
   maxHeight = 'max-h-96',
   tokenCount,
   syntaxHighlight = false,
-}): React.JSX.Element => {
+}: DiffViewerProps): React.JSX.Element {
   // Compute diff
   const oldLines = oldString.split(/\r?\n/);
   const newLines = newString.split(/\r?\n/);
@@ -456,4 +456,4 @@ export const DiffViewer: React.FC<DiffViewerProps> = ({
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/chat/viewers/MarkdownViewer.tsx b/src/renderer/components/chat/viewers/MarkdownViewer.tsx
index 5bd3b977..90faaf38 100644
--- a/src/renderer/components/chat/viewers/MarkdownViewer.tsx
+++ b/src/renderer/components/chat/viewers/MarkdownViewer.tsx
@@ -946,7 +946,7 @@ export const CompactMarkdownPreview: React.FC<CompactMarkdownPreviewProps> = Rea
   }
 );
 
-export const MarkdownViewer: React.FC<MarkdownViewerProps> = ({
+export const MarkdownViewer: React.FC<MarkdownViewerProps> = React.memo(function MarkdownViewer({
   content,
   maxHeight = 'max-h-96',
   className = '',
@@ -958,7 +958,7 @@ export const MarkdownViewer: React.FC<MarkdownViewerProps> = ({
   baseDir,
   teamColorByName: providedTeamColorByName,
   onTeamClick: providedOnTeamClick,
-}) => {
+}) {
   const [showRaw, setShowRaw] = React.useState(false);
   const [rawLimit, setRawLimit] = React.useState(LARGE_PREVIEW_CHARS);
   const { isLight } = useTheme();
@@ -1169,12 +1169,36 @@ export const MarkdownViewer: React.FC<MarkdownViewerProps> = ({
           <span className="text-sm font-medium" style={{ color: COLOR_TEXT_SECONDARY }}>
             {label}
           </span>
-          {copyable && (
-            <>
-              <span className="flex-1" />
-              <CopyButton text={content} inline />
-            </>
-          )}
+          <span className="flex-1" />
+          <button
+            type="button"
+            className="text-xs underline"
+            style={{ color: PROSE_LINK }}
+            onClick={() => setShowRaw(true)}
+            title="Show raw"
+          >
+            Show raw
+          </button>
+          {copyable && <CopyButton text={content} inline />}
+        </div>
+      )}
+
+      {/* Show raw toggle for no-label path (skip in bare mode) */}
+      {!label && !bare && (
+        <div
+          className="flex items-center justify-between px-3 py-1 text-xs"
+          style={{ color: COLOR_TEXT_MUTED }}
+        >
+          <span />
+          <button
+            type="button"
+            className="underline"
+            style={{ color: PROSE_LINK }}
+            onClick={() => setShowRaw(true)}
+            title="Show raw"
+          >
+            Show raw
+          </button>
         </div>
       )}
 
@@ -1195,4 +1219,4 @@ export const MarkdownViewer: React.FC<MarkdownViewerProps> = ({
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/schedules/SchedulesView.tsx b/src/renderer/components/schedules/SchedulesView.tsx
index 4ee09057..c8a2b2f0 100644
--- a/src/renderer/components/schedules/SchedulesView.tsx
+++ b/src/renderer/components/schedules/SchedulesView.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { lazy, Suspense, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { Button } from '@renderer/components/ui/button';
 import { Input } from '@renderer/components/ui/input';
@@ -24,13 +24,18 @@ import {
 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
-import { LaunchTeamDialog } from '../team/dialogs/LaunchTeamDialog';
 import { ScheduleRunLogDialog } from '../team/schedule/ScheduleRunLogDialog';
 import { ScheduleRunRow } from '../team/schedule/ScheduleRunRow';
 import { ScheduleStatusBadge } from '../team/schedule/ScheduleStatusBadge';
 
 import type { Schedule, ScheduleRun, ScheduleStatus } from '@shared/types';
 
+const LaunchTeamDialog = lazy(() =>
+  import('@renderer/components/team/dialogs/LaunchTeamDialog').then((m) => ({
+    default: m.LaunchTeamDialog,
+  }))
+);
+
 // =============================================================================
 // Constants
 // =============================================================================
@@ -562,13 +567,17 @@ export const SchedulesView = (): React.JSX.Element => {
       </div>
 
       {/* Create/Edit Dialog */}
-      <LaunchTeamDialog
-        mode="schedule"
-        open={dialogOpen}
-        teamName={editingSchedule?.teamName}
-        schedule={editingSchedule}
-        onClose={handleClose}
-      />
+      {dialogOpen && (
+        <Suspense fallback={null}>
+          <LaunchTeamDialog
+            mode="schedule"
+            open={dialogOpen}
+            teamName={editingSchedule?.teamName}
+            schedule={editingSchedule}
+            onClose={handleClose}
+          />
+        </Suspense>
+      )}
     </div>
   );
 };
diff --git a/src/renderer/components/sidebar/DateGroupedSessions.tsx b/src/renderer/components/sidebar/DateGroupedSessions.tsx
index fe578e07..5c539408 100644
--- a/src/renderer/components/sidebar/DateGroupedSessions.tsx
+++ b/src/renderer/components/sidebar/DateGroupedSessions.tsx
@@ -4,7 +4,7 @@
  * Supports multi-select with bulk actions and hidden session filtering.
  */
 
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import { recordRecentProjectOpenPaths } from '@features/recent-projects/renderer';
@@ -184,7 +184,7 @@ function matchesSessionSearch(session: Session, query: string): boolean {
   return haystack.includes(query);
 }
 
-export const DateGroupedSessions = (): React.JSX.Element => {
+export const DateGroupedSessions = memo((): React.JSX.Element => {
   const {
     sessions,
     selectedSessionId,
@@ -202,7 +202,6 @@ export const DateGroupedSessions = (): React.JSX.Element => {
     toggleShowHiddenSessions,
     sidebarSelectedSessionIds,
     sidebarMultiSelectActive,
-    toggleSidebarSessionSelection,
     clearSidebarSelection,
     toggleSidebarMultiSelect,
     hideMultipleSessions,
@@ -239,7 +238,6 @@ export const DateGroupedSessions = (): React.JSX.Element => {
       toggleShowHiddenSessions: s.toggleShowHiddenSessions,
       sidebarSelectedSessionIds: s.sidebarSelectedSessionIds,
       sidebarMultiSelectActive: s.sidebarMultiSelectActive,
-      toggleSidebarSessionSelection: s.toggleSidebarSessionSelection,
       clearSidebarSelection: s.clearSidebarSelection,
       toggleSidebarMultiSelect: s.toggleSidebarMultiSelect,
       hideMultipleSessions: s.hideMultipleSessions,
@@ -1104,7 +1102,6 @@ export const DateGroupedSessions = (): React.JSX.Element => {
                     isHidden={item.isHidden}
                     multiSelectActive={sidebarMultiSelectActive}
                     isSelected={selectedSet.has(item.session.id)}
-                    onToggleSelect={() => toggleSidebarSessionSelection(item.session.id)}
                   />
                 )}
               </div>
@@ -1114,4 +1111,6 @@ export const DateGroupedSessions = (): React.JSX.Element => {
       </div>
     </div>
   );
-};
+});
+
+DateGroupedSessions.displayName = 'DateGroupedSessions';
diff --git a/src/renderer/components/sidebar/GlobalTaskList.tsx b/src/renderer/components/sidebar/GlobalTaskList.tsx
index 14dcc6c3..f236f190 100644
--- a/src/renderer/components/sidebar/GlobalTaskList.tsx
+++ b/src/renderer/components/sidebar/GlobalTaskList.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { confirm } from '@renderer/components/common/ConfirmDialog';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
@@ -173,13 +173,13 @@ function applyProjectFilter(tasks: GlobalTask[], projectPath: string | null): Gl
   return tasks.filter((t) => t.projectPath && normalizePath(t.projectPath) === normalized);
 }
 
-export const GlobalTaskList = ({
+export const GlobalTaskList = memo(function GlobalTaskList({
   hideHeader = false,
   filters: externalFilters,
   onFiltersChange: externalOnFiltersChange,
   filtersPopoverOpen: externalFiltersPopoverOpen,
   onFiltersPopoverOpenChange: externalOnFiltersPopoverOpenChange,
-}: GlobalTaskListProps = {}): React.JSX.Element => {
+}: GlobalTaskListProps = {}): React.JSX.Element {
   const {
     globalTasks,
     globalTasksLoading,
@@ -271,37 +271,43 @@ export const GlobalTaskList = ({
     saveSortMode(mode);
   };
 
-  const handleRenameComplete = (teamName: string, taskId: string, newSubject: string): void => {
-    taskLocalState.renameTask(teamName, taskId, newSubject);
-    setRenamingTaskKey(null);
-  };
+  const handleRenameComplete = useCallback(
+    (teamName: string, taskId: string, newSubject: string): void => {
+      taskLocalState.renameTask(teamName, taskId, newSubject);
+      setRenamingTaskKey(null);
+    },
+    [taskLocalState]
+  );
 
-  const handleRenameCancel = (): void => {
+  const handleRenameCancel = useCallback((): void => {
     setRenamingTaskKey(null);
-  };
+  }, []);
 
-  const handleDeleteTask = async (teamName: string, taskId: string): Promise<void> => {
-    const confirmed = await confirm({
-      title: 'Delete task',
-      message: `Move task #${deriveTaskDisplayId(taskId)} to trash?`,
-      confirmLabel: 'Delete',
-      cancelLabel: 'Cancel',
-      variant: 'danger',
-    });
-    if (confirmed) {
-      try {
-        await softDeleteTask(teamName, taskId);
-        await fetchAllTasks();
-      } catch (err) {
-        void confirm({
-          title: 'Failed to delete task',
-          message: err instanceof Error ? err.message : 'An unexpected error occurred',
-          confirmLabel: 'OK',
-          variant: 'danger',
-        });
+  const handleDeleteTask = useCallback(
+    async (teamName: string, taskId: string): Promise<void> => {
+      const confirmed = await confirm({
+        title: 'Delete task',
+        message: `Move task #${deriveTaskDisplayId(taskId)} to trash?`,
+        confirmLabel: 'Delete',
+        cancelLabel: 'Cancel',
+        variant: 'danger',
+      });
+      if (confirmed) {
+        try {
+          await softDeleteTask(teamName, taskId);
+          await fetchAllTasks();
+        } catch (err) {
+          void confirm({
+            title: 'Failed to delete task',
+            message: err instanceof Error ? err.message : 'An unexpected error occurred',
+            confirmLabel: 'OK',
+            variant: 'danger',
+          });
+        }
       }
-    }
-  };
+    },
+    [fetchAllTasks, softDeleteTask]
+  );
 
   // Fetch tasks on mount — loading guard in the store action prevents
   // duplicate IPC calls when the centralized init chain is already fetching.
@@ -850,4 +856,4 @@ export const GlobalTaskList = ({
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/sidebar/SessionItem.tsx b/src/renderer/components/sidebar/SessionItem.tsx
index ab6b72a9..f9726a75 100644
--- a/src/renderer/components/sidebar/SessionItem.tsx
+++ b/src/renderer/components/sidebar/SessionItem.tsx
@@ -4,7 +4,7 @@
  * Supports right-click context menu for pane management.
  */
 
-import { useCallback, useRef, useState } from 'react';
+import { memo, useCallback, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 
 import { ProviderBrandLogo } from '@renderer/components/common/ProviderBrandLogo';
@@ -30,7 +30,6 @@ interface SessionItemProps {
   isHidden?: boolean;
   multiSelectActive?: boolean;
   isSelected?: boolean;
-  onToggleSelect?: () => void;
 }
 
 /**
@@ -156,15 +155,14 @@ const SessionRuntimeBadge = ({
   );
 };
 
-export const SessionItem = ({
+export const SessionItem = memo(function SessionItem({
   session,
   isActive,
   isPinned,
   isHidden,
   multiSelectActive,
   isSelected,
-  onToggleSelect,
-}: Readonly<SessionItemProps>): React.JSX.Element => {
+}: Readonly<SessionItemProps>): React.JSX.Element {
   const {
     openTab,
     activeProjectId,
@@ -173,6 +171,7 @@ export const SessionItem = ({
     splitPane,
     togglePinSession,
     toggleHideSession,
+    toggleSidebarSessionSelection,
   } = useStore(
     useShallow((s) => ({
       openTab: s.openTab,
@@ -182,6 +181,7 @@ export const SessionItem = ({
       splitPane: s.splitPane,
       togglePinSession: s.togglePinSession,
       toggleHideSession: s.toggleHideSession,
+      toggleSidebarSessionSelection: s.toggleSidebarSessionSelection,
     }))
   );
 
@@ -191,8 +191,8 @@ export const SessionItem = ({
     if (!activeProjectId) return;
 
     // In multi-select mode, clicks toggle selection
-    if (multiSelectActive && onToggleSelect) {
-      onToggleSelect();
+    if (multiSelectActive) {
+      toggleSidebarSessionSelection(session.id);
       return;
     }
 
@@ -290,7 +290,7 @@ export const SessionItem = ({
                   <input
                     type="checkbox"
                     checked={isSelected ?? false}
-                    onChange={() => onToggleSelect?.()}
+                    onChange={() => toggleSidebarSessionSelection(session.id)}
                     onClick={(e) => e.stopPropagation()}
                     className="size-3.5 shrink-0 accent-blue-500"
                   />
@@ -390,4 +390,4 @@ export const SessionItem = ({
         )}
     </>
   );
-};
+});
diff --git a/src/renderer/components/sidebar/SidebarTaskItem.tsx b/src/renderer/components/sidebar/SidebarTaskItem.tsx
index 688aa958..ef6d959b 100644
--- a/src/renderer/components/sidebar/SidebarTaskItem.tsx
+++ b/src/renderer/components/sidebar/SidebarTaskItem.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useEffect, useMemo, useRef, useState } from 'react';
 
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
 import { getTeamColorSet } from '@renderer/constants/teamColors';
@@ -69,7 +69,7 @@ interface SidebarTaskItemProps {
   getDisplaySubject?: (task: GlobalTask) => string | undefined;
 }
 
-export const SidebarTaskItem = ({
+export const SidebarTaskItem = memo(function SidebarTaskItem({
   task,
   hideTeamName,
   showTeamName,
@@ -77,7 +77,7 @@ export const SidebarTaskItem = ({
   onRenameComplete,
   onRenameCancel,
   getDisplaySubject,
-}: SidebarTaskItemProps): React.JSX.Element => {
+}: SidebarTaskItemProps): React.JSX.Element {
   const openGlobalTaskDetail = useStore((s) => s.openGlobalTaskDetail);
   const teamMembers = useStore(useShallow((s) => s.teamByName[task.teamName]?.members));
   const unreadCount = useUnreadCommentCount(task.teamName, task.id, task.comments);
@@ -283,4 +283,4 @@ export const SidebarTaskItem = ({
       )}
     </button>
   );
-};
+});
diff --git a/src/renderer/components/team/CollapsibleTeamSection.tsx b/src/renderer/components/team/CollapsibleTeamSection.tsx
index 3782434e..9b78b3a4 100644
--- a/src/renderer/components/team/CollapsibleTeamSection.tsx
+++ b/src/renderer/components/team/CollapsibleTeamSection.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useRef, useState } from 'react';
 
 import { Badge } from '@renderer/components/ui/badge';
 import { cn } from '@renderer/lib/utils';
@@ -44,7 +44,7 @@ interface CollapsibleTeamSectionProps {
   children: React.ReactNode;
 }
 
-export const CollapsibleTeamSection = ({
+export const CollapsibleTeamSection = memo(function CollapsibleTeamSection({
   title,
   icon,
   badge,
@@ -63,7 +63,7 @@ export const CollapsibleTeamSection = ({
   headerSurfaceClassName,
   keepMounted,
   children,
-}: CollapsibleTeamSectionProps): React.JSX.Element => {
+}: CollapsibleTeamSectionProps): React.JSX.Element {
   const [open, setOpen] = useState(defaultOpen);
   const isOpen = forceOpen ? true : open;
   const sectionRef = useRef<HTMLElement>(null);
@@ -174,4 +174,4 @@ export const CollapsibleTeamSection = ({
       )}
     </section>
   );
-};
+});
diff --git a/src/renderer/components/team/LeadSessionDetailGate.tsx b/src/renderer/components/team/LeadSessionDetailGate.tsx
new file mode 100644
index 00000000..e369bd03
--- /dev/null
+++ b/src/renderer/components/team/LeadSessionDetailGate.tsx
@@ -0,0 +1,73 @@
+import { memo, useEffect, useRef } from 'react';
+
+import { useStore } from '@renderer/store';
+import { useShallow } from 'zustand/react/shallow';
+
+import {
+  buildLeadSessionDetailRequestKey,
+  shouldFetchLeadSessionDetail,
+  shouldLoadLeadSessionDetail,
+} from './leadContextLoadGuards';
+
+interface LeadSessionDetailGateProps {
+  tabId: string | null;
+  projectId: string | null;
+  leadSessionId: string | null;
+  enabled: boolean;
+}
+
+export const LeadSessionDetailGate = memo(function LeadSessionDetailGate({
+  tabId,
+  projectId,
+  leadSessionId,
+  enabled,
+}: LeadSessionDetailGateProps): null {
+  const fetchSessionDetail = useStore((s) => s.fetchSessionDetail);
+  const { loadedSessionId, loading } = useStore(
+    useShallow((s) => {
+      const tabData = tabId ? (s.tabSessionData[tabId] ?? null) : null;
+      return {
+        loadedSessionId: tabData?.sessionDetail?.session?.id ?? null,
+        loading: tabData?.sessionDetailLoading ?? false,
+      };
+    })
+  );
+  const startedRequestKeyRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (!enabled) {
+      startedRequestKeyRef.current = null;
+    }
+  }, [enabled]);
+
+  useEffect(() => {
+    const input = { tabId, projectId, leadSessionId, enabled };
+    if (!shouldLoadLeadSessionDetail(input)) {
+      return;
+    }
+
+    const requestKey = buildLeadSessionDetailRequestKey(input);
+    if (
+      !shouldFetchLeadSessionDetail({
+        requestedSessionId: input.leadSessionId,
+        loadedSessionId,
+        loading,
+        inFlightOrAttemptedRequestKey: startedRequestKeyRef.current,
+        nextRequestKey: requestKey,
+      })
+    ) {
+      return;
+    }
+
+    startedRequestKeyRef.current = requestKey;
+    void fetchSessionDetail(input.projectId, input.leadSessionId, input.tabId, { silent: false });
+  }, [enabled, fetchSessionDetail, leadSessionId, loadedSessionId, loading, projectId, tabId]);
+
+  useEffect(() => {
+    if (loadedSessionId === leadSessionId) {
+      startedRequestKeyRef.current = null;
+    }
+  }, [leadSessionId, loadedSessionId]);
+
+  return null;
+});
diff --git a/src/renderer/components/team/LiveRuntimeStatusBridge.tsx b/src/renderer/components/team/LiveRuntimeStatusBridge.tsx
new file mode 100644
index 00000000..b646dcf2
--- /dev/null
+++ b/src/renderer/components/team/LiveRuntimeStatusBridge.tsx
@@ -0,0 +1,77 @@
+import { memo, useMemo } from 'react';
+
+import { useStore } from '@renderer/store';
+import { Activity } from 'lucide-react';
+import { useShallow } from 'zustand/react/shallow';
+
+import { CollapsibleTeamSection } from './CollapsibleTeamSection';
+import { LiveRuntimeStatusSection } from './LiveRuntimeStatusSection';
+import {
+  buildTeamRuntimeDisplayRows,
+  type TeamRuntimeDisplayMember,
+} from './teamRuntimeDisplayRows';
+
+export const TEAM_RUNTIME_UI_DECOUPLING_STORAGE_KEY = 'teamRuntimeUiDecouplingEnabled';
+
+interface LiveRuntimeStatusBridgeProps {
+  teamName: string;
+  members: readonly TeamRuntimeDisplayMember[];
+}
+
+export const LiveRuntimeStatusBridge = memo(function LiveRuntimeStatusBridge({
+  teamName,
+  members,
+}: LiveRuntimeStatusBridgeProps): React.JSX.Element | null {
+  if (!isTeamRuntimeUiDecouplingEnabled()) return null;
+
+  return <LiveRuntimeStatusStoreBridge teamName={teamName} members={members} />;
+});
+
+const LiveRuntimeStatusStoreBridge = memo(function LiveRuntimeStatusStoreBridge({
+  teamName,
+  members,
+}: LiveRuntimeStatusBridgeProps): React.JSX.Element | null {
+  const { runtimeSnapshot, spawnStatuses } = useStore(
+    useShallow((s) => ({
+      runtimeSnapshot: s.teamAgentRuntimeByTeam[teamName],
+      spawnStatuses: s.memberSpawnStatusesByTeam[teamName],
+    }))
+  );
+  const rows = useMemo(
+    () =>
+      buildTeamRuntimeDisplayRows({
+        members,
+        runtimeSnapshot,
+        spawnStatuses,
+      }),
+    [members, runtimeSnapshot, spawnStatuses]
+  );
+
+  if (rows.length === 0) return null;
+
+  const liveCount = rows.filter((row) => row.state === 'running').length;
+  const attentionCount = rows.filter((row) => row.state === 'degraded').length;
+  const badge = attentionCount > 0 ? attentionCount : liveCount > 0 ? liveCount : undefined;
+
+  return (
+    <CollapsibleTeamSection
+      sectionId="live-runtime-status"
+      title="Live Runtime Status"
+      icon={<Activity size={14} />}
+      badge={badge}
+      defaultOpen={false}
+    >
+      <LiveRuntimeStatusSection rows={rows} />
+    </CollapsibleTeamSection>
+  );
+});
+
+export function isTeamRuntimeUiDecouplingEnabled(): boolean {
+  if (typeof window === 'undefined') return false;
+
+  try {
+    return window.localStorage.getItem(TEAM_RUNTIME_UI_DECOUPLING_STORAGE_KEY) === 'true';
+  } catch {
+    return false;
+  }
+}
diff --git a/src/renderer/components/team/LiveRuntimeStatusSection.tsx b/src/renderer/components/team/LiveRuntimeStatusSection.tsx
new file mode 100644
index 00000000..b0ccd897
--- /dev/null
+++ b/src/renderer/components/team/LiveRuntimeStatusSection.tsx
@@ -0,0 +1,98 @@
+import { memo } from 'react';
+
+import type { RuntimeDisplayState, TeamRuntimeDisplayRow } from './teamRuntimeDisplayRows';
+
+interface LiveRuntimeStatusSectionProps {
+  rows: readonly TeamRuntimeDisplayRow[];
+}
+
+const STATE_LABELS: Record<RuntimeDisplayState, string> = {
+  running: 'Running',
+  starting: 'Starting',
+  waiting: 'Waiting',
+  degraded: 'Needs attention',
+  stopped: 'Stopped',
+  unknown: 'Unknown',
+};
+
+const STATE_CLASS_NAMES: Record<RuntimeDisplayState, string> = {
+  running: 'border-emerald-500/25 bg-emerald-500/10 text-emerald-700 dark:text-emerald-300',
+  starting: 'border-sky-500/25 bg-sky-500/10 text-sky-700 dark:text-sky-300',
+  waiting: 'border-amber-500/25 bg-amber-500/10 text-amber-700 dark:text-amber-300',
+  degraded: 'border-rose-500/25 bg-rose-500/10 text-rose-700 dark:text-rose-300',
+  stopped: 'border-zinc-500/25 bg-zinc-500/10 text-zinc-700 dark:text-zinc-300',
+  unknown: 'border-zinc-500/20 bg-zinc-500/5 text-zinc-600 dark:text-zinc-400',
+};
+
+export const LiveRuntimeStatusSection = memo(function LiveRuntimeStatusSection({
+  rows,
+}: LiveRuntimeStatusSectionProps): React.JSX.Element | null {
+  if (rows.length === 0) return null;
+
+  return (
+    <div className="space-y-3" aria-label="Live runtime status">
+      <span className="sr-only">Live runtime status</span>
+      <p className="text-muted-foreground text-xs">
+        Display-only heartbeat and launch state. Process controls remain below.
+      </p>
+      <div className="grid gap-2 sm:grid-cols-2 xl:grid-cols-3">
+        {rows.map((row) => (
+          <article
+            key={row.memberName}
+            className="border-border/70 bg-card/50 rounded-lg border p-3 shadow-sm"
+          >
+            <div className="flex items-start justify-between gap-3">
+              <div className="min-w-0">
+                <div className="text-foreground truncate text-sm font-medium">{row.memberName}</div>
+                <div className="text-muted-foreground mt-1 line-clamp-2 text-xs">
+                  {row.stateReason}
+                </div>
+              </div>
+              <span
+                className={`shrink-0 rounded-full border px-2 py-0.5 text-[11px] font-medium ${STATE_CLASS_NAMES[row.state]}`}
+              >
+                {STATE_LABELS[row.state]}
+              </span>
+            </div>
+
+            <div className="text-muted-foreground mt-3 flex flex-wrap gap-1.5 text-[11px]">
+              <span className="bg-muted rounded-full px-2 py-0.5">source: {row.source}</span>
+              {row.runtimeModel ? (
+                <span className="bg-muted rounded-full px-2 py-0.5">{row.runtimeModel}</span>
+              ) : null}
+              {row.laneKind ? (
+                <span className="bg-muted rounded-full px-2 py-0.5">{row.laneKind} lane</span>
+              ) : null}
+              {row.pidLabel ? (
+                <span className="bg-muted rounded-full px-2 py-0.5" title="Diagnostic only">
+                  {row.pidLabel}
+                </span>
+              ) : null}
+              {row.updatedAt ? (
+                <span className="bg-muted rounded-full px-2 py-0.5">
+                  updated {formatRuntimeUpdatedAt(row.updatedAt)}
+                </span>
+              ) : null}
+            </div>
+          </article>
+        ))}
+      </div>
+    </div>
+  );
+});
+
+function formatRuntimeUpdatedAt(value: string): string {
+  const timestamp = Date.parse(value);
+  if (!Number.isFinite(timestamp)) return value;
+
+  const secondsAgo = Math.max(0, Math.round((Date.now() - timestamp) / 1000));
+  if (secondsAgo < 60) return `${secondsAgo}s ago`;
+
+  const minutesAgo = Math.round(secondsAgo / 60);
+  if (minutesAgo < 60) return `${minutesAgo}m ago`;
+
+  return new Date(timestamp).toLocaleTimeString([], {
+    hour: '2-digit',
+    minute: '2-digit',
+  });
+}
diff --git a/src/renderer/components/team/MemberBadge.tsx b/src/renderer/components/team/MemberBadge.tsx
index 7f29c0ff..7031ce99 100644
--- a/src/renderer/components/team/MemberBadge.tsx
+++ b/src/renderer/components/team/MemberBadge.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { memo, useMemo } from 'react';
 
 import {
   getTeamColorSet,
@@ -37,81 +37,85 @@ interface MemberBadgeProps {
  * When onClick is provided, both avatar and badge are clickable as one unit.
  * Wrapped in MemberHoverCard to show member info on hover.
  */
-export const MemberBadge = ({
-  name,
-  color,
-  teamName,
-  size = 'sm',
-  hideAvatar,
-  onClick,
-  disableHoverCard,
-}: MemberBadgeProps): React.JSX.Element => {
-  const colors = getTeamColorSet(color ?? '');
-  const { isLight } = useTheme();
-  const selectedTeamName = useStore((s) => s.selectedTeamName);
-  const effectiveTeamName = teamName ?? selectedTeamName;
-  const teamMembers = useStore((s) =>
-    effectiveTeamName ? selectResolvedMembersForTeamName(s, effectiveTeamName) : []
-  );
-  const avatarMap = useMemo(() => buildMemberAvatarMap(teamMembers), [teamMembers]);
-  const avatarSize = size === 'md' ? 32 : size === 'sm' ? 24 : 18;
-  const avatarClass = size === 'md' ? 'size-6' : size === 'sm' ? 'size-5' : 'size-4';
-  const textClass = size === 'md' ? 'text-xs' : size === 'sm' ? 'text-[10px]' : 'text-[9px]';
-  const paddingClass = size === 'xs' ? 'px-1 py-0.5' : 'px-1.5 py-0.5';
+export const MemberBadge = memo(
+  ({
+    name,
+    color,
+    teamName,
+    size = 'sm',
+    hideAvatar,
+    onClick,
+    disableHoverCard,
+  }: MemberBadgeProps): React.JSX.Element => {
+    const colors = getTeamColorSet(color ?? '');
+    const { isLight } = useTheme();
+    const selectedTeamName = useStore((s) => s.selectedTeamName);
+    const effectiveTeamName = teamName ?? selectedTeamName;
+    const teamMembers = useStore((s) =>
+      effectiveTeamName ? selectResolvedMembersForTeamName(s, effectiveTeamName) : []
+    );
+    const avatarMap = useMemo(() => buildMemberAvatarMap(teamMembers), [teamMembers]);
+    const avatarSize = size === 'md' ? 32 : size === 'sm' ? 24 : 18;
+    const avatarClass = size === 'md' ? 'size-6' : size === 'sm' ? 'size-5' : 'size-4';
+    const textClass = size === 'md' ? 'text-xs' : size === 'sm' ? 'text-[10px]' : 'text-[9px]';
+    const paddingClass = size === 'xs' ? 'px-1 py-0.5' : 'px-1.5 py-0.5';
 
-  const badgeStyle = {
-    backgroundColor: getThemedBadge(colors, isLight),
-    color: getThemedText(colors, isLight),
-    border: `1px solid ${getThemedBorder(colors, isLight)}40`,
-  };
+    const badgeStyle = {
+      backgroundColor: getThemedBadge(colors, isLight),
+      color: getThemedText(colors, isLight),
+      border: `1px solid ${getThemedBorder(colors, isLight)}40`,
+    };
 
-  const avatar = (
-    <img
-      src={avatarMap.get(name) ?? agentAvatarUrl(name, avatarSize)}
-      alt=""
-      className={`${avatarClass} shrink-0 rounded-full bg-[var(--color-surface-raised)]`}
-      loading="lazy"
-    />
-  );
+    const avatar = (
+      <img
+        src={avatarMap.get(name) ?? agentAvatarUrl(name, avatarSize)}
+        alt=""
+        className={`${avatarClass} shrink-0 rounded-full bg-[var(--color-surface-raised)]`}
+        loading="lazy"
+      />
+    );
 
-  const badge = (
-    <span
-      className={`rounded ${paddingClass} ${textClass} font-medium tracking-wide`}
-      style={badgeStyle}
-    >
-      {displayMemberName(name)}
-    </span>
-  );
+    const badge = (
+      <span
+        className={`rounded ${paddingClass} ${textClass} font-medium tracking-wide`}
+        style={badgeStyle}
+      >
+        {displayMemberName(name)}
+      </span>
+    );
 
-  // Skip hover card for "user" and "system" pseudo-members
-  const skipHoverCard = disableHoverCard || name === 'user' || name === 'system';
+    // Skip hover card for "user" and "system" pseudo-members
+    const skipHoverCard = disableHoverCard || name === 'user' || name === 'system';
 
-  const content = onClick ? (
-    <button
-      type="button"
-      className="inline-flex items-center gap-1 rounded transition-opacity hover:opacity-90 focus:outline-none focus:ring-1 focus:ring-[var(--color-border)]"
-      onClick={(e) => {
-        e.stopPropagation();
-        onClick(name);
-      }}
-    >
-      {!hideAvatar && avatar}
-      {badge}
-    </button>
-  ) : (
-    <span className="inline-flex items-center gap-1">
-      {!hideAvatar && avatar}
-      {badge}
-    </span>
-  );
+    const content = onClick ? (
+      <button
+        type="button"
+        className="inline-flex items-center gap-1 rounded transition-opacity hover:opacity-90 focus:outline-none focus:ring-1 focus:ring-[var(--color-border)]"
+        onClick={(e) => {
+          e.stopPropagation();
+          onClick(name);
+        }}
+      >
+        {!hideAvatar && avatar}
+        {badge}
+      </button>
+    ) : (
+      <span className="inline-flex items-center gap-1">
+        {!hideAvatar && avatar}
+        {badge}
+      </span>
+    );
 
-  if (skipHoverCard) {
-    return content;
+    if (skipHoverCard) {
+      return content;
+    }
+
+    return (
+      <MemberHoverCard name={name} color={color} teamName={teamName}>
+        {content}
+      </MemberHoverCard>
+    );
   }
+);
 
-  return (
-    <MemberHoverCard name={name} color={color} teamName={teamName}>
-      {content}
-    </MemberHoverCard>
-  );
-};
+MemberBadge.displayName = 'MemberBadge';
diff --git a/src/renderer/components/team/ProvisioningProgressBlock.tsx b/src/renderer/components/team/ProvisioningProgressBlock.tsx
index 3dc2c59e..e593cf16 100644
--- a/src/renderer/components/team/ProvisioningProgressBlock.tsx
+++ b/src/renderer/components/team/ProvisioningProgressBlock.tsx
@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 
 import { Button } from '@renderer/components/ui/button';
 import { cn } from '@renderer/lib/utils';
+import { renderLinkifiedText } from '@renderer/utils/linkifiedText';
 import {
   AlertTriangle,
   Check,
@@ -431,9 +432,9 @@ export const ProvisioningProgressBlock = ({
         ) : null}
       </div>
       {message ? (
-        <p
+        <div
           className={cn(
-            'mt-1.5 text-xs',
+            'mt-1.5 whitespace-pre-wrap text-xs',
             isError || messageSeverity === 'error'
               ? 'text-red-400'
               : messageSeverity === 'warning'
@@ -443,13 +444,16 @@ export const ProvisioningProgressBlock = ({
                   : 'text-[var(--color-text-muted)]'
           )}
         >
-          {message}
-        </p>
+          {renderLinkifiedText(message, {
+            linkClassName: 'underline underline-offset-2 hover:text-[var(--color-accent)]',
+          })}
+        </div>
       ) : null}
       <div className="mt-2 px-2">
         <StepProgressBar
           steps={PROVISIONING_STEPS}
           currentIndex={currentStepIndex}
+          active={loading}
           errorIndex={errorStepIndex}
         />
       </div>
diff --git a/src/renderer/components/team/StepProgressBar.tsx b/src/renderer/components/team/StepProgressBar.tsx
index f9e8b8fc..290ee752 100644
--- a/src/renderer/components/team/StepProgressBar.tsx
+++ b/src/renderer/components/team/StepProgressBar.tsx
@@ -12,6 +12,8 @@ export interface StepProgressBarProps {
   steps: StepProgressBarStep[];
   /** 0-based index of the current step, -1 if not started */
   currentIndex: number;
+  /** Whether the current step should show in-progress animations */
+  active?: boolean;
   /** If set, this step shows a red error indicator instead of active/pending */
   errorIndex?: number;
   className?: string;
@@ -28,25 +30,33 @@ export interface StepProgressBarProps {
 export const StepProgressBar = ({
   steps,
   currentIndex,
+  active = true,
   errorIndex,
   className,
 }: StepProgressBarProps): React.JSX.Element => {
-  // Track which step just completed for jelly + flash animation
   const prevIndexRef = useRef(currentIndex);
   const [justCompletedIndex, setJustCompletedIndex] = useState<number | null>(null);
+  const canAnimate = active && errorIndex === undefined;
 
   useEffect(() => {
     const prev = prevIndexRef.current;
     prevIndexRef.current = currentIndex;
 
-    // Animate the highest step that just became "done"
-    if (currentIndex > prev && prev >= 0 && errorIndex === undefined) {
-      const lastDoneIndex = Math.min(currentIndex - 1, steps.length - 1);
-      setJustCompletedIndex(lastDoneIndex);
-      const timer = setTimeout(() => setJustCompletedIndex(null), 500);
-      return () => clearTimeout(timer);
+    if (!canAnimate) {
+      const clearTimer = window.setTimeout(() => setJustCompletedIndex(null), 0);
+      return () => window.clearTimeout(clearTimer);
     }
-  }, [currentIndex, errorIndex, steps.length]);
+
+    if (currentIndex > prev && prev >= 0) {
+      const lastDoneIndex = Math.min(currentIndex - 1, steps.length - 1);
+      const startTimer = window.setTimeout(() => setJustCompletedIndex(lastDoneIndex), 0);
+      const clearTimer = window.setTimeout(() => setJustCompletedIndex(null), 500);
+      return () => {
+        window.clearTimeout(startTimer);
+        window.clearTimeout(clearTimer);
+      };
+    }
+  }, [canAnimate, currentIndex, steps.length]);
 
   return (
     <div className={cn('flex items-start justify-center', className)}>
@@ -55,11 +65,12 @@ export const StepProgressBar = ({
         const isDone = !isError && currentIndex >= 0 && index < currentIndex;
         const isCurrent = !isError && currentIndex >= 0 && index === currentIndex;
         const isLast = index === steps.length - 1;
-        const isJustCompleted = justCompletedIndex === index;
+        const isJustCompleted = canAnimate && justCompletedIndex === index;
+        const isAnimatingCurrent = canAnimate && isCurrent;
 
         // The connecting line between this step and the next
         const lineState: 'done' | 'active' | 'pending' =
-          isDone && !isLast ? 'done' : isCurrent && !isLast ? 'active' : 'pending';
+          isDone && !isLast ? 'done' : isAnimatingCurrent && !isLast ? 'active' : 'pending';
 
         return (
           <div
@@ -69,7 +80,7 @@ export const StepProgressBar = ({
           >
             {/* Step circle + label column */}
             <div className="flex flex-col items-center" style={{ width: 56 }}>
-              {/* Circle wrapper — holds flash overlay */}
+              {/* Circle wrapper - holds flash overlay */}
               <div className="relative flex items-center justify-center">
                 {/* Green flash burst on completion */}
                 {isJustCompleted && isDone && (
@@ -96,7 +107,7 @@ export const StepProgressBar = ({
                   style={
                     isJustCompleted && isDone
                       ? { animation: 'stepper-jelly 0.45s ease-out' }
-                      : isCurrent
+                      : isAnimatingCurrent
                         ? { animation: 'stepper-pulse-ring 2s ease-in-out infinite' }
                         : undefined
                   }
diff --git a/src/renderer/components/team/TaskTooltip.tsx b/src/renderer/components/team/TaskTooltip.tsx
index 97471ad5..b777c22f 100644
--- a/src/renderer/components/team/TaskTooltip.tsx
+++ b/src/renderer/components/team/TaskTooltip.tsx
@@ -1,4 +1,4 @@
-import { useMemo } from 'react';
+import { memo, useMemo } from 'react';
 
 import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
 import { MemberBadge } from '@renderer/components/team/MemberBadge';
@@ -65,12 +65,12 @@ interface TaskTooltipProps {
  * Tooltip that shows task summary on hover over any #taskId link.
  * Reads task data from the current team in the store.
  */
-export const TaskTooltip = ({
+export const TaskTooltip = memo(function TaskTooltip({
   taskId,
   teamName,
   children,
   side = 'top',
-}: TaskTooltipProps): React.JSX.Element => {
+}: TaskTooltipProps): React.JSX.Element {
   const { selectedTeamName, selectedTeamData, selectedTeamMembers, globalTasks, teamByName } =
     useStore(
       useShallow((s) => ({
@@ -194,4 +194,4 @@ export const TaskTooltip = ({
       </TooltipContent>
     </Tooltip>
   );
-};
+});
diff --git a/src/renderer/components/team/TeamDetailView.tsx b/src/renderer/components/team/TeamDetailView.tsx
index dc992781..2c04dd15 100644
--- a/src/renderer/components/team/TeamDetailView.tsx
+++ b/src/renderer/components/team/TeamDetailView.tsx
@@ -78,12 +78,8 @@ import {
 import { useShallow } from 'zustand/react/shallow';
 
 import { AddMemberDialog } from './dialogs/AddMemberDialog';
-import { CreateTaskDialog } from './dialogs/CreateTaskDialog';
 import { EditTeamDialog } from './dialogs/EditTeamDialog';
-import { LaunchTeamDialog, type TeamLaunchDialogMode } from './dialogs/LaunchTeamDialog';
 import { ReviewDialog } from './dialogs/ReviewDialog';
-import { SendMessageDialog } from './dialogs/SendMessageDialog';
-import { TaskDetailDialog } from './dialogs/TaskDetailDialog';
 import { executeTeamRelaunch } from './dialogs/teamRelaunchFlow';
 import { KanbanBoard } from './kanban/KanbanBoard';
 import { UNASSIGNED_OWNER } from './kanban/KanbanFilterPopover';
@@ -93,9 +89,13 @@ import { MemberDetailDialog } from './members/MemberDetailDialog';
 import { type MemberActivityFilter, type MemberDetailTab } from './members/memberDetailTypes';
 
 import type { AddMemberEntry } from './dialogs/AddMemberDialog';
+import type { TeamLaunchDialogMode } from './dialogs/LaunchTeamDialog';
 import type { TeamMessagesPanelMode } from '@renderer/types/teamMessagesPanelMode';
 import type { ComponentProps, CSSProperties } from 'react';
 
+const LaunchTeamDialog = lazy(() =>
+  import('./dialogs/LaunchTeamDialog').then((m) => ({ default: m.LaunchTeamDialog }))
+);
 const ProjectEditorOverlay = lazy(() =>
   import('./editor/ProjectEditorOverlay').then((m) => ({ default: m.ProjectEditorOverlay }))
 );
@@ -104,9 +104,20 @@ const TeamGraphOverlay = lazy(() =>
     default: m.TeamGraphOverlay,
   }))
 );
+const TaskDetailDialog = lazy(() =>
+  import('./dialogs/TaskDetailDialog').then((m) => ({ default: m.TaskDetailDialog }))
+);
+const SendMessageDialog = lazy(() =>
+  import('./dialogs/SendMessageDialog').then((m) => ({ default: m.SendMessageDialog }))
+);
+const CreateTaskDialog = lazy(() =>
+  import('./dialogs/CreateTaskDialog').then((m) => ({ default: m.CreateTaskDialog }))
+);
+const ChangeReviewDialog = lazy(() =>
+  import('./review/ChangeReviewDialog').then((m) => ({ default: m.ChangeReviewDialog }))
+);
 import { MemberList } from './members/MemberList';
 import { MessagesPanel } from './messages/MessagesPanel';
-import { ChangeReviewDialog } from './review/ChangeReviewDialog';
 import { ScheduleSection } from './schedule/ScheduleSection';
 import { TeamSidebarHost } from './sidebar/TeamSidebarHost';
 import { TeamSidebarPortalSource } from './sidebar/TeamSidebarPortalSource';
@@ -117,13 +128,13 @@ import {
 } from './sidebar/teamSidebarUiState';
 import { ClaudeLogsSection } from './ClaudeLogsSection';
 import { CollapsibleTeamSection } from './CollapsibleTeamSection';
+import { deriveLeadContextButtonLabel } from './leadContextLoadGuards';
+import { LeadSessionDetailGate } from './LeadSessionDetailGate';
+import { LiveRuntimeStatusBridge } from './LiveRuntimeStatusBridge';
 import { ProcessesSection } from './ProcessesSection';
 import { getLaunchJoinMilestonesFromMembers, getLaunchJoinState } from './provisioningSteps';
 import { TeamProvisioningBanner } from './TeamProvisioningBanner';
-import {
-  isLeadSessionMissing,
-  shouldSuppressMissingLeadSessionFetch,
-} from './teamSessionFetchGuards';
+import { loadTeamSessionMetadata } from './teamSessionFetchGuards';
 import { TeamSessionsSection } from './TeamSessionsSection';
 
 import type { KanbanFilterState } from './kanban/KanbanFilterPopover';
@@ -323,17 +334,6 @@ type TeamSidebarRailBridgeProps = Omit<
 > & {
   messagesPanelProps: SharedTeamMessagesPanelProps;
 };
-interface LeadContextWatcherProps {
-  teamName: string;
-  tabId: string | null;
-  projectId: string | null;
-  leadSessionId: string | null;
-  sessionHistoryKey: string;
-  isThisTabActive: boolean;
-  isTeamAlive?: boolean;
-  sessions: readonly Session[];
-  sessionsLoading: boolean;
-}
 interface LeadContextBridgeProps {
   teamName: string;
   tabId: string | null;
@@ -341,6 +341,7 @@ interface LeadContextBridgeProps {
   leadSessionId: string | null;
   leadProviderId?: TeamProviderId;
   fallbackProjectRoot?: string;
+  isThisTabActive: boolean;
 }
 
 // Codex/OpenCode lead sessions do not expose the Claude-style context data this panel expects yet.
@@ -476,81 +477,6 @@ const TeamAgentRuntimeWatcher = memo(function TeamAgentRuntimeWatcher({
   return null;
 });
 
-const LeadContextWatcher = memo(function LeadContextWatcher({
-  teamName,
-  tabId,
-  projectId,
-  leadSessionId,
-  sessionHistoryKey,
-  isThisTabActive,
-  isTeamAlive,
-  sessions,
-  sessionsLoading,
-}: LeadContextWatcherProps): null {
-  const fetchSessionDetail = useStore((s) => s.fetchSessionDetail);
-  const missingLeadSessionFetchKeyRef = useRef<string | null>(null);
-  const missingLeadSessionFetchKey = useMemo(
-    () => `${teamName}:${projectId ?? ''}:${leadSessionId ?? ''}:${sessionHistoryKey}`,
-    [teamName, projectId, leadSessionId, sessionHistoryKey]
-  );
-
-  useEffect(() => {
-    missingLeadSessionFetchKeyRef.current = null;
-  }, [missingLeadSessionFetchKey]);
-
-  useEffect(() => {
-    if (!isThisTabActive) return;
-    if (!tabId || !projectId || !leadSessionId) return;
-
-    const leadSessionMissing = isLeadSessionMissing({
-      leadSessionId,
-      projectId,
-      sessionsLoading,
-      knownSessions: sessions,
-    });
-    if (leadSessionMissing) {
-      missingLeadSessionFetchKeyRef.current = missingLeadSessionFetchKey;
-      return;
-    }
-
-    const fetchLeadSessionDetail = () => {
-      const suppressRepeatedFetch = shouldSuppressMissingLeadSessionFetch({
-        leadSessionId,
-        projectId,
-        sessionsLoading,
-        knownSessions: sessions,
-        suppressionKey: missingLeadSessionFetchKeyRef.current,
-        currentKey: missingLeadSessionFetchKey,
-      });
-      if (suppressRepeatedFetch) {
-        return;
-      }
-      void fetchSessionDetail(projectId, leadSessionId, tabId, { silent: true });
-    };
-
-    fetchLeadSessionDetail();
-
-    if (!isTeamAlive) return;
-
-    const id = window.setInterval(() => {
-      fetchLeadSessionDetail();
-    }, 10_000);
-    return () => window.clearInterval(id);
-  }, [
-    fetchSessionDetail,
-    isTeamAlive,
-    isThisTabActive,
-    leadSessionId,
-    missingLeadSessionFetchKey,
-    projectId,
-    sessions,
-    sessionsLoading,
-    tabId,
-  ]);
-
-  return null;
-});
-
 const LeadContextBridge = memo(function LeadContextBridge({
   teamName,
   tabId,
@@ -558,6 +484,7 @@ const LeadContextBridge = memo(function LeadContextBridge({
   leadSessionId,
   leadProviderId,
   fallbackProjectRoot,
+  isThisTabActive,
 }: LeadContextBridgeProps): React.JSX.Element | null {
   const {
     leadTabData,
@@ -566,7 +493,6 @@ const LeadContextBridge = memo(function LeadContextBridge({
     selectedContextPhase,
     setContextPanelVisibleForTab,
     setSelectedContextPhaseForTab,
-    fetchSessionDetail,
   } = useStore(
     useShallow((s) => ({
       leadTabData: tabId ? (s.tabSessionData[tabId] ?? null) : null,
@@ -575,7 +501,6 @@ const LeadContextBridge = memo(function LeadContextBridge({
       selectedContextPhase: tabId ? (s.tabUIStates.get(tabId)?.selectedContextPhase ?? null) : null,
       setContextPanelVisibleForTab: s.setContextPanelVisibleForTab,
       setSelectedContextPhaseForTab: s.setSelectedContextPhaseForTab,
-      fetchSessionDetail: s.fetchSessionDetail,
     }))
   );
   const [isContextButtonHovered, setIsContextButtonHovered] = useState(false);
@@ -691,12 +616,23 @@ const LeadContextBridge = memo(function LeadContextBridge({
       visibleContextTokens,
     ]
   );
-  const contextUsedPercentLabel = useMemo(() => {
-    const percent =
-      contextMetrics.contextUsedPercentOfContextWindow ?? leadContextSnapshot?.contextUsedPercent;
-    return percent === null || percent === undefined ? null : `${percent.toFixed(1)}%`;
-  }, [contextMetrics.contextUsedPercentOfContextWindow, leadContextSnapshot?.contextUsedPercent]);
+  const contextUsedPercentLabel = useMemo(
+    () =>
+      deriveLeadContextButtonLabel({
+        liveContextUsedPercent: leadContextSnapshot?.contextUsedPercent,
+        fullContextUsedPercent: contextMetrics.contextUsedPercentOfContextWindow,
+        contextPanelOpen: isContextPanelVisible,
+      }),
+    [
+      contextMetrics.contextUsedPercentOfContextWindow,
+      isContextPanelVisible,
+      leadContextSnapshot?.contextUsedPercent,
+    ]
+  );
   const shouldShowLeadContextUi = canShowLeadContextUi(leadProviderId);
+  const shouldLoadFullLeadDetail = Boolean(
+    leadSessionId && shouldShowLeadContextUi && isThisTabActive && isContextPanelVisible
+  );
 
   useEffect(() => {
     if (!shouldShowLeadContextUi && isContextPanelVisible) {
@@ -710,6 +646,13 @@ const LeadContextBridge = memo(function LeadContextBridge({
 
   return (
     <>
+      <LeadSessionDetailGate
+        tabId={tabId}
+        projectId={projectId}
+        leadSessionId={leadSessionId}
+        enabled={shouldLoadFullLeadDetail}
+      />
+
       {isContextPanelVisible && (
         <div className="w-80 shrink-0">
           {leadSessionLoaded ? (
@@ -764,11 +707,7 @@ const LeadContextBridge = memo(function LeadContextBridge({
       >
         <button
           onClick={() => {
-            const next = !isContextPanelVisible;
-            setContextPanelVisible(next);
-            if (tabId && projectId) {
-              void fetchSessionDetail(projectId, leadSessionId, tabId, { silent: true });
-            }
+            setContextPanelVisible(!isContextPanelVisible);
           }}
           onMouseEnter={() => setIsContextButtonHovered(true)}
           onMouseLeave={() => setIsContextButtonHovered(false)}
@@ -791,7 +730,7 @@ const LeadContextBridge = memo(function LeadContextBridge({
                 : leadSessionId
           }
         >
-          {contextUsedPercentLabel ?? 'Context'}
+          {contextUsedPercentLabel}
         </button>
       </div>
     </>
@@ -947,10 +886,10 @@ const TeamMemberDetailDialogBridge = memo(function TeamMemberDetailDialogBridge(
   );
 });
 
-export const TeamDetailView = ({
+export const TeamDetailView = memo(function TeamDetailView({
   teamName,
   isPaneFocused = false,
-}: TeamDetailViewProps): React.JSX.Element => {
+}: TeamDetailViewProps): React.JSX.Element {
   const { isLight } = useTheme();
   const [requestChangesTaskId, setRequestChangesTaskId] = useState<string | null>(null);
   const [selectedTask, setSelectedTask] = useState<TeamTaskWithKanban | null>(null);
@@ -1525,7 +1464,10 @@ export const TeamDetailView = ({
 
     void (async () => {
       try {
-        const result = await api.getSessions(projectId);
+        const result = await loadTeamSessionMetadata(api, projectId, {
+          leadSessionId: data?.config.leadSessionId ?? null,
+          sessionHistory: data?.config.sessionHistory ?? [],
+        });
         if (!cancelled) {
           setSessions(result);
         }
@@ -1543,7 +1485,7 @@ export const TeamDetailView = ({
     return () => {
       cancelled = true;
     };
-  }, [projectId]);
+  }, [data?.config.leadSessionId, projectId, sessionHistoryKey]);
 
   // Live git branch tracking for the lead project and member worktrees
   const teamProjectPath = data?.config.projectPath?.trim() ?? null;
@@ -1701,8 +1643,6 @@ export const TeamDetailView = ({
     if (configuredLeadProviderId) return configuredLeadProviderId;
     return launchParams?.providerId;
   }, [activeMembers, data?.config.members, launchParams?.providerId]);
-  const shouldShowLeadContextUi = canShowLeadContextUi(leadProviderId);
-
   const taskMap = useMemo(() => new Map((data?.tasks ?? []).map((t) => [t.id, t])), [data?.tasks]);
   const taskMapRef = useRef(taskMap);
   taskMapRef.current = taskMap;
@@ -1904,17 +1844,52 @@ export const TeamDetailView = ({
     setPendingReviewRequest(null);
   }, [pendingReviewRequest, selectReviewFile, setPendingReviewRequest]);
 
+  const pendingTeamSectionFocus = useStore((s) => s.pendingTeamSectionFocus);
+  const clearTeamSectionFocus = useStore((s) => s.clearTeamSectionFocus);
+  useEffect(() => {
+    if (pendingTeamSectionFocus?.teamName !== teamName) return;
+
+    const sectionId =
+      pendingTeamSectionFocus.section === 'members'
+        ? 'team'
+        : pendingTeamSectionFocus.section === 'tasks'
+          ? 'kanban'
+          : pendingTeamSectionFocus.section;
+
+    if (sectionId === 'overview') {
+      contentRef.current?.scrollIntoView({ behavior: 'smooth', block: 'start' });
+      clearTeamSectionFocus();
+      return;
+    }
+
+    const section = contentRef.current?.querySelector<HTMLElement>(
+      `[data-section-id="${sectionId}"]`
+    );
+    if (!section) return;
+    section.dispatchEvent(new CustomEvent('team-section-navigate'));
+    clearTeamSectionFocus();
+  }, [pendingTeamSectionFocus, clearTeamSectionFocus, teamName, data]);
+
   // Pick up pending member profile request from MemberHoverCard
   const pendingMemberProfile = useStore((s) => s.pendingMemberProfile);
   useEffect(() => {
     if (!pendingMemberProfile || !data) return;
-    const member = membersWithLiveBranches.find((m) => m.name === pendingMemberProfile);
+    if (pendingMemberProfile.teamName && pendingMemberProfile.teamName !== teamName) return;
+
+    const member = membersWithLiveBranches.find((m) => m.name === pendingMemberProfile.memberName);
     if (member) {
       setSelectedMember(member);
-      setSelectedMemberView(null);
+      setSelectedMemberView({
+        initialTab:
+          pendingMemberProfile.focus === 'logs'
+            ? 'logs'
+            : pendingMemberProfile.focus === 'messages'
+              ? 'activity'
+              : undefined,
+      });
     }
     useStore.getState().closeMemberProfile();
-  }, [pendingMemberProfile, membersWithLiveBranches]);
+  }, [pendingMemberProfile, membersWithLiveBranches, teamName, data]);
 
   const handleDeleteTask = useCallback(
     (taskId: string) => {
@@ -2093,20 +2068,6 @@ export const TeamDetailView = ({
       isThisTabActive={isThisTabActive}
     />
   );
-  const leadContextWatcher = shouldShowLeadContextUi ? (
-    <LeadContextWatcher
-      teamName={teamName}
-      tabId={tabId}
-      projectId={projectId}
-      leadSessionId={leadSessionId}
-      sessionHistoryKey={sessionHistoryKey}
-      isThisTabActive={isThisTabActive}
-      isTeamAlive={data?.isAlive}
-      sessions={sessions}
-      sessionsLoading={sessionsLoading}
-    />
-  ) : null;
-
   const renderBody = (): React.JSX.Element => {
     if ((loading && !data) || (data && data.teamName !== teamName)) {
       return (
@@ -2163,18 +2124,22 @@ export const TeamDetailView = ({
               </div>
             </div>
           </div>
-          <LaunchTeamDialog
-            mode={launchDialogState.mode}
-            open={launchDialogOpen}
-            teamName={teamName}
-            members={[]}
-            defaultProjectPath={draftTeamSummary?.projectPath}
-            provisioningError={provisioningError}
-            clearProvisioningError={clearProvisioningError}
-            onClose={closeLaunchDialog}
-            onLaunch={handleLaunchDialogSubmit}
-            onRelaunch={handleRelaunchDialogSubmit}
-          />
+          {launchDialogOpen && (
+            <Suspense fallback={null}>
+              <LaunchTeamDialog
+                mode={launchDialogState.mode}
+                open={launchDialogOpen}
+                teamName={teamName}
+                members={[]}
+                defaultProjectPath={draftTeamSummary?.projectPath}
+                provisioningError={provisioningError}
+                clearProvisioningError={clearProvisioningError}
+                onClose={closeLaunchDialog}
+                onLaunch={handleLaunchDialogSubmit}
+                onRelaunch={handleRelaunchDialogSubmit}
+              />
+            </Suspense>
+          )}
         </>
       );
     }
@@ -2217,6 +2182,7 @@ export const TeamDetailView = ({
             leadSessionId={leadSessionId}
             leadProviderId={leadProviderId}
             fallbackProjectRoot={data.config.projectPath}
+            isThisTabActive={isThisTabActive}
           />
 
           {/* Messages sidebar (left, after context panel) */}
@@ -2708,6 +2674,8 @@ export const TeamDetailView = ({
                 <ScheduleSection teamName={teamName} />
               </CollapsibleTeamSection>
 
+              <LiveRuntimeStatusBridge teamName={teamName} members={membersWithLiveBranches} />
+
               {(data.processes?.length ?? 0) > 0 && (
                 <CollapsibleTeamSection
                   sectionId="processes"
@@ -2829,21 +2797,25 @@ export const TeamDetailView = ({
                 }}
               />
 
-              <CreateTaskDialog
-                open={createTaskDialog.open}
-                teamName={teamName}
-                members={activeMembers}
-                tasks={data.tasks}
-                isTeamAlive={data.isAlive && !isTeamProvisioning}
-                defaultSubject={createTaskDialog.defaultSubject}
-                defaultDescription={createTaskDialog.defaultDescription}
-                defaultOwner={createTaskDialog.defaultOwner}
-                defaultStartImmediately={createTaskDialog.defaultStartImmediately}
-                defaultChip={createTaskDialog.defaultChip}
-                onClose={closeCreateTaskDialog}
-                onSubmit={handleCreateTask}
-                submitting={creatingTask}
-              />
+              {createTaskDialog.open && (
+                <Suspense fallback={null}>
+                  <CreateTaskDialog
+                    open={createTaskDialog.open}
+                    teamName={teamName}
+                    members={activeMembers}
+                    tasks={data.tasks}
+                    isTeamAlive={data.isAlive && !isTeamProvisioning}
+                    defaultSubject={createTaskDialog.defaultSubject}
+                    defaultDescription={createTaskDialog.defaultDescription}
+                    defaultOwner={createTaskDialog.defaultOwner}
+                    defaultStartImmediately={createTaskDialog.defaultStartImmediately}
+                    defaultChip={createTaskDialog.defaultChip}
+                    onClose={closeCreateTaskDialog}
+                    onSubmit={handleCreateTask}
+                    submitting={creatingTask}
+                  />
+                </Suspense>
+              )}
 
               <EditTeamDialog
                 open={editDialogOpen}
@@ -2949,117 +2921,129 @@ export const TeamDetailView = ({
                 </DialogContent>
               </Dialog>
 
-              <LaunchTeamDialog
-                mode={launchDialogState.mode}
-                open={launchDialogOpen}
-                teamName={teamName}
-                members={membersWithLiveBranches}
-                defaultProjectPath={data.config.projectPath}
-                provisioningError={provisioningError}
-                clearProvisioningError={clearProvisioningError}
-                activeTeams={activeTeamsForLaunch}
-                onClose={closeLaunchDialog}
-                onLaunch={handleLaunchDialogSubmit}
-                onRelaunch={handleRelaunchDialogSubmit}
-              />
+              {launchDialogOpen && (
+                <Suspense fallback={null}>
+                  <LaunchTeamDialog
+                    mode={launchDialogState.mode}
+                    open={launchDialogOpen}
+                    teamName={teamName}
+                    members={membersWithLiveBranches}
+                    defaultProjectPath={data.config.projectPath}
+                    provisioningError={provisioningError}
+                    clearProvisioningError={clearProvisioningError}
+                    activeTeams={activeTeamsForLaunch}
+                    onClose={closeLaunchDialog}
+                    onLaunch={handleLaunchDialogSubmit}
+                    onRelaunch={handleRelaunchDialogSubmit}
+                  />
+                </Suspense>
+              )}
 
-              <SendMessageDialog
-                open={sendDialogOpen}
-                teamName={teamName}
-                members={activeMembers}
-                defaultRecipient={sendDialogRecipient}
-                defaultText={sendDialogDefaultText}
-                defaultChip={sendDialogDefaultChip}
-                quotedMessage={replyQuote}
-                isTeamAlive={data.isAlive}
-                sending={sendingMessage}
-                sendError={sendMessageError}
-                sendWarning={sendMessageWarning}
-                sendDebugDetails={sendMessageDebugDetails}
-                lastResult={lastSendMessageResult}
-                onSend={async (member, text, summary, attachments, actionMode, taskRefs) => {
-                  const sentAtMs = Date.now();
-                  setPendingRepliesByMember((prev) => ({ ...prev, [member]: sentAtMs }));
-                  try {
-                    const result = await sendTeamMessage(teamName, {
-                      member,
-                      text,
-                      summary,
-                      attachments,
-                      actionMode,
-                      taskRefs,
-                    });
-                    if (
-                      result?.runtimeDelivery?.attempted === true &&
-                      result.runtimeDelivery.delivered === false
-                    ) {
-                      setPendingRepliesByMember((prev) => {
-                        if (prev[member] !== sentAtMs) return prev;
-                        const next = { ...prev };
-                        delete next[member];
-                        return next;
-                      });
-                    }
-                    return result;
-                  } catch (error) {
-                    setPendingRepliesByMember((prev) => {
-                      if (prev[member] !== sentAtMs) return prev;
-                      const next = { ...prev };
-                      delete next[member];
-                      return next;
-                    });
-                    throw error;
-                  }
-                }}
-                onClose={() => {
-                  setSendDialogOpen(false);
-                  setReplyQuote(undefined);
-                  setSendDialogDefaultText(undefined);
-                  setSendDialogDefaultChip(undefined);
-                }}
-              />
+              {sendDialogOpen && (
+                <Suspense fallback={null}>
+                  <SendMessageDialog
+                    open={sendDialogOpen}
+                    teamName={teamName}
+                    members={activeMembers}
+                    defaultRecipient={sendDialogRecipient}
+                    defaultText={sendDialogDefaultText}
+                    defaultChip={sendDialogDefaultChip}
+                    quotedMessage={replyQuote}
+                    isTeamAlive={data.isAlive}
+                    sending={sendingMessage}
+                    sendError={sendMessageError}
+                    sendWarning={sendMessageWarning}
+                    sendDebugDetails={sendMessageDebugDetails}
+                    lastResult={lastSendMessageResult}
+                    onSend={async (member, text, summary, attachments, actionMode, taskRefs) => {
+                      const sentAtMs = Date.now();
+                      setPendingRepliesByMember((prev) => ({ ...prev, [member]: sentAtMs }));
+                      try {
+                        const result = await sendTeamMessage(teamName, {
+                          member,
+                          text,
+                          summary,
+                          attachments,
+                          actionMode,
+                          taskRefs,
+                        });
+                        if (
+                          result?.runtimeDelivery?.attempted === true &&
+                          result.runtimeDelivery.delivered === false
+                        ) {
+                          setPendingRepliesByMember((prev) => {
+                            if (prev[member] !== sentAtMs) return prev;
+                            const next = { ...prev };
+                            delete next[member];
+                            return next;
+                          });
+                        }
+                        return result;
+                      } catch (error) {
+                        setPendingRepliesByMember((prev) => {
+                          if (prev[member] !== sentAtMs) return prev;
+                          const next = { ...prev };
+                          delete next[member];
+                          return next;
+                        });
+                        throw error;
+                      }
+                    }}
+                    onClose={() => {
+                      setSendDialogOpen(false);
+                      setReplyQuote(undefined);
+                      setSendDialogDefaultText(undefined);
+                      setSendDialogDefaultChip(undefined);
+                    }}
+                  />
+                </Suspense>
+              )}
 
-              <TaskDetailDialog
-                open={selectedTask !== null}
-                task={selectedTask}
-                teamName={teamName}
-                kanbanTaskState={
-                  selectedTask ? data?.kanbanState.tasks[selectedTask.id] : undefined
-                }
-                taskMap={taskMap}
-                members={activeMembers}
-                onClose={() => setSelectedTask(null)}
-                onScrollToTask={(taskId) => {
-                  setSelectedTask(null);
-                  const el = document.querySelector(`[data-task-id="${taskId}"]`);
-                  if (el) {
-                    el.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
-                    el.classList.remove('kanban-card-focus-pulse');
-                    void (el as HTMLElement).offsetWidth;
-                    el.classList.add('kanban-card-focus-pulse');
-                    el.addEventListener(
-                      'animationend',
-                      () => el.classList.remove('kanban-card-focus-pulse'),
-                      { once: true }
-                    );
-                  }
-                }}
-                onOwnerChange={(taskId, owner) => {
-                  void (async () => {
-                    try {
-                      await updateTaskOwner(teamName, taskId, owner);
-                    } catch {
-                      // error via store
+              {selectedTask !== null && (
+                <Suspense fallback={null}>
+                  <TaskDetailDialog
+                    open={selectedTask !== null}
+                    task={selectedTask}
+                    teamName={teamName}
+                    kanbanTaskState={
+                      selectedTask ? data?.kanbanState.tasks[selectedTask.id] : undefined
                     }
-                  })();
-                }}
-                onViewChanges={handleViewChangesForFile}
-                onOpenInEditor={(filePath) => {
-                  const { revealFileInEditor } = useStore.getState();
-                  revealFileInEditor(filePath);
-                }}
-                onDeleteTask={handleDeleteTask}
-              />
+                    taskMap={taskMap}
+                    members={activeMembers}
+                    onClose={() => setSelectedTask(null)}
+                    onScrollToTask={(taskId) => {
+                      setSelectedTask(null);
+                      const el = document.querySelector(`[data-task-id="${taskId}"]`);
+                      if (el) {
+                        el.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
+                        el.classList.remove('kanban-card-focus-pulse');
+                        void (el as HTMLElement).offsetWidth;
+                        el.classList.add('kanban-card-focus-pulse');
+                        el.addEventListener(
+                          'animationend',
+                          () => el.classList.remove('kanban-card-focus-pulse'),
+                          { once: true }
+                        );
+                      }
+                    }}
+                    onOwnerChange={(taskId, owner) => {
+                      void (async () => {
+                        try {
+                          await updateTaskOwner(teamName, taskId, owner);
+                        } catch {
+                          // error via store
+                        }
+                      })();
+                    }}
+                    onViewChanges={handleViewChangesForFile}
+                    onOpenInEditor={(filePath) => {
+                      const { revealFileInEditor } = useStore.getState();
+                      revealFileInEditor(filePath);
+                    }}
+                    onDeleteTask={handleDeleteTask}
+                  />
+                </Suspense>
+              )}
 
               <TrashDialog
                 open={trashOpen}
@@ -3076,26 +3060,30 @@ export const TeamDetailView = ({
                 }}
               />
 
-              <ChangeReviewDialog
-                open={reviewDialogState.open}
-                onOpenChange={(open) =>
-                  setReviewDialogState((prev) => ({
-                    ...prev,
-                    open,
-                    ...(open
-                      ? {}
-                      : { initialFilePath: undefined, taskChangeRequestOptions: undefined }),
-                  }))
-                }
-                teamName={teamName}
-                mode={reviewDialogState.mode}
-                memberName={reviewDialogState.memberName}
-                taskId={reviewDialogState.taskId}
-                initialFilePath={reviewDialogState.initialFilePath}
-                taskChangeRequestOptions={reviewDialogState.taskChangeRequestOptions}
-                projectPath={data.config.projectPath}
-                onEditorAction={handleEditorAction}
-              />
+              {reviewDialogState.open && (
+                <Suspense fallback={null}>
+                  <ChangeReviewDialog
+                    open={reviewDialogState.open}
+                    onOpenChange={(open) =>
+                      setReviewDialogState((prev) => ({
+                        ...prev,
+                        open,
+                        ...(open
+                          ? {}
+                          : { initialFilePath: undefined, taskChangeRequestOptions: undefined }),
+                      }))
+                    }
+                    teamName={teamName}
+                    mode={reviewDialogState.mode}
+                    memberName={reviewDialogState.memberName}
+                    taskId={reviewDialogState.taskId}
+                    initialFilePath={reviewDialogState.initialFilePath}
+                    taskChangeRequestOptions={reviewDialogState.taskChangeRequestOptions}
+                    projectPath={data.config.projectPath}
+                    onEditorAction={handleEditorAction}
+                  />
+                </Suspense>
+              )}
             </div>
             <div
               ref={setMessagesPanelMountPoint}
@@ -3159,8 +3147,7 @@ export const TeamDetailView = ({
     <>
       {spawnStatusWatcher}
       {teamAgentRuntimeWatcher}
-      {leadContextWatcher}
       {renderBody()}
     </>
   );
-};
+});
diff --git a/src/renderer/components/team/TeamListView.tsx b/src/renderer/components/team/TeamListView.tsx
index 357ee15a..9a1e0567 100644
--- a/src/renderer/components/team/TeamListView.tsx
+++ b/src/renderer/components/team/TeamListView.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { lazy, memo, Suspense, useCallback, useEffect, useMemo, useState } from 'react';
 
 import { recordRecentProjectOpenPaths } from '@features/recent-projects/renderer';
 import { api, isElectronMode } from '@renderer/api';
@@ -45,8 +45,6 @@ import {
 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
-import { CreateTeamDialog } from './dialogs/CreateTeamDialog';
-import { LaunchTeamDialog } from './dialogs/LaunchTeamDialog';
 import { TeamEmptyState } from './TeamEmptyState';
 import { EMPTY_TEAM_FILTER, TeamListFilterPopover } from './TeamListFilterPopover';
 import {
@@ -67,6 +65,13 @@ import type {
   TeamSummaryMember,
 } from '@shared/types';
 
+const CreateTeamDialog = lazy(() =>
+  import('./dialogs/CreateTeamDialog').then((m) => ({ default: m.CreateTeamDialog }))
+);
+const LaunchTeamDialog = lazy(() =>
+  import('./dialogs/LaunchTeamDialog').then((m) => ({ default: m.LaunchTeamDialog }))
+);
+
 function generateUniqueName(sourceName: string, existingNames: string[]): string {
   const base = sourceName.replace(/-\d+$/, '');
   const existing = new Set(existingNames);
@@ -233,7 +238,7 @@ const StatusBadge = ({ status }: { status: TeamStatus }): React.JSX.Element => {
   }
 };
 
-export const TeamListView = (): React.JSX.Element => {
+export const TeamListView = memo(function TeamListView(): React.JSX.Element {
   const { isLight } = useTheme();
   const electronMode = isElectronMode();
   const [showCreateDialog, setShowCreateDialog] = useState(false);
@@ -596,7 +601,9 @@ export const TeamListView = (): React.JSX.Element => {
       e.stopPropagation();
       void (async () => {
         try {
-          const data = await api.teams.getData(teamName);
+          const data = await api.teams.getData(teamName, {
+            includeMemberBranches: false,
+          });
           const existingNames = teams.map((t) => t.teamName);
           const uniqueName = generateUniqueName(teamName, existingNames);
           const members = (data.members ?? [])
@@ -648,7 +655,9 @@ export const TeamListView = (): React.JSX.Element => {
       e.stopPropagation();
       if (!projectPath) return;
       try {
-        const data = await api.teams.getData(teamName);
+        const data = await api.teams.getData(teamName, {
+          includeMemberBranches: false,
+        });
         setLaunchDialogTeamName(teamName);
         setLaunchDialogMembers(resolveLaunchDialogMembers(data.members ?? []));
         setLaunchDialogDefaultPath(data.config.projectPath ?? projectPath);
@@ -731,36 +740,40 @@ export const TeamListView = (): React.JSX.Element => {
     );
   }
 
-  const createDialogElement = (
-    <CreateTeamDialog
-      open={showCreateDialog}
-      canCreate={canCreate}
-      provisioningErrorsByTeam={provisioningErrorByTeam}
-      clearProvisioningError={clearProvisioningError}
-      existingTeamNames={teams.map((t) => t.teamName)}
-      provisioningTeamNames={provisioningTeamNames}
-      activeTeams={activeTeams}
-      initialData={copyData ?? undefined}
-      defaultProjectPath={currentProjectPath}
-      onClose={handleCreateDialogClose}
-      onCreate={handleCreateSubmit}
-      onOpenTeam={openTeamTab}
-    />
+  const createDialogElement = showCreateDialog && (
+    <Suspense fallback={null}>
+      <CreateTeamDialog
+        open={showCreateDialog}
+        canCreate={canCreate}
+        provisioningErrorsByTeam={provisioningErrorByTeam}
+        clearProvisioningError={clearProvisioningError}
+        existingTeamNames={teams.map((t) => t.teamName)}
+        provisioningTeamNames={provisioningTeamNames}
+        activeTeams={activeTeams}
+        initialData={copyData ?? undefined}
+        defaultProjectPath={currentProjectPath}
+        onClose={handleCreateDialogClose}
+        onCreate={handleCreateSubmit}
+        onOpenTeam={openTeamTab}
+      />
+    </Suspense>
   );
 
-  const launchDialogElement = (
-    <LaunchTeamDialog
-      mode="launch"
-      open={launchDialogOpen}
-      teamName={launchDialogTeamName}
-      members={launchDialogMembers}
-      defaultProjectPath={launchDialogDefaultPath}
-      provisioningError={provisioningErrorByTeam[launchDialogTeamName] ?? null}
-      clearProvisioningError={clearProvisioningError}
-      activeTeams={activeTeams}
-      onClose={() => setLaunchDialogOpen(false)}
-      onLaunch={handleLaunchSubmit}
-    />
+  const launchDialogElement = launchDialogOpen && (
+    <Suspense fallback={null}>
+      <LaunchTeamDialog
+        mode="launch"
+        open={launchDialogOpen}
+        teamName={launchDialogTeamName}
+        members={launchDialogMembers}
+        defaultProjectPath={launchDialogDefaultPath}
+        provisioningError={provisioningErrorByTeam[launchDialogTeamName] ?? null}
+        clearProvisioningError={clearProvisioningError}
+        activeTeams={activeTeams}
+        onClose={() => setLaunchDialogOpen(false)}
+        onLaunch={handleLaunchSubmit}
+      />
+    </Suspense>
   );
 
   const renderHeader = (): React.JSX.Element => (
@@ -1177,4 +1190,4 @@ export const TeamListView = (): React.JSX.Element => {
       </div>
     </TooltipProvider>
   );
-};
+});
diff --git a/src/renderer/components/team/TeamProvisioningPanel.tsx b/src/renderer/components/team/TeamProvisioningPanel.tsx
index 69f29554..4a2a24df 100644
--- a/src/renderer/components/team/TeamProvisioningPanel.tsx
+++ b/src/renderer/components/team/TeamProvisioningPanel.tsx
@@ -7,6 +7,8 @@ import { X } from 'lucide-react';
 import { ProvisioningProgressBlock } from './ProvisioningProgressBlock';
 import { useTeamProvisioningPresentation } from './useTeamProvisioningPresentation';
 
+import type { RetryFailedOpenCodeSecondaryLanesResult } from '@shared/types';
+
 export interface TeamProvisioningPanelProps {
   teamName: string;
   surface?: 'raised' | 'flat';
@@ -15,6 +17,27 @@ export interface TeamProvisioningPanelProps {
   defaultLogsOpen?: boolean;
 }
 
+function formatOpenCodeSecondaryRetryResult(
+  result: RetryFailedOpenCodeSecondaryLanesResult
+): string {
+  const parts: string[] = [];
+  if (result.confirmed.length > 0) {
+    parts.push(`${result.confirmed.length} confirmed`);
+  }
+  if (result.pending.length > 0) {
+    parts.push(`${result.pending.length} pending`);
+  }
+  if (result.failed.length > 0) {
+    parts.push(`${result.failed.length} failed`);
+  }
+  if (result.skipped.length > 0) {
+    parts.push(`${result.skipped.length} skipped`);
+  }
+  return parts.length > 0
+    ? `OpenCode retry: ${parts.join(', ')}`
+    : 'No retryable OpenCode failures';
+}
+
 export const TeamProvisioningPanel = memo(function TeamProvisioningPanel({
   teamName,
   surface = 'flat',
@@ -22,13 +45,19 @@ export const TeamProvisioningPanel = memo(function TeamProvisioningPanel({
   className,
   defaultLogsOpen,
 }: TeamProvisioningPanelProps): React.JSX.Element | null {
-  const { presentation, cancelProvisioning, runInstanceKey } =
+  const { presentation, cancelProvisioning, retryFailedOpenCodeSecondaryLanes, runInstanceKey } =
     useTeamProvisioningPresentation(teamName);
   const [dismissed, setDismissed] = useState(false);
+  const [retryingOpenCode, setRetryingOpenCode] = useState(false);
+  const [openCodeRetryMessage, setOpenCodeRetryMessage] = useState<string | null>(null);
+  const [openCodeRetryError, setOpenCodeRetryError] = useState<string | null>(null);
   const lastActiveStepRef = useRef(-1);
 
   useEffect(() => {
     setDismissed(false);
+    setRetryingOpenCode(false);
+    setOpenCodeRetryMessage(null);
+    setOpenCodeRetryError(null);
   }, [runInstanceKey]);
 
   if (!presentation || dismissed) {
@@ -40,6 +69,48 @@ export const TeamProvisioningPanel = memo(function TeamProvisioningPanel({
   }
 
   const showRunningState = presentation.isActive || presentation.hasMembersStillJoining;
+  const canRetryFailedOpenCode =
+    !presentation.isActive &&
+    presentation.retryableOpenCodeSecondaryFailedCount > 0 &&
+    Boolean(retryFailedOpenCodeSecondaryLanes);
+
+  const retryOpenCodeAction = canRetryFailedOpenCode ? (
+    <div className="flex flex-wrap items-center gap-2 rounded-md border border-amber-500/30 bg-amber-500/10 px-3 py-2">
+      <p className="min-w-0 flex-1 text-xs text-[var(--step-warning-text)]">
+        {openCodeRetryError ??
+          openCodeRetryMessage ??
+          `${presentation.retryableOpenCodeSecondaryFailedCount} failed OpenCode teammate${
+            presentation.retryableOpenCodeSecondaryFailedCount === 1 ? '' : 's'
+          } can be retried.`}
+      </p>
+      <Button
+        variant="outline"
+        size="sm"
+        className="h-7 shrink-0 border-amber-500/40 px-2 text-xs text-[var(--step-warning-text)] hover:bg-amber-500/10"
+        disabled={retryingOpenCode}
+        onClick={() => {
+          if (!retryFailedOpenCodeSecondaryLanes || retryingOpenCode) {
+            return;
+          }
+          setRetryingOpenCode(true);
+          setOpenCodeRetryError(null);
+          setOpenCodeRetryMessage(null);
+          void retryFailedOpenCodeSecondaryLanes(teamName)
+            .then((result) => {
+              setOpenCodeRetryMessage(formatOpenCodeSecondaryRetryResult(result));
+            })
+            .catch((error: unknown) => {
+              setOpenCodeRetryError(error instanceof Error ? error.message : String(error));
+            })
+            .finally(() => {
+              setRetryingOpenCode(false);
+            });
+        }}
+      >
+        {retryingOpenCode ? 'Retrying OpenCode...' : 'Retry failed OpenCode teammates'}
+      </Button>
+    </div>
+  ) : null;
 
   const block = (
     <ProvisioningProgressBlock
@@ -81,32 +152,35 @@ export const TeamProvisioningPanel = memo(function TeamProvisioningPanel({
             }
           : null
       }
-      className={!presentation.isFailed ? className : undefined}
+      className={!presentation.isFailed && !retryOpenCodeAction ? className : undefined}
     />
   );
 
-  if (!presentation.isFailed) {
+  if (!presentation.isFailed && !retryOpenCodeAction) {
     return block;
   }
 
   return (
     <div className={cn('space-y-2', className)}>
-      <div className="flex items-center gap-2 rounded-md border border-red-500/40 bg-red-500/10 px-3 py-2">
-        <p className="flex-1 text-xs text-[var(--step-error-text)]">
-          {presentation.progress.message}
-        </p>
-        {dismissible ? (
-          <Button
-            variant="outline"
-            size="sm"
-            className="h-6 shrink-0 border-red-500/40 px-2 text-xs text-[var(--step-error-text)] hover:bg-red-500/10"
-            onClick={() => setDismissed(true)}
-          >
-            <X size={12} />
-          </Button>
-        ) : null}
-      </div>
+      {presentation.isFailed ? (
+        <div className="flex items-center gap-2 rounded-md border border-red-500/40 bg-red-500/10 px-3 py-2">
+          <p className="flex-1 text-xs text-[var(--step-error-text)]">
+            {presentation.progress.message}
+          </p>
+          {dismissible ? (
+            <Button
+              variant="outline"
+              size="sm"
+              className="h-6 shrink-0 border-red-500/40 px-2 text-xs text-[var(--step-error-text)] hover:bg-red-500/10"
+              onClick={() => setDismissed(true)}
+            >
+              <X size={12} />
+            </Button>
+          ) : null}
+        </div>
+      ) : null}
       {block}
+      {retryOpenCodeAction}
     </div>
   );
 });
diff --git a/src/renderer/components/team/activity/ActiveTasksBlock.tsx b/src/renderer/components/team/activity/ActiveTasksBlock.tsx
index 64398b5d..ac55ed8c 100644
--- a/src/renderer/components/team/activity/ActiveTasksBlock.tsx
+++ b/src/renderer/components/team/activity/ActiveTasksBlock.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useState } from 'react';
+import { memo, type ReactNode, useState } from 'react';
 
 import { CARD_BG, CARD_BORDER_STYLE, CARD_ICON_MUTED } from '@renderer/constants/cssVariables';
 import { getTeamColorSet, getThemedBadge } from '@renderer/constants/teamColors';
@@ -32,14 +32,14 @@ interface ActivityEntry {
   kind: 'working' | 'reviewing';
 }
 
-export const ActiveTasksBlock = ({
+export const ActiveTasksBlock = memo(function ActiveTasksBlock({
   members,
   tasks,
   defaultCollapsed = false,
   headerRight,
   onMemberClick,
   onTaskClick,
-}: ActiveTasksBlockProps): React.JSX.Element | null => {
+}: ActiveTasksBlockProps): React.JSX.Element | null {
   const { isLight } = useTheme();
   const [collapsed, setCollapsed] = useState(defaultCollapsed);
   const colorMap = buildMemberColorMap(members);
@@ -188,4 +188,4 @@ export const ActiveTasksBlock = ({
         })}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/team/activity/ActivityItem.tsx b/src/renderer/components/team/activity/ActivityItem.tsx
index 4cde29bc..366e5521 100644
--- a/src/renderer/components/team/activity/ActivityItem.tsx
+++ b/src/renderer/components/team/activity/ActivityItem.tsx
@@ -381,6 +381,7 @@ const PassiveIdlePeerSummaryRow = ({
 
 const BootstrapSystemRow = ({
   teamName,
+  eventKind,
   senderName,
   recipientName,
   runtime,
@@ -390,6 +391,7 @@ const BootstrapSystemRow = ({
   onMemberNameClick,
 }: {
   teamName: string;
+  eventKind: 'start' | 'restart';
   senderName: string;
   recipientName: string;
   runtime?: string;
@@ -397,34 +399,41 @@ const BootstrapSystemRow = ({
   recipientColor?: string;
   timestamp: string;
   onMemberNameClick?: (memberName: string) => void;
-}): React.JSX.Element => (
-  <div className="flex items-center gap-2 px-3 py-2" style={{ opacity: 0.82 }}>
-    <span className="bg-sky-500/12 inline-flex items-center rounded-full px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide text-sky-300">
-      start
-    </span>
-    <MemberBadge
-      name={senderName}
-      color={senderColor}
-      teamName={teamName}
-      hideAvatar
-      onClick={onMemberNameClick}
-    />
-    <MoveRight size={10} style={{ color: CARD_ICON_MUTED }} className="shrink-0" />
-    <MemberBadge
-      name={recipientName}
-      color={recipientColor}
-      teamName={teamName}
-      hideAvatar
-      onClick={onMemberNameClick}
-    />
-    <span className="min-w-0 flex-1 truncate text-[11px]" style={{ color: CARD_ICON_MUTED }}>
-      {runtime || 'Starting teammate'}
-    </span>
-    <span className="shrink-0 text-[10px]" style={{ color: CARD_ICON_MUTED }}>
-      {timestamp}
-    </span>
-  </div>
-);
+}): React.JSX.Element => {
+  const isRestart = eventKind === 'restart';
+  return (
+    <div className="flex items-center gap-2 px-3 py-2" style={{ opacity: 0.82 }}>
+      <span
+        className={`inline-flex items-center rounded-full px-1.5 py-0.5 text-[10px] font-medium uppercase tracking-wide ${
+          isRestart ? 'bg-amber-500/12 text-amber-300' : 'bg-sky-500/12 text-sky-300'
+        }`}
+      >
+        {isRestart ? 'restart' : 'start'}
+      </span>
+      <MemberBadge
+        name={senderName}
+        color={senderColor}
+        teamName={teamName}
+        hideAvatar
+        onClick={onMemberNameClick}
+      />
+      <MoveRight size={10} style={{ color: CARD_ICON_MUTED }} className="shrink-0" />
+      <MemberBadge
+        name={recipientName}
+        color={recipientColor}
+        teamName={teamName}
+        hideAvatar
+        onClick={onMemberNameClick}
+      />
+      <span className="min-w-0 flex-1 truncate text-[11px]" style={{ color: CARD_ICON_MUTED }}>
+        {runtime || (isRestart ? 'Restarting teammate' : 'Starting teammate')}
+      </span>
+      <span className="shrink-0 text-[10px]" style={{ color: CARD_ICON_MUTED }}>
+        {timestamp}
+      </span>
+    </div>
+  );
+};
 
 const BootstrapAcknowledgementRow = ({
   teamName,
@@ -921,6 +930,7 @@ export const ActivityItem = memo(
       return (
         <BootstrapSystemRow
           teamName={teamName}
+          eventKind={bootstrapDisplay.eventKind}
           senderName={senderName}
           recipientName={bootstrapDisplay.teammateName ?? message.to ?? 'teammate'}
           runtime={bootstrapDisplay.runtime}
diff --git a/src/renderer/components/team/activity/PendingRepliesBlock.tsx b/src/renderer/components/team/activity/PendingRepliesBlock.tsx
index fd521447..8e266ddb 100644
--- a/src/renderer/components/team/activity/PendingRepliesBlock.tsx
+++ b/src/renderer/components/team/activity/PendingRepliesBlock.tsx
@@ -1,3 +1,5 @@
+import { memo } from 'react';
+
 import { CARD_BG, CARD_BORDER_STYLE, CARD_ICON_MUTED } from '@renderer/constants/cssVariables';
 import { getTeamColorSet, getThemedBadge } from '@renderer/constants/teamColors';
 import { useTheme } from '@renderer/hooks/useTheme';
@@ -32,13 +34,13 @@ interface PendingRepliesBlockProps {
   onMemberClick?: (member: ResolvedTeamMember) => void;
 }
 
-export const PendingRepliesBlock = ({
+export const PendingRepliesBlock = memo(function PendingRepliesBlock({
   members,
   pendingRepliesByMember,
   pendingCrossTeamReplies = [],
   headerRight,
   onMemberClick,
-}: PendingRepliesBlockProps): React.JSX.Element | null => {
+}: PendingRepliesBlockProps): React.JSX.Element | null {
   const { isLight } = useTheme();
   const pendingApprovals = useStore(useShallow((s) => s.pendingApprovals));
   const colorMap = buildMemberColorMap(members);
@@ -270,4 +272,4 @@ export const PendingRepliesBlock = ({
       })}
     </div>
   );
-};
+});
diff --git a/src/renderer/components/team/activity/ReplyQuoteBlock.tsx b/src/renderer/components/team/activity/ReplyQuoteBlock.tsx
index 208291a2..e70271cf 100644
--- a/src/renderer/components/team/activity/ReplyQuoteBlock.tsx
+++ b/src/renderer/components/team/activity/ReplyQuoteBlock.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { memo, useState } from 'react';
 
 import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
 import { MemberBadge } from '@renderer/components/team/MemberBadge';
@@ -20,60 +20,64 @@ interface ReplyQuoteBlockProps {
 /** Threshold (characters) above which the "more/less" toggle is shown. */
 const LONG_QUOTE_THRESHOLD = 200;
 
-export const ReplyQuoteBlock = ({
-  reply,
-  memberColor,
-  bodyMaxHeight = 'max-h-56',
-  replyTaskRefs,
-}: ReplyQuoteBlockProps): React.JSX.Element => {
-  const isLong = reply.originalText.length > LONG_QUOTE_THRESHOLD;
-  const [expanded, setExpanded] = useState(false);
+export const ReplyQuoteBlock = memo(
+  ({
+    reply,
+    memberColor,
+    bodyMaxHeight = 'max-h-56',
+    replyTaskRefs,
+  }: ReplyQuoteBlockProps): React.JSX.Element => {
+    const isLong = reply.originalText.length > LONG_QUOTE_THRESHOLD;
+    const [expanded, setExpanded] = useState(false);
 
-  const quoteMaxHeight = expanded ? 'max-h-48' : 'max-h-[3.75rem]';
+    const quoteMaxHeight = expanded ? 'max-h-48' : 'max-h-[3.75rem]';
 
-  return (
-    <div className="space-y-2">
-      {/* Quote block — styled like SendMessageDialog */}
-      <div className="relative overflow-hidden rounded-md border border-blue-400/20 bg-blue-100/40 py-2 pl-3 pr-2 dark:border-blue-500/20 dark:bg-blue-950/20">
-        {/* Decorative quotation mark */}
-        <span className="pointer-events-none absolute -right-1 top-1/2 -translate-y-1/2 select-none font-serif text-[48px] leading-none text-blue-600/[0.08] dark:text-blue-400/[0.08]">
-          &ldquo;
-        </span>
+    return (
+      <div className="space-y-2">
+        {/* Quote block — styled like SendMessageDialog */}
+        <div className="relative overflow-hidden rounded-md border border-blue-400/20 bg-blue-100/40 py-2 pl-3 pr-2 dark:border-blue-500/20 dark:bg-blue-950/20">
+          {/* Decorative quotation mark */}
+          <span className="pointer-events-none absolute -right-1 top-1/2 -translate-y-1/2 select-none font-serif text-[48px] leading-none text-blue-600/[0.08] dark:text-blue-400/[0.08]">
+            &ldquo;
+          </span>
 
-        {/* "Replying to" + MemberBadge */}
-        <div className="mb-1 flex items-center gap-1.5">
-          <span className="text-[10px] text-blue-600/60 dark:text-blue-300/60">Replying to</span>
-          <MemberBadge name={reply.agentName} color={memberColor} size="sm" />
+          {/* "Replying to" + MemberBadge */}
+          <div className="mb-1 flex items-center gap-1.5">
+            <span className="text-[10px] text-blue-600/60 dark:text-blue-300/60">Replying to</span>
+            <MemberBadge name={reply.agentName} color={memberColor} size="sm" />
+          </div>
+
+          {/* Quote text */}
+          <div className={`pr-5 opacity-50 ${expanded ? '' : 'max-h-[3.75rem] overflow-hidden'}`}>
+            <MarkdownViewer
+              content={linkifyTaskIdsInMarkdown(reply.originalText)}
+              bare
+              maxHeight={quoteMaxHeight}
+            />
+          </div>
+
+          {/* More/less toggle */}
+          {isLong ? (
+            <button
+              type="button"
+              className="mt-0.5 text-[10px] text-blue-600/60 hover:text-blue-700 dark:text-blue-400/60 dark:hover:text-blue-300"
+              onClick={() => setExpanded((v) => !v)}
+            >
+              {expanded ? 'less' : 'more'}
+            </button>
+          ) : null}
         </div>
 
-        {/* Quote text */}
-        <div className={`pr-5 opacity-50 ${expanded ? '' : 'max-h-[3.75rem] overflow-hidden'}`}>
-          <MarkdownViewer
-            content={linkifyTaskIdsInMarkdown(reply.originalText)}
-            bare
-            maxHeight={quoteMaxHeight}
-          />
-        </div>
-
-        {/* More/less toggle */}
-        {isLong ? (
-          <button
-            type="button"
-            className="mt-0.5 text-[10px] text-blue-600/60 hover:text-blue-700 dark:text-blue-400/60 dark:hover:text-blue-300"
-            onClick={() => setExpanded((v) => !v)}
-          >
-            {expanded ? 'less' : 'more'}
-          </button>
-        ) : null}
+        {/* Reply text */}
+        <MarkdownViewer
+          content={linkifyTaskIdsInMarkdown(reply.replyText, replyTaskRefs)}
+          maxHeight={bodyMaxHeight}
+          copyable
+          bare
+        />
       </div>
+    );
+  }
+);
 
-      {/* Reply text */}
-      <MarkdownViewer
-        content={linkifyTaskIdsInMarkdown(reply.replyText, replyTaskRefs)}
-        maxHeight={bodyMaxHeight}
-        copyable
-        bare
-      />
-    </div>
-  );
-};
+ReplyQuoteBlock.displayName = 'ReplyQuoteBlock';
diff --git a/src/renderer/components/team/dialogs/EditTeamDialog.tsx b/src/renderer/components/team/dialogs/EditTeamDialog.tsx
index 47c01efc..8c42d319 100644
--- a/src/renderer/components/team/dialogs/EditTeamDialog.tsx
+++ b/src/renderer/components/team/dialogs/EditTeamDialog.tsx
@@ -33,6 +33,7 @@ import { parseNumericSuffixName } from '@shared/utils/teamMemberName';
 import { Loader2 } from 'lucide-react';
 
 import {
+  buildEditTeamMemberRosterSnapshot,
   buildEditTeamSourceSnapshot,
   getLiveRosterIdentityChanges,
   getMemberRuntimeContractKey,
@@ -254,6 +255,27 @@ export const EditTeamDialog = ({
       new Map(builtMembers.map((member) => [member.name.trim().toLowerCase(), member] as const)),
     [builtMembers]
   );
+  const currentMemberRosterSnapshot = useMemo(
+    () => buildEditTeamMemberRosterSnapshot(currentMembers),
+    [currentMembers]
+  );
+  const nextMemberRosterSnapshot = useMemo(
+    () => buildEditTeamMemberRosterSnapshot(builtMembers),
+    [builtMembers]
+  );
+  const hasMemberRosterChanges = currentMemberRosterSnapshot !== nextMemberRosterSnapshot;
+  const currentMembersByName = useMemo(
+    () =>
+      new Map(currentMembers.map((member) => [member.name.trim().toLowerCase(), member] as const)),
+    [currentMembers]
+  );
+  const isLiveMixedOpenCodeSideLaneTeam = useMemo(
+    () =>
+      isTeamAlive &&
+      leadMember?.providerId !== 'opencode' &&
+      currentMembers.some((member) => !member.removedAt && member.providerId === 'opencode'),
+    [currentMembers, isTeamAlive, leadMember?.providerId]
+  );
   const effectiveMembersToRestart = useMemo(() => {
     const retryMembers = Object.entries(membersPendingRestartRetry).flatMap(
       ([normalizedName, expectedRuntimeContractKey]) => {
@@ -270,10 +292,35 @@ export const EditTeamDialog = ({
       new Set(
         [...membersToRestart, ...retryMembers]
           .map((memberName) => memberName.trim())
+          .filter((memberName) => {
+            const nextMember = builtMembersByName.get(memberName.toLowerCase());
+            return nextMember?.providerId !== 'opencode';
+          })
           .filter(Boolean)
       )
     );
   }, [builtMembersByName, membersPendingRestartRetry, membersToRestart]);
+  const openCodeMembersHandledByLiveRoster = useMemo(() => {
+    if (!isTeamAlive) {
+      return [];
+    }
+    return Array.from(
+      new Set(
+        membersToRestart
+          .map((memberName) => memberName.trim())
+          .filter((memberName) => {
+            const nextMember = builtMembersByName.get(memberName.toLowerCase());
+            return nextMember?.providerId === 'opencode';
+          })
+          .filter(Boolean)
+      )
+    );
+  }, [builtMembersByName, isTeamAlive, membersToRestart]);
+  const liveRuntimeRefreshMemberNames = useMemo(
+    () =>
+      Array.from(new Set([...effectiveMembersToRestart, ...openCodeMembersHandledByLiveRoster])),
+    [effectiveMembersToRestart, openCodeMembersHandledByLiveRoster]
+  );
   const liveIdentityChanges = useMemo(
     () =>
       isTeamAlive
@@ -289,6 +336,34 @@ export const EditTeamDialog = ({
     () => (isTeamAlive ? liveIdentityChanges.removed : []),
     [isTeamAlive, liveIdentityChanges.removed]
   );
+  const unsupportedLiveMixedPrimaryRuntimeChangeNames = useMemo(() => {
+    if (!isLiveMixedOpenCodeSideLaneTeam) {
+      return [];
+    }
+    return membersToRestart.filter((memberName) => {
+      const nextMember = builtMembersByName.get(memberName.trim().toLowerCase());
+      return nextMember?.providerId !== 'opencode';
+    });
+  }, [builtMembersByName, isLiveMixedOpenCodeSideLaneTeam, membersToRestart]);
+  const unsupportedLiveMixedPrimaryRemovalNames = useMemo(() => {
+    if (!isLiveMixedOpenCodeSideLaneTeam) {
+      return [];
+    }
+    return liveRemovedExistingMembers.filter((memberName) => {
+      const currentMember = currentMembersByName.get(memberName.trim().toLowerCase());
+      return currentMember?.providerId !== 'opencode';
+    });
+  }, [currentMembersByName, isLiveMixedOpenCodeSideLaneTeam, liveRemovedExistingMembers]);
+  const unsupportedLiveMixedPrimaryMutationNames = useMemo(
+    () =>
+      Array.from(
+        new Set([
+          ...unsupportedLiveMixedPrimaryRuntimeChangeNames,
+          ...unsupportedLiveMixedPrimaryRemovalNames,
+        ])
+      ),
+    [unsupportedLiveMixedPrimaryRemovalNames, unsupportedLiveMixedPrimaryRuntimeChangeNames]
+  );
   const hasNewLiveTeammates = useMemo(
     () =>
       isTeamAlive && members.some((member) => !member.removedAt && !member.originalName?.trim()),
@@ -296,7 +371,7 @@ export const EditTeamDialog = ({
   );
   const memberWarningById = useMemo(() => {
     const restartNames = new Set(
-      effectiveMembersToRestart.map((memberName) => memberName.trim().toLowerCase())
+      liveRuntimeRefreshMemberNames.map((memberName) => memberName.trim().toLowerCase())
     );
     if (restartNames.size === 0) {
       return undefined;
@@ -309,7 +384,7 @@ export const EditTeamDialog = ({
           : null,
       ])
     );
-  }, [effectiveMembersToRestart, members]);
+  }, [liveRuntimeRefreshMemberNames, members]);
 
   const handleSave = (): void => {
     if (!name.trim()) {
@@ -359,12 +434,19 @@ export const EditTeamDialog = ({
       );
       return;
     }
+    if (unsupportedLiveMixedPrimaryMutationNames.length > 0) {
+      setError(
+        `Live edits to primary-owned teammates in mixed OpenCode teams are not supported yet. Stop the team, edit the roster, then relaunch. Affected: ${unsupportedLiveMixedPrimaryMutationNames.join(', ')}`
+      );
+      return;
+    }
     setSaving(true);
     setError(null);
     setSaveOutcomeError(null);
     void (async () => {
       let configSaved = false;
       let membersSaved = false;
+      let refreshAfterSaveAttempted = false;
       let committedMembersForSnapshot: ResolvedTeamMember[] = currentMembers;
       try {
         await api.teams.updateConfig(teamName, {
@@ -373,14 +455,17 @@ export const EditTeamDialog = ({
           color,
         });
         configSaved = true;
-        for (const removedMemberName of liveRemovedExistingMembers) {
-          await api.teams.removeMember(teamName, removedMemberName);
-          committedMembersForSnapshot = applyRemovedMembersToSnapshot(committedMembersForSnapshot, [
-            removedMemberName,
-          ]);
+        if (hasMemberRosterChanges) {
+          for (const removedMemberName of liveRemovedExistingMembers) {
+            await api.teams.removeMember(teamName, removedMemberName);
+            committedMembersForSnapshot = applyRemovedMembersToSnapshot(
+              committedMembersForSnapshot,
+              [removedMemberName]
+            );
+          }
+          await api.teams.replaceMembers(teamName, { members: builtMembers });
+          membersSaved = true;
         }
-        await api.teams.replaceMembers(teamName, { members: builtMembers });
-        membersSaved = true;
         pendingCommittedSourceSnapshotRef.current = buildEditTeamSourceSnapshot({
           name: name.trim(),
           description: description.trim(),
@@ -409,6 +494,7 @@ export const EditTeamDialog = ({
           }
         }
 
+        refreshAfterSaveAttempted = true;
         await Promise.resolve(onSaved());
         if (restartFailures.length === 0) {
           setMembersPendingRestartRetry({});
@@ -445,6 +531,12 @@ export const EditTeamDialog = ({
             color: color.trim(),
             members: committedMembersForSnapshot,
           });
+          if (refreshAfterSaveAttempted) {
+            setSaveOutcomeError(
+              `Team settings were saved, but failed to refresh the latest view: ${message}`
+            );
+            return;
+          }
           let refreshErrorDetail: string | null = null;
           try {
             await Promise.resolve(onSaved());
@@ -601,12 +693,19 @@ export const EditTeamDialog = ({
               changes or stop the team first.
             </p>
           ) : null}
-          {isTeamAlive && effectiveMembersToRestart.length > 0 ? (
+          {unsupportedLiveMixedPrimaryMutationNames.length > 0 ? (
+            <p className="text-xs text-red-300">
+              Live edits/removals for primary-owned teammates in mixed OpenCode teams require
+              stopping and relaunching the team:{' '}
+              {unsupportedLiveMixedPrimaryMutationNames.join(', ')}.
+            </p>
+          ) : null}
+          {isTeamAlive && liveRuntimeRefreshMemberNames.length > 0 ? (
             <p className="text-xs text-amber-300">
-              Saving will restart{' '}
-              {effectiveMembersToRestart.length === 1 ? 'this teammate' : 'these teammates'} to
+              Saving will restart or relaunch{' '}
+              {liveRuntimeRefreshMemberNames.length === 1 ? 'this teammate' : 'these teammates'} to
               apply role, workflow, worktree isolation, provider, model, or effort changes:{' '}
-              {effectiveMembersToRestart.join(', ')}.
+              {liveRuntimeRefreshMemberNames.join(', ')}.
             </p>
           ) : null}
           <div>
@@ -662,7 +761,8 @@ export const EditTeamDialog = ({
               isTeamProvisioning ||
               !name.trim() ||
               hasDuplicateMembers ||
-              Boolean(invalidMemberNamesError)
+              Boolean(invalidMemberNamesError) ||
+              unsupportedLiveMixedPrimaryMutationNames.length > 0
             }
           >
             {saving && <Loader2 size={14} className="mr-1.5 animate-spin" />}
diff --git a/src/renderer/components/team/dialogs/GlobalTaskDetailDialog.tsx b/src/renderer/components/team/dialogs/GlobalTaskDetailDialog.tsx
index c24bf8c7..6c9e3b0d 100644
--- a/src/renderer/components/team/dialogs/GlobalTaskDetailDialog.tsx
+++ b/src/renderer/components/team/dialogs/GlobalTaskDetailDialog.tsx
@@ -50,6 +50,7 @@ export const GlobalTaskDetailDialog = (): React.JSX.Element | null => {
 
   const teamName = globalTaskDetail?.teamName ?? '';
   const taskId = globalTaskDetail?.taskId ?? '';
+  const commentId = globalTaskDetail?.commentId;
   const hasTargetTeamData = hasSelectedTargetTeamData(
     teamName,
     selectedTeamName,
@@ -150,6 +151,7 @@ export const GlobalTaskDetailDialog = (): React.JSX.Element | null => {
       onClose={closeGlobalTaskDetail}
       onOwnerChange={undefined}
       onViewChanges={isFullTeamLoaded ? handleViewChanges : undefined}
+      focusCommentId={commentId}
       headerExtra={
         <button
           type="button"
diff --git a/src/renderer/components/team/dialogs/TaskCommentsSection.tsx b/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
index 24a82832..1ebf3dc1 100644
--- a/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
+++ b/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
@@ -49,6 +49,10 @@ const INITIAL_VISIBLE_COMMENTS = 30;
 const VISIBLE_COMMENTS_STEP = 50;
 const MAX_COMMENTS_TO_RENDER = 2000;
 
+function getTaskCommentElementId(taskId: string, commentId: string): string {
+  return `task-comment-${taskId}-${commentId}`;
+}
+
 interface TaskCommentsSectionProps {
   teamName: string;
   taskId: string;
@@ -66,6 +70,8 @@ interface TaskCommentsSectionProps {
   containerClassName?: string;
   /** Snapshot of unread comment IDs captured when the dialog opened. Blue dot is shown for these. */
   unreadCommentIds?: Set<string>;
+  /** Comment to reveal when the dialog was opened from a notification. */
+  focusCommentId?: string;
   /**
    * Ref callback factory from useViewportCommentRead.
    * When provided, each comment element is registered for viewport-based read tracking.
@@ -84,6 +90,7 @@ export const TaskCommentsSection = ({
   onTaskIdClick,
   containerClassName,
   unreadCommentIds,
+  focusCommentId,
   registerCommentForViewport,
 }: TaskCommentsSectionProps): React.JSX.Element => {
   const addTaskComment = useStore((s) => s.addTaskComment);
@@ -130,9 +137,15 @@ export const TaskCommentsSection = ({
     return list;
   }, [cappedComments]);
 
+  const visibleCountForFocus = useMemo(() => {
+    if (!focusCommentId) return visibleCount;
+    const focusedIndex = sortedComments.findIndex((comment) => comment.id === focusCommentId);
+    return focusedIndex >= 0 ? Math.max(visibleCount, focusedIndex + 1) : visibleCount;
+  }, [focusCommentId, sortedComments, visibleCount]);
+
   const visibleComments = useMemo(
-    () => sortedComments.slice(0, Math.min(visibleCount, sortedComments.length)),
-    [sortedComments, visibleCount]
+    () => sortedComments.slice(0, Math.min(visibleCountForFocus, sortedComments.length)),
+    [sortedComments, visibleCountForFocus]
   );
 
   const visibleCommentIds = useMemo(
@@ -163,6 +176,22 @@ export const TaskCommentsSection = ({
     trimmed.length <= MAX_TEXT_LENGTH &&
     !addingComment;
 
+  useEffect(() => {
+    if (!focusCommentId) return;
+    const target = document.getElementById(getTaskCommentElementId(taskId, focusCommentId));
+    if (!target) return;
+
+    target.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    target.classList.remove('kanban-card-focus-pulse');
+    void target.offsetWidth;
+    target.classList.add('kanban-card-focus-pulse');
+    target.addEventListener(
+      'animationend',
+      () => target.classList.remove('kanban-card-focus-pulse'),
+      { once: true }
+    );
+  }, [focusCommentId, taskId, visibleComments]);
+
   const handleSubmit = useCallback(async () => {
     if (!canSubmit) return;
     try {
@@ -215,6 +244,8 @@ export const TaskCommentsSection = ({
             {visibleComments.map((comment, index) => (
               <AnimatedHeightReveal key={comment.id} animate={newCommentIds.has(comment.id)}>
                 <div
+                  id={getTaskCommentElementId(taskId, comment.id)}
+                  data-task-comment-id={comment.id}
                   ref={
                     registerCommentForViewport ? registerCommentForViewport(comment.id) : undefined
                   }
diff --git a/src/renderer/components/team/dialogs/TaskDetailDialog.tsx b/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
index 9ecda341..bbc41c65 100644
--- a/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
+++ b/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
@@ -119,6 +119,7 @@ interface TaskDetailDialogProps {
   onViewChanges?: (taskId: string, filePath?: string) => void;
   onOpenInEditor?: (filePath: string) => void;
   onDeleteTask?: (taskId: string) => void;
+  focusCommentId?: string;
   /** Extra content rendered in the dialog header (e.g. "Open team" button). */
   headerExtra?: React.ReactNode;
 }
@@ -138,6 +139,7 @@ export const TaskDetailDialog = ({
   onViewChanges,
   onOpenInEditor,
   onDeleteTask,
+  focusCommentId,
   headerExtra,
 }: TaskDetailDialogProps): React.JSX.Element => {
   const colorMap = useMemo(() => buildMemberColorMap(members), [members]);
@@ -1392,6 +1394,7 @@ export const TaskDetailDialog = ({
                 }
                 containerClassName="-mx-6"
                 unreadCommentIds={unreadSnapshotRef.current}
+                focusCommentId={focusCommentId}
                 registerCommentForViewport={registerComment}
               />
             </CollapsibleTeamSection>
diff --git a/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts b/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
index c9e2921f..eb300d43 100644
--- a/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
+++ b/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
@@ -1,10 +1,13 @@
 import { isTeamEffortLevel } from '@shared/utils/effortLevels';
+import { migrateProviderBackendId } from '@shared/utils/providerBackend';
 import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
 
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
 import type {
   EffortLevel,
   ResolvedTeamMember,
+  TeamFastMode,
+  TeamProviderBackendId,
   TeamProviderId,
   TeamProvisioningMemberInput,
 } from '@shared/types';
@@ -127,18 +130,22 @@ function normalizeEditableMemberSnapshot(member: {
   role?: string;
   workflow?: string;
   providerId?: string;
+  providerBackendId?: string;
   model?: string;
   effort?: string;
   isolation?: string;
+  fastMode?: string;
   removedAt?: number | string | null;
 }): {
   name: string;
   role?: string;
   workflow?: string;
   providerId?: TeamProviderId;
+  providerBackendId?: TeamProviderBackendId;
   model?: string;
   effort?: EffortLevel;
   isolation?: 'worktree';
+  fastMode?: TeamFastMode;
 } | null {
   if (member.removedAt) {
     return null;
@@ -147,24 +154,42 @@ function normalizeEditableMemberSnapshot(member: {
   if (!name || name.toLowerCase() === 'team-lead') {
     return null;
   }
+  const runtime = normalizeRestartSensitiveMemberContract(member);
   return {
     name,
     role: member.role?.trim() || undefined,
     workflow: member.workflow?.trim() || undefined,
-    ...normalizeRestartSensitiveMemberContract(member),
+    providerBackendId: migrateProviderBackendId(runtime.providerId, member.providerBackendId),
+    fastMode:
+      member.fastMode === 'inherit' || member.fastMode === 'on' || member.fastMode === 'off'
+        ? member.fastMode
+        : undefined,
+    ...runtime,
   };
 }
 
+export function buildEditTeamMemberRosterSnapshot(members: readonly ResolvedTeamMember[]): string;
+export function buildEditTeamMemberRosterSnapshot(
+  members: readonly TeamProvisioningMemberInput[]
+): string;
+export function buildEditTeamMemberRosterSnapshot(
+  members: readonly (ResolvedTeamMember | TeamProvisioningMemberInput)[]
+): string {
+  const normalizedMembers = members
+    .map(normalizeEditableMemberSnapshot)
+    .filter((member): member is NonNullable<typeof member> => member !== null)
+    .sort((a, b) => a.name.localeCompare(b.name));
+
+  return JSON.stringify(normalizedMembers);
+}
+
 export function buildEditTeamSourceSnapshot(params: {
   name: string;
   description: string;
   color: string;
   members: readonly ResolvedTeamMember[];
 }): string {
-  const members = params.members
-    .map(normalizeEditableMemberSnapshot)
-    .filter((member): member is NonNullable<typeof member> => member !== null)
-    .sort((a, b) => a.name.localeCompare(b.name));
+  const members = JSON.parse(buildEditTeamMemberRosterSnapshot(params.members)) as unknown;
 
   return JSON.stringify({
     name: params.name.trim(),
diff --git a/src/renderer/components/team/kanban/KanbanBoard.tsx b/src/renderer/components/team/kanban/KanbanBoard.tsx
index 62d5759e..e5241390 100644
--- a/src/renderer/components/team/kanban/KanbanBoard.tsx
+++ b/src/renderer/components/team/kanban/KanbanBoard.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { DndContext, PointerSensor, useSensor, useSensors } from '@dnd-kit/core';
 import { arrayMove } from '@dnd-kit/sortable';
@@ -311,7 +311,7 @@ const SortableKanbanTaskCard = ({
   );
 };
 
-export const KanbanBoard = ({
+export const KanbanBoard = memo(function KanbanBoard({
   tasks,
   teamName,
   kanbanState,
@@ -338,7 +338,7 @@ export const KanbanBoard = ({
   onDeleteTask,
   deletedTaskCount,
   onOpenTrash,
-}: KanbanBoardProps): React.JSX.Element => {
+}: KanbanBoardProps): React.JSX.Element {
   const boardRef = useRef<HTMLDivElement>(null);
   const scrollRestoreTimeoutsRef = useRef<number[]>([]);
   const [viewMode, setViewMode] = useState<KanbanViewMode>('grid');
@@ -422,101 +422,119 @@ export const KanbanBoard = ({
     [onColumnOrderChange, groupedOrdered]
   );
 
-  const renderCards = (
-    columnId: KanbanColumnId,
-    columnTasks: TeamTask[],
-    compact?: boolean
-  ): React.JSX.Element => {
-    const addHandler =
-      onAddTask && columnId === 'todo'
-        ? () => onAddTask(false)
-        : onAddTask && columnId === 'in_progress'
-          ? () => onAddTask(true)
-          : undefined;
+  const renderCards = useCallback(
+    (columnId: KanbanColumnId, columnTasks: TeamTask[], compact?: boolean): React.JSX.Element => {
+      const addHandler =
+        onAddTask && columnId === 'todo'
+          ? () => onAddTask(false)
+          : onAddTask && columnId === 'in_progress'
+            ? () => onAddTask(true)
+            : undefined;
 
-    const addButton = addHandler ? (
-      <button
-        type="button"
-        onClick={addHandler}
-        className="flex w-full items-center justify-center gap-1.5 rounded-md border border-dashed border-[var(--color-border)] p-3 text-xs text-[var(--color-text-muted)] transition-colors hover:border-[var(--color-border-emphasis)] hover:text-[var(--color-text-secondary)]"
-      >
-        <Plus size={13} />
-        Add task
-      </button>
-    ) : null;
+      const addButton = addHandler ? (
+        <button
+          type="button"
+          onClick={addHandler}
+          className="flex w-full items-center justify-center gap-1.5 rounded-md border border-dashed border-[var(--color-border)] p-3 text-xs text-[var(--color-text-muted)] transition-colors hover:border-[var(--color-border-emphasis)] hover:text-[var(--color-text-secondary)]"
+        >
+          <Plus size={13} />
+          Add task
+        </button>
+      ) : null;
 
-    if (columnTasks.length === 0) {
-      return (
-        addButton ?? (
-          <div className="rounded-md border border-dashed border-[var(--color-border)] p-3 text-xs text-[var(--color-text-muted)]">
-            No tasks
-          </div>
-        )
-      );
-    }
-    if (enableTaskSorting) {
-      const itemIds = columnTasks.map((t) => t.id);
+      if (columnTasks.length === 0) {
+        return (
+          addButton ?? (
+            <div className="rounded-md border border-dashed border-[var(--color-border)] p-3 text-xs text-[var(--color-text-muted)]">
+              No tasks
+            </div>
+          )
+        );
+      }
+      if (enableTaskSorting) {
+        const itemIds = columnTasks.map((t) => t.id);
+        return (
+          <>
+            <SortableContext items={itemIds} strategy={verticalListSortingStrategy}>
+              {columnTasks.map((task) => (
+                <SortableKanbanTaskCard
+                  key={task.id}
+                  task={task}
+                  columnId={columnId}
+                  teamName={teamName}
+                  kanbanState={kanbanState}
+                  compact={compact}
+                  taskMap={taskMap}
+                  memberColorMap={memberColorMap}
+                  onRequestReview={onRequestReview}
+                  onApprove={onApprove}
+                  onRequestChanges={onRequestChanges}
+                  onMoveBackToDone={onMoveBackToDone}
+                  onStartTask={onStartTask}
+                  onCompleteTask={onCompleteTask}
+                  onCancelTask={onCancelTask}
+                  onScrollToTask={onScrollToTask}
+                  onTaskClick={onTaskClick}
+                  onViewChanges={onViewChanges}
+                  onDeleteTask={onDeleteTask}
+                />
+              ))}
+            </SortableContext>
+            {addButton}
+          </>
+        );
+      }
       return (
         <>
-          <SortableContext items={itemIds} strategy={verticalListSortingStrategy}>
-            {columnTasks.map((task) => (
-              <SortableKanbanTaskCard
-                key={task.id}
-                task={task}
-                columnId={columnId}
-                teamName={teamName}
-                kanbanState={kanbanState}
-                compact={compact}
-                taskMap={taskMap}
-                memberColorMap={memberColorMap}
-                onRequestReview={onRequestReview}
-                onApprove={onApprove}
-                onRequestChanges={onRequestChanges}
-                onMoveBackToDone={onMoveBackToDone}
-                onStartTask={onStartTask}
-                onCompleteTask={onCompleteTask}
-                onCancelTask={onCancelTask}
-                onScrollToTask={onScrollToTask}
-                onTaskClick={onTaskClick}
-                onViewChanges={onViewChanges}
-                onDeleteTask={onDeleteTask}
-              />
-            ))}
-          </SortableContext>
+          {columnTasks.map((task) => (
+            <KanbanTaskCard
+              key={task.id}
+              task={task}
+              teamName={teamName}
+              columnId={columnId}
+              kanbanTaskState={kanbanState.tasks[task.id]}
+              hasReviewers={hasReviewers}
+              compact={compact}
+              taskMap={taskMap}
+              memberColorMap={memberColorMap}
+              onRequestReview={onRequestReview}
+              onApprove={onApprove}
+              onRequestChanges={onRequestChanges}
+              onMoveBackToDone={onMoveBackToDone}
+              onStartTask={onStartTask}
+              onCompleteTask={onCompleteTask}
+              onCancelTask={onCancelTask}
+              onScrollToTask={onScrollToTask}
+              onTaskClick={onTaskClick}
+              onViewChanges={onViewChanges}
+              onDeleteTask={onDeleteTask}
+            />
+          ))}
           {addButton}
         </>
       );
-    }
-    return (
-      <>
-        {columnTasks.map((task) => (
-          <KanbanTaskCard
-            key={task.id}
-            task={task}
-            teamName={teamName}
-            columnId={columnId}
-            kanbanTaskState={kanbanState.tasks[task.id]}
-            hasReviewers={hasReviewers}
-            compact={compact}
-            taskMap={taskMap}
-            memberColorMap={memberColorMap}
-            onRequestReview={onRequestReview}
-            onApprove={onApprove}
-            onRequestChanges={onRequestChanges}
-            onMoveBackToDone={onMoveBackToDone}
-            onStartTask={onStartTask}
-            onCompleteTask={onCompleteTask}
-            onCancelTask={onCancelTask}
-            onScrollToTask={onScrollToTask}
-            onTaskClick={onTaskClick}
-            onViewChanges={onViewChanges}
-            onDeleteTask={onDeleteTask}
-          />
-        ))}
-        {addButton}
-      </>
-    );
-  };
+    },
+    [
+      enableTaskSorting,
+      hasReviewers,
+      kanbanState,
+      memberColorMap,
+      onAddTask,
+      onApprove,
+      onCancelTask,
+      onCompleteTask,
+      onDeleteTask,
+      onMoveBackToDone,
+      onRequestChanges,
+      onRequestReview,
+      onScrollToTask,
+      onStartTask,
+      onTaskClick,
+      onViewChanges,
+      taskMap,
+      teamName,
+    ]
+  );
 
   const visibleColumns = useMemo(
     () => (filter.columns.size > 0 ? COLUMNS.filter((c) => filter.columns.has(c.id)) : COLUMNS),
@@ -591,6 +609,29 @@ export const KanbanBoard = ({
     [scheduleScrollRestore, viewMode]
   );
 
+  const gridColumns = useMemo(
+    () =>
+      visibleColumns.map((column) => {
+        const columnTasks = groupedOrdered.get(column.id) ?? [];
+        const accent = COLUMN_ACCENTS[column.id];
+        return {
+          id: column.id,
+          title: column.title,
+          count: columnTasks.length,
+          icon: accent.icon,
+          headerBg: accent.headerBg,
+          bodyBg: accent.bodyBg,
+          content: renderCards(column.id, columnTasks),
+          showAddButton: columnSupportsAddButton(column.id, onAddTask),
+          skeletonCards: columnTasks.map((task) => ({
+            key: task.id,
+            height: estimateGridSkeletonCardHeight(task, column.id, kanbanState, hasReviewers),
+          })),
+        };
+      }),
+    [visibleColumns, groupedOrdered, renderCards, onAddTask, kanbanState, hasReviewers]
+  );
+
   const boardContent = (
     <div ref={boardRef} className="min-w-0 max-w-full overflow-x-hidden">
       <div
@@ -682,25 +723,7 @@ export const KanbanBoard = ({
           primaryColumnId={primaryVisibleColumnId}
           onPrimaryColumnWidthChange={setGridPrimaryColumnWidth}
           skeletonDelayMs={gridSkeletonDelayMs}
-          columns={visibleColumns.map((column) => {
-            const columnTasks = groupedOrdered.get(column.id) ?? [];
-            const accent = COLUMN_ACCENTS[column.id];
-
-            return {
-              id: column.id,
-              title: column.title,
-              count: columnTasks.length,
-              icon: accent.icon,
-              headerBg: accent.headerBg,
-              bodyBg: accent.bodyBg,
-              content: renderCards(column.id, columnTasks),
-              showAddButton: columnSupportsAddButton(column.id, onAddTask),
-              skeletonCards: columnTasks.map((task) => ({
-                key: task.id,
-                height: estimateGridSkeletonCardHeight(task, column.id, kanbanState, hasReviewers),
-              })),
-            };
-          })}
+          columns={gridColumns}
         />
       ) : (
         <div className="w-full min-w-0 max-w-full overflow-x-auto overflow-y-hidden px-1 pb-6 pr-4 pt-2">
@@ -752,4 +775,4 @@ export const KanbanBoard = ({
   }
 
   return boardContent;
-};
+});
diff --git a/src/renderer/components/team/kanban/KanbanGridLayout.tsx b/src/renderer/components/team/kanban/KanbanGridLayout.tsx
index 6b5f868e..2bc527b5 100644
--- a/src/renderer/components/team/kanban/KanbanGridLayout.tsx
+++ b/src/renderer/components/team/kanban/KanbanGridLayout.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable tailwindcss/no-custom-classname -- this adapter needs stable non-Tailwind class hooks for react-grid-layout handles. */
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import ReactGridLayout, { WidthProvider } from 'react-grid-layout/legacy';
 
 import { usePersistedGridLayout } from '@renderer/hooks/usePersistedGridLayout';
@@ -387,74 +387,78 @@ const LoadedKanbanGridLayout = ({
   );
 };
 
-export const KanbanGridLayout = ({
-  columns,
-  allColumnIds,
-  primaryColumnId,
-  onPrimaryColumnWidthChange,
-  skeletonDelayMs = SKELETON_HIDE_DELAY_MS,
-}: KanbanGridLayoutProps): React.JSX.Element => {
-  const visibleColumnIds = useMemo(() => columns.map((column) => column.id), [columns]);
-  const { visibleItems, applyVisibleItems, isLoaded } = usePersistedGridLayout({
-    scopeKey: GRID_SCOPE_KEY,
-    allItemIds: allColumnIds,
-    visibleItemIds: visibleColumnIds,
-    cols: GRID_COLS,
-    repository: browserGridLayoutRepository,
-    buildDefaultItems,
-  });
-  const [showResolvedLayout, setShowResolvedLayout] = useState(false);
+export const KanbanGridLayout = memo(
+  ({
+    columns,
+    allColumnIds,
+    primaryColumnId,
+    onPrimaryColumnWidthChange,
+    skeletonDelayMs = SKELETON_HIDE_DELAY_MS,
+  }: KanbanGridLayoutProps): React.JSX.Element => {
+    const visibleColumnIds = useMemo(() => columns.map((column) => column.id), [columns]);
+    const { visibleItems, applyVisibleItems, isLoaded } = usePersistedGridLayout({
+      scopeKey: GRID_SCOPE_KEY,
+      allItemIds: allColumnIds,
+      visibleItemIds: visibleColumnIds,
+      cols: GRID_COLS,
+      repository: browserGridLayoutRepository,
+      buildDefaultItems,
+    });
+    const [showResolvedLayout, setShowResolvedLayout] = useState(false);
 
-  useEffect(() => {
-    if (showResolvedLayout) return;
+    useEffect(() => {
+      if (showResolvedLayout) return;
 
-    const timeoutId = window.setTimeout(() => {
-      setShowResolvedLayout(true);
-    }, skeletonDelayMs);
+      const timeoutId = window.setTimeout(() => {
+        setShowResolvedLayout(true);
+      }, skeletonDelayMs);
 
-    return () => {
-      window.clearTimeout(timeoutId);
-    };
-  }, [showResolvedLayout, skeletonDelayMs]);
+      return () => {
+        window.clearTimeout(timeoutId);
+      };
+    }, [showResolvedLayout, skeletonDelayMs]);
 
-  const applyReactGridLayout = useCallback(
-    (layout: Layout, options?: { persist?: boolean }) => {
-      if (options?.persist) {
-        applyVisibleItems(fromReactGridLayout(layout), options);
-      }
-    },
-    [applyVisibleItems]
-  );
-  const showSkeletonOverlay = !showResolvedLayout || !isLoaded;
+    const applyReactGridLayout = useCallback(
+      (layout: Layout, options?: { persist?: boolean }) => {
+        if (options?.persist) {
+          applyVisibleItems(fromReactGridLayout(layout), options);
+        }
+      },
+      [applyVisibleItems]
+    );
+    const showSkeletonOverlay = !showResolvedLayout || !isLoaded;
 
-  const gridKey = visibleItems.map((item) => item.id).join('|');
+    const gridKey = visibleItems.map((item) => item.id).join('|');
 
-  return (
-    <div className="relative min-w-0 max-w-full">
-      <LoadedKanbanGridLayout
-        key={gridKey}
-        columns={columns}
-        visibleItems={visibleItems}
-        onPersistLayout={applyReactGridLayout}
-        primaryColumnId={primaryColumnId}
-        onPrimaryColumnWidthChange={onPrimaryColumnWidthChange}
-        className={cn(
-          'transition-opacity duration-150',
-          showSkeletonOverlay ? 'pointer-events-none opacity-0' : 'opacity-100'
-        )}
-      />
-      {showSkeletonOverlay ? (
-        <LoadingKanbanGridLayout
+    return (
+      <div className="relative min-w-0 max-w-full">
+        <LoadedKanbanGridLayout
+          key={gridKey}
           columns={columns}
           visibleItems={visibleItems}
+          onPersistLayout={applyReactGridLayout}
           primaryColumnId={primaryColumnId}
           onPrimaryColumnWidthChange={onPrimaryColumnWidthChange}
-          className="pointer-events-none absolute inset-0 z-10"
+          className={cn(
+            'transition-opacity duration-150',
+            showSkeletonOverlay ? 'pointer-events-none opacity-0' : 'opacity-100'
+          )}
         />
-      ) : null}
-    </div>
-  );
-};
+        {showSkeletonOverlay ? (
+          <LoadingKanbanGridLayout
+            columns={columns}
+            visibleItems={visibleItems}
+            primaryColumnId={primaryColumnId}
+            onPrimaryColumnWidthChange={onPrimaryColumnWidthChange}
+            className="pointer-events-none absolute inset-0 z-10"
+          />
+        ) : null}
+      </div>
+    );
+  }
+);
+
+KanbanGridLayout.displayName = 'KanbanGridLayout';
 
 export { SKELETON_HIDE_DELAY_MS, SKELETON_HIDE_DELAY_MS_ON_MODE_SWITCH };
 /* eslint-enable tailwindcss/no-custom-classname -- stable class hooks remain scoped to this file. */
diff --git a/src/renderer/components/team/leadContextLoadGuards.ts b/src/renderer/components/team/leadContextLoadGuards.ts
new file mode 100644
index 00000000..3662a2e2
--- /dev/null
+++ b/src/renderer/components/team/leadContextLoadGuards.ts
@@ -0,0 +1,62 @@
+export interface LeadSessionDetailLoadInput {
+  tabId: string | null;
+  projectId: string | null;
+  leadSessionId: string | null;
+  enabled: boolean;
+}
+
+export interface ResolvedLeadSessionDetailLoadInput {
+  tabId: string;
+  projectId: string;
+  leadSessionId: string;
+  enabled: true;
+}
+
+export function shouldLoadLeadSessionDetail(
+  input: LeadSessionDetailLoadInput
+): input is ResolvedLeadSessionDetailLoadInput {
+  return Boolean(
+    input.enabled && input.tabId?.trim() && input.projectId?.trim() && input.leadSessionId?.trim()
+  );
+}
+
+export function buildLeadSessionDetailRequestKey(input: {
+  tabId: string;
+  projectId: string;
+  leadSessionId: string;
+}): string {
+  return `${input.tabId}:${input.projectId}:${input.leadSessionId}`;
+}
+
+export function shouldFetchLeadSessionDetail(input: {
+  requestedSessionId: string | null;
+  loadedSessionId: string | null;
+  loading: boolean;
+  inFlightOrAttemptedRequestKey: string | null;
+  nextRequestKey: string | null;
+}): boolean {
+  const requested = input.requestedSessionId?.trim() ?? '';
+  if (!requested) return false;
+  if (input.loading) return false;
+  if (input.loadedSessionId === requested) return false;
+  if (input.nextRequestKey && input.inFlightOrAttemptedRequestKey === input.nextRequestKey) {
+    return false;
+  }
+  return true;
+}
+
+export function deriveLeadContextButtonLabel(input: {
+  liveContextUsedPercent?: number | null;
+  fullContextUsedPercent?: number | null;
+  contextPanelOpen: boolean;
+}): string {
+  const percent = input.contextPanelOpen
+    ? (input.fullContextUsedPercent ?? input.liveContextUsedPercent)
+    : input.liveContextUsedPercent;
+
+  if (typeof percent !== 'number' || !Number.isFinite(percent)) {
+    return 'Context';
+  }
+
+  return `${percent.toFixed(1)}%`;
+}
diff --git a/src/renderer/components/team/members/CurrentTaskIndicator.tsx b/src/renderer/components/team/members/CurrentTaskIndicator.tsx
index 4781c199..594eabaf 100644
--- a/src/renderer/components/team/members/CurrentTaskIndicator.tsx
+++ b/src/renderer/components/team/members/CurrentTaskIndicator.tsx
@@ -1,3 +1,5 @@
+import { memo } from 'react';
+
 import { SyncedLoader2 } from '@renderer/components/ui/SyncedLoader2';
 import { formatTaskDisplayLabel } from '@shared/utils/taskIdentity';
 
@@ -15,42 +17,46 @@ interface CurrentTaskIndicatorProps {
  * Inline indicator showing a spinning loader + "working on" + task label button.
  * Shared between MemberCard and MemberHoverCard.
  */
-export const CurrentTaskIndicator = ({
-  task,
-  borderColor,
-  maxSubjectLength,
-  activityLabel = 'working on',
-  onOpenTask,
-}: CurrentTaskIndicatorProps): React.JSX.Element => {
-  const subjectText =
-    typeof maxSubjectLength === 'number' &&
-    maxSubjectLength > 0 &&
-    task.subject.length > maxSubjectLength
-      ? `${task.subject.slice(0, maxSubjectLength)}…`
-      : task.subject;
+export const CurrentTaskIndicator = memo(
+  ({
+    task,
+    borderColor,
+    maxSubjectLength,
+    activityLabel = 'working on',
+    onOpenTask,
+  }: CurrentTaskIndicatorProps): React.JSX.Element => {
+    const subjectText =
+      typeof maxSubjectLength === 'number' &&
+      maxSubjectLength > 0 &&
+      task.subject.length > maxSubjectLength
+        ? `${task.subject.slice(0, maxSubjectLength)}…`
+        : task.subject;
 
-  return (
-    <div className="flex min-w-0 flex-1 items-center gap-1.5">
-      <SyncedLoader2 className="size-3 shrink-0" style={{ color: borderColor }} />
-      <span className="shrink-0 text-[10px] text-[var(--color-text-muted)]">{activityLabel}</span>
-      <button
-        type="button"
-        className="min-w-0 flex-1 truncate rounded px-1.5 py-0.5 text-left text-[10px] font-medium text-[var(--color-text)] transition-opacity hover:opacity-90 focus:outline-none focus:ring-1 focus:ring-[var(--color-border)]"
-        title="Open task"
-        onClick={(e) => {
-          e.stopPropagation();
-          onOpenTask?.();
-        }}
-        onKeyDown={(e) => {
-          if (e.key === 'Enter' || e.key === ' ' || e.key === 'Spacebar') {
-            e.preventDefault();
+    return (
+      <div className="flex min-w-0 flex-1 items-center gap-1.5">
+        <SyncedLoader2 className="size-3 shrink-0" style={{ color: borderColor }} />
+        <span className="shrink-0 text-[10px] text-[var(--color-text-muted)]">{activityLabel}</span>
+        <button
+          type="button"
+          className="min-w-0 flex-1 truncate rounded px-1.5 py-0.5 text-left text-[10px] font-medium text-[var(--color-text)] transition-opacity hover:opacity-90 focus:outline-none focus:ring-1 focus:ring-[var(--color-border)]"
+          title="Open task"
+          onClick={(e) => {
             e.stopPropagation();
             onOpenTask?.();
-          }
-        }}
-      >
-        {formatTaskDisplayLabel(task)} {subjectText}
-      </button>
-    </div>
-  );
-};
+          }}
+          onKeyDown={(e) => {
+            if (e.key === 'Enter' || e.key === ' ' || e.key === 'Spacebar') {
+              e.preventDefault();
+              e.stopPropagation();
+              onOpenTask?.();
+            }
+          }}
+        >
+          {formatTaskDisplayLabel(task)} {subjectText}
+        </button>
+      </div>
+    );
+  }
+);
+
+CurrentTaskIndicator.displayName = 'CurrentTaskIndicator';
diff --git a/src/renderer/components/team/members/MemberCard.tsx b/src/renderer/components/team/members/MemberCard.tsx
index 4d26595b..60ed3d0b 100644
--- a/src/renderer/components/team/members/MemberCard.tsx
+++ b/src/renderer/components/team/members/MemberCard.tsx
@@ -1,4 +1,4 @@
-import { useMemo, useState } from 'react';
+import { memo, useMemo, useState } from 'react';
 
 import { Badge } from '@renderer/components/ui/badge';
 import { SyncedLoader2 } from '@renderer/components/ui/SyncedLoader2';
@@ -8,6 +8,7 @@ import { useTheme } from '@renderer/hooks/useTheme';
 import { useStore } from '@renderer/store';
 import { selectResolvedMembersForTeamName } from '@renderer/store/slices/teamSlice';
 import { formatAgentRole } from '@renderer/utils/formatAgentRole';
+import { renderLinkifiedText } from '@renderer/utils/linkifiedText';
 import {
   agentAvatarUrl,
   buildMemberAvatarMap,
@@ -91,7 +92,35 @@ function splitRuntimeSummaryMemory(runtimeSummary: string | undefined): {
   };
 }
 
-export const MemberCard = ({
+function normalizeLaunchFailureReason(value: string | undefined): string | null {
+  const normalized = value
+    ?.replace(/\s+/g, ' ')
+    .trim()
+    .replace(/^Latest assistant message\s+\S+\s+failed with APIError\s*[-:]\s*/i, '')
+    .replace(/^APIError\s*[-:]\s*/i, '');
+  return normalized && normalized.length > 0 ? normalized : null;
+}
+
+function truncateLaunchFailureReason(value: string, maxLength = 220): string {
+  if (value.length <= maxLength) {
+    return value;
+  }
+  return `${value.slice(0, Math.max(0, maxLength - 3)).trimEnd()}...`;
+}
+
+function getLaunchFailureLinkLabel(url: string): string {
+  try {
+    const parsed = new URL(url);
+    if (parsed.hostname === 'openrouter.ai' && parsed.pathname === '/settings/credits') {
+      return 'OpenRouter credits';
+    }
+  } catch {
+    return url;
+  }
+  return url;
+}
+
+export const MemberCard = memo(function MemberCard({
   member,
   memberColor,
   runtimeSummary,
@@ -119,7 +148,7 @@ export const MemberCard = ({
   onAssignTask,
   onRestartMember,
   onSkipMemberForLaunch,
-}: MemberCardProps): React.JSX.Element => {
+}: MemberCardProps): React.JSX.Element {
   // NOTE: lead context display disabled — usage formula is inaccurate
   // const teamName = useStore((s) => s.selectedTeamName);
   // const leadContext = useStore((s) =>
@@ -140,6 +169,8 @@ export const MemberCard = ({
     spawnLaunchState,
     spawnLivenessSource,
     spawnRuntimeAlive,
+    spawnBootstrapConfirmed: spawnEntry?.bootstrapConfirmed,
+    spawnBootstrapStalled: spawnEntry?.bootstrapStalled,
     runtimeEntry,
     runtimeAdvisory: member.runtimeAdvisory,
     isLaunchSettling,
@@ -156,6 +187,8 @@ export const MemberCard = ({
   const launchVisualState = launchPresentation.launchVisualState;
   const launchStatusLabel = launchPresentation.launchStatusLabel;
   const displayPresenceLabel =
+    launchVisualState === 'queued' ||
+    launchVisualState === 'bootstrap_stalled' ||
     launchVisualState === 'runtime_pending' ||
     launchVisualState === 'permission_pending' ||
     launchVisualState === 'shell_only' ||
@@ -200,6 +233,7 @@ export const MemberCard = ({
     !runtimeAdvisoryLabel &&
     (presenceLabel === 'starting' ||
       presenceLabel === 'connecting' ||
+      launchVisualState === 'queued' ||
       launchVisualState === 'runtime_pending' ||
       launchVisualState === 'shell_only' ||
       launchVisualState === 'runtime_candidate' ||
@@ -240,6 +274,17 @@ export const MemberCard = ({
     spawnEntry?.skippedForLaunch === true;
   const showFailedLaunchBadge = !isRemoved && isFailedLaunch;
   const showSkippedLaunchBadge = !isRemoved && isSkippedLaunch;
+  const rawLaunchFailureReason =
+    spawnError ??
+    spawnEntry?.hardFailureReason ??
+    spawnEntry?.runtimeDiagnostic ??
+    spawnEntry?.error;
+  const launchFailureReason = showFailedLaunchBadge
+    ? normalizeLaunchFailureReason(rawLaunchFailureReason)
+    : null;
+  const displayedLaunchFailureReason = launchFailureReason
+    ? truncateLaunchFailureReason(launchFailureReason)
+    : null;
   const hasLiveLaunchControls =
     isTeamAlive === true || isTeamProvisioning === true || isLaunchSettling === true;
   const hasRestartMemberControl =
@@ -447,6 +492,21 @@ export const MemberCard = ({
                 ) : null}
               </div>
             ) : null}
+            {displayedLaunchFailureReason ? (
+              <div
+                data-testid="member-launch-failure-reason"
+                className="mt-1 min-w-0 text-[10px] font-medium leading-snug text-red-300/90"
+                title={rawLaunchFailureReason}
+              >
+                <span className="line-clamp-2 break-words">
+                  {renderLinkifiedText(displayedLaunchFailureReason, {
+                    linkClassName: 'underline underline-offset-2 hover:text-red-200',
+                    stopPropagation: true,
+                    getLinkLabel: getLaunchFailureLinkLabel,
+                  })}
+                </span>
+              </div>
+            ) : null}
           </div>
           {showLaunchBadge ? (
             <span
@@ -707,4 +767,4 @@ export const MemberCard = ({
       </div>
     </div>
   );
-};
+});
diff --git a/src/renderer/components/team/members/MemberDetailDialog.tsx b/src/renderer/components/team/members/MemberDetailDialog.tsx
index 8ab479ef..92458c37 100644
--- a/src/renderer/components/team/members/MemberDetailDialog.tsx
+++ b/src/renderer/components/team/members/MemberDetailDialog.tsx
@@ -50,6 +50,8 @@ import type {
 
 const OPENCODE_NO_RUNTIME_EVIDENCE_MESSAGE =
   'No OpenCode runtime session was recorded. Relaunch this teammate to start a fresh OpenCode session.';
+const OPENCODE_BOOTSTRAP_STALLED_MESSAGE =
+  'OpenCode process is alive, but bootstrap did not confirm. Relaunch this teammate to start a fresh OpenCode session.';
 
 function hasOpenCodeRuntimeEvidence(runtimeEntry: TeamAgentRuntimeEntry | undefined): boolean {
   const hasPid =
@@ -202,14 +204,31 @@ export const MemberDetailDialog = ({
   const launchErrorMessage = launchDiagnosticsPayload
     ? getMemberLaunchDiagnosticsErrorMessage(launchDiagnosticsPayload)
     : undefined;
+  const openCodeBootstrapStalled =
+    member?.providerId === 'opencode' && spawnEntry?.bootstrapStalled === true;
   const openCodeNoRuntimeEvidence = member
     ? isOpenCodeNoRuntimeEvidenceFailure(member, spawnEntry, runtimeEntry)
     : false;
   const effectiveLaunchErrorMessage = openCodeNoRuntimeEvidence
     ? OPENCODE_NO_RUNTIME_EVIDENCE_MESSAGE
     : launchErrorMessage;
-  const restartButtonLabel =
-    openCodeNoRuntimeEvidence || openCodeRelaunchActionable ? 'Relaunch OpenCode' : 'Restart';
+  const effectiveLaunchInfoMessage = openCodeBootstrapStalled
+    ? OPENCODE_BOOTSTRAP_STALLED_MESSAGE
+    : undefined;
+  const isOpenCodeMember = member?.providerId === 'opencode';
+  const restartButtonLabel = isOpenCodeMember ? 'Relaunch OpenCode' : 'Restart';
+  const hasLiveRestartContext = isTeamAlive === true || isTeamProvisioning === true;
+  const canControlledOpenCodeRelaunch =
+    member == null
+      ? false
+      : isOpenCodeMember && !member.removedAt && !isLeadMember(member) && hasLiveRestartContext;
+  const canRestartFromDialog =
+    member == null
+      ? false
+      : Boolean(onRestartMember) &&
+        !isLeadMember(member) &&
+        hasLiveRestartContext &&
+        (runtimeEntry?.restartable !== false || canControlledOpenCodeRelaunch);
 
   useEffect(() => {
     if (!open || !member) {
@@ -245,6 +264,8 @@ export const MemberDetailDialog = ({
               spawnLaunchState={spawnEntry?.launchState}
               spawnLivenessSource={spawnEntry?.livenessSource}
               spawnRuntimeAlive={spawnEntry?.runtimeAlive}
+              spawnBootstrapConfirmed={spawnEntry?.bootstrapConfirmed}
+              spawnBootstrapStalled={spawnEntry?.bootstrapStalled}
               runtimeEntry={runtimeEntry}
               isLaunchSettling={isLaunchSettling}
               onUpdateRole={
@@ -351,6 +372,12 @@ export const MemberDetailDialog = ({
                 />
               ) : null}
             </div>
+          ) : effectiveLaunchInfoMessage ? (
+            <div className="mr-auto flex min-w-0 items-center gap-2 text-xs text-amber-300">
+              <span className="min-w-0 truncate" title={effectiveLaunchInfoMessage}>
+                {effectiveLaunchInfoMessage}
+              </span>
+            </div>
           ) : runtimeEntry?.pid ? (
             <div className="mr-auto text-xs text-[var(--color-text-muted)]">
               PID {runtimeEntry.pid}
@@ -365,37 +392,35 @@ export const MemberDetailDialog = ({
             </span>
           ) : (
             <>
-              {onRestartMember &&
-                !isLeadMember(member) &&
-                (isTeamAlive || isTeamProvisioning) &&
-                runtimeEntry?.restartable !== false && (
-                  <Button
-                    variant="outline"
-                    size="sm"
-                    className="gap-1.5"
-                    disabled={restarting || restartInFlight}
-                    onClick={async () => {
-                      setRestartError(null);
-                      setRestarting(true);
-                      try {
-                        await onRestartMember(member.name);
-                      } catch (error) {
-                        setRestartError(
-                          error instanceof Error ? error.message : 'Failed to restart member'
-                        );
-                      } finally {
-                        setRestarting(false);
-                      }
-                    }}
-                  >
-                    {restarting ? (
-                      <Loader2 size={14} className="animate-spin" />
-                    ) : (
-                      <RotateCcw size={14} />
-                    )}
-                    {restartButtonLabel}
-                  </Button>
-                )}
+              {canRestartFromDialog && (
+                <Button
+                  variant="outline"
+                  size="sm"
+                  className="gap-1.5"
+                  disabled={restarting || restartInFlight}
+                  onClick={async () => {
+                    setRestartError(null);
+                    setRestarting(true);
+                    try {
+                      if (!onRestartMember) return;
+                      await onRestartMember(member.name);
+                    } catch (error) {
+                      setRestartError(
+                        error instanceof Error ? error.message : 'Failed to restart member'
+                      );
+                    } finally {
+                      setRestarting(false);
+                    }
+                  }}
+                >
+                  {restarting ? (
+                    <Loader2 size={14} className="animate-spin" />
+                  ) : (
+                    <RotateCcw size={14} />
+                  )}
+                  {restartButtonLabel}
+                </Button>
+              )}
               <Button variant="outline" size="sm" className="gap-1.5" onClick={onSendMessage}>
                 <MessageSquare size={14} />
                 Send Message
diff --git a/src/renderer/components/team/members/MemberDetailHeader.tsx b/src/renderer/components/team/members/MemberDetailHeader.tsx
index 7d2563b4..cf5569ae 100644
--- a/src/renderer/components/team/members/MemberDetailHeader.tsx
+++ b/src/renderer/components/team/members/MemberDetailHeader.tsx
@@ -38,6 +38,8 @@ interface MemberDetailHeaderProps {
   spawnLaunchState?: MemberLaunchState;
   spawnLivenessSource?: MemberSpawnLivenessSource;
   spawnRuntimeAlive?: boolean;
+  spawnBootstrapConfirmed?: boolean;
+  spawnBootstrapStalled?: boolean;
   isLaunchSettling?: boolean;
   onUpdateRole?: (newRole: string | undefined) => Promise<void> | void;
   updatingRole?: boolean;
@@ -54,6 +56,8 @@ export const MemberDetailHeader = ({
   spawnLaunchState,
   spawnLivenessSource,
   spawnRuntimeAlive,
+  spawnBootstrapConfirmed,
+  spawnBootstrapStalled,
   isLaunchSettling,
   onUpdateRole,
   updatingRole,
@@ -79,6 +83,8 @@ export const MemberDetailHeader = ({
     spawnLaunchState,
     spawnLivenessSource,
     spawnRuntimeAlive,
+    spawnBootstrapConfirmed,
+    spawnBootstrapStalled,
     runtimeEntry,
     runtimeAdvisory: member.runtimeAdvisory,
     isLaunchSettling,
@@ -96,7 +102,8 @@ export const MemberDetailHeader = ({
   const badgeLabel =
     runtimeAdvisoryTone === 'error' && runtimeAdvisoryLabel
       ? runtimeAdvisoryLabel
-      : launchVisualState === 'runtime_pending' ||
+      : launchVisualState === 'bootstrap_stalled' ||
+          launchVisualState === 'runtime_pending' ||
           launchVisualState === 'permission_pending' ||
           launchVisualState === 'shell_only' ||
           launchVisualState === 'runtime_candidate' ||
diff --git a/src/renderer/components/team/members/MemberHoverCard.tsx b/src/renderer/components/team/members/MemberHoverCard.tsx
index 92a48c25..e87c81a8 100644
--- a/src/renderer/components/team/members/MemberHoverCard.tsx
+++ b/src/renderer/components/team/members/MemberHoverCard.tsx
@@ -1,3 +1,5 @@
+import { memo } from 'react';
+
 import { Badge } from '@renderer/components/ui/badge';
 import { HoverCard, HoverCardContent, HoverCardTrigger } from '@renderer/components/ui/hover-card';
 import {
@@ -57,13 +59,13 @@ interface MemberHoverCardProps {
  * Reads member data from the team snapshot + resolved member selectors.
  * Falls back to a simple wrapper when member data is unavailable.
  */
-export const MemberHoverCard = ({
+export const MemberHoverCard = memo(function MemberHoverCard({
   name,
   color,
   teamName,
   onOpenTask,
   children,
-}: MemberHoverCardProps): React.JSX.Element => {
+}: MemberHoverCardProps): React.JSX.Element {
   const { isLight } = useTheme();
   const selectedTeamName = useStore((s) => s.selectedTeamName);
   const effectiveTeamName = teamName ?? selectedTeamName;
@@ -130,6 +132,8 @@ export const MemberHoverCard = ({
     spawnLaunchState: spawnEntry?.launchState,
     spawnLivenessSource: spawnEntry?.livenessSource,
     spawnRuntimeAlive: spawnEntry?.runtimeAlive,
+    spawnBootstrapConfirmed: spawnEntry?.bootstrapConfirmed,
+    spawnBootstrapStalled: spawnEntry?.bootstrapStalled,
     runtimeEntry,
     runtimeAdvisory: member.runtimeAdvisory,
     isLaunchSettling,
@@ -147,7 +151,8 @@ export const MemberHoverCard = ({
   const badgeLabel =
     runtimeAdvisoryTone === 'error' && runtimeAdvisoryLabel
       ? runtimeAdvisoryLabel
-      : launchVisualState === 'runtime_pending' ||
+      : launchVisualState === 'bootstrap_stalled' ||
+          launchVisualState === 'runtime_pending' ||
           launchVisualState === 'permission_pending' ||
           launchVisualState === 'shell_only' ||
           launchVisualState === 'runtime_candidate' ||
@@ -287,4 +292,4 @@ export const MemberHoverCard = ({
       </HoverCardContent>
     </HoverCard>
   );
-};
+});
diff --git a/src/renderer/components/team/members/MemberList.tsx b/src/renderer/components/team/members/MemberList.tsx
index 8b3f6140..95fc1934 100644
--- a/src/renderer/components/team/members/MemberList.tsx
+++ b/src/renderer/components/team/members/MemberList.tsx
@@ -10,6 +10,9 @@ import type { TeamLaunchParams } from '@renderer/store/slices/teamSlice';
 import type { TaskStatusCounts } from '@renderer/utils/pathNormalize';
 import type {
   LeadActivityState,
+  MemberLaunchState,
+  MemberSpawnLivenessSource,
+  MemberSpawnStatus,
   MemberSpawnStatusEntry,
   ResolvedTeamMember,
   TeamAgentRuntimeEntry,
@@ -255,6 +258,115 @@ function areMemberListPropsEqual(
   );
 }
 
+// ---------------------------------------------------------------------------
+// Per-member row wrapper — creates stable callbacks so MemberCard memo holds
+// ---------------------------------------------------------------------------
+
+interface MemberCardRowProps {
+  member: ResolvedTeamMember;
+  isRemoved: boolean;
+  memberColor: string;
+  currentTask: TeamTaskWithKanban | null;
+  reviewTask: TeamTaskWithKanban | null;
+  awaitingReply: boolean;
+  taskCounts?: TaskStatusCounts | null;
+  runtimeSummary?: string;
+  runtimeEntry?: TeamAgentRuntimeEntry;
+  runtimeRunId?: string | null;
+  spawnStatus?: MemberSpawnStatus;
+  spawnEntry?: MemberSpawnStatusEntry;
+  spawnError?: string;
+  spawnLivenessSource?: MemberSpawnLivenessSource;
+  spawnLaunchState?: MemberLaunchState;
+  spawnRuntimeAlive?: boolean;
+  isTeamAlive?: boolean;
+  isTeamProvisioning?: boolean;
+  leadActivity?: LeadActivityState;
+  isLaunchSettling?: boolean;
+  onOpenTask?: (taskId: string) => void;
+  onMemberClick?: (member: ResolvedTeamMember) => void;
+  onSendMessage?: (member: ResolvedTeamMember) => void;
+  onAssignTask?: (member: ResolvedTeamMember) => void;
+  onRestartMember?: (memberName: string) => Promise<void> | void;
+  onSkipMemberForLaunch?: (memberName: string) => Promise<void> | void;
+}
+
+const MemberCardRow = memo(function MemberCardRow({
+  member,
+  isRemoved,
+  memberColor,
+  currentTask,
+  reviewTask,
+  awaitingReply,
+  taskCounts,
+  runtimeSummary,
+  runtimeEntry,
+  runtimeRunId,
+  spawnStatus,
+  spawnEntry,
+  spawnError,
+  spawnLivenessSource,
+  spawnLaunchState,
+  spawnRuntimeAlive,
+  isTeamAlive,
+  isTeamProvisioning,
+  leadActivity,
+  isLaunchSettling,
+  onOpenTask,
+  onMemberClick,
+  onSendMessage,
+  onAssignTask,
+  onRestartMember,
+  onSkipMemberForLaunch,
+}: MemberCardRowProps): React.JSX.Element {
+  const currentTaskId = currentTask?.id;
+  const reviewTaskId = reviewTask?.id;
+
+  const handleOpenTask = useCallback(() => {
+    if (currentTaskId) onOpenTask?.(currentTaskId);
+  }, [onOpenTask, currentTaskId]);
+
+  const handleOpenReviewTask = useCallback(() => {
+    if (reviewTaskId) onOpenTask?.(reviewTaskId);
+  }, [onOpenTask, reviewTaskId]);
+
+  const handleClick = useCallback(() => onMemberClick?.(member), [onMemberClick, member]);
+  const handleSendMessage = useCallback(() => onSendMessage?.(member), [onSendMessage, member]);
+  const handleAssignTask = useCallback(() => onAssignTask?.(member), [onAssignTask, member]);
+
+  return (
+    <MemberCard
+      member={member}
+      memberColor={memberColor}
+      taskCounts={taskCounts}
+      isTeamAlive={isTeamAlive}
+      isTeamProvisioning={isTeamProvisioning}
+      leadActivity={isLeadMember(member) ? leadActivity : undefined}
+      currentTask={currentTask}
+      reviewTask={reviewTask}
+      isAwaitingReply={awaitingReply}
+      isRemoved={isRemoved}
+      runtimeSummary={runtimeSummary}
+      runtimeEntry={runtimeEntry}
+      runtimeRunId={runtimeRunId}
+      spawnStatus={spawnStatus}
+      spawnEntry={spawnEntry}
+      spawnError={spawnError}
+      spawnLivenessSource={spawnLivenessSource}
+      spawnLaunchState={spawnLaunchState}
+      spawnRuntimeAlive={spawnRuntimeAlive}
+      isLaunchSettling={isLaunchSettling}
+      onOpenTask={currentTask ? handleOpenTask : undefined}
+      onOpenReviewTask={reviewTask ? handleOpenReviewTask : undefined}
+      onClick={handleClick}
+      onSendMessage={handleSendMessage}
+      onAssignTask={handleAssignTask}
+      onRestartMember={onRestartMember}
+      onSkipMemberForLaunch={onSkipMemberForLaunch}
+    />
+  );
+});
+
 export const MemberList = memo(function MemberList({
   members,
   memberTaskCounts,
@@ -308,6 +420,17 @@ export const MemberList = memo(function MemberList({
   );
   const removedMembers = useMemo(() => members.filter((m) => m.removedAt), [members]);
   const colorMap = useMemo(() => buildMemberColorMap(members), [members]);
+  // Pre-compute reviewer->task map to avoid O(n*n) scan per member.
+  const reviewTaskByMember = useMemo(() => {
+    const result = new Map<string, TeamTaskWithKanban>();
+    if (!taskMap) return result;
+    for (const task of taskMap.values()) {
+      if (task.reviewer && (task.reviewState === 'review' || task.kanbanColumn === 'review')) {
+        result.set(task.reviewer, task);
+      }
+    }
+    return result;
+  }, [taskMap]);
 
   const buildRuntimeSummary = useCallback(
     (
@@ -328,75 +451,89 @@ export const MemberList = memo(function MemberList({
     );
   }
 
-  // Pre-compute reviewer→task map to avoid O(n×m) scan per member
-  const reviewTaskByMember = useMemo(() => {
-    const result = new Map<string, TeamTaskWithKanban>();
-    if (!taskMap) return result;
-    for (const task of taskMap.values()) {
-      if (task.reviewer && (task.reviewState === 'review' || task.kanbanColumn === 'review')) {
-        result.set(task.reviewer, task);
-      }
-    }
-    return result;
-  }, [taskMap]);
-
-  const renderCard = (member: ResolvedTeamMember, isRemoved: boolean): React.JSX.Element => {
-    const currentTask =
-      member.currentTaskId && taskMap ? (taskMap.get(member.currentTaskId) ?? null) : null;
-    const reviewCandidate = reviewTaskByMember.get(member.name) ?? null;
-    const reviewTask =
-      reviewCandidate && reviewCandidate.id !== member.currentTaskId ? reviewCandidate : null;
-    const awaitingReply = isTeamAlive !== false && Boolean(pendingRepliesByMember?.[member.name]);
-    const spawnEntry = memberSpawnStatuses?.get(member.name);
-    const runtimeEntry = memberRuntimeEntries?.get(member.name);
-    return (
-      <MemberCard
-        key={member.name}
-        member={member}
-        memberColor={colorMap.get(member.name) ?? 'blue'}
-        taskCounts={memberTaskCounts?.get(member.name.toLowerCase())}
-        isTeamAlive={isTeamAlive}
-        isTeamProvisioning={isTeamProvisioning}
-        leadActivity={isLeadMember(member) ? leadActivity : undefined}
-        currentTask={isRemoved ? null : currentTask}
-        reviewTask={isRemoved ? null : reviewTask}
-        isAwaitingReply={isRemoved ? false : awaitingReply}
-        isRemoved={isRemoved}
-        runtimeSummary={buildRuntimeSummary(
-          member,
-          isRemoved ? undefined : spawnEntry,
-          isRemoved ? undefined : runtimeEntry
-        )}
-        runtimeEntry={isRemoved ? undefined : runtimeEntry}
-        runtimeRunId={isRemoved ? undefined : runtimeRunId}
-        spawnStatus={isRemoved ? undefined : spawnEntry?.status}
-        spawnEntry={isRemoved ? undefined : spawnEntry}
-        spawnError={isRemoved ? undefined : (spawnEntry?.error ?? spawnEntry?.hardFailureReason)}
-        spawnLivenessSource={isRemoved ? undefined : spawnEntry?.livenessSource}
-        spawnLaunchState={isRemoved ? undefined : spawnEntry?.launchState}
-        spawnRuntimeAlive={isRemoved ? undefined : spawnEntry?.runtimeAlive}
-        isLaunchSettling={isRemoved ? false : isLaunchSettling}
-        onOpenTask={!isRemoved && currentTask ? () => onOpenTask?.(currentTask.id) : undefined}
-        onOpenReviewTask={!isRemoved && reviewTask ? () => onOpenTask?.(reviewTask.id) : undefined}
-        onClick={() => onMemberClick?.(member)}
-        onSendMessage={() => onSendMessage?.(member)}
-        onAssignTask={() => onAssignTask?.(member)}
-        onRestartMember={isRemoved ? undefined : onRestartMember}
-        onSkipMemberForLaunch={isRemoved ? undefined : onSkipMemberForLaunch}
-      />
-    );
-  };
-
   return (
     <div ref={containerRef} className="flex flex-col gap-1">
-      <div className={gridClass}>{activeMembers.map((member) => renderCard(member, false))}</div>
+      <div className={gridClass}>
+        {activeMembers.map((member) => {
+          const currentTask =
+            member.currentTaskId && taskMap ? (taskMap.get(member.currentTaskId) ?? null) : null;
+          const reviewCandidate = reviewTaskByMember.get(member.name) ?? null;
+          const reviewTask =
+            reviewCandidate && reviewCandidate.id !== member.currentTaskId ? reviewCandidate : null;
+          const spawnEntry = memberSpawnStatuses?.get(member.name);
+          const runtimeEntry = memberRuntimeEntries?.get(member.name);
+          return (
+            <MemberCardRow
+              key={member.name}
+              member={member}
+              isRemoved={false}
+              memberColor={colorMap.get(member.name) ?? 'blue'}
+              currentTask={currentTask}
+              reviewTask={reviewTask}
+              awaitingReply={
+                isTeamAlive !== false && Boolean(pendingRepliesByMember?.[member.name])
+              }
+              taskCounts={memberTaskCounts?.get(member.name.toLowerCase())}
+              runtimeSummary={buildRuntimeSummary(member, spawnEntry, runtimeEntry)}
+              runtimeEntry={runtimeEntry}
+              runtimeRunId={runtimeRunId}
+              spawnStatus={spawnEntry?.status}
+              spawnEntry={spawnEntry}
+              spawnError={spawnEntry?.error ?? spawnEntry?.hardFailureReason}
+              spawnLivenessSource={spawnEntry?.livenessSource}
+              spawnLaunchState={spawnEntry?.launchState}
+              spawnRuntimeAlive={spawnEntry?.runtimeAlive}
+              isTeamAlive={isTeamAlive}
+              isTeamProvisioning={isTeamProvisioning}
+              leadActivity={leadActivity}
+              isLaunchSettling={isLaunchSettling}
+              onOpenTask={onOpenTask}
+              onMemberClick={onMemberClick}
+              onSendMessage={onSendMessage}
+              onAssignTask={onAssignTask}
+              onRestartMember={onRestartMember}
+              onSkipMemberForLaunch={onSkipMemberForLaunch}
+            />
+          );
+        })}
+      </div>
       {removedMembers.length > 0 && (
         <>
           <div className="mt-2 text-[10px] text-[var(--color-text-muted)]">
             Removed ({removedMembers.length})
           </div>
           <div className={gridClass}>
-            {removedMembers.map((member) => renderCard(member, true))}
+            {removedMembers.map((member) => (
+              <MemberCardRow
+                key={member.name}
+                member={member}
+                isRemoved={true}
+                memberColor={colorMap.get(member.name) ?? 'blue'}
+                currentTask={null}
+                reviewTask={null}
+                awaitingReply={false}
+                taskCounts={memberTaskCounts?.get(member.name.toLowerCase())}
+                runtimeSummary={buildRuntimeSummary(member, undefined, undefined)}
+                runtimeEntry={undefined}
+                runtimeRunId={undefined}
+                spawnStatus={undefined}
+                spawnEntry={undefined}
+                spawnError={undefined}
+                spawnLivenessSource={undefined}
+                spawnLaunchState={undefined}
+                spawnRuntimeAlive={undefined}
+                isTeamAlive={isTeamAlive}
+                isTeamProvisioning={isTeamProvisioning}
+                leadActivity={leadActivity}
+                isLaunchSettling={false}
+                onOpenTask={onOpenTask}
+                onMemberClick={onMemberClick}
+                onSendMessage={onSendMessage}
+                onAssignTask={onAssignTask}
+                onRestartMember={undefined}
+                onSkipMemberForLaunch={undefined}
+              />
+            ))}
           </div>
         </>
       )}
diff --git a/src/renderer/components/team/members/MemberPresenceDot.tsx b/src/renderer/components/team/members/MemberPresenceDot.tsx
index aab1f38b..dde4e132 100644
--- a/src/renderer/components/team/members/MemberPresenceDot.tsx
+++ b/src/renderer/components/team/members/MemberPresenceDot.tsx
@@ -1,3 +1,5 @@
+import { memo } from 'react';
+
 import { useSyncedAnimationStyle } from '@renderer/hooks/useSyncedAnimationStyle';
 import { cn } from '@renderer/lib/utils';
 
@@ -8,21 +10,22 @@ interface MemberPresenceDotProps {
   label: string;
 }
 
-export const MemberPresenceDot = ({
-  className,
-  label,
-}: MemberPresenceDotProps): React.JSX.Element => {
-  const shouldSyncPulse = className?.includes('animate-pulse') === true;
-  const syncedPulseStyle = useSyncedAnimationStyle(shouldSyncPulse, PULSE_DURATION_MS);
+export const MemberPresenceDot = memo(
+  ({ className, label }: MemberPresenceDotProps): React.JSX.Element => {
+    const shouldSyncPulse = className?.includes('animate-pulse') === true;
+    const syncedPulseStyle = useSyncedAnimationStyle(shouldSyncPulse, PULSE_DURATION_MS);
 
-  return (
-    <span
-      className={cn(
-        'absolute -bottom-0.5 -right-0.5 rounded-full border-2 border-[var(--color-surface)]',
-        className
-      )}
-      style={syncedPulseStyle}
-      aria-label={label}
-    />
-  );
-};
+    return (
+      <span
+        className={cn(
+          'absolute -bottom-0.5 -right-0.5 rounded-full border-2 border-[var(--color-surface)]',
+          className
+        )}
+        style={syncedPulseStyle}
+        aria-label={label}
+      />
+    );
+  }
+);
+
+MemberPresenceDot.displayName = 'MemberPresenceDot';
diff --git a/src/renderer/components/team/messages/ActionModeSelector.tsx b/src/renderer/components/team/messages/ActionModeSelector.tsx
index ef64e86d..d5184e12 100644
--- a/src/renderer/components/team/messages/ActionModeSelector.tsx
+++ b/src/renderer/components/team/messages/ActionModeSelector.tsx
@@ -14,6 +14,7 @@ interface ActionModeSelectorProps {
   value: ActionMode;
   onChange: (mode: ActionMode) => void;
   showDelegate: boolean;
+  disabled?: boolean;
 }
 
 const MODE_CONFIG: {
@@ -50,6 +51,7 @@ export const ActionModeSelector = ({
   value,
   onChange,
   showDelegate,
+  disabled = false,
 }: ActionModeSelectorProps): React.JSX.Element => {
   const modes = showDelegate ? MODE_CONFIG : MODE_CONFIG.filter((m) => m.mode !== 'delegate');
 
@@ -76,10 +78,12 @@ export const ActionModeSelector = ({
                     'px-2 py-0.5 text-[10px] font-medium transition-colors',
                     isFirst && 'rounded-l-full',
                     isLast && 'rounded-r-full',
+                    disabled && 'cursor-not-allowed opacity-50',
                     isActive
                       ? cfg.activeClass
                       : 'text-[var(--color-text-muted)] hover:text-[var(--color-text-secondary)]'
                   )}
+                  disabled={disabled}
                   onClick={() => onChange(cfg.mode)}
                 >
                   {cfg.label}
diff --git a/src/renderer/components/team/messages/MessageComposer.pendingSend.test.tsx b/src/renderer/components/team/messages/MessageComposer.pendingSend.test.tsx
new file mode 100644
index 00000000..8e4cbb48
--- /dev/null
+++ b/src/renderer/components/team/messages/MessageComposer.pendingSend.test.tsx
@@ -0,0 +1,370 @@
+/* eslint-disable @typescript-eslint/naming-convention -- vi.mock component exports must stay PascalCase. */
+import React, { act } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import type { ResolvedTeamMember } from '@shared/types';
+
+const draftHarness = vi.hoisted(() => {
+  const initialState = {
+    text: 'hello teammate',
+    chips: [] as unknown[],
+    attachments: [] as unknown[],
+    actionMode: 'do',
+    isSaved: true,
+    isLoaded: true,
+  };
+  const state = { ...initialState };
+  const methods = {
+    addChip: vi.fn(),
+    addFiles: vi.fn().mockResolvedValue(undefined),
+    clearAttachmentError: vi.fn(),
+    clearAttachments: vi.fn(),
+    clearDraft: vi.fn(() => {
+      state.text = '';
+      state.chips = [];
+      state.attachments = [];
+    }),
+    finalizePendingSendClear: vi.fn(),
+    handleDrop: vi.fn(),
+    handlePaste: vi.fn(),
+    hideDraftForPendingSend: vi.fn((_content: { text: string }) => {
+      state.text = '';
+      state.chips = [];
+      state.attachments = [];
+    }),
+    removeAttachment: vi.fn(),
+    removeChip: vi.fn(),
+    restoreDraft: vi.fn((content: { text: string }) => {
+      state.text = content.text;
+    }),
+    setActionMode: vi.fn((mode: string) => {
+      state.actionMode = mode;
+    }),
+    setText: vi.fn((text: string) => {
+      state.text = text;
+    }),
+  };
+
+  return {
+    methods,
+    reset: () => {
+      Object.assign(state, initialState);
+      for (const method of Object.values(methods)) {
+        method.mockClear();
+      }
+    },
+    state,
+  };
+});
+
+vi.mock('@renderer/api', () => ({
+  api: {
+    teams: {
+      aliveList: vi.fn(() => new Promise<string[]>(() => undefined)),
+    },
+  },
+}));
+
+vi.mock('@renderer/components/team/attachments/AttachmentPreviewList', () => ({
+  AttachmentPreviewList: () => null,
+}));
+
+vi.mock('@renderer/components/team/attachments/DropZoneOverlay', () => ({
+  DropZoneOverlay: () => null,
+}));
+
+vi.mock('@renderer/components/team/MemberBadge', () => ({
+  MemberBadge: ({ name }: { name: string }) => React.createElement('span', null, name),
+}));
+
+vi.mock('@renderer/components/team/messages/ActionModeSelector', () => ({
+  ActionModeSelector: ({ disabled }: { disabled?: boolean }) =>
+    React.createElement('button', { disabled, type: 'button' }, 'Do'),
+}));
+
+vi.mock('@renderer/components/team/messages/OpenCodeDeliveryWarning', () => ({
+  OpenCodeDeliveryWarning: () => null,
+}));
+
+vi.mock('@renderer/components/ui/MentionableTextarea', () => {
+  const MockMentionableTextarea = React.forwardRef<
+    HTMLTextAreaElement,
+    {
+      value: string;
+      disabled?: boolean;
+      cornerAction?: React.ReactNode;
+      cornerActionLeft?: React.ReactNode;
+      footerRight?: React.ReactNode;
+    }
+  >(({ value, disabled, cornerAction, cornerActionLeft, footerRight }, ref) =>
+    React.createElement(
+      'div',
+      null,
+      React.createElement('textarea', {
+        'aria-label': 'Message',
+        disabled,
+        readOnly: true,
+        ref,
+        value,
+      }),
+      React.createElement('div', null, cornerActionLeft),
+      React.createElement('div', null, cornerAction),
+      React.createElement('div', null, footerRight)
+    )
+  );
+  MockMentionableTextarea.displayName = 'MockMentionableTextarea';
+  return { MentionableTextarea: MockMentionableTextarea };
+});
+
+vi.mock('@renderer/components/ui/popover', () => ({
+  Popover: ({ children }: { children: React.ReactNode }) =>
+    React.createElement(React.Fragment, null, children),
+  PopoverContent: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  PopoverTrigger: ({ children }: { children: React.ReactNode }) =>
+    React.createElement(React.Fragment, null, children),
+}));
+
+vi.mock('@renderer/components/ui/tooltip', () => ({
+  Tooltip: ({ children }: { children: React.ReactNode }) =>
+    React.createElement(React.Fragment, null, children),
+  TooltipContent: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('div', null, children),
+  TooltipTrigger: ({ children }: { children: React.ReactNode }) =>
+    React.createElement(React.Fragment, null, children),
+}));
+
+/* eslint-enable @typescript-eslint/naming-convention -- End PascalCase vi.mock component exports. */
+
+vi.mock('@renderer/hooks/useComposerDraft', () => ({
+  useComposerDraft: () => ({
+    text: draftHarness.state.text,
+    setText: draftHarness.methods.setText,
+    chips: draftHarness.state.chips,
+    addChip: draftHarness.methods.addChip,
+    removeChip: draftHarness.methods.removeChip,
+    attachments: draftHarness.state.attachments,
+    attachmentError: null,
+    canAddMore: true,
+    addFiles: draftHarness.methods.addFiles,
+    removeAttachment: draftHarness.methods.removeAttachment,
+    clearAttachments: draftHarness.methods.clearAttachments,
+    clearAttachmentError: draftHarness.methods.clearAttachmentError,
+    handlePaste: draftHarness.methods.handlePaste,
+    handleDrop: draftHarness.methods.handleDrop,
+    actionMode: draftHarness.state.actionMode,
+    setActionMode: draftHarness.methods.setActionMode,
+    isSaved: draftHarness.state.isSaved,
+    isLoaded: draftHarness.state.isLoaded,
+    clearDraft: draftHarness.methods.clearDraft,
+    hideDraftForPendingSend: draftHarness.methods.hideDraftForPendingSend,
+    finalizePendingSendClear: draftHarness.methods.finalizePendingSendClear,
+    restoreDraft: draftHarness.methods.restoreDraft,
+  }),
+}));
+
+vi.mock('@renderer/hooks/useTaskSuggestions', () => ({
+  useTaskSuggestions: () => ({ suggestions: [] }),
+}));
+
+vi.mock('@renderer/hooks/useTeamSuggestions', () => ({
+  useTeamSuggestions: () => ({ suggestions: [] }),
+}));
+
+vi.mock('@renderer/store', () => ({
+  useStore: (selector: (state: Record<string, unknown>) => unknown) =>
+    selector({
+      crossTeamTargets: [],
+      fetchCrossTeamTargets: vi.fn(),
+      fetchSkillsCatalog: vi.fn(),
+      selectedTeamData: null,
+      selectedTeamName: null,
+      skillsProjectCatalogByProjectPath: {},
+      skillsUserCatalog: [],
+    }),
+}));
+
+vi.mock('@renderer/store/slices/teamSlice', () => ({
+  isTeamProvisioningActive: () => false,
+}));
+
+import { MessageComposer } from './MessageComposer';
+
+const members: ResolvedTeamMember[] = [
+  {
+    agentType: 'developer',
+    currentTaskId: null,
+    lastActiveAt: null,
+    messageCount: 0,
+    name: 'alice',
+    role: 'Developer',
+    status: 'idle',
+    taskCount: 0,
+  },
+];
+
+function renderComposer(overrides: Partial<React.ComponentProps<typeof MessageComposer>> = {}): {
+  host: HTMLDivElement;
+  render: (next?: Partial<React.ComponentProps<typeof MessageComposer>>) => void;
+  root: ReturnType<typeof createRoot>;
+  onSend: ReturnType<typeof vi.fn>;
+} {
+  const host = document.createElement('div');
+  document.body.appendChild(host);
+  const root = createRoot(host);
+  const onSend = vi.fn();
+  const baseProps: React.ComponentProps<typeof MessageComposer> = {
+    teamName: 'team-alpha',
+    members,
+    isTeamAlive: true,
+    sending: false,
+    sendError: null,
+    sendWarning: null,
+    sendDebugDetails: null,
+    lastResult: null,
+    onSend,
+  };
+
+  const render = (next: Partial<React.ComponentProps<typeof MessageComposer>> = {}): void => {
+    act(() => {
+      root.render(React.createElement(MessageComposer, { ...baseProps, ...overrides, ...next }));
+    });
+  };
+  render();
+
+  return { host, render, root, onSend };
+}
+
+function getSendButton(host: HTMLElement): HTMLButtonElement {
+  const button = Array.from(host.querySelectorAll('button')).find(
+    (candidate) => candidate.textContent?.trim() === 'Send'
+  );
+  if (!(button instanceof HTMLButtonElement)) {
+    throw new Error('Send button not found');
+  }
+  return button;
+}
+
+describe('MessageComposer pending send lifecycle', () => {
+  beforeEach(() => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    draftHarness.reset();
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = '';
+    vi.clearAllMocks();
+    vi.unstubAllGlobals();
+  });
+
+  it('hides the submitted draft when sending starts and finalizes it on success', () => {
+    const { host, onSend, render, root } = renderComposer();
+
+    act(() => {
+      getSendButton(host).click();
+    });
+    expect(onSend).toHaveBeenCalledWith(
+      'alice',
+      'hello teammate',
+      'hello teammate',
+      undefined,
+      'do',
+      []
+    );
+    expect(draftHarness.methods.hideDraftForPendingSend).not.toHaveBeenCalled();
+
+    render({ sending: true });
+
+    expect(draftHarness.methods.hideDraftForPendingSend).toHaveBeenCalledWith(
+      expect.objectContaining({
+        text: 'hello teammate',
+        actionMode: 'do',
+        pendingSendId: expect.any(String) as string,
+      })
+    );
+    expect(draftHarness.state.text).toBe('');
+
+    render({ sending: false });
+
+    expect(draftHarness.methods.finalizePendingSendClear).toHaveBeenCalledWith(
+      undefined,
+      expect.objectContaining({
+        text: 'hello teammate',
+        actionMode: 'do',
+        pendingSendId: expect.any(String) as string,
+      })
+    );
+    expect(draftHarness.methods.restoreDraft).not.toHaveBeenCalled();
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('restores the submitted draft when sending fails after the optimistic hide', () => {
+    const { host, render, root } = renderComposer();
+
+    act(() => {
+      getSendButton(host).click();
+    });
+    render({ sending: true });
+    render({ sending: false, sendError: 'runtime failed' });
+
+    expect(draftHarness.methods.restoreDraft).toHaveBeenCalledWith(
+      expect.objectContaining({ text: 'hello teammate' })
+    );
+    expect(draftHarness.state.text).toBe('hello teammate');
+    expect(draftHarness.methods.finalizePendingSendClear).not.toHaveBeenCalled();
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('does not consume a new pending send before a sending transition is observed', () => {
+    const { host, render, root } = renderComposer({
+      lastResult: { deliveredToInbox: true, messageId: 'previous-message' },
+    });
+
+    act(() => {
+      getSendButton(host).click();
+    });
+    render({
+      lastResult: { deliveredToInbox: true, messageId: 'previous-message' },
+      sending: false,
+    });
+
+    expect(draftHarness.methods.hideDraftForPendingSend).not.toHaveBeenCalled();
+    expect(draftHarness.methods.finalizePendingSendClear).not.toHaveBeenCalled();
+    expect(draftHarness.methods.clearDraft).not.toHaveBeenCalled();
+    expect(draftHarness.state.text).toBe('hello teammate');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('clears the draft when a fast send completes before a sending render is observed', () => {
+    const previousResult = { deliveredToInbox: true, messageId: 'previous-message' };
+    const { host, render, root } = renderComposer({ lastResult: previousResult });
+
+    act(() => {
+      getSendButton(host).click();
+    });
+    render({
+      lastResult: { deliveredToInbox: true, messageId: 'new-message' },
+      sending: false,
+    });
+
+    expect(draftHarness.methods.clearDraft).toHaveBeenCalledOnce();
+    expect(draftHarness.methods.hideDraftForPendingSend).not.toHaveBeenCalled();
+    expect(draftHarness.methods.finalizePendingSendClear).not.toHaveBeenCalled();
+    expect(draftHarness.state.text).toBe('');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+});
diff --git a/src/renderer/components/team/messages/MessageComposer.tsx b/src/renderer/components/team/messages/MessageComposer.tsx
index 24df1ab2..a66b3e56 100644
--- a/src/renderer/components/team/messages/MessageComposer.tsx
+++ b/src/renderer/components/team/messages/MessageComposer.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 
 import { api } from '@renderer/api';
 import { AttachmentPreviewList } from '@renderer/components/team/attachments/AttachmentPreviewList';
@@ -37,6 +37,7 @@ import { AlertCircle, Check, ChevronDown, Mic, Paperclip, Search, Send } from 'l
 import { useShallow } from 'zustand/react/shallow';
 
 import type { ActionMode } from '@renderer/components/team/messages/ActionModeSelector';
+import type { ComposerDraftContent } from '@renderer/hooks/useComposerDraft';
 import type { MentionSuggestion } from '@renderer/types/mention';
 import type { OpenCodeRuntimeDeliveryDebugDetails } from '@renderer/utils/openCodeRuntimeDeliveryDiagnostics';
 import type {
@@ -75,6 +76,24 @@ interface MessageComposerProps {
   ) => void;
 }
 
+interface PendingSendState {
+  teamName: string;
+  snapshot: ComposerDraftContent;
+  previousDebugDetails: OpenCodeRuntimeDeliveryDebugDetails | null | undefined;
+  previousLastResult: SendMessageResult | null | undefined;
+  observedSending: boolean;
+  optimisticallyCleared: boolean;
+}
+
+let pendingSendIdCounter = 0;
+
+function createPendingSendId(): string {
+  const randomId = globalThis.crypto?.randomUUID?.();
+  if (randomId) return randomId;
+  pendingSendIdCounter += 1;
+  return `${Date.now()}-${pendingSendIdCounter}`;
+}
+
 export const MessageComposer = ({
   teamName,
   members,
@@ -310,14 +329,18 @@ export const MessageComposer = ({
   //   isLeadAgentRecipient ? s.leadContextByTeam[teamName] : undefined
   // );
   const supportsAttachments = isLeadRecipient && !isCrossTeam && !!isTeamAlive;
-  const canAttach = supportsAttachments && draft.canAddMore;
+  const canAttach = supportsAttachments && draft.canAddMore && !sending;
   const attachmentRestrictionReason = !supportsAttachments
     ? isCrossTeam
       ? 'File attachments are not supported for cross-team messages'
       : !isLeadRecipient
         ? 'Files can only be sent to the team lead'
         : 'Team must be online to attach files'
-    : undefined;
+    : sending
+      ? 'Wait for current message to finish sending before adding files'
+      : !draft.canAddMore
+        ? 'Maximum attachments reached'
+        : undefined;
   const attachmentsBlocked = draft.attachments.length > 0 && !supportsAttachments;
   const slashCommandRestrictionReason = standaloneSlashCommand
     ? draft.attachments.length > 0
@@ -340,19 +363,32 @@ export const MessageComposer = ({
     !slashCommandRestrictionReason &&
     (!isCrossTeam || onCrossTeamSend !== undefined);
 
-  // Track whether we initiated a send — clear draft only on confirmed success
-  const pendingSendRef = useRef(false);
+  const pendingSendRef = useRef<PendingSendState | null>(null);
 
   const handleCycleActionMode = useCallback(() => {
+    if (sending) return;
     const modes: ActionMode[] = canDelegate ? ['do', 'ask', 'delegate'] : ['do', 'ask'];
     const idx = modes.indexOf(actionMode);
     setActionMode(modes[(idx + 1) % modes.length]);
-  }, [actionMode, canDelegate, setActionMode]);
+  }, [actionMode, canDelegate, sending, setActionMode]);
 
   const handleSend = useCallback(() => {
     if (!canSend) return;
     dismissMentionsRef.current?.();
-    pendingSendRef.current = true;
+    pendingSendRef.current = {
+      teamName,
+      snapshot: {
+        text: draft.text,
+        chips: draft.chips,
+        attachments: draft.attachments,
+        actionMode,
+        pendingSendId: createPendingSendId(),
+      },
+      previousDebugDetails: sendDebugDetails,
+      previousLastResult: lastResult,
+      observedSending: false,
+      optimisticallyCleared: false,
+    };
     const taskRefs = extractTaskRefsFromText(draft.text, taskSuggestions);
     const serialized = serializeChipsWithText(trimmed, draft.chips);
     if (isCrossTeam && selectedTeam && onCrossTeamSend) {
@@ -377,32 +413,67 @@ export const MessageComposer = ({
     onCrossTeamSend,
     isCrossTeam,
     selectedTeam,
+    sendDebugDetails,
     draft.attachments,
     draft.chips,
+    draft.text,
+    lastResult,
     taskSuggestions,
+    teamName,
   ]);
 
-  // Clear draft only after send completes successfully (sending: true → false, no error)
-  useEffect(() => {
-    if (!sending && pendingSendRef.current) {
-      pendingSendRef.current = false;
-      if (!sendError && sendDebugDetails?.delivered !== false) {
-        draft.clearDraft();
-      }
-    }
-  }, [sending, sendError, sendDebugDetails, draft]);
+  // Clear once the send starts, not after the IPC finishes. For OpenCode teammates the message
+  // can already be visible from inbox refresh while runtime delivery diagnostics are still pending.
+  useLayoutEffect(() => {
+    const pending = pendingSendRef.current;
+    if (!pending) return;
+    const isPendingCurrentTeam = pending.teamName === teamName;
 
-  const { addFiles: draftAddFiles } = draft;
-  const handleFileInputChange = useCallback(
-    (e: React.ChangeEvent<HTMLInputElement>) => {
-      const input = e.target;
-      if (input.files?.length) {
-        void draftAddFiles(input.files);
+    if (sending) {
+      pending.observedSending = true;
+      if (isPendingCurrentTeam && !pending.optimisticallyCleared) {
+        pending.optimisticallyCleared = true;
+        draft.hideDraftForPendingSend(pending.snapshot);
       }
-      input.value = '';
-    },
-    [draftAddFiles]
-  );
+      return;
+    }
+
+    const hasNewResult =
+      lastResult?.messageId != null &&
+      lastResult.messageId !== pending.previousLastResult?.messageId;
+    const hasNewDebugDetails =
+      sendDebugDetails?.messageId != null &&
+      sendDebugDetails.messageId !== pending.previousDebugDetails?.messageId;
+    const hasCompletionSignal =
+      pending.observedSending || sendError !== null || hasNewResult || hasNewDebugDetails;
+    if (!hasCompletionSignal) return;
+
+    pendingSendRef.current = null;
+    const failed = sendError !== null || sendDebugDetails?.delivered === false;
+    if (failed) {
+      if (!isPendingCurrentTeam) return;
+      const currentDraftIsEmpty =
+        draft.text.length === 0 && draft.chips.length === 0 && draft.attachments.length === 0;
+      if (pending.optimisticallyCleared && currentDraftIsEmpty) {
+        draft.restoreDraft(pending.snapshot);
+      } else if (!currentDraftIsEmpty) {
+        draft.finalizePendingSendClear(undefined, pending.snapshot);
+      }
+      return;
+    }
+
+    if (!isPendingCurrentTeam) {
+      draft.finalizePendingSendClear(pending.teamName, pending.snapshot);
+      return;
+    }
+
+    if (!pending.optimisticallyCleared) {
+      draft.clearDraft();
+      return;
+    }
+
+    draft.finalizePendingSendClear(undefined, pending.snapshot);
+  }, [teamName, sending, sendError, sendDebugDetails, lastResult, draft]);
 
   const showFileRestrictionError = useCallback(() => {
     setFileRestrictionError(
@@ -414,6 +485,23 @@ export const MessageComposer = ({
     }, 4000);
   }, [attachmentRestrictionReason]);
 
+  const { addFiles: draftAddFiles } = draft;
+  const handleFileInputChange = useCallback(
+    (e: React.ChangeEvent<HTMLInputElement>) => {
+      const input = e.target;
+      if (input.files?.length) {
+        if (!canAttach) {
+          showFileRestrictionError();
+          input.value = '';
+          return;
+        }
+        void draftAddFiles(input.files);
+      }
+      input.value = '';
+    },
+    [canAttach, draftAddFiles, showFileRestrictionError]
+  );
+
   // Cleanup restriction error timer on unmount
   useEffect(() => {
     const ref = fileRestrictionTimerRef;
@@ -445,7 +533,7 @@ export const MessageComposer = ({
       e.preventDefault();
       dragCounterRef.current = 0;
       setIsDragOver(false);
-      if (!supportsAttachments) {
+      if (!canAttach) {
         const files = e.dataTransfer?.files;
         if (files?.length) {
           showFileRestrictionError();
@@ -454,13 +542,13 @@ export const MessageComposer = ({
       }
       draftHandleDrop(e);
     },
-    [supportsAttachments, draftHandleDrop, showFileRestrictionError]
+    [canAttach, draftHandleDrop, showFileRestrictionError]
   );
 
   const { handlePaste: draftHandlePaste } = draft;
   const handlePasteWrapper = useCallback(
     (e: React.ClipboardEvent) => {
-      if (!supportsAttachments) {
+      if (!canAttach) {
         const hasFiles = Array.from(e.clipboardData.items).some((item) => item.kind === 'file');
         if (hasFiles) {
           e.preventDefault();
@@ -470,7 +558,7 @@ export const MessageComposer = ({
       }
       draftHandlePaste(e);
     },
-    [supportsAttachments, draftHandlePaste, showFileRestrictionError]
+    [canAttach, draftHandlePaste, showFileRestrictionError]
   );
 
   const remaining = MAX_TEXT_LENGTH - trimmed.length;
@@ -543,9 +631,11 @@ export const MessageComposer = ({
                 <TooltipContent side="top">
                   {!isTeamAlive
                     ? 'Team must be online to attach files'
-                    : !draft.canAddMore
-                      ? 'Maximum attachments reached'
-                      : 'Attach files (paste or drag & drop)'}
+                    : sending
+                      ? 'Wait for current message to finish sending'
+                      : !draft.canAddMore
+                        ? 'Maximum attachments reached'
+                        : 'Attach files (paste or drag & drop)'}
                 </TooltipContent>
               </Tooltip>
             </>
@@ -847,7 +937,7 @@ export const MessageComposer = ({
       <div className="relative">
         <DropZoneOverlay
           active={isDragOver}
-          rejected={!supportsAttachments}
+          rejected={!canAttach}
           rejectionReason={attachmentRestrictionReason}
         />
         <MentionableTextarea
@@ -890,6 +980,7 @@ export const MessageComposer = ({
               value={actionMode}
               onChange={setActionMode}
               showDelegate={canDelegate}
+              disabled={sending}
             />
           }
           cornerAction={
diff --git a/src/renderer/components/team/messages/MessagesPanel.tsx b/src/renderer/components/team/messages/MessagesPanel.tsx
index 1784de68..145dd9b0 100644
--- a/src/renderer/components/team/messages/MessagesPanel.tsx
+++ b/src/renderer/components/team/messages/MessagesPanel.tsx
@@ -70,6 +70,7 @@ const BOTTOM_SHEET_HEADER_HEIGHT = 40;
 const BOTTOM_SHEET_COLLAPSED_SNAP_INDEX = 1;
 const BOTTOM_SHEET_COMPOSER_SNAP_INDEX = 2;
 const BOTTOM_SHEET_FULL_SNAP_INDEX = 4;
+const OPENCODE_RUNTIME_DELIVERY_STATUS_REFRESH_DELAYS_MS = [15_000, 45_000, 90_000] as const;
 
 interface MessagesPanelProps {
   teamName: string;
@@ -246,6 +247,7 @@ export const MessagesPanel = memo(function MessagesPanel({
     sendMessageDebugDetails,
     lastSendMessageResult,
     clearSendMessageRuntimeDiagnostics,
+    refreshSendMessageRuntimeDeliveryStatus,
     teams,
     openTeamTab,
     messages,
@@ -262,6 +264,7 @@ export const MessagesPanel = memo(function MessagesPanel({
       sendMessageDebugDetails: s.sendMessageDebugDetails,
       lastSendMessageResult: s.lastSendMessageResult,
       clearSendMessageRuntimeDiagnostics: s.clearSendMessageRuntimeDiagnostics,
+      refreshSendMessageRuntimeDeliveryStatus: s.refreshSendMessageRuntimeDeliveryStatus,
       teams: s.teams,
       openTeamTab: s.openTeamTab,
       messages: selectTeamMessages(s, teamName),
@@ -577,6 +580,28 @@ export const MessagesPanel = memo(function MessagesPanel({
     sendMessageRuntimeReplyVisible,
   ]);
 
+  useEffect(() => {
+    const debugDetails = sendMessageDebugDetails;
+    const messageId = debugDetails?.messageId;
+    if (!messageId || sendMessageRuntimeReplyVisible || debugDetails?.responsePending !== true) {
+      return;
+    }
+    const timers = OPENCODE_RUNTIME_DELIVERY_STATUS_REFRESH_DELAYS_MS.map((delayMs) =>
+      window.setTimeout(() => {
+        void refreshSendMessageRuntimeDeliveryStatus(teamName, messageId);
+      }, delayMs)
+    );
+    return () => {
+      timers.forEach((timer) => window.clearTimeout(timer));
+    };
+  }, [
+    refreshSendMessageRuntimeDeliveryStatus,
+    sendMessageDebugDetails?.messageId,
+    sendMessageDebugDetails?.responsePending,
+    sendMessageRuntimeReplyVisible,
+    teamName,
+  ]);
+
   const handleSend = useCallback(
     (
       member: string,
diff --git a/src/renderer/components/team/provisioningSteps.ts b/src/renderer/components/team/provisioningSteps.ts
index 8d99764e..776eaecc 100644
--- a/src/renderer/components/team/provisioningSteps.ts
+++ b/src/renderer/components/team/provisioningSteps.ts
@@ -65,7 +65,11 @@ function isFailedSpawnEntry(entry: MemberSpawnStatusEntry | undefined): boolean
 }
 
 function isStrongRuntimeProcessSpawnEntry(entry: MemberSpawnStatusEntry): boolean {
-  return entry.runtimeAlive === true && entry.livenessKind === 'runtime_process';
+  return (
+    entry.runtimeAlive === true &&
+    entry.livenessKind === 'runtime_process' &&
+    entry.bootstrapStalled !== true
+  );
 }
 
 function shouldPreferSnapshotEntryOverLive(
diff --git a/src/renderer/components/team/schedule/ScheduleSection.tsx b/src/renderer/components/team/schedule/ScheduleSection.tsx
index b8f44bd4..2a755123 100644
--- a/src/renderer/components/team/schedule/ScheduleSection.tsx
+++ b/src/renderer/components/team/schedule/ScheduleSection.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { lazy, Suspense, useCallback, useEffect, useState } from 'react';
 
 import { Button } from '@renderer/components/ui/button';
 import { Popover, PopoverContent, PopoverTrigger } from '@renderer/components/ui/popover';
@@ -18,13 +18,15 @@ import {
 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 
-import { LaunchTeamDialog } from '../dialogs/LaunchTeamDialog';
-
 import { ScheduleEmptyState } from './ScheduleEmptyState';
 import { ScheduleRunLogDialog } from './ScheduleRunLogDialog';
 import { ScheduleRunRow } from './ScheduleRunRow';
 import { ScheduleStatusBadge } from './ScheduleStatusBadge';
 
+const LaunchTeamDialog = lazy(() =>
+  import('../dialogs/LaunchTeamDialog').then((m) => ({ default: m.LaunchTeamDialog }))
+);
+
 import type { Schedule, ScheduleRun } from '@shared/types';
 
 // =============================================================================
@@ -305,13 +307,17 @@ export const ScheduleSection = ({ teamName }: ScheduleSectionProps): React.JSX.E
       )}
 
       {/* Create/Edit Dialog */}
-      <LaunchTeamDialog
-        mode="schedule"
-        open={dialogOpen}
-        teamName={teamName}
-        schedule={editingSchedule}
-        onClose={handleClose}
-      />
+      {dialogOpen && (
+        <Suspense fallback={null}>
+          <LaunchTeamDialog
+            mode="schedule"
+            open={dialogOpen}
+            teamName={teamName}
+            schedule={editingSchedule}
+            onClose={handleClose}
+          />
+        </Suspense>
+      )}
     </div>
   );
 };
diff --git a/src/renderer/components/team/tasks/TaskRow.tsx b/src/renderer/components/team/tasks/TaskRow.tsx
index 17f72124..5e188cda 100644
--- a/src/renderer/components/team/tasks/TaskRow.tsx
+++ b/src/renderer/components/team/tasks/TaskRow.tsx
@@ -1,3 +1,5 @@
+import { memo } from 'react';
+
 import {
   KANBAN_COLUMN_DISPLAY,
   REVIEW_STATE_DISPLAY,
@@ -12,7 +14,7 @@ interface TaskRowProps {
   task: TeamTaskWithKanban;
 }
 
-export const TaskRow = ({ task }: TaskRowProps): React.JSX.Element => {
+export const TaskRow = memo(function TaskRow({ task }: TaskRowProps): React.JSX.Element {
   const blockedByIds = task.blockedBy?.filter((id) => id.length > 0) ?? [];
   const blocksIds = task.blocks?.filter((id) => id.length > 0) ?? [];
   const kanbanColumn = getTaskKanbanColumn(task);
@@ -62,4 +64,4 @@ export const TaskRow = ({ task }: TaskRowProps): React.JSX.Element => {
       </td>
     </tr>
   );
-};
+});
diff --git a/src/renderer/components/team/teamRuntimeDisplayRows.ts b/src/renderer/components/team/teamRuntimeDisplayRows.ts
new file mode 100644
index 00000000..60527737
--- /dev/null
+++ b/src/renderer/components/team/teamRuntimeDisplayRows.ts
@@ -0,0 +1,324 @@
+import type {
+  MemberSpawnStatusEntry,
+  TeamAgentRuntimeDiagnosticSeverity,
+  TeamAgentRuntimeEntry,
+  TeamAgentRuntimeSnapshot,
+  TeamProviderBackendId,
+  TeamProviderId,
+} from '@shared/types';
+
+export type RuntimeDisplayState =
+  | 'running'
+  | 'starting'
+  | 'waiting'
+  | 'degraded'
+  | 'stopped'
+  | 'unknown';
+
+export interface TeamRuntimeDisplayMember {
+  name: string;
+}
+
+export interface TeamRuntimeDisplayRow {
+  memberName: string;
+  state: RuntimeDisplayState;
+  stateReason: string;
+  source: 'runtime' | 'spawn-status' | 'mixed';
+  updatedAt?: string;
+  providerId?: TeamProviderId;
+  providerBackendId?: TeamProviderBackendId;
+  laneId?: string;
+  laneKind?: 'primary' | 'secondary';
+  runtimeModel?: string;
+  diagnostic?: string;
+  diagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+  pidLabel?: string;
+  actionsAllowed: false;
+}
+
+interface SpawnDegradation {
+  reason: string;
+  diagnostic?: string;
+  diagnosticSeverity: TeamAgentRuntimeDiagnosticSeverity;
+}
+
+const ACTIVE_SPAWN_STATUSES = new Set(['waiting', 'spawning']);
+
+export function buildTeamRuntimeDisplayRows({
+  members,
+  runtimeSnapshot,
+  spawnStatuses,
+}: {
+  members: readonly TeamRuntimeDisplayMember[];
+  runtimeSnapshot?: TeamAgentRuntimeSnapshot | null;
+  spawnStatuses?: Record<string, MemberSpawnStatusEntry> | null;
+}): TeamRuntimeDisplayRow[] {
+  const runtimeByMember = buildRuntimeEntriesByMember(runtimeSnapshot);
+
+  return members.map((member) => {
+    const runtime = pickLatestRuntimeEntry(runtimeByMember.get(member.name) ?? []);
+    const spawn = spawnStatuses?.[member.name];
+    return buildRuntimeDisplayRow(member.name, runtime, spawn);
+  });
+}
+
+function buildRuntimeEntriesByMember(
+  runtimeSnapshot?: TeamAgentRuntimeSnapshot | null
+): Map<string, TeamAgentRuntimeEntry[]> {
+  const byMember = new Map<string, TeamAgentRuntimeEntry[]>();
+  const runtimeMembers = runtimeSnapshot?.members;
+  if (!runtimeMembers) return byMember;
+
+  for (const [key, entry] of Object.entries(runtimeMembers)) {
+    const memberName = entry.memberName || key;
+    if (!memberName) continue;
+    const entries = byMember.get(memberName);
+    if (entries) {
+      entries.push(entry);
+    } else {
+      byMember.set(memberName, [entry]);
+    }
+  }
+
+  return byMember;
+}
+
+function pickLatestRuntimeEntry(
+  entries: readonly TeamAgentRuntimeEntry[]
+): TeamAgentRuntimeEntry | undefined {
+  let latest: TeamAgentRuntimeEntry | undefined;
+  let latestTimestamp = Number.NEGATIVE_INFINITY;
+
+  for (const entry of entries) {
+    const timestamp = getRuntimeEntryTimestamp(entry);
+    if (!latest || timestamp >= latestTimestamp) {
+      latest = entry;
+      latestTimestamp = timestamp;
+    }
+  }
+
+  return latest;
+}
+
+function getRuntimeEntryTimestamp(entry: TeamAgentRuntimeEntry): number {
+  const timestamp = Date.parse(entry.runtimeLastSeenAt ?? entry.updatedAt ?? '');
+  return Number.isFinite(timestamp) ? timestamp : 0;
+}
+
+function buildRuntimeDisplayRow(
+  memberName: string,
+  runtime?: TeamAgentRuntimeEntry,
+  spawn?: MemberSpawnStatusEntry
+): TeamRuntimeDisplayRow {
+  if (runtime) {
+    return buildRuntimeBackedDisplayRow(memberName, runtime, spawn);
+  }
+
+  if (spawn) {
+    return buildSpawnBackedDisplayRow(memberName, spawn);
+  }
+
+  return {
+    memberName,
+    state: 'unknown',
+    stateReason: 'No live runtime snapshot yet',
+    source: 'spawn-status',
+    actionsAllowed: false,
+  };
+}
+
+function buildRuntimeBackedDisplayRow(
+  memberName: string,
+  runtime: TeamAgentRuntimeEntry,
+  spawn?: MemberSpawnStatusEntry
+): TeamRuntimeDisplayRow {
+  const hasErrorDiagnostic = runtime.runtimeDiagnosticSeverity === 'error';
+  const spawnDegradation = getSpawnDegradation(spawn);
+  const state = getRuntimeBackedState(runtime, hasErrorDiagnostic, spawnDegradation != null);
+  const stateReason =
+    spawnDegradation?.reason ??
+    runtime.runtimeDiagnostic ??
+    (runtime.alive === true ? 'Runtime heartbeat is alive' : 'Runtime heartbeat is not alive');
+
+  return {
+    memberName,
+    state,
+    stateReason,
+    source: spawn ? 'mixed' : 'runtime',
+    updatedAt: runtime.runtimeLastSeenAt ?? runtime.updatedAt,
+    providerId: runtime.providerId,
+    providerBackendId: runtime.providerBackendId,
+    laneId: runtime.laneId,
+    laneKind: runtime.laneKind,
+    runtimeModel: runtime.runtimeModel,
+    diagnostic: spawnDegradation?.diagnostic ?? runtime.runtimeDiagnostic,
+    diagnosticSeverity: spawnDegradation?.diagnosticSeverity ?? runtime.runtimeDiagnosticSeverity,
+    pidLabel: formatRuntimePidLabel(runtime),
+    actionsAllowed: false,
+  };
+}
+
+function getSpawnDegradation(spawn?: MemberSpawnStatusEntry): SpawnDegradation | null {
+  if (!spawn) return null;
+
+  if (spawn.status === 'error' || spawn.hardFailure === true) {
+    const reason =
+      spawn.error ?? spawn.hardFailureReason ?? spawn.runtimeDiagnostic ?? 'Spawn failed';
+    return {
+      reason,
+      diagnostic: spawn.runtimeDiagnostic ?? reason,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity ?? 'error',
+    };
+  }
+
+  if (spawn.bootstrapStalled === true) {
+    const reason = spawn.runtimeDiagnostic ?? 'Runtime is alive, but bootstrap did not confirm';
+    return {
+      reason,
+      diagnostic: spawn.runtimeDiagnostic ?? reason,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity ?? 'warning',
+    };
+  }
+
+  if ((spawn.pendingPermissionRequestIds?.length ?? 0) > 0) {
+    const reason = spawn.runtimeDiagnostic ?? 'Runtime is waiting for permission approval';
+    return {
+      reason,
+      diagnostic: spawn.runtimeDiagnostic ?? reason,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity ?? 'warning',
+    };
+  }
+
+  if (spawn.runtimeDiagnosticSeverity === 'error') {
+    const reason = spawn.runtimeDiagnostic ?? 'Runtime launch status needs attention';
+    return {
+      reason,
+      diagnostic: spawn.runtimeDiagnostic,
+      diagnosticSeverity: 'error',
+    };
+  }
+
+  return null;
+}
+
+function getRuntimeBackedState(
+  runtime: TeamAgentRuntimeEntry,
+  hasErrorDiagnostic: boolean,
+  hasSpawnDegradation: boolean
+): RuntimeDisplayState {
+  if (hasSpawnDegradation || hasErrorDiagnostic) {
+    return 'degraded';
+  }
+
+  return runtime.alive === true ? 'running' : 'stopped';
+}
+
+function buildSpawnBackedDisplayRow(
+  memberName: string,
+  spawn: MemberSpawnStatusEntry
+): TeamRuntimeDisplayRow {
+  const spawnDegradation = getSpawnDegradation(spawn);
+  if (spawnDegradation) {
+    return {
+      memberName,
+      state: 'degraded',
+      stateReason: spawnDegradation.reason,
+      source: 'spawn-status',
+      updatedAt: spawn.livenessLastCheckedAt ?? spawn.updatedAt,
+      runtimeModel: spawn.runtimeModel,
+      diagnostic: spawnDegradation.diagnostic,
+      diagnosticSeverity: spawnDegradation.diagnosticSeverity,
+      actionsAllowed: false,
+    };
+  }
+
+  if (
+    (spawn.status === 'online' && hasConfirmedSpawnLiveness(spawn)) ||
+    isConfirmedSpawnLaunch(spawn)
+  ) {
+    return {
+      memberName,
+      state: 'running',
+      stateReason: spawn.runtimeDiagnostic ?? 'Bootstrap confirmed',
+      source: 'spawn-status',
+      updatedAt: spawn.livenessLastCheckedAt ?? spawn.lastHeartbeatAt ?? spawn.updatedAt,
+      runtimeModel: spawn.runtimeModel,
+      diagnostic: spawn.runtimeDiagnostic,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity,
+      actionsAllowed: false,
+    };
+  }
+
+  if (ACTIVE_SPAWN_STATUSES.has(spawn.status)) {
+    return {
+      memberName,
+      state: spawn.status === 'waiting' ? 'waiting' : 'starting',
+      stateReason: spawn.runtimeDiagnostic ?? `Spawn status is ${spawn.status}`,
+      source: 'spawn-status',
+      updatedAt: spawn.livenessLastCheckedAt ?? spawn.updatedAt,
+      runtimeModel: spawn.runtimeModel,
+      diagnostic: spawn.runtimeDiagnostic,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity,
+      actionsAllowed: false,
+    };
+  }
+
+  if (spawn.status === 'offline' || spawn.status === 'skipped') {
+    return {
+      memberName,
+      state: 'stopped',
+      stateReason:
+        spawn.status === 'skipped'
+          ? (spawn.skipReason ?? 'Member was skipped for launch')
+          : 'Spawn status is offline',
+      source: 'spawn-status',
+      updatedAt: spawn.updatedAt,
+      runtimeModel: spawn.runtimeModel,
+      diagnostic: spawn.runtimeDiagnostic,
+      diagnosticSeverity: spawn.runtimeDiagnosticSeverity,
+      actionsAllowed: false,
+    };
+  }
+
+  return {
+    memberName,
+    state: 'unknown',
+    stateReason: `Spawn status is ${String(spawn.status)}`,
+    source: 'spawn-status',
+    updatedAt: spawn.updatedAt,
+    runtimeModel: spawn.runtimeModel,
+    diagnostic: spawn.runtimeDiagnostic,
+    diagnosticSeverity: spawn.runtimeDiagnosticSeverity,
+    actionsAllowed: false,
+  };
+}
+
+function hasConfirmedSpawnLiveness(spawn: MemberSpawnStatusEntry): boolean {
+  return (
+    spawn.runtimeAlive === true ||
+    spawn.bootstrapConfirmed === true ||
+    spawn.livenessSource === 'heartbeat' ||
+    spawn.livenessSource === 'process'
+  );
+}
+
+function isConfirmedSpawnLaunch(spawn: MemberSpawnStatusEntry): boolean {
+  return spawn.launchState === 'confirmed_alive' && spawn.bootstrapConfirmed === true;
+}
+
+function formatRuntimePidLabel(runtime: TeamAgentRuntimeEntry): string | undefined {
+  const runtimePid = getFinitePid(runtime.runtimePid);
+  if (runtimePid != null) return `runtime pid ${runtimePid}`;
+
+  const processPid = getFinitePid(runtime.pid);
+  if (processPid != null) return `${runtime.pidSource ?? 'process'} pid ${processPid}`;
+
+  const panePid = getFinitePid(runtime.panePid);
+  if (panePid != null) return `pane pid ${panePid}`;
+
+  return undefined;
+}
+
+function getFinitePid(value: number | undefined): number | undefined {
+  return typeof value === 'number' && Number.isFinite(value) ? value : undefined;
+}
diff --git a/src/renderer/components/team/teamSessionFetchGuards.ts b/src/renderer/components/team/teamSessionFetchGuards.ts
index b5a976e4..8b9d53a5 100644
--- a/src/renderer/components/team/teamSessionFetchGuards.ts
+++ b/src/renderer/components/team/teamSessionFetchGuards.ts
@@ -1,5 +1,97 @@
 import type { Session } from '@renderer/types/data';
 
+export interface TeamSessionConfigLike {
+  leadSessionId?: string | null;
+  sessionHistory?: readonly unknown[] | null;
+}
+
+export interface TeamSessionMetadataApi {
+  getSessionsByIds: (
+    projectId: string,
+    sessionIds: string[],
+    options?: { metadataLevel?: 'light' | 'deep' }
+  ) => Promise<Session[]>;
+  getSessionsPaginated: (
+    projectId: string,
+    cursor: string | null,
+    limit?: number,
+    options?: {
+      includeTotalCount?: boolean;
+      prefilterAll?: boolean;
+      metadataLevel?: 'light' | 'deep';
+    }
+  ) => Promise<{
+    sessions: Session[];
+    nextCursor: string | null;
+    hasMore: boolean;
+    totalCount: number;
+  }>;
+}
+
+const DEFAULT_TEAM_SESSION_METADATA_LIMIT = 20;
+
+export function buildTeamSessionIds(
+  config: TeamSessionConfigLike,
+  limit: number = DEFAULT_TEAM_SESSION_METADATA_LIMIT
+): string[] {
+  const max = Math.max(0, Math.floor(limit));
+  if (max === 0) return [];
+
+  const sessionIds: string[] = [];
+  const seen = new Set<string>();
+  const push = (value: unknown): void => {
+    if (typeof value !== 'string') return;
+    const sessionId = value.trim();
+    if (!sessionId || seen.has(sessionId) || sessionIds.length >= max) return;
+    seen.add(sessionId);
+    sessionIds.push(sessionId);
+  };
+
+  push(config.leadSessionId);
+  if (Array.isArray(config.sessionHistory)) {
+    for (let index = config.sessionHistory.length - 1; index >= 0; index -= 1) {
+      push(config.sessionHistory[index]);
+      if (sessionIds.length >= max) break;
+    }
+  }
+
+  return sessionIds;
+}
+
+export async function loadTeamSessionMetadata(
+  api: TeamSessionMetadataApi,
+  projectId: string,
+  config: TeamSessionConfigLike,
+  limit: number = DEFAULT_TEAM_SESSION_METADATA_LIMIT
+): Promise<Session[]> {
+  const sessionIds = buildTeamSessionIds(config, limit);
+  const leadSessionId = typeof config.leadSessionId === 'string' ? config.leadSessionId.trim() : '';
+
+  if (sessionIds.length === 0) {
+    const page = await api.getSessionsPaginated(projectId, null, limit, {
+      includeTotalCount: false,
+      prefilterAll: false,
+      metadataLevel: 'light',
+    });
+    return [...page.sessions].sort((a, b) => b.createdAt - a.createdAt);
+  }
+
+  const requestedOrder = new Map(sessionIds.map((sessionId, index) => [sessionId, index]));
+  const sessions = await api.getSessionsByIds(projectId, sessionIds, { metadataLevel: 'light' });
+
+  return [...sessions].sort((a, b) => {
+    if (leadSessionId) {
+      if (a.id === leadSessionId && b.id !== leadSessionId) return -1;
+      if (b.id === leadSessionId && a.id !== leadSessionId) return 1;
+    }
+    if (b.createdAt !== a.createdAt) return b.createdAt - a.createdAt;
+    return (
+      (requestedOrder.get(a.id) ?? Number.MAX_SAFE_INTEGER) -
+      (requestedOrder.get(b.id) ?? Number.MAX_SAFE_INTEGER)
+    );
+  });
+}
+
 export function isLeadSessionMissing(params: {
   leadSessionId: string | null;
   projectId: string | null;
diff --git a/src/renderer/components/team/useTeamProvisioningPresentation.ts b/src/renderer/components/team/useTeamProvisioningPresentation.ts
index 0cdf27ec..970cc9f8 100644
--- a/src/renderer/components/team/useTeamProvisioningPresentation.ts
+++ b/src/renderer/components/team/useTeamProvisioningPresentation.ts
@@ -9,22 +9,33 @@ import { buildTeamProvisioningPresentation } from '@renderer/utils/teamProvision
 import { useShallow } from 'zustand/react/shallow';
 
 import type { TeamProvisioningPresentation } from '@renderer/utils/teamProvisioningPresentation';
+import type { RetryFailedOpenCodeSecondaryLanesResult } from '@shared/types';
 
 export function useTeamProvisioningPresentation(teamName: string): {
   presentation: TeamProvisioningPresentation | null;
   cancelProvisioning: ((runId: string) => Promise<void>) | null;
+  retryFailedOpenCodeSecondaryLanes:
+    | ((teamName: string) => Promise<RetryFailedOpenCodeSecondaryLanesResult>)
+    | null;
   runInstanceKey: string | null;
 } {
-  const { progress, cancelProvisioning, teamMembers, memberSpawnStatuses, memberSpawnSnapshot } =
-    useStore(
-      useShallow((s) => ({
-        progress: getCurrentProvisioningProgressForTeam(s, teamName),
-        cancelProvisioning: s.cancelProvisioning,
-        teamMembers: selectTeamMemberSnapshotsForName(s, teamName),
-        memberSpawnStatuses: s.memberSpawnStatusesByTeam[teamName],
-        memberSpawnSnapshot: s.memberSpawnSnapshotsByTeam[teamName],
-      }))
-    );
+  const {
+    progress,
+    cancelProvisioning,
+    retryFailedOpenCodeSecondaryLanes,
+    teamMembers,
+    memberSpawnStatuses,
+    memberSpawnSnapshot,
+  } = useStore(
+    useShallow((s) => ({
+      progress: getCurrentProvisioningProgressForTeam(s, teamName),
+      cancelProvisioning: s.cancelProvisioning,
+      retryFailedOpenCodeSecondaryLanes: s.retryFailedOpenCodeSecondaryLanes,
+      teamMembers: selectTeamMemberSnapshotsForName(s, teamName),
+      memberSpawnStatuses: s.memberSpawnStatusesByTeam[teamName],
+      memberSpawnSnapshot: s.memberSpawnSnapshotsByTeam[teamName],
+    }))
+  );
 
   const presentation = useMemo(
     () =>
@@ -40,6 +51,7 @@ export function useTeamProvisioningPresentation(teamName: string): {
   return {
     presentation,
     cancelProvisioning,
+    retryFailedOpenCodeSecondaryLanes: retryFailedOpenCodeSecondaryLanes ?? null,
     runInstanceKey: progress ? `${teamName}:${progress.runId}:${progress.startedAt}` : null,
   };
 }
diff --git a/src/renderer/hooks/useComposerDraft.lifecycle.test.tsx b/src/renderer/hooks/useComposerDraft.lifecycle.test.tsx
new file mode 100644
index 00000000..b2f40352
--- /dev/null
+++ b/src/renderer/hooks/useComposerDraft.lifecycle.test.tsx
@@ -0,0 +1,412 @@
+import React, { act, useEffect } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const {
+  deleteSnapshotMock,
+  emptySnapshotMock,
+  loadSnapshotMock,
+  migrateLegacyMock,
+  saveSnapshotMock,
+} = vi.hoisted(() => ({
+  deleteSnapshotMock: vi.fn(),
+  emptySnapshotMock: vi.fn((teamName: string) => ({
+    version: 1,
+    teamName,
+    text: '',
+    chips: [],
+    attachments: [],
+    actionMode: 'do',
+    updatedAt: Date.now(),
+  })),
+  loadSnapshotMock: vi.fn(),
+  migrateLegacyMock: vi.fn(),
+  saveSnapshotMock: vi.fn(),
+}));
+
+vi.mock('@renderer/services/composerDraftStorage', () => ({
+  composerDraftStorage: {
+    deleteSnapshot: deleteSnapshotMock,
+    emptySnapshot: emptySnapshotMock,
+    loadSnapshot: loadSnapshotMock,
+    migrateLegacy: migrateLegacyMock,
+    saveSnapshot: saveSnapshotMock,
+  },
+}));
+
+import { useComposerDraft } from './useComposerDraft';
+
+const HookProbe = ({
+  onLoaded,
+}: {
+  onLoaded: (draft: ReturnType<typeof useComposerDraft>) => void;
+}): React.JSX.Element | null => {
+  const draft = useComposerDraft('team-alpha');
+
+  useEffect(() => {
+    if (draft.isLoaded) {
+      onLoaded(draft);
+    }
+  }, [draft, onLoaded]);
+
+  return null;
+};
+
+async function renderLoadedHook(): Promise<{
+  getDraft: () => ReturnType<typeof useComposerDraft>;
+  root: ReturnType<typeof createRoot>;
+}> {
+  const host = document.createElement('div');
+  document.body.appendChild(host);
+  const root = createRoot(host);
+  let latestDraft: ReturnType<typeof useComposerDraft> | null = null;
+
+  await act(async () => {
+    root.render(
+      React.createElement(HookProbe, {
+        onLoaded: (draft) => {
+          latestDraft = draft;
+        },
+      })
+    );
+    await Promise.resolve();
+    await Promise.resolve();
+  });
+
+  if (!latestDraft) {
+    throw new Error('useComposerDraft did not load');
+  }
+
+  return {
+    getDraft: () => {
+      if (!latestDraft) throw new Error('useComposerDraft did not load');
+      return latestDraft;
+    },
+    root,
+  };
+}
+
+describe('useComposerDraft pending send lifecycle', () => {
+  beforeEach(() => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    deleteSnapshotMock.mockReset();
+    emptySnapshotMock.mockClear();
+    loadSnapshotMock.mockReset();
+    migrateLegacyMock.mockReset();
+    saveSnapshotMock.mockReset();
+    loadSnapshotMock.mockResolvedValue(null);
+    migrateLegacyMock.mockResolvedValue(null);
+    saveSnapshotMock.mockResolvedValue(undefined);
+    deleteSnapshotMock.mockResolvedValue(undefined);
+  });
+
+  afterEach(() => {
+    document.body.innerHTML = '';
+    vi.useRealTimers();
+    vi.unstubAllGlobals();
+  });
+
+  it('hides submitted content immediately and can restore it on failed delivery', async () => {
+    const { getDraft, root } = await renderLoadedHook();
+
+    act(() => {
+      getDraft().setText('hello teammate');
+    });
+    expect(getDraft().text).toBe('hello teammate');
+
+    act(() => {
+      getDraft().hideDraftForPendingSend({
+        text: 'hello teammate',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(getDraft().text).toBe('');
+    expect(saveSnapshotMock).toHaveBeenCalledWith(
+      'team-alpha',
+      expect.objectContaining({ text: 'hello teammate' })
+    );
+    expect(deleteSnapshotMock).not.toHaveBeenCalled();
+
+    act(() => {
+      getDraft().restoreDraft({
+        text: 'hello teammate',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+      });
+    });
+
+    expect(getDraft().text).toBe('hello teammate');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('waits for pending snapshot persistence before deleting on successful delivery', async () => {
+    let resolveSave!: () => void;
+    saveSnapshotMock.mockImplementation(
+      () =>
+        new Promise<void>((resolve) => {
+          resolveSave = resolve;
+        })
+    );
+    const { getDraft, root } = await renderLoadedHook();
+
+    act(() => {
+      getDraft().hideDraftForPendingSend({
+        text: 'fast success',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+    act(() => {
+      getDraft().finalizePendingSendClear();
+    });
+
+    expect(deleteSnapshotMock).not.toHaveBeenCalled();
+
+    resolveSave();
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(deleteSnapshotMock).toHaveBeenCalledWith('team-alpha');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('persists a new draft after the submitted draft is hidden and then completes', async () => {
+    let resolveFirstSave!: () => void;
+    saveSnapshotMock
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve) => {
+            resolveFirstSave = resolve;
+          })
+      )
+      .mockResolvedValue(undefined);
+    const { getDraft, root } = await renderLoadedHook();
+
+    act(() => {
+      getDraft().hideDraftForPendingSend({
+        text: 'submitted text',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+    act(() => {
+      getDraft().setText('next draft');
+    });
+    act(() => {
+      getDraft().finalizePendingSendClear();
+    });
+
+    expect(saveSnapshotMock).toHaveBeenCalledTimes(1);
+
+    resolveFirstSave();
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(saveSnapshotMock).toHaveBeenCalledTimes(2);
+    expect(saveSnapshotMock).toHaveBeenNthCalledWith(
+      2,
+      'team-alpha',
+      expect.objectContaining({ text: 'next draft' })
+    );
+    expect(deleteSnapshotMock).not.toHaveBeenCalled();
+    expect(getDraft().text).toBe('next draft');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('deletes a completed snapshot for another team without interrupting the current draft', async () => {
+    vi.useFakeTimers();
+    const { getDraft, root } = await renderLoadedHook();
+    loadSnapshotMock.mockResolvedValueOnce({
+      version: 1,
+      teamName: 'team-beta',
+      text: 'submitted elsewhere',
+      chips: [],
+      attachments: [],
+      actionMode: 'do',
+      pendingSendId: 'pending-beta',
+      updatedAt: Date.now(),
+    });
+
+    act(() => {
+      getDraft().setText('current draft');
+    });
+    act(() => {
+      getDraft().finalizePendingSendClear('team-beta', {
+        text: 'submitted elsewhere',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+        pendingSendId: 'pending-beta',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(deleteSnapshotMock).toHaveBeenCalledWith('team-beta');
+    expect(getDraft().text).toBe('current draft');
+
+    await act(async () => {
+      vi.advanceTimersByTime(400);
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(saveSnapshotMock).toHaveBeenCalledWith(
+      'team-alpha',
+      expect.objectContaining({ text: 'current draft' })
+    );
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('does not delete another team draft when storage no longer matches the submitted snapshot', async () => {
+    const { getDraft, root } = await renderLoadedHook();
+    loadSnapshotMock.mockResolvedValueOnce({
+      version: 1,
+      teamName: 'team-beta',
+      text: 'newer draft',
+      chips: [],
+      attachments: [],
+      actionMode: 'do',
+      updatedAt: Date.now(),
+    });
+
+    act(() => {
+      getDraft().finalizePendingSendClear('team-beta', {
+        text: 'submitted elsewhere',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(deleteSnapshotMock).not.toHaveBeenCalled();
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('does not delete an identical newer draft when its pending send marker differs', async () => {
+    const { getDraft, root } = await renderLoadedHook();
+    loadSnapshotMock.mockResolvedValueOnce({
+      version: 1,
+      teamName: 'team-beta',
+      text: 'same text',
+      chips: [],
+      attachments: [],
+      actionMode: 'do',
+      pendingSendId: 'newer-send',
+      updatedAt: Date.now(),
+    });
+
+    act(() => {
+      getDraft().finalizePendingSendClear('team-beta', {
+        text: 'same text',
+        chips: [],
+        attachments: [],
+        actionMode: 'do',
+        pendingSendId: 'older-send',
+      });
+    });
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(deleteSnapshotMock).not.toHaveBeenCalled();
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it('does not mark a changed draft saved when an older debounced save resolves late', async () => {
+    vi.useFakeTimers();
+    let resolveFirstSave!: () => void;
+    saveSnapshotMock
+      .mockImplementationOnce(
+        () =>
+          new Promise<void>((resolve) => {
+            resolveFirstSave = resolve;
+          })
+      )
+      .mockResolvedValue(undefined);
+    const { getDraft, root } = await renderLoadedHook();
+
+    act(() => {
+      getDraft().setText('first draft');
+    });
+    await act(async () => {
+      vi.advanceTimersByTime(400);
+      await Promise.resolve();
+    });
+    expect(saveSnapshotMock).toHaveBeenCalledTimes(1);
+
+    act(() => {
+      getDraft().setText('second draft');
+    });
+    expect(getDraft().isSaved).toBe(false);
+
+    resolveFirstSave();
+    await act(async () => {
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+    expect(getDraft().isSaved).toBe(false);
+
+    await act(async () => {
+      vi.advanceTimersByTime(400);
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    expect(saveSnapshotMock).toHaveBeenCalledTimes(2);
+    expect(saveSnapshotMock).toHaveBeenNthCalledWith(
+      2,
+      'team-alpha',
+      expect.objectContaining({ text: 'second draft' })
+    );
+    expect(getDraft().isSaved).toBe(true);
+
+    act(() => {
+      root.unmount();
+    });
+  });
+});
diff --git a/src/renderer/hooks/useComposerDraft.ts b/src/renderer/hooks/useComposerDraft.ts
index 9b2eff53..dc6a76ae 100644
--- a/src/renderer/hooks/useComposerDraft.ts
+++ b/src/renderer/hooks/useComposerDraft.ts
@@ -63,6 +63,20 @@ export interface UseComposerDraftResult {
 
   // Clear all
   clearDraft: () => void;
+  hideDraftForPendingSend: (content: ComposerDraftContent) => void;
+  finalizePendingSendClear: (
+    teamNameOverride?: string,
+    submittedContent?: ComposerDraftContent
+  ) => void;
+  restoreDraft: (content: ComposerDraftContent) => void;
+}
+
+export interface ComposerDraftContent {
+  text: string;
+  chips: InlineChip[];
+  attachments: AttachmentPayload[];
+  actionMode?: AgentActionMode;
+  pendingSendId?: string;
 }
 
 // ---------------------------------------------------------------------------
@@ -71,6 +85,26 @@ export interface UseComposerDraftResult {
 
 const DEBOUNCE_MS = 400;
 
+function draftPayloadEquals(left: unknown, right: unknown): boolean {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
+
+function snapshotMatchesContent(
+  snapshot: ComposerDraftSnapshot | null,
+  content: ComposerDraftContent
+): boolean {
+  if (snapshot == null) return false;
+  if (content.pendingSendId != null) {
+    return snapshot.pendingSendId === content.pendingSendId;
+  }
+  if (snapshot.text !== content.text) return false;
+  if (content.actionMode != null && snapshot.actionMode !== content.actionMode) return false;
+  return (
+    draftPayloadEquals(snapshot.chips, content.chips) &&
+    draftPayloadEquals(snapshot.attachments, content.attachments)
+  );
+}
+
 // ---------------------------------------------------------------------------
 // Hook
 // ---------------------------------------------------------------------------
@@ -98,6 +132,8 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
   // Debounce timer
   const timerRef = useRef<ReturnType<typeof setTimeout> | null>(null);
   const pendingRef = useRef<{ teamName: string; snapshot: ComposerDraftSnapshot } | null>(null);
+  const persistQueueRef = useRef<Promise<void>>(Promise.resolve());
+  const persistenceVersionRef = useRef(0);
 
   // Keep teamNameRef in sync
   useEffect(() => {
@@ -127,6 +163,12 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
     };
   }, []);
 
+  const enqueuePersist = useCallback((operation: () => Promise<void>): Promise<void> => {
+    const queued = persistQueueRef.current.catch(() => undefined).then(operation);
+    persistQueueRef.current = queued.catch(() => undefined);
+    return queued;
+  }, []);
+
   const flushPending = useCallback(() => {
     if (timerRef.current != null) {
       clearTimeout(timerRef.current);
@@ -140,16 +182,19 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
         pending.snapshot.chips.length === 0 &&
         pending.snapshot.attachments.length === 0;
       if (isEmpty) {
-        void composerDraftStorage.deleteSnapshot(pending.teamName);
+        void enqueuePersist(() => composerDraftStorage.deleteSnapshot(pending.teamName));
       } else {
-        void composerDraftStorage.saveSnapshot(pending.teamName, pending.snapshot);
+        void enqueuePersist(() =>
+          composerDraftStorage.saveSnapshot(pending.teamName, pending.snapshot)
+        );
       }
     }
-  }, []);
+  }, [enqueuePersist]);
 
   const scheduleSave = useCallback(() => {
     const snapshot = buildSnapshot();
     pendingRef.current = { teamName: teamNameRef.current, snapshot };
+    const persistenceVersion = ++persistenceVersionRef.current;
 
     if (timerRef.current != null) {
       clearTimeout(timerRef.current);
@@ -165,16 +210,18 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
         pending.snapshot.text.length === 0 &&
         pending.snapshot.chips.length === 0 &&
         pending.snapshot.attachments.length === 0;
-      if (isEmpty) {
-        void composerDraftStorage.deleteSnapshot(pending.teamName);
-        if (mountedRef.current) setIsSaved(true);
-      } else {
-        void composerDraftStorage.saveSnapshot(pending.teamName, pending.snapshot).then(() => {
-          if (mountedRef.current) setIsSaved(true);
-        });
-      }
+      const persist = enqueuePersist(() =>
+        isEmpty
+          ? composerDraftStorage.deleteSnapshot(pending.teamName)
+          : composerDraftStorage.saveSnapshot(pending.teamName, pending.snapshot)
+      );
+      void persist.then(() => {
+        if (mountedRef.current && persistenceVersionRef.current === persistenceVersion) {
+          setIsSaved(true);
+        }
+      });
     }, DEBOUNCE_MS);
-  }, [buildSnapshot]);
+  }, [buildSnapshot, enqueuePersist]);
 
   // ---------------------------------------------------------------------------
   // Apply snapshot to state
@@ -458,6 +505,19 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
   // Clear all
   // ---------------------------------------------------------------------------
 
+  const toSnapshot = useCallback((content: ComposerDraftContent): ComposerDraftSnapshot => {
+    return {
+      version: 1,
+      teamName: teamNameRef.current,
+      text: content.text,
+      chips: content.chips,
+      attachments: content.attachments,
+      actionMode: content.actionMode ?? actionModeRef.current,
+      ...(content.pendingSendId ? { pendingSendId: content.pendingSendId } : {}),
+      updatedAt: Date.now(),
+    };
+  }, []);
+
   const clearDraft = useCallback(() => {
     if (timerRef.current != null) {
       clearTimeout(timerRef.current);
@@ -476,8 +536,102 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
     setAttachmentError(null);
     setIsSaved(false);
 
-    void composerDraftStorage.deleteSnapshot(teamNameRef.current);
-  }, []);
+    ++persistenceVersionRef.current;
+    const teamNameForDelete = teamNameRef.current;
+    void enqueuePersist(() => composerDraftStorage.deleteSnapshot(teamNameForDelete));
+  }, [enqueuePersist]);
+
+  const hideDraftForPendingSend = useCallback(
+    (content: ComposerDraftContent) => {
+      if (timerRef.current != null) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+      pendingRef.current = null;
+
+      ++persistenceVersionRef.current;
+      const teamNameForSave = teamNameRef.current;
+      const snapshot = toSnapshot(content);
+      void enqueuePersist(() => composerDraftStorage.saveSnapshot(teamNameForSave, snapshot));
+
+      textRef.current = '';
+      chipsRef.current = [];
+      attachmentsRef.current = [];
+
+      setTextState('');
+      setChipsState([]);
+      setAttachmentsState([]);
+      setAttachmentError(null);
+      setIsSaved(false);
+    },
+    [enqueuePersist, toSnapshot]
+  );
+
+  const deleteSubmittedSnapshotIfCurrent = useCallback(
+    (teamNameForDelete: string, submittedContent?: ComposerDraftContent) =>
+      enqueuePersist(async () => {
+        if (submittedContent != null) {
+          const currentSnapshot = await composerDraftStorage.loadSnapshot(teamNameForDelete);
+          if (!snapshotMatchesContent(currentSnapshot, submittedContent)) {
+            return;
+          }
+        }
+        await composerDraftStorage.deleteSnapshot(teamNameForDelete);
+      }),
+    [enqueuePersist]
+  );
+
+  const finalizePendingSendClear = useCallback(
+    (teamNameOverride?: string, submittedContent?: ComposerDraftContent) => {
+      const currentTeamName = teamNameRef.current;
+      const teamNameForPersist = teamNameOverride ?? currentTeamName;
+      const isCurrentTeam = teamNameForPersist === currentTeamName;
+
+      if (!isCurrentTeam) {
+        void deleteSubmittedSnapshotIfCurrent(teamNameForPersist, submittedContent);
+        return;
+      }
+
+      if (timerRef.current != null) {
+        clearTimeout(timerRef.current);
+        timerRef.current = null;
+      }
+      pendingRef.current = null;
+      const persistenceVersion = ++persistenceVersionRef.current;
+
+      const isEmpty =
+        textRef.current.length === 0 &&
+        chipsRef.current.length === 0 &&
+        attachmentsRef.current.length === 0;
+      if (isEmpty) {
+        void deleteSubmittedSnapshotIfCurrent(teamNameForPersist, submittedContent);
+        setIsSaved(false);
+        return;
+      }
+
+      const snapshot = buildSnapshot();
+      void enqueuePersist(() =>
+        composerDraftStorage.saveSnapshot(teamNameForPersist, snapshot)
+      ).then(() => {
+        if (mountedRef.current && persistenceVersionRef.current === persistenceVersion) {
+          setIsSaved(true);
+        }
+      });
+    },
+    [buildSnapshot, deleteSubmittedSnapshotIfCurrent, enqueuePersist]
+  );
+
+  const restoreDraft = useCallback(
+    (content: ComposerDraftContent) => {
+      userTouchedRef.current = true;
+      const snapshot = toSnapshot(content);
+      applySnapshot(snapshot);
+      setAttachmentError(null);
+      setIsSaved(false);
+      scheduleSave();
+    },
+    [applySnapshot, scheduleSave, toSnapshot]
+  );
 
   return {
     text,
@@ -499,5 +653,8 @@ export function useComposerDraft(teamName: string): UseComposerDraftResult {
     isSaved,
     isLoaded,
     clearDraft,
+    hideDraftForPendingSend,
+    finalizePendingSendClear,
+    restoreDraft,
   };
 }
diff --git a/src/renderer/services/composerDraftStorage.ts b/src/renderer/services/composerDraftStorage.ts
index b8ec54d7..43151171 100644
--- a/src/renderer/services/composerDraftStorage.ts
+++ b/src/renderer/services/composerDraftStorage.ts
@@ -25,6 +25,7 @@ export interface ComposerDraftSnapshot {
   chips: InlineChip[];
   attachments: AttachmentPayload[];
   actionMode?: AgentActionMode;
+  pendingSendId?: string;
   updatedAt: number;
 }
 
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 75751dbc..b19f8f9f 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -42,6 +42,7 @@ import { createTabUISlice } from './slices/tabUISlice';
 import {
   createTeamSlice,
   getActiveTeamPendingReplyWaits,
+  getCurrentProvisioningProgressForTeam,
   getLastResolvedTeamDataRefreshAt,
   hasActiveTeamPendingReplyWait,
   isTeamDataRefreshPending,
@@ -49,6 +50,16 @@ import {
 } from './slices/teamSlice';
 import { createUISlice } from './slices/uiSlice';
 import { createUpdateSlice } from './slices/updateSlice';
+import {
+  decideProcessFanoutDryRun,
+  decideProcessFanoutMode,
+  type TeamProcessFanoutDecision,
+} from './teamProcessFanoutDryRun';
+import { installTeamRefreshFanoutDebugBridge } from './teamRefreshFanoutDebugBridge';
+import {
+  noteTeamRefreshFanout,
+  type TeamRefreshFanoutOperation,
+} from './teamRefreshFanoutDiagnostics';
 
 import type { DetectedError } from '../types/data';
 import type { AppState } from './types';
@@ -59,6 +70,7 @@ import type {
   LeadContextUsage,
   ScheduleChangeEvent,
   TeamChangeEvent,
+  TeamProvisioningProgress,
   ToolActivityEventPayload,
   ToolApprovalEvent,
   ToolApprovalRequest,
@@ -75,6 +87,9 @@ const TEAM_CHANGE_EVENT_WARN_THROTTLE_MS = 2_000;
 const TEAM_VISIBLE_IDLE_WATCHDOG_POLL_MS = 10_000;
 const TEAM_VISIBLE_IDLE_WATCHDOG_STALE_MS = 30_000;
 const TEAM_MESSAGE_FALLBACK_POLL_MS = 10_000;
+const ACTIVE_PROVISIONING_STATES_FOR_PROCESS_LITE: ReadonlySet<TeamProvisioningProgress['state']> =
+  new Set(['validating', 'spawning', 'configuring', 'assembling', 'finalizing', 'verifying']);
+export const TEAM_PROCESS_LITE_FANOUT_STORAGE_KEY = 'team:processLiteFanout';
 const CURRENT_APP_VERSION =
   typeof __APP_VERSION__ === 'string' ? normalizeVersion(__APP_VERSION__) : '0.0.0';
 const logger = createLogger('Store:index');
@@ -98,6 +113,17 @@ const teamChangeEventDiagnostics = new Map<
   }
 >();
 
+export function isTeamProcessLiteFanoutEnabled(): boolean {
+  if (typeof window === 'undefined') {
+    return true;
+  }
+  try {
+    return window.localStorage.getItem(TEAM_PROCESS_LITE_FANOUT_STORAGE_KEY) !== '0';
+  } catch {
+    return true;
+  }
+}
+
 function noteTeamChangeEventBurst(teamName: string, eventType: string, visible: boolean): void {
   if (!visible) return;
 
@@ -172,6 +198,7 @@ export const useStore = create<AppState>()((...args) => ({
 export function initializeNotificationListeners(): () => void {
   void cleanupCommentReadState();
   const cleanupFns: (() => void)[] = [];
+  cleanupFns.push(installTeamRefreshFanoutDebugBridge());
   let cliStatusTimer: ReturnType<typeof setTimeout> | null = null;
   useStore.getState().subscribeProvisioningProgress();
   cleanupFns.push(() => {
@@ -244,12 +271,18 @@ export function initializeNotificationListeners(): () => void {
   let memberSpawnRefreshTimers = new Map<string, ReturnType<typeof setTimeout>>();
   let teamAgentRuntimeRefreshTimers = new Map<string, ReturnType<typeof setTimeout>>();
   let toolActivityTimers = new Map<string, ReturnType<typeof setTimeout>>();
+  let processLiteStructuralReconcileTimers = new Map<
+    string,
+    { firstScheduledAt: number; timer: ReturnType<typeof setTimeout> }
+  >();
   let inProgressChangePresencePollInFlight = false;
   let teamMessageFallbackPollInFlight = false;
   const inProgressChangePresenceCursorByTeam = new Map<string, number>();
 
   let teamListRefreshTimer: ReturnType<typeof setTimeout> | null = null;
   let globalTasksRefreshTimer: ReturnType<typeof setTimeout> | null = null;
+  const pendingTeamListRefreshDiagnostics = new Map<string, Set<string>>();
+  const pendingGlobalTasksRefreshDiagnostics = new Map<string, Set<string>>();
   const SESSION_REFRESH_DEBOUNCE_MS = 150;
   const PROJECT_REFRESH_DEBOUNCE_MS = 300;
   const TEAM_REFRESH_THROTTLE_MS = 800;
@@ -257,6 +290,66 @@ export function initializeNotificationListeners(): () => void {
   const TEAM_MEMBER_SPAWN_REFRESH_THROTTLE_MS = 500;
   const TEAM_LIST_REFRESH_THROTTLE_MS = 2000;
   const GLOBAL_TASKS_REFRESH_THROTTLE_MS = 500;
+  const PROCESS_LITE_STRUCTURAL_RECONCILE_IDLE_MS = 2_500;
+  const PROCESS_LITE_STRUCTURAL_RECONCILE_MAX_WAIT_MS = 15_000;
+  const buildTeamChangeFanoutReason = (eventType: string): string => `event:${eventType}`;
+  const isProvisioningProgressActiveForProcessLite = (
+    progress: Pick<TeamProvisioningProgress, 'state'> | null
+  ): boolean => progress != null && ACTIVE_PROVISIONING_STATES_FOR_PROCESS_LITE.has(progress.state);
+  const hasActiveProvisioningRunForTeam = (teamName: string): boolean => {
+    return isProvisioningProgressActiveForProcessLite(
+      getCurrentProvisioningProgressForTeam(useStore.getState(), teamName)
+    );
+  };
+  const shouldDeferAutomaticTeamDataRefreshDuringLaunch = (teamName: string): boolean => {
+    return isTeamProcessLiteFanoutEnabled() && hasActiveProvisioningRunForTeam(teamName);
+  };
+  const addPendingGlobalRefreshDiagnostic = (
+    pending: Map<string, Set<string>>,
+    teamName: string,
+    reason: string
+  ): void => {
+    const reasons = pending.get(teamName) ?? new Set<string>();
+    reasons.add(reason);
+    pending.set(teamName, reasons);
+  };
+  const drainPendingGlobalRefreshDiagnostics = (
+    pending: Map<string, Set<string>>,
+    operation: TeamRefreshFanoutOperation
+  ): void => {
+    const entries = Array.from(pending.entries());
+    pending.clear();
+    for (const [teamName, reasons] of entries) {
+      for (const reason of reasons) {
+        noteTeamRefreshFanout({
+          teamName,
+          surface: 'team-change-listener',
+          phase: 'executed',
+          reason,
+          operation,
+        });
+      }
+    }
+  };
+  const noteGlobalRefreshScheduled = (
+    pending: Map<string, Set<string>>,
+    teamName: string | null | undefined,
+    reason: string,
+    operation: TeamRefreshFanoutOperation,
+    coalesced: boolean
+  ): void => {
+    if (!teamName) {
+      return;
+    }
+    addPendingGlobalRefreshDiagnostic(pending, teamName, reason);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: coalesced ? 'coalesced' : 'scheduled',
+      reason,
+      operation,
+    });
+  };
   const refreshTrackedTeamMessages = async (teamName: string): Promise<void> => {
     if (!teamName || !shouldRefreshTeamMessages(teamName)) {
       return;
@@ -274,41 +367,138 @@ export function initializeNotificationListeners(): () => void {
       // Best-effort refresh for message-driven events and fallback polling only.
     }
   };
-  const scheduleMemberSpawnStatusesRefresh = (teamName: string | null | undefined): void => {
+  type RuntimeRefreshReason = 'event:member-spawn' | 'event:process-lite';
+  interface RuntimeRefreshScheduleOptions {
+    reason?: RuntimeRefreshReason;
+    skipIfHiddenAtExecution?: boolean;
+  }
+  const buildRuntimeRefreshTimerKey = (teamName: string, reason: RuntimeRefreshReason): string =>
+    `${teamName}:${reason}`;
+  const scheduleMemberSpawnStatusesRefresh = (
+    teamName: string | null | undefined,
+    options: RuntimeRefreshScheduleOptions = {}
+  ): void => {
     if (!teamName || !isTeamVisibleInAnyPane(teamName)) {
       return;
     }
-    if (memberSpawnRefreshTimers.has(teamName)) {
+    const reason = options.reason ?? 'event:member-spawn';
+    const timerKey = buildRuntimeRefreshTimerKey(teamName, reason);
+    const existingTimer = memberSpawnRefreshTimers.get(timerKey);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: existingTimer ? 'coalesced' : 'scheduled',
+      reason,
+      operation: 'fetchMemberSpawnStatuses',
+    });
+    if (memberSpawnRefreshTimers.has(timerKey)) {
       return;
     }
     const timer = setTimeout(() => {
-      memberSpawnRefreshTimers.delete(teamName);
+      memberSpawnRefreshTimers.delete(timerKey);
+      if (options.skipIfHiddenAtExecution === true && !isTeamVisibleInAnyPane(teamName)) {
+        noteTeamRefreshFanout({
+          teamName,
+          surface: 'team-change-listener',
+          phase: 'skipped',
+          reason,
+          operation: 'fetchMemberSpawnStatuses',
+          visible: false,
+        });
+        return;
+      }
+      noteTeamRefreshFanout({
+        teamName,
+        surface: 'team-change-listener',
+        phase: 'executed',
+        reason,
+        operation: 'fetchMemberSpawnStatuses',
+      });
       void useStore.getState().fetchMemberSpawnStatuses(teamName);
     }, TEAM_MEMBER_SPAWN_REFRESH_THROTTLE_MS);
-    memberSpawnRefreshTimers.set(teamName, timer);
+    memberSpawnRefreshTimers.set(timerKey, timer);
   };
-  const scheduleTeamAgentRuntimeRefresh = (teamName: string | null | undefined): void => {
+  const scheduleTeamAgentRuntimeRefresh = (
+    teamName: string | null | undefined,
+    options: RuntimeRefreshScheduleOptions = {}
+  ): void => {
     if (!teamName || !isTeamVisibleInAnyPane(teamName)) {
       return;
     }
-    if (teamAgentRuntimeRefreshTimers.has(teamName)) {
+    const reason = options.reason ?? 'event:member-spawn';
+    const timerKey = buildRuntimeRefreshTimerKey(teamName, reason);
+    const existingTimer = teamAgentRuntimeRefreshTimers.get(timerKey);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: existingTimer ? 'coalesced' : 'scheduled',
+      reason,
+      operation: 'fetchTeamAgentRuntime',
+    });
+    if (teamAgentRuntimeRefreshTimers.has(timerKey)) {
       return;
     }
     const timer = setTimeout(() => {
-      teamAgentRuntimeRefreshTimers.delete(teamName);
+      teamAgentRuntimeRefreshTimers.delete(timerKey);
+      if (options.skipIfHiddenAtExecution === true && !isTeamVisibleInAnyPane(teamName)) {
+        noteTeamRefreshFanout({
+          teamName,
+          surface: 'team-change-listener',
+          phase: 'skipped',
+          reason,
+          operation: 'fetchTeamAgentRuntime',
+          visible: false,
+        });
+        return;
+      }
+      noteTeamRefreshFanout({
+        teamName,
+        surface: 'team-change-listener',
+        phase: 'executed',
+        reason,
+        operation: 'fetchTeamAgentRuntime',
+      });
       void useStore.getState().fetchTeamAgentRuntime(teamName);
     }, TEAM_MEMBER_SPAWN_REFRESH_THROTTLE_MS);
-    teamAgentRuntimeRefreshTimers.set(teamName, timer);
+    teamAgentRuntimeRefreshTimers.set(timerKey, timer);
   };
-  const scheduleTrackedTeamMessageRefresh = (teamName: string | null | undefined): void => {
+  const scheduleProcessLiteRuntimeRefresh = (teamName: string): void => {
+    scheduleMemberSpawnStatusesRefresh(teamName, {
+      reason: 'event:process-lite',
+      skipIfHiddenAtExecution: true,
+    });
+    scheduleTeamAgentRuntimeRefresh(teamName, {
+      reason: 'event:process-lite',
+      skipIfHiddenAtExecution: true,
+    });
+  };
+  const scheduleTrackedTeamMessageRefresh = (
+    teamName: string | null | undefined,
+    reason: 'event:inbox' | 'event:lead-message'
+  ): void => {
     if (!teamName || !shouldRefreshTeamMessages(teamName)) {
       return;
     }
+    const existingTimer = teamMessageRefreshTimers.get(teamName);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: existingTimer ? 'coalesced' : 'scheduled',
+      reason,
+      operation: 'fetchTeamMessageHead',
+    });
     if (teamMessageRefreshTimers.has(teamName)) {
       return;
     }
     const timer = setTimeout(() => {
       teamMessageRefreshTimers.delete(teamName);
+      noteTeamRefreshFanout({
+        teamName,
+        surface: 'team-change-listener',
+        phase: 'executed',
+        reason,
+        operation: 'fetchTeamMessageHead',
+      });
       void refreshTrackedTeamMessages(teamName);
     }, TEAM_REFRESH_THROTTLE_MS);
     teamMessageRefreshTimers.set(teamName, timer);
@@ -466,6 +656,9 @@ export function initializeNotificationListeners(): () => void {
       for (const teamName of visibleTeamNames) {
         const teamData = selectTeamDataForName(state, teamName);
         if (teamData?.teamName !== teamName) {
+          if (shouldDeferAutomaticTeamDataRefreshDuringLaunch(teamName)) {
+            continue;
+          }
           if (!isTeamDataRefreshPending(teamName)) {
             void state.refreshTeamData(teamName, { withDedup: true });
           }
@@ -497,6 +690,9 @@ export function initializeNotificationListeners(): () => void {
 
         const currentTeamData = selectTeamDataForName(current, teamName);
         if (currentTeamData?.teamName !== teamName) {
+          if (shouldDeferAutomaticTeamDataRefreshDuringLaunch(teamName)) {
+            continue;
+          }
           if (!isTeamDataRefreshPending(teamName)) {
             void current.refreshTeamData(teamName, { withDedup: true });
           }
@@ -686,6 +882,179 @@ export function initializeNotificationListeners(): () => void {
 
     return activeTab.teamName;
   };
+  const buildProcessFanoutDecision = (
+    event: TeamChangeEvent,
+    isStaleRuntimeEvent: boolean
+  ): TeamProcessFanoutDecision => {
+    const state = useStore.getState();
+    const teamName = event.teamName;
+    return decideProcessFanoutMode({
+      teamName,
+      eventType: event.type,
+      detail: event.detail,
+      hasRunId: Boolean(event.runId),
+      isStaleRuntimeEvent,
+      isVisible: isTeamVisibleInAnyPane(teamName),
+      hasVisibleTeamData: selectTeamDataForName(state, teamName) != null,
+      hasActiveProvisioningRun: isProvisioningProgressActiveForProcessLite(
+        getCurrentProvisioningProgressForTeam(state, teamName)
+      ),
+      hasCurrentRuntimeRun: state.currentRuntimeRunIdByTeam[teamName] != null,
+    });
+  };
+  const recordProcessFanoutDecision = (
+    event: TeamChangeEvent,
+    decision: TeamProcessFanoutDecision
+  ): void => {
+    const dryRun = decideProcessFanoutDryRun({
+      teamName: event.teamName,
+      eventType: event.type,
+      detail: event.detail,
+      hasRunId: Boolean(event.runId),
+      isStaleRuntimeEvent: decision.reason === 'stale-runtime-event',
+      isVisible: decision.reason !== 'hidden-team',
+      hasVisibleTeamData: decision.reason !== 'missing-visible-team-data',
+      hasActiveProvisioningRun: decision.reason !== 'no-active-runtime-context',
+      hasCurrentRuntimeRun: decision.reason !== 'no-active-runtime-context',
+    });
+    const state = useStore.getState();
+
+    noteTeamRefreshFanout({
+      teamName: event.teamName,
+      surface: 'team-change-listener',
+      phase: 'skipped',
+      reason: `dry-run:process-lite:${dryRun.reason}`,
+      operation: dryRun.wouldUseProcessLite ? 'wouldUseProcessLite' : 'wouldKeepStructuralProcess',
+      eventType: event.type,
+      visible: isTeamVisibleInAnyPane(event.teamName),
+      selected: state.selectedTeamName === event.teamName,
+      activeTab: getFocusedVisibleTeamName() === event.teamName,
+    });
+  };
+  const cancelProcessLiteStructuralReconcile = (
+    teamName: string,
+    reason = 'event:process-lite:structural-reconcile:cancelled-by-structural'
+  ): void => {
+    const existing = processLiteStructuralReconcileTimers.get(teamName);
+    if (!existing) {
+      return;
+    }
+    clearTimeout(existing.timer);
+    processLiteStructuralReconcileTimers.delete(teamName);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: 'skipped',
+      reason,
+      operation: 'refreshTeamData',
+    });
+  };
+  const shouldSuppressProcessLiteStructuralReconcileDuringLaunch = (teamName: string): boolean => {
+    return isTeamProcessLiteFanoutEnabled() && hasActiveProvisioningRunForTeam(teamName);
+  };
+  const noteProcessLiteStructuralReconcileSuppressedDuringLaunch = (teamName: string): void => {
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: 'skipped',
+      reason: 'event:process-lite:structural-reconcile:suppressed-during-launch',
+      operation: 'refreshTeamData',
+      visible: isTeamVisibleInAnyPane(teamName),
+      selected: useStore.getState().selectedTeamName === teamName,
+      activeTab: getFocusedVisibleTeamName() === teamName,
+    });
+  };
+  const shouldUseLaunchProcessRuntimeOnlyFanout = (
+    event: TeamChangeEvent,
+    isStaleRuntimeEvent: boolean
+  ): boolean => {
+    return (
+      event.type === 'process' &&
+      event.detail === 'processes.json' &&
+      !isStaleRuntimeEvent &&
+      isTeamVisibleInAnyPane(event.teamName) &&
+      shouldSuppressProcessLiteStructuralReconcileDuringLaunch(event.teamName)
+    );
+  };
+  const noteLaunchProcessStructuralSuppressed = (
+    teamName: string,
+    operation: 'fetchTeams' | 'refreshTeamData'
+  ): void => {
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: 'skipped',
+      reason: 'event:process-lite:structural-suppressed-during-launch',
+      operation,
+      eventType: 'process',
+      selected: useStore.getState().selectedTeamName === teamName,
+      visible: true,
+      activeTab: getFocusedVisibleTeamName() === teamName,
+    });
+  };
+  const runProcessLiteStructuralReconcile = (teamName: string): void => {
+    if (shouldSuppressProcessLiteStructuralReconcileDuringLaunch(teamName)) {
+      noteProcessLiteStructuralReconcileSuppressedDuringLaunch(teamName);
+      return;
+    }
+
+    const current = useStore.getState();
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: 'executed',
+      reason: 'event:process-lite:structural-reconcile',
+      operation: 'fetchTeams',
+    });
+    void current.fetchTeams();
+
+    if (!isTeamVisibleInAnyPane(teamName) || selectTeamDataForName(current, teamName) == null) {
+      noteTeamRefreshFanout({
+        teamName,
+        surface: 'team-change-listener',
+        phase: 'skipped',
+        reason: 'event:process-lite:structural-reconcile:hidden-or-missing-data',
+        operation: 'refreshTeamData',
+        visible: isTeamVisibleInAnyPane(teamName),
+      });
+      return;
+    }
+
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: 'executed',
+      reason: 'event:process-lite:structural-reconcile',
+      operation: 'refreshTeamData',
+      selected: current.selectedTeamName === teamName,
+      visible: true,
+      activeTab: getFocusedVisibleTeamName() === teamName,
+    });
+    void current.refreshTeamData(teamName, { withDedup: true });
+  };
+  const scheduleProcessLiteStructuralReconcile = (teamName: string): void => {
+    const now = Date.now();
+    const existing = processLiteStructuralReconcileTimers.get(teamName);
+    const firstScheduledAt = existing?.firstScheduledAt ?? now;
+    if (existing) {
+      clearTimeout(existing.timer);
+    }
+    const elapsed = now - firstScheduledAt;
+    const remainingMaxWait = Math.max(0, PROCESS_LITE_STRUCTURAL_RECONCILE_MAX_WAIT_MS - elapsed);
+    const delay = Math.min(PROCESS_LITE_STRUCTURAL_RECONCILE_IDLE_MS, remainingMaxWait);
+    noteTeamRefreshFanout({
+      teamName,
+      surface: 'team-change-listener',
+      phase: existing ? 'coalesced' : 'scheduled',
+      reason: 'event:process-lite:structural-reconcile',
+      operation: 'refreshTeamData',
+    });
+    const timer = setTimeout(() => {
+      processLiteStructuralReconcileTimers.delete(teamName);
+      runProcessLiteStructuralReconcile(teamName);
+    }, delay);
+    processLiteStructuralReconcileTimers.set(teamName, { firstScheduledAt, timer });
+  };
 
   const pollTrackedTeamMessageFallback = async (): Promise<void> => {
     if (teamMessageFallbackPollInFlight) {
@@ -700,7 +1069,16 @@ export function initializeNotificationListeners(): () => void {
     teamMessageFallbackPollInFlight = true;
     try {
       await Promise.allSettled(
-        Array.from(teamNames, (teamName) => refreshTrackedTeamMessages(teamName))
+        Array.from(teamNames, (teamName) => {
+          noteTeamRefreshFanout({
+            teamName,
+            surface: 'pending-reply-fallback',
+            phase: 'executed',
+            reason: 'pending-reply:fallback-poll',
+            operation: 'fetchTeamMessageHead',
+          });
+          return refreshTrackedTeamMessages(teamName);
+        })
       );
     } finally {
       teamMessageFallbackPollInFlight = false;
@@ -726,6 +1104,10 @@ export function initializeNotificationListeners(): () => void {
       return;
     }
 
+    if (shouldDeferAutomaticTeamDataRefreshDuringLaunch(teamName)) {
+      return;
+    }
+
     const lastRelevantActivityAt = teamLastRelevantActivityAt.get(teamName) ?? 0;
     const lastResolvedRefreshAt = getLastResolvedTeamDataRefreshAt(teamName) ?? 0;
     const idleBaselineAt = Math.max(lastRelevantActivityAt, lastResolvedRefreshAt);
@@ -1213,7 +1595,7 @@ export function initializeNotificationListeners(): () => void {
       }
 
       if (event.type === 'inbox') {
-        scheduleTrackedTeamMessageRefresh(event.teamName);
+        scheduleTrackedTeamMessageRefresh(event.teamName, 'event:inbox');
         return;
       }
 
@@ -1224,7 +1606,7 @@ export function initializeNotificationListeners(): () => void {
           return;
         }
         seedCurrentRunIdIfMissing();
-        scheduleTrackedTeamMessageRefresh(event.teamName);
+        scheduleTrackedTeamMessageRefresh(event.teamName, 'event:lead-message');
         return;
       }
 
@@ -1232,22 +1614,103 @@ export function initializeNotificationListeners(): () => void {
         if (!event?.teamName || !isTeamVisibleInAnyPane(event.teamName)) {
           return;
         }
-        if (teamPresenceRefreshTimers.has(event.teamName)) {
+        const existingTimer = teamPresenceRefreshTimers.get(event.teamName);
+        noteTeamRefreshFanout({
+          teamName: event.teamName,
+          surface: 'team-change-listener',
+          phase: existingTimer ? 'coalesced' : 'scheduled',
+          reason: 'event:log-source-change',
+          operation: 'refreshTaskChangePresence',
+        });
+        if (existingTimer) {
           return;
         }
         const timer = setTimeout(() => {
           teamPresenceRefreshTimers.delete(event.teamName);
           const current = useStore.getState();
+          noteTeamRefreshFanout({
+            teamName: event.teamName,
+            surface: 'team-change-listener',
+            phase: 'executed',
+            reason: 'event:log-source-change',
+            operation: 'refreshTaskChangePresence',
+          });
           void current.refreshTeamChangePresence(event.teamName);
         }, TEAM_PRESENCE_REFRESH_THROTTLE_MS);
         teamPresenceRefreshTimers.set(event.teamName, timer);
         return;
       }
 
+      if (event.type === 'process') {
+        const processDecision = buildProcessFanoutDecision(event, isStaleRuntimeEvent);
+        recordProcessFanoutDecision(event, processDecision);
+        if (
+          isTeamProcessLiteFanoutEnabled() &&
+          shouldUseLaunchProcessRuntimeOnlyFanout(event, isStaleRuntimeEvent)
+        ) {
+          noteLaunchProcessStructuralSuppressed(event.teamName, 'fetchTeams');
+          noteLaunchProcessStructuralSuppressed(event.teamName, 'refreshTeamData');
+          scheduleProcessLiteRuntimeRefresh(event.teamName);
+          cancelProcessLiteStructuralReconcile(
+            event.teamName,
+            'event:process-lite:structural-reconcile:cancelled-during-launch'
+          );
+          noteProcessLiteStructuralReconcileSuppressedDuringLaunch(event.teamName);
+          return;
+        }
+        if (processDecision.mode === 'process-lite' && isTeamProcessLiteFanoutEnabled()) {
+          noteTeamRefreshFanout({
+            teamName: event.teamName,
+            surface: 'team-change-listener',
+            phase: 'skipped',
+            reason: 'event:process-lite:structural-suppressed',
+            operation: 'fetchTeams',
+            eventType: event.type,
+            selected: useStore.getState().selectedTeamName === event.teamName,
+            visible: true,
+            activeTab: getFocusedVisibleTeamName() === event.teamName,
+          });
+          noteTeamRefreshFanout({
+            teamName: event.teamName,
+            surface: 'team-change-listener',
+            phase: 'skipped',
+            reason: 'event:process-lite:structural-suppressed',
+            operation: 'refreshTeamData',
+            eventType: event.type,
+            selected: useStore.getState().selectedTeamName === event.teamName,
+            visible: true,
+            activeTab: getFocusedVisibleTeamName() === event.teamName,
+          });
+          scheduleProcessLiteRuntimeRefresh(event.teamName);
+          scheduleProcessLiteStructuralReconcile(event.teamName);
+          return;
+        }
+        if (processDecision.mode === 'process-lite') {
+          noteTeamRefreshFanout({
+            teamName: event.teamName,
+            surface: 'team-change-listener',
+            phase: 'skipped',
+            reason: 'event:process-lite:disabled',
+            operation: 'wouldKeepStructuralProcess',
+            eventType: event.type,
+          });
+        }
+      }
+
+      const eventReason = buildTeamChangeFanoutReason(event.type);
+
       // Throttled refresh of summary list (keeps TeamListView current without flooding).
+      noteGlobalRefreshScheduled(
+        pendingTeamListRefreshDiagnostics,
+        event.teamName,
+        eventReason,
+        'fetchTeams',
+        teamListRefreshTimer != null
+      );
       if (!teamListRefreshTimer) {
         teamListRefreshTimer = setTimeout(() => {
           teamListRefreshTimer = null;
+          drainPendingGlobalRefreshDiagnostics(pendingTeamListRefreshDiagnostics, 'fetchTeams');
           void useStore.getState().fetchTeams();
         }, TEAM_LIST_REFRESH_THROTTLE_MS);
       }
@@ -1255,11 +1718,24 @@ export function initializeNotificationListeners(): () => void {
       const shouldRefreshGlobalTasks = event.type === 'task' || event.type === 'config';
 
       // Throttled refresh of global tasks list for sidebar.
-      if (shouldRefreshGlobalTasks && !globalTasksRefreshTimer) {
-        globalTasksRefreshTimer = setTimeout(() => {
-          globalTasksRefreshTimer = null;
-          void useStore.getState().fetchAllTasks();
-        }, GLOBAL_TASKS_REFRESH_THROTTLE_MS);
+      if (shouldRefreshGlobalTasks) {
+        noteGlobalRefreshScheduled(
+          pendingGlobalTasksRefreshDiagnostics,
+          event.teamName,
+          eventReason,
+          'fetchAllTasks',
+          globalTasksRefreshTimer != null
+        );
+        if (!globalTasksRefreshTimer) {
+          globalTasksRefreshTimer = setTimeout(() => {
+            globalTasksRefreshTimer = null;
+            drainPendingGlobalRefreshDiagnostics(
+              pendingGlobalTasksRefreshDiagnostics,
+              'fetchAllTasks'
+            );
+            void useStore.getState().fetchAllTasks();
+          }, GLOBAL_TASKS_REFRESH_THROTTLE_MS);
+        }
       }
 
       if (!event?.teamName || !isTeamVisibleInAnyPane(event.teamName)) {
@@ -1268,13 +1744,39 @@ export function initializeNotificationListeners(): () => void {
 
       // Per-team throttle (not debounce): keep at most one pending detail refresh per team.
       // Debounce would delay indefinitely while inbox messages keep arriving.
-      if (teamRefreshTimers.has(event.teamName)) {
+      cancelProcessLiteStructuralReconcile(event.teamName);
+      const selectedForRefresh = useStore.getState().selectedTeamName === event.teamName;
+      const activeTabForRefresh = getFocusedVisibleTeamName() === event.teamName;
+      const existingDetailTimer = teamRefreshTimers.get(event.teamName);
+      noteTeamRefreshFanout({
+        teamName: event.teamName,
+        surface: 'team-change-listener',
+        phase: existingDetailTimer ? 'coalesced' : 'scheduled',
+        reason: eventReason,
+        operation: 'refreshTeamData',
+        eventType: event.type,
+        selected: selectedForRefresh,
+        visible: true,
+        activeTab: activeTabForRefresh,
+      });
+      if (existingDetailTimer) {
         return;
       }
 
       const timer = setTimeout(() => {
         teamRefreshTimers.delete(event.teamName);
         const current = useStore.getState();
+        noteTeamRefreshFanout({
+          teamName: event.teamName,
+          surface: 'team-change-listener',
+          phase: 'executed',
+          reason: eventReason,
+          operation: 'refreshTeamData',
+          eventType: event.type,
+          selected: current.selectedTeamName === event.teamName,
+          visible: isTeamVisibleInAnyPane(event.teamName),
+          activeTab: getFocusedVisibleTeamName() === event.teamName,
+        });
         void current.refreshTeamData(event.teamName, { withDedup: true });
       }, TEAM_REFRESH_THROTTLE_MS);
       teamRefreshTimers.set(event.teamName, timer);
@@ -1295,16 +1797,22 @@ export function initializeNotificationListeners(): () => void {
         teamAgentRuntimeRefreshTimers = new Map();
         for (const t of toolActivityTimers.values()) clearTimeout(t);
         toolActivityTimers = new Map();
+        for (const state of processLiteStructuralReconcileTimers.values()) {
+          clearTimeout(state.timer);
+        }
+        processLiteStructuralReconcileTimers = new Map();
         teamLastRelevantActivityAt.clear();
         teamLastIdleWatchdogRefreshAt.clear();
         if (teamListRefreshTimer) {
           clearTimeout(teamListRefreshTimer);
           teamListRefreshTimer = null;
         }
+        pendingTeamListRefreshDiagnostics.clear();
         if (globalTasksRefreshTimer) {
           clearTimeout(globalTasksRefreshTimer);
           globalTasksRefreshTimer = null;
         }
+        pendingGlobalTasksRefreshDiagnostics.clear();
       });
     }
   }
diff --git a/src/renderer/store/slices/notificationSlice.ts b/src/renderer/store/slices/notificationSlice.ts
index 2d0d3f60..44b1f082 100644
--- a/src/renderer/store/slices/notificationSlice.ts
+++ b/src/renderer/store/slices/notificationSlice.ts
@@ -10,11 +10,95 @@ import { getAllTabs } from '../utils/paneHelpers';
 
 import type { AppState } from '../types';
 import type { DetectedError } from '@renderer/types/data';
+import type { NotificationTarget } from '@shared/types';
 import type { StateCreator } from 'zustand';
 
 const logger = createLogger('Store:notification');
 const NOTIFICATIONS_FETCH_LIMIT = 200;
 
+function getTeamNameFromError(error: DetectedError): string | null {
+  if (error.sessionId.startsWith('team:')) {
+    const teamName = error.sessionId.slice('team:'.length).trim();
+    return teamName || null;
+  }
+  return null;
+}
+
+function isNotificationTarget(value: unknown): value is NotificationTarget {
+  if (!value || typeof value !== 'object') return false;
+  const row = value as Record<string, unknown>;
+  if (row.kind === 'team') return typeof row.teamName === 'string' && row.teamName.length > 0;
+  if (row.kind === 'task') {
+    return (
+      typeof row.teamName === 'string' &&
+      row.teamName.length > 0 &&
+      typeof row.taskId === 'string' &&
+      row.taskId.length > 0
+    );
+  }
+  if (row.kind === 'member') {
+    return (
+      typeof row.teamName === 'string' &&
+      row.teamName.length > 0 &&
+      typeof row.memberName === 'string' &&
+      row.memberName.length > 0
+    );
+  }
+  return false;
+}
+
+function parseLegacyTeamTarget(error: DetectedError, fallbackTeamName: string): NotificationTarget {
+  const dedupeParts = (error.dedupeKey ?? '').split(':');
+  const kind = dedupeParts[0];
+  const teamName = dedupeParts[1] || fallbackTeamName;
+
+  if (
+    (kind === 'comment' || kind === 'clarification' || kind === 'status' || kind === 'created') &&
+    dedupeParts[2]
+  ) {
+    return {
+      kind: 'task',
+      teamName,
+      taskId: dedupeParts[2],
+      commentId: kind === 'comment' ? dedupeParts[3] : undefined,
+      focus: kind === 'comment' || kind === 'clarification' ? 'comments' : 'detail',
+    };
+  }
+
+  if (kind === 'inbox' && dedupeParts[2]) {
+    return { kind: 'member', teamName, memberName: dedupeParts[2], focus: 'messages' };
+  }
+
+  return { kind: 'team', teamName, section: 'overview' };
+}
+
+function getTeamNotificationTarget(error: DetectedError): NotificationTarget | null {
+  if (isNotificationTarget(error.target)) {
+    return error.target;
+  }
+
+  const teamName = getTeamNameFromError(error);
+  if (!teamName) return null;
+
+  return parseLegacyTeamTarget(error, teamName);
+}
+
+function navigateToTeamNotification(state: AppState, error: DetectedError): void {
+  const target = getTeamNotificationTarget(error);
+  const teamName = target?.teamName ?? getTeamNameFromError(error);
+  if (!teamName) return;
+
+  state.openTeamTab(teamName, error.context.cwd);
+
+  if (target?.kind === 'team' && target.section) {
+    state.focusTeamSection(target.teamName, target.section);
+  } else if (target?.kind === 'task') {
+    state.openGlobalTaskDetail(target.teamName, target.taskId, target.commentId);
+  } else if (target?.kind === 'member') {
+    state.openMemberProfile(target.memberName, target.teamName, target.focus);
+  }
+}
+
 // =============================================================================
 // Slice Interface
 // =============================================================================
@@ -206,10 +290,9 @@ export const createNotificationSlice: StateCreator<AppState, [], [], Notificatio
     // Mark the notification as read
     void state.markNotificationRead(error.id);
 
-    // Team notifications (inbox, clarification, status change, rate-limit): open team tab
+    // Team notifications use structured targets when available.
     if (error.sessionId.startsWith('team:')) {
-      const teamName = error.sessionId.slice('team:'.length);
-      state.openTeamTab(teamName, error.context.cwd);
+      navigateToTeamNotification(state, error);
       return;
     }
 
diff --git a/src/renderer/store/slices/teamSlice.ts b/src/renderer/store/slices/teamSlice.ts
index b9adaedf..7e8ddc6a 100644
--- a/src/renderer/store/slices/teamSlice.ts
+++ b/src/renderer/store/slices/teamSlice.ts
@@ -20,6 +20,7 @@ import { formatTaskDisplayLabel } from '@shared/utils/taskIdentity';
 import { buildTeamGraphDefaultLayoutSeed } from '@shared/utils/teamGraphDefaultLayout';
 import { getStableTeamOwnerId } from '@shared/utils/teamStableOwnerId';
 
+import { noteTeamRefreshFanout } from '../teamRefreshFanoutDiagnostics';
 import { getWorktreeNavigationState } from '../utils/stateResetHelpers';
 
 import type { AppState } from '../types';
@@ -42,8 +43,10 @@ import type {
   MemberActivityMetaEntry,
   MemberSpawnStatusEntry,
   MemberSpawnStatusesSnapshot,
+  NotificationTarget,
   PersistedTeamLaunchSummary,
   ResolvedTeamMember,
+  RetryFailedOpenCodeSecondaryLanesResult,
   SendMessageRequest,
   SendMessageResult,
   TaskChangePresenceState,
@@ -51,6 +54,7 @@ import type {
   TeamAgentRuntimeEntry,
   TeamAgentRuntimeSnapshot,
   TeamCreateRequest,
+  TeamGetDataOptions,
   TeamLaunchRequest,
   TeamMemberActivityMeta,
   TeamMemberSnapshot,
@@ -75,9 +79,19 @@ const TEAM_FETCH_TIMEOUT_MS = 30_000;
 const MEMBER_SPAWN_STATUSES_IPC_RETRY_BACKOFF_MS = 5_000;
 const TEAM_REFRESH_BURST_WINDOW_MS = 4_000;
 const MEMBER_SPAWN_UI_EQUAL_WARN_THROTTLE_MS = 2_000;
+const POST_PAINT_TEAM_ENRICHMENT_FALLBACK_MS = 500;
 const inFlightTeamDataRequests = new Map<string, Promise<TeamViewSnapshot>>();
 const inFlightRefreshTeamDataCalls = new Map<string, Set<symbol>>();
 const pendingFreshTeamDataRefreshes = new Set<string>();
+const queuedFullTeamDataRefreshesAfterThin = new Set<string>();
+interface PostPaintHandle {
+  rafId?: number;
+  timerId?: ReturnType<typeof setTimeout>;
+  fallbackTimerId?: ReturnType<typeof setTimeout>;
+  cancelled: boolean;
+  ran: boolean;
+}
+const postPaintTeamEnrichmentTimers = new Map<string, PostPaintHandle>();
 const inFlightTeamMessagesHeadRequests = new Map<string, Promise<RefreshTeamMessagesHeadResult>>();
 const inFlightTeamMessagesOlderRequests = new Map<string, Promise<void>>();
 const queuedTeamMessagesHeadRefreshesAfterOlder = new Map<
@@ -103,6 +117,55 @@ interface RefreshTeamDataOptions {
   withDedup?: boolean;
 }
 
+type TeamDataSnapshotMode = 'full' | 'thin';
+
+function normalizeTeamGetDataOptions(options?: TeamGetDataOptions): TeamGetDataOptions | undefined {
+  return options?.includeMemberBranches === false ? { includeMemberBranches: false } : undefined;
+}
+
+function shouldIncludeMemberBranches(options?: TeamGetDataOptions): boolean {
+  return normalizeTeamGetDataOptions(options)?.includeMemberBranches !== false;
+}
+
+function getTeamDataSnapshotMode(options?: TeamGetDataOptions): TeamDataSnapshotMode {
+  return shouldIncludeMemberBranches(options) ? 'full' : 'thin';
+}
+
+function getTeamDataRequestKey(teamName: string, options?: TeamGetDataOptions): string {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
+  return `${teamName}\u0000mode:${getTeamDataSnapshotMode(normalizedOptions)}`;
+}
+
+function getTeamDataRequestLabel(teamName: string, options?: TeamGetDataOptions): string {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
+  return `team:getData(${teamName},mode=${getTeamDataSnapshotMode(normalizedOptions)})`;
+}
+
+function getFullTeamDataRequestKey(teamName: string): string {
+  return getTeamDataRequestKey(teamName);
+}
+
+function getThinTeamDataRequestKey(teamName: string): string {
+  return getTeamDataRequestKey(teamName, { includeMemberBranches: false });
+}
+
+function hasFullTeamDataRequestForTeam(teamName: string): boolean {
+  return inFlightTeamDataRequests.has(getFullTeamDataRequestKey(teamName));
+}
+
+function hasThinTeamDataRequestForTeam(teamName: string): boolean {
+  return inFlightTeamDataRequests.has(getThinTeamDataRequestKey(teamName));
+}
+
+function clearTeamDataRequestsForTeam(teamName: string): void {
+  const prefix = `${teamName}\u0000`;
+  for (const key of inFlightTeamDataRequests.keys()) {
+    if (key.startsWith(prefix)) {
+      inFlightTeamDataRequests.delete(key);
+    }
+  }
+}
+
 type TeamGraphSlotAssignments = Record<string, GraphOwnerSlotAssignment>;
 type TeamGraphMemberSeedInput = Pick<TeamMemberSnapshot, 'name' | 'agentId' | 'removedAt'>;
 type TeamGraphConfigMemberSeedInput = Pick<
@@ -116,9 +179,10 @@ interface TeamGraphLayoutSessionState {
 
 export function isTeamDataRefreshPending(teamName: string): boolean {
   return (
-    inFlightTeamDataRequests.has(teamName) ||
+    hasFullTeamDataRequestForTeam(teamName) ||
     (inFlightRefreshTeamDataCalls.get(teamName)?.size ?? 0) > 0 ||
-    pendingFreshTeamDataRefreshes.has(teamName)
+    pendingFreshTeamDataRefreshes.has(teamName) ||
+    queuedFullTeamDataRefreshesAfterThin.has(teamName)
   );
 }
 
@@ -142,6 +206,11 @@ export function __resetTeamSliceModuleStateForTests(): void {
   inFlightTeamDataRequests.clear();
   inFlightRefreshTeamDataCalls.clear();
   pendingFreshTeamDataRefreshes.clear();
+  queuedFullTeamDataRefreshesAfterThin.clear();
+  for (const teamName of postPaintTeamEnrichmentTimers.keys()) {
+    cancelPostPaintTeamEnrichments(teamName);
+  }
+  postPaintTeamEnrichmentTimers.clear();
   inFlightTeamMessagesHeadRequests.clear();
   inFlightTeamMessagesOlderRequests.clear();
   queuedTeamMessagesHeadRefreshesAfterOlder.clear();
@@ -182,9 +251,11 @@ function clearTeamScopedSelectorCaches(teamName: string): void {
 }
 
 function clearTeamScopedTransientState(teamName: string): void {
-  inFlightTeamDataRequests.delete(teamName);
+  clearTeamDataRequestsForTeam(teamName);
   inFlightRefreshTeamDataCalls.delete(teamName);
   pendingFreshTeamDataRefreshes.delete(teamName);
+  queuedFullTeamDataRefreshesAfterThin.delete(teamName);
+  cancelPostPaintTeamEnrichments(teamName);
   inFlightTeamMessagesHeadRequests.delete(teamName);
   inFlightTeamMessagesOlderRequests.delete(teamName);
   queuedTeamMessagesHeadRefreshesAfterOlder.delete(teamName);
@@ -387,12 +458,171 @@ function endInFlightTeamDataRefresh(teamName: string, token: symbol): void {
   }
 }
 
+function cancelPostPaintTeamEnrichments(teamName: string): void {
+  const handle = postPaintTeamEnrichmentTimers.get(teamName);
+  if (!handle) {
+    return;
+  }
+
+  handle.cancelled = true;
+  if (
+    handle.rafId !== undefined &&
+    typeof window !== 'undefined' &&
+    typeof window.cancelAnimationFrame === 'function'
+  ) {
+    window.cancelAnimationFrame(handle.rafId);
+  }
+  if (handle.timerId !== undefined) {
+    clearTimeout(handle.timerId);
+  }
+  if (handle.fallbackTimerId !== undefined) {
+    clearTimeout(handle.fallbackTimerId);
+  }
+  postPaintTeamEnrichmentTimers.delete(teamName);
+}
+
+function scheduleAfterPaint(run: () => void): PostPaintHandle {
+  const handle: PostPaintHandle = {
+    cancelled: false,
+    ran: false,
+  };
+
+  const runOnce = (): void => {
+    if (handle.cancelled || handle.ran) {
+      return;
+    }
+    handle.ran = true;
+
+    if (
+      handle.rafId !== undefined &&
+      typeof window !== 'undefined' &&
+      typeof window.cancelAnimationFrame === 'function'
+    ) {
+      window.cancelAnimationFrame(handle.rafId);
+      handle.rafId = undefined;
+    }
+    if (handle.timerId !== undefined) {
+      clearTimeout(handle.timerId);
+      handle.timerId = undefined;
+    }
+    if (handle.fallbackTimerId !== undefined) {
+      clearTimeout(handle.fallbackTimerId);
+      handle.fallbackTimerId = undefined;
+    }
+
+    run();
+  };
+
+  const scheduleTimer = (): void => {
+    handle.timerId = setTimeout(runOnce, 0);
+  };
+
+  handle.fallbackTimerId = setTimeout(runOnce, POST_PAINT_TEAM_ENRICHMENT_FALLBACK_MS);
+
+  if (typeof window !== 'undefined' && typeof window.requestAnimationFrame === 'function') {
+    handle.rafId = window.requestAnimationFrame(() => {
+      handle.rafId = undefined;
+      scheduleTimer();
+    });
+    return handle;
+  }
+
+  scheduleTimer();
+  return handle;
+}
+
+function drainQueuedFullRefreshAfterThinSettles(teamName: string, get: () => TeamSlice): void {
+  if (!queuedFullTeamDataRefreshesAfterThin.delete(teamName)) {
+    return;
+  }
+  void get().refreshTeamData(teamName, { withDedup: true });
+}
+
+function isSelectedTeamLoadStillCurrent(
+  get: () => TeamSlice,
+  teamName: string,
+  requestNonce: number,
+  teamStateEpoch: number
+): boolean {
+  const state = get();
+  return (
+    isTeamLocalStateEpochCurrent(teamName, teamStateEpoch) &&
+    state.selectedTeamName === teamName &&
+    state.selectedTeamLoadNonce === requestNonce &&
+    state.selectedTeamData?.teamName === teamName
+  );
+}
+
+function schedulePostPaintTeamEnrichments(params: {
+  teamName: string;
+  requestNonce: number;
+  teamStateEpoch: number;
+  get: () => TeamSlice;
+}): void {
+  const { teamName, requestNonce, teamStateEpoch, get } = params;
+
+  cancelPostPaintTeamEnrichments(teamName);
+
+  const handle = scheduleAfterPaint(() => {
+    if (postPaintTeamEnrichmentTimers.get(teamName) !== handle) {
+      return;
+    }
+    postPaintTeamEnrichmentTimers.delete(teamName);
+
+    void (async () => {
+      if (!isTeamLocalStateEpochCurrent(teamName, teamStateEpoch)) {
+        queuedFullTeamDataRefreshesAfterThin.delete(teamName);
+        return;
+      }
+
+      const state = get();
+      if (state.selectedTeamName !== teamName) {
+        drainQueuedFullRefreshAfterThinSettles(teamName, get);
+        return;
+      }
+
+      if (state.selectedTeamLoadNonce !== requestNonce) {
+        return;
+      }
+
+      if (state.selectedTeamData?.teamName !== teamName) {
+        queuedFullTeamDataRefreshesAfterThin.delete(teamName);
+        return;
+      }
+
+      if (queuedFullTeamDataRefreshesAfterThin.delete(teamName)) {
+        void get().refreshTeamData(teamName, { withDedup: true });
+      }
+
+      try {
+        const headResult = await get().refreshTeamMessagesHead(teamName);
+        if (!isSelectedTeamLoadStillCurrent(get, teamName, requestNonce, teamStateEpoch)) {
+          return;
+        }
+        if (headResult.feedChanged || isMemberActivityMetaStale(get(), teamName)) {
+          await get().refreshMemberActivityMeta(teamName);
+        }
+      } catch (error) {
+        logger.debug(
+          `post-paint team enrichments skipped team=${teamName} error=${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      }
+    })();
+  });
+
+  postPaintTeamEnrichmentTimers.set(teamName, handle);
+}
+
 export function __getTeamScopedTransientStateForTests(teamName: string): {
   hasResolvedMembersSelector: boolean;
   resolvedMemberSelectorCount: number;
   hasMergedMessagesSelector: boolean;
   memberMessagesSelectorCount: number;
   hasPendingFreshTeamDataRefresh: boolean;
+  hasQueuedFullTeamDataRefreshAfterThin: boolean;
+  hasPostPaintTeamEnrichmentTimer: boolean;
   hasQueuedHeadRefreshAfterOlder: boolean;
   hasPendingFreshMessagesHeadRefresh: boolean;
   hasPendingFreshMemberActivityMetaRefresh: boolean;
@@ -423,6 +653,8 @@ export function __getTeamScopedTransientStateForTests(teamName: string): {
     hasMergedMessagesSelector: mergedMessagesSelectorCache.has(teamName),
     memberMessagesSelectorCount,
     hasPendingFreshTeamDataRefresh: pendingFreshTeamDataRefreshes.has(teamName),
+    hasQueuedFullTeamDataRefreshAfterThin: queuedFullTeamDataRefreshesAfterThin.has(teamName),
+    hasPostPaintTeamEnrichmentTimer: postPaintTeamEnrichmentTimers.has(teamName),
     hasQueuedHeadRefreshAfterOlder: queuedTeamMessagesHeadRefreshesAfterOlder.has(teamName),
     hasPendingFreshMessagesHeadRefresh: pendingFreshTeamMessagesHeadRefreshes.has(teamName),
     hasPendingFreshMemberActivityMetaRefresh:
@@ -534,31 +766,48 @@ function withTimeout<T>(promise: Promise<T>, ms: number, label: string): Promise
   });
 }
 
-function fetchTeamDataDeduped(teamName: string): Promise<TeamViewSnapshot> {
-  const existing = inFlightTeamDataRequests.get(teamName);
+function fetchTeamDataDeduped(
+  teamName: string,
+  options?: TeamGetDataOptions
+): Promise<TeamViewSnapshot> {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
+  const key = getTeamDataRequestKey(teamName, normalizedOptions);
+  const existing = inFlightTeamDataRequests.get(key);
   if (existing) {
     return existing;
   }
 
   const request = withTimeout(
-    unwrapIpc('team:getData', () => api.teams.getData(teamName)),
+    unwrapIpc('team:getData', () =>
+      normalizedOptions === undefined
+        ? api.teams.getData(teamName)
+        : api.teams.getData(teamName, normalizedOptions)
+    ),
     TEAM_GET_DATA_TIMEOUT_MS,
-    `team:getData(${teamName})`
+    getTeamDataRequestLabel(teamName, normalizedOptions)
   ).finally(() => {
-    if (inFlightTeamDataRequests.get(teamName) === request) {
-      inFlightTeamDataRequests.delete(teamName);
+    if (inFlightTeamDataRequests.get(key) === request) {
+      inFlightTeamDataRequests.delete(key);
     }
   });
 
-  inFlightTeamDataRequests.set(teamName, request);
+  inFlightTeamDataRequests.set(key, request);
   return request;
 }
 
-function fetchTeamDataFresh(teamName: string): Promise<TeamViewSnapshot> {
+function fetchTeamDataFresh(
+  teamName: string,
+  options?: TeamGetDataOptions
+): Promise<TeamViewSnapshot> {
+  const normalizedOptions = normalizeTeamGetDataOptions(options);
   return withTimeout(
-    unwrapIpc('team:getData', () => api.teams.getData(teamName)),
+    unwrapIpc('team:getData', () =>
+      normalizedOptions === undefined
+        ? api.teams.getData(teamName)
+        : api.teams.getData(teamName, normalizedOptions)
+    ),
     TEAM_GET_DATA_TIMEOUT_MS,
-    `team:getData(${teamName})`
+    getTeamDataRequestLabel(teamName, normalizedOptions)
   );
 }
 
@@ -1062,6 +1311,7 @@ const notifiedStatusChangeKeys = new Set<string>();
 const notifiedCommentKeys = new Set<string>();
 const notifiedCreatedTaskKeys = new Set<string>();
 const notifiedAllCompletedTeams = new Set<string>();
+const notifiedBlockedTaskKeys = new Set<string>();
 
 let isFirstFetchAllTasks = true;
 
@@ -1102,6 +1352,13 @@ function fireClarificationNotification(task: GlobalTask, suppressToast: boolean)
       body,
       teamEventType: 'task_clarification',
       dedupeKey: `clarification:${task.teamName}:${task.id}:${task.updatedAt ?? Date.now()}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        commentId: latestComment?.id,
+        focus: 'comments',
+      },
       suppressToast,
     })
     .catch(() => undefined);
@@ -1198,6 +1455,12 @@ function fireStatusChangeNotification(
       body: task.subject,
       teamEventType: 'task_status_change',
       dedupeKey: `status:${task.teamName}:${task.id}:${fromStatus}:${toStatus}:${task.updatedAt ?? Date.now()}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        focus: 'status',
+      },
       suppressToast,
     })
     .catch(() => undefined);
@@ -1222,13 +1485,17 @@ function detectTaskCommentNotifications(
     for (const comment of newComments) {
       // Don't notify about user's own comments
       if (comment.author === 'user') continue;
-      // Skip review-related comment types (already covered by status change notifications)
-      if (comment.type === 'review_request' || comment.type === 'review_approved') continue;
 
       const key = `${task.teamName}:${task.id}:${comment.id}`;
       if (notifiedCommentKeys.has(key)) continue;
       notifiedCommentKeys.add(key);
 
+      if (comment.type === 'review_request') {
+        fireTaskReviewRequestedNotification(task, comment, !notifyEnabled);
+        continue;
+      }
+      if (comment.type === 'review_approved') continue;
+
       fireTaskCommentNotification(task, comment, !notifyEnabled);
     }
   }
@@ -1236,7 +1503,7 @@ function detectTaskCommentNotifications(
 
 function fireTaskCommentNotification(
   task: GlobalTask,
-  comment: { author: string; text: string; id: string },
+  comment: Pick<TaskComment, 'author' | 'text' | 'id'>,
   suppressToast: boolean
 ): void {
   // Double-check: never notify about user's own comments
@@ -1255,6 +1522,106 @@ function fireTaskCommentNotification(
       body: preview,
       teamEventType: 'task_comment',
       dedupeKey: `comment:${task.teamName}:${task.id}:${comment.id}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        commentId: comment.id,
+        focus: 'comments',
+      },
+      suppressToast,
+    })
+    .catch(() => undefined);
+}
+
+function fireTaskReviewRequestedNotification(
+  task: GlobalTask,
+  comment: Pick<TaskComment, 'author' | 'text' | 'id'>,
+  suppressToast: boolean
+): void {
+  const stripped = stripAgentBlocks(comment.text).trim();
+  const preview = stripped.length > 100 ? stripped.slice(0, 100) + '...' : stripped;
+
+  void api.teams
+    ?.showMessageNotification({
+      teamName: task.teamName,
+      teamDisplayName: task.teamDisplayName,
+      from: comment.author,
+      to: 'user',
+      summary: `Review requested ${formatTaskDisplayLabel(task)}: ${task.subject}`,
+      body: preview || task.subject,
+      teamEventType: 'task_review_requested',
+      dedupeKey: `review-request:${task.teamName}:${task.id}:${comment.id}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        commentId: comment.id,
+        focus: 'review',
+      },
+      suppressToast,
+    })
+    .catch(() => undefined);
+}
+
+function detectBlockedTaskNotifications(
+  oldTasks: GlobalTask[],
+  newTasks: GlobalTask[],
+  notifyEnabled: boolean
+): void {
+  const oldTaskMap = new Map(oldTasks.map((task) => [`${task.teamName}:${task.id}`, task]));
+
+  for (const task of newTasks) {
+    const oldTask = oldTaskMap.get(`${task.teamName}:${task.id}`);
+    const oldBlockedBy = new Set(oldTask?.blockedBy?.filter(Boolean) ?? []);
+    const newBlockedBy = Array.from(new Set(task.blockedBy?.filter(Boolean) ?? []));
+    const taskKeyPrefix = `${task.teamName}:${task.id}:`;
+    const key = `${taskKeyPrefix}${[...newBlockedBy].sort().join(',')}`;
+    const addedBlockedBy = newBlockedBy.filter((id) => !oldBlockedBy.has(id));
+
+    for (const existingKey of Array.from(notifiedBlockedTaskKeys)) {
+      if (existingKey.startsWith(taskKeyPrefix) && existingKey !== key) {
+        notifiedBlockedTaskKeys.delete(existingKey);
+      }
+    }
+
+    if (newBlockedBy.length > 0 && addedBlockedBy.length > 0) {
+      if (notifiedBlockedTaskKeys.has(key)) continue;
+      notifiedBlockedTaskKeys.add(key);
+      fireTaskBlockedNotification(task, newBlockedBy, !notifyEnabled);
+    } else if (newBlockedBy.length === 0) {
+      for (const existingKey of Array.from(notifiedBlockedTaskKeys)) {
+        if (existingKey.startsWith(taskKeyPrefix)) {
+          notifiedBlockedTaskKeys.delete(existingKey);
+        }
+      }
+    }
+  }
+}
+
+function fireTaskBlockedNotification(
+  task: GlobalTask,
+  blockedBy: readonly string[],
+  suppressToast: boolean
+): void {
+  const blockerRefs = blockedBy.map((id) => formatTaskDisplayLabel({ id })).join(', ');
+
+  void api.teams
+    ?.showMessageNotification({
+      teamName: task.teamName,
+      teamDisplayName: task.teamDisplayName,
+      from: task.owner ?? 'system',
+      to: 'user',
+      summary: `Blocked ${formatTaskDisplayLabel(task)}: ${task.subject}`,
+      body: blockerRefs ? `Blocked by ${blockerRefs}` : task.subject,
+      teamEventType: 'task_blocked',
+      dedupeKey: `blocked:${task.teamName}:${task.id}:${blockedBy.join(',')}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        focus: 'detail',
+      },
       suppressToast,
     })
     .catch(() => undefined);
@@ -1288,6 +1655,12 @@ function fireTaskCreatedNotification(task: GlobalTask, suppressToast: boolean):
       body: stripAgentBlocks(task.description || task.subject).trim(),
       teamEventType: 'task_created',
       dedupeKey: `created:${task.teamName}:${task.id}`,
+      target: {
+        kind: 'task',
+        teamName: task.teamName,
+        taskId: task.id,
+        focus: 'detail',
+      },
       suppressToast,
     })
     .catch(() => undefined);
@@ -1346,6 +1719,11 @@ function fireAllTasksCompletedNotification(
       body: `All tasks in team "${sampleTask.teamDisplayName}" are done`,
       teamEventType: 'all_tasks_completed',
       dedupeKey: `all-done:${sampleTask.teamName}:${Date.now()}`,
+      target: {
+        kind: 'team',
+        teamName: sampleTask.teamName,
+        section: 'tasks',
+      },
       suppressToast,
     })
     .catch(() => undefined);
@@ -1447,6 +1825,20 @@ function mapReviewError(error: unknown): string {
 export interface GlobalTaskDetailState {
   teamName: string;
   taskId: string;
+  commentId?: string;
+}
+
+export interface PendingMemberProfileState {
+  teamName?: string;
+  memberName: string;
+  focus?: 'profile' | 'messages' | 'logs';
+}
+
+type TeamSectionTarget = NonNullable<Extract<NotificationTarget, { kind: 'team' }>['section']>;
+
+export interface PendingTeamSectionFocusState {
+  teamName: string;
+  section: TeamSectionTarget;
 }
 
 /** Per-team launch parameters shown in the header badge. */
@@ -1583,6 +1975,9 @@ export function selectTeamDataForName(
   if (!teamName) {
     return null;
   }
+  if (state.selectedTeamName === teamName && state.selectedTeamData) {
+    return state.selectedTeamData;
+  }
   return (
     state.teamDataCacheByName[teamName] ??
     (state.selectedTeamName === teamName ? state.selectedTeamData : null)
@@ -1930,12 +2325,19 @@ export interface TeamSlice {
   globalTasksInitialized: boolean;
   globalTasksError: string | null;
   globalTaskDetail: GlobalTaskDetailState | null;
-  openGlobalTaskDetail: (teamName: string, taskId: string) => void;
+  openGlobalTaskDetail: (teamName: string, taskId: string, commentId?: string) => void;
   closeGlobalTaskDetail: () => void;
   /** Set by MemberHoverCard to signal TeamDetailView to open MemberDetailDialog */
-  pendingMemberProfile: string | null;
-  openMemberProfile: (memberName: string) => void;
+  pendingMemberProfile: PendingMemberProfileState | null;
+  openMemberProfile: (
+    memberName: string,
+    teamName?: string,
+    focus?: PendingMemberProfileState['focus']
+  ) => void;
   closeMemberProfile: () => void;
+  pendingTeamSectionFocus: PendingTeamSectionFocusState | null;
+  focusTeamSection: (teamName: string, section: TeamSectionTarget) => void;
+  clearTeamSectionFocus: () => void;
   /** Set by GlobalTaskDetailDialog to signal TeamDetailView to open ChangeReviewDialog */
   pendingReviewRequest: {
     taskId: string;
@@ -1965,6 +2367,7 @@ export interface TeamSlice {
   sendMessageDebugDetails: OpenCodeRuntimeDeliveryDebugDetails | null;
   lastSendMessageResult: SendMessageResult | null;
   clearSendMessageRuntimeDiagnostics: (messageId?: string | null) => void;
+  refreshSendMessageRuntimeDeliveryStatus: (teamName: string, messageId: string) => Promise<void>;
   reviewActionError: string | null;
   provisioningRuns: Record<string, TeamProvisioningProgress>;
   /** Synthetic TeamSummary snapshots for teams currently being provisioned (before config.json exists). */
@@ -2099,6 +2502,9 @@ export interface TeamSlice {
     memberName: string,
     role: string | undefined
   ) => Promise<void>;
+  retryFailedOpenCodeSecondaryLanes: (
+    teamName: string
+  ) => Promise<RetryFailedOpenCodeSecondaryLanesResult>;
   addTaskRelationship: (
     teamName: string,
     taskId: string,
@@ -2456,12 +2862,20 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
   kanbanFilterQuery: null,
   globalTaskDetail: null,
   pendingMemberProfile: null,
-  openMemberProfile: (memberName: string) => set({ pendingMemberProfile: memberName }),
+  pendingTeamSectionFocus: null,
+  openMemberProfile: (
+    memberName: string,
+    teamName?: string,
+    focus?: PendingMemberProfileState['focus']
+  ) => set({ pendingMemberProfile: { memberName, teamName, focus } }),
   closeMemberProfile: () => set({ pendingMemberProfile: null }),
+  focusTeamSection: (teamName: string, section: TeamSectionTarget) =>
+    set({ pendingTeamSectionFocus: { teamName, section } }),
+  clearTeamSectionFocus: () => set({ pendingTeamSectionFocus: null }),
   pendingReviewRequest: null,
   setPendingReviewRequest: (req) => set({ pendingReviewRequest: req }),
-  openGlobalTaskDetail: (teamName: string, taskId: string) => {
-    set({ globalTaskDetail: { teamName, taskId } });
+  openGlobalTaskDetail: (teamName: string, taskId: string, commentId?: string) => {
+    set({ globalTaskDetail: { teamName, taskId, commentId } });
   },
   closeGlobalTaskDetail: () => set({ globalTaskDetail: null }),
   addingComment: false,
@@ -2602,6 +3016,7 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
             const notifyOnClarifications =
               get().appConfig?.notifications?.notifyOnClarifications ?? true;
             detectClarificationNotifications(oldTasks, tasks, notifyOnClarifications);
+            detectBlockedTaskNotifications(oldTasks, tasks, notifyOnClarifications);
             detectStatusChangeNotifications(oldTasks, tasks, get().appConfig, get().teamByName);
             const notifyOnTaskComments =
               get().appConfig?.notifications?.notifyOnTaskComments ?? true;
@@ -2617,6 +3032,11 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
               if (task.needsClarification === 'user') {
                 notifiedClarificationTaskKeys.add(`${task.teamName}:${task.id}`);
               }
+              if ((task.blockedBy?.length ?? 0) > 0) {
+                notifiedBlockedTaskKeys.add(
+                  `${task.teamName}:${task.id}:${(task.blockedBy ?? []).join(',')}`
+                );
+              }
               notifiedStatusChangeKeys.add(`${task.teamName}:${task.id}:${task.status}`);
               if (task.reviewState === 'needsFix') {
                 notifiedStatusChangeKeys.add(`${task.teamName}:${task.id}:needsFix`);
@@ -3243,6 +3663,8 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     const requestNonce = get().selectedTeamLoadNonce + 1;
     const previousData = selectTeamDataForName(get(), teamName);
 
+    cancelPostPaintTeamEnrichments(teamName);
+
     // Repoint selection synchronously to the new team's cached snapshot when available.
     // Never keep the previous team's snapshot attached to a newly selected team.
     set({
@@ -3257,12 +3679,20 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     });
 
     try {
-      const data = await fetchTeamDataDeduped(teamName);
+      const data = await fetchTeamDataDeduped(teamName, {
+        includeMemberBranches: false,
+      });
       if (!isTeamLocalStateEpochCurrent(teamName, teamStateEpoch)) {
+        queuedFullTeamDataRefreshesAfterThin.delete(teamName);
         return;
       }
       // Stale check: user may have switched to another team during the async call
-      if (get().selectedTeamName !== teamName || get().selectedTeamLoadNonce !== requestNonce) {
+      const stateAfterLoad = get();
+      if (stateAfterLoad.selectedTeamName !== teamName) {
+        drainQueuedFullRefreshAfterThinSettles(teamName, get);
+        return;
+      }
+      if (stateAfterLoad.selectedTeamLoadNonce !== requestNonce) {
         return;
       }
       // Eagerly patch teamByName with color/displayName from detailed data
@@ -3310,80 +3740,105 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
         };
       });
       lastResolvedTeamDataRefreshAtByTeam.set(teamName, Date.now());
-      const invalidationState = previousData
-        ? collectTaskChangeInvalidationState(teamName, previousData.tasks, data.tasks)
-        : { cacheKeys: [], taskIds: [] };
-      if (invalidationState.cacheKeys.length > 0) {
-        get().invalidateTaskChangePresence(invalidationState.cacheKeys);
-      }
-      if (invalidationState.taskIds.length > 0) {
-        await api.review.invalidateTaskChangeSummaries(teamName, invalidationState.taskIds);
-      }
-      // Sync tab label with the team's display name from config
-      const displayName = data.config.name || teamName;
-      const allTabs = get().getAllPaneTabs();
-      const relatedTabs = allTabs.filter(
-        (tab) => (tab.type === 'team' || tab.type === 'graph') && tab.teamName === teamName
-      );
-      for (const tab of relatedTabs) {
-        const nextLabel = tab.type === 'graph' ? `${displayName} Graph` : displayName;
-        if (tab.label !== nextLabel) {
-          get().updateTabLabel(tab.id, nextLabel);
+
+      try {
+        const invalidationState = previousData
+          ? collectTaskChangeInvalidationState(teamName, previousData.tasks, data.tasks)
+          : { cacheKeys: [], taskIds: [] };
+        if (invalidationState.cacheKeys.length > 0) {
+          get().invalidateTaskChangePresence(invalidationState.cacheKeys);
+        }
+        if (invalidationState.taskIds.length > 0) {
+          void api.review
+            .invalidateTaskChangeSummaries(teamName, invalidationState.taskIds)
+            .catch(() => undefined);
         }
-      }
 
-      const messagesHeadResult = await get().refreshTeamMessagesHead(teamName);
-      if (messagesHeadResult.feedChanged || isMemberActivityMetaStale(get(), teamName)) {
-        await get().refreshMemberActivityMeta(teamName);
-      }
-
-      if (opts?.skipProjectAutoSelect) {
-        return;
-      }
-
-      // Auto-select the project associated with this team's cwd/projectPath.
-      // Must search both flat projects and grouped repositoryGroups/worktrees
-      // because the default viewMode is 'grouped' and flat projects may be empty.
-      const projectPath = data.config.projectPath;
-      if (projectPath) {
-        const state = get();
-        const normalizedTeamPath = normalizePath(projectPath);
-
-        // 1. Try flat projects list
-        const matchingProject = state.projects.find(
-          (p) => normalizePath(p.path) === normalizedTeamPath
+        // Sync tab label with the team's display name from config.
+        const displayName = data.config.name || teamName;
+        const allTabs = get().getAllPaneTabs();
+        const relatedTabs = allTabs.filter(
+          (tab) => (tab.type === 'team' || tab.type === 'graph') && tab.teamName === teamName
         );
-        if (matchingProject && state.selectedProjectId !== matchingProject.id) {
-          state.selectProject(matchingProject.id);
-        } else if (!matchingProject) {
-          // 2. Try grouped view: search worktrees across all repository groups
-          for (const repo of state.repositoryGroups) {
-            const matchingWorktree = repo.worktrees.find(
-              (wt) => normalizePath(wt.path) === normalizedTeamPath
-            );
-            if (matchingWorktree) {
-              if (state.selectedWorktreeId !== matchingWorktree.id) {
-                set(getWorktreeNavigationState(repo.id, matchingWorktree.id));
-                void get().fetchSessionsInitial(matchingWorktree.id);
+        for (const tab of relatedTabs) {
+          const nextLabel = tab.type === 'graph' ? `${displayName} Graph` : displayName;
+          if (tab.label !== nextLabel) {
+            get().updateTabLabel(tab.id, nextLabel);
+          }
+        }
+
+        // Auto-select the project associated with this team's cwd/projectPath.
+        // Must search both flat projects and grouped repositoryGroups/worktrees
+        // because the default viewMode is 'grouped' and flat projects may be empty.
+        const projectPath = data.config.projectPath;
+        if (
+          !opts?.skipProjectAutoSelect &&
+          projectPath &&
+          isSelectedTeamLoadStillCurrent(get, teamName, requestNonce, teamStateEpoch)
+        ) {
+          const state = get();
+          const normalizedTeamPath = normalizePath(projectPath);
+
+          // 1. Try flat projects list
+          const matchingProject = state.projects.find(
+            (p) => normalizePath(p.path) === normalizedTeamPath
+          );
+          if (matchingProject && state.selectedProjectId !== matchingProject.id) {
+            state.selectProject(matchingProject.id);
+          } else if (!matchingProject) {
+            // 2. Try grouped view: search worktrees across all repository groups
+            for (const repo of state.repositoryGroups) {
+              const matchingWorktree = repo.worktrees.find(
+                (wt) => normalizePath(wt.path) === normalizedTeamPath
+              );
+              if (matchingWorktree) {
+                if (state.selectedWorktreeId !== matchingWorktree.id) {
+                  set(getWorktreeNavigationState(repo.id, matchingWorktree.id));
+                  void get().fetchSessionsInitial(matchingWorktree.id);
+                }
+                break;
               }
-              break;
             }
           }
         }
+      } catch (error) {
+        logger.debug(
+          `selectTeam(${teamName}) post-structural sync work failed: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
+      }
+
+      try {
+        schedulePostPaintTeamEnrichments({
+          teamName,
+          requestNonce,
+          teamStateEpoch,
+          get,
+        });
+      } catch (error) {
+        logger.debug(
+          `selectTeam(${teamName}) failed to schedule post-paint enrichments: ${
+            error instanceof Error ? error.message : String(error)
+          }`
+        );
       }
     } catch (error) {
       if (!isTeamLocalStateEpochCurrent(teamName, teamStateEpoch)) {
+        queuedFullTeamDataRefreshesAfterThin.delete(teamName);
         return;
       }
       // If provisioning is in progress for this team, stay in loading state;
       // file watcher / progress callback will refresh once config is written.
       const currentState = get();
-      if (
-        currentState.selectedTeamName !== teamName ||
-        currentState.selectedTeamLoadNonce !== requestNonce
-      ) {
+      if (currentState.selectedTeamName !== teamName) {
+        queuedFullTeamDataRefreshesAfterThin.delete(teamName);
         return;
       }
+      if (currentState.selectedTeamLoadNonce !== requestNonce) {
+        return;
+      }
+      queuedFullTeamDataRefreshesAfterThin.delete(teamName);
       const isProvisioning = isTeamProvisioningActive(currentState, teamName);
 
       const msg = error instanceof Error ? error.message : String(error);
@@ -3422,12 +3877,21 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
   },
 
   refreshTeamData: async (teamName: string, opts?: RefreshTeamDataOptions) => {
+    const fullKey = getFullTeamDataRequestKey(teamName);
+    const reusedInFlightRequest = opts?.withDedup === true && inFlightTeamDataRequests.has(fullKey);
+    const queuedBehindThinRequest =
+      opts?.withDedup === true && !reusedInFlightRequest && hasThinTeamDataRequestForTeam(teamName);
+
+    if (queuedBehindThinRequest) {
+      queuedFullTeamDataRefreshesAfterThin.add(teamName);
+      logger.debug(`refreshTeamData(${teamName}) queued behind thin team:getData`);
+      return;
+    }
+
     const teamStateEpoch = captureTeamLocalStateEpoch(teamName);
     const refreshToken = beginInFlightTeamDataRefresh(teamName);
     // Silent refresh — update data without showing loading skeleton.
     // Only selectTeam() sets loading: true (for initial load).
-    const reusedInFlightRequest =
-      opts?.withDedup === true && inFlightTeamDataRequests.has(teamName);
     noteTeamRefreshBurst(teamName);
     if (reusedInFlightRequest) {
       pendingFreshTeamDataRefreshes.add(teamName);
@@ -4039,6 +4503,30 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     });
   },
 
+  refreshSendMessageRuntimeDeliveryStatus: async (teamName: string, messageId: string) => {
+    const normalizedMessageId = messageId.trim();
+    if (!normalizedMessageId) return;
+    if (get().sendMessageDebugDetails?.messageId !== normalizedMessageId) return;
+    const status = await unwrapIpc('team:getOpenCodeRuntimeDeliveryStatus', () =>
+      api.teams.getOpenCodeRuntimeDeliveryStatus(teamName, normalizedMessageId)
+    );
+    if (!status) return;
+    const diagnostics = buildOpenCodeRuntimeDeliveryDiagnostics({
+      deliveredToInbox: true,
+      messageId: normalizedMessageId,
+      runtimeDelivery: status,
+    });
+    set((state) => {
+      if (state.sendMessageDebugDetails?.messageId !== normalizedMessageId) {
+        return {};
+      }
+      return {
+        sendMessageWarning: diagnostics.warning,
+        sendMessageDebugDetails: diagnostics.debugDetails,
+      };
+    });
+  },
+
   fetchCrossTeamTargets: async () => {
     set({ crossTeamTargetsLoading: true });
     try {
@@ -4212,6 +4700,20 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
   restartMember: async (teamName: string, memberName: string) => {
     try {
       await unwrapIpc('team:restartMember', () => api.teams.restartMember(teamName, memberName));
+    } finally {
+      await Promise.allSettled([
+        get().refreshTeamMessagesHead(teamName),
+        get().fetchMemberSpawnStatuses(teamName),
+        get().fetchTeamAgentRuntime(teamName),
+      ]);
+    }
+  },
+
+  retryFailedOpenCodeSecondaryLanes: async (teamName: string) => {
+    try {
+      return await unwrapIpc('team:retryFailedOpenCodeSecondaryLanes', () =>
+        api.teams.retryFailedOpenCodeSecondaryLanes(teamName)
+      );
     } finally {
       await Promise.allSettled([
         get().fetchMemberSpawnStatuses(teamName),
@@ -4887,6 +5389,17 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     if (isCanonicalRun && becameConfigReady) {
       const state = get();
       if (isVisibleInActiveTeamSurface(state, progress.teamName)) {
+        const willSelectTeam =
+          state.selectedTeamName === progress.teamName && state.selectedTeamData == null;
+        noteTeamRefreshFanout({
+          teamName: progress.teamName,
+          surface: 'provisioning-progress',
+          phase: 'scheduled',
+          reason: 'provisioning:config-ready',
+          operation: willSelectTeam ? 'selectTeam' : 'refreshTeamData',
+          selected: state.selectedTeamName === progress.teamName,
+          visible: true,
+        });
         if (state.selectedTeamName === progress.teamName && state.selectedTeamData == null) {
           void state.selectTeam(progress.teamName, { allowReloadWhileProvisioning: true });
         } else {
@@ -4939,8 +5452,27 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
     }
 
     if (isCanonicalRun && (progress.state === 'ready' || progress.state === 'disconnected')) {
+      const terminalReason =
+        progress.state === 'ready'
+          ? 'provisioning:terminal-ready'
+          : 'provisioning:terminal-disconnected';
+      noteTeamRefreshFanout({
+        teamName: progress.teamName,
+        surface: 'provisioning-progress',
+        phase: 'scheduled',
+        reason: terminalReason,
+        operation: 'fetchTeams',
+      });
       void get().fetchTeams();
       if (hydratedVisibleTeam) {
+        noteTeamRefreshFanout({
+          teamName: progress.teamName,
+          surface: 'provisioning-progress',
+          phase: 'skipped',
+          reason: 'provisioning:already-hydrated-visible-team',
+          operation: 'refreshTeamData',
+          visible: true,
+        });
         return;
       }
 
@@ -4951,6 +5483,15 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
 
       // If the user already opened the team tab, reload team data now that
       // config.json is guaranteed to exist.
+      noteTeamRefreshFanout({
+        teamName: progress.teamName,
+        surface: 'provisioning-progress',
+        phase: 'scheduled',
+        reason: terminalReason,
+        operation: state.selectedTeamName === progress.teamName ? 'selectTeam' : 'refreshTeamData',
+        selected: state.selectedTeamName === progress.teamName,
+        visible: true,
+      });
       if (state.selectedTeamName === progress.teamName) {
         void state.selectTeam(progress.teamName);
       } else {
diff --git a/src/renderer/store/teamProcessFanoutDryRun.ts b/src/renderer/store/teamProcessFanoutDryRun.ts
new file mode 100644
index 00000000..f1d68660
--- /dev/null
+++ b/src/renderer/store/teamProcessFanoutDryRun.ts
@@ -0,0 +1,70 @@
+export type TeamProcessFanoutMode = 'process-lite' | 'structural';
+
+export interface TeamProcessFanoutInput {
+  teamName: string;
+  eventType: string;
+  detail?: string;
+  hasRunId: boolean;
+  isStaleRuntimeEvent: boolean;
+  isVisible: boolean;
+  hasVisibleTeamData: boolean;
+  hasActiveProvisioningRun: boolean;
+  hasCurrentRuntimeRun: boolean;
+}
+
+export type TeamProcessFanoutDryRunInput = TeamProcessFanoutInput;
+
+export type TeamProcessFanoutDecisionReason =
+  | 'not-process-event'
+  | 'stale-runtime-event'
+  | 'hidden-team'
+  | 'missing-visible-team-data'
+  | 'no-active-runtime-context'
+  | 'unsafe-process-detail'
+  | 'processes-json-visible-runtime-context';
+
+export interface TeamProcessFanoutDecision {
+  mode: TeamProcessFanoutMode;
+  reason: TeamProcessFanoutDecisionReason;
+}
+
+export interface TeamProcessFanoutDryRunDecision {
+  wouldUseProcessLite: boolean;
+  reason: TeamProcessFanoutDecisionReason;
+}
+
+export function decideProcessFanoutMode(input: TeamProcessFanoutInput): TeamProcessFanoutDecision {
+  if (input.eventType !== 'process') {
+    return { mode: 'structural', reason: 'not-process-event' };
+  }
+  if (input.isStaleRuntimeEvent) {
+    return { mode: 'structural', reason: 'stale-runtime-event' };
+  }
+  if (!input.isVisible) {
+    return { mode: 'structural', reason: 'hidden-team' };
+  }
+  if (!input.hasVisibleTeamData) {
+    return { mode: 'structural', reason: 'missing-visible-team-data' };
+  }
+  if (!input.hasActiveProvisioningRun && !input.hasCurrentRuntimeRun) {
+    return { mode: 'structural', reason: 'no-active-runtime-context' };
+  }
+  if (input.detail !== 'processes.json') {
+    return { mode: 'structural', reason: 'unsafe-process-detail' };
+  }
+
+  return {
+    mode: 'process-lite',
+    reason: 'processes-json-visible-runtime-context',
+  };
+}
+
+export function decideProcessFanoutDryRun(
+  input: TeamProcessFanoutDryRunInput
+): TeamProcessFanoutDryRunDecision {
+  const decision = decideProcessFanoutMode(input);
+  return {
+    wouldUseProcessLite: decision.mode === 'process-lite',
+    reason: decision.reason,
+  };
+}
diff --git a/src/renderer/store/teamRefreshFanoutDebugBridge.ts b/src/renderer/store/teamRefreshFanoutDebugBridge.ts
new file mode 100644
index 00000000..45a20286
--- /dev/null
+++ b/src/renderer/store/teamRefreshFanoutDebugBridge.ts
@@ -0,0 +1,49 @@
+import {
+  getTeamRefreshFanoutSnapshot,
+  resetTeamRefreshFanoutDiagnostics,
+  summarizeTeamRefreshFanout,
+} from './teamRefreshFanoutDiagnostics';
+
+declare global {
+  interface Window {
+    __TEAM_REFRESH_FANOUT__?: Readonly<{
+      snapshot: typeof getTeamRefreshFanoutSnapshot;
+      summary: typeof summarizeTeamRefreshFanout;
+      reset: typeof resetTeamRefreshFanoutDiagnostics;
+    }>;
+  }
+}
+
+export const TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY = 'debug:teamRefreshFanout';
+
+function isDebugBridgeEnabled(): boolean {
+  if (typeof window === 'undefined') {
+    return false;
+  }
+
+  try {
+    return window.localStorage.getItem(TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY) === '1';
+  } catch {
+    return false;
+  }
+}
+
+export function installTeamRefreshFanoutDebugBridge(): () => void {
+  if (typeof window === 'undefined' || !isDebugBridgeEnabled()) {
+    return () => undefined;
+  }
+
+  const bridge = Object.freeze({
+    snapshot: getTeamRefreshFanoutSnapshot,
+    summary: summarizeTeamRefreshFanout,
+    reset: resetTeamRefreshFanoutDiagnostics,
+  });
+
+  window.__TEAM_REFRESH_FANOUT__ = bridge;
+
+  return () => {
+    if (window.__TEAM_REFRESH_FANOUT__ === bridge) {
+      delete window.__TEAM_REFRESH_FANOUT__;
+    }
+  };
+}
diff --git a/src/renderer/store/teamRefreshFanoutDiagnostics.ts b/src/renderer/store/teamRefreshFanoutDiagnostics.ts
new file mode 100644
index 00000000..515c3347
--- /dev/null
+++ b/src/renderer/store/teamRefreshFanoutDiagnostics.ts
@@ -0,0 +1,224 @@
+export type TeamRefreshFanoutSurface =
+  | 'team-change-listener'
+  | 'provisioning-progress'
+  | 'pending-reply-fallback'
+  | 'manual-refresh';
+
+export type TeamRefreshFanoutPhase = 'scheduled' | 'coalesced' | 'executed' | 'skipped';
+
+export type TeamRefreshFanoutOperation =
+  | 'fetchTeams'
+  | 'fetchAllTasks'
+  | 'refreshTeamData'
+  | 'selectTeam'
+  | 'fetchTeamMessageHead'
+  | 'fetchMemberSpawnStatuses'
+  | 'fetchTeamAgentRuntime'
+  | 'refreshTaskChangePresence'
+  | 'wouldUseProcessLite'
+  | 'wouldKeepStructuralProcess';
+
+export interface TeamRefreshFanoutNote {
+  teamName: string;
+  surface: TeamRefreshFanoutSurface;
+  phase: TeamRefreshFanoutPhase;
+  reason: string;
+  operation: TeamRefreshFanoutOperation;
+  eventType?: string;
+  tabId?: string;
+  selected?: boolean;
+  visible?: boolean;
+  activeTab?: boolean;
+}
+
+export interface TeamRefreshFanoutRecentNote {
+  at: number;
+  surface: TeamRefreshFanoutSurface;
+  phase: TeamRefreshFanoutPhase;
+  reason: string;
+  operation: TeamRefreshFanoutOperation;
+  eventType?: string;
+  tabId?: string;
+  selected?: boolean;
+  visible?: boolean;
+  activeTab?: boolean;
+}
+
+export interface TeamRefreshFanoutSnapshot {
+  counts: Record<string, number>;
+  structuredCounts: Record<string, TeamRefreshFanoutStructuredCount>;
+  recent: TeamRefreshFanoutRecentNote[];
+  lastAt: number;
+}
+
+export interface TeamRefreshFanoutStructuredCount {
+  key: string;
+  count: number;
+  surface: TeamRefreshFanoutSurface;
+  reason: string;
+  operation: TeamRefreshFanoutOperation;
+  phase: TeamRefreshFanoutPhase;
+}
+
+export type TeamRefreshFanoutSummaryRow = TeamRefreshFanoutStructuredCount;
+
+export interface TeamRefreshFanoutSummary {
+  generatedAt: number;
+  teamName?: string;
+  total: number;
+  rows: TeamRefreshFanoutSummaryRow[];
+}
+
+interface TeamRefreshFanoutBucket {
+  counts: Record<string, number>;
+  structuredCounts: Record<string, TeamRefreshFanoutStructuredCount>;
+  recent: TeamRefreshFanoutRecentNote[];
+  lastAt: number;
+}
+
+export const MAX_TEAM_REFRESH_DIAGNOSTIC_TEAMS = 100;
+export const MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES = 50;
+
+const buckets = new Map<string, TeamRefreshFanoutBucket>();
+
+function createEmptyBucket(): TeamRefreshFanoutBucket {
+  return {
+    counts: {},
+    structuredCounts: {},
+    recent: [],
+    lastAt: 0,
+  };
+}
+
+function ensureTeamBucket(teamName: string): TeamRefreshFanoutBucket {
+  if (!buckets.has(teamName) && buckets.size >= MAX_TEAM_REFRESH_DIAGNOSTIC_TEAMS) {
+    const oldestKey = buckets.keys().next().value;
+    if (oldestKey) {
+      buckets.delete(oldestKey);
+    }
+  }
+
+  let bucket = buckets.get(teamName);
+  if (!bucket) {
+    bucket = createEmptyBucket();
+    buckets.set(teamName, bucket);
+  }
+
+  return bucket;
+}
+
+function cloneBucket(
+  bucket: TeamRefreshFanoutBucket | undefined
+): TeamRefreshFanoutSnapshot | null {
+  if (!bucket) {
+    return null;
+  }
+
+  return {
+    counts: { ...bucket.counts },
+    structuredCounts: Object.fromEntries(
+      Object.entries(bucket.structuredCounts).map(([key, value]) => [key, { ...value }])
+    ),
+    recent: bucket.recent.map((note) => ({ ...note })),
+    lastAt: bucket.lastAt,
+  };
+}
+
+export function buildTeamRefreshFanoutCountKey(note: TeamRefreshFanoutNote): string {
+  return `${note.surface}:${note.reason}:${note.operation}:${note.phase}`;
+}
+
+export function noteTeamRefreshFanout(note: TeamRefreshFanoutNote): void {
+  if (!note.teamName || !note.reason || !note.operation) {
+    return;
+  }
+
+  const bucket = ensureTeamBucket(note.teamName);
+  const key = buildTeamRefreshFanoutCountKey(note);
+  const now = Date.now();
+
+  bucket.counts[key] = (bucket.counts[key] ?? 0) + 1;
+  const existingStructured = bucket.structuredCounts[key];
+  bucket.structuredCounts[key] = {
+    key,
+    count: (existingStructured?.count ?? 0) + 1,
+    surface: note.surface,
+    reason: note.reason,
+    operation: note.operation,
+    phase: note.phase,
+  };
+  bucket.lastAt = now;
+  bucket.recent.push({
+    at: now,
+    surface: note.surface,
+    phase: note.phase,
+    reason: note.reason,
+    operation: note.operation,
+    eventType: note.eventType,
+    tabId: note.tabId,
+    selected: note.selected,
+    visible: note.visible,
+    activeTab: note.activeTab,
+  });
+
+  if (bucket.recent.length > MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES) {
+    bucket.recent.splice(0, bucket.recent.length - MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES);
+  }
+}
+
+function collectStructuredCounts(teamName?: string): TeamRefreshFanoutStructuredCount[] {
+  if (teamName) {
+    const bucket = buckets.get(teamName);
+    return bucket ? Object.values(bucket.structuredCounts).map((row) => ({ ...row })) : [];
+  }
+
+  return Array.from(buckets.values()).flatMap((bucket) =>
+    Object.values(bucket.structuredCounts).map((row) => ({ ...row }))
+  );
+}
+
+export function getTeamRefreshFanoutSnapshot(
+  teamName?: string
+): TeamRefreshFanoutSnapshot | Record<string, TeamRefreshFanoutSnapshot> | null {
+  if (teamName) {
+    return cloneBucket(buckets.get(teamName));
+  }
+
+  return Object.fromEntries(
+    Array.from(buckets.entries(), ([key, bucket]) => [key, cloneBucket(bucket)])
+  ) as Record<string, TeamRefreshFanoutSnapshot>;
+}
+
+export function resetTeamRefreshFanoutDiagnostics(): void {
+  buckets.clear();
+}
+
+export function summarizeTeamRefreshFanout(teamName?: string): TeamRefreshFanoutSummary {
+  const aggregate = new Map<string, TeamRefreshFanoutSummaryRow>();
+
+  for (const row of collectStructuredCounts(teamName)) {
+    const existing = aggregate.get(row.key);
+    aggregate.set(row.key, {
+      ...row,
+      count: (existing?.count ?? 0) + row.count,
+    });
+  }
+
+  const rows = Array.from(aggregate.values()).sort(
+    (a, b) =>
+      b.count - a.count ||
+      a.operation.localeCompare(b.operation) ||
+      a.reason.localeCompare(b.reason) ||
+      a.phase.localeCompare(b.phase)
+  );
+
+  return {
+    generatedAt: Date.now(),
+    ...(teamName ? { teamName } : {}),
+    total: rows.reduce((sum, row) => sum + row.count, 0),
+    rows,
+  };
+}
+
+export const getTeamRefreshFanoutSnapshotForTests = getTeamRefreshFanoutSnapshot;
+export const __resetTeamRefreshFanoutDiagnosticsForTests = resetTeamRefreshFanoutDiagnostics;
diff --git a/src/renderer/utils/bootstrapPromptSanitizer.ts b/src/renderer/utils/bootstrapPromptSanitizer.ts
index 4d58919f..c777c010 100644
--- a/src/renderer/utils/bootstrapPromptSanitizer.ts
+++ b/src/renderer/utils/bootstrapPromptSanitizer.ts
@@ -110,6 +110,7 @@ function buildRuntimeSummary(
 }
 
 export interface BootstrapPromptDisplay {
+  eventKind: 'start' | 'restart';
   teammateName?: string;
   teamName?: string;
   runtime?: string;
@@ -144,9 +145,16 @@ export function getBootstrapPromptDisplay(
   const model = matchOverrideField(text, 'Model override');
   const effort = matchOverrideField(text, 'Effort override');
   const runtime = buildRuntimeSummary(providerId, model, effort);
+  const eventKind = text.includes(
+    'The team has already been reconnected and you are being re-attached as a persistent teammate.'
+  )
+    ? 'restart'
+    : 'start';
   const displayName = teammateName ? displayMemberName(teammateName) : 'teammate';
-  const summary = `Starting ${displayName}`;
-  const bodyLines = [`Lead is starting \`${displayName}\` as a teammate.`];
+  const summary = `${eventKind === 'restart' ? 'Restarting' : 'Starting'} ${displayName}`;
+  const bodyLines = [
+    `Lead is ${eventKind === 'restart' ? 'restarting' : 'starting'} \`${displayName}\` as a teammate.`,
+  ];
 
   if (runtime) {
     bodyLines.push(`Runtime: ${runtime}`);
@@ -157,6 +165,7 @@ export function getBootstrapPromptDisplay(
   bodyLines.push('Startup instructions are hidden in the UI.');
 
   return {
+    eventKind,
     teammateName,
     teamName,
     runtime,
diff --git a/src/renderer/utils/linkifiedText.tsx b/src/renderer/utils/linkifiedText.tsx
new file mode 100644
index 00000000..184257f7
--- /dev/null
+++ b/src/renderer/utils/linkifiedText.tsx
@@ -0,0 +1,105 @@
+import { api } from '@renderer/api';
+
+import type { MouseEvent, ReactElement, ReactNode } from 'react';
+
+export interface LinkifiedTextOptions {
+  linkClassName?: string;
+  stopPropagation?: boolean;
+  getLinkLabel?: (url: string) => string;
+}
+
+function findNextHttpUrlStart(message: string, fromIndex: number): number {
+  const httpIndex = message.indexOf('http://', fromIndex);
+  const httpsIndex = message.indexOf('https://', fromIndex);
+  if (httpIndex === -1) {
+    return httpsIndex;
+  }
+  if (httpsIndex === -1) {
+    return httpIndex;
+  }
+  return Math.min(httpIndex, httpsIndex);
+}
+
+function isUrlTerminatingChar(char: string): boolean {
+  return char.trim() === '' || char === '<' || char === '>' || char === ')' || char === ']';
+}
+
+function findHttpUrlEnd(message: string, fromIndex: number): number {
+  let end = fromIndex;
+  while (end < message.length) {
+    const char = message[end];
+    if (!char || isUrlTerminatingChar(char)) {
+      break;
+    }
+    end += 1;
+  }
+  return end;
+}
+
+function splitUrlTrailingPunctuation(rawUrl: string): { url: string; trailing: string } {
+  let url = rawUrl;
+  let trailing = '';
+  while (/[.,;:!?]$/.test(url)) {
+    trailing = `${url[url.length - 1]}${trailing}`;
+    url = url.slice(0, -1);
+  }
+  return { url, trailing };
+}
+
+function isLinkableHttpUrl(url: string): boolean {
+  try {
+    const parsed = new URL(url);
+    return (parsed.protocol === 'http:' || parsed.protocol === 'https:') && parsed.hostname !== '';
+  } catch {
+    return false;
+  }
+}
+
+export function renderLinkifiedText(
+  message: string,
+  options: LinkifiedTextOptions = {}
+): ReactElement {
+  const nodes: ReactNode[] = [];
+  let lastIndex = 0;
+
+  while (lastIndex < message.length) {
+    const start = findNextHttpUrlStart(message, lastIndex);
+    if (start === -1) {
+      break;
+    }
+    if (start > lastIndex) {
+      nodes.push(message.slice(lastIndex, start));
+    }
+    const end = findHttpUrlEnd(message, start);
+    const rawUrl = message.slice(start, end);
+    const { url, trailing } = splitUrlTrailingPunctuation(rawUrl);
+    if (!isLinkableHttpUrl(url)) {
+      nodes.push(rawUrl);
+      lastIndex = end;
+      continue;
+    }
+
+    const handleClick = (event: MouseEvent<HTMLAnchorElement>): void => {
+      event.preventDefault();
+      if (options.stopPropagation === true) {
+        event.stopPropagation();
+      }
+      void api.openExternal(url);
+    };
+
+    nodes.push(
+      <a key={`${url}:${start}`} href={url} className={options.linkClassName} onClick={handleClick}>
+        {options.getLinkLabel?.(url) ?? url}
+      </a>
+    );
+    if (trailing) {
+      nodes.push(trailing);
+    }
+    lastIndex = end;
+  }
+
+  if (lastIndex < message.length) {
+    nodes.push(message.slice(lastIndex));
+  }
+  return <span>{nodes.length > 0 ? nodes : message}</span>;
+}
diff --git a/src/renderer/utils/memberHelpers.ts b/src/renderer/utils/memberHelpers.ts
index d95e0756..690b4725 100644
--- a/src/renderer/utils/memberHelpers.ts
+++ b/src/renderer/utils/memberHelpers.ts
@@ -546,9 +546,11 @@ export function getLaunchAwarePresenceLabel(
 }
 
 export type MemberLaunchVisualState =
+  | 'queued'
   | 'waiting'
   | 'spawning'
   | 'permission_pending'
+  | 'bootstrap_stalled'
   | 'runtime_pending'
   | 'shell_only'
   | 'runtime_candidate'
@@ -573,12 +575,16 @@ export interface MemberLaunchPresentation {
 
 export function getMemberLaunchStatusLabel(visualState: MemberLaunchVisualState): string | null {
   switch (visualState) {
+    case 'queued':
+      return 'queued';
     case 'waiting':
       return 'waiting to start';
     case 'spawning':
       return 'starting';
     case 'permission_pending':
       return 'awaiting permission';
+    case 'bootstrap_stalled':
+      return 'bootstrap stalled';
     case 'runtime_pending':
       return 'waiting for bootstrap';
     case 'shell_only':
@@ -602,7 +608,10 @@ export function getMemberLaunchStatusLabel(visualState: MemberLaunchVisualState)
 
 function getLaunchVisualStateDotClass(visualState: MemberLaunchVisualState): string | null {
   switch (visualState) {
+    case 'queued':
+      return SPAWN_DOT_COLORS.waiting;
     case 'permission_pending':
+    case 'bootstrap_stalled':
     case 'runtime_pending':
     case 'runtime_candidate':
       return 'bg-amber-400 animate-pulse';
@@ -617,6 +626,29 @@ function getLaunchVisualStateDotClass(visualState: MemberLaunchVisualState): str
   }
 }
 
+function isQueuedOpenCodeLaunch(
+  member: ResolvedTeamMember,
+  spawnStatus: MemberSpawnStatus | undefined,
+  spawnLaunchState: MemberLaunchState | undefined,
+  runtimeEntry: TeamAgentRuntimeEntry | undefined,
+  isLaunchSettling: boolean,
+  isTeamProvisioning: boolean | undefined
+): boolean {
+  if (member.providerId !== 'opencode') {
+    return false;
+  }
+  if (isTeamProvisioning !== true && !isLaunchSettling) {
+    return false;
+  }
+  if (spawnStatus !== 'waiting' || spawnLaunchState !== 'starting') {
+    return false;
+  }
+
+  // Only label lanes as queued before runtime evidence appears. Once the
+  // backend has any liveness signal, show the exact runtime state instead.
+  return runtimeEntry == null || runtimeEntry.livenessKind == null;
+}
+
 function hasElapsedSinceIso(
   value: string | undefined,
   thresholdMs: number,
@@ -682,6 +714,7 @@ export function isOpenCodeRelaunchActionable({
     nowMs
   );
   const hasExplicitBootstrapStall =
+    spawnEntry?.bootstrapStalled === true ||
     hasBootstrapStallDiagnostic(spawnEntry?.runtimeDiagnostic) ||
     hasBootstrapStallDiagnostic(runtimeEntry?.runtimeDiagnostic);
   const launchIsNoLongerFresh =
@@ -697,6 +730,9 @@ export function isOpenCodeRelaunchActionable({
   ) {
     return launchIsNoLongerFresh;
   }
+  if (livenessKind === 'runtime_process') {
+    return hasExplicitBootstrapStall;
+  }
   if (livenessKind !== 'runtime_process_candidate') {
     return false;
   }
@@ -710,6 +746,8 @@ export function buildMemberLaunchPresentation({
   spawnLaunchState,
   spawnLivenessSource,
   spawnRuntimeAlive,
+  spawnBootstrapConfirmed,
+  spawnBootstrapStalled,
   runtimeAdvisory,
   runtimeEntry,
   isLaunchSettling = false,
@@ -722,6 +760,8 @@ export function buildMemberLaunchPresentation({
   spawnLaunchState: MemberLaunchState | undefined;
   spawnLivenessSource: MemberSpawnLivenessSource | undefined;
   spawnRuntimeAlive: boolean | undefined;
+  spawnBootstrapConfirmed?: boolean;
+  spawnBootstrapStalled?: boolean;
   runtimeAdvisory: MemberRuntimeAdvisory | undefined;
   runtimeEntry?: TeamAgentRuntimeEntry;
   isLaunchSettling?: boolean;
@@ -729,12 +769,19 @@ export function buildMemberLaunchPresentation({
   isTeamProvisioning?: boolean;
   leadActivity?: LeadActivityState;
 }): MemberLaunchPresentation {
+  const hasConfirmedSpawnLaunch =
+    spawnLaunchState === 'confirmed_alive' && spawnBootstrapConfirmed === true;
+  const effectiveSpawnStatus =
+    hasConfirmedSpawnLaunch && (spawnStatus === 'waiting' || spawnStatus === 'spawning')
+      ? 'online'
+      : spawnStatus;
+  const effectiveSpawnRuntimeAlive = hasConfirmedSpawnLaunch ? true : spawnRuntimeAlive;
   const presenceLabel = getLaunchAwarePresenceLabel(
     member,
-    spawnStatus,
+    effectiveSpawnStatus,
     spawnLaunchState,
     spawnLivenessSource,
-    spawnRuntimeAlive,
+    effectiveSpawnRuntimeAlive,
     runtimeAdvisory,
     isLaunchSettling,
     isTeamAlive,
@@ -743,18 +790,18 @@ export function buildMemberLaunchPresentation({
   );
   const baseDotClass = getSpawnAwareDotClass(
     member,
-    spawnStatus,
+    effectiveSpawnStatus,
     spawnLaunchState,
-    spawnRuntimeAlive,
+    effectiveSpawnRuntimeAlive,
     isLaunchSettling,
     isTeamAlive,
     isTeamProvisioning,
     leadActivity
   );
   const cardClass = getSpawnCardClass(
-    spawnStatus,
+    effectiveSpawnStatus,
     spawnLaunchState,
-    spawnRuntimeAlive,
+    effectiveSpawnRuntimeAlive,
     isLaunchSettling,
     isTeamAlive,
     isTeamProvisioning
@@ -772,18 +819,37 @@ export function buildMemberLaunchPresentation({
       launchVisualState = 'skipped';
     } else if (spawnLaunchState === 'runtime_pending_permission') {
       launchVisualState = 'permission_pending';
-    } else if (runtimeEntry?.livenessKind === 'shell_only') {
+    } else if (spawnBootstrapStalled === true) {
+      launchVisualState = 'bootstrap_stalled';
+    } else if (!hasConfirmedSpawnLaunch && runtimeEntry?.livenessKind === 'shell_only') {
       launchVisualState = 'shell_only';
-    } else if (runtimeEntry?.livenessKind === 'runtime_process_candidate') {
+    } else if (
+      !hasConfirmedSpawnLaunch &&
+      runtimeEntry?.livenessKind === 'runtime_process_candidate'
+    ) {
       launchVisualState = 'runtime_candidate';
-    } else if (runtimeEntry?.livenessKind === 'registered_only') {
+    } else if (!hasConfirmedSpawnLaunch && runtimeEntry?.livenessKind === 'registered_only') {
       launchVisualState = 'registered_only';
     } else if (
-      runtimeEntry?.livenessKind === 'stale_metadata' ||
-      runtimeEntry?.livenessKind === 'not_found'
+      !hasConfirmedSpawnLaunch &&
+      (runtimeEntry?.livenessKind === 'stale_metadata' ||
+        runtimeEntry?.livenessKind === 'not_found')
     ) {
       launchVisualState = 'stale_runtime';
     } else if (
+      !hasConfirmedSpawnLaunch &&
+      isQueuedOpenCodeLaunch(
+        member,
+        spawnStatus,
+        spawnLaunchState,
+        runtimeEntry,
+        isLaunchSettling,
+        isTeamProvisioning
+      )
+    ) {
+      launchVisualState = 'queued';
+    } else if (
+      !hasConfirmedSpawnLaunch &&
       isLaunchStillStarting(
         spawnStatus,
         spawnLaunchState,
@@ -793,16 +859,13 @@ export function buildMemberLaunchPresentation({
     ) {
       launchVisualState = spawnStatus === 'spawning' ? 'spawning' : 'waiting';
     } else if (
+      !hasConfirmedSpawnLaunch &&
       spawnLaunchState === 'runtime_pending_bootstrap' &&
       (runtimeEntry?.livenessKind === 'runtime_process' ||
         (spawnStatus === 'online' && spawnRuntimeAlive === true))
     ) {
       launchVisualState = 'runtime_pending';
-    } else if (
-      isLaunchSettling &&
-      spawnStatus === 'online' &&
-      spawnLaunchState === 'confirmed_alive'
-    ) {
+    } else if (isLaunchSettling && spawnLaunchState === 'confirmed_alive') {
       launchVisualState = 'settling';
     }
   }
@@ -810,7 +873,9 @@ export function buildMemberLaunchPresentation({
   const launchStatusLabel = getMemberLaunchStatusLabel(launchVisualState);
   const launchVisualStateDotClass = getLaunchVisualStateDotClass(launchVisualState);
   const shouldShowLaunchStatusAsPresence =
+    launchVisualState === 'queued' ||
     launchVisualState === 'permission_pending' ||
+    launchVisualState === 'bootstrap_stalled' ||
     launchVisualState === 'runtime_pending' ||
     launchVisualState === 'shell_only' ||
     launchVisualState === 'runtime_candidate' ||
diff --git a/src/renderer/utils/memberLaunchDiagnostics.ts b/src/renderer/utils/memberLaunchDiagnostics.ts
index 97f04069..b09b70b1 100644
--- a/src/renderer/utils/memberLaunchDiagnostics.ts
+++ b/src/renderer/utils/memberLaunchDiagnostics.ts
@@ -27,6 +27,7 @@ export interface MemberLaunchDiagnosticsPayload {
   runtimeSessionId?: string;
   runtimeDiagnostic?: string;
   runtimeDiagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+  bootstrapStalled?: boolean;
   diagnostics?: string[];
   updatedAt?: string;
 }
@@ -139,6 +140,7 @@ export function buildMemberLaunchDiagnosticsPayload(params: {
             spawnEntry?.runtimeDiagnosticSeverity ?? runtimeEntry?.runtimeDiagnosticSeverity,
         }
       : {}),
+    ...(spawnEntry?.bootstrapStalled === true ? { bootstrapStalled: true } : {}),
     ...(diagnostics ? { diagnostics } : {}),
     ...(boundedString(spawnEntry?.updatedAt ?? runtimeEntry?.updatedAt)
       ? { updatedAt: boundedString(spawnEntry?.updatedAt ?? runtimeEntry?.updatedAt) }
@@ -159,6 +161,7 @@ export function hasMemberLaunchDiagnosticsDetails(
   return Boolean(
     (payload.launchState && payload.launchState !== 'confirmed_alive') ||
     (payload.spawnStatus && payload.spawnStatus !== 'online') ||
+    payload.bootstrapStalled === true ||
     weakLiveness ||
     payload.runtimeDiagnostic ||
     payload.diagnostics?.length
diff --git a/src/renderer/utils/memberRuntimeSummary.ts b/src/renderer/utils/memberRuntimeSummary.ts
index 66c0b6cd..f5f763aa 100644
--- a/src/renderer/utils/memberRuntimeSummary.ts
+++ b/src/renderer/utils/memberRuntimeSummary.ts
@@ -11,6 +11,35 @@ import type {
   TeamProviderId,
 } from '@shared/types';
 
+function shouldShowRuntimeMemory(
+  spawnEntry: MemberSpawnStatusEntry | undefined,
+  runtimeEntry: TeamAgentRuntimeEntry | undefined
+): boolean {
+  if (typeof runtimeEntry?.rssBytes !== 'number' || runtimeEntry.rssBytes <= 0) {
+    return false;
+  }
+
+  if (
+    spawnEntry?.status === 'offline' ||
+    spawnEntry?.status === 'skipped' ||
+    spawnEntry?.launchState === 'skipped_for_launch'
+  ) {
+    return false;
+  }
+
+  if (!spawnEntry) {
+    return runtimeEntry.alive === true;
+  }
+
+  return (
+    runtimeEntry.alive === true ||
+    spawnEntry.runtimeAlive === true ||
+    spawnEntry.bootstrapConfirmed === true ||
+    spawnEntry.livenessSource === 'process' ||
+    spawnEntry.livenessSource === 'heartbeat'
+  );
+}
+
 function normalizeMemberBackendLabel(
   providerId: TeamProviderId,
   backendLabel: string | undefined
@@ -101,10 +130,9 @@ export function resolveMemberRuntimeSummary(
     configuredProvider,
     formatTeamProviderBackendLabel(configuredProvider, configuredProviderBackendId)
   );
-  const memorySuffix =
-    typeof runtimeEntry?.rssBytes === 'number' && runtimeEntry.rssBytes > 0
-      ? ` · ${formatBytes(runtimeEntry.rssBytes)}`
-      : '';
+  const memorySuffix = shouldShowRuntimeMemory(spawnEntry, runtimeEntry)
+    ? ` · ${formatBytes(runtimeEntry!.rssBytes!)}`
+    : '';
 
   if (runtimeModel && (isMemberLaunchPending(spawnEntry) || configuredModel.length === 0)) {
     const runtimeProvider = inferTeamProviderIdFromModel(runtimeModel) ?? configuredProvider;
diff --git a/src/renderer/utils/openCodeRuntimeDeliveryDiagnostics.ts b/src/renderer/utils/openCodeRuntimeDeliveryDiagnostics.ts
index a7317841..5cce4646 100644
--- a/src/renderer/utils/openCodeRuntimeDeliveryDiagnostics.ts
+++ b/src/renderer/utils/openCodeRuntimeDeliveryDiagnostics.ts
@@ -22,6 +22,17 @@ const PENDING_WARNING =
 const FAILED_WARNING =
   'OpenCode runtime delivery failed. Message was saved to inbox, but live delivery did not complete.';
 
+function formatOpenCodeRuntimeDeliveryFailureReason(reason: string | null | undefined): string {
+  const normalized = reason?.trim();
+  if (!normalized) {
+    return '';
+  }
+  if (normalized === 'empty_assistant_turn') {
+    return 'OpenCode returned an empty assistant turn.';
+  }
+  return '';
+}
+
 export function buildOpenCodeRuntimeDeliveryDiagnostics(
   result: SendMessageResult
 ): OpenCodeRuntimeDeliveryDiagnostics {
@@ -36,8 +47,19 @@ export function buildOpenCodeRuntimeDeliveryDiagnostics(
     return { warning: null, debugDetails: null };
   }
 
+  const failureReason = isFailed
+    ? formatOpenCodeRuntimeDeliveryFailureReason(
+        runtimeDelivery.reason ?? runtimeDelivery.diagnostics?.[0]
+      )
+    : '';
+
   return {
-    warning: isFailed ? FAILED_WARNING : PENDING_WARNING,
+    warning:
+      isFailed && failureReason
+        ? `${FAILED_WARNING} Reason: ${failureReason}`
+        : isFailed
+          ? FAILED_WARNING
+          : PENDING_WARNING,
     debugDetails: {
       messageId: result.messageId,
       providerId: runtimeDelivery.providerId,
diff --git a/src/renderer/utils/teamProvisioningPresentation.ts b/src/renderer/utils/teamProvisioningPresentation.ts
index f51b6e46..99a14d26 100644
--- a/src/renderer/utils/teamProvisioningPresentation.ts
+++ b/src/renderer/utils/teamProvisioningPresentation.ts
@@ -4,6 +4,7 @@ import {
   getLaunchJoinMilestonesFromMembers,
   getLaunchJoinState,
 } from '@renderer/components/team/provisioningSteps';
+import { isLeadMember } from '@shared/utils/leadDetection';
 
 import type {
   MemberSpawnStatusEntry,
@@ -42,6 +43,7 @@ interface SkippedSpawnDetail {
 }
 
 type PendingDiagnosticBucket =
+  | 'bootstrapStalled'
   | 'shellOnly'
   | 'runtimeProcess'
   | 'runtimeCandidate'
@@ -68,6 +70,42 @@ function isSkippedSpawnEntry(entry: MemberSpawnStatusEntry | undefined): boolean
   return entry?.launchState === 'skipped_for_launch' || entry?.skippedForLaunch === true;
 }
 
+function isOpenCodeSecondaryRetryCandidate(params: {
+  member: ProvisioningMemberLike | undefined;
+  entry: MemberSpawnStatusEntry | undefined;
+}): boolean {
+  const { member, entry } = params;
+  if (!member || !entry) {
+    return false;
+  }
+  if (member.providerId !== 'opencode' || member.removedAt) {
+    return false;
+  }
+  if (isLeadMember({ name: member.name, agentType: member.agentType })) {
+    return false;
+  }
+  if (member.laneKind && member.laneKind !== 'secondary') {
+    return false;
+  }
+  if (member.laneOwnerProviderId && member.laneOwnerProviderId !== 'opencode') {
+    return false;
+  }
+  if (
+    entry.launchState === 'skipped_for_launch' ||
+    entry.skippedForLaunch === true ||
+    entry.launchState === 'runtime_pending_permission' ||
+    entry.launchState === 'runtime_pending_bootstrap' ||
+    (entry.pendingPermissionRequestIds?.length ?? 0) > 0 ||
+    entry.launchState === 'starting' ||
+    entry.status === 'spawning' ||
+    entry.launchState === 'confirmed_alive' ||
+    entry.bootstrapConfirmed === true
+  ) {
+    return false;
+  }
+  return entry.launchState === 'failed_to_start' || entry.status === 'error';
+}
+
 function shouldPreferSnapshotEntryOverLive(params: {
   liveEntry: MemberSpawnStatusEntry | undefined;
   snapshotEntry: MemberSpawnStatusEntry | undefined;
@@ -182,6 +220,7 @@ function getPendingDiagnosticNameGroups(params: {
   memberSpawnSnapshotUpdatedAt?: string;
 }): PendingDiagnosticNameGroups {
   const groups: PendingDiagnosticNameGroups = {
+    bootstrapStalled: [],
     shellOnly: [],
     runtimeProcess: [],
     runtimeCandidate: [],
@@ -215,6 +254,10 @@ function getPendingDiagnosticNameGroups(params: {
       groups.permission.push(name);
       continue;
     }
+    if (entry.bootstrapStalled === true) {
+      groups.bootstrapStalled.push(name);
+      continue;
+    }
     if (entry.livenessKind === 'shell_only') {
       groups.shellOnly.push(name);
     } else if (entry.livenessKind === 'runtime_process') {
@@ -288,9 +331,24 @@ function buildOpenCodeSecondaryWaitPhrase(params: {
   const pendingOnlyOpenCodeSecondary = pendingNames.every((name) =>
     isOpenCodeSecondaryMember(memberByName.get(name))
   );
-  return pendingOnlyOpenCodeSecondary
-    ? `Waiting for OpenCode: ${formatMemberNameList(pendingNames)}`
-    : null;
+  if (!pendingOnlyOpenCodeSecondary) {
+    return null;
+  }
+
+  const groups = getPendingDiagnosticNameGroups({
+    memberSpawnStatuses: params.memberSpawnStatuses,
+    memberSpawnSnapshotStatuses: params.memberSpawnSnapshotStatuses,
+    memberSpawnSnapshotUpdatedAt: params.memberSpawnSnapshotUpdatedAt,
+  });
+  if (groups.bootstrapStalled.length === 0) {
+    return `Waiting for OpenCode: ${formatMemberNameList(pendingNames)}`;
+  }
+
+  const stalled = `Bootstrap stalled: ${formatMemberNameList(groups.bootstrapStalled)}`;
+  const waitingNames = pendingNames.filter((name) => !groups.bootstrapStalled.includes(name));
+  return waitingNames.length > 0
+    ? `${stalled}; Waiting for OpenCode: ${formatMemberNameList(waitingNames)}`
+    : stalled;
 }
 
 function formatNamedPendingDiagnostic(label: string, names: readonly string[]): string | null {
@@ -323,6 +381,7 @@ function buildPendingDiagnosticPhrase({
     memberSpawnSnapshotUpdatedAt,
   });
   const namedParts = [
+    formatNamedPendingDiagnostic('Bootstrap stalled', groups.bootstrapStalled),
     formatNamedPendingDiagnostic('Shell-only', groups.shellOnly),
     formatNamedPendingDiagnostic('Waiting for bootstrap', groups.runtimeProcess),
     formatNamedPendingDiagnostic('Bootstrap unconfirmed', groups.runtimeCandidate),
@@ -458,6 +517,51 @@ function getSkippedSpawnDetails(params: {
     .sort((left, right) => left.name.localeCompare(right.name));
 }
 
+function getRetryableOpenCodeSecondaryFailedNames(params: {
+  members: readonly ProvisioningMemberLike[];
+  memberSpawnStatuses: MemberSpawnStatusCollection;
+  memberSpawnSnapshotStatuses?: MemberSpawnStatusesSnapshot['statuses'];
+  memberSpawnSnapshotUpdatedAt?: string;
+}): string[] {
+  const membersByName = new Map(
+    params.members
+      .map((member) => [member.name.trim(), member] as const)
+      .filter(([name]) => name.length > 0)
+  );
+  const names = new Set<string>(membersByName.keys());
+  if (params.memberSpawnStatuses instanceof Map) {
+    for (const name of params.memberSpawnStatuses.keys()) {
+      names.add(name);
+    }
+  } else if (params.memberSpawnStatuses) {
+    for (const name of Object.keys(params.memberSpawnStatuses)) {
+      names.add(name);
+    }
+  }
+  for (const name of Object.keys(params.memberSpawnSnapshotStatuses ?? {})) {
+    names.add(name);
+  }
+
+  return [...names]
+    .filter((name) => {
+      const liveEntry =
+        params.memberSpawnStatuses instanceof Map
+          ? params.memberSpawnStatuses.get(name)
+          : params.memberSpawnStatuses?.[name];
+      const snapshotEntry = params.memberSpawnSnapshotStatuses?.[name];
+      const entry = getPreferredSpawnEntry({
+        liveEntry,
+        snapshotEntry,
+        snapshotUpdatedAt: params.memberSpawnSnapshotUpdatedAt,
+      });
+      return isOpenCodeSecondaryRetryCandidate({
+        member: membersByName.get(name),
+        entry,
+      });
+    })
+    .sort((left, right) => left.localeCompare(right));
+}
+
 function normalizeFailureReason(reason: string): string {
   return reason.replace(/\s+/g, ' ').trim();
 }
@@ -470,18 +574,9 @@ function buildFailedSpawnPanelMessage(
   }
   if (failedSpawnDetails.length === 1) {
     const [failed] = failedSpawnDetails;
-    return failed.reason
-      ? `${failed.name} failed to start - ${normalizeFailureReason(failed.reason)}`
-      : `${failed.name} failed to start`;
+    return `${failed.name} failed to start`;
   }
-  const listedFailures = failedSpawnDetails
-    .slice(0, 2)
-    .map((failed) =>
-      failed.reason ? `${failed.name} - ${normalizeFailureReason(failed.reason)}` : failed.name
-    )
-    .join('; ');
-  const remainingCount = failedSpawnDetails.length - Math.min(failedSpawnDetails.length, 2);
-  return `Failed teammates: ${listedFailures}${remainingCount > 0 ? `; +${remainingCount} more` : ''}`;
+  return `${failedSpawnDetails.length} teammates failed to start`;
 }
 
 function buildFailedSpawnCompactDetail(
@@ -559,6 +654,8 @@ export interface TeamProvisioningPresentation {
   allTeammatesConfirmedAlive: boolean;
   hasMembersStillJoining: boolean;
   remainingJoinCount: number;
+  retryableOpenCodeSecondaryFailedCount: number;
+  retryableOpenCodeSecondaryFailedNames: string[];
   panelTitle: string;
   panelMessage?: string | null;
   panelMessageSeverity?: 'error' | 'warning' | 'info';
@@ -652,6 +749,13 @@ export function buildTeamProvisioningPresentation({
     memberSpawnSnapshotStatuses: memberSpawnSnapshot?.statuses,
     memberSpawnSnapshotUpdatedAt: memberSpawnSnapshot?.updatedAt,
   });
+  const retryableOpenCodeSecondaryFailedNames = getRetryableOpenCodeSecondaryFailedNames({
+    members,
+    memberSpawnStatuses,
+    memberSpawnSnapshotStatuses: memberSpawnSnapshot?.statuses,
+    memberSpawnSnapshotUpdatedAt: memberSpawnSnapshot?.updatedAt,
+  });
+  const retryableOpenCodeSecondaryFailedCount = retryableOpenCodeSecondaryFailedNames.length;
 
   const { allTeammatesConfirmedAlive, hasMembersStillJoining, remainingJoinCount } =
     getLaunchJoinState({
@@ -690,6 +794,8 @@ export function buildTeamProvisioningPresentation({
       allTeammatesConfirmedAlive,
       hasMembersStillJoining,
       remainingJoinCount,
+      retryableOpenCodeSecondaryFailedCount,
+      retryableOpenCodeSecondaryFailedNames,
       panelTitle: 'Launch failed',
       panelMessage: progress.error ?? failedSpawnPanelMessage ?? genericFailedSpawnPanelMessage,
       panelTone: 'error',
@@ -778,6 +884,8 @@ export function buildTeamProvisioningPresentation({
       allTeammatesConfirmedAlive,
       hasMembersStillJoining,
       remainingJoinCount,
+      retryableOpenCodeSecondaryFailedCount,
+      retryableOpenCodeSecondaryFailedNames,
       panelTitle: 'Launch details',
       panelMessage:
         failedSpawnCount > 0 || skippedSpawnCount > 0 || hasMembersStillJoining
@@ -853,6 +961,8 @@ export function buildTeamProvisioningPresentation({
       allTeammatesConfirmedAlive,
       hasMembersStillJoining,
       remainingJoinCount,
+      retryableOpenCodeSecondaryFailedCount,
+      retryableOpenCodeSecondaryFailedNames,
       panelTitle: openCodeSecondaryWaitPhrase ? 'Core team ready' : 'Launching team',
       panelMessage:
         failedSpawnCount > 0
diff --git a/src/shared/types/api.ts b/src/shared/types/api.ts
index b76e809a..5e41c625 100644
--- a/src/shared/types/api.ts
+++ b/src/shared/types/api.ts
@@ -58,8 +58,10 @@ import type {
   MemberLogSummary,
   MemberSpawnStatusesSnapshot,
   MessagesPage,
+  OpenCodeRuntimeDeliveryStatus,
   ProjectBranchChangeEvent,
   ReplaceMembersRequest,
+  RetryFailedOpenCodeSecondaryLanesResult,
   SendMessageRequest,
   SendMessageResult,
   TaskAttachmentMeta,
@@ -73,6 +75,7 @@ import type {
   TeamCreateConfigRequest,
   TeamCreateRequest,
   TeamCreateResponse,
+  TeamGetDataOptions,
   TeamLaunchRequest,
   TeamLaunchResponse,
   TeamMemberActivityMeta,
@@ -440,7 +443,7 @@ export interface HttpServerAPI {
 
 export interface TeamsAPI {
   list: () => Promise<TeamSummary[]>;
-  getData: (teamName: string) => Promise<TeamViewSnapshot>;
+  getData: (teamName: string, options?: TeamGetDataOptions) => Promise<TeamViewSnapshot>;
   getTaskChangePresence: (teamName: string) => Promise<Record<string, TaskChangePresenceState>>;
   setChangePresenceTracking: (teamName: string, enabled: boolean) => Promise<void>;
   setToolActivityTracking: (teamName: string, enabled: boolean) => Promise<void>;
@@ -466,6 +469,10 @@ export interface TeamsAPI {
   getProvisioningStatus: (runId: string) => Promise<TeamProvisioningProgress>;
   cancelProvisioning: (runId: string) => Promise<void>;
   sendMessage: (teamName: string, request: SendMessageRequest) => Promise<SendMessageResult>;
+  getOpenCodeRuntimeDeliveryStatus: (
+    teamName: string,
+    messageId: string
+  ) => Promise<OpenCodeRuntimeDeliveryStatus | null>;
   getMessagesPage: (
     teamName: string,
     options?: { cursor?: string | null; limit?: number }
@@ -554,6 +561,9 @@ export interface TeamsAPI {
   getLeadContext: (teamName: string) => Promise<LeadContextUsageSnapshot>;
   getMemberSpawnStatuses: (teamName: string) => Promise<MemberSpawnStatusesSnapshot>;
   getTeamAgentRuntime: (teamName: string) => Promise<TeamAgentRuntimeSnapshot>;
+  retryFailedOpenCodeSecondaryLanes: (
+    teamName: string
+  ) => Promise<RetryFailedOpenCodeSecondaryLanesResult>;
   restartMember: (teamName: string, memberName: string) => Promise<void>;
   skipMemberForLaunch: (teamName: string, memberName: string) => Promise<void>;
   softDeleteTask: (teamName: string, taskId: string) => Promise<void>;
diff --git a/src/shared/types/notifications.ts b/src/shared/types/notifications.ts
index 3c39c08e..8de0313f 100644
--- a/src/shared/types/notifications.ts
+++ b/src/shared/types/notifications.ts
@@ -21,17 +21,41 @@ import type { TriggerColor } from '@shared/constants/triggerColors';
  */
 export type TeamEventType =
   | 'rate_limit'
+  | 'api_error'
   | 'lead_inbox'
   | 'user_inbox'
   | 'task_clarification'
   | 'task_status_change'
   | 'task_comment'
+  | 'task_review_requested'
+  | 'task_blocked'
   | 'task_created'
   | 'all_tasks_completed'
   | 'cross_team_message'
   | 'schedule_completed'
   | 'schedule_failed'
-  | 'team_launched';
+  | 'team_launched'
+  | 'team_launch_incomplete';
+
+export type NotificationTarget =
+  | {
+      kind: 'team';
+      teamName: string;
+      section?: 'overview' | 'tasks' | 'members' | 'messages' | 'schedules';
+    }
+  | {
+      kind: 'task';
+      teamName: string;
+      taskId: string;
+      commentId?: string;
+      focus?: 'detail' | 'comments' | 'status' | 'review';
+    }
+  | {
+      kind: 'member';
+      teamName: string;
+      memberName: string;
+      focus?: 'profile' | 'messages' | 'logs';
+    };
 
 /**
  * Detected error from session JSONL files.
@@ -72,6 +96,8 @@ export interface DetectedError {
   category?: 'error' | 'team';
   /** For team notifications: specific event sub-type */
   teamEventType?: TeamEventType;
+  /** Structured destination for notification clicks. */
+  target?: NotificationTarget;
   /** Explicit key for storage deduplication. Two notifications with the same dedupeKey won't be stored twice. */
   dedupeKey?: string;
   /** Additional context */
diff --git a/src/shared/types/team.ts b/src/shared/types/team.ts
index 9f96f742..7507ca1a 100644
--- a/src/shared/types/team.ts
+++ b/src/shared/types/team.ts
@@ -1,3 +1,4 @@
+import type { NotificationTarget, TeamEventType } from './notifications';
 import type { EnhancedChunk } from '@main/types';
 
 export interface TeamMember {
@@ -55,6 +56,8 @@ export interface TeamSummary {
   color?: string;
   memberCount: number;
   members?: TeamSummaryMember[];
+  leadName?: string;
+  leadColor?: string;
   taskCount: number;
   lastActivity: string | null;
   projectPath?: string;
@@ -733,6 +736,10 @@ export interface SendMessageResult {
   };
 }
 
+export type OpenCodeRuntimeDeliveryStatus = NonNullable<SendMessageResult['runtimeDelivery']> & {
+  messageId: string;
+};
+
 export interface AddTaskCommentRequest {
   text: string;
   attachments?: CommentAttachmentPayload[];
@@ -872,6 +879,14 @@ export interface TeamMemberActivityMeta {
   feedRevision: string;
 }
 
+export interface TeamGetDataOptions {
+  /**
+   * Default true.
+   * Set false only for UI-first reads where branch labels can arrive through branch sync.
+   */
+  includeMemberBranches?: boolean;
+}
+
 export interface TeamViewSnapshot {
   teamName: string;
   config: TeamConfig;
@@ -1020,6 +1035,8 @@ export interface PersistedTeamLaunchMemberState {
   pidSource?: TeamAgentRuntimePidSource;
   runtimeDiagnostic?: string;
   runtimeDiagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+  /** True when a live runtime process missed the bounded bootstrap check-in window. */
+  bootstrapStalled?: boolean;
   runtimeLastSeenAt?: string;
   firstSpawnAcceptedAt?: string;
   lastHeartbeatAt?: string;
@@ -1066,6 +1083,14 @@ export interface MemberSpawnStatusesSnapshot {
   source?: 'live' | 'persisted' | 'merged';
 }
 
+export interface RetryFailedOpenCodeSecondaryLanesResult {
+  attempted: string[];
+  confirmed: string[];
+  pending: string[];
+  failed: Array<{ memberName: string; error: string }>;
+  skipped: Array<{ memberName: string; reason: string }>;
+}
+
 export type MemberSpawnLivenessSource = 'heartbeat' | 'process';
 
 export type TeamAgentRuntimeBackendType = 'lead' | 'tmux' | 'iterm2' | 'in-process' | 'process';
@@ -1197,6 +1222,8 @@ export interface MemberSpawnStatusEntry {
   runtimeDiagnostic?: string;
   /** Visual severity for runtimeDiagnostic. */
   runtimeDiagnosticSeverity?: TeamAgentRuntimeDiagnosticSeverity;
+  /** Process is alive, but bootstrap did not confirm before the bounded OpenCode deadline. */
+  bootstrapStalled?: boolean;
   /** ISO timestamp of the last liveness evaluation. */
   livenessLastCheckedAt?: string;
   /** ISO timestamp of the last status change. */
@@ -1497,12 +1524,9 @@ export interface TeamMessageNotificationData {
   /** Optional sender color for visual context. */
   color?: string;
   /** Team event sub-type for notification categorization. */
-  teamEventType?:
-    | 'task_clarification'
-    | 'task_status_change'
-    | 'task_comment'
-    | 'task_created'
-    | 'all_tasks_completed';
+  teamEventType?: TeamEventType;
+  /** Structured destination used when clicking the OS or in-app notification. */
+  target?: NotificationTarget;
   /** Stable key for storage deduplication. Required — no fallback to Date.now(). */
   dedupeKey?: string;
   /**
diff --git a/test/features/member-work-sync/main/createMemberWorkSyncFeature.test.ts b/test/features/member-work-sync/main/createMemberWorkSyncFeature.test.ts
index 9ba09292..c6801f22 100644
--- a/test/features/member-work-sync/main/createMemberWorkSyncFeature.test.ts
+++ b/test/features/member-work-sync/main/createMemberWorkSyncFeature.test.ts
@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { afterEach, describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import {
   MEMBER_WORK_SYNC_NUDGE_SIDE_EFFECTS_ENV,
@@ -80,6 +80,34 @@ describe('createMemberWorkSyncFeature composition', () => {
     }
   });
 
+  it('uses snapshot config reads for startup roster materialization', async () => {
+    const getConfig = vi.fn(async () => ({ members: [] }));
+    const getConfigSnapshot = vi.fn(async () => ({
+      members: [{ name: 'alice' }],
+    }));
+    const feature = createMemberWorkSyncFeature({
+      teamsBasePath: makeTempRoot(),
+      configReader: {
+        getConfig,
+        getConfigSnapshot,
+      } as never,
+      taskReader: {} as never,
+      kanbanManager: {} as never,
+      membersMetaStore: {
+        getMembers: vi.fn(async () => []),
+      } as never,
+      nudgeSideEffectsEnabled: false,
+    });
+
+    try {
+      await feature.enqueueStartupScan(['my-team']);
+      expect(getConfigSnapshot).toHaveBeenCalledWith('my-team');
+      expect(getConfig).not.toHaveBeenCalled();
+    } finally {
+      await feature.dispose();
+    }
+  });
+
   it('builds Claude Stop hook settings without requiring nudge side effects', async () => {
     const root = makeTempRoot();
     const feature = createMemberWorkSyncFeature({
diff --git a/test/main/ipc/teams.test.ts b/test/main/ipc/teams.test.ts
index 3070bdf9..b3e60e9c 100644
--- a/test/main/ipc/teams.test.ts
+++ b/test/main/ipc/teams.test.ts
@@ -14,6 +14,7 @@ import type {
   SendMessageResult,
   TeamViewSnapshot,
   TeamCreateRequest,
+  TeamProviderId,
   TeamProvisioningProgress,
 } from '@shared/types/team';
 
@@ -49,8 +50,30 @@ const { mockTeamDataWorkerClient } = vi.hoisted(() => ({
     getMessagesPage: vi.fn(),
     getMemberActivityMeta: vi.fn(),
     findLogsForTask: vi.fn(),
+    invalidateTeamConfig: vi.fn(),
+    invalidateTeamMessageFeed: vi.fn(),
   },
 }));
+
+function createDeferred<T>(): {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (error: unknown) => void;
+} {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+async function flushMicrotasks(): Promise<void> {
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
 vi.mock('@main/services/infrastructure/NotificationManager', () => ({
   NotificationManager: {
     getInstance: vi.fn().mockReturnValue({
@@ -135,6 +158,7 @@ import {
   removeTeamHandlers,
 } from '../../../src/main/ipc/teams';
 import { ConfigManager } from '../../../src/main/services/infrastructure/ConfigManager';
+import { LaunchIoGovernor } from '../../../src/main/services/team/LaunchIoGovernor';
 import { getAppDataPath } from '../../../src/main/utils/pathDecoder';
 
 describe('ipc teams handlers', () => {
@@ -147,6 +171,7 @@ describe('ipc teams handlers', () => {
       handlers.delete(channel);
     }),
   };
+  let launchIoGovernor: LaunchIoGovernor;
 
   const service = {
     listTeams: vi.fn(async () => [{ teamName: 'my-team', displayName: 'My Team' }]),
@@ -165,6 +190,7 @@ describe('ipc teams handlers', () => {
       feedRevision: 'rev-1',
       messages: [] as InboxMessage[],
     })),
+    getAllTasks: vi.fn(async () => [{ id: 'task-1', teamName: 'my-team', subject: 'Task 1' }]),
     getMessagesPage: vi.fn(
       async (..._args: unknown[]): Promise<MessagesPage> => ({
         messages: [] as InboxMessage[],
@@ -187,10 +213,21 @@ describe('ipc teams handlers', () => {
       projectPath: '/tmp/project',
     })),
     deleteTeam: vi.fn(async () => undefined),
+    restoreTeam: vi.fn(async () => undefined),
+    permanentlyDeleteTeam: vi.fn(async () => undefined),
     getLeadMemberName: vi.fn(async () => 'team-lead'),
     getTeamDisplayName: vi.fn(async () => 'My Team'),
     updateConfig: vi.fn(async () => ({ name: 'My Team' })),
-    sendMessage: vi.fn(async () => ({ deliveredToInbox: true, messageId: 'm1' })),
+    sendMessage: vi.fn(
+      async (_teamName: string, _request: unknown) => ({ deliveredToInbox: true, messageId: 'm1' })
+    ) as ReturnType<
+      typeof vi.fn<
+        (
+          teamName: string,
+          request: unknown
+        ) => Promise<{ deliveredToInbox: boolean; messageId: string }>
+      >
+    >,
     sendDirectToLead: vi.fn(async () => ({ deliveredToInbox: false, messageId: 'direct-1' })),
     createTask: vi.fn(async () => ({ id: '1', subject: 'Test', status: 'pending' })),
     requestReview: vi.fn(async () => undefined),
@@ -213,6 +250,7 @@ describe('ipc teams handlers', () => {
     addTaskRelationship: vi.fn(async () => undefined),
     removeTaskRelationship: vi.fn(async () => undefined),
     replaceMembers: vi.fn(async () => undefined),
+    invalidateMessageFeed: vi.fn(() => undefined),
     createTeamConfig: vi.fn(async () => undefined),
     getSavedRequest: vi.fn(async (): Promise<TeamCreateRequest | null> => null),
   };
@@ -242,6 +280,14 @@ describe('ipc teams handlers', () => {
     pushLiveLeadProcessMessage: vi.fn(),
     relayLeadInboxMessages: vi.fn(async () => 0),
     relayMemberInboxMessages: vi.fn(async () => 0),
+    resolveRuntimeRecipientProviderId: vi.fn(
+      async (_teamName: string, _memberName: string): Promise<TeamProviderId | undefined> =>
+        undefined
+    ) as ReturnType<
+      typeof vi.fn<
+        (teamName: string, memberName: string) => Promise<TeamProviderId | undefined>
+      >
+    >,
     isOpenCodeRuntimeRecipient: vi.fn(async () => false),
     relayOpenCodeMemberInboxMessages: vi.fn(async () => ({
       relayed: 0,
@@ -298,6 +344,12 @@ describe('ipc teams handlers', () => {
   beforeEach(() => {
     handlers.clear();
     vi.clearAllMocks();
+    service.listTeams.mockReset();
+    service.getAllTasks.mockReset();
+    service.listTeams.mockResolvedValue([{ teamName: 'my-team', displayName: 'My Team' }]);
+    service.getAllTasks.mockResolvedValue([
+      { id: 'task-1', teamName: 'my-team', subject: 'Task 1' },
+    ]);
     mockGetMembersMeta.mockReset();
     mockGetMembersMeta.mockResolvedValue([]);
     mockGetMembersMetaFile.mockReset();
@@ -313,6 +365,11 @@ describe('ipc teams handlers', () => {
     mockTeamDataWorkerClient.getMessagesPage.mockReset();
     mockTeamDataWorkerClient.getMemberActivityMeta.mockReset();
     mockTeamDataWorkerClient.findLogsForTask.mockReset();
+    mockTeamDataWorkerClient.invalidateTeamConfig.mockReset();
+    mockTeamDataWorkerClient.invalidateTeamMessageFeed.mockReset();
+    provisioningService.resolveRuntimeRecipientProviderId.mockReset();
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValue(undefined);
+    launchIoGovernor = new LaunchIoGovernor({ quietWindowMs: 100 });
     initializeTeamHandlers(
       service as never,
       provisioningService as never,
@@ -326,12 +383,14 @@ describe('ipc teams handlers', () => {
       boardTaskActivityDetailService as never,
       boardTaskLogStreamService as never,
       boardTaskExactLogsService as never,
-      boardTaskExactLogDetailService as never
+      boardTaskExactLogDetailService as never,
+      launchIoGovernor
     );
     registerTeamHandlers(ipcMain as never);
   });
 
   afterEach(() => {
+    launchIoGovernor.clearForTests();
     vi.useRealTimers();
     setClaudeBasePathOverride(null);
   });
@@ -607,8 +666,63 @@ describe('ipc teams handlers', () => {
     expect(result.success).toBe(false);
   });
 
+  it('uses Agent Teams MCP reply instructions for Codex user direct messages', async () => {
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce('codex');
+    const sendHandler = handlers.get(TEAM_SEND_MESSAGE);
+    expect(sendHandler).toBeDefined();
+
+    const result = (await sendHandler!({} as never, 'my-team', {
+      member: 'jack',
+      from: ' User ',
+      text: 'Здесь?',
+    })) as { success: boolean };
+
+    expect(result.success).toBe(true);
+    const request = service.sendMessage.mock.calls.at(-1)?.[1] as
+      | { from?: string; text?: string; messageId?: string }
+      | undefined;
+    expect(request).toBeDefined();
+    expect(request?.from).toBe('user');
+    expect(request?.messageId).toEqual(expect.any(String));
+    expect(request?.text).toContain('agent-teams_message_send');
+    expect(request?.text).toContain('mcp__agent-teams__message_send');
+    expect(request?.text).toContain('teamName="my-team"');
+    expect(request?.text).toContain('to="user"');
+    expect(request?.text).toContain('from="jack"');
+    expect(request?.text).toContain('source="runtime_delivery"');
+    expect(request?.text).toContain(`relayOfMessageId="${request?.messageId}"`);
+    expect(request?.text).toContain('before any visible-message tool attempt');
+    expect(request?.text).not.toContain('tool call fails before sending');
+    expect(request?.text).not.toContain('Reply using the SendMessage tool');
+  });
+
+  it.each([
+    ['anthropic' as const],
+    ['gemini' as const],
+    [undefined],
+  ])('keeps SendMessage reply instructions for %s user direct messages', async (providerId) => {
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce(providerId);
+    const sendHandler = handlers.get(TEAM_SEND_MESSAGE);
+    expect(sendHandler).toBeDefined();
+
+    const result = (await sendHandler!({} as never, 'my-team', {
+      member: 'alice',
+      text: 'Здесь?',
+    })) as { success: boolean };
+
+    expect(result.success).toBe(true);
+    const request = service.sendMessage.mock.calls.at(-1)?.[1] as
+      | { text?: string; messageId?: string }
+      | undefined;
+    expect(request).toBeDefined();
+    expect(request).not.toHaveProperty('messageId');
+    expect(request?.text).toContain('Reply using the SendMessage tool');
+    expect(request?.text).toContain('to="user"');
+    expect(request?.text).not.toContain('agent-teams_message_send');
+  });
+
   it('stores base text and returns runtimeDelivery success for OpenCode teammate sends', async () => {
-    provisioningService.isOpenCodeRuntimeRecipient.mockResolvedValueOnce(true);
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce('opencode');
     provisioningService.relayOpenCodeMemberInboxMessages.mockResolvedValueOnce({
       relayed: 1,
       attempted: 1,
@@ -661,7 +775,7 @@ describe('ipc teams handlers', () => {
   });
 
   it('returns runtimeDelivery failure without hiding the persisted OpenCode message', async () => {
-    provisioningService.isOpenCodeRuntimeRecipient.mockResolvedValueOnce(true);
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce('opencode');
     provisioningService.relayOpenCodeMemberInboxMessages.mockResolvedValueOnce({
       relayed: 0,
       attempted: 1,
@@ -696,7 +810,7 @@ describe('ipc teams handlers', () => {
   });
 
   it('returns runtimeDelivery acceptanceUnknown for OpenCode observe-pending timeout sends', async () => {
-    provisioningService.isOpenCodeRuntimeRecipient.mockResolvedValueOnce(true);
+    provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce('opencode');
     provisioningService.relayOpenCodeMemberInboxMessages.mockResolvedValueOnce({
       relayed: 0,
       attempted: 1,
@@ -736,7 +850,7 @@ describe('ipc teams handlers', () => {
   it('maps OpenCode UI relay timeout to pending acceptance-unknown delivery', async () => {
     vi.useFakeTimers();
     try {
-      provisioningService.isOpenCodeRuntimeRecipient.mockResolvedValueOnce(true);
+      provisioningService.resolveRuntimeRecipientProviderId.mockResolvedValueOnce('opencode');
       provisioningService.relayOpenCodeMemberInboxMessages.mockReturnValueOnce(
         new Promise(() => undefined)
       );
@@ -1045,6 +1159,155 @@ describe('ipc teams handlers', () => {
     });
   });
 
+  it('returns cached TEAM_LIST data under active launch pressure without starting another scan', async () => {
+    const first = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+    expect(first.success).toBe(true);
+    expect(first.data).toEqual([{ teamName: 'my-team', displayName: 'My Team' }]);
+
+    service.listTeams.mockResolvedValueOnce([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+    launchIoGovernor.noteLaunchIntent('my-team', 'test');
+
+    const second = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+
+    expect(second.success).toBe(true);
+    expect(second.data).toEqual([{ teamName: 'my-team', displayName: 'My Team' }]);
+    expect(service.listTeams).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns cached TEAM_GET_ALL_TASKS data under active launch pressure without starting another scan', async () => {
+    const first = (await handlers.get(TEAM_GET_ALL_TASKS)!({} as never)) as {
+      success: boolean;
+      data: { id: string }[];
+    };
+    expect(first.success).toBe(true);
+    expect(first.data).toEqual([{ id: 'task-1', teamName: 'my-team', subject: 'Task 1' }]);
+
+    service.getAllTasks.mockResolvedValueOnce([
+      { id: 'task-2', teamName: 'my-team', subject: 'Task 2' },
+    ]);
+    launchIoGovernor.noteLaunchIntent('my-team', 'test');
+
+    const second = (await handlers.get(TEAM_GET_ALL_TASKS)!({} as never)) as {
+      success: boolean;
+      data: { id: string }[];
+    };
+
+    expect(second.success).toBe(true);
+    expect(second.data).toEqual([{ id: 'task-1', teamName: 'my-team', subject: 'Task 1' }]);
+    expect(service.getAllTasks).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps current fresh behavior for TEAM_LIST when launch pressure has no cached data', async () => {
+    launchIoGovernor.clearForTests();
+    launchIoGovernor.noteLaunchIntent('my-team', 'test');
+
+    const result = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+
+    expect(result.success).toBe(true);
+    expect(result.data).toEqual([{ teamName: 'my-team', displayName: 'My Team' }]);
+    expect(service.listTeams).toHaveBeenCalledTimes(1);
+  });
+
+  it('flushes TEAM_LIST once after terminal provisioning progress quiet window', async () => {
+    vi.useFakeTimers();
+    const first = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+    };
+    expect(first.success).toBe(true);
+
+    service.listTeams.mockResolvedValue([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+    launchIoGovernor.noteLaunchIntent('my-team', 'test');
+    await handlers.get(TEAM_LIST)!({} as never);
+    launchIoGovernor.noteProvisioningProgress({
+      runId: 'run-1',
+      teamName: 'my-team',
+      state: 'ready',
+      message: 'ready',
+      startedAt: '2026-05-02T00:00:00.000Z',
+      updatedAt: '2026-05-02T00:00:00.000Z',
+    } as TeamProvisioningProgress);
+
+    await vi.advanceTimersByTimeAsync(100);
+    await flushMicrotasks();
+    expect(service.listTeams).toHaveBeenCalledTimes(2);
+  });
+
+  it('does not let provisioning status polling activate launch IO stale mode', async () => {
+    const first = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+    expect(first.success).toBe(true);
+
+    service.listTeams.mockResolvedValueOnce([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+    const status = (await handlers.get(TEAM_PROVISIONING_STATUS)!({} as never, 'run-1')) as {
+      success: boolean;
+    };
+    expect(status.success).toBe(true);
+
+    const second = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+    expect(second.success).toBe(true);
+    expect(second.data).toEqual([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+    expect(service.listTeams).toHaveBeenCalledTimes(2);
+  });
+
+  it('clears launch IO pressure when create fails before first provisioning progress', async () => {
+    vi.useFakeTimers();
+    const first = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+    };
+    expect(first.success).toBe(true);
+    provisioningService.createTeam.mockRejectedValueOnce(new Error('bootstrap failed early'));
+    service.listTeams
+      .mockResolvedValueOnce([{ teamName: 'background-fresh', displayName: 'Background Fresh' }])
+      .mockResolvedValueOnce([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+
+    const createResult = (await handlers.get(TEAM_CREATE)!(
+      { sender: { send: vi.fn() } } as never,
+      {
+        teamName: 'my-team',
+        members: [{ name: 'alice' }],
+        cwd: os.tmpdir(),
+      }
+    )) as { success: boolean };
+    expect(createResult.success).toBe(false);
+    vi.mocked(console.error).mockClear();
+
+    await vi.advanceTimersByTimeAsync(100);
+    await flushMicrotasks();
+    const second = (await handlers.get(TEAM_LIST)!({} as never)) as {
+      success: boolean;
+      data: { teamName: string }[];
+    };
+    expect(second.success).toBe(true);
+    expect(second.data).toEqual([{ teamName: 'fresh-team', displayName: 'Fresh' }]);
+    expect(service.listTeams).toHaveBeenCalledTimes(3);
+  });
+
+  it('does not route TEAM_GET_MESSAGES_PAGE through the launch IO governor', async () => {
+    launchIoGovernor.noteLaunchIntent('my-team', 'test');
+
+    const result = (await handlers.get(TEAM_GET_MESSAGES_PAGE)!({} as never, 'my-team', {
+      limit: 50,
+    })) as { success: boolean; data?: { feedRevision: string } };
+
+    expect(result.success).toBe(true);
+    expect(result.data?.feedRevision).toBe('rev-1');
+    expect(service.getMessagesPage).toHaveBeenCalledTimes(1);
+  });
+
   it('keeps TEAM_GET_DATA structural and does not expose message transport', async () => {
     provisioningService.getLiveLeadProcessMessages.mockReturnValueOnce([
       {
@@ -1087,6 +1350,244 @@ describe('ipc teams handlers', () => {
     (electron.app as { isPackaged: boolean }).isPackaged = false;
   });
 
+  it('forwards thin TEAM_GET_DATA options to the worker without changing full request shape', async () => {
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(true);
+    mockTeamDataWorkerClient.getTeamData.mockResolvedValueOnce({
+      teamName: 'my-team',
+      config: { name: 'My Team' },
+      tasks: [],
+      members: [],
+      kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+      processes: [],
+    });
+
+    const handler = handlers.get(TEAM_GET_DATA)!;
+    const result = (await handler({} as never, 'my-team', {
+      includeMemberBranches: false,
+    })) as {
+      success: boolean;
+      data?: { teamName: string };
+    };
+
+    expect(result.success).toBe(true);
+    expect(result.data?.teamName).toBe('my-team');
+    expect(mockTeamDataWorkerClient.getTeamData).toHaveBeenCalledWith('my-team', {
+      includeMemberBranches: false,
+    });
+    expect(service.getTeamData).not.toHaveBeenCalled();
+  });
+
+  it('normalizes explicit full TEAM_GET_DATA options to the existing one-argument call shape', async () => {
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(true);
+    mockTeamDataWorkerClient.getTeamData.mockResolvedValueOnce({
+      teamName: 'my-team',
+      config: { name: 'My Team' },
+      tasks: [],
+      members: [],
+      kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+      processes: [],
+    });
+
+    const handler = handlers.get(TEAM_GET_DATA)!;
+    const result = (await handler({} as never, 'my-team', {
+      includeMemberBranches: true,
+    })) as {
+      success: boolean;
+      data?: { teamName: string };
+    };
+
+    expect(result.success).toBe(true);
+    expect(mockTeamDataWorkerClient.getTeamData).toHaveBeenCalledWith('my-team');
+  });
+
+  it('forwards thin TEAM_GET_DATA options through packaged main-thread fallback', async () => {
+    const electron = await import('electron');
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(false);
+    (electron.app as { isPackaged: boolean }).isPackaged = true;
+
+    const handler = handlers.get(TEAM_GET_DATA)!;
+    const result = (await handler({} as never, 'my-team', {
+      includeMemberBranches: false,
+    })) as {
+      success: boolean;
+      data?: { teamName: string };
+    };
+
+    expect(result.success).toBe(true);
+    expect(service.getTeamData).toHaveBeenCalledWith('my-team', {
+      includeMemberBranches: false,
+    });
+    vi.mocked(console.error).mockClear();
+
+    (electron.app as { isPackaged: boolean }).isPackaged = false;
+  });
+
+  it('rejects malformed TEAM_GET_DATA options before dispatching to service or worker', async () => {
+    const handler = handlers.get(TEAM_GET_DATA)!;
+    const result = (await handler({} as never, 'my-team', {
+      includeMemberBranches: 'false',
+    })) as {
+      success: boolean;
+      error?: string;
+    };
+
+    expect(result.success).toBe(false);
+    expect(result.error).toContain('includeMemberBranches');
+    expect(mockTeamDataWorkerClient.getTeamData).not.toHaveBeenCalled();
+    expect(service.getTeamData).not.toHaveBeenCalled();
+  });
+
+  it.each([
+    ['null options', null, 'options must be an object'],
+    ['array options', [], 'options must be an object'],
+    ['unknown option key', { includeMemberBranches: false, thin: true }, 'Unknown getData option'],
+  ])(
+    'rejects malformed TEAM_GET_DATA %s before dispatching to service or worker',
+    async (_label, rawOptions, expectedError) => {
+      const handler = handlers.get(TEAM_GET_DATA)!;
+      const result = (await handler({} as never, 'my-team', rawOptions)) as {
+        success: boolean;
+        error?: string;
+      };
+
+      expect(result.success).toBe(false);
+      expect(result.error).toContain(expectedError);
+      expect(mockTeamDataWorkerClient.getTeamData).not.toHaveBeenCalled();
+      expect(service.getTeamData).not.toHaveBeenCalled();
+    }
+  );
+
+  it('classifies draft teams before asking the team-data worker for a full snapshot', async () => {
+    const claudeRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ipc-draft-get-data-'));
+    setClaudeBasePathOverride(claudeRoot);
+    const teamDir = path.join(claudeRoot, 'teams', 'draft-team');
+    await fs.promises.mkdir(teamDir, { recursive: true });
+    await fs.promises.writeFile(
+      path.join(teamDir, 'team.meta.json'),
+      JSON.stringify({
+        version: 1,
+        cwd: '/tmp/draft-team',
+        createdAt: Date.now(),
+      })
+    );
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(true);
+
+    try {
+      const handler = handlers.get(TEAM_GET_DATA)!;
+      const result = (await handler({} as never, 'draft-team')) as {
+        success: boolean;
+        error?: string;
+      };
+
+      expect(result).toEqual({ success: false, error: 'TEAM_DRAFT' });
+      expect(mockTeamDataWorkerClient.getTeamData).not.toHaveBeenCalled();
+      expect(service.getTeamData).not.toHaveBeenCalledWith('draft-team');
+    } finally {
+      await fs.promises.rm(claudeRoot, { recursive: true, force: true });
+      setClaudeBasePathOverride(null);
+    }
+  });
+
+  it('classifies draft teams before falling back to main-thread getTeamData', async () => {
+    const claudeRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ipc-draft-main-get-data-'));
+    setClaudeBasePathOverride(claudeRoot);
+    const teamDir = path.join(claudeRoot, 'teams', 'draft-team');
+    await fs.promises.mkdir(teamDir, { recursive: true });
+    await fs.promises.writeFile(
+      path.join(teamDir, 'team.meta.json'),
+      JSON.stringify({
+        version: 1,
+        cwd: '/tmp/draft-team',
+        createdAt: Date.now(),
+      })
+    );
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(false);
+
+    try {
+      const handler = handlers.get(TEAM_GET_DATA)!;
+      const result = (await handler({} as never, 'draft-team')) as {
+        success: boolean;
+        error?: string;
+      };
+
+      expect(result).toEqual({ success: false, error: 'TEAM_DRAFT' });
+      expect(mockTeamDataWorkerClient.getTeamData).not.toHaveBeenCalled();
+      expect(service.getTeamData).not.toHaveBeenCalledWith('draft-team');
+    } finally {
+      await fs.promises.rm(claudeRoot, { recursive: true, force: true });
+      setClaudeBasePathOverride(null);
+    }
+  });
+
+  it('does not let slow draft metadata classification block normal getData fallback', async () => {
+    const claudeRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ipc-draft-slow-meta-'));
+    setClaudeBasePathOverride(claudeRoot);
+    const teamDir = path.join(claudeRoot, 'teams', 'slow-meta-team');
+    await fs.promises.mkdir(teamDir, { recursive: true });
+    const { TeamMetaStore } = await import('../../../src/main/services/team/TeamMetaStore');
+    const metaSpy = vi
+      .spyOn(TeamMetaStore.prototype, 'getMeta')
+      .mockImplementation(async () => new Promise(() => undefined));
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(true);
+    mockTeamDataWorkerClient.getTeamData.mockResolvedValueOnce({
+      teamName: 'slow-meta-team',
+      config: { name: 'Slow Meta Team' },
+      tasks: [],
+      members: [],
+      kanbanState: { teamName: 'slow-meta-team', reviewers: [], tasks: {} },
+      processes: [],
+    });
+
+    try {
+      const startedAt = Date.now();
+      const handler = handlers.get(TEAM_GET_DATA)!;
+      const result = (await handler({} as never, 'slow-meta-team')) as {
+        success: boolean;
+        data?: { teamName: string };
+      };
+
+      expect(Date.now() - startedAt).toBeLessThan(1500);
+      expect(result.success).toBe(true);
+      expect(result.data?.teamName).toBe('slow-meta-team');
+      expect(mockTeamDataWorkerClient.getTeamData).toHaveBeenCalledWith('slow-meta-team');
+    } finally {
+      metaSpy.mockRestore();
+      await fs.promises.rm(claudeRoot, { recursive: true, force: true });
+      setClaudeBasePathOverride(null);
+    }
+  });
+
+  it('does not let slow draft metadata classification block Team not found fallback', async () => {
+    const claudeRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'ipc-draft-slow-missing-meta-'));
+    setClaudeBasePathOverride(claudeRoot);
+    const teamDir = path.join(claudeRoot, 'teams', 'slow-missing-team');
+    await fs.promises.mkdir(teamDir, { recursive: true });
+    const { TeamMetaStore } = await import('../../../src/main/services/team/TeamMetaStore');
+    const metaSpy = vi
+      .spyOn(TeamMetaStore.prototype, 'getMeta')
+      .mockImplementation(async () => new Promise(() => undefined));
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(false);
+    service.getTeamData.mockRejectedValueOnce(new Error('Team not found: slow-missing-team'));
+
+    try {
+      const startedAt = Date.now();
+      const handler = handlers.get(TEAM_GET_DATA)!;
+      const result = (await handler({} as never, 'slow-missing-team')) as {
+        success: boolean;
+        error?: string;
+      };
+
+      expect(Date.now() - startedAt).toBeLessThan(1500);
+      expect(result).toEqual({ success: false, error: 'Team not found: slow-missing-team' });
+      expect(service.getTeamData).toHaveBeenCalledWith('slow-missing-team');
+      vi.mocked(console.error).mockClear();
+    } finally {
+      metaSpy.mockRestore();
+      await fs.promises.rm(claudeRoot, { recursive: true, force: true });
+      setClaudeBasePathOverride(null);
+    }
+  });
+
   it('does not let a live duplicate of the same session rate-limit reply delay auto-resume', async () => {
     vi.useFakeTimers();
     vi.setSystemTime(new Date('2026-04-17T12:00:30.000Z'));
@@ -1219,6 +1720,7 @@ describe('ipc teams handlers', () => {
 
     expect(result.success).toBe(true);
     expect(result.data.feedRevision).toBe('rev-worker');
+    await flushMicrotasks();
     expect(mockAddTeamNotification).toHaveBeenCalledWith(
       expect.objectContaining({
         teamEventType: 'rate_limit',
@@ -1231,6 +1733,47 @@ describe('ipc teams handlers', () => {
     expect(service.getMessageFeed).not.toHaveBeenCalled();
   });
 
+  it('does not block TEAM_GET_MESSAGES_PAGE on notification context reads', async () => {
+    mockTeamDataWorkerClient.isAvailable.mockReturnValue(true);
+    mockTeamDataWorkerClient.getMessagesPage.mockResolvedValueOnce({
+      messages: [
+        {
+          from: 'team-lead',
+          text: "You've hit your limit. Please wait a bit before retrying.",
+          timestamp: '2026-02-23T10:00:01.000Z',
+          read: true,
+          source: 'lead_session' as const,
+          messageId: 'msg-rate-limit-nonblocking',
+        },
+      ],
+      nextCursor: null,
+      hasMore: false,
+      feedRevision: 'rev-worker',
+    });
+    const context = createDeferred<{ displayName: string; projectPath: string }>();
+    service.getTeamNotificationContext.mockReturnValueOnce(context.promise);
+
+    const handler = handlers.get(TEAM_GET_MESSAGES_PAGE)!;
+    const result = (await handler({} as never, 'my-team', {
+      limit: 50,
+    })) as { success: boolean; data: { feedRevision: string } };
+
+    expect(result.success).toBe(true);
+    expect(result.data.feedRevision).toBe('rev-worker');
+    expect(mockAddTeamNotification).not.toHaveBeenCalled();
+
+    context.resolve({ displayName: 'My Team', projectPath: '/tmp/project' });
+    await flushMicrotasks();
+    expect(mockAddTeamNotification).toHaveBeenCalledWith(
+      expect.objectContaining({
+        teamEventType: 'rate_limit',
+        teamName: 'my-team',
+        teamDisplayName: 'My Team',
+        dedupeKey: 'rate-limit:my-team:msg-rate-limit-nonblocking',
+      })
+    );
+  });
+
   it('falls back TEAM_GET_MESSAGES_PAGE to the main thread in packaged runtime when worker is unavailable', async () => {
     const electron = await import('electron');
     mockTeamDataWorkerClient.isAvailable.mockReturnValue(false);
@@ -2128,6 +2671,7 @@ describe('ipc teams handlers', () => {
         description: undefined,
         color: undefined,
       });
+      expect(mockTeamDataWorkerClient.invalidateTeamConfig).toHaveBeenCalledWith('my-team');
       expect(provisioningService.sendMessageToTeam).toHaveBeenCalledWith(
         'my-team',
         'The team has been renamed to "Renamed Team". Please use this name when referring to the team going forward.'
@@ -2153,6 +2697,33 @@ describe('ipc teams handlers', () => {
     });
   });
 
+  describe('team mutation cache invalidation', () => {
+    it('invalidates worker config cache after delete, restore, and permanent delete', async () => {
+      const deleteHandler = handlers.get(TEAM_DELETE_TEAM)!;
+      const restoreHandler = handlers.get(TEAM_RESTORE)!;
+      const permanentlyDeleteHandler = handlers.get(TEAM_PERMANENTLY_DELETE)!;
+
+      let result = (await deleteHandler({} as never, 'my-team')) as { success: boolean };
+      expect(result.success).toBe(true);
+      expect(service.deleteTeam).toHaveBeenCalledWith('my-team');
+      expect(mockTeamDataWorkerClient.invalidateTeamConfig).toHaveBeenCalledWith('my-team');
+
+      mockTeamDataWorkerClient.invalidateTeamConfig.mockClear();
+
+      result = (await restoreHandler({} as never, 'my-team')) as { success: boolean };
+      expect(result.success).toBe(true);
+      expect(service.restoreTeam).toHaveBeenCalledWith('my-team');
+      expect(mockTeamDataWorkerClient.invalidateTeamConfig).toHaveBeenCalledWith('my-team');
+
+      mockTeamDataWorkerClient.invalidateTeamConfig.mockClear();
+
+      result = (await permanentlyDeleteHandler({} as never, 'my-team')) as { success: boolean };
+      expect(result.success).toBe(true);
+      expect(service.permanentlyDeleteTeam).toHaveBeenCalledWith('my-team');
+      expect(mockTeamDataWorkerClient.invalidateTeamConfig).toHaveBeenCalledWith('my-team');
+    });
+  });
+
   describe('removeMember', () => {
     it('calls service on valid input', async () => {
       const handler = handlers.get(TEAM_REMOVE_MEMBER)!;
@@ -2906,6 +3477,7 @@ describe('ipc teams handlers', () => {
         cwd: os.tmpdir(),
       })) as { success: boolean };
       expect(result.success).toBe(true);
+      expect(mockTeamDataWorkerClient.invalidateTeamConfig).toHaveBeenCalledWith('solo-team');
     });
 
     it('handleCreateConfig preserves draft launch metadata', async () => {
diff --git a/test/main/services/discovery/ProjectScanner.sessionIndex.test.ts b/test/main/services/discovery/ProjectScanner.sessionIndex.test.ts
new file mode 100644
index 00000000..6642b568
--- /dev/null
+++ b/test/main/services/discovery/ProjectScanner.sessionIndex.test.ts
@@ -0,0 +1,727 @@
+import * as crypto from 'node:crypto';
+import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { ProjectScanner } from '../../../../src/main/services/discovery/ProjectScanner';
+import { SessionMetadataIndex } from '../../../../src/main/services/discovery/SessionMetadataIndex';
+import { subprojectRegistry } from '../../../../src/main/services/discovery/SubprojectRegistry';
+import type { FileSystemProvider } from '../../../../src/main/services/infrastructure/FileSystemProvider';
+
+function createSessionLine(content: string, timestamp = '2026-01-01T00:00:00.000Z'): string {
+  return JSON.stringify({
+    uuid: crypto.randomUUID(),
+    type: 'user',
+    message: { role: 'user', content },
+    timestamp,
+  });
+}
+
+function createNoiseLine(): string {
+  return JSON.stringify({
+    uuid: crypto.randomUUID(),
+    type: 'system',
+    content: 'noise',
+    timestamp: '2026-01-01T00:00:00.000Z',
+  });
+}
+
+function createSessionLineWithCwd(content: string, cwd: string): string {
+  return JSON.stringify({
+    uuid: crypto.randomUUID(),
+    type: 'user',
+    cwd,
+    message: { role: 'user', content },
+    timestamp: '2026-01-01T00:00:00.000Z',
+  });
+}
+
+function createSshLikeLocalProvider(): FileSystemProvider {
+  return {
+    type: 'ssh',
+    exists: (filePath: string) => Promise.resolve(fs.existsSync(filePath)),
+    readFile: async (filePath: string, encoding: BufferEncoding = 'utf8') =>
+      fs.promises.readFile(filePath, encoding),
+    stat: async (filePath: string) => {
+      const stats = await fs.promises.stat(filePath);
+      return {
+        size: stats.size,
+        mtimeMs: stats.mtimeMs,
+        birthtimeMs: stats.birthtimeMs,
+        isFile: () => stats.isFile(),
+        isDirectory: () => stats.isDirectory(),
+      };
+    },
+    readdir: async (dirPath: string) => {
+      const entries = await fs.promises.readdir(dirPath, { withFileTypes: true });
+      return Promise.all(
+        entries.map(async (entry) => {
+          const entryPath = path.join(dirPath, entry.name);
+          const stats = await fs.promises.stat(entryPath);
+          return {
+            name: entry.name,
+            isFile: () => entry.isFile(),
+            isDirectory: () => entry.isDirectory(),
+            size: stats.size,
+            mtimeMs: stats.mtimeMs,
+            birthtimeMs: stats.birthtimeMs,
+          };
+        })
+      );
+    },
+    createReadStream: (filePath: string, opts?: { start?: number; encoding?: BufferEncoding }) =>
+      fs.createReadStream(filePath, opts),
+    dispose: () => undefined,
+  };
+}
+
+function createReadStreamFailingLocalProvider(): FileSystemProvider {
+  return {
+    ...createSshLikeLocalProvider(),
+    type: 'local',
+    createReadStream: () => {
+      throw new Error('session body should not be read when a fresh index entry exists');
+    },
+  };
+}
+
+function readIndexSessions(
+  indexDir: string,
+  projectDir: string
+): Record<string, Record<string, unknown>> {
+  const raw = fs.readFileSync(SessionMetadataIndex.getIndexPath(indexDir, projectDir), 'utf8');
+  const parsed = JSON.parse(raw) as { sessions?: Record<string, Record<string, unknown>> };
+  return parsed.sessions ?? {};
+}
+
+function sortStrings(values: string[]): string[] {
+  return [...values].sort((a, b) => a.localeCompare(b));
+}
+
+async function withTimeout<T>(promise: Promise<T>, ms: number): Promise<T | 'timeout'> {
+  let timeoutId: ReturnType<typeof setTimeout> | undefined;
+  try {
+    return await Promise.race([
+      promise,
+      new Promise<'timeout'>((resolve) => {
+        timeoutId = setTimeout(() => resolve('timeout'), ms);
+      }),
+    ]);
+  } finally {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+    }
+  }
+}
+
+describe('ProjectScanner session metadata index', () => {
+  const tempDirs: string[] = [];
+
+  afterEach(() => {
+    subprojectRegistry.clear();
+    for (const dir of tempDirs) {
+      fs.rmSync(dir, { recursive: true, force: true });
+    }
+    tempDirs.length = 0;
+  });
+
+  function createFixture(): {
+    projectsDir: string;
+    indexDir: string;
+    projectId: string;
+    projectDir: string;
+    sessionPath: string;
+  } {
+    const rootDir = fs.mkdtempSync(path.join(os.tmpdir(), 'scanner-index-'));
+    tempDirs.push(rootDir);
+
+    const projectsDir = path.join(rootDir, 'projects');
+    const indexDir = path.join(rootDir, 'session-index');
+    const projectId = '-Users-test-indexed-project';
+    const projectDir = path.join(projectsDir, projectId);
+    const sessionPath = path.join(projectDir, 'session-1.jsonl');
+
+    fs.mkdirSync(projectDir, { recursive: true });
+
+    return {
+      projectsDir,
+      indexDir,
+      projectId,
+      projectDir,
+      sessionPath,
+    };
+  }
+
+  it('does not serve stale indexed metadata after a session file changes', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+
+    fs.writeFileSync(sessionPath, `${createSessionLine('old indexed title')}\n`, 'utf8');
+
+    const firstScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const firstSessions = await firstScanner.listSessions(projectId);
+    expect(firstSessions).toHaveLength(1);
+    expect(firstSessions[0].firstMessage).toBe('old indexed title');
+
+    await firstScanner.flushSessionMetadataIndexForTesting();
+    const indexPath = SessionMetadataIndex.getIndexPath(indexDir, projectDir);
+    expect(fs.existsSync(indexPath)).toBe(true);
+
+    fs.writeFileSync(
+      sessionPath,
+      `${createSessionLine('new indexed title with different size')}\n`,
+      'utf8'
+    );
+    const future = new Date('2026-01-01T00:01:00.000Z');
+    fs.utimesSync(sessionPath, future, future);
+
+    const secondScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const secondSessions = await secondScanner.listSessions(projectId);
+    expect(secondSessions).toHaveLength(1);
+    expect(secondSessions[0].firstMessage).toBe('new indexed title with different size');
+  });
+
+  it('falls back to live parsing when the persisted index is corrupt', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('live title')}\n`, 'utf8');
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      '{not valid json',
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('live title');
+  });
+
+  it('ignores malformed indexed metadata and reparses the live session file', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('live metadata title')}\n`, 'utf8');
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      JSON.stringify({
+        schemaVersion: 1,
+        projectStorageDir: projectDir,
+        updatedAt: Date.now(),
+        sessions: {
+          [sessionPath]: {
+            sessionId: 'session-1',
+            filePath: sessionPath,
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            birthtimeMs: stats.birthtimeMs,
+            hasContent: true,
+            metadata: {
+              firstUserMessage: { text: 42, timestamp: 'bad' },
+              messageCount: 'bad',
+              isOngoing: 'bad',
+              gitBranch: null,
+            },
+            updatedAt: Date.now(),
+          },
+        },
+      }),
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+    await scanner.flushSessionMetadataIndexForTesting();
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('live metadata title');
+    expect(
+      (
+        readIndexSessions(indexDir, projectDir)[sessionPath].metadata as {
+          firstUserMessage?: { text?: string };
+        }
+      ).firstUserMessage?.text
+    ).toBe('live metadata title');
+  });
+
+  it('does not trust content presence from an entry with malformed metadata', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(
+      sessionPath,
+      `${createSessionLine('visible despite corrupt index')}\n`,
+      'utf8'
+    );
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      JSON.stringify({
+        schemaVersion: 1,
+        projectStorageDir: projectDir,
+        updatedAt: Date.now(),
+        sessions: {
+          [sessionPath]: {
+            sessionId: 'session-1',
+            filePath: sessionPath,
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            birthtimeMs: stats.birthtimeMs,
+            hasContent: false,
+            metadata: {
+              firstUserMessage: { text: 42, timestamp: 'bad' },
+              messageCount: 'bad',
+              isOngoing: 'bad',
+              gitBranch: null,
+            },
+            updatedAt: Date.now(),
+          },
+        },
+      }),
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('visible despite corrupt index');
+  });
+
+  it('does not trust content presence when the indexed session id mismatches the file', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('visible despite id mismatch')}\n`, 'utf8');
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      JSON.stringify({
+        schemaVersion: 1,
+        projectStorageDir: projectDir,
+        updatedAt: Date.now(),
+        sessions: {
+          [sessionPath]: {
+            sessionId: 'different-session',
+            filePath: sessionPath,
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            birthtimeMs: stats.birthtimeMs,
+            hasContent: false,
+            updatedAt: Date.now(),
+          },
+        },
+      }),
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('visible despite id mismatch');
+  });
+
+  it('does not trust content presence from an entry with invalid numeric signature fields', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(
+      sessionPath,
+      `${createSessionLine('visible despite invalid signature')}\n`,
+      'utf8'
+    );
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      JSON.stringify({
+        schemaVersion: 1,
+        projectStorageDir: projectDir,
+        updatedAt: Date.now(),
+        sessions: {
+          [sessionPath]: {
+            sessionId: 'session-1',
+            filePath: sessionPath,
+            mtimeMs: stats.mtimeMs,
+            size: stats.size,
+            birthtimeMs: -1,
+            hasContent: false,
+            updatedAt: Date.now(),
+          },
+        },
+      }),
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('visible despite invalid signature');
+  });
+
+  it('does not hide a session when a stale no-content index entry exists', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createNoiseLine()}\n`, 'utf8');
+
+    const firstScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const noiseSessions = await firstScanner.listSessions(projectId);
+    expect(noiseSessions).toHaveLength(0);
+    await firstScanner.flushSessionMetadataIndexForTesting();
+    expect(readIndexSessions(indexDir, projectDir)[sessionPath].hasContent).toBe(false);
+
+    fs.writeFileSync(sessionPath, `${createSessionLine('visible after stale false')}\n`, 'utf8');
+    const future = new Date('2026-01-01T00:02:00.000Z');
+    fs.utimesSync(sessionPath, future, future);
+
+    const secondScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const liveSessions = await secondScanner.listSessions(projectId);
+
+    expect(liveSessions).toHaveLength(1);
+    expect(liveSessions[0].firstMessage).toBe('visible after stale false');
+  });
+
+  it('ignores indexed metadata containing non-finite numeric fields', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('live finite numeric title')}\n`, 'utf8');
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      `{
+        "schemaVersion": 1,
+        "projectStorageDir": ${JSON.stringify(projectDir)},
+        "updatedAt": ${Date.now()},
+        "sessions": {
+          ${JSON.stringify(sessionPath)}: {
+            "sessionId": "session-1",
+            "filePath": ${JSON.stringify(sessionPath)},
+            "mtimeMs": ${stats.mtimeMs},
+            "size": ${stats.size},
+            "birthtimeMs": ${stats.birthtimeMs},
+            "hasContent": true,
+            "metadata": {
+              "firstUserMessage": {
+                "text": "indexed title with corrupt numeric field",
+                "timestamp": "2026-01-01T00:00:00.000Z"
+              },
+              "messageCount": 1,
+              "isOngoing": false,
+              "gitBranch": null,
+              "model": null,
+              "contextConsumption": 1e999
+            },
+            "updatedAt": ${Date.now()}
+          }
+        }
+      }`,
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('live finite numeric title');
+  });
+
+  it('ignores indexed metadata with corrupt phase breakdown fields', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('live phase breakdown title')}\n`, 'utf8');
+    const stats = fs.statSync(sessionPath);
+
+    fs.mkdirSync(indexDir, { recursive: true });
+    fs.writeFileSync(
+      SessionMetadataIndex.getIndexPath(indexDir, projectDir),
+      `{
+        "schemaVersion": 1,
+        "projectStorageDir": ${JSON.stringify(projectDir)},
+        "updatedAt": ${Date.now()},
+        "sessions": {
+          ${JSON.stringify(sessionPath)}: {
+            "sessionId": "session-1",
+            "filePath": ${JSON.stringify(sessionPath)},
+            "mtimeMs": ${stats.mtimeMs},
+            "size": ${stats.size},
+            "birthtimeMs": ${stats.birthtimeMs},
+            "hasContent": true,
+            "metadata": {
+              "firstUserMessage": {
+                "text": "indexed title with corrupt phase breakdown",
+                "timestamp": "2026-01-01T00:00:00.000Z"
+              },
+              "messageCount": 1,
+              "isOngoing": false,
+              "gitBranch": null,
+              "model": null,
+              "contextConsumption": 10,
+              "compactionCount": 1,
+              "phaseBreakdown": [
+                {
+                  "phaseNumber": 1,
+                  "contribution": 10,
+                  "peakTokens": 10,
+                  "postCompaction": 1e999
+                }
+              ]
+            },
+            "updatedAt": ${Date.now()}
+          }
+        }
+      }`,
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('live phase breakdown title');
+  });
+
+  it('does not retry forever when the index cannot be persisted', async () => {
+    const { projectsDir, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('best effort cache')}\n`, 'utf8');
+    const stats = fs.statSync(sessionPath);
+    const blockedIndexRoot = path.join(path.dirname(projectsDir), 'blocked-index-root');
+    fs.writeFileSync(blockedIndexRoot, 'not a directory', 'utf8');
+
+    const index = new SessionMetadataIndex({
+      rootDir: blockedIndexRoot,
+      persistDelayMs: 0,
+    });
+    await index.setMetadata(
+      {
+        sessionId: 'session-1',
+        filePath: sessionPath,
+        mtimeMs: stats.mtimeMs,
+        size: stats.size,
+        birthtimeMs: stats.birthtimeMs,
+      },
+      {
+        firstUserMessage: {
+          text: 'best effort cache',
+          timestamp: '2026-01-01T00:00:00.000Z',
+        },
+        messageCount: 1,
+        isOngoing: false,
+        gitBranch: null,
+        model: null,
+      }
+    );
+
+    const flushResult = await withTimeout(
+      index.flushForTesting().then(() => 'resolved'),
+      500
+    );
+
+    expect(flushResult).toBe('resolved');
+    expect(fs.existsSync(SessionMetadataIndex.getIndexPath(blockedIndexRoot, projectDir))).toBe(
+      false
+    );
+  });
+
+  it('persists content filtering and metadata across scanner instances for paginated listing', async () => {
+    const { projectsDir, indexDir, projectId, projectDir } = createFixture();
+    const visiblePath = path.join(projectDir, 'session-visible.jsonl');
+    const noisePath = path.join(projectDir, 'session-noise.jsonl');
+    fs.writeFileSync(visiblePath, `${createSessionLine('visible title')}\n`, 'utf8');
+    fs.writeFileSync(noisePath, `${createNoiseLine()}\n`, 'utf8');
+
+    const firstScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const firstPage = await firstScanner.listSessionsPaginated(projectId, null, 10, {
+      includeTotalCount: true,
+      prefilterAll: true,
+      metadataLevel: 'deep',
+    });
+    expect(firstPage.sessions.map((session) => session.id)).toEqual(['session-visible']);
+    expect(firstPage.totalCount).toBe(1);
+
+    await firstScanner.flushSessionMetadataIndexForTesting();
+    const indexedSessions = readIndexSessions(indexDir, projectDir);
+    expect(sortStrings(Object.keys(indexedSessions))).toEqual(
+      sortStrings([noisePath, visiblePath])
+    );
+    expect(indexedSessions[visiblePath].hasContent).toBe(true);
+    expect(indexedSessions[noisePath].hasContent).toBe(false);
+    expect(
+      (
+        indexedSessions[visiblePath].metadata as {
+          firstUserMessage?: { text?: string };
+        }
+      ).firstUserMessage?.text
+    ).toBe('visible title');
+
+    const secondScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const secondPage = await secondScanner.listSessionsPaginated(projectId, null, 10, {
+      includeTotalCount: true,
+      prefilterAll: true,
+      metadataLevel: 'deep',
+    });
+    expect(secondPage.sessions.map((session) => session.id)).toEqual(['session-visible']);
+    expect(secondPage.sessions[0].firstMessage).toBe('visible title');
+    expect(secondPage.totalCount).toBe(1);
+  });
+
+  it('serves fresh indexed listing data without reopening the session body', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('fresh cached title')}\n`, 'utf8');
+
+    const firstScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const firstSessions = await firstScanner.listSessions(projectId);
+    expect(firstSessions).toHaveLength(1);
+    await firstScanner.flushSessionMetadataIndexForTesting();
+    expect(readIndexSessions(indexDir, projectDir)[sessionPath].hasContent).toBe(true);
+
+    const secondScanner = new ProjectScanner(
+      projectsDir,
+      undefined,
+      createReadStreamFailingLocalProvider(),
+      {
+        sessionIndexDir: indexDir,
+        sessionIndexPersistDelayMs: 0,
+      }
+    );
+    const secondSessions = await secondScanner.listSessions(projectId);
+
+    expect(secondSessions).toHaveLength(1);
+    expect(secondSessions[0].firstMessage).toBe('fresh cached title');
+  });
+
+  it('does not persist a local session index for ssh filesystem providers', async () => {
+    const { projectsDir, indexDir, projectId, projectDir, sessionPath } = createFixture();
+    fs.writeFileSync(sessionPath, `${createSessionLine('ssh provider title')}\n`, 'utf8');
+
+    const scanner = new ProjectScanner(projectsDir, undefined, createSshLikeLocalProvider(), {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await scanner.listSessions(projectId);
+    await scanner.flushSessionMetadataIndexForTesting();
+
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].firstMessage).toBe('ssh provider title');
+    expect(fs.existsSync(SessionMetadataIndex.getIndexPath(indexDir, projectDir))).toBe(false);
+  });
+
+  it('prunes deleted session entries from the persisted index after relisting', async () => {
+    const { projectsDir, indexDir, projectId, projectDir } = createFixture();
+    const keepPath = path.join(projectDir, 'session-keep.jsonl');
+    const deletePath = path.join(projectDir, 'session-delete.jsonl');
+    fs.writeFileSync(keepPath, `${createSessionLine('keep title')}\n`, 'utf8');
+    fs.writeFileSync(deletePath, `${createSessionLine('delete title')}\n`, 'utf8');
+
+    const firstScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    await firstScanner.listSessions(projectId);
+    await firstScanner.flushSessionMetadataIndexForTesting();
+    expect(sortStrings(Object.keys(readIndexSessions(indexDir, projectDir)))).toEqual(
+      sortStrings([deletePath, keepPath])
+    );
+
+    fs.rmSync(deletePath);
+
+    const secondScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const sessions = await secondScanner.listSessions(projectId);
+    await secondScanner.flushSessionMetadataIndexForTesting();
+
+    expect(sessions.map((session) => session.id)).toEqual(['session-keep']);
+    expect(Object.keys(readIndexSessions(indexDir, projectDir))).toEqual([keepPath]);
+  });
+
+  it('does not prune sibling composite-subproject entries when listing one subproject', async () => {
+    const { projectsDir, indexDir, projectId, projectDir } = createFixture();
+    const sessionAPath = path.join(projectDir, 'session-a.jsonl');
+    const sessionBPath = path.join(projectDir, 'session-b.jsonl');
+    fs.writeFileSync(
+      sessionAPath,
+      `${createSessionLineWithCwd('title a', '/Users/test/indexed-project-a')}\n`,
+      'utf8'
+    );
+    fs.writeFileSync(
+      sessionBPath,
+      `${createSessionLineWithCwd('title b', '/Users/test/indexed-project-b')}\n`,
+      'utf8'
+    );
+
+    const scanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    const projects = await scanner.scan();
+    const compositeProjects = projects
+      .filter((project) => project.id.startsWith(`${projectId}::`))
+      .sort((a, b) => a.path.localeCompare(b.path));
+    expect(compositeProjects).toHaveLength(2);
+
+    await scanner.listSessions(compositeProjects[0].id);
+    await scanner.listSessions(compositeProjects[1].id);
+    await scanner.flushSessionMetadataIndexForTesting();
+    expect(sortStrings(Object.keys(readIndexSessions(indexDir, projectDir)))).toEqual(
+      sortStrings([sessionAPath, sessionBPath])
+    );
+
+    const freshScanner = new ProjectScanner(projectsDir, undefined, undefined, {
+      sessionIndexDir: indexDir,
+      sessionIndexPersistDelayMs: 0,
+    });
+    await freshScanner.scan();
+    await freshScanner.listSessions(compositeProjects[0].id);
+    await freshScanner.flushSessionMetadataIndexForTesting();
+
+    expect(sortStrings(Object.keys(readIndexSessions(indexDir, projectDir)))).toEqual(
+      sortStrings([sessionAPath, sessionBPath])
+    );
+  });
+});
diff --git a/test/main/services/infrastructure/FileWatcher.test.ts b/test/main/services/infrastructure/FileWatcher.test.ts
index 08cbbc9f..db3027f3 100644
--- a/test/main/services/infrastructure/FileWatcher.test.ts
+++ b/test/main/services/infrastructure/FileWatcher.test.ts
@@ -191,6 +191,24 @@ describe('FileWatcher', () => {
     ]);
   });
 
+  it('emits config team-change events for team and members metadata changes', () => {
+    const dataCache = new DataCache(50, 10, false);
+    const watcher = new FileWatcher(dataCache, '/tmp/projects', '/tmp/todos');
+    const events: unknown[] = [];
+    watcher.on('team-change', (event) => events.push(event));
+
+    const testWatcher = watcher as unknown as {
+      processTeamsChange: (eventType: string, filename: string) => void;
+    };
+    testWatcher.processTeamsChange('change', 'team-a/team.meta.json');
+    testWatcher.processTeamsChange('change', 'team-a/members.meta.json');
+
+    expect(events).toEqual([
+      { type: 'config', teamName: 'team-a', detail: 'team.meta.json' },
+      { type: 'config', teamName: 'team-a', detail: 'members.meta.json' },
+    ]);
+  });
+
   it('keeps append offset pinned for partial trailing lines until completed', async () => {
     vi.useRealTimers();
     const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'filewatcher-'));
diff --git a/test/main/services/infrastructure/NotificationManager.team.test.ts b/test/main/services/infrastructure/NotificationManager.team.test.ts
index 2bddcc92..8fd7b37b 100644
--- a/test/main/services/infrastructure/NotificationManager.team.test.ts
+++ b/test/main/services/infrastructure/NotificationManager.team.test.ts
@@ -22,6 +22,14 @@ vi.mock('electron', () => ({
     { isSupported: vi.fn().mockReturnValue(true) }
   ),
   BrowserWindow: vi.fn(),
+  nativeImage: {
+    createFromPath: vi.fn(() => ({
+      isEmpty: vi.fn().mockReturnValue(true),
+    })),
+    createFromDataURL: vi.fn(() => ({
+      isEmpty: vi.fn().mockReturnValue(false),
+    })),
+  },
 }));
 
 // --- Mock fs/promises to prevent disk I/O ---
@@ -67,6 +75,35 @@ vi.mock('@main/utils/textFormatting', () => ({
 
 import { ConfigManager } from '@main/services/infrastructure/ConfigManager';
 import { NotificationManager } from '@main/services/infrastructure/NotificationManager';
+import { Notification as ElectronNotification } from 'electron';
+
+function decodeXmlText(value: string): string {
+  return value
+    .replace(/&quot;/g, '"')
+    .replace(/&apos;/g, "'")
+    .replace(/&lt;/g, '<')
+    .replace(/&gt;/g, '>')
+    .replace(/&amp;/g, '&');
+}
+
+function getLastNotificationOptions(): Record<string, unknown> {
+  const mock = ElectronNotification as unknown as {
+    mock: { calls: [Record<string, unknown>][] };
+  };
+  const options = mock.mock.calls.at(-1)?.[0] ?? {};
+  if (typeof options.toastXml !== 'string') {
+    return options;
+  }
+
+  const textRows = [...options.toastXml.matchAll(/<text>(.*?)<\/text>/g)].map((match) =>
+    decodeXmlText(match[1] ?? '')
+  );
+  return {
+    ...options,
+    title: textRows[0],
+    body: textRows.slice(1).join('\n'),
+  };
+}
 
 function makeTeamPayload(
   overrides: Partial<TeamNotificationPayload> = {}
@@ -258,4 +295,94 @@ describe('NotificationManager.addTeamNotification', () => {
     const result = await manager.getNotifications({ limit: 10 });
     expect(result.notifications).toHaveLength(0);
   });
+
+  it('formats clarification as a reply-needed notification', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'task_clarification',
+        from: 'jack',
+        summary: 'Clarification needed - Task #55c51f15',
+        body: 'Can you confirm the reviewer?',
+        dedupeKey: 'presentation-reply',
+      })
+    );
+
+    expect(getLastNotificationOptions().title).toBe('@jack needs your reply on #55c51f15');
+  });
+
+  it('formats review requests as action-needed notifications', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'task_review_requested',
+        from: 'alice',
+        summary: 'Review requested #46cceca0: Landing page',
+        body: 'Please review the implementation.',
+        dedupeKey: 'presentation-review',
+      })
+    );
+
+    expect(getLastNotificationOptions().title).toBe('@alice requested review on #46cceca0');
+  });
+
+  it('formats blocked tasks as action-needed notifications', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'task_blocked',
+        from: 'bob',
+        summary: 'Blocked #6002830d: API contract',
+        body: 'Blocked by #11111111',
+        dedupeKey: 'presentation-blocked',
+      })
+    );
+
+    expect(getLastNotificationOptions().title).toBe('@bob is blocked on #6002830d');
+  });
+
+  it('formats rate limits with human restart guidance', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'rate_limit',
+        from: 'tom',
+        summary: 'Rate limit',
+        body: 'Auto-resume scheduled at 14:30',
+        dedupeKey: 'presentation-rate',
+      })
+    );
+
+    const options = getLastNotificationOptions();
+    expect(options.title).toBe('@tom paused: rate limit');
+    expect(options.body).toContain('Auto-resume scheduled at 14:30');
+  });
+
+  it('formats API errors with manual restart guidance', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'api_error',
+        from: 'tom',
+        summary: 'API Error 500',
+        body: 'Manual restart needed',
+        dedupeKey: 'presentation-api',
+      })
+    );
+
+    const options = getLastNotificationOptions();
+    expect(options.title).toBe('@tom paused: API error');
+    expect(options.body).toContain('Manual restart needed');
+  });
+
+  it('formats incomplete launches without a System prefix', async () => {
+    await manager.addTeamNotification(
+      makeTeamPayload({
+        teamEventType: 'team_launch_incomplete',
+        from: 'system',
+        summary: 'Team launch incomplete',
+        body: '3/4 joined · @tom did not join',
+        dedupeKey: 'presentation-launch-incomplete',
+      })
+    );
+
+    const options = getLastNotificationOptions();
+    expect(options.title).toBe('Team launch incomplete');
+    expect(options.body).toContain('3/4 joined · @tom did not join');
+  });
 });
diff --git a/test/main/services/runtime/ProviderConnectionService.test.ts b/test/main/services/runtime/ProviderConnectionService.test.ts
index e4e7292b..1cd8813c 100644
--- a/test/main/services/runtime/ProviderConnectionService.test.ts
+++ b/test/main/services/runtime/ProviderConnectionService.test.ts
@@ -995,4 +995,65 @@ describe('ProviderConnectionService', () => {
       source: 'app-server',
     });
   });
+
+  it('returns the stored Anthropic API key for team helper mode only in api_key auth mode', async () => {
+    const lookupPreferred = vi.fn().mockResolvedValue({
+      envVarName: 'ANTHROPIC_API_KEY',
+      value: 'stored-team-key',
+    });
+    const { ProviderConnectionService } =
+      await import('@main/services/runtime/ProviderConnectionService');
+
+    const service = new ProviderConnectionService(
+      {
+        lookupPreferred,
+      } as never,
+      {
+        getConfig: () => createConfig('api_key'),
+      } as never
+    );
+
+    await expect(
+      service.getConfiguredAnthropicApiKeyForTeamRuntime({
+        ANTHROPIC_API_KEY: 'env-team-key',
+      })
+    ).resolves.toBe('stored-team-key');
+    expect(lookupPreferred).toHaveBeenCalledWith('ANTHROPIC_API_KEY');
+  });
+
+  it('does not use token-only or OAuth credentials for Anthropic team helper mode', async () => {
+    const { ProviderConnectionService } =
+      await import('@main/services/runtime/ProviderConnectionService');
+
+    const oauthService = new ProviderConnectionService(
+      {
+        lookupPreferred: vi.fn().mockResolvedValue({
+          envVarName: 'ANTHROPIC_API_KEY',
+          value: 'stored-team-key',
+        }),
+      } as never,
+      {
+        getConfig: () => createConfig('oauth'),
+      } as never
+    );
+    const apiKeyService = new ProviderConnectionService(
+      {
+        lookupPreferred: vi.fn().mockResolvedValue(null),
+      } as never,
+      {
+        getConfig: () => createConfig('api_key'),
+      } as never
+    );
+
+    await expect(
+      oauthService.getConfiguredAnthropicApiKeyForTeamRuntime({
+        ANTHROPIC_API_KEY: 'env-team-key',
+      })
+    ).resolves.toBeNull();
+    await expect(
+      apiKeyService.getConfiguredAnthropicApiKeyForTeamRuntime({
+        ANTHROPIC_AUTH_TOKEN: 'proxy-token-only',
+      })
+    ).resolves.toBeNull();
+  });
 });
diff --git a/test/main/services/runtime/anthropicTeamApiKeyHelper.test.ts b/test/main/services/runtime/anthropicTeamApiKeyHelper.test.ts
new file mode 100644
index 00000000..979dbc9b
--- /dev/null
+++ b/test/main/services/runtime/anthropicTeamApiKeyHelper.test.ts
@@ -0,0 +1,90 @@
+// @vitest-environment node
+import { mkdtemp, readFile, rm, stat } from 'fs/promises';
+import { execFile } from 'child_process';
+import { tmpdir } from 'os';
+import path from 'path';
+import { promisify } from 'util';
+
+import { afterEach, describe, expect, it } from 'vitest';
+
+import {
+  buildAnthropicTeamAuthDirectoryName,
+  cleanupAnthropicTeamApiKeyHelperMaterial,
+  materializeAnthropicTeamApiKeyHelper,
+  verifyAnthropicTeamApiKeyHelperMaterial,
+} from '@main/services/runtime/anthropicTeamApiKeyHelper';
+
+const execFileAsync = promisify(execFile);
+
+describe('anthropicTeamApiKeyHelper', () => {
+  const tempRoots: string[] = [];
+
+  async function createTempRoot(): Promise<string> {
+    const dir = await mkdtemp(path.join(tmpdir(), 'anthropic-team-helper-'));
+    tempRoots.push(dir);
+    return dir;
+  }
+
+  afterEach(async () => {
+    await Promise.all(tempRoots.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
+  });
+
+  it('uses slug plus hash to avoid unsafe-name collisions', () => {
+    const one = buildAnthropicTeamAuthDirectoryName('team/a');
+    const two = buildAnthropicTeamAuthDirectoryName('team:a');
+
+    expect(one).not.toBe(two);
+    expect(one).toMatch(/^[a-zA-Z0-9._-]+-[a-f0-9]{12}$/);
+    expect(two).toMatch(/^[a-zA-Z0-9._-]+-[a-f0-9]{12}$/);
+  });
+
+  it('materializes helper settings without writing the raw key into args or settings', async () => {
+    const root = await mkdtemp(path.join(tmpdir(), "anthropic team helper ' "));
+    tempRoots.push(root);
+    const apiKey = 'sk-ant-test-secret-value';
+    const material = await materializeAnthropicTeamApiKeyHelper({
+      teamName: 'secure team',
+      authMaterialId: 'run-123',
+      apiKey,
+      baseClaudeDir: root,
+    });
+
+    const settingsRaw = await readFile(material.settingsPath, 'utf8');
+    const helperRaw = await readFile(material.helperPath, 'utf8');
+
+    expect(material.settingsArgs).toEqual(['--settings', material.settingsPath]);
+    expect(material.settingsArgs.join(' ')).not.toContain(apiKey);
+    expect(settingsRaw).toContain('apiKeyHelper');
+    expect(settingsRaw).not.toContain(apiKey);
+    expect(helperRaw).toContain('KEY_FILE=');
+    expect(helperRaw).not.toContain(apiKey);
+    const parsedSettings = JSON.parse(settingsRaw) as { apiKeyHelper: string };
+
+    if (process.platform !== 'win32') {
+      const shellResult = await execFileAsync('/bin/sh', ['-c', parsedSettings.apiKeyHelper]);
+      expect(shellResult.stdout.trim()).toBe(apiKey);
+      expect((await stat(material.keyPath)).mode & 0o777).toBe(0o600);
+      expect((await stat(material.helperPath)).mode & 0o777).toBe(0o700);
+      expect((await stat(material.settingsPath)).mode & 0o777).toBe(0o600);
+
+      await verifyAnthropicTeamApiKeyHelperMaterial({
+        helperPath: material.helperPath,
+        expectedApiKey: apiKey,
+      });
+    }
+  });
+
+  it('cleans only owned helper material files', async () => {
+    const root = await createTempRoot();
+    const material = await materializeAnthropicTeamApiKeyHelper({
+      teamName: 'cleanup team',
+      authMaterialId: 'run-456',
+      apiKey: 'sk-ant-test-cleanup',
+      baseClaudeDir: root,
+    });
+
+    await cleanupAnthropicTeamApiKeyHelperMaterial({ directory: material.directory });
+
+    await expect(stat(material.directory)).rejects.toMatchObject({ code: 'ENOENT' });
+  });
+});
diff --git a/test/main/services/runtime/teamRuntimeSettingsBundle.test.ts b/test/main/services/runtime/teamRuntimeSettingsBundle.test.ts
new file mode 100644
index 00000000..c1a63348
--- /dev/null
+++ b/test/main/services/runtime/teamRuntimeSettingsBundle.test.ts
@@ -0,0 +1,74 @@
+// @vitest-environment node
+import { mkdtemp, readFile, rm } from 'fs/promises';
+import { tmpdir } from 'os';
+import path from 'path';
+
+import { afterEach, describe, expect, it } from 'vitest';
+
+import { materializeTeamRuntimeSettingsBundle } from '@main/services/runtime/teamRuntimeSettingsBundle';
+
+describe('teamRuntimeSettingsBundle', () => {
+  const tempRoots: string[] = [];
+
+  async function createTempRoot(): Promise<string> {
+    const dir = await mkdtemp(path.join(tmpdir(), 'team-runtime-settings-'));
+    tempRoots.push(dir);
+    return dir;
+  }
+
+  afterEach(async () => {
+    await Promise.all(tempRoots.splice(0).map((dir) => rm(dir, { recursive: true, force: true })));
+  });
+
+  it('merges app settings and helper settings into one provider settings file', async () => {
+    const dir = await createTempRoot();
+    const helper = {
+      teamName: 'bundle-team',
+      directory: dir,
+      helperPath: path.join(dir, 'helper.sh'),
+      keyPath: path.join(dir, 'key'),
+      settingsPath: path.join(dir, 'settings.json'),
+      settingsObject: { apiKeyHelper: "'/tmp/helper.sh'" },
+      settingsArgs: ['--settings', path.join(dir, 'settings.json')],
+      envPatch: {},
+    };
+
+    const bundle = await materializeTeamRuntimeSettingsBundle({
+      teamName: 'bundle-team',
+      providerId: 'anthropic',
+      anthropicHelper: helper,
+      baseSettings: [
+        { fastMode: false },
+        {
+          env: {
+            ANTHROPIC_API_KEY: 'must-not-survive',
+            ANTHROPIC_AUTH_TOKEN: 'must-not-survive',
+            SAFE_VALUE: 'keep',
+          },
+        },
+        {
+          hooks: {
+            Stop: [
+              {
+                matcher: '',
+                hooks: [{ type: 'command', command: '/bin/sh app-stop.sh' }],
+              },
+            ],
+          },
+        },
+      ],
+    });
+
+    expect(bundle?.args).toEqual(['--settings', bundle?.settingsPath]);
+    const settings = JSON.parse(await readFile(bundle!.settingsPath, 'utf8'));
+
+    expect(settings).toMatchObject({
+      fastMode: false,
+      apiKeyHelper: "'/tmp/helper.sh'",
+      env: { SAFE_VALUE: 'keep' },
+    });
+    expect(settings.env.ANTHROPIC_API_KEY).toBeUndefined();
+    expect(settings.env.ANTHROPIC_AUTH_TOKEN).toBeUndefined();
+    expect(settings.hooks.Stop).toHaveLength(1);
+  });
+});
diff --git a/test/main/services/team/AnthropicRuntimeMemory.live.test.ts b/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
index 1c05b0e7..19a0f5cd 100644
--- a/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
+++ b/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
@@ -2,7 +2,7 @@ import { constants as fsConstants, promises as fs } from 'node:fs';
 import * as os from 'node:os';
 import * as path from 'node:path';
 
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
 import { setClaudeBasePathOverride } from '../../../../src/main/utils/pathDecoder';
@@ -12,6 +12,14 @@ import type {
   TeamProvisioningProgress,
 } from '../../../../src/shared/types';
 
+vi.mock('../../../../src/main/services/infrastructure/NotificationManager', () => ({
+  NotificationManager: {
+    getInstance: () => ({
+      addTeamNotification: vi.fn(async () => undefined),
+    }),
+  },
+}));
+
 const liveDescribe =
   process.env.ANTHROPIC_RUNTIME_MEMORY_LIVE === '1' && process.env.ANTHROPIC_API_KEY?.trim()
     ? describe
diff --git a/test/main/services/team/CrossTeamService.test.ts b/test/main/services/team/CrossTeamService.test.ts
index 4dd371e5..7ae53902 100644
--- a/test/main/services/team/CrossTeamService.test.ts
+++ b/test/main/services/team/CrossTeamService.test.ts
@@ -51,7 +51,10 @@ function makeConfig(overrides: Partial<TeamConfig> = {}): TeamConfig {
 describe('CrossTeamService', () => {
   let service: CrossTeamService;
   let configReader: { getConfig: ReturnType<typeof vi.fn> };
-  let dataService: { getLeadMemberName: ReturnType<typeof vi.fn> };
+  let dataService: {
+    getLeadMemberName: ReturnType<typeof vi.fn>;
+    listTeams: ReturnType<typeof vi.fn>;
+  };
   let inboxWriter: { sendMessage: ReturnType<typeof vi.fn> };
   let provisioning: {
     isTeamAlive: ReturnType<typeof vi.fn>;
@@ -68,6 +71,7 @@ describe('CrossTeamService', () => {
     };
     dataService = {
       getLeadMemberName: vi.fn().mockResolvedValue('team-lead'),
+      listTeams: vi.fn().mockResolvedValue([]),
     };
     inboxWriter = {
       sendMessage: vi.fn().mockResolvedValue({ deliveredToInbox: true, messageId: 'mock-id' }),
@@ -353,11 +357,65 @@ describe('CrossTeamService', () => {
   });
 
   describe('listAvailableTargets', () => {
-    it('returns empty when teams dir read fails', async () => {
-      configReader.getConfig.mockRejectedValue(new Error('ENOENT'));
+    it('returns empty when team summary listing fails', async () => {
+      dataService.listTeams.mockRejectedValue(new Error('ENOENT'));
       const result = await service.listAvailableTargets();
       expect(result).toEqual([]);
     });
+
+    it('uses team summaries instead of verified config reads for target discovery', async () => {
+      dataService.listTeams.mockResolvedValue([
+        {
+          teamName: 'team-a',
+          displayName: 'Team A',
+          description: '',
+          memberCount: 1,
+          members: [],
+        },
+        {
+          teamName: 'team-b',
+          displayName: 'Team B',
+          description: 'Target team',
+          color: 'blue',
+          memberCount: 1,
+          members: [{ name: 'alice', color: '#abcdef' }],
+          leadName: 'captain',
+          leadColor: '#123456',
+        },
+        {
+          teamName: 'deleted-team',
+          displayName: 'Deleted',
+          description: '',
+          memberCount: 0,
+          members: [],
+          deletedAt: '2026-05-01T00:00:00.000Z',
+        },
+        {
+          teamName: 'draft-team',
+          displayName: 'Draft',
+          description: '',
+          memberCount: 0,
+          members: [],
+          pendingCreate: true,
+        },
+      ]);
+      provisioning.isTeamAlive.mockImplementation((teamName: string) => teamName === 'team-b');
+
+      const result = await service.listAvailableTargets('team-a');
+
+      expect(configReader.getConfig).not.toHaveBeenCalled();
+      expect(result).toEqual([
+        {
+          teamName: 'team-b',
+          displayName: 'Team B',
+          description: 'Target team',
+          color: 'blue',
+          leadName: 'captain',
+          leadColor: '#123456',
+          isOnline: true,
+        },
+      ]);
+    });
   });
 
   describe('getOutbox', () => {
diff --git a/test/main/services/team/LaunchIoGovernor.test.ts b/test/main/services/team/LaunchIoGovernor.test.ts
new file mode 100644
index 00000000..1b989282
--- /dev/null
+++ b/test/main/services/team/LaunchIoGovernor.test.ts
@@ -0,0 +1,338 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  cloneLaunchIoGovernorPayload,
+  LaunchIoGovernor,
+} from '../../../../src/main/services/team/LaunchIoGovernor';
+import type { GlobalTask, TeamProvisioningProgress, TeamSummary } from '../../../../src/shared/types';
+
+function team(teamName: string): TeamSummary {
+  return { teamName, displayName: teamName } as TeamSummary;
+}
+
+function task(id: string): GlobalTask {
+  return { id, teamName: 'team-a', subject: id } as GlobalTask;
+}
+
+function progress(teamName: string, state: string): TeamProvisioningProgress {
+  return {
+    runId: `run-${teamName}`,
+    teamName,
+    state,
+    message: state,
+    startedAt: '2026-05-02T00:00:00.000Z',
+    updatedAt: '2026-05-02T00:00:00.000Z',
+  } as TeamProvisioningProgress;
+}
+
+function createDeferred<T>(): {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (error: unknown) => void;
+} {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+async function flushMicrotasks(): Promise<void> {
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+describe('LaunchIoGovernor', () => {
+  afterEach(() => {
+    vi.useRealTimers();
+  });
+
+  it('runs fresh and caches success when there is no launch pressure', async () => {
+    const governor = new LaunchIoGovernor();
+    const loadFresh = vi.fn(async () => [team('fresh')]);
+
+    const result = await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+
+    expect(result).toEqual([team('fresh')]);
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+  });
+
+  it('returns bounded stale cache under active launch pressure and schedules no duplicate fresh read', async () => {
+    vi.useFakeTimers();
+    let now = 0;
+    const governor = new LaunchIoGovernor({ now: () => now, quietWindowMs: 100 });
+    const loadFresh = vi.fn(async () => [team('old')]);
+
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    loadFresh.mockResolvedValue([team('new')]);
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    const result = await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+
+    expect(result).toEqual([team('old')]);
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+
+    now += 99;
+    await vi.advanceTimersByTimeAsync(99);
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+  });
+
+  it('isolates cached payload from caller-side mutations', async () => {
+    const governor = new LaunchIoGovernor();
+    const loadFresh = vi.fn(async () => [team('old')]);
+
+    const first = await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    first[0]!.displayName = 'mutated';
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    const second = await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+
+    expect(second).toEqual([team('old')]);
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+  });
+
+  it('runs one fresh read and coalesces callers when pressure has no cache', async () => {
+    const governor = new LaunchIoGovernor();
+    const deferred = createDeferred<TeamSummary[]>();
+    const loadFresh = vi.fn(() => deferred.promise);
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    const first = governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    const second = governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+    deferred.resolve([team('fresh')]);
+    await expect(Promise.all([first, second])).resolves.toEqual([[team('fresh')], [team('fresh')]]);
+  });
+
+  it('does not serve cache beyond max stale age during launch pressure', async () => {
+    let now = 0;
+    const governor = new LaunchIoGovernor({ now: () => now, maxStaleAgeMs: 100 });
+    const loadFresh = vi.fn(async () => [team('old')]);
+
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    now = 101;
+    loadFresh.mockResolvedValue([team('new')]);
+    governor.noteLaunchIntent('team-a', 'launch');
+
+    await expect(
+      governor.runSummaryOperation('teams:list', loadFresh, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([team('new')]);
+    expect(loadFresh).toHaveBeenCalledTimes(2);
+  });
+
+  it('does not cache an in-flight result when a dirty generation arrives before it resolves', async () => {
+    const governor = new LaunchIoGovernor();
+    const deferred = createDeferred<TeamSummary[]>();
+    const loadFresh = vi.fn(() => deferred.promise);
+
+    const first = governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    governor.noteLaunchIntent('team-a', 'launch');
+    deferred.resolve([team('stale-inflight')]);
+    await expect(first).resolves.toEqual([team('stale-inflight')]);
+
+    loadFresh.mockResolvedValue([team('fresh-after-dirty')]);
+    await expect(
+      governor.runSummaryOperation('teams:list', loadFresh, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([team('fresh-after-dirty')]);
+    expect(loadFresh).toHaveBeenCalledTimes(2);
+  });
+
+  it('marks config and task changes dirty for the correct summary operations', async () => {
+    const governor = new LaunchIoGovernor();
+    const loadTeams = vi.fn(async () => [team('team-old')]);
+    const loadTasks = vi.fn(async () => [task('task-old')]);
+
+    await governor.runSummaryOperation('teams:list', loadTeams, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    await governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+
+    loadTeams.mockResolvedValue([team('team-new')]);
+    loadTasks.mockResolvedValue([task('task-new')]);
+    governor.noteLaunchIntent('team-a', 'launch');
+    governor.noteTeamChange({ type: 'task', teamName: 'team-a', detail: 'task.json' });
+
+    await expect(
+      governor.runSummaryOperation('teams:list', loadTeams, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([team('team-old')]);
+    await expect(
+      governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([task('task-old')]);
+    expect(loadTeams).toHaveBeenCalledTimes(1);
+    expect(loadTasks).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not start background refresh for dirty events outside launch pressure', async () => {
+    vi.useFakeTimers();
+    const governor = new LaunchIoGovernor({ quietWindowMs: 100 });
+    const loadTeams = vi.fn(async () => [team('old')]);
+
+    await governor.runSummaryOperation('teams:list', loadTeams, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    loadTeams.mockResolvedValue([team('new')]);
+
+    governor.noteTeamChange({ type: 'config', teamName: 'team-a', detail: 'config.json' });
+    await vi.advanceTimersByTimeAsync(1_000);
+    await flushMicrotasks();
+    expect(loadTeams).toHaveBeenCalledTimes(1);
+
+    await expect(
+      governor.runSummaryOperation('teams:list', loadTeams, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([team('new')]);
+    expect(loadTeams).toHaveBeenCalledTimes(2);
+  });
+
+  it('does not mark global tasks dirty from launch intent alone', async () => {
+    vi.useFakeTimers();
+    let now = 0;
+    const governor = new LaunchIoGovernor({ now: () => now, quietWindowMs: 100 });
+    const loadTeams = vi.fn(async () => [team('old-team')]);
+    const loadTasks = vi.fn(async () => [task('old-task')]);
+
+    await governor.runSummaryOperation('teams:list', loadTeams, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    await governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    loadTeams.mockResolvedValue([team('new-team')]);
+    loadTasks.mockResolvedValue([task('new-task')]);
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    await governor.runSummaryOperation('teams:list', loadTeams, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    await governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    governor.noteProvisioningProgress(progress('team-a', 'ready'));
+
+    now += 100;
+    await vi.advanceTimersByTimeAsync(100);
+    await flushMicrotasks();
+
+    expect(loadTeams).toHaveBeenCalledTimes(2);
+    expect(loadTasks).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps quiet window after terminal progress and flushes dirty cache once timer expires', async () => {
+    vi.useFakeTimers();
+    let now = 0;
+    const governor = new LaunchIoGovernor({ now: () => now, quietWindowMs: 100 });
+    const loadFresh = vi.fn(async () => [team('old')]);
+    const loadTasks = vi.fn(async () => [task('old')]);
+
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    await governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    loadFresh.mockResolvedValue([team('new')]);
+    loadTasks.mockResolvedValue([task('new')]);
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    await governor.runSummaryOperation('teams:getAllTasks', loadTasks, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    governor.noteTeamChange({ type: 'config', teamName: 'team-a', detail: 'config.json' });
+    governor.noteProvisioningProgress(progress('team-a', 'ready'));
+
+    now += 99;
+    await vi.advanceTimersByTimeAsync(99);
+    await flushMicrotasks();
+    expect(loadFresh).toHaveBeenCalledTimes(1);
+    expect(loadTasks).toHaveBeenCalledTimes(1);
+
+    now += 1;
+    await vi.advanceTimersByTimeAsync(1);
+    await flushMicrotasks();
+    expect(loadFresh).toHaveBeenCalledTimes(2);
+    expect(loadTasks).toHaveBeenCalledTimes(2);
+  });
+
+  it('keeps launch pressure until all concurrent launches reach terminal states', () => {
+    let now = 0;
+    const governor = new LaunchIoGovernor({ now: () => now, quietWindowMs: 100 });
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    governor.noteLaunchIntent('team-b', 'launch');
+    governor.noteProvisioningProgress(progress('team-a', 'failed'));
+    expect(governor.hasLaunchPressureForTests()).toBe(true);
+
+    governor.noteProvisioningProgress(progress('team-b', 'ready'));
+    expect(governor.hasLaunchPressureForTests()).toBe(true);
+
+    now += 100;
+    expect(governor.hasLaunchPressureForTests()).toBe(false);
+  });
+
+  it('preserves old cache and dirty state when a deferred refresh fails', async () => {
+    vi.useFakeTimers();
+    let now = 0;
+    const logger = { warn: vi.fn() };
+    const governor = new LaunchIoGovernor({ now: () => now, quietWindowMs: 100, logger });
+    const loadFresh = vi.fn(async () => [team('old')]);
+
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    loadFresh.mockRejectedValueOnce(new Error('worker timeout'));
+
+    governor.noteLaunchIntent('team-a', 'launch');
+    governor.noteTeamChange({ type: 'config', teamName: 'team-a', detail: 'config.json' });
+    await governor.runSummaryOperation('teams:list', loadFresh, {
+      clone: cloneLaunchIoGovernorPayload,
+    });
+    governor.noteProvisioningProgress(progress('team-a', 'ready'));
+
+    now += 100;
+    await vi.advanceTimersByTimeAsync(100);
+    await flushMicrotasks();
+
+    expect(logger.warn).toHaveBeenCalledWith(expect.stringContaining('deferred refresh failed'));
+    governor.noteLaunchIntent('team-b', 'launch');
+    await expect(
+      governor.runSummaryOperation('teams:list', loadFresh, {
+        clone: cloneLaunchIoGovernorPayload,
+      })
+    ).resolves.toEqual([team('old')]);
+  });
+});
diff --git a/test/main/services/team/MixedProviderTeamLaunch.live.test.ts b/test/main/services/team/MixedProviderTeamLaunch.live.test.ts
new file mode 100644
index 00000000..794f072e
--- /dev/null
+++ b/test/main/services/team/MixedProviderTeamLaunch.live.test.ts
@@ -0,0 +1,411 @@
+import { constants as fsConstants, promises as fs } from 'node:fs';
+import * as os from 'node:os';
+import * as path from 'node:path';
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { readOpenCodeRuntimeLaneIndex } from '../../../../src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader';
+import {
+  getTeamsBasePath,
+  setClaudeBasePathOverride,
+} from '../../../../src/main/utils/pathDecoder';
+import {
+  createOpenCodeLiveHarness,
+  waitForOpenCodeLanesStopped,
+  waitUntil,
+  type OpenCodeLiveHarness,
+} from './openCodeLiveTestHarness';
+
+import type { TeamProvisioningProgress } from '../../../../src/shared/types';
+
+vi.mock('../../../../src/main/services/infrastructure/NotificationManager', () => ({
+  NotificationManager: {
+    getInstance: () => ({
+      addTeamNotification: vi.fn(async () => undefined),
+    }),
+  },
+}));
+
+const liveDescribe =
+  process.env.MIXED_PROVIDER_TEAM_LIVE === '1' &&
+  process.env.OPENCODE_E2E === '1' &&
+  process.env.OPENCODE_E2E_USE_REAL_APP_CREDENTIALS === '1' &&
+  Boolean(process.env.ANTHROPIC_API_KEY?.trim())
+    ? describe
+    : describe.skip;
+
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ANTHROPIC_MODEL = 'haiku';
+const DEFAULT_CODEX_MODEL = 'gpt-5.4-mini';
+const DEFAULT_OPENCODE_MODEL = 'openai/gpt-5.4-mini';
+
+liveDescribe('Mixed provider team launch live e2e', () => {
+  let tempDir: string;
+  let tempClaudeRoot: string;
+  let tempHome: string;
+  let projectPath: string;
+  let previousCliPath: string | undefined;
+  let previousCliFlavor: string | undefined;
+  let previousNudgeFlag: string | undefined;
+  let previousCodexHome: string | undefined;
+  let previousHome: string | undefined;
+  let previousUserProfile: string | undefined;
+  let previousNodeEnv: string | undefined;
+  let previousDisableAppBootstrap: string | undefined;
+  let previousDisableRuntimeBootstrap: string | undefined;
+  let harness: OpenCodeLiveHarness | null;
+  let teamName: string | null;
+  let codexAccountFeature: { getSnapshot(): Promise<unknown>; dispose(): Promise<void> } | null;
+  let providerConnectionService: {
+    setCodexAccountFeature(feature: { getSnapshot(): Promise<unknown> } | null): void;
+  } | null;
+
+  beforeEach(async () => {
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'mixed-provider-team-live-'));
+    tempClaudeRoot = path.join(tempDir, '.claude');
+    tempHome = path.join(tempDir, 'home');
+    projectPath = path.join(tempDir, 'project');
+    await fs.mkdir(tempClaudeRoot, { recursive: true });
+    await fs.mkdir(tempHome, { recursive: true });
+    await fs.mkdir(projectPath, { recursive: true });
+    await fs.writeFile(
+      path.join(projectPath, 'README.md'),
+      '# Mixed provider team live e2e\n\nThis project is intentionally tiny.\n',
+      'utf8'
+    );
+    await writeTrustedClaudeConfig(tempClaudeRoot, projectPath);
+    setClaudeBasePathOverride(tempClaudeRoot);
+
+    previousCliPath = process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH;
+    previousCliFlavor = process.env.CLAUDE_TEAM_CLI_FLAVOR;
+    previousNudgeFlag = process.env.CLAUDE_TEAM_MEMBER_WORK_SYNC_NUDGES_ENABLED;
+    previousCodexHome = process.env.CODEX_HOME;
+    previousHome = process.env.HOME;
+    previousUserProfile = process.env.USERPROFILE;
+    previousNodeEnv = process.env.NODE_ENV;
+    previousDisableAppBootstrap = process.env.CLAUDE_APP_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
+    previousDisableRuntimeBootstrap = process.env.CLAUDE_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
+
+    process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH =
+      process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim() || DEFAULT_ORCHESTRATOR_CLI;
+    process.env.CLAUDE_TEAM_CLI_FLAVOR = 'agent_teams_orchestrator';
+    process.env.CLAUDE_TEAM_MEMBER_WORK_SYNC_NUDGES_ENABLED = '0';
+    process.env.CODEX_HOME = resolveConnectedCodexHome(previousCodexHome);
+    process.env.HOME = tempHome;
+    process.env.USERPROFILE = tempHome;
+    process.env.NODE_ENV = 'production';
+    delete process.env.CLAUDE_APP_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
+    delete process.env.CLAUDE_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
+
+    harness = null;
+    teamName = null;
+    codexAccountFeature = null;
+    providerConnectionService = null;
+  });
+
+  afterEach(async () => {
+    const keepProcesses = process.env.MIXED_PROVIDER_TEAM_LIVE_KEEP_PROCESSES === '1';
+    if (!keepProcesses && harness && teamName) {
+      await harness.svc.stopTeam(teamName).catch(() => undefined);
+      await waitForOpenCodeLanesStopped(teamName, 90_000).catch(() => undefined);
+    }
+    providerConnectionService?.setCodexAccountFeature(null);
+    await codexAccountFeature?.dispose().catch(() => undefined);
+    if (!keepProcesses) {
+      await harness?.dispose().catch(() => undefined);
+    }
+    setClaudeBasePathOverride(null);
+
+    restoreEnv('CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH', previousCliPath);
+    restoreEnv('CLAUDE_TEAM_CLI_FLAVOR', previousCliFlavor);
+    restoreEnv('CLAUDE_TEAM_MEMBER_WORK_SYNC_NUDGES_ENABLED', previousNudgeFlag);
+    restoreEnv('CODEX_HOME', previousCodexHome);
+    restoreEnv('HOME', previousHome);
+    restoreEnv('USERPROFILE', previousUserProfile);
+    restoreEnv('NODE_ENV', previousNodeEnv);
+    restoreEnv('CLAUDE_APP_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP', previousDisableAppBootstrap);
+    restoreEnv('CLAUDE_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP', previousDisableRuntimeBootstrap);
+
+    if (process.env.MIXED_PROVIDER_TEAM_LIVE_KEEP_TEMP === '1') {
+      process.stderr.write(`[MixedProviderTeamLaunch.live] preserved temp dir: ${tempDir}\n`);
+    } else {
+      await removeTempDirWithRetries(tempDir);
+    }
+  }, 180_000);
+
+  it(
+    'launches Anthropic, Codex subscription, and OpenCode teammates in one mixed team',
+    async () => {
+      const orchestratorCli = process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim();
+      expect(orchestratorCli).toBeTruthy();
+      await assertExecutable(orchestratorCli!);
+      await assertExecutable(path.join(process.env.CODEX_HOME!, 'auth.json'));
+
+      const anthropicModel =
+        process.env.MIXED_PROVIDER_TEAM_ANTHROPIC_MODEL?.trim() || DEFAULT_ANTHROPIC_MODEL;
+      const codexModel = process.env.MIXED_PROVIDER_TEAM_CODEX_MODEL?.trim() || DEFAULT_CODEX_MODEL;
+      const codexEffort =
+        (process.env.MIXED_PROVIDER_TEAM_CODEX_EFFORT?.trim() as
+          | 'low'
+          | 'medium'
+          | 'high'
+          | 'xhigh'
+          | undefined) || 'low';
+      const openCodeModel =
+        process.env.MIXED_PROVIDER_TEAM_OPENCODE_MODEL?.trim() || DEFAULT_OPENCODE_MODEL;
+
+      const [
+        { ProviderConnectionService },
+        { createCodexAccountFeature },
+      ] = await Promise.all([
+        import('../../../../src/main/services/runtime/ProviderConnectionService'),
+        import('../../../../src/features/codex-account/main/composition/createCodexAccountFeature'),
+      ]);
+
+      codexAccountFeature = createCodexAccountFeature({
+        logger: {
+          info: () => undefined,
+          warn: () => undefined,
+          error: () => undefined,
+        },
+        configManager: {
+          getConfig: () => ({
+            providerConnections: {
+              codex: {
+                preferredAuthMode: 'chatgpt' as const,
+              },
+            },
+          }),
+        },
+      });
+      providerConnectionService = ProviderConnectionService.getInstance();
+      providerConnectionService.setCodexAccountFeature(codexAccountFeature);
+
+      harness = await createOpenCodeLiveHarness({
+        tempDir,
+        selectedModel: openCodeModel,
+        projectPath,
+      });
+
+      teamName = `mixed-provider-live-${Date.now()}`;
+      const progressEvents: TeamProvisioningProgress[] = [];
+
+      await harness.svc.createTeam(
+        {
+          teamName,
+          cwd: projectPath,
+          providerId: 'anthropic',
+          model: anthropicModel,
+          skipPermissions: true,
+          prompt: 'Keep the team idle after bootstrap. Do not start extra work.',
+          members: [
+            {
+              name: 'alice',
+              role: 'Developer',
+              providerId: 'anthropic',
+              model: anthropicModel,
+            },
+            {
+              name: 'cody',
+              role: 'Developer',
+              providerId: 'codex',
+              model: codexModel,
+              effort: codexEffort,
+            },
+            {
+              name: 'oscar',
+              role: 'Developer',
+              providerId: 'opencode',
+              model: openCodeModel,
+            },
+          ],
+        },
+        (progress) => {
+          progressEvents.push(progress);
+        }
+      );
+
+      await waitUntil(async () => {
+        const last = progressEvents.at(-1);
+        if (last?.state === 'failed') {
+          throw new Error(formatProgressDump(progressEvents));
+        }
+        return last?.state === 'ready';
+      }, 360_000);
+
+      await waitUntilWithDiagnostics(async () => {
+        const status = await harness!.svc.getMemberSpawnStatuses(teamName!);
+        if (status.teamLaunchState === 'partial_failure') {
+          throw new Error(await formatMixedLaunchDiagnostics(harness!, teamName!, progressEvents));
+        }
+        for (const memberName of ['alice', 'cody', 'oscar'] as const) {
+          const member = status.statuses[memberName];
+          if (
+            member?.status !== 'online' ||
+            member.launchState !== 'confirmed_alive' ||
+            member.bootstrapConfirmed !== true
+          ) {
+            return false;
+          }
+        }
+        return true;
+      }, 180_000, () => formatMixedLaunchDiagnostics(harness!, teamName!, progressEvents));
+
+      await waitUntilWithDiagnostics(async () => {
+        const snapshot = await harness!.svc.getTeamAgentRuntimeSnapshot(teamName!);
+        return (
+          snapshot.members.alice?.providerId === 'anthropic' &&
+          snapshot.members.alice.alive === true &&
+          snapshot.members.cody?.providerId === 'codex' &&
+          snapshot.members.cody.alive === true &&
+          snapshot.members.oscar?.providerId === 'opencode' &&
+          snapshot.members.oscar.alive === true
+        );
+      }, 180_000, () => formatMixedLaunchDiagnostics(harness!, teamName!, progressEvents));
+
+      const laneIndex = await readOpenCodeRuntimeLaneIndex(getTeamsBasePath(), teamName);
+      expect(
+        Object.entries(laneIndex.lanes).some(
+          ([laneId, lane]) => lane.state === 'active' && laneId === 'secondary:opencode:oscar'
+        )
+      ).toBe(true);
+    },
+    480_000
+  );
+});
+
+function restoreEnv(name: string, previous: string | undefined): void {
+  if (previous === undefined) {
+    delete process.env[name];
+  } else {
+    process.env[name] = previous;
+  }
+}
+
+async function assertExecutable(filePath: string): Promise<void> {
+  await fs.access(filePath, fsConstants.R_OK);
+}
+
+async function writeTrustedClaudeConfig(configDir: string, projectPath: string): Promise<void> {
+  const normalizedProjectPath = path.normalize(projectPath).replace(/\\/g, '/');
+  const approvedApiKeySuffix = process.env.ANTHROPIC_API_KEY?.trim().slice(-20);
+  const config: {
+    projects: Record<string, { hasTrustDialogAccepted: true }>;
+    customApiKeyResponses?: { approved: string[]; rejected: string[] };
+  } = {
+    projects: {
+      [normalizedProjectPath]: {
+        hasTrustDialogAccepted: true,
+      },
+    },
+  };
+  if (approvedApiKeySuffix) {
+    config.customApiKeyResponses = {
+      approved: [approvedApiKeySuffix],
+      rejected: [],
+    };
+  }
+  await fs.writeFile(
+    path.join(configDir, '.claude.json'),
+    `${JSON.stringify(config, null, 2)}\n`,
+    'utf8'
+  );
+}
+
+function resolveConnectedCodexHome(previousCodexHome: string | undefined): string {
+  const explicit = process.env.MIXED_PROVIDER_TEAM_CODEX_HOME?.trim();
+  if (explicit) {
+    return path.resolve(explicit);
+  }
+  const previous = previousCodexHome?.trim();
+  if (previous) {
+    return path.resolve(previous);
+  }
+  return path.join(os.userInfo().homedir, '.codex');
+}
+
+async function removeTempDirWithRetries(dirPath: string): Promise<void> {
+  const attempts = process.platform === 'win32' ? 20 : 1;
+  for (let attempt = 1; attempt <= attempts; attempt += 1) {
+    try {
+      await fs.rm(dirPath, { recursive: true, force: true });
+      return;
+    } catch (error) {
+      const code = (error as NodeJS.ErrnoException).code;
+      if ((code !== 'EBUSY' && code !== 'EPERM') || attempt === attempts) {
+        throw error;
+      }
+      await new Promise((resolve) => setTimeout(resolve, 100));
+    }
+  }
+}
+
+function formatProgressDump(progressEvents: TeamProvisioningProgress[]): string {
+  return redactSecrets(
+    progressEvents
+      .map((progress) =>
+        [
+          progress.state,
+          progress.message,
+          progress.messageSeverity,
+          progress.error,
+          progress.cliLogsTail,
+        ]
+          .filter(Boolean)
+          .join(' | ')
+      )
+      .join('\n')
+  );
+}
+
+function redactSecrets(text: string): string {
+  return text
+    .replace(/sk-ant-api03-[A-Za-z0-9_-]+/g, '<redacted-anthropic-key>')
+    .replace(/\b(?:sk|ak)-[A-Za-z0-9_-]{20,}\b/g, '<redacted-api-key>');
+}
+
+async function waitUntilWithDiagnostics(
+  predicate: () => Promise<boolean>,
+  timeoutMs: number,
+  describeState: () => Promise<string>,
+  pollMs = 1_000
+): Promise<void> {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    if (await predicate()) {
+      return;
+    }
+    await new Promise((resolve) => setTimeout(resolve, pollMs));
+  }
+  throw new Error(`Timed out after ${timeoutMs}ms waiting for condition.\n${await describeState()}`);
+}
+
+async function formatMixedLaunchDiagnostics(
+  harness: OpenCodeLiveHarness,
+  teamName: string,
+  progressEvents: TeamProvisioningProgress[]
+): Promise<string> {
+  const [spawnStatuses, runtimeSnapshot, laneIndex] = await Promise.all([
+    harness.svc.getMemberSpawnStatuses(teamName).catch((error) => ({
+      error: String(error),
+    })),
+    harness.svc.getTeamAgentRuntimeSnapshot(teamName).catch((error) => ({
+      error: String(error),
+    })),
+    readOpenCodeRuntimeLaneIndex(getTeamsBasePath(), teamName).catch((error) => ({
+      error: String(error),
+    })),
+  ]);
+  return redactSecrets(
+    JSON.stringify(
+      {
+        progress: formatProgressDump(progressEvents),
+        spawnStatuses,
+        runtimeSnapshot,
+        laneIndex,
+      },
+      null,
+      2
+    )
+  );
+}
diff --git a/test/main/services/team/OpenCodeMixedRecovery.live.test.ts b/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
index 4a34dfaf..841334c7 100644
--- a/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
+++ b/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
@@ -77,6 +77,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
       ...createStableBridgeEnv(),
       PATH: withBunOnPath(process.env.PATH ?? ''),
       XDG_DATA_HOME: path.join(tempDir, 'xdg-data-single'),
+      AGENT_TEAMS_MCP_CLAUDE_DIR: tempClaudeRoot,
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
@@ -119,7 +120,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
       });
       launchedLanes.push(launchInput);
       const launchResult = await adapter.launch(launchInput);
-      expect(launchResult.teamLaunchState).toBe('clean_success');
+      expectCleanOpenCodeLaunch(launchResult);
       expect(launchResult.members.bob).toMatchObject({
         launchState: 'confirmed_alive',
         runtimeAlive: true,
@@ -181,6 +182,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
         ...createStableBridgeEnv(),
         PATH: withBunOnPath(process.env.PATH ?? ''),
         XDG_DATA_HOME: path.join(tempDir, 'xdg-data-multi'),
+        AGENT_TEAMS_MCP_CLAUDE_DIR: tempClaudeRoot,
         CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
         CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
         CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
@@ -225,7 +227,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
           });
           launchedLanes.push(launchInput);
           const launchResult = await adapter.launch(launchInput);
-          expect(launchResult.teamLaunchState).toBe('clean_success');
+          expectCleanOpenCodeLaunch(launchResult);
           expect(launchResult.members[memberName]).toMatchObject({
             launchState: 'confirmed_alive',
             runtimeAlive: true,
@@ -310,6 +312,21 @@ function createSecondaryLaneLaunchInput(input: {
   };
 }
 
+function expectCleanOpenCodeLaunch(
+  launchResult: Awaited<ReturnType<OpenCodeTeamRuntimeAdapter['launch']>>
+): void {
+  if (launchResult.teamLaunchState !== 'clean_success') {
+    throw new Error(
+      `Expected OpenCode launch to be clean_success, received ${launchResult.teamLaunchState}:\n${JSON.stringify(
+        launchResult,
+        null,
+        2
+      )}`
+    );
+  }
+  expect(launchResult.teamLaunchState).toBe('clean_success');
+}
+
 async function writeMixedRecoveryFixtures(input: {
   teamName: string;
   projectPath: string;
diff --git a/test/main/services/team/OpenCodePromptDeliveryLedger.test.ts b/test/main/services/team/OpenCodePromptDeliveryLedger.test.ts
index 4d1d2d2f..c1f5f2aa 100644
--- a/test/main/services/team/OpenCodePromptDeliveryLedger.test.ts
+++ b/test/main/services/team/OpenCodePromptDeliveryLedger.test.ts
@@ -286,6 +286,71 @@ describe('OpenCodePromptDeliveryLedger', () => {
     expect(observed.observedAssistantPreview).toBe('Понял');
   });
 
+  it('keeps plain-text responses active until their visible inbox reply is materialized', async () => {
+    const store = createStore();
+    const record = await store.ensurePending({
+      teamName: 'team-a',
+      memberName: 'jack',
+      laneId: 'secondary:opencode:jack',
+      inboxMessageId: 'msg-plain-visible',
+      inboxTimestamp: '2026-04-25T09:59:00.000Z',
+      source: 'watcher',
+      replyRecipient: 'user',
+      actionMode: 'ask',
+      taskRefs: [],
+      payloadHash: 'sha256:plain-visible',
+      now: '2026-04-25T10:00:00.000Z',
+    });
+
+    const responded = await store.applyDeliveryResult({
+      id: record.id,
+      accepted: true,
+      attempted: true,
+      responseObservation: {
+        state: 'responded_plain_text',
+        deliveredUserMessageId: 'oc-user-plain',
+        assistantMessageId: 'oc-assistant-plain',
+        toolCallNames: [],
+        visibleMessageToolCallId: null,
+        visibleReplyMessageId: null,
+        visibleReplyCorrelation: null,
+        latestAssistantPreview: 'Concrete visible answer.',
+        reason: null,
+      },
+      now: '2026-04-25T10:00:05.000Z',
+    });
+    expect(responded.status).toBe('responded');
+
+    await expect(store.getActiveForMember({
+      teamName: 'team-a',
+      memberName: 'jack',
+      laneId: 'secondary:opencode:jack',
+    })).resolves.toMatchObject({
+      id: record.id,
+      responseState: 'responded_plain_text',
+    });
+
+    const materialized = await store.applyDestinationProof({
+      id: record.id,
+      visibleReplyInbox: 'user',
+      visibleReplyMessageId: 'opencode-plain-reply-1',
+      visibleReplyCorrelation: 'plain_assistant_text',
+      semanticallySufficient: true,
+      observedAt: '2026-04-25T10:00:06.000Z',
+    });
+    expect(materialized).toMatchObject({
+      status: 'responded',
+      responseState: 'responded_plain_text',
+      visibleReplyCorrelation: 'plain_assistant_text',
+    });
+
+    await expect(store.getActiveForMember({
+      teamName: 'team-a',
+      memberName: 'jack',
+      laneId: 'secondary:opencode:jack',
+    })).resolves.toBeNull();
+  });
+
   it('does not keep responded live deliveries active when no inbox commit is needed', async () => {
     const store = createStore();
     const direct = await store.ensurePending({
diff --git a/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts b/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
index 0058beff..f7c0f2d9 100644
--- a/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
+++ b/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
@@ -67,6 +67,7 @@ liveDescribe('OpenCode team provisioning live e2e', () => {
       ...createStableBridgeEnv(),
       PATH: withBunOnPath(process.env.PATH ?? ''),
       XDG_DATA_HOME: path.join(tempDir, 'xdg-data'),
+      AGENT_TEAMS_MCP_CLAUDE_DIR: tempClaudeRoot,
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
       CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
diff --git a/test/main/services/team/OpenCodeTeamRuntimeAdapter.test.ts b/test/main/services/team/OpenCodeTeamRuntimeAdapter.test.ts
index 47bbc2d9..ef3c6dac 100644
--- a/test/main/services/team/OpenCodeTeamRuntimeAdapter.test.ts
+++ b/test/main/services/team/OpenCodeTeamRuntimeAdapter.test.ts
@@ -86,6 +86,176 @@ describe('OpenCodeTeamRuntimeAdapter', () => {
     });
   });
 
+  it('can rely on the launch bridge as the only readiness authority', async () => {
+    const launchOpenCodeTeam = vi.fn<
+      NonNullable<OpenCodeTeamRuntimeBridgePort['launchOpenCodeTeam']>
+    >(
+      async () =>
+        ({
+          runId: 'run-1',
+          teamLaunchState: 'ready',
+          members: {
+            alice: {
+              sessionId: 'oc-session-1',
+              launchState: 'confirmed_alive',
+              runtimePid: 123,
+              model: 'openai/gpt-5.4-mini',
+              evidence: [
+                { kind: 'required_tools_proven', observedAt: '2026-04-21T00:00:00.000Z' },
+                { kind: 'delivery_ready', observedAt: '2026-04-21T00:00:00.000Z' },
+                { kind: 'member_ready', observedAt: '2026-04-21T00:00:00.000Z' },
+                { kind: 'run_ready', observedAt: '2026-04-21T00:00:00.000Z' },
+              ],
+            },
+          },
+          warnings: [],
+          diagnostics: [
+            {
+              code: 'opencode_launch_total_timing',
+              severity: 'info',
+              message: 'total=12ms provisioningProbe=3ms members=1',
+            },
+            {
+              code: 'member_reconcile',
+              severity: 'warning',
+              message: 'alice: sample reconcile diagnostic',
+            },
+          ],
+        }) satisfies OpenCodeLaunchTeamCommandData
+    );
+    const bridge = bridgePort(
+      readiness({
+        state: 'unknown_error',
+        launchAllowed: false,
+        diagnostics: ['readiness should be skipped'],
+      }),
+      { launchOpenCodeTeam }
+    );
+    const adapter = new OpenCodeTeamRuntimeAdapter(bridge);
+
+    const result = await adapter.launch(launchInput({ skipReadinessPreflight: true }));
+
+    expect(result.teamLaunchState).toBe('clean_success');
+    expect(bridge.checkOpenCodeTeamLaunchReadiness).not.toHaveBeenCalled();
+    expect(launchOpenCodeTeam).toHaveBeenCalledWith(
+      expect.objectContaining({
+        selectedModel: 'openai/gpt-5.4-mini',
+        expectedCapabilitySnapshotId: null,
+      })
+    );
+    expect(result.diagnostics).toEqual(
+      expect.arrayContaining([
+        'info:opencode_launch_total_timing: total=12ms provisioningProbe=3ms members=1',
+      ])
+    );
+    expect(result.members.alice?.diagnostics).not.toContain(
+      'info:opencode_launch_total_timing: total=12ms provisioningProbe=3ms members=1'
+    );
+    expect(result.members.alice?.diagnostics).toContain(
+      'warning:member_reconcile: alice: sample reconcile diagnostic'
+    );
+  });
+
+  it('uses concrete member diagnostics as failed OpenCode hard failure reasons', async () => {
+    const concreteReason =
+      'Latest assistant message msg_123 failed with APIError - Insufficient credits. Add more using https://openrouter.ai/settings/credits';
+    const launchOpenCodeTeam = vi.fn<
+      NonNullable<OpenCodeTeamRuntimeBridgePort['launchOpenCodeTeam']>
+    >(
+      async () =>
+        ({
+          runId: 'run-1',
+          teamLaunchState: 'failed',
+          members: {
+            alice: {
+              sessionId: 'oc-session-1',
+              launchState: 'failed',
+              model: 'openai/gpt-5.4-mini',
+              diagnostics: ['OpenCode bridge reported member launch failure', concreteReason],
+              evidence: [],
+            },
+          },
+          warnings: [],
+          diagnostics: [],
+        }) satisfies OpenCodeLaunchTeamCommandData
+    );
+    const adapter = new OpenCodeTeamRuntimeAdapter(
+      bridgePort(readiness({ state: 'ready', launchAllowed: true }), { launchOpenCodeTeam })
+    );
+
+    const result = await adapter.launch(launchInput());
+
+    expect(result.members.alice).toMatchObject({
+      launchState: 'failed_to_start',
+      hardFailureReason: concreteReason,
+    });
+  });
+
+  it('falls back to bridge error diagnostics when member failure details are generic', async () => {
+    const bridgeError = 'Provider runtime returned a concrete launch error';
+    const launchOpenCodeTeam = vi.fn<
+      NonNullable<OpenCodeTeamRuntimeBridgePort['launchOpenCodeTeam']>
+    >(
+      async () =>
+        ({
+          runId: 'run-1',
+          teamLaunchState: 'failed',
+          members: {
+            alice: {
+              sessionId: 'oc-session-1',
+              launchState: 'failed',
+              model: 'openai/gpt-5.4-mini',
+              diagnostics: ['OpenCode bridge reported member launch failure'],
+              evidence: [],
+            },
+          },
+          warnings: [],
+          diagnostics: [{ code: 'provider_error', severity: 'error', message: bridgeError }],
+        }) satisfies OpenCodeLaunchTeamCommandData
+    );
+    const adapter = new OpenCodeTeamRuntimeAdapter(
+      bridgePort(readiness({ state: 'ready', launchAllowed: true }), { launchOpenCodeTeam })
+    );
+
+    const result = await adapter.launch(launchInput());
+
+    expect(result.members.alice?.hardFailureReason).toBe(bridgeError);
+  });
+
+  it('redacts secret-like values in selected OpenCode failure reasons', async () => {
+    const launchOpenCodeTeam = vi.fn<
+      NonNullable<OpenCodeTeamRuntimeBridgePort['launchOpenCodeTeam']>
+    >(
+      async () =>
+        ({
+          runId: 'run-1',
+          teamLaunchState: 'failed',
+          members: {
+            alice: {
+              sessionId: 'oc-session-1',
+              launchState: 'failed',
+              model: 'openai/gpt-5.4-mini',
+              diagnostics: [
+                'Provider failed with --api-key sk-openroutersecret000000000000 and Bearer abc.def.ghi',
+              ],
+              evidence: [],
+            },
+          },
+          warnings: [],
+          diagnostics: [],
+        }) satisfies OpenCodeLaunchTeamCommandData
+    );
+    const adapter = new OpenCodeTeamRuntimeAdapter(
+      bridgePort(readiness({ state: 'ready', launchAllowed: true }), { launchOpenCodeTeam })
+    );
+
+    const result = await adapter.launch(launchInput());
+
+    expect(result.members.alice?.hardFailureReason).toBe(
+      'Provider failed with --api-key [redacted] and Bearer [redacted]'
+    );
+  });
+
   it('rejects non-OpenCode members before readiness or launch bridge dispatch', async () => {
     const launchOpenCodeTeam = vi.fn();
     const bridge = bridgePort(readiness({ state: 'ready', launchAllowed: true }), {
diff --git a/test/main/services/team/TeamAgentLaunchMatrix.safe-e2e.test.ts b/test/main/services/team/TeamAgentLaunchMatrix.safe-e2e.test.ts
index f32a1e75..3a7726a8 100644
--- a/test/main/services/team/TeamAgentLaunchMatrix.safe-e2e.test.ts
+++ b/test/main/services/team/TeamAgentLaunchMatrix.safe-e2e.test.ts
@@ -32,11 +32,18 @@ import {
 } from '../../../../src/main/utils/pathDecoder';
 import { createPersistedLaunchSnapshot } from '../../../../src/main/services/team/TeamLaunchStateEvaluator';
 import {
+  getOpenCodeRuntimeManifestPath,
   getOpenCodeRuntimeLaneIndexPath,
   readOpenCodeRuntimeLaneIndex,
   setOpenCodeRuntimeActiveRunManifest,
   upsertOpenCodeRuntimeLaneIndexEntry,
 } from '../../../../src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader';
+import {
+  createRuntimeStoreManifestStore,
+  createRuntimeStoreReceiptStore,
+  OPENCODE_RUNTIME_STORE_DESCRIPTORS,
+  RuntimeStoreBatchWriter,
+} from '../../../../src/main/services/team/opencode/store/RuntimeStoreManifest';
 
 import type { TeamProvisioningProgress } from '../../../../src/shared/types';
 
@@ -9921,6 +9928,7 @@ describe('Team agent launch matrix safe e2e', () => {
     addGeminiPrimaryToMixedRun(currentRun);
     staleRun.runId = `run-${teamName}-stale`;
     currentRun.runId = `run-${teamName}-current`;
+    markMixedOpenCodeLaneConfirmedForTest(currentRun, 'bob');
     trackLiveRun(svc, staleRun);
     trackLiveRun(svc, currentRun);
 
@@ -9990,6 +9998,7 @@ describe('Team agent launch matrix safe e2e', () => {
     addGeminiPrimaryToMixedRun(secondRun);
     firstRun.child = { stdin: { writable: true } };
     secondRun.child = { stdin: { writable: true } };
+    markMixedOpenCodeLaneConfirmedForTest(secondRun, 'bob');
     trackLiveRun(svc, firstRun);
     trackLiveRun(svc, secondRun);
 
@@ -10268,6 +10277,7 @@ describe('Team agent launch matrix safe e2e', () => {
     const currentRun = createMixedLiveRun({ teamName, projectPath, primaryProviderId: 'anthropic' });
     addGeminiPrimaryToMixedRun(currentRun);
     currentRun.runId = `run-${teamName}-current`;
+    markMixedOpenCodeLaneConfirmedForTest(currentRun, 'bob');
     trackLiveRun(svc, currentRun);
     injectStaleTerminalProvisioningRun(svc, teamName, `run-${teamName}-stale`);
 
@@ -11181,7 +11191,7 @@ describe('Team agent launch matrix safe e2e', () => {
     });
   });
 
-  it('recovers a missing mixed OpenCode lane index from materialized persisted runtime evidence before direct delivery', async () => {
+  it('recovers a missing mixed OpenCode lane index from materialized persisted runtime evidence but blocks direct delivery until bootstrap', async () => {
     const teamName = 'mixed-opencode-direct-message-recovers-missing-lane-safe-e2e';
     await writeMixedTeamConfig({ teamName, projectPath });
     await writeTeamMeta(teamName, projectPath);
@@ -11268,8 +11278,11 @@ describe('Team agent launch matrix safe e2e', () => {
         messageId: 'msg-recovered-missing-lane-bob',
       })
     ).resolves.toEqual({
-      delivered: true,
-      diagnostics: [],
+      delivered: false,
+      reason: 'opencode_runtime_not_active',
+      diagnostics: [
+        'OpenCode runtime bootstrap is not confirmed for bob. Message was saved and will be retried after runtime check-in.',
+      ],
     });
 
     expect(adapter.reconcileInputs).toHaveLength(1);
@@ -11287,15 +11300,7 @@ describe('Team agent launch matrix safe e2e', () => {
         },
       }
     );
-    expect(adapter.messageInputs).toHaveLength(1);
-    expect(adapter.messageInputs[0]).toMatchObject({
-      teamName,
-      laneId: 'secondary:opencode:bob',
-      memberName: 'bob',
-      cwd: projectPath,
-      text: 'recovered bob receives direct message',
-      messageId: 'msg-recovered-missing-lane-bob',
-    });
+    expect(adapter.messageInputs).toEqual([]);
   });
 
   it('recovers a missing mixed OpenCode lane index from confirmed-alive persisted runtime evidence before direct delivery', async () => {
@@ -11354,6 +11359,13 @@ describe('Team agent launch matrix safe e2e', () => {
     const adapter = new FakeOpenCodeRuntimeAdapter('clean_success', {
       bob: 'confirmed',
     });
+    await writeOpenCodeBootstrapSessionEvidenceForTest({
+      teamName,
+      laneId: 'secondary:opencode:bob',
+      memberName: 'bob',
+      runId: null,
+      sessionId: 'ses_bob_confirmed_materialized',
+    });
     await writeAliveProcessRegistry(teamName);
     const restartedService = new TeamProvisioningService();
     restartedService.setRuntimeAdapterRegistry(new TeamRuntimeAdapterRegistry([adapter]));
@@ -12641,6 +12653,7 @@ describe('Team agent launch matrix safe e2e', () => {
     svc.setRuntimeAdapterRegistry(new TeamRuntimeAdapterRegistry([adapter]));
     const run = createMixedLiveRun({ teamName, projectPath, primaryProviderId: 'anthropic' });
     addGeminiPrimaryToMixedRun(run);
+    markMixedOpenCodeLaneConfirmedForTest(run, 'tom');
     trackLiveRun(svc, run);
 
     await expect(
@@ -12696,6 +12709,7 @@ describe('Team agent launch matrix safe e2e', () => {
     svc.setRuntimeAdapterRegistry(new TeamRuntimeAdapterRegistry([adapter]));
     const run = createMixedLiveRun({ teamName, projectPath, primaryProviderId: 'anthropic' });
     addGeminiPrimaryToMixedRun(run);
+    markMixedOpenCodeLaneConfirmedForTest(run, 'bob');
     trackLiveRun(svc, run);
 
     await expect(
@@ -14796,7 +14810,7 @@ describe('Team agent launch matrix safe e2e', () => {
     expect(adapter.launchInputs).toHaveLength(0);
     expect(run.mixedSecondaryLanes.map((lane: { state: string }) => lane.state)).toEqual([
       'launching',
-      'launching',
+      'queued',
     ]);
     expect(run.mixedSecondaryLanes.map((lane: { runId: string | null }) => lane.runId)).toEqual(
       firstLaneRunIds
@@ -14847,7 +14861,7 @@ describe('Team agent launch matrix safe e2e', () => {
     expect(adapter.launchInputs).toHaveLength(0);
     expect(run.mixedSecondaryLanes.map((lane: { state: string }) => lane.state)).toEqual([
       'launching',
-      'launching',
+      'queued',
     ]);
     expect(run.mixedSecondaryLanes.map((lane: { runId: string | null }) => lane.runId)).toEqual(
       firstLaneRunIds
@@ -17105,6 +17119,7 @@ async function upsertActiveOpenCodeRuntimeLaneForTest(input: {
   runId?: string | null;
   diagnostics?: string[];
 }): Promise<void> {
+  const runId = input.runId ?? null;
   await upsertOpenCodeRuntimeLaneIndexEntry({
     teamsBasePath: getTeamsBasePath(),
     teamName: input.teamName,
@@ -17116,7 +17131,76 @@ async function upsertActiveOpenCodeRuntimeLaneForTest(input: {
     teamsBasePath: getTeamsBasePath(),
     teamName: input.teamName,
     laneId: input.laneId,
-    runId: input.runId ?? null,
+    runId,
+  });
+  await writeOpenCodeBootstrapSessionEvidenceForTest({
+    teamName: input.teamName,
+    laneId: input.laneId,
+    runId,
+  });
+}
+
+async function writeOpenCodeBootstrapSessionEvidenceForTest(input: {
+  teamName: string;
+  laneId: string;
+  runId?: string | null;
+  memberName?: string;
+  sessionId?: string;
+}): Promise<void> {
+  const runId = input.runId ?? null;
+  const descriptor = OPENCODE_RUNTIME_STORE_DESCRIPTORS.find(
+    (candidate) => candidate.schemaName === 'opencode.sessionStore'
+  );
+  if (!descriptor) {
+    throw new Error('OpenCode session store descriptor missing');
+  }
+  const manifestPath = getOpenCodeRuntimeManifestPath(
+    getTeamsBasePath(),
+    input.teamName,
+    input.laneId
+  );
+  const runtimeDirectory = path.dirname(manifestPath);
+  await fs.mkdir(runtimeDirectory, { recursive: true });
+  const memberName = input.memberName ?? input.laneId.split(':').at(-1) ?? input.laneId;
+  const writer = new RuntimeStoreBatchWriter(
+    runtimeDirectory,
+    createRuntimeStoreManifestStore({
+      filePath: manifestPath,
+      teamName: input.teamName,
+    }),
+    createRuntimeStoreReceiptStore({
+      filePath: path.join(runtimeDirectory, 'opencode-runtime-receipts.json'),
+    }),
+    {
+      clock: () => new Date('2026-04-23T10:00:00.000Z'),
+      batchIdFactory: () => `batch-${input.teamName}-${input.laneId}`,
+      receiptIdFactory: () => `receipt-${input.teamName}-${input.laneId}`,
+    }
+  );
+  await writer.writeBatch({
+    teamName: input.teamName,
+    runId,
+    capabilitySnapshotId: null,
+    behaviorFingerprint: null,
+    reason: 'launch_checkpoint',
+    writes: [
+      {
+        descriptor,
+        data: {
+          sessions: [
+            {
+              id: input.sessionId ?? `ses-${input.teamName}-${input.laneId}`,
+              teamName: input.teamName,
+              memberName,
+              laneId: input.laneId,
+              runId,
+              observedAt: '2026-04-23T10:00:00.000Z',
+              source: 'runtime_bootstrap_checkin',
+            },
+          ],
+        },
+      },
+    ],
   });
 }
 
@@ -17291,6 +17375,42 @@ function createMixedLiveRun(input: {
   };
 }
 
+function markMixedOpenCodeLaneConfirmedForTest(run: any, memberName: string): void {
+  const now = '2026-04-23T10:00:00.000Z';
+  const laneId = `secondary:opencode:${memberName}`;
+  const lane = run.mixedSecondaryLanes?.find((candidate: any) => candidate.laneId === laneId);
+  if (!lane) {
+    throw new Error(`Missing mixed OpenCode lane fixture for ${memberName}`);
+  }
+  lane.runId = run.runId;
+  lane.state = 'active';
+  lane.result = {
+    runId: run.runId,
+    teamName: run.teamName,
+    launchPhase: 'reconciled',
+    teamLaunchState: 'clean_success',
+    members: {
+      [memberName]: {
+        memberName,
+        providerId: 'opencode',
+        launchState: 'confirmed_alive',
+        agentToolAccepted: true,
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        sessionId: `session-${memberName}`,
+        runtimePid: 10_000,
+        livenessKind: 'confirmed_bootstrap',
+        pidSource: 'opencode_bridge',
+        diagnostics: ['fake OpenCode launch ready'],
+        lastEvaluatedAt: now,
+      },
+    },
+    warnings: [],
+    diagnostics: ['fake OpenCode launch ready'],
+  };
+}
+
 function addGeminiPrimaryToMixedRun(run: any): void {
   const now = '2026-04-23T10:00:00.000Z';
   const reviewer = {
diff --git a/test/main/services/team/TeamConfigReader.test.ts b/test/main/services/team/TeamConfigReader.test.ts
index 88b3c47d..31fb3fca 100644
--- a/test/main/services/team/TeamConfigReader.test.ts
+++ b/test/main/services/team/TeamConfigReader.test.ts
@@ -22,6 +22,20 @@ vi.mock('../../../../src/main/services/team/TeamFsWorkerClient', () => ({
 import { TeamConfigReader } from '../../../../src/main/services/team/TeamConfigReader';
 import { createPersistedLaunchSummaryProjection } from '../../../../src/main/services/team/TeamLaunchSummaryProjection';
 
+function createDeferred<T>(): {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+  reject: (error: unknown) => void;
+} {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
 describe('TeamConfigReader', () => {
   let tempDir = '';
 
@@ -31,6 +45,9 @@ describe('TeamConfigReader', () => {
   });
 
   afterEach(async () => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+    TeamConfigReader.clearCacheForTests();
     if (tempDir) {
       await fs.rm(tempDir, { recursive: true, force: true });
     }
@@ -183,6 +200,118 @@ describe('TeamConfigReader', () => {
     expect(teams[0]?.missingMembers).toBeUndefined();
   });
 
+  it('exposes lead summary fields without adding lead to teammate member chips', async () => {
+    const teamName = 'lead-summary-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Lead Summary Team',
+        members: [
+          { name: 'captain', agentType: 'team-lead', color: '#123456' },
+          { name: 'alice', role: 'reviewer', color: '#abcdef' },
+        ],
+      }),
+      'utf8'
+    );
+
+    const reader = new TeamConfigReader();
+    const teams = await reader.listTeams();
+
+    expect(teams).toHaveLength(1);
+    expect(teams[0]).toMatchObject({
+      teamName,
+      displayName: 'Lead Summary Team',
+      memberCount: 1,
+      members: [{ name: 'alice', role: 'reviewer', color: '#abcdef' }],
+      leadName: 'captain',
+      leadColor: '#123456',
+    });
+  });
+
+  it('dedupes and briefly caches listTeams scans until invalidated', async () => {
+    const teamName = 'cached-list-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Cached List Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readdirSpy = vi.spyOn(nodeFs.promises, 'readdir');
+
+    const reader = new TeamConfigReader();
+    const [first, second] = await Promise.all([reader.listTeams(), reader.listTeams()]);
+    const readdirAfterFirstBatch = readdirSpy.mock.calls.length;
+
+    expect(first).toHaveLength(1);
+    expect(second).toHaveLength(1);
+
+    await reader.listTeams();
+    expect(readdirSpy).toHaveBeenCalledTimes(readdirAfterFirstBatch);
+
+    TeamConfigReader.invalidateTeam(teamName);
+    await reader.listTeams();
+    expect(readdirSpy.mock.calls.length).toBeGreaterThan(readdirAfterFirstBatch);
+  });
+
+  it('does not reuse a stale in-flight listTeams scan after invalidation', async () => {
+    const teamName = 'inflight-invalidated-list-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Before Invalidation',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const firstReadStarted = createDeferred<void>();
+    const releaseFirstRead = createDeferred<void>();
+    const originalReaddir = nodeFs.promises.readdir.bind(nodeFs.promises);
+    let blockedFirstTeamScan = false;
+    const readdirSpy = vi
+      .spyOn(nodeFs.promises, 'readdir')
+      .mockImplementation(async (...args: unknown[]) => {
+        if (!blockedFirstTeamScan && args[0] === tempDir) {
+          blockedFirstTeamScan = true;
+          firstReadStarted.resolve();
+          await releaseFirstRead.promise;
+        }
+        return originalReaddir(...(args as Parameters<typeof nodeFs.promises.readdir>));
+      });
+
+    const reader = new TeamConfigReader();
+    const first = reader.listTeams();
+    await firstReadStarted.promise;
+
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'After Invalidation',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    TeamConfigReader.invalidateTeam(teamName);
+
+    const second = reader.listTeams();
+    await Promise.resolve();
+
+    const teamDirReads = readdirSpy.mock.calls.filter((call) => call[0] === tempDir);
+    expect(teamDirReads.length).toBeGreaterThanOrEqual(2);
+
+    releaseFirstRead.resolve();
+    const [, secondTeams] = await Promise.all([first, second]);
+    expect(secondTeams[0]?.displayName).toBe('After Invalidation');
+  });
+
   it('does not let a removed base member hide an active auto-suffixed teammate in team summaries', async () => {
     const teamName = 'suffix-team';
     const teamDir = path.join(tempDir, teamName);
@@ -237,7 +366,7 @@ describe('TeamConfigReader', () => {
       JSON.stringify({
         version: 1,
         members: [
-          { name: 'team-lead', agentType: 'team-lead' },
+          { name: 'team-lead', agentType: 'team-lead', color: '#123456' },
           { name: 'alice', removedAt: Date.now() - 60_000 },
           { name: 'bob', role: 'developer' },
         ],
@@ -252,11 +381,51 @@ describe('TeamConfigReader', () => {
       teamName,
       displayName: 'Draft Summary Team',
       memberCount: 1,
+      leadName: 'team-lead',
+      leadColor: '#123456',
       pendingCreate: true,
     });
   });
 
-  it('shares in-flight getConfig reads and returns cloned cached configs', async () => {
+  it('uses injected members meta store for draft team summaries', async () => {
+    const teamName = 'draft-summary-injected-store-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'team.meta.json'),
+      JSON.stringify({
+        version: 1,
+        cwd: tempDir,
+        displayName: 'Injected Draft Team',
+        createdAt: Date.parse('2026-04-22T12:00:00.000Z'),
+      }),
+      'utf8'
+    );
+    await fs.writeFile(
+      path.join(teamDir, 'members.meta.json'),
+      JSON.stringify({ version: 1, members: [] }),
+      'utf8'
+    );
+    const getMembers = vi.fn(async () => [
+      { name: 'captain', agentType: 'team-lead', color: '#123456' },
+      { name: 'alice', role: 'developer' },
+    ]);
+
+    const reader = new TeamConfigReader({ getMembers } as never);
+    const teams = await reader.listTeams();
+
+    expect(getMembers).toHaveBeenCalledWith(teamName);
+    expect(teams[0]).toMatchObject({
+      teamName,
+      displayName: 'Injected Draft Team',
+      memberCount: 1,
+      leadName: 'captain',
+      leadColor: '#123456',
+      pendingCreate: true,
+    });
+  });
+
+  it('shares in-flight verified reads without reusing completed cache', async () => {
     const teamName = 'cached-config-team';
     const teamDir = path.join(tempDir, teamName);
     await fs.mkdir(teamDir, { recursive: true });
@@ -273,17 +442,582 @@ describe('TeamConfigReader', () => {
 
     const reader = new TeamConfigReader();
     const [first, second] = await Promise.all([
-      reader.getConfig(teamName),
-      reader.getConfig(teamName),
+      reader.getConfigVerified(teamName),
+      reader.getConfigVerified(teamName),
     ]);
     if (!first) {
       throw new Error('Expected config to load.');
     }
     first.name = 'Mutated In Caller';
-    const third = await reader.getConfig(teamName);
+    const third = await reader.getConfigVerified(teamName);
 
     expect(second?.name).toBe('Cached Config Team');
     expect(third?.name).toBe('Cached Config Team');
+    expect(readFileSpy).toHaveBeenCalledTimes(2);
+  });
+
+  it('uses fingerprint-validated snapshot cache without rereading unchanged config content', async () => {
+    const teamName = 'snapshot-cache-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Snapshot Cache Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+    const statSpy = vi.spyOn(nodeFs.promises, 'stat');
+
+    const reader = new TeamConfigReader();
+    const first = await reader.getConfigSnapshot(teamName);
+    if (!first) {
+      throw new Error('Expected config to load.');
+    }
+    first.name = 'Mutated In Caller';
+    const second = await reader.getConfigSnapshot(teamName);
+
+    expect(second?.name).toBe('Snapshot Cache Team');
+    expect(statSpy).toHaveBeenCalledTimes(2);
     expect(readFileSpy).toHaveBeenCalledTimes(1);
   });
+
+  it('logs slow config reads with mode, likely cause, generation, and caller diagnostics', async () => {
+    const teamName = 'slow-read-diagnostics-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Slow Diagnostics Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => undefined);
+    vi.spyOn(performance, 'now')
+      .mockReturnValueOnce(0)
+      .mockReturnValueOnce(0)
+      .mockReturnValueOnce(1)
+      .mockReturnValueOnce(1)
+      .mockReturnValueOnce(2_001)
+      .mockReturnValueOnce(2_001)
+      .mockReturnValueOnce(2_001)
+      .mockReturnValueOnce(2_001)
+      .mockReturnValueOnce(2_001);
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigVerified(teamName))?.name).toBe('Slow Diagnostics Team');
+
+    const slowLog = warnSpy.mock.calls.find((call) =>
+      String(call[1] ?? '').includes('[getConfig] slow read diag=')
+    );
+    expect(slowLog).toBeTruthy();
+    const rawMessage = String(slowLog?.[1] ?? '');
+    const diag = JSON.parse(rawMessage.slice(rawMessage.indexOf('diag=') + 'diag='.length)) as {
+      mode: string;
+      configPath: string;
+      likelyCause: string;
+      readMs: number;
+      cacheGeneration: number;
+      currentGeneration: number;
+      caller: string | null;
+    };
+    expect(diag).toMatchObject({
+      mode: 'verified',
+      configPath,
+      likelyCause: 'io_read_slow',
+      readMs: 2000,
+      cacheGeneration: 0,
+      currentGeneration: 0,
+    });
+    expect(diag.caller).toBeTruthy();
+  });
+
+  it('shares in-flight snapshot stat and read work for concurrent calls', async () => {
+    const teamName = 'snapshot-inflight-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Snapshot Inflight Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+    const statSpy = vi.spyOn(nodeFs.promises, 'stat');
+
+    const reader = new TeamConfigReader();
+    const [first, second] = await Promise.all([
+      reader.getConfigSnapshot(teamName),
+      reader.getConfigSnapshot(teamName),
+    ]);
+
+    expect(first?.name).toBe('Snapshot Inflight Team');
+    expect(second?.name).toBe('Snapshot Inflight Team');
+    expect(statSpy).toHaveBeenCalledTimes(1);
+    expect(readFileSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('rereads snapshot when ctime changes even if mtime is unchanged', async () => {
+    const teamName = 'snapshot-ctime-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before Ctime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    let ctimeMs = 1000;
+    vi.spyOn(nodeFs.promises, 'stat').mockImplementation(async () => ({
+      size: BigInt(4096),
+      mode: BigInt(33188),
+      dev: BigInt(1),
+      ino: BigInt(2),
+      mtimeMs: 1000,
+      ctimeMs,
+      birthtimeMs: 1000,
+      isFile: () => true,
+    }) as never);
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Before Ctime');
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'After Ctime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    ctimeMs = 2000;
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('After Ctime');
+    expect(readFileSpy).toHaveBeenCalledTimes(2);
+  });
+
+  it('rereads snapshot when the config fingerprint changes', async () => {
+    const teamName = 'snapshot-reread-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Before');
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'After',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('After');
+    expect(readFileSpy).toHaveBeenCalledTimes(2);
+  });
+
+  it('primeConfig updates snapshot cache immediately after app-owned writes', async () => {
+    const teamName = 'prime-cache-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Before Prime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Before Prime');
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'After Prime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await TeamConfigReader.primeConfig(teamName, {
+      name: 'After Prime',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    } as never);
+
+    const snapshot = await reader.getConfigSnapshot(teamName);
+    expect(snapshot?.name).toBe('After Prime');
+  });
+
+  it('does not let stale in-flight snapshot reads overwrite a primed config cache', async () => {
+    const teamName = 'stale-read-prime-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    const staleRaw = JSON.stringify({
+      name: 'Stale Read',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    });
+    await fs.writeFile(configPath, staleRaw, 'utf8');
+
+    const readDeferred = createDeferred<string>();
+    const realReadFile = nodeFs.promises.readFile.bind(nodeFs.promises);
+    let intercepted = false;
+    vi.spyOn(nodeFs.promises, 'readFile').mockImplementation(
+      ((file: unknown, ...args: unknown[]) => {
+        if (!intercepted && String(file) === configPath) {
+          intercepted = true;
+          return readDeferred.promise as never;
+        }
+        return realReadFile(file as never, ...(args as never[])) as never;
+      }) as never
+    );
+
+    const reader = new TeamConfigReader();
+    const staleSnapshot = reader.getConfigSnapshot(teamName);
+    await vi.waitFor(() => expect(intercepted).toBe(true));
+
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Fresh Prime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await TeamConfigReader.primeConfig(teamName, {
+      name: 'Fresh Prime',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    } as never);
+
+    readDeferred.resolve(staleRaw);
+    expect((await staleSnapshot)?.name).toBe('Stale Read');
+
+    vi.spyOn(nodeFs.promises, 'stat').mockRejectedValue(new Error('stat unavailable'));
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Fresh Prime');
+  });
+
+  it('does not reuse stale in-flight verified reads after app-owned primeConfig', async () => {
+    const teamName = 'verified-stale-read-prime-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    const staleRaw = JSON.stringify({
+      name: 'Stale Verified Read',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    });
+    await fs.writeFile(configPath, staleRaw, 'utf8');
+
+    const readDeferred = createDeferred<string>();
+    const realReadFile = nodeFs.promises.readFile.bind(nodeFs.promises);
+    let intercepted = false;
+    vi.spyOn(nodeFs.promises, 'readFile').mockImplementation(
+      ((file: unknown, ...args: unknown[]) => {
+        if (!intercepted && String(file) === configPath) {
+          intercepted = true;
+          return readDeferred.promise as never;
+        }
+        return realReadFile(file as never, ...(args as never[])) as never;
+      }) as never
+    );
+
+    const reader = new TeamConfigReader();
+    const staleVerified = reader.getConfig(teamName);
+    await vi.waitFor(() => expect(intercepted).toBe(true));
+
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Fresh Verified Prime',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await TeamConfigReader.primeConfig(teamName, {
+      name: 'Fresh Verified Prime',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    } as never);
+
+    expect((await reader.getConfig(teamName))?.name).toBe('Fresh Verified Prime');
+
+    readDeferred.resolve(staleRaw);
+    expect((await staleVerified)?.name).toBe('Stale Verified Read');
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Fresh Verified Prime');
+  });
+
+  it('does not let stale in-flight snapshot read failures invalidate a primed config cache', async () => {
+    const teamName = 'stale-read-failure-prime-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before Failure',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const readDeferred = createDeferred<string>();
+    const realReadFile = nodeFs.promises.readFile.bind(nodeFs.promises);
+    let intercepted = false;
+    vi.spyOn(nodeFs.promises, 'readFile').mockImplementation(
+      ((file: unknown, ...args: unknown[]) => {
+        if (!intercepted && String(file) === configPath) {
+          intercepted = true;
+          return readDeferred.promise as never;
+        }
+        return realReadFile(file as never, ...(args as never[])) as never;
+      }) as never
+    );
+
+    const reader = new TeamConfigReader();
+    const staleSnapshot = reader.getConfigSnapshot(teamName);
+    await vi.waitFor(() => expect(intercepted).toBe(true));
+
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Fresh After Failure',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await TeamConfigReader.primeConfig(teamName, {
+      name: 'Fresh After Failure',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    } as never);
+
+    readDeferred.reject(new Error('old read failed'));
+    await expect(staleSnapshot).resolves.toBeNull();
+
+    vi.spyOn(nodeFs.promises, 'stat').mockRejectedValue(new Error('stat unavailable'));
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Fresh After Failure');
+  });
+
+  it('does not let stale in-flight snapshot stat results invalidate a primed config cache', async () => {
+    const teamName = 'stale-stat-prime-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before Stat Race',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const statDeferred = createDeferred<unknown>();
+    let statCalls = 0;
+    vi.spyOn(nodeFs.promises, 'stat').mockImplementation(async () => {
+      statCalls++;
+      if (statCalls === 1) {
+        return (await statDeferred.promise) as never;
+      }
+      throw new Error('stat unavailable');
+    });
+
+    const reader = new TeamConfigReader();
+    const snapshot = reader.getConfigSnapshot(teamName);
+    await vi.waitFor(() => expect(statCalls).toBe(1));
+
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Fresh After Stat Race',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await TeamConfigReader.primeConfig(teamName, {
+      name: 'Fresh After Stat Race',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    } as never);
+
+    statDeferred.resolve({
+      size: BigInt(4096),
+      mode: BigInt(33188),
+      dev: BigInt(1),
+      ino: BigInt(2),
+      mtimeMs: 1000,
+      ctimeMs: 1000,
+      birthtimeMs: 1000,
+      isFile: () => false,
+    });
+
+    expect((await snapshot)?.name).toBe('Fresh After Stat Race');
+  });
+
+  it('invalidateTeam forces the next snapshot to reread config content', async () => {
+    const teamName = 'invalidate-cache-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before Invalidate',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Before Invalidate');
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'After Invalidate',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    TeamConfigReader.invalidateTeam(teamName);
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('After Invalidate');
+    expect(readFileSpy).toHaveBeenCalledTimes(2);
+  });
+
+  it('uses recent snapshot cache on stat failure but verified mode does not', async () => {
+    const teamName = 'stat-failure-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Recent Cache',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Recent Cache');
+    vi.spyOn(nodeFs.promises, 'stat').mockRejectedValue(new Error('stat unavailable'));
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Recent Cache');
+    await expect(reader.getConfigVerified(teamName)).resolves.toBeNull();
+  });
+
+  it('clears snapshot cache after parse failure', async () => {
+    const teamName = 'parse-failure-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Valid Config',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Valid Config');
+    await fs.writeFile(configPath, '{"name":', 'utf8');
+
+    expect(await reader.getConfigSnapshot(teamName)).toBeNull();
+    await fs.rm(configPath);
+    expect(await reader.getConfigSnapshot(teamName)).toBeNull();
+  });
+
+  it('clears snapshot cache when config disappears and reloads after recreation', async () => {
+    const teamName = 'missing-then-recreated-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Before Delete',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Before Delete');
+    await fs.rm(configPath);
+
+    expect(await reader.getConfigSnapshot(teamName)).toBeNull();
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'After Recreate',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('After Recreate');
+  });
+
+  it('bounds stale snapshots on coarse fingerprints with periodic full verification', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-04-30T12:00:00.000Z'));
+
+    const teamName = 'coarse-fs-team';
+    const teamDir = path.join(tempDir, teamName);
+    const configPath = path.join(teamDir, 'config.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Alpha',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    const readFileSpy = vi.spyOn(nodeFs.promises, 'readFile');
+    vi.spyOn(nodeFs.promises, 'stat').mockResolvedValue({
+      size: BigInt(4096),
+      mode: BigInt(33188),
+      dev: BigInt(1),
+      ino: BigInt(2),
+      mtimeMs: 1000,
+      ctimeMs: 1000,
+      birthtimeMs: 1000,
+      isFile: () => true,
+    } as never);
+
+    const reader = new TeamConfigReader();
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Alpha');
+    await fs.writeFile(
+      configPath,
+      JSON.stringify({
+        name: 'Bravo',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Alpha');
+    vi.advanceTimersByTime(1_501);
+    expect((await reader.getConfigSnapshot(teamName))?.name).toBe('Bravo');
+    expect(readFileSpy).toHaveBeenCalledTimes(2);
+  });
 });
diff --git a/test/main/services/team/TeamDataService.test.ts b/test/main/services/team/TeamDataService.test.ts
index 9a350f98..d36d1379 100644
--- a/test/main/services/team/TeamDataService.test.ts
+++ b/test/main/services/team/TeamDataService.test.ts
@@ -9,6 +9,8 @@ import { encodePath, setClaudeBasePathOverride } from '../../../../src/main/util
 import { TeamConfigReader } from '../../../../src/main/services/team/TeamConfigReader';
 import { buildTaskChangePresenceDescriptor } from '../../../../src/main/services/team/taskChangePresenceUtils';
 import { TeamDataService } from '../../../../src/main/services/team/TeamDataService';
+import { TeamTaskReader } from '../../../../src/main/services/team/TeamTaskReader';
+import { gitIdentityResolver } from '../../../../src/main/services/parsing/GitIdentityResolver';
 import type { TeamMetaFile } from '../../../../src/main/services/team/TeamMetaStore';
 
 import type {
@@ -237,6 +239,138 @@ afterEach(async () => {
   );
 });
 
+describe('TeamDataService task projection cache invalidation', () => {
+  it('invalidates global task projection cache after direct task mutations', async () => {
+    const task: TeamTask = {
+      id: 'task-1',
+      subject: 'Task 1',
+      status: 'pending',
+      createdAt: '2026-05-02T12:00:00.000Z',
+      updatedAt: '2026-05-02T12:00:00.000Z',
+    };
+    const taskController = {
+      createTask: vi.fn(() => task),
+      startTask: vi.fn(),
+      setTaskStatus: vi.fn(),
+      softDeleteTask: vi.fn(),
+      restoreTask: vi.fn(),
+      setTaskOwner: vi.fn(),
+      updateTaskFields: vi.fn(),
+      addTaskAttachmentMeta: vi.fn(),
+      removeTaskAttachment: vi.fn(),
+      setNeedsClarification: vi.fn(),
+      linkTask: vi.fn(),
+      unlinkTask: vi.fn(),
+      addTaskComment: vi.fn(() => ({
+        comment: {
+          id: 'comment-1',
+          author: 'user',
+          text: 'Comment',
+          createdAt: '2026-05-02T12:01:00.000Z',
+          type: 'regular',
+        },
+      })),
+    };
+    const service = new TeamDataService(
+      {
+        getConfig: vi.fn(async () => ({
+          name: 'my-team',
+          projectPath: '/repo',
+          members: [{ name: 'team-lead', role: 'Lead' }],
+        })),
+      } as never,
+      {
+        getTasks: vi.fn(async () => [task]),
+      } as never,
+      {
+        listInboxNames: vi.fn(async () => []),
+        getMessages: vi.fn(async () => []),
+      } as never,
+      {} as never,
+      {} as never,
+      { resolveMembers: vi.fn(() => []) } as never,
+      { getState: vi.fn(async () => ({ teamName: 'my-team', reviewers: [], tasks: {} })) } as never,
+      {} as never,
+      { getMembers: vi.fn(async () => []) } as never,
+      { readMessages: vi.fn(async () => []) } as never,
+      (() => ({ tasks: taskController })) as never
+    );
+    const invalidateSpy = vi.spyOn(TeamTaskReader, 'invalidateAllTasksCache');
+
+    await service.createTask('my-team', { subject: 'Task 1' });
+    await service.startTask('my-team', 'task-1');
+    await service.startTaskByUser('my-team', 'task-1');
+    await service.updateTaskStatus('my-team', 'task-1', 'completed');
+    await service.softDeleteTask('my-team', 'task-1');
+    await service.restoreTask('my-team', 'task-1');
+    await service.updateTaskOwner('my-team', 'task-1', 'alice');
+    await service.updateTaskFields('my-team', 'task-1', { subject: 'Task 1 updated' });
+    await service.addTaskAttachment('my-team', 'task-1', {
+      id: 'att-1',
+      filename: 'note.txt',
+      mimeType: 'text/plain',
+      size: 1,
+      createdAt: '2026-05-02T12:02:00.000Z',
+    } as never);
+    await service.removeTaskAttachment('my-team', 'task-1', 'att-1');
+    await service.setTaskNeedsClarification('my-team', 'task-1', 'lead');
+    await service.addTaskRelationship('my-team', 'task-1', 'task-2', 'related');
+    await service.removeTaskRelationship('my-team', 'task-1', 'task-2', 'related');
+    await service.addTaskComment('my-team', 'task-1', 'Comment');
+
+    expect(invalidateSpy).toHaveBeenCalledTimes(14);
+  });
+
+  it('invalidates config and global task caches after permanent team deletion', async () => {
+    const claudeRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'team-data-delete-cache-'));
+    tempPaths.push(claudeRoot);
+    setClaudeBasePathOverride(claudeRoot);
+
+    await fs.mkdir(path.join(claudeRoot, 'teams', 'gone-team'), { recursive: true });
+    await fs.mkdir(path.join(claudeRoot, 'tasks', 'gone-team'), { recursive: true });
+
+    const configInvalidateSpy = vi.spyOn(TeamConfigReader, 'invalidateTeam');
+    const taskInvalidateSpy = vi.spyOn(TeamTaskReader, 'invalidateAllTasksCache');
+
+    const service = new TeamDataService();
+    await service.permanentlyDeleteTeam('gone-team');
+
+    await expect(fs.access(path.join(claudeRoot, 'teams', 'gone-team'))).rejects.toThrow();
+    await expect(fs.access(path.join(claudeRoot, 'tasks', 'gone-team'))).rejects.toThrow();
+    expect(configInvalidateSpy).toHaveBeenCalledWith('gone-team');
+    expect(taskInvalidateSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps team deletion mutations on verified config reads', async () => {
+    const claudeRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'team-data-delete-verified-'));
+    tempPaths.push(claudeRoot);
+    setClaudeBasePathOverride(claudeRoot);
+    await fs.mkdir(path.join(claudeRoot, 'teams', 'my-team'), { recursive: true });
+
+    const getConfig = vi.fn(async () => ({
+      name: 'My team',
+      members: [],
+    }));
+    const getConfigSnapshot = vi.fn(async () => {
+      throw new Error('snapshot config read should not be used for team deletion');
+    });
+    const service = new TeamDataService({
+      listTeams: vi.fn(),
+      getConfig,
+      getConfigSnapshot,
+    } as never);
+
+    await service.deleteTeam('my-team');
+
+    const written = JSON.parse(
+      await fs.readFile(path.join(claudeRoot, 'teams', 'my-team', 'config.json'), 'utf8')
+    ) as TeamConfig;
+    expect(written.deletedAt).toBeTruthy();
+    expect(getConfig).toHaveBeenCalledWith('my-team');
+    expect(getConfigSnapshot).not.toHaveBeenCalled();
+  });
+});
+
 describe('TeamDataService draft metadata', () => {
   it('round-trips create config metadata through getSavedRequest', async () => {
     const claudeRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'team-data-saved-request-'));
@@ -244,6 +378,7 @@ describe('TeamDataService draft metadata', () => {
     setClaudeBasePathOverride(claudeRoot);
 
     const service = new TeamDataService();
+    const listCacheInvalidateSpy = vi.spyOn(TeamConfigReader, 'invalidateListTeamsCache');
     await service.createTeamConfig({
       teamName: 'draft-team',
       displayName: 'Draft Team',
@@ -271,6 +406,7 @@ describe('TeamDataService draft metadata', () => {
         },
       ],
     });
+    expect(listCacheInvalidateSpy).toHaveBeenCalled();
 
     await expect(service.getSavedRequest('missing-team')).resolves.toBeNull();
     await expect(service.getSavedRequest('draft-team')).resolves.toMatchObject({
@@ -423,6 +559,9 @@ function createGetTeamDataHarness(
   const getConfig = vi.fn(async () =>
     options.config === undefined ? buildDefaultTeamConfig() : options.config
   );
+  const getConfigSnapshot = vi.fn(async () =>
+    options.config === undefined ? buildDefaultTeamConfig() : options.config
+  );
   const getTasks =
     options.getTasks ??
     (async () => {
@@ -496,6 +635,7 @@ function createGetTeamDataHarness(
     {
       listTeams: vi.fn(),
       getConfig,
+      getConfigSnapshot,
     } as never,
     taskReader as never,
     inboxReader as never,
@@ -522,6 +662,7 @@ function createGetTeamDataHarness(
   return {
     service,
     getConfig,
+    getConfigSnapshot,
     taskReader,
     inboxReader,
     membersMetaStore,
@@ -1259,15 +1400,20 @@ describe('TeamDataService', () => {
 
   it('includes projectPath from config when creating a task', async () => {
     const createTaskMock = vi.fn((task) => task);
+    const getConfig = vi.fn(async () => {
+      throw new Error('verified config read should not be used for task enrichment');
+    });
+    const getConfigSnapshot = vi.fn(async () => ({
+      name: 'My team',
+      members: [],
+      projectPath: '/Users/dev/my-project',
+    }));
 
     const service = new TeamDataService(
       {
         listTeams: vi.fn(),
-        getConfig: vi.fn(async () => ({
-          name: 'My team',
-          members: [],
-          projectPath: '/Users/dev/my-project',
-        })),
+        getConfig,
+        getConfigSnapshot,
       } as never,
       {
         getNextTaskId: vi.fn(async () => '1'),
@@ -1306,6 +1452,8 @@ describe('TeamDataService', () => {
     expect(createTaskMock).toHaveBeenCalledWith(
       expect.objectContaining({ projectPath: '/Users/dev/my-project' })
     );
+    expect(getConfigSnapshot).toHaveBeenCalledWith('my-team');
+    expect(getConfig).not.toHaveBeenCalled();
   });
 
   it('returns lightweight notification context from config without hydrating team data', async () => {
@@ -1314,11 +1462,17 @@ describe('TeamDataService', () => {
       projectPath: '/Users/dev/my-project',
       members: [],
     }));
+    const getConfigSnapshot = vi.fn(async () => ({
+      name: 'My Team',
+      projectPath: '/Users/dev/my-project',
+      members: [],
+    }));
 
     const service = new TeamDataService(
       {
         listTeams: vi.fn(),
         getConfig,
+        getConfigSnapshot,
       } as never,
       {} as never,
       {} as never,
@@ -1338,7 +1492,8 @@ describe('TeamDataService', () => {
       displayName: 'My Team',
       projectPath: '/Users/dev/my-project',
     });
-    expect(getConfig).toHaveBeenCalledWith('my-team');
+    expect(getConfigSnapshot).toHaveBeenCalledWith('my-team');
+    expect(getConfig).not.toHaveBeenCalled();
   });
 
   it('creates task with status pending when startImmediately is false', async () => {
@@ -4431,6 +4586,108 @@ describe('TeamDataService', () => {
     expect(harness.listProcessesSpy).not.toHaveBeenCalled();
   });
 
+  it('uses snapshot config reads for UI team data snapshots', async () => {
+    const harness = createGetTeamDataHarness();
+
+    await harness.service.getTeamData('my-team');
+
+    expect(harness.getConfigSnapshot).toHaveBeenCalledWith('my-team');
+    expect(harness.getConfig).not.toHaveBeenCalled();
+  });
+
+  it('skips member branch enrichment for thin UI team data snapshots', async () => {
+    const getBranchSpy = vi.spyOn(gitIdentityResolver, 'getBranch').mockResolvedValue('main');
+    const harness = createGetTeamDataHarness({
+      config: buildDefaultTeamConfig({
+        projectPath: '/repo',
+        members: [
+          { name: 'team-lead', role: 'Lead', cwd: '/repo' },
+          { name: 'alice', role: 'Developer', cwd: '/repo-alice' },
+        ],
+      }),
+      resolveMembers: () => [
+        { ...buildResolvedMember('team-lead'), cwd: '/repo' },
+        { ...buildResolvedMember('alice'), cwd: '/repo-alice' },
+      ],
+    });
+
+    const data = await harness.service.getTeamData('my-team', {
+      includeMemberBranches: false,
+    });
+
+    expect(getBranchSpy).not.toHaveBeenCalled();
+    expect(data.members.find((member) => member.name === 'alice')?.gitBranch).toBeUndefined();
+  });
+
+  it('keeps member branch enrichment on by default for full UI team data snapshots', async () => {
+    const rootRepoPath = path.normalize('/repo');
+    const aliceRepoPath = path.normalize('/repo-alice');
+    const getBranchSpy = vi
+      .spyOn(gitIdentityResolver, 'getBranch')
+      .mockImplementation(async (cwd) => (cwd === aliceRepoPath ? 'feature/alice' : 'main'));
+    const harness = createGetTeamDataHarness({
+      config: buildDefaultTeamConfig({
+        projectPath: rootRepoPath,
+        members: [
+          { name: 'team-lead', role: 'Lead', cwd: rootRepoPath },
+          { name: 'alice', role: 'Developer', cwd: aliceRepoPath },
+        ],
+      }),
+      resolveMembers: () => [
+        { ...buildResolvedMember('team-lead'), cwd: rootRepoPath },
+        { ...buildResolvedMember('alice'), cwd: aliceRepoPath },
+      ],
+    });
+
+    const data = await harness.service.getTeamData('my-team');
+
+    expect(getBranchSpy).toHaveBeenCalledWith(rootRepoPath);
+    expect(getBranchSpy).toHaveBeenCalledWith(aliceRepoPath);
+    expect(data.members.find((member) => member.name === 'alice')?.gitBranch).toBe(
+      'feature/alice'
+    );
+  });
+
+  it('keeps member branch enrichment on for explicit full UI team data snapshots', async () => {
+    const rootRepoPath = path.normalize('/repo');
+    const aliceRepoPath = path.normalize('/repo-alice');
+    const getBranchSpy = vi
+      .spyOn(gitIdentityResolver, 'getBranch')
+      .mockImplementation(async (cwd) => (cwd === aliceRepoPath ? 'feature/alice' : 'main'));
+    const harness = createGetTeamDataHarness({
+      config: buildDefaultTeamConfig({
+        projectPath: rootRepoPath,
+        members: [
+          { name: 'team-lead', role: 'Lead', cwd: rootRepoPath },
+          { name: 'alice', role: 'Developer', cwd: aliceRepoPath },
+        ],
+      }),
+      resolveMembers: () => [
+        { ...buildResolvedMember('team-lead'), cwd: rootRepoPath },
+        { ...buildResolvedMember('alice'), cwd: aliceRepoPath },
+      ],
+    });
+
+    const data = await harness.service.getTeamData('my-team', {
+      includeMemberBranches: true,
+    });
+
+    expect(getBranchSpy).toHaveBeenCalledWith(rootRepoPath);
+    expect(getBranchSpy).toHaveBeenCalledWith(aliceRepoPath);
+    expect(data.members.find((member) => member.name === 'alice')?.gitBranch).toBe(
+      'feature/alice'
+    );
+  });
+
+  it('uses snapshot config reads for UI message feed snapshots', async () => {
+    const harness = createGetTeamDataHarness();
+
+    await harness.service.getMessageFeed('my-team');
+
+    expect(harness.getConfigSnapshot).toHaveBeenCalledWith('my-team');
+    expect(harness.getConfig).not.toHaveBeenCalled();
+  });
+
   it('starts light reads immediately, bounds heavy reads, and keeps processes outside the parallel phase', async () => {
     const order: string[] = [];
     const tasksDeferred = createDeferred<TeamTask[]>();
diff --git a/test/main/services/team/TeamDataWorkerClient.test.ts b/test/main/services/team/TeamDataWorkerClient.test.ts
new file mode 100644
index 00000000..d3ef99ae
--- /dev/null
+++ b/test/main/services/team/TeamDataWorkerClient.test.ts
@@ -0,0 +1,391 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+const hoisted = vi.hoisted(() => {
+  const skipResponsesForOps = new Set<string>();
+  const workers: Array<{
+    messages: unknown[];
+    handlers: Map<string, (value: unknown) => void>;
+    postMessage: (message: unknown) => void;
+    on: (event: string, handler: (value: unknown) => void) => void;
+    terminate: () => Promise<void>;
+  }> = [];
+  const createMockWorker = vi.fn().mockImplementation(() => {
+    const worker = {
+      messages: [] as unknown[],
+      handlers: new Map<string, (value: unknown) => void>(),
+      postMessage(message: unknown) {
+        worker.messages.push(message);
+        const request = message as { id: string; op: string; payload?: { teamName?: string } };
+        if (skipResponsesForOps.has(request.op)) return;
+        queueMicrotask(() => {
+          const handler = worker.handlers.get('message');
+          if (!handler) return;
+          handler({
+            id: request.id,
+            ok: true,
+            result:
+              request.op === 'getTeamData'
+                ? { teamName: request.payload?.teamName, config: { name: 'Team' } }
+                : request.op === 'getMessagesPage'
+                  ? { messages: [], nextCursor: null, hasMore: false, feedRevision: 'rev-1' }
+                : null,
+          });
+        });
+      },
+      on(event: string, handler: (value: unknown) => void) {
+        worker.handlers.set(event, handler);
+      },
+      terminate: vi.fn(async () => undefined),
+    };
+    workers.push(worker);
+    return worker;
+  });
+  return {
+    workers,
+    createMockWorker,
+    skipResponsesForOps,
+  };
+});
+
+vi.mock('node:fs', async () => {
+  const actual = await vi.importActual<typeof import('node:fs')>('node:fs');
+  return {
+    ...actual,
+    existsSync: vi.fn(() => true),
+  };
+});
+
+vi.mock('node:worker_threads', () => ({
+  Worker: hoisted.createMockWorker,
+  default: {
+    Worker: hoisted.createMockWorker,
+  },
+}));
+
+describe('TeamDataWorkerClient', () => {
+  afterEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+    vi.useRealTimers();
+    hoisted.workers.length = 0;
+    hoisted.skipResponsesForOps.clear();
+  });
+
+  it('deduplicates concurrent getTeamData calls for the same team', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const [first, second] = await Promise.all([
+      client.getTeamData('my-team'),
+      client.getTeamData('my-team'),
+    ]);
+
+    expect(first).toEqual(second);
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team' },
+    });
+
+    client.dispose();
+  });
+
+  it('does not deduplicate thin and full getTeamData calls together', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    await Promise.all([
+      client.getTeamData('my-team'),
+      client.getTeamData('my-team', { includeMemberBranches: false }),
+    ]);
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(2);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team' },
+    });
+    expect(hoisted.workers[0].messages[0]).not.toMatchObject({
+      payload: { options: expect.anything() },
+    });
+    expect(hoisted.workers[0].messages[1]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team', options: { includeMemberBranches: false } },
+    });
+
+    client.dispose();
+  });
+
+  it('deduplicates explicit full getTeamData options with the default request', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    await Promise.all([
+      client.getTeamData('my-team'),
+      client.getTeamData('my-team', { includeMemberBranches: true }),
+    ]);
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team' },
+    });
+    expect(hoisted.workers[0].messages[0]).not.toMatchObject({
+      payload: { options: expect.anything() },
+    });
+
+    client.dispose();
+  });
+
+  it('deduplicates concurrent thin getTeamData calls for the same team', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const [first, second] = await Promise.all([
+      client.getTeamData('my-team', { includeMemberBranches: false }),
+      client.getTeamData('my-team', { includeMemberBranches: false }),
+    ]);
+
+    expect(first).toEqual(second);
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team', options: { includeMemberBranches: false } },
+    });
+
+    client.dispose();
+  });
+
+  it('does not queue warmup behind an already running worker', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    await client.getTeamData('my-team');
+    await client.prewarm();
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getTeamData',
+      payload: { teamName: 'my-team' },
+    });
+
+    client.dispose();
+  });
+
+  it('sends best-effort team config invalidation to the worker', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+    await client.getTeamData('my-team');
+    hoisted.workers[0].messages.length = 0;
+
+    client.invalidateTeamConfig('my-team');
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'invalidateTeamConfig',
+      payload: { teamName: 'my-team' },
+    });
+
+    client.dispose();
+  });
+
+  it('deduplicates concurrent getMessagesPage calls with the same page key', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const [first, second] = await Promise.all([
+      client.getMessagesPage('my-team', { cursor: null, limit: 50 }),
+      client.getMessagesPage('my-team', { cursor: null, limit: 50 }),
+    ]);
+
+    expect(first).toEqual(second);
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'getMessagesPage',
+      payload: { teamName: 'my-team', options: { cursor: null, limit: 50 } },
+    });
+
+    client.dispose();
+  });
+
+  it('sends best-effort message feed invalidation to the worker', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+    await client.getTeamData('my-team');
+    hoisted.workers[0].messages.length = 0;
+
+    client.invalidateTeamMessageFeed('my-team');
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'invalidateTeamMessageFeed',
+      payload: { teamName: 'my-team' },
+    });
+
+    client.dispose();
+  });
+
+  it('clears in-flight getMessagesPage dedupe when invalidating message feed', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const first = client.getMessagesPage('my-team', { cursor: null, limit: 50 });
+    client.invalidateTeamMessageFeed('my-team');
+    const second = client.getMessagesPage('my-team', { cursor: null, limit: 50 });
+
+    await Promise.all([first, second]);
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages.map((message) => (message as { op: string }).op)).toEqual([
+      'getMessagesPage',
+      'invalidateTeamMessageFeed',
+      'getMessagesPage',
+    ]);
+
+    client.dispose();
+  });
+
+  it('clears in-flight getTeamData dedupe when invalidating team config', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const first = client.getTeamData('my-team');
+    client.invalidateTeamConfig('my-team');
+    const second = client.getTeamData('my-team');
+
+    await Promise.all([first, second]);
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages.map((message) => (message as { op: string }).op)).toEqual([
+      'getTeamData',
+      'invalidateTeamConfig',
+      'getTeamData',
+    ]);
+
+    client.dispose();
+  });
+
+  it('clears both thin and full getTeamData dedupe when invalidating team config', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    const firstFull = client.getTeamData('my-team');
+    const firstThin = client.getTeamData('my-team', { includeMemberBranches: false });
+    client.invalidateTeamConfig('my-team');
+    const secondFull = client.getTeamData('my-team');
+    const secondThin = client.getTeamData('my-team', { includeMemberBranches: false });
+
+    await Promise.all([firstFull, firstThin, secondFull, secondThin]);
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages.map((message) => (message as { op: string }).op)).toEqual([
+      'getTeamData',
+      'getTeamData',
+      'invalidateTeamConfig',
+      'getTeamData',
+      'getTeamData',
+    ]);
+
+    const payloads = hoisted.workers[0].messages.map(
+      (message) => (message as { payload: unknown }).payload
+    );
+    expect(payloads).toEqual([
+      { teamName: 'my-team' },
+      { teamName: 'my-team', options: { includeMemberBranches: false } },
+      { teamName: 'my-team' },
+      { teamName: 'my-team' },
+      { teamName: 'my-team', options: { includeMemberBranches: false } },
+    ]);
+
+    client.dispose();
+  });
+
+  it('rejects and clears thin and full getTeamData requests on dispose', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    hoisted.skipResponsesForOps.add('getTeamData');
+    const client = new TeamDataWorkerClient();
+
+    const full = client.getTeamData('my-team');
+    const thin = client.getTeamData('my-team', { includeMemberBranches: false });
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(2);
+
+    client.dispose();
+
+    await expect(full).rejects.toThrow('Client disposed');
+    await expect(thin).rejects.toThrow('Client disposed');
+
+    hoisted.skipResponsesForOps.delete('getTeamData');
+
+    await client.getTeamData('my-team');
+    expect(hoisted.workers).toHaveLength(2);
+    expect(hoisted.workers[1].messages).toHaveLength(1);
+
+    client.dispose();
+  });
+
+  it('does not spawn a worker only to send config invalidation', async () => {
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+
+    client.invalidateTeamConfig('my-team');
+    await new Promise((resolve) => setTimeout(resolve, 0));
+
+    expect(hoisted.workers).toHaveLength(0);
+  });
+
+  it('does not attach a timeout that can kill the worker for best-effort invalidation', async () => {
+    vi.useFakeTimers();
+    const { TeamDataWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamDataWorkerClient'
+    );
+    const client = new TeamDataWorkerClient();
+    await client.getTeamData('my-team');
+    hoisted.workers[0].messages.length = 0;
+    hoisted.skipResponsesForOps.add('invalidateTeamMessageFeed');
+
+    client.invalidateTeamMessageFeed('my-team');
+    await vi.advanceTimersByTimeAsync(31_000);
+
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].terminate).not.toHaveBeenCalled();
+
+    client.dispose();
+  });
+});
diff --git a/test/main/services/team/TeamFsWorker.integration.test.ts b/test/main/services/team/TeamFsWorker.integration.test.ts
index 647394fd..5ffa9e57 100644
--- a/test/main/services/team/TeamFsWorker.integration.test.ts
+++ b/test/main/services/team/TeamFsWorker.integration.test.ts
@@ -1,4 +1,3 @@
-import { existsSync } from 'fs';
 import * as fs from 'fs/promises';
 import * as os from 'os';
 import * as path from 'path';
@@ -12,17 +11,13 @@ interface WorkerResponse {
   id: string;
   ok: boolean;
   result?: unknown;
+  diag?: unknown;
   error?: string;
 }
 
 let bundledWorkerPathPromise: Promise<string> | null = null;
 
 async function getWorkerPath(): Promise<string> {
-  const builtWorkerPath = path.join(process.cwd(), 'dist-electron', 'main', 'team-fs-worker.cjs');
-  if (existsSync(builtWorkerPath)) {
-    return builtWorkerPath;
-  }
-
   bundledWorkerPathPromise ??= bundleWorkerForTests();
   return bundledWorkerPathPromise;
 }
@@ -50,7 +45,11 @@ function createWorker(workerPath: string): Worker {
   return new Worker(workerPath);
 }
 
-function callListTeams(worker: Worker, teamsDir: string): Promise<unknown[]> {
+function callWorker(
+  worker: Worker,
+  op: string,
+  payload: Record<string, unknown> = {}
+): Promise<{ result: unknown; diag?: unknown }> {
   const requestId = `req-${Date.now()}`;
   return new Promise((resolve, reject) => {
     const timeout = setTimeout(() => {
@@ -78,29 +77,56 @@ function callListTeams(worker: Worker, teamsDir: string): Promise<unknown[]> {
         reject(new Error(message.error || 'team-fs-worker returned an unknown error'));
         return;
       }
-      resolve(Array.isArray(message.result) ? message.result : []);
+      resolve({ result: message.result, diag: message.diag });
     };
 
     worker.on('message', onMessage);
     worker.on('error', onError);
-    worker.postMessage({
-      id: requestId,
-      op: 'listTeams',
-      payload: {
-        teamsDir,
-        largeConfigBytes: 8 * 1024,
-        configHeadBytes: 4 * 1024,
-        maxConfigBytes: 256 * 1024,
-        maxConfigReadMs: 5_000,
-        maxMembersMetaBytes: 256 * 1024,
-        maxSessionHistoryInSummary: 10,
-        maxProjectPathHistoryInSummary: 10,
-        concurrency: 2,
-      },
-    });
+    worker.postMessage({ id: requestId, op, payload });
   });
 }
 
+async function callListTeams(worker: Worker, teamsDir: string): Promise<{
+  teams: unknown[];
+  diag?: Record<string, unknown>;
+}> {
+  const { result, diag } = await callWorker(worker, 'listTeams', {
+    teamsDir,
+    largeConfigBytes: 8 * 1024,
+    configHeadBytes: 4 * 1024,
+    maxConfigBytes: 256 * 1024,
+    maxConfigReadMs: 5_000,
+    maxMembersMetaBytes: 256 * 1024,
+    maxSessionHistoryInSummary: 10,
+    maxProjectPathHistoryInSummary: 10,
+    concurrency: 2,
+  });
+  return {
+    teams: Array.isArray(result) ? result : [],
+    diag: diag && typeof diag === 'object' ? (diag as Record<string, unknown>) : undefined,
+  };
+}
+
+async function callGetAllTasks(worker: Worker, tasksBase: string): Promise<{
+  tasks: unknown[];
+  diag?: Record<string, unknown>;
+}> {
+  const { result, diag } = await callWorker(worker, 'getAllTasks', {
+    tasksBase,
+    maxTaskBytes: 256 * 1024,
+    maxTaskReadMs: 5_000,
+    concurrency: 2,
+  });
+  return {
+    tasks: Array.isArray(result) ? result : [],
+    diag: diag && typeof diag === 'object' ? (diag as Record<string, unknown>) : undefined,
+  };
+}
+
+async function callWarmup(worker: Worker): Promise<void> {
+  await callWorker(worker, 'warmup');
+}
+
 describe('team-fs-worker integration', () => {
   let tempDir = '';
 
@@ -189,7 +215,7 @@ describe('team-fs-worker integration', () => {
 
     const worker = createWorker(workerPath);
     try {
-      const teams = (await callListTeams(worker, tempDir)) as Array<Record<string, unknown>>;
+      const { teams } = await callListTeams(worker, tempDir);
       expect(teams).toHaveLength(1);
       expect(teams[0]).toMatchObject({
         teamName,
@@ -230,7 +256,7 @@ describe('team-fs-worker integration', () => {
       JSON.stringify({
         version: 1,
         members: [
-          { name: 'team-lead', agentType: 'team-lead' },
+          { name: 'team-lead', agentType: 'team-lead', color: '#123456' },
           { name: 'alice', removedAt: Date.parse('2026-04-22T12:01:00.000Z') },
           { name: 'bob', role: 'developer' },
         ],
@@ -240,15 +266,276 @@ describe('team-fs-worker integration', () => {
 
     const worker = createWorker(workerPath);
     try {
-      const teams = (await callListTeams(worker, tempDir)) as Array<Record<string, unknown>>;
+      const { teams } = await callListTeams(worker, tempDir);
       expect(teams).toHaveLength(1);
       expect(teams[0]).toMatchObject({
         teamName,
         displayName: 'Draft Worker Team',
         memberCount: 1,
+        leadName: 'team-lead',
+        leadColor: '#123456',
       });
     } finally {
       await worker.terminate();
     }
   });
+
+  it('prewarms and reuses unchanged team summaries by fingerprint', async () => {
+    const workerPath = await getWorkerPath();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'team-fs-worker-'));
+    const teamName = 'cached-worker-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(path.join(teamDir, 'inboxes'), { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Cached Worker Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await fs.writeFile(
+      path.join(teamDir, 'members.meta.json'),
+      JSON.stringify({ version: 1, members: [{ name: 'alice' }] }),
+      'utf8'
+    );
+
+    const worker = createWorker(workerPath);
+    try {
+      await callWarmup(worker);
+      const first = await callListTeams(worker, tempDir);
+      expect(first.teams[0]).toMatchObject({ teamName, memberCount: 1 });
+      expect(first.diag?.cacheMisses).toBe(1);
+
+      const second = await callListTeams(worker, tempDir);
+      expect(second.teams[0]).toMatchObject({ teamName, memberCount: 1 });
+      expect(second.diag?.cacheHits).toBe(1);
+
+      await fs.writeFile(
+        path.join(teamDir, 'members.meta.json'),
+        JSON.stringify({ version: 1, members: [{ name: 'alice' }, { name: 'bob' }] }),
+        'utf8'
+      );
+      const changed = await callListTeams(worker, tempDir);
+      expect(changed.teams[0]).toMatchObject({ teamName, memberCount: 2 });
+      expect(changed.diag?.cacheMisses).toBe(1);
+    } finally {
+      await worker.terminate();
+    }
+  });
+
+  it('does not cache pending launch summaries because liveness can change without file writes', async () => {
+    const workerPath = await getWorkerPath();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'team-fs-worker-'));
+    const teamName = 'pending-launch-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Pending Launch Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await fs.writeFile(
+      path.join(teamDir, 'launch-summary.json'),
+      JSON.stringify({
+        version: 1,
+        teamName,
+        updatedAt: new Date().toISOString(),
+        launchPhase: 'active',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 1,
+        pendingCount: 1,
+      }),
+      'utf8'
+    );
+
+    const worker = createWorker(workerPath);
+    try {
+      const first = await callListTeams(worker, tempDir);
+      expect(first.teams[0]).toMatchObject({
+        teamName,
+        teamLaunchState: 'partial_pending',
+        pendingCount: 1,
+      });
+      expect(first.diag?.cacheMisses).toBe(1);
+      expect(first.diag?.cacheWriteSkips).toBe(1);
+
+      const second = await callListTeams(worker, tempDir);
+      expect(second.teams[0]).toMatchObject({
+        teamName,
+        teamLaunchState: 'partial_pending',
+        pendingCount: 1,
+      });
+      expect(second.diag?.cacheHits).toBe(0);
+      expect(second.diag?.cacheMisses).toBe(1);
+      expect(second.diag?.cacheWriteSkips).toBe(1);
+    } finally {
+      await worker.terminate();
+    }
+  });
+
+  it('ignores stale pending launch-summary fallbacks so offline teams do not stay reconciling', async () => {
+    const workerPath = await getWorkerPath();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'team-fs-worker-'));
+    const teamName = 'stale-pending-summary-team';
+    const teamDir = path.join(tempDir, teamName);
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Stale Pending Summary Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await fs.writeFile(
+      path.join(teamDir, 'launch-summary.json'),
+      JSON.stringify({
+        version: 1,
+        teamName,
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchUpdatedAt: '2026-04-09T20:35:57.962Z',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 1,
+        pendingCount: 1,
+        permissionPendingCount: 0,
+      }),
+      'utf8'
+    );
+
+    const worker = createWorker(workerPath);
+    try {
+      const first = await callListTeams(worker, tempDir);
+      expect(first.teams[0]).toMatchObject({ teamName });
+      expect(first.teams[0]).not.toMatchObject({
+        teamLaunchState: 'partial_pending',
+      });
+      expect(first.diag?.cacheMisses).toBe(1);
+      expect(first.diag?.cacheWriteSkips).toBe(0);
+    } finally {
+      await worker.terminate();
+    }
+  });
+
+  it('rereads launch-summary after caching a stale pending fallback as settled', async () => {
+    const workerPath = await getWorkerPath();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'team-fs-worker-'));
+    const teamName = 'stale-pending-cache-invalidation-team';
+    const teamDir = path.join(tempDir, teamName);
+    const launchSummaryPath = path.join(teamDir, 'launch-summary.json');
+    await fs.mkdir(teamDir, { recursive: true });
+    await fs.writeFile(
+      path.join(teamDir, 'config.json'),
+      JSON.stringify({
+        name: 'Stale Pending Cache Invalidation Team',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }],
+      }),
+      'utf8'
+    );
+    await fs.writeFile(
+      launchSummaryPath,
+      JSON.stringify({
+        version: 1,
+        teamName,
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchUpdatedAt: '2026-04-09T20:35:57.962Z',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 1,
+        pendingCount: 1,
+        permissionPendingCount: 0,
+      }),
+      'utf8'
+    );
+
+    const worker = createWorker(workerPath);
+    try {
+      const stale = await callListTeams(worker, tempDir);
+      expect(stale.teams[0]).toMatchObject({ teamName });
+      expect(stale.teams[0]).not.toMatchObject({
+        teamLaunchState: 'partial_pending',
+      });
+      expect(stale.diag?.cacheMisses).toBe(1);
+      expect(stale.diag?.cacheWriteSkips).toBe(0);
+
+      await fs.writeFile(
+        launchSummaryPath,
+        JSON.stringify({
+          version: 1,
+          teamName,
+          updatedAt: new Date().toISOString(),
+          launchPhase: 'active',
+          teamLaunchState: 'partial_pending',
+          expectedMemberCount: 1,
+          pendingCount: 1,
+          permissionPendingCount: 0,
+        }),
+        'utf8'
+      );
+
+      const fresh = await callListTeams(worker, tempDir);
+      expect(fresh.teams[0]).toMatchObject({
+        teamName,
+        teamLaunchState: 'partial_pending',
+        pendingCount: 1,
+      });
+      expect(fresh.diag?.cacheHits).toBe(0);
+      expect(fresh.diag?.cacheMisses).toBe(1);
+      expect(fresh.diag?.cacheWriteSkips).toBe(1);
+    } finally {
+      await worker.terminate();
+    }
+  });
+
+  it('reuses unchanged parsed tasks and rereads changed task files by fingerprint', async () => {
+    const workerPath = await getWorkerPath();
+    tempDir = await fs.mkdtemp(path.join(os.tmpdir(), 'team-fs-worker-'));
+    const tasksBase = path.join(tempDir, 'tasks');
+    const teamName = 'task-cache-team';
+    const tasksDir = path.join(tasksBase, teamName);
+    await fs.mkdir(tasksDir, { recursive: true });
+    const taskPath = path.join(tasksDir, '1.json');
+    await fs.writeFile(
+      taskPath,
+      JSON.stringify({
+        id: '1',
+        subject: 'First subject',
+        status: 'pending',
+        createdAt: '2026-05-02T12:00:00.000Z',
+      }),
+      'utf8'
+    );
+
+    const worker = createWorker(workerPath);
+    try {
+      const first = await callGetAllTasks(worker, tasksBase);
+      expect(first.tasks[0]).toMatchObject({ teamName, subject: 'First subject' });
+      expect(first.diag?.cacheMisses).toBe(1);
+
+      const second = await callGetAllTasks(worker, tasksBase);
+      expect(second.tasks[0]).toMatchObject({ teamName, subject: 'First subject' });
+      expect(second.diag?.cacheHits).toBe(1);
+
+      await fs.writeFile(
+        taskPath,
+        JSON.stringify({
+          id: '1',
+          subject: 'Changed subject with a different size',
+          status: 'pending',
+          createdAt: '2026-05-02T12:00:00.000Z',
+        }),
+        'utf8'
+      );
+      const changed = await callGetAllTasks(worker, tasksBase);
+      expect(changed.tasks[0]).toMatchObject({
+        teamName,
+        subject: 'Changed subject with a different size',
+      });
+      expect(changed.diag?.cacheMisses).toBe(1);
+    } finally {
+      await worker.terminate();
+    }
+  });
 });
diff --git a/test/main/services/team/TeamFsWorkerClient.test.ts b/test/main/services/team/TeamFsWorkerClient.test.ts
new file mode 100644
index 00000000..48a3a9f9
--- /dev/null
+++ b/test/main/services/team/TeamFsWorkerClient.test.ts
@@ -0,0 +1,152 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+const hoisted = vi.hoisted(() => {
+  const skipResponsesForOps = new Set<string>();
+  const workers: Array<{
+    messages: unknown[];
+    handlers: Map<string, (value: unknown) => void>;
+    postMessage: (message: unknown) => void;
+    on: (event: string, handler: (value: unknown) => void) => void;
+    terminate: ReturnType<typeof vi.fn>;
+  }> = [];
+  const createMockWorker = vi.fn().mockImplementation(() => {
+    const worker = {
+      messages: [] as unknown[],
+      handlers: new Map<string, (value: unknown) => void>(),
+      postMessage(message: unknown) {
+        worker.messages.push(message);
+        const request = message as { id: string; op: string };
+        if (skipResponsesForOps.has(request.op)) return;
+        queueMicrotask(() => {
+          const handler = worker.handlers.get('message');
+          if (!handler) return;
+          handler({
+            id: request.id,
+            ok: true,
+            result: request.op === 'listTeams' || request.op === 'getAllTasks' ? [] : null,
+            diag: { op: request.op, totalMs: 0 },
+          });
+        });
+      },
+      on(event: string, handler: (value: unknown) => void) {
+        worker.handlers.set(event, handler);
+      },
+      terminate: vi.fn(async () => undefined),
+    };
+    workers.push(worker);
+    return worker;
+  });
+  return {
+    workers,
+    createMockWorker,
+    skipResponsesForOps,
+  };
+});
+
+vi.mock('node:fs', async () => {
+  const actual = await vi.importActual<typeof import('node:fs')>('node:fs');
+  return {
+    ...actual,
+    existsSync: vi.fn(() => true),
+  };
+});
+
+vi.mock('node:worker_threads', () => ({
+  Worker: hoisted.createMockWorker,
+  default: {
+    Worker: hoisted.createMockWorker,
+  },
+}));
+
+describe('TeamFsWorkerClient', () => {
+  afterEach(() => {
+    vi.resetModules();
+    vi.clearAllMocks();
+    vi.useRealTimers();
+    hoisted.workers.length = 0;
+    hoisted.skipResponsesForOps.clear();
+  });
+
+  it('prewarms the worker without running a scan', async () => {
+    const { TeamFsWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamFsWorkerClient'
+    );
+    const client = new TeamFsWorkerClient();
+
+    await client.prewarm();
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'warmup',
+      payload: {},
+    });
+  });
+
+  it('does not queue warmup behind an already running worker', async () => {
+    const { TeamFsWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamFsWorkerClient'
+    );
+    const client = new TeamFsWorkerClient();
+
+    await client.listTeams({
+      largeConfigBytes: 8 * 1024,
+      configHeadBytes: 4 * 1024,
+      maxConfigBytes: 256 * 1024,
+      maxMembersMetaBytes: 256 * 1024,
+      maxSessionHistoryInSummary: 10,
+      maxProjectPathHistoryInSummary: 10,
+    });
+    await client.prewarm();
+
+    expect(hoisted.workers).toHaveLength(1);
+    expect(hoisted.workers[0].messages).toHaveLength(1);
+    expect(hoisted.workers[0].messages[0]).toMatchObject({
+      op: 'listTeams',
+    });
+  });
+
+  it('ignores stale worker exit after timeout when a replacement worker owns pending work', async () => {
+    vi.useFakeTimers();
+    hoisted.skipResponsesForOps.add('warmup');
+    hoisted.skipResponsesForOps.add('listTeams');
+    const { TeamFsWorkerClient } = await import(
+      '../../../../src/main/services/team/TeamFsWorkerClient'
+    );
+    const client = new TeamFsWorkerClient();
+
+    const prewarmResult = client.prewarm().catch((error: unknown) => error);
+    await vi.advanceTimersByTimeAsync(20_001);
+    const prewarmError = await prewarmResult;
+    expect(prewarmError).toBeInstanceOf(Error);
+    expect((prewarmError as Error).message).toContain('Worker call timeout');
+    expect(hoisted.workers).toHaveLength(1);
+
+    const listPromise = client.listTeams({
+      largeConfigBytes: 8 * 1024,
+      configHeadBytes: 4 * 1024,
+      maxConfigBytes: 256 * 1024,
+      maxMembersMetaBytes: 256 * 1024,
+      maxSessionHistoryInSummary: 10,
+      maxProjectPathHistoryInSummary: 10,
+    });
+
+    expect(hoisted.workers).toHaveLength(2);
+    const staleWorker = hoisted.workers[0];
+    const replacementWorker = hoisted.workers[1];
+    const listRequest = replacementWorker.messages[0] as { id: string };
+
+    staleWorker.handlers.get('exit')?.(1);
+    replacementWorker.handlers.get('message')?.({
+      id: listRequest.id,
+      ok: true,
+      result: [{ teamName: 'fresh-team', displayName: 'Fresh Team' }],
+      diag: { op: 'listTeams', totalMs: 1 },
+    });
+
+    await expect(listPromise).resolves.toEqual({
+      teams: [{ teamName: 'fresh-team', displayName: 'Fresh Team' }],
+      diag: { op: 'listTeams', totalMs: 1 },
+    });
+  });
+});
diff --git a/test/main/services/team/TeamLaunchStateEvaluator.test.ts b/test/main/services/team/TeamLaunchStateEvaluator.test.ts
index 106e2663..108bf0d1 100644
--- a/test/main/services/team/TeamLaunchStateEvaluator.test.ts
+++ b/test/main/services/team/TeamLaunchStateEvaluator.test.ts
@@ -223,6 +223,129 @@ describe('TeamLaunchStateEvaluator', () => {
     });
   });
 
+  it('keeps bootstrap-stalled runtime processes pending instead of online', () => {
+    const snapshot = normalizePersistedLaunchSnapshot('my-team', {
+      version: 2,
+      teamName: 'my-team',
+      updatedAt: '2026-04-23T00:00:00.000Z',
+      launchPhase: 'active',
+      expectedMembers: ['alice'],
+      members: {
+        alice: {
+          name: 'alice',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          laneId: 'secondary:opencode:alice',
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          livenessKind: 'runtime_process',
+          bootstrapStalled: true,
+          runtimeDiagnostic: 'Runtime process is alive, but no bootstrap check-in after 5 min.',
+          runtimeDiagnosticSeverity: 'warning',
+          lastEvaluatedAt: '2026-04-23T00:00:00.000Z',
+        },
+      },
+    });
+
+    expect(snapshot?.members.alice.bootstrapStalled).toBe(true);
+    expect(snapshot?.teamLaunchState).toBe('partial_pending');
+
+    const statuses = snapshotToMemberSpawnStatuses(snapshot);
+    expect(statuses.alice).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: true,
+      livenessSource: undefined,
+      livenessKind: 'runtime_process',
+      bootstrapStalled: true,
+    });
+  });
+
+  it('keeps bootstrap-stalled OpenCode registered sessions pending even without strong runtime liveness', () => {
+    const snapshot = normalizePersistedLaunchSnapshot('my-team', {
+      version: 2,
+      teamName: 'my-team',
+      updatedAt: '2026-04-23T00:00:00.000Z',
+      launchPhase: 'active',
+      expectedMembers: ['alice'],
+      members: {
+        alice: {
+          name: 'alice',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          laneId: 'secondary:opencode:alice',
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          livenessKind: 'registered_only',
+          runtimeSessionId: 'ses_alice_partial_bootstrap',
+          bootstrapStalled: true,
+          runtimeDiagnostic:
+            'OpenCode member_briefing completed, but runtime_bootstrap_checkin did not complete after 5 min.',
+          runtimeDiagnosticSeverity: 'warning',
+          lastEvaluatedAt: '2026-04-23T00:00:00.000Z',
+        },
+      },
+    });
+
+    expect(snapshot?.members.alice.bootstrapStalled).toBe(true);
+
+    const statuses = snapshotToMemberSpawnStatuses(snapshot);
+    expect(statuses.alice).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: false,
+      livenessSource: undefined,
+      livenessKind: 'registered_only',
+      bootstrapStalled: true,
+    });
+  });
+
+  it('keeps OpenCode secondary runtime processes pending before bootstrap stalls', () => {
+    const snapshot = normalizePersistedLaunchSnapshot('my-team', {
+      version: 2,
+      teamName: 'my-team',
+      updatedAt: '2026-04-23T00:00:00.000Z',
+      launchPhase: 'active',
+      expectedMembers: ['alice'],
+      members: {
+        alice: {
+          name: 'alice',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          laneId: 'secondary:opencode:alice',
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          livenessKind: 'runtime_process',
+          runtimeDiagnostic: 'OpenCode runtime process detected',
+          runtimeDiagnosticSeverity: 'info',
+          lastEvaluatedAt: '2026-04-23T00:00:00.000Z',
+        },
+      },
+    });
+
+    const statuses = snapshotToMemberSpawnStatuses(snapshot);
+    expect(statuses.alice).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: true,
+      livenessSource: undefined,
+      livenessKind: 'runtime_process',
+      bootstrapStalled: false,
+    });
+  });
+
   it('normalizes stale persisted runtimeAlive to false without strong liveness evidence', () => {
     const snapshot = normalizePersistedLaunchSnapshot('demo', {
       version: 2,
diff --git a/test/main/services/team/TeamLaunchSummaryProjection.test.ts b/test/main/services/team/TeamLaunchSummaryProjection.test.ts
index abbdc3fe..b9319eb5 100644
--- a/test/main/services/team/TeamLaunchSummaryProjection.test.ts
+++ b/test/main/services/team/TeamLaunchSummaryProjection.test.ts
@@ -49,6 +49,192 @@ describe('TeamLaunchSummaryProjection', () => {
     expect(summary).toBeNull();
   });
 
+  it('ignores stale terminal launch-state pending summaries before projecting renderer copy', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSnapshot: {
+        version: 2,
+        teamName: 'atlas-hq-2',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchPhase: 'finished',
+        expectedMembers: ['alice', 'jack'],
+        members: {
+          alice: {
+            name: 'alice',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            lastEvaluatedAt: '2026-04-09T20:35:57.962Z',
+          },
+          jack: {
+            name: 'jack',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            lastEvaluatedAt: '2026-04-09T20:35:57.962Z',
+          },
+        },
+        summary: {
+          confirmedCount: 0,
+          pendingCount: 2,
+          failedCount: 0,
+          runtimeAlivePendingCount: 0,
+        },
+        teamLaunchState: 'partial_pending',
+      } as never,
+      bootstrapSnapshot: null,
+      launchSummaryProjection: null,
+    });
+
+    expect(summary).toBeNull();
+  });
+
+  it('ignores stale active launch-state pending summaries without outstanding permissions', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSnapshot: {
+        version: 2,
+        teamName: 'vector-room-13',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchPhase: 'active',
+        expectedMembers: ['alice', 'bob'],
+        members: {
+          alice: {
+            name: 'alice',
+            launchState: 'starting',
+            agentToolAccepted: false,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            lastEvaluatedAt: '2026-04-09T20:35:57.962Z',
+          },
+          bob: {
+            name: 'bob',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            lastEvaluatedAt: '2026-04-09T20:35:57.962Z',
+          },
+        },
+        summary: {
+          confirmedCount: 0,
+          pendingCount: 2,
+          failedCount: 0,
+          runtimeAlivePendingCount: 0,
+          permissionPendingCount: 0,
+        },
+        teamLaunchState: 'partial_pending',
+      } as never,
+      launchSummaryProjection: null,
+    });
+
+    expect(summary).toBeNull();
+  });
+
+  it('keeps stale launch-state pending summaries when permission approval is outstanding', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSnapshot: {
+        version: 2,
+        teamName: 'permission-team',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchPhase: 'active',
+        expectedMembers: ['alice'],
+        members: {
+          alice: {
+            name: 'alice',
+            launchState: 'permission_pending',
+            agentToolAccepted: false,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            lastEvaluatedAt: '2026-04-09T20:35:57.962Z',
+          },
+        },
+        summary: {
+          confirmedCount: 0,
+          pendingCount: 1,
+          failedCount: 0,
+          runtimeAlivePendingCount: 0,
+          permissionPendingCount: 1,
+        },
+        teamLaunchState: 'partial_pending',
+      } as never,
+      launchSummaryProjection: null,
+    });
+
+    expect(summary).toMatchObject({
+      teamLaunchState: 'partial_pending',
+      permissionPendingCount: 1,
+    });
+  });
+
+  it('ignores stale pending launch-summary projections when canonical launch truth is missing', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSummaryProjection: {
+        version: 1,
+        teamName: 'atlas-hq-2',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchUpdatedAt: '2026-04-09T20:35:57.962Z',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 2,
+        confirmedCount: 0,
+        pendingCount: 2,
+        failedCount: 0,
+        runtimeProcessPendingCount: 0,
+        permissionPendingCount: 0,
+      },
+    });
+
+    expect(summary).toBeNull();
+  });
+
+  it('ignores stale active pending launch-summary projections without outstanding permissions', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSummaryProjection: {
+        version: 1,
+        teamName: 'vector-room-13',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchUpdatedAt: '2026-04-09T20:35:57.962Z',
+        launchPhase: 'active',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 2,
+        confirmedCount: 0,
+        pendingCount: 2,
+        failedCount: 0,
+        runtimeProcessPendingCount: 0,
+        permissionPendingCount: 0,
+      },
+    });
+
+    expect(summary).toBeNull();
+  });
+
+  it('keeps stale pending launch-summary projections when permission approval is outstanding', () => {
+    const summary = choosePreferredLaunchStateSummary({
+      launchSummaryProjection: {
+        version: 1,
+        teamName: 'permission-team',
+        updatedAt: '2026-04-09T20:35:57.962Z',
+        launchUpdatedAt: '2026-04-09T20:35:57.962Z',
+        teamLaunchState: 'partial_pending',
+        expectedMemberCount: 1,
+        confirmedCount: 0,
+        pendingCount: 1,
+        failedCount: 0,
+        permissionPendingCount: 1,
+      },
+    });
+
+    expect(summary).toMatchObject({
+      teamLaunchState: 'partial_pending',
+      permissionPendingCount: 1,
+    });
+  });
+
   it('prefers a mixed-aware persisted summary projection over a newer but poorer bootstrap snapshot', () => {
     const bootstrapSnapshot = {
       version: 2,
@@ -219,6 +405,7 @@ describe('TeamLaunchSummaryProjection', () => {
       confirmedMemberCount: 1,
       missingMembers: ['bob'],
       failedCount: 1,
+      launchPhase: 'finished',
       teamLaunchState: 'partial_failure',
     });
   });
diff --git a/test/main/services/team/TeamLogSourceTracker.test.ts b/test/main/services/team/TeamLogSourceTracker.test.ts
index 6f75b660..74beea88 100644
--- a/test/main/services/team/TeamLogSourceTracker.test.ts
+++ b/test/main/services/team/TeamLogSourceTracker.test.ts
@@ -30,10 +30,11 @@ describe('TeamLogSourceTracker', () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-'));
 
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: tempDir!,
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
 
     const tracker = new TeamLogSourceTracker(logsFinder);
@@ -66,10 +67,11 @@ describe('TeamLogSourceTracker', () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-refcount-'));
 
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: tempDir!,
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
 
     const tracker = new TeamLogSourceTracker(logsFinder);
@@ -104,14 +106,107 @@ describe('TeamLogSourceTracker', () => {
     expect(emitter).not.toHaveBeenCalled();
   });
 
+  it('emits log-source-change for scoped root transcripts', async () => {
+    tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-scoped-root-'));
+    await writeFile(path.join(tempDir, 'lead-session.jsonl'), '{"seq":1}\n');
+
+    const logsFinder = {
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
+        projectDir: tempDir!,
+        sessionIds: ['lead-session'],
+        watchSessionIds: ['lead-session'],
+      })),
+    } as unknown as TeamMemberLogsFinder;
+
+    const tracker = new TeamLogSourceTracker(logsFinder);
+    const emitter = vi.fn<(event: TeamChangeEvent) => void>();
+    tracker.setEmitter(emitter);
+
+    await tracker.enableTracking('demo', 'change_presence');
+    emitter.mockClear();
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    await writeFile(path.join(tempDir, 'lead-session.jsonl'), '{"seq":2}\n');
+
+    await vi.waitFor(() => {
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'log-source-change',
+        teamName: 'demo',
+      });
+    });
+
+    await tracker.disableTracking('demo', 'change_presence');
+  });
+
+  it('ignores old unscoped root transcript changes', async () => {
+    tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-unscoped-root-'));
+    await writeFile(path.join(tempDir, 'lead-session.jsonl'), '{"seq":1}\n');
+    await writeFile(path.join(tempDir, 'old-session.jsonl'), '{"seq":1}\n');
+
+    const logsFinder = {
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
+        projectDir: tempDir!,
+        sessionIds: ['lead-session'],
+        watchSessionIds: ['lead-session'],
+      })),
+    } as unknown as TeamMemberLogsFinder;
+
+    const tracker = new TeamLogSourceTracker(logsFinder);
+    const emitter = vi.fn<(event: TeamChangeEvent) => void>();
+    tracker.setEmitter(emitter);
+
+    await tracker.enableTracking('demo', 'change_presence');
+    emitter.mockClear();
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    await writeFile(path.join(tempDir, 'old-session.jsonl'), '{"seq":2}\n');
+    await new Promise((resolve) => setTimeout(resolve, 450));
+
+    expect(emitter.mock.calls.map(([event]) => event.type)).not.toContain('log-source-change');
+
+    await tracker.disableTracking('demo', 'change_presence');
+  });
+
+  it('emits log-source-change when a scoped root transcript appears', async () => {
+    tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-pending-root-'));
+
+    const logsFinder = {
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
+        projectDir: tempDir!,
+        sessionIds: ['new-runtime'],
+        watchSessionIds: ['new-runtime'],
+      })),
+    } as unknown as TeamMemberLogsFinder;
+
+    const tracker = new TeamLogSourceTracker(logsFinder);
+    const emitter = vi.fn<(event: TeamChangeEvent) => void>();
+    tracker.setEmitter(emitter);
+
+    await tracker.enableTracking('demo', 'change_presence');
+    emitter.mockClear();
+    await new Promise((resolve) => setTimeout(resolve, 100));
+
+    await writeFile(path.join(tempDir, 'new-runtime.jsonl'), '{"seq":1}\n');
+
+    await vi.waitFor(() => {
+      expect(emitter).toHaveBeenCalledWith({
+        type: 'log-source-change',
+        teamName: 'demo',
+      });
+    });
+
+    await tracker.disableTracking('demo', 'change_presence');
+  });
+
   it('does not reinitialize when another consumer joins an already tracked team', async () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-init-'));
 
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: tempDir!,
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
 
     const tracker = new TeamLogSourceTracker(logsFinder);
@@ -119,7 +214,7 @@ describe('TeamLogSourceTracker', () => {
     await tracker.enableTracking('demo', 'tool_activity');
     await tracker.enableTracking('demo', 'task_log_stream');
 
-    expect(logsFinder.getLogSourceWatchContext).toHaveBeenCalledTimes(1);
+    expect(logsFinder.getLiveLogSourceWatchContext).toHaveBeenCalledTimes(1);
 
     await tracker.disableTracking('demo', 'task_log_stream');
     await tracker.disableTracking('demo', 'tool_activity');
@@ -127,10 +222,11 @@ describe('TeamLogSourceTracker', () => {
 
   it('notifies log-source listeners before forwarding the external team change event', () => {
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: '/tmp/demo',
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
     const tracker = new TeamLogSourceTracker(logsFinder);
     const events: string[] = [];
@@ -154,10 +250,11 @@ describe('TeamLogSourceTracker', () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-stall-monitor-'));
 
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: tempDir!,
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
 
     const tracker = new TeamLogSourceTracker(logsFinder);
@@ -188,10 +285,11 @@ describe('TeamLogSourceTracker', () => {
     tempDir = await mkdtemp(path.join(tmpdir(), 'team-log-source-tracker-safe-task-'));
 
     const logsFinder = {
-      getLogSourceWatchContext: vi.fn(async () => ({
+      getLiveLogSourceWatchContext: vi.fn(async () => ({
         projectDir: tempDir!,
         sessionIds: [],
-      })),
+        watchSessionIds: [],
+})),
     } as unknown as TeamMemberLogsFinder;
 
     const tracker = new TeamLogSourceTracker(logsFinder);
@@ -227,6 +325,7 @@ describe('TeamLogSourceTracker', () => {
 
   it('ignores internal ledger artifact paths but keeps freshness signals visible', () => {
     const projectDir = '/tmp/demo-project';
+    const scopedSessionIds = new Set(['lead-session']);
 
     expect(
       shouldIgnoreLogSourceWatcherPath(
@@ -246,5 +345,71 @@ describe('TeamLogSourceTracker', () => {
         path.join(projectDir, '.board-task-change-freshness', 'task.json')
       )
     ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, '.board-task-log-freshness', 'task.json'),
+        { scopedSessionIds }
+      )
+    ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, 'lead-session.jsonl'),
+        { scopedSessionIds }
+      )
+    ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(projectDir, path.join(projectDir, 'old-session.jsonl'), {
+        scopedSessionIds,
+      })
+    ).toBe(true);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, 'pending-session.jsonl'),
+        {
+          scopedSessionIds,
+          pendingRootSessionIds: new Set(['pending-session']),
+        }
+      )
+    ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(projectDir, path.join(projectDir, 'lead-session'), {
+        scopedSessionIds,
+      })
+    ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(projectDir, path.join(projectDir, 'pending-session'), {
+        scopedSessionIds,
+        pendingRootSessionIds: new Set(['pending-session']),
+      })
+    ).toBe(true);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(projectDir, path.join(projectDir, 'old-session'), {
+        scopedSessionIds,
+      })
+    ).toBe(true);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, 'lead-session', 'subagents', 'agent-worker.jsonl'),
+        { scopedSessionIds }
+      )
+    ).toBe(false);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, 'lead-session', 'subagents', 'agent-acompact-worker.jsonl'),
+        { scopedSessionIds }
+      )
+    ).toBe(true);
+    expect(
+      shouldIgnoreLogSourceWatcherPath(
+        projectDir,
+        path.join(projectDir, 'old-session', 'subagents', 'agent-worker.jsonl'),
+        { scopedSessionIds }
+      )
+    ).toBe(true);
   });
 });
diff --git a/test/main/services/team/TeamMcpConfigBuilder.test.ts b/test/main/services/team/TeamMcpConfigBuilder.test.ts
index 01b50283..cf98ab04 100644
--- a/test/main/services/team/TeamMcpConfigBuilder.test.ts
+++ b/test/main/services/team/TeamMcpConfigBuilder.test.ts
@@ -46,7 +46,10 @@ vi.mock('@main/utils/pathDecoder', async (importOriginal) => {
 });
 
 import { setAppDataBasePath, setClaudeBasePathOverride } from '@main/utils/pathDecoder';
-import { TeamMcpConfigBuilder } from '@main/services/team/TeamMcpConfigBuilder';
+import {
+  TeamMcpConfigBuilder,
+  clearResolvedNodePathForTests,
+} from '@main/services/team/TeamMcpConfigBuilder';
 
 describe('TeamMcpConfigBuilder', () => {
   const createdPaths: string[] = [];
@@ -93,7 +96,7 @@ describe('TeamMcpConfigBuilder', () => {
     entry: string
   ): void {
     expect(server?.args).toEqual([entry]);
-    expect(server?.command).toMatch(/(^node$|[\\/]node(?:\.exe)?$)/);
+    expect(server?.command).toMatch(/(^node(?:-\d+)?$|[\\/]node(?:-\d+)?(?:\.exe)?$)/);
   }
 
   function expectNodeTsxSourceEntry(
@@ -102,7 +105,7 @@ describe('TeamMcpConfigBuilder', () => {
     sourceEntry: string
   ): void {
     expect(server?.args).toEqual([tsxCli, sourceEntry]);
-    expect(server?.command).toMatch(/(^node$|[\\/]node(?:\.exe)?$)/);
+    expect(server?.command).toMatch(/(^node(?:-\d+)?$|[\\/]node(?:-\d+)?(?:\.exe)?$)/);
   }
 
   function getBuiltWorkspaceEntry(): string {
@@ -165,6 +168,7 @@ describe('TeamMcpConfigBuilder', () => {
   }
 
   beforeEach(() => {
+    clearResolvedNodePathForTests();
     originalResourcesPath = (process as NodeJS.Process & { resourcesPath?: string }).resourcesPath;
     tempAppData = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-appdata-'));
     createdDirs.push(tempAppData);
diff --git a/test/main/services/team/TeamMemberLogsFinder.test.ts b/test/main/services/team/TeamMemberLogsFinder.test.ts
index c553ebc9..19ea0cff 100644
--- a/test/main/services/team/TeamMemberLogsFinder.test.ts
+++ b/test/main/services/team/TeamMemberLogsFinder.test.ts
@@ -1,6 +1,6 @@
 import * as os from 'os';
 import * as path from 'path';
-import { afterEach, describe, expect, it } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import * as fs from 'fs/promises';
 
@@ -18,6 +18,82 @@ describe('TeamMemberLogsFinder', () => {
     }
   });
 
+  it('builds live log source context without broad transcript discovery', async () => {
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-logs-live-context-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'live-context-team';
+    const projectPath = '/Users/test/live-context';
+    const projectRoot = path.join(tmpDir, 'projects', '-Users-test-live-context');
+    const config = {
+      name: teamName,
+      projectPath,
+      leadSessionId: 'lead-session',
+      sessionHistory: ['old-session', 'recent-session'],
+      members: [],
+    };
+    await fs.mkdir(projectRoot, { recursive: true });
+
+    const projectResolver = {
+      getLiveBaseContext: vi.fn(async () => ({
+        projectDir: projectRoot,
+        projectId: '-Users-test-live-context',
+        config,
+      })),
+      getContext: vi.fn(async () => {
+        throw new Error('broad context must not be used for live tracking');
+      }),
+    };
+    const launchStateStore = {
+      read: vi.fn(async () => ({
+        version: 2,
+        teamName,
+        updatedAt: '2026-05-03T12:00:00.000Z',
+        leadSessionId: 'lead-session',
+        launchPhase: 'active',
+        expectedMembers: ['bob'],
+        members: {
+          bob: {
+            name: 'bob',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            runtimeSessionId: 'runtime-bob',
+            updatedAt: '2026-05-03T12:00:00.000Z',
+          },
+        },
+        summary: {},
+        teamLaunchState: 'partial_pending',
+      })),
+    };
+
+    const finder = new TeamMemberLogsFinder(
+      undefined,
+      undefined,
+      undefined,
+      projectResolver as never,
+      launchStateStore as never
+    );
+
+    const context = await finder.getLiveLogSourceWatchContext(teamName, { forceRefresh: true });
+
+    expect(projectResolver.getLiveBaseContext).toHaveBeenCalledWith(
+      teamName,
+      expect.objectContaining({ forceRefresh: true })
+    );
+    expect(projectResolver.getContext).not.toHaveBeenCalled();
+    expect(context?.projectDir).toBe(projectRoot);
+    expect(context?.watchSessionIds).toEqual([
+      'lead-session',
+      'runtime-bob',
+      'recent-session',
+      'old-session',
+    ]);
+    expect(context?.sessionIds).toEqual(context?.watchSessionIds);
+  });
+
   it('returns subagent logs for a member and lead session for team-lead', async () => {
     tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-logs-'));
     setClaudeBasePathOverride(tmpDir);
diff --git a/test/main/services/team/TeamMessageFeedService.test.ts b/test/main/services/team/TeamMessageFeedService.test.ts
index 34149bca..b35ddae4 100644
--- a/test/main/services/team/TeamMessageFeedService.test.ts
+++ b/test/main/services/team/TeamMessageFeedService.test.ts
@@ -17,6 +17,16 @@ function makeMessage(overrides: Partial<InboxMessage> = {}): InboxMessage {
   };
 }
 
+function createDeferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
 describe('TeamMessageFeedService', () => {
   const config: TeamConfig = {
     name: 'Signal Ops 4',
@@ -101,6 +111,75 @@ describe('TeamMessageFeedService', () => {
     ).toBe(true);
   });
 
+  it('deduplicates concurrent feed rebuilds for the same team', async () => {
+    const inboxRequest = createDeferred<InboxMessage[]>();
+    const getInboxMessages = vi.fn(() => inboxRequest.promise);
+    const service = new TeamMessageFeedService({
+      getConfig: vi.fn(async () => config),
+      getInboxMessages,
+      getLeadSessionMessages: vi.fn(async () => []),
+      getSentMessages: vi.fn(async () => []),
+    });
+
+    const first = service.getFeed('signal-ops-4');
+    const second = service.getFeed('signal-ops-4');
+    await Promise.resolve();
+
+    expect(getInboxMessages).toHaveBeenCalledTimes(1);
+    inboxRequest.resolve([makeMessage()]);
+
+    const [firstFeed, secondFeed] = await Promise.all([first, second]);
+    expect(firstFeed).toEqual(secondFeed);
+    expect(firstFeed.messages).toHaveLength(1);
+  });
+
+  it('does not reuse or cache a stale in-flight rebuild after invalidation', async () => {
+    const firstInboxRequest = createDeferred<InboxMessage[]>();
+    const secondInboxRequest = createDeferred<InboxMessage[]>();
+    const getInboxMessages = vi
+      .fn()
+      .mockImplementationOnce(() => firstInboxRequest.promise)
+      .mockImplementationOnce(() => secondInboxRequest.promise);
+    const service = new TeamMessageFeedService({
+      getConfig: vi.fn(async () => config),
+      getInboxMessages,
+      getLeadSessionMessages: vi.fn(async () => []),
+      getSentMessages: vi.fn(async () => []),
+    });
+
+    const staleRequest = service.getFeed('signal-ops-4');
+    await Promise.resolve();
+    expect(getInboxMessages).toHaveBeenCalledTimes(1);
+
+    service.invalidate('signal-ops-4');
+    const freshRequest = service.getFeed('signal-ops-4');
+    await Promise.resolve();
+    expect(getInboxMessages).toHaveBeenCalledTimes(2);
+
+    secondInboxRequest.resolve([
+      makeMessage({
+        messageId: 'fresh-message',
+        text: 'fresh',
+        timestamp: '2026-04-19T18:46:45.000Z',
+      }),
+    ]);
+    const freshFeed = await freshRequest;
+    expect(freshFeed.messages[0]?.messageId).toBe('fresh-message');
+
+    firstInboxRequest.resolve([
+      makeMessage({
+        messageId: 'stale-message',
+        text: 'stale',
+        timestamp: '2026-04-19T18:46:44.000Z',
+      }),
+    ]);
+    await staleRequest;
+
+    const cachedFeed = await service.getFeed('signal-ops-4');
+    expect(cachedFeed.messages[0]?.messageId).toBe('fresh-message');
+    expect(getInboxMessages).toHaveBeenCalledTimes(2);
+  });
+
   it('adds UI-only OpenCode bootstrap start rows for side-lane teammates', async () => {
     const opencodeConfig: TeamConfig = {
       name: 'relay-works-14',
diff --git a/test/main/services/team/TeamProvisioningService.test.ts b/test/main/services/team/TeamProvisioningService.test.ts
index 17b236dd..69dc98d1 100644
--- a/test/main/services/team/TeamProvisioningService.test.ts
+++ b/test/main/services/team/TeamProvisioningService.test.ts
@@ -129,8 +129,15 @@ import {
   initializeAutoResumeService,
 } from '@main/services/team/AutoResumeService';
 import { getTeamBootstrapStatePath } from '@main/services/team/TeamBootstrapStateReader';
-import { createPersistedLaunchSnapshot } from '@main/services/team/TeamLaunchStateEvaluator';
-import { getTeamLaunchStatePath } from '@main/services/team/TeamLaunchStateStore';
+import {
+  createPersistedLaunchSnapshot,
+  snapshotFromRuntimeMemberStatuses,
+} from '@main/services/team/TeamLaunchStateEvaluator';
+import {
+  getTeamLaunchStatePath,
+  getTeamLaunchSummaryPath,
+} from '@main/services/team/TeamLaunchStateStore';
+import { TeamConfigReader } from '@main/services/team/TeamConfigReader';
 import {
   getOpenCodeLaneScopedRuntimeFilePath,
   getOpenCodeRuntimeManifestPath,
@@ -205,6 +212,16 @@ function createPidusageStat(pid: number, memory: number) {
   };
 }
 
+function createDeferred<T>() {
+  let resolve!: (value: T | PromiseLike<T>) => void;
+  let reject!: (reason?: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
 function writeLaunchConfig(
   teamName: string,
   projectPath: string,
@@ -231,12 +248,16 @@ function writeLaunchConfig(
 function writeLaunchState(
   teamName: string,
   leadSessionId: string,
-  members: Record<string, Record<string, unknown>>
+  members: Record<string, Record<string, unknown>>,
+  options?: {
+    launchPhase?: 'active' | 'finished';
+    updatedAt?: string;
+  }
 ): void {
   const snapshot = createPersistedLaunchSnapshot({
     teamName,
     leadSessionId,
-    launchPhase: 'finished',
+    launchPhase: options?.launchPhase ?? 'finished',
     expectedMembers: Object.keys(members),
     members: Object.fromEntries(
       Object.entries(members).map(([name, member]) => [
@@ -254,6 +275,7 @@ function writeLaunchState(
         },
       ])
     ) as any,
+    ...(options?.updatedAt ? { updatedAt: options.updatedAt } : {}),
   });
   fs.writeFileSync(
     getTeamLaunchStatePath(teamName),
@@ -391,6 +413,24 @@ async function writeCommittedOpenCodeSessionStore(input: {
   });
 }
 
+async function writeDefaultBobOpenCodeBootstrapEvidence(): Promise<void> {
+  await writeCommittedOpenCodeSessionStore({
+    teamName: 'team-a',
+    laneId: 'secondary:opencode:bob',
+    runId: 'opencode-run-bob',
+    sessions: [
+      {
+        id: 'oc-session-bob',
+        teamName: 'team-a',
+        memberName: 'bob',
+        laneId: 'secondary:opencode:bob',
+        runId: 'opencode-run-bob',
+        source: 'runtime_bootstrap_checkin',
+      },
+    ],
+  });
+}
+
 function createMemberSpawnStatusEntry(
   overrides: Record<string, unknown> = {}
 ): Record<string, unknown> {
@@ -417,6 +457,7 @@ function createMemberSpawnRun(params?: {
   expectedMembers?: string[];
   memberSpawnStatuses?: Map<string, Record<string, unknown>>;
   memberSpawnLeadInboxCursorByMember?: Map<string, { timestamp: string; messageId: string }>;
+  mixedSecondaryLanes?: Array<{ providerId: string; member: { name: string } }>;
 }) {
   const teamName = params?.teamName ?? 'member-spawn-team';
   const expectedMembers = params?.expectedMembers ?? ['alice'];
@@ -438,6 +479,7 @@ function createMemberSpawnRun(params?: {
     request: {
       members: [],
     },
+    mixedSecondaryLanes: params?.mixedSecondaryLanes ?? [],
     expectedMembers,
     memberSpawnStatuses,
     memberSpawnToolUseIds: new Map(),
@@ -541,6 +583,445 @@ describe('TeamProvisioningService', () => {
       await expect(svc.warmup()).resolves.not.toThrow();
       expect(spawnCli).toHaveBeenCalled();
     });
+
+  });
+
+  describe('team launch notifications', () => {
+    it('does not fire incomplete notification for pending-only teammates still joining', async () => {
+      const { NotificationManager } =
+        await import('@main/services/infrastructure/NotificationManager');
+      const addTeamNotification = vi.fn(async (_payload: unknown) => undefined);
+      NotificationManager.setInstance({ addTeamNotification } as never);
+
+      try {
+        const svc = new TeamProvisioningService();
+        const run = {
+          runId: 'run-beacon-desk-15',
+          teamName: 'beacon-desk-15',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'beacon-desk-15',
+          },
+          expectedMembers: ['alice', 'bob', 'jack', 'tom'],
+          allEffectiveMembers: [
+            { name: 'alice' },
+            { name: 'bob' },
+            { name: 'jack' },
+            { name: 'tom' },
+          ],
+          memberSpawnStatuses: new Map(
+            ['alice', 'bob', 'jack', 'tom'].map((name) => [
+              name,
+              createMemberSpawnStatusEntry({
+                status: 'waiting',
+                launchState: 'runtime_pending_bootstrap',
+                runtimeAlive: true,
+                bootstrapConfirmed: false,
+                hardFailure: false,
+              }),
+            ])
+          ),
+        };
+        const pendingSnapshot = {
+          expectedMembers: ['alice', 'bob', 'jack', 'tom'],
+          members: Object.fromEntries(
+            ['alice', 'bob', 'jack', 'tom'].map((name) => [
+              name,
+              {
+                name,
+                launchState: 'runtime_pending_bootstrap',
+                agentToolAccepted: true,
+                runtimeAlive: true,
+                bootstrapConfirmed: false,
+                hardFailure: false,
+                lastEvaluatedAt: '2026-04-13T10:00:00.000Z',
+              },
+            ])
+          ),
+          summary: {
+            confirmedCount: 0,
+            pendingCount: 4,
+            failedCount: 0,
+            runtimeAlivePendingCount: 4,
+          },
+        };
+
+        await (svc as any).fireTeamLaunchIncompleteNotification(
+          run,
+          [],
+          pendingSnapshot.summary,
+          pendingSnapshot
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+
+      expect(addTeamNotification).not.toHaveBeenCalled();
+    });
+
+    it('ignores stale failed summary without concrete failed member evidence', async () => {
+      const { NotificationManager } =
+        await import('@main/services/infrastructure/NotificationManager');
+      const addTeamNotification = vi.fn(async (_payload: unknown) => undefined);
+      NotificationManager.setInstance({ addTeamNotification } as never);
+
+      try {
+        const svc = new TeamProvisioningService();
+        const run = {
+          runId: 'run-stale-summary',
+          teamName: 'stale-summary-team',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'stale-summary-team',
+          },
+          expectedMembers: ['alice'],
+          allEffectiveMembers: [{ name: 'alice' }],
+          memberSpawnStatuses: new Map([
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'waiting',
+                launchState: 'runtime_pending_bootstrap',
+                runtimeAlive: true,
+                bootstrapConfirmed: false,
+                hardFailure: false,
+              }),
+            ],
+          ]),
+        };
+        const staleSnapshot = {
+          expectedMembers: ['alice'],
+          members: {
+            alice: {
+              name: 'alice',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: false,
+              hardFailure: false,
+              lastEvaluatedAt: '2026-04-13T10:00:00.000Z',
+            },
+          },
+          summary: {
+            confirmedCount: 0,
+            pendingCount: 0,
+            failedCount: 1,
+            runtimeAlivePendingCount: 0,
+          },
+        };
+
+        await (svc as any).fireTeamLaunchIncompleteNotification(
+          run,
+          [],
+          staleSnapshot.summary,
+          staleSnapshot
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+
+      expect(addTeamNotification).not.toHaveBeenCalled();
+    });
+
+    it('prefers live confirmed evidence over stale persisted failed member evidence', async () => {
+      const { NotificationManager } =
+        await import('@main/services/infrastructure/NotificationManager');
+      const addTeamNotification = vi.fn(async (_payload: unknown) => undefined);
+      NotificationManager.setInstance({ addTeamNotification } as never);
+
+      try {
+        const svc = new TeamProvisioningService();
+        const run = {
+          runId: 'run-live-confirmed',
+          teamName: 'live-confirmed-team',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'live-confirmed-team',
+          },
+          expectedMembers: ['alice'],
+          allEffectiveMembers: [{ name: 'alice' }],
+          memberSpawnStatuses: new Map([
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+                hardFailure: false,
+              }),
+            ],
+          ]),
+        };
+        const staleSnapshot = {
+          expectedMembers: ['alice'],
+          members: {
+            alice: {
+              name: 'alice',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'stale failure',
+              lastEvaluatedAt: '2026-04-13T10:00:00.000Z',
+            },
+          },
+          summary: {
+            confirmedCount: 0,
+            pendingCount: 0,
+            failedCount: 1,
+            runtimeAlivePendingCount: 0,
+          },
+        };
+
+        await (svc as any).fireTeamLaunchIncompleteNotification(
+          run,
+          [],
+          staleSnapshot.summary,
+          staleSnapshot
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+
+      expect(addTeamNotification).not.toHaveBeenCalled();
+    });
+
+    it('uses live member evidence instead of stale summary for incomplete launch copy', async () => {
+      const { NotificationManager } =
+        await import('@main/services/infrastructure/NotificationManager');
+      const addTeamNotification = vi.fn(async (_payload: unknown) => undefined);
+      NotificationManager.setInstance({ addTeamNotification } as never);
+
+      try {
+        const svc = new TeamProvisioningService();
+        const run = {
+          runId: 'run-relay-works-18',
+          teamName: 'relay-works-18',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'relay-works-18',
+          },
+          expectedMembers: ['bob', 'jack', 'alice', 'tom'],
+          allEffectiveMembers: [
+            { name: 'bob' },
+            { name: 'jack' },
+            { name: 'alice' },
+            { name: 'tom' },
+          ],
+          memberSpawnStatuses: new Map([
+            [
+              'bob',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+            [
+              'jack',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'error',
+                launchState: 'failed_to_start',
+                runtimeAlive: false,
+                bootstrapConfirmed: false,
+                hardFailure: true,
+                hardFailureReason: 'Insufficient credits',
+              }),
+            ],
+            [
+              'tom',
+              createMemberSpawnStatusEntry({
+                status: 'waiting',
+                launchState: 'runtime_pending_bootstrap',
+                runtimeAlive: true,
+                bootstrapConfirmed: false,
+              }),
+            ],
+          ]),
+        };
+        const staleSnapshot = {
+          expectedMembers: ['bob', 'jack', 'alice', 'tom'],
+          members: Object.fromEntries(
+            ['bob', 'jack', 'alice', 'tom'].map((name) => [
+              name,
+              {
+                name,
+                launchState: 'runtime_pending_bootstrap',
+                agentToolAccepted: true,
+                runtimeAlive: false,
+                bootstrapConfirmed: false,
+                hardFailure: false,
+                lastEvaluatedAt: '2026-04-13T10:00:00.000Z',
+              },
+            ])
+          ),
+          summary: {
+            confirmedCount: 0,
+            pendingCount: 4,
+            failedCount: 0,
+            runtimeAlivePendingCount: 0,
+          },
+        };
+
+        await (svc as any).fireTeamLaunchIncompleteNotification(
+          run,
+          [{ name: 'alice' }],
+          staleSnapshot.summary,
+          staleSnapshot
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+
+      expect(addTeamNotification).toHaveBeenCalledTimes(1);
+      const payload = addTeamNotification.mock.calls[0]![0] as { body: string };
+      expect(payload.body).toBe('2/4 joined · failed: @alice · still joining: @tom');
+      expect(payload.body).not.toContain('0/4');
+      expect(payload.body).not.toContain('did not join');
+    });
+
+    it('does not report persisted bootstrap-confirmed primary members as failed from a stale failed list', async () => {
+      const { NotificationManager } =
+        await import('@main/services/infrastructure/NotificationManager');
+      const addTeamNotification = vi.fn(async (_payload: unknown) => undefined);
+      NotificationManager.setInstance({ addTeamNotification } as never);
+
+      try {
+        const svc = new TeamProvisioningService();
+        const run = {
+          runId: 'run-forge-labs-15',
+          teamName: 'forge-labs-15',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'forge-labs-15',
+          },
+          expectedMembers: ['bob', 'jack', 'alice', 'tom'],
+          allEffectiveMembers: [
+            { name: 'bob' },
+            { name: 'jack' },
+            { name: 'alice' },
+            { name: 'tom' },
+          ],
+          memberSpawnStatuses: new Map([
+            [
+              'bob',
+              createMemberSpawnStatusEntry({
+                status: 'error',
+                launchState: 'failed_to_start',
+                runtimeAlive: false,
+                bootstrapConfirmed: false,
+                hardFailure: true,
+                hardFailureReason: 'Teammate was never spawned during launch.',
+              }),
+            ],
+            [
+              'jack',
+              createMemberSpawnStatusEntry({
+                status: 'error',
+                launchState: 'failed_to_start',
+                runtimeAlive: false,
+                bootstrapConfirmed: false,
+                hardFailure: true,
+                hardFailureReason: 'Teammate was never spawned during launch.',
+              }),
+            ],
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'waiting',
+                launchState: 'runtime_pending_bootstrap',
+                runtimeAlive: false,
+                bootstrapConfirmed: false,
+              }),
+            ],
+            [
+              'tom',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+          ]),
+        };
+        const reconciledSnapshot = {
+          expectedMembers: ['bob', 'jack', 'alice', 'tom'],
+          members: {
+            bob: {
+              name: 'bob',
+              launchState: 'confirmed_alive',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+              hardFailure: false,
+              lastEvaluatedAt: '2026-05-04T19:32:37.000Z',
+            },
+            jack: {
+              name: 'jack',
+              launchState: 'confirmed_alive',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+              hardFailure: false,
+              lastEvaluatedAt: '2026-05-04T19:32:30.000Z',
+            },
+            alice: {
+              name: 'alice',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: false,
+              lastEvaluatedAt: '2026-05-04T19:35:49.000Z',
+            },
+            tom: {
+              name: 'tom',
+              launchState: 'confirmed_alive',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+              hardFailure: false,
+              lastEvaluatedAt: '2026-05-04T19:35:49.000Z',
+            },
+          },
+          summary: {
+            confirmedCount: 3,
+            pendingCount: 1,
+            failedCount: 0,
+            runtimeAlivePendingCount: 0,
+          },
+        };
+
+        await (svc as any).fireTeamLaunchIncompleteNotification(
+          run,
+          [{ name: 'bob' }, { name: 'jack' }],
+          reconciledSnapshot.summary,
+          reconciledSnapshot
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+
+      expect(addTeamNotification).not.toHaveBeenCalled();
+    });
   });
 
   describe('getClaudeLogs', () => {
@@ -617,7 +1098,660 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  describe('provisioning status', () => {
+    it('retains final progress after cleanupRun removes the live run', async () => {
+      const svc = new TeamProvisioningService();
+      const run = createClaudeLogsRun({
+        runId: 'run-retained-progress',
+        teamName: 'retained-progress-team',
+        provisioningComplete: false,
+        progress: {
+          runId: 'run-retained-progress',
+          teamName: 'retained-progress-team',
+          state: 'failed',
+          message: 'CLI exited quickly',
+          startedAt: '2026-04-19T10:00:00.000Z',
+          updatedAt: '2026-04-19T10:00:01.000Z',
+          error: 'bootstrap failed',
+          warnings: ['retry is safe'],
+        },
+      });
+
+      (svc as any).runs.set(run.runId, run);
+      (svc as any).provisioningRunByTeam.set(run.teamName, run.runId);
+
+      (svc as any).cleanupRun(run);
+
+      expect((svc as any).runs.has(run.runId)).toBe(false);
+      await expect(svc.getProvisioningStatus(run.runId)).resolves.toMatchObject({
+        runId: run.runId,
+        teamName: run.teamName,
+        state: 'failed',
+        message: 'CLI exited quickly',
+        error: 'bootstrap failed',
+        warnings: ['retry is safe'],
+      });
+    });
+
+    it('treats result.success as a fallback provisioning completion signal', () => {
+      const svc = new TeamProvisioningService();
+      const run = createClaudeLogsRun({
+        runId: 'run-success-fallback',
+        teamName: 'success-fallback-team',
+        provisioningComplete: false,
+        progress: {
+          runId: 'run-success-fallback',
+          teamName: 'success-fallback-team',
+          state: 'configuring',
+          message: 'Waiting for CLI result',
+          startedAt: '2026-04-19T10:00:00.000Z',
+          updatedAt: '2026-04-19T10:00:01.000Z',
+        },
+      });
+      const complete = vi
+        .spyOn(svc as any, 'handleProvisioningTurnComplete')
+        .mockResolvedValue(undefined);
+
+      (svc as any).handleStreamJsonMessage(run, { type: 'result', subtype: 'success' });
+
+      expect(complete).toHaveBeenCalledWith(run);
+    });
+
+    it('finalizes unconfirmed launch members as failed before cleanup removes the run', () => {
+      const svc = new TeamProvisioningService();
+      const run = createClaudeLogsRun({
+        runId: 'run-cleanup-finalizes-launch',
+        teamName: 'cleanup-finalizes-launch-team',
+        isLaunch: true,
+        provisioningComplete: false,
+        cancelRequested: false,
+        expectedMembers: ['alice', 'bob'],
+        provisioningOutputParts: [],
+        memberSpawnStatuses: new Map([
+          [
+            'alice',
+            createMemberSpawnStatusEntry({
+              status: 'online',
+              launchState: 'confirmed_alive',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+            }),
+          ],
+          [
+            'bob',
+            createMemberSpawnStatusEntry({
+              status: 'online',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: false,
+              livenessSource: 'process',
+            }),
+          ],
+        ]),
+      });
+      const persist = vi.spyOn(svc as any, 'persistLaunchStateSnapshot').mockResolvedValue(null);
+
+      (svc as any).runs.set(run.runId, run);
+      (svc as any).provisioningRunByTeam.set(run.teamName, run.runId);
+
+      (svc as any).cleanupRun(run);
+
+      expect(run.memberSpawnStatuses.get('bob')).toMatchObject({
+        status: 'error',
+        launchState: 'failed_to_start',
+        runtimeAlive: false,
+        bootstrapConfirmed: false,
+        hardFailure: true,
+      });
+      expect((svc as any).buildLiveLaunchSnapshotForRun(run, 'finished')).toMatchObject({
+        teamLaunchState: 'partial_failure',
+        summary: {
+          confirmedCount: 1,
+          pendingCount: 0,
+          failedCount: 1,
+        },
+      });
+      expect(persist).toHaveBeenCalledWith(run, 'finished');
+    });
+  });
+
+  describe('member spawn status launch reads', () => {
+    it('coalesces concurrent active launch status reads and serves a short cached follow-up', async () => {
+      const svc = new TeamProvisioningService();
+      const teamName = 'spawn-cache-team';
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+      });
+      run.isLaunch = true;
+      run.progress = {
+        teamName,
+        state: 'launching',
+        message: 'Launching',
+        updatedAt: '2026-05-02T10:00:00.000Z',
+      };
+      run.onProgress = vi.fn();
+      (svc as any).aliveRunByTeam.set(teamName, run.runId);
+      (svc as any).runs.set(run.runId, run);
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => null),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(async () => new Map());
+      const refreshDeferred = createDeferred<void>();
+      const refreshLeadInbox = vi
+        .spyOn(svc as any, 'refreshMemberSpawnStatusesFromLeadInbox')
+        .mockImplementation(async () => refreshDeferred.promise);
+      const auditStatuses = vi
+        .spyOn(svc as any, 'maybeAuditMemberSpawnStatuses')
+        .mockResolvedValue(undefined);
+      const persistSnapshot = vi
+        .spyOn(svc as any, 'persistLaunchStateSnapshot')
+        .mockResolvedValue(null);
+
+      const first = svc.getMemberSpawnStatuses(teamName);
+      const second = svc.getMemberSpawnStatuses(teamName);
+      await Promise.resolve();
+
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(1);
+      refreshDeferred.resolve();
+      const [firstSnapshot, secondSnapshot] = await Promise.all([first, second]);
+
+      expect(firstSnapshot).toEqual(secondSnapshot);
+      expect(auditStatuses).toHaveBeenCalledTimes(1);
+      expect(persistSnapshot).toHaveBeenCalledTimes(1);
+
+      await svc.getMemberSpawnStatuses(teamName);
+
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(1);
+      expect(auditStatuses).toHaveBeenCalledTimes(1);
+      expect(persistSnapshot).toHaveBeenCalledTimes(1);
+    });
+
+    it('invalidates the short status cache when a real member-spawn change is emitted', async () => {
+      const svc = new TeamProvisioningService();
+      const teamName = 'spawn-cache-invalidated-team';
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+      });
+      run.isLaunch = true;
+      run.progress = {
+        teamName,
+        state: 'launching',
+        message: 'Launching',
+        updatedAt: '2026-05-02T10:00:00.000Z',
+      };
+      run.onProgress = vi.fn();
+      (svc as any).aliveRunByTeam.set(teamName, run.runId);
+      (svc as any).runs.set(run.runId, run);
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => null),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(async () => new Map());
+      const refreshLeadInbox = vi
+        .spyOn(svc as any, 'refreshMemberSpawnStatusesFromLeadInbox')
+        .mockResolvedValue(undefined);
+      vi.spyOn(svc as any, 'maybeAuditMemberSpawnStatuses').mockResolvedValue(undefined);
+      vi.spyOn(svc as any, 'persistLaunchStateSnapshot').mockResolvedValue(null);
+
+      await svc.getMemberSpawnStatuses(teamName);
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(1);
+
+      (svc as any).setMemberSpawnStatus(
+        run,
+        'alice',
+        'online',
+        undefined,
+        'heartbeat',
+        '2026-05-02T10:00:05.000Z'
+      );
+      await svc.getMemberSpawnStatuses(teamName);
+
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(2);
+    });
+
+    it('retries the owner status request when a member-spawn change lands while it is building', async () => {
+      const svc = new TeamProvisioningService();
+      const teamName = 'spawn-cache-owner-retry-team';
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+      });
+      run.isLaunch = true;
+      run.progress = {
+        teamName,
+        state: 'launching',
+        message: 'Launching',
+        updatedAt: '2026-05-02T10:00:00.000Z',
+      };
+      run.onProgress = vi.fn();
+      (svc as any).aliveRunByTeam.set(teamName, run.runId);
+      (svc as any).runs.set(run.runId, run);
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => null),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(async () => new Map());
+      const firstRefresh = createDeferred<void>();
+      const refreshLeadInbox = vi
+        .spyOn(svc as any, 'refreshMemberSpawnStatusesFromLeadInbox')
+        .mockImplementationOnce(async () => firstRefresh.promise)
+        .mockResolvedValue(undefined);
+      vi.spyOn(svc as any, 'maybeAuditMemberSpawnStatuses').mockResolvedValue(undefined);
+      vi.spyOn(svc as any, 'persistLaunchStateSnapshot').mockResolvedValue(null);
+
+      const pending = svc.getMemberSpawnStatuses(teamName);
+      await Promise.resolve();
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(1);
+
+      (svc as any).setMemberSpawnStatus(
+        run,
+        'alice',
+        'online',
+        undefined,
+        'heartbeat',
+        '2026-05-02T10:00:05.000Z'
+      );
+      firstRefresh.resolve();
+      const result = await pending;
+
+      expect(refreshLeadInbox).toHaveBeenCalledTimes(2);
+      expect(result.statuses.alice).toMatchObject({
+        status: 'online',
+        launchState: 'confirmed_alive',
+        bootstrapConfirmed: true,
+      });
+    });
+  });
+
+  describe('launch-state no-op persistence guard', () => {
+    it('does not rewrite launch-state or invalidate runtime cache for a recent semantic no-op', async () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:05.000Z'));
+      const svc = new TeamProvisioningService();
+      const teamName = 'launch-state-noop-team';
+      const status = createMemberSpawnStatusEntry({
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+      });
+      const previousSnapshot = snapshotFromRuntimeMemberStatuses({
+        teamName,
+        expectedMembers: ['alice'],
+        launchPhase: 'active',
+        updatedAt: '2026-05-02T10:00:02.000Z',
+        statuses: { alice: status as any },
+      });
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+        memberSpawnStatuses: new Map([['alice', status]]),
+      });
+      run.isLaunch = true;
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => previousSnapshot),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).launchStateWrittenRunIdByTeam.set(teamName, run.runId);
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      const invalidateRuntime = vi.spyOn(svc as any, 'invalidateRuntimeSnapshotCaches');
+
+      const result = await (svc as any).persistLaunchStateSnapshotNow(run, 'active');
+
+      expect(result).toBe(previousSnapshot);
+      expect((svc as any).launchStateStore.write).not.toHaveBeenCalled();
+      expect(invalidateRuntime).not.toHaveBeenCalled();
+    });
+
+    it('keeps a bounded launch-state heartbeat for unchanged active snapshots', async () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:20.000Z'));
+      const svc = new TeamProvisioningService();
+      const teamName = 'launch-state-heartbeat-team';
+      const status = createMemberSpawnStatusEntry({
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+      });
+      const previousSnapshot = snapshotFromRuntimeMemberStatuses({
+        teamName,
+        expectedMembers: ['alice'],
+        launchPhase: 'active',
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        statuses: { alice: status as any },
+      });
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+        memberSpawnStatuses: new Map([['alice', status]]),
+      });
+      run.isLaunch = true;
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => previousSnapshot),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      const invalidateRuntime = vi.spyOn(svc as any, 'invalidateRuntimeSnapshotCaches');
+
+      const result = await (svc as any).persistLaunchStateSnapshotNow(run, 'active');
+
+      expect(result.updatedAt).toBe('2026-05-02T10:00:20.000Z');
+      expect((svc as any).launchStateStore.write).toHaveBeenCalledTimes(1);
+      expect(invalidateRuntime).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not skip the first service-owned launch-state write for an existing snapshot', async () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:05.000Z'));
+      const svc = new TeamProvisioningService();
+      const teamName = 'launch-state-first-write-team';
+      const status = createMemberSpawnStatusEntry({
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+      });
+      const previousSnapshot = snapshotFromRuntimeMemberStatuses({
+        teamName,
+        expectedMembers: ['alice'],
+        launchPhase: 'active',
+        updatedAt: '2026-05-02T10:00:02.000Z',
+        statuses: { alice: status as any },
+      });
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+        memberSpawnStatuses: new Map([['alice', status]]),
+      });
+      run.isLaunch = true;
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => previousSnapshot),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      const invalidateRuntime = vi.spyOn(svc as any, 'invalidateRuntimeSnapshotCaches');
+
+      await (svc as any).persistLaunchStateSnapshotNow(run, 'active');
+
+      expect((svc as any).launchStateStore.write).toHaveBeenCalledTimes(1);
+      expect(invalidateRuntime).toHaveBeenCalledTimes(1);
+    });
+
+    it('does not skip the first write for a new run even when the previous snapshot is semantically equal', async () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:05.000Z'));
+      const svc = new TeamProvisioningService();
+      const teamName = 'launch-state-new-run-team';
+      const status = createMemberSpawnStatusEntry({
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+      });
+      const previousSnapshot = snapshotFromRuntimeMemberStatuses({
+        teamName,
+        expectedMembers: ['alice'],
+        launchPhase: 'active',
+        updatedAt: '2026-05-02T10:00:02.000Z',
+        statuses: { alice: status as any },
+      });
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+        memberSpawnStatuses: new Map([['alice', status]]),
+      });
+      run.isLaunch = true;
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => previousSnapshot),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).launchStateWrittenRunIdByTeam.set(teamName, 'previous-run-id');
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      const invalidateRuntime = vi.spyOn(svc as any, 'invalidateRuntimeSnapshotCaches');
+
+      const result = await (svc as any).persistLaunchStateSnapshotNow(run, 'active');
+
+      expect(result.updatedAt).toBe('2026-05-02T10:00:05.000Z');
+      expect((svc as any).launchStateStore.write).toHaveBeenCalledTimes(1);
+      expect(invalidateRuntime).toHaveBeenCalledTimes(1);
+    });
+
+    it('writes and invalidates runtime cache when launch-state semantics change', async () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:05.000Z'));
+      const svc = new TeamProvisioningService();
+      const teamName = 'launch-state-change-team';
+      const previousStatus = createMemberSpawnStatusEntry({
+        status: 'waiting',
+        launchState: 'runtime_pending_bootstrap',
+        updatedAt: '2026-05-02T10:00:00.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+      });
+      const nextStatus = createMemberSpawnStatusEntry({
+        status: 'online',
+        launchState: 'confirmed_alive',
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        livenessSource: 'heartbeat',
+        updatedAt: '2026-05-02T10:00:05.000Z',
+        firstSpawnAcceptedAt: '2026-05-02T10:00:00.000Z',
+        lastHeartbeatAt: '2026-05-02T10:00:05.000Z',
+      });
+      const previousSnapshot = snapshotFromRuntimeMemberStatuses({
+        teamName,
+        expectedMembers: ['alice'],
+        launchPhase: 'active',
+        updatedAt: '2026-05-02T10:00:02.000Z',
+        statuses: { alice: previousStatus as any },
+      });
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['alice'],
+        memberSpawnStatuses: new Map([['alice', nextStatus]]),
+      });
+      run.isLaunch = true;
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => previousSnapshot),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+      (svc as any).membersMetaStore = { getMembers: vi.fn(async () => []) };
+      const invalidateRuntime = vi.spyOn(svc as any, 'invalidateRuntimeSnapshotCaches');
+
+      const result = await (svc as any).persistLaunchStateSnapshotNow(run, 'active');
+
+      expect(result.members.alice?.launchState).toBe('confirmed_alive');
+      expect((svc as any).launchStateStore.write).toHaveBeenCalledTimes(1);
+      expect(invalidateRuntime).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('getTeamAgentRuntimeSnapshot', () => {
+    it('dedupes concurrent runtime snapshot probes for the same team', async () => {
+      const svc = new TeamProvisioningService();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          members: [
+            { name: 'team-lead', agentType: 'team-lead' },
+            { name: 'alice', model: 'gpt-5.4-mini' },
+          ],
+        })),
+      };
+      (svc as any).readPersistedRuntimeMembers = vi.fn(() => [
+        {
+          name: 'alice',
+          agentId: 'alice@runtime-team',
+          tmuxPaneId: '%1',
+          backendType: 'tmux',
+        },
+      ]);
+      (svc as any).aliveRunByTeam.set('runtime-team', 'run-1');
+      (svc as any).runs.set('run-1', {
+        runId: 'run-1',
+        child: { pid: 111 },
+        request: { model: 'gpt-5.4' },
+        processKilled: false,
+        cancelRequested: false,
+        spawnContext: null,
+      });
+      const paneInfo = createDeferred<Map<string, { paneId: string; panePid: number }>>();
+      vi.mocked(listTmuxPaneRuntimeInfoForCurrentPlatform).mockReturnValueOnce(
+        paneInfo.promise as ReturnType<typeof listTmuxPaneRuntimeInfoForCurrentPlatform>
+      );
+      vi.mocked(pidusage).mockResolvedValueOnce({
+        '111': createPidusageStat(111, 123_000_000),
+        '222': createPidusageStat(222, 456_000_000),
+      } as any);
+
+      const first = svc.getTeamAgentRuntimeSnapshot('runtime-team');
+      const second = svc.getTeamAgentRuntimeSnapshot('runtime-team');
+      paneInfo.resolve(
+        new Map([
+          [
+            '%1',
+            {
+              paneId: '%1',
+              panePid: 222,
+            },
+          ],
+        ])
+      );
+      const [firstSnapshot, secondSnapshot] = await Promise.all([first, second]);
+
+      expect(listTmuxPaneRuntimeInfoForCurrentPlatform).toHaveBeenCalledTimes(1);
+      expect(pidusage).toHaveBeenCalledTimes(1);
+      expect(firstSnapshot.members.alice?.pid).toBe(222);
+      expect(secondSnapshot.members.alice?.pid).toBe(222);
+    });
+
+    it('does not cache live runtime metadata when invalidated while the probe is in flight', async () => {
+      const svc = new TeamProvisioningService();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          members: [
+            { name: 'team-lead', agentType: 'team-lead' },
+            { name: 'alice', model: 'gpt-5.4-mini' },
+          ],
+        })),
+      };
+      const processRows = createDeferred<Awaited<ReturnType<typeof listRuntimeProcessesForCurrentTmuxPlatform>>>();
+      vi.mocked(listRuntimeProcessesForCurrentTmuxPlatform)
+        .mockReturnValueOnce(processRows.promise)
+        .mockResolvedValueOnce([]);
+
+      const first = (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team') as Promise<
+        Map<string, unknown>
+      >;
+      (svc as any).invalidateRuntimeSnapshotCaches('runtime-team');
+      processRows.resolve([]);
+      await first;
+
+      await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team');
+
+      expect(listRuntimeProcessesForCurrentTmuxPlatform).toHaveBeenCalledTimes(2);
+    });
+
+    it('returns cloned live runtime metadata maps from cache', async () => {
+      const svc = new TeamProvisioningService();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          members: [
+            { name: 'team-lead', agentType: 'team-lead' },
+            { name: 'alice', model: 'gpt-5.4-mini' },
+          ],
+        })),
+      };
+      vi.mocked(listRuntimeProcessesForCurrentTmuxPlatform).mockResolvedValueOnce([]);
+
+      const first = (await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team')) as Map<
+        string,
+        unknown
+      >;
+      expect(first.has('alice')).toBe(true);
+      first.delete('alice');
+
+      const second = (await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team')) as Map<
+        string,
+        unknown
+      >;
+
+      expect(second.has('alice')).toBe(true);
+      expect(listRuntimeProcessesForCurrentTmuxPlatform).toHaveBeenCalledTimes(1);
+    });
+
+    it('clears runtime probe caches when starting a new run for the team', async () => {
+      const svc = new TeamProvisioningService();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          members: [
+            { name: 'team-lead', agentType: 'team-lead' },
+            { name: 'alice', model: 'gpt-5.4-mini' },
+          ],
+        })),
+      };
+      vi.mocked(listRuntimeProcessesForCurrentTmuxPlatform)
+        .mockResolvedValueOnce([])
+        .mockResolvedValueOnce([]);
+
+      await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team');
+      (svc as any).resetTeamScopedTransientStateForNewRun('runtime-team');
+      await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team');
+
+      expect(listRuntimeProcessesForCurrentTmuxPlatform).toHaveBeenCalledTimes(2);
+    });
+
+    it('does not cache a probe that started before runtime adapter evidence was installed', async () => {
+      const svc = new TeamProvisioningService();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          members: [
+            { name: 'team-lead', agentType: 'team-lead' },
+            { name: 'alice', providerId: 'opencode', model: 'gpt-5.4-mini' },
+          ],
+        })),
+      };
+      (svc as any).provisioningRunByTeam.set('runtime-team', 'run-1');
+      const processRows = createDeferred<Awaited<ReturnType<typeof listRuntimeProcessesForCurrentTmuxPlatform>>>();
+      vi.mocked(listRuntimeProcessesForCurrentTmuxPlatform)
+        .mockReturnValueOnce(processRows.promise)
+        .mockResolvedValueOnce([]);
+
+      const first = (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team') as Promise<
+        Map<string, unknown>
+      >;
+      (svc as any).runtimeAdapterRunByTeam.set('runtime-team', {
+        runId: 'run-1',
+        providerId: 'opencode',
+        cwd: '/tmp/runtime-project',
+        members: {
+          alice: {
+            providerId: 'opencode',
+            runtimeAlive: true,
+            bootstrapConfirmed: false,
+            runtimePid: 333,
+            livenessKind: 'runtime_process',
+            pidSource: 'agent_process_table',
+          },
+        },
+      });
+      (svc as any).invalidateRuntimeSnapshotCaches('runtime-team');
+      processRows.resolve([]);
+      await first;
+
+      await (svc as any).getLiveTeamAgentRuntimeMetadata('runtime-team');
+
+      expect(listRuntimeProcessesForCurrentTmuxPlatform).toHaveBeenCalledTimes(2);
+    });
+
     it('uses batched pidusage rss values for lead and teammates', async () => {
       const svc = new TeamProvisioningService();
       (svc as any).configReader = {
@@ -3289,6 +4423,8 @@ describe('TeamProvisioningService', () => {
           providerId: 'opencode',
           model: 'minimax-m2.5-free',
           effort: 'medium',
+          runtimeOnly: true,
+          skipReadinessPreflight: true,
           cwd: '/tmp/mixed-team',
           expectedMembers: [
             expect.objectContaining({
@@ -3392,6 +4528,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -3438,6 +4575,326 @@ describe('TeamProvisioningService', () => {
       });
     });
 
+    it('persists verified OpenCode bridge runtime pids so member cards can show memory', async () => {
+      const svc = new TeamProvisioningService();
+      const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
+        ok: true,
+        providerId: 'opencode',
+        memberName: String(input.memberName),
+        sessionId: 'oc-session-bob',
+        runtimePid: 456,
+        diagnostics: [],
+      }));
+      const registry = new TeamRuntimeAdapterRegistry([
+        {
+          providerId: 'opencode',
+          prepare: vi.fn(),
+          launch: vi.fn(),
+          reconcile: vi.fn(),
+          stop: vi.fn(),
+          sendMessageToMember,
+        } as any,
+      ]);
+      svc.setRuntimeAdapterRegistry(registry);
+      vi.spyOn(svc as any, 'readProcessCommandByPid').mockReturnValue(
+        '/opt/homebrew/bin/opencode serve --hostname 127.0.0.1 --port 45678'
+      );
+
+      (svc as any).getTrackedRunId = vi.fn(() => 'run-1');
+      (svc as any).provisioningRunByTeam.set('team-a', 'run-1');
+      (svc as any).setSecondaryRuntimeRun({
+        teamName: 'team-a',
+        runId: 'opencode-run-bob',
+        providerId: 'opencode',
+        laneId: 'secondary:opencode:bob',
+        memberName: 'bob',
+        cwd: '/repo',
+      });
+      writeLaunchState('team-a', 'lead-session', {
+        bob: {
+          providerId: 'opencode',
+          model: 'opencode/minimax-m2.5-free',
+          laneId: 'secondary:opencode:bob',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          launchState: 'confirmed_alive',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: true,
+          hardFailure: false,
+          runtimeRunId: 'opencode-run-bob',
+          runtimeSessionId: 'oc-session-bob',
+          livenessKind: 'confirmed_bootstrap',
+        },
+      });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          projectPath: '/repo',
+          members: [
+            { name: 'team-lead', providerId: 'codex', model: 'gpt-5.4' },
+            { name: 'bob', providerId: 'opencode', model: 'opencode/minimax-m2.5-free' },
+          ],
+        })),
+      };
+      (svc as any).teamMetaStore = {
+        getMeta: vi.fn(async () => ({
+          launchIdentity: { providerId: 'codex' },
+          providerId: 'codex',
+        })),
+      };
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => [
+          {
+            name: 'bob',
+            providerId: 'opencode',
+            model: 'opencode/minimax-m2.5-free',
+          },
+        ]),
+      };
+      vi.mocked(listRuntimeProcessesForCurrentTmuxPlatform).mockResolvedValue([
+        {
+          pid: 456,
+          ppid: 1,
+          command: '/opt/homebrew/bin/opencode serve --hostname 127.0.0.1 --port 45678',
+        },
+      ]);
+      vi.mocked(pidusage).mockReset();
+      vi.mocked(pidusage).mockImplementation(
+        async (target: number | string | Array<number | string>) => {
+          if (Array.isArray(target)) {
+            return {
+              '456': createPidusageStat(456, 456_000_000),
+            } as any;
+          }
+          if (target === 456) {
+            return createPidusageStat(456, 456_000_000) as any;
+          }
+          throw new Error(`Unexpected pidusage target: ${String(target)}`);
+        }
+      );
+
+      await expect(
+        svc.deliverOpenCodeMemberMessage('team-a', {
+          memberName: 'bob',
+          text: 'hello bob',
+          messageId: 'msg-1',
+        })
+      ).resolves.toMatchObject({ delivered: true });
+
+      const persisted = JSON.parse(fs.readFileSync(getTeamLaunchStatePath('team-a'), 'utf8'));
+      expect(persisted.members.bob).toMatchObject({
+        runtimePid: 456,
+        pidSource: 'opencode_bridge',
+        runtimeSessionId: 'oc-session-bob',
+      });
+
+      const snapshot = await svc.getTeamAgentRuntimeSnapshot('team-a');
+      expect(snapshot.members.bob).toMatchObject({
+        memberName: 'bob',
+        providerId: 'opencode',
+        pid: 456,
+        runtimePid: 456,
+        rssBytes: 456_000_000,
+        livenessKind: 'runtime_process_candidate',
+      });
+    });
+
+    it('does not persist OpenCode bridge runtime pids when process identity is not verified', async () => {
+      const svc = new TeamProvisioningService();
+      const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
+        ok: true,
+        providerId: 'opencode',
+        memberName: String(input.memberName),
+        sessionId: 'oc-session-bob',
+        runtimePid: 456,
+        diagnostics: [],
+      }));
+      const registry = new TeamRuntimeAdapterRegistry([
+        {
+          providerId: 'opencode',
+          prepare: vi.fn(),
+          launch: vi.fn(),
+          reconcile: vi.fn(),
+          stop: vi.fn(),
+          sendMessageToMember,
+        } as any,
+      ]);
+      svc.setRuntimeAdapterRegistry(registry);
+      vi.spyOn(svc as any, 'readProcessCommandByPid').mockReturnValue('/usr/bin/yes');
+
+      (svc as any).getTrackedRunId = vi.fn(() => 'run-1');
+      (svc as any).provisioningRunByTeam.set('team-a', 'run-1');
+      (svc as any).setSecondaryRuntimeRun({
+        teamName: 'team-a',
+        runId: 'opencode-run-bob',
+        providerId: 'opencode',
+        laneId: 'secondary:opencode:bob',
+        memberName: 'bob',
+        cwd: '/repo',
+      });
+      writeLaunchState('team-a', 'lead-session', {
+        bob: {
+          providerId: 'opencode',
+          model: 'opencode/minimax-m2.5-free',
+          laneId: 'secondary:opencode:bob',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          launchState: 'confirmed_alive',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: true,
+          hardFailure: false,
+          runtimeRunId: 'opencode-run-bob',
+          runtimeSessionId: 'oc-session-bob',
+          livenessKind: 'confirmed_bootstrap',
+        },
+      });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          projectPath: '/repo',
+          members: [
+            { name: 'team-lead', providerId: 'codex', model: 'gpt-5.4' },
+            { name: 'bob', providerId: 'opencode', model: 'opencode/minimax-m2.5-free' },
+          ],
+        })),
+      };
+      (svc as any).teamMetaStore = {
+        getMeta: vi.fn(async () => ({
+          launchIdentity: { providerId: 'codex' },
+          providerId: 'codex',
+        })),
+      };
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => [
+          {
+            name: 'bob',
+            providerId: 'opencode',
+            model: 'opencode/minimax-m2.5-free',
+          },
+        ]),
+      };
+
+      await expect(
+        svc.deliverOpenCodeMemberMessage('team-a', {
+          memberName: 'bob',
+          text: 'hello bob',
+          messageId: 'msg-1',
+        })
+      ).resolves.toMatchObject({ delivered: true });
+
+      const persisted = JSON.parse(fs.readFileSync(getTeamLaunchStatePath('team-a'), 'utf8'));
+      expect(persisted.members.bob.runtimePid).toBeUndefined();
+      expect(persisted.members.bob.pidSource).toBeUndefined();
+    });
+
+    it('uses snapshot config reads for OpenCode member delivery routing', async () => {
+      const getConfig = vi.fn(async () => {
+        throw new Error('verified config read should not be used for delivery routing');
+      });
+      const getConfigSnapshot = vi.fn(async () => ({
+        projectPath: '/repo',
+        members: [
+          { name: 'team-lead', providerId: 'codex', model: 'gpt-5.4' },
+          { name: 'bob', providerId: 'opencode', model: 'minimax-m2.5-free' },
+        ],
+      }));
+      const svc = new TeamProvisioningService({
+        getConfig,
+        getConfigSnapshot,
+      } as any);
+      const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
+        ok: true,
+        providerId: 'opencode',
+        memberName: String(input.memberName),
+        sessionId: 'oc-session-bob',
+        diagnostics: [],
+      }));
+      svc.setRuntimeAdapterRegistry(
+        new TeamRuntimeAdapterRegistry([
+          {
+            providerId: 'opencode',
+            prepare: vi.fn(),
+            launch: vi.fn(),
+            reconcile: vi.fn(),
+            stop: vi.fn(),
+            sendMessageToMember,
+          } as any,
+        ])
+      );
+      (svc as any).teamMetaStore = {
+        getMeta: vi.fn(async () => ({
+          launchIdentity: { providerId: 'codex' },
+          providerId: 'codex',
+        })),
+      };
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => [
+          { name: 'bob', providerId: 'opencode', model: 'opencode/minimax-m2.5-free' },
+        ]),
+      };
+      (svc as any).setSecondaryRuntimeRun({
+        teamName: 'team-a',
+        runId: 'opencode-run-bob',
+        providerId: 'opencode',
+        laneId: 'secondary:opencode:bob',
+        memberName: 'bob',
+        cwd: '/repo',
+      });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
+
+      await expect(
+        svc.deliverOpenCodeMemberMessage('team-a', {
+          memberName: 'bob',
+          text: 'hello bob',
+          messageId: 'msg-1',
+        })
+      ).resolves.toMatchObject({ delivered: true });
+
+      expect(getConfigSnapshot).toHaveBeenCalledWith('team-a');
+      expect(getConfig).not.toHaveBeenCalled();
+    });
+
+    it('resolves OpenCode runtime lane members from one snapshot directory read', async () => {
+      const getConfig = vi.fn(async () => {
+        throw new Error('verified config read should not be used for lane member resolution');
+      });
+      const getConfigSnapshot = vi.fn(async () => ({
+        projectPath: '/repo',
+        members: [
+          { name: 'team-lead', providerId: 'codex', model: 'gpt-5.4' },
+          { name: 'bob', providerId: 'opencode', model: 'minimax-m2.5-free' },
+          { name: 'alice', providerId: 'codex', model: 'gpt-5.4' },
+        ],
+      }));
+      const svc = new TeamProvisioningService({
+        getConfig,
+        getConfigSnapshot,
+      } as any);
+      (svc as any).teamMetaStore = {
+        getMeta: vi.fn(async () => ({
+          launchIdentity: { providerId: 'codex' },
+          providerId: 'codex',
+        })),
+      };
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => [
+          { name: 'bob', providerId: 'opencode', model: 'opencode/minimax-m2.5-free' },
+        ]),
+      };
+
+      await expect(
+        (svc as any).resolveOpenCodeMembersForRuntimeLane(
+          'team-a',
+          'secondary:opencode:bob'
+        )
+      ).resolves.toEqual(['bob']);
+
+      expect(getConfigSnapshot).toHaveBeenCalledTimes(1);
+      expect(getConfig).not.toHaveBeenCalled();
+    });
+
     it('delivers OpenCode secondary-lane messages to the member worktree cwd after restart', async () => {
       const svc = new TeamProvisioningService();
       const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
@@ -3470,6 +4927,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo/.agent-team-worktrees/bob',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).resolveCurrentOpenCodeRuntimeRunId = vi.fn(async () => 'opencode-run-bob');
       (svc as any).isOpenCodeRuntimeLaneIndexActive = vi.fn(async () => true);
       (svc as any).configReader = {
@@ -3551,7 +5009,7 @@ describe('TeamProvisioningService', () => {
           visibleMessageToolCallId: null,
           visibleReplyMessageId: null,
           visibleReplyCorrelation: null,
-          latestAssistantPreview: null,
+          latestAssistantPreview: 'Answer after observe.',
           reason: null,
         },
         diagnostics: [],
@@ -3579,6 +5037,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -3639,8 +5098,21 @@ describe('TeamProvisioningService', () => {
         })
       ).resolves.toMatchObject({
         delivered: true,
-        responsePending: false,
-        responseState: 'responded_plain_text',
+          responsePending: false,
+          responseState: 'responded_plain_text',
+          visibleReplyCorrelation: 'plain_assistant_text',
+        });
+
+      const userInbox = JSON.parse(
+        await fsPromises.readFile(path.join(tempTeamsBase, 'team-a', 'inboxes', 'user.json'), 'utf8')
+      ) as Array<Record<string, unknown>>;
+      expect(userInbox).toHaveLength(1);
+      expect(userInbox[0]).toMatchObject({
+        from: 'bob',
+        to: 'user',
+        text: 'Answer after observe.',
+        relayOfMessageId: 'msg-ledger-1',
+        source: 'runtime_delivery',
       });
 
       expect(sendMessageToMember).toHaveBeenCalledTimes(1);
@@ -3716,6 +5188,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -3845,6 +5318,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -3933,6 +5407,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -4041,6 +5516,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -4124,6 +5600,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -4236,6 +5713,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -4691,6 +6169,7 @@ describe('TeamProvisioningService', () => {
           memberName: 'bob',
           cwd: '/repo',
         });
+        await writeDefaultBobOpenCodeBootstrapEvidence();
         (svc as any).configReader = {
           getConfig: vi.fn(async () => ({
             projectPath: '/repo',
@@ -4807,6 +6286,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -4932,6 +6412,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -5037,6 +6518,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -5184,6 +6666,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -5307,6 +6790,7 @@ describe('TeamProvisioningService', () => {
         memberName: 'bob',
         cwd: '/repo',
       });
+      await writeDefaultBobOpenCodeBootstrapEvidence();
       (svc as any).configReader = {
         getConfig: vi.fn(async () => ({
           projectPath: '/repo',
@@ -5445,25 +6929,21 @@ describe('TeamProvisioningService', () => {
         laneId,
         state: 'active',
       });
-      const manifestPath = getOpenCodeRuntimeManifestPath(tempTeamsBase, teamName, laneId);
-      await fsPromises.mkdir(path.dirname(manifestPath), { recursive: true });
-      await fsPromises.writeFile(
-        manifestPath,
-        `${JSON.stringify(
+      await writeCommittedOpenCodeSessionStore({
+        teamName,
+        laneId,
+        runId: 'opencode-run-durable',
+        sessions: [
           {
-            ...createDefaultRuntimeStoreManifest(teamName, '2026-04-22T12:00:00.000Z'),
-            activeRunId: 'opencode-run-durable',
+            id: 'oc-session-bob',
+            teamName,
+            memberName: 'bob',
+            laneId,
+            runId: 'opencode-run-durable',
+            source: 'runtime_bootstrap_checkin',
           },
-          null,
-          2
-        )}\n`,
-        'utf8'
-      );
-      await fsPromises.writeFile(
-        path.join(path.dirname(manifestPath), 'opencode-sessions.json'),
-        `${JSON.stringify({ sessions: [{ id: 'oc-session-bob' }] })}\n`,
-        'utf8'
-      );
+        ],
+      });
 
       await expect(
         svc.deliverOpenCodeMemberMessage(teamName, {
@@ -5488,6 +6968,85 @@ describe('TeamProvisioningService', () => {
       );
     });
 
+    it('blocks OpenCode secondary delivery when runtime session exists but bootstrap did not check in', async () => {
+      const svc = new TeamProvisioningService();
+      const teamName = 'team-a';
+      const laneId = 'secondary:opencode:bob';
+      const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
+        ok: true,
+        providerId: 'opencode',
+        memberName: String(input.memberName),
+        sessionId: 'oc-session-bob',
+        diagnostics: [],
+      }));
+      svc.setRuntimeAdapterRegistry(
+        new TeamRuntimeAdapterRegistry([
+          {
+            providerId: 'opencode',
+            prepare: vi.fn(),
+            launch: vi.fn(),
+            reconcile: vi.fn(),
+            stop: vi.fn(),
+            sendMessageToMember,
+          } as any,
+        ])
+      );
+      (svc as any).configReader = {
+        getConfig: vi.fn(async () => ({
+          projectPath: '/repo',
+          members: [
+            { name: 'team-lead', providerId: 'codex', model: 'gpt-5.4' },
+            { name: 'bob', providerId: 'opencode', model: 'minimax-m2.5-free' },
+          ],
+        })),
+      };
+      (svc as any).teamMetaStore = {
+        getMeta: vi.fn(async () => ({
+          launchIdentity: { providerId: 'codex' },
+          providerId: 'codex',
+        })),
+      };
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => [
+          { name: 'bob', providerId: 'opencode', model: 'opencode/minimax-m2.5-free' },
+        ]),
+      };
+      await upsertOpenCodeRuntimeLaneIndexEntry({
+        teamsBasePath: tempTeamsBase,
+        teamName,
+        laneId,
+        state: 'active',
+      });
+      await writeCommittedOpenCodeSessionStore({
+        teamName,
+        laneId,
+        runId: 'opencode-run-pending-bootstrap',
+        sessions: [],
+      });
+
+      await expect(
+        svc.deliverOpenCodeMemberMessage(teamName, {
+          memberName: 'bob',
+          text: 'must wait for bootstrap',
+          messageId: 'msg-before-bootstrap-checkin',
+        })
+      ).resolves.toMatchObject({
+        delivered: false,
+        reason: 'opencode_runtime_not_active',
+        diagnostics: [
+          expect.stringContaining('OpenCode runtime bootstrap is not confirmed for bob'),
+        ],
+      });
+      expect(sendMessageToMember).not.toHaveBeenCalled();
+      await expect(readOpenCodeRuntimeLaneIndex(tempTeamsBase, teamName)).resolves.toMatchObject({
+        lanes: {
+          [laneId]: {
+            state: 'active',
+          },
+        },
+      });
+    });
+
     it('rejects stale active lane manifest without runtime evidence before delivery', async () => {
       const svc = new TeamProvisioningService();
       const teamName = 'team-a';
@@ -5728,25 +7287,21 @@ describe('TeamProvisioningService', () => {
         laneId,
         state: 'active',
       });
-      const manifestPath = getOpenCodeRuntimeManifestPath(tempTeamsBase, teamName, laneId);
-      await fsPromises.mkdir(path.dirname(manifestPath), { recursive: true });
-      await fsPromises.writeFile(
-        manifestPath,
-        `${JSON.stringify(
+      await writeCommittedOpenCodeSessionStore({
+        teamName,
+        laneId,
+        runId: 'opencode-run-from-manifest',
+        sessions: [
           {
-            ...createDefaultRuntimeStoreManifest(teamName, '2026-04-22T12:00:00.000Z'),
-            activeRunId: 'opencode-run-from-manifest',
+            id: 'oc-session-bob',
+            teamName,
+            memberName: 'bob',
+            laneId,
+            runId: 'opencode-run-from-manifest',
+            source: 'runtime_bootstrap_checkin',
           },
-          null,
-          2
-        )}\n`,
-        'utf8'
-      );
-      await fsPromises.writeFile(
-        path.join(path.dirname(manifestPath), 'opencode-sessions.json'),
-        `${JSON.stringify({ sessions: [{ id: 'oc-session-bob' }] })}\n`,
-        'utf8'
-      );
+        ],
+      });
 
       await expect(
         svc.deliverOpenCodeMemberMessage(teamName, {
@@ -5899,6 +7454,9 @@ describe('TeamProvisioningService', () => {
                 state: 'degraded',
                 diagnostics: expect.arrayContaining([
                   'OpenCode readiness bridge failed: timeout: OpenCode bridge command timed out',
+                  expect.stringMatching(
+                    /^OpenCode secondary lane timing: member=bob queueWaitMs=\d+ms launchMs=\d+ms totalMs=\d+ms$/
+                  ),
                 ]),
               },
             },
@@ -5908,6 +7466,237 @@ describe('TeamProvisioningService', () => {
       );
     });
 
+    it('does not keep an OpenCode secondary lane active from prompt acceptance without runtime evidence', async () => {
+      const teamName = 'mixed-accepted-without-runtime-evidence';
+      const svc = new TeamProvisioningService();
+      const adapterLaunch = vi.fn(async (input: Record<string, unknown>) => ({
+        runId: String(input.runId),
+        teamName: String(input.teamName),
+        launchPhase: 'finished',
+        teamLaunchState: 'partial_failure',
+        members: {
+          tom: {
+            memberName: 'tom',
+            providerId: 'opencode',
+            launchState: 'failed_to_start',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: true,
+            hardFailureReason: 'OpenCode bridge reported member launch failure',
+            diagnostics: ['runtime_bootstrap_checkin failed: MCP Not connected'],
+          },
+        },
+        warnings: [],
+        diagnostics: ['OpenCode bridge reported member launch failure'],
+      }));
+      svc.setRuntimeAdapterRegistry(
+        new TeamRuntimeAdapterRegistry([
+          {
+            providerId: 'opencode',
+            prepare: vi.fn(),
+            launch: adapterLaunch,
+            reconcile: vi.fn(),
+            stop: vi.fn(),
+          } as any,
+        ])
+      );
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => null),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['bob'],
+      });
+      run.isLaunch = true;
+      run.request = {
+        teamName,
+        cwd: '/tmp/mixed-accepted-without-runtime-evidence',
+        providerId: 'codex',
+        model: 'gpt-5.4',
+        effort: 'high',
+        skipPermissions: true,
+      };
+      run.effectiveMembers = [
+        {
+          name: 'bob',
+          role: 'Developer',
+          providerId: 'codex',
+          model: 'gpt-5.4',
+          effort: 'high',
+        },
+      ];
+      run.mixedSecondaryLanes = [
+        {
+          laneId: 'secondary:opencode:tom',
+          providerId: 'opencode',
+          member: {
+            name: 'tom',
+            role: 'Developer',
+            providerId: 'opencode',
+            model: 'minimax-m2.5-free',
+            effort: 'medium',
+          },
+          runId: null,
+          state: 'queued',
+          result: null,
+          warnings: [],
+          diagnostics: [],
+        },
+      ];
+
+      await (svc as any).launchMixedSecondaryLaneIfNeeded(run);
+      await vi.waitFor(
+        async () => {
+          await expect(readOpenCodeRuntimeLaneIndex(tempTeamsBase, teamName)).resolves.toMatchObject({
+            lanes: {
+              'secondary:opencode:tom': {
+                state: 'degraded',
+                diagnostics: expect.not.arrayContaining([
+                  'opencode_bootstrap_pending_after_materialized_session',
+                ]),
+              },
+            },
+          });
+          expect(run.mixedSecondaryLanes?.[0]?.result?.members.tom).toMatchObject({
+            launchState: 'failed_to_start',
+            hardFailure: true,
+          });
+        },
+        { timeout: 5000 }
+      );
+    });
+
+    it('keeps an OpenCode secondary lane active when bootstrap is pending after runtime materializes', async () => {
+      const teamName = 'mixed-runtime-materialized-failure';
+      const svc = new TeamProvisioningService();
+      const adapterLaunch = vi.fn(async (input: Record<string, unknown>) => ({
+        runId: String(input.runId),
+        teamName: String(input.teamName),
+        launchPhase: 'active',
+        teamLaunchState: 'partial_failure',
+        members: {
+          tom: {
+            memberName: 'tom',
+            providerId: 'opencode',
+            launchState: 'failed_to_start',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: true,
+            hardFailureReason: 'OpenCode bridge reported member launch failure',
+            sessionId: 'ses_tom_materialized_without_bootstrap',
+            runtimePid: 71388,
+            livenessKind: 'runtime_process',
+            diagnostics: [
+              'OpenCode bootstrap MCP did not complete required tools before assistant response: runtime_bootstrap_checkin, member_briefing',
+            ],
+          },
+        },
+        warnings: [],
+        diagnostics: ['OpenCode bridge reported member launch failure'],
+      }));
+
+      svc.setRuntimeAdapterRegistry(
+        new TeamRuntimeAdapterRegistry([
+          {
+            providerId: 'opencode',
+            prepare: vi.fn(),
+            launch: adapterLaunch,
+            reconcile: vi.fn(),
+            stop: vi.fn(),
+          } as any,
+        ])
+      );
+      (svc as any).launchStateStore = {
+        read: vi.fn(async () => null),
+        write: vi.fn(async () => {}),
+        clear: vi.fn(async () => {}),
+      };
+
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['bob'],
+      });
+      run.isLaunch = true;
+      run.request = {
+        teamName,
+        cwd: '/tmp/mixed-runtime-materialized-failure',
+        providerId: 'codex',
+        model: 'gpt-5.4',
+        effort: 'high',
+        skipPermissions: true,
+      };
+      run.effectiveMembers = [
+        {
+          name: 'bob',
+          role: 'Developer',
+          providerId: 'codex',
+          model: 'gpt-5.4',
+          effort: 'high',
+        },
+      ];
+      run.mixedSecondaryLanes = [
+        {
+          laneId: 'secondary:opencode:tom',
+          providerId: 'opencode',
+          member: {
+            name: 'tom',
+            role: 'Developer',
+            providerId: 'opencode',
+            model: 'minimax-m2.5-free',
+            effort: 'medium',
+          },
+          runId: null,
+          state: 'queued',
+          result: null,
+          warnings: [],
+          diagnostics: [],
+        },
+      ];
+
+      await (svc as any).launchMixedSecondaryLaneIfNeeded(run);
+      await vi.waitFor(
+        async () => {
+          expect(adapterLaunch).toHaveBeenCalledTimes(1);
+          const launchInput = adapterLaunch.mock.calls[0]?.[0] as { runId?: string } | undefined;
+          await expect(
+            new OpenCodeRuntimeManifestEvidenceReader({ teamsBasePath: tempTeamsBase }).read(
+              teamName,
+              'secondary:opencode:tom'
+            )
+          ).resolves.toMatchObject({
+            activeRunId: launchInput?.runId,
+          });
+          await expect(readOpenCodeRuntimeLaneIndex(tempTeamsBase, teamName)).resolves.toMatchObject({
+            lanes: {
+              'secondary:opencode:tom': {
+                state: 'active',
+                diagnostics: expect.arrayContaining([
+                  'OpenCode bridge reported member launch failure',
+                  'OpenCode bootstrap MCP did not complete required tools before assistant response: runtime_bootstrap_checkin, member_briefing',
+                  'opencode_bootstrap_pending_after_materialized_session',
+                ]),
+              },
+            },
+          });
+          expect(run.mixedSecondaryLanes?.[0]?.result?.members.tom).toMatchObject({
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: true,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            livenessKind: 'runtime_process',
+          });
+          expect(run.mixedSecondaryLanes?.[0]?.result?.teamLaunchState).toBe('partial_pending');
+        },
+        { timeout: 5000 }
+      );
+    });
+
     it('starts queued OpenCode secondary lanes sequentially without blocking launch progress', async () => {
       const svc = new TeamProvisioningService();
       const registry = new TeamRuntimeAdapterRegistry([
@@ -6017,13 +7806,18 @@ describe('TeamProvisioningService', () => {
       expect(launchSingleMixedSecondaryLane).toHaveBeenCalledTimes(1);
       expect(run.mixedSecondaryLanes.map((lane: { state: string }) => lane.state)).toEqual([
         'launching',
-        'launching',
-        'launching',
+        'queued',
+        'queued',
       ]);
 
       await expect(resultPromise).resolves.toBeNull();
       expect(persistLaunchStateSnapshot).toHaveBeenCalledTimes(1);
 
+      await (svc as any).launchMixedSecondaryLaneIfNeeded(run);
+      await Promise.resolve();
+      expect(launchSingleMixedSecondaryLane).toHaveBeenCalledTimes(1);
+      expect(persistLaunchStateSnapshot).toHaveBeenCalledTimes(2);
+
       resolveFirstLaunch();
       await Promise.resolve();
       await vi.waitFor(() => expect(launchSingleMixedSecondaryLane).toHaveBeenCalledTimes(3));
@@ -6463,7 +8257,7 @@ describe('TeamProvisioningService', () => {
       expect(writtenSnapshot?.expectedMembers).toEqual(['bob', 'alice']);
     });
 
-    it('accepts duplicate OpenCode bootstrap check-ins for the same runtime session without rewriting liveness', async () => {
+    it('accepts duplicate OpenCode bootstrap check-ins for the same runtime session and refreshes liveness', async () => {
       const svc = new TeamProvisioningService();
       const previousSnapshot = {
         version: 2 as const,
@@ -6520,7 +8314,41 @@ describe('TeamProvisioningService', () => {
         diagnostics: ['opencode_bootstrap_checkin_duplicate_accepted'],
         runtimeSessionId: 'session-bob',
       });
-      expect(updateLiveness).not.toHaveBeenCalled();
+      expect(updateLiveness).toHaveBeenCalledWith(
+        expect.objectContaining({
+          teamName: 'mixed-team',
+          runId: 'opencode-run-1',
+          memberName: 'bob',
+          runtimeSessionId: 'session-bob',
+        })
+      );
+    });
+
+    it('keeps OpenCode bootstrap check-in allowlist on verified config reads', async () => {
+      const getConfig = vi.fn(async () => ({
+        teamName: 'mixed-team',
+        members: [{ name: 'bob', providerId: 'opencode' }],
+      }));
+      const getConfigSnapshot = vi.fn(async () => {
+        throw new Error('snapshot config read should not be used for bootstrap check-in guards');
+      });
+      const svc = new TeamProvisioningService({
+        getConfig,
+        getConfigSnapshot,
+      } as any);
+      (svc as any).membersMetaStore = {
+        getMembers: vi.fn(async () => []),
+      };
+
+      await expect(
+        (svc as any).assertOpenCodeRuntimeMemberCheckinAllowed({
+          teamName: 'mixed-team',
+          memberName: 'bob',
+        })
+      ).resolves.toBeUndefined();
+
+      expect(getConfig).toHaveBeenCalledWith('mixed-team');
+      expect(getConfigSnapshot).not.toHaveBeenCalled();
     });
 
     it('rejects duplicate OpenCode bootstrap check-ins for members removed after the first check-in', async () => {
@@ -6869,6 +8697,114 @@ describe('TeamProvisioningService', () => {
       ]);
     });
 
+    it('updates the live mixed OpenCode lane when bootstrap check-in arrives after launch command completion', async () => {
+      const svc = new TeamProvisioningService();
+      const persistLaunchStateSnapshot = vi.spyOn(svc as any, 'persistLaunchStateSnapshot');
+      const teamName = 'mixed-live-checkin-team';
+      const laneId = 'secondary:opencode:tom';
+      const runId = 'opencode-run-tom';
+      const run = createMemberSpawnRun({
+        runId: 'lead-run',
+        teamName,
+        expectedMembers: ['bob', 'tom'],
+        memberSpawnStatuses: new Map([
+          [
+            'bob',
+            createMemberSpawnStatusEntry({
+              status: 'online',
+              launchState: 'confirmed_alive',
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+              hardFailure: false,
+            }),
+          ],
+          [
+            'tom',
+            createMemberSpawnStatusEntry({
+              status: 'waiting',
+              launchState: 'runtime_pending_bootstrap',
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: false,
+            }),
+          ],
+        ]),
+      });
+      Object.assign(run, {
+        isLaunch: true,
+        request: { providerId: 'codex', members: [] },
+        effectiveMembers: [{ name: 'bob', providerId: 'codex', model: 'gpt-5.5' }],
+        allEffectiveMembers: [
+          { name: 'bob', providerId: 'codex', model: 'gpt-5.5' },
+          { name: 'tom', providerId: 'opencode', model: 'openrouter/minimax/minimax-m2.5' },
+        ],
+        mixedSecondaryLanes: [
+          {
+            laneId,
+            providerId: 'opencode',
+            member: {
+              name: 'tom',
+              providerId: 'opencode',
+              model: 'openrouter/minimax/minimax-m2.5',
+            },
+            runId,
+            state: 'finished',
+            result: {
+              runId,
+              teamName,
+              launchPhase: 'active',
+              teamLaunchState: 'partial_pending',
+              members: {
+                tom: {
+                  memberName: 'tom',
+                  providerId: 'opencode',
+                  launchState: 'runtime_pending_bootstrap',
+                  agentToolAccepted: true,
+                  runtimeAlive: false,
+                  bootstrapConfirmed: false,
+                  hardFailure: false,
+                  livenessKind: 'registered_only',
+                  diagnostics: ['registered runtime metadata without live process'],
+                },
+              },
+              warnings: [],
+              diagnostics: ['registered runtime metadata without live process'],
+            },
+            warnings: [],
+            diagnostics: ['registered runtime metadata without live process'],
+          },
+        ],
+      });
+      (svc as any).aliveRunByTeam.set(teamName, 'lead-run');
+      (svc as any).runs.set('lead-run', run);
+
+      await (svc as any).updateOpenCodeRuntimeMemberLiveness({
+        teamName,
+        runId,
+        memberName: 'tom',
+        runtimeSessionId: 'ses_tom_live',
+        observedAt: '2026-04-22T12:05:00.000Z',
+        diagnostics: undefined,
+        metadata: undefined,
+        reason: 'OpenCode runtime bootstrap check-in accepted',
+      });
+
+      expect(run.memberSpawnStatuses.get('tom')).toMatchObject({
+        status: 'online',
+        launchState: 'confirmed_alive',
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        livenessKind: 'confirmed_bootstrap',
+      });
+      expect(run.mixedSecondaryLanes[0]?.result?.members.tom).toMatchObject({
+        launchState: 'confirmed_alive',
+        bootstrapConfirmed: true,
+        sessionId: 'ses_tom_live',
+      });
+      expect(persistLaunchStateSnapshot).toHaveBeenCalledWith(run, 'finished');
+    });
+
     it('uses the secondary lane run id for OpenCode runtime delivery journal acceptance', async () => {
       const svc = new TeamProvisioningService();
       const delivered = new Map<
@@ -8289,6 +10225,7 @@ describe('TeamProvisioningService', () => {
       const run = createMemberSpawnRun({
         teamName: 'codex-team',
         expectedMembers: ['bob'],
+        mixedSecondaryLanes: [{ providerId: 'opencode', member: { name: 'bob' } }],
         memberSpawnStatuses: new Map([
           [
             'bob',
@@ -8322,14 +10259,67 @@ describe('TeamProvisioningService', () => {
       await (svc as any).reevaluateMemberLaunchStatus(run, 'bob');
 
       expect(run.memberSpawnStatuses.get('bob')).toMatchObject({
-        status: 'online',
+        status: 'waiting',
         launchState: 'runtime_pending_bootstrap',
         runtimeAlive: true,
         bootstrapConfirmed: false,
-        livenessSource: 'process',
+        livenessSource: undefined,
         livenessKind: 'runtime_process',
         runtimeDiagnostic: 'Runtime process is alive, but no bootstrap check-in after 5 min.',
         runtimeDiagnosticSeverity: 'warning',
+        bootstrapStalled: true,
+        hardFailure: false,
+      });
+    });
+
+    it('keeps OpenCode runtime process pending before the bootstrap stall window', async () => {
+      const svc = new TeamProvisioningService();
+      const run = createMemberSpawnRun({
+        teamName: 'codex-team',
+        expectedMembers: ['bob'],
+        mixedSecondaryLanes: [{ providerId: 'opencode', member: { name: 'bob' } }],
+        memberSpawnStatuses: new Map([
+          [
+            'bob',
+            createMemberSpawnStatusEntry({
+              status: 'waiting',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              firstSpawnAcceptedAt: new Date(Date.now() - 60_000).toISOString(),
+            }),
+          ],
+        ]),
+      });
+      (svc as any).refreshMemberSpawnStatusesFromLeadInbox = vi.fn(async () => {});
+      (svc as any).maybeAuditMemberSpawnStatuses = vi.fn(async () => {});
+      (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(
+        async () =>
+          new Map([
+            [
+              'bob',
+              {
+                alive: true,
+                livenessKind: 'runtime_process',
+                runtimeDiagnostic: 'OpenCode runtime process detected',
+              },
+            ],
+          ])
+      );
+
+      await (svc as any).reevaluateMemberLaunchStatus(run, 'bob');
+
+      expect(run.memberSpawnStatuses.get('bob')).toMatchObject({
+        status: 'waiting',
+        launchState: 'runtime_pending_bootstrap',
+        runtimeAlive: true,
+        bootstrapConfirmed: false,
+        livenessSource: undefined,
+        livenessKind: 'runtime_process',
+        runtimeDiagnostic: 'OpenCode runtime process detected',
+        runtimeDiagnosticSeverity: 'info',
+        bootstrapStalled: undefined,
         hardFailure: false,
       });
     });
@@ -8594,6 +10584,38 @@ describe('TeamProvisioningService', () => {
       };
     }
 
+    it('invalidates config cache after writing OpenCode team config', async () => {
+      const teamName = 'opencode-config-cache-prime';
+      fs.mkdirSync(path.join(tempTeamsBase, teamName), { recursive: true });
+      const invalidateSpy = vi.spyOn(TeamConfigReader, 'invalidateTeam');
+      const { svc } = createSafeLaunchService();
+
+      await (svc as any).writeOpenCodeTeamConfig(
+        {
+          teamName,
+          displayName: 'OpenCode Config Cache Prime',
+          cwd: tempClaudeRoot,
+          providerId: 'opencode',
+          model: 'openrouter/test/model',
+          effort: 'medium',
+        },
+        [
+          {
+            name: 'bob',
+            role: 'Developer',
+            providerId: 'opencode',
+            model: 'openrouter/test/model',
+          },
+        ]
+      );
+
+      expect(invalidateSpy).toHaveBeenCalledWith(teamName);
+      expect((await new TeamConfigReader().getConfigSnapshot(teamName))?.name).toBe(
+        'OpenCode Config Cache Prime'
+      );
+      invalidateSpy.mockRestore();
+    });
+
     it('starts a pure Codex team through the app createTeam path without a real CLI process', async () => {
       allowConsoleLogs();
       vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
@@ -9043,6 +11065,7 @@ describe('TeamProvisioningService', () => {
       const teamName = 'mixed-opencode-post-launch-config';
       const teamDir = path.join(tempTeamsBase, teamName);
       const jackWorktree = path.join(tempClaudeRoot, 'worktrees', 'jack');
+      const invalidateSpy = vi.spyOn(TeamConfigReader, 'invalidateTeam');
       fs.mkdirSync(teamDir, { recursive: true });
       fs.writeFileSync(
         path.join(teamDir, 'config.json'),
@@ -9113,6 +11136,7 @@ describe('TeamProvisioningService', () => {
 
       expect(config.leadSessionId).toBe('new-lead-session');
       expect(config.projectPath).toBe(tempClaudeRoot);
+      expect(invalidateSpy).toHaveBeenCalledWith(teamName);
       expect(config.members).toEqual([
         expect.objectContaining({
           name: 'team-lead',
@@ -9140,6 +11164,7 @@ describe('TeamProvisioningService', () => {
         }),
       ]);
       expect(config.members.some((member) => member.name === 'alice')).toBe(false);
+      invalidateSpy.mockRestore();
     });
 
     it('launches isolated OpenCode side lanes from the resolved member worktree cwd', async () => {
@@ -9513,11 +11538,16 @@ describe('TeamProvisioningService', () => {
 
   it('expands teammate permission suggestions to the operational tool set only', async () => {
     allowConsoleLogs();
+    const getConfig = vi.fn(async () => ({
+      projectPath: tempClaudeRoot,
+      members: [{ cwd: tempClaudeRoot }],
+    }));
+    const getConfigSnapshot = vi.fn(async () => {
+      throw new Error('snapshot config read should not be used for permission writes');
+    });
     const svc = new TeamProvisioningService({
-      getConfig: vi.fn(async () => ({
-        projectPath: tempClaudeRoot,
-        members: [{ cwd: tempClaudeRoot }],
-      })),
+      getConfig,
+      getConfigSnapshot,
     } as any);
 
     await (svc as any).respondToTeammatePermission(
@@ -9545,6 +11575,8 @@ describe('TeamProvisioningService', () => {
     );
     expect(settings.permissions?.allow).not.toContain('mcp__agent-teams__team_stop');
     expect(settings.permissions?.allow).not.toContain('mcp__agent-teams__kanban_clear');
+    expect(getConfig).toHaveBeenCalledWith('ops-team');
+    expect(getConfigSnapshot).not.toHaveBeenCalled();
   });
 
   it('does not broaden admin/runtime teammate permission suggestions', async () => {
@@ -9689,6 +11721,136 @@ describe('TeamProvisioningService', () => {
     expect(launchArgs).not.toContain(leadSessionId);
   });
 
+  it('skips --resume when a stale active launch state shows no teammate ever spawned', async () => {
+    allowConsoleLogs();
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-03T12:03:00.000Z'));
+
+    const teamName = 'resume-skip-stale-active-team';
+    const leadSessionId = 'lead-session-skip-stale-active';
+    writeLaunchConfig(teamName, tempClaudeRoot, leadSessionId, ['alice', 'bob']);
+    writeLaunchState(
+      teamName,
+      leadSessionId,
+      {
+        alice: {
+          launchState: 'starting',
+          hardFailure: false,
+        },
+        bob: {
+          launchState: 'starting',
+          hardFailure: false,
+        },
+      },
+      {
+        launchPhase: 'active',
+        updatedAt: '2026-05-03T12:00:00.000Z',
+      }
+    );
+
+    vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
+    vi.mocked(spawnCli).mockImplementation(() => {
+      throw new Error('launch spawn EINVAL');
+    });
+
+    const svc = new TeamProvisioningService(undefined, undefined, undefined, undefined, {
+      writeConfigFile: vi.fn(async () => '/mock/mcp-config-launch.json'),
+      removeConfigFile: vi.fn(async () => {}),
+    } as any);
+    (svc as any).buildProvisioningEnv = vi.fn(async () => ({
+      env: { ANTHROPIC_API_KEY: 'test' },
+      authSource: 'anthropic_api_key',
+    }));
+    (svc as any).resolveLaunchExpectedMembers = vi.fn(async () => ({
+      members: [{ name: 'alice' }, { name: 'bob' }],
+      source: 'members-meta',
+      warning: undefined,
+    }));
+    (svc as any).normalizeTeamConfigForLaunch = vi.fn(async () => {});
+    (svc as any).assertConfigLeadOnlyForLaunch = vi.fn(async () => {});
+    (svc as any).updateConfigProjectPath = vi.fn(async () => {});
+    (svc as any).restorePrelaunchConfig = vi.fn(async () => {});
+    (svc as any).validateAgentTeamsMcpRuntime = vi.fn(async () => {});
+    (svc as any).pathExists = vi.fn(async (targetPath: string) =>
+      targetPath.endsWith(`${leadSessionId}.jsonl`)
+    );
+
+    await expect(svc.launchTeam({ teamName, cwd: tempClaudeRoot }, () => {})).rejects.toThrow(
+      'launch spawn EINVAL'
+    );
+
+    const launchArgs = vi.mocked(spawnCli).mock.calls[0]?.[1] as string[];
+    expect(launchArgs).toBeTruthy();
+    expect(launchArgs).not.toContain('--resume');
+    expect(launchArgs).not.toContain(leadSessionId);
+  });
+
+  it('skips --resume when a stale active launch has accepted but no live teammates', async () => {
+    allowConsoleLogs();
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-03T12:03:00.000Z'));
+
+    const teamName = 'resume-skip-stale-active-dead-team';
+    const leadSessionId = 'lead-session-skip-stale-active-dead';
+    writeLaunchConfig(teamName, tempClaudeRoot, leadSessionId, ['alice', 'bob']);
+    writeLaunchState(
+      teamName,
+      leadSessionId,
+      {
+        alice: {
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          firstSpawnAcceptedAt: '2026-05-03T12:00:15.000Z',
+          hardFailure: false,
+        },
+        bob: {
+          launchState: 'starting',
+          hardFailure: false,
+        },
+      },
+      {
+        launchPhase: 'active',
+        updatedAt: '2026-05-03T12:00:00.000Z',
+      }
+    );
+
+    vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
+    vi.mocked(spawnCli).mockImplementation(() => {
+      throw new Error('launch spawn EINVAL');
+    });
+
+    const svc = new TeamProvisioningService(undefined, undefined, undefined, undefined, {
+      writeConfigFile: vi.fn(async () => '/mock/mcp-config-launch.json'),
+      removeConfigFile: vi.fn(async () => {}),
+    } as any);
+    (svc as any).buildProvisioningEnv = vi.fn(async () => ({
+      env: { ANTHROPIC_API_KEY: 'test' },
+      authSource: 'anthropic_api_key',
+    }));
+    (svc as any).resolveLaunchExpectedMembers = vi.fn(async () => ({
+      members: [{ name: 'alice' }, { name: 'bob' }],
+      source: 'members-meta',
+      warning: undefined,
+    }));
+    (svc as any).normalizeTeamConfigForLaunch = vi.fn(async () => {});
+    (svc as any).assertConfigLeadOnlyForLaunch = vi.fn(async () => {});
+    (svc as any).updateConfigProjectPath = vi.fn(async () => {});
+    (svc as any).restorePrelaunchConfig = vi.fn(async () => {});
+    (svc as any).validateAgentTeamsMcpRuntime = vi.fn(async () => {});
+    (svc as any).pathExists = vi.fn(async (targetPath: string) =>
+      targetPath.endsWith(`${leadSessionId}.jsonl`)
+    );
+
+    await expect(svc.launchTeam({ teamName, cwd: tempClaudeRoot }, () => {})).rejects.toThrow(
+      'launch spawn EINVAL'
+    );
+
+    const launchArgs = vi.mocked(spawnCli).mock.calls[0]?.[1] as string[];
+    expect(launchArgs).toBeTruthy();
+    expect(launchArgs).not.toContain('--resume');
+    expect(launchArgs).not.toContain(leadSessionId);
+  });
+
   it('keeps --resume when a teammate had an accepted spawn before failing bootstrap', async () => {
     allowConsoleLogs();
     const teamName = 'resume-keep-team';
@@ -10821,6 +12983,198 @@ describe('TeamProvisioningService', () => {
     );
   });
 
+  it('marks OpenCode secondary partial member_briefing bootstrap as stalled instead of confirmed', async () => {
+    allowConsoleLogs();
+    const teamName = 'zz-opencode-partial-bootstrap-stalled';
+    const leadSessionId = 'lead-session';
+    const memberSessionId = 'alice-opencode-session';
+    const projectPath = '/Users/test/proj';
+    const projectId = '-Users-test-proj';
+    const acceptedAt = new Date(Date.now() - 6 * 60_000).toISOString();
+    const successAt = new Date(Date.now() - 5 * 60_000).toISOString();
+
+    writeLaunchConfig(teamName, projectPath, leadSessionId, ['alice']);
+
+    const projectRoot = path.join(tempProjectsBase, projectId);
+    fs.mkdirSync(projectRoot, { recursive: true });
+    fs.writeFileSync(
+      path.join(projectRoot, `${memberSessionId}.jsonl`),
+      [
+        JSON.stringify({
+          timestamp: acceptedAt,
+          teamName,
+          agentName: 'alice',
+          type: 'user',
+          message: {
+            role: 'user',
+            content: `You are bootstrapping into team "${teamName}" as member "alice".`,
+          },
+        }),
+        JSON.stringify({
+          timestamp: successAt,
+          teamName,
+          agentName: 'alice',
+          type: 'user',
+          message: {
+            role: 'user',
+            content: [
+              {
+                type: 'tool_result',
+                tool_use_id: 'item_1',
+                content: `Member briefing for alice on team "${teamName}" (${teamName}).\nTask briefing for alice:\nNo actionable tasks.`,
+                is_error: false,
+              },
+            ],
+          },
+        }),
+      ].join('\n') + '\n',
+      'utf8'
+    );
+
+    const svc = new TeamProvisioningService();
+    const run = createMemberSpawnRun({
+      teamName,
+      expectedMembers: ['alice'],
+      memberSpawnStatuses: new Map([
+        [
+          'alice',
+          createMemberSpawnStatusEntry({
+            status: 'waiting',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            firstSpawnAcceptedAt: acceptedAt,
+            livenessKind: 'registered_only',
+          }),
+        ],
+      ]),
+    });
+    run.mixedSecondaryLanes = [
+      {
+        laneId: 'secondary:opencode:alice',
+        providerId: 'opencode',
+        member: {
+          name: 'alice',
+          providerId: 'opencode',
+          model: 'openrouter/qwen/qwen3-coder',
+        },
+        runId: 'opencode-run-alice',
+        state: 'finished',
+        result: null,
+        warnings: [],
+        diagnostics: [],
+      },
+    ];
+
+    await (svc as any).maybeAuditMemberSpawnStatuses(run, { force: true });
+
+    expect(run.memberSpawnStatuses.get('alice')).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: false,
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      bootstrapStalled: true,
+      runtimeDiagnostic:
+        'OpenCode member_briefing completed, but runtime_bootstrap_checkin did not complete after 5 min.',
+      runtimeDiagnosticSeverity: 'warning',
+    });
+    expect(run.provisioningOutputParts.join('\n')).not.toContain(
+      'bootstrap confirmed via transcript'
+    );
+  });
+
+  it('preserves OpenCode secondary bootstrapStalled through mixed launch snapshot rebuilds', () => {
+    const teamName = 'zz-opencode-bootstrap-stalled-snapshot-rebuild';
+    const svc = new TeamProvisioningService();
+    const acceptedAt = new Date(Date.now() - 6 * 60_000).toISOString();
+    const run = createMemberSpawnRun({
+      teamName,
+      expectedMembers: [],
+      memberSpawnStatuses: new Map([
+        [
+          'alice',
+          createMemberSpawnStatusEntry({
+            status: 'waiting',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            firstSpawnAcceptedAt: acceptedAt,
+            livenessKind: 'registered_only',
+            bootstrapStalled: true,
+            runtimeDiagnostic:
+              'OpenCode member_briefing completed, but runtime_bootstrap_checkin did not complete after 5 min.',
+            runtimeDiagnosticSeverity: 'warning',
+          }),
+        ],
+      ]),
+    });
+    run.isLaunch = true;
+    run.effectiveMembers = [];
+    run.request = {
+      ...run.request,
+      teamName,
+      cwd: '/tmp/opencode-bootstrap-stalled-snapshot-rebuild',
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+      skipPermissions: true,
+    };
+    run.mixedSecondaryLanes = [
+      {
+        laneId: 'secondary:opencode:alice',
+        providerId: 'opencode',
+        member: {
+          name: 'alice',
+          providerId: 'opencode',
+          model: 'openrouter/qwen/qwen3-coder',
+        },
+        runId: 'opencode-run-alice',
+        state: 'finished',
+        result: {
+          runId: 'opencode-run-alice',
+          teamName,
+          launchPhase: 'active',
+          teamLaunchState: 'partial_pending',
+          members: {
+            alice: {
+              memberName: 'alice',
+              providerId: 'opencode',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: false,
+              sessionId: 'ses_alice_partial_bootstrap',
+              livenessKind: 'registered_only',
+              diagnostics: ['OpenCode runtime session materialized.'],
+            },
+          },
+          warnings: [],
+          diagnostics: [],
+        },
+        warnings: [],
+        diagnostics: [],
+      },
+    ];
+
+    const snapshot = (svc as any).buildMixedPersistedLaunchSnapshotForRun(run, 'active');
+
+    expect(snapshot?.members.alice).toMatchObject({
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: false,
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      runtimeSessionId: 'ses_alice_partial_bootstrap',
+      livenessKind: 'registered_only',
+      bootstrapStalled: true,
+    });
+  });
+
   it('does not copy bootstrap-state success into OpenCode secondary runtime evidence', async () => {
     const teamName = 'zz-opencode-bootstrap-state-not-evidence';
     const leadSessionId = 'lead-session';
@@ -10935,6 +13289,7 @@ describe('TeamProvisioningService', () => {
         bootstrapConfirmed: false,
         hardFailure: false,
         hardFailureReason: undefined,
+        livenessKind: 'registered_only',
         diagnostics: [
           'OpenCode bridge reported bootstrap confirmation, but no lane runtime evidence was committed.',
         ],
@@ -10949,7 +13304,8 @@ describe('TeamProvisioningService', () => {
       launchState: 'confirmed_alive',
       agentToolAccepted: true,
       bootstrapConfirmed: true,
-      runtimeAlive: false,
+      runtimeAlive: true,
+      livenessKind: 'confirmed_bootstrap',
     });
     const persisted = JSON.parse(
       await fsPromises.readFile(getTeamLaunchStatePath(teamName), 'utf8')
@@ -10957,8 +13313,9 @@ describe('TeamProvisioningService', () => {
     expect(persisted.members.tom).toMatchObject({
       launchState: 'confirmed_alive',
       bootstrapConfirmed: true,
-      runtimeAlive: false,
+      runtimeAlive: true,
       runtimeSessionId: 'ses-tom',
+      livenessKind: 'confirmed_bootstrap',
     });
   });
 
@@ -11040,7 +13397,7 @@ describe('TeamProvisioningService', () => {
     expect(persisted.members.tom).toMatchObject({
       launchState: 'confirmed_alive',
       bootstrapConfirmed: true,
-      runtimeAlive: false,
+      runtimeAlive: true,
       runtimeSessionId: 'ses-tom',
     });
     expect(persisted.teamLaunchState).toBe('clean_success');
@@ -11061,12 +13418,80 @@ describe('TeamProvisioningService', () => {
     expect(persistedAfterMissingWrite.members.tom).toMatchObject({
       launchState: 'confirmed_alive',
       bootstrapConfirmed: true,
-      runtimeAlive: false,
+      runtimeAlive: true,
       runtimeSessionId: 'ses-tom',
     });
     expect(persistedAfterMissingWrite.teamLaunchState).toBe('clean_success');
   });
 
+  it('normalizes stale confirmed OpenCode secondary liveness from committed bootstrap evidence', async () => {
+    const teamName = 'zz-opencode-committed-overlay-normalizes-liveness';
+    const leadSessionId = 'lead-session';
+    const laneId = 'secondary:opencode:tom';
+    const runId = 'opencode-run-tom';
+
+    writeMembersMeta(teamName, [{ name: 'tom', providerId: 'opencode' }]);
+    await upsertOpenCodeRuntimeLaneIndexEntry({
+      teamsBasePath: tempTeamsBase,
+      teamName,
+      laneId,
+      state: 'active',
+    });
+    await writeCommittedOpenCodeSessionStore({
+      teamName,
+      laneId,
+      runId,
+      sessions: [
+        {
+          id: 'ses-tom',
+          teamName,
+          memberName: 'tom',
+          laneId,
+          runId,
+          observedAt: '2026-04-22T12:00:00.000Z',
+          source: 'runtime_bootstrap_checkin',
+        },
+      ],
+    });
+    writeLaunchState(teamName, leadSessionId, {
+      tom: {
+        providerId: 'opencode',
+        laneId,
+        laneKind: 'secondary',
+        laneOwnerProviderId: 'opencode',
+        launchState: 'confirmed_alive',
+        agentToolAccepted: true,
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        runtimeSessionId: 'ses-tom',
+        livenessKind: 'registered_only',
+        runtimeDiagnostic: 'OpenCode bootstrap evidence committed.',
+        diagnostics: ['opencode_bootstrap_evidence_committed'],
+      },
+    });
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.tom).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      runtimeAlive: true,
+      livenessKind: 'confirmed_bootstrap',
+    });
+    const persisted = JSON.parse(
+      await fsPromises.readFile(getTeamLaunchStatePath(teamName), 'utf8')
+    );
+    expect(persisted.members.tom).toMatchObject({
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      runtimeAlive: true,
+      livenessKind: 'confirmed_bootstrap',
+    });
+  });
+
   it('marks a live teammate bootstrap as confirmed from transcript even when runtime discovery is stale', async () => {
     allowConsoleLogs();
     const teamName = 'zz-live-bootstrap-transcript-success-without-runtime';
@@ -11939,6 +14364,300 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  it('keeps OpenCode secondary pending-bootstrap status waiting when live runtime process is attached', async () => {
+    const svc = new TeamProvisioningService();
+    (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(
+      async () =>
+        new Map([
+          [
+            'tom',
+            {
+              alive: true,
+              model: 'openrouter/minimax/minimax-m2.5',
+              livenessKind: 'runtime_process',
+              providerId: 'opencode',
+              runtimeDiagnostic: 'OpenCode runtime process detected',
+              runtimeDiagnosticSeverity: 'info',
+            },
+          ],
+        ])
+    );
+
+    const result = await (svc as any).attachLiveRuntimeMetadataToStatuses(
+      'beacon-desk-4',
+      {
+        tom: createMemberSpawnStatusEntry({
+          status: 'waiting',
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+        }),
+      },
+      { openCodeSecondaryBootstrapPendingMembers: new Set(['tom']) }
+    );
+
+    expect(result.tom).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: true,
+      bootstrapConfirmed: false,
+      livenessSource: undefined,
+      livenessKind: 'runtime_process',
+      runtimeModel: 'openrouter/minimax/minimax-m2.5',
+      runtimeDiagnostic: 'OpenCode runtime process detected',
+      runtimeDiagnosticSeverity: 'info',
+    });
+  });
+
+  it('marks stale OpenCode secondary pending-bootstrap status stalled when live runtime is attached after restart', async () => {
+    const svc = new TeamProvisioningService();
+    (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(
+      async () =>
+        new Map([
+          [
+            'tom',
+            {
+              alive: true,
+              model: 'openrouter/minimax/minimax-m2.5',
+              livenessKind: 'runtime_process',
+              providerId: 'opencode',
+              runtimeDiagnostic: 'OpenCode runtime process detected',
+              runtimeDiagnosticSeverity: 'info',
+            },
+          ],
+        ])
+    );
+
+    const result = await (svc as any).attachLiveRuntimeMetadataToStatuses(
+      'beacon-desk-4',
+      {
+        tom: createMemberSpawnStatusEntry({
+          status: 'waiting',
+          launchState: 'runtime_pending_bootstrap',
+          agentToolAccepted: true,
+          runtimeAlive: true,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          firstSpawnAcceptedAt: new Date(Date.now() - 6 * 60_000).toISOString(),
+        }),
+      },
+      { openCodeSecondaryBootstrapPendingMembers: new Set(['tom']) }
+    );
+
+    expect(result.tom).toMatchObject({
+      status: 'waiting',
+      launchState: 'runtime_pending_bootstrap',
+      runtimeAlive: true,
+      bootstrapConfirmed: false,
+      livenessSource: undefined,
+      livenessKind: 'runtime_process',
+      bootstrapStalled: true,
+      runtimeDiagnostic: 'Runtime process is alive, but no bootstrap check-in after 5 min.',
+      runtimeDiagnosticSeverity: 'warning',
+    });
+  });
+
+  it('self-heals stale persisted OpenCode secondary bootstrap without live metadata', async () => {
+    const teamName = 'zz-opencode-persisted-bootstrap-stall-no-live';
+    const leadSessionId = 'lead-session';
+    const acceptedAt = new Date(Date.now() - 6 * 60_000).toISOString();
+
+    writeTeamMeta(teamName, {
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+    });
+    writeMembersMeta(teamName, [
+      {
+        name: 'tom',
+        providerId: 'opencode',
+        model: 'openrouter/minimax/minimax-m2.5',
+      },
+    ]);
+    writeLaunchConfig(teamName, '/Users/test/proj', leadSessionId, ['tom']);
+    writeLaunchState(teamName, leadSessionId, {
+      tom: {
+        providerId: 'opencode',
+        model: 'openrouter/minimax/minimax-m2.5',
+        laneId: 'secondary:opencode:tom',
+        laneKind: 'secondary',
+        laneOwnerProviderId: 'opencode',
+        launchState: 'runtime_pending_bootstrap',
+        agentToolAccepted: true,
+        runtimeAlive: false,
+        bootstrapConfirmed: false,
+        hardFailure: false,
+        runtimeSessionId: 'ses_tom_partial',
+        runtimePid: 55947,
+        livenessKind: 'registered_only',
+        firstSpawnAcceptedAt: acceptedAt,
+        diagnostics: [
+          'OpenCode bootstrap MCP tool failed before required attach completed: runtime_bootstrap_checkin',
+          'member_briefing at 2026-05-04T18:25:43.091Z',
+        ],
+        lastEvaluatedAt: acceptedAt,
+      },
+    });
+
+    const svc = new TeamProvisioningService();
+    vi.spyOn(svc as any, 'getLiveTeamAgentRuntimeMetadata').mockResolvedValue(new Map());
+
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.tom).toMatchObject({
+      launchState: 'runtime_pending_bootstrap',
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      bootstrapStalled: true,
+      runtimeDiagnostic:
+        'OpenCode bootstrap MCP tool failed before required attach completed: runtime_bootstrap_checkin',
+      runtimeDiagnosticSeverity: 'warning',
+    });
+    const persisted = JSON.parse(
+      await fsPromises.readFile(getTeamLaunchStatePath(teamName), 'utf8')
+    );
+    expect(persisted.members.tom).toMatchObject({
+      launchState: 'runtime_pending_bootstrap',
+      bootstrapConfirmed: false,
+      hardFailure: false,
+      bootstrapStalled: true,
+    });
+  });
+
+  it('sends one targeted OpenCode bootstrap check-in retry when a partial bootstrap stalls', async () => {
+    const teamName = 'zz-opencode-bootstrap-checkin-retry';
+    const acceptedAt = new Date(Date.now() - 6 * 60_000).toISOString();
+    const sendMessageToMember = vi.fn(async (input: Record<string, unknown>) => ({
+      ok: true,
+      providerId: 'opencode',
+      memberName: String(input.memberName),
+      diagnostics: [],
+    }));
+    const svc = new TeamProvisioningService();
+    svc.setRuntimeAdapterRegistry(
+      new TeamRuntimeAdapterRegistry([
+        {
+          providerId: 'opencode',
+          prepare: vi.fn(),
+          launch: vi.fn(),
+          reconcile: vi.fn(),
+          stop: vi.fn(),
+          sendMessageToMember,
+        } as any,
+      ])
+    );
+    vi.spyOn(svc as any, 'refreshMemberSpawnStatusesFromLeadInbox').mockResolvedValue(undefined);
+    vi.spyOn(svc as any, 'maybeAuditMemberSpawnStatuses').mockResolvedValue(undefined);
+    vi.spyOn(svc as any, 'getLiveTeamAgentRuntimeMetadata').mockResolvedValue(
+      new Map([
+        [
+          'tom',
+          {
+            alive: true,
+            providerId: 'opencode',
+            livenessKind: 'runtime_process',
+            runtimeSessionId: 'ses_tom_partial',
+            runtimeDiagnostic: 'OpenCode runtime process detected',
+            runtimeDiagnosticSeverity: 'info',
+          },
+        ],
+      ])
+    );
+
+    const run = createMemberSpawnRun({
+      teamName,
+      runId: 'run-bootstrap-checkin-retry',
+      expectedMembers: ['tom'],
+      memberSpawnStatuses: new Map([
+        [
+          'tom',
+          createMemberSpawnStatusEntry({
+            status: 'waiting',
+            launchState: 'runtime_pending_bootstrap',
+            agentToolAccepted: true,
+            runtimeAlive: true,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            firstSpawnAcceptedAt: acceptedAt,
+            livenessKind: 'runtime_process',
+          }),
+        ],
+      ]),
+    });
+    run.onProgress = vi.fn();
+    run.isLaunch = false;
+    run.request = {
+      teamName,
+      cwd: '/Users/test/proj',
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+      members: [],
+    };
+    run.mixedSecondaryLanes = [
+      {
+        laneId: 'secondary:opencode:tom',
+        providerId: 'opencode',
+        member: {
+          name: 'tom',
+          providerId: 'opencode',
+          model: 'openrouter/minimax/minimax-m2.5',
+          cwd: '/Users/test/proj',
+        },
+        runId: 'opencode-run-tom',
+        state: 'finished',
+        result: {
+          runId: 'opencode-run-tom',
+          teamName,
+          launchPhase: 'active',
+          teamLaunchState: 'partial_pending',
+          members: {
+            tom: {
+              memberName: 'tom',
+              providerId: 'opencode',
+              launchState: 'runtime_pending_bootstrap',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: false,
+              sessionId: 'ses_tom_partial',
+              diagnostics: [
+                'runtime_bootstrap_checkin failed: Not connected',
+                'member_briefing at 2026-05-04T18:25:43.091Z',
+              ],
+            },
+          },
+          warnings: [],
+          diagnostics: [],
+        },
+        warnings: [],
+        diagnostics: [],
+      },
+    ];
+    (svc as any).runs.set(run.runId, run);
+    (svc as any).aliveRunByTeam.set(teamName, run.runId);
+
+    await (svc as any).reevaluateMemberLaunchStatus(run, 'tom');
+    await (svc as any).reevaluateMemberLaunchStatus(run, 'tom');
+
+    expect(sendMessageToMember).toHaveBeenCalledTimes(1);
+    expect(sendMessageToMember).toHaveBeenCalledWith(
+      expect.objectContaining({
+        runId: 'opencode-run-tom',
+        teamName,
+        laneId: 'secondary:opencode:tom',
+        memberName: 'tom',
+        cwd: '/Users/test/proj',
+        bootstrapCheckinRetry: {
+          runtimeSessionId: 'ses_tom_partial',
+          reason: 'runtime_bootstrap_checkin failed: Not connected',
+        },
+      })
+    );
+  });
+
   it('keeps process table diagnostics visible when live metadata has no primary diagnostic', async () => {
     const svc = new TeamProvisioningService();
     (svc as any).getLiveTeamAgentRuntimeMetadata = vi.fn(
@@ -12398,6 +15117,91 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  it('clears stale launch-state and launch-summary when bootstrap truth supersedes a persisted failure', async () => {
+    const teamName = 'bootstrap-supersedes-stale-launch-summary-team';
+    const leadSessionId = 'lead-session';
+    const staleUpdatedAt = '2026-04-16T09:55:00.000Z';
+    const freshObservedAt = '2026-04-16T10:00:00.000Z';
+    writeLaunchConfig(teamName, '/Users/test/proj', leadSessionId, ['bob']);
+    writeLaunchState(
+      teamName,
+      leadSessionId,
+      {
+        bob: {
+          launchState: 'failed_to_start',
+          agentToolAccepted: false,
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: true,
+          hardFailureReason: 'Teammate was never spawned during launch.',
+        },
+      },
+      { updatedAt: staleUpdatedAt }
+    );
+    fs.writeFileSync(
+      getTeamLaunchSummaryPath(teamName),
+      `${JSON.stringify(
+        {
+          version: 1,
+          teamName,
+          updatedAt: staleUpdatedAt,
+          launchPhase: 'finished',
+          partialLaunchFailure: true,
+          expectedMemberCount: 1,
+          confirmedMemberCount: 0,
+          missingMembers: ['bob'],
+          teamLaunchState: 'partial_failure',
+          launchUpdatedAt: staleUpdatedAt,
+          confirmedCount: 0,
+          pendingCount: 0,
+          failedCount: 1,
+          skippedCount: 0,
+          runtimeAlivePendingCount: 0,
+          shellOnlyPendingCount: 0,
+          runtimeProcessPendingCount: 0,
+          runtimeCandidatePendingCount: 0,
+          noRuntimePendingCount: 0,
+          permissionPendingCount: 0,
+        },
+        null,
+        2
+      )}\n`,
+      'utf8'
+    );
+    writeBootstrapState(
+      teamName,
+      [
+        {
+          name: 'bob',
+          status: 'bootstrap_confirmed',
+          lastAttemptAt: Date.parse(freshObservedAt),
+          lastObservedAt: Date.parse(freshObservedAt),
+        },
+      ],
+      freshObservedAt
+    );
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.bob).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    await expect(fsPromises.readFile(getTeamLaunchStatePath(teamName), 'utf8')).rejects.toMatchObject(
+      {
+        code: 'ENOENT',
+      }
+    );
+    await expect(
+      fsPromises.readFile(getTeamLaunchSummaryPath(teamName), 'utf8')
+    ).rejects.toMatchObject({
+      code: 'ENOENT',
+    });
+  });
+
   it('reconciles extra persisted launch members when bootstrap state proves they were registered', async () => {
     const teamName = 'registered-bootstrap-extra-member-team';
     const teamDir = path.join(tempTeamsBase, teamName);
@@ -13188,6 +15992,222 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  it('recovers degraded OpenCode file-lock failures when bootstrap evidence committed later', async () => {
+    const teamName = 'atlas-hq-file-lock-late-evidence';
+    const tomLaneId = 'secondary:opencode:tom';
+    const tomRunId = 'tom-runtime-run';
+    writeTeamMeta(teamName, {
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.5',
+    });
+    writeMembersMeta(teamName, [
+      { name: 'bob', providerId: 'codex', model: 'gpt-5.5' },
+      { name: 'jack', providerId: 'codex', model: 'gpt-5.4' },
+      { name: 'tom', providerId: 'opencode', model: 'openrouter/minimax/minimax-m2.5' },
+    ]);
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', ['bob', 'jack']);
+    writeBootstrapState(teamName, [
+      { name: 'bob', status: 'bootstrap_confirmed', lastObservedAt: Date.now() - 60_000 },
+      { name: 'jack', status: 'bootstrap_confirmed', lastObservedAt: Date.now() - 60_000 },
+    ]);
+    fs.writeFileSync(
+      getTeamLaunchStatePath(teamName),
+      `${JSON.stringify(
+        createPersistedLaunchSnapshot({
+          teamName,
+          leadSessionId: 'lead-session',
+          launchPhase: 'finished',
+          expectedMembers: ['bob', 'jack', 'tom'],
+          bootstrapExpectedMembers: ['bob', 'jack'],
+          members: {
+            bob: {
+              name: 'bob',
+              providerId: 'codex',
+              laneId: 'primary',
+              laneKind: 'primary',
+              laneOwnerProviderId: 'codex',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'Teammate was never spawned during launch.',
+              lastEvaluatedAt: '2026-04-23T10:00:00.000Z',
+            },
+            jack: {
+              name: 'jack',
+              providerId: 'codex',
+              laneId: 'primary',
+              laneKind: 'primary',
+              laneOwnerProviderId: 'codex',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'Teammate was never spawned during launch.',
+              lastEvaluatedAt: '2026-04-23T10:00:00.000Z',
+            },
+            tom: {
+              name: 'tom',
+              providerId: 'opencode',
+              model: 'openrouter/minimax/minimax-m2.5',
+              laneId: tomLaneId,
+              laneKind: 'secondary',
+              laneOwnerProviderId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: `File lock timeout: ${path.join(
+                tempTeamsBase,
+                teamName,
+                '.opencode-runtime',
+                'lanes',
+                encodeURIComponent(tomLaneId),
+                'opencode-runtime-receipts.json'
+              )}`,
+              diagnostics: ['File lock timeout: opencode-runtime-receipts.json'],
+              lastEvaluatedAt: '2026-04-23T10:00:00.000Z',
+            },
+          },
+          updatedAt: '2026-04-23T10:00:00.000Z',
+        }),
+        null,
+        2
+      )}\n`,
+      'utf8'
+    );
+    await upsertOpenCodeRuntimeLaneIndexEntry({
+      teamsBasePath: tempTeamsBase,
+      teamName,
+      laneId: tomLaneId,
+      state: 'degraded',
+      diagnostics: ['File lock timeout: opencode-runtime-receipts.json'],
+    });
+    await writeCommittedOpenCodeSessionStore({
+      teamName,
+      laneId: tomLaneId,
+      runId: tomRunId,
+      sessions: [
+        {
+          id: 'ses_tom_late',
+          teamName,
+          memberName: 'tom',
+          runId: tomRunId,
+          laneId: tomLaneId,
+          providerId: 'opencode',
+          observedAt: '2026-04-23T10:01:00.000Z',
+          source: 'runtime_bootstrap_checkin',
+        },
+      ],
+    });
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.tom).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      hardFailure: false,
+      bootstrapConfirmed: true,
+    });
+    expect(result.statuses.bob).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      hardFailure: false,
+    });
+    expect(result.statuses.jack).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      hardFailure: false,
+    });
+  });
+
+  it('does not recover degraded OpenCode file-lock failures from stale run evidence', async () => {
+    const teamName = 'atlas-hq-file-lock-stale-run-evidence';
+    const tomLaneId = 'secondary:opencode:tom';
+    writeTeamMeta(teamName, {
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.5',
+    });
+    writeMembersMeta(teamName, [
+      { name: 'tom', providerId: 'opencode', model: 'openrouter/minimax/minimax-m2.5' },
+    ]);
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', []);
+    fs.writeFileSync(
+      getTeamLaunchStatePath(teamName),
+      `${JSON.stringify(
+        createPersistedLaunchSnapshot({
+          teamName,
+          leadSessionId: 'lead-session',
+          launchPhase: 'finished',
+          expectedMembers: ['tom'],
+          bootstrapExpectedMembers: [],
+          members: {
+            tom: {
+              name: 'tom',
+              providerId: 'opencode',
+              model: 'openrouter/minimax/minimax-m2.5',
+              laneId: tomLaneId,
+              laneKind: 'secondary',
+              laneOwnerProviderId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'File lock timeout: opencode-runtime-receipts.json',
+              diagnostics: ['File lock timeout: opencode-runtime-receipts.json'],
+              lastEvaluatedAt: '2026-04-23T10:00:00.000Z',
+            },
+          },
+          updatedAt: '2026-04-23T10:00:00.000Z',
+        }),
+        null,
+        2
+      )}\n`,
+      'utf8'
+    );
+    await upsertOpenCodeRuntimeLaneIndexEntry({
+      teamsBasePath: tempTeamsBase,
+      teamName,
+      laneId: tomLaneId,
+      state: 'degraded',
+      diagnostics: ['File lock timeout: opencode-runtime-receipts.json'],
+    });
+    await writeCommittedOpenCodeSessionStore({
+      teamName,
+      laneId: tomLaneId,
+      runId: 'current-runtime-run',
+      sessions: [
+        {
+          id: 'ses_tom_old',
+          teamName,
+          memberName: 'tom',
+          runId: 'old-runtime-run',
+          laneId: tomLaneId,
+          providerId: 'opencode',
+          observedAt: '2026-04-23T09:00:00.000Z',
+          source: 'runtime_bootstrap_checkin',
+        },
+      ],
+    });
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.tom).toMatchObject({
+      status: 'error',
+      launchState: 'failed_to_start',
+      hardFailure: true,
+      bootstrapConfirmed: false,
+    });
+  });
+
   it('reconciles stale persisted mixed pending OpenCode lanes instead of keeping them pending forever', async () => {
     const teamName = 'signal-ops-7';
     writeTeamMeta(teamName, {
@@ -13437,6 +16457,478 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  it('keeps primary bootstrap-confirmed members alive when OpenCode secondary lanes fail', async () => {
+    const teamName = 'atlas-hq-source-aware-live';
+    const startedAt = '2026-04-23T10:00:00.000Z';
+    const exactOpenCodeReason =
+      'Latest assistant message msg_alice failed with APIError - Insufficient credits.';
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', ['bob', 'jack']);
+    writeBootstrapState(
+      teamName,
+      [
+        {
+          name: 'bob',
+          status: 'bootstrap_confirmed',
+          lastObservedAt: Date.parse('2026-04-23T10:01:00.000Z'),
+        },
+        {
+          name: 'jack',
+          status: 'bootstrap_confirmed',
+          lastObservedAt: Date.parse('2026-04-23T10:01:00.000Z'),
+        },
+      ],
+      '2026-04-23T10:01:00.000Z'
+    );
+    const run = createMemberSpawnRun({
+      teamName,
+      runId: 'run-atlas-hq-source-aware-live',
+      startedAt,
+      expectedMembers: ['bob', 'jack'],
+      memberSpawnStatuses: new Map([
+        [
+          'bob',
+          createMemberSpawnStatusEntry({
+            status: 'error',
+            launchState: 'failed_to_start',
+            agentToolAccepted: false,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: true,
+            error: 'Teammate was never spawned during launch.',
+            hardFailureReason: 'Teammate was never spawned during launch.',
+          }),
+        ],
+        [
+          'jack',
+          createMemberSpawnStatusEntry({
+            status: 'error',
+            launchState: 'failed_to_start',
+            agentToolAccepted: false,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: true,
+            error: 'Teammate was never spawned during launch.',
+            hardFailureReason: 'Teammate was never spawned during launch.',
+          }),
+        ],
+      ]),
+    });
+    run.isLaunch = true;
+    run.request = {
+      teamName,
+      cwd: '/Users/test/proj',
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+      members: [],
+    };
+    run.effectiveMembers = [
+      { name: 'bob', providerId: 'codex', model: 'gpt-5.3-codex' },
+      { name: 'jack', providerId: 'codex', model: 'gpt-5.4' },
+    ];
+    run.mixedSecondaryLanes = [
+      {
+        laneId: 'secondary:opencode:alice',
+        providerId: 'opencode',
+        member: {
+          name: 'alice',
+          providerId: 'opencode',
+          model: 'openrouter/z-ai/glm-5.1',
+        },
+        runId: 'lane-run-alice',
+        state: 'finished',
+        result: {
+          runId: 'lane-run-alice',
+          teamName,
+          launchPhase: 'finished',
+          teamLaunchState: 'partial_failure',
+          members: {
+            alice: {
+              memberName: 'alice',
+              providerId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: exactOpenCodeReason,
+              diagnostics: [exactOpenCodeReason],
+            },
+          },
+          warnings: [],
+          diagnostics: [exactOpenCodeReason],
+        },
+        warnings: [],
+        diagnostics: [exactOpenCodeReason],
+      },
+      {
+        laneId: 'secondary:opencode:tom',
+        providerId: 'opencode',
+        member: {
+          name: 'tom',
+          providerId: 'opencode',
+          model: 'openrouter/minimax/minimax-m2.5',
+        },
+        runId: 'lane-run-tom',
+        state: 'finished',
+        result: {
+          runId: 'lane-run-tom',
+          teamName,
+          launchPhase: 'finished',
+          teamLaunchState: 'partial_failure',
+          members: {
+            tom: {
+              memberName: 'tom',
+              providerId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'Tom provider launch failed.',
+              diagnostics: ['Tom provider launch failed.'],
+            },
+          },
+          warnings: [],
+          diagnostics: ['Tom provider launch failed.'],
+        },
+        warnings: [],
+        diagnostics: ['Tom provider launch failed.'],
+      },
+    ];
+    run.detectedSessionId = 'lead-session';
+
+    const svc = new TeamProvisioningService();
+    const snapshot = await (svc as any).persistLaunchStateSnapshot(run, 'finished');
+
+    expect(snapshot.members.bob).toMatchObject({
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    expect(snapshot.members.jack).toMatchObject({
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    expect(snapshot.members.alice).toMatchObject({
+      launchState: 'failed_to_start',
+      hardFailureReason: exactOpenCodeReason,
+    });
+    expect(snapshot.members.tom).toMatchObject({
+      launchState: 'failed_to_start',
+      hardFailureReason: 'Tom provider launch failed.',
+    });
+    expect(snapshot.summary.confirmedCount).toBe(2);
+    expect(snapshot.summary.failedCount).toBe(2);
+  });
+
+  it('reconciles persisted mixed launch-state when primary bootstrap members were marked missing', async () => {
+    const teamName = 'atlas-hq-source-aware-persisted';
+    const exactOpenCodeReason =
+      'Latest assistant message msg_alice failed with APIError - Insufficient credits.';
+    const transientBobMcpFailure =
+      'resources/read failed: resources/read failed for `agent-teams` (member_briefing?teamName=atlas-hq-source-aware-persisted&memberName=bob): Mcp error: -32601: Method not found';
+    writeTeamMeta(teamName, {
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+    });
+    writeMembersMeta(teamName, [
+      { name: 'bob', providerId: 'codex', model: 'gpt-5.3-codex' },
+      { name: 'jack', providerId: 'codex', model: 'gpt-5.4' },
+      { name: 'alice', providerId: 'opencode', model: 'openrouter/z-ai/glm-5.1' },
+      { name: 'tom', providerId: 'opencode', model: 'openrouter/minimax/minimax-m2.5' },
+    ]);
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', ['bob', 'jack']);
+    writeBootstrapState(
+      teamName,
+      [
+        {
+          name: 'bob',
+          status: 'bootstrap_confirmed',
+          lastObservedAt: Date.parse('2026-04-23T10:01:00.000Z'),
+        },
+        {
+          name: 'jack',
+          status: 'bootstrap_confirmed',
+          lastObservedAt: Date.parse('2026-04-23T10:01:00.000Z'),
+        },
+      ],
+      '2026-04-23T10:01:00.000Z'
+    );
+    fs.writeFileSync(
+      getTeamLaunchStatePath(teamName),
+      `${JSON.stringify(
+        createPersistedLaunchSnapshot({
+          teamName,
+          leadSessionId: 'lead-session',
+          launchPhase: 'finished',
+          expectedMembers: ['bob', 'jack', 'alice', 'tom'],
+          bootstrapExpectedMembers: ['bob', 'jack'],
+          members: {
+            bob: {
+              name: 'bob',
+              providerId: 'codex',
+              laneId: 'primary',
+              laneKind: 'primary',
+              laneOwnerProviderId: 'codex',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: transientBobMcpFailure,
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+            jack: {
+              name: 'jack',
+              providerId: 'codex',
+              laneId: 'primary',
+              laneKind: 'primary',
+              laneOwnerProviderId: 'codex',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'Teammate was never spawned during launch.',
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+            alice: {
+              name: 'alice',
+              providerId: 'opencode',
+              model: 'openrouter/z-ai/glm-5.1',
+              laneId: 'secondary:opencode:alice',
+              laneKind: 'secondary',
+              laneOwnerProviderId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'OpenCode bridge reported member launch failure',
+              diagnostics: [exactOpenCodeReason],
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+            tom: {
+              name: 'tom',
+              providerId: 'opencode',
+              model: 'openrouter/minimax/minimax-m2.5',
+              laneId: 'secondary:opencode:tom',
+              laneKind: 'secondary',
+              laneOwnerProviderId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'OpenCode bridge reported member launch failure',
+              diagnostics: ['Tom provider launch failed.'],
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+          },
+          updatedAt: '2026-04-23T10:02:00.000Z',
+        }),
+        null,
+        2
+      )}\n`,
+      'utf8'
+    );
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.statuses.bob).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    expect(result.statuses.jack).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    expect(result.statuses.alice).toMatchObject({
+      status: 'error',
+      launchState: 'failed_to_start',
+      hardFailureReason: exactOpenCodeReason,
+    });
+    expect(result.statuses.tom).toMatchObject({
+      status: 'error',
+      launchState: 'failed_to_start',
+      hardFailureReason: 'Tom provider launch failed.',
+    });
+    const summary = JSON.parse(await fsPromises.readFile(getTeamLaunchSummaryPath(teamName), 'utf8'));
+    expect(summary).toMatchObject({
+      teamLaunchState: 'partial_failure',
+      confirmedCount: 2,
+      failedCount: 2,
+      missingMembers: ['alice', 'tom'],
+    });
+  });
+
+  it('does not collapse persisted mixed secondary failures when primary bootstrap snapshot is clean and richer', async () => {
+    const teamName = 'mixed-clean-bootstrap-does-not-collapse-secondary-failure';
+    writeMembersMeta(teamName, [
+      { name: 'bob', providerId: 'codex', model: 'gpt-5.4' },
+      { name: 'alice', providerId: 'opencode', model: 'openrouter/z-ai/glm-5.1' },
+    ]);
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', ['bob']);
+    writeBootstrapState(
+      teamName,
+      [
+        { name: 'bob', status: 'bootstrap_confirmed' },
+        { name: 'jack', status: 'bootstrap_confirmed' },
+        { name: 'nova', status: 'bootstrap_confirmed' },
+        { name: 'sam', status: 'bootstrap_confirmed' },
+        { name: 'kim', status: 'bootstrap_confirmed' },
+      ],
+      '2026-04-23T10:03:00.000Z'
+    );
+    const exactOpenCodeReason =
+      'Latest assistant message msg_alice failed with APIError - Insufficient credits.';
+    fs.writeFileSync(
+      getTeamLaunchStatePath(teamName),
+      `${JSON.stringify(
+        createPersistedLaunchSnapshot({
+          teamName,
+          leadSessionId: 'lead-session',
+          launchPhase: 'finished',
+          expectedMembers: ['bob', 'alice'],
+          bootstrapExpectedMembers: ['bob'],
+          members: {
+            bob: {
+              name: 'bob',
+              providerId: 'codex',
+              laneId: 'primary',
+              laneKind: 'primary',
+              laneOwnerProviderId: 'codex',
+              launchState: 'failed_to_start',
+              agentToolAccepted: false,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'Teammate was never spawned during launch.',
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+            alice: {
+              name: 'alice',
+              providerId: 'opencode',
+              laneId: 'secondary:opencode:alice',
+              laneKind: 'secondary',
+              laneOwnerProviderId: 'opencode',
+              launchState: 'failed_to_start',
+              agentToolAccepted: true,
+              runtimeAlive: false,
+              bootstrapConfirmed: false,
+              hardFailure: true,
+              hardFailureReason: 'OpenCode bridge reported member launch failure',
+              diagnostics: [exactOpenCodeReason],
+              lastEvaluatedAt: '2026-04-23T10:02:00.000Z',
+            },
+          },
+          updatedAt: '2026-04-23T10:02:00.000Z',
+        }),
+        null,
+        2
+      )}\n`,
+      'utf8'
+    );
+
+    const svc = new TeamProvisioningService();
+    const result = await svc.getMemberSpawnStatuses(teamName);
+
+    expect(result.teamLaunchState).toBe('partial_failure');
+    expect(result.statuses.bob).toMatchObject({
+      status: 'online',
+      launchState: 'confirmed_alive',
+      bootstrapConfirmed: true,
+      hardFailure: false,
+    });
+    expect(result.statuses.alice).toMatchObject({
+      status: 'error',
+      launchState: 'failed_to_start',
+      hardFailureReason: exactOpenCodeReason,
+    });
+    const persisted = JSON.parse(await fsPromises.readFile(getTeamLaunchStatePath(teamName), 'utf8'));
+    expect(persisted.members.alice).toMatchObject({
+      laneId: 'secondary:opencode:alice',
+      launchState: 'failed_to_start',
+      hardFailureReason: exactOpenCodeReason,
+    });
+  });
+
+  it('does not revive primary members from stale bootstrap-state during mixed projection', async () => {
+    const teamName = 'atlas-hq-stale-bootstrap-live';
+    writeLaunchConfig(teamName, '/Users/test/proj', 'lead-session', ['bob']);
+    writeBootstrapState(
+      teamName,
+      [
+        {
+          name: 'bob',
+          status: 'bootstrap_confirmed',
+          lastObservedAt: Date.parse('2026-04-23T09:59:00.000Z'),
+        },
+      ],
+      '2026-04-23T09:59:00.000Z'
+    );
+    const run = createMemberSpawnRun({
+      teamName,
+      runId: 'run-atlas-hq-stale-bootstrap-live',
+      startedAt: '2026-04-23T10:00:00.000Z',
+      expectedMembers: ['bob'],
+      memberSpawnStatuses: new Map([
+        [
+          'bob',
+          createMemberSpawnStatusEntry({
+            status: 'error',
+            launchState: 'failed_to_start',
+            agentToolAccepted: false,
+            runtimeAlive: false,
+            bootstrapConfirmed: false,
+            hardFailure: true,
+            error: 'Teammate was never spawned during launch.',
+            hardFailureReason: 'Teammate was never spawned during launch.',
+          }),
+        ],
+      ]),
+    });
+    run.isLaunch = true;
+    run.request = {
+      teamName,
+      cwd: '/Users/test/proj',
+      providerId: 'codex',
+      providerBackendId: 'codex-native',
+      model: 'gpt-5.4',
+      members: [],
+    };
+    run.effectiveMembers = [{ name: 'bob', providerId: 'codex', model: 'gpt-5.3-codex' }];
+    run.mixedSecondaryLanes = [
+      {
+        laneId: 'secondary:opencode:alice',
+        providerId: 'opencode',
+        member: { name: 'alice', providerId: 'opencode', model: 'openrouter/model' },
+        runId: 'lane-run-alice',
+        state: 'finished',
+        result: null,
+        warnings: [],
+        diagnostics: [],
+      },
+    ];
+
+    const svc = new TeamProvisioningService();
+    const snapshot = await (svc as any).persistLaunchStateSnapshot(run, 'finished');
+
+    expect(snapshot.members.bob).toMatchObject({
+      launchState: 'failed_to_start',
+      bootstrapConfirmed: false,
+      hardFailure: true,
+    });
+  });
+
   it('includes queued OpenCode secondary lanes in live spawn statuses during createTeam runs', async () => {
     const svc = new TeamProvisioningService();
     vi.spyOn(svc as any, 'refreshMemberSpawnStatusesFromLeadInbox').mockResolvedValue(undefined);
@@ -13619,4 +17111,64 @@ describe('TeamProvisioningService', () => {
     });
     expect(run.expectedMembers).toEqual(['alice', 'jack']);
   });
+
+  it('bulk retries failed OpenCode secondary lanes sequentially and classifies outcomes', async () => {
+    const svc = new TeamProvisioningService();
+    const run = createMemberSpawnRun({
+      teamName: 'mixed-retry-team',
+      runId: 'run-mixed-retry',
+      expectedMembers: ['alice', 'tom', 'nova'],
+    });
+    run.isLaunch = true;
+    run.provisioningComplete = true;
+
+    (svc as any).runs.set(run.runId, run);
+    (svc as any).aliveRunByTeam.set(run.teamName, run.runId);
+
+    vi.spyOn(svc as any, 'collectFailedOpenCodeSecondaryRetryCandidates').mockResolvedValue([
+      { memberName: 'alice', laneId: 'secondary:opencode:alice' },
+      { memberName: 'tom', laneId: 'secondary:opencode:tom' },
+      { memberName: 'nova', laneId: 'secondary:opencode:nova' },
+    ]);
+    const reattach = vi
+      .spyOn(svc as any, 'reattachOpenCodeOwnedMemberLane')
+      .mockResolvedValueOnce(undefined)
+      .mockResolvedValueOnce(undefined)
+      .mockRejectedValueOnce(new Error('OpenCode bridge crashed'));
+    vi.spyOn(svc as any, 'readOpenCodeSecondaryRetryOutcome')
+      .mockResolvedValueOnce({ launchState: 'confirmed_alive' })
+      .mockResolvedValueOnce({
+        launchState: 'failed_to_start',
+        reason: 'Latest assistant message reported OpenRouter credits exhausted',
+      });
+    const notify = vi
+      .spyOn(svc as any, 'notifyLeadAboutConfirmedOpenCodeRetries')
+      .mockResolvedValue(undefined);
+
+    const result = await svc.retryFailedOpenCodeSecondaryLanes(run.teamName);
+
+    expect(reattach).toHaveBeenNthCalledWith(1, run.teamName, 'alice', {
+      reason: 'manual_restart',
+    });
+    expect(reattach).toHaveBeenNthCalledWith(2, run.teamName, 'tom', {
+      reason: 'manual_restart',
+    });
+    expect(reattach).toHaveBeenNthCalledWith(3, run.teamName, 'nova', {
+      reason: 'manual_restart',
+    });
+    expect(result).toEqual({
+      attempted: ['alice', 'tom'],
+      confirmed: ['alice'],
+      pending: [],
+      failed: [
+        {
+          memberName: 'tom',
+          error: 'Latest assistant message reported OpenRouter credits exhausted',
+        },
+        { memberName: 'nova', error: 'OpenCode bridge crashed' },
+      ],
+      skipped: [],
+    });
+    expect(notify).toHaveBeenCalledWith(run, result);
+  });
 });
diff --git a/test/main/services/team/TeamProvisioningServicePrepare.test.ts b/test/main/services/team/TeamProvisioningServicePrepare.test.ts
index 53cddd7f..a392f1d0 100644
--- a/test/main/services/team/TeamProvisioningServicePrepare.test.ts
+++ b/test/main/services/team/TeamProvisioningServicePrepare.test.ts
@@ -95,7 +95,10 @@ vi.mock('@main/utils/childProcess', () => ({
   killProcessTree: vi.fn(),
 }));
 
-import { TeamProvisioningService } from '@main/services/team/TeamProvisioningService';
+import {
+  TeamProvisioningService,
+  buildDirectTmuxRestartEnvAssignments,
+} from '@main/services/team/TeamProvisioningService';
 import { ClaudeBinaryResolver } from '@main/services/team/ClaudeBinaryResolver';
 import { TeamRuntimeAdapterRegistry } from '@main/services/team/runtime';
 import { ProviderConnectionService } from '@main/services/runtime/ProviderConnectionService';
@@ -347,6 +350,91 @@ describe('TeamProvisioningService prepare/auth behavior', () => {
     delete process.env.ANTHROPIC_AUTH_TOKEN;
   });
 
+  it('blanks Anthropic auth carriers for direct tmux restart in helper mode', () => {
+    const assignments = buildDirectTmuxRestartEnvAssignments(
+      {
+        CLAUDE_TEAM_ANTHROPIC_AUTH_MODE: 'api_key_helper',
+        CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH:
+          '/tmp/team-runtime-auth/demo/runtime-settings-anthropic.json',
+        ANTHROPIC_API_KEY: 'sk-ant-direct-restart-should-not-leak',
+        ANTHROPIC_AUTH_TOKEN: 'direct-restart-token-should-not-leak',
+        CLAUDE_CODE_API_KEY_FILE_DESCRIPTOR: '3',
+        CLAUDE_CODE_OAUTH_TOKEN: 'direct-restart-oauth-token-should-not-leak',
+        CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR: '4',
+      },
+      'anthropic'
+    );
+
+    expect(assignments).toContain("CLAUDE_TEAM_ANTHROPIC_AUTH_MODE='api_key_helper'");
+    expect(assignments).toContain(
+      "CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH='/tmp/team-runtime-auth/demo/runtime-settings-anthropic.json'"
+    );
+    expect(assignments).toContain("ANTHROPIC_API_KEY=''");
+    expect(assignments).toContain("ANTHROPIC_AUTH_TOKEN=''");
+    expect(assignments).toContain("CLAUDE_CODE_API_KEY_FILE_DESCRIPTOR=''");
+    expect(assignments).toContain("CLAUDE_CODE_OAUTH_TOKEN=''");
+    expect(assignments).toContain("CLAUDE_CODE_OAUTH_TOKEN_FILE_DESCRIPTOR=''");
+    expect(assignments).not.toContain('sk-ant-direct-restart-should-not-leak');
+    expect(assignments).not.toContain('direct-restart-token-should-not-leak');
+    expect(assignments).not.toContain('direct-restart-oauth-token-should-not-leak');
+  });
+
+  it('preserves CODEX_HOME for direct tmux restart even when Codex API keys are blanked', () => {
+    const assignments = buildDirectTmuxRestartEnvAssignments(
+      {
+        CODEX_HOME: '/tmp/codex-connected-home',
+        CODEX_API_KEY: '',
+        OPENAI_API_KEY: '',
+      },
+      'codex'
+    );
+
+    expect(assignments).toContain("CODEX_HOME='/tmp/codex-connected-home'");
+  });
+
+  it('does not flatten Anthropic helper settings into non-Anthropic lead cross-provider args', async () => {
+    const svc = new TeamProvisioningService();
+    const helperSettingsPath = path.join(tempRoot, 'team-runtime-auth', 'helper-settings.json');
+    vi.spyOn(svc as any, 'buildProvisioningEnv').mockResolvedValue({
+      env: {
+        CLAUDE_TEAM_ANTHROPIC_AUTH_MODE: 'api_key_helper',
+        CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH: helperSettingsPath,
+      },
+      authSource: 'anthropic_api_key_helper',
+      geminiRuntimeAuth: null,
+      providerArgs: ['--settings', helperSettingsPath, '--anthropic-safe-passthrough'],
+      anthropicApiKeyHelper: {
+        teamName: 'mixed-team',
+        directory: path.dirname(helperSettingsPath),
+        helperPath: path.join(tempRoot, 'helper.sh'),
+        keyPath: path.join(tempRoot, 'key'),
+        settingsPath: helperSettingsPath,
+        settingsObject: { apiKeyHelper: "'/tmp/helper.sh'" },
+        settingsArgs: ['--settings', helperSettingsPath],
+        envPatch: {
+          CLAUDE_TEAM_ANTHROPIC_AUTH_MODE: 'api_key_helper',
+          CLAUDE_TEAM_ANTHROPIC_API_KEY_HELPER_SETTINGS_PATH: helperSettingsPath,
+        },
+      },
+    });
+
+    const result = await (svc as any).buildCrossProviderMemberArgs(
+      'codex',
+      [{ name: 'alice', providerId: 'anthropic', model: 'opus' }],
+      { teamRuntimeAuth: { teamName: 'mixed-team', authMaterialId: 'run-1' } }
+    );
+
+    expect(result.usesAnthropicApiKeyHelper).toBe(true);
+    expect(result.envPatch.CLAUDE_TEAM_ANTHROPIC_AUTH_MODE).toBe('api_key_helper');
+    expect(result.args).toContain('--anthropic-safe-passthrough');
+    expect(result.args).not.toContain(helperSettingsPath);
+    expect(result.providerArgsByProvider.get('anthropic')).toEqual([
+      '--settings',
+      helperSettingsPath,
+      '--anthropic-safe-passthrough',
+    ]);
+  });
+
   afterEach(async () => {
     await removeTempRoot(tempRoot);
   });
diff --git a/test/main/services/team/TeamProvisioningServicePrompts.test.ts b/test/main/services/team/TeamProvisioningServicePrompts.test.ts
index 55c35dfb..1b8356a3 100644
--- a/test/main/services/team/TeamProvisioningServicePrompts.test.ts
+++ b/test/main/services/team/TeamProvisioningServicePrompts.test.ts
@@ -25,7 +25,7 @@ vi.mock('@main/services/team/ClaudeBinaryResolver', () => ({
 
 vi.mock('@main/utils/childProcess', () => ({
   execCli: vi.fn(async (_binaryPath: string | null, args: string[]) => {
-    if (args[0] === 'model') {
+    if (args.includes('model') && args.includes('list')) {
       return {
         stdout: JSON.stringify({
           schemaVersion: 1,
@@ -54,7 +54,7 @@ vi.mock('@main/utils/childProcess', () => ({
         stderr: '',
       };
     }
-    if (args[0] === 'runtime') {
+    if (args.includes('runtime') && args.includes('status')) {
       return {
         stdout: JSON.stringify({
           providers: {
diff --git a/test/main/services/team/TeamProvisioningServiceRelay.test.ts b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
index 1b5e8b7e..28718cf1 100644
--- a/test/main/services/team/TeamProvisioningServiceRelay.test.ts
+++ b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
@@ -16,9 +16,19 @@ const hoisted = vi.hoisted(() => {
       error.code = 'ENOENT';
       throw error;
     }
+    const size = Buffer.byteLength(data, 'utf8');
     return {
       isFile: () => true,
-      size: Buffer.byteLength(data, 'utf8'),
+      size,
+      mode: 0o100644,
+      dev: 1,
+      ino: 1,
+      mtimeMs: 1,
+      ctimeMs: 1,
+      birthtimeMs: 1,
+      mtimeNs: 1n,
+      ctimeNs: 1n,
+      birthtimeNs: 1n,
     };
   });
 
@@ -54,22 +64,20 @@ const hoisted = vi.hoisted(() => {
       files.set(sentMessagesPath, JSON.stringify(rows));
       return message;
     }),
-    sendInboxMessage: vi.fn(
-      (teamName: string, message: Record<string, unknown>) => {
-        const member =
-          typeof message.member === 'string'
-            ? message.member
-            : typeof message.to === 'string'
-              ? message.to
-              : 'unknown';
-        const p = `/mock/teams/${teamName}/inboxes/${member}.json`;
-        const current = files.get(p);
-        const rows = current ? (JSON.parse(current) as unknown[]) : [];
-        rows.push(message);
-        files.set(p, JSON.stringify(rows));
-        return { deliveredToInbox: true, messageId: 'mock-id', message };
-      }
-    ),
+    sendInboxMessage: vi.fn((teamName: string, message: Record<string, unknown>) => {
+      const member =
+        typeof message.member === 'string'
+          ? message.member
+          : typeof message.to === 'string'
+            ? message.to
+            : 'unknown';
+      const p = `/mock/teams/${teamName}/inboxes/${member}.json`;
+      const current = files.get(p);
+      const rows = current ? (JSON.parse(current) as unknown[]) : [];
+      rows.push(message);
+      files.set(p, JSON.stringify(rows));
+      return { deliveredToInbox: true, messageId: 'mock-id', message };
+    }),
     setAtomicWriteShouldFail: (next: boolean) => {
       atomicWriteShouldFail = next;
     },
@@ -298,6 +306,45 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
     expect(service.getLiveLeadProcessMessages(teamName)).toHaveLength(1);
   });
 
+  it('uses snapshot config reads for lead inbox relay routing', async () => {
+    const getConfig = vi.fn(async () => {
+      throw new Error('verified config read should not be used for inbox relay routing');
+    });
+    const getConfigSnapshot = vi.fn(async () => ({
+      name: 'My Team',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    }));
+    const service = new TeamProvisioningService({
+      getConfig,
+      getConfigSnapshot,
+    } as any);
+    const teamName = 'my-team';
+    seedLeadInbox(teamName, [
+      {
+        from: 'bob',
+        text: 'Please assign this to Alice.',
+        timestamp: '2026-02-23T10:00:00.000Z',
+        read: false,
+        summary: 'Need delegation',
+        messageId: 'm-1',
+      },
+    ]);
+
+    const { writeSpy } = attachAliveRun(service, teamName);
+    const relayPromise = service.relayLeadInboxMessages(teamName);
+    const run = await waitForCapture(service);
+    (service as any).handleStreamJsonMessage(run, {
+      type: 'assistant',
+      content: [{ type: 'text', text: 'OK, will do.' }],
+    });
+    (service as any).handleStreamJsonMessage(run, { type: 'result', subtype: 'success' });
+
+    await expect(relayPromise).resolves.toBe(1);
+    expect(writeSpy).toHaveBeenCalledTimes(1);
+    expect(getConfigSnapshot).toHaveBeenCalledWith(teamName);
+    expect(getConfig).not.toHaveBeenCalled();
+  });
+
   it('shows assistant text after relay capture has already settled', () => {
     const service = new TeamProvisioningService();
     const teamName = 'my-team';
@@ -371,7 +418,9 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
     const payload = String(writeSpy.mock.calls[0]?.[0] ?? '');
     expect(payload).toContain('Source: system_notification');
     expect(payload).toContain('summary looks like \\"Comment on #...\\"');
-    expect(payload).toContain('reply via task_add_comment only when you have a substantive board update');
+    expect(payload).toContain(
+      'reply via task_add_comment only when you have a substantive board update'
+    );
     expect(payload).toContain('Do NOT post acknowledgement-only task comments');
 
     (service as any).handleStreamJsonMessage(run, {
@@ -492,9 +541,13 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       runId: 'run-old',
     });
     const inboxDeferred = createDeferred<typeof inboxMessages>();
-    const inboxReader = (service as unknown as {
-      inboxReader: { getMessagesFor: (team: string, member: string) => Promise<typeof inboxMessages> };
-    }).inboxReader;
+    const inboxReader = (
+      service as unknown as {
+        inboxReader: {
+          getMessagesFor: (team: string, member: string) => Promise<typeof inboxMessages>;
+        };
+      }
+    ).inboxReader;
     const inboxSpy = vi
       .spyOn(inboxReader, 'getMessagesFor')
       .mockImplementationOnce(async () => await inboxDeferred.promise)
@@ -538,14 +591,13 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
 
     const { runId: oldRunId } = attachAliveRun(service, teamName, { runId: 'run-old' });
     const inboxDeferred = createDeferred<[typeof permissionMessage]>();
-    const inboxReader = (service as unknown as {
-      inboxReader: {
-        getMessagesFor: (
-          team: string,
-          member: string
-        ) => Promise<[typeof permissionMessage]>;
-      };
-    }).inboxReader;
+    const inboxReader = (
+      service as unknown as {
+        inboxReader: {
+          getMessagesFor: (team: string, member: string) => Promise<[typeof permissionMessage]>;
+        };
+      }
+    ).inboxReader;
     const inboxSpy = vi
       .spyOn(inboxReader, 'getMessagesFor')
       .mockImplementationOnce(async () => await inboxDeferred.promise)
@@ -654,7 +706,9 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
     const payload = String(writeSpy.mock.calls[0]?.[0] ?? '');
     expect(payload).toContain('Source: cross_team');
     expect(payload).toContain('Cross-team conversationId: conv-explicit');
-    expect(payload).toContain('Call the MCP tool named cross_team_send with toTeam=\\"other-team\\"');
+    expect(payload).toContain(
+      'Call the MCP tool named cross_team_send with toTeam=\\"other-team\\"'
+    );
     expect(payload).toContain('replyToConversationId=\\"conv-explicit\\"');
     expect(payload).toContain('NEVER set recipient/to to \\"cross_team_send\\"');
 
@@ -905,7 +959,11 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
     attachAliveRun(service, teamName);
 
     const run = (service as unknown as { runs: Map<string, unknown> }).runs.get('run-1') as {
-      silentUserDmForward: { target: string; startedAt: string; mode: 'user_dm' | 'member_inbox_relay' } | null;
+      silentUserDmForward: {
+        target: string;
+        startedAt: string;
+        mode: 'user_dm' | 'member_inbox_relay';
+      } | null;
     };
     run.silentUserDmForward = {
       target: 'alice',
@@ -1072,9 +1130,13 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       runId: 'run-old',
     });
     const inboxDeferred = createDeferred<typeof inboxMessages>();
-    const inboxReader = (service as unknown as {
-      inboxReader: { getMessagesFor: (team: string, member: string) => Promise<typeof inboxMessages> };
-    }).inboxReader;
+    const inboxReader = (
+      service as unknown as {
+        inboxReader: {
+          getMessagesFor: (team: string, member: string) => Promise<typeof inboxMessages>;
+        };
+      }
+    ).inboxReader;
     const inboxSpy = vi
       .spyOn(inboxReader, 'getMessagesFor')
       .mockImplementationOnce(async () => await inboxDeferred.promise)
@@ -1284,11 +1346,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
 
     await (service as any).markInboxMessagesRead(teamName, 'alice', [
       {
-        messageId: buildLegacyInboxMessageId(
-          legacyRow.from,
-          legacyRow.timestamp,
-          legacyRow.text
-        ),
+        messageId: buildLegacyInboxMessageId(legacyRow.from, legacyRow.timestamp, legacyRow.text),
       },
     ]);
 
@@ -1684,9 +1742,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
         taskRefs: [{ teamName, taskId: 'task-1', displayId: 'abcd1234' }],
       })
     );
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows[0].read).toBe(true);
   });
 
@@ -1732,9 +1788,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       failed: 0,
       lastDelivery: { delivered: true, responsePending: true },
     });
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows[0].read).toBe(false);
   });
 
@@ -1866,9 +1920,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       teamName,
       expect.objectContaining({ messageId: 'opencode-terminal-new' })
     );
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows.map((row: { read?: boolean }) => row.read)).toEqual([false, true]);
   });
 
@@ -1952,9 +2004,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       'opencode_attachments_not_supported_for_secondary_runtime'
     );
     vi.mocked(console.warn).mockClear();
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows[0].read).toBe(false);
     expect(records[0]).toMatchObject({
       inboxMessageId: 'opencode-attachment-1',
@@ -1979,7 +2029,10 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
           ],
         })
       );
-      const identity = await (service as any).resolveOpenCodeMemberDeliveryIdentity(teamName, 'jack');
+      const identity = await (service as any).resolveOpenCodeMemberDeliveryIdentity(
+        teamName,
+        'jack'
+      );
       expect(identity.ok).toBe(true);
       const laneId = identity.laneId;
       const records: any[] = [];
@@ -2000,7 +2053,12 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
           return record;
         }),
         markAcceptanceUnknown: vi.fn(
-          async (input: { id: string; reason: string; nextAttemptAt: string; markedAt: string }) => {
+          async (input: {
+            id: string;
+            reason: string;
+            nextAttemptAt: string;
+            markedAt: string;
+          }) => {
             const record = records.find((candidate) => candidate.id === input.id);
             Object.assign(record, {
               status: 'failed_retryable',
@@ -2132,9 +2190,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       teamName,
       expect.objectContaining({ messageId: 'opencode-inflight-new' })
     );
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows.map((row: { read?: boolean }) => row.read)).toEqual([true, true]);
   });
 
@@ -2207,10 +2263,12 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       delivered: true,
       diagnostics: [],
     });
+    const recipientSpy = vi.spyOn(service, 'isOpenCodeRuntimeRecipient');
 
     const relay = await service.relayInboxFileToLiveRecipient(teamName, 'jack');
 
     expect(relay).toMatchObject({ kind: 'opencode_member', relayed: 1 });
+    expect(recipientSpy).toHaveBeenCalledTimes(1);
     const rows = JSON.parse(
       hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
     );
@@ -2303,9 +2361,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       'OpenCode inbox relay failed for jack/opencode-relay-failed-1'
     );
     vi.mocked(console.warn).mockClear();
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows[0].read).toBe(false);
   });
 
@@ -2337,9 +2393,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       delivered: true,
       diagnostics: [],
     });
-    vi.spyOn(service as any, 'markInboxMessagesRead').mockRejectedValue(
-      new Error('write failed')
-    );
+    vi.spyOn(service as any, 'markInboxMessagesRead').mockRejectedValue(new Error('write failed'));
 
     const relay = await service.relayOpenCodeMemberInboxMessages(teamName, 'jack');
 
@@ -2360,9 +2414,7 @@ describe('TeamProvisioningService relayLeadInboxMessages', () => {
       'opencode_inbox_mark_read_failed_after_delivery'
     );
     vi.mocked(console.warn).mockClear();
-    const rows = JSON.parse(
-      hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]'
-    );
+    const rows = JSON.parse(hoisted.files.get(`/mock/teams/${teamName}/inboxes/jack.json`) ?? '[]');
     expect(rows[0].read).toBe(false);
   });
 });
diff --git a/test/main/services/team/TeamRuntimeLivenessResolver.test.ts b/test/main/services/team/TeamRuntimeLivenessResolver.test.ts
index 73c91c20..9c60fea0 100644
--- a/test/main/services/team/TeamRuntimeLivenessResolver.test.ts
+++ b/test/main/services/team/TeamRuntimeLivenessResolver.test.ts
@@ -172,6 +172,36 @@ describe('resolveTeamMemberRuntimeLiveness', () => {
     );
   });
 
+  it('does not let a reused OpenCode runtime pid downgrade committed bootstrap evidence', () => {
+    const result = resolveTeamMemberRuntimeLiveness({
+      teamName: 'demo',
+      memberName: 'bob',
+      providerId: 'opencode',
+      persistedRuntimePid: 404,
+      persistedRuntimeSessionId: 'session-bob',
+      trackedSpawnStatus: {
+        status: 'online',
+        launchState: 'confirmed_alive',
+        agentToolAccepted: true,
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        hardFailure: false,
+        updatedAt: NOW,
+      },
+      processRows: [{ pid: 404, ppid: 1, command: 'node unrelated-worker.js' }],
+      processTableAvailable: true,
+      nowIso: NOW,
+    });
+
+    expect(result.alive).toBe(true);
+    expect(result.livenessKind).toBe('confirmed_bootstrap');
+    expect(result.pidSource).toBe('runtime_bootstrap');
+    expect(result.pid).toBeUndefined();
+    expect(result.diagnostics).toContain(
+      'bootstrap confirmed despite runtime pid identity mismatch'
+    );
+  });
+
   it('does not trust a stale persisted pid without current process identity', () => {
     const result = resolveTeamMemberRuntimeLiveness({
       teamName: 'demo',
diff --git a/test/main/services/team/TeamTaskReader.test.ts b/test/main/services/team/TeamTaskReader.test.ts
new file mode 100644
index 00000000..40426231
--- /dev/null
+++ b/test/main/services/team/TeamTaskReader.test.ts
@@ -0,0 +1,62 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { TeamTaskReader } from '../../../../src/main/services/team/TeamTaskReader';
+
+import type { TeamTask } from '../../../../src/shared/types/team';
+
+function createDeferred<T>() {
+  let resolve!: (value: T) => void;
+  let reject!: (error: unknown) => void;
+  const promise = new Promise<T>((res, rej) => {
+    resolve = res;
+    reject = rej;
+  });
+  return { promise, resolve, reject };
+}
+
+function makeTask(id: string): TeamTask & { teamName: string } {
+  return {
+    id,
+    subject: id,
+    owner: 'alice',
+    status: 'pending',
+    createdAt: '2026-05-02T12:00:00.000Z',
+    updatedAt: '2026-05-02T12:00:00.000Z',
+    teamName: 'atlas-hq',
+  };
+}
+
+describe('TeamTaskReader', () => {
+  afterEach(() => {
+    vi.restoreAllMocks();
+    TeamTaskReader.invalidateAllTasksCache();
+  });
+
+  it('does not reuse or cache a stale in-flight getAllTasks scan after invalidation', async () => {
+    const firstRead = createDeferred<(TeamTask & { teamName: string })[]>();
+    const secondRead = createDeferred<(TeamTask & { teamName: string })[]>();
+    const readAllTasksUncached = vi
+      .spyOn(TeamTaskReader.prototype as unknown as { readAllTasksUncached: () => Promise<(TeamTask & { teamName: string })[]> }, 'readAllTasksUncached')
+      .mockImplementationOnce(() => firstRead.promise)
+      .mockImplementationOnce(() => secondRead.promise);
+
+    const reader = new TeamTaskReader();
+    const staleRequest = reader.getAllTasks();
+    await Promise.resolve();
+    expect(readAllTasksUncached).toHaveBeenCalledTimes(1);
+
+    TeamTaskReader.invalidateAllTasksCache();
+    const freshRequest = reader.getAllTasks();
+    await Promise.resolve();
+    expect(readAllTasksUncached).toHaveBeenCalledTimes(2);
+
+    secondRead.resolve([makeTask('fresh-task')]);
+    await expect(freshRequest).resolves.toEqual([makeTask('fresh-task')]);
+
+    firstRead.resolve([makeTask('stale-task')]);
+    await staleRequest;
+
+    await expect(reader.getAllTasks()).resolves.toEqual([makeTask('fresh-task')]);
+    expect(readAllTasksUncached).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/test/main/services/team/TeamTranscriptProjectResolver.test.ts b/test/main/services/team/TeamTranscriptProjectResolver.test.ts
index e914942e..a96c93a0 100644
--- a/test/main/services/team/TeamTranscriptProjectResolver.test.ts
+++ b/test/main/services/team/TeamTranscriptProjectResolver.test.ts
@@ -140,6 +140,59 @@ describe('TeamTranscriptProjectResolver', () => {
     return { projectDir, jsonlPath };
   }
 
+  it('uses snapshot-capable config readers for resolver observations', async () => {
+    await setupClaudeRoot();
+    const { projectDir } = await createSessionFile('/repo/current', 'lead-session-1');
+    const getConfig = vi.fn(async () => {
+      throw new Error('verified config read should not be used for transcript observations');
+    });
+    const getConfigSnapshot = vi.fn(async () => ({
+      name: 'My Team',
+      projectPath: '/repo/current',
+      leadSessionId: 'lead-session-1',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    }));
+    const resolver = new TeamTranscriptProjectResolver({
+      getConfig,
+      getConfigSnapshot,
+    });
+
+    const context = await resolver.getContext('my-team');
+
+    expect(context?.projectDir).toBe(projectDir);
+    expect(getConfigSnapshot).toHaveBeenCalledWith('my-team');
+    expect(getConfig).not.toHaveBeenCalled();
+  });
+
+  it('resolves live base context from cheap projectPath evidence without session discovery', async () => {
+    await setupClaudeRoot();
+
+    const teamName = 'live-base-team';
+    const projectPath = '/Users/test/live-base';
+    const projectDir = path.join(tmpDir!, 'projects', encodePath(projectPath));
+    await fs.mkdir(projectDir, { recursive: true });
+    const getConfig = vi.fn(async () => {
+      throw new Error('verified config read should not be used for live base context');
+    });
+    const getConfigSnapshot = vi.fn(async () => ({
+      name: teamName,
+      projectPath,
+      leadSessionId: 'lead-session',
+      members: [{ name: 'team-lead', agentType: 'team-lead' }],
+    }));
+    const resolver = new TeamTranscriptProjectResolver({
+      getConfig,
+      getConfigSnapshot,
+    });
+
+    const context = await resolver.getLiveBaseContext(teamName, { forceRefresh: true });
+
+    expect(context?.projectDir).toBe(projectDir);
+    expect(context?.config.projectPath).toBe(projectPath);
+    expect(getConfigSnapshot).toHaveBeenCalledWith(teamName);
+    expect(getConfig).not.toHaveBeenCalled();
+  });
+
   it('repairs stale projectPath when exact leadSessionId exists only in the renamed project', async () => {
     await setupClaudeRoot();
 
diff --git a/test/main/services/team/teamLogSourceWatchScope.test.ts b/test/main/services/team/teamLogSourceWatchScope.test.ts
new file mode 100644
index 00000000..829e571c
--- /dev/null
+++ b/test/main/services/team/teamLogSourceWatchScope.test.ts
@@ -0,0 +1,94 @@
+import * as path from 'path';
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildTeamLogWatchSessionIds,
+  classifyLogSourceWatcherEvent,
+  extractRuntimeSessionIds,
+  normalizeLogSourceSessionId,
+} from '../../../../src/main/services/team/teamLogSourceWatchScope';
+
+describe('teamLogSourceWatchScope', () => {
+  it('builds a bounded confirmed session scope with lead, runtime ids, and newest history first', () => {
+    const ids = buildTeamLogWatchSessionIds({
+      configLeadSessionId: 'lead-session',
+      launchLeadSessionId: 'lead-session',
+      launchRuntimeSessionIds: ['runtime-bob'],
+      sessionHistory: ['old-session', 'recent-session', 'lead-session'],
+    });
+
+    expect(ids).toEqual(['lead-session', 'runtime-bob', 'recent-session', 'old-session']);
+  });
+
+  it('normalizes session ids defensively', () => {
+    expect(normalizeLogSourceSessionId(' valid_id-1 ')).toBe('valid_id-1');
+    expect(normalizeLogSourceSessionId('')).toBeNull();
+    expect(normalizeLogSourceSessionId('../escape')).toBeNull();
+    expect(normalizeLogSourceSessionId('with/slash')).toBeNull();
+  });
+
+  it('extracts runtime session ids from launch members that can still write early logs', () => {
+    const ids = extractRuntimeSessionIds({
+      members: {
+        pending: {
+          launchState: 'runtime_pending_bootstrap',
+          runtimeSessionId: 'runtime-pending',
+          hardFailure: false,
+        },
+        failed: {
+          launchState: 'failed_to_start',
+          runtimeSessionId: 'runtime-failed',
+          hardFailure: true,
+        },
+      },
+    } as never);
+
+    expect(ids).toEqual(['runtime-pending']);
+  });
+
+  it('classifies unknown, pending, scoped, and ignored watcher events', () => {
+    const projectDir = '/tmp/project';
+    const scopedSessionIds = new Set(['lead-session']);
+    const pendingUnknownSessionIds = new Set(['new-runtime']);
+
+    expect(
+      classifyLogSourceWatcherEvent({
+        projectDir,
+        changedPath: path.join(projectDir, 'old-session.jsonl'),
+        eventName: 'change',
+        scopedSessionIds,
+        pendingUnknownSessionIds,
+      })
+    ).toEqual({ kind: 'ignore' });
+
+    expect(
+      classifyLogSourceWatcherEvent({
+        projectDir,
+        changedPath: path.join(projectDir, 'new-runtime.jsonl'),
+        eventName: 'change',
+        scopedSessionIds,
+        pendingUnknownSessionIds,
+      })
+    ).toEqual({ kind: 'context-refresh', candidateSessionId: 'new-runtime' });
+
+    expect(
+      classifyLogSourceWatcherEvent({
+        projectDir,
+        changedPath: path.join(projectDir, 'lead-session', 'subagents', 'agent-worker.jsonl'),
+        eventName: 'change',
+        scopedSessionIds,
+        pendingUnknownSessionIds,
+      })
+    ).toEqual({ kind: 'scoped-recompute' });
+
+    expect(
+      classifyLogSourceWatcherEvent({
+        projectDir,
+        changedPath: path.join(projectDir, 'lead-session', 'subagents', 'agent-acompact-x.jsonl'),
+        eventName: 'change',
+        scopedSessionIds,
+        pendingUnknownSessionIds,
+      })
+    ).toEqual({ kind: 'ignore' });
+  });
+});
diff --git a/test/main/utils/teamNotificationBuilder.test.ts b/test/main/utils/teamNotificationBuilder.test.ts
index 0dee4cee..78210d06 100644
--- a/test/main/utils/teamNotificationBuilder.test.ts
+++ b/test/main/utils/teamNotificationBuilder.test.ts
@@ -52,11 +52,11 @@ describe('buildDetectedErrorFromTeam', () => {
     expect(result.teamEventType).toBe('rate_limit');
   });
 
-  it('constructs message from "from" and body', () => {
+  it('constructs message from "from", summary, and body', () => {
     const result = buildDetectedErrorFromTeam(
       makePayload({ from: 'bob', body: 'Something happened' })
     );
-    expect(result.message).toBe('[bob] Something happened');
+    expect(result.message).toBe('[bob] Hello from Alice: Something happened');
   });
 
   it('truncates body to 300 chars in message', () => {
@@ -88,17 +88,21 @@ describe('buildDetectedErrorFromTeam', () => {
 
   const EXPECTED_CONFIG: Record<TeamEventType, { triggerName: string; triggerColor: string }> = {
     rate_limit: { triggerName: 'Rate Limit', triggerColor: 'red' },
+    api_error: { triggerName: 'API Error', triggerColor: 'red' },
     lead_inbox: { triggerName: 'Team Inbox', triggerColor: 'blue' },
     user_inbox: { triggerName: 'User Inbox', triggerColor: 'green' },
     task_clarification: { triggerName: 'Clarification', triggerColor: 'orange' },
     task_status_change: { triggerName: 'Status Change', triggerColor: 'purple' },
     task_comment: { triggerName: 'Task Comment', triggerColor: 'cyan' },
+    task_review_requested: { triggerName: 'Review Requested', triggerColor: 'orange' },
+    task_blocked: { triggerName: 'Task Blocked', triggerColor: 'red' },
     task_created: { triggerName: 'Task Created', triggerColor: 'green' },
     all_tasks_completed: { triggerName: 'All Done', triggerColor: 'green' },
     cross_team_message: { triggerName: 'Cross-Team', triggerColor: 'cyan' },
     schedule_completed: { triggerName: 'Schedule Done', triggerColor: 'green' },
     schedule_failed: { triggerName: 'Schedule Failed', triggerColor: 'red' },
     team_launched: { triggerName: 'Team Launched', triggerColor: 'green' },
+    team_launch_incomplete: { triggerName: 'Launch Incomplete', triggerColor: 'orange' },
   };
 
   for (const [eventType, expected] of Object.entries(EXPECTED_CONFIG)) {
diff --git a/test/mocks/electronAPI.ts b/test/mocks/electronAPI.ts
index fe6fd666..9ab95cc1 100644
--- a/test/mocks/electronAPI.ts
+++ b/test/mocks/electronAPI.ts
@@ -16,7 +16,7 @@ export interface MockElectronAPI {
         projectId: string,
         cursor: string | null,
         limit?: number,
-        options?: { includeTotalCount?: boolean; prefilterAll?: boolean }
+        options?: { includeTotalCount?: boolean; prefilterAll?: boolean; metadataLevel?: 'light' | 'deep' }
       ) => Promise<{
         sessions: Session[];
         nextCursor: string | null;
@@ -25,6 +25,15 @@ export interface MockElectronAPI {
       }>
     >
   >;
+  getSessionsByIds: ReturnType<
+    typeof vi.fn<
+      (
+        projectId: string,
+        sessionIds: string[],
+        options?: { metadataLevel?: 'light' | 'deep' }
+      ) => Promise<Session[]>
+    >
+  >;
   getSessionDetail: ReturnType<
     typeof vi.fn<(projectId: string, sessionId: string) => Promise<SessionDetail | null>>
   >;
@@ -90,6 +99,7 @@ export function createMockElectronAPI(): MockElectronAPI {
       hasMore: false,
       totalCount: 0,
     }),
+    getSessionsByIds: vi.fn().mockResolvedValue([]),
     getSessionDetail: vi.fn().mockResolvedValue(null),
     getRepositoryGroups: vi.fn().mockResolvedValue([]),
     getWorktreeSessions: vi.fn().mockResolvedValue([]),
diff --git a/test/renderer/components/sidebar/GlobalTaskList.test.ts b/test/renderer/components/sidebar/GlobalTaskList.test.ts
index 3dcacade..8bfd3436 100644
--- a/test/renderer/components/sidebar/GlobalTaskList.test.ts
+++ b/test/renderer/components/sidebar/GlobalTaskList.test.ts
@@ -32,12 +32,29 @@ const taskLocalState = {
   renameTask: vi.fn(),
 };
 
+const storeListeners = new Set<() => void>();
+function notifyStoreUpdate(): void {
+  storeListeners.forEach((l) => l());
+}
+
 vi.mock('../../../../src/renderer/store', () => ({
-  useStore: (selector: (state: StoreState) => unknown) => selector(storeState),
+  useStore: (selector: (state: StoreState) => unknown) => {
+    // eslint-disable-next-line @typescript-eslint/no-require-imports
+    const { useState, useEffect } = require('react') as typeof import('react');
+    const [, setVersion] = useState(0);
+    useEffect(() => {
+      const listener = () => setVersion((v) => v + 1);
+      storeListeners.add(listener);
+      return () => {
+        storeListeners.delete(listener);
+      };
+    }, []);
+    return selector(storeState);
+  },
 }));
 
 vi.mock('zustand/react/shallow', () => ({
-  useShallow: <T,>(selector: T) => selector,
+  useShallow: <T>(selector: T) => selector,
 }));
 
 vi.mock('../../../../src/renderer/components/common/ConfirmDialog', () => ({
@@ -75,7 +92,8 @@ vi.mock('../../../../src/renderer/components/sidebar/TaskFiltersPopover', () =>
 }));
 
 vi.mock('../../../../src/renderer/components/ui/popover', () => ({
-  Popover: ({ children }: React.PropsWithChildren) => React.createElement(React.Fragment, null, children),
+  Popover: ({ children }: React.PropsWithChildren) =>
+    React.createElement(React.Fragment, null, children),
   PopoverTrigger: ({ children }: React.PropsWithChildren) =>
     React.createElement(React.Fragment, null, children),
   PopoverContent: ({ children }: React.PropsWithChildren) =>
@@ -83,7 +101,8 @@ vi.mock('../../../../src/renderer/components/ui/popover', () => ({
 }));
 
 vi.mock('../../../../src/renderer/components/ui/tooltip', () => ({
-  Tooltip: ({ children }: React.PropsWithChildren) => React.createElement(React.Fragment, null, children),
+  Tooltip: ({ children }: React.PropsWithChildren) =>
+    React.createElement(React.Fragment, null, children),
   TooltipTrigger: ({ children }: React.PropsWithChildren) =>
     React.createElement(React.Fragment, null, children),
   TooltipContent: ({ children }: React.PropsWithChildren) =>
@@ -113,9 +132,11 @@ function flushMicrotasks(): Promise<void> {
 }
 
 function findButton(host: HTMLElement, label: string): HTMLButtonElement | null {
-  return Array.from(host.querySelectorAll('button')).find(
-    (button) => button.textContent?.trim() === label
-  ) ?? null;
+  return (
+    Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent?.trim() === label
+    ) ?? null
+  );
 }
 
 function visibleSubjects(host: HTMLElement): string[] {
@@ -175,6 +196,7 @@ describe('GlobalTaskList project grouping', () => {
   afterEach(() => {
     document.body.innerHTML = '';
     vi.unstubAllGlobals();
+    storeListeners.clear();
   });
 
   it('shows five tasks first, then expands and collapses with Show more and Show less', async () => {
@@ -199,7 +221,14 @@ describe('GlobalTaskList project grouping', () => {
       await flushMicrotasks();
     });
 
-    expect(visibleSubjects(host)).toEqual(['Task 1', 'Task 2', 'Task 3', 'Task 4', 'Task 5', 'Task 6']);
+    expect(visibleSubjects(host)).toEqual([
+      'Task 1',
+      'Task 2',
+      'Task 3',
+      'Task 4',
+      'Task 5',
+      'Task 6',
+    ]);
     expect(findButton(host, 'Show less')).not.toBeNull();
 
     await act(async () => {
@@ -249,7 +278,7 @@ describe('GlobalTaskList project grouping', () => {
     ];
 
     await act(async () => {
-      root.render(React.createElement(GlobalTaskList));
+      notifyStoreUpdate();
       await flushMicrotasks();
     });
 
diff --git a/test/renderer/components/team/LeadSessionDetailGate.test.tsx b/test/renderer/components/team/LeadSessionDetailGate.test.tsx
new file mode 100644
index 00000000..96678afc
--- /dev/null
+++ b/test/renderer/components/team/LeadSessionDetailGate.test.tsx
@@ -0,0 +1,212 @@
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+const fetchSessionDetail = vi.fn(async () => undefined);
+const storeState = {
+  fetchSessionDetail,
+  tabSessionData: {} as Record<
+    string,
+    {
+      sessionDetail?: { session?: { id?: string } | null } | null;
+      sessionDetailLoading?: boolean;
+    }
+  >,
+};
+
+vi.mock('@renderer/store', () => ({
+  useStore: (selector: (state: typeof storeState) => unknown) => selector(storeState),
+}));
+
+vi.mock('zustand/react/shallow', () => ({
+  useShallow: (selector: unknown) => selector,
+}));
+
+import { LeadSessionDetailGate } from '@renderer/components/team/LeadSessionDetailGate';
+
+describe('LeadSessionDetailGate', () => {
+  let host: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    host = document.createElement('div');
+    document.body.appendChild(host);
+    root = createRoot(host);
+    fetchSessionDetail.mockClear();
+    storeState.tabSessionData = {};
+  });
+
+  afterEach(() => {
+    act(() => {
+      root.unmount();
+    });
+    document.body.innerHTML = '';
+    vi.unstubAllGlobals();
+  });
+
+  it('does not fetch while disabled', async () => {
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled={false}
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).not.toHaveBeenCalled();
+  });
+
+  it('fetches once when enabled and unloaded', async () => {
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).toHaveBeenCalledTimes(1);
+    expect(fetchSessionDetail).toHaveBeenCalledWith('project-1', 'lead-1', 'tab-1', {
+      silent: false,
+    });
+  });
+
+  it('does not fetch an already loaded lead session', async () => {
+    storeState.tabSessionData = {
+      'tab-1': {
+        sessionDetail: { session: { id: 'lead-1' } },
+        sessionDetailLoading: false,
+      },
+    };
+
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).not.toHaveBeenCalled();
+  });
+
+  it('does not fetch while tab detail is loading', async () => {
+    storeState.tabSessionData = {
+      'tab-1': {
+        sessionDetail: null,
+        sessionDetailLoading: true,
+      },
+    };
+
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).not.toHaveBeenCalled();
+  });
+
+  it('does not refetch the same attempted request on rerender', async () => {
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).toHaveBeenCalledTimes(1);
+  });
+
+  it('fetches again when the requested lead session changes', async () => {
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-2"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).toHaveBeenCalledTimes(2);
+    expect(fetchSessionDetail).toHaveBeenLastCalledWith('project-1', 'lead-2', 'tab-1', {
+      silent: false,
+    });
+  });
+
+  it('allows retry after disabling and enabling the gate', async () => {
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled={false}
+        />
+      );
+    });
+    await act(async () => {
+      root.render(
+        <LeadSessionDetailGate
+          tabId="tab-1"
+          projectId="project-1"
+          leadSessionId="lead-1"
+          enabled
+        />
+      );
+    });
+
+    expect(fetchSessionDetail).toHaveBeenCalledTimes(2);
+  });
+});
diff --git a/test/renderer/components/team/LiveRuntimeStatusSection.test.tsx b/test/renderer/components/team/LiveRuntimeStatusSection.test.tsx
new file mode 100644
index 00000000..f349cd73
--- /dev/null
+++ b/test/renderer/components/team/LiveRuntimeStatusSection.test.tsx
@@ -0,0 +1,53 @@
+import React, { act } from 'react';
+import { createRoot, type Root } from 'react-dom/client';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import { LiveRuntimeStatusSection } from '@renderer/components/team/LiveRuntimeStatusSection';
+
+describe('LiveRuntimeStatusSection', () => {
+  let host: HTMLDivElement;
+  let root: Root;
+
+  beforeEach(() => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    host = document.createElement('div');
+    document.body.appendChild(host);
+    root = createRoot(host);
+  });
+
+  afterEach(() => {
+    act(() => {
+      root.unmount();
+    });
+    document.body.innerHTML = '';
+    vi.unstubAllGlobals();
+  });
+
+  it('renders display-only runtime rows without process actions', async () => {
+    await act(async () => {
+      root.render(
+        <LiveRuntimeStatusSection
+          rows={[
+            {
+              memberName: 'alice',
+              state: 'running',
+              stateReason: 'Runtime heartbeat is alive',
+              source: 'runtime',
+              runtimeModel: 'claude-sonnet-4.5',
+              pidLabel: 'runtime pid 1234',
+              actionsAllowed: false,
+            },
+          ]}
+        />
+      );
+    });
+
+    expect(host.textContent).toContain('Live runtime status');
+    expect(host.textContent).toContain('Display-only heartbeat and launch state');
+    expect(host.textContent).toContain('alice');
+    expect(host.textContent).toContain('runtime pid 1234');
+    expect(host.textContent).not.toContain('Kill');
+    expect(host.textContent).not.toContain('Open');
+    expect(host.querySelectorAll('button')).toHaveLength(0);
+  });
+});
diff --git a/test/renderer/components/team/ProvisioningProgressBlock.test.tsx b/test/renderer/components/team/ProvisioningProgressBlock.test.tsx
index 1080e575..44cb9da9 100644
--- a/test/renderer/components/team/ProvisioningProgressBlock.test.tsx
+++ b/test/renderer/components/team/ProvisioningProgressBlock.test.tsx
@@ -2,6 +2,17 @@ import React, { act } from 'react';
 import { createRoot } from 'react-dom/client';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
+const hoisted = vi.hoisted(() => ({
+  openExternal: vi.fn(),
+  stepperProps: [] as { active?: boolean }[],
+}));
+
+vi.mock('@renderer/api', () => ({
+  api: {
+    openExternal: hoisted.openExternal,
+  },
+}));
+
 vi.mock('@renderer/components/ui/button', () => ({
   Button: ({ children, onClick }: { children: React.ReactNode; onClick?: () => void }) =>
     React.createElement('button', { type: 'button', onClick }, children),
@@ -17,7 +28,14 @@ vi.mock('@renderer/components/team/CliLogsRichView', () => ({
 }));
 
 vi.mock('@renderer/components/team/StepProgressBar', () => ({
-  StepProgressBar: () => React.createElement('div', null, 'step-progress'),
+  StepProgressBar: (props: { active?: boolean }) => {
+    hoisted.stepperProps.push(props);
+    return React.createElement(
+      'div',
+      { 'data-stepper-active': props.active ? 'true' : 'false' },
+      'step-progress'
+    );
+  },
 }));
 
 vi.mock('lucide-react', () => {
@@ -40,6 +58,8 @@ import { ProvisioningProgressBlock } from '@renderer/components/team/Provisionin
 describe('ProvisioningProgressBlock', () => {
   afterEach(() => {
     document.body.innerHTML = '';
+    hoisted.openExternal.mockReset();
+    hoisted.stepperProps = [];
     vi.unstubAllGlobals();
   });
 
@@ -69,6 +89,9 @@ describe('ProvisioningProgressBlock', () => {
     expect(host.textContent).toContain('CLI logs');
     expect(host.textContent).not.toContain('streamed output');
     expect(host.textContent).not.toContain('logs:tail line');
+    expect(host.querySelector('[data-stepper-active]')?.getAttribute('data-stepper-active')).toBe(
+      'true'
+    );
 
     await act(async () => {
       root.unmount();
@@ -257,4 +280,48 @@ describe('ProvisioningProgressBlock', () => {
       await Promise.resolve();
     });
   });
+
+  it('renders multi-line status messages and opens links externally', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(ProvisioningProgressBlock, {
+          title: 'Launch details',
+          message:
+            'Failed teammates:\n- alice - Insufficient credits. Add more using https://openrouter.ai/settings/credits\n- tom - Insufficient credits. Add more using https://openrouter.ai/settings/credits',
+          messageSeverity: 'warning',
+          currentStepIndex: 2,
+          loading: false,
+          defaultLiveOutputOpen: false,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Failed teammates:');
+    expect(host.textContent).toContain('alice - Insufficient credits');
+    expect(host.textContent).toContain('tom - Insufficient credits');
+    expect(host.querySelector('[data-stepper-active]')?.getAttribute('data-stepper-active')).toBe(
+      'false'
+    );
+
+    const links = host.querySelectorAll('a[href="https://openrouter.ai/settings/credits"]');
+    expect(links).toHaveLength(2);
+
+    await act(async () => {
+      links[0]?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+      await Promise.resolve();
+    });
+
+    expect(hoisted.openExternal).toHaveBeenCalledWith('https://openrouter.ai/settings/credits');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
 });
diff --git a/test/renderer/components/team/StepProgressBar.test.tsx b/test/renderer/components/team/StepProgressBar.test.tsx
new file mode 100644
index 00000000..5f9c0dcb
--- /dev/null
+++ b/test/renderer/components/team/StepProgressBar.test.tsx
@@ -0,0 +1,151 @@
+import React, { act } from 'react';
+import { createRoot } from 'react-dom/client';
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import { StepProgressBar } from '@renderer/components/team/StepProgressBar';
+
+import type { StepProgressBarStep } from '@renderer/components/team/StepProgressBar';
+import type { Root } from 'react-dom/client';
+
+vi.mock('lucide-react', () => {
+  const Icon = (props: React.SVGProps<SVGSVGElement>) => React.createElement('svg', props);
+  return {
+    Check: Icon,
+    X: Icon,
+  };
+});
+
+const STEPS: StepProgressBarStep[] = [
+  { key: 'starting', label: 'Starting' },
+  { key: 'setup', label: 'Team setup' },
+  { key: 'joining', label: 'Members joining' },
+  { key: 'finalizing', label: 'Finalizing' },
+];
+
+function hasInlineAnimation(host: HTMLElement, animationName: string): boolean {
+  return Array.from(host.querySelectorAll<HTMLElement>('[style]')).some((node) =>
+    (node.getAttribute('style') ?? '').includes(animationName)
+  );
+}
+
+function waitForTimerTick(): Promise<void> {
+  return new Promise((resolve) => window.setTimeout(resolve, 0));
+}
+
+async function renderStepper(
+  props: React.ComponentProps<typeof StepProgressBar>
+): Promise<{ host: HTMLDivElement; root: Root }> {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+  const host = document.createElement('div');
+  document.body.appendChild(host);
+  const root = createRoot(host);
+
+  await act(async () => {
+    root.render(React.createElement(StepProgressBar, props));
+    await Promise.resolve();
+  });
+
+  return { host, root };
+}
+
+describe('StepProgressBar', () => {
+  afterEach(() => {
+    document.body.innerHTML = '';
+    vi.unstubAllGlobals();
+  });
+
+  it('animates the current step and next connector while active', async () => {
+    const { host, root } = await renderStepper({
+      steps: STEPS,
+      currentIndex: 2,
+      active: true,
+    });
+
+    expect(hasInlineAnimation(host, 'stepper-pulse-ring')).toBe(true);
+    expect(hasInlineAnimation(host, 'stepper-line-sweep')).toBe(true);
+    expect(host.textContent).toContain('Members joining');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('keeps the current marker but stops progress animations when settled', async () => {
+    const { host, root } = await renderStepper({
+      steps: STEPS,
+      currentIndex: 2,
+      active: false,
+    });
+
+    expect(host.textContent).toContain('3');
+    expect(host.textContent).toContain('Members joining');
+    expect(hasInlineAnimation(host, 'stepper-pulse-ring')).toBe(false);
+    expect(hasInlineAnimation(host, 'stepper-line-sweep')).toBe(false);
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('plays completion animations when an active launch advances steps', async () => {
+    const { host, root } = await renderStepper({
+      steps: STEPS,
+      currentIndex: 1,
+      active: true,
+    });
+
+    await act(async () => {
+      root.render(
+        React.createElement(StepProgressBar, {
+          steps: STEPS,
+          currentIndex: 2,
+          active: true,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      await waitForTimerTick();
+    });
+
+    expect(hasInlineAnimation(host, 'stepper-flash')).toBe(true);
+    expect(hasInlineAnimation(host, 'stepper-jelly')).toBe(true);
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('does not play completion animations for an inactive terminal update', async () => {
+    const { host, root } = await renderStepper({
+      steps: STEPS,
+      currentIndex: 1,
+      active: true,
+    });
+
+    await act(async () => {
+      root.render(
+        React.createElement(StepProgressBar, {
+          steps: STEPS,
+          currentIndex: 2,
+          active: false,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(hasInlineAnimation(host, 'stepper-flash')).toBe(false);
+    expect(hasInlineAnimation(host, 'stepper-jelly')).toBe(false);
+    expect(hasInlineAnimation(host, 'stepper-pulse-ring')).toBe(false);
+    expect(hasInlineAnimation(host, 'stepper-line-sweep')).toBe(false);
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+});
diff --git a/test/renderer/components/team/TeamProvisioningBanner.test.ts b/test/renderer/components/team/TeamProvisioningBanner.test.ts
index a9af3989..72e42e9e 100644
--- a/test/renderer/components/team/TeamProvisioningBanner.test.ts
+++ b/test/renderer/components/team/TeamProvisioningBanner.test.ts
@@ -5,6 +5,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 const storeState = {
   progress: null as Record<string, unknown> | null,
   cancelProvisioning: vi.fn(),
+  retryFailedOpenCodeSecondaryLanes: vi.fn(),
   selectedTeamName: 'northstar-core',
   selectedTeamData: {
     members: [
@@ -106,6 +107,13 @@ describe('TeamProvisioningBanner launch-step alignment', () => {
       cliLogsTail: '',
       assistantOutput: '',
     };
+    storeState.retryFailedOpenCodeSecondaryLanes.mockResolvedValue({
+      attempted: [],
+      confirmed: [],
+      pending: [],
+      failed: [],
+      skipped: [],
+    });
     storeState.memberSpawnStatusesByTeam['northstar-core'] = {};
     storeState.selectedTeamData.members = [
       { name: 'team-lead', agentType: 'team-lead' },
@@ -408,6 +416,51 @@ describe('TeamProvisioningBanner launch-step alignment', () => {
     });
   });
 
+  it('renders a bulk retry action for failed OpenCode secondary teammates', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.selectedTeamData.members = [
+      { name: 'team-lead', agentType: 'team-lead', providerId: 'anthropic' },
+      {
+        name: 'alice',
+        agentType: 'developer',
+        providerId: 'opencode',
+        laneKind: 'secondary',
+        laneOwnerProviderId: 'opencode',
+      },
+    ];
+    storeState.teamDataCacheByName['northstar-core'] = {
+      members: [...storeState.selectedTeamData.members],
+    };
+    storeState.memberSpawnStatusesByTeam['northstar-core'] = {
+      alice: {
+        status: 'error',
+        launchState: 'failed_to_start',
+        updatedAt: '2026-04-09T10:00:00.000Z',
+        runtimeAlive: false,
+        bootstrapConfirmed: false,
+        hardFailure: true,
+        hardFailureReason: 'OpenRouter credits exhausted',
+        agentToolAccepted: false,
+      },
+    } as Record<string, unknown>;
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(React.createElement(TeamProvisioningBanner, { teamName: 'northstar-core' }));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Retry failed OpenCode teammates');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('uses info severity while runtimes are online but teammate contact is still pending', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     storeState.memberSpawnSnapshotsByTeam['northstar-core'] = {
diff --git a/test/renderer/components/team/dialogs/EditTeamDialog.test.ts b/test/renderer/components/team/dialogs/EditTeamDialog.test.ts
index 45a77c3b..568d0c3e 100644
--- a/test/renderer/components/team/dialogs/EditTeamDialog.test.ts
+++ b/test/renderer/components/team/dialogs/EditTeamDialog.test.ts
@@ -477,6 +477,140 @@ describe('EditTeamDialog', () => {
     });
   });
 
+  it('saves config-only edits without touching the roster', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    vi.mocked(api.teams.updateConfig).mockResolvedValue({} as any);
+    vi.mocked(api.teams.replaceMembers).mockResolvedValue(undefined);
+    const onSaved = vi.fn();
+    const onClose = vi.fn();
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(EditTeamDialog, {
+          open: true,
+          teamName: 'live-team',
+          currentName: 'Current Team',
+          currentDescription: 'desc',
+          currentColor: 'blue',
+          currentMembers: [
+            { name: 'bob', role: 'Developer', providerId: 'codex', model: 'gpt-5.2' },
+            { name: 'alice', role: 'Reviewer', providerId: 'opencode', model: 'openrouter/a' },
+          ] as any,
+          leadMember: { name: 'team-lead', role: 'Team Lead', providerId: 'codex' } as any,
+          isTeamAlive: true,
+          projectPath: '/tmp/project',
+          onClose,
+          onChangeLeadRuntime: vi.fn(),
+          onSaved,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const nameInput = host.querySelector('#edit-team-name') as HTMLInputElement;
+    await act(async () => {
+      const setValue = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set;
+      setValue?.call(nameInput, 'Renamed Team');
+      nameInput.dispatchEvent(new Event('input', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    const saveButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent === 'Save'
+    ) as HTMLButtonElement;
+    await act(async () => {
+      saveButton.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(api.teams.updateConfig).toHaveBeenCalledWith('live-team', {
+      name: 'Renamed Team',
+      description: 'desc',
+      color: 'blue',
+    });
+    expect(api.teams.replaceMembers).not.toHaveBeenCalled();
+    expect(api.teams.restartMember).not.toHaveBeenCalled();
+    expect(onSaved).toHaveBeenCalled();
+    expect(onClose).toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('surfaces config-only refresh failures without reporting member changes', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    vi.mocked(api.teams.updateConfig).mockResolvedValue({} as any);
+    vi.mocked(api.teams.replaceMembers).mockResolvedValue(undefined);
+    const onSaved = vi.fn(async () => {
+      throw new Error('refresh failed');
+    });
+    const onClose = vi.fn();
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(EditTeamDialog, {
+          open: true,
+          teamName: 'live-team',
+          currentName: 'Current Team',
+          currentDescription: 'desc',
+          currentColor: 'blue',
+          currentMembers: [{ name: 'alice', role: 'Reviewer' }] as any,
+          isTeamAlive: true,
+          projectPath: '/tmp/project',
+          onClose,
+          onChangeLeadRuntime: vi.fn(),
+          onSaved,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const nameInput = host.querySelector('#edit-team-name') as HTMLInputElement;
+    await act(async () => {
+      const setValue = Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, 'value')?.set;
+      setValue?.call(nameInput, 'Renamed Team');
+      nameInput.dispatchEvent(new Event('input', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    const saveButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent === 'Save'
+    ) as HTMLButtonElement;
+    await act(async () => {
+      saveButton.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+    await act(async () => {
+      await Promise.resolve();
+    });
+
+    expect(api.teams.updateConfig).toHaveBeenCalled();
+    expect(api.teams.replaceMembers).not.toHaveBeenCalled();
+    expect(host.textContent).toContain(
+      'Team settings were saved, but failed to refresh the latest view: refresh failed'
+    );
+    expect(host.textContent).not.toContain('member changes failed');
+    expect(onClose).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('removes existing live teammates through the dedicated removeMember path during save', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     vi.mocked(api.teams.updateConfig).mockResolvedValue({} as any);
@@ -655,6 +789,70 @@ describe('EditTeamDialog', () => {
       await Promise.resolve();
     });
 
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-runtime"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Saving will restart or relaunch this teammate');
+
+    const saveButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent === 'Save'
+    );
+
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-role"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      saveButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(api.teams.restartMember).toHaveBeenCalledWith('live-team', 'alice');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('does not call generic restart for live OpenCode teammate edits handled by replaceMembers', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    vi.mocked(api.teams.updateConfig).mockResolvedValue({} as any);
+    vi.mocked(api.teams.replaceMembers).mockResolvedValue(undefined);
+    vi.mocked(api.teams.restartMember).mockResolvedValue(undefined);
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(EditTeamDialog, {
+          open: true,
+          teamName: 'live-team',
+          currentName: 'Current Team',
+          currentDescription: 'desc',
+          currentColor: 'blue',
+          currentMembers: [
+            { name: 'alice', role: 'Reviewer', providerId: 'opencode', model: 'openrouter/a' },
+          ] as any,
+          isTeamAlive: true,
+          projectPath: '/tmp/project',
+          onClose: vi.fn(),
+          onChangeLeadRuntime: vi.fn(),
+          onSaved: vi.fn(),
+        })
+      );
+      await Promise.resolve();
+    });
+
     await act(async () => {
       host
         .querySelector('[data-testid="change-member-role"]')
@@ -666,12 +864,85 @@ describe('EditTeamDialog', () => {
       (button) => button.textContent === 'Save'
     );
 
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-role"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
     await act(async () => {
       saveButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
       await Promise.resolve();
     });
 
-    expect(api.teams.restartMember).toHaveBeenCalledWith('live-team', 'alice');
+    expect(api.teams.replaceMembers).toHaveBeenCalledWith(
+      'live-team',
+      expect.objectContaining({
+        members: expect.arrayContaining([
+          expect.objectContaining({ name: 'alice', providerId: 'opencode' }),
+        ]),
+      })
+    );
+    expect(api.teams.restartMember).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('blocks live primary-owned teammate edits in mixed OpenCode teams before saving', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    vi.mocked(api.teams.updateConfig).mockResolvedValue({} as any);
+    vi.mocked(api.teams.replaceMembers).mockResolvedValue(undefined);
+    vi.mocked(api.teams.restartMember).mockResolvedValue(undefined);
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(EditTeamDialog, {
+          open: true,
+          teamName: 'live-team',
+          currentName: 'Current Team',
+          currentDescription: 'desc',
+          currentColor: 'blue',
+          currentMembers: [
+            { name: 'bob', role: 'Reviewer', providerId: 'codex', model: 'gpt-5.2' },
+            { name: 'alice', role: 'Reviewer', providerId: 'opencode', model: 'openrouter/a' },
+          ] as any,
+          leadMember: { name: 'team-lead', role: 'Team Lead', providerId: 'codex' } as any,
+          isTeamAlive: true,
+          projectPath: '/tmp/project',
+          onClose: vi.fn(),
+          onChangeLeadRuntime: vi.fn(),
+          onSaved: vi.fn(),
+        })
+      );
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-role"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain(
+      'Live edits/removals for primary-owned teammates in mixed OpenCode teams'
+    );
+
+    const saveButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent === 'Save'
+    ) as HTMLButtonElement | undefined;
+    expect(saveButton?.disabled).toBe(true);
+    expect(api.teams.updateConfig).not.toHaveBeenCalled();
+    expect(api.teams.replaceMembers).not.toHaveBeenCalled();
+    expect(api.teams.restartMember).not.toHaveBeenCalled();
 
     await act(async () => {
       root.unmount();
@@ -818,6 +1089,13 @@ describe('EditTeamDialog', () => {
       (button) => button.textContent === 'Save'
     );
 
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-role"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
     await act(async () => {
       saveButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
       await Promise.resolve();
@@ -876,6 +1154,13 @@ describe('EditTeamDialog', () => {
       await Promise.resolve();
     });
 
+    await act(async () => {
+      host
+        .querySelector('[data-testid="change-member-role"]')
+        ?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
     await act(async () => {
       saveButton()?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
       await Promise.resolve();
diff --git a/test/renderer/components/team/dialogs/editTeamRuntimeChanges.test.ts b/test/renderer/components/team/dialogs/editTeamRuntimeChanges.test.ts
index f55edf4b..ad57eb47 100644
--- a/test/renderer/components/team/dialogs/editTeamRuntimeChanges.test.ts
+++ b/test/renderer/components/team/dialogs/editTeamRuntimeChanges.test.ts
@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest';
 
 import {
+  buildEditTeamMemberRosterSnapshot,
   buildEditTeamSourceSnapshot,
   getLiveRosterIdentityChanges,
   getMembersRequiringRuntimeRestart,
@@ -209,6 +210,57 @@ describe('getMembersRequiringRuntimeRestart', () => {
     expect(refreshed).toBe(base);
   });
 
+  it('matches equivalent current and built roster snapshots', () => {
+    const current = buildEditTeamMemberRosterSnapshot([
+      {
+        name: 'alice',
+        role: 'Reviewer',
+        providerId: 'codex',
+        providerBackendId: 'api',
+        model: 'gpt-5.4-mini',
+        effort: 'medium',
+        status: 'online',
+      } as any,
+    ]);
+
+    const built = buildEditTeamMemberRosterSnapshot([
+      {
+        name: 'alice',
+        role: 'Reviewer',
+        providerId: 'codex',
+        model: 'gpt-5.4-mini',
+        effort: 'medium',
+      },
+    ]);
+
+    expect(built).toBe(current);
+  });
+
+  it('keeps provider backend and fast mode in the edit roster snapshot', () => {
+    const base = buildEditTeamMemberRosterSnapshot([
+      {
+        name: 'alice',
+        role: 'Reviewer',
+        providerId: 'codex',
+        model: 'gpt-5.4-mini',
+        fastMode: 'inherit',
+      } as any,
+    ]);
+
+    const changed = buildEditTeamMemberRosterSnapshot([
+      {
+        name: 'alice',
+        role: 'Reviewer',
+        providerId: 'codex',
+        providerBackendId: 'codex-native',
+        model: 'gpt-5.4-mini',
+        fastMode: 'off',
+      } as any,
+    ]);
+
+    expect(changed).not.toBe(base);
+  });
+
   it('keeps worktree isolation in the edit source snapshot', () => {
     const sharedWorkspace = buildEditTeamSourceSnapshot({
       name: 'Team A',
diff --git a/test/renderer/components/team/leadContextLoadGuards.test.ts b/test/renderer/components/team/leadContextLoadGuards.test.ts
new file mode 100644
index 00000000..b46c6f77
--- /dev/null
+++ b/test/renderer/components/team/leadContextLoadGuards.test.ts
@@ -0,0 +1,187 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  buildLeadSessionDetailRequestKey,
+  deriveLeadContextButtonLabel,
+  shouldFetchLeadSessionDetail,
+  shouldLoadLeadSessionDetail,
+} from '@renderer/components/team/leadContextLoadGuards';
+
+describe('leadContextLoadGuards', () => {
+  describe('shouldLoadLeadSessionDetail', () => {
+    it('does not load when disabled', () => {
+      expect(
+        shouldLoadLeadSessionDetail({
+          enabled: false,
+          tabId: 'tab-1',
+          projectId: 'project-1',
+          leadSessionId: 'lead-1',
+        })
+      ).toBe(false);
+    });
+
+    it('requires all identifiers', () => {
+      expect(
+        shouldLoadLeadSessionDetail({
+          enabled: true,
+          tabId: null,
+          projectId: 'project-1',
+          leadSessionId: 'lead-1',
+        })
+      ).toBe(false);
+      expect(
+        shouldLoadLeadSessionDetail({
+          enabled: true,
+          tabId: 'tab-1',
+          projectId: null,
+          leadSessionId: 'lead-1',
+        })
+      ).toBe(false);
+      expect(
+        shouldLoadLeadSessionDetail({
+          enabled: true,
+          tabId: 'tab-1',
+          projectId: 'project-1',
+          leadSessionId: null,
+        })
+      ).toBe(false);
+    });
+
+    it('loads only when enabled and identifiers are valid', () => {
+      expect(
+        shouldLoadLeadSessionDetail({
+          enabled: true,
+          tabId: 'tab-1',
+          projectId: 'project-1',
+          leadSessionId: 'lead-1',
+        })
+      ).toBe(true);
+    });
+  });
+
+  describe('buildLeadSessionDetailRequestKey', () => {
+    it('builds a stable per-tab request key', () => {
+      expect(
+        buildLeadSessionDetailRequestKey({
+          tabId: 'tab-1',
+          projectId: 'project-1',
+          leadSessionId: 'lead-1',
+        })
+      ).toBe('tab-1:project-1:lead-1');
+    });
+  });
+
+  describe('shouldFetchLeadSessionDetail', () => {
+    it('does not fetch without a requested session', () => {
+      expect(
+        shouldFetchLeadSessionDetail({
+          requestedSessionId: null,
+          loadedSessionId: null,
+          loading: false,
+          inFlightOrAttemptedRequestKey: null,
+          nextRequestKey: null,
+        })
+      ).toBe(false);
+    });
+
+    it('does not fetch while loading', () => {
+      expect(
+        shouldFetchLeadSessionDetail({
+          requestedSessionId: 'lead-1',
+          loadedSessionId: null,
+          loading: true,
+          inFlightOrAttemptedRequestKey: null,
+          nextRequestKey: 'tab-1:project-1:lead-1',
+        })
+      ).toBe(false);
+    });
+
+    it('does not fetch an already loaded session', () => {
+      expect(
+        shouldFetchLeadSessionDetail({
+          requestedSessionId: 'lead-1',
+          loadedSessionId: 'lead-1',
+          loading: false,
+          inFlightOrAttemptedRequestKey: null,
+          nextRequestKey: 'tab-1:project-1:lead-1',
+        })
+      ).toBe(false);
+    });
+
+    it('does not refetch the same attempted request key', () => {
+      expect(
+        shouldFetchLeadSessionDetail({
+          requestedSessionId: 'lead-1',
+          loadedSessionId: null,
+          loading: false,
+          inFlightOrAttemptedRequestKey: 'tab-1:project-1:lead-1',
+          nextRequestKey: 'tab-1:project-1:lead-1',
+        })
+      ).toBe(false);
+    });
+
+    it('fetches when the requested session is unloaded and not already attempted', () => {
+      expect(
+        shouldFetchLeadSessionDetail({
+          requestedSessionId: 'lead-2',
+          loadedSessionId: 'lead-1',
+          loading: false,
+          inFlightOrAttemptedRequestKey: null,
+          nextRequestKey: 'tab-1:project-1:lead-2',
+        })
+      ).toBe(true);
+    });
+  });
+
+  describe('deriveLeadContextButtonLabel', () => {
+    it('uses live percent while the panel is closed', () => {
+      expect(
+        deriveLeadContextButtonLabel({
+          liveContextUsedPercent: 25,
+          fullContextUsedPercent: 90,
+          contextPanelOpen: false,
+        })
+      ).toBe('25.0%');
+    });
+
+    it('prefers full percent while the panel is open', () => {
+      expect(
+        deriveLeadContextButtonLabel({
+          liveContextUsedPercent: 25,
+          fullContextUsedPercent: 90,
+          contextPanelOpen: true,
+        })
+      ).toBe('90.0%');
+    });
+
+    it('falls back to live percent while open when full percent is unavailable', () => {
+      expect(
+        deriveLeadContextButtonLabel({
+          liveContextUsedPercent: 25,
+          fullContextUsedPercent: null,
+          contextPanelOpen: true,
+        })
+      ).toBe('25.0%');
+    });
+
+    it('falls back to Context when no percent is available', () => {
+      expect(
+        deriveLeadContextButtonLabel({
+          liveContextUsedPercent: null,
+          fullContextUsedPercent: null,
+          contextPanelOpen: false,
+        })
+      ).toBe('Context');
+    });
+
+    it('does not clamp full percent values', () => {
+      expect(
+        deriveLeadContextButtonLabel({
+          liveContextUsedPercent: null,
+          fullContextUsedPercent: 125.5,
+          contextPanelOpen: true,
+        })
+      ).toBe('125.5%');
+    });
+  });
+});
diff --git a/test/renderer/components/team/members/MemberCard.test.ts b/test/renderer/components/team/members/MemberCard.test.ts
index 2c994708..ace72f25 100644
--- a/test/renderer/components/team/members/MemberCard.test.ts
+++ b/test/renderer/components/team/members/MemberCard.test.ts
@@ -4,6 +4,16 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import type { MemberSpawnStatusEntry, ResolvedTeamMember, TeamTaskWithKanban } from '@shared/types';
 
+const hoisted = vi.hoisted(() => ({
+  openExternal: vi.fn(),
+}));
+
+vi.mock('@renderer/api', () => ({
+  api: {
+    openExternal: hoisted.openExternal,
+  },
+}));
+
 vi.mock('@renderer/components/ui/badge', () => ({
   Badge: ({
     children,
@@ -86,6 +96,7 @@ const skippedSpawnEntry: MemberSpawnStatusEntry = {
 describe('MemberCard starting-state visuals', () => {
   afterEach(() => {
     document.body.innerHTML = '';
+    hoisted.openExternal.mockReset();
     vi.useRealTimers();
   });
 
@@ -772,6 +783,60 @@ describe('MemberCard starting-state visuals', () => {
     });
   });
 
+  it('shows a compact failed launch reason on the member row with clickable links', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const reason =
+      'Latest assistant message msg_df2d6414f0016Bn0Pc0QJbo5sU failed with APIError - Insufficient credits. Add more using https://openrouter.ai/settings/credits';
+
+    await act(async () => {
+      root.render(
+        React.createElement(MemberCard, {
+          member,
+          memberColor: 'blue',
+          isTeamAlive: true,
+          isTeamProvisioning: false,
+          spawnStatus: 'error',
+          spawnLaunchState: 'failed_to_start',
+          spawnRuntimeAlive: false,
+          spawnError: reason,
+          spawnEntry: {
+            ...failedSpawnEntry,
+            hardFailureReason: reason,
+            runtimeDiagnostic: reason,
+          },
+          onRestartMember: vi.fn(),
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const failureReason = host.querySelector('[data-testid="member-launch-failure-reason"]');
+    expect(failureReason?.textContent).toContain('Insufficient credits');
+    expect(failureReason?.textContent).toContain('OpenRouter credits');
+    expect(failureReason?.textContent).not.toContain('Latest assistant message');
+    expect(failureReason?.textContent).not.toContain('msg_df2d6414');
+
+    const link = failureReason?.querySelector(
+      'a[href="https://openrouter.ai/settings/credits"]'
+    ) as HTMLAnchorElement | null;
+    expect(link).not.toBeNull();
+
+    await act(async () => {
+      link?.dispatchEvent(new MouseEvent('click', { bubbles: true, cancelable: true }));
+      await Promise.resolve();
+    });
+
+    expect(hoisted.openExternal).toHaveBeenCalledWith('https://openrouter.ai/settings/credits');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('renders Relaunch OpenCode for registered-only OpenCode teammates', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     const host = document.createElement('div');
diff --git a/test/renderer/components/team/members/MemberDetailDialog.test.ts b/test/renderer/components/team/members/MemberDetailDialog.test.ts
index 1243c6b7..78f905f3 100644
--- a/test/renderer/components/team/members/MemberDetailDialog.test.ts
+++ b/test/renderer/components/team/members/MemberDetailDialog.test.ts
@@ -413,4 +413,82 @@ describe('MemberDetailDialog activity count', () => {
       await Promise.resolve();
     });
   });
+
+  it('shows Relaunch OpenCode copy for stalled OpenCode bootstrap', async () => {
+    const member: ResolvedTeamMember = {
+      name: 'tom',
+      status: 'active',
+      currentTaskId: null,
+      taskCount: 0,
+      lastActiveAt: null,
+      messageCount: 0,
+      providerId: 'opencode',
+    };
+    const onRestartMember = vi.fn(async () => undefined);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(MemberDetailDialog, {
+          open: true,
+          member,
+          teamName: 'demo-team',
+          members: [member],
+          tasks: [],
+          isTeamAlive: true,
+          spawnEntry: {
+            status: 'waiting',
+            launchState: 'runtime_pending_bootstrap',
+            runtimeAlive: true,
+            bootstrapConfirmed: false,
+            hardFailure: false,
+            agentToolAccepted: true,
+            livenessKind: 'runtime_process',
+            runtimeDiagnostic: 'Runtime process is alive, but no bootstrap check-in after 5 min.',
+            runtimeDiagnosticSeverity: 'warning',
+            bootstrapStalled: true,
+            updatedAt: '2026-04-24T12:05:00.000Z',
+          },
+          runtimeEntry: {
+            memberName: 'tom',
+            alive: true,
+            restartable: true,
+            providerId: 'opencode',
+            livenessKind: 'runtime_process',
+            runtimeDiagnostic: 'OpenCode runtime process detected',
+            runtimeDiagnosticSeverity: 'info',
+            updatedAt: '2026-04-24T12:05:01.000Z',
+          },
+          onClose: () => undefined,
+          onSendMessage: () => undefined,
+          onAssignTask: () => undefined,
+          onTaskClick: () => undefined,
+          onRestartMember,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain(
+      'OpenCode process is alive, but bootstrap did not confirm. Relaunch this teammate to start a fresh OpenCode session.'
+    );
+    const relaunchButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('Relaunch OpenCode')
+    );
+    expect(relaunchButton).not.toBeUndefined();
+
+    await act(async () => {
+      relaunchButton?.click();
+      await Promise.resolve();
+    });
+
+    expect(onRestartMember).toHaveBeenCalledWith('tom');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
 });
diff --git a/test/renderer/components/team/messages/MessagesPanel.test.ts b/test/renderer/components/team/messages/MessagesPanel.test.ts
index 6022a9c0..84166381 100644
--- a/test/renderer/components/team/messages/MessagesPanel.test.ts
+++ b/test/renderer/components/team/messages/MessagesPanel.test.ts
@@ -14,6 +14,7 @@ const storeState = {
   sendMessageDebugDetails: null as OpenCodeRuntimeDeliveryDebugDetails | null,
   lastSendMessageResult: null as unknown,
   clearSendMessageRuntimeDiagnostics: vi.fn(),
+  refreshSendMessageRuntimeDeliveryStatus: vi.fn().mockResolvedValue(undefined),
   teams: [],
   openTeamTab: vi.fn(),
   loadOlderTeamMessages: vi.fn().mockResolvedValue(undefined),
@@ -191,6 +192,7 @@ function makeMessage(overrides: Partial<InboxMessage> = {}): InboxMessage {
 describe('MessagesPanel idle summary invariants', () => {
   afterEach(() => {
     document.body.innerHTML = '';
+    vi.useRealTimers();
     vi.unstubAllGlobals();
   });
 
@@ -204,6 +206,7 @@ describe('MessagesPanel idle summary invariants', () => {
     storeState.sendCrossTeamMessage.mockClear();
     storeState.openTeamTab.mockClear();
     storeState.clearSendMessageRuntimeDiagnostics.mockClear();
+    storeState.refreshSendMessageRuntimeDeliveryStatus.mockClear();
     storeState.loadOlderTeamMessages.mockClear();
     storeState.refreshTeamMessagesHead.mockClear();
     storeState.sendingMessage = false;
@@ -606,6 +609,80 @@ describe('MessagesPanel idle summary invariants', () => {
     });
   });
 
+  it('refreshes pending OpenCode runtime diagnostics after send timeout', async () => {
+    vi.useFakeTimers();
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    storeState.sendMessageWarning =
+      'OpenCode runtime delivery is still being checked. Message was saved and will be retried if needed.';
+    storeState.sendMessageDebugDetails = {
+      messageId: 'user-send',
+      providerId: 'opencode',
+      delivered: true,
+      responsePending: true,
+      responseState: 'pending',
+      ledgerStatus: 'accepted',
+      acceptanceUnknown: false,
+      reason: 'assistant_response_pending',
+      diagnostics: ['assistant_response_pending'],
+    };
+
+    await act(async () => {
+      storeState.teamMessagesByName['atlas-hq'] = {
+        canonicalMessages: [
+          makeMessage({
+            messageId: 'user-send',
+            from: 'user',
+            to: 'tom',
+            source: 'user_sent',
+            timestamp: '2026-04-08T12:00:00.000Z',
+            text: 'Тут?',
+          }),
+        ],
+        optimisticMessages: [],
+        feedRevision: 'rev-1',
+        nextCursor: null,
+        hasMore: false,
+        lastFetchedAt: Date.now(),
+        loadingHead: false,
+        loadingOlder: false,
+        headHydrated: true,
+      };
+      root.render(
+        React.createElement(MessagesPanel, {
+          teamName: 'atlas-hq',
+          position: 'sidebar',
+          onPositionChange: vi.fn(),
+          members: [],
+          tasks: [],
+          timeWindow: null,
+          pendingRepliesByMember: {},
+          onPendingReplyChange: vi.fn(),
+        })
+      );
+      await Promise.resolve();
+    });
+
+    await act(async () => {
+      vi.advanceTimersByTime(15_000);
+      await Promise.resolve();
+    });
+
+    expect(storeState.refreshSendMessageRuntimeDeliveryStatus).toHaveBeenCalledWith(
+      'atlas-hq',
+      'user-send'
+    );
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+    vi.useRealTimers();
+  });
+
   it('renders the bottom-sheet composer before the status block so input stays pinned near the header', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     const host = document.createElement('div');
diff --git a/test/renderer/components/team/messages/OpenCodeDeliveryWarning.test.tsx b/test/renderer/components/team/messages/OpenCodeDeliveryWarning.test.tsx
index e363a0dd..ac8086df 100644
--- a/test/renderer/components/team/messages/OpenCodeDeliveryWarning.test.tsx
+++ b/test/renderer/components/team/messages/OpenCodeDeliveryWarning.test.tsx
@@ -173,6 +173,29 @@ describe('OpenCodeDeliveryWarning', () => {
     });
   });
 
+  it('shows terminal empty assistant turn reason in the compact failed warning', async () => {
+    const failedWarning =
+      'OpenCode runtime delivery failed. Message was saved to inbox, but live delivery did not complete. Reason: OpenCode returned an empty assistant turn.';
+    const { host, root } = renderWarning({
+      warning: failedWarning,
+      debugDetails: {
+        ...debugDetails,
+        delivered: false,
+        responsePending: false,
+        responseState: 'empty_assistant_turn',
+        ledgerStatus: 'failed_terminal',
+        reason: 'empty_assistant_turn',
+        diagnostics: ['empty_assistant_turn'],
+      },
+    });
+
+    expect(host.textContent).toContain(failedWarning);
+
+    await act(async () => {
+      root.unmount();
+    });
+  });
+
   it('hides details again when a different runtime delivery payload arrives', async () => {
     const { host, root } = renderWarning();
 
diff --git a/test/renderer/components/team/provisioningSteps.test.ts b/test/renderer/components/team/provisioningSteps.test.ts
index b4574066..4d8830bd 100644
--- a/test/renderer/components/team/provisioningSteps.test.ts
+++ b/test/renderer/components/team/provisioningSteps.test.ts
@@ -65,6 +65,25 @@ describe('getLaunchJoinMilestonesFromMembers', () => {
     expect(milestones.pendingSpawnCount).toBe(4);
   });
 
+  it('keeps bootstrap-stalled runtime processes out of process-alive progress', () => {
+    const milestones = getLaunchJoinMilestonesFromMembers({
+      members,
+      memberSpawnStatuses: {
+        alice: {
+          status: 'waiting',
+          launchState: 'runtime_pending_bootstrap',
+          runtimeAlive: true,
+          livenessKind: 'runtime_process',
+          bootstrapStalled: true,
+          updatedAt: '2026-04-24T12:05:00.000Z',
+        },
+      },
+    });
+
+    expect(milestones.processOnlyAliveCount).toBe(0);
+    expect(milestones.pendingSpawnCount).toBe(4);
+  });
+
   it('uses runtimeProcessPendingCount instead of legacy runtimeAlivePendingCount for snapshot pending math', () => {
     const milestones = getLaunchJoinMilestonesFromMembers({
       members,
diff --git a/test/renderer/components/team/teamRuntimeDisplayRows.test.ts b/test/renderer/components/team/teamRuntimeDisplayRows.test.ts
new file mode 100644
index 00000000..186c52f9
--- /dev/null
+++ b/test/renderer/components/team/teamRuntimeDisplayRows.test.ts
@@ -0,0 +1,236 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildTeamRuntimeDisplayRows } from '@renderer/components/team/teamRuntimeDisplayRows';
+
+import type {
+  MemberSpawnStatusEntry,
+  TeamAgentRuntimeEntry,
+  TeamAgentRuntimeSnapshot,
+} from '@shared/types';
+
+const members = [{ name: 'alice' }, { name: 'bob' }];
+
+function createRuntimeEntry(overrides: Partial<TeamAgentRuntimeEntry> = {}): TeamAgentRuntimeEntry {
+  return {
+    memberName: 'alice',
+    alive: true,
+    restartable: true,
+    updatedAt: '2026-05-03T10:00:00.000Z',
+    ...overrides,
+  };
+}
+
+function createRuntimeSnapshot(
+  membersByName: Record<string, TeamAgentRuntimeEntry>
+): TeamAgentRuntimeSnapshot {
+  return {
+    teamName: 'my-team',
+    updatedAt: '2026-05-03T10:00:00.000Z',
+    runId: 'run-1',
+    members: membersByName,
+  };
+}
+
+function createSpawnStatus(overrides: Partial<MemberSpawnStatusEntry> = {}): MemberSpawnStatusEntry {
+  return {
+    status: 'spawning',
+    launchState: 'starting',
+    updatedAt: '2026-05-03T10:00:00.000Z',
+    ...overrides,
+  };
+}
+
+describe('buildTeamRuntimeDisplayRows', () => {
+  it('maps alive runtime entries to running display rows', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members,
+      runtimeSnapshot: createRuntimeSnapshot({
+        alice: createRuntimeEntry({ runtimeModel: 'claude-sonnet-4.5', runtimePid: 1234 }),
+      }),
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'running',
+      source: 'runtime',
+      runtimeModel: 'claude-sonnet-4.5',
+      pidLabel: 'runtime pid 1234',
+      actionsAllowed: false,
+    });
+    expect(rows[1]).toMatchObject({
+      memberName: 'bob',
+      state: 'unknown',
+      actionsAllowed: false,
+    });
+  });
+
+  it('does not treat historical bootstrap as running when runtime is not alive', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      runtimeSnapshot: createRuntimeSnapshot({
+        alice: createRuntimeEntry({
+          alive: false,
+          historicalBootstrapConfirmed: true,
+          runtimeDiagnostic: 'Runtime heartbeat is stale',
+        }),
+      }),
+      spawnStatuses: {
+        alice: createSpawnStatus({
+          status: 'online',
+          launchState: 'confirmed_alive',
+          bootstrapConfirmed: true,
+        }),
+      },
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'stopped',
+      source: 'mixed',
+      stateReason: 'Runtime heartbeat is stale',
+      actionsAllowed: false,
+    });
+  });
+
+  it('treats confirmed spawn bootstrap as running even if stale status is still waiting', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      spawnStatuses: {
+        alice: createSpawnStatus({
+          status: 'waiting',
+          launchState: 'confirmed_alive',
+          bootstrapConfirmed: true,
+          runtimeAlive: true,
+          livenessKind: 'registered_only',
+        }),
+      },
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'running',
+      source: 'spawn-status',
+      stateReason: 'Bootstrap confirmed',
+      actionsAllowed: false,
+    });
+  });
+
+  it('maps a non-alive runtime with error diagnostics to degraded', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      runtimeSnapshot: createRuntimeSnapshot({
+        alice: createRuntimeEntry({
+          alive: false,
+          runtimeDiagnostic: 'Runtime process crashed',
+          runtimeDiagnosticSeverity: 'error',
+        }),
+      }),
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'degraded',
+      stateReason: 'Runtime process crashed',
+      actionsAllowed: false,
+    });
+  });
+
+  it('degrades mixed rows when runtime is alive but spawn evidence has failed', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      runtimeSnapshot: createRuntimeSnapshot({
+        alice: createRuntimeEntry({
+          alive: true,
+          runtimeDiagnostic: 'Runtime heartbeat is alive',
+        }),
+      }),
+      spawnStatuses: {
+        alice: createSpawnStatus({
+          status: 'error',
+          launchState: 'failed_to_start',
+          hardFailure: true,
+          hardFailureReason: 'Bootstrap command failed',
+        }),
+      },
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'degraded',
+      source: 'mixed',
+      stateReason: 'Bootstrap command failed',
+      actionsAllowed: false,
+    });
+  });
+
+  it('degrades spawn-only rows when online process evidence has stalled bootstrap', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      spawnStatuses: {
+        alice: createSpawnStatus({
+          status: 'online',
+          launchState: 'runtime_pending_bootstrap',
+          runtimeAlive: true,
+          bootstrapStalled: true,
+          runtimeDiagnostic: 'Runtime is alive, but bootstrap did not confirm',
+        }),
+      },
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'degraded',
+      source: 'spawn-status',
+      stateReason: 'Runtime is alive, but bootstrap did not confirm',
+      actionsAllowed: false,
+    });
+  });
+
+  it('uses explicit spawn status handling without promoting unknown statuses to running', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }, { name: 'bob' }, { name: 'carol' }],
+      spawnStatuses: {
+        alice: createSpawnStatus({ status: 'spawning' }),
+        bob: createSpawnStatus({
+          status: 'online',
+          launchState: 'confirmed_alive',
+          runtimeAlive: true,
+        }),
+        carol: createSpawnStatus({ status: 'surprising-new-status' as never }),
+      },
+    });
+
+    expect(rows.map((row) => [row.memberName, row.state])).toEqual([
+      ['alice', 'starting'],
+      ['bob', 'running'],
+      ['carol', 'unknown'],
+    ]);
+  });
+
+  it('chooses the latest runtime entry when multiple lanes map to one member', () => {
+    const rows = buildTeamRuntimeDisplayRows({
+      members: [{ name: 'alice' }],
+      runtimeSnapshot: createRuntimeSnapshot({
+        'alice-primary': createRuntimeEntry({
+          memberName: 'alice',
+          alive: false,
+          laneKind: 'primary',
+          updatedAt: '2026-05-03T10:00:00.000Z',
+        }),
+        'alice-secondary': createRuntimeEntry({
+          memberName: 'alice',
+          alive: true,
+          laneKind: 'secondary',
+          updatedAt: '2026-05-03T10:01:00.000Z',
+        }),
+      }),
+    });
+
+    expect(rows[0]).toMatchObject({
+      memberName: 'alice',
+      state: 'running',
+      laneKind: 'secondary',
+      actionsAllowed: false,
+    });
+  });
+});
diff --git a/test/renderer/components/team/teamSessionFetchGuards.test.ts b/test/renderer/components/team/teamSessionFetchGuards.test.ts
index ce2c8c3f..0ef071f7 100644
--- a/test/renderer/components/team/teamSessionFetchGuards.test.ts
+++ b/test/renderer/components/team/teamSessionFetchGuards.test.ts
@@ -1,8 +1,101 @@
-import { describe, expect, it } from 'vitest';
+import { describe, expect, it, vi } from 'vitest';
 
-import { shouldSuppressMissingLeadSessionFetch } from '@renderer/components/team/teamSessionFetchGuards';
+import {
+  buildTeamSessionIds,
+  loadTeamSessionMetadata,
+  shouldSuppressMissingLeadSessionFetch,
+} from '@renderer/components/team/teamSessionFetchGuards';
+
+import type { Session } from '@renderer/types/data';
+
+function createSession(id: string, createdAt: number): Session {
+  return {
+    id,
+    projectId: 'project-1',
+    projectPath: '/tmp/project',
+    createdAt,
+    hasSubagents: false,
+    messageCount: 0,
+  };
+}
 
 describe('teamSessionFetchGuards', () => {
+  it('builds bounded team session ids with lead first and newest history first', () => {
+    expect(
+      buildTeamSessionIds({
+        leadSessionId: ' lead-session ',
+        sessionHistory: ['old-session', 'lead-session', '', 42, 'new-session'],
+      })
+    ).toEqual(['lead-session', 'new-session', 'old-session']);
+  });
+
+  it('limits team session ids to avoid loading deep project history', () => {
+    const sessionHistory = Array.from({ length: 25 }, (_, index) => `session-${index}`);
+    const ids = buildTeamSessionIds({ leadSessionId: 'lead-session', sessionHistory }, 20);
+
+    expect(ids).toHaveLength(20);
+    expect(ids[0]).toBe('lead-session');
+    expect(ids[1]).toBe('session-24');
+    expect(ids).not.toContain('session-5');
+  });
+
+  it('loads targeted team session metadata without calling legacy getSessions', async () => {
+    const api = {
+      getSessions: vi.fn(),
+      getSessionsByIds: vi.fn().mockResolvedValue([
+        createSession('older-session', 100),
+        createSession('lead-session', 1),
+        createSession('newer-session', 200),
+      ]),
+      getSessionsPaginated: vi.fn(),
+    };
+
+    const sessions = await loadTeamSessionMetadata(api, 'project-1', {
+      leadSessionId: 'lead-session',
+      sessionHistory: ['older-session', 'newer-session'],
+    });
+
+    expect(api.getSessionsByIds).toHaveBeenCalledWith(
+      'project-1',
+      ['lead-session', 'newer-session', 'older-session'],
+      { metadataLevel: 'light' }
+    );
+    expect(api.getSessionsPaginated).not.toHaveBeenCalled();
+    expect(api.getSessions).not.toHaveBeenCalled();
+    expect(sessions.map((session) => session.id)).toEqual([
+      'lead-session',
+      'newer-session',
+      'older-session',
+    ]);
+  });
+
+  it('falls back to light paginated sessions for legacy teams without known session ids', async () => {
+    const api = {
+      getSessions: vi.fn(),
+      getSessionsByIds: vi.fn(),
+      getSessionsPaginated: vi.fn().mockResolvedValue({
+        sessions: [createSession('old-session', 10), createSession('new-session', 20)],
+        nextCursor: null,
+        hasMore: false,
+        totalCount: 2,
+      }),
+    };
+
+    const sessions = await loadTeamSessionMetadata(api, 'project-1', {
+      leadSessionId: null,
+      sessionHistory: [],
+    });
+
+    expect(api.getSessionsPaginated).toHaveBeenCalledWith('project-1', null, 20, {
+      includeTotalCount: false,
+      prefilterAll: false,
+      metadataLevel: 'light',
+    });
+    expect(api.getSessionsByIds).not.toHaveBeenCalled();
+    expect(api.getSessions).not.toHaveBeenCalled();
+    expect(sessions.map((session) => session.id)).toEqual(['new-session', 'old-session']);
+  });
+
   it('suppresses repeated silent fetches for the same missing lead session id', () => {
     expect(
       shouldSuppressMissingLeadSessionFetch({
diff --git a/test/renderer/features/agent-graph/GraphProvisioningHud.test.ts b/test/renderer/features/agent-graph/GraphProvisioningHud.test.ts
index fd7c2aeb..4d7ca317 100644
--- a/test/renderer/features/agent-graph/GraphProvisioningHud.test.ts
+++ b/test/renderer/features/agent-graph/GraphProvisioningHud.test.ts
@@ -4,20 +4,22 @@ import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import { GraphProvisioningHud } from '@features/agent-graph/renderer/ui/GraphProvisioningHud';
 
+const hoisted = vi.hoisted(() => ({
+  stepperProps: [] as { active?: boolean }[],
+}));
+
 const hookState = {
-  presentation: null as
-    | {
-        isActive: boolean;
-        isFailed: boolean;
-        hasMembersStillJoining: boolean;
-        failedSpawnCount: number;
-        compactTone: 'default' | 'warning' | 'error' | 'success';
-        compactTitle: string;
-        compactDetail?: string | null;
-        currentStepIndex: number;
-        progress: { runId: string };
-      }
-    | null,
+  presentation: null as {
+    isActive: boolean;
+    isFailed: boolean;
+    hasMembersStillJoining: boolean;
+    failedSpawnCount: number;
+    compactTone: 'default' | 'warning' | 'error' | 'success';
+    compactTitle: string;
+    compactDetail?: string | null;
+    currentStepIndex: number;
+    progress: { runId: string };
+  } | null,
   runInstanceKey: 'team:run-1:2026-04-13T10:00:00.000Z',
 };
 
@@ -26,19 +28,26 @@ vi.mock('@renderer/components/team/useTeamProvisioningPresentation', () => ({
 }));
 
 vi.mock('@renderer/components/ui/badge', () => ({
-  Badge: ({ children }: { children: React.ReactNode }) => React.createElement('span', null, children),
+  Badge: ({ children }: { children: React.ReactNode }) =>
+    React.createElement('span', null, children),
 }));
 
 vi.mock('@renderer/components/team/StepProgressBar', () => ({
-  StepProgressBar: () => React.createElement('div', { 'data-testid': 'stepper' }, 'stepper'),
+  StepProgressBar: (props: { active?: boolean }) => {
+    hoisted.stepperProps.push(props);
+    return React.createElement(
+      'div',
+      {
+        'data-testid': 'stepper',
+        'data-stepper-active': props.active ? 'true' : 'false',
+      },
+      'stepper'
+    );
+  },
 }));
 
 vi.mock('@renderer/components/team/TeamProvisioningPanel', () => ({
-  TeamProvisioningPanel: ({
-    defaultLogsOpen,
-  }: {
-    defaultLogsOpen?: boolean;
-  }) =>
+  TeamProvisioningPanel: ({ defaultLogsOpen }: { defaultLogsOpen?: boolean }) =>
     React.createElement(
       'div',
       { 'data-testid': 'panel', 'data-default-logs-open': defaultLogsOpen ? 'true' : 'false' },
@@ -51,6 +60,7 @@ describe('GraphProvisioningHud', () => {
     document.body.innerHTML = '';
     hookState.presentation = null;
     hookState.runInstanceKey = 'team:run-1:2026-04-13T10:00:00.000Z';
+    hoisted.stepperProps = [];
   });
 
   it('hides the graph launch hud once provisioning is ready', async () => {
@@ -119,6 +129,9 @@ describe('GraphProvisioningHud', () => {
 
     const openButton = host.querySelector('button[aria-label]');
     expect(openButton).not.toBeNull();
+    expect(host.querySelector('[data-testid="stepper"]')?.getAttribute('data-stepper-active')).toBe(
+      'true'
+    );
 
     await act(async () => {
       openButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
@@ -126,8 +139,45 @@ describe('GraphProvisioningHud', () => {
     });
 
     expect(document.body.textContent).toContain('provisioning-panel');
-    expect(document.body.querySelector('[data-testid="panel"]')?.getAttribute('data-default-logs-open')).toBe(
-      'true'
+    expect(
+      document.body.querySelector('[data-testid="panel"]')?.getAttribute('data-default-logs-open')
+    ).toBe('true');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('renders the failed graph hud without active stepper animation', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    hookState.presentation = {
+      isActive: false,
+      isFailed: true,
+      hasMembersStillJoining: false,
+      failedSpawnCount: 1,
+      compactTone: 'error',
+      compactTitle: 'Launch failed',
+      compactDetail: 'alice failed to start',
+      currentStepIndex: 2,
+      progress: { runId: 'run-4' },
+    };
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(GraphProvisioningHud, {
+          teamName: 'northstar-core',
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.querySelector('[data-testid="stepper"]')?.getAttribute('data-stepper-active')).toBe(
+      'false'
     );
 
     await act(async () => {
diff --git a/test/renderer/store/notificationSlice.test.ts b/test/renderer/store/notificationSlice.test.ts
index 8d2557e7..2aade950 100644
--- a/test/renderer/store/notificationSlice.test.ts
+++ b/test/renderer/store/notificationSlice.test.ts
@@ -502,6 +502,74 @@ describe('notificationSlice', () => {
         expect(tabs).toHaveLength(1);
         expect(tabs[0].type).toBe('team');
       });
+
+      it('should open global task detail for task notification targets', () => {
+        const teamError = createMockError({
+          sessionId: 'team:delta-team',
+          source: 'task_comment',
+          category: 'team' as never,
+          teamEventType: 'task_comment' as never,
+          target: {
+            kind: 'task',
+            teamName: 'delta-team',
+            taskId: 'task-123',
+            commentId: 'comment-456',
+            focus: 'comments',
+          },
+        });
+
+        store.getState().navigateToError(teamError);
+
+        expect(store.getState().globalTaskDetail).toEqual({
+          teamName: 'delta-team',
+          taskId: 'task-123',
+          commentId: 'comment-456',
+        });
+      });
+
+      it('should open team-scoped member profile for member notification targets', () => {
+        const teamError = createMockError({
+          sessionId: 'team:epsilon-team',
+          source: 'rate_limit',
+          category: 'team' as never,
+          teamEventType: 'rate_limit' as never,
+          target: {
+            kind: 'member',
+            teamName: 'epsilon-team',
+            memberName: 'tom',
+            focus: 'logs',
+          },
+        });
+
+        store.getState().navigateToError(teamError);
+
+        expect(store.getState().pendingMemberProfile).toEqual({
+          teamName: 'epsilon-team',
+          memberName: 'tom',
+          focus: 'logs',
+        });
+      });
+
+      it('should focus a team section for team notification targets', () => {
+        const teamError = createMockError({
+          sessionId: 'team:zeta-team',
+          source: 'team_launch_incomplete',
+          category: 'team' as never,
+          teamEventType: 'team_launch_incomplete' as never,
+          target: {
+            kind: 'team',
+            teamName: 'zeta-team',
+            section: 'members',
+          },
+        });
+
+        store.getState().navigateToError(teamError);
+
+        expect(store.getState().pendingTeamSectionFocus).toEqual({
+          teamName: 'zeta-team',
+          section: 'members',
+        });
+      });
     });
 
     describe('existing tab behavior', () => {
diff --git a/test/renderer/store/teamChangeThrottle.test.ts b/test/renderer/store/teamChangeThrottle.test.ts
index 47fd6c9c..23331506 100644
--- a/test/renderer/store/teamChangeThrottle.test.ts
+++ b/test/renderer/store/teamChangeThrottle.test.ts
@@ -2,7 +2,10 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 const hoisted = vi.hoisted(() => ({
   onTeamChangeCb: null as
-    | ((event: unknown, data: { type?: string; teamName: string; detail?: string }) => void)
+    | ((
+        event: unknown,
+        data: { type?: string; teamName: string; detail?: string; runId?: string }
+      ) => void)
     | null,
   onProvisioningProgressCb: null as
     | ((event: unknown, data: { runId: string; teamName: string }) => void)
@@ -35,7 +38,10 @@ vi.mock('@renderer/api', () => ({
       setToolActivityTracking: vi.fn(async () => undefined),
       onTeamChange: vi.fn(
         (
-          cb: (event: unknown, data: { teamName: string; type?: string; detail?: string }) => void
+          cb: (
+            event: unknown,
+            data: { teamName: string; type?: string; detail?: string; runId?: string }
+          ) => void
         ): (() => void) => {
           hoisted.onTeamChangeCb = cb;
           return () => {
@@ -63,6 +69,12 @@ vi.mock('@renderer/api', () => ({
 
 import { initializeNotificationListeners, useStore } from '../../../src/renderer/store';
 import { __resetTeamSliceModuleStateForTests } from '../../../src/renderer/store/slices/teamSlice';
+import {
+  __resetTeamRefreshFanoutDiagnosticsForTests,
+  getTeamRefreshFanoutSnapshotForTests,
+  summarizeTeamRefreshFanout,
+  type TeamRefreshFanoutSnapshot,
+} from '../../../src/renderer/store/teamRefreshFanoutDiagnostics';
 import { api } from '@renderer/api';
 
 describe('team change throttling', () => {
@@ -71,8 +83,10 @@ describe('team change throttling', () => {
   beforeEach(async () => {
     vi.useFakeTimers();
     __resetTeamSliceModuleStateForTests();
+    __resetTeamRefreshFanoutDiagnosticsForTests();
     const fetchTeams = vi.fn(async () => undefined);
     const fetchMemberSpawnStatuses = vi.fn(async () => undefined);
+    const fetchTeamAgentRuntime = vi.fn(async () => undefined);
     const refreshTeamData = vi.fn(async () => undefined);
     const refreshTeamMessagesHead = vi.fn(async () => ({
       feedChanged: true,
@@ -85,6 +99,7 @@ describe('team change throttling', () => {
     useStore.setState({
       fetchTeams,
       fetchMemberSpawnStatuses,
+      fetchTeamAgentRuntime,
       refreshTeamData,
       refreshTeamMessagesHead,
       refreshMemberActivityMeta,
@@ -92,6 +107,14 @@ describe('team change throttling', () => {
       selectedTeamName: null,
       selectedTeamData: null,
       teamDataCacheByName: {},
+      provisioningRuns: {},
+      currentProvisioningRunIdByTeam: {},
+      currentRuntimeRunIdByTeam: {},
+      ignoredProvisioningRunIds: {},
+      ignoredRuntimeRunIds: {},
+      memberSpawnStatusesByTeam: {},
+      memberSpawnSnapshotsByTeam: {},
+      teamAgentRuntimeByTeam: {},
       memberActivityMetaByTeam: {},
       paneLayout: {
         focusedPaneId: 'p1',
@@ -117,6 +140,8 @@ describe('team change throttling', () => {
     cleanup?.();
     cleanup = null;
     __resetTeamSliceModuleStateForTests();
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+    window.localStorage.removeItem('team:processLiteFanout');
     vi.mocked(console.warn).mockClear();
     vi.useRealTimers();
   });
@@ -163,6 +188,859 @@ describe('team change throttling', () => {
     expect(refreshTeamDataSpy).toHaveBeenCalledTimes(2);
   });
 
+  it('keeps process events on the existing structural refresh path and records fanout', async () => {
+    const state = useStore.getState();
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.({}, { type: 'process', teamName: 'my-team' });
+
+    await vi.advanceTimersByTimeAsync(800);
+
+    expect(refreshTeamDataSpy).toHaveBeenCalledTimes(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+
+    const snapshot = getTeamRefreshFanoutSnapshotForTests(
+      'my-team'
+    ) as TeamRefreshFanoutSnapshot | null;
+    expect(
+      snapshot?.counts['team-change-listener:event:process:refreshTeamData:scheduled']
+    ).toBe(1);
+    expect(snapshot?.counts['team-change-listener:event:process:refreshTeamData:executed']).toBe(
+      1
+    );
+  });
+
+  it('uses process-lite for strict candidates and delays structural reconcile', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const fetchMemberSpawnStatusesSpy = vi.spyOn(state, 'fetchMemberSpawnStatuses');
+    const fetchTeamAgentRuntimeSpy = vi.spyOn(state, 'fetchTeamAgentRuntime');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(500);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledTimes(1);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledWith('my-team');
+    expect(fetchTeamAgentRuntimeSpy).toHaveBeenCalledTimes(1);
+    expect(fetchTeamAgentRuntimeSpy).toHaveBeenCalledWith('my-team');
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(1999);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(1);
+    expect(fetchTeamsSpy).toHaveBeenCalledTimes(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledTimes(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'dry-run:process-lite:processes-json-visible-runtime-context',
+          operation: 'wouldUseProcessLite',
+          phase: 'skipped',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-suppressed',
+          operation: 'refreshTeamData',
+          phase: 'skipped',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite',
+          operation: 'fetchMemberSpawnStatuses',
+          phase: 'executed',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite',
+          operation: 'fetchTeamAgentRuntime',
+          phase: 'executed',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-reconcile',
+          operation: 'refreshTeamData',
+          phase: 'executed',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-reconcile',
+          operation: 'fetchTeams',
+          phase: 'executed',
+        }),
+      ])
+    );
+  });
+
+  it('uses process-lite when an active provisioning run exists without current runtime', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: {},
+    } as never);
+
+    const state = useStore.getState();
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+    const fetchMemberSpawnStatusesSpy = vi.spyOn(state, 'fetchMemberSpawnStatuses');
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(500);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledWith('my-team');
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(20_000);
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-reconcile:suppressed-during-launch',
+          operation: 'refreshTeamData',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps active launch process file events runtime-only before team data hydrates', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: null,
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: {},
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+    const fetchMemberSpawnStatusesSpy = vi.spyOn(state, 'fetchMemberSpawnStatuses');
+    const fetchTeamAgentRuntimeSpy = vi.spyOn(state, 'fetchTeamAgentRuntime');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+    await vi.advanceTimersByTimeAsync(799);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(1);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledWith('my-team');
+    expect(fetchTeamAgentRuntimeSpy).toHaveBeenCalledWith('my-team');
+    expect(useStore.getState().selectedTeamData).toBeNull();
+    expect(useStore.getState().teamDataCacheByName['my-team']).toBeUndefined();
+
+    await vi.advanceTimersByTimeAsync(19_200);
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'dry-run:process-lite:missing-visible-team-data',
+          operation: 'wouldKeepStructuralProcess',
+          phase: 'skipped',
+        }),
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-suppressed-during-launch',
+          operation: 'refreshTeamData',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps active launch process file events structural when process-lite is disabled', async () => {
+    window.localStorage.setItem('team:processLiteFanout', '0');
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: null,
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: {},
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+  });
+
+  it('suppresses idle-watchdog structural refresh during active launch', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json', runId: 'run-1' }
+    );
+
+    await vi.advanceTimersByTimeAsync(30_000);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+  });
+
+  it('keeps idle-watchdog structural refresh available when process-lite is disabled', async () => {
+    window.localStorage.setItem('team:processLiteFanout', '0');
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'lead-activity', teamName: 'my-team', detail: 'active', runId: 'run-1' }
+    );
+
+    await vi.advanceTimersByTimeAsync(29_999);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    await vi.advanceTimersByTimeAsync(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+  });
+
+  it('does not treat terminal or unknown provisioning states as process-lite active', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'ready',
+          message: 'Ready',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: {},
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+  });
+
+  it('keeps unsafe process details structural during active launch', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-1' },
+      provisioningRuns: {
+        'run-1': {
+          runId: 'run-1',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+    const fetchMemberSpawnStatusesSpy = vi.spyOn(useStore.getState(), 'fetchMemberSpawnStatuses');
+
+    hoisted.onTeamChangeCb?.({}, { type: 'process', teamName: 'my-team', detail: 'failed' });
+
+    await vi.advanceTimersByTimeAsync(500);
+    expect(fetchMemberSpawnStatusesSpy).not.toHaveBeenCalled();
+    await vi.advanceTimersByTimeAsync(300);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'dry-run:process-lite:unsafe-process-detail',
+          operation: 'wouldKeepStructuralProcess',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps strict process candidates on the structural path when process-lite is disabled', async () => {
+    window.localStorage.setItem('team:processLiteFanout', '0');
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+    const fetchTeamAgentRuntimeSpy = vi.spyOn(state, 'fetchTeamAgentRuntime');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+    expect(fetchTeamAgentRuntimeSpy).not.toHaveBeenCalled();
+    await vi.advanceTimersByTimeAsync(1200);
+    expect(fetchTeamsSpy).toHaveBeenCalledTimes(1);
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'event:process-lite:disabled',
+          operation: 'wouldKeepStructuralProcess',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('coalesces process-lite structural reconcile until idle or max wait', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+    for (let elapsed = 2_000; elapsed <= 14_000; elapsed += 2_000) {
+      await vi.advanceTimersByTimeAsync(2_000);
+      hoisted.onTeamChangeCb?.(
+        {},
+        { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+      );
+      expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+      expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    }
+
+    await vi.advanceTimersByTimeAsync(999);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+    await vi.advanceTimersByTimeAsync(1);
+    expect(fetchTeamsSpy).toHaveBeenCalledTimes(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('cancels pending process-lite structural reconcile when launch becomes active', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(500);
+    useStore.setState({
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-2' },
+      provisioningRuns: {
+        'run-2': {
+          runId: 'run-2',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-2' },
+    } as never);
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json', runId: 'run-2' }
+    );
+
+    await vi.advanceTimersByTimeAsync(20_000);
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-reconcile:cancelled-during-launch',
+          operation: 'refreshTeamData',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('skips pending process-lite structural reconcile if provisioning becomes active before the timer fires', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json', runId: 'run-1' }
+    );
+
+    await vi.advanceTimersByTimeAsync(500);
+    useStore.setState({
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-2' },
+      provisioningRuns: {
+        'run-2': {
+          runId: 'run-2',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-2' },
+    } as never);
+
+    await vi.advanceTimersByTimeAsync(20_000);
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'event:process-lite:structural-reconcile:suppressed-during-launch',
+          operation: 'refreshTeamData',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps pending process-lite structural reconcile available when process-lite is disabled before the timer fires', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json', runId: 'run-1' }
+    );
+
+    await vi.advanceTimersByTimeAsync(500);
+    window.localStorage.setItem('team:processLiteFanout', '0');
+    useStore.setState({
+      currentProvisioningRunIdByTeam: { 'my-team': 'run-2' },
+      provisioningRuns: {
+        'run-2': {
+          runId: 'run-2',
+          teamName: 'my-team',
+          state: 'spawning',
+          message: 'Spawning',
+          startedAt: '2026-05-03T00:00:00.000Z',
+          updatedAt: '2026-05-03T00:00:00.000Z',
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-2' },
+    } as never);
+
+    await vi.advanceTimersByTimeAsync(2_000);
+    expect(fetchTeamsSpy).toHaveBeenCalledTimes(1);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+  });
+
+  it('cancels pending process-lite reconcile when a normal structural event wins', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+    await vi.advanceTimersByTimeAsync(500);
+    hoisted.onTeamChangeCb?.({}, { type: 'task', teamName: 'my-team' });
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).toHaveBeenCalledTimes(1);
+
+    await vi.advanceTimersByTimeAsync(15_000);
+    expect(refreshTeamDataSpy).toHaveBeenCalledTimes(1);
+  });
+
+  it('does not let process-lite coalescing weaken member-spawn runtime refresh semantics', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchMemberSpawnStatusesSpy = vi.spyOn(state, 'fetchMemberSpawnStatuses');
+    const fetchTeamAgentRuntimeSpy = vi.spyOn(state, 'fetchTeamAgentRuntime');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+    hoisted.onTeamChangeCb?.({}, { type: 'member-spawn', teamName: 'my-team' });
+
+    useStore.setState({
+      paneLayout: {
+        focusedPaneId: 'p1',
+        panes: [
+          {
+            id: 'p1',
+            widthFraction: 1,
+            tabs: [{ id: 't2', type: 'team', teamName: 'other-team', label: 'other-team' }],
+            activeTabId: 't2',
+          },
+        ],
+      },
+    } as never);
+
+    await vi.advanceTimersByTimeAsync(500);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledTimes(1);
+    expect(fetchMemberSpawnStatusesSpy).toHaveBeenCalledWith('my-team');
+    expect(fetchTeamAgentRuntimeSpy).toHaveBeenCalledTimes(1);
+    expect(fetchTeamAgentRuntimeSpy).toHaveBeenCalledWith('my-team');
+  });
+
+  it('cleans up pending process-lite reconcile timers', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const state = useStore.getState();
+    const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
+    const refreshTeamDataSpy = vi.spyOn(state, 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'my-team', detail: 'processes.json' }
+    );
+    cleanup?.();
+    cleanup = null;
+
+    await vi.advanceTimersByTimeAsync(20_000);
+    expect(fetchTeamsSpy).not.toHaveBeenCalled();
+    expect(refreshTeamDataSpy).not.toHaveBeenCalled();
+  });
+
+  it('records unsafe process details as structural dry-run without changing refresh behavior', async () => {
+    useStore.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: {
+        teamName: 'my-team',
+        config: { name: 'My Team', members: [], projectPath: '/repo' },
+        tasks: [],
+        members: [],
+        kanbanState: { teamName: 'my-team', reviewers: [], tasks: {} },
+        processes: [],
+      },
+      currentRuntimeRunIdByTeam: { 'my-team': 'run-1' },
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.({}, { type: 'process', teamName: 'my-team', detail: 'cancelled' });
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).toHaveBeenCalledWith('my-team', { withDedup: true });
+
+    const summary = summarizeTeamRefreshFanout('my-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'dry-run:process-lite:unsafe-process-detail',
+          operation: 'wouldKeepStructuralProcess',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps hidden process events out of visible detail refresh while recording structural dry-run', async () => {
+    useStore.setState({
+      paneLayout: {
+        focusedPaneId: 'p1',
+        panes: [
+          {
+            id: 'p1',
+            widthFraction: 1,
+            tabs: [{ id: 't1', type: 'team', teamName: 'my-team', label: 'my-team' }],
+            activeTabId: 't1',
+          },
+        ],
+      },
+      teamDataCacheByName: {
+        'other-team': {
+          teamName: 'other-team',
+          config: { name: 'Other Team', members: [], projectPath: '/repo' },
+          tasks: [],
+          members: [],
+          kanbanState: { teamName: 'other-team', reviewers: [], tasks: {} },
+          processes: [],
+        },
+      },
+      currentRuntimeRunIdByTeam: { 'other-team': 'run-1' },
+    } as never);
+
+    const refreshTeamDataSpy = vi.spyOn(useStore.getState(), 'refreshTeamData');
+
+    hoisted.onTeamChangeCb?.(
+      {},
+      { type: 'process', teamName: 'other-team', detail: 'processes.json' }
+    );
+
+    await vi.advanceTimersByTimeAsync(800);
+    expect(refreshTeamDataSpy).not.toHaveBeenCalledWith('other-team', { withDedup: true });
+
+    const summary = summarizeTeamRefreshFanout('other-team');
+    expect(summary.rows).toEqual(
+      expect.arrayContaining([
+        expect.objectContaining({
+          reason: 'dry-run:process-lite:hidden-team',
+          operation: 'wouldKeepStructuralProcess',
+          phase: 'skipped',
+        }),
+      ])
+    );
+  });
+
+  it('keeps task and config events on the existing global task refresh path', async () => {
+    const fetchAllTasksSpy = vi.fn(async () => undefined);
+    useStore.setState({ fetchAllTasks: fetchAllTasksSpy } as never);
+
+    hoisted.onTeamChangeCb?.({}, { type: 'task', teamName: 'my-team' });
+    hoisted.onTeamChangeCb?.({}, { type: 'config', teamName: 'my-team' });
+
+    await vi.advanceTimersByTimeAsync(500);
+
+    expect(fetchAllTasksSpy).toHaveBeenCalledTimes(1);
+
+    const snapshot = getTeamRefreshFanoutSnapshotForTests(
+      'my-team'
+    ) as TeamRefreshFanoutSnapshot | null;
+    expect(snapshot?.counts['team-change-listener:event:task:fetchAllTasks:scheduled']).toBe(1);
+    expect(snapshot?.counts['team-change-listener:event:config:fetchAllTasks:coalesced']).toBe(1);
+    expect(snapshot?.counts['team-change-listener:event:task:fetchAllTasks:executed']).toBe(1);
+    expect(snapshot?.counts['team-change-listener:event:config:fetchAllTasks:executed']).toBe(1);
+  });
+
   it('lead-message refreshes message head only, not team list, tasks, or structural detail', async () => {
     const state = useStore.getState();
     const fetchTeamsSpy = vi.spyOn(state, 'fetchTeams');
diff --git a/test/renderer/store/teamProcessFanoutDryRun.test.ts b/test/renderer/store/teamProcessFanoutDryRun.test.ts
new file mode 100644
index 00000000..b24ae175
--- /dev/null
+++ b/test/renderer/store/teamProcessFanoutDryRun.test.ts
@@ -0,0 +1,112 @@
+import { describe, expect, it } from 'vitest';
+
+import {
+  decideProcessFanoutMode,
+  decideProcessFanoutDryRun,
+  type TeamProcessFanoutInput,
+} from '../../../src/renderer/store/teamProcessFanoutDryRun';
+
+const baseInput: TeamProcessFanoutInput = {
+  teamName: 'my-team',
+  eventType: 'process',
+  detail: 'processes.json',
+  hasRunId: false,
+  isStaleRuntimeEvent: false,
+  isVisible: true,
+  hasVisibleTeamData: true,
+  hasActiveProvisioningRun: false,
+  hasCurrentRuntimeRun: true,
+};
+
+describe('teamProcessFanoutDryRun', () => {
+  it('does not mark non-process events as candidates', () => {
+    expect(decideProcessFanoutDryRun({ ...baseInput, eventType: 'config' })).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'not-process-event',
+    });
+  });
+
+  it('does not mark stale runtime events as candidates', () => {
+    expect(decideProcessFanoutDryRun({ ...baseInput, isStaleRuntimeEvent: true })).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'stale-runtime-event',
+    });
+  });
+
+  it('does not mark hidden teams as candidates', () => {
+    expect(decideProcessFanoutDryRun({ ...baseInput, isVisible: false })).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'hidden-team',
+    });
+  });
+
+  it('does not mark visible teams without visible data as candidates', () => {
+    expect(decideProcessFanoutDryRun({ ...baseInput, hasVisibleTeamData: false })).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'missing-visible-team-data',
+    });
+  });
+
+  it('does not mark teams without runtime or provisioning context as candidates', () => {
+    expect(
+      decideProcessFanoutDryRun({
+        ...baseInput,
+        hasActiveProvisioningRun: false,
+        hasCurrentRuntimeRun: false,
+      })
+    ).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'no-active-runtime-context',
+    });
+  });
+
+  it('does not treat runId alone as a safe process-lite signal', () => {
+    expect(
+      decideProcessFanoutDryRun({
+        ...baseInput,
+        detail: 'cancelled',
+        hasRunId: true,
+      })
+    ).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'unsafe-process-detail',
+    });
+  });
+
+  it('does not mark missing process detail as a candidate even with runId', () => {
+    expect(
+      decideProcessFanoutDryRun({
+        ...baseInput,
+        detail: undefined,
+        hasRunId: true,
+      })
+    ).toEqual({
+      wouldUseProcessLite: false,
+      reason: 'unsafe-process-detail',
+    });
+  });
+
+  it('marks visible processes.json updates with runtime context as candidates', () => {
+    expect(decideProcessFanoutDryRun(baseInput)).toEqual({
+      wouldUseProcessLite: true,
+      reason: 'processes-json-visible-runtime-context',
+    });
+    expect(decideProcessFanoutMode(baseInput)).toEqual({
+      mode: 'process-lite',
+      reason: 'processes-json-visible-runtime-context',
+    });
+  });
+
+  it('marks visible processes.json updates with active provisioning as candidates', () => {
+    expect(
+      decideProcessFanoutMode({
+        ...baseInput,
+        hasActiveProvisioningRun: true,
+        hasCurrentRuntimeRun: false,
+      })
+    ).toEqual({
+      mode: 'process-lite',
+      reason: 'processes-json-visible-runtime-context',
+    });
+  });
+});
diff --git a/test/renderer/store/teamRefreshFanoutDebugBridge.test.ts b/test/renderer/store/teamRefreshFanoutDebugBridge.test.ts
new file mode 100644
index 00000000..7cc8fe48
--- /dev/null
+++ b/test/renderer/store/teamRefreshFanoutDebugBridge.test.ts
@@ -0,0 +1,81 @@
+import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+
+import {
+  installTeamRefreshFanoutDebugBridge,
+  TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY,
+} from '../../../src/renderer/store/teamRefreshFanoutDebugBridge';
+import {
+  __resetTeamRefreshFanoutDiagnosticsForTests,
+  noteTeamRefreshFanout,
+} from '../../../src/renderer/store/teamRefreshFanoutDiagnostics';
+
+describe('teamRefreshFanoutDebugBridge', () => {
+  beforeEach(() => {
+    localStorage.clear();
+    delete window.__TEAM_REFRESH_FANOUT__;
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+  });
+
+  afterEach(() => {
+    localStorage.clear();
+    delete window.__TEAM_REFRESH_FANOUT__;
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+  });
+
+  it('does not install without the localStorage flag', () => {
+    const cleanup = installTeamRefreshFanoutDebugBridge();
+
+    expect(window.__TEAM_REFRESH_FANOUT__).toBeUndefined();
+    cleanup();
+    expect(window.__TEAM_REFRESH_FANOUT__).toBeUndefined();
+  });
+
+  it('installs a frozen bridge behind the localStorage flag', () => {
+    localStorage.setItem(TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY, '1');
+
+    const cleanup = installTeamRefreshFanoutDebugBridge();
+
+    expect(window.__TEAM_REFRESH_FANOUT__).toBeDefined();
+    expect(Object.isFrozen(window.__TEAM_REFRESH_FANOUT__)).toBe(true);
+    expect(typeof window.__TEAM_REFRESH_FANOUT__?.snapshot).toBe('function');
+    expect(typeof window.__TEAM_REFRESH_FANOUT__?.summary).toBe('function');
+    expect(typeof window.__TEAM_REFRESH_FANOUT__?.reset).toBe('function');
+
+    cleanup();
+    expect(window.__TEAM_REFRESH_FANOUT__).toBeUndefined();
+  });
+
+  it('cleanup removes only the bridge it installed', () => {
+    localStorage.setItem(TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY, '1');
+    const cleanup = installTeamRefreshFanoutDebugBridge();
+    const replacement = {
+      snapshot: window.__TEAM_REFRESH_FANOUT__!.snapshot,
+      summary: window.__TEAM_REFRESH_FANOUT__!.summary,
+      reset: window.__TEAM_REFRESH_FANOUT__!.reset,
+    };
+    window.__TEAM_REFRESH_FANOUT__ = replacement;
+
+    cleanup();
+
+    expect(window.__TEAM_REFRESH_FANOUT__).toBe(replacement);
+  });
+
+  it('bridge reset clears diagnostics', () => {
+    localStorage.setItem(TEAM_REFRESH_FANOUT_DEBUG_STORAGE_KEY, '1');
+    const cleanup = installTeamRefreshFanoutDebugBridge();
+
+    noteTeamRefreshFanout({
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    });
+
+    expect(window.__TEAM_REFRESH_FANOUT__?.summary('team-a').total).toBe(1);
+    window.__TEAM_REFRESH_FANOUT__?.reset();
+    expect(window.__TEAM_REFRESH_FANOUT__?.summary('team-a').total).toBe(0);
+
+    cleanup();
+  });
+});
diff --git a/test/renderer/store/teamRefreshFanoutDiagnostics.test.ts b/test/renderer/store/teamRefreshFanoutDiagnostics.test.ts
new file mode 100644
index 00000000..eb223304
--- /dev/null
+++ b/test/renderer/store/teamRefreshFanoutDiagnostics.test.ts
@@ -0,0 +1,218 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  __resetTeamRefreshFanoutDiagnosticsForTests,
+  buildTeamRefreshFanoutCountKey,
+  getTeamRefreshFanoutSnapshotForTests,
+  MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES,
+  MAX_TEAM_REFRESH_DIAGNOSTIC_TEAMS,
+  noteTeamRefreshFanout,
+  summarizeTeamRefreshFanout,
+  type TeamRefreshFanoutSnapshot,
+} from '../../../src/renderer/store/teamRefreshFanoutDiagnostics';
+
+function snapshotFor(teamName: string): TeamRefreshFanoutSnapshot {
+  const snapshot = getTeamRefreshFanoutSnapshotForTests(teamName);
+  expect(snapshot).not.toBeNull();
+  return snapshot as TeamRefreshFanoutSnapshot;
+}
+
+describe('teamRefreshFanoutDiagnostics', () => {
+  beforeEach(() => {
+    vi.useFakeTimers();
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+  });
+
+  afterEach(() => {
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+    vi.useRealTimers();
+  });
+
+  it('records scheduled and executed fanout counts separately', () => {
+    const scheduled = {
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    } as const;
+    const executed = {
+      ...scheduled,
+      phase: 'executed',
+    } as const;
+
+    noteTeamRefreshFanout(scheduled);
+    noteTeamRefreshFanout(executed);
+
+    const snapshot = snapshotFor('team-a');
+    expect(snapshot.counts[buildTeamRefreshFanoutCountKey(scheduled)]).toBe(1);
+    expect(snapshot.counts[buildTeamRefreshFanoutCountKey(executed)]).toBe(1);
+  });
+
+  it('records coalesced notes separately from scheduled notes', () => {
+    const scheduled = {
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:member-spawn',
+      operation: 'fetchMemberSpawnStatuses',
+    } as const;
+    const coalesced = {
+      ...scheduled,
+      phase: 'coalesced',
+    } as const;
+
+    noteTeamRefreshFanout(scheduled);
+    noteTeamRefreshFanout(coalesced);
+    noteTeamRefreshFanout(coalesced);
+
+    const snapshot = snapshotFor('team-a');
+    expect(snapshot.counts[buildTeamRefreshFanoutCountKey(scheduled)]).toBe(1);
+    expect(snapshot.counts[buildTeamRefreshFanoutCountKey(coalesced)]).toBe(2);
+  });
+
+  it('caps recent notes per team', () => {
+    for (let index = 0; index < MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES + 5; index += 1) {
+      noteTeamRefreshFanout({
+        teamName: 'team-a',
+        surface: 'team-change-listener',
+        phase: 'scheduled',
+        reason: `event:${index}`,
+        operation: 'refreshTeamData',
+      });
+    }
+
+    const snapshot = snapshotFor('team-a');
+    expect(snapshot.recent).toHaveLength(MAX_TEAM_REFRESH_DIAGNOSTIC_RECENT_NOTES);
+    expect(snapshot.recent[0]?.reason).toBe('event:5');
+  });
+
+  it('caps team buckets by evicting the oldest bucket', () => {
+    for (let index = 0; index < MAX_TEAM_REFRESH_DIAGNOSTIC_TEAMS + 1; index += 1) {
+      noteTeamRefreshFanout({
+        teamName: `team-${index}`,
+        surface: 'team-change-listener',
+        phase: 'scheduled',
+        reason: 'event:process',
+        operation: 'refreshTeamData',
+      });
+    }
+
+    expect(getTeamRefreshFanoutSnapshotForTests('team-0')).toBeNull();
+    expect(
+      getTeamRefreshFanoutSnapshotForTests(`team-${MAX_TEAM_REFRESH_DIAGNOSTIC_TEAMS}`)
+    ).not.toBeNull();
+  });
+
+  it('reset clears all diagnostic state', () => {
+    noteTeamRefreshFanout({
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    });
+
+    __resetTeamRefreshFanoutDiagnosticsForTests();
+
+    expect(getTeamRefreshFanoutSnapshotForTests('team-a')).toBeNull();
+    expect(getTeamRefreshFanoutSnapshotForTests()).toEqual({});
+  });
+
+  it('summarizes structured counts without splitting colon-containing reasons', () => {
+    noteTeamRefreshFanout({
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    });
+
+    const summary = summarizeTeamRefreshFanout('team-a');
+
+    expect(summary).toMatchObject({ teamName: 'team-a', total: 1 });
+    expect(summary.rows[0]).toMatchObject({
+      count: 1,
+      surface: 'team-change-listener',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+      phase: 'scheduled',
+    });
+  });
+
+  it('sorts summary rows by count descending and aggregates across teams', () => {
+    const highVolumeNote = {
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    } as const;
+    const lowVolumeNote = {
+      teamName: 'team-b',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:config',
+      operation: 'fetchTeams',
+    } as const;
+
+    noteTeamRefreshFanout(highVolumeNote);
+    noteTeamRefreshFanout(highVolumeNote);
+    noteTeamRefreshFanout(lowVolumeNote);
+
+    const summary = summarizeTeamRefreshFanout();
+
+    expect(summary.total).toBe(3);
+    expect(summary.rows[0]).toMatchObject({
+      count: 2,
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    });
+    expect(summary.rows[1]).toMatchObject({
+      count: 1,
+      reason: 'event:config',
+      operation: 'fetchTeams',
+    });
+  });
+
+  it('returns cloned snapshots that cannot mutate internal buckets', () => {
+    const note = {
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    } as const;
+    noteTeamRefreshFanout(note);
+
+    const key = buildTeamRefreshFanoutCountKey(note);
+    const snapshot = snapshotFor('team-a');
+    snapshot.counts[key] = 99;
+    snapshot.structuredCounts[key]!.count = 99;
+    snapshot.recent[0]!.reason = 'mutated';
+
+    const nextSnapshot = snapshotFor('team-a');
+    expect(nextSnapshot.counts[key]).toBe(1);
+    expect(nextSnapshot.structuredCounts[key]?.count).toBe(1);
+    expect(nextSnapshot.recent[0]?.reason).toBe('event:process');
+  });
+
+  it('ignores invalid empty team or reason values', () => {
+    noteTeamRefreshFanout({
+      teamName: '',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: 'event:process',
+      operation: 'refreshTeamData',
+    });
+    noteTeamRefreshFanout({
+      teamName: 'team-a',
+      surface: 'team-change-listener',
+      phase: 'scheduled',
+      reason: '',
+      operation: 'refreshTeamData',
+    });
+
+    expect(getTeamRefreshFanoutSnapshotForTests()).toEqual({});
+  });
+});
diff --git a/test/renderer/store/teamSlice.test.ts b/test/renderer/store/teamSlice.test.ts
index b2abffb9..4d3c0f6a 100644
--- a/test/renderer/store/teamSlice.test.ts
+++ b/test/renderer/store/teamSlice.test.ts
@@ -1,4 +1,4 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import { create } from 'zustand';
 
 import {
@@ -11,7 +11,13 @@ import {
   selectMemberMessagesForTeamMember,
   selectResolvedMemberForTeamName,
   selectResolvedMembersForTeamName,
+  selectTeamDataForName,
 } from '../../../src/renderer/store/slices/teamSlice';
+import {
+  __resetTeamRefreshFanoutDiagnosticsForTests,
+  getTeamRefreshFanoutSnapshotForTests,
+  type TeamRefreshFanoutSnapshot,
+} from '../../../src/renderer/store/teamRefreshFanoutDiagnostics';
 
 const hoisted = vi.hoisted(() => ({
   list: vi.fn(),
@@ -28,6 +34,8 @@ const hoisted = vi.hoisted(() => ({
   restoreTeam: vi.fn(),
   permanentlyDeleteTeam: vi.fn(),
   sendMessage: vi.fn(),
+  getOpenCodeRuntimeDeliveryStatus: vi.fn(),
+  retryFailedOpenCodeSecondaryLanes: vi.fn(),
   restartMember: vi.fn(),
   skipMemberForLaunch: vi.fn(),
   requestReview: vi.fn(),
@@ -36,6 +44,16 @@ const hoisted = vi.hoisted(() => ({
   onProvisioningProgress: vi.fn(() => () => undefined),
 }));
 
+const originalWindowAnimationFrame =
+  typeof window === 'undefined'
+    ? null
+    : {
+        hasRequest: Object.prototype.hasOwnProperty.call(window, 'requestAnimationFrame'),
+        hasCancel: Object.prototype.hasOwnProperty.call(window, 'cancelAnimationFrame'),
+        requestAnimationFrame: window.requestAnimationFrame,
+        cancelAnimationFrame: window.cancelAnimationFrame,
+      };
+
 vi.mock('@renderer/api', () => ({
   api: {
     teams: {
@@ -53,6 +71,8 @@ vi.mock('@renderer/api', () => ({
       restoreTeam: hoisted.restoreTeam,
       permanentlyDeleteTeam: hoisted.permanentlyDeleteTeam,
       sendMessage: hoisted.sendMessage,
+      getOpenCodeRuntimeDeliveryStatus: hoisted.getOpenCodeRuntimeDeliveryStatus,
+      retryFailedOpenCodeSecondaryLanes: hoisted.retryFailedOpenCodeSecondaryLanes,
       restartMember: hoisted.restartMember,
       skipMemberForLaunch: hoisted.skipMemberForLaunch,
       requestReview: hoisted.requestReview,
@@ -173,6 +193,83 @@ function createDeferredPromise<T>() {
   return { promise, resolve, reject };
 }
 
+function defineWindowAnimationFrame(
+  requestAnimationFrame: ((callback: FrameRequestCallback) => number) | undefined,
+  cancelAnimationFrame: ((handle: number) => void) | undefined
+): void {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  if (requestAnimationFrame === undefined) {
+    delete (window as Partial<Window>).requestAnimationFrame;
+  } else {
+    Object.defineProperty(window, 'requestAnimationFrame', {
+      configurable: true,
+      writable: true,
+      value: requestAnimationFrame,
+    });
+  }
+  if (cancelAnimationFrame === undefined) {
+    delete (window as Partial<Window>).cancelAnimationFrame;
+  } else {
+    Object.defineProperty(window, 'cancelAnimationFrame', {
+      configurable: true,
+      writable: true,
+      value: cancelAnimationFrame,
+    });
+  }
+}
+
+function restoreWindowAnimationFrame(): void {
+  if (typeof window === 'undefined' || originalWindowAnimationFrame === null) {
+    return;
+  }
+  defineWindowAnimationFrame(
+    originalWindowAnimationFrame.hasRequest
+      ? originalWindowAnimationFrame.requestAnimationFrame
+      : undefined,
+    originalWindowAnimationFrame.hasCancel ? originalWindowAnimationFrame.cancelAnimationFrame : undefined
+  );
+}
+
+function stubAnimationFrameWithTimer(): void {
+  defineWindowAnimationFrame(
+    (callback) => setTimeout(() => callback(Date.now()), 16) as unknown as number,
+    (handle) => clearTimeout(handle as unknown as ReturnType<typeof setTimeout>)
+  );
+}
+
+function stubAnimationFrameNeverFires(): void {
+  defineWindowAnimationFrame(
+    () => 1,
+    () => undefined
+  );
+}
+
+async function flushPostPaintTeamEnrichments(): Promise<void> {
+  await vi.advanceTimersByTimeAsync(16);
+  await vi.runOnlyPendingTimersAsync();
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+async function flushMicrotasks(): Promise<void> {
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+  await Promise.resolve();
+}
+
+async function flushAsyncWork(): Promise<void> {
+  await flushMicrotasks();
+  await new Promise<void>((resolve) => {
+    setTimeout(resolve, 0);
+  });
+  await flushMicrotasks();
+}
+
 function createRuntimeSnapshot(overrides: Record<string, unknown> = {}) {
   return {
     teamName: 'my-team',
@@ -198,6 +295,7 @@ describe('teamSlice actions', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     __resetTeamSliceModuleStateForTests();
+    __resetTeamRefreshFanoutDiagnosticsForTests();
     hoisted.list.mockResolvedValue([]);
     hoisted.getData.mockResolvedValue(createTeamSnapshot());
     hoisted.getMessagesPage.mockResolvedValue({
@@ -213,6 +311,7 @@ describe('teamSlice actions', () => {
       feedRevision: 'rev-1',
     });
     hoisted.sendMessage.mockResolvedValue({ deliveredToInbox: true, messageId: 'm1' });
+    hoisted.getOpenCodeRuntimeDeliveryStatus.mockResolvedValue(null);
     hoisted.requestReview.mockResolvedValue(undefined);
     hoisted.updateKanban.mockResolvedValue(undefined);
     hoisted.createTeam.mockResolvedValue({ runId: 'run-1' });
@@ -234,10 +333,73 @@ describe('teamSlice actions', () => {
     hoisted.deleteTeam.mockResolvedValue(undefined);
     hoisted.restoreTeam.mockResolvedValue(undefined);
     hoisted.permanentlyDeleteTeam.mockResolvedValue(undefined);
+    hoisted.retryFailedOpenCodeSecondaryLanes.mockResolvedValue({
+      attempted: [],
+      confirmed: [],
+      pending: [],
+      failed: [],
+      skipped: [],
+    });
     hoisted.restartMember.mockResolvedValue(undefined);
     hoisted.skipMemberForLaunch.mockResolvedValue(undefined);
   });
 
+  afterEach(() => {
+    restoreWindowAnimationFrame();
+    vi.useRealTimers();
+  });
+
+  it('records terminal provisioning fanout diagnostics without changing visible graph hydrate behavior', () => {
+    const store = createSliceStore();
+    const fetchTeams = vi.fn(async () => undefined);
+    const refreshTeamData = vi.fn(async () => undefined);
+    store.setState({
+      fetchTeams,
+      refreshTeamData,
+      selectedTeamName: 'other-team',
+      selectedTeamData: createTeamSnapshot({
+        teamName: 'other-team',
+        config: { name: 'Other Team' },
+      }),
+      paneLayout: {
+        focusedPaneId: 'pane-default',
+        panes: [
+          {
+            id: 'pane-default',
+            widthFraction: 1,
+            tabs: [{ id: 'graph-my-team', type: 'graph', teamName: 'my-team', label: 'Graph' }],
+            activeTabId: 'graph-my-team',
+          },
+        ],
+      },
+    });
+
+    store.getState().onProvisioningProgress({
+      runId: 'run-ready',
+      teamName: 'my-team',
+      state: 'ready',
+      message: 'Ready',
+      startedAt: '2026-03-12T10:00:00.000Z',
+      updatedAt: '2026-03-12T10:00:01.000Z',
+    } as never);
+
+    expect(fetchTeams).toHaveBeenCalledTimes(1);
+    expect(refreshTeamData).toHaveBeenCalledTimes(1);
+    expect(refreshTeamData).toHaveBeenCalledWith('my-team', { withDedup: true });
+
+    const snapshot = getTeamRefreshFanoutSnapshotForTests(
+      'my-team'
+    ) as TeamRefreshFanoutSnapshot | null;
+    expect(
+      snapshot?.counts['provisioning-progress:provisioning:terminal-ready:fetchTeams:scheduled']
+    ).toBe(1);
+    expect(
+      snapshot?.counts[
+        'provisioning-progress:provisioning:terminal-ready:refreshTeamData:scheduled'
+      ]
+    ).toBe(1);
+  });
+
   it('maps inbox verify failure to user-friendly text', async () => {
     const store = createSliceStore();
     hoisted.sendMessage.mockRejectedValue(new Error('Failed to verify inbox write'));
@@ -328,6 +490,58 @@ describe('teamSlice actions', () => {
     });
   });
 
+  it('updates pending OpenCode runtime diagnostics when delivery becomes terminal', async () => {
+    const store = createSliceStore();
+    hoisted.sendMessage.mockResolvedValue({
+      deliveredToInbox: true,
+      messageId: 'm-opencode-pending',
+      runtimeDelivery: {
+        providerId: 'opencode',
+        attempted: true,
+        delivered: true,
+        responsePending: true,
+        responseState: 'pending',
+        ledgerStatus: 'accepted',
+        acceptanceUnknown: false,
+        reason: 'assistant_response_pending',
+        diagnostics: ['assistant_response_pending'],
+      },
+    });
+    hoisted.getOpenCodeRuntimeDeliveryStatus.mockResolvedValue({
+      messageId: 'm-opencode-pending',
+      providerId: 'opencode',
+      attempted: true,
+      delivered: false,
+      responsePending: false,
+      responseState: 'empty_assistant_turn',
+      ledgerStatus: 'failed_terminal',
+      acceptanceUnknown: false,
+      reason: 'empty_assistant_turn',
+      diagnostics: ['empty_assistant_turn'],
+    });
+
+    await store.getState().sendTeamMessage('my-team', {
+      member: 'bob',
+      text: 'hello',
+    });
+    await store
+      .getState()
+      .refreshSendMessageRuntimeDeliveryStatus('my-team', 'm-opencode-pending');
+
+    expect(store.getState().sendMessageWarning).toBe(
+      'OpenCode runtime delivery failed. Message was saved to inbox, but live delivery did not complete. Reason: OpenCode returned an empty assistant turn.'
+    );
+    expect(store.getState().sendMessageDebugDetails).toMatchObject({
+      messageId: 'm-opencode-pending',
+      delivered: false,
+      responsePending: false,
+      responseState: 'empty_assistant_turn',
+      ledgerStatus: 'failed_terminal',
+      reason: 'empty_assistant_turn',
+      diagnostics: ['empty_assistant_turn'],
+    });
+  });
+
   it('clears OpenCode runtime diagnostics only for the matching message id', async () => {
     const store = createSliceStore();
     hoisted.sendMessage.mockResolvedValue({
@@ -905,6 +1119,470 @@ describe('teamSlice actions', () => {
     expect(store.getState().selectedTeamData).toBe(cachedBeta);
   });
 
+  it('commits selectTeam thin snapshot before post-paint messages and activity meta refreshes', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const messagesRequest = createDeferredPromise<{
+      messages: Array<{
+        from: string;
+        text: string;
+        timestamp: string;
+        messageId: string;
+        source: 'inbox';
+      }>;
+      nextCursor: null;
+      hasMore: false;
+      feedRevision: string;
+    }>();
+    const metaRequest = createDeferredPromise<{
+      teamName: string;
+      computedAt: string;
+      feedRevision: string;
+      members: Record<string, never>;
+    }>();
+    const thinSnapshot = createTeamSnapshot({
+      config: { name: 'Thin Team' },
+      members: [{ name: 'alice', role: 'developer', currentTaskId: null }],
+    });
+
+    hoisted.getData.mockResolvedValueOnce(thinSnapshot);
+    hoisted.getMessagesPage.mockImplementationOnce(() => messagesRequest.promise);
+    hoisted.getMemberActivityMeta.mockImplementationOnce(() => metaRequest.promise);
+
+    await store.getState().selectTeam('my-team');
+
+    expect(hoisted.getData).toHaveBeenCalledWith('my-team', {
+      includeMemberBranches: false,
+    });
+    expect(store.getState().selectedTeamLoading).toBe(false);
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(hoisted.getMessagesPage).not.toHaveBeenCalled();
+    expect(hoisted.getMemberActivityMeta).not.toHaveBeenCalled();
+
+    await flushPostPaintTeamEnrichments();
+
+    expect(hoisted.getMessagesPage).toHaveBeenCalledWith('my-team', { limit: 50 });
+    expect(hoisted.getMemberActivityMeta).not.toHaveBeenCalled();
+
+    messagesRequest.resolve({
+      messages: [],
+      nextCursor: null,
+      hasMore: false,
+      feedRevision: 'rev-thin',
+    });
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(hoisted.getMemberActivityMeta).toHaveBeenCalledWith('my-team');
+
+    metaRequest.resolve({
+      teamName: 'my-team',
+      computedAt: '2026-03-12T10:00:00.000Z',
+      feedRevision: 'rev-thin',
+      members: {},
+    });
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(store.getState().selectedTeamError).toBeNull();
+  });
+
+  it('keeps selected team data visible when post-paint message refresh fails', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinSnapshot = createTeamSnapshot({
+      config: { name: 'Thin Team' },
+      members: [{ name: 'alice', role: 'developer', currentTaskId: null }],
+    });
+
+    hoisted.getData.mockResolvedValueOnce(thinSnapshot);
+    hoisted.getMessagesPage.mockRejectedValueOnce(new Error('message feed unavailable'));
+
+    await store.getState().selectTeam('my-team');
+    await flushPostPaintTeamEnrichments();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(hoisted.getMessagesPage).toHaveBeenCalledTimes(1);
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(store.getState().selectedTeamError).toBeNull();
+    expect(store.getState().teamMessagesByName['my-team']?.loadingHead).toBe(false);
+  });
+
+  it('queues a full team refresh behind an in-flight thin selectTeam snapshot', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const thinSnapshot = createTeamSnapshot({
+      config: { name: 'Thin Team' },
+    });
+    const fullSnapshot = createTeamSnapshot({
+      config: { name: 'Full Team' },
+      members: [{ name: 'alice', role: 'developer', currentTaskId: null, gitBranch: 'feature/a' }],
+    });
+
+    hoisted.getData
+      .mockImplementationOnce(() => thinRequest.promise)
+      .mockResolvedValueOnce(fullSnapshot);
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await Promise.resolve();
+
+    await store.getState().refreshTeamData('my-team', { withDedup: true });
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+    });
+
+    thinRequest.resolve(thinSnapshot);
+    await selectPromise;
+
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+
+    await flushPostPaintTeamEnrichments();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(2);
+    expect(hoisted.getData.mock.calls[1]).toEqual(['my-team']);
+    expect(store.getState().selectedTeamData).toEqual(fullSnapshot);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+    });
+  });
+
+  it('drains queued full team refresh through the post-paint fallback when rAF never fires', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameNeverFires();
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+
+    hoisted.getData
+      .mockImplementationOnce(() => thinRequest.promise)
+      .mockResolvedValueOnce(
+        createTeamSnapshot({
+          config: { name: 'Full Team After Fallback' },
+        })
+      );
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await Promise.resolve();
+    await store.getState().refreshTeamData('my-team', { withDedup: true });
+
+    thinRequest.resolve(createTeamSnapshot({ config: { name: 'Thin Team' } }));
+    await selectPromise;
+
+    await vi.advanceTimersByTimeAsync(499);
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+
+    await vi.advanceTimersByTimeAsync(1);
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(2);
+    expect(store.getState().selectedTeamData?.config.name).toBe('Full Team After Fallback');
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+      hasPostPaintTeamEnrichmentTimer: false,
+    });
+  });
+
+  it('keeps selected team data visible when post-paint activity meta refresh fails', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinSnapshot = createTeamSnapshot({
+      config: { name: 'Thin Team' },
+      members: [{ name: 'alice', role: 'developer', currentTaskId: null }],
+    });
+
+    hoisted.getData.mockResolvedValueOnce(thinSnapshot);
+    hoisted.getMessagesPage.mockResolvedValueOnce({
+      messages: [
+        {
+          from: 'alice',
+          text: 'Fresh message',
+          timestamp: '2026-03-12T10:00:00.000Z',
+          messageId: 'msg-fresh',
+          source: 'inbox',
+        },
+      ],
+      nextCursor: null,
+      hasMore: false,
+      feedRevision: 'rev-meta-fail',
+    });
+    hoisted.getMemberActivityMeta.mockRejectedValueOnce(new Error('meta unavailable'));
+
+    await store.getState().selectTeam('my-team');
+    await flushPostPaintTeamEnrichments();
+    await flushMicrotasks();
+
+    expect(hoisted.getMemberActivityMeta).toHaveBeenCalledWith('my-team');
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(store.getState().selectedTeamError).toBeNull();
+  });
+
+  it('does not share a forced full refresh request with an in-flight thin selectTeam request', async () => {
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const fullRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const thinSnapshot = createTeamSnapshot({ config: { name: 'Thin Team' } });
+    const fullSnapshot = createTeamSnapshot({
+      config: { name: 'Full Team' },
+      members: [{ name: 'alice', role: 'developer', currentTaskId: null, gitBranch: 'feature/a' }],
+    });
+
+    hoisted.getData
+      .mockImplementationOnce(() => thinRequest.promise)
+      .mockImplementationOnce(() => fullRequest.promise);
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await flushMicrotasks();
+
+    const fullPromise = store.getState().refreshTeamData('my-team', { withDedup: false });
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(2);
+    expect(hoisted.getData.mock.calls[0]).toEqual([
+      'my-team',
+      { includeMemberBranches: false },
+    ]);
+    expect(hoisted.getData.mock.calls[1]).toEqual(['my-team']);
+
+    thinRequest.resolve(thinSnapshot);
+    await selectPromise;
+    fullRequest.resolve(fullSnapshot);
+    await fullPromise;
+
+    expect(store.getState().selectedTeamData).toEqual(fullSnapshot);
+  });
+
+  it('keeps one queued full refresh for repeated fanout while thin selectTeam is pending', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const fullSnapshot = createTeamSnapshot({
+      config: { name: 'Full Team Once' },
+    });
+
+    hoisted.getData
+      .mockImplementationOnce(() => thinRequest.promise)
+      .mockResolvedValueOnce(fullSnapshot);
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await flushMicrotasks();
+
+    await Promise.all([
+      store.getState().refreshTeamData('my-team', { withDedup: true }),
+      store.getState().refreshTeamData('my-team', { withDedup: true }),
+    ]);
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+    });
+
+    thinRequest.resolve(createTeamSnapshot({ config: { name: 'Thin Team' } }));
+    await selectPromise;
+    await flushPostPaintTeamEnrichments();
+    await flushMicrotasks();
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(2);
+    expect(store.getState().selectedTeamData).toEqual(fullSnapshot);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+    });
+  });
+
+  it('drains queued full refresh when thin selectTeam becomes stale after switching teams', async () => {
+    const store = createSliceStore();
+    const alphaThin = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const alphaFull = createTeamSnapshot({
+      teamName: 'alpha-team',
+      config: { name: 'Alpha Full' },
+    });
+
+    hoisted.getData
+      .mockImplementationOnce(() => alphaThin.promise)
+      .mockResolvedValueOnce(createTeamSnapshot({ teamName: 'beta-team', config: { name: 'Beta' } }))
+      .mockResolvedValueOnce(alphaFull);
+
+    const alphaSelect = store.getState().selectTeam('alpha-team');
+    await flushMicrotasks();
+    await store.getState().refreshTeamData('alpha-team', { withDedup: true });
+
+    expect(__getTeamScopedTransientStateForTests('alpha-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+    });
+
+    await store.getState().selectTeam('beta-team');
+
+    alphaThin.resolve(createTeamSnapshot({ teamName: 'alpha-team', config: { name: 'Alpha Thin' } }));
+    await alphaSelect;
+    await flushAsyncWork();
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(3);
+    expect(hoisted.getData.mock.calls[2]).toEqual(['alpha-team']);
+    expect(store.getState().selectedTeamName).toBe('beta-team');
+    expect(store.getState().teamDataCacheByName['alpha-team']).toEqual(alphaFull);
+    expect(__getTeamScopedTransientStateForTests('alpha-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+    });
+  });
+
+  it('clears queued full refresh when thin selectTeam fails structurally', async () => {
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+
+    hoisted.getData.mockImplementationOnce(() => thinRequest.promise);
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await flushMicrotasks();
+    await store.getState().refreshTeamData('my-team', { withDedup: true });
+
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+    });
+
+    thinRequest.reject(new Error('TEAM_DRAFT'));
+    await selectPromise;
+
+    expect(store.getState().selectedTeamError).toBe('TEAM_DRAFT');
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+    });
+  });
+
+  it('lets the newer same-team selectTeam drain queued full refresh after its own paint', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+    const fullSnapshot = createTeamSnapshot({
+      config: { name: 'Full After Newer Paint' },
+    });
+
+    hoisted.getData
+      .mockImplementationOnce(() => thinRequest.promise)
+      .mockResolvedValueOnce(fullSnapshot);
+
+    const firstSelect = store.getState().selectTeam('my-team');
+    await flushMicrotasks();
+    await store.getState().refreshTeamData('my-team', { withDedup: true });
+    const secondSelect = store
+      .getState()
+      .selectTeam('my-team', { allowReloadWhileProvisioning: true });
+
+    thinRequest.resolve(createTeamSnapshot({ config: { name: 'Thin Team' } }));
+    await Promise.all([firstSelect, secondSelect]);
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+      hasPostPaintTeamEnrichmentTimer: true,
+    });
+
+    await flushPostPaintTeamEnrichments();
+    await flushMicrotasks();
+
+    expect(hoisted.getData).toHaveBeenCalledTimes(2);
+    expect(hoisted.getData.mock.calls[1]).toEqual(['my-team']);
+    expect(store.getState().selectedTeamData).toEqual(fullSnapshot);
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+    });
+  });
+
+  it('does not run stale post-paint messages for a team after switching away', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+
+    hoisted.getData
+      .mockResolvedValueOnce(createTeamSnapshot({ teamName: 'alpha-team', config: { name: 'Alpha' } }))
+      .mockResolvedValueOnce(createTeamSnapshot({ teamName: 'beta-team', config: { name: 'Beta' } }));
+
+    await store.getState().selectTeam('alpha-team');
+    expect(__getTeamScopedTransientStateForTests('alpha-team')).toMatchObject({
+      hasPostPaintTeamEnrichmentTimer: true,
+    });
+
+    await store.getState().selectTeam('beta-team');
+    await flushPostPaintTeamEnrichments();
+    await flushMicrotasks();
+
+    expect(hoisted.getMessagesPage).toHaveBeenCalledTimes(1);
+    expect(hoisted.getMessagesPage).toHaveBeenCalledWith('beta-team', { limit: 50 });
+    expect(hoisted.getMessagesPage).not.toHaveBeenCalledWith('alpha-team', { limit: 50 });
+  });
+
+  it('clears queued full refresh and post-paint timer when deleting a loaded team', async () => {
+    vi.useFakeTimers();
+    stubAnimationFrameWithTimer();
+    const store = createSliceStore();
+    const thinRequest = createDeferredPromise<ReturnType<typeof createTeamSnapshot>>();
+
+    hoisted.getData.mockImplementationOnce(() => thinRequest.promise);
+
+    const selectPromise = store.getState().selectTeam('my-team');
+    await flushMicrotasks();
+    await store.getState().refreshTeamData('my-team', { withDedup: true });
+
+    thinRequest.resolve(createTeamSnapshot({ config: { name: 'Thin Team' } }));
+    await selectPromise;
+
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: true,
+      hasPostPaintTeamEnrichmentTimer: true,
+    });
+
+    await store.getState().deleteTeam('my-team');
+
+    expect(__getTeamScopedTransientStateForTests('my-team')).toMatchObject({
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+      hasPostPaintTeamEnrichmentTimer: false,
+    });
+
+    await flushPostPaintTeamEnrichments();
+
+    expect(hoisted.getMessagesPage).not.toHaveBeenCalled();
+    expect(hoisted.getData).toHaveBeenCalledTimes(1);
+  });
+
+  it('keeps selected team data visible when post-structural sync work throws', async () => {
+    const store = createSliceStore();
+    const thinSnapshot = createTeamSnapshot({
+      config: { name: 'Renamed Team' },
+    });
+    const updateTabLabel = vi.fn(() => {
+      throw new Error('tab label failed');
+    });
+
+    store.setState({
+      getAllPaneTabs: vi.fn(() => [
+        { id: 'tab-1', type: 'team', teamName: 'my-team', label: 'Old Team' },
+      ]),
+      updateTabLabel,
+    });
+    hoisted.getData.mockResolvedValueOnce(thinSnapshot);
+
+    await store.getState().selectTeam('my-team');
+
+    expect(updateTabLabel).toHaveBeenCalledWith('tab-1', 'Renamed Team');
+    expect(store.getState().selectedTeamData).toEqual(thinSnapshot);
+    expect(store.getState().selectedTeamError).toBeNull();
+  });
+
   it('distinguishes historical feed changes from visible head changes in refreshTeamMessagesHead', async () => {
     const store = createSliceStore();
     const existingMessages = [
@@ -1646,6 +2324,35 @@ describe('teamSlice actions', () => {
     expect(nextResolvedMembers).toBe(initialResolvedMembers);
   });
 
+  it('prefers selected team data over stale cached data for the active team', () => {
+    const store = createSliceStore();
+    const staleCachedData = createTeamSnapshot({
+      members: [],
+    });
+    const freshSelectedData = createTeamSnapshot({
+      members: [
+        {
+          name: 'alice',
+          currentTaskId: null,
+          taskCount: 0,
+          color: 'blue',
+        },
+      ],
+    });
+
+    store.setState({
+      selectedTeamName: 'my-team',
+      selectedTeamData: freshSelectedData,
+      teamDataCacheByName: {
+        'my-team': staleCachedData,
+      },
+      memberActivityMetaByTeam: {},
+    });
+
+    expect(selectTeamDataForName(store.getState(), 'my-team')).toBe(freshSelectedData);
+    expect(selectResolvedMembersForTeamName(store.getState(), 'my-team')).toHaveLength(1);
+  });
+
   it('memoizes team-scoped member messages selectors over the merged message feed', () => {
     const store = createSliceStore();
     store.setState({
@@ -1907,6 +2614,8 @@ describe('teamSlice actions', () => {
       hasMergedMessagesSelector: false,
       memberMessagesSelectorCount: 0,
       hasPendingFreshTeamDataRefresh: false,
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+      hasPostPaintTeamEnrichmentTimer: false,
       hasQueuedHeadRefreshAfterOlder: false,
       hasPendingFreshMessagesHeadRefresh: false,
       hasPendingFreshMemberActivityMetaRefresh: false,
@@ -2000,6 +2709,8 @@ describe('teamSlice actions', () => {
       hasMergedMessagesSelector: false,
       memberMessagesSelectorCount: 0,
       hasPendingFreshTeamDataRefresh: false,
+      hasQueuedFullTeamDataRefreshAfterThin: false,
+      hasPostPaintTeamEnrichmentTimer: false,
       hasQueuedHeadRefreshAfterOlder: false,
       hasPendingFreshMessagesHeadRefresh: false,
       hasPendingFreshMemberActivityMetaRefresh: false,
@@ -2747,6 +3458,38 @@ describe('teamSlice actions', () => {
     expect(store.getState().teamAgentRuntimeByTeam['my-team']).toEqual(createRuntimeSnapshot());
   });
 
+  it('retryFailedOpenCodeSecondaryLanes refreshes only spawn statuses and runtime snapshot', async () => {
+    const store = createSliceStore();
+    const refreshSpawnStatuses = vi.fn(async (_teamName: string) => undefined);
+    const refreshRuntimeSnapshot = vi.fn(async (_teamName: string) => undefined);
+    const refreshTeamData = vi.fn(async (_teamName: string) => undefined);
+    const fetchTeams = vi.fn(async () => undefined);
+    store.setState({
+      fetchMemberSpawnStatuses: refreshSpawnStatuses,
+      fetchTeamAgentRuntime: refreshRuntimeSnapshot,
+      refreshTeamData,
+      fetchTeams,
+    });
+    hoisted.retryFailedOpenCodeSecondaryLanes.mockResolvedValueOnce({
+      attempted: ['alice'],
+      confirmed: [],
+      pending: [],
+      failed: [{ memberName: 'alice', error: 'OpenRouter credits exhausted' }],
+      skipped: [],
+    });
+
+    const result = await store.getState().retryFailedOpenCodeSecondaryLanes('my-team');
+
+    expect(result.failed).toEqual([
+      { memberName: 'alice', error: 'OpenRouter credits exhausted' },
+    ]);
+    expect(hoisted.retryFailedOpenCodeSecondaryLanes).toHaveBeenCalledWith('my-team');
+    expect(refreshSpawnStatuses).toHaveBeenCalledWith('my-team');
+    expect(refreshRuntimeSnapshot).toHaveBeenCalledWith('my-team');
+    expect(refreshTeamData).not.toHaveBeenCalled();
+    expect(fetchTeams).not.toHaveBeenCalled();
+  });
+
   it('restartMember refreshes spawn statuses and runtime snapshot even when restart fails', async () => {
     const store = createSliceStore();
     const refreshSpawnStatuses = vi.fn(async (_teamName: string) => undefined);
diff --git a/test/renderer/utils/memberHelpers.test.ts b/test/renderer/utils/memberHelpers.test.ts
index 90f288a1..8cd3f956 100644
--- a/test/renderer/utils/memberHelpers.test.ts
+++ b/test/renderer/utils/memberHelpers.test.ts
@@ -83,6 +83,80 @@ describe('memberHelpers spawn-aware presence', () => {
     ).toBe('starting');
   });
 
+  it('labels queued OpenCode lanes separately from active startup', () => {
+    const openCodeMember: ResolvedTeamMember = { ...member, providerId: 'opencode' };
+
+    expect(
+      buildMemberLaunchPresentation({
+        member: openCodeMember,
+        spawnStatus: 'waiting',
+        spawnLaunchState: 'starting',
+        spawnLivenessSource: undefined,
+        spawnRuntimeAlive: false,
+        runtimeAdvisory: undefined,
+        isLaunchSettling: true,
+        isTeamAlive: true,
+        isTeamProvisioning: false,
+      })
+    ).toMatchObject({
+      presenceLabel: 'queued',
+      launchVisualState: 'queued',
+      launchStatusLabel: 'queued',
+      dotClass: expect.stringContaining('bg-zinc-400'),
+    });
+  });
+
+  it('does not label non-OpenCode waiting lanes as queued', () => {
+    expect(
+      buildMemberLaunchPresentation({
+        member,
+        spawnStatus: 'waiting',
+        spawnLaunchState: 'starting',
+        spawnLivenessSource: undefined,
+        spawnRuntimeAlive: false,
+        runtimeAdvisory: undefined,
+        isLaunchSettling: true,
+        isTeamAlive: true,
+        isTeamProvisioning: false,
+      })
+    ).toMatchObject({
+      presenceLabel: 'starting',
+      launchVisualState: 'waiting',
+      launchStatusLabel: 'waiting to start',
+    });
+  });
+
+  it('keeps OpenCode runtime evidence states more specific than queued', () => {
+    const openCodeMember: ResolvedTeamMember = { ...member, providerId: 'opencode' };
+
+    expect(
+      buildMemberLaunchPresentation({
+        member: openCodeMember,
+        spawnStatus: 'waiting',
+        spawnLaunchState: 'starting',
+        spawnLivenessSource: undefined,
+        spawnRuntimeAlive: false,
+        runtimeEntry: {
+          memberName: 'alice',
+          alive: false,
+          restartable: true,
+          providerId: 'opencode',
+          livenessKind: 'registered_only',
+          runtimeDiagnostic: 'registered runtime metadata without live process',
+          updatedAt: '2026-04-24T12:00:00.000Z',
+        },
+        runtimeAdvisory: undefined,
+        isLaunchSettling: true,
+        isTeamAlive: true,
+        isTeamProvisioning: false,
+      })
+    ).toMatchObject({
+      presenceLabel: 'registered',
+      launchVisualState: 'registered_only',
+      launchStatusLabel: 'registered',
+    });
+  });
+
   it('keeps starting visuals after provisioning already transitioned out of active state', () => {
     expect(
       getSpawnAwarePresenceLabel(
@@ -229,6 +303,26 @@ describe('memberHelpers spawn-aware presence', () => {
     expect(permissionPending.cardClass).toContain('member-waiting-shimmer');
   });
 
+  it('surfaces bootstrap-stalled OpenCode teammates as actionable pending state', () => {
+    const bootstrapStalled = buildMemberLaunchPresentation({
+      member: { ...member, providerId: 'opencode' },
+      spawnStatus: 'waiting',
+      spawnLaunchState: 'runtime_pending_bootstrap',
+      spawnLivenessSource: undefined,
+      spawnRuntimeAlive: true,
+      spawnBootstrapStalled: true,
+      runtimeAdvisory: undefined,
+      isLaunchSettling: false,
+      isTeamAlive: true,
+      isTeamProvisioning: false,
+    });
+
+    expect(bootstrapStalled.presenceLabel).toBe('bootstrap stalled');
+    expect(bootstrapStalled.launchVisualState).toBe('bootstrap_stalled');
+    expect(bootstrapStalled.launchStatusLabel).toBe('bootstrap stalled');
+    expect(bootstrapStalled.dotClass).toContain('bg-amber-400');
+  });
+
   it('surfaces strict runtime liveness diagnostics as launch labels', () => {
     expect(
       buildMemberLaunchPresentation({
@@ -291,6 +385,7 @@ describe('memberHelpers spawn-aware presence', () => {
         spawnLaunchState: 'confirmed_alive',
         spawnLivenessSource: 'process',
         spawnRuntimeAlive: true,
+        spawnBootstrapConfirmed: true,
         runtimeEntry: {
           memberName: 'alice',
           alive: false,
@@ -305,10 +400,38 @@ describe('memberHelpers spawn-aware presence', () => {
         isTeamProvisioning: false,
       })
     ).toMatchObject({
-      presenceLabel: 'registered',
-      launchVisualState: 'registered_only',
-      launchStatusLabel: 'registered',
-      dotClass: expect.stringContaining('bg-zinc-400'),
+      presenceLabel: 'online',
+      launchVisualState: null,
+      launchStatusLabel: null,
+      dotClass: expect.stringContaining('bg-emerald-400'),
+    });
+
+    expect(
+      buildMemberLaunchPresentation({
+        member,
+        spawnStatus: 'waiting',
+        spawnLaunchState: 'confirmed_alive',
+        spawnLivenessSource: 'process',
+        spawnRuntimeAlive: true,
+        spawnBootstrapConfirmed: true,
+        runtimeEntry: {
+          memberName: 'alice',
+          alive: false,
+          restartable: true,
+          livenessKind: 'registered_only',
+          runtimeDiagnostic: 'registered runtime metadata without live process',
+          updatedAt: '2026-04-24T12:00:00.000Z',
+        },
+        runtimeAdvisory: undefined,
+        isLaunchSettling: false,
+        isTeamAlive: true,
+        isTeamProvisioning: false,
+      })
+    ).toMatchObject({
+      presenceLabel: 'online',
+      launchVisualState: null,
+      launchStatusLabel: null,
+      dotClass: expect.stringContaining('bg-emerald-400'),
     });
   });
 
diff --git a/test/renderer/utils/memberRuntimeSummary.test.ts b/test/renderer/utils/memberRuntimeSummary.test.ts
index 80e10ec1..0417c1ff 100644
--- a/test/renderer/utils/memberRuntimeSummary.test.ts
+++ b/test/renderer/utils/memberRuntimeSummary.test.ts
@@ -114,6 +114,30 @@ describe('resolveMemberRuntimeSummary', () => {
     );
   });
 
+  it('hides stale runtime memory when the spawn state is explicitly offline', () => {
+    const member = createMember({ model: 'gpt-5.4-mini' });
+    const spawnEntry = createSpawnEntry({
+      status: 'offline',
+      launchState: 'failed_to_start',
+      runtimeAlive: false,
+      bootstrapConfirmed: false,
+    });
+    const runtimeEntry = {
+      memberName: 'alice',
+      alive: true,
+      restartable: false,
+      providerId: 'opencode',
+      pid: 333,
+      pidSource: 'opencode_bridge',
+      rssBytes: 97.3 * 1024 * 1024,
+      updatedAt: '2026-04-24T12:00:00.000Z',
+    };
+
+    expect(resolveMemberRuntimeSummary(member, undefined, spawnEntry, runtimeEntry as never)).toBe(
+      '5.4 Mini · Medium · Codex'
+    );
+  });
+
   it('keeps the persisted backend lane visible in the runtime summary', () => {
     const member = createMember({ model: 'gpt-5.4-mini' });
 
diff --git a/test/renderer/utils/openCodeRuntimeDeliveryDiagnostics.test.ts b/test/renderer/utils/openCodeRuntimeDeliveryDiagnostics.test.ts
new file mode 100644
index 00000000..84e91000
--- /dev/null
+++ b/test/renderer/utils/openCodeRuntimeDeliveryDiagnostics.test.ts
@@ -0,0 +1,30 @@
+import { describe, expect, it } from 'vitest';
+
+import { buildOpenCodeRuntimeDeliveryDiagnostics } from '../../../src/renderer/utils/openCodeRuntimeDeliveryDiagnostics';
+
+describe('openCodeRuntimeDeliveryDiagnostics', () => {
+  it('surfaces terminal empty assistant turn in the compact failed warning', () => {
+    const diagnostics = buildOpenCodeRuntimeDeliveryDiagnostics({
+      deliveredToInbox: true,
+      messageId: 'msg-empty',
+      runtimeDelivery: {
+        providerId: 'opencode',
+        attempted: true,
+        delivered: false,
+        responsePending: false,
+        responseState: 'empty_assistant_turn',
+        ledgerStatus: 'failed_terminal',
+        reason: 'empty_assistant_turn',
+        diagnostics: ['empty_assistant_turn'],
+      },
+    });
+
+    expect(diagnostics.warning).toBe(
+      'OpenCode runtime delivery failed. Message was saved to inbox, but live delivery did not complete. Reason: OpenCode returned an empty assistant turn.'
+    );
+    expect(diagnostics.debugDetails).toMatchObject({
+      responseState: 'empty_assistant_turn',
+      reason: 'empty_assistant_turn',
+    });
+  });
+});
diff --git a/test/renderer/utils/teamProvisioningPresentation.test.ts b/test/renderer/utils/teamProvisioningPresentation.test.ts
index a07043b8..9388bc7b 100644
--- a/test/renderer/utils/teamProvisioningPresentation.test.ts
+++ b/test/renderer/utils/teamProvisioningPresentation.test.ts
@@ -83,14 +83,135 @@ describe('buildTeamProvisioningPresentation', () => {
       memberSpawnSnapshot: undefined,
     });
 
-    expect(presentation?.panelMessage).toContain('jack failed to start');
-    expect(presentation?.panelMessage).toContain('gpt-5.2-codex');
+    expect(presentation?.panelMessage).toBe('jack failed to start');
     expect(presentation?.panelMessageSeverity).toBe('warning');
     expect(presentation?.compactDetail).toBe('jack failed to start');
     expect(presentation?.compactTone).toBe('warning');
     expect(presentation?.defaultLiveOutputOpen).toBe(false);
   });
 
+  it('counts retryable failed OpenCode secondary teammates conservatively', () => {
+    const presentation = buildTeamProvisioningPresentation({
+      progress: {
+        runId: 'run-opencode-retry',
+        teamName: 'mixed-team',
+        state: 'ready',
+        startedAt: '2026-04-13T10:00:00.000Z',
+        updatedAt: '2026-04-13T10:00:08.000Z',
+        message: 'Launch completed with teammate errors',
+        messageSeverity: 'warning',
+        pid: 4321,
+        cliLogsTail: '',
+        assistantOutput: '',
+      },
+      members: [
+        {
+          name: 'team-lead',
+          agentType: 'team-lead',
+          providerId: 'anthropic',
+        },
+        {
+          name: 'alice',
+          agentType: 'developer',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+        },
+        {
+          name: 'bob',
+          agentType: 'developer',
+          providerId: 'anthropic',
+          laneKind: 'primary',
+        },
+      ],
+      memberSpawnStatuses: {
+        alice: {
+          status: 'error',
+          launchState: 'failed_to_start',
+          hardFailureReason: 'OpenRouter credits exhausted',
+          updatedAt: '2026-04-13T10:00:05.000Z',
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: true,
+          agentToolAccepted: false,
+        },
+        bob: {
+          status: 'error',
+          launchState: 'failed_to_start',
+          hardFailureReason: 'Primary lane failed',
+          updatedAt: '2026-04-13T10:00:05.000Z',
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: true,
+          agentToolAccepted: false,
+        },
+      },
+      memberSpawnSnapshot: undefined,
+    });
+
+    expect(presentation?.retryableOpenCodeSecondaryFailedNames).toEqual(['alice']);
+    expect(presentation?.retryableOpenCodeSecondaryFailedCount).toBe(1);
+  });
+
+  it('does not count skipped or permission-blocked OpenCode failures as bulk retry candidates', () => {
+    const presentation = buildTeamProvisioningPresentation({
+      progress: {
+        runId: 'run-opencode-no-retry',
+        teamName: 'mixed-team',
+        state: 'ready',
+        startedAt: '2026-04-13T10:00:00.000Z',
+        updatedAt: '2026-04-13T10:00:08.000Z',
+        message: 'Launch completed with teammate errors',
+        messageSeverity: 'warning',
+        pid: 4321,
+        cliLogsTail: '',
+        assistantOutput: '',
+      },
+      members: [
+        {
+          name: 'alice',
+          agentType: 'developer',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+        },
+        {
+          name: 'tom',
+          agentType: 'developer',
+          providerId: 'opencode',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+        },
+      ],
+      memberSpawnStatuses: {
+        alice: {
+          status: 'skipped',
+          launchState: 'skipped_for_launch',
+          skippedForLaunch: true,
+          updatedAt: '2026-04-13T10:00:05.000Z',
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          agentToolAccepted: false,
+        },
+        tom: {
+          status: 'waiting',
+          launchState: 'runtime_pending_permission',
+          pendingPermissionRequestIds: ['perm-1'],
+          updatedAt: '2026-04-13T10:00:05.000Z',
+          runtimeAlive: true,
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          agentToolAccepted: true,
+        },
+      },
+      memberSpawnSnapshot: undefined,
+    });
+
+    expect(presentation?.retryableOpenCodeSecondaryFailedNames).toEqual([]);
+    expect(presentation?.retryableOpenCodeSecondaryFailedCount).toBe(0);
+  });
+
   it('does not truncate long failed teammate reasons in the panel message', () => {
     const reason =
       'You are bootstrapping into team "relay-works-10" as member "alice". Your first action is to call the MCP tool member_briefing on the agent-teams server with teamName="relay-works-10" and memberName="alice". If tool search shows only the prefixed MCP name, use mcp__agent-teams__member_briefing.';
@@ -144,7 +265,66 @@ describe('buildTeamProvisioningPresentation', () => {
       memberSpawnSnapshot: undefined,
     });
 
-    expect(presentation?.panelMessage).toBe(`alice failed to start - ${reason}`);
+    expect(presentation?.panelMessage).toBe('alice failed to start');
+  });
+
+  it('keeps multiple failed teammate details out of the top panel', () => {
+    const presentation = buildTeamProvisioningPresentation({
+      progress: {
+        runId: 'run-multi-failure',
+        teamName: 'relay-works-18',
+        state: 'ready',
+        startedAt: '2026-04-13T10:00:00.000Z',
+        updatedAt: '2026-04-13T10:00:08.000Z',
+        message: 'Launch completed with teammate errors',
+        messageSeverity: 'warning',
+        pid: 4321,
+        cliLogsTail: '',
+        assistantOutput: '',
+      },
+      members: [
+        { name: 'team-lead', agentType: 'team-lead' },
+        { name: 'alice', agentType: 'reviewer' },
+        { name: 'tom', agentType: 'developer' },
+      ],
+      memberSpawnStatuses: {
+        alice: {
+          status: 'error',
+          launchState: 'failed_to_start',
+          hardFailureReason:
+            'Latest assistant message msg_alice failed with APIError - Insufficient credits. Add more using https://openrouter.ai/settings/credits',
+          updatedAt: '2026-04-13T10:00:03.000Z',
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: true,
+          agentToolAccepted: true,
+        },
+        tom: {
+          status: 'error',
+          launchState: 'failed_to_start',
+          hardFailureReason:
+            'Latest assistant message msg_tom failed with APIError - Insufficient credits. Add more using https://openrouter.ai/settings/credits',
+          updatedAt: '2026-04-13T10:00:04.000Z',
+          runtimeAlive: false,
+          bootstrapConfirmed: false,
+          hardFailure: true,
+          agentToolAccepted: true,
+        },
+      },
+      memberSpawnSnapshot: {
+        expectedMembers: ['alice', 'tom'],
+        summary: {
+          confirmedCount: 0,
+          pendingCount: 0,
+          failedCount: 2,
+          runtimeAlivePendingCount: 0,
+        },
+      },
+    });
+
+    expect(presentation?.panelMessage).toBe('2 teammates failed to start');
+    expect(presentation?.panelMessage).not.toContain('msg_alice');
+    expect(presentation?.panelMessage).not.toContain('openrouter.ai');
   });
 
   it('surfaces the failed teammate reason after launch completes with errors', () => {
@@ -209,7 +389,7 @@ describe('buildTeamProvisioningPresentation', () => {
     expect(presentation?.successMessage).toBe(
       'Launch finished with errors - 1/1 teammates failed to start'
     );
-    expect(presentation?.panelMessage).toContain('requested model is not available');
+    expect(presentation?.panelMessage).toBe('jack failed to start');
     expect(presentation?.compactDetail).toBe('jack failed to start');
     expect(presentation?.currentStepIndex).toBe(2);
   });
@@ -345,7 +525,7 @@ describe('buildTeamProvisioningPresentation', () => {
     });
 
     expect(presentation?.currentStepIndex).toBe(2);
-    expect(presentation?.panelMessage).toContain('bob failed to start');
+    expect(presentation?.panelMessage).toBe('bob failed to start');
     expect(presentation?.compactTone).toBe('warning');
   });
 
@@ -667,6 +847,84 @@ describe('buildTeamProvisioningPresentation', () => {
     expect(presentation?.currentStepIndex).toBe(2);
   });
 
+  it('shows stalled OpenCode secondaries separately from normal bootstrap waiting', () => {
+    const presentation = buildTeamProvisioningPresentation({
+      progress: {
+        runId: 'run-opencode-secondary-stalled',
+        teamName: 'mixed-team',
+        state: 'ready',
+        startedAt: '2026-04-13T10:00:00.000Z',
+        updatedAt: '2026-04-13T10:05:08.000Z',
+        message: 'Team provisioned - waiting for secondary runtime lane: tom',
+        messageSeverity: undefined,
+        pid: 4321,
+        cliLogsTail: '',
+        assistantOutput: '',
+      },
+      members: [
+        {
+          name: 'team-lead',
+          agentType: 'team-lead',
+          providerId: 'codex',
+          status: 'active',
+          currentTaskId: null,
+          taskCount: 0,
+          lastActiveAt: null,
+          messageCount: 0,
+        },
+        {
+          name: 'alice',
+          providerId: 'codex',
+          laneKind: 'primary',
+          status: 'active',
+          currentTaskId: null,
+          taskCount: 0,
+          lastActiveAt: null,
+          messageCount: 0,
+        },
+        {
+          name: 'tom',
+          providerId: 'opencode',
+          laneId: 'secondary:opencode:tom',
+          laneKind: 'secondary',
+          laneOwnerProviderId: 'opencode',
+          status: 'unknown',
+          currentTaskId: null,
+          taskCount: 0,
+          lastActiveAt: null,
+          messageCount: 0,
+        },
+      ],
+      memberSpawnStatuses: {
+        alice: {
+          status: 'online',
+          launchState: 'confirmed_alive',
+          updatedAt: '2026-04-13T10:00:05.000Z',
+          runtimeAlive: true,
+          bootstrapConfirmed: true,
+          hardFailure: false,
+          agentToolAccepted: true,
+        },
+        tom: {
+          status: 'waiting',
+          launchState: 'runtime_pending_bootstrap',
+          updatedAt: '2026-04-13T10:05:07.000Z',
+          runtimeAlive: true,
+          livenessKind: 'runtime_process',
+          bootstrapConfirmed: false,
+          hardFailure: false,
+          agentToolAccepted: true,
+          bootstrapStalled: true,
+        },
+      },
+    });
+
+    expect(presentation?.successMessage).toBe('Core team ready');
+    expect(presentation?.panelMessage).toBe('Bootstrap stalled: tom');
+    expect(presentation?.compactDetail).toBe('Bootstrap stalled: tom');
+    expect(presentation?.currentStepIndex).toBe(2);
+  });
+
   it('does not show core team ready while a primary member is still joining', () => {
     const presentation = buildTeamProvisioningPresentation({
       progress: {
@@ -1280,8 +1538,7 @@ describe('buildTeamProvisioningPresentation', () => {
       },
     });
 
-    expect(presentation?.panelMessage).toContain('jack failed to start');
-    expect(presentation?.panelMessage).toContain('requested model is not available');
+    expect(presentation?.panelMessage).toBe('jack failed to start');
     expect(presentation?.compactDetail).toBe('jack failed to start');
   });