diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aaa7f639..601173e2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -411,10 +411,10 @@ jobs:
         run: ${{ matrix.dist_command }} --publish never
 
       - name: Validate packaged bundle (macOS ${{ matrix.arch }})
-        run: node ./scripts/electron-builder/verifyBundle.cjs "release/mac-${{ matrix.arch }}/Agent Teams UI.app" darwin ${{ matrix.arch }}
+        run: node ./scripts/electron-builder/verifyBundle.cjs "release/mac-${{ matrix.arch }}/Agent Teams AI.app" darwin ${{ matrix.arch }}
 
       - name: Smoke packaged app (macOS ${{ matrix.arch }})
-        run: node ./scripts/electron-builder/smokePackagedApp.cjs "release/mac-${{ matrix.arch }}/Agent Teams UI.app" darwin
+        run: node ./scripts/electron-builder/smokePackagedApp.cjs "release/mac-${{ matrix.arch }}/Agent Teams AI.app" darwin
 
       - name: Upload assets to release
         if: ${{ env.IS_RELEASE_BUILD == 'true' }}
@@ -682,6 +682,13 @@ jobs:
           trap 'rm -rf "$TMP_DIR"' EXIT
 
           declare -A COMPATIBILITY_ALIASES=(
+            ["Agent.Teams.AI-arm64.dmg"]="Agent.Teams.AI-${VERSION}-arm64.dmg"
+            ["Agent.Teams.AI-x64.dmg"]="Agent.Teams.AI-${VERSION}-x64.dmg"
+            ["Agent.Teams.AI.Setup.exe"]="Agent.Teams.AI.Setup.${VERSION}.exe"
+            ["Agent.Teams.AI.AppImage"]="Agent.Teams.AI-${VERSION}.AppImage"
+            ["agent-teams-ai-amd64.deb"]="agent-teams-ai_${VERSION}_amd64.deb"
+            ["agent-teams-ai-x86_64.rpm"]="agent-teams-ai-${VERSION}.x86_64.rpm"
+            ["agent-teams-ai.pacman"]="agent-teams-ai-${VERSION}.pacman"
             ["Claude-Agent-Teams-UI-arm64.dmg"]="Agent.Teams.AI-${VERSION}-arm64.dmg"
             ["Claude-Agent-Teams-UI-x64.dmg"]="Agent.Teams.AI-${VERSION}-x64.dmg"
             ["Claude-Agent-Teams-UI-Setup.exe"]="Agent.Teams.AI.Setup.${VERSION}.exe"
diff --git a/.gitignore b/.gitignore
index 480a728f..87a82200 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,6 +53,7 @@ temp/
 
 eslint-fix/
 .eslintcache
+.eslintcache-fast
 remotion/*
 
 .home/
diff --git a/AGENTS.md b/AGENTS.md
index 836b2b5b..e6c9f728 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -22,6 +22,22 @@ Default local run target:
 - Do not start the browser/web dev mode for normal development or smoke checks. The browser path is limited and lacks the full desktop runtime, IPC, terminal, provider auth, and team lifecycle behavior.
 - When documenting or recommending startup commands, point contributors to the desktop app unless a task explicitly asks for browser-mode internals.
 
+Live team smoke runtime:
+
+- Use the orchestrator source launcher by default for live/dev smoke loops: `/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source`
+- The source launcher runs `src/entrypoints/cli.tsx` through Bun, so it reflects local orchestrator source edits immediately and cannot accidentally test stale `dist` output.
+- The source launcher normalizes inherited `NODE_ENV=production` to `NODE_ENV=development`. Release or production-like smoke must use the built wrapper instead of preserving production mode on source.
+- Local live/prove scripts should use `scripts/lib/live-smoke-runtime.mjs`, which defaults to `cli-source` unless `CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH` is explicitly set.
+- Source-mode teammate startup can be slower than bundled startup. Live smoke harnesses may raise `CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS` and `CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS` when the test is validating source behavior instead of watchdog latency.
+- Use the built wrapper only for release or production-like smoke checks. Build first in `/Users/belief/dev/projects/claude/agent_teams_orchestrator` with `bun run build`, then set `CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH=/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli`.
+- Do not use `cli-dev` or `bun run build:dev` as proof for the production wrapper. `cli` reads `dist/local-cli/cli.js`; `cli-dev` reads `dist/local-cli-dev/cli.js`.
+Fast local lint:
+
+- Use `pnpm lint:fast:files -- <changed files>` for quick preflight on files you touched.
+- Use `pnpm lint:fast` for a faster source-tree lint pass when full type-aware lint is too slow.
+- `lint:fast` intentionally uses `eslint.fast.config.js` without TypeScript project-service rules. It is not a replacement for `pnpm typecheck` or the full `pnpm lint` gate.
+- Keep using `pnpm typecheck` after TypeScript changes, and use full `pnpm lint` when validating a broad PR or changing lint-sensitive architecture boundaries.
+
 For new features:
 
 - Default home for medium and large features: `src/features/<feature-name>/`
diff --git a/README.md b/README.md
index 70c59ce3..1e8e02bc 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 </p>
 
 <p align="center">
-  <sub>Free desktop app for AI agent teams. Auto-detects Claude/Codex/OpenCode (200+ models). Use the provider access you already have - subscriptions or API keys. Not just coding agents.</sub>
+  <sub>Free desktop app for AI agent teams. Start with a free model with no auth - no signup, API key, or card - or connect Claude/Codex/OpenCode provider access for more models. Not just coding agents.</sub>
 </p>
 
 <!--
@@ -58,33 +58,33 @@ If you want the FRESHEST version, clone the repo and run it from the `dev` branc
 <table align="center">
 <tr>
 <td align="center">
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-arm64.dmg">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Agent.Teams.AI-arm64.dmg">
     <img src="https://img.shields.io/badge/macOS_Apple_Silicon-.dmg-000000?style=for-the-badge&logo=apple&logoColor=white" alt="macOS Apple Silicon" />
   </a>
   <br />
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-x64.dmg">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Agent.Teams.AI-x64.dmg">
     <img src="https://img.shields.io/badge/macOS_Intel-.dmg-434343?style=for-the-badge&logo=apple&logoColor=white" alt="macOS Intel" />
   </a>
 </td>
 <td align="center">
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-Setup.exe">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Agent.Teams.AI.Setup.exe">
     <img src="https://img.shields.io/badge/Windows-Download_.exe-0078D4?style=for-the-badge&logo=windows&logoColor=white" alt="Windows" />
   </a>
   <br />
   <sub>May trigger SmartScreen — click "More info" → "Run anyway"</sub>
 </td>
 <td align="center">
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI.AppImage">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Agent.Teams.AI.AppImage">
     <img src="https://img.shields.io/badge/Linux-Download_.AppImage-FCC624?style=for-the-badge&logo=linux&logoColor=black" alt="Linux AppImage" />
   </a>
   <br />
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-amd64.deb">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/agent-teams-ai-amd64.deb">
     <img src="https://img.shields.io/badge/.deb-E95420?style=flat-square&logo=ubuntu&logoColor=white" alt=".deb" />
   </a>&nbsp;
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-x86_64.rpm">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/agent-teams-ai-x86_64.rpm">
     <img src="https://img.shields.io/badge/.rpm-294172?style=flat-square&logo=redhat&logoColor=white" alt=".rpm" />
   </a>&nbsp;
-  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI.pacman">
+  <a href="https://github.com/777genius/agent-teams-ai/releases/latest/download/agent-teams-ai.pacman">
     <img src="https://img.shields.io/badge/.pacman-1793D1?style=flat-square&logo=archlinux&logoColor=white" alt=".pacman" />
   </a>
 </td>
@@ -96,11 +96,11 @@ If you want the FRESHEST version, clone the repo and run it from the `dev` branc
 - [Installation](#installation)
 - [Table of contents](#table-of-contents)
 - [What is this](#what-is-this)
-- [Developer architecture docs](#developer-architecture-docs)
 - [Comparison](#comparison)
 - [Quick start](#quick-start)
 - [FAQ](#faq)
 - [Development](#development)
+  - [Developer architecture docs](#developer-architecture-docs)
 - [Tech stack](#tech-stack)
   - [Build for distribution](#build-for-distribution)
   - [Scripts](#scripts)
@@ -113,7 +113,7 @@ If you want the FRESHEST version, clone the repo and run it from the `dev` branc
 
 An orchestration layer for AI agent teams across Claude, Codex, and OpenCode.
 
-- **Claude + Codex + OpenCode orchestration** — auto-detect available Claude/Codex/OpenCode runtimes and use the provider access you already have - subscriptions or API keys
+- **Claude + Codex + OpenCode orchestration** — start with a free model with no auth immediately, or auto-detect available Claude/Codex/OpenCode runtimes and use the provider access you already have - subscriptions or API keys
 - **Assemble your team** — create agent teams with different roles that work autonomously in parallel
 - **Agents talk to each other** — they communicate, create and manage their own tasks, review, leave comments
 - **Cross-team communication** — agents can fully communicate across different teams; you can configure or prompt them to collaborate and message each other between teams
@@ -141,7 +141,7 @@ An orchestration layer for AI agent teams across Claude, Codex, and OpenCode.
 
 - **Recent tasks across projects** — browse the latest completed tasks from all your projects in one place
 
-- **Zero-setup onboarding** — built-in runtime detection and provider authentication
+- **Zero-setup onboarding** — start with the free model with no auth, then connect paid/account providers only when you need them
 
 - **Built-in code editor** — edit project files with Git support without leaving the app
 
@@ -163,15 +163,6 @@ An orchestration layer for AI agent teams across Claude, Codex, and OpenCode.
 
 </details>
 
-## Developer architecture docs
-
-For feature architecture and implementation guidance:
-
-- Canonical standard - [docs/FEATURE_ARCHITECTURE_STANDARD.md](docs/FEATURE_ARCHITECTURE_STANDARD.md)
-- Repo working instructions - [CLAUDE.md](CLAUDE.md)
-- Feature root guidance - [src/features/README.md](src/features/README.md)
-- Reference implementation - `src/features/recent-projects`
-
 ## Comparison
 
 | Feature | Agent Teams | Gastown | Paperclip | Cursor | Claude Code CLI |
@@ -201,7 +192,7 @@ For feature architecture and implementation guidance:
 | **Teammate launch status** | ✅ Know who started, who is stuck, and who replied | ⚠️ Session health, less clear message status | ⚠️ Run status, not live teammate status | ❌ | ⚠️ CLI mailbox, no visual status |
 | **Org chart / governance** | ⚠️ Roles + approvals, no org chart | ⚠️ Roles + escalation | ✅ Org chart + board governance | ⚠️ Team admin only | ❌ |
 | **Budget controls** | ⚠️ Cost/token visibility, no hard caps | ⚠️ Cost tiers + digest, no hard caps | ✅ Per-agent budgets + hard stops | ⚠️ Usage + BG spend limits | ⚠️ `/usage` + workspace limits |
-| **Price** | **Free OSS UI**, provider access needed | Free OSS, runtime plans needed | Free OSS, self-hosted + infra | Free + paid usage | Claude plan or API usage |
+| **Price** | **Free OSS UI + free model with no auth**, paid providers optional | Free OSS, runtime plans needed | Free OSS, self-hosted + infra | Free + paid usage | Claude plan or API usage |
 
 Fact sources checked on May 18, 2026: [detailed research notes](docs/research/gastown-paperclip-comparison-2026-05-16.md), [Gastown README](https://github.com/gastownhall/gastown), [Gastown provider guide](https://github.com/gastownhall/gastown/blob/main/docs/agent-provider-integration.md), [Gastown scheduler](https://github.com/gastownhall/gastown/blob/main/docs/design/scheduler.md), [Gastown dashboard source](https://github.com/gastownhall/gastown/blob/main/internal/web/templates/convoy.html), [Gastown release](https://github.com/gastownhall/gastown/releases/tag/v1.1.0), [Paperclip README](https://github.com/paperclipai/paperclip), [Paperclip adapters](https://github.com/paperclipai/paperclip/blob/master/docs/adapters/overview.md), [Paperclip heartbeat protocol](https://github.com/paperclipai/paperclip/blob/master/docs/guides/agent-developer/heartbeat-protocol.md), [Paperclip org chart](https://paperclip.inc/docs/guides/board-operator/org-structure/), [Paperclip OrgChart source](https://github.com/paperclipai/paperclip/blob/master/ui/src/pages/OrgChart.tsx), [Paperclip budgets](https://github.com/paperclipai/paperclip/blob/master/docs/guides/board-operator/costs-and-budgets.md), [Paperclip runtime services](https://github.com/paperclipai/paperclip/blob/master/docs/guides/board-operator/execution-workspaces-and-runtime-services.md), [Paperclip Kanban source](https://github.com/paperclipai/paperclip/blob/master/ui/src/components/KanbanBoard.tsx), [Paperclip work products](https://github.com/paperclipai/paperclip/blob/master/packages/shared/src/validators/work-product.ts), [Paperclip release](https://github.com/paperclipai/paperclip/releases/tag/v2026.517.0), [Cursor Background Agents](https://docs.cursor.com/en/background-agents), [Cursor Diffs & Review](https://docs.cursor.com/en/agent/review), [Cursor Bugbot](https://docs.cursor.com/en/bugbot), [Cursor pricing](https://docs.cursor.com/en/account/usage), [Claude Code agent teams](https://code.claude.com/docs/en/agent-teams), [Claude Code subagents](https://code.claude.com/docs/en/sub-agents), [Claude Code workflows](https://code.claude.com/docs/en/common-workflows), [Claude Code costs](https://code.claude.com/docs/en/costs), [Claude pricing](https://claude.com/pricing).
 
@@ -210,7 +201,7 @@ Fact sources checked on May 18, 2026: [detailed research notes](docs/research/ga
 ## Quick start
 
 1. **Download** the app for your platform (see [Installation](#installation))
-2. **Launch the desktop app** - On first run, the setup wizard will detect the runtime and guide provider authentication
+2. **Launch the desktop app** - start with the free model with no auth, or let the setup wizard detect runtimes and guide provider authentication
 3. **Create a team** — Pick a project, define roles, write a provisioning prompt
 4. **Watch** — Agents spawn, create tasks, and work. You see it all on the kanban board
 
@@ -224,7 +215,7 @@ Use the desktop app as the primary product. The browser/web path is not needed f
 <details>
 <summary><strong>Do I need to install a runtime before using this app?</strong></summary>
 <br />
-No. The app guides runtime detection/setup and provider authentication from the UI - just launch and follow the setup wizard.
+No. You can start with the free model with no auth right away. If you want Claude, Codex, OpenCode/OpenRouter, or other provider-backed models, the app guides runtime detection/setup and provider authentication from the UI.
 </details>
 
 <details>
@@ -242,7 +233,7 @@ Yes. Agents send direct messages, create shared tasks, and leave comments - all
 <details>
 <summary><strong>Is it free?</strong></summary>
 <br />
-Yes, 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.
+Yes. The app is free and open source, and you can start with a free model with no auth - no registration, API keys, or credit card. If you want more models, connect the provider access you already have, such as Claude, Codex, OpenCode/OpenRouter, or other supported runtimes.
 </details>
 
 <details>
@@ -267,6 +258,15 @@ Yes. Run multiple teams in one project or across different projects, even simult
 
 ## Development
 
+### Developer architecture docs
+
+For feature architecture and implementation guidance:
+
+- Canonical standard - [docs/FEATURE_ARCHITECTURE_STANDARD.md](docs/FEATURE_ARCHITECTURE_STANDARD.md)
+- Repo working instructions - [CLAUDE.md](CLAUDE.md)
+- Feature root guidance - [src/features/README.md](src/features/README.md)
+- Reference implementation - `src/features/recent-projects`
+
 ## Tech stack
 
 Electron 40, React 19, TypeScript 5, Tailwind CSS 3, Zustand 4. Data from `~/.claude/` (session logs, todos, tasks). The desktop app works with local runtime/session state, while some runtime modes may also use provider or startup capability services when required.
diff --git a/docs/RELEASE.md b/docs/RELEASE.md
index 3549649d..7d5c317b 100644
--- a/docs/RELEASE.md
+++ b/docs/RELEASE.md
@@ -212,17 +212,17 @@ Group entries by type: `What's New` > `Improvements` > `Bug Fixes` > `Breaking C
 
 electron-builder generates these artifacts per platform:
 
-| Platform        | Versioned Name                       | Stable Name (for /latest/download) |
-| --------------- | ------------------------------------ | ---------------------------------- |
-| macOS arm64 DMG | `Agent.Teams.AI-<VER>-arm64.dmg`     | `Claude-Agent-Teams-UI-arm64.dmg`  |
-| macOS x64 DMG   | `Agent.Teams.AI-<VER>-x64.dmg`       | `Claude-Agent-Teams-UI-x64.dmg`    |
-| macOS arm64 ZIP | `Agent.Teams.AI-<VER>-arm64-mac.zip` | -                                  |
-| macOS x64 ZIP   | `Agent.Teams.AI-<VER>-x64-mac.zip`   | -                                  |
-| Windows         | `Agent.Teams.AI.Setup.<VER>.exe`     | `Claude-Agent-Teams-UI-Setup.exe`  |
-| Linux AppImage  | `Agent.Teams.AI-<VER>.AppImage`      | `Claude-Agent-Teams-UI.AppImage`   |
-| Linux deb       | `agent-teams-ai_<VER>_amd64.deb`     | `Claude-Agent-Teams-UI-amd64.deb`  |
-| Linux rpm       | `agent-teams-ai-<VER>.x86_64.rpm`    | `Claude-Agent-Teams-UI-x86_64.rpm` |
-| Linux pacman    | `agent-teams-ai-<VER>.pacman`        | `Claude-Agent-Teams-UI.pacman`     |
+| Platform        | Versioned Name                       | Stable Name (for /latest/download) | Compatibility Alias                |
+| --------------- | ------------------------------------ | ---------------------------------- | ---------------------------------- |
+| macOS arm64 DMG | `Agent.Teams.AI-<VER>-arm64.dmg`     | `Agent.Teams.AI-arm64.dmg`         | `Claude-Agent-Teams-UI-arm64.dmg`  |
+| macOS x64 DMG   | `Agent.Teams.AI-<VER>-x64.dmg`       | `Agent.Teams.AI-x64.dmg`           | `Claude-Agent-Teams-UI-x64.dmg`    |
+| macOS arm64 ZIP | `Agent.Teams.AI-<VER>-arm64-mac.zip` | -                                  | -                                  |
+| macOS x64 ZIP   | `Agent.Teams.AI-<VER>-x64-mac.zip`   | -                                  | -                                  |
+| Windows         | `Agent.Teams.AI.Setup.<VER>.exe`     | `Agent.Teams.AI.Setup.exe`         | `Claude-Agent-Teams-UI-Setup.exe`  |
+| Linux AppImage  | `Agent.Teams.AI-<VER>.AppImage`      | `Agent.Teams.AI.AppImage`          | `Claude-Agent-Teams-UI.AppImage`   |
+| Linux deb       | `agent-teams-ai_<VER>_amd64.deb`     | `agent-teams-ai-amd64.deb`         | `Claude-Agent-Teams-UI-amd64.deb`  |
+| Linux rpm       | `agent-teams-ai-<VER>.x86_64.rpm`    | `agent-teams-ai-x86_64.rpm`        | `Claude-Agent-Teams-UI-x86_64.rpm` |
+| Linux pacman    | `agent-teams-ai-<VER>.pacman`        | `agent-teams-ai.pacman`            | `Claude-Agent-Teams-UI.pacman`     |
 
 ## Stable Download Links
 
@@ -232,10 +232,11 @@ It starts only after **release-mac** (two matrix jobs), **release-win**, and **r
 This enables permanent links in README that always point to the latest release:
 
 ```
-https://github.com/777genius/agent-teams-ai/releases/latest/download/Claude-Agent-Teams-UI-arm64.dmg
+https://github.com/777genius/agent-teams-ai/releases/latest/download/Agent.Teams.AI-arm64.dmg
 ```
 
 GitHub automatically redirects `/releases/latest/download/FILENAME` to the asset from the most recent release. No README updates needed when releasing a new version.
+The `Claude-Agent-Teams-UI-*` aliases are kept only for backward compatibility with older links and clients.
 
 ## macOS Code Signing
 
diff --git a/docs/team-management/debugging-agent-teams.md b/docs/team-management/debugging-agent-teams.md
index 8decd6c6..b8dc5f78 100644
--- a/docs/team-management/debugging-agent-teams.md
+++ b/docs/team-management/debugging-agent-teams.md
@@ -59,6 +59,29 @@ Desktop launches use the app-managed process backend by default. That is the sup
 normal app launches because the app owns the process lifecycle, runtime logs, cleanup, and bootstrap
 evidence.
 
+## Live Smoke Runtime Launcher
+
+Live/dev smoke tests should use the orchestrator source launcher by default:
+
+```bash
+CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH=/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source \
+  pnpm vitest run --maxWorkers 1 --minWorkers 1 test/main/services/team/AnthropicLaunchSelection.live.test.ts
+```
+
+`cli-source` runs `src/entrypoints/cli.tsx` directly through Bun. Use it while developing launch/runtime code so the smoke test cannot accidentally pass or fail against a stale `dist/local-cli/cli.js` bundle.
+
+For release or production-like smoke checks, test the built wrapper explicitly:
+
+```bash
+cd /Users/belief/dev/projects/claude/agent_teams_orchestrator
+bun run build
+cd /Users/belief/dev/projects/claude/claude_team
+CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH=/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli \
+  pnpm vitest run --maxWorkers 1 --minWorkers 1 test/main/services/team/AnthropicLaunchSelection.live.test.ts
+```
+
+The built wrapper `cli` reads `dist/local-cli/cli.js`. `cli-dev` reads `dist/local-cli-dev/cli.js`; it is useful for dev-bundle checks, but it is not the production wrapper.
+
 For local debugging, force pane-backed teammates through `tmux`:
 
 ```bash
@@ -81,6 +104,40 @@ Use this mode to inspect interactive CLI behavior, terminal prompts, and pane ou
 as equivalent to the process backend for recovery semantics; persisted pane IDs can help discovery,
 but app restart does not make old panes a fully app-owned runtime again.
 
+## Live Smoke Runtime Launcher
+
+Live/dev smoke checks should run the orchestrator from source unless the test explicitly says it is
+validating packaged output. This keeps app smoke tests aligned with the source tree and avoids a stale
+`dist` bundle hiding runtime changes.
+
+Default live/dev smoke launcher:
+
+```bash
+export CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH=/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source
+```
+
+The source launcher executes `src/entrypoints/cli.tsx` through Bun. It is the right default for local
+debug loops, live model/provider checks, and cross-repo runtime fixes.
+It normalizes inherited `NODE_ENV=production` to `NODE_ENV=development`, because source smoke is a
+dev/runtime validation path. If you need production semantics, run the release smoke path below.
+Local live/prove scripts should resolve their default CLI through `scripts/lib/live-smoke-runtime.mjs`,
+which points at `cli-source` unless `CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH` is explicitly set.
+Source-mode teammate startup can be slower than bundled startup, so live smoke harnesses may set
+`CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS` and
+`CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS` to larger values when they are validating source
+behavior instead of watchdog latency.
+
+Release or production-like smoke checks must validate the built wrapper:
+
+```bash
+cd /Users/belief/dev/projects/claude/agent_teams_orchestrator
+bun run build
+export CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH=/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli
+```
+
+`cli` reads `dist/local-cli/cli.js`. `cli-dev` reads `dist/local-cli-dev/cli.js`, so a passing
+`cli-dev` smoke is not proof that the production wrapper is fresh.
+
 ## Member State Meanings
 
 Common `launch-state.json` cases:
diff --git a/docs/team-management/member-mcp-bootstrap-spike.md b/docs/team-management/member-mcp-bootstrap-spike.md
new file mode 100644
index 00000000..c1ef5afe
--- /dev/null
+++ b/docs/team-management/member-mcp-bootstrap-spike.md
@@ -0,0 +1,35 @@
+# Per-Member MCP Bootstrap Spike
+
+Date: 2026-05-19
+
+## Question
+
+Can the app pass per-member MCP inheritance or allowlist settings through Claude Code native agent-team bootstrap?
+
+## Findings
+
+- The app currently starts native Claude-led teams with one lead CLI process and one generated `--mcp-config`. That generated config only contains the app-owned `agent-teams` server. User, project, and local MCP servers are inherited through `--setting-sources user,project,local`.
+- Claude Code docs for agent teams state that teammates load MCP servers from project and user settings like regular sessions. They also state that subagent-definition `mcpServers` frontmatter is not applied when the definition runs as an agent-team teammate: https://code.claude.com/docs/en/agent-teams
+- Claude Code docs for subagents support `mcpServers` for normal subagents and main sessions, but agent teams explicitly exclude that field on the teammate path: https://code.claude.com/docs/en/sub-agents
+- Local Claude Code `2.1.119` supports `--mcp-config`, `--setting-sources`, and `--strict-mcp-config`. The public CLI reference documents those flags: https://code.claude.com/docs/en/cli-usage
+- A local probe with `claude --bare --team-bootstrap-spec <spec>` on `2.1.119` exits with `error: unknown option '--team-bootstrap-spec'`, so the hidden app bootstrap path cannot be validated as a public CLI contract from the installed binary.
+
+## Decision
+
+Per-member MCP settings should be treated as a gated app feature until the native bootstrap contract is proven to apply them on initial spawn.
+
+The safe implementation path is:
+
+1. Persist `mcpPolicy` on members.
+2. Surface the policy in the roster editor.
+3. Apply the policy only on app-controlled teammate launches/restarts where the app owns the CLI args.
+4. Keep initial native bootstrap behavior unchanged until the app either moves that path to app-managed teammate launch or detects a Claude Code capability that supports per-member MCP in bootstrap specs.
+
+## Current Runtime Semantics
+
+- `inheritLead`: keep existing behavior.
+- `inheritScopes`: app-controlled teammate launches can narrow `--setting-sources`.
+- `strictAllowlist`: app-controlled teammate launches generate a strict MCP config containing `agent-teams` plus selected server definitions.
+- `appOnly`: app-controlled teammate launches generate a strict MCP config containing only `agent-teams`.
+
+`agent-teams` must remain non-removable because it carries team messaging and task tooling.
diff --git a/eslint.fast.config.js b/eslint.fast.config.js
new file mode 100644
index 00000000..29c3c9b0
--- /dev/null
+++ b/eslint.fast.config.js
@@ -0,0 +1,256 @@
+import { defineConfig, globalIgnores } from 'eslint/config';
+import js from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import boundaries from 'eslint-plugin-boundaries';
+import reactPlugin from 'eslint-plugin-react';
+import reactHooks from 'eslint-plugin-react-hooks';
+import reactRefresh from 'eslint-plugin-react-refresh';
+import jsxA11y from 'eslint-plugin-jsx-a11y';
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
+import importPlugin from 'eslint-plugin-import';
+import security from 'eslint-plugin-security';
+import sonarjs from 'eslint-plugin-sonarjs';
+import tailwindcss from 'eslint-plugin-tailwindcss';
+import globals from 'globals';
+
+export default defineConfig([
+  {
+    name: 'fast-linter-options',
+    linterOptions: {
+      reportUnusedDisableDirectives: 'off',
+    },
+  },
+
+  globalIgnores([
+    'dist/**',
+    'dist-electron/**',
+    'build/**',
+    'node_modules/**',
+    'out/**',
+    'landing/.nuxt/**',
+  ]),
+
+  js.configs.recommended,
+  ...tseslint.configs.recommended,
+
+  {
+    name: 'fast-known-plugin-namespaces',
+    plugins: {
+      boundaries,
+      import: importPlugin,
+      security,
+      sonarjs,
+      tailwindcss,
+    },
+    rules: {
+      '@typescript-eslint/no-require-imports': 'warn',
+      'no-control-regex': 'warn',
+      'no-unsafe-finally': 'warn',
+      'no-useless-escape': 'warn',
+    },
+  },
+
+  {
+    name: 'fast-typescript',
+    files: ['**/*.{ts,tsx}'],
+    languageOptions: {
+      parser: tseslint.parser,
+      parserOptions: {
+        projectService: false,
+      },
+    },
+    rules: {
+      'no-undef': 'off',
+      'prefer-const': 'error',
+      'no-var': 'error',
+      eqeqeq: ['error', 'always', { null: 'ignore' }],
+      '@typescript-eslint/no-unused-vars': [
+        'warn',
+        {
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
+      ],
+    },
+  },
+
+  {
+    name: 'fast-imports',
+    files: ['src/**/*.{js,jsx,ts,tsx}', 'test/**/*.{ts,tsx}', 'packages/agent-graph/src/**/*.{ts,tsx}'],
+    plugins: {
+      'simple-import-sort': simpleImportSort,
+    },
+    rules: {
+      'simple-import-sort/imports': [
+        'error',
+        {
+          groups: [
+            ['^\\u0000'],
+            ['^node:'],
+            ['^react', '^react-dom'],
+            ['^@?\\w'],
+            ['^@/'],
+            ['^\\.\\.(?!/?$)', '^\\.\\./?$'],
+            ['^\\./(?=.*/)(?!/?$)', '^\\.(?!/?$)', '^\\./?$'],
+            ['^.+\\u0000$'],
+          ],
+        },
+      ],
+      'simple-import-sort/exports': 'error',
+    },
+  },
+
+  {
+    name: 'fast-node-globals',
+    files: ['src/main/**/*.ts', 'src/preload/**/*.ts', 'scripts/**/*.{js,mjs,ts}', 'test/**/*.ts'],
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+
+  {
+    name: 'fast-browser-globals',
+    files: ['src/renderer/**/*.{ts,tsx}', 'src/features/**/renderer/**/*.{ts,tsx}'],
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+    },
+  },
+
+  {
+    name: 'fast-react',
+    files: ['src/renderer/**/*.{tsx,ts}', 'src/features/**/renderer/**/*.{tsx,ts}'],
+    plugins: {
+      react: reactPlugin,
+      'react-hooks': reactHooks,
+      'react-refresh': reactRefresh,
+      'jsx-a11y': jsxA11y,
+    },
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+    rules: {
+      ...reactPlugin.configs.recommended.rules,
+      ...reactPlugin.configs['jsx-runtime'].rules,
+      ...reactHooks.configs.recommended.rules,
+      ...jsxA11y.configs.recommended.rules,
+      'react-refresh/only-export-components': ['warn', { allowConstantExport: true }],
+      'react/prop-types': 'off',
+      'react-hooks/exhaustive-deps': 'warn',
+      'react-hooks/rules-of-hooks': 'warn',
+      'react-hooks/globals': 'off',
+      'react-hooks/purity': 'off',
+      'react-hooks/refs': 'off',
+      'react-hooks/set-state-in-effect': 'off',
+      'react-hooks/preserve-manual-memoization': 'off',
+      'react-hooks/immutability': 'off',
+      'jsx-a11y/click-events-have-key-events': 'warn',
+      'jsx-a11y/no-static-element-interactions': 'warn',
+      'jsx-a11y/label-has-associated-control': 'warn',
+      'jsx-a11y/no-noninteractive-tabindex': 'warn',
+      'jsx-a11y/no-autofocus': 'off',
+      'react/function-component-definition': [
+        'warn',
+        {
+          namedComponents: 'arrow-function',
+          unnamedComponents: 'arrow-function',
+        },
+      ],
+      'react/jsx-key': [
+        'error',
+        {
+          checkFragmentShorthand: true,
+          checkKeyMustBeforeSpread: true,
+        },
+      ],
+      'react/self-closing-comp': ['error', { component: true, html: true }],
+    },
+  },
+
+  {
+    name: 'fast-feature-entrypoints',
+    files: [
+      'src/main/**/*.{ts,tsx}',
+      'src/preload/**/*.{ts,tsx}',
+      'src/renderer/**/*.{ts,tsx}',
+      'src/shared/**/*.{ts,tsx}',
+    ],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          patterns: [
+            {
+              group: [
+                '@features/*/contracts/*',
+                '@features/*/core/**',
+                '@features/*/main/*',
+                '@features/*/preload/*',
+                '@features/*/renderer/*',
+              ],
+              message: 'Import feature public entrypoints only.',
+            },
+          ],
+        },
+      ],
+    },
+  },
+
+  {
+    name: 'fast-feature-core-guards',
+    files: ['src/features/*/core/{domain,application}/**/*.ts'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            { name: 'electron', message: 'Feature core must stay Electron-free.' },
+            { name: 'fastify', message: 'Feature core must stay transport-free.' },
+            { name: 'child_process', message: 'Feature core must not spawn processes directly.' },
+            {
+              name: 'node:child_process',
+              message: 'Feature core must not spawn processes directly.',
+            },
+          ],
+          patterns: [
+            {
+              group: ['@main/*', '@preload/*', '@renderer/*'],
+              message: 'Feature core must stay process-agnostic.',
+            },
+            {
+              group: ['@features/*/main/**', '@features/*/preload/**', '@features/*/renderer/**'],
+              message: 'Feature core must not import runtime or transport layers.',
+            },
+          ],
+        },
+      ],
+    },
+  },
+
+  {
+    name: 'fast-feature-renderer-ui-guards',
+    files: ['src/features/*/renderer/ui/**/*.{ts,tsx}'],
+    rules: {
+      'no-restricted-imports': [
+        'error',
+        {
+          paths: [
+            { name: '@renderer/api', message: 'renderer/ui must stay presentational.' },
+            { name: '@renderer/store', message: 'renderer/ui must stay store-free.' },
+            { name: 'electron', message: 'renderer/ui must stay Electron-free.' },
+          ],
+          patterns: [
+            { group: ['@main/*'], message: 'renderer/ui must not import main modules.' },
+            { group: ['@renderer/store/*'], message: 'renderer/ui must stay store-free.' },
+          ],
+        },
+      ],
+    },
+  },
+]);
diff --git a/graph-log-preview-smoke.png b/graph-log-preview-smoke.png
deleted file mode 100644
index b8aec00b..00000000
Binary files a/graph-log-preview-smoke.png and /dev/null differ
diff --git a/landing/AGENTS.md b/landing/AGENTS.md
new file mode 100644
index 00000000..5c0451cf
--- /dev/null
+++ b/landing/AGENTS.md
@@ -0,0 +1,13 @@
+# Landing Visual QA
+
+- For cyberpunk landing work, verify layout with browser/runtime measurements, not by eye only.
+- Use Chrome DevTools MCP for landing visual QA. Do not use Brave real browser as a fallback for this landing unless the user explicitly asks for Brave.
+- First try the direct `mcp__chrome_devtools__*` namespace for viewport screenshots, DOM rectangles, computed styles, console errors, network state, and performance checks.
+- If the direct `mcp__chrome_devtools__*` namespace is exposed but the transport is closed, diagnose/fix that first. The stable global config should point to a fixed local install, not `npx @latest`: `/usr/local/bin/node /Users/belief/.codex/mcp/chrome-devtools/node_modules/chrome-devtools-mcp/build/src/bin/chrome-devtools-mcp.js --isolated --viewport=1440x900 --logFile /Users/belief/.codex/log/chrome-devtools-mcp.log --no-usage-statistics --no-performance-crux`.
+- If the current Codex thread cannot recover the direct transport after the config is fixed, use only the official Chrome DevTools MCP isolated stdio client as the temporary fallback. The current server uses newline-delimited JSON-RPC over stdio. Kill the spawned MCP process after screenshots/metrics finish.
+- If `chrome-devtools` is enabled in `~/.codex/config.toml` but no `mcp__chrome_devtools__*` tools are exposed in the current thread, treat it as a Codex Desktop tool-schema/session exposure issue. Start a fresh thread/session when possible; otherwise use the official isolated Chrome DevTools MCP stdio client above, not Brave.
+- Required visual viewports for this landing: `2048x1152`, `1680x941`, `1366x768`, and `390x844`.
+- For the HUD header, measure the brand panel, nav rail, action panel, nav item centers, and action button centers with `getBoundingClientRect()`. Check that hover/focus glow is clipped to the angular panel shape.
+- For the hero video scene, measure robot foot baselines against the video frame top/bottom/side edges. Top-row robots should stand on the top edge; bottom-row robots should stand on the bottom edge; side robots should not cover the video content randomly.
+- Keep the header as live DOM plus SVG. Do not ship a PNG header asset except for reference images stored under `assets/images/references/`.
+- Do not run `pnpm generate` while the landing dev server is running. Stop dev first, generate, then run cleanup before starting dev again.
diff --git a/landing/assets/styles/cyberpunk-hero.scss b/landing/assets/styles/cyberpunk-hero.scss
index cc3ebccd..5929e57f 100644
--- a/landing/assets/styles/cyberpunk-hero.scss
+++ b/landing/assets/styles/cyberpunk-hero.scss
@@ -24,17 +24,18 @@
     radial-gradient(circle at 86% 70%, rgba(255, 43, 255, 0.14), transparent 34%),
     linear-gradient(180deg, var(--cyber-bg-0), var(--cyber-bg-1) 58%, var(--cyber-bg-0));
   --cyber-monterey-bg:
-    radial-gradient(circle at 76% 22%, rgba(138, 47, 255, 0.76), transparent 30%),
-    radial-gradient(circle at 18% 76%, rgba(37, 8, 128, 0.72), transparent 36%),
-    linear-gradient(180deg, #180061 0%, #3200a2 46%, #130042 100%);
+    radial-gradient(circle at 76% 22%, rgba(47, 125, 255, 0.22), transparent 30%),
+    radial-gradient(circle at 18% 76%, rgba(37, 8, 128, 0.22), transparent 36%),
+    radial-gradient(circle at 88% 68%, rgba(255, 43, 255, 0.1), transparent 34%),
+    linear-gradient(180deg, #030614 0%, #07122a 46%, #02050d 100%);
   --cyber-monterey-before-bg:
     radial-gradient(circle at 18% 34%, rgba(2, 5, 13, 0.62), rgba(2, 5, 13, 0.14) 34%, transparent 62%),
     linear-gradient(90deg, rgba(2, 5, 13, 0.48) 0%, rgba(2, 5, 13, 0.17) 42%, rgba(2, 5, 13, 0.04) 64%, rgba(2, 5, 13, 0.3) 100%);
   --cyber-monterey-after-bg:
     linear-gradient(180deg, rgba(2, 5, 13, 0.92) 0%, rgba(2, 5, 13, 0.62) 15%, rgba(2, 5, 13, 0.08) 44%, rgba(2, 5, 13, 0.68) 100%),
     radial-gradient(circle at 64% 42%, transparent 0 26%, rgba(2, 5, 13, 0.24) 70%, rgba(2, 5, 13, 0.54) 100%);
-  --cyber-monterey-canvas-opacity: 1;
-  --cyber-monterey-canvas-filter: blur(4px) saturate(1.22) brightness(1.08) contrast(1.08);
+  --cyber-monterey-canvas-opacity: 0.42;
+  --cyber-monterey-canvas-filter: blur(4px) saturate(0.78) brightness(0.62) contrast(1.08);
   --cyber-monterey-canvas-blend: normal;
   --cyber-background-bg:
     radial-gradient(circle at 72% 28%, rgba(0, 234, 255, 0.1), transparent 30%),
@@ -255,6 +256,10 @@
   background: var(--cyber-hero-bg);
 }
 
+#hero.cyber-hero {
+  padding-top: 120px;
+}
+
 .cyber-hero__background,
 .cyber-hero__monterey,
 .cyber-hero__wash,
@@ -454,7 +459,7 @@
   flex-direction: row;
   flex-wrap: nowrap;
   gap: 0.18em;
-  font-size: clamp(2.55rem, 5.1vw, 5.7rem);
+  font-size: clamp(2.45rem, 4.8vw, 5.35rem);
   line-height: 1;
   font-weight: 900;
   letter-spacing: 0;
@@ -1468,7 +1473,7 @@
   }
 
   .cyber-hero__title {
-    font-size: clamp(3rem, 4.6vw, 4.8rem);
+    font-size: clamp(2.8rem, 4.2vw, 4.45rem);
   }
 
   .cyber-scene {
@@ -1609,7 +1614,8 @@
   }
 
   .cyber-hero__title {
-    font-size: clamp(2.55rem, 13vw, 4rem);
+    gap: 0.12em;
+    font-size: clamp(2rem, 9.4vw, 3.1rem);
   }
 
   .cyber-hero__slogan {
diff --git a/landing/components/common/AppLogo.vue b/landing/components/common/AppLogo.vue
index cd59e367..92c8094f 100644
--- a/landing/components/common/AppLogo.vue
+++ b/landing/components/common/AppLogo.vue
@@ -6,12 +6,12 @@ const { baseURL } = useRuntimeConfig().app;
   <NuxtLink to="/" class="app-logo" :prefetch="false">
     <img
       :src="`${baseURL}logo-192.png`"
-      alt="Agent Teams"
+      alt="Agent Teams AI"
       class="app-logo__img"
       width="36"
       height="36"
     >
-    <span class="app-logo__text">Agent Teams</span>
+    <span class="app-logo__text">Agent Teams AI</span>
   </NuxtLink>
 </template>
 
@@ -46,12 +46,13 @@ const { baseURL } = useRuntimeConfig().app;
   -webkit-background-clip: text;
   background-clip: text;
   -webkit-text-fill-color: transparent;
+  text-shadow: 0 0 16px rgba(0, 240, 255, 0.22);
 }
 </style>
 
 <style>
 .v-theme--light .app-logo__text {
-  background: linear-gradient(135deg, #1e293b, #0891b2);
+  background: linear-gradient(135deg, #ffffff 0%, #dff8ff 44%, #43efff 100%);
   -webkit-background-clip: text;
   background-clip: text;
   -webkit-text-fill-color: transparent;
diff --git a/landing/components/layout/AppFooter.vue b/landing/components/layout/AppFooter.vue
index 396acddd..da28e209 100644
--- a/landing/components/layout/AppFooter.vue
+++ b/landing/components/layout/AppFooter.vue
@@ -43,16 +43,25 @@ const docsHref = computed(() => {
 
 <style scoped>
 .app-footer {
+  --footer-bg:
+    linear-gradient(180deg, rgba(3, 10, 22, 0.96) 0%, rgba(2, 6, 16, 0.98) 100%);
+  --footer-wall-border: rgba(0, 234, 255, 0.28);
+  --footer-wall-highlight: rgba(255, 255, 255, 0.06);
+
   position: relative;
-  border-top: 1px solid var(--at-c-border);
-  padding: 20px 0;
+  border-top: 1px solid var(--footer-wall-border);
+  padding: 28px 0 22px;
   isolation: isolate;
+  background: var(--footer-bg);
+  box-shadow:
+    0 -28px 70px rgba(0, 0, 0, 0.34),
+    0 -1px 0 var(--footer-wall-highlight) inset;
 }
 
 .app-footer__robot-stage {
   position: absolute;
   right: clamp(24px, 7vw, 112px);
-  bottom: calc(100% - 5px);
+  bottom: calc(100% - 11px);
   z-index: 2;
   width: clamp(178px, 16vw, 236px);
   pointer-events: none;
@@ -92,7 +101,7 @@ const docsHref = computed(() => {
 
 .app-footer__copy {
   font-size: 13px;
-  opacity: 0.5;
+  color: rgba(244, 247, 255, 0.72);
   font-family: var(--at-font-mono);
 }
 
@@ -106,7 +115,7 @@ const docsHref = computed(() => {
   color: var(--at-c-cyan);
   text-decoration: none;
   font-size: 13px;
-  opacity: 0.7;
+  opacity: 0.9;
   transition: opacity 0.2s ease;
   font-family: var(--at-font-mono);
 }
@@ -122,11 +131,19 @@ const docsHref = computed(() => {
 }
 
 .v-theme--light .app-footer {
-  border-top-color: var(--at-c-border);
+  --footer-bg:
+    linear-gradient(180deg, rgba(230, 240, 247, 0.98) 0%, rgba(218, 229, 238, 0.98) 100%);
+  --footer-wall-border: rgba(8, 88, 112, 0.24);
+  --footer-wall-highlight: rgba(255, 255, 255, 0.82);
+
+  border-top-color: var(--footer-wall-border);
+  box-shadow:
+    0 -32px 74px rgba(62, 84, 104, 0.2),
+    0 -1px 0 rgba(255, 255, 255, 0.92) inset;
 }
 
 .v-theme--light .app-footer__copy {
-  opacity: 0.72;
+  color: rgba(42, 50, 61, 0.74);
 }
 
 .v-theme--light .app-footer__link {
diff --git a/landing/components/layout/AppHeader.vue b/landing/components/layout/AppHeader.vue
index 460fe65b..c216375b 100644
--- a/landing/components/layout/AppHeader.vue
+++ b/landing/components/layout/AppHeader.vue
@@ -183,12 +183,12 @@ const navItems = computed(() => [
   --header-cyan: var(--cyber-cyan);
   --header-violet: var(--cyber-violet);
   --header-magenta: var(--cyber-magenta);
-  --header-height: 128px;
+  --header-height: 126px;
   --header-panel-height: 86px;
   --header-action-size: clamp(54px, 3.25vw, 66px);
   --header-github-width: clamp(150px, 9.7vw, 204px);
-  --header-brand-icon: clamp(58px, 4.1vw, 76px);
-  --header-brand-text: clamp(24px, 1.55vw, 34px);
+  --header-brand-icon: clamp(52px, 3.7vw, 68px);
+  --header-brand-text: clamp(23px, 1.42vw, 32px);
 
   position: fixed;
   top: 0;
@@ -299,7 +299,7 @@ const navItems = computed(() => [
   width: 100%;
   height: var(--header-panel-height);
   min-width: 0;
-  padding: 0 64px 0 clamp(38px, 4.2vw, 82px);
+  padding: 0 46px 0 clamp(24px, 2vw, 38px);
   background: transparent;
   border: 0;
   overflow: hidden;
@@ -548,12 +548,12 @@ const navItems = computed(() => [
 
 @media (max-width: 1439px) {
   .app-header {
-    --header-height: 104px;
+    --header-height: 112px;
     --header-panel-height: 72px;
     --header-action-size: 54px;
     --header-github-width: 124px;
-    --header-brand-icon: 48px;
-    --header-brand-text: 16px;
+    --header-brand-icon: 44px;
+    --header-brand-text: 15px;
   }
 
   .app-header__inner {
@@ -563,8 +563,8 @@ const navItems = computed(() => [
 
   .app-header__brand-frame {
     height: 72px;
-    padding-left: 38px;
-    padding-right: 38px;
+    padding-left: 24px;
+    padding-right: 28px;
   }
 
   .app-header__brand-frame :deep(.app-logo__text) {
@@ -598,7 +598,7 @@ const navItems = computed(() => [
 @media (max-width: 1120px) {
   .app-header {
     --header-github-width: 104px;
-    --header-brand-text: 14px;
+    --header-brand-text: 13px;
   }
 
   .app-header__inner {
@@ -606,8 +606,8 @@ const navItems = computed(() => [
   }
 
   .app-header__brand-frame {
-    padding-left: 26px;
-    padding-right: 34px;
+    padding-left: 18px;
+    padding-right: 24px;
   }
 
   .app-header__nav {
@@ -628,11 +628,11 @@ const navItems = computed(() => [
 
 @media (max-width: 1279px) and (min-width: 768px) {
   .app-header {
-    --header-height: 88px;
+    --header-height: 104px;
     --header-panel-height: 64px;
     --header-action-size: clamp(40px, 5vw, 48px);
-    --header-brand-icon: clamp(38px, 4.8vw, 44px);
-    --header-brand-text: clamp(11px, 1.35vw, 14px);
+    --header-brand-icon: clamp(34px, 4.6vw, 42px);
+    --header-brand-text: clamp(10px, 1.2vw, 12px);
   }
 
   .app-header__inner {
@@ -642,8 +642,8 @@ const navItems = computed(() => [
 
   .app-header__brand-frame {
     height: 64px;
-    padding-left: clamp(18px, 2.4vw, 30px);
-    padding-right: clamp(22px, 3vw, 34px);
+    padding-left: clamp(12px, 1.7vw, 18px);
+    padding-right: clamp(16px, 2vw, 22px);
   }
 
   .app-header__brand-frame :deep(.app-logo) {
@@ -658,7 +658,7 @@ const navItems = computed(() => [
     --nav-pad-start: clamp(14px, 3.4cqw, 28px);
     --nav-pad-end: clamp(18px, 4cqw, 34px);
 
-    top: 12px;
+    top: calc((var(--header-height) - var(--header-panel-height)) / 2);
     left: calc(456 / 2048 * 100%);
     right: calc((2048 - 1568) / 2048 * 100%);
     height: 64px;
@@ -715,6 +715,8 @@ const navItems = computed(() => [
 @media (max-width: 767px) {
   .app-header {
     height: 64px;
+    --header-brand-icon: 34px;
+    --header-brand-text: 12px;
   }
 
   .app-header__inner {
diff --git a/landing/components/sections/ComparisonSection.vue b/landing/components/sections/ComparisonSection.vue
index 9fe419ad..b87d24cd 100644
--- a/landing/components/sections/ComparisonSection.vue
+++ b/landing/components/sections/ComparisonSection.vue
@@ -224,7 +224,7 @@ const rows = computed<ComparisonRow[]>(() => [
   },
   {
     feature: t('comparison.features.price'),
-    us: { status: 'free', note: 'OSS, provider access needed' },
+    us: { status: 'free', note: 'OSS + free model with no auth, paid providers optional' },
     gastown: { status: 'free', note: 'OSS, runtime plans needed' },
     paperclip: { status: 'free', note: 'OSS, self-hosted + infra' },
     cursor: { status: 'text', note: 'Free + paid usage' },
@@ -511,7 +511,7 @@ function getStatusIcon(status: string): string {
 .comparison-table__robot {
   position: absolute;
   right: clamp(28px, 7vw, 96px);
-  bottom: calc(100% - 5px);
+  bottom: calc(100% - 20px);
   z-index: 4;
   width: clamp(82px, 7.2vw, 124px);
   height: auto;
diff --git a/landing/components/sections/DownloadSection.vue b/landing/components/sections/DownloadSection.vue
index 7998b376..5de9896c 100644
--- a/landing/components/sections/DownloadSection.vue
+++ b/landing/components/sections/DownloadSection.vue
@@ -892,6 +892,11 @@ const releaseDate = computed(() => {
   color: #64748b;
 }
 
+.v-theme--light .download-section__btn {
+  color: #f8fbff;
+  text-shadow: 0 1px 8px rgba(15, 23, 42, 0.34);
+}
+
 .v-theme--light .download-section__release-info {
   color: #94a3b8;
 }
diff --git a/landing/components/sections/HeroSection.vue b/landing/components/sections/HeroSection.vue
index a0737585..77f1be60 100644
--- a/landing/components/sections/HeroSection.vue
+++ b/landing/components/sections/HeroSection.vue
@@ -131,9 +131,10 @@ onUnmounted(() => {
     <v-container class="cyber-hero__container">
       <div class="cyber-hero__layout">
         <div class="cyber-hero__copy">
-          <h1 class="cyber-hero__title" aria-label="Agent Teams">
+          <h1 class="cyber-hero__title" aria-label="Agent Teams AI">
             <span>Agent</span>
             <span class="cyber-hero__title-accent">Teams</span>
+            <span class="cyber-hero__title-accent">AI</span>
           </h1>
 
           <p class="cyber-hero__slogan cyber-panel">
diff --git a/landing/components/sections/PricingSection.vue b/landing/components/sections/PricingSection.vue
index 048bba7e..4bac49f8 100644
--- a/landing/components/sections/PricingSection.vue
+++ b/landing/components/sections/PricingSection.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { mdiOpenSourceInitiative } from '@mdi/js'
+import { mdiCheckCircleOutline, mdiOpenSourceInitiative } from '@mdi/js'
 import { useLandingContent } from '~/composables/useLandingContent'
 
 const { content } = useLandingContent()
@@ -43,6 +43,23 @@ function onGetStarted() {
                 <span v-if="plan.period" class="pricing-card__period">/ {{ plan.period }}</span>
               </div>
               <p class="pricing-card__description">{{ plan.description }}</p>
+              <div class="pricing-card__callout">
+                {{ t('pricing.freeModelCallout') }}
+              </div>
+              <ul v-if="plan.features.length" class="pricing-card__features">
+                <li
+                  v-for="feature in plan.features"
+                  :key="feature"
+                  class="pricing-card__feature"
+                >
+                  <v-icon
+                    size="16"
+                    class="pricing-card__feature-icon"
+                    :icon="mdiCheckCircleOutline"
+                  />
+                  <span>{{ feature }}</span>
+                </li>
+              </ul>
             </div>
 
             <button
@@ -177,6 +194,41 @@ function onGetStarted() {
   margin: 0;
 }
 
+.pricing-card__callout {
+  margin-top: 16px;
+  padding: 10px 12px;
+  border: 1px solid rgba(57, 255, 20, 0.22);
+  border-radius: 10px;
+  background: rgba(57, 255, 20, 0.08);
+  color: #d9ffe0;
+  font-size: 0.86rem;
+  font-weight: 700;
+  line-height: 1.45;
+}
+
+.pricing-card__features {
+  list-style: none;
+  padding: 0;
+  margin: 18px 0 0;
+  display: grid;
+  gap: 10px;
+}
+
+.pricing-card__feature {
+  display: flex;
+  align-items: flex-start;
+  gap: 8px;
+  color: #aab4d4;
+  font-size: 0.84rem;
+  line-height: 1.45;
+}
+
+.pricing-card__feature-icon {
+  color: #39ff14;
+  flex-shrink: 0;
+  margin-top: 1px;
+}
+
 .pricing-card__btn--primary {
   margin-top: 24px;
   width: 100%;
@@ -243,6 +295,20 @@ function onGetStarted() {
   color: #475569;
 }
 
+.v-theme--light .pricing-card__callout {
+  border-color: rgba(18, 161, 80, 0.22);
+  background: rgba(18, 161, 80, 0.08);
+  color: #116b3b;
+}
+
+.v-theme--light .pricing-card__feature {
+  color: #475569;
+}
+
+.v-theme--light .pricing-card__feature-icon {
+  color: #12a150;
+}
+
 .v-theme--light .pricing-section__note {
   color: #56617c;
   opacity: 1;
diff --git a/landing/content/ar.json b/landing/content/ar.json
index 7ab6568c..28fedfcf 100644
--- a/landing/content/ar.json
+++ b/landing/content/ar.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "هل هو مجاني فعلاً؟",
-      "answer": "نعم. التطبيق مجاني ومفتوح المصدر. التطبيق نفسه لا يملك خطة مدفوعة. لتشغيل الوكلاء تحتاج فقط إلى وصول إلى مزود أو runtime مدعوم مثل Anthropic أو Codex."
+      "answer": "نعم. التطبيق مجاني ومفتوح المصدر، ويمكنك البدء بنموذج مجاني بدون مصادقة - بدون تسجيل أو مفتاح API أو بطاقة ائتمان. إذا أردت نماذج أكثر، وصّل Claude أو Codex أو OpenCode/OpenRouter أو مزوداً مدعوماً آخر."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "ماذا أحتاج للبدء؟",
-      "answer": "فقط ثبّت التطبيق - وسيرشدك من الواجهة لاكتشاف الـ runtime وتسجيل دخول المزود. البدء بدون إعداد يجعلك تعمل في دقائق."
+      "answer": "فقط ثبّت التطبيق - ابدأ بالنموذج المجاني بدون مصادقة، ثم وصّل نماذج provider-backed من الواجهة فقط عندما تحتاجها."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "مجاني",
       "price": "$0",
       "period": "",
-      "description": "كل شيء متضمن. بدون حدود، بدون مفاتيح API، بدون بطاقة ائتمان.",
+      "description": "ابدأ بالنموذج المجاني بدون مصادقة المضمّن. بدون تسجيل، بدون مفتاح API، بدون بطاقة.",
       "features": [
+        "نموذج مجاني بدون مصادقة لأول تشغيل",
+        "لا تحتاج حساباً أو تسجيل دخول مزود للتجربة",
+        "وصول اختياري إلى Claude وCodex وOpenCode",
         "فرق وكلاء غير محدودة",
         "لوحة كانبان بتحديثات فورية",
         "مراجعة كود مع عرض diff",
         "تواصل بين الفرق",
-        "وضع فردي وجماعي",
-        "مراقبة عمليات مباشرة",
-        "محرر كود مدمج",
-        "تكامل MCP"
+        "وضع فردي وجماعي"
       ],
       "highlighted": true
     }
diff --git a/landing/content/de.json b/landing/content/de.json
index 47506809..c7479f6c 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 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, und Sie können mit einem kostenlosen Modell ohne Authentifizierung starten - ohne Registrierung, API-Schlüssel oder Kreditkarte. Für mehr Modelle verbinden Sie Claude, Codex, OpenCode/OpenRouter oder einen anderen unterstützten Provider."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "Was brauche ich zum Start?",
-      "answer": "Einfach die App installieren - sie führt Sie in der UI durch Runtime-Erkennung und Provider-Authentifizierung. Zero-Setup-Onboarding bringt Sie in Minuten zum Laufen."
+      "answer": "Einfach die App installieren - starten Sie mit dem kostenlosen Modell ohne Authentifizierung und verbinden Sie provider-backed Modelle in der UI erst, wenn Sie sie brauchen."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Kostenlos",
       "price": "0€",
       "period": "",
-      "description": "Alles inklusive. Keine Limits, keine API-Schlüssel, keine Kreditkarte.",
+      "description": "Starten Sie mit dem enthaltenen kostenlosen Modell ohne Authentifizierung. Keine Registrierung, kein API-Schlüssel, keine Kreditkarte.",
       "features": [
+        "Kostenloses Modell ohne Authentifizierung für erste Läufe",
+        "Kein Konto und kein Provider-Login zum Testen erforderlich",
+        "Optionaler Zugriff auf Claude, Codex und OpenCode",
         "Unbegrenzte Agenten-Teams",
         "Kanban-Board mit Echtzeit-Updates",
         "Code-Review mit Diff-Ansicht",
         "Teamübergreifende Kommunikation",
-        "Solo- und Team-Modi",
-        "Live-Prozessüberwachung",
-        "Integrierter Code-Editor",
-        "MCP-Integration"
+        "Solo- und Team-Modi"
       ],
       "highlighted": true
     }
diff --git a/landing/content/en.json b/landing/content/en.json
index c5758412..d6d1bff5 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 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 is free and open source, and you can start with a free model with no auth - no registration, API keys, or credit card. If you want more models, connect Claude, Codex, OpenCode/OpenRouter, or another supported provider."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "What do I need to get started?",
-      "answer": "Just install the app - it guides runtime detection and provider authentication from the UI. Zero-setup onboarding gets you running in minutes."
+      "answer": "Just install the app - start with the free model with no auth, then connect provider-backed models from the UI only when you need them."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Free",
       "price": "$0",
       "period": "",
-      "description": "Everything included. No limits, no API keys, no credit card.",
+      "description": "Start with the included free model with no auth. No signup, no API key, no credit card.",
       "features": [
+        "Free model with no auth for first runs",
+        "No account or provider login required to try",
+        "Optional Claude, Codex, and OpenCode provider access",
         "Unlimited agent teams",
         "Kanban board with real-time updates",
         "Code review with diff view",
         "Cross-team communication",
-        "Solo & team modes",
-        "Live process monitoring",
-        "Built-in code editor",
-        "MCP integration"
+        "Solo & team modes"
       ],
       "highlighted": true
     }
diff --git a/landing/content/es.json b/landing/content/es.json
index 31886f18..592d52e1 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 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, y puedes empezar con un modelo gratuito sin autenticación - sin registro, claves API ni tarjeta. Si quieres más modelos, conecta Claude, Codex, OpenCode/OpenRouter u otro proveedor compatible."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "¿Qué necesito para empezar?",
-      "answer": "Solo instala la app - te guía en la detección del runtime y la autenticación del proveedor desde la interfaz. El onboarding sin configuración te pone en marcha en minutos."
+      "answer": "Solo instala la app - empieza con el modelo gratuito sin autenticación, y conecta modelos con proveedor desde la interfaz solo cuando los necesites."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Gratis",
       "price": "$0",
       "period": "",
-      "description": "Todo incluido. Sin límites, sin claves API, sin tarjeta de crédito.",
+      "description": "Empieza con el modelo gratuito sin autenticación incluido. Sin registro, sin clave API, sin tarjeta.",
       "features": [
+        "Modelo gratuito sin autenticación para los primeros usos",
+        "No necesitas cuenta ni login de proveedor para probar",
+        "Acceso opcional a Claude, Codex y OpenCode",
         "Equipos de agentes ilimitados",
         "Tablero kanban con actualizaciones en tiempo real",
         "Revisión de código con vista diff",
         "Comunicación entre equipos",
-        "Modo solo y equipo",
-        "Monitorización de procesos en vivo",
-        "Editor de código integrado",
-        "Integración MCP"
+        "Modo solo y equipo"
       ],
       "highlighted": true
     }
diff --git a/landing/content/fr.json b/landing/content/fr.json
index 831006bb..75f7dc28 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 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, et vous pouvez commencer avec un modèle gratuit sans authentification - sans inscription, clé API ni carte bancaire. Pour plus de modèles, connectez Claude, Codex, OpenCode/OpenRouter ou un autre provider pris en charge."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "De quoi ai-je besoin pour commencer ?",
-      "answer": "Installez simplement l'application - elle vous guide pour la détection du runtime et l'authentification du provider depuis l'interface. L'onboarding zéro-configuration vous fait démarrer en quelques minutes."
+      "answer": "Installez simplement l'application - commencez avec le modèle gratuit sans authentification, puis connectez les modèles provider-backed depuis l'interface seulement si nécessaire."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Gratuit",
       "price": "0€",
       "period": "",
-      "description": "Tout inclus. Sans limites, sans clés API, sans carte bancaire.",
+      "description": "Commencez avec le modèle gratuit sans authentification inclus. Sans inscription, sans clé API, sans carte bancaire.",
       "features": [
+        "Modèle gratuit sans authentification pour les premiers essais",
+        "Aucun compte ni login provider requis pour tester",
+        "Accès optionnel à Claude, Codex et OpenCode",
         "Équipes d'agents illimitées",
         "Kanban avec mises à jour en temps réel",
         "Revue de code avec vue diff",
         "Communication inter-équipes",
-        "Modes solo et équipe",
-        "Surveillance des processus en direct",
-        "Éditeur de code intégré",
-        "Intégration MCP"
+        "Modes solo et équipe"
       ],
       "highlighted": true
     }
diff --git a/landing/content/hi.json b/landing/content/hi.json
index b1e4f81e..f779b7b8 100644
--- a/landing/content/hi.json
+++ b/landing/content/hi.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "क्या यह सच में मुफ़्त है?",
-      "answer": "हाँ। ऐप मुफ़्त और ओपन सोर्स है। ऐप का अपना कोई paid plan नहीं है। agents चलाने के लिए आपको सिर्फ़ किसी supported provider/runtime, जैसे Anthropic या Codex, का access चाहिए।"
+      "answer": "हाँ। ऐप मुफ़्त और ओपन सोर्स है, और आप बिना registration, API key या credit card के मुफ़्त no-auth model से शुरू कर सकते हैं। अगर और models चाहिए, तो Claude, Codex, OpenCode/OpenRouter या कोई दूसरा supported provider जोड़ें।"
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "शुरू करने के लिए क्या चाहिए?",
-      "answer": "बस ऐप इंस्टॉल करें - यह UI से runtime detection और provider authentication में गाइड करता है। zero-setup onboarding आपको कुछ ही मिनटों में शुरू करा देता है।"
+      "answer": "बस ऐप इंस्टॉल करें - मुफ़्त no-auth model से शुरू करें, फिर provider-backed models को UI से तभी जोड़ें जब ज़रूरत हो।"
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "मुफ़्त",
       "price": "$0",
       "period": "",
-      "description": "सब कुछ शामिल। कोई लिमिट नहीं, कोई API कुंजी नहीं, कोई क्रेडिट कार्ड नहीं।",
+      "description": "शामिल मुफ़्त no-auth model से शुरू करें। कोई registration नहीं, कोई API key नहीं, कोई credit card नहीं।",
       "features": [
+        "पहले runs के लिए मुफ़्त no-auth model",
+        "Try करने के लिए account या provider login नहीं चाहिए",
+        "Claude, Codex और OpenCode provider access optional",
         "असीमित एजेंट टीमें",
         "रियल-टाइम अपडेट के साथ कानबन बोर्ड",
         "diff व्यू के साथ कोड रिव्यू",
         "क्रॉस-टीम कम्युनिकेशन",
-        "सोलो और टीम मोड",
-        "लाइव प्रोसेस मॉनिटरिंग",
-        "बिल्ट-इन कोड एडिटर",
-        "MCP इंटीग्रेशन"
+        "सोलो और टीम मोड"
       ],
       "highlighted": true
     }
diff --git a/landing/content/ja.json b/landing/content/ja.json
index d18336c0..1d31c014 100644
--- a/landing/content/ja.json
+++ b/landing/content/ja.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "本当に無料ですか？",
-      "answer": "はい。アプリは無料のオープンソースです。アプリ自体に有料プランはありません。エージェントを実行するには、Anthropic や Codex など対応する provider/runtime へのアクセスだけが必要です。"
+      "answer": "はい。アプリは無料のオープンソースで、登録、APIキー、クレジットカードなしで認証なしの無料モデルから始められます。さらに多くのモデルが必要な場合は、Claude、Codex、OpenCode/OpenRouter など対応 provider を接続できます。"
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "始めるには何が必要ですか？",
-      "answer": "アプリをインストールするだけです - UI 上で runtime の検出と provider 認証を案内します。ゼロ設定のオンボーディングで数分で開始できます。"
+      "answer": "アプリをインストールするだけです - 認証なしの無料モデルから始め、provider-backed モデルは必要になった時だけ UI から接続できます。"
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "無料",
       "price": "¥0",
       "period": "",
-      "description": "すべて含まれています。制限なし、APIキー不要、クレジットカード不要。",
+      "description": "含まれている認証なしの無料モデルから開始できます。登録なし、APIキー不要、クレジットカード不要。",
       "features": [
+        "最初の実行に使える認証なしの無料モデル",
+        "試用にアカウントや provider ログインは不要",
+        "Claude、Codex、OpenCode provider 接続は任意",
         "無制限のエージェントチーム",
         "リアルタイム更新のカンバンボード",
         "Diffビュー付きコードレビュー",
         "チーム間コミュニケーション",
-        "ソロ＆チームモード",
-        "ライブプロセス監視",
-        "組み込みコードエディタ",
-        "MCP統合"
+        "ソロ＆チームモード"
       ],
       "highlighted": true
     }
diff --git a/landing/content/pt.json b/landing/content/pt.json
index 9d7d8497..6cee9a15 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 é 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, e você pode começar com um modelo gratuito sem autenticação - sem cadastro, chave de API ou cartão. Para mais modelos, conecte Claude, Codex, OpenCode/OpenRouter ou outro provedor compatível."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "O que preciso para começar?",
-      "answer": "Basta instalar o app - ele guia a detecção do runtime e a autenticação do provider pela interface. O onboarding sem configuração coloca você em ação em minutos."
+      "answer": "Basta instalar o app - comece com o modelo gratuito sem autenticação, depois conecte modelos com provedor pela interface só quando precisar."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Grátis",
       "price": "$0",
       "period": "",
-      "description": "Tudo incluído. Sem limites, sem chaves de API, sem cartão de crédito.",
+      "description": "Comece com o modelo gratuito sem autenticação incluído. Sem cadastro, sem chave de API, sem cartão.",
       "features": [
+        "Modelo gratuito sem autenticação para os primeiros usos",
+        "Não precisa de conta nem login de provedor para testar",
+        "Acesso opcional a Claude, Codex e OpenCode",
         "Equipes de agentes ilimitadas",
         "Quadro kanban com atualizações em tempo real",
         "Revisão de código com visualização diff",
         "Comunicação entre equipes",
-        "Modo solo e equipe",
-        "Monitoramento de processos ao vivo",
-        "Editor de código integrado",
-        "Integração MCP"
+        "Modo solo e equipe"
       ],
       "highlighted": true
     }
diff --git a/landing/content/ru.json b/landing/content/ru.json
index 2eb6b4a7..217dd874 100644
--- a/landing/content/ru.json
+++ b/landing/content/ru.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "Это действительно бесплатно?",
-      "answer": "Да. Само приложение полностью бесплатное и с открытым кодом. У него нет собственного платного тарифа. Для запуска агентов нужен только доступ к поддерживаемому провайдеру/рантайму, например Anthropic или Codex."
+      "answer": "Да. Приложение бесплатное и open source, и можно начать с бесплатной модели без авторизации - без регистрации, API-ключей и карты. Если нужны дополнительные модели, подключите Claude, Codex, OpenCode/OpenRouter или другого поддерживаемого провайдера."
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "Что нужно для начала?",
-      "answer": "Просто установите приложение - оно проведёт вас через определение рантайма и аутентификацию провайдера прямо в интерфейсе. Онбординг без настройки запустит вас за минуты."
+      "answer": "Просто установите приложение - начните с бесплатной модели без авторизации, а provider-backed модели подключайте из интерфейса только когда они понадобятся."
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "Бесплатно",
       "price": "$0",
       "period": "",
-      "description": "Всё включено. Без лимитов, без API-ключей, без кредитной карты.",
+      "description": "Начните со встроенной бесплатной модели без авторизации. Без регистрации, API-ключей и карты.",
       "features": [
+        "Бесплатная модель без авторизации для первого запуска",
+        "Без аккаунта и логина провайдера для пробы",
+        "Опциональный доступ к Claude, Codex и OpenCode",
         "Безлимитные команды агентов",
         "Канбан-доска с обновлениями в реальном времени",
         "Код-ревью с diff-просмотром",
         "Межкомандная коммуникация",
-        "Соло и командный режимы",
-        "Мониторинг живых процессов",
-        "Встроенный редактор кода",
-        "Интеграция MCP"
+        "Соло и командный режимы"
       ],
       "highlighted": true
     }
diff --git a/landing/content/zh.json b/landing/content/zh.json
index 2fea952f..7a258c08 100644
--- a/landing/content/zh.json
+++ b/landing/content/zh.json
@@ -44,7 +44,7 @@
     {
       "id": "isFree",
       "question": "真的免费吗？",
-      "answer": "是的。应用本身免费且开源。应用没有自己的付费方案。要运行智能体，你只需要接入受支持的 provider/runtime，例如 Anthropic 或 Codex。"
+      "answer": "是的。应用免费且开源，你可以从无需认证的免费模型开始，无需注册、API 密钥或信用卡。如果需要更多模型，可以连接 Claude、Codex、OpenCode/OpenRouter 或其他受支持的提供商。"
     },
     {
       "id": "platforms",
@@ -64,7 +64,7 @@
     {
       "id": "requirements",
       "question": "开始需要什么？",
-      "answer": "只需安装应用 - 它会在界面中引导你完成 runtime 检测和 provider 认证。零配置上手，几分钟即可运行。"
+      "answer": "只需安装应用 - 先使用无需认证的免费模型，需要更多 provider-backed 模型时再从界面连接。"
     }
   ],
   "download": {
@@ -85,16 +85,16 @@
       "name": "免费",
       "price": "$0",
       "period": "",
-      "description": "全部功能。无限制，无需 API 密钥，无需信用卡。",
+      "description": "从内置无需认证的免费模型开始。无需注册、API 密钥或信用卡。",
       "features": [
+        "用于首次运行的无需认证的免费模型",
+        "试用无需账号或提供商登录",
+        "可选连接 Claude、Codex 和 OpenCode 提供商",
         "无限智能体团队",
         "实时更新的看板",
         "带 diff 查看的代码审查",
         "跨团队通信",
-        "单人和团队模式",
-        "实时进程监控",
-        "内置代码编辑器",
-        "MCP 集成"
+        "单人和团队模式"
       ],
       "highlighted": true
     }
diff --git a/landing/layouts/default.vue b/landing/layouts/default.vue
index 0a4397d7..4ddbe3a2 100644
--- a/landing/layouts/default.vue
+++ b/landing/layouts/default.vue
@@ -11,6 +11,19 @@
 <style scoped>
 .app-layout__main {
   flex: 1;
-  padding-top: 64px;
+  background:
+    radial-gradient(circle at 78% 18%, rgba(0, 234, 255, 0.08), transparent 32%),
+    radial-gradient(circle at 18% 72%, rgba(47, 125, 255, 0.07), transparent 38%),
+    linear-gradient(180deg, #02050d 0%, #050814 58%, #02050d 100%);
+}
+
+.v-theme--light .app-layout__main {
+  background:
+    radial-gradient(circle at 52% 0%, rgba(255, 43, 255, 0.16), transparent 30%),
+    radial-gradient(circle at 64% 0%, rgba(0, 234, 255, 0.14), transparent 28%),
+    radial-gradient(circle at 78% 24%, rgba(113, 185, 255, 0.28), transparent 31%),
+    radial-gradient(circle at 22% 72%, rgba(221, 170, 255, 0.24), transparent 38%),
+    radial-gradient(circle at 8% 32%, rgba(101, 218, 255, 0.18), transparent 34%),
+    linear-gradient(180deg, #edf8ff 0%, #eaf7fb 48%, #fbf7ff 100%);
 }
 </style>
diff --git a/landing/locales/ar.json b/landing/locales/ar.json
index 23905f5f..61e3f987 100644
--- a/landing/locales/ar.json
+++ b/landing/locales/ar.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "أدوات قوية تجعل التعاون متعدد الوكلاء يعمل فعلاً."
   },
   "pricing": {
-    "sectionTitle": "مجاني 100%. بدون شروط.",
-    "sectionSubtitle": "مفتوح المصدر، بدون مفاتيح API، بدون إعدادات. فقط ثبّت وابدأ.",
+    "sectionTitle": "التثبيت مجاني. نموذج مجاني مضمّن.",
+    "sectionSubtitle": "ابدأ فوراً بنموذج مجاني بدون مصادقة - بدون حساب أو مفتاح API أو بطاقة. وصّل Claude أو Codex أو OpenCode/OpenRouter أو مزودين آخرين فقط عندما تحتاج نماذج إضافية.",
     "getStarted": "حمّل الآن",
     "popular": "مجاني",
-    "note": "مفتوح المصدر. بدون مفاتيح API. بدون إعدادات. يعمل محلياً بالكامل."
+    "freeModelCallout": "نموذج مجاني بدون مصادقة مضمّن",
+    "note": "لا يملك Agent Teams أي خطة مدفوعة. النموذج المجاني بدون مصادقة يتيح التجربة فوراً؛ استخدام المزودين المدفوعين اختياري ويتبع المزود الذي تختاره."
   },
   "testimonials": {
     "sectionTitle": "ماذا يقول المطورون",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - تنسيق وكلاء الذكاء الاصطناعي للمطورين",
-    "homeDescription": "تطبيق سطح مكتب مجاني ومفتوح المصدر لتشكيل فرق وكلاء الذكاء الاصطناعي. لوحة كانبان، مراجعة الكود، تواصل بين الفرق. يعمل محلياً بالكامل.",
+    "homeDescription": "تطبيق سطح مكتب مجاني ومفتوح المصدر لفرق وكلاء الذكاء الاصطناعي. ابدأ بنموذج مجاني بدون مصادقة، ثم وصّل Claude أو Codex أو OpenCode عند الحاجة.",
     "downloadTitle": "تنزيل Agent Teams لنظام macOS وWindows وLinux",
     "downloadDescription": "نزّل Agent Teams لنظام macOS وWindows وLinux. تطبيق سطح مكتب مجاني ومفتوح المصدر لفرق وكلاء Claude وCodex وOpenCode."
   },
diff --git a/landing/locales/de.json b/landing/locales/de.json
index 9957e737..f407c51b 100644
--- a/landing/locales/de.json
+++ b/landing/locales/de.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Leistungsstarke Tools für effektive Multi-Agenten-Zusammenarbeit."
   },
   "pricing": {
-    "sectionTitle": "100% Kostenlos. Ohne Haken.",
-    "sectionSubtitle": "Open Source, keine API-Schlüssel, keine Konfiguration. Einfach installieren und loslegen.",
+    "sectionTitle": "Kostenlos installieren. Kostenloses Modell inklusive.",
+    "sectionSubtitle": "Starten Sie sofort mit einem kostenlosen Modell ohne Authentifizierung - ohne Konto, API-Schlüssel oder Kreditkarte. Verbinden Sie Claude, Codex, OpenCode/OpenRouter oder andere Provider nur, wenn Sie mehr Modelle möchten.",
     "getStarted": "Herunterladen",
     "popular": "Kostenlos",
-    "note": "Open Source. Keine API-Schlüssel. Keine Konfiguration. Läuft vollständig lokal."
+    "freeModelCallout": "Kostenloses Modell ohne Authentifizierung inklusive",
+    "note": "Agent Teams hat keinen eigenen Bezahlplan. Mit dem kostenlosen Modell ohne Authentifizierung können Sie sofort testen; kostenpflichtige Provider-Nutzung ist optional und hängt vom gewählten Provider ab."
   },
   "testimonials": {
     "sectionTitle": "Was Entwickler sagen",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - KI-Agenten-Orchestrierung für Entwickler",
-    "homeDescription": "Kostenlose Open-Source-Desktop-App für KI-Agenten-Teams. Kanban-Board, Code-Review, teamübergreifende Kommunikation. Läuft vollständig lokal.",
+    "homeDescription": "Kostenlose Open-Source-Desktop-App für KI-Agenten-Teams. Starten Sie mit einem kostenlosen Modell ohne Authentifizierung und verbinden Sie Claude, Codex oder OpenCode bei Bedarf.",
     "downloadTitle": "Agent Teams für macOS, Windows und Linux herunterladen",
     "downloadDescription": "Laden Sie Agent Teams für macOS, Windows und Linux herunter. Kostenlose Open-Source-Desktop-App für Claude-, Codex- und OpenCode-Agententeams."
   },
diff --git a/landing/locales/en.json b/landing/locales/en.json
index 6d7ecf2a..fc0f0476 100644
--- a/landing/locales/en.json
+++ b/landing/locales/en.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Powerful tools that make multi-agent collaboration actually work."
   },
   "pricing": {
-    "sectionTitle": "100% Free. No strings attached.",
-    "sectionSubtitle": "Open source, no API keys, no configuration. Just install and go.",
+    "sectionTitle": "Free to install. Free model included.",
+    "sectionSubtitle": "Start immediately with a free model with no auth - no account, API key, or credit card. Connect Claude, Codex, OpenCode/OpenRouter, or other provider access only when you want more models.",
     "getStarted": "Download Now",
     "popular": "Free",
-    "note": "Open source. No API keys. No configuration. Runs entirely locally."
+    "freeModelCallout": "Free model with no auth included",
+    "note": "Agent Teams has no paid tier. The free model with no auth lets you try it right away; paid provider usage is optional and controlled by the provider you choose."
   },
   "testimonials": {
     "sectionTitle": "What developers say",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - AI Agent Orchestration for Developers",
-    "homeDescription": "Free, open-source desktop app for assembling AI agent teams. Kanban board, code review, cross-team communication. Runs entirely locally.",
+    "homeDescription": "Free, open-source desktop app for AI agent teams. Start with a free model with no auth, then connect Claude, Codex, or OpenCode when you need more models.",
     "downloadTitle": "Download Agent Teams for macOS, Windows, and Linux",
     "downloadDescription": "Download Agent Teams for macOS, Windows, and Linux. Free open-source desktop app for Claude, Codex, and OpenCode agent teams."
   },
diff --git a/landing/locales/es.json b/landing/locales/es.json
index 176ca3a0..579f122f 100644
--- a/landing/locales/es.json
+++ b/landing/locales/es.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Herramientas potentes que hacen que la colaboración multi-agente realmente funcione."
   },
   "pricing": {
-    "sectionTitle": "100% Gratis. Sin letra pequeña.",
-    "sectionSubtitle": "Código abierto, sin claves API, sin configuración. Instala y empieza.",
+    "sectionTitle": "Gratis para instalar. Modelo gratis incluido.",
+    "sectionSubtitle": "Empieza al instante con un modelo gratuito sin autenticación - sin cuenta, clave API ni tarjeta. Conecta Claude, Codex, OpenCode/OpenRouter u otros proveedores solo si quieres más modelos.",
     "getStarted": "Descargar ahora",
     "popular": "Gratis",
-    "note": "Código abierto. Sin claves API. Sin configuración. Funciona completamente en local."
+    "freeModelCallout": "Modelo gratuito sin autenticación incluido",
+    "note": "Agent Teams no tiene plan de pago propio. El modelo gratuito sin autenticación te permite probarlo de inmediato; el uso de proveedores de pago es opcional y depende del proveedor que elijas."
   },
   "testimonials": {
     "sectionTitle": "Lo que dicen los desarrolladores",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - Orquestación de agentes IA para desarrolladores",
-    "homeDescription": "App de escritorio gratuita y de código abierto para montar equipos de agentes IA. Tablero kanban, revisión de código, comunicación entre equipos. Funciona completamente en local.",
+    "homeDescription": "App de escritorio gratuita y open source para equipos de agentes IA. Empieza con un modelo gratuito sin autenticación, y conecta Claude, Codex u OpenCode cuando necesites más modelos.",
     "downloadTitle": "Descargar Agent Teams para macOS, Windows y Linux",
     "downloadDescription": "Descarga Agent Teams para macOS, Windows y Linux. App de escritorio gratis y open source para equipos de agentes Claude, Codex y OpenCode."
   },
diff --git a/landing/locales/fr.json b/landing/locales/fr.json
index 57738f7a..675c6833 100644
--- a/landing/locales/fr.json
+++ b/landing/locales/fr.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Des outils puissants pour une collaboration multi-agents efficace."
   },
   "pricing": {
-    "sectionTitle": "100% Gratuit. Sans conditions.",
-    "sectionSubtitle": "Open source, sans clé API, sans configuration. Installez et c'est parti.",
+    "sectionTitle": "Installation gratuite. Modèle gratuit inclus.",
+    "sectionSubtitle": "Commencez immédiatement avec un modèle gratuit sans authentification - sans compte, clé API ni carte bancaire. Connectez Claude, Codex, OpenCode/OpenRouter ou un autre provider seulement si vous voulez plus de modèles.",
     "getStarted": "Télécharger",
     "popular": "Gratuit",
-    "note": "Open source. Sans clé API. Sans configuration. Fonctionne entièrement en local."
+    "freeModelCallout": "Modèle gratuit sans authentification inclus",
+    "note": "Agent Teams n'a pas d'offre payante. Le modèle gratuit sans authentification permet d'essayer tout de suite; l'usage de providers payants est optionnel et dépend du provider choisi."
   },
   "testimonials": {
     "sectionTitle": "Ce que disent les développeurs",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - Orchestration d'agents IA pour développeurs",
-    "homeDescription": "Application desktop gratuite et open source pour gérer des équipes d'agents IA. Tableau kanban, revue de code, communication inter-équipes. Fonctionne entièrement en local.",
+    "homeDescription": "Application desktop gratuite et open source pour équipes d'agents IA. Commencez avec un modèle gratuit sans authentification, puis connectez Claude, Codex ou OpenCode si besoin.",
     "downloadTitle": "Télécharger Agent Teams pour macOS, Windows et Linux",
     "downloadDescription": "Téléchargez Agent Teams pour macOS, Windows et Linux. Application desktop gratuite et open source pour équipes d'agents Claude, Codex et OpenCode."
   },
diff --git a/landing/locales/hi.json b/landing/locales/hi.json
index fb38cc89..db802dcf 100644
--- a/landing/locales/hi.json
+++ b/landing/locales/hi.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "शक्तिशाली उपकरण जो मल्टी-एजेंट सहयोग को वास्तव में काम करते हैं।"
   },
   "pricing": {
-    "sectionTitle": "100% मुफ़्त। कोई शर्त नहीं।",
-    "sectionSubtitle": "ओपन सोर्स, कोई API कुंजी नहीं, कोई कॉन्फ़िगरेशन नहीं। बस इंस्टॉल करें और शुरू करें।",
+    "sectionTitle": "इंस्टॉल मुफ़्त। मुफ़्त मॉडल शामिल।",
+    "sectionSubtitle": "मुफ़्त no-auth model से तुरंत शुरू करें - कोई account, API key या credit card नहीं। Claude, Codex, OpenCode/OpenRouter या अन्य providers तभी जोड़ें जब आपको और models चाहिए।",
     "getStarted": "अभी डाउनलोड करें",
     "popular": "मुफ़्त",
-    "note": "ओपन सोर्स। कोई API कुंजी नहीं। कोई कॉन्फ़िगरेशन नहीं। पूरी तरह लोकल चलता है।"
+    "freeModelCallout": "मुफ़्त no-auth model शामिल",
+    "note": "Agent Teams का अपना कोई paid plan नहीं है। मुफ़्त no-auth model से आप तुरंत try कर सकते हैं; paid provider usage optional है और चुने गए provider पर निर्भर है।"
   },
   "testimonials": {
     "sectionTitle": "डेवलपर्स क्या कहते हैं",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - डेवलपर्स के लिए AI एजेंट ऑर्केस्ट्रेशन",
-    "homeDescription": "AI एजेंट टीमें बनाने के लिए मुफ़्त, ओपन-सोर्स डेस्कटॉप ऐप। कानबन बोर्ड, कोड रिव्यू, क्रॉस-टीम संचार। पूरी तरह लोकल चलता है।",
+    "homeDescription": "AI agent teams के लिए मुफ़्त open-source desktop app। मुफ़्त no-auth model से शुरू करें, फिर ज़रूरत पर Claude, Codex या OpenCode जोड़ें।",
     "downloadTitle": "macOS, Windows और Linux के लिए Agent Teams डाउनलोड करें",
     "downloadDescription": "macOS, Windows और Linux के लिए Agent Teams डाउनलोड करें। Claude, Codex और OpenCode एजेंट टीमों के लिए मुफ़्त ओपन-सोर्स डेस्कटॉप ऐप।"
   },
diff --git a/landing/locales/ja.json b/landing/locales/ja.json
index 50d7414d..4f957f5f 100644
--- a/landing/locales/ja.json
+++ b/landing/locales/ja.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "マルチエージェント連携を実現する強力なツール。"
   },
   "pricing": {
-    "sectionTitle": "100%無料。制約なし。",
-    "sectionSubtitle": "オープンソース、APIキー不要、設定不要。インストールするだけ。",
+    "sectionTitle": "インストール無料。無料モデル付き。",
+    "sectionSubtitle": "認証なしの無料モデルですぐに開始できます - アカウント、APIキー、クレジットカードは不要。追加モデルが必要な時だけ Claude、Codex、OpenCode/OpenRouter などを接続できます。",
     "getStarted": "ダウンロード",
     "popular": "無料",
-    "note": "オープンソース。APIキー不要。設定不要。完全にローカルで動作。"
+    "freeModelCallout": "認証なしの無料モデルが含まれています",
+    "note": "Agent Teams 自体に有料プランはありません。認証なしの無料モデルですぐに試せます。有料 provider の利用は任意で、選択した provider の条件に従います。"
   },
   "testimonials": {
     "sectionTitle": "開発者の声",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - 開発者向けAIエージェントオーケストレーション",
-    "homeDescription": "AIエージェントチームを管理する無料のオープンソースデスクトップアプリ。カンバンボード、コードレビュー、チーム間通信。完全にローカルで動作。",
+    "homeDescription": "AIエージェントチーム向けの無料オープンソースデスクトップアプリ。認証なしの無料モデルから始め、必要に応じて Claude、Codex、OpenCode を接続できます。",
     "downloadTitle": "macOS、Windows、Linux向けAgent Teamsをダウンロード",
     "downloadDescription": "macOS、Windows、Linux向けAgent Teamsをダウンロード。Claude、Codex、OpenCodeエージェントチーム用の無料オープンソースデスクトップアプリ。"
   },
diff --git a/landing/locales/pt.json b/landing/locales/pt.json
index 0c83735e..f5b7960c 100644
--- a/landing/locales/pt.json
+++ b/landing/locales/pt.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Ferramentas poderosas que fazem a colaboração multi-agente realmente funcionar."
   },
   "pricing": {
-    "sectionTitle": "100% Grátis. Sem pegadinhas.",
-    "sectionSubtitle": "Código aberto, sem chaves de API, sem configuração. Instale e comece.",
+    "sectionTitle": "Grátis para instalar. Modelo grátis incluído.",
+    "sectionSubtitle": "Comece na hora com um modelo gratuito sem autenticação - sem conta, chave de API ou cartão. Conecte Claude, Codex, OpenCode/OpenRouter ou outros provedores só quando quiser mais modelos.",
     "getStarted": "Baixar agora",
     "popular": "Grátis",
-    "note": "Código aberto. Sem chaves de API. Sem configuração. Roda totalmente local."
+    "freeModelCallout": "Modelo gratuito sem autenticação incluído",
+    "note": "Agent Teams não tem plano pago próprio. O modelo gratuito sem autenticação permite testar imediatamente; uso de provedores pagos é opcional e depende do provedor escolhido."
   },
   "testimonials": {
     "sectionTitle": "O que os desenvolvedores dizem",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - Orquestração de agentes IA para desenvolvedores",
-    "homeDescription": "App desktop gratuito e open source para montar equipes de agentes IA. Quadro kanban, revisão de código, comunicação entre equipes. Roda totalmente local.",
+    "homeDescription": "App desktop gratuito e open source para equipes de agentes IA. Comece com um modelo gratuito sem autenticação, depois conecte Claude, Codex ou OpenCode quando precisar.",
     "downloadTitle": "Baixar Agent Teams para macOS, Windows e Linux",
     "downloadDescription": "Baixe o Agent Teams para macOS, Windows e Linux. App desktop gratuito e open source para equipes de agentes Claude, Codex e OpenCode."
   },
diff --git a/landing/locales/ru.json b/landing/locales/ru.json
index 241c30a3..3d31af0c 100644
--- a/landing/locales/ru.json
+++ b/landing/locales/ru.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "Мощные инструменты, которые делают мультиагентную совместную работу реальностью."
   },
   "pricing": {
-    "sectionTitle": "100% Бесплатно. Без подвоха.",
-    "sectionSubtitle": "Открытый код, без API-ключей, без конфигурации. Просто установите и работайте.",
+    "sectionTitle": "Бесплатно установить. Бесплатная модель уже внутри.",
+    "sectionSubtitle": "Можно сразу начать с бесплатной модели без авторизации - без регистрации, API-ключей и карты. Claude, Codex, OpenCode/OpenRouter и другие провайдеры подключайте только если нужны дополнительные модели.",
     "getStarted": "Скачать",
     "popular": "Бесплатно",
-    "note": "Открытый код. Без API-ключей. Без конфигурации. Работает полностью локально."
+    "freeModelCallout": "Бесплатная модель без авторизации включена",
+    "note": "У Agent Teams нет платного тарифа. Бесплатная модель без авторизации даёт попробовать сразу; платные провайдеры опциональны и зависят от выбранного сервиса."
   },
   "testimonials": {
     "sectionTitle": "Что говорят разработчики",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - Оркестрация ИИ-агентов для разработчиков",
-    "homeDescription": "Бесплатное десктопное приложение с открытым кодом для управления командами ИИ-агентов. Канбан-доска, код-ревью, межкомандная коммуникация. Работает полностью локально.",
+    "homeDescription": "Бесплатное open-source desktop-приложение для команд ИИ-агентов. Начните с бесплатной модели без авторизации, а Claude, Codex или OpenCode подключайте когда нужны дополнительные модели.",
     "downloadTitle": "Скачать Agent Teams для macOS, Windows и Linux",
     "downloadDescription": "Скачайте Agent Teams для macOS, Windows и Linux. Бесплатное open-source приложение для команд агентов Claude, Codex и OpenCode."
   },
diff --git a/landing/locales/zh.json b/landing/locales/zh.json
index 63de8336..66cd073e 100644
--- a/landing/locales/zh.json
+++ b/landing/locales/zh.json
@@ -43,11 +43,12 @@
     "sectionSubtitle": "强大的工具，让多智能体协作真正有效。"
   },
   "pricing": {
-    "sectionTitle": "100% 免费，没有附加条件。",
-    "sectionSubtitle": "开源，无需 API 密钥，无需配置。安装即用。",
+    "sectionTitle": "免费安装。内置免费模型。",
+    "sectionSubtitle": "可立即使用无需认证的免费模型 - 无需账号、API 密钥或信用卡。只有在需要更多模型时，才连接 Claude、Codex、OpenCode/OpenRouter 或其他提供商。",
     "getStarted": "立即下载",
     "popular": "免费",
-    "note": "开源。无需 API 密钥。无需配置。完全本地运行。"
+    "freeModelCallout": "已包含无需认证的免费模型",
+    "note": "Agent Teams 没有自己的付费套餐。无需认证的免费模型可让你立即试用；付费提供商的使用是可选的，并由你选择的提供商控制。"
   },
   "testimonials": {
     "sectionTitle": "开发者怎么说",
@@ -112,7 +113,7 @@
   },
   "meta": {
     "homeTitle": "Agent Teams - 面向开发者的 AI 智能体编排",
-    "homeDescription": "免费开源桌面应用，用于组建 AI 智能体团队。看板、代码审查、跨团队通信。完全本地运行。",
+    "homeDescription": "面向 AI 智能体团队的免费开源桌面应用。先使用无需认证的免费模型，需要更多模型时再连接 Claude、Codex 或 OpenCode。",
     "downloadTitle": "下载适用于 macOS、Windows 和 Linux 的 Agent Teams",
     "downloadDescription": "下载适用于 macOS、Windows 和 Linux 的 Agent Teams。面向 Claude、Codex 和 OpenCode 智能体团队的免费开源桌面应用。"
   },
diff --git a/landing/product-docs/guide/installation.md b/landing/product-docs/guide/installation.md
index 93034d7b..80b7c747 100644
--- a/landing/product-docs/guide/installation.md
+++ b/landing/product-docs/guide/installation.md
@@ -9,7 +9,7 @@ Agent Teams is distributed as a desktop app for macOS, Windows, and Linux.
 
 ::: tip Shortest path
 1. Download the build for your platform below
-2. Launch the app — it detects runtimes and guides provider auth from the UI
+2. Launch the app - start with the free model with no auth or connect provider auth from the UI
 3. Start the [quickstart](/guide/quickstart) to create your first team
 
 Desktop app startup: run `pnpm dev` for the Electron app. Do not start the browser/web dev mode for normal use.
@@ -30,16 +30,16 @@ Unsigned or newly published open-source apps can trigger SmartScreen. If you tru
 
 ## Requirements
 
-The packaged app is designed for zero-setup onboarding. It guides you through runtime detection and provider authentication from the UI — no manual CLI configuration needed.
+The packaged app is designed for zero-setup onboarding. You can start with the free model with no auth - no registration, API keys, or credit card. If you want more models, the app guides runtime detection and provider authentication from the UI.
 
-To use agent runtimes, you need access to at least one provider:
+For paid or account-backed models, connect at least one provider:
 
 | Provider           | Access method                                     |
 | ------------------ | ------------------------------------------------- |
 | Claude (Anthropic) | Claude Code CLI login or API key                  |
 | Codex (OpenAI)     | Codex CLI login or API key                        |
 | Gemini (Google)    | Google ADC, Gemini CLI, or API key                |
-| OpenCode           | API key for a supported backend (e.g. OpenRouter) |
+| OpenCode           | Included free model with no auth, or API key for a supported backend (e.g. OpenRouter) |
 
 ::: info
 Gemini is available as a supported provider path. See [Providers and runtimes](/reference/providers-runtimes) for auth options and current status across all providers.
diff --git a/landing/product-docs/guide/quickstart.md b/landing/product-docs/guide/quickstart.md
index 204ef137..90d09ba8 100644
--- a/landing/product-docs/guide/quickstart.md
+++ b/landing/product-docs/guide/quickstart.md
@@ -47,7 +47,7 @@ For project conventions and architecture guidance, refer to these canonical file
 
 ## 1. Run from source or download
 
-**Download the packaged app** for macOS, Windows, or Linux from the <a href="/download/" target="_self">download page</a> — no prerequisites needed. The app guides runtime detection and provider authentication from the UI.
+**Download the packaged app** for macOS, Windows, or Linux from the <a href="/download/" target="_self">download page</a> - no prerequisites needed. Start with the free model with no auth, or connect provider auth from the UI when you want more models.
 
 **Or run from source** for development:
 
@@ -84,7 +84,7 @@ The setup flow auto-detects installed runtimes on your machine. A common first s
 | -------- | ----------------------------------------------- |
 | Claude   | Claude Code users and existing Anthropic access |
 | Codex    | Codex-native workflows and OpenAI access        |
-| OpenCode | Multi-model teams and many provider backends    |
+| OpenCode | Free model with no auth, multi-model teams, and many provider backends |
 
 ::: info
 Gemini is available as a supported provider path. See [Providers and runtimes](/reference/providers-runtimes) for auth options and current provider status.
@@ -92,7 +92,7 @@ Gemini is available as a supported provider path. See [Providers and runtimes](/
 
 See [Runtime setup](/guide/runtime-setup) for detailed configuration per provider.
 
-To verify the selected runtime outside the app, check the binary and test auth:
+To verify a paid or account-backed runtime outside the app, check the binary and test auth:
 
 ```bash
 # Check that the runtime is installed and on PATH
@@ -101,7 +101,7 @@ command -v codex && codex --version
 command -v opencode && opencode --version
 ```
 
-If the command fails, fix the runtime installation or `PATH` first. Team prompts cannot work around a missing binary or missing provider auth.
+If the command fails, fix the runtime installation or `PATH` first. Team prompts cannot work around a missing binary or missing provider auth for models that require it.
 
 ::: tip
 If the binary is found but the app reports "not logged in", the environment may differ between your terminal and the app. See the [auth diagnostic log](/guide/troubleshooting#auth-diagnostic-log) to compare them.
@@ -162,7 +162,7 @@ Before approving the first task, check three things:
 | Symptom | Likely cause | Check |
 | --- | --- | --- |
 | App does not detect a runtime | Binary not on `PATH`, or app and terminal see different environments | Run `command -v <runtime>` in a terminal, then use the same terminal env to launch the app |
-| Team launch hangs | Missing provider auth, wrong model string, or runtime binary not found | See [Troubleshooting](/guide/troubleshooting#team-does-not-launch) |
+| Team launch hangs | Missing provider auth for a paid/account model, wrong model string, or runtime binary not found | See [Troubleshooting](/guide/troubleshooting#team-does-not-launch) |
 | OpenCode lane stuck on `registered` | Lane evidence not committed yet, or model string mismatch | Inspect `~/.claude/teams/<team>/.opencode-runtime/lanes/` |
 | Agent replies missing | Runtime delivery retry, parsing, or task attribution issue | Open task logs and check the delivery ledger |
 | Provider returns 429s | Rate limit reached | Wait for reset or switch model/provider |
diff --git a/landing/product-docs/guide/runtime-setup.md b/landing/product-docs/guide/runtime-setup.md
index 29b3e658..a7446e28 100644
--- a/landing/product-docs/guide/runtime-setup.md
+++ b/landing/product-docs/guide/runtime-setup.md
@@ -12,6 +12,7 @@ Agent Teams is a coordination layer. The actual model work runs through supporte
 | --- | --- |
 | Already use Claude Code or have Anthropic access | **Claude** - familiar auth, minimal setup |
 | Use Codex or OpenAI-based workflows | **Codex** - native integration |
+| Want to try Agent Teams without signup or API keys | **OpenCode** - use the included free model with no auth |
 | Want multi-model routing or broad provider coverage | **OpenCode** - most flexible, one config for many backends |
 | Are not sure which runtime fits | **OpenCode** - covers the most provider options and lets you switch later |
 
@@ -23,7 +24,7 @@ Start with one runtime and one teammate. Confirm one launch works before expandi
 Before launching a team, make sure:
 
 - The runtime binary is installed and on your `PATH`.
-- Your provider account has active access to the model you intend to use.
+- Your provider account has active access to the model you intend to use, unless you start with the included free OpenCode model with no auth.
 - The project path exists and is readable.
 - The app and your terminal use the same home/config environment when you test auth manually.
 
@@ -55,10 +56,10 @@ Gemini is available as a supported provider path with Google ADC (`gcloud auth`)
 
 ## 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.
+Agent Teams has no paid tier of its own. You can start with the included free OpenCode model with no auth - no registration, API keys, or credit card. For additional models, bring the provider access you already have: subscriptions, local runtime auth, or API keys depending on the path you choose.
 
 - **Claude** and **Codex** paths rely on their respective CLI auth tools.
-- **OpenCode** needs provider-specific API keys in a config file (e.g., `openrouter`, `openai`, `anthropic`).
+- **OpenCode** can run the included free model with no auth first. Other OpenCode models may need provider-specific API keys in a config file (e.g., `openrouter`, `openai`, `anthropic`).
 
 ## Auth configuration
 
@@ -96,7 +97,7 @@ Codex-native launches use Codex account state and model catalog data when availa
 
 ### OpenCode
 
-Create or edit `~/.opencode/config.json` (or the equivalent path on your platform) with the provider key you want:
+To use the included free model with no auth, select it in the app and launch without provider signup. To use other OpenCode backends, create or edit `~/.opencode/config.json` (or the equivalent path on your platform) with the provider key you want:
 
 ```json
 {
diff --git a/landing/product-docs/reference/providers-runtimes.md b/landing/product-docs/reference/providers-runtimes.md
index b0d26ece..95282626 100644
--- a/landing/product-docs/reference/providers-runtimes.md
+++ b/landing/product-docs/reference/providers-runtimes.md
@@ -88,7 +88,7 @@ Recommended patterns:
 
 ## Provider costs
 
-Agent Teams is free and open source. Provider usage is governed by the runtime/provider you select: subscription limits, API keys, account auth, rate limits, and provider policies all remain external to the app.
+Agent Teams is free and open source. You can start with the included free model with no auth - no registration, API keys, or credit card. Paid or account-backed provider usage is governed by the runtime/provider you select: subscription limits, API keys, account auth, rate limits, and provider policies all remain external to the app.
 
 ## Capability checks
 
diff --git a/landing/product-docs/ru/guide/installation.md b/landing/product-docs/ru/guide/installation.md
index 1285824f..60eec9b5 100644
--- a/landing/product-docs/ru/guide/installation.md
+++ b/landing/product-docs/ru/guide/installation.md
@@ -23,16 +23,16 @@ Agent Teams распространяется как desktop-приложение
 
 ## Требования
 
-Пакетная сборка рассчитана на zero-setup onboarding. Приложение само помогает с runtime detection и provider authentication — ручная настройка CLI не нужна.
+Пакетная сборка рассчитана на zero-setup onboarding. Можно начать с бесплатной модели без авторизации - без регистрации, API-ключей и карты. Если нужны дополнительные модели, приложение само помогает с runtime detection и provider authentication.
 
-Для работы агентных рантаймов нужен доступ хотя бы к одному провайдеру:
+Для платных или account-backed моделей подключите хотя бы один провайдер:
 
 | Провайдер          | Способ доступа                                             |
 | ------------------ | ---------------------------------------------------------- |
 | Claude (Anthropic) | Claude Code CLI login или API key                          |
 | Codex (OpenAI)     | Codex CLI login или API key                                |
 | Gemini (Google)    | Google ADC, Gemini CLI или API key                         |
-| OpenCode           | API key для поддерживаемого бэкенда (например, OpenRouter) |
+| OpenCode           | Встроенная бесплатная модель без авторизации или API key для поддерживаемого бэкенда (например, OpenRouter) |
 
 ::: info
 Gemini — поддерживаемый провайдер. Варианты auth смотрите в разделе [Провайдеры и рантаймы](/ru/reference/providers-runtimes).
diff --git a/landing/product-docs/ru/guide/quickstart.md b/landing/product-docs/ru/guide/quickstart.md
index a879f0cc..60d5f9ea 100644
--- a/landing/product-docs/ru/guide/quickstart.md
+++ b/landing/product-docs/ru/guide/quickstart.md
@@ -14,7 +14,7 @@ lang: ru-RU
 
 - **macOS, Windows или Linux** машина
 - **Git-репозиторий** в качестве проекта (рекомендуется для diff review и worktree isolation)
-- Доступ хотя бы к одному провайдеру: Anthropic (Claude), OpenAI (Codex), OpenRouter (OpenCode) или Google (Gemini)
+- Бесплатная модель без авторизации для первого запуска или доступ к провайдеру, если нужны дополнительные модели: Anthropic (Claude), OpenAI (Codex), OpenRouter (OpenCode) или Google (Gemini)
 - Node.js 20+ и pnpm 10+ при запуске из исходников
 
 Подробности и ссылки для скачивания — в разделе [Установка](/ru/guide/installation).
@@ -24,7 +24,7 @@ lang: ru-RU
 Скачайте последний релиз под вашу платформу на <a href="/ru/download/" target="_self">странице загрузок</a> или в [GitHub releases](https://github.com/777genius/agent-teams-ai/releases).
 
 ::: tip
-Приложение бесплатное и с открытым кодом. Выбранный runtime может требовать доступ к провайдеру — подробности в разделе [Установка](/ru/guide/installation).
+Приложение бесплатное и с открытым кодом. Можно начать с бесплатной модели без авторизации - без регистрации; дополнительные runtime/provider paths могут требовать доступ к провайдеру. Подробности в разделе [Установка](/ru/guide/installation).
 :::
 
 ::: info
@@ -55,7 +55,7 @@ git status --short
 | -------- | ------------------------------------------------------------------- |
 | Claude   | Если вы уже используете Claude Code или у вас есть Anthropic access |
 | Codex    | Для Codex-native workflows и OpenAI access                          |
-| OpenCode | Для multi-model команд и большого числа provider backends           |
+| OpenCode | Бесплатная модель без авторизации, multi-model команды и много provider backends |
 
 ::: info
 Gemini — поддерживаемый провайдер. Варианты auth смотрите в разделе [Провайдеры и рантаймы](/ru/reference/providers-runtimes).
@@ -63,7 +63,7 @@ Gemini — поддерживаемый провайдер. Варианты aut
 
 Подробная настройка каждого провайдера — в разделе [Настройка рантайма](/ru/guide/runtime-setup).
 
-Чтобы проверить выбранный runtime вне приложения, запустите соответствующую команду версии:
+Чтобы проверить платный или account-backed runtime вне приложения, запустите соответствующую команду версии:
 
 ```bash
 claude --version
@@ -71,7 +71,7 @@ codex --version
 opencode --version
 ```
 
-Если команда падает в терминале, сначала исправьте runtime installation или `PATH`. Team prompts не смогут компенсировать отсутствующий binary или provider auth.
+Если команда падает в терминале, сначала исправьте runtime installation или `PATH`. Team prompts не смогут компенсировать отсутствующий binary или provider auth для моделей, которым он нужен.
 
 Также можно проверить, что бинарник доступен в `PATH`:
 
@@ -134,7 +134,7 @@ Lead создаёт задачи, назначает работу и коорд
 | Симптом | Вероятная причина | Что проверить |
 | --- | --- | --- |
 | Приложение не видит runtime | Бинарник не в `PATH` или разные окружения у приложения и терминала | Запустите `command -v <runtime>` в терминале |
-| Запуск команды зависает | Нет provider auth, неверная модель или runtime не найден | Раздел [Диагностика](/ru/guide/troubleshooting#team-does-not-launch) |
+| Запуск команды зависает | Нет provider auth для платной/account модели, неверная модель или runtime не найден | Раздел [Диагностика](/ru/guide/troubleshooting#team-does-not-launch) |
 | OpenCode lane в статусе `registered` | Lane evidence ещё не зафиксирован или несовпадение модели | Проверьте `~/.claude/teams/<team>/.opencode-runtime/lanes/` |
 | Ответы агента не приходят | Runtime delivery retry, parsing или task attribution | Откройте task logs и проверьте delivery ledger |
 | Провайдер возвращает 429 | Достигнут лимит запросов | Дождитесь сброса или смените модель/провайдера |
diff --git a/landing/product-docs/ru/guide/runtime-setup.md b/landing/product-docs/ru/guide/runtime-setup.md
index 9e9a2491..f0bb362f 100644
--- a/landing/product-docs/ru/guide/runtime-setup.md
+++ b/landing/product-docs/ru/guide/runtime-setup.md
@@ -13,7 +13,7 @@ Agent Teams - координационный слой. Работа моделе
 Перед запуском команды убедитесь, что:
 
 - Runtime binary установлен и находится в `PATH`.
-- Ваш аккаунт провайдера имеет доступ к выбранной модели.
+- Ваш аккаунт провайдера имеет доступ к выбранной модели, если вы не начинаете со встроенной OpenCode-модели без авторизации.
 - Путь к проекту существует и доступен для чтения.
 - Приложение и терминал используют одинаковое home/config окружение, когда вы вручную проверяете auth.
 
@@ -45,10 +45,10 @@ Gemini — поддерживаемый провайдер с Google ADC (`gclou
 
 ## Доступ к провайдеру
 
-У Agent Teams нет своего платного тарифа. Вы используете доступ к провайдеру, который у вас уже есть: подписка, локальная авторизация рантайма или API-ключи в зависимости от выбранного пути.
+У Agent Teams нет своего платного тарифа. Можно начать со встроенной OpenCode-модели без авторизации - без регистрации, API-ключей и карты. Для дополнительных моделей используйте доступ к провайдеру, который у вас уже есть: подписка, локальная авторизация рантайма или API-ключи в зависимости от выбранного пути.
 
 - Для **Claude** и **Codex** используется auth соответствующего CLI.
-- Для **OpenCode** требуются provider-specific API keys в файле конфигурации (например, `openrouter`, `openai`, `anthropic`).
+- **OpenCode** может сначала работать через встроенную бесплатную модель без авторизации. Другие OpenCode-модели могут требовать provider-specific API keys в файле конфигурации (например, `openrouter`, `openai`, `anthropic`).
 
 ## Настройка авторизации
 
@@ -86,7 +86,7 @@ Codex-native launches используют Codex account state и model catalog
 
 ### OpenCode
 
-Создайте или отредактируйте `~/.opencode/config.json` (или эквивалентный путь на вашей платформе):
+Для встроенной бесплатной модели без авторизации достаточно выбрать её в приложении и запустить без регистрации у провайдера. Для других OpenCode backend создайте или отредактируйте `~/.opencode/config.json` (или эквивалентный путь на вашей платформе):
 
 ```json
 {
diff --git a/landing/product-docs/ru/reference/providers-runtimes.md b/landing/product-docs/ru/reference/providers-runtimes.md
index 14e13f06..30559bb7 100644
--- a/landing/product-docs/ru/reference/providers-runtimes.md
+++ b/landing/product-docs/ru/reference/providers-runtimes.md
@@ -89,7 +89,7 @@ Contributor-facing границы и canonical implementation guidance смот
 
 ## Стоимость providers
 
-Agent Teams бесплатен и open source. Provider usage зависит от выбранного runtime/provider: subscription limits, API keys, account auth, rate limits и provider policies остаются внешними для приложения.
+Agent Teams бесплатен и open source. Можно начать со встроенной бесплатной модели без авторизации - без регистрации, API-ключей и карты. Платный или account-backed provider usage зависит от выбранного runtime/provider: subscription limits, API keys, account auth, rate limits и provider policies остаются внешними для приложения.
 
 ## Capability checks
 
diff --git a/package.json b/package.json
index dbc5330d..b0d73263 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,8 @@
     "typecheck": "tsc --noEmit",
     "typecheck:workspace": "pnpm typecheck && pnpm --filter agent-teams-mcp typecheck && pnpm --filter agent-teams-mcp typecheck:test",
     "lint": "eslint src/ --cache --cache-location .eslintcache --cache-strategy content",
+    "lint:fast": "eslint --config eslint.fast.config.js --cache --cache-location .eslintcache-fast --cache-strategy content src/",
+    "lint:fast:files": "eslint --config eslint.fast.config.js --cache --cache-location .eslintcache-fast --cache-strategy content",
     "lint:mcp": "pnpm --filter agent-teams-mcp lint",
     "lint:fix": "eslint src/ --fix --cache --cache-location .eslintcache --cache-strategy content",
     "format": "prettier --write \"src/**/*.{ts,tsx,js,jsx,json,css}\"",
@@ -244,7 +246,7 @@
   },
   "build": {
     "appId": "com.agent-teams.app",
-    "productName": "Agent Teams UI",
+    "productName": "Agent Teams AI",
     "directories": {
       "output": "release"
     },
diff --git a/packages/agent-graph/src/canvas/draw-tasks.ts b/packages/agent-graph/src/canvas/draw-tasks.ts
index edb0cb41..c86b1ddd 100644
--- a/packages/agent-graph/src/canvas/draw-tasks.ts
+++ b/packages/agent-graph/src/canvas/draw-tasks.ts
@@ -3,13 +3,15 @@
  * NEW — not from agent-flow. Custom renderer for our task nodes.
  */
 
-import type { GraphNode } from '../ports/types';
-import { COLORS, getTaskStatusColor, getReviewStateColor } from '../constants/colors';
-import { TASK_PILL, MIN_VISIBLE_OPACITY, ANIM } from '../constants/canvas-constants';
-import { truncateText, wrapTextLines } from './draw-misc';
-import { drawPillShell, drawPillStackLayer } from './draw-pill-shell';
+import { ANIM, KANBAN_ZONE, MIN_VISIBLE_OPACITY, TASK_PILL } from '../constants/canvas-constants';
+import { COLORS, getReviewStateColor, getTaskStatusColor } from '../constants/colors';
+
+import { wrapTextLines } from './draw-misc';
+import { drawPillShell } from './draw-pill-shell';
 import { hexWithAlpha } from './render-cache';
+
 import type { KanbanZoneInfo } from '../layout/kanbanLayout';
+import type { GraphNode } from '../ports/types';
 
 const KANBAN_HEADER_FONT = '600 10px monospace';
 const KANBAN_HEADER_ALPHA = 0.92;
@@ -82,7 +84,7 @@ function drawTaskPill(
   ctx.translate(x, y);
 
   if (node.isOverflowStack) {
-    drawOverflowStack(ctx, halfW, halfH, r, node, isSelected, isHovered);
+    drawOverflowStack(ctx, halfW, r, node, time, isSelected, isHovered);
     ctx.restore();
     return;
   }
@@ -200,8 +202,8 @@ function drawTaskPill(
 
   // Comment count badge — on the bottom-right border edge, 1.5x bigger
   if (node.totalCommentCount && node.totalCommentCount > 0) {
-    const badgeX = halfW - 6;
-    const badgeY = halfH;
+    const badgeX = halfW - 36;
+    const badgeY = halfH - 30;
 
     // Speech bubble background
     const bw = 20;
@@ -265,7 +267,7 @@ function drawTaskPillLod(
   ctx.translate(x, y);
 
   if (node.isOverflowStack) {
-    drawOverflowStack(ctx, halfW, halfH, r, node, isSelected, isHovered);
+    drawOverflowStack(ctx, halfW, r, node, time, isSelected, isHovered);
     ctx.restore();
     return;
   }
@@ -336,52 +338,41 @@ function drawLiveTaskLogIndicator(
 function drawOverflowStack(
   ctx: CanvasRenderingContext2D,
   halfW: number,
-  halfH: number,
   r: number,
   node: GraphNode,
+  time: number,
   isSelected: boolean,
   isHovered: boolean
 ): void {
-  for (const [offset, alpha] of [
-    [6, 0.18],
-    [3, 0.28],
-  ] as const) {
-    drawPillStackLayer(ctx, {
-      width: TASK_PILL.width,
-      height: TASK_PILL.height,
-      radius: r,
-      offsetX: offset,
-      offsetY: -offset,
-      fillColor: '#334155',
-      fillAlpha: alpha,
-    });
-  }
+  const footerHeight = KANBAN_ZONE.overflowHeight;
 
   drawPillShell(ctx, {
     width: TASK_PILL.width,
-    height: TASK_PILL.height,
-    radius: r,
+    height: footerHeight,
+    radius: Math.min(r, footerHeight / 2),
     fillStyle: isSelected
       ? COLORS.cardBgSelected
       : isHovered
-        ? 'rgba(15, 20, 40, 0.78)'
-        : COLORS.cardBg,
+        ? 'rgba(12, 20, 40, 0.78)'
+        : 'rgba(8, 14, 28, 0.64)',
     borderColor: node.isBlocked
       ? hexWithAlpha(COLORS.edgeBlocking, isSelected ? 0.85 : 0.65)
-      : hexWithAlpha(COLORS.taskPending, isSelected ? 0.85 : 0.55),
-    borderWidth: node.isBlocked ? (isSelected ? 2.4 : 1.5) : isSelected ? 2 : 1,
+      : isSelected
+        ? hexWithAlpha(COLORS.holoBright, 0.45)
+        : 'rgba(255, 255, 255, 0.10)',
+    borderWidth: node.isBlocked ? (isSelected ? 2.4 : 1.5) : isSelected ? 1.5 : 1,
     accentColor: node.isBlocked ? hexWithAlpha(COLORS.edgeBlocking, 0.6) : undefined,
   });
 
-  ctx.font = 'bold 12px sans-serif';
-  ctx.textAlign = 'left';
+  ctx.font = '600 11px sans-serif';
+  ctx.textAlign = 'center';
   ctx.textBaseline = 'middle';
-  ctx.fillStyle = COLORS.textPrimary;
-  ctx.fillText(node.label, -halfW + 14, -8);
+  ctx.fillStyle = '#cbd5e1';
+  ctx.fillText(node.label, 0, 0.5);
 
-  ctx.font = '10px monospace';
-  ctx.fillStyle = COLORS.textDim;
-  ctx.fillText('more tasks', -halfW + 14, 12);
+  if (node.hasLiveTaskLogs) {
+    drawLiveTaskLogIndicator(ctx, -halfW + 16, 0, time, true);
+  }
 }
 
 function drawReviewChip(
@@ -451,6 +442,24 @@ function drawCenteredSpacedText(
   ctx.textAlign = previousAlign;
 }
 
+function drawLeftSpacedText(
+  ctx: CanvasRenderingContext2D,
+  text: string,
+  x: number,
+  y: number,
+  letterSpacing: number
+): void {
+  const chars = Array.from(text);
+  const previousAlign = ctx.textAlign;
+  ctx.textAlign = 'left';
+  let cursorX = x;
+  for (const char of chars) {
+    ctx.fillText(char, cursorX, y);
+    cursorX += ctx.measureText(char).width + letterSpacing;
+  }
+  ctx.textAlign = previousAlign;
+}
+
 /**
  * Draw kanban column headers above task columns.
  */
@@ -470,41 +479,21 @@ export function drawColumnHeaders(
       const labelY = (zone.headers[0]?.y ?? zone.ownerY + 60) + 10;
       drawCenteredSpacedText(ctx, 'Unassigned', zone.ownerX, labelY, KANBAN_HEADER_LETTER_SPACING);
 
-      // Overflow badge
-      for (const header of zone.headers) {
-        if (header.overflowCount > 0) {
-          ctx.font = '7px monospace';
-          ctx.textAlign = 'center';
-          ctx.textBaseline = 'top';
-          ctx.fillStyle = hexWithAlpha(header.color, 0.45);
-          ctx.fillText(`+${header.overflowCount} more`, header.x, header.overflowY + 4);
-        }
-      }
       continue;
     }
 
     for (const header of zone.headers) {
       ctx.font = KANBAN_HEADER_FONT;
-      ctx.textAlign = 'center';
-      ctx.textBaseline = 'middle';
+      ctx.textAlign = 'left';
+      ctx.textBaseline = 'top';
       ctx.fillStyle = hexWithAlpha(header.color, KANBAN_HEADER_ALPHA);
-      drawCenteredSpacedText(
+      drawLeftSpacedText(
         ctx,
         header.label,
-        header.x,
+        header.x - TASK_PILL.width / 2 + 4,
         header.y + 10,
         KANBAN_HEADER_LETTER_SPACING
       );
-
-      // Overflow badge: "+N more"
-      if (header.overflowCount > 0) {
-        const badgeText = `+${header.overflowCount} more`;
-        ctx.font = '10px monospace';
-        ctx.textAlign = 'center';
-        ctx.textBaseline = 'top';
-        ctx.fillStyle = hexWithAlpha(header.color, 0.45);
-        ctx.fillText(badgeText, header.x, header.overflowY + 4);
-      }
     }
   }
 }
diff --git a/packages/agent-graph/src/canvas/hit-detection.ts b/packages/agent-graph/src/canvas/hit-detection.ts
index 3d3577c3..470fb5bf 100644
--- a/packages/agent-graph/src/canvas/hit-detection.ts
+++ b/packages/agent-graph/src/canvas/hit-detection.ts
@@ -3,10 +3,12 @@
  * Adapted from agent-flow's hit-detection.ts (Apache 2.0).
  */
 
-import type { GraphEdge, GraphNode } from '../ports/types';
-import { BEAM, NODE, TASK_PILL, HIT_DETECTION } from '../constants/canvas-constants';
+import { BEAM, HIT_DETECTION, KANBAN_ZONE, NODE, TASK_PILL } from '../constants/canvas-constants';
+
 import { bezierPoint, computeControlPoints } from './draw-edges';
 
+import type { GraphEdge, GraphNode } from '../ports/types';
+
 /**
  * Find the node at the given world-space coordinates.
  * Returns node ID or null.
@@ -39,7 +41,8 @@ export function findNodeAt(
       }
       case 'task': {
         const halfW = TASK_PILL.width / 2 + HIT_DETECTION.taskPadding;
-        const halfH = TASK_PILL.height / 2 + HIT_DETECTION.taskPadding;
+        const taskHeight = node.isOverflowStack ? KANBAN_ZONE.overflowHeight : TASK_PILL.height;
+        const halfH = taskHeight / 2 + HIT_DETECTION.taskPadding;
         if (
           worldX >= x - halfW &&
           worldX <= x + halfW &&
diff --git a/packages/agent-graph/src/constants/canvas-constants.ts b/packages/agent-graph/src/constants/canvas-constants.ts
index 23c027eb..7e961cf1 100644
--- a/packages/agent-graph/src/constants/canvas-constants.ts
+++ b/packages/agent-graph/src/constants/canvas-constants.ts
@@ -258,17 +258,22 @@ export const BACKGROUND = {
 
 // ─── Kanban zone layout ─────────────────────────────────────────────────────
 
+/** Max visible task rows per column. Includes the overflow stack row when present. */
+export const TASK_COLUMN_MAX_VISIBLE_ROWS = STABLE_SLOT_GEOMETRY.taskMaxVisibleRows;
+
 export const KANBAN_ZONE = {
   /** Column width: task card (260) + gap (20) */
   columnWidth: 280,
   /** Row height: task card (72) + gap (8) */
   rowHeight: 80,
+  /** Compact overflow footer height, matching activity/log more buttons */
+  overflowHeight: 32,
   /** Task center offset from band top: header (20) + gap (4) + half card */
   headerHeight: 60,
   /** Zone starts this far below member node center */
   offsetY: 70,
   /** Column sequence: pending → wip → done → review → approved */
   columns: ['todo', 'wip', 'done', 'review', 'approved'] as const,
-  /** Max tasks shown per column (overflow hidden) */
-  maxVisibleRows: STABLE_SLOT_GEOMETRY.taskMaxVisibleRows,
+  /** Max task rows shown per column. Includes the overflow stack row when present. */
+  maxVisibleRows: TASK_COLUMN_MAX_VISIBLE_ROWS,
 } as const;
diff --git a/packages/agent-graph/src/index.ts b/packages/agent-graph/src/index.ts
index 4a675f71..2b8d5078 100644
--- a/packages/agent-graph/src/index.ts
+++ b/packages/agent-graph/src/index.ts
@@ -7,31 +7,32 @@
  */
 
 // ─── Components ──────────────────────────────────────────────────────────────
-export { GraphView } from './ui/GraphView';
-export type { GraphViewProps } from './ui/GraphView';
+export { TASK_COLUMN_MAX_VISIBLE_ROWS } from './constants/canvas-constants';
 export { ACTIVITY_ANCHOR_LAYOUT, ACTIVITY_LANE } from './layout/activityLane';
-export { getTransientHandoffCardAlpha } from './ui/transientHandoffs';
-export type { TransientHandoffCard } from './ui/transientHandoffs';
 
 // ─── Port Interfaces (for adapters in host project) ─────────────────────────
+export type { GraphConfigPort } from './ports/GraphConfigPort';
 export type { GraphDataPort } from './ports/GraphDataPort';
 export type { GraphEventPort } from './ports/GraphEventPort';
-export type { GraphConfigPort } from './ports/GraphConfigPort';
 
 // ─── Port Types ──────────────────────────────────────────────────────────────
 export type {
-  GraphNode,
-  GraphEdge,
-  GraphParticle,
   GraphActivityItem,
-  GraphOwnerSlotAssignment,
-  GraphLayoutPort,
+  GraphDomainRef,
+  GraphEdge,
+  GraphEdgeType,
+  GraphLaunchVisualState,
   GraphLayoutMode,
+  GraphLayoutPort,
   GraphLayoutVersion,
+  GraphNode,
   GraphNodeKind,
   GraphNodeState,
-  GraphLaunchVisualState,
-  GraphEdgeType,
+  GraphOwnerSlotAssignment,
+  GraphParticle,
   GraphParticleKind,
-  GraphDomainRef,
 } from './ports/types';
+export type { GraphViewProps } from './ui/GraphView';
+export { GraphView } from './ui/GraphView';
+export type { TransientHandoffCard } from './ui/transientHandoffs';
+export { getTransientHandoffCardAlpha } from './ui/transientHandoffs';
diff --git a/packages/agent-graph/src/layout/kanbanLayout.ts b/packages/agent-graph/src/layout/kanbanLayout.ts
index fe4b7911..72322280 100644
--- a/packages/agent-graph/src/layout/kanbanLayout.ts
+++ b/packages/agent-graph/src/layout/kanbanLayout.ts
@@ -7,9 +7,10 @@
  * Class with ES #private methods, single source of truth from KANBAN_ZONE constants.
  */
 
-import type { GraphNode } from '../ports/types';
 import { KANBAN_ZONE, TASK_PILL } from '../constants/canvas-constants';
 import { COLORS } from '../constants/colors';
+
+import type { GraphNode } from '../ports/types';
 import type { SlotFrame, StableRect } from './stableSlots';
 
 /** Column header info for rendering */
@@ -18,10 +19,6 @@ export interface KanbanColumnHeader {
   x: number;
   y: number;
   color: string;
-  /** Number of hidden overflow tasks in this column */
-  overflowCount: number;
-  /** Y position for the overflow badge */
-  overflowY: number;
 }
 
 /** Zone info per owner for rendering headers */
@@ -41,6 +38,18 @@ const COLUMN_LABELS: Record<string, { label: string; color: string }> = {
   approved: { label: 'Approved', color: COLORS.reviewApproved },
 };
 
+function getOverflowFooterCenterY(baseY: number): number {
+  const overflowGap = KANBAN_ZONE.rowHeight - TASK_PILL.height;
+  return (
+    baseY +
+    KANBAN_ZONE.headerHeight +
+    (KANBAN_ZONE.maxVisibleRows - 1) * KANBAN_ZONE.rowHeight +
+    TASK_PILL.height / 2 +
+    overflowGap +
+    KANBAN_ZONE.overflowHeight / 2
+  );
+}
+
 export function getOwnerKanbanBaseX(args: {
   ownerX: number;
   ownerKind: GraphNode['kind'];
@@ -200,8 +209,6 @@ export class KanbanLayoutEngine {
     for (const [colIdx, col] of activeColumns.entries()) {
       const colX = baseX + colIdx * columnWidth;
       const config = COLUMN_LABELS[col.name] ?? { label: col.name, color: '#888' };
-      const overflow = col.tasks.find((task) => task.isOverflowStack)?.overflowCount ?? 0;
-      const visibleCount = col.tasks.length;
 
       // Column header — centered over pill area (pill center = colX since drawTaskPill translates to x,y)
       headers.push({
@@ -209,14 +216,15 @@ export class KanbanLayoutEngine {
         x: colX, // pill center = task.x = colX
         y: baseY,
         color: config.color,
-        overflowCount: overflow,
-        overflowY: baseY + headerHeight + visibleCount * rowHeight,
       });
 
-      // Position tasks below header
+      // Position tasks below header. Overflow stacks render as a compact footer after
+      // the full visible task budget instead of consuming a task-card row.
       for (const [rowIdx, task] of col.tasks.entries()) {
         const targetX = colX;
-        const targetY = baseY + headerHeight + rowIdx * rowHeight;
+        const targetY = task.isOverflowStack
+          ? getOverflowFooterCenterY(baseY)
+          : baseY + headerHeight + rowIdx * rowHeight;
         task.x = slotFrame
           ? targetX
           : task.x != null
@@ -264,7 +272,6 @@ export class KanbanLayoutEngine {
       const baseX = unassignedTaskRect.left + TASK_PILL.width / 2;
       const headerY = unassignedTaskRect.top;
       const baseY = headerY + KANBAN_ZONE.headerHeight;
-      const overflowCount = tasks.reduce((sum, task) => sum + (task.overflowCount ?? 0), 0);
 
       this.zones.push({
         ownerId: '__unassigned__',
@@ -276,8 +283,6 @@ export class KanbanLayoutEngine {
             x: 0,
             y: headerY,
             color: COLORS.taskPending,
-            overflowCount,
-            overflowY: baseY + KANBAN_ZONE.maxVisibleRows * rowHeight,
           },
         ],
       });
@@ -286,7 +291,7 @@ export class KanbanLayoutEngine {
         const col = idx % cols;
         const row = Math.floor(idx / cols);
         const targetX = baseX + col * columnWidth;
-        const targetY = baseY + row * rowHeight;
+        const targetY = task.isOverflowStack ? getOverflowFooterCenterY(headerY) : baseY + row * rowHeight;
         task.x = targetX;
         task.y = targetY;
         task.fx = targetX;
@@ -322,7 +327,6 @@ export class KanbanLayoutEngine {
 
     // Add zone header for unassigned section
     if (tasks.length > 0) {
-      const overflowCount = tasks.reduce((sum, task) => sum + (task.overflowCount ?? 0), 0);
       this.zones.push({
         ownerId: '__unassigned__',
         ownerX: centerX,
@@ -333,8 +337,6 @@ export class KanbanLayoutEngine {
             x: centerX,
             y: headerY,
             color: COLORS.taskPending,
-            overflowCount,
-            overflowY: baseY + KANBAN_ZONE.maxVisibleRows * rowHeight,
           },
         ],
       });
@@ -344,7 +346,7 @@ export class KanbanLayoutEngine {
       const col = idx % cols;
       const row = Math.floor(idx / cols);
       const targetX = baseX + col * columnWidth;
-      const targetY = baseY + row * rowHeight;
+      const targetY = task.isOverflowStack ? getOverflowFooterCenterY(headerY) : baseY + row * rowHeight;
       task.x = task.x != null ? task.x + (targetX - task.x) * 0.15 : targetX;
       task.y = task.y != null ? task.y + (targetY - task.y) * 0.15 : targetY;
       task.fx = task.x;
diff --git a/packages/agent-graph/src/layout/stableSlots.ts b/packages/agent-graph/src/layout/stableSlots.ts
index dfddc4ce..cd96e380 100644
--- a/packages/agent-graph/src/layout/stableSlots.ts
+++ b/packages/agent-graph/src/layout/stableSlots.ts
@@ -1,9 +1,11 @@
 import { KANBAN_ZONE, TASK_PILL } from '../constants/canvas-constants';
-import type { GraphLayoutPort, GraphNode, GraphOwnerSlotAssignment } from '../ports/types';
+
 import { ACTIVITY_LANE } from './activityLane';
-import type { WorldBounds } from './launchAnchor';
 import { STABLE_SLOT_GEOMETRY, STABLE_SLOT_SECTOR_VECTORS } from './stableSlotGeometry';
 
+import type { GraphLayoutPort, GraphNode, GraphOwnerSlotAssignment } from '../ports/types';
+import type { WorldBounds } from './launchAnchor';
+
 export type StableSlotWidthBucket = 'S' | 'M' | 'L';
 
 export interface StableRect {
@@ -138,7 +140,11 @@ const SLOT_GEOMETRY = {
   boardColumnGap: 24,
   processRailMinWidth: STABLE_SLOT_GEOMETRY.processRailWidth,
   kanbanBandHeight:
-    KANBAN_ZONE.headerHeight + STABLE_SLOT_GEOMETRY.taskMaxVisibleRows * KANBAN_ZONE.rowHeight,
+    KANBAN_ZONE.headerHeight +
+    (STABLE_SLOT_GEOMETRY.taskMaxVisibleRows - 1) * KANBAN_ZONE.rowHeight +
+    TASK_PILL.height / 2 +
+    (KANBAN_ZONE.rowHeight - TASK_PILL.height) +
+    KANBAN_ZONE.overflowHeight,
   centralPadding: STABLE_SLOT_GEOMETRY.centralSafetyPadding,
 } as const;
 
@@ -1455,7 +1461,7 @@ function buildRowOrbitSlotFrames(
     const rowTop = rowTopByIndex.get(row[0]!.rowIndex) ?? 0;
     const columnCount = rowCounts[row[0]!.rowIndex] ?? row.length;
     const columnWidths = resolveRowOrbitColumnWidths(row, columnCount, fallbackColumnWidth);
-    let nextLeft = -getRowOrbitRowWidth(columnWidths) / 2;
+    const nextLeft = -getRowOrbitRowWidth(columnWidths) / 2;
     for (const config of row) {
       const ownerX =
         nextLeft +
diff --git a/packages/agent-graph/src/strategies/taskStrategy.ts b/packages/agent-graph/src/strategies/taskStrategy.ts
index 96a9a92b..e231eedf 100644
--- a/packages/agent-graph/src/strategies/taskStrategy.ts
+++ b/packages/agent-graph/src/strategies/taskStrategy.ts
@@ -2,10 +2,11 @@
  * Render strategy for task pill nodes.
  */
 
-import type { GraphNode } from '../ports/types';
-import type { NodeRenderStrategy, NodeRenderState } from './types';
 import { drawTasks } from '../canvas/draw-tasks';
-import { TASK_PILL, HIT_DETECTION } from '../constants/canvas-constants';
+import { HIT_DETECTION, KANBAN_ZONE, TASK_PILL } from '../constants/canvas-constants';
+
+import type { GraphNode } from '../ports/types';
+import type { NodeRenderState, NodeRenderStrategy } from './types';
 
 export class TaskStrategy implements NodeRenderStrategy {
   readonly kind = 'task' as const;
@@ -24,7 +25,8 @@ export class TaskStrategy implements NodeRenderStrategy {
     const x = node.x ?? 0;
     const y = node.y ?? 0;
     const halfW = TASK_PILL.width / 2 + HIT_DETECTION.taskPadding;
-    const halfH = TASK_PILL.height / 2 + HIT_DETECTION.taskPadding;
+    const taskHeight = node.isOverflowStack ? KANBAN_ZONE.overflowHeight : TASK_PILL.height;
+    const halfH = taskHeight / 2 + HIT_DETECTION.taskPadding;
     return wx >= x - halfW && wx <= x + halfW && wy >= y - halfH && wy <= y + halfH;
   }
 
diff --git a/runtime.lock.json b/runtime.lock.json
index 492a0d16..55271663 100644
--- a/runtime.lock.json
+++ b/runtime.lock.json
@@ -1,27 +1,27 @@
 {
-  "version": "0.0.39",
-  "sourceRef": "v0.0.39",
+  "version": "0.0.44",
+  "sourceRef": "v0.0.44",
   "sourceRepository": "777genius/agent_teams_orchestrator",
   "releaseRepository": "777genius/agent-teams-ai",
   "releaseTag": "v2.0.0",
   "assets": {
     "darwin-arm64": {
-      "file": "agent-teams-runtime-darwin-arm64-v0.0.39.tar.gz",
+      "file": "agent-teams-runtime-darwin-arm64-v0.0.44.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "darwin-x64": {
-      "file": "agent-teams-runtime-darwin-x64-v0.0.39.tar.gz",
+      "file": "agent-teams-runtime-darwin-x64-v0.0.44.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "linux-x64": {
-      "file": "agent-teams-runtime-linux-x64-v0.0.39.tar.gz",
+      "file": "agent-teams-runtime-linux-x64-v0.0.44.tar.gz",
       "archiveKind": "tar.gz",
       "binaryName": "claude-multimodel"
     },
     "win32-x64": {
-      "file": "agent-teams-runtime-win32-x64-v0.0.39.zip",
+      "file": "agent-teams-runtime-win32-x64-v0.0.44.zip",
       "archiveKind": "zip",
       "binaryName": "claude-multimodel.exe"
     }
diff --git a/scripts/electron-builder/dist-invocations.cjs b/scripts/electron-builder/dist-invocations.cjs
index a8f7db1c..4ff479ee 100644
--- a/scripts/electron-builder/dist-invocations.cjs
+++ b/scripts/electron-builder/dist-invocations.cjs
@@ -14,8 +14,8 @@ const PLATFORM_ARGS = {
 };
 
 const LINUX_PACKAGE_NAME_OVERRIDES = [
-  '--config.productName=Agent-Teams-UI',
-  '--config.linux.desktop.entry.Name=Agent Teams UI',
+  '--config.productName=Agent-Teams-AI',
+  '--config.linux.desktop.entry.Name=Agent Teams AI',
 ];
 
 function buildElectronBuilderInvocations(argv) {
diff --git a/scripts/electron-builder/smokePackagedApp.cjs b/scripts/electron-builder/smokePackagedApp.cjs
index ec4ed780..c9b9d969 100644
--- a/scripts/electron-builder/smokePackagedApp.cjs
+++ b/scripts/electron-builder/smokePackagedApp.cjs
@@ -115,7 +115,12 @@ function findExecutable(bundlePath, platform) {
     const packageJson = fs.existsSync(packageJsonPath)
       ? JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'))
       : {};
-    const preferredNames = [packageJson.name, 'agent-teams-ai', 'Agent Teams UI'].filter(Boolean);
+    const preferredNames = [
+      packageJson.name,
+      'agent-teams-ai',
+      'Agent Teams AI',
+      'Agent Teams UI',
+    ].filter(Boolean);
     for (const name of preferredNames) {
       const candidate = path.join(bundlePath, name);
       if (fs.existsSync(candidate)) return candidate;
diff --git a/scripts/lib/live-smoke-runtime.mjs b/scripts/lib/live-smoke-runtime.mjs
new file mode 100644
index 00000000..9cf959e6
--- /dev/null
+++ b/scripts/lib/live-smoke-runtime.mjs
@@ -0,0 +1,37 @@
+import path from 'node:path';
+
+export function resolveLiveSmokeOrchestratorCliPath({
+  env = process.env,
+  repoRoot,
+} = {}) {
+  const explicitCliPath = env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim();
+  if (explicitCliPath) {
+    return explicitCliPath;
+  }
+
+  const configuredRuntimeRoot = env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
+  const baseRepoRoot = repoRoot ? path.resolve(repoRoot) : process.cwd();
+  const runtimeRoot = configuredRuntimeRoot
+    ? path.resolve(configuredRuntimeRoot)
+    : path.resolve(baseRepoRoot, '..', 'agent_teams_orchestrator');
+
+  return path.join(runtimeRoot, 'cli-source');
+}
+
+export function resolveReleaseSmokeOrchestratorCliPath({
+  env = process.env,
+  repoRoot,
+} = {}) {
+  const explicitCliPath = env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim();
+  if (explicitCliPath) {
+    return explicitCliPath;
+  }
+
+  const configuredRuntimeRoot = env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
+  const baseRepoRoot = repoRoot ? path.resolve(repoRoot) : process.cwd();
+  const runtimeRoot = configuredRuntimeRoot
+    ? path.resolve(configuredRuntimeRoot)
+    : path.resolve(baseRepoRoot, '..', 'agent_teams_orchestrator');
+
+  return path.join(runtimeRoot, 'cli');
+}
diff --git a/scripts/lib/opencode-live-preflight.mjs b/scripts/lib/opencode-live-preflight.mjs
index 1fc7d734..176720fa 100644
--- a/scripts/lib/opencode-live-preflight.mjs
+++ b/scripts/lib/opencode-live-preflight.mjs
@@ -7,6 +7,7 @@ import path from 'node:path';
 const CHILD_CLOSE_GRACE_MS = 3_000;
 const CHILD_FORCE_CLOSE_GRACE_MS = 1_000;
 const TASKKILL_TIMEOUT_MS = 5_000;
+const OPENCODE_HEALTH_FETCH_TIMEOUT_MS = 1_000;
 
 export async function preflightOpenCodeLiveEnvironment(input) {
   const repoRoot = input.repoRoot;
@@ -125,13 +126,12 @@ async function canStartOpenCodeHost(opencodeBin, cwd, env) {
         return { ok: false, reason: output || `process exited with code ${child.exitCode}` };
       }
       try {
-        const response = await fetch(`http://127.0.0.1:${port}/global/health`);
-        if (response.ok) {
-          const data = await response.json().catch(() => ({}));
-          if (data?.healthy === true) {
-            return { ok: true };
-          }
+        const response = await fetchOpenCodeHealth(port);
+        if (isHealthyOpenCodeHostResponse(response)) {
+          response.body?.cancel().catch(() => undefined);
+          return { ok: true };
         }
+        response.body?.cancel().catch(() => undefined);
       } catch {
         // Host is still starting.
       }
@@ -143,6 +143,22 @@ async function canStartOpenCodeHost(opencodeBin, cwd, env) {
   }
 }
 
+async function fetchOpenCodeHealth(port) {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), OPENCODE_HEALTH_FETCH_TIMEOUT_MS);
+  try {
+    return await fetch(`http://127.0.0.1:${port}/global/health`, {
+      signal: controller.signal,
+    });
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+
+function isHealthyOpenCodeHostResponse(response) {
+  return response.ok;
+}
+
 async function stopChild(child, options = {}) {
   const platform = options.platform ?? process.platform;
   const killProcessTree = options.killProcessTree ?? taskkillProcessTree;
@@ -271,6 +287,7 @@ function compactOutput(value) {
 }
 
 export const __opencodeLivePreflightTestHooks = {
+  isHealthyOpenCodeHostResponse,
   stopChild,
   taskkillProcessTree,
 };
diff --git a/scripts/prove-agent-cli-launch.mjs b/scripts/prove-agent-cli-launch.mjs
index 68d5e7c5..eaf63af5 100644
--- a/scripts/prove-agent-cli-launch.mjs
+++ b/scripts/prove-agent-cli-launch.mjs
@@ -5,18 +5,24 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
+
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
   AGENT_CLI_LAUNCH_LIVE_E2E: '1',
   CLAUDE_TEAM_CLI_FLAVOR: process.env.CLAUDE_TEAM_CLI_FLAVOR || 'agent_teams_orchestrator',
-  CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH:
-    process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH || path.join(siblingOrchestrator, 'cli'),
 };
 
+if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
+}
+
 console.log('Running agent CLI launch live smoke');
 console.log(`Claude runtime: ${env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH}`);
 
diff --git a/scripts/prove-opencode-mixed-recovery.mjs b/scripts/prove-opencode-mixed-recovery.mjs
index 9fa176da..3a896a7f 100644
--- a/scripts/prove-opencode-mixed-recovery.mjs
+++ b/scripts/prove-opencode-mixed-recovery.mjs
@@ -5,6 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import {
   exitForSkippedPreflight,
   preflightOpenCodeLiveEnvironment,
@@ -12,8 +13,6 @@ import {
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
@@ -26,8 +25,10 @@ const env = {
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running OpenCode mixed recovery live smoke');
diff --git a/scripts/prove-opencode-semantic-gauntlet.mjs b/scripts/prove-opencode-semantic-gauntlet.mjs
index abb9cc1a..031b18a1 100644
--- a/scripts/prove-opencode-semantic-gauntlet.mjs
+++ b/scripts/prove-opencode-semantic-gauntlet.mjs
@@ -5,6 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import {
   exitForSkippedPreflight,
   preflightOpenCodeLiveEnvironment,
@@ -12,8 +13,6 @@ import {
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
@@ -33,8 +32,10 @@ const env = {
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running OpenCode semantic gauntlet live smoke');
diff --git a/scripts/prove-opencode-semantic-messaging.mjs b/scripts/prove-opencode-semantic-messaging.mjs
index 19d4e0bd..1eee1cb0 100644
--- a/scripts/prove-opencode-semantic-messaging.mjs
+++ b/scripts/prove-opencode-semantic-messaging.mjs
@@ -5,6 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import {
   exitForSkippedPreflight,
   preflightOpenCodeLiveEnvironment,
@@ -12,8 +13,6 @@ import {
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
@@ -25,8 +24,10 @@ const env = {
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running OpenCode semantic messaging live smoke');
diff --git a/scripts/prove-opencode-semantic-model-matrix.mjs b/scripts/prove-opencode-semantic-model-matrix.mjs
index 717dc804..9f91862f 100644
--- a/scripts/prove-opencode-semantic-model-matrix.mjs
+++ b/scripts/prove-opencode-semantic-model-matrix.mjs
@@ -5,6 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import {
   exitForSkippedPreflight,
   preflightOpenCodeLiveEnvironment,
@@ -12,8 +13,6 @@ import {
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
@@ -24,8 +23,10 @@ const env = {
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running OpenCode semantic model matrix live smoke');
diff --git a/scripts/prove-opencode-team-provisioning.mjs b/scripts/prove-opencode-team-provisioning.mjs
index 246e891a..12673fd3 100644
--- a/scripts/prove-opencode-team-provisioning.mjs
+++ b/scripts/prove-opencode-team-provisioning.mjs
@@ -5,6 +5,7 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import {
   exitForSkippedPreflight,
   preflightOpenCodeLiveEnvironment,
@@ -12,8 +13,6 @@ import {
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 
 const env = {
   ...process.env,
@@ -25,8 +24,10 @@ const env = {
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running OpenCode team provisioning live smoke');
diff --git a/scripts/prove-provider-launch-stress.mjs b/scripts/prove-provider-launch-stress.mjs
index f8abe106..b757e964 100644
--- a/scripts/prove-provider-launch-stress.mjs
+++ b/scripts/prove-provider-launch-stress.mjs
@@ -7,12 +7,11 @@ import path from 'node:path';
 import process from 'node:process';
 import { fileURLToPath } from 'node:url';
 
+import { resolveLiveSmokeOrchestratorCliPath } from './lib/live-smoke-runtime.mjs';
 import { preflightOpenCodeLiveEnvironment } from './lib/opencode-live-preflight.mjs';
 
 const scriptDir = path.dirname(fileURLToPath(import.meta.url));
 const repoRoot = path.resolve(scriptDir, '..');
-const orchestratorRoot = process.env.CLAUDE_DEV_RUNTIME_ROOT?.trim();
-const siblingOrchestrator = path.resolve(repoRoot, '..', 'agent_teams_orchestrator');
 const requestedOrder =
   process.env.PROVIDER_LAUNCH_STRESS_ORDER?.trim() || 'anthropic,codex,opencode,mixed';
 
@@ -25,14 +24,20 @@ const env = {
   PROVIDER_LAUNCH_STRESS_ANTHROPIC_AUTH:
     process.env.PROVIDER_LAUNCH_STRESS_ANTHROPIC_AUTH?.trim() ||
     (process.env.ANTHROPIC_API_KEY?.trim() ? 'api-key' : 'subscription'),
+  CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS:
+    process.env.CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS?.trim() || '90000',
+  CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS:
+    process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS?.trim() || '30000',
   OPENCODE_E2E: '1',
   OPENCODE_E2E_USE_REAL_APP_CREDENTIALS: '1',
   OPENCODE_DISABLE_AUTOUPDATE: process.env.OPENCODE_DISABLE_AUTOUPDATE ?? '1',
 };
 
 if (!env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim()) {
-  const runtimeRoot = orchestratorRoot ? path.resolve(orchestratorRoot) : siblingOrchestrator;
-  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = path.join(runtimeRoot, 'cli');
+  env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH = resolveLiveSmokeOrchestratorCliPath({
+    env,
+    repoRoot,
+  });
 }
 
 console.log('Running provider launch stress live smoke');
diff --git a/src/features/agent-graph/core/domain/collapseOverflowStacks.ts b/src/features/agent-graph/core/domain/collapseOverflowStacks.ts
index 8d99dbc1..b2da40ae 100644
--- a/src/features/agent-graph/core/domain/collapseOverflowStacks.ts
+++ b/src/features/agent-graph/core/domain/collapseOverflowStacks.ts
@@ -72,8 +72,8 @@ export function collapseOverflowStacksWithMeta(
       continue;
     }
 
-    const keptTasks = groupTasks.slice(0, maxVisibleRows - 1);
-    const hiddenTasks = groupTasks.slice(maxVisibleRows - 1);
+    const keptTasks = groupTasks.slice(0, maxVisibleRows);
+    const hiddenTasks = groupTasks.slice(maxVisibleRows);
     const representative = hiddenTasks[0] ?? groupTasks[groupTasks.length - 1];
     const columnKey = resolveOverflowColumnKey(representative);
     const ownerMemberName = extractOwnerMemberName(representative, teamName);
@@ -96,10 +96,10 @@ export function collapseOverflowStacksWithMeta(
     visibleTasks.push({
       id: `task:${teamName}:overflow:${groupKey}`,
       kind: 'task',
-      label: `+${hiddenTasks.length}`,
+      label: `+${hiddenTasks.length} more`,
       state: representative.state,
-      displayId: `+${hiddenTasks.length}`,
-      sublabel: `${hiddenTasks.length} more tasks`,
+      displayId: `+${hiddenTasks.length} more`,
+      sublabel: undefined,
       ownerId: representative.ownerId ?? null,
       taskStatus: representative.taskStatus,
       reviewState: representative.reviewState,
diff --git a/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts b/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
index fb49907b..469e117b 100644
--- a/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
+++ b/src/features/agent-graph/renderer/adapters/TeamGraphAdapter.ts
@@ -8,6 +8,17 @@
  * Class-based with ES #private fields and DI-ready constructor.
  */
 
+import {
+  type GraphDataPort,
+  type GraphEdge,
+  type GraphLayoutMode,
+  type GraphLayoutPort,
+  type GraphNode,
+  type GraphNodeState,
+  type GraphOwnerSlotAssignment,
+  type GraphParticle,
+  TASK_COLUMN_MAX_VISIBLE_ROWS,
+} from '@claude-teams/agent-graph';
 import { getUnreadCount } from '@renderer/services/commentReadStorage';
 import {
   agentAvatarUrl,
@@ -50,32 +61,24 @@ import {
   resolveTaskReviewer,
 } from '../../core/domain/taskGraphSemantics';
 
-import type {
-  GraphDataPort,
-  GraphEdge,
-  GraphLayoutMode,
-  GraphLayoutPort,
-  GraphNode,
-  GraphNodeState,
-  GraphOwnerSlotAssignment,
-  GraphParticle,
-} from '@claude-teams/agent-graph';
 import type {
   ActiveToolCall,
   InboxMessage,
   LeadActivityState,
+  LeadContextUsage,
   MemberSpawnStatusEntry,
   MemberSpawnStatusesSnapshot,
   ResolvedTeamMember,
+  TeamAgentRuntimeEntry,
   TeamProcess,
   TeamProvisioningProgress,
   TeamViewSnapshot,
 } from '@shared/types/team';
-import type { LeadContextUsage } from '@shared/types/team';
 
 export interface TeamGraphData extends TeamViewSnapshot {
   members: ResolvedTeamMember[];
   messageFeed: InboxMessage[];
+  runtimeEntriesByMember?: Record<string, TeamAgentRuntimeEntry>;
 }
 
 function toGraphLaunchVisualState(
@@ -438,6 +441,7 @@ export class TeamGraphAdapter {
   ): void {
     const percent = leadContext?.contextUsedPercent;
     const leadMember = data.members.find((member) => member.name === leadName);
+    const runtimeEntry = data.runtimeEntriesByMember?.[leadName];
     const isTeamVisualOnline = data.isAlive || isTeamProvisioning;
     const activeTool = TeamGraphAdapter.#selectVisibleTool(
       activeTools?.[leadName],
@@ -454,6 +458,7 @@ export class TeamGraphAdapter {
           spawnLivenessSource: undefined,
           spawnRuntimeAlive: undefined,
           spawnBootstrapStalled: undefined,
+          runtimeEntry,
           runtimeAdvisory: leadMember.runtimeAdvisory,
           isLaunchSettling: false,
           isTeamAlive: data.isAlive,
@@ -545,6 +550,7 @@ export class TeamGraphAdapter {
       const memberId =
         memberNodeIdByAlias.get(member.name) ?? buildGraphMemberNodeIdForMember(teamName, member);
       const spawn = spawnStatuses?.[member.name];
+      const runtimeEntry = data.runtimeEntriesByMember?.[member.name];
       const activeTool = TeamGraphAdapter.#selectVisibleTool(
         activeTools?.[member.name],
         finishedVisible?.[member.name]
@@ -576,6 +582,9 @@ export class TeamGraphAdapter {
         spawnAgentToolAccepted: spawn?.agentToolAccepted,
         spawnHardFailure: spawn?.hardFailure,
         spawnLivenessKind: spawn?.livenessKind,
+        spawnFirstSpawnAcceptedAt: spawn?.firstSpawnAcceptedAt,
+        spawnUpdatedAt: spawn?.updatedAt,
+        runtimeEntry,
         runtimeAdvisory: member.runtimeAdvisory,
         isLaunchSettling,
         isTeamAlive: data.isAlive,
@@ -751,7 +760,7 @@ export class TeamGraphAdapter {
     }
 
     const { visibleNodes: visibleTaskNodes, visibleNodeIdByTaskId } =
-      collapseOverflowStacksWithMeta(rawTaskNodes, teamName, 5);
+      collapseOverflowStacksWithMeta(rawTaskNodes, teamName, TASK_COLUMN_MAX_VISIBLE_ROWS);
     const visibleTaskIds = new Set(
       visibleTaskNodes.flatMap((taskNode) =>
         taskNode.domainRef.kind === 'task' ? [taskNode.domainRef.taskId] : []
diff --git a/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts b/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
index 11ea2c25..692ab93f 100644
--- a/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
+++ b/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
@@ -17,6 +17,7 @@ interface GraphMemberPopoverContext {
     | null;
   teamMembers: ReturnType<typeof selectResolvedMembersForTeamName>;
   spawnEntry: AppState['memberSpawnStatusesByTeam'][string][string] | undefined;
+  runtimeEntry: AppState['teamAgentRuntimeByTeam'][string]['members'][string] | undefined;
   leadActivity: AppState['leadActivityByTeam'][string] | undefined;
   progress: ReturnType<typeof getCurrentProvisioningProgressForTeam> | null;
   memberSpawnSnapshot: AppState['memberSpawnSnapshotsByTeam'][string] | undefined;
@@ -41,6 +42,9 @@ function selectGraphMemberPopoverContext(
       : null,
     teamMembers,
     spawnEntry: teamName ? state.memberSpawnStatusesByTeam[teamName]?.[memberName] : undefined,
+    runtimeEntry: teamName
+      ? state.teamAgentRuntimeByTeam[teamName]?.members[memberName]
+      : undefined,
     leadActivity: teamName ? state.leadActivityByTeam[teamName] : undefined,
     progress: teamName ? getCurrentProvisioningProgressForTeam(state, teamName) : null,
     memberSpawnSnapshot: teamName ? state.memberSpawnSnapshotsByTeam[teamName] : undefined,
diff --git a/src/features/agent-graph/renderer/hooks/useTeamGraphAdapter.ts b/src/features/agent-graph/renderer/hooks/useTeamGraphAdapter.ts
index 0d722411..5299417f 100644
--- a/src/features/agent-graph/renderer/hooks/useTeamGraphAdapter.ts
+++ b/src/features/agent-graph/renderer/hooks/useTeamGraphAdapter.ts
@@ -5,6 +5,7 @@
 
 import { useLayoutEffect, useMemo, useRef, useSyncExternalStore } from 'react';
 
+import { useTeamAgentRuntimeWatcher } from '@renderer/components/team/useTeamAgentRuntimeWatcher';
 import { getSnapshot, subscribe } from '@renderer/services/commentReadStorage';
 import { useStore } from '@renderer/store';
 import {
@@ -73,6 +74,7 @@ export function useTeamGraphAdapter(
     members,
     messages,
     spawnStatuses,
+    runtimeSnapshot,
     leadActivity,
     leadContext,
     pendingApprovals,
@@ -93,6 +95,7 @@ export function useTeamGraphAdapter(
       members: isActive ? selectResolvedMembersForTeamName(s, teamName) : EMPTY_MEMBERS,
       messages: isActive ? selectTeamMessages(s, teamName) : EMPTY_MESSAGES,
       spawnStatuses: isActive && teamName ? s.memberSpawnStatusesByTeam[teamName] : undefined,
+      runtimeSnapshot: isActive && teamName ? s.teamAgentRuntimeByTeam[teamName] : undefined,
       leadActivity: isActive && teamName ? s.leadActivityByTeam[teamName] : undefined,
       leadContext: isActive && teamName ? s.leadContextByTeam[teamName] : undefined,
       pendingApprovals: isActive ? s.pendingApprovals : EMPTY_PENDING_APPROVALS,
@@ -113,6 +116,11 @@ export function useTeamGraphAdapter(
     }))
   );
 
+  useTeamAgentRuntimeWatcher({
+    teamName,
+    enabled: isActive,
+  });
+
   const pendingApprovalAgents = useMemo(() => {
     if (!isActive) {
       return EMPTY_PENDING_APPROVAL_AGENTS;
@@ -134,8 +142,9 @@ export function useTeamGraphAdapter(
       ...teamSnapshot,
       members,
       messageFeed: messages,
+      runtimeEntriesByMember: runtimeSnapshot?.members,
     };
-  }, [members, messages, teamSnapshot]);
+  }, [members, messages, runtimeSnapshot?.members, teamSnapshot]);
 
   const commentReadState = useSyncExternalStore(
     isActive ? subscribe : subscribeNoop,
diff --git a/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx b/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
index 21863e37..06a29b1f 100644
--- a/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
@@ -29,6 +29,7 @@ const ACTIVITY_SHELL_HEIGHT =
   ACTIVITY_LANE.maxVisibleItems * ACTIVITY_LANE.rowHeight +
   ACTIVITY_LANE.overflowHeight;
 const NEW_ACTIVITY_HIGHLIGHT_MS = 1_000;
+const INTERACTIVE_ACTIVITY_CONTROL_CLASS = 'pointer-events-auto';
 
 interface GraphActivityHudProps {
   teamName: string;
@@ -456,7 +457,7 @@ export const GraphActivityHud = ({
           key={entry.graphItem.id}
           data-activity-entry-id={entry.graphItem.id}
           className={[
-            'h-[72px] min-h-[72px] min-w-0 max-w-full cursor-pointer overflow-hidden rounded-md border transition-[border-color,background-color,box-shadow] duration-500',
+            `${INTERACTIVE_ACTIVITY_CONTROL_CLASS} h-[72px] min-h-[72px] min-w-0 max-w-full cursor-pointer overflow-hidden rounded-md border transition-[border-color,background-color,box-shadow] duration-500`,
             isHighlighted
               ? 'border-sky-300/70 bg-[rgba(14,34,62,0.56)] shadow-[0_0_0_1px_rgba(125,211,252,0.30),0_0_18px_rgba(56,189,248,0.22)]'
               : 'border-transparent',
@@ -536,7 +537,7 @@ export const GraphActivityHud = ({
                     ref={(element) => {
                       shellRefs.current.set(lane.node.id, element);
                     }}
-                    className="pointer-events-auto absolute z-10 origin-top-left select-none opacity-0"
+                    className="pointer-events-none absolute z-10 origin-top-left select-none opacity-0"
                     style={{
                       width: `${laneWidth}px`,
                       maxWidth: `${laneWidth}px`,
@@ -561,7 +562,7 @@ export const GraphActivityHud = ({
                         {lane.overflowCount > 0 ? (
                           <button
                             type="button"
-                            className="h-8 min-h-8 w-full rounded-md border border-white/10 bg-[rgba(8,14,28,0.64)] px-3 py-1 text-center text-[11px] font-medium text-slate-300 transition-colors hover:border-white/20 hover:bg-[rgba(12,20,40,0.78)]"
+                            className={`${INTERACTIVE_ACTIVITY_CONTROL_CLASS} h-8 min-h-8 w-full rounded-md border border-white/10 bg-[rgba(8,14,28,0.64)] px-3 py-1 text-center text-[11px] font-medium text-slate-300 transition-colors hover:border-white/20 hover:bg-[rgba(12,20,40,0.78)]`}
                             onClick={() => handleOpenOwnerActivity(lane.node)}
                           >
                             +{lane.overflowCount} more
diff --git a/src/features/agent-graph/renderer/ui/GraphMemberLogPreviewHud.tsx b/src/features/agent-graph/renderer/ui/GraphMemberLogPreviewHud.tsx
index fd06994b..16c4e79a 100644
--- a/src/features/agent-graph/renderer/ui/GraphMemberLogPreviewHud.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphMemberLogPreviewHud.tsx
@@ -605,7 +605,7 @@ export const GraphMemberLogPreviewHud = ({
             }}
           >
             <div className="flex h-full min-w-0 max-w-full flex-col overflow-hidden">
-              <div className="flex h-4 min-h-4 items-center gap-1 px-1 text-[9px] font-semibold tracking-[0.18em] text-slate-400/70">
+              <div className="mb-1 flex h-4 min-h-4 items-center gap-1 px-1 text-[9px] font-semibold tracking-[0.18em] text-slate-400/70">
                 <Wrench className="size-2.5 text-slate-500" />
                 Logs
               </div>
diff --git a/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx b/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
index 7f12b012..2c2b3a4d 100644
--- a/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphNodePopover.tsx
@@ -315,6 +315,7 @@ const MemberPopoverContent = ({
     teamData,
     teamMembers,
     spawnEntry,
+    runtimeEntry,
     leadActivity,
     progress,
     memberSpawnSnapshot,
@@ -358,6 +359,9 @@ const MemberPopoverContent = ({
         spawnAgentToolAccepted: spawnEntry?.agentToolAccepted,
         spawnHardFailure: spawnEntry?.hardFailure,
         spawnLivenessKind: spawnEntry?.livenessKind,
+        spawnFirstSpawnAcceptedAt: spawnEntry?.firstSpawnAcceptedAt,
+        spawnUpdatedAt: spawnEntry?.updatedAt,
+        runtimeEntry,
         runtimeAdvisory: member.runtimeAdvisory,
         isLaunchSettling: provisioningPresentation?.hasMembersStillJoining ?? false,
         isTeamAlive: teamData?.isAlive,
diff --git a/src/features/anthropic-runtime-profile/core/domain/resolveAnthropicRuntimeProfile.ts b/src/features/anthropic-runtime-profile/core/domain/resolveAnthropicRuntimeProfile.ts
index 1d4b5f52..67027607 100644
--- a/src/features/anthropic-runtime-profile/core/domain/resolveAnthropicRuntimeProfile.ts
+++ b/src/features/anthropic-runtime-profile/core/domain/resolveAnthropicRuntimeProfile.ts
@@ -44,6 +44,12 @@ export interface AnthropicRuntimeReconciliation {
   fastModeResetReason: string | null;
 }
 
+export type AnthropicEffortSupportResolution =
+  | { kind: 'supported'; source: 'catalog' | 'runtime-capability' | 'static-fallback' }
+  | { kind: 'unsupported-by-catalog'; supportedEfforts: EffortLevel[] }
+  | { kind: 'unsupported-by-runtime-capability'; supportedEfforts: EffortLevel[] }
+  | { kind: 'unverified-catalog-missing' };
+
 function getAnthropicCatalog(
   source: AnthropicRuntimeProfileSource
 ): CliProviderModelCatalog | null {
@@ -77,17 +83,89 @@ function hasCatalogTruth(selection: AnthropicRuntimeSelection): boolean {
   return selection.catalogSource !== 'unavailable' && selection.catalogStatus !== 'unavailable';
 }
 
+function stripOneMillionSuffix(model: string): string {
+  return model
+    .trim()
+    .toLowerCase()
+    .replace(/(?:\[1m\])+$/i, '');
+}
+
+function isKnownAnthropicReasoningModel(model: string | null | undefined): boolean {
+  const normalized = stripOneMillionSuffix(model ?? '');
+  return (
+    normalized === 'opus' ||
+    normalized === 'sonnet' ||
+    normalized === 'claude-opus-4-7' ||
+    normalized.startsWith('claude-opus-4-7-') ||
+    normalized === 'claude-opus-4-6' ||
+    normalized.startsWith('claude-opus-4-6-') ||
+    normalized === 'claude-sonnet-4-6' ||
+    normalized.startsWith('claude-sonnet-4-6-')
+  );
+}
+
+function normalizeRuntimeReasoningEfforts(
+  capabilities: CliProviderRuntimeCapabilities | null | undefined
+): EffortLevel[] {
+  return normalizeEffortLevels(capabilities?.reasoningEffort?.values);
+}
+
+export function resolveAnthropicEffortSupport(params: {
+  selection: AnthropicRuntimeSelection;
+  effort: EffortLevel;
+  runtimeCapabilities?: CliProviderRuntimeCapabilities | null;
+}): AnthropicEffortSupportResolution {
+  if (params.selection.catalogModel) {
+    return params.selection.supportedEfforts.includes(params.effort)
+      ? { kind: 'supported', source: 'catalog' }
+      : { kind: 'unsupported-by-catalog', supportedEfforts: params.selection.supportedEfforts };
+  }
+
+  const runtimeReasoning = params.runtimeCapabilities?.reasoningEffort;
+  const runtimeEfforts = normalizeRuntimeReasoningEfforts(params.runtimeCapabilities);
+  if (runtimeReasoning) {
+    if (
+      runtimeReasoning.supported !== true ||
+      runtimeReasoning.configPassthrough !== true ||
+      !runtimeEfforts.includes(params.effort)
+    ) {
+      return { kind: 'unsupported-by-runtime-capability', supportedEfforts: runtimeEfforts };
+    }
+    if (isKnownAnthropicReasoningModel(params.selection.resolvedLaunchModel)) {
+      return { kind: 'supported', source: 'runtime-capability' };
+    }
+  }
+
+  if (
+    !runtimeReasoning &&
+    isKnownAnthropicReasoningModel(params.selection.resolvedLaunchModel) &&
+    (params.effort === 'low' ||
+      params.effort === 'medium' ||
+      params.effort === 'high' ||
+      params.effort === 'max')
+  ) {
+    return { kind: 'supported', source: 'static-fallback' };
+  }
+
+  return { kind: 'unverified-catalog-missing' };
+}
+
 export function resolveAnthropicRuntimeSelection(params: {
   source: AnthropicRuntimeProfileSource;
   selectedModel?: string | null;
   limitContext: boolean;
+  availableLaunchModels?: Iterable<string>;
 }): AnthropicRuntimeSelection {
   const catalog = getAnthropicCatalog(params.source);
+  const availableLaunchModels =
+    catalog !== null
+      ? catalog.models.map((model) => model.launchModel)
+      : params.availableLaunchModels;
   const resolvedLaunchModel =
     resolveAnthropicLaunchModel({
       selectedModel: params.selectedModel,
       limitContext: params.limitContext,
-      availableLaunchModels: catalog?.models.map((model) => model.launchModel),
+      availableLaunchModels,
       defaultLaunchModel: catalog?.defaultLaunchModel ?? null,
     }) ?? null;
 
@@ -168,6 +246,7 @@ export function reconcileAnthropicRuntimeSelections(params: {
   selectedEffort?: string | null;
   selectedFastMode?: TeamFastMode | null;
   providerFastModeDefault?: boolean;
+  runtimeCapabilities?: CliProviderRuntimeCapabilities | null;
 }): AnthropicRuntimeReconciliation {
   const selectedEffort = normalizeEffortLevel(params.selectedEffort ?? null);
   if (!hasCatalogTruth(params.selection)) {
@@ -179,14 +258,22 @@ export function reconcileAnthropicRuntimeSelections(params: {
     };
   }
 
-  const nextEffort =
-    selectedEffort && !params.selection.supportedEfforts.includes(selectedEffort)
-      ? ''
-      : (selectedEffort ?? '');
-  const effortResetReason =
-    selectedEffort && nextEffort === ''
-      ? `${selectedEffort} effort is not available for the currently selected Anthropic model. Reset to Default.`
-      : null;
+  let nextEffort: EffortLevel | '' = selectedEffort ?? '';
+  let effortResetReason: string | null = null;
+  if (selectedEffort) {
+    const effortSupport = resolveAnthropicEffortSupport({
+      selection: params.selection,
+      effort: selectedEffort,
+      runtimeCapabilities: params.runtimeCapabilities,
+    });
+    if (
+      effortSupport.kind === 'unsupported-by-catalog' ||
+      effortSupport.kind === 'unsupported-by-runtime-capability'
+    ) {
+      nextEffort = '';
+      effortResetReason = `${selectedEffort} effort is not available for the currently selected Anthropic model. Reset to Default.`;
+    }
+  }
 
   const fastResolution = resolveAnthropicFastMode({
     selection: params.selection,
diff --git a/src/features/anthropic-runtime-profile/main/index.ts b/src/features/anthropic-runtime-profile/main/index.ts
index 2304b4c5..60c6af6e 100644
--- a/src/features/anthropic-runtime-profile/main/index.ts
+++ b/src/features/anthropic-runtime-profile/main/index.ts
@@ -1,4 +1,5 @@
 export type {
+  AnthropicEffortSupportResolution,
   AnthropicFastModeResolution,
   AnthropicRuntimeProfileSource,
   AnthropicRuntimeReconciliation,
@@ -6,6 +7,7 @@ export type {
 } from '../core/domain/resolveAnthropicRuntimeProfile';
 export {
   reconcileAnthropicRuntimeSelections,
+  resolveAnthropicEffortSupport,
   resolveAnthropicFastMode,
   resolveAnthropicRuntimeSelection,
 } from '../core/domain/resolveAnthropicRuntimeProfile';
diff --git a/src/features/anthropic-runtime-profile/renderer/index.ts b/src/features/anthropic-runtime-profile/renderer/index.ts
index 2304b4c5..60c6af6e 100644
--- a/src/features/anthropic-runtime-profile/renderer/index.ts
+++ b/src/features/anthropic-runtime-profile/renderer/index.ts
@@ -1,4 +1,5 @@
 export type {
+  AnthropicEffortSupportResolution,
   AnthropicFastModeResolution,
   AnthropicRuntimeProfileSource,
   AnthropicRuntimeReconciliation,
@@ -6,6 +7,7 @@ export type {
 } from '../core/domain/resolveAnthropicRuntimeProfile';
 export {
   reconcileAnthropicRuntimeSelections,
+  resolveAnthropicEffortSupport,
   resolveAnthropicFastMode,
   resolveAnthropicRuntimeSelection,
 } from '../core/domain/resolveAnthropicRuntimeProfile';
diff --git a/src/features/recent-projects/main/infrastructure/codex/CodexAppServerClient.ts b/src/features/recent-projects/main/infrastructure/codex/CodexAppServerClient.ts
index 6aeeeac7..5b8951b6 100644
--- a/src/features/recent-projects/main/infrastructure/codex/CodexAppServerClient.ts
+++ b/src/features/recent-projects/main/infrastructure/codex/CodexAppServerClient.ts
@@ -216,7 +216,7 @@ export class CodexAppServerClient {
           {
             clientInfo: {
               name: 'agent-teams-ai',
-              title: 'Agent Teams UI',
+              title: 'Agent Teams AI',
               version: '0.1.0',
             },
             capabilities: {
diff --git a/src/features/team-runtime-lanes/core/domain/__tests__/planTeamRuntimeLanes.test.ts b/src/features/team-runtime-lanes/core/domain/__tests__/planTeamRuntimeLanes.test.ts
index 51704b72..272f28b0 100644
--- a/src/features/team-runtime-lanes/core/domain/__tests__/planTeamRuntimeLanes.test.ts
+++ b/src/features/team-runtime-lanes/core/domain/__tests__/planTeamRuntimeLanes.test.ts
@@ -183,7 +183,7 @@ describe('planTeamRuntimeLanes', () => {
       ok: false,
       reason: 'unsupported_opencode_led_mixed_team',
       message:
-        'Mixed teams with an OpenCode lead are not supported in this phase. Keep the team lead on Anthropic, Codex, or Gemini when you mix OpenCode with other providers.',
+        'Mixed teams with an OpenCode lead are not supported in this phase. Keep the team lead on Anthropic or Codex when you mix OpenCode with other providers.',
     });
   });
 });
diff --git a/src/features/team-runtime-lanes/core/domain/planTeamRuntimeLanes.ts b/src/features/team-runtime-lanes/core/domain/planTeamRuntimeLanes.ts
index 46f63a9b..63b1e011 100644
--- a/src/features/team-runtime-lanes/core/domain/planTeamRuntimeLanes.ts
+++ b/src/features/team-runtime-lanes/core/domain/planTeamRuntimeLanes.ts
@@ -126,7 +126,7 @@ export function planTeamRuntimeLanes(params: {
         ok: false,
         reason: 'unsupported_opencode_led_mixed_team',
         message:
-          'Mixed teams with an OpenCode lead are not supported in this phase. Keep the team lead on Anthropic, Codex, or Gemini when you mix OpenCode with other providers.',
+          'Mixed teams with an OpenCode lead are not supported in this phase. Keep the team lead on Anthropic or Codex when you mix OpenCode with other providers.',
       };
     }
     return {
diff --git a/src/features/tmux-installer/core/domain/policies/buildTmuxEffectiveAvailability.ts b/src/features/tmux-installer/core/domain/policies/buildTmuxEffectiveAvailability.ts
index 78a674a4..4a26e476 100644
--- a/src/features/tmux-installer/core/domain/policies/buildTmuxEffectiveAvailability.ts
+++ b/src/features/tmux-installer/core/domain/policies/buildTmuxEffectiveAvailability.ts
@@ -72,7 +72,7 @@ export function buildTmuxEffectiveAvailability(
       version: input.host.version,
       binaryPath: input.host.binaryPath,
       runtimeReady: input.nativeSupported,
-      detail: 'tmux is available as an optional pane transport for teammate sessions.',
+      detail: 'tmux is available.',
     };
   }
 
diff --git a/src/features/tmux-installer/main/infrastructure/installer/TmuxInstallStrategyResolver.ts b/src/features/tmux-installer/main/infrastructure/installer/TmuxInstallStrategyResolver.ts
index 4ba5607b..c7864f80 100644
--- a/src/features/tmux-installer/main/infrastructure/installer/TmuxInstallStrategyResolver.ts
+++ b/src/features/tmux-installer/main/infrastructure/installer/TmuxInstallStrategyResolver.ts
@@ -171,7 +171,7 @@ export class TmuxInstallStrategyResolver {
     if (input.effective.available) {
       return input.effective.location === 'wsl'
         ? 'tmux is available inside WSL on Windows.'
-        : 'tmux is available as an optional pane transport for teammate sessions.';
+        : 'tmux is available.';
     }
 
     if (input.platform === 'darwin') {
diff --git a/src/features/tmux-installer/renderer/adapters/__tests__/TmuxInstallerBannerAdapter.test.ts b/src/features/tmux-installer/renderer/adapters/__tests__/TmuxInstallerBannerAdapter.test.ts
index 0d3ab57e..756ea2ab 100644
--- a/src/features/tmux-installer/renderer/adapters/__tests__/TmuxInstallerBannerAdapter.test.ts
+++ b/src/features/tmux-installer/renderer/adapters/__tests__/TmuxInstallerBannerAdapter.test.ts
@@ -216,7 +216,7 @@ describe('TmuxInstallerBannerAdapter', () => {
           version: 'tmux 3.6a',
           binaryPath: '/opt/homebrew/bin/tmux',
           runtimeReady: true,
-          detail: 'tmux is available as an optional pane transport.',
+          detail: 'tmux is available.',
         },
       },
       snapshot: {
diff --git a/src/main/index.ts b/src/main/index.ts
index 8cc26c0c..ccc6a263 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -1,5 +1,5 @@
 /**
- * Main process entry point for Agent Teams UI.
+ * Main process entry point for Agent Teams AI.
  *
  * Responsibilities:
  * - Initialize Electron app and main window
@@ -70,6 +70,7 @@ import { ChangeExtractorService } from '@main/services/team/ChangeExtractorServi
 import { CrossTeamService } from '@main/services/team/CrossTeamService';
 import { FileContentResolver } from '@main/services/team/FileContentResolver';
 import { GitDiffFallback } from '@main/services/team/GitDiffFallback';
+import { isInformationalOpenCodeRuntimeDeliveryDiagnostic } from '@main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryDiagnostics';
 import {
   copyOpenCodeLocalMcpLaunchEnv,
   hasOpenCodeLocalMcpLaunchEnv,
@@ -237,6 +238,13 @@ const logger = createLogger('App');
 const appStartedAtMs = Date.now();
 const openCodeManagedHostInstanceId = `${process.pid}-${appStartedAtMs}`;
 let openCodeLifecycleBridge: OpenCodeReadinessBridge | null = null;
+
+function hasWarningRelayDiagnostics(diagnostics: readonly string[]): boolean {
+  return diagnostics.some(
+    (diagnostic) => !isInformationalOpenCodeRuntimeDeliveryDiagnostic(diagnostic)
+  );
+}
+
 if (
   earlyElectronUserDataMigrationResult.migrated &&
   earlyElectronUserDataMigrationResult.legacyPath &&
@@ -1268,9 +1276,12 @@ function wireFileWatcherEvents(context: ServiceContext): void {
               .relayInboxFileToLiveRecipient(teamName, inboxName)
               .then((relay) => {
                 if (relay.diagnostics?.length) {
-                  logger.warn(
-                    `[FileWatcher] relay diagnostics for ${teamName}/${inboxName}: ${relay.diagnostics.join('; ')}`
-                  );
+                  const message = `[FileWatcher] relay diagnostics for ${teamName}/${inboxName}: ${relay.diagnostics.join('; ')}`;
+                  if (hasWarningRelayDiagnostics(relay.diagnostics)) {
+                    logger.warn(message);
+                  } else {
+                    logger.info(message);
+                  }
                 }
               })
               .catch((e: unknown) =>
diff --git a/src/main/ipc/editor.ts b/src/main/ipc/editor.ts
index cd85dc94..bd411d78 100644
--- a/src/main/ipc/editor.ts
+++ b/src/main/ipc/editor.ts
@@ -79,6 +79,20 @@ const editorFileWatcher = new EditorFileWatcher();
 const wrapHandler = createIpcWrapper('IPC:editor');
 const log = createLogger('IPC:editor');
 
+const MISSING_PROJECT_PATH_ERROR_CODES = new Set(['ENOENT', 'ENOTDIR']);
+
+function getFileSystemErrorCode(error: unknown): string | null {
+  if (typeof error !== 'object' || error === null || !('code' in error)) {
+    return null;
+  }
+  const code = (error as { code?: unknown }).code;
+  return typeof code === 'string' ? code : null;
+}
+
+function isMissingProjectPathError(error: unknown): boolean {
+  return MISSING_PROJECT_PATH_ERROR_CODES.has(getFileSystemErrorCode(error) ?? '');
+}
+
 // =============================================================================
 // Handlers
 // =============================================================================
@@ -316,7 +330,15 @@ async function handleProjectListFiles(
       throw new Error('projectPath is required');
     }
     const normalized = path.resolve(projectPath);
-    await fs.access(normalized);
+    const stat = await fs.stat(normalized).catch((error: unknown) => {
+      if (isMissingProjectPathError(error)) {
+        return null;
+      }
+      throw error;
+    });
+    if (!stat?.isDirectory()) {
+      return [];
+    }
     return fileSearchService.listFiles(normalized);
   });
 }
diff --git a/src/main/ipc/teams.ts b/src/main/ipc/teams.ts
index 94226edf..ff9a6abc 100644
--- a/src/main/ipc/teams.ts
+++ b/src/main/ipc/teams.ts
@@ -115,6 +115,7 @@ import {
   buildStandaloneSlashCommandMeta,
   parseStandaloneSlashCommand,
 } from '@shared/utils/slashCommands';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { isTeamProviderId, normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
 import crypto from 'crypto';
 import { app, BrowserWindow, type IpcMain, type IpcMainInvokeEvent, Notification } from 'electron';
@@ -222,6 +223,7 @@ import type {
   TeamMessageNotificationData,
   TeamProviderBackendId,
   TeamProviderId,
+  TeamProvisioningModelCheckRequest,
   TeamProvisioningModelVerificationMode,
   TeamProvisioningPrepareResult,
   TeamProvisioningProgress,
@@ -1563,6 +1565,7 @@ interface RuntimeRosterMutationMember {
   model?: string;
   effort?: EffortLevel;
   fastMode?: TeamFastMode;
+  mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
   removedAt?: number | string | null;
 }
 
@@ -1621,7 +1624,9 @@ function didOpenCodeRosterMemberChange(
       ) ||
     (previous.model?.trim() || undefined) !== (next.model?.trim() || undefined) ||
     previous.effort !== next.effort ||
-    previous.fastMode !== next.fastMode
+    previous.fastMode !== next.fastMode ||
+    JSON.stringify(normalizeTeamMemberMcpPolicy(previous.mcpPolicy)) !==
+      JSON.stringify(normalizeTeamMemberMcpPolicy(next.mcpPolicy))
   );
 }
 
@@ -1660,6 +1665,7 @@ function toRollbackReplaceMembersRequest(members: RuntimeRosterMutationMember[])
     model?: string;
     effort?: EffortLevel;
     fastMode?: TeamFastMode;
+    mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
   }[];
 } {
   return {
@@ -1675,6 +1681,7 @@ function toRollbackReplaceMembersRequest(members: RuntimeRosterMutationMember[])
         model: member.model?.trim() || undefined,
         effort: member.effort,
         fastMode: member.fastMode,
+        mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
       })),
   };
 }
@@ -1884,6 +1891,7 @@ async function validateProvisioningRequest(
       model: typeof model === 'string' ? model.trim() || undefined : undefined,
       effort: effortValidation.value,
       fastMode: fastModeValidation.value,
+      mcpPolicy: normalizeTeamMemberMcpPolicy((member as { mcpPolicy?: unknown }).mcpPolicy),
     });
   }
 
@@ -2366,7 +2374,8 @@ async function handlePrepareProvisioning(
   providerIds: unknown,
   selectedModels: unknown,
   limitContext: unknown,
-  modelVerificationMode: unknown
+  modelVerificationMode: unknown,
+  selectedModelChecks: unknown
 ): Promise<IpcResult<TeamProvisioningPrepareResult>> {
   let validatedCwd: string | undefined;
   let validatedProviderId: TeamLaunchRequest['providerId'];
@@ -2374,6 +2383,7 @@ async function handlePrepareProvisioning(
   let validatedSelectedModels: string[] | undefined;
   let validatedLimitContext: boolean | undefined;
   let validatedModelVerificationMode: TeamProvisioningModelVerificationMode | undefined;
+  let validatedSelectedModelChecks: TeamProvisioningModelCheckRequest[] | undefined;
   if (cwd !== undefined) {
     if (typeof cwd !== 'string' || cwd.trim().length === 0) {
       return { success: false, error: 'cwd must be a non-empty string' };
@@ -2436,6 +2446,51 @@ async function handlePrepareProvisioning(
     }
     validatedModelVerificationMode = modelVerificationMode;
   }
+  if (selectedModelChecks !== undefined) {
+    if (!Array.isArray(selectedModelChecks)) {
+      return { success: false, error: 'selectedModelChecks must be an array when provided' };
+    }
+    const normalized: TeamProvisioningModelCheckRequest[] = [];
+    const seen = new Set<string>();
+    for (const entry of selectedModelChecks) {
+      if (!entry || typeof entry !== 'object') {
+        return { success: false, error: 'selectedModelChecks entries must be objects' };
+      }
+      const rawEntry = entry as {
+        providerId?: unknown;
+        model?: unknown;
+        effort?: unknown;
+      };
+      if (!isTeamProviderId(rawEntry.providerId)) {
+        return {
+          success: false,
+          error: 'selectedModelChecks entries must include a valid providerId',
+        };
+      }
+      if (typeof rawEntry.model !== 'string' || rawEntry.model.trim().length === 0) {
+        return {
+          success: false,
+          error: 'selectedModelChecks entries must include a non-empty model',
+        };
+      }
+      const effortValidation = parseOptionalTeamEffort(rawEntry.effort, rawEntry.providerId);
+      if (!effortValidation.valid) {
+        return { success: false, error: `selectedModelChecks ${effortValidation.error}` };
+      }
+      const model = rawEntry.model.trim();
+      const key = `${rawEntry.providerId}\n${model}\n${effortValidation.value ?? ''}`;
+      if (seen.has(key)) {
+        continue;
+      }
+      seen.add(key);
+      normalized.push({
+        providerId: rawEntry.providerId,
+        model,
+        ...(effortValidation.value ? { effort: effortValidation.value } : {}),
+      });
+    }
+    validatedSelectedModelChecks = normalized;
+  }
   return wrapTeamHandler('prepareProvisioning', () =>
     getTeamProvisioningService().prepareForProvisioning(validatedCwd, {
       providerId: validatedProviderId,
@@ -2443,6 +2498,7 @@ async function handlePrepareProvisioning(
       modelIds: validatedSelectedModels,
       limitContext: validatedLimitContext,
       modelVerificationMode: validatedModelVerificationMode,
+      modelChecks: validatedSelectedModelChecks,
     })
   );
 }
@@ -4246,7 +4302,7 @@ async function handleAddMember(
   if (!payload || typeof payload !== 'object') {
     return { success: false, error: 'Invalid payload' };
   }
-  const { name, role, workflow, isolation, providerId, model } = payload as {
+  const { name, role, workflow, isolation, providerId, model, mcpPolicy } = payload as {
     name?: unknown;
     role?: unknown;
     workflow?: unknown;
@@ -4254,6 +4310,7 @@ async function handleAddMember(
     providerId?: unknown;
     model?: unknown;
     effort?: unknown;
+    mcpPolicy?: unknown;
   };
   const vName = validateTeammateName(name);
   if (!vName.valid) return { success: false, error: vName.error ?? 'Invalid member name' };
@@ -4302,6 +4359,7 @@ async function handleAddMember(
       providerId: providerValidation.value,
       model: typeof model === 'string' ? model.trim() || undefined : undefined,
       effort: effortValidation.value,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(mcpPolicy),
     });
     invalidateTeamRosterSnapshotCaches(tn);
 
@@ -4382,6 +4440,7 @@ async function handleReplaceMembers(
     model?: string;
     effort?: EffortLevel;
     fastMode?: TeamFastMode;
+    mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
   }[] = [];
   for (const item of payload.members) {
     if (!item || typeof item !== 'object') {
@@ -4397,6 +4456,7 @@ async function handleReplaceMembers(
       model?: unknown;
       effort?: unknown;
       fastMode?: unknown;
+      mcpPolicy?: unknown;
     };
     const vName = validateTeammateName(m.name);
     if (!vName.valid) return { success: false, error: vName.error ?? 'Invalid member name' };
@@ -4449,6 +4509,7 @@ async function handleReplaceMembers(
       model: typeof m.model === 'string' ? m.model.trim() || undefined : undefined,
       effort: effortValidation.value,
       fastMode: fastModeValidation.value,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(m.mcpPolicy),
     });
   }
 
diff --git a/src/main/services/extensions/runtime/McpConfigStateReader.ts b/src/main/services/extensions/runtime/McpConfigStateReader.ts
index a9302277..15d0d66c 100644
--- a/src/main/services/extensions/runtime/McpConfigStateReader.ts
+++ b/src/main/services/extensions/runtime/McpConfigStateReader.ts
@@ -8,6 +8,11 @@ import type { InstalledMcpEntry } from '@shared/types/extensions';
 
 const logger = createLogger('Extensions:McpConfigStateReader');
 
+export interface ConfiguredMcpEntry extends InstalledMcpEntry {
+  scope: 'local' | 'user' | 'project';
+  config: Record<string, unknown>;
+}
+
 export class McpConfigStateReader {
   async readInstalled(projectPath?: string): Promise<InstalledMcpEntry[]> {
     const entries: InstalledMcpEntry[] = [];
@@ -23,6 +28,20 @@ export class McpConfigStateReader {
     return entries;
   }
 
+  async readConfigured(projectPath?: string): Promise<ConfiguredMcpEntry[]> {
+    const entries: ConfiguredMcpEntry[] = [];
+    const claudeConfig = await this.readClaudeConfig();
+
+    entries.push(...this.readConfiguredMcpServersFromConfig(claudeConfig?.mcpServers, 'user'));
+
+    if (projectPath) {
+      entries.push(...this.readLocalConfiguredMcpServers(claudeConfig, projectPath));
+      entries.push(...(await this.readProjectConfiguredMcpServers(projectPath)));
+    }
+
+    return entries;
+  }
+
   private async readClaudeConfig(): Promise<Record<string, unknown> | null> {
     const configPath = path.join(getHomeDir(), '.claude.json');
     try {
@@ -45,6 +64,15 @@ export class McpConfigStateReader {
     config: Record<string, unknown> | null,
     projectPath: string
   ): InstalledMcpEntry[] {
+    return this.readLocalConfiguredMcpServers(config, projectPath).map(
+      ({ config: _config, ...entry }) => entry
+    );
+  }
+
+  private readLocalConfiguredMcpServers(
+    config: Record<string, unknown> | null,
+    projectPath: string
+  ): ConfiguredMcpEntry[] {
     const projects =
       config && typeof config.projects === 'object' && config.projects
         ? (config.projects as Record<string, unknown>)
@@ -53,7 +81,7 @@ export class McpConfigStateReader {
       projects && typeof projects[projectPath] === 'object' && projects[projectPath]
         ? (projects[projectPath] as Record<string, unknown>)
         : null;
-    return this.readMcpServersFromConfig(projectConfig?.mcpServers, 'local');
+    return this.readConfiguredMcpServersFromConfig(projectConfig?.mcpServers, 'local');
   }
 
   private async readProjectMcpServers(projectPath: string): Promise<InstalledMcpEntry[]> {
@@ -61,6 +89,13 @@ export class McpConfigStateReader {
     return this.readMcpServersFromFile(configPath, 'project');
   }
 
+  private async readProjectConfiguredMcpServers(
+    projectPath: string
+  ): Promise<ConfiguredMcpEntry[]> {
+    const configPath = path.join(projectPath, '.mcp.json');
+    return this.readConfiguredMcpServersFromFile(configPath, 'project');
+  }
+
   private readMcpServersFromConfig(
     value: unknown,
     scope: 'user' | 'project' | 'local'
@@ -82,14 +117,47 @@ export class McpConfigStateReader {
     });
   }
 
+  private readConfiguredMcpServersFromConfig(
+    value: unknown,
+    scope: 'user' | 'project' | 'local'
+  ): ConfiguredMcpEntry[] {
+    const mcpServers =
+      value && typeof value === 'object' ? (value as Record<string, unknown>) : null;
+    if (!mcpServers) {
+      return [];
+    }
+
+    return Object.entries(mcpServers)
+      .filter((entry): entry is [string, Record<string, unknown>] => {
+        const [, config] = entry;
+        return Boolean(config && typeof config === 'object' && !Array.isArray(config));
+      })
+      .map(([name, config]): ConfiguredMcpEntry => {
+        let transport: string | undefined;
+        if (typeof config.command === 'string') transport = 'stdio';
+        else if (typeof config.url === 'string') transport = 'http';
+
+        return { name, scope, transport, config: { ...config } };
+      });
+  }
+
   private async readMcpServersFromFile(
     filePath: string,
     scope: 'user' | 'project'
   ): Promise<InstalledMcpEntry[]> {
+    return (await this.readConfiguredMcpServersFromFile(filePath, scope)).map(
+      ({ config: _config, ...entry }) => entry
+    );
+  }
+
+  private async readConfiguredMcpServersFromFile(
+    filePath: string,
+    scope: 'user' | 'project'
+  ): Promise<ConfiguredMcpEntry[]> {
     try {
       const raw = await fs.readFile(filePath, 'utf-8');
       const json = JSON.parse(raw) as Record<string, unknown>;
-      return this.readMcpServersFromConfig(json.mcpServers, scope);
+      return this.readConfiguredMcpServersFromConfig(json.mcpServers, scope);
     } catch (err) {
       if ((err as NodeJS.ErrnoException).code === 'ENOENT') {
         return [];
diff --git a/src/main/services/infrastructure/CliInstallerService.ts b/src/main/services/infrastructure/CliInstallerService.ts
index 4833861b..ee902cb7 100644
--- a/src/main/services/infrastructure/CliInstallerService.ts
+++ b/src/main/services/infrastructure/CliInstallerService.ts
@@ -734,6 +734,38 @@ export class CliInstallerService {
     };
   }
 
+  private getLatestProviderStatusForModelVerification(
+    providerId: CliProviderId,
+    binaryPath: string,
+    installedVersion: string | null
+  ): CliProviderStatus | null {
+    const snapshot = this.latestStatusSnapshot;
+    if (
+      !snapshot ||
+      snapshot.flavor !== 'agent_teams_orchestrator' ||
+      snapshot.binaryPath !== binaryPath ||
+      snapshot.installedVersion !== installedVersion
+    ) {
+      return null;
+    }
+
+    const provider =
+      cloneCliInstallationStatus(snapshot).providers.find(
+        (candidate) => candidate.providerId === providerId
+      ) ?? null;
+    if (
+      !provider ||
+      provider.models.length <= 0 ||
+      provider.supported !== true ||
+      provider.authenticated !== true ||
+      provider.capabilities.oneShot !== true
+    ) {
+      return null;
+    }
+
+    return provider;
+  }
+
   // ---------------------------------------------------------------------------
   // Public: getStatus
   // ---------------------------------------------------------------------------
@@ -844,10 +876,12 @@ export class CliInstallerService {
       return nextProviderStatus;
     }
 
-    const providerStatus = await this.multimodelBridgeService.getProviderStatus(
-      binaryPath,
-      providerId
-    );
+    const providerStatus =
+      this.getLatestProviderStatusForModelVerification(
+        providerId,
+        binaryPath,
+        versionProbe.version
+      ) ?? (await this.multimodelBridgeService.getProviderStatus(binaryPath, providerId));
     const nextProviderStatus = this.applyProviderModelAvailabilityToProvider(
       binaryPath,
       versionProbe.version,
diff --git a/src/main/services/infrastructure/NotificationManager.ts b/src/main/services/infrastructure/NotificationManager.ts
index 7b3bad30..9043cec7 100644
--- a/src/main/services/infrastructure/NotificationManager.ts
+++ b/src/main/services/infrastructure/NotificationManager.ts
@@ -1193,10 +1193,10 @@ export class NotificationManager extends EventEmitter {
     logger.debug(`[test-notification] creating Notification (platform=${process.platform})`);
     const notification = new NotificationClass({
       title: 'Test Notification',
-      ...(isMac ? { subtitle: 'Agent Teams UI' } : {}),
+      ...(isMac ? { subtitle: 'Agent Teams AI' } : {}),
       body: isMac
         ? 'Notifications are working correctly!'
-        : 'Agent Teams UI\nNotifications are working correctly!',
+        : 'Agent Teams AI\nNotifications are working correctly!',
       ...(iconPath ? { icon: iconPath } : {}),
     });
 
diff --git a/src/main/services/infrastructure/OpenCodeRuntimeInstallerService.ts b/src/main/services/infrastructure/OpenCodeRuntimeInstallerService.ts
index cabcc480..2d9ba36c 100644
--- a/src/main/services/infrastructure/OpenCodeRuntimeInstallerService.ts
+++ b/src/main/services/infrastructure/OpenCodeRuntimeInstallerService.ts
@@ -1,4 +1,5 @@
 import { execCli } from '@main/utils/childProcess';
+import { buildMergedCliPath } from '@main/utils/cliPathMerge';
 import { getAppDataPath } from '@main/utils/pathDecoder';
 import { safeSendToRenderer } from '@main/utils/safeWebContentsSend';
 import { getCachedShellEnv, resolveInteractiveShellEnvBestEffort } from '@main/utils/shellEnv';
@@ -142,6 +143,7 @@ function resolvePathOpenCodeBinary(
   const pathEntries = [
     ...additionalEnvSources.flatMap((env) => splitPathEnv(env?.PATH)),
     ...splitPathEnv(shellEnv.PATH),
+    ...splitPathEnv(buildMergedCliPath()),
     ...splitPathEnv(process.env.PATH),
   ];
   const seen = new Set<string>();
diff --git a/src/main/services/infrastructure/codexAppServer/CodexAppServerSessionFactory.ts b/src/main/services/infrastructure/codexAppServer/CodexAppServerSessionFactory.ts
index 8218e9a3..9d200b98 100644
--- a/src/main/services/infrastructure/codexAppServer/CodexAppServerSessionFactory.ts
+++ b/src/main/services/infrastructure/codexAppServer/CodexAppServerSessionFactory.ts
@@ -114,7 +114,7 @@ export class CodexAppServerSessionFactory {
       {
         clientInfo: {
           name: 'agent-teams-ai',
-          title: 'Agent Teams UI',
+          title: 'Agent Teams AI',
           version: '0.1.0',
         },
         capabilities: {
diff --git a/src/main/services/infrastructure/codexAppServer/CodexBinaryResolver.ts b/src/main/services/infrastructure/codexAppServer/CodexBinaryResolver.ts
index 0537b1ab..09bfa73e 100644
--- a/src/main/services/infrastructure/codexAppServer/CodexBinaryResolver.ts
+++ b/src/main/services/infrastructure/codexAppServer/CodexBinaryResolver.ts
@@ -9,13 +9,16 @@ import { buildMergedCliPath } from '@main/utils/cliPathMerge';
 import { getCachedShellEnv } from '@main/utils/shellEnv';
 
 const CACHE_VERIFY_TTL_MS = 30_000;
+const STALE_POSITIVE_CACHE_TTL_MS = 5 * 60_000;
 const VERSION_CACHE_TTL_MS = 30_000;
 const BINARY_LAUNCH_VERIFY_TIMEOUT_MS = 3_000;
 
 let cachedBinaryPath: string | null | undefined;
 let cacheVerifiedAt = 0;
+let cacheLaunchVerifiedAt = 0;
 let resolveInFlight: Promise<string | null> | null = null;
 let cachedMissHadShellEnv = false;
+let cachedPositiveIsStale = false;
 const versionCache = new Map<string, { version: string | null; observedAt: number }>();
 
 async function fileExists(filePath: string): Promise<boolean> {
@@ -117,29 +120,54 @@ async function verifyBinary(candidate: string): Promise<string | null> {
   return null;
 }
 
+async function canReuseStalePositiveBinary(
+  candidate: string | null,
+  launchVerifiedAt: number
+): Promise<boolean> {
+  if (
+    !candidate ||
+    launchVerifiedAt <= 0 ||
+    Date.now() - launchVerifiedAt > STALE_POSITIVE_CACHE_TTL_MS
+  ) {
+    return false;
+  }
+
+  return fileExists(candidate);
+}
+
 export class CodexBinaryResolver {
   static clearCache(): void {
     cachedBinaryPath = undefined;
     cacheVerifiedAt = 0;
+    cacheLaunchVerifiedAt = 0;
     resolveInFlight = null;
     cachedMissHadShellEnv = false;
+    cachedPositiveIsStale = false;
     versionCache.clear();
   }
 
   static async resolve(): Promise<string | null> {
+    let stalePositiveBinaryPath: string | null = null;
+    let stalePositiveLaunchVerifiedAt = 0;
+
     if (cachedBinaryPath !== undefined) {
       if (cachedBinaryPath === null) {
         if (!cachedMissHadShellEnv && getCachedShellEnv() !== null) {
           cachedBinaryPath = undefined;
           cacheVerifiedAt = 0;
+          cacheLaunchVerifiedAt = 0;
           cachedMissHadShellEnv = false;
+          cachedPositiveIsStale = false;
         } else {
           const verifiedAppManagedBinaryPath =
             await resolveVerifiedAppManagedCodexRuntimeBinaryPath();
           if (verifiedAppManagedBinaryPath) {
+            const now = Date.now();
             cachedBinaryPath = verifiedAppManagedBinaryPath;
-            cacheVerifiedAt = Date.now();
+            cacheVerifiedAt = now;
+            cacheLaunchVerifiedAt = now;
             cachedMissHadShellEnv = false;
+            cachedPositiveIsStale = false;
             return verifiedAppManagedBinaryPath;
           }
           if (Date.now() - cacheVerifiedAt <= CACHE_VERIFY_TTL_MS) {
@@ -147,22 +175,36 @@ export class CodexBinaryResolver {
           }
           cachedBinaryPath = undefined;
           cacheVerifiedAt = 0;
+          cacheLaunchVerifiedAt = 0;
           cachedMissHadShellEnv = false;
+          cachedPositiveIsStale = false;
         }
       } else {
-        if (Date.now() - cacheVerifiedAt <= CACHE_VERIFY_TTL_MS) {
+        const now = Date.now();
+        const stalePositiveIsStillAllowed =
+          !cachedPositiveIsStale || now - cacheLaunchVerifiedAt <= STALE_POSITIVE_CACHE_TTL_MS;
+        if (now - cacheVerifiedAt <= CACHE_VERIFY_TTL_MS && stalePositiveIsStillAllowed) {
           return cachedBinaryPath;
         }
 
-        const verified = await verifyBinary(cachedBinaryPath);
+        const cachedPositiveBinaryPath = cachedBinaryPath;
+        const cachedPositiveLaunchVerifiedAt = cacheLaunchVerifiedAt;
+        const verified = await verifyBinary(cachedPositiveBinaryPath);
         if (verified) {
-          cacheVerifiedAt = Date.now();
+          const verifiedAt = Date.now();
+          cacheVerifiedAt = verifiedAt;
+          cacheLaunchVerifiedAt = verifiedAt;
           cachedMissHadShellEnv = false;
+          cachedPositiveIsStale = false;
           return verified;
         }
 
+        stalePositiveBinaryPath = cachedPositiveBinaryPath;
+        stalePositiveLaunchVerifiedAt = cachedPositiveLaunchVerifiedAt;
         cachedBinaryPath = undefined;
         cacheVerifiedAt = 0;
+        cacheLaunchVerifiedAt = 0;
+        cachedPositiveIsStale = false;
       }
     }
 
@@ -172,7 +214,20 @@ export class CodexBinaryResolver {
       });
     }
 
-    return resolveInFlight;
+    const resolved = await resolveInFlight;
+    if (
+      !resolved &&
+      (await canReuseStalePositiveBinary(stalePositiveBinaryPath, stalePositiveLaunchVerifiedAt))
+    ) {
+      cachedBinaryPath = stalePositiveBinaryPath;
+      cacheVerifiedAt = Date.now();
+      cacheLaunchVerifiedAt = stalePositiveLaunchVerifiedAt;
+      cachedMissHadShellEnv = false;
+      cachedPositiveIsStale = true;
+      return stalePositiveBinaryPath;
+    }
+
+    return resolved;
   }
 
   private static async runResolve(): Promise<string | null> {
@@ -187,16 +242,21 @@ export class CodexBinaryResolver {
     for (const candidate of candidates) {
       const resolved = await verifyBinary(candidate);
       if (resolved) {
+        const now = Date.now();
         cachedBinaryPath = resolved;
-        cacheVerifiedAt = Date.now();
+        cacheVerifiedAt = now;
+        cacheLaunchVerifiedAt = now;
         cachedMissHadShellEnv = false;
+        cachedPositiveIsStale = false;
         return resolved;
       }
     }
 
     cachedBinaryPath = null;
     cacheVerifiedAt = Date.now();
+    cacheLaunchVerifiedAt = 0;
     cachedMissHadShellEnv = getCachedShellEnv() !== null;
+    cachedPositiveIsStale = false;
     return null;
   }
 
diff --git a/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.real.test.ts b/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.real.test.ts
new file mode 100644
index 00000000..e1e93fd3
--- /dev/null
+++ b/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.real.test.ts
@@ -0,0 +1,134 @@
+// @vitest-environment node
+import { chmod, mkdtemp, rm, unlink, writeFile } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@main/utils/cliPathMerge', () => ({
+  buildMergedCliPath: () => process.env.PATH ?? '',
+}));
+
+vi.mock('@main/utils/shellEnv', async (importOriginal) => {
+  const actual = await importOriginal<typeof import('@main/utils/shellEnv')>();
+  return {
+    ...actual,
+    getCachedShellEnv: () => null,
+  };
+});
+
+const originalPath = process.env.PATH;
+const originalCodexCliPath = process.env.CODEX_CLI_PATH;
+const originalFakeFailFile = process.env.CODEX_FAKE_CODEX_FAIL_FILE;
+const describePosix = process.platform === 'win32' ? describe.skip : describe;
+const LIVE_CODEX_BINARY_SMOKE = process.env.LIVE_CODEX_BINARY_RESOLVER_SMOKE === '1';
+const describeLive = LIVE_CODEX_BINARY_SMOKE ? describe : describe.skip;
+const BASE_TIME_MS = 1_767_225_600_000;
+
+let tempDirs: string[] = [];
+
+async function clearResolverCache(): Promise<void> {
+  const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+  CodexBinaryResolver.clearCache();
+}
+
+async function createFakeCodexBinary(): Promise<{
+  binaryPath: string;
+  failMarkerPath: string;
+}> {
+  const tempDir = await mkdtemp(path.join(os.tmpdir(), 'codex-binary-resolver-real-'));
+  tempDirs.push(tempDir);
+  const binaryPath = path.join(tempDir, 'codex');
+  const failMarkerPath = path.join(tempDir, 'fail');
+  await writeFile(
+    binaryPath,
+    [
+      '#!/bin/sh',
+      'if [ -n "$CODEX_FAKE_CODEX_FAIL_FILE" ] && [ -f "$CODEX_FAKE_CODEX_FAIL_FILE" ]; then',
+      '  echo "fake codex failure" >&2',
+      '  exit 42',
+      'fi',
+      'if [ "$1" = "--version" ]; then',
+      '  echo "codex-cli 99.0.0"',
+      '  exit 0',
+      'fi',
+      'echo "unexpected args: $*" >&2',
+      'exit 2',
+      '',
+    ].join('\n'),
+    'utf8'
+  );
+  await chmod(binaryPath, 0o755);
+  process.env.PATH = tempDir;
+  return { binaryPath, failMarkerPath };
+}
+
+afterEach(async () => {
+  vi.restoreAllMocks();
+  process.env.PATH = originalPath;
+  process.env.CODEX_CLI_PATH = originalCodexCliPath;
+  process.env.CODEX_FAKE_CODEX_FAIL_FILE = originalFakeFailFile;
+  await clearResolverCache();
+  await Promise.all(tempDirs.map((tempDir) => rm(tempDir, { recursive: true, force: true })));
+  tempDirs = [];
+});
+
+describePosix('CodexBinaryResolver real filesystem/process smoke', () => {
+  it('resolves an explicit executable through real fs access and execFile', async () => {
+    const { binaryPath, failMarkerPath } = await createFakeCodexBinary();
+    process.env.CODEX_CLI_PATH = binaryPath;
+    process.env.CODEX_FAKE_CODEX_FAIL_FILE = failMarkerPath;
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(binaryPath);
+    await expect(CodexBinaryResolver.resolveVersion(binaryPath)).resolves.toBe('99.0.0');
+  });
+
+  it('keeps a recent real executable during transient launch failure, then expires it', async () => {
+    const { binaryPath, failMarkerPath } = await createFakeCodexBinary();
+    process.env.CODEX_CLI_PATH = binaryPath;
+    process.env.CODEX_FAKE_CODEX_FAIL_FILE = failMarkerPath;
+    const nowSpy = vi.spyOn(Date, 'now');
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    nowSpy.mockReturnValue(BASE_TIME_MS);
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(binaryPath);
+
+    await writeFile(failMarkerPath, 'fail', 'utf8');
+    nowSpy.mockReturnValue(BASE_TIME_MS + 30_001);
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(binaryPath);
+
+    nowSpy.mockReturnValue(BASE_TIME_MS + 300_001);
+    await expect(CodexBinaryResolver.resolve()).resolves.toBeNull();
+  });
+
+  it('does not keep a recent real executable after it is removed', async () => {
+    const { binaryPath, failMarkerPath } = await createFakeCodexBinary();
+    process.env.CODEX_CLI_PATH = binaryPath;
+    process.env.CODEX_FAKE_CODEX_FAIL_FILE = failMarkerPath;
+    const nowSpy = vi.spyOn(Date, 'now');
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    nowSpy.mockReturnValue(BASE_TIME_MS);
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(binaryPath);
+
+    await unlink(binaryPath);
+    nowSpy.mockReturnValue(BASE_TIME_MS + 30_001);
+    await expect(CodexBinaryResolver.resolve()).resolves.toBeNull();
+  });
+});
+
+describeLive('CodexBinaryResolver live local Codex smoke', () => {
+  it('resolves and versions the current local Codex binary', async () => {
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    const binaryPath = await CodexBinaryResolver.resolve();
+    expect(binaryPath).toEqual(expect.any(String));
+    const version = await CodexBinaryResolver.resolveVersion(binaryPath);
+    expect(version).toEqual(expect.any(String));
+  });
+});
diff --git a/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.test.ts b/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.test.ts
index a1d4c07c..3dbc9481 100644
--- a/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.test.ts
+++ b/src/main/services/infrastructure/codexAppServer/__tests__/CodexBinaryResolver.test.ts
@@ -327,6 +327,137 @@ describe('CodexBinaryResolver', () => {
     expect(buildEnrichedEnvMock).toHaveBeenCalledWith(codexShim);
   });
 
+  it('reuses a recent known-good binary when revalidation transiently fails', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z'));
+    setPlatform('darwin');
+    process.env.PATH = '/usr/local/bin:/usr/bin:/bin';
+    const codexShim = path.posix.join('/usr/local/bin', 'codex');
+    let canLaunch = true;
+
+    accessMock.mockImplementation((filePath) => {
+      if (filePath === codexShim) {
+        return Promise.resolve();
+      }
+      return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
+    });
+    execCliMock.mockImplementation(() => {
+      if (canLaunch) {
+        return Promise.resolve({ stdout: 'codex-cli 0.130.0', stderr: '' });
+      }
+      return Promise.reject(new Error('codex --version timed out'));
+    });
+
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(codexShim);
+
+    canLaunch = false;
+    vi.advanceTimersByTime(30_001);
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(codexShim);
+  });
+
+  it('expires stale known-good reuse from the last real launch verification', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z'));
+    setPlatform('darwin');
+    process.env.PATH = '/usr/local/bin:/usr/bin:/bin';
+    const codexShim = path.posix.join('/usr/local/bin', 'codex');
+    let canLaunch = true;
+
+    accessMock.mockImplementation((filePath) => {
+      if (filePath === codexShim) {
+        return Promise.resolve();
+      }
+      return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
+    });
+    execCliMock.mockImplementation(() => {
+      if (canLaunch) {
+        return Promise.resolve({ stdout: 'codex-cli 0.130.0', stderr: '' });
+      }
+      return Promise.reject(new Error('codex --version timed out'));
+    });
+
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(codexShim);
+
+    canLaunch = false;
+    vi.advanceTimersByTime(290_000);
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(codexShim);
+
+    vi.advanceTimersByTime(10_001);
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBeNull();
+  });
+
+  it('prefers a newly resolved binary over stale known-good reuse', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z'));
+    setPlatform('darwin');
+    const oldCodexShim = path.posix.join('/old/bin', 'codex');
+    const newCodexShim = path.posix.join('/new/bin', 'codex');
+    process.env.PATH = '/old/bin:/usr/bin:/bin';
+    let oldCanLaunch = true;
+
+    accessMock.mockImplementation((filePath) => {
+      if (filePath === oldCodexShim || filePath === newCodexShim) {
+        return Promise.resolve();
+      }
+      return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
+    });
+    execCliMock.mockImplementation((binaryPath) => {
+      if (binaryPath === oldCodexShim) {
+        if (oldCanLaunch) {
+          return Promise.resolve({ stdout: 'codex-cli 0.130.0', stderr: '' });
+        }
+        return Promise.reject(new Error('old codex --version timed out'));
+      }
+      return Promise.resolve({ stdout: 'codex-cli 0.131.0', stderr: '' });
+    });
+
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(oldCodexShim);
+
+    oldCanLaunch = false;
+    process.env.PATH = '/new/bin:/usr/bin:/bin';
+    vi.advanceTimersByTime(30_001);
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(newCodexShim);
+  });
+
+  it('does not reuse a recent known-good binary after the file disappears', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-01-01T00:00:00.000Z'));
+    setPlatform('darwin');
+    process.env.PATH = '/usr/local/bin:/usr/bin:/bin';
+    const codexShim = path.posix.join('/usr/local/bin', 'codex');
+    let filePresent = true;
+
+    accessMock.mockImplementation((filePath) => {
+      if (filePath === codexShim && filePresent) {
+        return Promise.resolve();
+      }
+      return Promise.reject(Object.assign(new Error('ENOENT'), { code: 'ENOENT' }));
+    });
+
+    const { CodexBinaryResolver } = await import('../CodexBinaryResolver');
+    CodexBinaryResolver.clearCache();
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBe(codexShim);
+
+    filePresent = false;
+    vi.advanceTimersByTime(30_001);
+
+    await expect(CodexBinaryResolver.resolve()).resolves.toBeNull();
+  });
+
   it('uses enriched env for Codex version probes', async () => {
     setPlatform('darwin');
     const codexShim = path.posix.join('/usr/local/bin', 'codex');
diff --git a/src/main/services/runtime/ClaudeMultimodelBridgeService.ts b/src/main/services/runtime/ClaudeMultimodelBridgeService.ts
index efdb8ddd..26ded7a1 100644
--- a/src/main/services/runtime/ClaudeMultimodelBridgeService.ts
+++ b/src/main/services/runtime/ClaudeMultimodelBridgeService.ts
@@ -679,6 +679,11 @@ export class ClaudeMultimodelBridgeService {
 
   private readonly providerStatusHydrationGenerations = new Map<CliProviderId, number>();
 
+  private readonly providerStatusHydrationInFlight = new Map<
+    CliProviderId,
+    { readonly generation: number; readonly promise: Promise<CliProviderStatus> }
+  >();
+
   private beginProviderStatusHydration(providerIds: readonly CliProviderId[]): number {
     const generation = ++this.providerStatusHydrationGeneration;
     for (const providerId of providerIds) {
@@ -691,6 +696,38 @@ export class ClaudeMultimodelBridgeService {
     return this.providerStatusHydrationGenerations.get(providerId) === generation;
   }
 
+  private getProviderCatalogHydration(
+    binaryPath: string,
+    providerId: CliProviderId,
+    generation: number
+  ): Promise<CliProviderStatus | null> {
+    const inFlight = this.providerStatusHydrationInFlight.get(providerId);
+    if (inFlight) {
+      if (inFlight.generation === generation) {
+        return inFlight.promise;
+      }
+
+      return inFlight.promise
+        .catch(() => undefined)
+        .then(() => {
+          if (!this.isProviderStatusHydrationCurrent(providerId, generation)) {
+            return null;
+          }
+          return this.getProviderCatalogHydration(binaryPath, providerId, generation);
+        });
+    }
+
+    const request = this.getProviderStatusFromScopedRuntimeStatus(binaryPath, providerId).finally(
+      () => {
+        if (this.providerStatusHydrationInFlight.get(providerId)?.promise === request) {
+          this.providerStatusHydrationInFlight.delete(providerId);
+        }
+      }
+    );
+    this.providerStatusHydrationInFlight.set(providerId, { generation, promise: request });
+    return request;
+  }
+
   private async buildCliEnv(
     binaryPath: string
   ): Promise<Awaited<ReturnType<typeof buildProviderAwareCliEnv>>> {
@@ -708,18 +745,23 @@ export class ClaudeMultimodelBridgeService {
     });
   }
 
-  private isUnifiedRuntimeUnsupported(error: unknown): boolean {
+  private isRuntimeStatusCompatibilityError(error: unknown): boolean {
     const message = error instanceof Error ? error.message : String(error);
     const lower = message.toLowerCase();
     return (
       lower.includes('unknown command') ||
       lower.includes('unknown option') ||
       lower.includes('no such command') ||
-      lower.includes('did you mean') ||
-      lower.includes('runtime status')
+      lower.includes('did you mean')
     );
   }
 
+  private isUnifiedRuntimeUnsupported(error: unknown): boolean {
+    const message = error instanceof Error ? error.message : String(error);
+    const lower = message.toLowerCase();
+    return this.isRuntimeStatusCompatibilityError(error) || lower.includes('runtime status');
+  }
+
   private mapRuntimeProviderStatus(
     providerId: CliProviderId,
     runtimeStatus: NonNullable<UnifiedRuntimeStatusResponse['providers']>[string] | undefined
@@ -961,8 +1003,11 @@ export class ClaudeMultimodelBridgeService {
         continue;
       }
 
-      void this.getProviderStatusFromScopedRuntimeStatus(binaryPath, liveProvider.providerId)
+      void this.getProviderCatalogHydration(binaryPath, liveProvider.providerId, generation)
         .then((hydratedProvider) => {
+          if (!hydratedProvider) {
+            return;
+          }
           if (!this.isProviderStatusHydrationCurrent(liveProvider.providerId, generation)) {
             return;
           }
@@ -1100,8 +1145,11 @@ export class ClaudeMultimodelBridgeService {
         summary: true,
       });
       if (provider.runtimeCapabilities?.modelCatalog?.dynamic === true && onCatalogUpdate) {
-        void this.getProviderStatusFromScopedRuntimeStatus(binaryPath, provider.providerId)
+        void this.getProviderCatalogHydration(binaryPath, provider.providerId, generation)
           .then((hydratedProvider) => {
+            if (!hydratedProvider) {
+              return;
+            }
             if (!this.isProviderStatusHydrationCurrent(provider.providerId, generation)) {
               return;
             }
@@ -1124,24 +1172,35 @@ export class ClaudeMultimodelBridgeService {
       }
       return provider;
     } catch (error) {
-      if (!this.isUnifiedRuntimeUnsupported(error)) {
+      if (providerId === 'gemini' && this.isRuntimeStatusCompatibilityError(error)) {
+        return this.buildGeminiStatus(binaryPath);
+      }
+
+      if (this.isRuntimeStatusCompatibilityError(error)) {
         logger.warn(
           `Provider-scoped summary runtime status unavailable for ${providerId}, falling back to full probe: ${
             error instanceof Error ? error.message : String(error)
           }`
         );
+        try {
+          return await this.getProviderStatusFromScopedRuntimeStatus(binaryPath, providerId);
+        } catch (fullError) {
+          logger.warn(
+            `Provider-scoped full runtime status unavailable for ${providerId}, returning scoped error: ${
+              fullError instanceof Error ? fullError.message : String(fullError)
+            }`
+          );
+          return createRuntimeStatusErrorProviderStatus(providerId, fullError);
+        }
       }
-    }
 
-    if (providerId === 'gemini') {
-      return this.buildGeminiStatus(binaryPath);
+      logger.warn(
+        `Provider-scoped summary runtime status unavailable for ${providerId}, returning scoped error: ${
+          error instanceof Error ? error.message : String(error)
+        }`
+      );
+      return createRuntimeStatusErrorProviderStatus(providerId, error);
     }
-
-    const providers = await this.getProviderStatuses(binaryPath);
-    return (
-      providers.find((provider) => provider.providerId === providerId) ??
-      createDefaultProviderStatus(providerId)
-    );
   }
 
   async verifyProviderStatus(
diff --git a/src/main/services/team/TeamConfigReader.ts b/src/main/services/team/TeamConfigReader.ts
index 4d217aef..158224cf 100644
--- a/src/main/services/team/TeamConfigReader.ts
+++ b/src/main/services/team/TeamConfigReader.ts
@@ -2,6 +2,7 @@ import { FileReadTimeoutError, readFileUtf8WithTimeout } from '@main/utils/fsRea
 import { getTeamsBasePath } from '@main/utils/pathDecoder';
 import { isLeadMember } from '@shared/utils/leadDetection';
 import { createLogger } from '@shared/utils/logger';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import {
   createCliAutoSuffixNameGuard,
   createCliProvisionerNameGuard,
@@ -559,6 +560,7 @@ export class TeamConfigReader {
           name: existing?.name ?? name,
           role: m.role?.trim() || existing?.role,
           color: m.color?.trim() || existing?.color,
+          mcpPolicy: normalizeTeamMemberMcpPolicy(m.mcpPolicy) ?? existing?.mcpPolicy,
         });
       };
 
diff --git a/src/main/services/team/TeamDataService.ts b/src/main/services/team/TeamDataService.ts
index 80f470f8..5076572e 100644
--- a/src/main/services/team/TeamDataService.ts
+++ b/src/main/services/team/TeamDataService.ts
@@ -18,6 +18,7 @@ import { getReviewStateFromTask } from '@shared/utils/reviewState';
 import { buildStandaloneSlashCommandMeta } from '@shared/utils/slashCommands';
 import { formatTaskDisplayLabel } from '@shared/utils/taskIdentity';
 import { buildTeamMemberColorMap } from '@shared/utils/teamMemberColors';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { parseNumericSuffixName, validateTeamMemberNameFormat } from '@shared/utils/teamMemberName';
 import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
 import { extractToolPreview, formatToolSummaryFromCalls } from '@shared/utils/toolSummary';
@@ -998,6 +999,7 @@ export class TeamDataService {
         model: member.model,
         effort: member.effort,
         fastMode: member.fastMode,
+        mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
       })),
     };
   }
@@ -1812,6 +1814,7 @@ export class TeamDataService {
       providerId: normalizeOptionalTeamProviderId(request.providerId),
       model: request.model?.trim() || undefined,
       effort: isTeamEffortLevel(request.effort) ? request.effort : undefined,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(request.mcpPolicy),
       agentType: 'general-purpose',
       joinedAt: Date.now(),
     };
@@ -1888,6 +1891,7 @@ export class TeamDataService {
             member.fastMode === 'inherit' || member.fastMode === 'on' || member.fastMode === 'off'
               ? member.fastMode
               : undefined,
+          mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
           agentType: prev?.agentType ?? 'general-purpose',
           agentId: isSameActiveMember ? prev?.agentId : undefined,
           color: prev?.color,
@@ -3011,6 +3015,7 @@ export class TeamDataService {
         model: member.model?.trim() || undefined,
         effort: isTeamEffortLevel(member.effort) ? member.effort : undefined,
         fastMode: member.fastMode,
+        mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
         agentType: 'general-purpose' as const,
         joinedAt,
       }))
diff --git a/src/main/services/team/TeamLaunchFailureArtifactPack.ts b/src/main/services/team/TeamLaunchFailureArtifactPack.ts
index 1313fbc6..b8213729 100644
--- a/src/main/services/team/TeamLaunchFailureArtifactPack.ts
+++ b/src/main/services/team/TeamLaunchFailureArtifactPack.ts
@@ -219,6 +219,35 @@ function firstEvidence(parts: readonly string[], pattern: RegExp): string[] {
 const WORKSPACE_TRUST_FAILURE_PATTERN =
   /workspace trust is not accepted|cannot start in headless process runtime because workspace trust|open that workspace once interactively and accept trust|workspace_trust_preflight_not_confirmed|workspace trust was not confirmed|workspace trust preflight blocked launch/i;
 
+const BOOTSTRAP_TRANSPORT_EVIDENCE_PATTERN = new RegExp(
+  [
+    'mailbox_bootstrap_written',
+    'bootstrap_prompt_observed',
+    'bootstrap_submit_attempted',
+    'bootstrap_submitted',
+    'inbox_poller_ready',
+    'runtime_events_log',
+  ].join('|'),
+  'i'
+);
+
+const MODEL_NO_BOOTSTRAP_PATTERN = new RegExp(
+  [
+    'did not bootstrap-confirm',
+    'bootstrap unconfirmed',
+    'bootstrap-confirm before timeout',
+    'bootstrap was not confirmed',
+    'bootstrap not confirmed',
+    'check-in not yet received',
+    'bootstrap_stalled',
+    'did not submit bootstrap prompt',
+    'bootstrap_submit_accepted_without_uuid',
+    'timed out waiting for bootstrap_submitted',
+    'last transport stage:\\s*(?:mailbox_bootstrap_written|bootstrap_prompt_observed|bootstrap_submit_attempted|bootstrap_submitted)',
+  ].join('|'),
+  'i'
+);
+
 export function isWorkspaceTrustLaunchFailureText(value: string): boolean {
   return WORKSPACE_TRUST_FAILURE_PATTERN.test(value);
 }
@@ -228,6 +257,7 @@ export function classifyLaunchFailureArtifact(
 ): LaunchFailureArtifactClassification {
   const parts = collectLaunchFailureSearchParts(input);
   const text = parts.join('\n').toLowerCase();
+  const hasBootstrapTransportEvidence = BOOTSTRAP_TRANSPORT_EVIDENCE_PATTERN.test(text);
   const candidates: {
     code: LaunchFailureArtifactClassificationCode;
     confidence: number;
@@ -268,8 +298,7 @@ export function classifyLaunchFailureArtifact(
     {
       code: 'model_no_bootstrap',
       confidence: 0.82,
-      pattern:
-        /did not bootstrap-confirm|bootstrap unconfirmed|bootstrap-confirm before timeout|bootstrap was not confirmed|bootstrap not confirmed|check-in not yet received|bootstrap_stalled/i,
+      pattern: MODEL_NO_BOOTSTRAP_PATTERN,
     },
     {
       code: 'process_exited',
@@ -279,6 +308,9 @@ export function classifyLaunchFailureArtifact(
   ];
 
   for (const candidate of candidates) {
+    if (candidate.code === 'stdin_missing' && hasBootstrapTransportEvidence) {
+      continue;
+    }
     if (candidate.pattern.test(text)) {
       return {
         code: candidate.code,
@@ -305,24 +337,29 @@ export function extractLaunchBootstrapTransportBreadcrumb(
   ];
   const evidence = firstEvidence(
     parts,
-    /bootstrap_submit_|last transport stage|no stdin data received|local prompt handler/i
+    /bootstrap_submit_|mailbox_bootstrap_written|bootstrap_prompt_observed|bootstrap_submitted|last transport stage|no stdin data received|local prompt handler/i
   ).map(redactLaunchFailureArtifactText);
   const retryableRaw = retryableMatches.at(-1)?.[1]?.toLowerCase();
   return {
-    lastTransportStage: lastStageMatches.at(-1)?.[1]?.trim() ?? null,
+    lastTransportStage: normalizeLastTransportStage(lastStageMatches.at(-1)?.[1]),
     submitRejected: /bootstrap_submit_rejected|submit rejected by local prompt handler/i.test(
       combined
     ),
     retryable: retryableRaw === 'true' ? true : retryableRaw === 'false' ? false : null,
     noStdinWarning: /no stdin data received|proceeding without it/i.test(combined),
     bootstrapSubmitted:
-      /(?:event["']?\s*:\s*["']bootstrap_submitted["']|bootstrap_submit_accepted|bootstrap submitted)/i.test(
+      /(?:(?:event|type)["']?\s*[:=]\s*["']bootstrap_submitted["']|bootstrap_submit_accepted|bootstrap submitted)/i.test(
         combined
       ),
     evidence,
   };
 }
 
+function normalizeLastTransportStage(stage: string | undefined): string | null {
+  const normalized = stage?.replace(/\s+Last\s+(?:stderr|stdout):.*$/i, '').trim();
+  return normalized || null;
+}
+
 async function readBoundedTextFile(sourcePath: string): Promise<{ text?: string; issue?: string }> {
   try {
     const stat = await fs.promises.stat(sourcePath);
diff --git a/src/main/services/team/TeamMcpConfigBuilder.ts b/src/main/services/team/TeamMcpConfigBuilder.ts
index c0562397..1005b769 100644
--- a/src/main/services/team/TeamMcpConfigBuilder.ts
+++ b/src/main/services/team/TeamMcpConfigBuilder.ts
@@ -7,12 +7,17 @@ import {
 } from '@main/utils/pathDecoder';
 import { resolveInteractiveShellEnv } from '@main/utils/shellEnv';
 import { createLogger } from '@shared/utils/logger';
+import { resolveTeamMemberMcpScopes } from '@shared/utils/teamMemberMcpPolicy';
 import { randomUUID } from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
 
+import { McpConfigStateReader } from '../extensions/runtime/McpConfigStateReader';
+
 import { atomicWriteAsync } from './atomicWrite';
 
+import type { TeamMemberMcpPolicy, TeamMemberMcpScope } from '@shared/types';
+
 export interface McpLaunchSpec {
   command: string;
   args: string[];
@@ -27,6 +32,10 @@ export interface McpLaunchSpecResolveOptions {
   onProgress?: (progress: McpLaunchSpecResolveProgress) => void;
 }
 
+interface WriteMcpConfigOptions {
+  mcpPolicy?: TeamMemberMcpPolicy;
+}
+
 const MCP_SERVER_NAME = 'agent-teams';
 const MCP_CLAUDE_DIR_ENV = 'AGENT_TEAMS_MCP_CLAUDE_DIR';
 const logger = createLogger('Service:TeamMcpConfigBuilder');
@@ -43,6 +52,8 @@ const MCP_CONFIG_STALE_MAX_AGE_MS = 7 * 24 * 60 * 60 * 1000;
 
 type McpServerConfig = Record<string, unknown>;
 
+const MCP_CONFIG_SCOPE_PRECEDENCE: readonly TeamMemberMcpScope[] = ['user', 'project', 'local'];
+
 function isPackagedApp(): boolean {
   try {
     const { app } = require('electron') as typeof import('electron');
@@ -417,26 +428,42 @@ export async function resolveAgentTeamsMcpLaunchSpec(
 }
 
 export class TeamMcpConfigBuilder {
-  async writeConfigFile(_projectPath?: string): Promise<string> {
+  async writeConfigFile(projectPath?: string, options?: WriteMcpConfigOptions): Promise<string>;
+  async writeConfigFile(projectPath?: string, mcpPolicy?: TeamMemberMcpPolicy): Promise<string>;
+  async writeConfigFile(
+    projectPath?: string,
+    optionsOrPolicy?: WriteMcpConfigOptions | TeamMemberMcpPolicy
+  ): Promise<string> {
     const launchSpec = await resolveAgentTeamsMcpLaunchSpec();
     const configDir = getMcpConfigsBasePath();
     const configPath = path.join(
       configDir,
       `${MCP_CONFIG_PREFIX}${process.pid}-${Date.now()}-${randomUUID()}.json`
     );
+    const mcpPolicy =
+      optionsOrPolicy && 'mcpPolicy' in optionsOrPolicy
+        ? optionsOrPolicy.mcpPolicy
+        : (optionsOrPolicy as TeamMemberMcpPolicy | undefined);
     // Keep the team bootstrap config minimal: recent Claude sidechain runs can
     // lose the agent-teams tool surface when we inline large user MCP bundles
     // into the generated --mcp-config. User/project/local MCP remain loaded
     // through Claude's native settings sources.
-    const generatedServers: Record<string, McpServerConfig> = {
-      [MCP_SERVER_NAME]: {
-        command: launchSpec.command,
-        args: launchSpec.args,
-        env: {
-          [MCP_CLAUDE_DIR_ENV]: getClaudeBasePath(),
-        },
+    const generatedServers: Record<string, McpServerConfig> = Object.create(null);
+    generatedServers[MCP_SERVER_NAME] = {
+      command: launchSpec.command,
+      args: launchSpec.args,
+      enabled: true,
+      env: {
+        [MCP_CLAUDE_DIR_ENV]: getClaudeBasePath(),
       },
     };
+    if (mcpPolicy?.mode === 'strictAllowlist') {
+      for (const [name, config] of Object.entries(
+        await this.readAllowlistedServers(projectPath, mcpPolicy)
+      )) {
+        generatedServers[name] = config;
+      }
+    }
 
     await fs.promises.mkdir(configDir, { recursive: true });
     await atomicWriteAsync(
@@ -453,6 +480,47 @@ export class TeamMcpConfigBuilder {
     return configPath;
   }
 
+  private async readAllowlistedServers(
+    projectPath: string | undefined,
+    policy: TeamMemberMcpPolicy
+  ): Promise<Record<string, McpServerConfig>> {
+    const allowlist = new Set(
+      (policy.serverNames ?? [])
+        .map((name) => name.trim())
+        .filter(Boolean)
+        .map((name) => name.toLowerCase())
+    );
+    if (allowlist.size === 0) {
+      return {};
+    }
+
+    const scopes = resolveTeamMemberMcpScopes(policy);
+    const entries = await new McpConfigStateReader().readConfigured(projectPath);
+    const byScope = new Map<TeamMemberMcpScope, typeof entries>();
+    for (const scope of MCP_CONFIG_SCOPE_PRECEDENCE) {
+      byScope.set(scope, []);
+    }
+    for (const entry of entries) {
+      if (!scopes[entry.scope]) {
+        continue;
+      }
+      byScope.get(entry.scope)?.push(entry);
+    }
+
+    const selected: Record<string, McpServerConfig> = Object.create(null);
+    for (const scope of MCP_CONFIG_SCOPE_PRECEDENCE) {
+      for (const entry of byScope.get(scope) ?? []) {
+        if (entry.name.toLowerCase() === MCP_SERVER_NAME) {
+          continue;
+        }
+        if (allowlist.has(entry.name.toLowerCase())) {
+          selected[entry.name] = entry.config;
+        }
+      }
+    }
+    return selected;
+  }
+
   /** Delete a single MCP config file (best-effort). */
   async removeConfigFile(configPath: string): Promise<void> {
     for (let attempt = 0; attempt <= MCP_CONFIG_REMOVE_RETRY_DELAYS_MS.length; attempt += 1) {
diff --git a/src/main/services/team/TeamMemberResolver.ts b/src/main/services/team/TeamMemberResolver.ts
index a2b36bfb..de9c8394 100644
--- a/src/main/services/team/TeamMemberResolver.ts
+++ b/src/main/services/team/TeamMemberResolver.ts
@@ -2,6 +2,7 @@ import { buildPlannedMemberLaneIdentity } from '@features/team-runtime-lanes';
 import { getMemberColorByName } from '@shared/constants/memberColors';
 import { migrateProviderBackendId } from '@shared/utils/providerBackend';
 import { buildTeamMemberColorMap } from '@shared/utils/teamMemberColors';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import {
   createCliAutoSuffixNameGuard,
   createCliProvisionerNameGuard,
@@ -163,6 +164,7 @@ export class TeamMemberResolver {
         model?: string;
         effort?: TeamMember['effort'];
         fastMode?: TeamMember['fastMode'];
+        mcpPolicy?: TeamMember['mcpPolicy'];
         color?: string;
         cwd?: string;
       }
@@ -190,6 +192,7 @@ export class TeamMemberResolver {
               configMember.fastMode === 'off'
                 ? configMember.fastMode
                 : undefined,
+            mcpPolicy: normalizeTeamMemberMcpPolicy(configMember.mcpPolicy),
             color: configMember.color,
             cwd: configMember.cwd,
           });
@@ -210,6 +213,7 @@ export class TeamMemberResolver {
         model?: string;
         effort?: TeamMember['effort'];
         fastMode?: TeamMember['fastMode'];
+        mcpPolicy?: TeamMember['mcpPolicy'];
         color?: string;
         cwd?: string;
         removedAt?: number;
@@ -235,6 +239,7 @@ export class TeamMemberResolver {
               member.fastMode === 'inherit' || member.fastMode === 'on' || member.fastMode === 'off'
                 ? member.fastMode
                 : undefined,
+            mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
             color: member.color,
             cwd: member.cwd,
             removedAt: member.removedAt,
@@ -324,6 +329,7 @@ export class TeamMemberResolver {
         providerBackendId,
         model: launchMember?.model ?? configMember?.model ?? metaMember?.model,
         effort: launchMember?.effort ?? configMember?.effort ?? metaMember?.effort,
+        mcpPolicy: configMember?.mcpPolicy ?? metaMember?.mcpPolicy,
         selectedFastMode:
           launchMember?.selectedFastMode ??
           configMember?.fastMode ??
diff --git a/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts b/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
index 4e89a2af..c95de073 100644
--- a/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
+++ b/src/main/services/team/TeamMemberRuntimeAdvisoryService.ts
@@ -498,20 +498,12 @@ export class TeamMemberRuntimeAdvisoryService {
           getOpenCodeRuntimeDeliveryRecordTimeMs(right) -
           getOpenCodeRuntimeDeliveryRecordTimeMs(left)
       );
-    const latestSuccess = ordered.find(isTerminalSuccessfulOpenCodeDeliveryRecord);
     const latestError = ordered.find((record) => {
       return this.isOpenCodeDeliveryAdvisoryCandidate(record, now);
     });
     if (!latestError) {
       return null;
     }
-    if (
-      latestSuccess &&
-      getOpenCodeRuntimeDeliveryRecordTimeMs(latestSuccess) >
-        getOpenCodeRuntimeDeliveryRecordTimeMs(latestError)
-    ) {
-      return null;
-    }
 
     const decision = decideOpenCodeRuntimeDeliveryAdvisory({
       record: latestError,
diff --git a/src/main/services/team/TeamMembersMetaStore.ts b/src/main/services/team/TeamMembersMetaStore.ts
index 63d201c5..d1d6b3be 100644
--- a/src/main/services/team/TeamMembersMetaStore.ts
+++ b/src/main/services/team/TeamMembersMetaStore.ts
@@ -2,6 +2,7 @@ import { FileReadTimeoutError, readFileUtf8WithTimeout } from '@main/utils/fsRea
 import { getTeamsBasePath } from '@main/utils/pathDecoder';
 import { isTeamEffortLevel } from '@shared/utils/effortLevels';
 import { migrateProviderBackendId } from '@shared/utils/providerBackend';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { createCliAutoSuffixNameGuard } from '@shared/utils/teamMemberName';
 import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
 import * as fs from 'fs';
@@ -50,6 +51,7 @@ function normalizeMember(member: TeamMember): TeamMember | null {
     model: typeof member.model === 'string' ? member.model.trim() || undefined : undefined,
     effort: isTeamEffortLevel(member.effort) ? member.effort : undefined,
     fastMode: normalizeFastMode(member.fastMode),
+    mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
     agentType:
       typeof member.agentType === 'string' ? member.agentType.trim() || undefined : undefined,
     color: typeof member.color === 'string' ? member.color.trim() || undefined : undefined,
diff --git a/src/main/services/team/TeamProvisioningService.ts b/src/main/services/team/TeamProvisioningService.ts
index 1f8fe493..4add31bf 100644
--- a/src/main/services/team/TeamProvisioningService.ts
+++ b/src/main/services/team/TeamProvisioningService.ts
@@ -7,6 +7,7 @@ import {
   type OpenCodeFilePart,
 } from '@features/agent-attachments/main';
 import {
+  resolveAnthropicEffortSupport,
   resolveAnthropicFastMode,
   resolveAnthropicRuntimeSelection,
 } from '@features/anthropic-runtime-profile/main';
@@ -127,6 +128,11 @@ import {
   type ParsedTeammateContent,
 } from '@shared/utils/teammateMessageParser';
 import { buildTeamMemberColorMap } from '@shared/utils/teamMemberColors';
+import {
+  buildTeamMemberMcpSettingSources,
+  normalizeTeamMemberMcpPolicy,
+  requiresStrictTeamMemberMcpConfig,
+} from '@shared/utils/teamMemberMcpPolicy';
 import { createCliAutoSuffixNameGuard, parseNumericSuffixName } from '@shared/utils/teamMemberName';
 import {
   inferTeamProviderIdFromModel,
@@ -568,6 +574,7 @@ import type {
   TeamMember,
   TeamProviderBackendId,
   TeamProviderId,
+  TeamProvisioningModelCheckRequest,
   TeamProvisioningModelVerificationMode,
   TeamProvisioningPrepareIssue,
   TeamProvisioningPrepareResult,
@@ -1328,6 +1335,11 @@ interface RuntimeProviderLaunchFacts {
     | null;
 }
 
+interface ProviderSelectedModelCheck {
+  modelId: string;
+  effort?: EffortLevel;
+}
+
 function extractJsonObjectFromCli<T>(raw: string): T {
   const trimmed = raw.trim();
   try {
@@ -1389,6 +1401,58 @@ function normalizeProviderModelListModels(
   return models;
 }
 
+function normalizeProviderSelectedModelChecks(
+  modelIds: readonly string[],
+  modelChecks?: readonly ProviderSelectedModelCheck[]
+): ProviderSelectedModelCheck[] {
+  const checks: ProviderSelectedModelCheck[] =
+    modelChecks && modelChecks.length > 0
+      ? [...modelChecks]
+      : modelIds.map((modelId) => ({ modelId }));
+  const seen = new Set<string>();
+  const normalized: ProviderSelectedModelCheck[] = [];
+  for (const check of checks) {
+    const modelId = check.modelId.trim();
+    if (!modelId) {
+      continue;
+    }
+    const key = `${modelId}\n${check.effort ?? ''}`;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    normalized.push({
+      modelId,
+      ...(check.effort ? { effort: check.effort } : {}),
+    });
+  }
+  return normalized;
+}
+
+function normalizeProvisioningModelCheckRequests(
+  checks: readonly TeamProvisioningModelCheckRequest[] | undefined
+): TeamProvisioningModelCheckRequest[] {
+  const seen = new Set<string>();
+  const normalized: TeamProvisioningModelCheckRequest[] = [];
+  for (const check of checks ?? []) {
+    const model = check.model.trim();
+    if (!model) {
+      continue;
+    }
+    const key = `${check.providerId}\n${model}\n${check.effort ?? ''}`;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    normalized.push({
+      providerId: check.providerId,
+      model,
+      ...(check.effort ? { effort: check.effort } : {}),
+    });
+  }
+  return normalized;
+}
+
 function addModelCatalogLaunchModels(
   modelIds: Set<string>,
   catalog: CliProviderModelCatalog
@@ -1444,7 +1508,7 @@ function getAnthropicFastModeDefault(): boolean {
 function resolveAnthropicSelectionFromFacts(params: {
   selectedModel?: string;
   limitContext?: boolean;
-  facts: Pick<RuntimeProviderLaunchFacts, 'modelCatalog' | 'runtimeCapabilities'>;
+  facts: Pick<RuntimeProviderLaunchFacts, 'modelCatalog' | 'modelIds' | 'runtimeCapabilities'>;
 }) {
   return resolveAnthropicRuntimeSelection({
     source: {
@@ -1453,9 +1517,33 @@ function resolveAnthropicSelectionFromFacts(params: {
     },
     selectedModel: params.selectedModel,
     limitContext: params.limitContext === true,
+    availableLaunchModels: params.facts.modelCatalog ? undefined : params.facts.modelIds,
   });
 }
 
+function formatAnthropicEffortSupportFailure(params: {
+  effort: EffortLevel;
+  modelLabel: string;
+  supportedEfforts?: readonly EffortLevel[];
+  kind:
+    | 'unsupported-by-catalog'
+    | 'unsupported-by-runtime-capability'
+    | 'unverified-catalog-missing';
+}): string {
+  if (params.kind === 'unverified-catalog-missing') {
+    return `Anthropic runtime catalog was unavailable, so effort "${params.effort}" for ${params.modelLabel} could not be verified.`;
+  }
+
+  const supported = params.supportedEfforts?.length
+    ? ` Supported efforts: ${params.supportedEfforts.join(', ')}.`
+    : '';
+  const runtimeSuffix =
+    params.kind === 'unsupported-by-runtime-capability'
+      ? ' in the current runtime capability data'
+      : ' in the current runtime';
+  return `${params.modelLabel} does not support Anthropic effort "${params.effort}"${runtimeSuffix}.${supported}`;
+}
+
 function resolveCodexSelectionFromFacts(params: {
   selectedModel?: string;
   providerBackendId?: TeamCreateRequest['providerBackendId'];
@@ -1697,7 +1785,7 @@ function isPureOpenCodeProvisioningRequest(request: {
 export function getOpenCodeMixedProviderProvisioningError(): string {
   return (
     'This OpenCode mixed-team request is outside the current support scope. ' +
-    'Supported mixed teams keep the lead on Anthropic, Codex, or Gemini. OpenCode-led mixed teams still remain blocked in this phase.'
+    'Supported mixed teams keep the lead on Anthropic or Codex. OpenCode-led mixed teams still remain blocked in this phase.'
   );
 }
 
@@ -1757,7 +1845,7 @@ function mergeProvisioningWarnings(
 }
 
 const DETERMINISTIC_BOOTSTRAP_LARGE_TEAM_WARNING_THRESHOLD = 8;
-const DETERMINISTIC_BOOTSTRAP_MAX_PRIMARY_MEMBERS = 16;
+const DETERMINISTIC_BOOTSTRAP_MAX_PRIMARY_MEMBERS = 20;
 
 function buildLargeDeterministicBootstrapWarning(memberCount: number): string | null {
   if (memberCount <= DETERMINISTIC_BOOTSTRAP_LARGE_TEAM_WARNING_THRESHOLD) {
@@ -2049,6 +2137,8 @@ interface ProvisioningRun {
   firstRealTurnSucceeded: boolean;
   /** Path to the generated MCP config file for later cleanup. */
   mcpConfigPath: string | null;
+  /** Paths to per-member generated MCP config files consumed by deterministic bootstrap. */
+  memberMcpConfigPaths: string[];
   /** Path to the deterministic bootstrap spec file for later cleanup. */
   bootstrapSpecPath: string | null;
   /** Path to the deferred first-user-task file consumed by runtime after bootstrap. */
@@ -2145,8 +2235,8 @@ interface ProvisioningRun {
    * Post-compact context reinjection lifecycle.
    * - pendingPostCompactReminder: compact_boundary was received; waiting for idle to inject.
    * - postCompactReminderInFlight: the reminder turn has been injected via stdin, waiting for result.
-   * - suppressPostCompactReminderOutput: true while processing a reminder turn — suppress
-   *   low-value acknowledgement text so the user doesn't see "OK, I'll remember that."
+   * - suppressPostCompactReminderOutput: true while processing a reminder turn - suppress
+   *   low-value context-refresh acknowledgement text.
    */
   pendingPostCompactReminder: boolean;
   postCompactReminderInFlight: boolean;
@@ -4435,9 +4525,18 @@ interface RuntimeBootstrapMemberSpec {
   description?: string;
   useSplitPane?: boolean;
   planModeRequired?: boolean;
+  mcpConfigPath?: string;
+  mcpSettingSources?: string;
+  strictMcpConfig?: boolean;
   nativeAppManagedBootstrap?: NativeAppManagedBootstrapSpec;
 }
 
+interface RuntimeBootstrapMemberMcpLaunchConfig {
+  mcpConfigPath: string;
+  mcpSettingSources: string;
+  strictMcpConfig: boolean;
+}
+
 interface RuntimeBootstrapSpec {
   version: 1;
   runId: string;
@@ -4467,11 +4566,39 @@ interface RuntimeBootstrapSpec {
   };
 }
 
+const DETERMINISTIC_BOOTSTRAP_MIN_TIMEOUT_MS = 120_000;
+const DETERMINISTIC_BOOTSTRAP_TIMEOUT_PER_MEMBER_MS = 75_000;
+const DETERMINISTIC_BOOTSTRAP_MAX_TIMEOUT_MS = 900_000;
+const DETERMINISTIC_BOOTSTRAP_OUTER_TIMEOUT_GRACE_MS = 30_000;
+
+function getDeterministicBootstrapTimeoutMs(memberCount: number): number {
+  const perMemberBudget = Math.max(0, memberCount) * DETERMINISTIC_BOOTSTRAP_TIMEOUT_PER_MEMBER_MS;
+  return Math.min(
+    DETERMINISTIC_BOOTSTRAP_MAX_TIMEOUT_MS,
+    Math.max(DETERMINISTIC_BOOTSTRAP_MIN_TIMEOUT_MS, perMemberBudget)
+  );
+}
+
+function getProvisioningRunTimeoutMs(
+  run: Pick<ProvisioningRun, 'deterministicBootstrap' | 'effectiveMembers'>
+): number {
+  if (!run.deterministicBootstrap) {
+    return RUN_TIMEOUT_MS;
+  }
+
+  return Math.max(
+    RUN_TIMEOUT_MS,
+    getDeterministicBootstrapTimeoutMs(run.effectiveMembers.length) +
+      DETERMINISTIC_BOOTSTRAP_OUTER_TIMEOUT_GRACE_MS
+  );
+}
+
 function buildDeterministicCreateBootstrapSpec(
   runId: string,
   request: TeamCreateRequest,
   effectiveMembers: TeamCreateRequest['members'],
-  nativeAppManagedBootstrapByMember: ReadonlyMap<string, NativeAppManagedBootstrapSpec> = new Map()
+  nativeAppManagedBootstrapByMember: ReadonlyMap<string, NativeAppManagedBootstrapSpec> = new Map(),
+  mcpLaunchConfigByMember: ReadonlyMap<string, RuntimeBootstrapMemberMcpLaunchConfig> = new Map()
 ): RuntimeBootstrapSpec {
   return {
     version: 1,
@@ -4501,21 +4628,26 @@ function buildDeterministicCreateBootstrapSpec(
           }
         : {}),
     },
-    members: effectiveMembers.map((member) => ({
-      name: member.name,
-      ...(member.role?.trim() ? { role: member.role.trim() } : {}),
-      ...(member.workflow?.trim() ? { workflow: member.workflow.trim() } : {}),
-      ...(request.cwd ? { cwd: request.cwd } : {}),
-      ...(member.model?.trim() ? { model: member.model.trim() } : {}),
-      ...(member.providerId ? { provider: member.providerId } : {}),
-      ...(member.effort ? { effort: member.effort } : {}),
-      ...(member.isolation === 'worktree' ? { isolation: 'worktree' as const } : {}),
-      ...(member.role?.trim() ? { description: member.role.trim() } : {}),
-      ...(nativeAppManagedBootstrapByMember.get(member.name)
-        ? { nativeAppManagedBootstrap: nativeAppManagedBootstrapByMember.get(member.name)! }
-        : {}),
-    })),
+    members: effectiveMembers.map((member) => {
+      const mcpLaunchConfig = mcpLaunchConfigByMember.get(member.name);
+      return {
+        name: member.name,
+        ...(member.role?.trim() ? { role: member.role.trim() } : {}),
+        ...(member.workflow?.trim() ? { workflow: member.workflow.trim() } : {}),
+        ...(request.cwd ? { cwd: request.cwd } : {}),
+        ...(member.model?.trim() ? { model: member.model.trim() } : {}),
+        ...(member.providerId ? { provider: member.providerId } : {}),
+        ...(member.effort ? { effort: member.effort } : {}),
+        ...(member.isolation === 'worktree' ? { isolation: 'worktree' as const } : {}),
+        ...(member.role?.trim() ? { description: member.role.trim() } : {}),
+        ...(mcpLaunchConfig ? mcpLaunchConfig : {}),
+        ...(nativeAppManagedBootstrapByMember.get(member.name)
+          ? { nativeAppManagedBootstrap: nativeAppManagedBootstrapByMember.get(member.name)! }
+          : {}),
+      };
+    }),
     launch: {
+      bootstrapTimeoutMs: getDeterministicBootstrapTimeoutMs(effectiveMembers.length),
       continueOnPartialFailure: true,
     },
     ui: {
@@ -4528,7 +4660,8 @@ function buildDeterministicLaunchBootstrapSpec(
   runId: string,
   request: TeamLaunchRequest,
   effectiveMembers: TeamCreateRequest['members'],
-  nativeAppManagedBootstrapByMember: ReadonlyMap<string, NativeAppManagedBootstrapSpec> = new Map()
+  nativeAppManagedBootstrapByMember: ReadonlyMap<string, NativeAppManagedBootstrapSpec> = new Map(),
+  mcpLaunchConfigByMember: ReadonlyMap<string, RuntimeBootstrapMemberMcpLaunchConfig> = new Map()
 ): RuntimeBootstrapSpec {
   return {
     version: 1,
@@ -4555,21 +4688,26 @@ function buildDeterministicLaunchBootstrapSpec(
           }
         : {}),
     },
-    members: effectiveMembers.map((member) => ({
-      name: member.name,
-      ...(request.cwd ? { cwd: request.cwd } : {}),
-      ...(member.model?.trim() ? { model: member.model.trim() } : {}),
-      ...(member.providerId ? { provider: member.providerId } : {}),
-      ...(member.effort ? { effort: member.effort } : {}),
-      ...(member.isolation === 'worktree' ? { isolation: 'worktree' as const } : {}),
-      ...(member.role?.trim() ? { role: member.role.trim() } : {}),
-      ...(member.workflow?.trim() ? { workflow: member.workflow.trim() } : {}),
-      ...(member.role?.trim() ? { description: member.role.trim() } : {}),
-      ...(nativeAppManagedBootstrapByMember.get(member.name)
-        ? { nativeAppManagedBootstrap: nativeAppManagedBootstrapByMember.get(member.name)! }
-        : {}),
-    })),
+    members: effectiveMembers.map((member) => {
+      const mcpLaunchConfig = mcpLaunchConfigByMember.get(member.name);
+      return {
+        name: member.name,
+        ...(request.cwd ? { cwd: request.cwd } : {}),
+        ...(member.model?.trim() ? { model: member.model.trim() } : {}),
+        ...(member.providerId ? { provider: member.providerId } : {}),
+        ...(member.effort ? { effort: member.effort } : {}),
+        ...(member.isolation === 'worktree' ? { isolation: 'worktree' as const } : {}),
+        ...(member.role?.trim() ? { role: member.role.trim() } : {}),
+        ...(member.workflow?.trim() ? { workflow: member.workflow.trim() } : {}),
+        ...(member.role?.trim() ? { description: member.role.trim() } : {}),
+        ...(mcpLaunchConfig ? mcpLaunchConfig : {}),
+        ...(nativeAppManagedBootstrapByMember.get(member.name)
+          ? { nativeAppManagedBootstrap: nativeAppManagedBootstrapByMember.get(member.name)! }
+          : {}),
+      };
+    }),
     launch: {
+      bootstrapTimeoutMs: getDeterministicBootstrapTimeoutMs(effectiveMembers.length),
       continueOnPartialFailure: true,
     },
     ui: {
@@ -4974,7 +5112,7 @@ function buildDeterministicLaunchHydrationPrompt(
 Do NOT call TeamCreate.
 Do NOT use Agent to spawn or restore teammates.
 Do NOT start implementation in this turn.
-Use this turn only to refresh context, review the current board snapshot, and confirm you are ready.
+Use this turn only to review the current board snapshot and confirm operational readiness.
 ${
   hasOriginalUserPrompt
     ? 'Do NOT create or update any new task in this turn - wait for the next normal operating turn before translating those instructions into board work.'
@@ -4984,7 +5122,7 @@ ${
 Do NOT call TeamCreate.
 Do NOT use Agent to spawn or restore teammates.
 Do NOT repeat the launch summary.
-Use this turn only to refresh context and review the current board snapshot.
+Use this turn only to review the current board snapshot and teammate readiness.
 ${
   hasOriginalUserPrompt
     ? 'Do NOT create or assign any new task in this turn - wait for the next normal operating turn before translating those instructions into board work.'
@@ -5003,7 +5141,7 @@ ${nextSteps}
 ${taskBoardSnapshot}
 ${persistentContext}
 
-If there is nothing else to say after refreshing context, reply with exactly one word: "OK".`;
+Reply with one concise user-facing team status line. Mention whether there is actionable board work and whether any teammate is still bootstrap-pending. Only report board readiness and teammate availability. Do not start work, create tasks, or delegate in this turn.`;
 }
 
 function buildGeminiPostLaunchHydrationPrompt(
@@ -5050,13 +5188,13 @@ function buildGeminiPostLaunchHydrationPrompt(
   });
   const nextStepInstruction = isSolo
     ? hasOriginalUserPrompt
-      ? 'From this point on, use the full operating rules below for all future turns. Do NOT create or update any new task in this context-refresh turn - wait for the next normal operating turn before translating those instructions into board work.'
-      : 'From this point on, use the full operating rules below for all future turns. Do NOT create, assign, or delegate any new task in this context-refresh turn. If the board is empty, stay silent and wait for a fresh user instruction.'
+      ? 'From this point on, use the full operating rules below for all future turns. Do NOT create or update any new task in this turn - wait for the next normal operating turn before translating those instructions into board work.'
+      : 'From this point on, use the full operating rules below for all future turns. Do NOT create, assign, or delegate any new task in this turn. If the board is empty, stay silent and wait for a fresh user instruction.'
     : hasOriginalUserPrompt
-      ? 'From this point on, use the full team operating rules below for all future turns. Do NOT create or assign any new task in this context-refresh turn - wait for the next normal operating turn before translating those instructions into board work. Do NOT assume bootstrap-pending or failed teammates are ready; only treat teammates with confirmed bootstrap as immediately available for blocking assignments.'
-      : 'From this point on, use the full team operating rules below for all future turns. Do NOT create, assign, or delegate any new task in this context-refresh turn. If the board is empty, stay silent and wait for a fresh user instruction. Do NOT assume bootstrap-pending or failed teammates are ready; only treat teammates with confirmed bootstrap as immediately available for blocking assignments.';
+      ? 'From this point on, use the full team operating rules below for all future turns. Do NOT create or assign any new task in this turn - wait for the next normal operating turn before translating those instructions into board work. Do NOT assume bootstrap-pending or failed teammates are ready; only treat teammates with confirmed bootstrap as immediately available for blocking assignments.'
+      : 'From this point on, use the full team operating rules below for all future turns. Do NOT create, assign, or delegate any new task in this turn. If the board is empty, stay silent and wait for a fresh user instruction. Do NOT assume bootstrap-pending or failed teammates are ready; only treat teammates with confirmed bootstrap as immediately available for blocking assignments.';
 
-  return `Gemini launch phase 2 — operating context for team "${run.teamName}".
+  return `Gemini launch phase 2 - team readiness check for team "${run.teamName}".
 
 The first launch/reconnect turn has already completed.
 Do NOT call TeamCreate again.
@@ -5070,7 +5208,7 @@ ${nextStepInstruction}
 ${teammateBootstrapSnapshot}${taskBoardSnapshot}
 ${persistentContext}
 
-This is a context-refresh turn only. Do not re-run launch. If no task planning or delegation is needed right now, reply with exactly one word: "OK".`;
+This is a readiness-check turn only. Do not re-run launch. Reply with one concise user-facing team status line about board readiness and teammate availability. Only report board readiness and teammate availability. Do not start work, create tasks, or delegate in this turn.`;
 }
 
 /**
@@ -6181,6 +6319,7 @@ export class TeamProvisioningService {
   private readonly memberLogsFinder: TeamMemberLogsFinder;
   private readonly transcriptProjectResolver: TeamTranscriptProjectResolver;
   private readonly taskActivityIntervalService = new TeamTaskActivityIntervalService();
+  private readonly leadTaskActivitySyncedRunKeys = new Set<string>();
   private readonly crashRepairedActivityIntervalsByTeam = new Set<string>();
   private readonly pendingCrashRepairSnapshotByTeam = new Map<
     string,
@@ -7342,11 +7481,28 @@ export class TeamProvisioningService {
           `${params.actorLabel} resolves to Anthropic model "${resolvedLaunchModel}", but the current runtime does not list it as launchable.`
         );
       }
-      if (params.effort && !selection.supportedEfforts.includes(params.effort)) {
+      if (params.effort) {
         const modelLabel = selection.displayName ?? resolvedLaunchModel;
-        throw new Error(
-          `${params.actorLabel} uses Anthropic effort "${params.effort}", but ${modelLabel} does not support it in the current runtime.`
-        );
+        const effortSupport = resolveAnthropicEffortSupport({
+          selection,
+          effort: params.effort,
+          runtimeCapabilities: params.facts.runtimeCapabilities,
+        });
+        if (effortSupport.kind !== 'supported') {
+          throw new Error(
+            `${params.actorLabel} uses Anthropic effort "${params.effort}", but ${formatAnthropicEffortSupportFailure(
+              {
+                effort: params.effort,
+                modelLabel,
+                kind: effortSupport.kind,
+                supportedEfforts:
+                  effortSupport.kind === 'unverified-catalog-missing'
+                    ? undefined
+                    : effortSupport.supportedEfforts,
+              }
+            )}`
+          );
+        }
       }
 
       const fastResolution = resolveAnthropicFastMode({
@@ -11961,9 +12117,49 @@ export class TeamProvisioningService {
       ...(configuredMember.model ? { model: configuredMember.model } : {}),
       ...(configuredMember.effort ? { effort: configuredMember.effort } : {}),
       ...(configuredMember.fastMode ? { fastMode: configuredMember.fastMode } : {}),
+      ...(configuredMember.mcpPolicy
+        ? { mcpPolicy: normalizeTeamMemberMcpPolicy(configuredMember.mcpPolicy) }
+        : {}),
     };
   }
 
+  private async buildRuntimeBootstrapMemberMcpLaunchConfigs(input: {
+    cwd: string;
+    members: TeamCreateRequest['members'];
+    run: ProvisioningRun;
+  }): Promise<Map<string, RuntimeBootstrapMemberMcpLaunchConfig>> {
+    const configs = new Map<string, RuntimeBootstrapMemberMcpLaunchConfig>();
+    for (const member of input.members) {
+      const mcpPolicy = normalizeTeamMemberMcpPolicy(member.mcpPolicy);
+      if (!mcpPolicy) {
+        continue;
+      }
+
+      const memberCwd = member.cwd?.trim() || input.cwd;
+      const mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(memberCwd, mcpPolicy);
+      input.run.memberMcpConfigPaths.push(mcpConfigPath);
+      configs.set(member.name, {
+        mcpConfigPath,
+        mcpSettingSources: buildTeamMemberMcpSettingSources(mcpPolicy),
+        strictMcpConfig: requiresStrictTeamMemberMcpConfig(mcpPolicy),
+      });
+    }
+    return configs;
+  }
+
+  private async removeRunMemberMcpConfigFiles(run: ProvisioningRun): Promise<void> {
+    const paths = run.memberMcpConfigPaths?.splice(0) ?? [];
+    await Promise.all(
+      paths.map((configPath) => this.mcpConfigBuilder.removeConfigFile(configPath))
+    );
+  }
+
+  private removeRunMemberMcpConfigFilesLater(run: ProvisioningRun): void {
+    for (const configPath of run.memberMcpConfigPaths?.splice(0) ?? []) {
+      void this.mcpConfigBuilder.removeConfigFile(configPath);
+    }
+  }
+
   private buildMembersMetaWritePayload(members: TeamCreateRequest['members']): TeamMember[] {
     return applyDistinctProvisioningMemberColors(
       members.map((member) => ({
@@ -11980,6 +12176,7 @@ export class TeamProvisioningService {
           member.fastMode === 'inherit' || member.fastMode === 'on' || member.fastMode === 'off'
             ? member.fastMode
             : undefined,
+        mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
         agentType: 'general-purpose' as const,
         color: getMemberColorByName(member.name.trim()),
         joinedAt:
@@ -14857,6 +15054,9 @@ export class TeamProvisioningService {
     if (!runId) return { state: 'offline', runId: null };
     const run = this.runs.get(runId);
     if (!run || run.processKilled || run.cancelRequested) return { state: 'offline', runId: null };
+    // Read-repair active lead task intervals for runs that were already active
+    // before interval tracking was introduced or before the renderer polled state.
+    this.syncLeadTaskActivityForState(run, run.leadActivityState, run.leadActivityState);
     return { state: run.leadActivityState, runId };
   }
 
@@ -14993,10 +15193,54 @@ export class TeamProvisioningService {
     return parts.join('\n').trim();
   }
 
+  private getLeadTaskActivityRunKey(run: ProvisioningRun): string {
+    return `${run.teamName}\u0000${run.runId}`;
+  }
+
+  private syncLeadTaskActivityForState(
+    run: ProvisioningRun,
+    state: 'active' | 'idle' | 'offline',
+    previousState: 'active' | 'idle' | 'offline',
+    at = nowIso()
+  ): void {
+    const key = this.getLeadTaskActivityRunKey(run);
+    if (state === 'active') {
+      if (this.leadTaskActivitySyncedRunKeys.has(key)) return;
+      const result = this.taskActivityIntervalService.resumeActiveIntervalsForMember(
+        run.teamName,
+        this.getRunLeadName(run),
+        at
+      );
+      if (result.failed) return;
+      this.leadTaskActivitySyncedRunKeys.add(key);
+      return;
+    }
+
+    const wasSynced = this.leadTaskActivitySyncedRunKeys.has(key);
+    if (previousState !== 'active' && !wasSynced) return;
+    const result = this.taskActivityIntervalService.pauseActiveIntervalsForMember(
+      run.teamName,
+      this.getRunLeadName(run),
+      at
+    );
+    if (result.failed) {
+      this.leadTaskActivitySyncedRunKeys.add(key);
+      return;
+    }
+    this.leadTaskActivitySyncedRunKeys.delete(key);
+  }
+
   private setLeadActivity(run: ProvisioningRun, state: 'active' | 'idle' | 'offline'): void {
-    if (run.leadActivityState === state) return;
+    const previousState = run.leadActivityState;
+    const isCurrentRun = this.isCurrentTrackedRun(run);
+    if (isCurrentRun) {
+      this.syncLeadTaskActivityForState(run, state, previousState);
+    } else {
+      this.leadTaskActivitySyncedRunKeys.delete(this.getLeadTaskActivityRunKey(run));
+    }
+    if (previousState === state) return;
     run.leadActivityState = state;
-    if (!this.isCurrentTrackedRun(run)) return;
+    if (!isCurrentRun) return;
     this.teamChangeEmitter?.({
       type: 'lead-activity',
       teamName: run.teamName,
@@ -16542,7 +16786,10 @@ export class TeamProvisioningService {
       throw new Error(provisioningEnv.warning);
     }
 
-    const mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(cwd);
+    const memberMcpPolicy = normalizeTeamMemberMcpPolicy(input.configuredMember.mcpPolicy);
+    const mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(cwd, memberMcpPolicy);
+    const memberMcpSettingSources = buildTeamMemberMcpSettingSources(memberMcpPolicy);
+    const strictMemberMcpConfig = requiresStrictTeamMemberMcpConfig(memberMcpPolicy);
     const agentId = `${input.configuredMember.name}@${input.teamName}`;
     const color =
       input.config.members
@@ -16592,9 +16839,10 @@ export class TeamProvisioningService {
         ? ['--agent-type', input.configuredMember.agentType]
         : []),
       '--setting-sources',
-      'user,project,local',
+      memberMcpSettingSources,
       '--mcp-config',
       mcpConfigPath,
+      ...(strictMemberMcpConfig ? ['--strict-mcp-config'] : []),
       '--disallowedTools',
       APP_TEAM_RUNTIME_DISALLOWED_TOOLS,
       ...(input.run.request.skipPermissions !== false
@@ -16685,7 +16933,10 @@ export class TeamProvisioningService {
       throw new Error(provisioningEnv.warning);
     }
 
-    const mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(cwd);
+    const memberMcpPolicy = normalizeTeamMemberMcpPolicy(input.configuredMember.mcpPolicy);
+    const mcpConfigPath = await this.mcpConfigBuilder.writeConfigFile(cwd, memberMcpPolicy);
+    const memberMcpSettingSources = buildTeamMemberMcpSettingSources(memberMcpPolicy);
+    const strictMemberMcpConfig = requiresStrictTeamMemberMcpConfig(memberMcpPolicy);
     const agentId = `${input.configuredMember.name}@${input.teamName}`;
     const color =
       input.config.members
@@ -16706,6 +16957,7 @@ export class TeamProvisioningService {
       ...(input.configuredMember.model ? { model: input.configuredMember.model } : {}),
       ...(input.configuredMember.effort ? { effort: input.configuredMember.effort } : {}),
       ...(input.configuredMember.agentType ? { agentType: input.configuredMember.agentType } : {}),
+      ...(memberMcpPolicy ? { mcpPolicy: memberMcpPolicy } : {}),
       ...(input.configuredMember.isolation === 'worktree'
         ? { isolation: 'worktree' as const }
         : {}),
@@ -16774,9 +17026,10 @@ export class TeamProvisioningService {
         ? ['--agent-type', input.configuredMember.agentType]
         : []),
       '--setting-sources',
-      'user,project,local',
+      memberMcpSettingSources,
       '--mcp-config',
       mcpConfigPath,
+      ...(strictMemberMcpConfig ? ['--strict-mcp-config'] : []),
       '--disallowedTools',
       APP_TEAM_RUNTIME_DISALLOWED_TOOLS,
       ...(input.run.request.skipPermissions !== false
@@ -19000,6 +19253,7 @@ export class TeamProvisioningService {
       providerId?: TeamProviderId;
       providerIds?: TeamProviderId[];
       modelIds?: string[];
+      modelChecks?: TeamProvisioningModelCheckRequest[];
       limitContext?: boolean;
       modelVerificationMode?: TeamProvisioningModelVerificationMode;
     }
@@ -19026,6 +19280,7 @@ export class TeamProvisioningService {
       providerId?: TeamProviderId;
       providerIds?: TeamProviderId[];
       modelIds?: string[];
+      modelChecks?: TeamProvisioningModelCheckRequest[];
       limitContext?: boolean;
       modelVerificationMode?: TeamProvisioningModelVerificationMode;
     }
@@ -19040,11 +19295,24 @@ export class TeamProvisioningService {
     const modelIds = Array.from(
       new Set((opts?.modelIds ?? []).map((modelId) => modelId.trim()).filter(Boolean))
     );
+    const modelChecks = normalizeProvisioningModelCheckRequests(opts?.modelChecks)
+      .map((check) => ({
+        providerId: check.providerId,
+        model: check.model,
+        effort: check.effort ?? null,
+      }))
+      .sort(
+        (left, right) =>
+          left.providerId.localeCompare(right.providerId) ||
+          left.model.localeCompare(right.model) ||
+          (left.effort ?? '').localeCompare(right.effort ?? '')
+      );
     return JSON.stringify({
       cwd: cwd?.trim() || process.cwd(),
       forceFresh: opts?.forceFresh === true,
       providerIds,
       modelIds,
+      modelChecks,
       limitContext: opts?.limitContext === true,
       modelVerificationMode: opts?.modelVerificationMode ?? null,
     });
@@ -19068,6 +19336,7 @@ export class TeamProvisioningService {
       providerId?: TeamProviderId;
       providerIds?: TeamProviderId[];
       modelIds?: string[];
+      modelChecks?: TeamProvisioningModelCheckRequest[];
       limitContext?: boolean;
       modelVerificationMode?: TeamProvisioningModelVerificationMode;
     }
@@ -19104,8 +19373,20 @@ export class TeamProvisioningService {
     const selectedModelIds = Array.from(
       new Set((opts?.modelIds ?? []).map((modelId) => modelId.trim()).filter(Boolean))
     );
+    const selectedModelChecks = normalizeProvisioningModelCheckRequests(opts?.modelChecks);
+    const useStructuredModelChecks = selectedModelChecks.length > 0;
 
     for (const providerId of providerIds) {
+      const providerModelChecks = selectedModelChecks
+        .filter((check) => check.providerId === providerId)
+        .map((check) => ({
+          modelId: check.model,
+          ...(check.effort ? { effort: check.effort } : {}),
+        }));
+      const providerSelectedModelIds = useStructuredModelChecks
+        ? Array.from(new Set(providerModelChecks.map((check) => check.modelId)))
+        : selectedModelIds;
+
       if (providerId === 'opencode') {
         const adapter = this.getOpenCodeRuntimeAdapter();
         if (!adapter) {
@@ -19115,7 +19396,7 @@ export class TeamProvisioningService {
           continue;
         }
 
-        if (selectedModelIds.length === 0) {
+        if (providerSelectedModelIds.length === 0) {
           const prepare = await adapter.prepare({
             runId: `prepare-${randomUUID()}`,
             teamName: '__prepare_opencode__',
@@ -19149,7 +19430,7 @@ export class TeamProvisioningService {
         const openCodeModelPrepare = await this.prepareSelectedOpenCodeModels({
           adapter,
           cwd: targetCwd,
-          modelIds: selectedModelIds,
+          modelIds: providerSelectedModelIds,
           verificationMode: opts?.modelVerificationMode ?? 'deep',
         });
         details.push(...openCodeModelPrepare.details);
@@ -19176,7 +19457,7 @@ export class TeamProvisioningService {
       }
 
       const appendSelectedModelVerification = async (): Promise<void> => {
-        if (selectedModelIds.length === 0) {
+        if (providerSelectedModelIds.length === 0) {
           return;
         }
 
@@ -19184,12 +19465,14 @@ export class TeamProvisioningService {
           claudePath: probeResult.claudePath,
           cwd: targetCwd,
           providerId,
-          modelIds: selectedModelIds,
+          modelIds: providerSelectedModelIds,
+          modelChecks: providerModelChecks,
           limitContext: opts?.limitContext === true,
         });
         details.push(...modelVerification.details);
         warnings.push(...modelVerification.warnings);
         blockingMessages.push(...modelVerification.blockingMessages);
+        issues.push(...(modelVerification.issues ?? []));
       };
 
       const appendOneShotDiagnostic = async (): Promise<void> => {
@@ -19298,7 +19581,7 @@ export class TeamProvisioningService {
           // Preflight warnings (including timeouts) should not block provisioning.
           warnings.push(prefixedWarning);
           const blockingCountBeforeModelChecks = blockingMessages.length;
-          if (!isBlockingPreflightWarning && selectedModelIds.length > 0) {
+          if (!isBlockingPreflightWarning && providerSelectedModelIds.length > 0) {
             await appendSelectedModelVerification();
           }
           if (
@@ -19964,24 +20247,29 @@ export class TeamProvisioningService {
     cwd,
     providerId,
     modelIds,
+    modelChecks,
     limitContext,
   }: {
     claudePath: string;
     cwd: string;
     providerId: TeamProviderId;
     modelIds: string[];
+    modelChecks?: ProviderSelectedModelCheck[];
     limitContext: boolean;
   }): Promise<{
     details: string[];
     warnings: string[];
     blockingMessages: string[];
+    issues?: TeamProvisioningPrepareIssue[];
   }> {
     const details: string[] = [];
     const warnings: string[] = [];
     const blockingMessages: string[] = [];
+    const issues: TeamProvisioningPrepareIssue[] = [];
     const startedAt = Date.now();
+    const selectedModelChecks = normalizeProviderSelectedModelChecks(modelIds, modelChecks);
 
-    if (modelIds.length === 0) {
+    if (selectedModelChecks.length === 0) {
       return { details, warnings, blockingMessages };
     }
 
@@ -20013,35 +20301,99 @@ export class TeamProvisioningService {
         return;
       }
       blockingMessages.push(`Selected model ${requestedModelId} is unavailable. ${outcome.reason}`);
+      issues.push({
+        providerId,
+        modelId: requestedModelId,
+        scope: 'model',
+        severity: 'blocking',
+        code: 'model_unavailable',
+        message: outcome.reason,
+      });
+    };
+
+    const recordAnthropicEffortOutcome = (
+      requestedModelId: string,
+      effort: EffortLevel
+    ): boolean => {
+      const selection = resolveAnthropicSelectionFromFacts({
+        selectedModel: requestedModelId,
+        limitContext,
+        facts: runtimeFacts,
+      });
+      const modelLabel = selection.displayName ?? selection.resolvedLaunchModel ?? requestedModelId;
+      const effortSupport = resolveAnthropicEffortSupport({
+        selection,
+        effort,
+        runtimeCapabilities: runtimeFacts.runtimeCapabilities,
+      });
+      if (effortSupport.kind === 'supported') {
+        return true;
+      }
+
+      const reason = formatAnthropicEffortSupportFailure({
+        effort,
+        modelLabel,
+        kind: effortSupport.kind,
+        supportedEfforts:
+          effortSupport.kind === 'unverified-catalog-missing'
+            ? undefined
+            : effortSupport.supportedEfforts,
+      });
+      blockingMessages.push(`Selected model ${requestedModelId} is unavailable. ${reason}`);
+      issues.push({
+        providerId,
+        modelId: requestedModelId,
+        scope: 'model',
+        severity: 'blocking',
+        code:
+          effortSupport.kind === 'unverified-catalog-missing'
+            ? 'effort_unverified'
+            : 'effort_unsupported',
+        message: reason,
+      });
+      return false;
     };
 
     appendPreflightDebugLog('provider_model_catalog_check_start', {
       providerId,
       cwd,
-      modelIds,
+      modelIds: selectedModelChecks.map((check) => check.modelId),
     });
 
-    for (const modelId of modelIds) {
-      const label = modelId.trim();
+    const checksByModelId = new Map<string, ProviderSelectedModelCheck[]>();
+    for (const check of selectedModelChecks) {
+      const label = check.modelId.trim();
       if (!label) {
         continue;
       }
+      checksByModelId.set(label, [...(checksByModelId.get(label) ?? []), check]);
+    }
 
-      recordOutcome(
-        label,
-        this.resolveProviderCompatibilityModel({
-          providerId,
-          requestedModelId: label,
-          runtimeFacts,
-          limitContext,
-        })
-      );
+    for (const [label, checks] of checksByModelId.entries()) {
+      const outcome = this.resolveProviderCompatibilityModel({
+        providerId,
+        requestedModelId: label,
+        runtimeFacts,
+        limitContext,
+      });
+      let effortSupported = true;
+      if (outcome.kind !== 'unavailable' && providerId === 'anthropic') {
+        for (const check of checks) {
+          if (check.effort && !recordAnthropicEffortOutcome(label, check.effort)) {
+            effortSupported = false;
+          }
+        }
+      }
+      if (!effortSupported) {
+        continue;
+      }
+      recordOutcome(label, outcome);
     }
 
     appendPreflightDebugLog('provider_model_catalog_check_complete', {
       providerId,
       cwd,
-      modelIds,
+      modelIds: selectedModelChecks.map((check) => check.modelId),
       durationMs: Date.now() - startedAt,
       modelCount: runtimeFacts.modelIds.size,
       details,
@@ -20049,7 +20401,12 @@ export class TeamProvisioningService {
       blockingMessages,
     });
 
-    return { details, warnings, blockingMessages };
+    return {
+      details,
+      warnings,
+      blockingMessages,
+      ...(issues.length > 0 ? { issues } : {}),
+    };
   }
 
   private async resolveProviderDefaultModel(
@@ -20999,7 +21356,7 @@ export class TeamProvisioningService {
           this.cleanupRun(run);
         })();
       }
-    }, RUN_TIMEOUT_MS);
+    }, getProvisioningRunTimeoutMs(run));
 
     child.once('error', (error) => {
       const hint = run.isLaunch ? ' (launch)' : '';
@@ -21438,6 +21795,7 @@ export class TeamProvisioningService {
         requiresFirstRealTurnSuccess: false,
         firstRealTurnSucceeded: false,
         mcpConfigPath: null,
+        memberMcpConfigPaths: [],
         bootstrapSpecPath: null,
         bootstrapUserPromptPath: null,
         isLaunch: false,
@@ -21569,6 +21927,11 @@ export class TeamProvisioningService {
           cwd: request.cwd,
           members: effectiveMemberSpecs,
         });
+        const memberMcpLaunchConfigs = await this.buildRuntimeBootstrapMemberMcpLaunchConfigs({
+          cwd: request.cwd,
+          members: effectiveMemberSpecs,
+          run,
+        });
         if (nativeBootstrapBuild.diagnostics.warning) {
           run.progress = {
             ...run.progress,
@@ -21587,7 +21950,8 @@ export class TeamProvisioningService {
           runId,
           request,
           effectiveMemberSpecs,
-          nativeBootstrapBuild.specs
+          nativeBootstrapBuild.specs,
+          memberMcpLaunchConfigs
         );
         emitProvisioningCheckpoint(run, 'Writing deterministic bootstrap spec file');
         bootstrapSpecPath = await writeDeterministicBootstrapSpecFile(bootstrapSpec);
@@ -21632,6 +21996,11 @@ export class TeamProvisioningService {
           () => {}
         );
         run.bootstrapUserPromptPath = null;
+        if (run.mcpConfigPath) {
+          await this.mcpConfigBuilder.removeConfigFile(run.mcpConfigPath).catch(() => {});
+          run.mcpConfigPath = null;
+        }
+        await this.removeRunMemberMcpConfigFiles(run).catch(() => {});
         throw error;
       }
       const launchModelArg = getLaunchModelArg(
@@ -21733,6 +22102,7 @@ export class TeamProvisioningService {
           await this.mcpConfigBuilder.removeConfigFile(run.mcpConfigPath).catch(() => {});
           run.mcpConfigPath = null;
         }
+        await this.removeRunMemberMcpConfigFiles(run).catch(() => {});
         if (provisioningEnv.anthropicApiKeyHelper) {
           await cleanupAnthropicTeamApiKeyHelperMaterial({
             directory: provisioningEnv.anthropicApiKeyHelper.directory,
@@ -21795,7 +22165,7 @@ export class TeamProvisioningService {
             this.cleanupRun(run);
           })();
         }
-      }, RUN_TIMEOUT_MS);
+      }, getProvisioningRunTimeoutMs(run));
 
       child.once('error', (error) => {
         const progress = updateProgress(run, 'failed', 'Failed to start Claude CLI', {
@@ -22167,6 +22537,7 @@ export class TeamProvisioningService {
           providerId: normalizeOptionalTeamProviderId(member.providerId),
           model: member.model,
           effort: member.effort,
+          mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
           cwd: member.cwd?.trim() || undefined,
         })),
       ],
@@ -22719,6 +23090,7 @@ export class TeamProvisioningService {
         requiresFirstRealTurnSuccess: false,
         firstRealTurnSucceeded: false,
         mcpConfigPath: null,
+        memberMcpConfigPaths: [],
         bootstrapSpecPath: null,
         bootstrapUserPromptPath: null,
         isLaunch: true,
@@ -22846,6 +23218,11 @@ export class TeamProvisioningService {
           cwd: request.cwd,
           members: effectiveMemberSpecs,
         });
+        const memberMcpLaunchConfigs = await this.buildRuntimeBootstrapMemberMcpLaunchConfigs({
+          cwd: request.cwd,
+          members: effectiveMemberSpecs,
+          run,
+        });
         if (nativeBootstrapBuild.diagnostics.warning) {
           run.progress = {
             ...run.progress,
@@ -22864,7 +23241,8 @@ export class TeamProvisioningService {
           runId,
           request,
           effectiveMemberSpecs,
-          nativeBootstrapBuild.specs
+          nativeBootstrapBuild.specs,
+          memberMcpLaunchConfigs
         );
         emitProvisioningCheckpoint(run, 'Writing deterministic bootstrap spec file');
         bootstrapSpecPath = await writeDeterministicBootstrapSpecFile(bootstrapSpec);
@@ -22901,6 +23279,11 @@ export class TeamProvisioningService {
           () => {}
         );
         run.bootstrapUserPromptPath = null;
+        if (run.mcpConfigPath) {
+          await this.mcpConfigBuilder.removeConfigFile(run.mcpConfigPath).catch(() => {});
+          run.mcpConfigPath = null;
+        }
+        await this.removeRunMemberMcpConfigFiles(run).catch(() => {});
         await this.restorePrelaunchConfig(request.teamName);
         throw error;
       }
@@ -23038,6 +23421,7 @@ export class TeamProvisioningService {
           () => {}
         );
         run.bootstrapUserPromptPath = null;
+        await this.removeRunMemberMcpConfigFiles(run).catch(() => {});
         if (provisioningEnv.anthropicApiKeyHelper) {
           await cleanupAnthropicTeamApiKeyHelperMaterial({
             directory: provisioningEnv.anthropicApiKeyHelper.directory,
@@ -23098,7 +23482,7 @@ export class TeamProvisioningService {
             this.cleanupRun(run);
           })();
         }
-      }, RUN_TIMEOUT_MS);
+      }, getProvisioningRunTimeoutMs(run));
 
       child.once('error', (error) => {
         const progress = updateProgress(run, 'failed', 'Failed to start Claude CLI (launch)', {
@@ -25941,6 +26325,7 @@ export class TeamProvisioningService {
     model?: string;
     effort?: EffortLevel;
     fastMode?: TeamFastMode;
+    mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
     cwd?: string;
     agentType?: string;
     removedAt?: number | string;
@@ -25991,6 +26376,9 @@ export class TeamProvisioningService {
           : undefined;
     const agentType =
       metaMember?.agentType?.trim() || configuredMember?.agentType?.trim() || undefined;
+    const mcpPolicy =
+      normalizeTeamMemberMcpPolicy(metaMember?.mcpPolicy) ??
+      normalizeTeamMemberMcpPolicy(configuredMember?.mcpPolicy);
     const cwd = metaMember?.cwd?.trim() || configuredMember?.cwd?.trim() || undefined;
     const removedAt = metaMember?.removedAt ?? configuredMember?.removedAt;
 
@@ -26004,6 +26392,7 @@ export class TeamProvisioningService {
       ...(model ? { model } : {}),
       ...(effort ? { effort } : {}),
       ...(fastMode ? { fastMode } : {}),
+      ...(mcpPolicy ? { mcpPolicy } : {}),
       ...(cwd ? { cwd } : {}),
       ...(agentType ? { agentType } : {}),
       ...(removedAt != null ? { removedAt } : {}),
@@ -28561,9 +28950,39 @@ export class TeamProvisioningService {
       return false;
     }
 
+    const secondaryLanes = run.mixedSecondaryLanes ?? [];
+    const confirmedSecondaryMembers = new Set<string>();
+    for (const lane of secondaryLanes) {
+      const memberName = lane.member.name.trim();
+      if (!memberName) {
+        return false;
+      }
+      if (lane.state !== 'finished' || !lane.result) {
+        return false;
+      }
+      if (lane.runId && lane.result.runId !== lane.runId) {
+        return false;
+      }
+      const evidence = resolveOpenCodeSecondaryLaneMemberEvidence(lane, memberName);
+      if (
+        evidence?.launchState !== 'confirmed_alive' ||
+        evidence.bootstrapConfirmed !== true ||
+        evidence.hardFailure === true
+      ) {
+        return false;
+      }
+      confirmedSecondaryMembers.add(memberName);
+    }
+
     return expectedMembers.every((memberName) => {
       const member = run.memberSpawnStatuses.get(memberName);
-      return member?.launchState === 'confirmed_alive';
+      if (member?.launchState !== 'confirmed_alive' || member.bootstrapConfirmed !== true) {
+        return false;
+      }
+      const isSecondaryMember = secondaryLanes.some((lane) =>
+        matchesTeamMemberIdentity(lane.member.name, memberName)
+      );
+      return !isSecondaryMember || confirmedSecondaryMembers.has(memberName);
     });
   }
 
@@ -32916,7 +33335,7 @@ export class TeamProvisioningService {
     }
 
     const message = [
-      `Context reminder (post-compaction) — your context was compacted. Here are your standing rules and current state:`,
+      `Apply these standing rules and current team state before responding:`,
       ``,
       `You are "${leadName}", the team lead of team "${run.teamName}".`,
       `You are running in a non-interactive CLI session. Do not ask questions.`,
@@ -32925,7 +33344,7 @@ export class TeamProvisioningService {
       persistentContext,
       taskBoardBlock.trim() ? `\n${taskBoardBlock}` : '',
       ``,
-      `This is a context-only reminder. Do NOT start new work or execute tasks in this turn. Reply with a single word: "OK".`,
+      `Do NOT start new work or execute tasks in this turn. Reply with one concise user-facing team status line about board readiness and teammate availability. Only report board readiness and teammate availability.`,
     ]
       .filter(Boolean)
       .join('\n');
@@ -34436,7 +34855,6 @@ export class TeamProvisioningService {
     if (run.teamLaunchedNotificationFired) {
       return;
     }
-    run.teamLaunchedNotificationFired = true;
 
     try {
       const config = ConfigManager.getInstance().getConfig();
@@ -34447,6 +34865,7 @@ export class TeamProvisioningService {
       if (run.isLaunch && joinedCount > 0 && !allJoined) {
         return;
       }
+      run.teamLaunchedNotificationFired = true;
       const body = run.isLaunch
         ? allJoined
           ? `Team "${displayName}" has been launched - all ${joinedCount} teammates joined and are ready for tasks.`
@@ -35096,6 +35515,7 @@ export class TeamProvisioningService {
       void this.mcpConfigBuilder.removeConfigFile(run.mcpConfigPath);
       run.mcpConfigPath = null;
     }
+    this.removeRunMemberMcpConfigFilesLater(run);
     if (run.bootstrapSpecPath) {
       void removeDeterministicBootstrapSpecFile(run.bootstrapSpecPath);
       run.bootstrapSpecPath = null;
@@ -36040,6 +36460,7 @@ export class TeamProvisioningService {
       providerId: 'opencode',
       model: member.model?.trim() || undefined,
       effort: isTeamEffortLevel(member.effort) ? member.effort : undefined,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
       cwd: member.cwd?.trim() || undefined,
       joinedAt: Date.now(),
     };
@@ -36788,6 +37209,7 @@ export class TeamProvisioningService {
             providerId: configMember?.providerId,
             model: configMember?.model,
             effort: configMember?.effort,
+            mcpPolicy: configMember?.mcpPolicy,
           };
         });
         const memberOverridesUsed = members.some(
@@ -36931,9 +37353,20 @@ export class TeamProvisioningService {
       const model = typeof member.model === 'string' ? member.model.trim() || undefined : undefined;
       const effort = isTeamEffortLevel(member.effort) ? member.effort : undefined;
       const cwd = typeof member.cwd === 'string' ? member.cwd.trim() || undefined : undefined;
+      const mcpPolicy = normalizeTeamMemberMcpPolicy(member.mcpPolicy);
       const prev = byName.get(name);
       if (!prev) {
-        byName.set(name, { name, role, workflow, isolation, cwd, providerId, model, effort });
+        byName.set(name, {
+          name,
+          role,
+          workflow,
+          isolation,
+          cwd,
+          providerId,
+          model,
+          effort,
+          mcpPolicy,
+        });
       } else {
         byName.set(name, {
           ...prev,
@@ -36944,6 +37377,7 @@ export class TeamProvisioningService {
           providerId: prev.providerId || providerId,
           model: prev.model || model,
           effort: prev.effort || effort,
+          mcpPolicy: prev.mcpPolicy || mcpPolicy,
         });
       }
     }
@@ -37036,6 +37470,7 @@ export class TeamProvisioningService {
           provider?: string;
           model?: string;
           effort?: string;
+          mcpPolicy?: unknown;
           cwd?: string;
           removedAt?: unknown;
         }[];
@@ -37061,6 +37496,7 @@ export class TeamProvisioningService {
           providerId: normalizeTeamMemberProviderId(member.providerId ?? member.provider),
           model: typeof member.model === 'string' ? member.model.trim() || undefined : undefined,
           effort: isTeamEffortLevel(member.effort) ? member.effort : undefined,
+          mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
         });
       }
       // Defense: ignore CLI auto-suffixed duplicates (alice-2) when base name exists.
diff --git a/src/main/services/team/bootstrap/NativeAppManagedBootstrapContextBuilder.ts b/src/main/services/team/bootstrap/NativeAppManagedBootstrapContextBuilder.ts
index 3ffa0367..3d71e714 100644
--- a/src/main/services/team/bootstrap/NativeAppManagedBootstrapContextBuilder.ts
+++ b/src/main/services/team/bootstrap/NativeAppManagedBootstrapContextBuilder.ts
@@ -31,6 +31,10 @@ export interface NativeAppManagedBootstrapBuildResult {
 const MAX_NATIVE_BOOTSTRAP_BRIEFING_CHARS = 18_000;
 const MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS = 24_000;
 export const MAX_NATIVE_BOOTSTRAP_TOTAL_CONTEXT_CHARS = 256_000;
+const MIN_NATIVE_BOOTSTRAP_CONTEXT_CHARS = 6_000;
+const NATIVE_BOOTSTRAP_COMPACT_ROSTER_MEMBER_COUNT = 10;
+const NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_MIN_CHARS = 64_000;
+const NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_PER_MEMBER_CHARS = 4_000;
 const NATIVE_BOOTSTRAP_LARGE_ROSTER_MEMBER_COUNT = 7;
 const NATIVE_BOOTSTRAP_NEAR_LIMIT_RATIO = 0.85;
 
@@ -72,6 +76,7 @@ function buildContextText(params: {
   providerId?: TeamProviderId;
   cwd: string;
   briefing: string;
+  maxContextChars?: number;
 }): string {
   const briefing = boundText(
     redactNativeBootstrapContextText(params.briefing),
@@ -90,7 +95,39 @@ function buildContextText(params: {
       '</member_briefing_context_data>',
       '</agent_teams_native_bootstrap_context>',
     ].join('\n'),
-    MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS
+    params.maxContextChars ?? MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS
+  );
+}
+
+function shouldUseCompactNativeBootstrapContext(nativeMemberCount: number): boolean {
+  if (nativeMemberCount >= NATIVE_BOOTSTRAP_COMPACT_ROSTER_MEMBER_COUNT) {
+    return true;
+  }
+  const reservedSpecOverhead = Math.max(
+    NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_MIN_CHARS,
+    nativeMemberCount * NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_PER_MEMBER_CHARS
+  );
+  return (
+    nativeMemberCount * MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS >
+    MAX_NATIVE_BOOTSTRAP_TOTAL_CONTEXT_CHARS - reservedSpecOverhead
+  );
+}
+
+function getNativeBootstrapContextCharLimit(nativeMemberCount: number): number {
+  if (!shouldUseCompactNativeBootstrapContext(nativeMemberCount)) {
+    return MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS;
+  }
+  const reservedSpecOverhead = Math.max(
+    NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_MIN_CHARS,
+    nativeMemberCount * NATIVE_BOOTSTRAP_SPEC_JSON_OVERHEAD_PER_MEMBER_CHARS
+  );
+  const aggregateContextBudget = Math.max(
+    MIN_NATIVE_BOOTSTRAP_CONTEXT_CHARS * nativeMemberCount,
+    MAX_NATIVE_BOOTSTRAP_TOTAL_CONTEXT_CHARS - reservedSpecOverhead
+  );
+  return Math.min(
+    MAX_NATIVE_BOOTSTRAP_CONTEXT_CHARS,
+    Math.floor(aggregateContextBudget / Math.max(1, nativeMemberCount))
   );
 }
 
@@ -162,6 +199,63 @@ function buildLocalNativeMemberBriefing(params: {
     .join('\n');
 }
 
+function formatCompactField(label: string, value: string | undefined, maxChars: number): string {
+  const trimmed = value?.trim();
+  if (!trimmed) {
+    return '';
+  }
+  return `${label}: ${boundText(redactNativeBootstrapContextText(trimmed), maxChars)}`;
+}
+
+async function readCompactTaskBriefing(params: {
+  controller: ReturnType<typeof createController>;
+  memberName: string;
+}): Promise<string> {
+  try {
+    return String(await params.controller.tasks.taskBriefing(params.memberName));
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    return `Task briefing unavailable during startup context generation: ${message}`;
+  }
+}
+
+function buildCompactNativeMemberBriefing(params: {
+  teamName: string;
+  cwd: string;
+  providerId?: TeamProviderId;
+  member: TeamCreateRequest['members'][number];
+  taskBriefing: string;
+  maxContextChars: number;
+}): string {
+  const member = params.member;
+  const taskBriefingLimit = Math.max(1_200, Math.floor(params.maxContextChars * 0.55));
+  return [
+    `You are ${member.name}, a teammate in team ${params.teamName}.`,
+    `Provider: ${params.providerId ?? 'anthropic'}`,
+    `Project: ${member.cwd?.trim() || params.cwd}`,
+    formatCompactField('Role', member.role, 700),
+    formatCompactField('Workflow', member.workflow, 1_200),
+    formatCompactField('Model', member.model, 300),
+    formatCompactField('Effort', member.effort, 100),
+    '',
+    'The app loaded compact startup context for a large native team.',
+    '',
+    'Startup rules:',
+    '- This bootstrap turn is private. Reply locally once, then stop and wait for real work.',
+    '- Do not call member_briefing for launch readiness in this flow.',
+    '- Do not send messages to the user, lead, or teammates during bootstrap.',
+    '- Before real task work, use task_briefing as your working queue.',
+    '- Start real work only from an assigned task or a direct app-delivered instruction.',
+    '- Post durable task results as task comments before completing tasks.',
+    '- Ask the lead when blocked instead of guessing.',
+    '',
+    'Current task briefing:',
+    boundText(redactNativeBootstrapContextText(params.taskBriefing), taskBriefingLimit),
+  ]
+    .filter((line) => line.length > 0)
+    .join('\n');
+}
+
 export async function buildNativeAppManagedBootstrapSpecs(params: {
   teamName: string;
   cwd: string;
@@ -182,39 +276,52 @@ export async function buildNativeAppManagedBootstrapSpecsWithDiagnostics(params:
   });
   const result = new Map<string, NativeAppManagedBootstrapSpec>();
   let totalContextChars = 0;
-  let nativeMemberCount = 0;
-
-  for (const member of params.members) {
-    const providerId = normalizeOptionalTeamProviderId(member.providerId) ?? 'anthropic';
-    if (!isNativeAppManagedBootstrapProvider(providerId)) {
-      continue;
-    }
-    nativeMemberCount += 1;
+  const nativeMembers = params.members
+    .map((member) => ({
+      member,
+      providerId: normalizeOptionalTeamProviderId(member.providerId) ?? 'anthropic',
+    }))
+    .filter(({ providerId }) => isNativeAppManagedBootstrapProvider(providerId));
+  const nativeMemberCount = nativeMembers.length;
+  const compactContext = shouldUseCompactNativeBootstrapContext(nativeMemberCount);
+  const maxContextChars = getNativeBootstrapContextCharLimit(nativeMemberCount);
 
+  for (const { member, providerId } of nativeMembers) {
     let briefing: string;
-    try {
-      briefing = String(
-        await controller.tasks.memberBriefing(member.name, {
-          runtimeProvider: 'native',
-          includeActiveProcesses: false,
-        })
-      );
-    } catch (error) {
-      const message = error instanceof Error ? error.message : String(error);
-      if (!message.includes('Member not found in team metadata or inboxes')) {
-        throw error;
-      }
-      // In createTeam, the orchestrator's canonical config/inboxes may not
-      // exist until after the lead process runs. Fail-closed would break team
-      // creation, so use bounded request metadata while keeping readiness tied
-      // to the private bootstrap proof, never to this context load.
-      briefing = buildLocalNativeMemberBriefing({
+    if (compactContext) {
+      briefing = buildCompactNativeMemberBriefing({
         teamName: params.teamName,
         cwd: params.cwd,
         providerId,
         member,
-        unavailableReason: message,
+        taskBriefing: await readCompactTaskBriefing({ controller, memberName: member.name }),
+        maxContextChars,
       });
+    } else {
+      try {
+        briefing = String(
+          await controller.tasks.memberBriefing(member.name, {
+            runtimeProvider: 'native',
+            includeActiveProcesses: false,
+          })
+        );
+      } catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        if (!message.includes('Member not found in team metadata or inboxes')) {
+          throw error;
+        }
+        // In createTeam, the orchestrator's canonical config/inboxes may not
+        // exist until after the lead process runs. Fail-closed would break team
+        // creation, so use bounded request metadata while keeping readiness tied
+        // to the private bootstrap proof, never to this context load.
+        briefing = buildLocalNativeMemberBriefing({
+          teamName: params.teamName,
+          cwd: params.cwd,
+          providerId,
+          member,
+          unavailableReason: message,
+        });
+      }
     }
     const boundedBriefing = boundText(
       redactNativeBootstrapContextText(briefing),
@@ -229,6 +336,7 @@ export async function buildNativeAppManagedBootstrapSpecsWithDiagnostics(params:
       providerId,
       cwd: member.cwd?.trim() || params.cwd,
       briefing: boundedBriefing,
+      maxContextChars,
     });
     totalContextChars += contextText.length;
     if (totalContextChars > MAX_NATIVE_BOOTSTRAP_TOTAL_CONTEXT_CHARS) {
diff --git a/src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient.ts b/src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient.ts
index 87778ee2..acab846a 100644
--- a/src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient.ts
+++ b/src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient.ts
@@ -58,6 +58,8 @@ export interface OpenCodeBridgeCommandClientOptions {
 const DEFAULT_STDOUT_LIMIT_BYTES = 1_000_000;
 const DEFAULT_STDERR_LIMIT_BYTES = 256_000;
 const WINDOWS_BATCH_EXTENSIONS = new Set(['.cmd', '.bat']);
+const EMPTY_STDOUT_READINESS_MAX_ATTEMPTS = 2;
+const EMPTY_STDOUT_READINESS_RETRY_DELAY_MS = 250;
 
 export function resolveOpenCodeBridgeProcessCwd(
   binaryPath: string,
@@ -160,60 +162,105 @@ export class OpenCodeBridgeCommandClient {
       body,
     };
     const inputPath = await this.writeInputFile(envelope);
+    const outputPath = `${inputPath}.output.json`;
 
     try {
-      const processResult = await this.processRunner.run({
-        binaryPath: this.binaryPath,
-        args: ['runtime', 'opencode-command', '--json', '--input', inputPath],
-        cwd: resolveOpenCodeBridgeProcessCwd(this.binaryPath, options.cwd),
-        timeoutMs: options.timeoutMs,
-        stdoutLimitBytes: options.stdoutLimitBytes ?? DEFAULT_STDOUT_LIMIT_BYTES,
-        stderrLimitBytes: options.stderrLimitBytes ?? DEFAULT_STDERR_LIMIT_BYTES,
-        env: await this.resolveEnv(),
-      });
-
-      if (processResult.timedOut) {
-        return this.contractFailure(
-          envelope,
-          'timeout',
-          'OpenCode bridge command timed out',
-          true,
-          {
-            stderr: redactBridgeDiagnosticText(processResult.stderr),
-          }
-        );
-      }
-
-      if (processResult.exitCode !== 0) {
-        return this.contractFailure(
-          envelope,
-          'provider_error',
-          'OpenCode bridge command failed',
-          true,
-          {
-            exitCode: processResult.exitCode,
-            stderr: redactBridgeDiagnosticText(processResult.stderr),
-          }
-        );
-      }
-
-      const parsed = parseSingleBridgeJsonResult<TData>(processResult.stdout);
-      if (!parsed.ok) {
-        return this.contractFailure(envelope, 'contract_violation', parsed.error, false, {
-          stdoutPreview: redactBridgeDiagnosticText(processResult.stdout.slice(0, 2_000)),
+      const maxAttempts =
+        command === 'opencode.readiness' ? EMPTY_STDOUT_READINESS_MAX_ATTEMPTS : 1;
+      for (let attempt = 1; attempt <= maxAttempts; attempt += 1) {
+        const processResult = await this.processRunner.run({
+          binaryPath: this.binaryPath,
+          args: [
+            'runtime',
+            'opencode-command',
+            '--json',
+            '--input',
+            inputPath,
+            '--output',
+            outputPath,
+          ],
+          cwd: resolveOpenCodeBridgeProcessCwd(this.binaryPath, options.cwd),
+          timeoutMs: options.timeoutMs,
+          stdoutLimitBytes: options.stdoutLimitBytes ?? DEFAULT_STDOUT_LIMIT_BYTES,
+          stderrLimitBytes: options.stderrLimitBytes ?? DEFAULT_STDERR_LIMIT_BYTES,
+          env: await this.resolveEnv(),
         });
+        const stdout = await this.readBridgeOutput(processResult.stdout, outputPath);
+
+        if (processResult.timedOut) {
+          return this.contractFailure(
+            envelope,
+            'timeout',
+            'OpenCode bridge command timed out',
+            true,
+            {
+              stderr: redactBridgeDiagnosticText(processResult.stderr),
+              attempts: attempt,
+            }
+          );
+        }
+
+        if (processResult.exitCode !== 0) {
+          return this.contractFailure(
+            envelope,
+            'provider_error',
+            'OpenCode bridge command failed',
+            true,
+            {
+              exitCode: processResult.exitCode,
+              stderr: redactBridgeDiagnosticText(processResult.stderr),
+              attempts: attempt,
+            }
+          );
+        }
+
+        const parsed = parseSingleBridgeJsonResult<TData>(stdout);
+        if (!parsed.ok) {
+          if (shouldRetryEmptyReadinessStdout(command, parsed.error, attempt, maxAttempts)) {
+            await sleep(EMPTY_STDOUT_READINESS_RETRY_DELAY_MS);
+            continue;
+          }
+
+          return this.contractFailure(envelope, 'contract_violation', parsed.error, false, {
+            stdoutPreview: redactBridgeDiagnosticText(stdout.slice(0, 2_000)),
+            stderrPreview: redactBridgeDiagnosticText(processResult.stderr.slice(0, 2_000)),
+            attempts: attempt,
+          });
+        }
+
+        const validation = validateBridgeResultEnvelope(parsed.value, envelope);
+        if (!validation.ok) {
+          return this.contractFailure(envelope, 'contract_violation', validation.reason, false, {
+            attempts: attempt,
+          });
+        }
+
+        return parsed.value;
       }
 
-      const validation = validateBridgeResultEnvelope(parsed.value, envelope);
-      if (!validation.ok) {
-        return this.contractFailure(envelope, 'contract_violation', validation.reason, false, {});
-      }
-
-      return parsed.value;
+      return this.contractFailure(
+        envelope,
+        'contract_violation',
+        'Bridge stdout was empty after retry',
+        false,
+        { attempts: maxAttempts }
+      );
     } finally {
       if (!this.keepInputFile) {
         await fs.unlink(inputPath).catch(() => undefined);
       }
+      await fs.unlink(outputPath).catch(() => undefined);
+    }
+  }
+
+  private async readBridgeOutput(stdout: string, outputPath: string): Promise<string> {
+    if (stdout.trim().length > 0) {
+      return stdout;
+    }
+    try {
+      return await fs.readFile(outputPath, 'utf8');
+    } catch {
+      return stdout;
     }
   }
 
@@ -285,6 +332,21 @@ export function redactBridgeDiagnosticText(value: string): string {
     .replace(/((?:api[_-]?key|token|password|secret)\s*[=:]\s*)[^\s"'`]+/gi, '$1[redacted]');
 }
 
+function shouldRetryEmptyReadinessStdout(
+  command: OpenCodeBridgeCommandName,
+  error: string,
+  attempt: number,
+  maxAttempts: number
+): boolean {
+  return (
+    command === 'opencode.readiness' && error === 'Bridge stdout was empty' && attempt < maxAttempts
+  );
+}
+
+function sleep(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 function bufferToString(value: string | Buffer | undefined): string {
   if (typeof value === 'string') {
     return value;
diff --git a/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryAdvisoryPolicy.ts b/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryAdvisoryPolicy.ts
index de83fcf6..ebbc0e04 100644
--- a/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryAdvisoryPolicy.ts
+++ b/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryAdvisoryPolicy.ts
@@ -12,6 +12,7 @@ import type {
 } from '@shared/types';
 
 export const OPENCODE_RUNTIME_DELIVERY_GENERIC_PROOF_GRACE_MS = 120_000;
+const OPENCODE_RUNTIME_DELIVERY_PROOF_TIMESTAMP_SKEW_MS = 5_000;
 
 export interface OpenCodeRuntimeDeliveryProofSnapshot {
   latestSuccessAt?: number;
@@ -156,14 +157,20 @@ export function hasSupersedingOpenCodeRuntimeDeliveryProof(input: {
   if (!proof) {
     return false;
   }
-  const recordTime = getOpenCodeRuntimeDeliveryRecordTimeMs(input.record);
-  if (typeof proof.latestSuccessAt === 'number' && proof.latestSuccessAt > recordTime) {
+  const promptTime = getOpenCodeRuntimeDeliveryPromptTimeMs(input.record);
+  const isPromptTimeEligible = (proofAt: number): boolean => {
+    if (!Number.isFinite(proofAt) || proofAt <= 0) {
+      return false;
+    }
+    if (!Number.isFinite(promptTime) || promptTime <= 0) {
+      return true;
+    }
+    return proofAt + OPENCODE_RUNTIME_DELIVERY_PROOF_TIMESTAMP_SKEW_MS >= promptTime;
+  };
+  if (typeof proof.visibleReplyAt === 'number' && isPromptTimeEligible(proof.visibleReplyAt)) {
     return true;
   }
-  if (typeof proof.visibleReplyAt === 'number' && proof.visibleReplyAt > 0) {
-    return true;
-  }
-  if (typeof proof.taskProgressAt === 'number' && proof.taskProgressAt > 0) {
+  if (typeof proof.taskProgressAt === 'number' && isPromptTimeEligible(proof.taskProgressAt)) {
     return true;
   }
   return false;
diff --git a/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryDiagnostics.ts b/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryDiagnostics.ts
index fb27767e..6458b8ac 100644
--- a/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryDiagnostics.ts
+++ b/src/main/services/team/opencode/delivery/OpenCodeRuntimeDeliveryDiagnostics.ts
@@ -77,7 +77,7 @@ function isOpenCodeRuntimeDeliveryCleanSessionRefreshDiagnostic(message: string)
   );
 }
 
-function isInformationalOpenCodeRuntimeDeliveryDiagnostic(
+export function isInformationalOpenCodeRuntimeDeliveryDiagnostic(
   message: string | null | undefined
 ): boolean {
   const normalized = message?.trim().toLowerCase();
diff --git a/src/main/services/team/opencode/readiness/OpenCodeTeamLaunchReadiness.ts b/src/main/services/team/opencode/readiness/OpenCodeTeamLaunchReadiness.ts
index b3e90652..7ebc877f 100644
--- a/src/main/services/team/opencode/readiness/OpenCodeTeamLaunchReadiness.ts
+++ b/src/main/services/team/opencode/readiness/OpenCodeTeamLaunchReadiness.ts
@@ -101,6 +101,10 @@ export interface OpenCodeTeamLaunchReadinessServiceOptions {
 
 const OPENCODE_RUNTIME_BINARY_UNREACHABLE_DIAGNOSTIC =
   'OpenCode runtime binary is not installed or not reachable by launch preflight.';
+const OPENCODE_UNAUTHENTICATED_FREE_MODEL_DIAGNOSTIC =
+  'No connected OpenCode provider found. Proceeding with a free OpenCode model route that does not require provider authentication.';
+const OPENCODE_UNAUTHENTICATED_PAID_MODEL_DIAGNOSTIC =
+  'No connected OpenCode provider found. Choose a free OpenCode model such as Big Pickle, or connect a provider in OpenCode for provider-backed models.';
 
 export class OpenCodeTeamLaunchReadinessService {
   constructor(
@@ -132,18 +136,14 @@ export class OpenCodeTeamLaunchReadinessService {
         });
       }
 
-      if (!inventory.authenticated || inventory.connectedProviders.length === 0) {
-        return readiness({
-          state: 'not_authenticated',
-          inventory,
-          modelId: input.selectedModel,
-          diagnostics: appendDiagnostics(inventory.diagnostics, [
-            'No connected OpenCode providers found',
-          ]),
-        });
-      }
-
-      const modelId = input.selectedModel ?? inventory.models[0] ?? null;
+      const explicitModelId = input.selectedModel?.trim() || null;
+      const hasConnectedProvider =
+        inventory.authenticated && inventory.connectedProviders.length > 0;
+      const modelId =
+        explicitModelId ??
+        (!hasConnectedProvider
+          ? (inventory.models.find(isFreeOpenCodeModelRoute) ?? inventory.models[0] ?? null)
+          : (inventory.models[0] ?? null));
       if (!modelId) {
         return readiness({
           state: 'model_unavailable',
@@ -153,6 +153,20 @@ export class OpenCodeTeamLaunchReadinessService {
         });
       }
 
+      const usingFreeModelWithoutProvider =
+        !hasConnectedProvider && isFreeOpenCodeModelRoute(modelId);
+
+      if (!hasConnectedProvider && !usingFreeModelWithoutProvider) {
+        return readiness({
+          state: 'not_authenticated',
+          inventory,
+          modelId,
+          diagnostics: appendDiagnostics(inventory.diagnostics, [
+            OPENCODE_UNAUTHENTICATED_PAID_MODEL_DIAGNOSTIC,
+          ]),
+        });
+      }
+
       const capabilities = await this.capabilities.detect({
         projectPath: input.projectPath,
         inventory,
@@ -241,7 +255,11 @@ export class OpenCodeTeamLaunchReadinessService {
         runtimeStoreReadiness,
         supportLevel: support.supportLevel,
         launchAllowed: true,
-        diagnostics: inventory.diagnostics,
+        diagnostics: usingFreeModelWithoutProvider
+          ? appendDiagnostics(inventory.diagnostics, [
+              OPENCODE_UNAUTHENTICATED_FREE_MODEL_DIAGNOSTIC,
+            ])
+          : inventory.diagnostics,
       });
     } catch (error) {
       return readiness({
@@ -254,6 +272,16 @@ export class OpenCodeTeamLaunchReadinessService {
   }
 }
 
+function isFreeOpenCodeModelRoute(modelId: string): boolean {
+  const normalized = modelId.trim().toLowerCase();
+  return (
+    normalized === 'opencode/big-pickle' ||
+    normalized.includes(':free') ||
+    normalized.endsWith('-free') ||
+    normalized.endsWith('/free')
+  );
+}
+
 function readiness(input: {
   state: OpenCodeTeamLaunchReadinessState;
   inventory: OpenCodeRuntimeInventory | null;
diff --git a/src/main/services/team/stallMonitor/TeamTaskStallPolicy.ts b/src/main/services/team/stallMonitor/TeamTaskStallPolicy.ts
index f9cf2ef3..06caec45 100644
--- a/src/main/services/team/stallMonitor/TeamTaskStallPolicy.ts
+++ b/src/main/services/team/stallMonitor/TeamTaskStallPolicy.ts
@@ -18,14 +18,14 @@ const REVIEW_TOUCH_TOOLS = new Set(['review_start', 'task_add_comment']);
 
 const ONE_MINUTE_MS = 60_000;
 const WORK_THRESHOLDS_MS: Record<TaskStallSignal, number> = {
-  turn_ended_after_touch: 8 * ONE_MINUTE_MS,
-  touch_then_other_turns: 10 * ONE_MINUTE_MS,
-  mid_turn_after_touch: 20 * ONE_MINUTE_MS,
+  turn_ended_after_touch: 4 * ONE_MINUTE_MS,
+  touch_then_other_turns: 5 * ONE_MINUTE_MS,
+  mid_turn_after_touch: 10 * ONE_MINUTE_MS,
 };
 const REVIEW_THRESHOLDS_MS: Record<TaskStallSignal, number> = {
-  turn_ended_after_touch: 10 * ONE_MINUTE_MS,
-  touch_then_other_turns: 10 * ONE_MINUTE_MS,
-  mid_turn_after_touch: 25 * ONE_MINUTE_MS,
+  turn_ended_after_touch: 5 * ONE_MINUTE_MS,
+  touch_then_other_turns: 6 * ONE_MINUTE_MS,
+  mid_turn_after_touch: 12 * ONE_MINUTE_MS,
 };
 
 function skip(
diff --git a/src/main/services/team/stallMonitor/featureGates.ts b/src/main/services/team/stallMonitor/featureGates.ts
index d3c2c551..90db02a7 100644
--- a/src/main/services/team/stallMonitor/featureGates.ts
+++ b/src/main/services/team/stallMonitor/featureGates.ts
@@ -44,7 +44,7 @@ export function isTeamTaskStallAlertsEnabled(): boolean {
 }
 
 export function getTeamTaskStallScanIntervalMs(): number {
-  return readInt(process.env.CLAUDE_TEAM_TASK_STALL_SCAN_INTERVAL_MS, 60_000);
+  return readInt(process.env.CLAUDE_TEAM_TASK_STALL_SCAN_INTERVAL_MS, 30_000);
 }
 
 export function getTeamTaskStallStartupGraceMs(): number {
@@ -52,10 +52,10 @@ export function getTeamTaskStallStartupGraceMs(): number {
 }
 
 export function getTeamTaskStallActivationGraceMs(): number {
-  return readInt(process.env.CLAUDE_TEAM_TASK_STALL_ACTIVATION_GRACE_MS, 120_000);
+  return readInt(process.env.CLAUDE_TEAM_TASK_STALL_ACTIVATION_GRACE_MS, 60_000);
 }
 
 export function getOpenCodeWeakStartStallThresholdMs(): number {
   // Shorter OpenCode threshold for "started work" comments that do not contain concrete progress.
-  return readInt(process.env.CLAUDE_TEAM_OPENCODE_WEAK_START_STALL_THRESHOLD_MS, 120_000);
+  return readInt(process.env.CLAUDE_TEAM_OPENCODE_WEAK_START_STALL_THRESHOLD_MS, 100_000);
 }
diff --git a/src/main/standalone.ts b/src/main/standalone.ts
index eda481d9..e263608a 100644
--- a/src/main/standalone.ts
+++ b/src/main/standalone.ts
@@ -1,5 +1,5 @@
 /**
- * Standalone (non-Electron) entry point for Agent Teams UI.
+ * Standalone (non-Electron) entry point for Agent Teams AI.
  *
  * Runs the HTTP server + API without Electron, suitable for Docker
  * or any headless/remote environment. The renderer is served as
diff --git a/src/main/types/chunks.ts b/src/main/types/chunks.ts
index fcd9e54c..6c6c0d1e 100644
--- a/src/main/types/chunks.ts
+++ b/src/main/types/chunks.ts
@@ -1,5 +1,5 @@
 /**
- * Chunk and visualization types for Agent Teams UI.
+ * Chunk and visualization types for Agent Teams AI.
  *
  * This module contains:
  * - Chunk types (UserChunk, AIChunk, SystemChunk, CompactChunk)
diff --git a/src/main/types/domain.ts b/src/main/types/domain.ts
index b0221f56..e771c9c4 100644
--- a/src/main/types/domain.ts
+++ b/src/main/types/domain.ts
@@ -1,5 +1,5 @@
 /**
- * Domain/business entity types for Agent Teams UI.
+ * Domain/business entity types for Agent Teams AI.
  *
  * These types represent the application's domain model:
  * - Projects and sessions
diff --git a/src/main/types/messages.ts b/src/main/types/messages.ts
index a7d9f6e2..dbcaa44a 100644
--- a/src/main/types/messages.ts
+++ b/src/main/types/messages.ts
@@ -1,5 +1,5 @@
 /**
- * Parsed message types and type guards for Agent Teams UI.
+ * Parsed message types and type guards for Agent Teams AI.
  *
  * ParsedMessage is the application's internal representation after parsing
  * raw JSONL entries. This module also contains type guards for classifying
diff --git a/src/main/utils/electronUserDataMigration.ts b/src/main/utils/electronUserDataMigration.ts
index d09fc9dc..7376fe61 100644
--- a/src/main/utils/electronUserDataMigration.ts
+++ b/src/main/utils/electronUserDataMigration.ts
@@ -3,6 +3,7 @@ import * as path from 'path';
 
 const LEGACY_USER_DATA_DIR_NAMES = [
   'agent-teams-ai',
+  'Agent Teams AI',
   'Agent Teams UI',
   'Claude Agent Teams UI',
   'claude-agent-teams-ui',
diff --git a/src/preload/index.ts b/src/preload/index.ts
index 1370a6d0..523f6631 100644
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -331,6 +331,7 @@ import type {
   TeamLaunchResponse,
   TeamMemberActivityMeta,
   TeamMessageNotificationData,
+  TeamProvisioningModelCheckRequest,
   TeamProvisioningModelVerificationMode,
   TeamProvisioningPrepareResult,
   TeamProvisioningProgress,
@@ -927,7 +928,8 @@ const electronAPI: ElectronAPI = {
       providerIds?: TeamLaunchRequest['providerId'][],
       selectedModels?: string[],
       limitContext?: boolean,
-      modelVerificationMode?: TeamProvisioningModelVerificationMode
+      modelVerificationMode?: TeamProvisioningModelVerificationMode,
+      selectedModelChecks?: TeamProvisioningModelCheckRequest[]
     ) => {
       return invokeIpcWithResult<TeamProvisioningPrepareResult>(
         TEAM_PREPARE_PROVISIONING,
@@ -936,7 +938,8 @@ const electronAPI: ElectronAPI = {
         providerIds,
         selectedModels,
         limitContext,
-        modelVerificationMode
+        modelVerificationMode,
+        selectedModelChecks
       );
     },
     getWorktreeGitStatus: async (projectPath: string) => {
diff --git a/src/renderer/components/dashboard/CliStatusBanner.tsx b/src/renderer/components/dashboard/CliStatusBanner.tsx
index b7cf7dc8..b7904727 100644
--- a/src/renderer/components/dashboard/CliStatusBanner.tsx
+++ b/src/renderer/components/dashboard/CliStatusBanner.tsx
@@ -34,6 +34,10 @@ import {
 import { ProviderModelBadges } from '@renderer/components/runtime/ProviderModelBadges';
 import { getProviderRuntimeBackendSummary } from '@renderer/components/runtime/ProviderRuntimeBackendSelector';
 import { ProviderRuntimeSettingsDialog } from '@renderer/components/runtime/ProviderRuntimeSettingsDialog';
+import {
+  getProviderTerminalCommand,
+  getProviderTerminalLogoutCommand,
+} from '@renderer/components/runtime/providerTerminalCommands';
 import { TerminalLogPanel } from '@renderer/components/terminal/TerminalLogPanel';
 import { TerminalModal } from '@renderer/components/terminal/TerminalModal';
 import { useCliInstaller } from '@renderer/hooks/useCliInstaller';
@@ -393,62 +397,6 @@ function getProviderLabel(providerId: CliProviderId): string {
   }
 }
 
-function getProviderTerminalCommand(provider: CliProviderStatus): {
-  args: string[];
-  env?: Record<string, string>;
-} {
-  if (provider.providerId === 'gemini') {
-    return {
-      args: ['login'],
-      env: {
-        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
-        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
-      },
-    };
-  }
-
-  if (provider.providerId === 'codex') {
-    return {
-      args: ['auth', 'login', '--provider', provider.providerId],
-      env: {
-        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
-      },
-    };
-  }
-
-  return {
-    args: ['auth', 'login', '--provider', provider.providerId],
-  };
-}
-
-function getProviderTerminalLogoutCommand(provider: CliProviderStatus): {
-  args: string[];
-  env?: Record<string, string>;
-} {
-  if (provider.providerId === 'gemini') {
-    return {
-      args: ['logout'],
-      env: {
-        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
-        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
-      },
-    };
-  }
-
-  if (provider.providerId === 'codex') {
-    return {
-      args: ['auth', 'logout', '--provider', provider.providerId],
-      env: {
-        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
-      },
-    };
-  }
-
-  return {
-    args: ['auth', 'logout', '--provider', provider.providerId],
-  };
-}
-
 const ProviderDetailSkeleton = (): React.JSX.Element => {
   return (
     <div className="mt-1 space-y-2">
@@ -584,18 +532,35 @@ function hasVisibleAuthenticatedMultimodelProvider(
   return visibleProviders.some((provider) => provider.authenticated);
 }
 
+function isOpenCodeProviderEffectivelyReady(provider: CliProviderStatus): boolean {
+  return (
+    provider.providerId === 'opencode' &&
+    provider.supported === true &&
+    provider.authenticated === true &&
+    provider.verificationState === 'verified' &&
+    provider.capabilities.teamLaunch === true
+  );
+}
+
+function isOpenCodeRuntimeReady(openCodeRuntimeStatus: OpenCodeRuntimeStatus | null): boolean {
+  return (
+    openCodeRuntimeStatus?.installed === true &&
+    (openCodeRuntimeStatus.source === 'path' ||
+      (openCodeRuntimeStatus.source === 'app-managed' && openCodeRuntimeStatus.state !== 'failed'))
+  );
+}
+
 function shouldShowOpenCodeInstallAction(
   provider: CliProviderStatus,
   showSkeleton: boolean,
   openCodeRuntimeStatus: OpenCodeRuntimeStatus | null
 ): boolean {
-  const runtimeReady =
-    openCodeRuntimeStatus?.installed === true &&
-    (openCodeRuntimeStatus.source === 'path' ||
-      (openCodeRuntimeStatus.source === 'app-managed' && openCodeRuntimeStatus.state !== 'failed'));
-  const runtimeNeedsInstall = !runtimeReady;
-
-  return provider.providerId === 'opencode' && !showSkeleton && runtimeNeedsInstall;
+  return (
+    provider.providerId === 'opencode' &&
+    !showSkeleton &&
+    !isOpenCodeProviderEffectivelyReady(provider) &&
+    !isOpenCodeRuntimeReady(openCodeRuntimeStatus)
+  );
 }
 
 function shouldShowCodexInstallAction(
diff --git a/src/renderer/components/runtime/providerTerminalCommands.ts b/src/renderer/components/runtime/providerTerminalCommands.ts
new file mode 100644
index 00000000..bc9593ae
--- /dev/null
+++ b/src/renderer/components/runtime/providerTerminalCommands.ts
@@ -0,0 +1,58 @@
+import type { CliProviderStatus } from '@shared/types';
+
+export interface ProviderTerminalCommand {
+  args: string[];
+  env?: Record<string, string>;
+}
+
+export function getProviderTerminalCommand(provider: CliProviderStatus): ProviderTerminalCommand {
+  if (provider.providerId === 'gemini') {
+    return {
+      args: ['login'],
+      env: {
+        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
+        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
+      },
+    };
+  }
+
+  if (provider.providerId === 'codex') {
+    return {
+      args: ['auth', 'login', '--provider', provider.providerId],
+      env: {
+        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
+      },
+    };
+  }
+
+  return {
+    args: ['auth', 'login', '--provider', provider.providerId],
+  };
+}
+
+export function getProviderTerminalLogoutCommand(
+  provider: CliProviderStatus
+): ProviderTerminalCommand {
+  if (provider.providerId === 'gemini') {
+    return {
+      args: ['logout'],
+      env: {
+        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
+        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
+      },
+    };
+  }
+
+  if (provider.providerId === 'codex') {
+    return {
+      args: ['auth', 'logout', '--provider', provider.providerId],
+      env: {
+        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
+      },
+    };
+  }
+
+  return {
+    args: ['auth', 'logout', '--provider', provider.providerId],
+  };
+}
diff --git a/src/renderer/components/settings/sections/AdvancedSection.tsx b/src/renderer/components/settings/sections/AdvancedSection.tsx
index 949a3c00..ca8a5251 100644
--- a/src/renderer/components/settings/sections/AdvancedSection.tsx
+++ b/src/renderer/components/settings/sections/AdvancedSection.tsx
@@ -172,7 +172,7 @@ export const AdvancedSection = ({
         <div>
           <div className="flex items-center gap-3">
             <p className="text-sm font-medium" style={{ color: 'var(--color-text)' }}>
-              Agent Teams UI
+              Agent Teams AI
             </p>
             {isElectron && (
               <button
diff --git a/src/renderer/components/settings/sections/CliStatusSection.tsx b/src/renderer/components/settings/sections/CliStatusSection.tsx
index 0b6ee6dc..77953757 100644
--- a/src/renderer/components/settings/sections/CliStatusSection.tsx
+++ b/src/renderer/components/settings/sections/CliStatusSection.tsx
@@ -28,6 +28,10 @@ import {
 import { ProviderModelBadges } from '@renderer/components/runtime/ProviderModelBadges';
 import { getProviderRuntimeBackendSummary } from '@renderer/components/runtime/ProviderRuntimeBackendSelector';
 import { ProviderRuntimeSettingsDialog } from '@renderer/components/runtime/ProviderRuntimeSettingsDialog';
+import {
+  getProviderTerminalCommand,
+  getProviderTerminalLogoutCommand,
+} from '@renderer/components/runtime/providerTerminalCommands';
 import { TerminalModal } from '@renderer/components/terminal/TerminalModal';
 import { useCliInstaller } from '@renderer/hooks/useCliInstaller';
 import { useStore } from '@renderer/store';
@@ -129,62 +133,6 @@ function getProviderLabel(providerId: CliProviderId): string {
   }
 }
 
-function getProviderTerminalCommand(provider: CliProviderStatus): {
-  args: string[];
-  env?: Record<string, string>;
-} {
-  if (provider.providerId === 'gemini') {
-    return {
-      args: ['login'],
-      env: {
-        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
-        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
-      },
-    };
-  }
-
-  if (provider.providerId === 'codex') {
-    return {
-      args: ['auth', 'login', '--provider', provider.providerId],
-      env: {
-        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
-      },
-    };
-  }
-
-  return {
-    args: ['auth', 'login', '--provider', provider.providerId],
-  };
-}
-
-function getProviderTerminalLogoutCommand(provider: CliProviderStatus): {
-  args: string[];
-  env?: Record<string, string>;
-} {
-  if (provider.providerId === 'gemini') {
-    return {
-      args: ['logout'],
-      env: {
-        CLAUDE_CODE_ENTRY_PROVIDER: 'gemini',
-        CLAUDE_CODE_GEMINI_BACKEND: provider.selectedBackendId ?? 'auto',
-      },
-    };
-  }
-
-  if (provider.providerId === 'codex') {
-    return {
-      args: ['auth', 'logout', '--provider', provider.providerId],
-      env: {
-        CLAUDE_CODE_CODEX_BACKEND: provider.selectedBackendId ?? 'codex-native',
-      },
-    };
-  }
-
-  return {
-    args: ['auth', 'logout', '--provider', provider.providerId],
-  };
-}
-
 export const CliStatusSection = (): React.JSX.Element | null => {
   const isElectron = useMemo(() => isElectronMode(), []);
   const appConfig = useStore((s) => s.appConfig);
diff --git a/src/renderer/components/team/CollapsibleTeamSection.tsx b/src/renderer/components/team/CollapsibleTeamSection.tsx
index 75231ee2..294c8eb0 100644
--- a/src/renderer/components/team/CollapsibleTeamSection.tsx
+++ b/src/renderer/components/team/CollapsibleTeamSection.tsx
@@ -149,7 +149,7 @@ export const CollapsibleTeamSection = memo(function CollapsibleTeamSection({
           {headerExtra}
         </div>
         {action && (
-          <div className="relative z-10 flex shrink-0 items-center self-start">{action}</div>
+          <div className="relative z-10 flex shrink-0 items-center self-stretch">{action}</div>
         )}
       </div>
       {keepMounted ? (
diff --git a/src/renderer/components/team/TeamDetailView.tsx b/src/renderer/components/team/TeamDetailView.tsx
index 1b5835ce..ae75fac9 100644
--- a/src/renderer/components/team/TeamDetailView.tsx
+++ b/src/renderer/components/team/TeamDetailView.tsx
@@ -144,6 +144,7 @@ import { TeamChangesSection } from './TeamChangesSection';
 import { TeamProvisioningBanner } from './TeamProvisioningBanner';
 import { loadTeamSessionMetadata } from './teamSessionFetchGuards';
 import { TeamSessionsSection } from './TeamSessionsSection';
+import { useTeamAgentRuntimeWatcher } from './useTeamAgentRuntimeWatcher';
 
 import type { KanbanFilterState } from './kanban/KanbanFilterPopover';
 import type { KanbanSortState } from './kanban/KanbanSortPopover';
@@ -915,8 +916,6 @@ const TeamSpawnStatusWatcher = memo(function TeamSpawnStatusWatcher({
   return null;
 });
 
-const TEAM_AGENT_RUNTIME_REFRESH_MS = 5_000;
-
 const TeamAgentRuntimeWatcher = memo(function TeamAgentRuntimeWatcher({
   teamName,
   isTeamProvisioning,
@@ -928,37 +927,12 @@ const TeamAgentRuntimeWatcher = memo(function TeamAgentRuntimeWatcher({
   isTeamAlive?: boolean;
   isThisTabActive: boolean;
 }): null {
-  const { leadActivity, fetchTeamAgentRuntime } = useStore(
-    useShallow((s) => ({
-      leadActivity: s.leadActivityByTeam[teamName],
-      fetchTeamAgentRuntime: s.fetchTeamAgentRuntime,
-    }))
-  );
-
-  useEffect(() => {
-    if (!isThisTabActive) return;
-    const shouldWatch =
-      isTeamProvisioning ||
-      isTeamAlive === true ||
-      leadActivity === 'active' ||
-      leadActivity === 'idle';
-    if (!shouldWatch) return;
-
-    void fetchTeamAgentRuntime(teamName);
-    const timer = window.setInterval(() => {
-      void fetchTeamAgentRuntime(teamName);
-    }, TEAM_AGENT_RUNTIME_REFRESH_MS);
-    return () => {
-      window.clearInterval(timer);
-    };
-  }, [
-    fetchTeamAgentRuntime,
+  useTeamAgentRuntimeWatcher({
+    teamName,
+    enabled: isThisTabActive,
     isTeamAlive,
     isTeamProvisioning,
-    isThisTabActive,
-    leadActivity,
-    teamName,
-  ]);
+  });
 
   return null;
 });
@@ -3332,6 +3306,7 @@ export const TeamDetailView = memo(function TeamDetailView({
                           providerId: entry.providerId,
                           model: entry.model,
                           effort: entry.effort,
+                          mcpPolicy: entry.mcpPolicy,
                         });
                       }
                       setAddMemberDialogOpen(false);
diff --git a/src/renderer/components/team/TeamListView.tsx b/src/renderer/components/team/TeamListView.tsx
index f2e896e7..eeb43ace 100644
--- a/src/renderer/components/team/TeamListView.tsx
+++ b/src/renderer/components/team/TeamListView.tsx
@@ -844,7 +844,7 @@ export const TeamListView = memo(function TeamListView(): React.JSX.Element {
               if (!role && m.agentType && m.agentType !== 'general-purpose') {
                 role = m.agentType;
               }
-              return { name: m.name, role };
+              return { name: m.name, role, mcpPolicy: m.mcpPolicy };
             });
           setCopyData({
             teamName: uniqueName,
diff --git a/src/renderer/components/team/dialogs/AddMemberDialog.tsx b/src/renderer/components/team/dialogs/AddMemberDialog.tsx
index 9d4ef77e..09f608fd 100644
--- a/src/renderer/components/team/dialogs/AddMemberDialog.tsx
+++ b/src/renderer/components/team/dialogs/AddMemberDialog.tsx
@@ -20,7 +20,7 @@ import { isGeminiUiFrozen } from '@renderer/utils/geminiUiFreeze';
 import { Loader2 } from 'lucide-react';
 
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
-import type { EffortLevel, TeamProviderId } from '@shared/types';
+import type { EffortLevel, TeamMemberMcpPolicy, TeamProviderId } from '@shared/types';
 
 export interface AddMemberEntry {
   name: string;
@@ -30,6 +30,7 @@ export interface AddMemberEntry {
   providerId?: TeamProviderId;
   model?: string;
   effort?: EffortLevel;
+  mcpPolicy?: TeamMemberMcpPolicy;
 }
 
 interface AddMemberDialogProps {
@@ -153,6 +154,7 @@ export const AddMemberDialog = ({
         providerId: m.providerId,
         model: m.model,
         effort: m.effort,
+        mcpPolicy: m.mcpPolicy,
       }))
     );
   };
diff --git a/src/renderer/components/team/dialogs/CreateTeamDialog.tsx b/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
index 6fc1c8a1..cc7e689c 100644
--- a/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
+++ b/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
@@ -103,28 +103,27 @@ import { loadProjectPathProjects, type ProjectPathProject } from './projectPathP
 import { ProjectPathSelector } from './ProjectPathSelector';
 import { buildProviderPrepareModelCacheKey } from './providerPrepareCacheKey';
 import {
-  getProviderPrepareCachedSnapshot,
   mergeReusableProviderPrepareModelResults,
   type ProviderPrepareDiagnosticsModelResult,
   runProviderPrepareDiagnostics,
 } from './providerPrepareDiagnostics';
+import { buildProviderPreparePlans, type ProviderPreparePlan } from './providerPreparePlans';
 import {
-  buildProviderPrepareMembersSignature,
-  buildProviderPrepareRequestSignature,
+  buildProviderPrepareModelChecksSignature,
   buildProviderPrepareRuntimeStatusSignature,
 } from './providerPrepareRequestSignature';
 import {
   getShortLivedProviderPrepareModelIssueReasons,
-  getShortLivedProviderPrepareModelResults,
   storeShortLivedProviderPrepareModelResults,
 } from './providerPrepareShortLivedCache';
 import { getProvisioningModelIssue } from './provisioningModelIssues';
+import { ProvisioningProviderRuntimeSettingsDialog } from './ProvisioningProviderRuntimeSettingsDialog';
 import {
   deriveEffectiveProvisioningPrepareState,
-  failIncompleteProviderChecks,
   getPrimaryProvisioningFailureDetail,
   getProvisioningFailureHint,
   getProvisioningProviderBackendSummary,
+  getProvisioningProviderProgressMessage,
   type ProvisioningProviderCheck,
   ProvisioningProviderStatusList,
   shouldHideProvisioningProviderStatusList,
@@ -146,6 +145,15 @@ import {
 } from './WorktreeGitReadinessBanner';
 
 import type { MemberDraft } from '@renderer/components/team/members/MembersEditorSection';
+import type {
+  CliProviderId,
+  EffortLevel,
+  TeamCreateRequest,
+  TeamFastMode,
+  TeamProviderId,
+  TeamProvisioningMemberInput,
+  TeamProvisioningModelCheckRequest,
+} from '@shared/types';
 
 const TEAM_COLOR_NAMES = [
   'blue',
@@ -160,14 +168,6 @@ const TEAM_COLOR_NAMES = [
 
 const APP_TEAM_RUNTIME_DISALLOWED_TOOLS = 'TeamDelete,TodoWrite,TaskCreate,TaskUpdate';
 
-import type {
-  EffortLevel,
-  TeamCreateRequest,
-  TeamFastMode,
-  TeamProviderId,
-  TeamProvisioningMemberInput,
-} from '@shared/types';
-
 function getProviderLabel(providerId: TeamProviderId): string {
   return getCatalogTeamProviderLabel(providerId) ?? 'Anthropic';
 }
@@ -365,6 +365,13 @@ function cancelScheduledIdle(handle: ScheduledIdleHandle | null): void {
   window.clearTimeout(handle.id);
 }
 
+function cancelScheduledIdleSet(handles: Set<ScheduledIdleHandle>): void {
+  for (const handle of handles) {
+    cancelScheduledIdle(handle);
+  }
+  handles.clear();
+}
+
 function isCurrentPrepareGeneration(ref: { current: number }, generation: number): boolean {
   return ref.current === generation;
 }
@@ -451,8 +458,13 @@ export const CreateTeamDialog = ({
   const [prepareMessage, setPrepareMessage] = useState<string | null>(null);
   const [prepareWarnings, setPrepareWarnings] = useState<string[]>([]);
   const [prepareChecks, setPrepareChecks] = useState<ProvisioningProviderCheck[]>([]);
+  const [prepareProviderInvalidationEpochById, setPrepareProviderInvalidationEpochById] = useState<
+    Partial<Record<TeamProviderId, number>>
+  >({});
+  const [providerSettingsProviderId, setProviderSettingsProviderId] =
+    useState<TeamProviderId | null>(null);
   const prepareRequestSeqRef = useRef(0);
-  const prepareIdleHandleRef = useRef<ScheduledIdleHandle | null>(null);
+  const prepareIdleHandlesRef = useRef(new Set<ScheduledIdleHandle>());
   const prepareUnmountGenerationRef = useRef(0);
   const appliedDefaultProjectPathRef = useRef<string | null>(null);
   const lastAutoDescriptionRef = useRef<string | null>(null);
@@ -485,6 +497,12 @@ export const CreateTeamDialog = ({
     migrateLegacyCreateTeamPreferences();
   }, []);
 
+  useEffect(() => {
+    if (!open) {
+      setProviderSettingsProviderId(null);
+    }
+  }, [open]);
+
   // Re-read localStorage when advancedKey changes
   useEffect(() => {
     const storedEnabled =
@@ -678,27 +696,14 @@ export const CreateTeamDialog = ({
   );
   const runtimeBackendSummaryByProviderRef = useRef(runtimeBackendSummaryByProvider);
   const prepareChecksRef = useRef<ProvisioningProviderCheck[]>([]);
+  const prepareMessageRef = useRef<string | null>(null);
   const prepareModelResultsCacheRef = useRef(
     new Map<string, Record<string, ProviderPrepareDiagnosticsModelResult>>()
   );
-  const lastPrepareRequestSignatureRef = useRef<string | null>(null);
-
-  useEffect(() => {
-    const generation = ++prepareUnmountGenerationRef.current;
-    return () => {
-      // React StrictMode replays effect cleanup/setup in development; defer
-      // invalidation so the replay does not cancel the live prepare request.
-      queueMicrotask(() => {
-        if (!isCurrentPrepareGeneration(prepareUnmountGenerationRef, generation)) {
-          return;
-        }
-        cancelScheduledIdle(prepareIdleHandleRef.current);
-        prepareIdleHandleRef.current = null;
-        prepareRequestSeqRef.current += 1;
-        lastPrepareRequestSignatureRef.current = null;
-      });
-    };
-  }, []);
+  const lastPrepareProviderSignatureByIdRef = useRef(new Map<TeamProviderId, string>());
+  const pendingPrepareProviderSignatureByIdRef = useRef(new Map<TeamProviderId, string>());
+  const prepareProviderRequestSeqByIdRef = useRef(new Map<TeamProviderId, number>());
+  const prepareWarningsByProviderIdRef = useRef(new Map<TeamProviderId, string[]>());
 
   useEffect(() => {
     runtimeBackendSummaryByProviderRef.current = runtimeBackendSummaryByProvider;
@@ -719,14 +724,44 @@ export const CreateTeamDialog = ({
     prepareChecksRef.current = prepareChecks;
   }, [prepareChecks]);
 
+  useEffect(() => {
+    prepareMessageRef.current = prepareMessage;
+  }, [prepareMessage]);
+
+  const invalidatePrepareProvider = useCallback((providerId: CliProviderId): void => {
+    if (!isTeamProviderId(providerId)) {
+      return;
+    }
+
+    lastPrepareProviderSignatureByIdRef.current.delete(providerId);
+    pendingPrepareProviderSignatureByIdRef.current.delete(providerId);
+    prepareProviderRequestSeqByIdRef.current.set(
+      providerId,
+      (prepareProviderRequestSeqByIdRef.current.get(providerId) ?? 0) + 1
+    );
+    prepareWarningsByProviderIdRef.current.delete(providerId);
+    setPrepareProviderInvalidationEpochById((current) => ({
+      ...current,
+      [providerId]: (current[providerId] ?? 0) + 1,
+    }));
+  }, []);
+
   useEffect(() => {
     if (!open) {
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      pendingPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
     }
   }, [open]);
 
   useEffect(() => {
     const generation = ++prepareUnmountGenerationRef.current;
+    const idleHandles = prepareIdleHandlesRef.current;
+    const lastProviderSignatures = lastPrepareProviderSignatureByIdRef.current;
+    const pendingProviderSignatures = pendingPrepareProviderSignatureByIdRef.current;
+    const providerRequestSeqs = prepareProviderRequestSeqByIdRef.current;
+    const warningsByProviderId = prepareWarningsByProviderIdRef.current;
     return () => {
       // React StrictMode replays effect cleanup/setup in development; defer
       // invalidation so the replay does not cancel the live prepare request.
@@ -734,49 +769,98 @@ export const CreateTeamDialog = ({
         if (!isCurrentPrepareGeneration(prepareUnmountGenerationRef, generation)) {
           return;
         }
-        cancelScheduledIdle(prepareIdleHandleRef.current);
-        prepareIdleHandleRef.current = null;
+        cancelScheduledIdleSet(idleHandles);
         prepareRequestSeqRef.current += 1;
-        lastPrepareRequestSignatureRef.current = null;
+        lastProviderSignatures.clear();
+        pendingProviderSignatures.clear();
+        providerRequestSeqs.clear();
+        warningsByProviderId.clear();
       });
     };
   }, []);
 
-  const prepareRuntimeStatusSignature = useMemo(
-    () =>
-      buildProviderPrepareRuntimeStatusSignature(
-        selectedMemberProviders,
-        runtimeProviderStatusById
-      ),
-    [runtimeProviderStatusById, selectedMemberProviders]
-  );
-  const prepareMembersSignature = useMemo(
-    () => buildProviderPrepareMembersSignature(effectiveMemberDrafts),
-    [effectiveMemberDrafts]
-  );
-  const prepareRequestSignature = useMemo(
-    () =>
-      buildProviderPrepareRequestSignature({
-        cwd: effectiveCwd,
-        selectedProviderId,
-        selectedModel,
-        selectedMemberProviders,
-        limitContext: effectiveAnthropicRuntimeLimitContext,
-        runtimeStatusSignature: prepareRuntimeStatusSignature,
-        membersSignature: prepareMembersSignature,
-      }),
-    [
-      effectiveCwd,
-      effectiveAnthropicRuntimeLimitContext,
-      prepareMembersSignature,
-      prepareRuntimeStatusSignature,
-      selectedMemberProviders,
+  const selectedModelChecksByProvider = useMemo(() => {
+    const modelsByProvider = new Map<TeamProviderId, TeamProvisioningModelCheckRequest[]>();
+    const leadEffort = (selectedEffort as EffortLevel | '') || undefined;
+    const addModel = (
+      providerId: TeamProviderId,
+      model: string | undefined,
+      effort?: EffortLevel
+    ): void => {
+      const trimmed = model?.trim() ?? '';
+      if (!trimmed) {
+        return;
+      }
+      const existing = modelsByProvider.get(providerId) ?? [];
+      if (!existing.some((entry) => entry.model === trimmed && entry.effort === effort)) {
+        modelsByProvider.set(providerId, [
+          ...existing,
+          {
+            providerId,
+            model: trimmed,
+            ...(effort ? { effort } : {}),
+          },
+        ]);
+      }
+    };
+    const addDefaultSelection = (providerId: TeamProviderId, effort?: EffortLevel): void => {
+      if (
+        providerId === 'codex' ||
+        providerId === 'gemini' ||
+        (providerId === 'anthropic' && selectedProviderId === 'anthropic')
+      ) {
+        addModel(providerId, DEFAULT_PROVIDER_MODEL_SELECTION, effort);
+      }
+    };
+
+    const leadModel = computeEffectiveTeamModel(
       selectedModel,
-      selectedProviderId,
-    ]
+      effectiveAnthropicRuntimeLimitContext,
+      selectedProviderId
+    );
+    if (selectedModel.trim()) {
+      addModel(selectedProviderId, leadModel, leadEffort);
+    } else {
+      addDefaultSelection(selectedProviderId, leadEffort);
+    }
+    for (const member of effectiveMemberDrafts) {
+      if (member.removedAt) {
+        continue;
+      }
+      const memberProviderId = normalizeOptionalTeamProviderId(member.providerId);
+      const inheritsDefaultRuntime = !memberProviderId || memberProviderId === selectedProviderId;
+      const explicitMemberModel = member.model?.trim() ?? '';
+      const memberEffort =
+        member.effort ?? (inheritsDefaultRuntime && !explicitMemberModel ? leadEffort : undefined);
+      const scopedModel = resolveProviderScopedMemberModel({
+        memberProviderId: member.providerId,
+        memberModel: member.model,
+        selectedProviderId,
+        runtimeProviderStatusById,
+      });
+      if (scopedModel.model) {
+        addModel(scopedModel.providerId, scopedModel.model, memberEffort);
+      } else {
+        addDefaultSelection(scopedModel.providerId, memberEffort);
+      }
+    }
+
+    return modelsByProvider;
+  }, [
+    effectiveAnthropicRuntimeLimitContext,
+    effectiveMemberDrafts,
+    runtimeProviderStatusById,
+    selectedEffort,
+    selectedModel,
+    selectedProviderId,
+  ]);
+  const selectedModelChecksByProviderSignature = useMemo(
+    () => buildProviderPrepareModelChecksSignature(selectedModelChecksByProvider),
+    [selectedModelChecksByProvider]
   );
   const shortLivedModelIssueReasons = useMemo(() => {
     void prepareChecks;
+    void selectedModelChecksByProviderSignature;
     const modelAdvisoryReasonByProvider: Partial<Record<TeamProviderId, Record<string, string>>> =
       {};
     const modelIssueReasonByProvider: Partial<Record<TeamProviderId, Record<string, string>>> = {};
@@ -786,12 +870,20 @@ export const CreateTeamDialog = ({
 
     for (const providerId of selectedMemberProviders) {
       const backendSummary = runtimeBackendSummaryByProvider.get(providerId) ?? null;
+      const providerRuntimeStatusSignature = buildProviderPrepareRuntimeStatusSignature(
+        [providerId],
+        runtimeProviderStatusById
+      );
+      const providerModelChecksSignature = buildProviderPrepareModelChecksSignature(
+        new Map([[providerId, selectedModelChecksByProvider.get(providerId) ?? []]])
+      );
       const cacheKey = buildProviderPrepareModelCacheKey({
         cwd: effectiveCwd,
         providerId,
         backendSummary,
         limitContext: effectiveAnthropicRuntimeLimitContext,
-        runtimeStatusSignature: prepareRuntimeStatusSignature,
+        runtimeStatusSignature: providerRuntimeStatusSignature,
+        modelChecksSignature: providerModelChecksSignature,
       });
       const issueReasons = getShortLivedProviderPrepareModelIssueReasons({
         providerId,
@@ -817,8 +909,10 @@ export const CreateTeamDialog = ({
     effectiveAnthropicRuntimeLimitContext,
     effectiveCwd,
     prepareChecks,
-    prepareRuntimeStatusSignature,
     runtimeBackendSummaryByProvider,
+    runtimeProviderStatusById,
+    selectedModelChecksByProvider,
+    selectedModelChecksByProviderSignature,
     selectedMemberProviders,
   ]);
 
@@ -859,18 +953,22 @@ export const CreateTeamDialog = ({
 
   useEffect(() => {
     if (!open || !canCreate || !launchTeam) {
-      cancelScheduledIdle(prepareIdleHandleRef.current);
-      prepareIdleHandleRef.current = null;
+      cancelScheduledIdleSet(prepareIdleHandlesRef.current);
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      pendingPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       return;
     }
 
     if (typeof api.teams.prepareProvisioning !== 'function') {
-      cancelScheduledIdle(prepareIdleHandleRef.current);
-      prepareIdleHandleRef.current = null;
+      cancelScheduledIdleSet(prepareIdleHandlesRef.current);
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      pendingPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       setPrepareState('failed');
       setPrepareWarnings([]);
       setPrepareChecks([]);
@@ -881,10 +979,12 @@ export const CreateTeamDialog = ({
     }
 
     if (!effectiveCwd) {
-      cancelScheduledIdle(prepareIdleHandleRef.current);
-      prepareIdleHandleRef.current = null;
+      cancelScheduledIdleSet(prepareIdleHandlesRef.current);
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      pendingPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       setPrepareState('idle');
       setPrepareWarnings([]);
       setPrepareChecks([]);
@@ -892,205 +992,199 @@ export const CreateTeamDialog = ({
       return;
     }
 
-    if (lastPrepareRequestSignatureRef.current === prepareRequestSignature) {
+    const selectedProviderIdSet = new Set(selectedMemberProviders);
+    for (const providerId of Array.from(lastPrepareProviderSignatureByIdRef.current.keys())) {
+      if (!selectedProviderIdSet.has(providerId)) {
+        lastPrepareProviderSignatureByIdRef.current.delete(providerId);
+        pendingPrepareProviderSignatureByIdRef.current.delete(providerId);
+        prepareProviderRequestSeqByIdRef.current.delete(providerId);
+        prepareWarningsByProviderIdRef.current.delete(providerId);
+      }
+    }
+
+    const providerPlans = buildProviderPreparePlans({
+      cwd: effectiveCwd,
+      providerIds: selectedMemberProviders,
+      selectedModelChecksByProvider,
+      backendSummaryByProvider: runtimeBackendSummaryByProviderRef.current,
+      limitContext: effectiveAnthropicRuntimeLimitContext,
+      runtimeProviderStatusById,
+      cachedModelResultsByCacheKey: prepareModelResultsCacheRef.current,
+    });
+    const changedPlans = providerPlans.filter((plan) => {
+      const lastSignature = lastPrepareProviderSignatureByIdRef.current.get(plan.providerId);
+      const pendingSignature = pendingPrepareProviderSignatureByIdRef.current.get(plan.providerId);
+      return lastSignature !== plan.requestSignature && pendingSignature !== plan.requestSignature;
+    });
+    const loadingMessage = getProvisioningProviderProgressMessage(
+      changedPlans.map((plan) => plan.providerId),
+      selectedMemberProviders.length
+    );
+    const getSelectedWarnings = (): string[] =>
+      selectedMemberProviders.flatMap(
+        (providerId) => prepareWarningsByProviderIdRef.current.get(providerId) ?? []
+      );
+    const commitChecks = (nextChecks: ProvisioningProviderCheck[]): void => {
+      prepareChecksRef.current = nextChecks;
+      setPrepareChecks(nextChecks);
+    };
+    const applyPrepareOutcome = (
+      nextChecks: ProvisioningProviderCheck[],
+      pendingMessage: string | null
+    ): void => {
+      const selectedWarnings = getSelectedWarnings();
+      setPrepareWarnings(selectedWarnings);
+
+      if (nextChecks.some((check) => check.status === 'pending' || check.status === 'checking')) {
+        setPrepareState('loading');
+        setPrepareMessage(pendingMessage);
+        return;
+      }
+
+      const anyFailure = nextChecks.some((check) => check.status === 'failed');
+      const anyNotes =
+        selectedWarnings.length > 0 || nextChecks.some((check) => check.status === 'notes');
+      const failureMessage =
+        getPrimaryProvisioningFailureDetail(nextChecks) ??
+        'Some selected providers need attention.';
+      setPrepareState(anyFailure ? 'failed' : 'ready');
+      setPrepareMessage(
+        anyFailure
+          ? failureMessage
+          : anyNotes
+            ? 'All selected providers are ready, with notes.'
+            : 'All selected providers are ready.'
+      );
+    };
+
+    let checks = alignProvisioningChecks(prepareChecksRef.current, selectedMemberProviders);
+    for (const plan of changedPlans) {
+      checks = updateProviderCheck(checks, plan.providerId, {
+        status: plan.selectedModelIds.length > 0 ? plan.cachedSnapshot.status : 'checking',
+        backendSummary: plan.backendSummary,
+        details: plan.cachedSnapshot.details,
+      });
+      prepareWarningsByProviderIdRef.current.delete(plan.providerId);
+    }
+    commitChecks(checks);
+    applyPrepareOutcome(
+      checks,
+      changedPlans.length > 0
+        ? loadingMessage
+        : (prepareMessageRef.current ??
+            getProvisioningProviderProgressMessage([], selectedMemberProviders.length))
+    );
+
+    if (changedPlans.length === 0) {
       return;
     }
-    lastPrepareRequestSignatureRef.current = prepareRequestSignature;
 
-    const requestSeq = ++prepareRequestSeqRef.current;
-    const initialChecks = alignProvisioningChecks(
-      prepareChecksRef.current,
-      selectedMemberProviders
-    );
-    setPrepareState('loading');
-    setPrepareMessage('Checking selected providers in parallel...');
-    setPrepareWarnings([]);
-    setPrepareChecks(initialChecks);
+    for (const plan of changedPlans) {
+      pendingPrepareProviderSignatureByIdRef.current.set(plan.providerId, plan.requestSignature);
+    }
 
-    // Defer the heavy IPC orchestration until the renderer is idle so the
-    // synchronous state updates above (setPrepareState etc.) can paint first.
-    // Cancel any pending idle work from a superseded run so a stale callback
-    // can't start expensive diagnostics for an obsolete request.
-    cancelScheduledIdle(prepareIdleHandleRef.current);
-    prepareIdleHandleRef.current = null;
-
-    prepareIdleHandleRef.current = scheduleIdle(() => {
-      prepareIdleHandleRef.current = null;
-      if (prepareRequestSeqRef.current !== requestSeq) return;
+    const idleHandle = scheduleIdle(() => {
+      prepareIdleHandlesRef.current.delete(idleHandle);
+      const generation = prepareRequestSeqRef.current;
+      const runningPlans = changedPlans.flatMap((plan) => {
+        if (
+          pendingPrepareProviderSignatureByIdRef.current.get(plan.providerId) !==
+          plan.requestSignature
+        ) {
+          return [];
+        }
+        pendingPrepareProviderSignatureByIdRef.current.delete(plan.providerId);
+        const requestSeq = (prepareProviderRequestSeqByIdRef.current.get(plan.providerId) ?? 0) + 1;
+        prepareProviderRequestSeqByIdRef.current.set(plan.providerId, requestSeq);
+        lastPrepareProviderSignatureByIdRef.current.set(plan.providerId, plan.requestSignature);
+        return [{ ...plan, requestSeq }];
+      });
+      if (runningPlans.length === 0) {
+        return;
+      }
+      const isPlanCurrent = (plan: ProviderPreparePlan & { requestSeq: number }): boolean =>
+        prepareRequestSeqRef.current === generation &&
+        lastPrepareProviderSignatureByIdRef.current.get(plan.providerId) ===
+          plan.requestSignature &&
+        prepareProviderRequestSeqByIdRef.current.get(plan.providerId) === plan.requestSeq &&
+        !pendingPrepareProviderSignatureByIdRef.current.has(plan.providerId);
       void (async () => {
-        let checks = initialChecks;
-        const providerPlans = selectedMemberProviders.map((providerId) => {
-          const selectedModelChecks = (() => {
-            const next = new Set<string>();
-            let hasDefaultSelection = false;
-            const supportsProviderDefaultCheck =
-              providerId === 'codex' ||
-              providerId === 'gemini' ||
-              (providerId === 'anthropic' && selectedProviderId === 'anthropic');
-            const leadModel = computeEffectiveTeamModel(
-              selectedModel,
-              effectiveAnthropicRuntimeLimitContext,
-              selectedProviderId
-            );
-            if (selectedProviderId === providerId && selectedModel.trim()) {
-              if (leadModel?.trim()) {
-                next.add(leadModel.trim());
-              }
-            } else if (selectedProviderId === providerId && supportsProviderDefaultCheck) {
-              hasDefaultSelection = true;
-            }
-            for (const member of effectiveMemberDrafts) {
-              if (member.removedAt) {
-                continue;
-              }
-              const scopedModel = resolveProviderScopedMemberModel({
-                memberProviderId: member.providerId,
-                memberModel: member.model,
-                selectedProviderId,
-                runtimeProviderStatusById,
-              });
-              if (scopedModel.providerId !== providerId) {
-                continue;
-              }
-              if (scopedModel.model) {
-                next.add(scopedModel.model);
-              } else if (supportsProviderDefaultCheck) {
-                hasDefaultSelection = true;
-              }
-            }
-            if (supportsProviderDefaultCheck && hasDefaultSelection) {
-              next.add(DEFAULT_PROVIDER_MODEL_SELECTION);
-            }
-            return Array.from(next);
-          })();
-          const backendSummary = runtimeBackendSummaryByProviderRef.current.get(providerId) ?? null;
-          const cacheKey = buildProviderPrepareModelCacheKey({
-            cwd: effectiveCwd,
-            providerId,
-            backendSummary,
-            limitContext: effectiveAnthropicRuntimeLimitContext,
-            runtimeStatusSignature: prepareRuntimeStatusSignature,
-          });
-          const cachedModelResultsById = {
-            ...getShortLivedProviderPrepareModelResults({
-              providerId,
-              cacheKey,
-            }),
-            ...(prepareModelResultsCacheRef.current.get(cacheKey) ?? {}),
-          };
-          const cachedSnapshot = getProviderPrepareCachedSnapshot({
-            providerId,
-            selectedModelIds: selectedModelChecks,
-            cachedModelResultsById,
-          });
-          return {
-            providerId,
-            selectedModelChecks,
-            backendSummary,
-            cacheKey,
-            cachedModelResultsById,
-            cachedSnapshot,
-          };
-        });
-
-        try {
-          for (const plan of providerPlans) {
-            checks = updateProviderCheck(checks, plan.providerId, {
-              status: plan.selectedModelChecks.length > 0 ? plan.cachedSnapshot.status : 'checking',
-              backendSummary: plan.backendSummary,
-              details: plan.cachedSnapshot.details,
-            });
-          }
-          if (prepareRequestSeqRef.current === requestSeq) {
-            setPrepareChecks(checks);
-          }
-          const providerResults = await Promise.all(
-            providerPlans.map(async (plan) => {
+        await Promise.all(
+          runningPlans.map(async (plan) => {
+            try {
               const prepResult = await runProviderPrepareDiagnostics({
                 cwd: effectiveCwd,
                 providerId: plan.providerId,
-                selectedModelIds: plan.selectedModelChecks,
+                selectedModelIds: plan.selectedModelIds,
+                selectedModelChecks: plan.selectedModelChecks,
                 prepareProvisioning: api.teams.prepareProvisioning,
                 limitContext: effectiveAnthropicRuntimeLimitContext,
                 cachedModelResultsById: plan.cachedModelResultsById,
                 onModelProgress: ({ status, details }) => {
-                  checks = updateProviderCheck(checks, plan.providerId, {
-                    status,
-                    backendSummary: plan.backendSummary,
-                    details,
-                  });
-                  if (prepareRequestSeqRef.current === requestSeq) {
-                    setPrepareChecks(checks);
+                  if (!isPlanCurrent(plan)) {
+                    return;
                   }
+                  const nextChecks = updateProviderCheck(
+                    prepareChecksRef.current,
+                    plan.providerId,
+                    {
+                      status,
+                      backendSummary: plan.backendSummary,
+                      details,
+                    }
+                  );
+                  commitChecks(nextChecks);
+                  applyPrepareOutcome(nextChecks, loadingMessage);
                 },
               });
-              return { ...plan, prepResult };
-            })
-          );
-          let anyFailure = false;
-          let anyNotes = false;
-          const collectedWarnings: string[] = [];
-          for (const plan of providerResults) {
-            if (plan.prepResult.warnings.length > 0) {
-              anyNotes = true;
-              collectedWarnings.push(
-                ...plan.prepResult.warnings.map(
+              if (!isPlanCurrent(plan)) {
+                return;
+              }
+              prepareWarningsByProviderIdRef.current.set(
+                plan.providerId,
+                prepResult.warnings.map(
                   (warning) => `${getProviderLabel(plan.providerId)}: ${warning}`
                 )
               );
-            }
-            if (plan.prepResult.status === 'failed') {
-              anyFailure = true;
-            } else if (plan.prepResult.status === 'notes') {
-              anyNotes = true;
-            }
-            if (prepareRequestSeqRef.current === requestSeq) {
               prepareModelResultsCacheRef.current.set(
                 plan.cacheKey,
                 mergeReusableProviderPrepareModelResults(
                   prepareModelResultsCacheRef.current.get(plan.cacheKey),
-                  plan.prepResult.modelResultsById
+                  prepResult.modelResultsById
                 )
               );
               storeShortLivedProviderPrepareModelResults({
                 providerId: plan.providerId,
                 cacheKey: plan.cacheKey,
-                modelResultsById: plan.prepResult.modelResultsById,
+                modelResultsById: prepResult.modelResultsById,
               });
+              const nextChecks = updateProviderCheck(prepareChecksRef.current, plan.providerId, {
+                status: prepResult.status,
+                backendSummary: plan.backendSummary,
+                details: prepResult.details,
+              });
+              commitChecks(nextChecks);
+              applyPrepareOutcome(nextChecks, loadingMessage);
+            } catch (error) {
+              if (!isPlanCurrent(plan)) {
+                return;
+              }
+              const failureMessage =
+                error instanceof Error ? error.message : 'Failed to prepare selected providers';
+              const nextChecks = updateProviderCheck(prepareChecksRef.current, plan.providerId, {
+                status: 'failed',
+                backendSummary: plan.backendSummary,
+                details: [failureMessage],
+              });
+              prepareWarningsByProviderIdRef.current.delete(plan.providerId);
+              commitChecks(nextChecks);
+              applyPrepareOutcome(nextChecks, failureMessage);
             }
-            checks = updateProviderCheck(checks, plan.providerId, {
-              status: plan.prepResult.status,
-              backendSummary: plan.backendSummary,
-              details: plan.prepResult.details,
-            });
-          }
-          if (prepareRequestSeqRef.current === requestSeq) {
-            setPrepareChecks(checks);
-          }
-          if (prepareRequestSeqRef.current !== requestSeq) return;
-          const failureMessage =
-            getPrimaryProvisioningFailureDetail(checks) ??
-            'Some selected providers need attention.';
-          setPrepareState(anyFailure ? 'failed' : 'ready');
-          setPrepareMessage(
-            anyFailure
-              ? failureMessage
-              : anyNotes
-                ? 'Selected providers are ready with notes.'
-                : 'Selected providers are ready.'
-          );
-          setPrepareWarnings(collectedWarnings);
-        } catch (error) {
-          if (prepareRequestSeqRef.current !== requestSeq) return;
-          const failureMessage =
-            error instanceof Error ? error.message : 'Failed to warm up Claude CLI environment';
-          setPrepareState('failed');
-          setPrepareWarnings([]);
-          setPrepareChecks(failIncompleteProviderChecks(checks, failureMessage));
-          setPrepareMessage(failureMessage);
-        }
+          })
+        );
       })();
     });
+    prepareIdleHandlesRef.current.add(idleHandle);
   }, [
     open,
     canCreate,
@@ -1098,10 +1192,11 @@ export const CreateTeamDialog = ({
     effectiveCwd,
     effectiveMemberDrafts,
     effectiveAnthropicRuntimeLimitContext,
-    prepareRequestSignature,
-    prepareRuntimeStatusSignature,
+    prepareProviderInvalidationEpochById,
     runtimeProviderStatusById,
     selectedModel,
+    selectedModelChecksByProvider,
+    selectedModelChecksByProviderSignature,
     selectedProviderId,
     selectedMemberProviders,
   ]);
@@ -1168,6 +1263,7 @@ export const CreateTeamDialog = ({
               providerId: normalizeOptionalTeamProviderId(m.providerId),
               model: m.model ?? '',
               effort: m.effort,
+              mcpPolicy: m.mcpPolicy,
             }),
             multimodelEnabled
           );
@@ -1366,6 +1462,23 @@ export const CreateTeamDialog = ({
       tmuxRuntime.status,
     ]
   );
+  const teammateRuntimeProviderNoticeById:
+    | Partial<Record<TeamProviderId, React.ReactNode>>
+    | undefined = teammateRuntimeCompatibility.providerNoticeProviderId
+    ? {
+        [teammateRuntimeCompatibility.providerNoticeProviderId]: (
+          <TeammateRuntimeCompatibilityNotice
+            analysis={teammateRuntimeCompatibility}
+            onOpenDashboard={() => {
+              onClose();
+              openDashboard();
+            }}
+          />
+        ),
+      }
+    : undefined;
+  const showRosterTeammateRuntimeCompatibility =
+    teammateRuntimeCompatibility.visible && !teammateRuntimeCompatibility.providerNoticeProviderId;
   const anthropicRuntimeSelection = useMemo(
     () =>
       selectedProviderId === 'anthropic'
@@ -1450,6 +1563,7 @@ export const CreateTeamDialog = ({
             selectedEffort,
             selectedFastMode,
             providerFastModeDefault: anthropicProviderFastModeDefault,
+            runtimeCapabilities: runtimeProviderStatusById.get('anthropic')?.runtimeCapabilities,
           })
         : {
             nextEffort: selectedEffort,
@@ -1895,17 +2009,19 @@ export const CreateTeamDialog = ({
 
   const rosterHeaderBottom = useMemo(
     () =>
-      teammateRuntimeCompatibility.visible ||
+      showRosterTeammateRuntimeCompatibility ||
       soloTeam ||
       (canCreate && hasSelectedWorktreeIsolation) ? (
         <div className="space-y-2">
-          <TeammateRuntimeCompatibilityNotice
-            analysis={teammateRuntimeCompatibility}
-            onOpenDashboard={() => {
-              onClose();
-              openDashboard();
-            }}
-          />
+          {showRosterTeammateRuntimeCompatibility ? (
+            <TeammateRuntimeCompatibilityNotice
+              analysis={teammateRuntimeCompatibility}
+              onOpenDashboard={() => {
+                onClose();
+                openDashboard();
+              }}
+            />
+          ) : null}
           {soloTeam ? (
             <div className="flex items-start gap-2 rounded-md border border-sky-500/20 bg-sky-500/5 px-3 py-2">
               <Info className="mt-0.5 size-3.5 shrink-0 text-sky-400" />
@@ -1928,6 +2044,7 @@ export const CreateTeamDialog = ({
       hasSelectedWorktreeIsolation,
       onClose,
       openDashboard,
+      showRosterTeammateRuntimeCompatibility,
       soloTeam,
       teammateRuntimeCompatibility,
       worktreeGitReadiness,
@@ -2065,6 +2182,7 @@ export const CreateTeamDialog = ({
               model={selectedModel}
               effort={(selectedEffort as EffortLevel) || undefined}
               limitContext={effectiveAnthropicRuntimeLimitContext}
+              leadProviderNoticeById={teammateRuntimeProviderNoticeById}
               onProviderChange={setSelectedProviderId}
               onModelChange={setSelectedModel}
               onEffortChange={setSelectedEffort}
@@ -2321,7 +2439,7 @@ export const CreateTeamDialog = ({
                     <span>
                       {effectivePrepare.message ??
                         (effectivePrepare.state === 'idle'
-                          ? 'Warming up CLI environment...'
+                          ? 'Checking selected providers...'
                           : 'Preparing environment...')}
                     </span>
                     <p className="mt-0.5 text-[10px] text-[var(--color-text-muted)] opacity-70">
@@ -2329,7 +2447,11 @@ export const CreateTeamDialog = ({
                     </p>
                   </div>
                 </div>
-                <ProvisioningProviderStatusList checks={prepareChecks} className="mt-2" />
+                <ProvisioningProviderStatusList
+                  checks={prepareChecks}
+                  className="mt-2"
+                  onOpenProviderSettings={(providerId) => setProviderSettingsProviderId(providerId)}
+                />
               </>
             ) : null}
 
@@ -2340,8 +2462,8 @@ export const CreateTeamDialog = ({
                   <span>
                     {prepareChecks.some((check) => check.status === 'notes') ||
                     prepareWarnings.length > 0
-                      ? 'CLI environment ready (with notes)'
-                      : 'CLI environment ready'}
+                      ? 'Selected providers ready (with notes)'
+                      : 'Selected providers ready'}
                   </span>
                 </div>
                 {effectivePrepare.message ? (
@@ -2349,7 +2471,11 @@ export const CreateTeamDialog = ({
                     {effectivePrepare.message}
                   </p>
                 ) : null}
-                <ProvisioningProviderStatusList checks={prepareChecks} className="mt-1" />
+                <ProvisioningProviderStatusList
+                  checks={prepareChecks}
+                  className="mt-1"
+                  onOpenProviderSettings={(providerId) => setProviderSettingsProviderId(providerId)}
+                />
                 {prepareWarnings.length > 0 && prepareChecks.length === 0 ? (
                   <div className="mt-0.5 space-y-0.5 pl-5">
                     {prepareWarnings.map((warning, index) => (
@@ -2383,6 +2509,9 @@ export const CreateTeamDialog = ({
                     checks={prepareChecks}
                     className="mt-2"
                     suppressDetailsMatching={prepareMessage}
+                    onOpenProviderSettings={(providerId) =>
+                      setProviderSettingsProviderId(providerId)
+                    }
                   />
                 ) : null}
                 {prepareWarnings.length > 0 && prepareChecks.length === 0 ? (
@@ -2450,6 +2579,14 @@ export const CreateTeamDialog = ({
           </div>
         </DialogFooter>
       </DialogContent>
+      <ProvisioningProviderRuntimeSettingsDialog
+        openProviderId={providerSettingsProviderId}
+        onOpenProviderIdChange={(providerId) => setProviderSettingsProviderId(providerId)}
+        providers={effectiveCliStatus?.providers ?? []}
+        projectPath={effectiveCwd || null}
+        disabled={isSubmitting}
+        onProviderRuntimeChanged={invalidatePrepareProvider}
+      />
     </Dialog>
   );
 };
diff --git a/src/renderer/components/team/dialogs/EditTeamDialog.tsx b/src/renderer/components/team/dialogs/EditTeamDialog.tsx
index 8c42d319..38252cc9 100644
--- a/src/renderer/components/team/dialogs/EditTeamDialog.tsx
+++ b/src/renderer/components/team/dialogs/EditTeamDialog.tsx
@@ -478,6 +478,7 @@ export const EditTeamDialog = ({
             model: member.model,
             effort: member.effort,
             isolation: member.isolation,
+            mcpPolicy: member.mcpPolicy,
           })) as ResolvedTeamMember[],
         });
 
diff --git a/src/renderer/components/team/dialogs/LaunchTeamDialog.tsx b/src/renderer/components/team/dialogs/LaunchTeamDialog.tsx
index b44a1c46..859e5380 100644
--- a/src/renderer/components/team/dialogs/LaunchTeamDialog.tsx
+++ b/src/renderer/components/team/dialogs/LaunchTeamDialog.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import {
   reconcileAnthropicRuntimeSelections,
@@ -107,28 +107,27 @@ import { loadProjectPathProjects, type ProjectPathProject } from './projectPathP
 import { ProjectPathSelector } from './ProjectPathSelector';
 import { buildProviderPrepareModelCacheKey } from './providerPrepareCacheKey';
 import {
-  getProviderPrepareCachedSnapshot,
   mergeReusableProviderPrepareModelResults,
   type ProviderPrepareDiagnosticsModelResult,
   runProviderPrepareDiagnostics,
 } from './providerPrepareDiagnostics';
+import { buildProviderPreparePlans, type ProviderPreparePlan } from './providerPreparePlans';
 import {
   buildProviderPrepareModelChecksSignature,
-  buildProviderPrepareRequestSignature,
   buildProviderPrepareRuntimeStatusSignature,
 } from './providerPrepareRequestSignature';
 import {
   getShortLivedProviderPrepareModelIssueReasons,
-  getShortLivedProviderPrepareModelResults,
   storeShortLivedProviderPrepareModelResults,
 } from './providerPrepareShortLivedCache';
 import { getProvisioningModelIssue } from './provisioningModelIssues';
+import { ProvisioningProviderRuntimeSettingsDialog } from './ProvisioningProviderRuntimeSettingsDialog';
 import {
   deriveEffectiveProvisioningPrepareState,
-  failIncompleteProviderChecks,
   getPrimaryProvisioningFailureDetail,
   getProvisioningFailureHint,
   getProvisioningProviderBackendSummary,
+  getProvisioningProviderProgressMessage,
   type ProvisioningProviderCheck,
   ProvisioningProviderStatusList,
   shouldHideProvisioningProviderStatusList,
@@ -157,6 +156,7 @@ import type { ActiveTeamRef } from './CreateTeamDialog';
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
 import type { MentionSuggestion } from '@renderer/types/mention';
 import type {
+  CliProviderId,
   CreateScheduleInput,
   EffortLevel,
   ResolvedTeamMember,
@@ -166,6 +166,7 @@ import type {
   TeamFastMode,
   TeamLaunchRequest,
   TeamProviderId,
+  TeamProvisioningModelCheckRequest,
   UpdateSchedulePatch,
 } from '@shared/types';
 
@@ -462,6 +463,11 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
   const [prepareMessage, setPrepareMessage] = useState<string | null>(null);
   const [prepareWarnings, setPrepareWarnings] = useState<string[]>([]);
   const [prepareChecks, setPrepareChecks] = useState<ProvisioningProviderCheck[]>([]);
+  const [prepareProviderInvalidationEpochById, setPrepareProviderInvalidationEpochById] = useState<
+    Partial<Record<TeamProviderId, number>>
+  >({});
+  const [providerSettingsProviderId, setProviderSettingsProviderId] =
+    useState<TeamProviderId | null>(null);
   const prepareRequestSeqRef = useRef(0);
   const appliedDefaultProjectPathRef = useRef<string | null>(null);
   const storeMembers = useStore((s) => selectResolvedMembersForTeamName(s, s.selectedTeamName));
@@ -474,6 +480,12 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     null
   );
 
+  useEffect(() => {
+    if (!open) {
+      setProviderSettingsProviderId(null);
+    }
+  }, [open]);
+
   // Advanced CLI section state (with localStorage persistence)
   const [worktreeEnabled, setWorktreeEnabledRaw] = useState(
     () =>
@@ -539,10 +551,13 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
   }, [effectiveCliStatus?.providers]);
   const runtimeBackendSummaryByProviderRef = useRef(runtimeBackendSummaryByProvider);
   const prepareChecksRef = useRef<ProvisioningProviderCheck[]>([]);
+  const prepareMessageRef = useRef<string | null>(null);
   const prepareModelResultsCacheRef = useRef(
     new Map<string, Record<string, ProviderPrepareDiagnosticsModelResult>>()
   );
-  const lastPrepareRequestSignatureRef = useRef<string | null>(null);
+  const lastPrepareProviderSignatureByIdRef = useRef(new Map<TeamProviderId, string>());
+  const prepareProviderRequestSeqByIdRef = useRef(new Map<TeamProviderId, number>());
+  const prepareWarningsByProviderIdRef = useRef(new Map<TeamProviderId, string[]>());
 
   useEffect(() => {
     runtimeBackendSummaryByProviderRef.current = runtimeBackendSummaryByProvider;
@@ -550,9 +565,32 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
   useEffect(() => {
     prepareChecksRef.current = prepareChecks;
   }, [prepareChecks]);
+  useEffect(() => {
+    prepareMessageRef.current = prepareMessage;
+  }, [prepareMessage]);
+
+  const invalidatePrepareProvider = useCallback((providerId: CliProviderId): void => {
+    if (!isTeamProviderId(providerId)) {
+      return;
+    }
+
+    lastPrepareProviderSignatureByIdRef.current.delete(providerId);
+    prepareProviderRequestSeqByIdRef.current.set(
+      providerId,
+      (prepareProviderRequestSeqByIdRef.current.get(providerId) ?? 0) + 1
+    );
+    prepareWarningsByProviderIdRef.current.delete(providerId);
+    setPrepareProviderInvalidationEpochById((current) => ({
+      ...current,
+      [providerId]: (current[providerId] ?? 0) + 1,
+    }));
+  }, []);
+
   useEffect(() => {
     if (!open) {
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
     }
   }, [open]);
   const runtimeProviderStatusById = useMemo(
@@ -955,6 +993,23 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
       tmuxRuntime.status,
     ]
   );
+  const teammateRuntimeProviderNoticeById:
+    | Partial<Record<TeamProviderId, React.ReactNode>>
+    | undefined = teammateRuntimeCompatibility.providerNoticeProviderId
+    ? {
+        [teammateRuntimeCompatibility.providerNoticeProviderId]: (
+          <TeammateRuntimeCompatibilityNotice
+            analysis={teammateRuntimeCompatibility}
+            onOpenDashboard={() => {
+              closeDialog();
+              openDashboard();
+            }}
+          />
+        ),
+      }
+    : undefined;
+  const showRosterTeammateRuntimeCompatibility =
+    teammateRuntimeCompatibility.visible && !teammateRuntimeCompatibility.providerNoticeProviderId;
   const anthropicRuntimeSelection = useMemo(
     () =>
       selectedProviderId === 'anthropic'
@@ -1055,6 +1110,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
             selectedEffort,
             selectedFastMode,
             providerFastModeDefault: anthropicProviderFastModeDefault,
+            runtimeCapabilities: runtimeProviderStatusById.get('anthropic')?.runtimeCapabilities,
           })
         : {
             nextEffort: selectedEffort,
@@ -1116,37 +1172,53 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
   ]);
 
   const selectedModelChecksByProvider = useMemo(() => {
-    const modelsByProvider = new Map<TeamProviderId, string[]>();
-    const defaultSelectionByProvider = new Map<TeamProviderId, boolean>();
-    const addModel = (providerId: TeamProviderId, model: string | undefined): void => {
+    const modelsByProvider = new Map<TeamProviderId, TeamProvisioningModelCheckRequest[]>();
+    const leadEffort = (selectedEffort as EffortLevel | '') || undefined;
+    const addModel = (
+      providerId: TeamProviderId,
+      model: string | undefined,
+      effort?: EffortLevel
+    ): void => {
       const trimmed = model?.trim() ?? '';
       if (!trimmed) {
         return;
       }
       const existing = modelsByProvider.get(providerId) ?? [];
-      if (!existing.includes(trimmed)) {
-        modelsByProvider.set(providerId, [...existing, trimmed]);
+      if (!existing.some((entry) => entry.model === trimmed && entry.effort === effort)) {
+        modelsByProvider.set(providerId, [
+          ...existing,
+          {
+            providerId,
+            model: trimmed,
+            ...(effort ? { effort } : {}),
+          },
+        ]);
       }
     };
-    const addDefaultSelection = (providerId: TeamProviderId): void => {
+    const addDefaultSelection = (providerId: TeamProviderId, effort?: EffortLevel): void => {
       if (
         providerId === 'codex' ||
         providerId === 'gemini' ||
         (providerId === 'anthropic' && selectedProviderId === 'anthropic')
       ) {
-        defaultSelectionByProvider.set(providerId, true);
+        addModel(providerId, DEFAULT_PROVIDER_MODEL_SELECTION, effort);
       }
     };
 
     if (selectedModel.trim()) {
-      addModel(selectedProviderId, effectiveLeadRuntimeModel);
+      addModel(selectedProviderId, effectiveLeadRuntimeModel, leadEffort);
     } else {
-      addDefaultSelection(selectedProviderId);
+      addDefaultSelection(selectedProviderId, leadEffort);
     }
     for (const member of effectiveMemberDrafts) {
       if (member.removedAt) {
         continue;
       }
+      const memberProviderId = normalizeOptionalTeamProviderId(member.providerId);
+      const inheritsDefaultRuntime = !memberProviderId || memberProviderId === selectedProviderId;
+      const explicitMemberModel = member.model?.trim() ?? '';
+      const memberEffort =
+        member.effort ?? (inheritsDefaultRuntime && !explicitMemberModel ? leadEffort : undefined);
       const scopedModel = resolveProviderScopedMemberModel({
         memberProviderId: member.providerId,
         memberModel: member.model,
@@ -1154,20 +1226,18 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
         runtimeProviderStatusById,
       });
       if (scopedModel.model) {
-        addModel(scopedModel.providerId, scopedModel.model);
+        addModel(scopedModel.providerId, scopedModel.model, memberEffort);
       } else {
-        addDefaultSelection(scopedModel.providerId);
+        addDefaultSelection(scopedModel.providerId, memberEffort);
       }
     }
-    for (const providerId of defaultSelectionByProvider.keys()) {
-      addModel(providerId, DEFAULT_PROVIDER_MODEL_SELECTION);
-    }
 
     return modelsByProvider;
   }, [
     effectiveLeadRuntimeModel,
     effectiveMemberDrafts,
     runtimeProviderStatusById,
+    selectedEffort,
     selectedModel,
     selectedProviderId,
   ]);
@@ -1396,40 +1466,13 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     worktreeGitReadiness,
     hasSelectedWorktreeIsolation
   );
-  const prepareRuntimeStatusSignature = useMemo(
-    () =>
-      buildProviderPrepareRuntimeStatusSignature(
-        selectedMemberProviders,
-        runtimeProviderStatusById
-      ),
-    [runtimeProviderStatusById, selectedMemberProviders]
-  );
   const selectedModelChecksByProviderSignature = useMemo(
     () => buildProviderPrepareModelChecksSignature(selectedModelChecksByProvider),
     [selectedModelChecksByProvider]
   );
-  const prepareRequestSignature = useMemo(
-    () =>
-      buildProviderPrepareRequestSignature({
-        cwd: effectiveCwd,
-        selectedProviderId,
-        selectedModel,
-        selectedMemberProviders,
-        limitContext: effectiveAnthropicRuntimeLimitContext,
-        runtimeStatusSignature: prepareRuntimeStatusSignature,
-        modelChecksSignature: selectedModelChecksByProviderSignature,
-      }),
-    [
-      effectiveCwd,
-      effectiveAnthropicRuntimeLimitContext,
-      prepareRuntimeStatusSignature,
-      selectedMemberProviders,
-      selectedModel,
-      selectedModelChecksByProviderSignature,
-      selectedProviderId,
-    ]
-  );
   const shortLivedModelIssueReasons = useMemo(() => {
+    void prepareChecks;
+    void selectedModelChecksByProviderSignature;
     const modelAdvisoryReasonByProvider: Partial<Record<TeamProviderId, Record<string, string>>> =
       {};
     const modelIssueReasonByProvider: Partial<Record<TeamProviderId, Record<string, string>>> = {};
@@ -1447,12 +1490,20 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
 
     for (const providerId of selectedMemberProviders) {
       const backendSummary = runtimeBackendSummaryByProvider.get(providerId) ?? null;
+      const providerRuntimeStatusSignature = buildProviderPrepareRuntimeStatusSignature(
+        [providerId],
+        runtimeProviderStatusById
+      );
+      const providerModelChecksSignature = buildProviderPrepareModelChecksSignature(
+        new Map([[providerId, selectedModelChecksByProvider.get(providerId) ?? []]])
+      );
       const cacheKey = buildProviderPrepareModelCacheKey({
         cwd: effectiveCwd,
         providerId,
         backendSummary,
         limitContext: effectiveAnthropicRuntimeLimitContext,
-        runtimeStatusSignature: prepareRuntimeStatusSignature,
+        runtimeStatusSignature: providerRuntimeStatusSignature,
+        modelChecksSignature: providerModelChecksSignature,
       });
       const issueReasons = getShortLivedProviderPrepareModelIssueReasons({
         providerId,
@@ -1479,8 +1530,10 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
     effectiveCwd,
     isLaunchMode,
     prepareChecks,
-    prepareRuntimeStatusSignature,
     runtimeBackendSummaryByProvider,
+    runtimeProviderStatusById,
+    selectedModelChecksByProvider,
+    selectedModelChecksByProviderSignature,
     selectedMemberProviders,
   ]);
 
@@ -1495,13 +1548,17 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
   useEffect(() => {
     if (!open || !isLaunchMode) {
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       return;
     }
 
     if (typeof api.teams.prepareProvisioning !== 'function') {
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       setPrepareState('failed');
       setPrepareWarnings([]);
       setPrepareChecks([]);
@@ -1513,7 +1570,9 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
 
     if (!effectiveCwd) {
       prepareRequestSeqRef.current += 1;
-      lastPrepareRequestSignatureRef.current = null;
+      lastPrepareProviderSignatureByIdRef.current.clear();
+      prepareProviderRequestSeqByIdRef.current.clear();
+      prepareWarningsByProviderIdRef.current.clear();
       setPrepareState('idle');
       setPrepareWarnings([]);
       setPrepareChecks([]);
@@ -1521,160 +1580,184 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
       return;
     }
 
-    if (lastPrepareRequestSignatureRef.current === prepareRequestSignature) {
+    const selectedProviderIdSet = new Set(selectedMemberProviders);
+    for (const providerId of Array.from(lastPrepareProviderSignatureByIdRef.current.keys())) {
+      if (!selectedProviderIdSet.has(providerId)) {
+        lastPrepareProviderSignatureByIdRef.current.delete(providerId);
+        prepareProviderRequestSeqByIdRef.current.delete(providerId);
+        prepareWarningsByProviderIdRef.current.delete(providerId);
+      }
+    }
+
+    const providerPlans = buildProviderPreparePlans({
+      cwd: effectiveCwd,
+      providerIds: selectedMemberProviders,
+      selectedModelChecksByProvider,
+      backendSummaryByProvider: runtimeBackendSummaryByProviderRef.current,
+      limitContext: effectiveAnthropicRuntimeLimitContext,
+      runtimeProviderStatusById,
+      cachedModelResultsByCacheKey: prepareModelResultsCacheRef.current,
+    });
+    const changedPlans = providerPlans.filter(
+      (plan) =>
+        lastPrepareProviderSignatureByIdRef.current.get(plan.providerId) !== plan.requestSignature
+    );
+    const loadingMessage = getProvisioningProviderProgressMessage(
+      changedPlans.map((plan) => plan.providerId),
+      selectedMemberProviders.length
+    );
+    const getSelectedWarnings = (): string[] =>
+      selectedMemberProviders.flatMap(
+        (providerId) => prepareWarningsByProviderIdRef.current.get(providerId) ?? []
+      );
+    const commitChecks = (nextChecks: ProvisioningProviderCheck[]): void => {
+      prepareChecksRef.current = nextChecks;
+      setPrepareChecks(nextChecks);
+    };
+    const applyPrepareOutcome = (
+      nextChecks: ProvisioningProviderCheck[],
+      pendingMessage: string | null
+    ): void => {
+      const selectedWarnings = getSelectedWarnings();
+      setPrepareWarnings(selectedWarnings);
+
+      if (nextChecks.some((check) => check.status === 'pending' || check.status === 'checking')) {
+        setPrepareState('loading');
+        setPrepareMessage(pendingMessage);
+        return;
+      }
+
+      const anyFailure = nextChecks.some((check) => check.status === 'failed');
+      const anyNotes =
+        selectedWarnings.length > 0 || nextChecks.some((check) => check.status === 'notes');
+      const failureMessage =
+        getPrimaryProvisioningFailureDetail(nextChecks) ??
+        'Some selected providers need attention.';
+      setPrepareState(anyFailure ? 'failed' : 'ready');
+      setPrepareMessage(
+        anyFailure
+          ? failureMessage
+          : anyNotes
+            ? 'All selected providers are ready, with notes.'
+            : 'All selected providers are ready.'
+      );
+    };
+
+    let checks = alignProvisioningChecks(prepareChecksRef.current, selectedMemberProviders);
+    for (const plan of changedPlans) {
+      checks = updateProviderCheck(checks, plan.providerId, {
+        status: plan.selectedModelIds.length > 0 ? plan.cachedSnapshot.status : 'checking',
+        backendSummary: plan.backendSummary,
+        details: plan.cachedSnapshot.details,
+      });
+      prepareWarningsByProviderIdRef.current.delete(plan.providerId);
+    }
+    commitChecks(checks);
+    applyPrepareOutcome(
+      checks,
+      changedPlans.length > 0
+        ? loadingMessage
+        : (prepareMessageRef.current ??
+            getProvisioningProviderProgressMessage([], selectedMemberProviders.length))
+    );
+
+    if (changedPlans.length === 0) {
       return;
     }
-    lastPrepareRequestSignatureRef.current = prepareRequestSignature;
 
-    const requestSeq = ++prepareRequestSeqRef.current;
-    const initialChecks = alignProvisioningChecks(
-      prepareChecksRef.current,
-      selectedMemberProviders
-    );
-    setPrepareState('loading');
-    setPrepareMessage('Checking selected providers in parallel...');
-    setPrepareWarnings([]);
-    setPrepareChecks(initialChecks);
+    const generation = prepareRequestSeqRef.current;
+    const runningPlans = changedPlans.map((plan) => {
+      const requestSeq = (prepareProviderRequestSeqByIdRef.current.get(plan.providerId) ?? 0) + 1;
+      prepareProviderRequestSeqByIdRef.current.set(plan.providerId, requestSeq);
+      lastPrepareProviderSignatureByIdRef.current.set(plan.providerId, plan.requestSignature);
+      return { ...plan, requestSeq };
+    });
+    const isPlanCurrent = (plan: ProviderPreparePlan & { requestSeq: number }): boolean =>
+      prepareRequestSeqRef.current === generation &&
+      lastPrepareProviderSignatureByIdRef.current.get(plan.providerId) === plan.requestSignature &&
+      prepareProviderRequestSeqByIdRef.current.get(plan.providerId) === plan.requestSeq;
 
     void (async () => {
-      let checks = initialChecks;
-      const providerPlans = selectedMemberProviders.map((providerId) => {
-        const selectedModelChecks = selectedModelChecksByProvider.get(providerId) ?? [];
-        const backendSummary = runtimeBackendSummaryByProviderRef.current.get(providerId) ?? null;
-        const cacheKey = buildProviderPrepareModelCacheKey({
-          cwd: effectiveCwd,
-          providerId,
-          backendSummary,
-          limitContext: effectiveAnthropicRuntimeLimitContext,
-          runtimeStatusSignature: prepareRuntimeStatusSignature,
-        });
-        const cachedModelResultsById = {
-          ...getShortLivedProviderPrepareModelResults({
-            providerId,
-            cacheKey,
-          }),
-          ...(prepareModelResultsCacheRef.current.get(cacheKey) ?? {}),
-        };
-        const cachedSnapshot = getProviderPrepareCachedSnapshot({
-          providerId,
-          selectedModelIds: selectedModelChecks,
-          cachedModelResultsById,
-        });
-        return {
-          providerId,
-          selectedModelChecks,
-          backendSummary,
-          cacheKey,
-          cachedModelResultsById,
-          cachedSnapshot,
-        };
-      });
-
-      try {
-        for (const plan of providerPlans) {
-          checks = updateProviderCheck(checks, plan.providerId, {
-            status: plan.selectedModelChecks.length > 0 ? plan.cachedSnapshot.status : 'checking',
-            backendSummary: plan.backendSummary,
-            details: plan.cachedSnapshot.details,
-          });
-        }
-        if (prepareRequestSeqRef.current === requestSeq) {
-          setPrepareChecks(checks);
-        }
-        const providerResults = await Promise.all(
-          providerPlans.map(async (plan) => {
+      await Promise.all(
+        runningPlans.map(async (plan) => {
+          try {
             const prepResult = await runProviderPrepareDiagnostics({
               cwd: effectiveCwd,
               providerId: plan.providerId,
-              selectedModelIds: plan.selectedModelChecks,
+              selectedModelIds: plan.selectedModelIds,
+              selectedModelChecks: plan.selectedModelChecks,
               prepareProvisioning: api.teams.prepareProvisioning,
               limitContext: effectiveAnthropicRuntimeLimitContext,
               cachedModelResultsById: plan.cachedModelResultsById,
               onModelProgress: ({ status, details }) => {
-                checks = updateProviderCheck(checks, plan.providerId, {
+                if (!isPlanCurrent(plan)) {
+                  return;
+                }
+                const nextChecks = updateProviderCheck(prepareChecksRef.current, plan.providerId, {
                   status,
                   backendSummary: plan.backendSummary,
                   details,
                 });
-                if (prepareRequestSeqRef.current === requestSeq) {
-                  setPrepareChecks(checks);
-                }
+                commitChecks(nextChecks);
+                applyPrepareOutcome(nextChecks, loadingMessage);
               },
             });
-            return { ...plan, prepResult };
-          })
-        );
-        let anyFailure = false;
-        let anyNotes = false;
-        const collectedWarnings: string[] = [];
-        for (const plan of providerResults) {
-          if (plan.prepResult.warnings.length > 0) {
-            anyNotes = true;
-            collectedWarnings.push(
-              ...plan.prepResult.warnings.map(
+            if (!isPlanCurrent(plan)) {
+              return;
+            }
+            prepareWarningsByProviderIdRef.current.set(
+              plan.providerId,
+              prepResult.warnings.map(
                 (warning) => `${getProviderLabel(plan.providerId)}: ${warning}`
               )
             );
-          }
-          if (plan.prepResult.status === 'failed') {
-            anyFailure = true;
-          } else if (plan.prepResult.status === 'notes') {
-            anyNotes = true;
-          }
-          if (prepareRequestSeqRef.current === requestSeq) {
             prepareModelResultsCacheRef.current.set(
               plan.cacheKey,
               mergeReusableProviderPrepareModelResults(
                 prepareModelResultsCacheRef.current.get(plan.cacheKey),
-                plan.prepResult.modelResultsById
+                prepResult.modelResultsById
               )
             );
             storeShortLivedProviderPrepareModelResults({
               providerId: plan.providerId,
               cacheKey: plan.cacheKey,
-              modelResultsById: plan.prepResult.modelResultsById,
+              modelResultsById: prepResult.modelResultsById,
             });
+            const nextChecks = updateProviderCheck(prepareChecksRef.current, plan.providerId, {
+              status: prepResult.status,
+              backendSummary: plan.backendSummary,
+              details: prepResult.details,
+            });
+            commitChecks(nextChecks);
+            applyPrepareOutcome(nextChecks, loadingMessage);
+          } catch (error) {
+            if (!isPlanCurrent(plan)) {
+              return;
+            }
+            const failureMessage =
+              error instanceof Error ? error.message : 'Failed to prepare selected providers';
+            const nextChecks = updateProviderCheck(prepareChecksRef.current, plan.providerId, {
+              status: 'failed',
+              backendSummary: plan.backendSummary,
+              details: [failureMessage],
+            });
+            prepareWarningsByProviderIdRef.current.delete(plan.providerId);
+            commitChecks(nextChecks);
+            applyPrepareOutcome(nextChecks, failureMessage);
           }
-          checks = updateProviderCheck(checks, plan.providerId, {
-            status: plan.prepResult.status,
-            backendSummary: plan.backendSummary,
-            details: plan.prepResult.details,
-          });
-        }
-        if (prepareRequestSeqRef.current === requestSeq) {
-          setPrepareChecks(checks);
-        }
-        if (prepareRequestSeqRef.current !== requestSeq) return;
-        const failureMessage =
-          getPrimaryProvisioningFailureDetail(checks) ?? 'Some selected providers need attention.';
-        setPrepareState(anyFailure ? 'failed' : 'ready');
-        setPrepareMessage(
-          anyFailure
-            ? failureMessage
-            : anyNotes
-              ? 'Selected providers are ready with notes.'
-              : 'Selected providers are ready.'
-        );
-        setPrepareWarnings(collectedWarnings);
-      } catch (error) {
-        if (prepareRequestSeqRef.current !== requestSeq) return;
-        const failureMessage =
-          error instanceof Error ? error.message : 'Failed to warm up Claude CLI environment';
-        setPrepareState('failed');
-        setPrepareWarnings([]);
-        setPrepareChecks(failIncompleteProviderChecks(checks, failureMessage));
-        setPrepareMessage(failureMessage);
-      }
+        })
+      );
     })();
   }, [
     open,
     isLaunchMode,
     effectiveCwd,
     effectiveAnthropicRuntimeLimitContext,
-    prepareRequestSignature,
-    selectedProviderId,
+    prepareProviderInvalidationEpochById,
+    runtimeProviderStatusById,
     selectedMemberProviders,
     selectedModelChecksByProvider,
+    selectedModelChecksByProviderSignature,
   ]);
 
   // ---------------------------------------------------------------------------
@@ -2613,6 +2696,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                   model={selectedModel}
                   effort={(selectedEffort as EffortLevel) || undefined}
                   limitContext={effectiveAnthropicRuntimeLimitContext}
+                  leadProviderNoticeById={teammateRuntimeProviderNoticeById}
                   onProviderChange={setSelectedProviderId}
                   onModelChange={setSelectedModel}
                   onEffortChange={setSelectedEffort}
@@ -2640,15 +2724,17 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                   softDeleteMembers
                   disableGeminiOption={isGeminiUiFrozen()}
                   headerBottom={
-                    teammateRuntimeCompatibility.visible || hasSelectedWorktreeIsolation ? (
+                    showRosterTeammateRuntimeCompatibility || hasSelectedWorktreeIsolation ? (
                       <div className="space-y-2">
-                        <TeammateRuntimeCompatibilityNotice
-                          analysis={teammateRuntimeCompatibility}
-                          onOpenDashboard={() => {
-                            closeDialog();
-                            openDashboard();
-                          }}
-                        />
+                        {showRosterTeammateRuntimeCompatibility ? (
+                          <TeammateRuntimeCompatibilityNotice
+                            analysis={teammateRuntimeCompatibility}
+                            onOpenDashboard={() => {
+                              closeDialog();
+                              openDashboard();
+                            }}
+                          />
+                        ) : null}
                         {hasSelectedWorktreeIsolation ? (
                           <WorktreeGitReadinessBanner state={worktreeGitReadiness} />
                         ) : null}
@@ -2812,7 +2898,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                   id="dialog-effort"
                   providerId={selectedProviderId}
                   model={selectedModel}
-                  limitContext={false}
+                  limitContext={effectiveAnthropicRuntimeLimitContext}
                 />
                 {selectedProviderId === 'anthropic' ? (
                   <div className="mt-2">
@@ -2821,7 +2907,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       onValueChange={setSelectedFastMode}
                       providerFastModeDefault={anthropicProviderFastModeDefault}
                       model={selectedModel}
-                      limitContext={false}
+                      limitContext={effectiveAnthropicRuntimeLimitContext}
                       id="dialog-fast-mode"
                     />
                     {anthropicRuntimeNotice ? (
@@ -2931,7 +3017,7 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       <span>
                         {effectivePrepare.message ??
                           (effectivePrepare.state === 'idle'
-                            ? 'Warming up CLI environment...'
+                            ? 'Checking selected providers...'
                             : 'Preparing environment...')}
                       </span>
                       <p className="mt-0.5 flex items-center gap-1.5 text-[10px] text-[var(--color-text-muted)] opacity-70">
@@ -2942,7 +3028,13 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       </p>
                     </div>
                   </div>
-                  <ProvisioningProviderStatusList checks={prepareChecks} className="mt-2" />
+                  <ProvisioningProviderStatusList
+                    checks={prepareChecks}
+                    className="mt-2"
+                    onOpenProviderSettings={(providerId) =>
+                      setProviderSettingsProviderId(providerId)
+                    }
+                  />
                 </>
               ) : null}
 
@@ -2953,8 +3045,8 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                     <span>
                       {prepareChecks.some((check) => check.status === 'notes') ||
                       prepareWarnings.length > 0
-                        ? 'CLI environment ready (with notes)'
-                        : 'CLI environment ready'}
+                        ? 'Selected providers ready (with notes)'
+                        : 'Selected providers ready'}
                     </span>
                   </div>
                   {effectivePrepare.message ? (
@@ -2962,7 +3054,13 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       {effectivePrepare.message}
                     </p>
                   ) : null}
-                  <ProvisioningProviderStatusList checks={prepareChecks} className="mt-1" />
+                  <ProvisioningProviderStatusList
+                    checks={prepareChecks}
+                    className="mt-1"
+                    onOpenProviderSettings={(providerId) =>
+                      setProviderSettingsProviderId(providerId)
+                    }
+                  />
                   {prepareWarnings.length > 0 && prepareChecks.length === 0 ? (
                     <div className="mt-0.5 space-y-0.5 pl-5">
                       {prepareWarnings.map((warning, index) => (
@@ -3000,6 +3098,9 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
                       checks={prepareChecks}
                       className="mt-2"
                       suppressDetailsMatching={effectivePrepare.message}
+                      onOpenProviderSettings={(providerId) =>
+                        setProviderSettingsProviderId(providerId)
+                      }
                     />
                   ) : null}
                   {prepareWarnings.length > 0 && prepareChecks.length === 0 ? (
@@ -3070,6 +3171,14 @@ export const LaunchTeamDialog = (props: LaunchTeamDialogProps): React.JSX.Elemen
           </div>
         </DialogFooter>
       </DialogContent>
+      <ProvisioningProviderRuntimeSettingsDialog
+        openProviderId={providerSettingsProviderId}
+        onOpenProviderIdChange={(providerId) => setProviderSettingsProviderId(providerId)}
+        providers={effectiveCliStatus?.providers ?? []}
+        projectPath={effectiveCwd || null}
+        disabled={isSubmitting || launchInFlight}
+        onProviderRuntimeChanged={invalidatePrepareProvider}
+      />
     </Dialog>
   );
 };
diff --git a/src/renderer/components/team/dialogs/LimitContextCheckbox.tsx b/src/renderer/components/team/dialogs/LimitContextCheckbox.tsx
index 5145c169..0f72ca62 100644
--- a/src/renderer/components/team/dialogs/LimitContextCheckbox.tsx
+++ b/src/renderer/components/team/dialogs/LimitContextCheckbox.tsx
@@ -1,13 +1,8 @@
 import React from 'react';
 
 import { Checkbox } from '@renderer/components/ui/checkbox';
+import { HoverTooltip } from '@renderer/components/ui/hover-tooltip';
 import { Label } from '@renderer/components/ui/label';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@renderer/components/ui/tooltip';
 import { Info } from 'lucide-react';
 
 interface LimitContextCheckboxProps {
@@ -44,20 +39,15 @@ export const LimitContextCheckbox: React.FC<LimitContextCheckboxProps> = ({
       ) : null}
       {disabled && <span className="text-[10px] italic">(always 200K for this model)</span>}
     </Label>
-    <TooltipProvider delayDuration={200}>
-      <Tooltip>
-        <TooltipTrigger asChild>
-          <Info
-            className={`size-3.5 shrink-0 ${disabled ? 'text-text-muted opacity-50' : 'text-text-muted hover:text-text-secondary'} cursor-help`}
-          />
-        </TooltipTrigger>
-        <TooltipContent side="top" className="max-w-[260px]">
-          <p>
-            Enable this to cap Anthropic runtimes at 200K tokens. Leave it off only when you want
-            the selected Anthropic model or runtime to use a longer context window when available.
-          </p>
-        </TooltipContent>
-      </Tooltip>
-    </TooltipProvider>
+    <HoverTooltip
+      content="Enable this to cap Anthropic runtimes at 200K tokens. Leave it off only when you want the selected Anthropic model or runtime to use a longer context window when available."
+      title="Enable this to cap Anthropic runtimes at 200K tokens."
+      contentClassName="max-w-[260px]"
+    >
+      <Info
+        className={`size-3.5 shrink-0 ${disabled ? 'text-text-muted opacity-50' : 'text-text-muted hover:text-text-secondary'} cursor-help`}
+        aria-hidden="true"
+      />
+    </HoverTooltip>
   </div>
 );
diff --git a/src/renderer/components/team/dialogs/ProvisioningProviderRuntimeSettingsDialog.tsx b/src/renderer/components/team/dialogs/ProvisioningProviderRuntimeSettingsDialog.tsx
new file mode 100644
index 00000000..300abf4e
--- /dev/null
+++ b/src/renderer/components/team/dialogs/ProvisioningProviderRuntimeSettingsDialog.tsx
@@ -0,0 +1,198 @@
+import React, { useCallback, useMemo, useState } from 'react';
+
+import { ProviderRuntimeSettingsDialog } from '@renderer/components/runtime/ProviderRuntimeSettingsDialog';
+import {
+  getProviderTerminalCommand,
+  getProviderTerminalLogoutCommand,
+} from '@renderer/components/runtime/providerTerminalCommands';
+import { TerminalModal } from '@renderer/components/terminal/TerminalModal';
+import { useStore } from '@renderer/store';
+import { refreshCliStatusForCurrentMode } from '@renderer/utils/refreshCliStatus';
+import { getRuntimeDisplayName } from '@renderer/utils/runtimeDisplayName';
+import { useShallow } from 'zustand/react/shallow';
+
+import { getProvisioningProviderLabel } from './ProvisioningProviderStatusList';
+
+import type { CliProviderId, CliProviderStatus } from '@shared/types';
+
+interface ProvisioningProviderRuntimeSettingsDialogProps {
+  readonly openProviderId: CliProviderId | null;
+  readonly onOpenProviderIdChange: (providerId: CliProviderId | null) => void;
+  readonly providers: CliProviderStatus[];
+  readonly projectPath?: string | null;
+  readonly disabled?: boolean;
+  readonly onProviderRuntimeChanged?: (providerId: CliProviderId) => void;
+}
+
+interface ProviderTerminalState {
+  providerId: CliProviderId;
+  action: 'login' | 'logout';
+}
+
+export const ProvisioningProviderRuntimeSettingsDialog = ({
+  openProviderId,
+  onOpenProviderIdChange,
+  providers,
+  projectPath = null,
+  disabled = false,
+  onProviderRuntimeChanged,
+}: ProvisioningProviderRuntimeSettingsDialogProps): React.JSX.Element | null => {
+  const [providerTerminal, setProviderTerminal] = useState<ProviderTerminalState | null>(null);
+  const {
+    appConfig,
+    bootstrapCliStatus,
+    cliProviderStatusLoading,
+    cliStatus,
+    cliStatusLoading,
+    codexRuntimeStatus,
+    codexRuntimeStatusLoading,
+    fetchCliProviderStatus,
+    fetchCliStatus,
+    installCodexRuntime,
+    invalidateCliStatus,
+    multimodelEnabled,
+    updateConfig,
+  } = useStore(
+    useShallow((s) => ({
+      appConfig: s.appConfig,
+      bootstrapCliStatus: s.bootstrapCliStatus,
+      cliProviderStatusLoading: s.cliProviderStatusLoading,
+      cliStatus: s.cliStatus,
+      cliStatusLoading: s.cliStatusLoading,
+      codexRuntimeStatus: s.codexRuntimeStatus,
+      codexRuntimeStatusLoading: s.codexRuntimeStatusLoading,
+      fetchCliProviderStatus: s.fetchCliProviderStatus,
+      fetchCliStatus: s.fetchCliStatus,
+      installCodexRuntime: s.installCodexRuntime,
+      invalidateCliStatus: s.invalidateCliStatus,
+      multimodelEnabled: s.appConfig?.general?.multimodelEnabled ?? true,
+      updateConfig: s.updateConfig,
+    }))
+  );
+
+  const selectedProviderId = useMemo<CliProviderId | null>(() => {
+    if (!openProviderId || providers.length === 0) {
+      return null;
+    }
+
+    return providers.some((provider) => provider.providerId === openProviderId)
+      ? openProviderId
+      : (providers[0]?.providerId ?? null);
+  }, [openProviderId, providers]);
+
+  const handleProviderBackendChange = useCallback(
+    async (providerId: CliProviderId, backendId: string) => {
+      if (providerId !== 'gemini' && providerId !== 'codex') {
+        return;
+      }
+
+      const currentBackends = appConfig?.runtime?.providerBackends ?? {
+        gemini: 'auto' as const,
+        codex: 'codex-native' as const,
+      };
+
+      await updateConfig('runtime', {
+        providerBackends: {
+          ...currentBackends,
+          [providerId]: backendId,
+        },
+      });
+
+      try {
+        await fetchCliProviderStatus(providerId, { silent: false });
+        onProviderRuntimeChanged?.(providerId);
+      } catch {
+        throw new Error('Runtime updated, but failed to refresh provider status.');
+      }
+    },
+    [
+      appConfig?.runtime?.providerBackends,
+      fetchCliProviderStatus,
+      onProviderRuntimeChanged,
+      updateConfig,
+    ]
+  );
+
+  const handleProviderRefresh = useCallback(
+    async (providerId: CliProviderId) => {
+      await fetchCliProviderStatus(providerId, { silent: false });
+      onProviderRuntimeChanged?.(providerId);
+    },
+    [fetchCliProviderStatus, onProviderRuntimeChanged]
+  );
+
+  const refreshRuntimeAfterTerminal = useCallback(() => {
+    void (async () => {
+      await invalidateCliStatus();
+      await refreshCliStatusForCurrentMode({
+        multimodelEnabled,
+        bootstrapCliStatus,
+        fetchCliStatus,
+      });
+    })();
+  }, [bootstrapCliStatus, fetchCliStatus, invalidateCliStatus, multimodelEnabled]);
+
+  const activeTerminalProvider = providerTerminal
+    ? (providers.find((provider) => provider.providerId === providerTerminal.providerId) ?? null)
+    : null;
+  const providerTerminalCommand =
+    providerTerminal && activeTerminalProvider
+      ? providerTerminal.action === 'login'
+        ? getProviderTerminalCommand(activeTerminalProvider)
+        : getProviderTerminalLogoutCommand(activeTerminalProvider)
+      : null;
+
+  if (!selectedProviderId) {
+    return null;
+  }
+
+  return (
+    <>
+      <ProviderRuntimeSettingsDialog
+        open={Boolean(openProviderId)}
+        onOpenChange={(open) => {
+          if (!open) {
+            onOpenProviderIdChange(null);
+          }
+        }}
+        providers={providers}
+        projectPath={projectPath}
+        initialProviderId={selectedProviderId}
+        providerStatusLoading={cliProviderStatusLoading}
+        disabled={disabled || cliStatusLoading || !cliStatus?.binaryPath}
+        codexRuntimeStatus={codexRuntimeStatus}
+        codexRuntimeStatusLoading={codexRuntimeStatusLoading}
+        onInstallCodexRuntime={() => installCodexRuntime()}
+        onSelectBackend={handleProviderBackendChange}
+        onRefreshProvider={handleProviderRefresh}
+        onRequestLogin={(providerId) => setProviderTerminal({ providerId, action: 'login' })}
+      />
+      {providerTerminal && cliStatus?.binaryPath && (
+        <TerminalModal
+          title={`${getRuntimeDisplayName(cliStatus, multimodelEnabled)} ${
+            providerTerminal.action === 'login' ? 'Login' : 'Logout'
+          }: ${getProvisioningProviderLabel(providerTerminal.providerId)}`}
+          command={cliStatus.binaryPath}
+          args={providerTerminalCommand?.args}
+          env={providerTerminalCommand?.env}
+          onClose={() => {
+            setProviderTerminal(null);
+            onProviderRuntimeChanged?.(providerTerminal.providerId);
+            refreshRuntimeAfterTerminal();
+          }}
+          onExit={() => {
+            onProviderRuntimeChanged?.(providerTerminal.providerId);
+            refreshRuntimeAfterTerminal();
+          }}
+          autoCloseOnSuccessMs={3000}
+          successMessage={
+            providerTerminal.action === 'login' ? 'Authentication updated' : 'Provider logged out'
+          }
+          failureMessage={
+            providerTerminal.action === 'login' ? 'Authentication failed' : 'Logout failed'
+          }
+        />
+      )}
+    </>
+  );
+};
diff --git a/src/renderer/components/team/dialogs/ProvisioningProviderStatusList.tsx b/src/renderer/components/team/dialogs/ProvisioningProviderStatusList.tsx
index 10f6da61..84eb0958 100644
--- a/src/renderer/components/team/dialogs/ProvisioningProviderStatusList.tsx
+++ b/src/renderer/components/team/dialogs/ProvisioningProviderStatusList.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { formatProviderBackendLabel } from '@renderer/utils/providerBackendIdentity';
 import { getTeamProviderLabel as getCatalogTeamProviderLabel } from '@renderer/utils/teamModelCatalog';
-import { AlertTriangle, CheckCircle2, Loader2 } from 'lucide-react';
+import { AlertTriangle, CheckCircle2, Loader2, SlidersHorizontal } from 'lucide-react';
 
 import type { CliProviderStatus, TeamProviderId } from '@shared/types';
 
@@ -133,6 +133,21 @@ export function failIncompleteProviderChecks(
   );
 }
 
+export function getProvisioningProviderProgressMessage(
+  providerIds: readonly TeamProviderId[],
+  totalProviderCount: number
+): string {
+  if (providerIds.length === 0 || providerIds.length === totalProviderCount) {
+    return 'Checking selected providers in parallel...';
+  }
+
+  if (providerIds.length === 1) {
+    return `Checking ${getProvisioningProviderLabel(providerIds[0])} provider...`;
+  }
+
+  return `Checking ${providerIds.map(getProvisioningProviderLabel).join(', ')} providers...`;
+}
+
 type ProvisioningDetailSummary =
   | 'CLI binary missing'
   | 'OpenCode runtime missing'
@@ -177,6 +192,15 @@ function isModelDetail(lower: string): boolean {
   return isSelectedModelDetail(lower) || isFormattedModelDetail(lower);
 }
 
+function isInternalProvisioningDetail(detail: string): boolean {
+  const normalized = detail.trim().toLowerCase();
+  return normalized === 'opencode_app_mcp_tool_proof_persisted_cache_hit';
+}
+
+function getPublicProvisioningDetails(details: string[]): string[] {
+  return details.filter((detail) => !isInternalProvisioningDetail(detail));
+}
+
 function getStatusLabel(status: ProvisioningProviderCheckStatus): string {
   switch (status) {
     case 'checking':
@@ -418,12 +442,13 @@ function hasCompatibilityPendingDetails(checks: ProvisioningProviderCheck[]): bo
 }
 
 function getDisplayStatusText(check: ProvisioningProviderCheck): string {
-  const modelSummary = getModelDetailSummary(check.details);
+  const publicDetails = getPublicProvisioningDetails(check.details);
+  const modelSummary = getModelDetailSummary(publicDetails);
   if (modelSummary) {
     return modelSummary;
   }
 
-  const summarizedDetails = check.details
+  const summarizedDetails = publicDetails
     .map((detail) => summarizeDetail(detail, check.status))
     .filter((detail): detail is ProvisioningDetailSummary => Boolean(detail));
 
@@ -507,7 +532,8 @@ export function getPrimaryProvisioningFailureDetail(
       continue;
     }
 
-    const unavailableDetail = check.details.find((detail) =>
+    const publicDetails = getPublicProvisioningDetails(check.details);
+    const unavailableDetail = publicDetails.find((detail) =>
       detail.toLowerCase().includes('selected model') &&
       detail.toLowerCase().includes('is unavailable')
         ? true
@@ -523,22 +549,23 @@ export function getPrimaryProvisioningFailureDetail(
       continue;
     }
 
-    const preferredFailure = check.details.find(
+    const publicDetails = getPublicProvisioningDetails(check.details);
+    const preferredFailure = publicDetails.find(
       (detail) => getDetailTone(detail, check.status) === 'failure'
     );
     if (preferredFailure) {
       return preferredFailure;
     }
 
-    const nonSuccessDetail = check.details.find(
+    const nonSuccessDetail = publicDetails.find(
       (detail) => getDetailTone(detail, check.status) !== 'success'
     );
     if (nonSuccessDetail) {
       return nonSuccessDetail;
     }
 
-    if (check.details.length > 0) {
-      return check.details[0];
+    if (publicDetails.length > 0) {
+      return publicDetails[0];
     }
   }
 
@@ -598,8 +625,8 @@ export function deriveEffectiveProvisioningPrepareState(params: {
   return {
     state: 'ready',
     message: hasNotes
-      ? 'Selected providers are ready with notes.'
-      : 'Selected providers are ready.',
+      ? 'All selected providers are ready, with notes.'
+      : 'All selected providers are ready.',
   };
 }
 
@@ -655,14 +682,49 @@ const StatusIcon = ({ status }: { status: ProvisioningProviderCheckStatus }): Re
   return <span className="inline-block size-1.5 rounded-full bg-current opacity-60" />;
 };
 
+function getProvisioningProviderSettingsActionLabel(
+  check: ProvisioningProviderCheck
+): string | null {
+  if (check.status !== 'notes' && check.status !== 'failed') {
+    return null;
+  }
+
+  const details = getPublicProvisioningDetails(check.details);
+  const combined = [check.backendSummary ?? '', ...details].join('\n').toLowerCase();
+  if (!combined.trim()) {
+    return null;
+  }
+
+  const hasActionableProviderSetupDetail =
+    combined.includes('auth required') ||
+    combined.includes('authentication required') ||
+    combined.includes('not authenticated') ||
+    combined.includes('not logged in') ||
+    combined.includes('provider is not configured for runtime use') ||
+    combined.includes('connect a chatgpt account') ||
+    combined.includes('connected chatgpt account') ||
+    combined.includes('reconnect chatgpt') ||
+    combined.includes('openai_api_key') ||
+    combined.includes('codex_api_key') ||
+    combined.includes('anthropic_api_key') ||
+    combined.includes('gemini_api_key') ||
+    combined.includes('api key mode is selected');
+
+  return hasActionableProviderSetupDetail
+    ? `Open ${getProvisioningProviderLabel(check.providerId)} settings`
+    : null;
+}
+
 export const ProvisioningProviderStatusList = ({
   checks,
   className = '',
   suppressDetailsMatching,
+  onOpenProviderSettings,
 }: {
   checks: ProvisioningProviderCheck[];
   className?: string;
   suppressDetailsMatching?: string | null;
+  onOpenProviderSettings?: (providerId: TeamProviderId) => void;
 }): React.JSX.Element | null => {
   if (checks.length === 0) {
     return null;
@@ -671,9 +733,13 @@ export const ProvisioningProviderStatusList = ({
   return (
     <div className={`space-y-1 pl-5 ${className}`.trim()}>
       {checks.map((check) => {
-        const visibleDetails = check.details.filter(
-          (detail) => detail.trim() !== (suppressDetailsMatching ?? '').trim()
+        const suppressDetailsMatchingTrimmed = (suppressDetailsMatching ?? '').trim();
+        const visibleDetails = getPublicProvisioningDetails(check.details).filter(
+          (detail) => detail.trim() !== suppressDetailsMatchingTrimmed
         );
+        const settingsActionLabel = onOpenProviderSettings
+          ? getProvisioningProviderSettingsActionLabel(check)
+          : null;
 
         return (
           <div key={check.providerId}>
@@ -699,6 +765,22 @@ export const ProvisioningProviderStatusList = ({
                 ))}
               </div>
             ) : null}
+            {settingsActionLabel ? (
+              <div className="mt-1 pl-4">
+                <button
+                  type="button"
+                  className="inline-flex items-center gap-1 rounded-md border px-2 py-1 text-[10px] font-medium transition-colors hover:bg-white/5"
+                  style={{
+                    borderColor: 'var(--color-border-subtle)',
+                    color: 'var(--color-text-secondary)',
+                  }}
+                  onClick={() => onOpenProviderSettings?.(check.providerId)}
+                >
+                  <SlidersHorizontal className="size-3" />
+                  {settingsActionLabel}
+                </button>
+              </div>
+            ) : null}
           </div>
         );
       })}
diff --git a/src/renderer/components/team/dialogs/TeamModelSelector.tsx b/src/renderer/components/team/dialogs/TeamModelSelector.tsx
index 3890ad47..cc138fc1 100644
--- a/src/renderer/components/team/dialogs/TeamModelSelector.tsx
+++ b/src/renderer/components/team/dialogs/TeamModelSelector.tsx
@@ -135,8 +135,8 @@ const OPENCODE_MODEL_ROW_ESTIMATE_PX = 92;
 const PROVIDERS: ProviderDef[] = [
   { id: 'anthropic', label: 'Anthropic', comingSoon: false },
   { id: 'codex', label: 'Codex', comingSoon: false },
-  { id: 'gemini', label: 'Gemini', comingSoon: false },
   { id: 'opencode', label: 'OpenCode', comingSoon: false },
+  { id: 'gemini', label: 'Gemini', comingSoon: false },
 ];
 
 function getOpenCodeSourceInfo(model: string): OpenCodeSourceInfo | null {
@@ -328,11 +328,106 @@ function getOpenCodeModelPricingInfo(
   };
 }
 
+function isFreeOpenCodeModelRoute(model: string): boolean {
+  const normalized = model.trim().toLowerCase();
+  return (
+    normalized === 'opencode/big-pickle' ||
+    normalized.includes(':free') ||
+    normalized.endsWith('-free') ||
+    normalized.endsWith('/free')
+  );
+}
+
+function hasFreeOpenCodeModelRoute(providerStatus: CliProviderStatus | null | undefined): boolean {
+  if (providerStatus?.providerId !== 'opencode') {
+    return false;
+  }
+
+  if (providerStatus.models.some(isFreeOpenCodeModelRoute)) {
+    return true;
+  }
+
+  return (
+    providerStatus.modelCatalog?.models.some((model) => {
+      const badgeLabel = model.badgeLabel?.trim().toLowerCase();
+      return (
+        model.metadata?.free === true ||
+        badgeLabel === 'free' ||
+        isFreeOpenCodeModelRoute(model.launchModel) ||
+        isFreeOpenCodeModelRoute(model.id)
+      );
+    }) ?? false
+  );
+}
+
 const OPENCODE_UI_DISABLED_REASON = 'OpenCode team launch is not ready.';
 export const OPENCODE_ONE_SHOT_DISABLED_REASON =
-  'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic, Codex, or Gemini for one-shot schedules.';
+  'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic or Codex for one-shot schedules.';
 export const OPENCODE_ONE_SHOT_DISABLED_BADGE_LABEL = 'team only';
 
+function getOpenCodeReadinessBadgeLabel(
+  providerStatus: CliProviderStatus | null | undefined
+): string {
+  if (!providerStatus) {
+    return 'Check';
+  }
+  if (!providerStatus.supported) {
+    return 'Install';
+  }
+  if (!providerStatus.authenticated) {
+    return 'Free';
+  }
+  return 'Setup';
+}
+
+function getOpenCodeReadinessSummary(providerStatus: CliProviderStatus | null | undefined): string {
+  if (!providerStatus) {
+    return 'OpenCode status: checking runtime';
+  }
+
+  const runtimeReady = providerStatus.supported;
+  const hasFreeModelRoute = hasFreeOpenCodeModelRoute(providerStatus);
+  let readinessSummary = 'team launch blocked';
+  if (runtimeReady) {
+    if (!providerStatus.authenticated) {
+      readinessSummary = hasFreeModelRoute
+        ? 'provider connection optional'
+        : 'provider-backed models need setup';
+    } else if (providerStatus.capabilities.teamLaunch) {
+      readinessSummary = 'team launch ready';
+    }
+  }
+  const parts = [
+    runtimeReady ? 'runtime detected' : 'runtime missing',
+    runtimeReady && !providerStatus.authenticated && hasFreeModelRoute
+      ? 'free models available without auth'
+      : providerStatus.authenticated
+        ? 'provider connected'
+        : 'provider not connected',
+    readinessSummary,
+  ];
+  return `OpenCode status: ${parts.join(' · ')}`;
+}
+
+function getOpenCodeReadinessMessage(providerStatus: CliProviderStatus | null | undefined): string {
+  if (!providerStatus) {
+    return 'The app is still checking the OpenCode runtime. Wait for provider status to finish, then try again.';
+  }
+  if (!providerStatus.supported) {
+    return 'OpenCode is not installed, not found, or the detected runtime is not supported. Install or update OpenCode, then refresh provider status.';
+  }
+  if (!providerStatus.authenticated) {
+    if (hasFreeOpenCodeModelRoute(providerStatus)) {
+      return 'OpenCode is detected. You can use free OpenCode models such as Big Pickle without connecting a provider. Connect a provider only when you want provider-backed models.';
+    }
+    return 'OpenCode is detected, but no free OpenCode model is listed yet. Refresh provider status, or connect a provider in OpenCode for provider-backed models.';
+  }
+  if (!providerStatus.capabilities.teamLaunch) {
+    return 'OpenCode is installed and authenticated, but Agent Teams launch readiness is blocked.';
+  }
+  return 'OpenCode is ready for team launch.';
+}
+
 export function getTeamModelLabel(model: string): string {
   return getCatalogTeamModelLabel(model) ?? model;
 }
@@ -427,7 +522,10 @@ const OpenCodeVirtualizedModelGrid = ({
       return undefined;
     }
 
-    const updateGridWidth = (): void => setGridWidth(element.clientWidth);
+    const updateGridWidth = (): void => {
+      const nextWidth = element.clientWidth;
+      setGridWidth((previousWidth) => (previousWidth === nextWidth ? previousWidth : nextWidth));
+    };
     updateGridWidth();
 
     if (typeof ResizeObserver !== 'undefined') {
@@ -563,6 +661,7 @@ export interface TeamModelSelectorProps {
   onValueChange: (value: string) => void;
   id?: string;
   disableGeminiOption?: boolean;
+  providerNoticeById?: Partial<Record<TeamProviderId, React.ReactNode>>;
   providerDisabledReasonById?: Partial<Record<TeamProviderId, string | null | undefined>>;
   providerDisabledBadgeLabelById?: Partial<Record<TeamProviderId, string | null | undefined>>;
   modelAdvisoryReasonByValue?: Partial<Record<string, string | null | undefined>>;
@@ -577,6 +676,7 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
   onValueChange,
   id,
   disableGeminiOption = false,
+  providerNoticeById,
   providerDisabledReasonById,
   providerDisabledBadgeLabelById,
   modelAdvisoryReasonByValue,
@@ -591,9 +691,13 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
   const [selectedOpenCodeSourceIds, setSelectedOpenCodeSourceIds] = useState<Set<string>>(
     () => new Set()
   );
-
-  const effectiveProviderId =
+  const selectedProviderId =
     disableGeminiOption && isGeminiUiFrozen() && providerId === 'gemini' ? 'anthropic' : providerId;
+  const [inspectedProviderId, setInspectedProviderId] = useState<TeamProviderId | null>(null);
+  const previousEffectiveProviderIdRef = useRef<TeamProviderId>(selectedProviderId);
+  const previousSelectedProviderIdRef = useRef<TeamProviderId>(selectedProviderId);
+  const effectiveProviderId = inspectedProviderId ?? selectedProviderId;
+  const isInspectingInactiveProvider = inspectedProviderId !== null;
   const { cliStatus: effectiveCliStatus, providerStatus: runtimeProviderStatus } =
     useEffectiveCliProviderStatus(effectiveProviderId);
   const multimodelAvailable =
@@ -624,12 +728,17 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
     }
     return 'Uses the runtime default for the selected provider.';
   }, [effectiveProviderId, runtimeProviderStatus]);
+  const getProviderOverrideDisabledReason = (candidateProviderId: string): string | null => {
+    if (!isTeamProviderId(candidateProviderId)) {
+      return null;
+    }
+
+    return providerDisabledReasonById?.[candidateProviderId]?.trim() || null;
+  };
   const getProviderDisabledReason = (candidateProviderId: string): string | null => {
-    if (isTeamProviderId(candidateProviderId)) {
-      const overrideReason = providerDisabledReasonById?.[candidateProviderId]?.trim();
-      if (overrideReason) {
-        return overrideReason;
-      }
+    const overrideReason = getProviderOverrideDisabledReason(candidateProviderId);
+    if (overrideReason) {
+      return overrideReason;
     }
 
     if (candidateProviderId === 'opencode') {
@@ -644,14 +753,7 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
           'OpenCode runtime is not installed.'
         );
       }
-      if (!providerStatus.authenticated) {
-        return (
-          providerStatus.detailMessage ??
-          providerStatus.statusMessage ??
-          'OpenCode has no connected provider.'
-        );
-      }
-      if (!providerStatus.capabilities.teamLaunch) {
+      if (providerStatus.authenticated && !providerStatus.capabilities.teamLaunch) {
         return (
           providerStatus.detailMessage ??
           providerStatus.statusMessage ??
@@ -670,6 +772,11 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
   const isProviderSelectable = (candidateProviderId: string): boolean =>
     !isProviderTemporarilyDisabled(candidateProviderId) &&
     (multimodelAvailable || candidateProviderId === 'anthropic');
+  const isProviderInspectable = (candidateProviderId: string): boolean =>
+    candidateProviderId === 'opencode' &&
+    getProviderOverrideDisabledReason(candidateProviderId) === null &&
+    getProviderDisabledReason(candidateProviderId) !== null &&
+    multimodelAvailable;
   const activeProviderSelectable = isProviderSelectable(effectiveProviderId);
   const getProviderStatusBadge = (candidateProviderId: string): string | null => {
     if (isTeamProviderId(candidateProviderId)) {
@@ -681,7 +788,9 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
     }
 
     if (candidateProviderId === 'opencode') {
-      return getProviderDisabledReason(candidateProviderId) ? 'Gated' : null;
+      return getProviderDisabledReason(candidateProviderId)
+        ? getOpenCodeReadinessBadgeLabel(runtimeProviderStatusById.get('opencode'))
+        : null;
     }
 
     const providerDisabledReason = getProviderDisabledReason(candidateProviderId);
@@ -696,10 +805,6 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
     return null;
   };
   const getProviderStatusBadgeLabel = (statusBadge: string | null): string | null => {
-    if (statusBadge === 'Gated') {
-      return 'Gate';
-    }
-
     if (statusBadge === 'Multimodel off') {
       return 'Off';
     }
@@ -717,10 +822,13 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
   );
 
   useEffect(() => {
+    if (isInspectingInactiveProvider) {
+      return;
+    }
     if (normalizedValue !== value) {
       onValueChange(normalizedValue);
     }
-  }, [normalizedValue, onValueChange, value]);
+  }, [isInspectingInactiveProvider, normalizedValue, onValueChange, value]);
 
   const modelOptions = useMemo(() => {
     if (shouldAwaitRuntimeModelList) {
@@ -784,29 +892,43 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
   );
 
   useEffect(() => {
-    if (effectiveProviderId !== 'opencode' || !hasRecommendedOpenCodeModels) {
-      queueMicrotask(() => setRecommendedOnly(false));
+    if (previousSelectedProviderIdRef.current === selectedProviderId) {
+      return;
     }
-  }, [effectiveProviderId, hasRecommendedOpenCodeModels]);
+    previousSelectedProviderIdRef.current = selectedProviderId;
+    setInspectedProviderId(null);
+  }, [selectedProviderId]);
 
   useEffect(() => {
-    queueMicrotask(() => setModelQuery(''));
+    if (recommendedOnly && (effectiveProviderId !== 'opencode' || !hasRecommendedOpenCodeModels)) {
+      setRecommendedOnly(false);
+    }
+  }, [effectiveProviderId, hasRecommendedOpenCodeModels, recommendedOnly]);
+
+  useEffect(() => {
+    if (previousEffectiveProviderIdRef.current === effectiveProviderId) {
+      return;
+    }
+    previousEffectiveProviderIdRef.current = effectiveProviderId;
+    setModelQuery('');
   }, [effectiveProviderId]);
 
   useEffect(() => {
-    if (effectiveProviderId !== 'opencode') {
-      queueMicrotask(() => {
-        setSelectedOpenCodeSourceIds(new Set());
-        setOpenCodeSourceFilterOpen(false);
-      });
+    if (effectiveProviderId === 'opencode') {
+      return;
     }
-  }, [effectiveProviderId]);
+    if (selectedOpenCodeSourceIds.size === 0 && !openCodeSourceFilterOpen) {
+      return;
+    }
+    setSelectedOpenCodeSourceIds(new Set());
+    setOpenCodeSourceFilterOpen(false);
+  }, [effectiveProviderId, openCodeSourceFilterOpen, selectedOpenCodeSourceIds]);
 
   useEffect(() => {
-    if (!openCodeSourceFilterOpen) {
-      queueMicrotask(() => setOpenCodeSourceQuery(''));
+    if (!openCodeSourceFilterOpen && openCodeSourceQuery) {
+      setOpenCodeSourceQuery('');
     }
-  }, [openCodeSourceFilterOpen]);
+  }, [openCodeSourceFilterOpen, openCodeSourceQuery]);
 
   const openCodeSourceOptions = useMemo<OpenCodeSourceOption[]>(() => {
     if (effectiveProviderId !== 'opencode') {
@@ -851,7 +973,7 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
       Array.from(selectedOpenCodeSourceIds).filter((sourceId) => availableSourceIds.has(sourceId))
     );
     if (nextSelectedSourceIds.size !== selectedOpenCodeSourceIds.size) {
-      queueMicrotask(() => setSelectedOpenCodeSourceIds(nextSelectedSourceIds));
+      setSelectedOpenCodeSourceIds(nextSelectedSourceIds);
     }
   }, [openCodeSourceOptions, selectedOpenCodeSourceIds]);
 
@@ -946,7 +1068,10 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
       if (!normalizedModelQuery) {
         return true;
       }
-      const modelRecommendation = getTeamModelRecommendation(effectiveProviderId, option.value);
+      const modelRecommendation =
+        effectiveProviderId === 'opencode'
+          ? getTeamModelRecommendation(effectiveProviderId, option.value)
+          : null;
       return [
         option.value,
         option.label,
@@ -1008,6 +1133,46 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
     effectiveProviderId === 'opencode' &&
     !shouldShowOpenCodeCatalogLoading &&
     visibleConcreteModelOptionCount > OPENCODE_MODEL_VIRTUALIZATION_THRESHOLD;
+  const activeProviderDisabledReason = activeProviderSelectable
+    ? null
+    : getProviderDisabledReason(effectiveProviderId);
+  const canActivateInspectedOpenCode =
+    effectiveProviderId === 'opencode' && isInspectingInactiveProvider && activeProviderSelectable;
+  const activeProviderStatusPanel =
+    activeProviderDisabledReason && effectiveProviderId === 'opencode'
+      ? {
+          tone: 'warning' as const,
+          title: 'OpenCode is not ready for team launch',
+          summary: getOpenCodeReadinessSummary(runtimeProviderStatus),
+          message: getOpenCodeReadinessMessage(runtimeProviderStatus),
+          reason: activeProviderDisabledReason,
+          actionLabel: null,
+        }
+      : effectiveProviderId === 'opencode' &&
+          runtimeProviderStatus?.supported === true &&
+          runtimeProviderStatus.authenticated === false
+        ? {
+            tone: 'warning' as const,
+            title: hasFreeOpenCodeModelRoute(runtimeProviderStatus)
+              ? 'OpenCode free models are available'
+              : 'OpenCode provider is not connected',
+            summary: getOpenCodeReadinessSummary(runtimeProviderStatus),
+            message: getOpenCodeReadinessMessage(runtimeProviderStatus),
+            reason: null,
+            actionLabel: null,
+          }
+        : canActivateInspectedOpenCode
+          ? {
+              tone: 'ready' as const,
+              title: 'OpenCode is ready',
+              summary: getOpenCodeReadinessSummary(runtimeProviderStatus),
+              message:
+                'OpenCode passed provider readiness. Select it to use OpenCode models for this team.',
+              reason: null,
+              actionLabel: 'Use OpenCode',
+            }
+          : null;
+  const activeProviderNotice = providerNoticeById?.[effectiveProviderId] ?? null;
   const getModelAdvisoryBadgeLabel = (reason: string | null): string =>
     reason?.toLowerCase().includes('ping not confirmed') ? 'Ping not confirmed' : 'Note';
   const renderModelOption = (opt: TeamRuntimeModelOption): React.JSX.Element => {
@@ -1040,6 +1205,7 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
     const hasBlockingModelIssue = Boolean(modelIssueReason || modelUnavailableReason);
     const hasModelAdvisory = Boolean(modelAdvisoryReason) && !hasBlockingModelIssue;
     const modelSelectable =
+      !isInspectingInactiveProvider &&
       activeProviderSelectable &&
       !modelUnavailableReason &&
       !modelDisabledReason &&
@@ -1053,9 +1219,12 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
       null;
     const openCodeMetadata =
       effectiveProviderId === 'opencode' ? openCodeModelMetadataByValue.get(opt.value) : null;
-    const modelRecommendation =
-      openCodeMetadata?.recommendation ??
-      getTeamModelRecommendation(effectiveProviderId, opt.value);
+    let modelRecommendation: ReturnType<typeof getTeamModelRecommendation> = null;
+    if (effectiveProviderId === 'opencode') {
+      modelRecommendation =
+        openCodeMetadata?.recommendation ??
+        getTeamModelRecommendation(effectiveProviderId, opt.value);
+    }
     const openCodePricingInfo =
       effectiveProviderId === 'opencode' ? (openCodeMetadata?.pricingInfo ?? null) : null;
     const modelButtonTitle =
@@ -1227,8 +1396,20 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
       <Tabs
         value={effectiveProviderId}
         onValueChange={(nextValue) => {
-          if (isTeamProviderId(nextValue) && isProviderSelectable(nextValue)) {
+          if (!isTeamProviderId(nextValue)) {
+            return;
+          }
+          if (isInspectingInactiveProvider && nextValue === selectedProviderId) {
+            setInspectedProviderId(null);
+            return;
+          }
+          if (isProviderSelectable(nextValue)) {
+            setInspectedProviderId(null);
             onProviderChange(nextValue);
+            return;
+          }
+          if (isProviderInspectable(nextValue)) {
+            setInspectedProviderId(nextValue);
           }
         }}
       >
@@ -1238,6 +1419,7 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
               {PROVIDERS.map((provider) => {
                 const providerDisabledReason = getProviderDisabledReason(provider.id);
                 const providerSelectable = isProviderSelectable(provider.id);
+                const providerInspectable = isProviderInspectable(provider.id);
                 const statusBadge = getProviderStatusBadge(provider.id);
                 const statusBadgeLabel = getProviderStatusBadgeLabel(statusBadge);
 
@@ -1245,7 +1427,8 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
                   <TabsTrigger
                     key={provider.id}
                     value={provider.id}
-                    disabled={provider.comingSoon || !providerSelectable}
+                    disabled={provider.comingSoon || (!providerSelectable && !providerInspectable)}
+                    aria-disabled={!providerSelectable || undefined}
                     title={
                       providerDisabledReason ??
                       (statusBadge === 'Multimodel off'
@@ -1295,6 +1478,50 @@ export const TeamModelSelector: React.FC<TeamModelSelectorProps> = ({
             ) : null}
 
             <div className="p-3">
+              {activeProviderNotice ? (
+                <div data-testid="team-model-selector-provider-notice" className="mb-3">
+                  {activeProviderNotice}
+                </div>
+              ) : null}
+              {activeProviderStatusPanel ? (
+                <div
+                  data-testid="team-model-selector-provider-status"
+                  className={cn(
+                    'mb-3 rounded-md border px-3 py-2 text-[11px] leading-relaxed',
+                    activeProviderStatusPanel.tone === 'ready'
+                      ? 'border-emerald-300/30 bg-emerald-300/10 text-emerald-100'
+                      : 'border-amber-300/30 bg-amber-300/10 text-amber-100'
+                  )}
+                >
+                  <div className="flex items-start gap-2">
+                    {activeProviderStatusPanel.tone === 'ready' ? (
+                      <CheckCircle2 className="mt-0.5 size-3.5 shrink-0 text-emerald-200" />
+                    ) : (
+                      <AlertTriangle className="mt-0.5 size-3.5 shrink-0 text-amber-200" />
+                    )}
+                    <div className="min-w-0 space-y-1">
+                      <p className="font-medium">{activeProviderStatusPanel.title}</p>
+                      <p className="opacity-90">{activeProviderStatusPanel.summary}</p>
+                      <p>{activeProviderStatusPanel.message}</p>
+                      {activeProviderStatusPanel.reason ? (
+                        <p className="opacity-90">Reason: {activeProviderStatusPanel.reason}</p>
+                      ) : null}
+                      {activeProviderStatusPanel.actionLabel ? (
+                        <button
+                          type="button"
+                          className="mt-1 inline-flex h-7 items-center rounded-md border border-emerald-300/35 bg-emerald-300/10 px-2.5 text-[11px] font-medium text-emerald-100 transition-colors hover:border-emerald-200/50 hover:bg-emerald-300/15"
+                          onClick={() => {
+                            setInspectedProviderId(null);
+                            onProviderChange('opencode');
+                          }}
+                        >
+                          {activeProviderStatusPanel.actionLabel}
+                        </button>
+                      ) : null}
+                    </div>
+                  </div>
+                </div>
+              ) : null}
               {shouldAwaitRuntimeModelList ? (
                 <p className="mb-2 text-[11px] text-[var(--color-text-muted)]">
                   Explicit models load from the current runtime. Default remains available while the
diff --git a/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts b/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
index eb300d43..58df9dca 100644
--- a/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
+++ b/src/renderer/components/team/dialogs/editTeamRuntimeChanges.ts
@@ -1,5 +1,6 @@
 import { isTeamEffortLevel } from '@shared/utils/effortLevels';
 import { migrateProviderBackendId } from '@shared/utils/providerBackend';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
 
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
@@ -19,6 +20,7 @@ function normalizeRestartSensitiveMemberContract(member: {
   providerId?: string;
   model?: string;
   effort?: string;
+  mcpPolicy?: unknown;
 }): {
   role?: string;
   workflow?: string;
@@ -26,6 +28,7 @@ function normalizeRestartSensitiveMemberContract(member: {
   model?: string;
   effort?: EffortLevel;
   isolation?: 'worktree';
+  mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
 } {
   const role = member.role?.trim() || undefined;
   const workflow = member.workflow?.trim() || undefined;
@@ -33,7 +36,8 @@ function normalizeRestartSensitiveMemberContract(member: {
   const model = member.model?.trim() || undefined;
   const effort = isTeamEffortLevel(member.effort) ? member.effort : undefined;
   const isolation = member.isolation === 'worktree' ? 'worktree' : undefined;
-  return { role, workflow, providerId, model, effort, isolation };
+  const mcpPolicy = normalizeTeamMemberMcpPolicy(member.mcpPolicy);
+  return { role, workflow, providerId, model, effort, isolation, mcpPolicy };
 }
 
 export function getMemberRuntimeContractKey(member: {
@@ -43,6 +47,7 @@ export function getMemberRuntimeContractKey(member: {
   model?: string;
   effort?: string;
   isolation?: string;
+  mcpPolicy?: unknown;
 }): string {
   return JSON.stringify(normalizeRestartSensitiveMemberContract(member));
 }
@@ -76,7 +81,8 @@ export function getMembersRequiringRuntimeRestart(params: {
       previousRuntime.providerId !== nextRuntime.providerId ||
       previousRuntime.model !== nextRuntime.model ||
       previousRuntime.effort !== nextRuntime.effort ||
-      previousRuntime.isolation !== nextRuntime.isolation
+      previousRuntime.isolation !== nextRuntime.isolation ||
+      JSON.stringify(previousRuntime.mcpPolicy) !== JSON.stringify(nextRuntime.mcpPolicy)
     ) {
       membersToRestart.push(previousMember.name);
     }
@@ -135,6 +141,7 @@ function normalizeEditableMemberSnapshot(member: {
   effort?: string;
   isolation?: string;
   fastMode?: string;
+  mcpPolicy?: unknown;
   removedAt?: number | string | null;
 }): {
   name: string;
@@ -146,6 +153,7 @@ function normalizeEditableMemberSnapshot(member: {
   effort?: EffortLevel;
   isolation?: 'worktree';
   fastMode?: TeamFastMode;
+  mcpPolicy?: ReturnType<typeof normalizeTeamMemberMcpPolicy>;
 } | null {
   if (member.removedAt) {
     return null;
diff --git a/src/renderer/components/team/dialogs/providerPrepareCacheKey.ts b/src/renderer/components/team/dialogs/providerPrepareCacheKey.ts
index 39ef82d7..6195aa10 100644
--- a/src/renderer/components/team/dialogs/providerPrepareCacheKey.ts
+++ b/src/renderer/components/team/dialogs/providerPrepareCacheKey.ts
@@ -6,12 +6,14 @@ export function buildProviderPrepareModelCacheKey({
   backendSummary,
   limitContext,
   runtimeStatusSignature,
+  modelChecksSignature,
 }: {
   cwd: string;
   providerId: TeamProviderId;
   backendSummary: string | null | undefined;
   limitContext: boolean;
   runtimeStatusSignature?: string | null;
+  modelChecksSignature?: string | null;
 }): string {
   return [
     cwd,
@@ -19,5 +21,6 @@ export function buildProviderPrepareModelCacheKey({
     backendSummary ?? '',
     limitContext ? 'limit-context:on' : 'limit-context:off',
     runtimeStatusSignature ?? '',
+    modelChecksSignature ?? '',
   ].join('::');
 }
diff --git a/src/renderer/components/team/dialogs/providerPrepareDiagnostics.ts b/src/renderer/components/team/dialogs/providerPrepareDiagnostics.ts
index 58636bcd..55cd595e 100644
--- a/src/renderer/components/team/dialogs/providerPrepareDiagnostics.ts
+++ b/src/renderer/components/team/dialogs/providerPrepareDiagnostics.ts
@@ -3,6 +3,7 @@ import { isDefaultProviderModelSelection } from '@shared/utils/providerModelSele
 
 import type {
   TeamProviderId,
+  TeamProvisioningModelCheckRequest,
   TeamProvisioningModelVerificationMode,
   TeamProvisioningPrepareResult,
 } from '@shared/types';
@@ -15,7 +16,8 @@ type PrepareProvisioningFn = (
   providerIds?: TeamProviderId[],
   selectedModels?: string[],
   limitContext?: boolean,
-  modelVerificationMode?: TeamProvisioningModelVerificationMode
+  modelVerificationMode?: TeamProvisioningModelVerificationMode,
+  selectedModelChecks?: TeamProvisioningModelCheckRequest[]
 ) => Promise<TeamProvisioningPrepareResult>;
 
 interface ProviderPrepareDiagnosticsProgress {
@@ -109,6 +111,44 @@ function buildModelSuccessLine(providerId: TeamProviderId, modelId: string): str
   return `${getModelLabel(providerId, modelId)} - verified`;
 }
 
+function normalizeSelectedModelChecks(
+  providerId: TeamProviderId,
+  selectedModelIds: readonly string[],
+  selectedModelChecks?: readonly TeamProvisioningModelCheckRequest[]
+): TeamProvisioningModelCheckRequest[] {
+  const rawChecks: TeamProvisioningModelCheckRequest[] =
+    selectedModelChecks && selectedModelChecks.length > 0
+      ? [...selectedModelChecks]
+      : selectedModelIds.map((model) => ({ providerId, model }));
+  const seen = new Set<string>();
+  const normalized: TeamProvisioningModelCheckRequest[] = [];
+  for (const check of rawChecks) {
+    const model = check.model.trim();
+    if (!model) {
+      continue;
+    }
+    const key = `${check.providerId}\n${model}\n${check.effort ?? ''}`;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    normalized.push({
+      providerId: check.providerId,
+      model,
+      ...(check.effort ? { effort: check.effort } : {}),
+    });
+  }
+  return normalized;
+}
+
+function selectModelChecksForIds(
+  modelChecks: readonly TeamProvisioningModelCheckRequest[],
+  modelIds: readonly string[]
+): TeamProvisioningModelCheckRequest[] {
+  const modelIdSet = new Set(modelIds);
+  return modelChecks.filter((check) => modelIdSet.has(check.model));
+}
+
 function buildModelAvailableLine(providerId: TeamProviderId, modelId: string): string {
   return `${getModelLabel(providerId, modelId)} - available for launch`;
 }
@@ -899,16 +939,25 @@ export async function runProviderPrepareDiagnostics({
   limitContext,
   onModelProgress,
   cachedModelResultsById,
+  selectedModelChecks,
 }: {
   cwd: string;
   providerId: TeamProviderId;
   selectedModelIds: string[];
+  selectedModelChecks?: TeamProvisioningModelCheckRequest[];
   prepareProvisioning: PrepareProvisioningFn;
   limitContext?: boolean;
   onModelProgress?: (progress: ProviderPrepareDiagnosticsProgress) => void;
   cachedModelResultsById?: Record<string, ProviderPrepareDiagnosticsModelResult>;
 }): Promise<ProviderPrepareDiagnosticsResult> {
-  if (selectedModelIds.length === 0) {
+  const normalizedModelChecks = normalizeSelectedModelChecks(
+    providerId,
+    selectedModelIds,
+    selectedModelChecks
+  );
+  const hasExplicitModelChecks = (selectedModelChecks?.length ?? 0) > 0;
+  const orderedModelIds = Array.from(new Set(normalizedModelChecks.map((check) => check.model)));
+  if (orderedModelIds.length === 0) {
     const runtimeResult = await prepareProvisioning(
       cwd,
       providerId,
@@ -936,9 +985,6 @@ export async function runProviderPrepareDiagnostics({
     };
   }
 
-  const orderedModelIds = Array.from(
-    new Set(selectedModelIds.map((modelId) => modelId.trim()).filter(Boolean))
-  );
   const reusableModelResultsById = cachedModelResultsById ?? {};
   const modelResultsById = new Map<string, ProviderPrepareDiagnosticsModelResult>();
   const modelLines = new Map<string, string>();
@@ -1039,7 +1085,10 @@ export async function runProviderPrepareDiagnostics({
           [providerId],
           uncachedModelIds,
           limitContext,
-          'compatibility'
+          'compatibility',
+          ...(hasExplicitModelChecks
+            ? [selectModelChecksForIds(normalizedModelChecks, uncachedModelIds)]
+            : [])
         );
         runtimeDetailLines = createRuntimeDetailLines(compatibilityResult).filter(
           (entry) => !isModelScopedEntryForAnyModel(uncachedModelIds, entry)
@@ -1177,7 +1226,10 @@ export async function runProviderPrepareDiagnostics({
           [providerId],
           compatibilityPassedModelIds,
           limitContext,
-          'deep'
+          'deep',
+          ...(hasExplicitModelChecks
+            ? [selectModelChecksForIds(normalizedModelChecks, compatibilityPassedModelIds)]
+            : [])
         );
         runtimeDetailLines = createRuntimeDetailLines(batchedModelResult).filter(
           (entry) => !isModelScopedEntryForAnyModel(compatibilityPassedModelIds, entry)
@@ -1328,7 +1380,10 @@ export async function runProviderPrepareDiagnostics({
           [providerId],
           uncachedModelIds,
           limitContext,
-          'compatibility'
+          'compatibility',
+          ...(hasExplicitModelChecks
+            ? [selectModelChecksForIds(normalizedModelChecks, uncachedModelIds)]
+            : [])
         );
         runtimeDetailLines = createRuntimeDetailLines(compatibilityResult).filter(
           (entry) => !isModelScopedEntryForAnyModel(uncachedModelIds, entry)
diff --git a/src/renderer/components/team/dialogs/providerPreparePlans.ts b/src/renderer/components/team/dialogs/providerPreparePlans.ts
new file mode 100644
index 00000000..3d987b55
--- /dev/null
+++ b/src/renderer/components/team/dialogs/providerPreparePlans.ts
@@ -0,0 +1,111 @@
+import { buildProviderPrepareModelCacheKey } from './providerPrepareCacheKey';
+import {
+  getProviderPrepareCachedSnapshot,
+  type ProviderPrepareDiagnosticsCachedSnapshot,
+  type ProviderPrepareDiagnosticsModelResult,
+} from './providerPrepareDiagnostics';
+import {
+  buildProviderPrepareModelChecksSignature,
+  buildProviderPrepareRequestSignature,
+  buildProviderPrepareRuntimeStatusSignature,
+} from './providerPrepareRequestSignature';
+import { getShortLivedProviderPrepareModelResults } from './providerPrepareShortLivedCache';
+
+import type {
+  CliProviderStatus,
+  TeamProviderId,
+  TeamProvisioningModelCheckRequest,
+} from '@shared/types';
+
+type RuntimeProviderStatusById = ReadonlyMap<TeamProviderId, CliProviderStatus | null | undefined>;
+
+export interface ProviderPreparePlan {
+  providerId: TeamProviderId;
+  selectedModelChecks: TeamProvisioningModelCheckRequest[];
+  selectedModelIds: string[];
+  backendSummary: string | null;
+  runtimeStatusSignature: string;
+  modelChecksSignature: string;
+  requestSignature: string;
+  cacheKey: string;
+  cachedModelResultsById: Record<string, ProviderPrepareDiagnosticsModelResult>;
+  cachedSnapshot: ProviderPrepareDiagnosticsCachedSnapshot;
+}
+
+export function buildProviderPreparePlans({
+  cwd,
+  providerIds,
+  selectedModelChecksByProvider,
+  backendSummaryByProvider,
+  limitContext,
+  runtimeProviderStatusById,
+  cachedModelResultsByCacheKey,
+}: {
+  cwd: string;
+  providerIds: readonly TeamProviderId[];
+  selectedModelChecksByProvider: ReadonlyMap<
+    TeamProviderId,
+    readonly TeamProvisioningModelCheckRequest[]
+  >;
+  backendSummaryByProvider: ReadonlyMap<TeamProviderId, string | null>;
+  limitContext: boolean;
+  runtimeProviderStatusById: RuntimeProviderStatusById;
+  cachedModelResultsByCacheKey: ReadonlyMap<
+    string,
+    Record<string, ProviderPrepareDiagnosticsModelResult>
+  >;
+}): ProviderPreparePlan[] {
+  return providerIds.map((providerId) => {
+    const selectedModelChecks = [...(selectedModelChecksByProvider.get(providerId) ?? [])];
+    const selectedModelIds = selectedModelChecks.map((check) => check.model);
+    const backendSummary = backendSummaryByProvider.get(providerId) ?? null;
+    const runtimeStatusSignature = buildProviderPrepareRuntimeStatusSignature(
+      [providerId],
+      runtimeProviderStatusById
+    );
+    const modelChecksSignature = buildProviderPrepareModelChecksSignature(
+      new Map([[providerId, selectedModelChecks]])
+    );
+    const requestSignature = buildProviderPrepareRequestSignature({
+      cwd,
+      selectedProviderId: providerId,
+      selectedModel: '',
+      selectedMemberProviders: [providerId],
+      limitContext,
+      runtimeStatusSignature,
+      modelChecksSignature,
+    });
+    const cacheKey = buildProviderPrepareModelCacheKey({
+      cwd,
+      providerId,
+      backendSummary,
+      limitContext,
+      runtimeStatusSignature,
+      modelChecksSignature,
+    });
+    const cachedModelResultsById = {
+      ...getShortLivedProviderPrepareModelResults({
+        providerId,
+        cacheKey,
+      }),
+      ...(cachedModelResultsByCacheKey.get(cacheKey) ?? {}),
+    };
+
+    return {
+      providerId,
+      selectedModelChecks,
+      selectedModelIds,
+      backendSummary,
+      runtimeStatusSignature,
+      modelChecksSignature,
+      requestSignature,
+      cacheKey,
+      cachedModelResultsById,
+      cachedSnapshot: getProviderPrepareCachedSnapshot({
+        providerId,
+        selectedModelIds,
+        cachedModelResultsById,
+      }),
+    };
+  });
+}
diff --git a/src/renderer/components/team/dialogs/providerPrepareRequestSignature.ts b/src/renderer/components/team/dialogs/providerPrepareRequestSignature.ts
index b681ddda..8682bc1b 100644
--- a/src/renderer/components/team/dialogs/providerPrepareRequestSignature.ts
+++ b/src/renderer/components/team/dialogs/providerPrepareRequestSignature.ts
@@ -1,8 +1,31 @@
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
-import type { CliProviderStatus, TeamProviderId } from '@shared/types';
+import type {
+  CliProviderStatus,
+  TeamProviderId,
+  TeamProvisioningModelCheckRequest,
+} from '@shared/types';
 
 type RuntimeProviderStatusById = ReadonlyMap<TeamProviderId, CliProviderStatus | null | undefined>;
-type SelectedModelChecksByProvider = ReadonlyMap<TeamProviderId, readonly string[]>;
+type ProviderModelCheckSignatureInput =
+  | string
+  | Pick<TeamProvisioningModelCheckRequest, 'model' | 'effort'>;
+type SelectedModelChecksByProvider = ReadonlyMap<
+  TeamProviderId,
+  readonly ProviderModelCheckSignatureInput[]
+>;
+
+function getCodexPrepareRuntimeSignature(
+  codex: NonNullable<NonNullable<CliProviderStatus['connection']>['codex']>
+): Record<string, unknown> {
+  return {
+    preferredAuthMode: codex.preferredAuthMode,
+    effectiveAuthMode: codex.effectiveAuthMode,
+    managedAccountType: codex.managedAccount?.type ?? null,
+    requiresOpenaiAuth: codex.requiresOpenaiAuth ?? null,
+    launchAllowed: codex.launchAllowed,
+    launchReadinessState: codex.launchAllowed ? 'launchable' : codex.launchReadinessState,
+  };
+}
 
 function normalizeModelIds(modelIds: readonly string[] | null | undefined): string[] {
   return Array.from(
@@ -10,10 +33,33 @@ function normalizeModelIds(modelIds: readonly string[] | null | undefined): stri
   ).sort();
 }
 
+function normalizeModelChecks(
+  checks: readonly ProviderModelCheckSignatureInput[] | null | undefined
+): { model: string; effort: string | null }[] {
+  const seen = new Set<string>();
+  const normalized: { model: string; effort: string | null }[] = [];
+  for (const check of checks ?? []) {
+    const model = (typeof check === 'string' ? check : check.model).trim();
+    if (!model) {
+      continue;
+    }
+    const effort = typeof check === 'string' ? null : (check.effort ?? null);
+    const key = `${model}\n${effort ?? ''}`;
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    normalized.push({ model, effort });
+  }
+  return normalized.sort(
+    (left, right) =>
+      left.model.localeCompare(right.model) || (left.effort ?? '').localeCompare(right.effort ?? '')
+  );
+}
+
 export function buildProviderPrepareMembersSignature(members: readonly MemberDraft[]): string {
   return JSON.stringify(
     members.map((member) => ({
-      id: member.id,
       providerId: member.providerId ?? null,
       model: member.model?.trim() || null,
       effort: member.effort ?? null,
@@ -29,7 +75,10 @@ export function buildProviderPrepareModelChecksSignature(
     Array.from(modelChecksByProvider.entries())
       .map(([providerId, modelIds]) => ({
         providerId,
-        modelIds: normalizeModelIds(modelIds),
+        modelIds: normalizeModelIds(
+          modelIds.map((modelId) => (typeof modelId === 'string' ? modelId : modelId.model))
+        ),
+        modelChecks: normalizeModelChecks(modelIds),
       }))
       .sort((left, right) => left.providerId.localeCompare(right.providerId))
   );
@@ -64,35 +113,10 @@ export function buildProviderPrepareRuntimeStatusSignature(
                 apiKeyConfigured: provider.connection.apiKeyConfigured,
                 apiKeySource: provider.connection.apiKeySource ?? null,
                 codex: provider.connection.codex
-                  ? {
-                      preferredAuthMode: provider.connection.codex.preferredAuthMode,
-                      effectiveAuthMode: provider.connection.codex.effectiveAuthMode,
-                      appServerState: provider.connection.codex.appServerState,
-                      managedAccountType: provider.connection.codex.managedAccount?.type ?? null,
-                      managedAccountEmail: provider.connection.codex.managedAccount?.email ?? null,
-                      requiresOpenaiAuth: provider.connection.codex.requiresOpenaiAuth ?? null,
-                      localAccountArtifactsPresent:
-                        provider.connection.codex.localAccountArtifactsPresent ?? null,
-                      localActiveChatgptAccountPresent:
-                        provider.connection.codex.localActiveChatgptAccountPresent ?? null,
-                      loginStatus: provider.connection.codex.login?.status ?? null,
-                      launchAllowed: provider.connection.codex.launchAllowed,
-                      launchIssueMessage: provider.connection.codex.launchIssueMessage ?? null,
-                      launchReadinessState: provider.connection.codex.launchReadinessState,
-                    }
+                  ? getCodexPrepareRuntimeSignature(provider.connection.codex)
                   : null,
               }
             : null,
-          availableBackends: (provider?.availableBackends ?? [])
-            .map((backend) => ({
-              id: backend.id,
-              available: backend.available,
-              selectable: backend.selectable,
-              state: backend.state ?? null,
-              recommended: backend.recommended,
-              audience: backend.audience ?? null,
-            }))
-            .sort((left, right) => left.id.localeCompare(right.id)),
         };
       })
   );
diff --git a/src/renderer/components/team/dialogs/teammateRuntimeCompatibility.tsx b/src/renderer/components/team/dialogs/teammateRuntimeCompatibility.tsx
index c54cbd53..3fcf651d 100644
--- a/src/renderer/components/team/dialogs/teammateRuntimeCompatibility.tsx
+++ b/src/renderer/components/team/dialogs/teammateRuntimeCompatibility.tsx
@@ -34,6 +34,7 @@ export interface TeammateRuntimeCompatibility {
   visible: boolean;
   blocksSubmission: boolean;
   checking: boolean;
+  providerNoticeProviderId: TeamProviderId | null;
   title: string;
   message: string;
   details: string[];
@@ -189,6 +190,7 @@ export function analyzeTeammateRuntimeCompatibility({
       visible: false,
       blocksSubmission: false,
       checking: false,
+      providerNoticeProviderId: null,
       title: '',
       message: '',
       details: [],
@@ -208,6 +210,7 @@ export function analyzeTeammateRuntimeCompatibility({
       visible: false,
       blocksSubmission: false,
       checking: false,
+      providerNoticeProviderId: null,
       title: '',
       message: '',
       details: [],
@@ -221,6 +224,7 @@ export function analyzeTeammateRuntimeCompatibility({
       visible: false,
       blocksSubmission: false,
       checking: false,
+      providerNoticeProviderId: null,
       title: '',
       message: '',
       details: [],
@@ -273,7 +277,7 @@ export function analyzeTeammateRuntimeCompatibility({
   }
   if (hasOpenCodeLeadMixedUnsupported) {
     details.push(
-      'Fix: keep the team lead on Anthropic, Codex, or Gemini when mixing OpenCode with other providers.'
+      'Fix: keep the team lead on Anthropic or Codex when mixing OpenCode with other providers.'
     );
   } else if (hasExplicitInProcess) {
     details.push(
@@ -307,6 +311,7 @@ export function analyzeTeammateRuntimeCompatibility({
     visible: blocksSubmission || checking,
     blocksSubmission,
     checking,
+    providerNoticeProviderId: hasOpenCodeLeadMixedUnsupported ? 'opencode' : null,
     title: checking
       ? 'Checking tmux runtime for explicit teammate mode'
       : hasOpenCodeLeadMixedUnsupported
@@ -317,12 +322,12 @@ export function analyzeTeammateRuntimeCompatibility({
     message: checking
       ? 'Custom CLI args request tmux teammates. The app is checking whether tmux is available.'
       : hasOpenCodeLeadMixedUnsupported
-        ? 'OpenCode can be added as a teammate under an Anthropic, Codex, or Gemini lead, but mixed teams cannot use OpenCode as the lead in this phase.'
+        ? 'OpenCode can be added as a teammate under an Anthropic or Codex lead, but mixed teams cannot use OpenCode as the lead in this phase.'
         : hasExplicitInProcess
           ? 'Some teammates require separate processes. Remove --teammate-mode in-process so the app can use native process transport.'
           : 'Custom CLI args force --teammate-mode tmux, but tmux is not ready. Remove that arg to use native process transport on Windows, or install tmux/WSL tmux.',
     details,
-    tmuxDetail: getTmuxDetail(tmuxStatus, tmuxStatusError),
+    tmuxDetail: hasOpenCodeLeadMixedUnsupported ? null : getTmuxDetail(tmuxStatus, tmuxStatusError),
     memberWarningById,
   };
 }
diff --git a/src/renderer/components/team/members/LeadModelRow.test.tsx b/src/renderer/components/team/members/LeadModelRow.test.tsx
index d89a889a..134dec25 100644
--- a/src/renderer/components/team/members/LeadModelRow.test.tsx
+++ b/src/renderer/components/team/members/LeadModelRow.test.tsx
@@ -23,7 +23,10 @@ vi.mock('@renderer/components/team/dialogs/LimitContextCheckbox', () => ({
 }));
 
 vi.mock('@renderer/components/team/dialogs/TeamModelSelector', () => ({
+  formatTeamModelSummary: (providerId: string, model: string, effort?: string) =>
+    [providerId, model || 'Default', effort].filter(Boolean).join(' · '),
   getProviderScopedTeamModelLabel: (_providerId: string, model: string) => model || 'Default',
+  getTeamEffortLabel: (effort: string) => effort || 'Default',
   getTeamProviderLabel: (providerId: string) => providerId,
   TeamModelSelector: () => React.createElement('div', null, 'team-model-selector'),
 }));
diff --git a/src/renderer/components/team/members/LeadModelRow.tsx b/src/renderer/components/team/members/LeadModelRow.tsx
index bfc36bce..634c984c 100644
--- a/src/renderer/components/team/members/LeadModelRow.tsx
+++ b/src/renderer/components/team/members/LeadModelRow.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { ProviderBrandLogo } from '@renderer/components/common/ProviderBrandLogo';
 import {
@@ -45,6 +45,7 @@ interface LeadModelRowProps {
   onSyncModelsWithTeammatesChange: (value: boolean) => void;
   warningText?: string | null;
   disableGeminiOption?: boolean;
+  providerNoticeById?: Partial<Record<TeamProviderId, React.ReactNode>>;
   modelIssueText?: string | null;
   modelAdvisoryReasonByValue?: Partial<Record<string, string | null | undefined>>;
   modelIssueReasonByValue?: Partial<Record<string, string | null | undefined>>;
@@ -66,6 +67,7 @@ export const LeadModelRow = ({
   onSyncModelsWithTeammatesChange,
   warningText,
   disableGeminiOption = false,
+  providerNoticeById,
   modelIssueText,
   modelAdvisoryReasonByValue,
   modelIssueReasonByValue,
@@ -74,7 +76,8 @@ export const LeadModelRow = ({
   disableAnthropicContextLimit,
 }: LeadModelRowProps): React.JSX.Element => {
   const { isLight } = useTheme();
-  const [modelExpanded, setModelExpanded] = useState(false);
+  const hasActiveProviderNotice = Boolean(providerNoticeById?.[providerId]);
+  const [modelExpanded, setModelExpanded] = useState(hasActiveProviderNotice);
   const leadColorSet = getTeamColorSet(resolveTeamLeadColorName());
   const modelButtonLabel = model.trim()
     ? getProviderScopedTeamModelLabel(providerId, model.trim())
@@ -109,6 +112,12 @@ export const LeadModelRow = ({
     disableAnthropicContextLimit ??
     (providerId === 'anthropic' && isAnthropicHaikuTeamModel(model));
 
+  useEffect(() => {
+    if (hasActiveProviderNotice && !modelExpanded) {
+      setModelExpanded(true);
+    }
+  }, [hasActiveProviderNotice, modelExpanded]);
+
   return (
     <div
       className="relative grid grid-cols-1 gap-2 rounded-md p-2 shadow-sm md:grid-cols-[minmax(0,1fr)_auto_auto]"
@@ -204,6 +213,7 @@ export const LeadModelRow = ({
             onValueChange={onModelChange}
             id="lead-model"
             disableGeminiOption={disableGeminiOption}
+            providerNoticeById={providerNoticeById}
             modelAdvisoryReasonByValue={modelAdvisoryReasonByValue}
             modelIssueReasonByValue={{
               ...(modelIssueReasonByValue ?? {}),
diff --git a/src/renderer/components/team/members/MemberDraftRow.test.tsx b/src/renderer/components/team/members/MemberDraftRow.test.tsx
index 824d619a..b0a0db0f 100644
--- a/src/renderer/components/team/members/MemberDraftRow.test.tsx
+++ b/src/renderer/components/team/members/MemberDraftRow.test.tsx
@@ -16,6 +16,7 @@ vi.mock('@renderer/components/team/dialogs/TeamModelSelector', () => ({
   formatTeamModelSummary: (providerId: string, model: string, effort?: string) =>
     [providerId, model || 'Default', effort].filter(Boolean).join(' · '),
   getProviderScopedTeamModelLabel: (_providerId: string, model: string) => model || 'Default',
+  getTeamEffortLabel: (effort: string) => effort || 'Default',
   getTeamProviderLabel: (providerId: string) => providerId,
   TeamModelSelector: () => React.createElement('div', null, 'team-model-selector'),
 }));
@@ -32,6 +33,7 @@ vi.mock('@renderer/components/ui/button', () => ({
     disabled,
     title,
     'aria-describedby': ariaDescribedBy,
+    'aria-expanded': ariaExpanded,
     'aria-label': ariaLabel,
   }: {
     children: React.ReactNode;
@@ -40,6 +42,7 @@ vi.mock('@renderer/components/ui/button', () => ({
     disabled?: boolean;
     title?: string;
     'aria-describedby'?: string;
+    'aria-expanded'?: boolean;
     'aria-label'?: string;
   }) =>
     React.createElement(
@@ -51,6 +54,7 @@ vi.mock('@renderer/components/ui/button', () => ({
         disabled,
         title,
         'aria-describedby': ariaDescribedBy,
+        'aria-expanded': ariaExpanded,
         'aria-label': ariaLabel,
       },
       children
@@ -174,6 +178,211 @@ describe('MemberDraftRow', () => {
     });
   });
 
+  it('renders workflow and MCP row controls as icon-only buttons with tooltip text', () => {
+    const { host, root } = renderMemberDraftRow({
+      showWorkflow: true,
+      onWorkflowChange: () => undefined,
+      onMcpPolicyChange: () => undefined,
+    });
+
+    const workflowButton = host.querySelector<HTMLButtonElement>(
+      'button[aria-label="Add teammate workflow"]'
+    )!;
+    const mcpButton = Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find(
+      (button) =>
+        button.getAttribute('aria-label') ===
+        "MCP inherit: Control this member's MCP inheritance policy"
+    )!;
+    const removeButton = host.querySelector<HTMLButtonElement>(
+      'button[aria-label="Remove alice"]'
+    )!;
+
+    expect(workflowButton).toBeTruthy();
+    expect(workflowButton.textContent).not.toContain('Workflow');
+    expect(workflowButton.closest('[title]')?.getAttribute('title')).toBe('Add teammate workflow');
+    expect(workflowButton.getAttribute('aria-expanded')).toBe('false');
+
+    expect(mcpButton).toBeTruthy();
+    expect(mcpButton.textContent).not.toContain('MCP');
+    expect(mcpButton.textContent).not.toContain('inherit');
+    const mcpTooltipWrapper = mcpButton.closest('[title]');
+    const mcpTooltipContent = Array.from(mcpTooltipWrapper?.children ?? []).find(
+      (element) => element.getAttribute('aria-hidden') === 'true'
+    );
+    expect(mcpTooltipWrapper?.getAttribute('title')).toBe(
+      "MCP inherit: Control this member's MCP inheritance policy"
+    );
+    expect(mcpTooltipContent?.getAttribute('class')).toContain(
+      'group-hover/hover-tooltip:opacity-100'
+    );
+    expect(mcpButton.getAttribute('aria-expanded')).toBe('false');
+    expect(
+      workflowButton.compareDocumentPosition(mcpButton) & Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+    expect(
+      mcpButton.compareDocumentPosition(removeButton) & Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+
+    act(() => {
+      workflowButton.click();
+      mcpButton.click();
+    });
+
+    expect(workflowButton.getAttribute('aria-expanded')).toBe('true');
+    expect(mcpButton.getAttribute('aria-expanded')).toBe('true');
+    expect(mcpButton.className).toContain('border-sky-400/45');
+    expect(mcpTooltipWrapper?.getAttribute('title')).toBeNull();
+    expect(mcpTooltipContent?.getAttribute('class')).not.toContain(
+      'group-hover/hover-tooltip:opacity-100'
+    );
+    expect(host.textContent).toContain('Workflow (optional)');
+    expect(host.textContent).toContain('MCP mode');
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
+  it.each([
+    {
+      label: 'inherit lead',
+      mcpPolicy: undefined,
+      ariaLabel: "MCP inherit: Control this member's MCP inheritance policy",
+      highlightedBeforeClick: false,
+    },
+    {
+      label: 'agent teams mcp',
+      mcpPolicy: { mode: 'appOnly' as const },
+      ariaLabel: "Agent Teams MCP: Control this member's MCP inheritance policy",
+      highlightedBeforeClick: true,
+    },
+    {
+      label: 'scope inheritance',
+      mcpPolicy: {
+        mode: 'inheritScopes' as const,
+        scopes: { user: true, project: false, local: true },
+      },
+      ariaLabel: "MCP scopes: Control this member's MCP inheritance policy",
+      highlightedBeforeClick: true,
+    },
+    {
+      label: 'strict allowlist',
+      mcpPolicy: {
+        mode: 'strictAllowlist' as const,
+        scopes: { user: true, project: true, local: false },
+        serverNames: ['github', 'linear'],
+      },
+      ariaLabel: "MCP 2: Control this member's MCP inheritance policy",
+      highlightedBeforeClick: true,
+    },
+  ])(
+    'keeps MCP control state correct across $label settings in the row fixture e2e',
+    ({ mcpPolicy, ariaLabel, highlightedBeforeClick }) => {
+      const { host, root } = renderMemberDraftRow({
+        member: createMemberDraft({
+          id: 'member-1',
+          name: 'alice',
+          roleSelection: 'developer',
+          providerId: 'anthropic',
+          model: 'opus',
+          mcpPolicy,
+        }),
+        onMcpPolicyChange: () => undefined,
+      });
+
+      const mcpButton = Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find(
+        (button) => button.getAttribute('aria-label') === ariaLabel
+      )!;
+      const tooltipWrapper = mcpButton.closest('[title]');
+      const tooltipContent = Array.from(tooltipWrapper?.children ?? []).find(
+        (element) => element.getAttribute('aria-hidden') === 'true'
+      );
+
+      expect(mcpButton).toBeTruthy();
+      expect(mcpButton.textContent).not.toContain('MCP');
+      expect(mcpButton.className.includes('border-sky-400/45')).toBe(highlightedBeforeClick);
+      expect(tooltipWrapper?.getAttribute('title')).toBe(ariaLabel);
+      expect(tooltipContent?.getAttribute('class')).toContain(
+        'group-hover/hover-tooltip:opacity-100'
+      );
+
+      act(() => {
+        mcpButton.click();
+      });
+
+      expect(mcpButton.getAttribute('aria-expanded')).toBe('true');
+      expect(mcpButton.className).toContain('border-sky-400/45');
+      expect(tooltipWrapper?.getAttribute('title')).toBeNull();
+      expect(tooltipContent?.getAttribute('class')).not.toContain(
+        'group-hover/hover-tooltip:opacity-100'
+      );
+      expect(host.textContent).toContain('MCP mode');
+
+      act(() => {
+        root.unmount();
+      });
+    }
+  );
+
+  it('locks MCP controls when Agent Teams MCP master mode is enabled', () => {
+    const onMcpPolicyChange = vi.fn();
+    const { host, root } = renderMemberDraftRow({
+      member: createMemberDraft({
+        id: 'member-1',
+        name: 'alice',
+        roleSelection: 'developer',
+        providerId: 'anthropic',
+        model: 'opus',
+        mcpPolicy: {
+          mode: 'strictAllowlist',
+          scopes: { user: true, project: true, local: true },
+          serverNames: ['github'],
+        },
+      }),
+      onMcpPolicyChange,
+      agentTeamsMcpLocked: true,
+    });
+
+    const mcpButton = Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find(
+      (button) =>
+        button.getAttribute('aria-label') ===
+        "Agent Teams MCP: Control this member's MCP inheritance policy"
+    )!;
+
+    expect(mcpButton).toBeTruthy();
+    expect(mcpButton.className).toContain('border-amber-300/50');
+    expect(mcpButton.querySelector('.bg-amber-300')).toBeTruthy();
+
+    act(() => {
+      mcpButton.click();
+    });
+
+    expect(host.textContent).toContain('MCP mode');
+    expect(host.textContent).toContain('Agent Teams MCP');
+    expect(host.textContent).toContain(
+      'Agent Teams MCP only is enabled for all teammates. This teammate will launch with only the Agent Teams server.'
+    );
+
+    const mcpModeTrigger = host.querySelector<HTMLButtonElement>('#member-member-1-mcp-mode')!;
+    const scopeCheckboxes = Array.from(
+      host.querySelectorAll<HTMLInputElement>('input[type="checkbox"]')
+    );
+
+    expect(mcpModeTrigger.disabled).toBe(true);
+    expect(scopeCheckboxes).toHaveLength(3);
+    expect(scopeCheckboxes.every((checkbox) => checkbox.disabled)).toBe(true);
+
+    act(() => {
+      scopeCheckboxes[0]?.click();
+    });
+
+    expect(onMcpPolicyChange).not.toHaveBeenCalled();
+
+    act(() => {
+      root.unmount();
+    });
+  });
+
   it('shows inherited model copy when sync is enabled', () => {
     const { host, root } = renderMemberDraftRow({
       lockProviderModel: true,
diff --git a/src/renderer/components/team/members/MemberDraftRow.tsx b/src/renderer/components/team/members/MemberDraftRow.tsx
index f986d5b5..9ab071f4 100644
--- a/src/renderer/components/team/members/MemberDraftRow.tsx
+++ b/src/renderer/components/team/members/MemberDraftRow.tsx
@@ -16,6 +16,13 @@ import { HoverTooltip } from '@renderer/components/ui/hover-tooltip';
 import { Input } from '@renderer/components/ui/input';
 import { Label } from '@renderer/components/ui/label';
 import { MentionableTextarea } from '@renderer/components/ui/MentionableTextarea';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@renderer/components/ui/select';
 import { getTeamColorSet } from '@renderer/constants/teamColors';
 import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
 import { useFileListCacheWarmer } from '@renderer/hooks/useFileListCacheWarmer';
@@ -24,20 +31,31 @@ import { cn } from '@renderer/lib/utils';
 import { reconcileChips, removeChipTokenFromText } from '@renderer/utils/chipUtils';
 import { isAnthropicSonnetOneMillionContextTeamModel } from '@renderer/utils/teamModelCatalog';
 import { getMemberColorByName } from '@shared/constants/memberColors';
+import {
+  normalizeTeamMemberMcpPolicy,
+  resolveTeamMemberMcpScopes,
+} from '@shared/utils/teamMemberMcpPolicy';
 import {
   AlertTriangle,
   ChevronDown,
   ChevronRight,
   GitBranch,
   Info,
+  Plug,
   RotateCcw,
   Trash2,
+  Workflow as WorkflowIcon,
 } from 'lucide-react';
 
 import type { MemberDraft } from './membersEditorTypes';
 import type { InlineChip } from '@renderer/types/inlineChip';
 import type { MentionSuggestion } from '@renderer/types/mention';
-import type { EffortLevel, TeamProviderId } from '@shared/types';
+import type {
+  EffortLevel,
+  TeamMemberMcpMode,
+  TeamMemberMcpPolicy,
+  TeamProviderId,
+} from '@shared/types';
 
 interface MemberDraftRowProps {
   member: MemberDraft;
@@ -90,6 +108,8 @@ interface MemberDraftRowProps {
   showWorktreeIsolationControls?: boolean;
   worktreeIsolationDisabledReason?: string | null;
   onWorktreeIsolationChange?: (id: string, enabled: boolean) => void;
+  onMcpPolicyChange?: (id: string, policy: TeamMemberMcpPolicy | undefined) => void;
+  agentTeamsMcpLocked?: boolean;
   lockedModelAction?: {
     label: string;
     description?: string;
@@ -143,6 +163,8 @@ export const MemberDraftRow = ({
   showWorktreeIsolationControls = false,
   worktreeIsolationDisabledReason,
   onWorktreeIsolationChange,
+  onMcpPolicyChange,
+  agentTeamsMcpLocked = false,
   lockedModelAction,
 }: MemberDraftRowProps): React.JSX.Element => {
   const { isLight } = useTheme();
@@ -152,6 +174,7 @@ export const MemberDraftRow = ({
   );
   const [workflowExpanded, setWorkflowExpanded] = useState(false);
   const [modelExpanded, setModelExpanded] = useState(false);
+  const [mcpExpanded, setMcpExpanded] = useState(false);
 
   // Pre-warm file list cache when workflow section is expanded
   useFileListCacheWarmer(workflowExpanded && projectPath ? projectPath : null);
@@ -201,6 +224,88 @@ export const MemberDraftRow = ({
     [chips, member.id, onWorkflowChange, onWorkflowChipsChange, workflowDraft]
   );
 
+  const effectiveMcpPolicy = useMemo<TeamMemberMcpPolicy | undefined>(
+    () => (agentTeamsMcpLocked ? { mode: 'appOnly' } : member.mcpPolicy),
+    [agentTeamsMcpLocked, member.mcpPolicy]
+  );
+  const mcpMode: TeamMemberMcpMode = effectiveMcpPolicy?.mode ?? 'inheritLead';
+  const mcpScopes = useMemo(
+    () => resolveTeamMemberMcpScopes(effectiveMcpPolicy),
+    [effectiveMcpPolicy]
+  );
+  const mcpServerNames = useMemo(
+    () => effectiveMcpPolicy?.serverNames ?? [],
+    [effectiveMcpPolicy?.serverNames]
+  );
+  const mcpButtonLabel =
+    mcpMode === 'appOnly'
+      ? 'Agent Teams MCP'
+      : mcpMode === 'strictAllowlist'
+        ? `MCP ${mcpServerNames.length || 'strict'}`
+        : mcpMode === 'inheritScopes'
+          ? 'MCP scopes'
+          : 'MCP inherit';
+  const updateMcpPolicy = useCallback(
+    (policy: TeamMemberMcpPolicy | undefined) => {
+      if (agentTeamsMcpLocked) {
+        return;
+      }
+      onMcpPolicyChange?.(member.id, normalizeTeamMemberMcpPolicy(policy));
+    },
+    [agentTeamsMcpLocked, member.id, onMcpPolicyChange]
+  );
+  const handleMcpModeChange = useCallback(
+    (mode: string) => {
+      if (mode === 'inheritLead') {
+        updateMcpPolicy(undefined);
+        return;
+      }
+      if (mode === 'appOnly') {
+        updateMcpPolicy({ mode: 'appOnly' });
+        return;
+      }
+      if (mode === 'inheritScopes' || mode === 'strictAllowlist') {
+        updateMcpPolicy({
+          mode,
+          scopes: mcpScopes,
+          ...(mode === 'strictAllowlist' && mcpServerNames.length > 0
+            ? { serverNames: mcpServerNames }
+            : {}),
+        });
+      }
+    },
+    [mcpScopes, mcpServerNames, updateMcpPolicy]
+  );
+  const updateMcpScope = useCallback(
+    (scope: 'user' | 'project' | 'local', enabled: boolean) => {
+      if (mcpMode !== 'inheritScopes' && mcpMode !== 'strictAllowlist') {
+        return;
+      }
+      updateMcpPolicy({
+        mode: mcpMode,
+        scopes: { ...mcpScopes, [scope]: enabled },
+        ...(mcpMode === 'strictAllowlist' && mcpServerNames.length > 0
+          ? { serverNames: mcpServerNames }
+          : {}),
+      });
+    },
+    [mcpMode, mcpScopes, mcpServerNames, updateMcpPolicy]
+  );
+  const updateMcpServerNames = useCallback(
+    (value: string) => {
+      const serverNames = value
+        .split(',')
+        .map((name) => name.trim())
+        .filter(Boolean);
+      updateMcpPolicy({
+        mode: 'strictAllowlist',
+        scopes: mcpScopes,
+        serverNames,
+      });
+    },
+    [mcpScopes, updateMcpPolicy]
+  );
+
   useEffect(() => {
     if (
       onWorkflowChange &&
@@ -307,9 +412,16 @@ export const MemberDraftRow = ({
     Boolean(message)
   );
   const hasWarnings = warningMessages.length > 0 || showSonnetExtraUsageWarning;
-  const anthropicContextModeLabel = limitContext
-    ? '200K limit enabled'
-    : '1M-capable context allowed';
+  const anthropicContextModeLabel = limitContext ? '200K limit enabled' : 'default context setting';
+  const workflowTooltipText = workflowDraft.value.trim()
+    ? 'Edit teammate workflow'
+    : 'Add teammate workflow';
+  const mcpTooltipText = `${mcpButtonLabel}: Control this member's MCP inheritance policy`;
+  const mcpLockedInfoText =
+    'Agent Teams MCP only is enabled for all teammates. This teammate will launch with only the Agent Teams server.';
+  const mcpSettingInfoText = agentTeamsMcpLocked
+    ? mcpLockedInfoText
+    : 'Agent Teams MCP launches this teammate with only the Agent Teams server. Scope and allowlist modes apply only to this teammate launch.';
   const runtimeSummary = formatTeamModelSummary(
     effectiveProviderId,
     effectiveModel?.trim() ?? '',
@@ -346,6 +458,7 @@ export const MemberDraftRow = ({
             value={member.name}
             aria-label={`Member ${index + 1} name`}
             disabled={isRemoved || lockIdentity}
+            title={lockIdentity ? identityLockReason : undefined}
             onChange={(event) => onNameChange(member.id, event.target.value)}
             placeholder="member-name"
           />
@@ -371,25 +484,6 @@ export const MemberDraftRow = ({
       </div>
       <div className="space-y-1">
         <div className="flex flex-col gap-2 sm:flex-row sm:items-start">
-          {showWorkflow && onWorkflowChange ? (
-            <Button
-              variant="outline"
-              size="sm"
-              className="relative h-8 shrink-0 gap-1"
-              disabled={isRemoved}
-              onClick={() => setWorkflowExpanded((prev) => !prev)}
-            >
-              {workflowExpanded ? (
-                <ChevronDown className="size-3.5" />
-              ) : (
-                <ChevronRight className="size-3.5" />
-              )}
-              Workflow
-              {!workflowExpanded && workflowDraft.value.trim() ? (
-                <span className="absolute -right-1 -top-1 size-2 rounded-full bg-blue-500" />
-              ) : null}
-            </Button>
-          ) : null}
           <div className="w-full min-w-0 space-y-1 sm:w-[150px] sm:min-w-[150px]">
             <HoverTooltip
               content={modelButtonTooltipContent}
@@ -490,6 +584,70 @@ export const MemberDraftRow = ({
               </span>
             </div>
           ) : null}
+          {showWorkflow && onWorkflowChange ? (
+            <HoverTooltip
+              content={workflowTooltipText}
+              title={workflowTooltipText}
+              dismissOnClick
+              className="shrink-0"
+              contentClassName="max-w-64"
+            >
+              <Button
+                variant="outline"
+                size="sm"
+                className={cn(
+                  'relative size-8 shrink-0 px-0',
+                  workflowExpanded &&
+                    'border-blue-400/50 bg-blue-500/10 text-blue-100 hover:bg-blue-500/15'
+                )}
+                aria-label={workflowTooltipText}
+                aria-expanded={workflowExpanded}
+                disabled={isRemoved}
+                onClick={() => setWorkflowExpanded((prev) => !prev)}
+              >
+                <WorkflowIcon className="size-3.5" />
+                {!workflowExpanded && workflowDraft.value.trim() ? (
+                  <span className="absolute -right-1 -top-1 size-2 rounded-full bg-blue-500" />
+                ) : null}
+              </Button>
+            </HoverTooltip>
+          ) : null}
+          {onMcpPolicyChange ? (
+            <HoverTooltip
+              content={mcpTooltipText}
+              title={mcpTooltipText}
+              dismissOnClick
+              className="shrink-0"
+              contentClassName="max-w-64"
+            >
+              <Button
+                variant="outline"
+                size="sm"
+                className={cn(
+                  'relative size-8 shrink-0 px-0',
+                  agentTeamsMcpLocked &&
+                    'border-amber-300/50 bg-amber-400/10 text-amber-100 hover:bg-amber-400/15',
+                  !agentTeamsMcpLocked &&
+                    (mcpExpanded || mcpMode !== 'inheritLead') &&
+                    'border-sky-400/45 bg-sky-500/10 text-sky-100 hover:bg-sky-500/15'
+                )}
+                aria-label={mcpTooltipText}
+                aria-expanded={mcpExpanded}
+                disabled={isRemoved}
+                onClick={() => setMcpExpanded((prev) => !prev)}
+              >
+                <Plug className="size-3.5" />
+                {agentTeamsMcpLocked || mcpMode !== 'inheritLead' ? (
+                  <span
+                    className={cn(
+                      'absolute -right-1 -top-1 size-2 rounded-full',
+                      agentTeamsMcpLocked ? 'bg-amber-300' : 'bg-sky-400'
+                    )}
+                  />
+                ) : null}
+              </Button>
+            </HoverTooltip>
+          ) : null}
           {hideActionButton ? null : isRemoved ? (
             <Button
               variant="outline"
@@ -539,6 +697,87 @@ export const MemberDraftRow = ({
           </div>
         </div>
       ) : null}
+      {!isRemoved && onMcpPolicyChange && mcpExpanded ? (
+        <div className="space-y-3 pl-3 md:col-span-3">
+          <div className="rounded-md border border-[var(--color-border)] bg-[var(--color-surface)] p-3">
+            <div className="grid gap-3 sm:grid-cols-[minmax(160px,220px)_1fr]">
+              <div className="space-y-1">
+                <Label
+                  htmlFor={`member-${member.id}-mcp-mode`}
+                  className="text-[10px] text-[var(--color-text-muted)]"
+                >
+                  MCP mode
+                </Label>
+                <Select
+                  value={mcpMode}
+                  onValueChange={handleMcpModeChange}
+                  disabled={agentTeamsMcpLocked}
+                >
+                  <SelectTrigger
+                    id={`member-${member.id}-mcp-mode`}
+                    className="h-8 text-xs"
+                    disabled={agentTeamsMcpLocked}
+                  >
+                    <SelectValue />
+                  </SelectTrigger>
+                  <SelectContent>
+                    <SelectItem value="inheritLead">Inherit lead</SelectItem>
+                    <SelectItem value="inheritScopes">Choose scopes</SelectItem>
+                    <SelectItem value="strictAllowlist">Strict allowlist</SelectItem>
+                    <SelectItem value="appOnly">Agent Teams MCP</SelectItem>
+                  </SelectContent>
+                </Select>
+              </div>
+              <div className="space-y-2">
+                <div className="grid gap-2 sm:grid-cols-3">
+                  {(['user', 'project', 'local'] as const).map((scope) => (
+                    <label
+                      key={scope}
+                      className={cn(
+                        'flex h-8 items-center gap-2 rounded-md border border-[var(--color-border)] px-2 text-xs text-[var(--color-text-secondary)]',
+                        (agentTeamsMcpLocked ||
+                          mcpMode === 'inheritLead' ||
+                          mcpMode === 'appOnly') &&
+                          'opacity-50'
+                      )}
+                    >
+                      <Checkbox
+                        checked={mcpMode === 'appOnly' ? false : mcpScopes[scope]}
+                        disabled={
+                          agentTeamsMcpLocked || mcpMode === 'inheritLead' || mcpMode === 'appOnly'
+                        }
+                        onCheckedChange={(checked) => updateMcpScope(scope, checked === true)}
+                      />
+                      <span className="capitalize">{scope}</span>
+                    </label>
+                  ))}
+                </div>
+                {mcpMode === 'strictAllowlist' ? (
+                  <div className="space-y-1">
+                    <Label
+                      htmlFor={`member-${member.id}-mcp-servers`}
+                      className="text-[10px] text-[var(--color-text-muted)]"
+                    >
+                      Server names
+                    </Label>
+                    <Input
+                      id={`member-${member.id}-mcp-servers`}
+                      className="h-8 text-xs"
+                      value={mcpServerNames.join(', ')}
+                      disabled={agentTeamsMcpLocked}
+                      onChange={(event) => updateMcpServerNames(event.target.value)}
+                      placeholder="github, sentry"
+                    />
+                  </div>
+                ) : null}
+                {mcpMode !== 'inheritLead' ? (
+                  <p className="text-[10px] leading-snug text-amber-200">{mcpSettingInfoText}</p>
+                ) : null}
+              </div>
+            </div>
+          </div>
+        </div>
+      ) : null}
       {showWorkflow && onWorkflowChange && workflowExpanded ? (
         <div className="space-y-0.5 pl-3 md:col-span-3">
           <label
diff --git a/src/renderer/components/team/members/MembersEditorSection.test.tsx b/src/renderer/components/team/members/MembersEditorSection.test.tsx
new file mode 100644
index 00000000..84043e71
--- /dev/null
+++ b/src/renderer/components/team/members/MembersEditorSection.test.tsx
@@ -0,0 +1,510 @@
+import React, { act } from 'react';
+import { createRoot } from 'react-dom/client';
+
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+vi.mock('@renderer/components/ui/button', () => ({
+  Button: ({
+    children,
+    onClick,
+    disabled,
+    title,
+    className,
+  }: React.ButtonHTMLAttributes<HTMLButtonElement> & { children: React.ReactNode }) =>
+    React.createElement(
+      'button',
+      {
+        type: 'button',
+        className,
+        disabled,
+        title,
+        onClick,
+      },
+      children
+    ),
+}));
+
+vi.mock('@renderer/components/ui/checkbox', () => ({
+  Checkbox: ({
+    checked,
+    onCheckedChange,
+    ...props
+  }: Omit<React.InputHTMLAttributes<HTMLInputElement>, 'checked' | 'onChange'> & {
+    checked?: boolean | 'indeterminate';
+    onCheckedChange?: (value: boolean | 'indeterminate') => void;
+  }) =>
+    React.createElement('input', {
+      ...props,
+      checked: checked === true,
+      'data-state':
+        checked === 'indeterminate' ? 'indeterminate' : checked ? 'checked' : 'unchecked',
+      type: 'checkbox',
+      onChange: (event: React.ChangeEvent<HTMLInputElement>) =>
+        onCheckedChange?.(event.target.checked),
+    }),
+}));
+
+vi.mock('@renderer/components/ui/label', () => ({
+  Label: ({
+    children,
+    ...props
+  }: React.LabelHTMLAttributes<HTMLLabelElement> & { children: React.ReactNode }) =>
+    React.createElement('label', props, children),
+}));
+
+vi.mock('../dialogs/MembersJsonEditor', () => ({
+  MembersJsonEditor: ({ value, onChange }: { value: string; onChange: (value: string) => void }) =>
+    React.createElement('textarea', {
+      'data-testid': 'members-json-editor',
+      value,
+      onChange: (event: React.ChangeEvent<HTMLTextAreaElement>) => onChange(event.target.value),
+    }),
+}));
+
+vi.mock('./MemberDraftRow', () => ({
+  MemberDraftRow: ({
+    member,
+    onWorktreeIsolationChange,
+    onRemove,
+    onRestore,
+    agentTeamsMcpLocked,
+  }: {
+    member: {
+      id: string;
+      name: string;
+      isolation?: 'worktree';
+      mcpPolicy?: { mode?: string };
+      removedAt?: number | string | null;
+    };
+    onWorktreeIsolationChange?: (id: string, enabled: boolean) => void;
+    onRemove?: (id: string) => void;
+    onRestore?: (id: string) => void;
+    agentTeamsMcpLocked?: boolean;
+  }) =>
+    React.createElement(
+      'div',
+      null,
+      React.createElement(
+        'button',
+        {
+          type: 'button',
+          'data-testid': `member-${member.name}`,
+          'data-isolation': member.isolation ?? '',
+          'data-mcp-policy': member.mcpPolicy?.mode ?? '',
+          'data-agent-teams-mcp-locked': agentTeamsMcpLocked ? 'true' : 'false',
+          'data-removed': member.removedAt ? 'true' : 'false',
+          onClick: () => onWorktreeIsolationChange?.(member.id, member.isolation !== 'worktree'),
+        },
+        member.name
+      ),
+      React.createElement(
+        'button',
+        {
+          type: 'button',
+          'data-testid': `remove-${member.name}`,
+          onClick: () => onRemove?.(member.id),
+        },
+        'remove'
+      ),
+      React.createElement(
+        'button',
+        {
+          type: 'button',
+          'data-testid': `restore-${member.name}`,
+          onClick: () => onRestore?.(member.id),
+        },
+        'restore'
+      )
+    ),
+}));
+
+import { MembersEditorSection } from './MembersEditorSection';
+import { createMemberDraft } from './membersEditorUtils';
+
+import type { MemberDraft } from './membersEditorTypes';
+
+const mountedRoots: ReturnType<typeof createRoot>[] = [];
+
+beforeEach(() => {
+  vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+});
+
+function renderMembersEditor(props: {
+  members: MemberDraft[];
+  teammateWorktreeDefault?: boolean;
+  onChange?: (members: MemberDraft[]) => void;
+  softDeleteMembers?: boolean;
+}): {
+  host: HTMLDivElement;
+  onChange: ReturnType<typeof vi.fn>;
+  rerender: (members: MemberDraft[]) => void;
+} {
+  const host = document.createElement('div');
+  document.body.appendChild(host);
+  const root = createRoot(host);
+  mountedRoots.push(root);
+  const onChange = props.onChange ?? vi.fn();
+
+  const render = (members: MemberDraft[]): void => {
+    root.render(
+      <MembersEditorSection
+        members={members}
+        onChange={onChange}
+        showWorktreeIsolationControls
+        teammateWorktreeDefault={props.teammateWorktreeDefault}
+        softDeleteMembers={props.softDeleteMembers}
+        draftKeyPrefix="worktree-test"
+      />
+    );
+  };
+
+  act(() => {
+    render(props.members);
+  });
+
+  return {
+    host,
+    onChange: onChange as ReturnType<typeof vi.fn>,
+    rerender: (members: MemberDraft[]) => {
+      act(() => render(members));
+    },
+  };
+}
+
+function masterWorktreeCheckbox(host: HTMLElement): HTMLInputElement {
+  const checkbox = host.querySelector<HTMLInputElement>('#teammate-worktree-default-worktree-test');
+  if (!checkbox) {
+    throw new Error('Master worktree checkbox not found');
+  }
+  return checkbox;
+}
+
+function masterAgentTeamsMcpCheckbox(host: HTMLElement): HTMLInputElement {
+  const checkbox = host.querySelector<HTMLInputElement>(
+    '#teammate-agent-teams-mcp-default-worktree-test'
+  );
+  if (!checkbox) {
+    throw new Error('Master Agent Teams MCP checkbox not found');
+  }
+  return checkbox;
+}
+
+function addMemberButton(host: HTMLElement): HTMLButtonElement {
+  const button = Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find((element) =>
+    element.textContent?.includes('Add member')
+  );
+  if (!button) {
+    throw new Error('Add member button not found');
+  }
+  return button;
+}
+
+function editJsonButton(host: HTMLElement): HTMLButtonElement {
+  const button = Array.from(host.querySelectorAll<HTMLButtonElement>('button')).find((element) =>
+    element.textContent?.includes('Edit as JSON')
+  );
+  if (!button) {
+    throw new Error('Edit as JSON button not found');
+  }
+  return button;
+}
+
+afterEach(() => {
+  for (const root of mountedRoots.splice(0)) {
+    act(() => root.unmount());
+  }
+  document.body.innerHTML = '';
+});
+
+describe('MembersEditorSection worktree master checkbox', () => {
+  it('renders indeterminate when only some active members use worktrees', () => {
+    const { host } = renderMembersEditor({
+      members: [
+        createMemberDraft({ id: 'alice', name: 'alice' }),
+        createMemberDraft({ id: 'bob', name: 'bob', isolation: 'worktree' }),
+      ],
+      teammateWorktreeDefault: true,
+    });
+
+    const checkbox = masterWorktreeCheckbox(host);
+
+    expect(checkbox.checked).toBe(false);
+    expect(checkbox.dataset.state).toBe('indeterminate');
+  });
+
+  it('renders checked only when all active members use worktrees', () => {
+    const { host } = renderMembersEditor({
+      members: [
+        createMemberDraft({ id: 'alice', name: 'alice', isolation: 'worktree' }),
+        createMemberDraft({ id: 'bob', name: 'bob', isolation: 'worktree' }),
+      ],
+    });
+
+    const checkbox = masterWorktreeCheckbox(host);
+
+    expect(checkbox.checked).toBe(true);
+    expect(checkbox.dataset.state).toBe('checked');
+  });
+
+  it('turns all active members on when clicked from mixed state', () => {
+    const { host, onChange } = renderMembersEditor({
+      members: [
+        createMemberDraft({ id: 'alice', name: 'alice' }),
+        createMemberDraft({ id: 'bob', name: 'bob', isolation: 'worktree' }),
+      ],
+    });
+
+    act(() => {
+      masterWorktreeCheckbox(host).click();
+    });
+
+    const nextMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+
+    expect(nextMembers.map((member) => member.isolation)).toEqual(['worktree', 'worktree']);
+  });
+});
+
+describe('MembersEditorSection Agent Teams MCP master checkbox', () => {
+  it('renders to the right of the worktree master control', () => {
+    const { host } = renderMembersEditor({
+      members: [createMemberDraft({ id: 'alice', name: 'alice' })],
+    });
+
+    const worktreeCheckbox = masterWorktreeCheckbox(host);
+    const mcpCheckbox = masterAgentTeamsMcpCheckbox(host);
+
+    expect(host.textContent).toContain('Agent Teams MCP only');
+    expect(mcpCheckbox.checked).toBe(false);
+    expect(
+      worktreeCheckbox.compareDocumentPosition(mcpCheckbox) & Node.DOCUMENT_POSITION_FOLLOWING
+    ).toBeTruthy();
+  });
+
+  it('forces all active members to Agent Teams MCP when enabled', () => {
+    const removed = createMemberDraft({
+      id: 'removed',
+      name: 'removed',
+      mcpPolicy: { mode: 'strictAllowlist', serverNames: ['github'] },
+      removedAt: Date.now(),
+    });
+    const { host, onChange } = renderMembersEditor({
+      members: [
+        createMemberDraft({ id: 'alice', name: 'alice' }),
+        createMemberDraft({
+          id: 'bob',
+          name: 'bob',
+          mcpPolicy: { mode: 'inheritScopes', scopes: { user: true, project: false } },
+        }),
+        removed,
+      ],
+      softDeleteMembers: true,
+    });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+
+    const nextMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+
+    expect(nextMembers.find((member) => member.id === 'alice')?.mcpPolicy).toEqual({
+      mode: 'appOnly',
+    });
+    expect(nextMembers.find((member) => member.id === 'bob')?.mcpPolicy).toEqual({
+      mode: 'appOnly',
+    });
+    expect(nextMembers.find((member) => member.id === 'removed')?.mcpPolicy).toEqual(
+      removed.mcpPolicy
+    );
+  });
+
+  it('restores previous policies after rerender when disabled', () => {
+    const originalMembers = [
+      createMemberDraft({ id: 'alice', name: 'alice' }),
+      createMemberDraft({
+        id: 'bob',
+        name: 'bob',
+        mcpPolicy: {
+          mode: 'strictAllowlist',
+          scopes: { user: true, project: false, local: true },
+          serverNames: ['github', 'linear'],
+        },
+      }),
+    ];
+    const { host, onChange, rerender } = renderMembersEditor({ members: originalMembers });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+    const lockedMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+    rerender(lockedMembers);
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+
+    const restoredMembers = onChange.mock.calls[1]?.[0] as MemberDraft[];
+
+    expect(restoredMembers.find((member) => member.id === 'alice')?.mcpPolicy).toBeUndefined();
+    expect(restoredMembers.find((member) => member.id === 'bob')?.mcpPolicy).toEqual(
+      originalMembers[1].mcpPolicy
+    );
+  });
+
+  it('gives new members Agent Teams MCP while lock is enabled, then restores them to inherited MCP', () => {
+    const { host, onChange, rerender } = renderMembersEditor({
+      members: [createMemberDraft({ id: 'alice', name: 'alice' })],
+    });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+    const lockedMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+    rerender(lockedMembers);
+
+    act(() => {
+      addMemberButton(host).click();
+    });
+
+    const withNewMember = onChange.mock.calls[1]?.[0] as MemberDraft[];
+    const addedMember = withNewMember.at(-1);
+    expect(addedMember?.mcpPolicy).toEqual({ mode: 'appOnly' });
+
+    rerender(withNewMember);
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+
+    const restoredMembers = onChange.mock.calls[2]?.[0] as MemberDraft[];
+    expect(
+      restoredMembers.find((member) => member.id === addedMember?.id)?.mcpPolicy
+    ).toBeUndefined();
+  });
+
+  it('keeps the restore map stable when a member is removed while locked', () => {
+    const originalMembers = [
+      createMemberDraft({
+        id: 'alice',
+        name: 'alice',
+        mcpPolicy: { mode: 'inheritScopes', scopes: { user: false, project: true } },
+      }),
+      createMemberDraft({
+        id: 'bob',
+        name: 'bob',
+        mcpPolicy: { mode: 'strictAllowlist', serverNames: ['github'] },
+      }),
+    ];
+    const { host, onChange, rerender } = renderMembersEditor({ members: originalMembers });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+    const lockedMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+    rerender(lockedMembers);
+
+    act(() => {
+      host.querySelector<HTMLButtonElement>('[data-testid="remove-bob"]')?.click();
+    });
+    const withoutBob = onChange.mock.calls[1]?.[0] as MemberDraft[];
+    rerender(withoutBob);
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+
+    const restoredMembers = onChange.mock.calls[2]?.[0] as MemberDraft[];
+    expect(restoredMembers.map((member) => member.id)).toEqual(['alice']);
+    expect(restoredMembers[0]?.mcpPolicy).toEqual(originalMembers[0].mcpPolicy);
+  });
+
+  it('forces JSON editor changes through Agent Teams MCP while lock is enabled', async () => {
+    const { host, onChange, rerender } = renderMembersEditor({
+      members: [createMemberDraft({ id: 'alice', name: 'alice' })],
+    });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+    const lockedMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+    rerender(lockedMembers);
+
+    await act(async () => {
+      editJsonButton(host).click();
+      await Promise.resolve();
+    });
+
+    const editor = host.querySelector<HTMLTextAreaElement>('[data-testid="members-json-editor"]')!;
+    const textareaValueSetter = Object.getOwnPropertyDescriptor(
+      window.HTMLTextAreaElement.prototype,
+      'value'
+    )?.set;
+    await act(async () => {
+      textareaValueSetter?.call(
+        editor,
+        JSON.stringify([
+          {
+            name: 'alice',
+            role: 'developer',
+            mcpPolicy: {
+              mode: 'strictAllowlist',
+              scopes: { user: true, project: true, local: true },
+              serverNames: ['github'],
+            },
+          },
+        ])
+      );
+      editor.dispatchEvent(new Event('input', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    const nextMembers = onChange.mock.calls[1]?.[0] as MemberDraft[];
+    expect(nextMembers).toHaveLength(1);
+    expect(nextMembers[0]?.mcpPolicy).toEqual({ mode: 'appOnly' });
+  });
+
+  it('restores a soft-deleted member policy when that member is restored while locked', () => {
+    const originalMembers = [
+      createMemberDraft({
+        id: 'alice',
+        name: 'alice',
+        mcpPolicy: { mode: 'inheritScopes', scopes: { user: true, project: false } },
+      }),
+      createMemberDraft({
+        id: 'bob',
+        name: 'bob',
+        mcpPolicy: { mode: 'strictAllowlist', serverNames: ['github'] },
+        removedAt: Date.now(),
+      }),
+    ];
+    const { host, onChange, rerender } = renderMembersEditor({
+      members: originalMembers,
+      softDeleteMembers: true,
+    });
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+    const lockedMembers = onChange.mock.calls[0]?.[0] as MemberDraft[];
+    rerender(lockedMembers);
+
+    act(() => {
+      host.querySelector<HTMLButtonElement>('[data-testid="restore-bob"]')?.click();
+    });
+    const restoredDuringLock = onChange.mock.calls[1]?.[0] as MemberDraft[];
+    expect(restoredDuringLock.find((member) => member.id === 'bob')?.mcpPolicy).toEqual({
+      mode: 'appOnly',
+    });
+    rerender(restoredDuringLock);
+
+    act(() => {
+      masterAgentTeamsMcpCheckbox(host).click();
+    });
+
+    const restoredAfterUnlock = onChange.mock.calls[2]?.[0] as MemberDraft[];
+    expect(restoredAfterUnlock.find((member) => member.id === 'alice')?.mcpPolicy).toEqual(
+      originalMembers[0].mcpPolicy
+    );
+    expect(restoredAfterUnlock.find((member) => member.id === 'bob')?.mcpPolicy).toEqual(
+      originalMembers[1].mcpPolicy
+    );
+  });
+});
diff --git a/src/renderer/components/team/members/MembersEditorSection.tsx b/src/renderer/components/team/members/MembersEditorSection.tsx
index 5f832345..6c1ad20e 100644
--- a/src/renderer/components/team/members/MembersEditorSection.tsx
+++ b/src/renderer/components/team/members/MembersEditorSection.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 
 import { Button } from '@renderer/components/ui/button';
 import { Checkbox } from '@renderer/components/ui/checkbox';
@@ -8,8 +8,9 @@ import { cn } from '@renderer/lib/utils';
 import { getParticipantAvatarUrlByIndex } from '@renderer/utils/memberAvatarCatalog';
 import { isTeamEffortLevel } from '@shared/utils/effortLevels';
 import { migrateProviderBackendId } from '@shared/utils/providerBackend';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { normalizeOptionalTeamProviderId } from '@shared/utils/teamProvider';
-import { GitBranch, Plus } from 'lucide-react';
+import { GitBranch, Plug, Plus } from 'lucide-react';
 
 import { MembersJsonEditor } from '../dialogs/MembersJsonEditor';
 
@@ -33,7 +34,7 @@ function membersToJsonText(drafts: MemberDraft[]): string {
     .filter((d) => d.name.trim())
     .map((d) => {
       const role = getMemberDraftRole(d);
-      const obj: Record<string, string> = { name: d.name.trim() };
+      const obj: Record<string, unknown> = { name: d.name.trim() };
       if (role) obj.role = role;
       const workflow = getWorkflowForExport(d);
       if (workflow) obj.workflow = workflow;
@@ -41,6 +42,7 @@ function membersToJsonText(drafts: MemberDraft[]): string {
       if (d.providerId) obj.providerId = d.providerId;
       if (d.model?.trim()) obj.model = d.model.trim();
       if (d.effort) obj.effort = d.effort;
+      if (d.mcpPolicy) obj.mcpPolicy = d.mcpPolicy;
       return obj;
     });
   return JSON.stringify(arr, null, 2);
@@ -59,6 +61,7 @@ function parseJsonToDrafts(text: string): MemberDraft[] {
     const effort: EffortLevel | undefined = isTeamEffortLevel(item.effort)
       ? item.effort
       : undefined;
+    const mcpPolicy = normalizeTeamMemberMcpPolicy(item.mcpPolicy);
     const presetRoles: readonly string[] = PRESET_ROLES;
     const isPreset = presetRoles.includes(role);
     return createMemberDraft({
@@ -70,10 +73,29 @@ function parseJsonToDrafts(text: string): MemberDraft[] {
       providerId,
       model,
       effort,
+      mcpPolicy,
     });
   });
 }
 
+function cloneMcpPolicy(policy: MemberDraft['mcpPolicy']): MemberDraft['mcpPolicy'] {
+  const normalized = normalizeTeamMemberMcpPolicy(policy);
+  if (!normalized) {
+    return undefined;
+  }
+  return {
+    mode: normalized.mode,
+    ...(normalized.scopes ? { scopes: { ...normalized.scopes } } : {}),
+    ...(normalized.serverNames ? { serverNames: [...normalized.serverNames] } : {}),
+  };
+}
+
+function forceActiveMembersToAgentTeamsMcp(drafts: MemberDraft[]): MemberDraft[] {
+  return drafts.map((member) =>
+    member.removedAt ? member : { ...member, mcpPolicy: { mode: 'appOnly' as const } }
+  );
+}
+
 export interface MembersEditorSectionProps {
   members: MemberDraft[];
   onChange: (members: MemberDraft[]) => void;
@@ -177,6 +199,14 @@ export const MembersEditorSection = ({
   const [jsonEditorOpen, setJsonEditorOpen] = useState(false);
   const [jsonText, setJsonText] = useState('');
   const [jsonError, setJsonError] = useState<string | null>(null);
+  const [agentTeamsMcpLockedForAll, setAgentTeamsMcpLockedForAll] = useState(false);
+  const previousMcpPolicyByMemberIdRef = useRef<Map<string, MemberDraft['mcpPolicy']>>(new Map());
+
+  const emitMembersChange = (nextMembers: MemberDraft[]): void => {
+    onChange(
+      agentTeamsMcpLockedForAll ? forceActiveMembersToAgentTeamsMcp(nextMembers) : nextMembers
+    );
+  };
 
   const toggleJsonEditor = (): void => {
     if (!jsonEditorOpen) {
@@ -195,7 +225,7 @@ export const MembersEditorSection = ({
     setJsonText(text);
     try {
       const drafts = parseJsonToDrafts(text);
-      onChange(drafts);
+      emitMembersChange(drafts);
       setJsonError(null);
     } catch (e) {
       setJsonError(e instanceof Error ? e.message : 'Invalid JSON');
@@ -203,12 +233,12 @@ export const MembersEditorSection = ({
   };
 
   const updateMemberName = (memberId: string, name: string): void => {
-    onChange(members.map((c) => (c.id === memberId ? { ...c, name } : c)));
+    emitMembersChange(members.map((c) => (c.id === memberId ? { ...c, name } : c)));
   };
 
   const updateMemberRole = (memberId: string, roleSelection: string): void => {
     const resolvedRole = roleSelection === NO_ROLE ? '' : roleSelection;
-    onChange(
+    emitMembersChange(
       members.map((c) =>
         c.id === memberId
           ? {
@@ -222,19 +252,19 @@ export const MembersEditorSection = ({
   };
 
   const updateMemberCustomRole = (memberId: string, customRole: string): void => {
-    onChange(members.map((c) => (c.id === memberId ? { ...c, customRole } : c)));
+    emitMembersChange(members.map((c) => (c.id === memberId ? { ...c, customRole } : c)));
   };
 
   const updateMemberWorkflow = (memberId: string, workflow: string): void => {
-    onChange(members.map((c) => (c.id === memberId ? { ...c, workflow } : c)));
+    emitMembersChange(members.map((c) => (c.id === memberId ? { ...c, workflow } : c)));
   };
 
   const updateMemberWorkflowChips = (memberId: string, workflowChips: InlineChip[]): void => {
-    onChange(members.map((c) => (c.id === memberId ? { ...c, workflowChips } : c)));
+    emitMembersChange(members.map((c) => (c.id === memberId ? { ...c, workflowChips } : c)));
   };
 
   const updateMemberProvider = (memberId: string, providerId: TeamProviderId): void => {
-    onChange(
+    emitMembersChange(
       members.map((c) =>
         c.id === memberId
           ? (() => {
@@ -255,11 +285,11 @@ export const MembersEditorSection = ({
   };
 
   const updateMemberModel = (memberId: string, model: string): void => {
-    onChange(members.map((c) => (c.id === memberId ? { ...c, model } : c)));
+    emitMembersChange(members.map((c) => (c.id === memberId ? { ...c, model } : c)));
   };
 
   const updateMemberEffort = (memberId: string, effort: string): void => {
-    onChange(
+    emitMembersChange(
       members.map((c) =>
         c.id === memberId
           ? {
@@ -275,19 +305,53 @@ export const MembersEditorSection = ({
     if (enabled && worktreeIsolationDisabledReason) {
       return;
     }
-    onChange(
+    emitMembersChange(
       members.map((c) =>
         c.id === memberId ? { ...c, isolation: enabled ? 'worktree' : undefined } : c
       )
     );
   };
 
+  const updateMemberMcpPolicy = (memberId: string, mcpPolicy: MemberDraft['mcpPolicy']): void => {
+    if (agentTeamsMcpLockedForAll) {
+      return;
+    }
+    emitMembersChange(
+      members.map((c) =>
+        c.id === memberId ? { ...c, mcpPolicy: normalizeTeamMemberMcpPolicy(mcpPolicy) } : c
+      )
+    );
+  };
+
+  const updateAgentTeamsMcpLock = (enabled: boolean): void => {
+    if (enabled) {
+      const previous = new Map<string, MemberDraft['mcpPolicy']>();
+      for (const member of members) {
+        previous.set(member.id, cloneMcpPolicy(member.mcpPolicy));
+      }
+      previousMcpPolicyByMemberIdRef.current = previous;
+      setAgentTeamsMcpLockedForAll(true);
+      onChange(forceActiveMembersToAgentTeamsMcp(members));
+      return;
+    }
+
+    setAgentTeamsMcpLockedForAll(false);
+    const previous = previousMcpPolicyByMemberIdRef.current;
+    onChange(
+      members.map((member) => ({
+        ...member,
+        mcpPolicy: cloneMcpPolicy(previous.get(member.id)),
+      }))
+    );
+    previous.clear();
+  };
+
   const updateTeammateWorktreeDefault = (enabled: boolean): void => {
     if (enabled && worktreeIsolationDisabledReason) {
       return;
     }
     onTeammateWorktreeDefaultChange?.(enabled);
-    onChange(
+    emitMembersChange(
       members.map((member) =>
         member.removedAt ? member : { ...member, isolation: enabled ? 'worktree' : undefined }
       )
@@ -296,10 +360,10 @@ export const MembersEditorSection = ({
 
   const removeMember = (memberId: string): void => {
     if (!softDeleteMembers) {
-      onChange(members.filter((c) => c.id !== memberId));
+      emitMembersChange(members.filter((c) => c.id !== memberId));
       return;
     }
-    onChange(
+    emitMembersChange(
       members.map((member) =>
         member.id === memberId ? { ...member, removedAt: member.removedAt ?? Date.now() } : member
       )
@@ -307,32 +371,49 @@ export const MembersEditorSection = ({
   };
 
   const restoreMember = (memberId: string): void => {
-    onChange(
+    emitMembersChange(
       members.map((member) => (member.id === memberId ? { ...member, removedAt: null } : member))
     );
   };
 
+  const activeMembers = members.filter((member) => !member.removedAt);
+  const removedMembers = members.filter((member) => member.removedAt);
+  const activeWorktreeMemberCount = activeMembers.filter(
+    (member) => member.isolation === 'worktree'
+  ).length;
+  const allActiveMembersUseWorktrees =
+    activeMembers.length > 0 && activeWorktreeMemberCount === activeMembers.length;
+  const someActiveMembersUseWorktrees = activeWorktreeMemberCount > 0;
+  const teammateWorktreeDefaultChecked: boolean | 'indeterminate' = allActiveMembersUseWorktrees
+    ? true
+    : someActiveMembersUseWorktrees
+      ? 'indeterminate'
+      : false;
+  const newMemberUsesWorktree =
+    allActiveMembersUseWorktrees || (activeMembers.length === 0 && teammateWorktreeDefault);
+  const worktreeDefaultDisabled = Boolean(
+    worktreeIsolationDisabledReason && !allActiveMembersUseWorktrees
+  );
+
   const addMember = (): void => {
     const suggestedName = getNextSuggestedMemberName(members.map((member) => member.name));
-    onChange([
+    emitMembersChange([
       ...members,
       createMemberDraft(
         inheritModelSettingsByDefault
           ? {
               name: suggestedName,
-              isolation: teammateWorktreeDefault ? 'worktree' : undefined,
+              isolation: newMemberUsesWorktree ? 'worktree' : undefined,
             }
           : {
               name: suggestedName,
               providerId: defaultProviderId,
-              isolation: teammateWorktreeDefault ? 'worktree' : undefined,
+              isolation: newMemberUsesWorktree ? 'worktree' : undefined,
             }
       ),
     ]);
   };
 
-  const activeMembers = members.filter((member) => !member.removedAt);
-  const removedMembers = members.filter((member) => member.removedAt);
   const names = activeMembers.map((m) => m.name.trim().toLowerCase()).filter(Boolean);
   const hasDuplicates = new Set(names).size !== names.length;
   const memberColorMap = useMemo(
@@ -344,6 +425,11 @@ export const MembersEditorSection = ({
       `teammate-worktree-default-${(draftKeyPrefix ?? 'default').replace(/[^a-zA-Z0-9_-]/g, '-')}`,
     [draftKeyPrefix]
   );
+  const agentTeamsMcpDefaultControlId = useMemo(
+    () =>
+      `teammate-agent-teams-mcp-default-${(draftKeyPrefix ?? 'default').replace(/[^a-zA-Z0-9_-]/g, '-')}`,
+    [draftKeyPrefix]
+  );
 
   const mentionSuggestions = useMemo(
     () => buildMemberDraftSuggestions(members, memberColorMap),
@@ -398,22 +484,38 @@ export const MembersEditorSection = ({
           >
             {showWorktreeIsolationControls ? (
               <div
-                className="flex items-center gap-2 border-b border-[var(--color-border)] px-2.5 py-2"
+                className="flex items-center justify-between gap-3 border-b border-[var(--color-border)] px-2.5 py-2"
                 title={worktreeIsolationDisabledReason ?? undefined}
               >
-                <Checkbox
-                  id={worktreeDefaultControlId}
-                  checked={teammateWorktreeDefault}
-                  disabled={Boolean(worktreeIsolationDisabledReason && !teammateWorktreeDefault)}
-                  onCheckedChange={(checked) => updateTeammateWorktreeDefault(checked === true)}
-                />
-                <Label
-                  htmlFor={worktreeDefaultControlId}
-                  className="flex min-w-0 cursor-pointer items-center gap-1.5 text-xs font-normal text-[var(--color-text-secondary)]"
-                >
-                  <GitBranch className="size-3.5 shrink-0" />
-                  <span className="truncate">Run teammates in separate worktrees</span>
-                </Label>
+                <div className="flex min-w-0 items-center gap-2">
+                  <Checkbox
+                    id={worktreeDefaultControlId}
+                    checked={teammateWorktreeDefaultChecked}
+                    disabled={worktreeDefaultDisabled}
+                    onCheckedChange={(checked) => updateTeammateWorktreeDefault(checked === true)}
+                  />
+                  <Label
+                    htmlFor={worktreeDefaultControlId}
+                    className="flex min-w-0 cursor-pointer items-center gap-1.5 text-xs font-normal text-[var(--color-text-secondary)]"
+                  >
+                    <GitBranch className="size-3.5 shrink-0" />
+                    <span className="truncate">Run teammates in separate worktrees</span>
+                  </Label>
+                </div>
+                <div className="flex shrink-0 items-center gap-2">
+                  <Checkbox
+                    id={agentTeamsMcpDefaultControlId}
+                    checked={agentTeamsMcpLockedForAll}
+                    onCheckedChange={(checked) => updateAgentTeamsMcpLock(checked === true)}
+                  />
+                  <Label
+                    htmlFor={agentTeamsMcpDefaultControlId}
+                    className="flex cursor-pointer items-center gap-1.5 text-xs font-normal text-[var(--color-text-secondary)]"
+                  >
+                    <Plug className="size-3.5 shrink-0" />
+                    <span className="whitespace-nowrap">Agent Teams MCP only</span>
+                  </Label>
+                </div>
               </div>
             ) : null}
             <div className={cn('space-y-2', showWorktreeIsolationControls && 'p-2')}>
@@ -438,6 +540,8 @@ export const MembersEditorSection = ({
                   showWorktreeIsolationControls={showWorktreeIsolationControls}
                   worktreeIsolationDisabledReason={worktreeIsolationDisabledReason}
                   onWorktreeIsolationChange={updateMemberIsolation}
+                  onMcpPolicyChange={updateMemberMcpPolicy}
+                  agentTeamsMcpLocked={agentTeamsMcpLockedForAll}
                   inheritedProviderId={inheritedProviderId}
                   inheritedModel={inheritedModel}
                   inheritedEffort={inheritedEffort}
@@ -488,6 +592,8 @@ export const MembersEditorSection = ({
                         onEffortChange={updateMemberEffort}
                         showWorktreeIsolationControls={showWorktreeIsolationControls}
                         onWorktreeIsolationChange={updateMemberIsolation}
+                        onMcpPolicyChange={updateMemberMcpPolicy}
+                        agentTeamsMcpLocked={agentTeamsMcpLockedForAll}
                         inheritedProviderId={inheritedProviderId}
                         inheritedModel={inheritedModel}
                         inheritedEffort={inheritedEffort}
diff --git a/src/renderer/components/team/members/TeamRosterEditorSection.tsx b/src/renderer/components/team/members/TeamRosterEditorSection.tsx
index 1bf777aa..bb2dcf4e 100644
--- a/src/renderer/components/team/members/TeamRosterEditorSection.tsx
+++ b/src/renderer/components/team/members/TeamRosterEditorSection.tsx
@@ -42,6 +42,7 @@ interface TeamRosterEditorSectionProps {
   onSyncModelsWithTeammatesChange: (value: boolean) => void;
   headerTop?: React.ReactNode;
   headerBottom?: React.ReactNode;
+  leadProviderNoticeById?: Partial<Record<TeamProviderId, React.ReactNode>>;
   softDeleteMembers?: boolean;
   leadWarningText?: string | null;
   memberWarningById?: Record<string, string | null | undefined>;
@@ -97,6 +98,7 @@ const TeamRosterEditorSectionImpl = ({
   onSyncModelsWithTeammatesChange,
   headerTop,
   headerBottom,
+  leadProviderNoticeById,
   softDeleteMembers = false,
   leadWarningText,
   memberWarningById,
@@ -188,6 +190,7 @@ const TeamRosterEditorSectionImpl = ({
             onSyncModelsWithTeammatesChange={onSyncModelsWithTeammatesChange}
             warningText={leadWarningText}
             disableGeminiOption={disableGeminiOption}
+            providerNoticeById={leadProviderNoticeById}
             modelIssueText={leadModelIssueText}
             modelAdvisoryReasonByValue={modelAdvisoryReasonByProvider?.[providerId]}
             modelIssueReasonByValue={modelIssueReasonByProvider?.[providerId]}
diff --git a/src/renderer/components/team/members/membersEditorTypes.ts b/src/renderer/components/team/members/membersEditorTypes.ts
index 2c3cd9ea..aab68a38 100644
--- a/src/renderer/components/team/members/membersEditorTypes.ts
+++ b/src/renderer/components/team/members/membersEditorTypes.ts
@@ -2,6 +2,7 @@ import type { InlineChip } from '@renderer/types/inlineChip';
 import type {
   EffortLevel,
   TeamFastMode,
+  TeamMemberMcpPolicy,
   TeamProviderBackendId,
   TeamProviderId,
 } from '@shared/types';
@@ -20,6 +21,7 @@ export interface MemberDraft {
   model?: string;
   effort?: EffortLevel;
   fastMode?: TeamFastMode;
+  mcpPolicy?: TeamMemberMcpPolicy;
   removedAt?: number | string | null;
 }
 
diff --git a/src/renderer/components/team/members/membersEditorUtils.ts b/src/renderer/components/team/members/membersEditorUtils.ts
index b1800a1e..0bf0ede6 100644
--- a/src/renderer/components/team/members/membersEditorUtils.ts
+++ b/src/renderer/components/team/members/membersEditorUtils.ts
@@ -6,6 +6,7 @@ import { isTeamEffortLevel, isTeamEffortLevelForProvider } from '@shared/utils/e
 import { isLeadMember } from '@shared/utils/leadDetection';
 import { migrateProviderBackendId } from '@shared/utils/providerBackend';
 import { buildTeamMemberColorMap } from '@shared/utils/teamMemberColors';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { validateTeamMemberNameFormat } from '@shared/utils/teamMemberName';
 import {
   inferTeamProviderIdFromModel,
@@ -48,6 +49,7 @@ export function createMemberDraft(initial?: Partial<MemberDraft>): MemberDraft {
     model: normalizeExplicitTeamModelForUi(providerId, initial?.model ?? ''),
     effort: initial?.effort,
     fastMode: initial?.fastMode,
+    mcpPolicy: normalizeTeamMemberMcpPolicy(initial?.mcpPolicy),
     removedAt: initial?.removedAt,
   };
 }
@@ -63,6 +65,7 @@ export function createMemberDraftsFromInputs(
     model?: string;
     effort?: EffortLevel;
     fastMode?: TeamFastMode;
+    mcpPolicy?: unknown;
     isolation?: 'worktree';
     removedAt?: number | string | null;
   }[]
@@ -85,6 +88,7 @@ export function createMemberDraftsFromInputs(
         model: member.model ?? '',
         effort: normalizeDraftEffort(member.effort),
         fastMode: member.fastMode,
+        mcpPolicy: normalizeTeamMemberMcpPolicy(member.mcpPolicy),
         removedAt: member.removedAt,
       });
     });
@@ -340,6 +344,10 @@ export function buildMembersFromDrafts(
       if (member.fastMode) {
         result.fastMode = member.fastMode;
       }
+      const mcpPolicy = normalizeTeamMemberMcpPolicy(member.mcpPolicy);
+      if (mcpPolicy) {
+        result.mcpPolicy = mcpPolicy;
+      }
       return result;
     })
     .filter((member): member is NonNullable<typeof member> => member !== null);
diff --git a/src/renderer/components/team/schedule/CronScheduleInput.tsx b/src/renderer/components/team/schedule/CronScheduleInput.tsx
index 244fe16a..cb9a1062 100644
--- a/src/renderer/components/team/schedule/CronScheduleInput.tsx
+++ b/src/renderer/components/team/schedule/CronScheduleInput.tsx
@@ -246,7 +246,7 @@ export const CronScheduleInput = ({
           </SelectContent>
         </Select>
         <p className="text-[11px] text-[var(--color-text-muted)]">
-          Pre-warms CLI environment before scheduled execution
+          Prepares selected providers before scheduled execution
         </p>
       </div>
     </div>
diff --git a/src/renderer/components/team/useTeamAgentRuntimeWatcher.ts b/src/renderer/components/team/useTeamAgentRuntimeWatcher.ts
new file mode 100644
index 00000000..e65cbcfb
--- /dev/null
+++ b/src/renderer/components/team/useTeamAgentRuntimeWatcher.ts
@@ -0,0 +1,59 @@
+import { useEffect } from 'react';
+
+import { useStore } from '@renderer/store';
+import { isTeamProvisioningActive, selectTeamDataForName } from '@renderer/store/slices/teamSlice';
+import { useShallow } from 'zustand/react/shallow';
+
+const TEAM_AGENT_RUNTIME_REFRESH_MS = 5_000;
+
+interface TeamAgentRuntimeWatcherOptions {
+  teamName: string;
+  enabled: boolean;
+  isTeamProvisioning?: boolean;
+  isTeamAlive?: boolean;
+}
+
+export function useTeamAgentRuntimeWatcher({
+  teamName,
+  enabled,
+  isTeamProvisioning,
+  isTeamAlive,
+}: TeamAgentRuntimeWatcherOptions): void {
+  const { leadActivity, storeIsTeamAlive, storeIsTeamProvisioning, fetchTeamAgentRuntime } =
+    useStore(
+      useShallow((s) => ({
+        leadActivity: s.leadActivityByTeam[teamName],
+        storeIsTeamAlive: selectTeamDataForName(s, teamName)?.isAlive,
+        storeIsTeamProvisioning: isTeamProvisioningActive(s, teamName),
+        fetchTeamAgentRuntime: s.fetchTeamAgentRuntime,
+      }))
+    );
+
+  const effectiveIsTeamAlive = isTeamAlive ?? storeIsTeamAlive;
+  const effectiveIsTeamProvisioning = isTeamProvisioning ?? storeIsTeamProvisioning;
+
+  useEffect(() => {
+    if (!enabled) return;
+    const shouldWatch =
+      effectiveIsTeamProvisioning ||
+      effectiveIsTeamAlive === true ||
+      leadActivity === 'active' ||
+      leadActivity === 'idle';
+    if (!shouldWatch) return;
+
+    void fetchTeamAgentRuntime(teamName);
+    const timer = window.setInterval(() => {
+      void fetchTeamAgentRuntime(teamName);
+    }, TEAM_AGENT_RUNTIME_REFRESH_MS);
+    return () => {
+      window.clearInterval(timer);
+    };
+  }, [
+    effectiveIsTeamAlive,
+    effectiveIsTeamProvisioning,
+    enabled,
+    fetchTeamAgentRuntime,
+    leadActivity,
+    teamName,
+  ]);
+}
diff --git a/src/renderer/components/ui/checkbox.tsx b/src/renderer/components/ui/checkbox.tsx
index 151c69fc..9ad642ea 100644
--- a/src/renderer/components/ui/checkbox.tsx
+++ b/src/renderer/components/ui/checkbox.tsx
@@ -2,12 +2,12 @@ import * as React from 'react';
 
 import * as CheckboxPrimitive from '@radix-ui/react-checkbox';
 import { cn } from '@renderer/lib/utils';
-import { Check } from 'lucide-react';
+import { Check, Minus } from 'lucide-react';
 
 const Checkbox = React.forwardRef<
   React.ComponentRef<typeof CheckboxPrimitive.Root>,
   React.ComponentPropsWithoutRef<typeof CheckboxPrimitive.Root>
->(({ className, ...props }, ref) => (
+>(({ className, checked, ...props }, ref) => (
   <CheckboxPrimitive.Root
     ref={ref}
     className={cn(
@@ -15,12 +15,14 @@ const Checkbox = React.forwardRef<
       'focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-[var(--color-accent)]',
       'disabled:cursor-not-allowed disabled:opacity-50',
       'data-[state=checked]:border-[var(--color-accent)] data-[state=checked]:bg-[var(--color-accent)] data-[state=checked]:text-white',
+      'data-[state=indeterminate]:border-[var(--color-accent)] data-[state=indeterminate]:bg-[var(--color-accent)] data-[state=indeterminate]:text-white',
       className
     )}
+    checked={checked}
     {...props}
   >
     <CheckboxPrimitive.Indicator className="flex items-center justify-center text-current">
-      <Check className="size-3" />
+      {checked === 'indeterminate' ? <Minus className="size-3" /> : <Check className="size-3" />}
     </CheckboxPrimitive.Indicator>
   </CheckboxPrimitive.Root>
 ));
diff --git a/src/renderer/components/ui/hover-tooltip.tsx b/src/renderer/components/ui/hover-tooltip.tsx
index f6809d94..753310cc 100644
--- a/src/renderer/components/ui/hover-tooltip.tsx
+++ b/src/renderer/components/ui/hover-tooltip.tsx
@@ -13,6 +13,7 @@ interface HoverTooltipProps {
   className?: string;
   contentClassName?: string;
   disabled?: boolean;
+  dismissOnClick?: boolean;
   side?: HoverTooltipSide;
   stopClickPropagation?: boolean;
   title?: string;
@@ -45,11 +46,13 @@ export const HoverTooltip = ({
   className,
   contentClassName,
   disabled = false,
+  dismissOnClick = false,
   side = 'top',
   stopClickPropagation = false,
   title,
 }: Readonly<HoverTooltipProps>): React.JSX.Element => {
   const TooltipWrapper = as;
+  const [dismissed, setDismissed] = React.useState(false);
 
   if (disabled || !content) {
     return <TooltipWrapper className={className}>{children}</TooltipWrapper>;
@@ -58,17 +61,25 @@ export const HoverTooltip = ({
   return (
     <TooltipWrapper
       className={cn('group/hover-tooltip relative inline-flex min-w-0', className)}
-      title={title}
-      onClick={
-        stopClickPropagation ? (event: React.MouseEvent) => event.stopPropagation() : undefined
-      }
+      title={dismissed ? undefined : title}
+      onBlur={dismissOnClick ? () => setDismissed(false) : undefined}
+      onClick={(event: React.MouseEvent) => {
+        if (dismissOnClick) {
+          setDismissed(true);
+        }
+        if (stopClickPropagation) {
+          event.stopPropagation();
+        }
+      }}
+      onMouseLeave={dismissOnClick ? () => setDismissed(false) : undefined}
     >
       {children}
       <span
         aria-hidden="true"
         className={cn(
           'pointer-events-none absolute z-[80] w-max max-w-72 rounded-md border border-[var(--color-border-emphasis)] bg-[var(--color-surface-overlay)] px-2.5 py-1.5 text-left text-xs font-normal leading-relaxed text-[var(--color-text)] opacity-0 shadow-2xl shadow-black/40 ring-1 ring-black/10 transition-opacity duration-100',
-          'group-focus-within/hover-tooltip:opacity-100 group-hover/hover-tooltip:opacity-100',
+          !dismissed &&
+            'group-focus-within/hover-tooltip:opacity-100 group-hover/hover-tooltip:opacity-100',
           sideClassBySide[side],
           alignClassByAlign[align],
           contentClassName
diff --git a/src/renderer/hooks/useCreateTeamDraft.test.tsx b/src/renderer/hooks/useCreateTeamDraft.test.tsx
index 2494f8f2..79b11440 100644
--- a/src/renderer/hooks/useCreateTeamDraft.test.tsx
+++ b/src/renderer/hooks/useCreateTeamDraft.test.tsx
@@ -143,4 +143,84 @@ describe('useCreateTeamDraft', () => {
       root.unmount();
     });
   });
+
+  it('preserves per-member MCP policy in saved create-team drafts', async () => {
+    loadSnapshotMock.mockResolvedValue({
+      version: 1,
+      teamName: 'team-alpha',
+      members: [
+        {
+          id: 'member-1',
+          name: 'alice',
+          roleSelection: 'developer',
+          customRole: '',
+          mcpPolicy: { mode: 'appOnly' },
+        },
+      ],
+      syncModelsWithLead: true,
+      teammateWorktreeDefault: false,
+      cwdMode: 'project',
+      selectedProjectPath: '',
+      customCwd: '',
+      soloTeam: false,
+      launchTeam: true,
+      teamColor: '',
+      updatedAt: Date.now(),
+    });
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    let loadedDraft: ReturnType<typeof useCreateTeamDraft> | null = null;
+
+    await act(async () => {
+      root.render(
+        React.createElement(HookProbeWithDraft, {
+          onLoaded: (draft) => {
+            loadedDraft = draft;
+          },
+        })
+      );
+      await Promise.resolve();
+      await Promise.resolve();
+    });
+
+    const draft = loadedDraft as ReturnType<typeof useCreateTeamDraft> | null;
+    expect(draft).not.toBeNull();
+    if (!draft) {
+      throw new Error('Draft did not load');
+    }
+    expect(draft.members[0]?.mcpPolicy).toEqual({ mode: 'appOnly' });
+
+    act(() => {
+      draft.setMembers([
+        {
+          id: 'member-1',
+          name: 'alice',
+          roleSelection: 'developer',
+          customRole: '',
+          mcpPolicy: {
+            mode: 'strictAllowlist',
+            scopes: { user: true, project: false, local: false },
+            serverNames: ['github'],
+          },
+        },
+      ]);
+      root.unmount();
+    });
+
+    expect(saveSnapshotMock).toHaveBeenCalledWith(
+      expect.objectContaining({
+        members: [
+          expect.objectContaining({
+            mcpPolicy: {
+              mode: 'strictAllowlist',
+              scopes: { user: true, project: false, local: false },
+              serverNames: ['github'],
+            },
+          }),
+        ],
+      })
+    );
+  });
 });
diff --git a/src/renderer/hooks/useCreateTeamDraft.ts b/src/renderer/hooks/useCreateTeamDraft.ts
index 933c0381..09bba769 100644
--- a/src/renderer/hooks/useCreateTeamDraft.ts
+++ b/src/renderer/hooks/useCreateTeamDraft.ts
@@ -26,6 +26,7 @@ import {
   setStoredCreateTeamMemberRuntimePreferences,
   setStoredCreateTeamSyncModelsWithLead,
 } from '@renderer/services/createTeamPreferences';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 
 import type { MemberDraft } from '@renderer/components/team/members/membersEditorTypes';
 
@@ -73,7 +74,7 @@ const DEBOUNCE_MS = 400;
 
 function serializeMembers(members: MemberDraft[]): SerializedMemberDraft[] {
   return members.map(
-    ({ id, name, roleSelection, customRole, workflow, isolation, providerId, model, effort }) => ({
+    ({
       id,
       name,
       roleSelection,
@@ -83,6 +84,18 @@ function serializeMembers(members: MemberDraft[]): SerializedMemberDraft[] {
       providerId,
       model,
       effort,
+      mcpPolicy,
+    }) => ({
+      id,
+      name,
+      roleSelection,
+      customRole,
+      workflow,
+      isolation,
+      providerId,
+      model,
+      effort,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(mcpPolicy),
     })
   );
 }
@@ -99,6 +112,7 @@ function deserializeMembers(serialized: SerializedMemberDraft[]): MemberDraft[]
       providerId: m.providerId,
       model: m.model,
       effort: m.effort,
+      mcpPolicy: normalizeTeamMemberMcpPolicy(m.mcpPolicy),
     })
   );
 }
diff --git a/src/renderer/index.html b/src/renderer/index.html
index 8b1d07d1..387ab289 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -652,7 +652,7 @@
         var TEAM_MEMBER_OFFSETS = [0, 4, 7];
         var TEAM_LABELS = ['Marketing', 'Researchers', 'Coding'];
         var MAX_DPR = 2;
-        var AVATAR_URLS = [
+        var FALLBACK_AVATAR_URLS = [
           './assets/participant-avatars/01.png',
           './assets/participant-avatars/02.png',
           './assets/participant-avatars/03.png',
@@ -667,9 +667,36 @@
           './assets/participant-avatars/12.png',
           './assets/participant-avatars/13.png',
         ];
+        var AVATAR_URLS = resolveAvatarUrls();
         var avatarCache = new Map();
         var avatarLoading = new Map();
 
+        function resolveAvatarUrls() {
+          var links = document.querySelectorAll(
+            'link[rel="preload"][as="image"][type="image/png"]'
+          );
+          var urlsByIndex = [];
+
+          for (var i = 0; i < links.length; i++) {
+            var href = links[i].getAttribute('href');
+            if (!href) continue;
+
+            var match = href.match(/(?:^|\/)(0[1-9]|1[0-3])(?:-[^/?#]+)?\.png(?:[?#].*)?$/);
+            if (!match) continue;
+
+            urlsByIndex[Number(match[1]) - 1] = href;
+          }
+
+          var resolved = [];
+          for (var avatarIndex = 0; avatarIndex < FALLBACK_AVATAR_URLS.length; avatarIndex++) {
+            var url = urlsByIndex[avatarIndex];
+            if (!url) return FALLBACK_AVATAR_URLS;
+            resolved.push(url);
+          }
+
+          return resolved;
+        }
+
         function startFileSplashScene(splash) {
           if (window.__claudeTeamsSplashScene && splash.querySelector('#splash-enhanced-canvas')) {
             return window.__claudeTeamsSplashScene;
diff --git a/src/renderer/services/createTeamDraftStorage.ts b/src/renderer/services/createTeamDraftStorage.ts
index fdc48fa0..54d56aa8 100644
--- a/src/renderer/services/createTeamDraftStorage.ts
+++ b/src/renderer/services/createTeamDraftStorage.ts
@@ -10,10 +10,11 @@
  */
 
 import { isTeamEffortLevel } from '@shared/utils/effortLevels';
+import { normalizeTeamMemberMcpPolicy } from '@shared/utils/teamMemberMcpPolicy';
 import { isTeamProviderId } from '@shared/utils/teamProvider';
 import { del, get, set } from 'idb-keyval';
 
-import type { TeamProviderId } from '@shared/types';
+import type { TeamMemberMcpPolicy, TeamProviderId } from '@shared/types';
 import type { EffortLevel } from '@shared/types';
 
 // ---------------------------------------------------------------------------
@@ -34,6 +35,7 @@ export interface SerializedMemberDraft {
   providerId?: TeamProviderId;
   model?: string;
   effort?: EffortLevel;
+  mcpPolicy?: TeamMemberMcpPolicy;
 }
 
 export interface CreateTeamDraftSnapshot {
@@ -64,6 +66,10 @@ const STORAGE_KEY = 'createTeamDraft:form';
 function isValidMember(m: unknown): m is SerializedMemberDraft {
   if (typeof m !== 'object' || m === null) return false;
   const obj = m as Record<string, unknown>;
+  const mcpPolicyMode =
+    obj.mcpPolicy && typeof obj.mcpPolicy === 'object'
+      ? (obj.mcpPolicy as Record<string, unknown>).mode
+      : undefined;
   return (
     typeof obj.id === 'string' &&
     typeof obj.name === 'string' &&
@@ -72,7 +78,10 @@ function isValidMember(m: unknown): m is SerializedMemberDraft {
     (obj.isolation === undefined || obj.isolation === 'worktree') &&
     (obj.providerId === undefined || isTeamProviderId(obj.providerId)) &&
     (obj.model === undefined || typeof obj.model === 'string') &&
-    (obj.effort === undefined || isTeamEffortLevel(obj.effort))
+    (obj.effort === undefined || isTeamEffortLevel(obj.effort)) &&
+    (obj.mcpPolicy === undefined ||
+      mcpPolicyMode === 'inheritLead' ||
+      normalizeTeamMemberMcpPolicy(obj.mcpPolicy) !== undefined)
   );
 }
 
diff --git a/src/renderer/store/slices/teamSlice.ts b/src/renderer/store/slices/teamSlice.ts
index fc56e85d..bf570a3b 100644
--- a/src/renderer/store/slices/teamSlice.ts
+++ b/src/renderer/store/slices/teamSlice.ts
@@ -2035,6 +2035,7 @@ function buildConfigFallbackMemberSnapshots(snapshot: TeamViewSnapshot): TeamMem
       providerBackendId: member.providerBackendId,
       model: member.model,
       effort: member.effort,
+      mcpPolicy: member.mcpPolicy,
       selectedFastMode: member.fastMode,
       cwd: member.cwd,
       removedAt: member.removedAt,
@@ -2082,6 +2083,7 @@ interface SummaryFallbackMemberSource {
   agentId?: string;
   role?: string;
   color?: string;
+  mcpPolicy?: TeamMemberSnapshot['mcpPolicy'];
 }
 
 function normalizeSummaryTeammateName(
@@ -2120,6 +2122,7 @@ function getSummaryRosterTeammateSources(summary: TeamSummary): SummaryFallbackM
       agentId: member.agentId,
       role: member.role,
       color: member.color,
+      mcpPolicy: member.mcpPolicy,
     });
   }
   return sources;
@@ -2218,7 +2221,7 @@ function buildSummaryFallbackMemberSnapshots(
   const seenNames = new Set<string>();
   const buildSnapshot = (
     name: string,
-    source?: { agentId?: string; role?: string; color?: string },
+    source?: Omit<SummaryFallbackMemberSource, 'name'>,
     lead = false
   ): TeamMemberSnapshot | null => {
     const trimmed = name.trim();
@@ -2237,6 +2240,7 @@ function buildSummaryFallbackMemberSnapshots(
       color: source?.color ?? getMemberColorByName(trimmed),
       agentType: lead ? 'team-lead' : undefined,
       role: source?.role ?? (lead ? 'Team Lead' : undefined),
+      mcpPolicy: source?.mcpPolicy,
     };
   };
 
@@ -3070,6 +3074,33 @@ export interface TeamSlice {
 
 // --- Per-team launch params persistence ---
 const LAUNCH_PARAMS_PREFIX = 'team:launchParams:';
+const MESSAGES_PANEL_MODE_STORAGE_KEY = 'team:messagesPanelMode';
+const DEFAULT_MESSAGES_PANEL_MODE: TeamMessagesPanelMode = 'sidebar';
+const VALID_MESSAGES_PANEL_MODES: ReadonlySet<TeamMessagesPanelMode> = new Set([
+  'sidebar',
+  'inline',
+  'bottom-sheet',
+  'floating-composer',
+]);
+
+export function loadPersistedMessagesPanelMode(): TeamMessagesPanelMode {
+  try {
+    const persisted = localStorage.getItem(MESSAGES_PANEL_MODE_STORAGE_KEY);
+    return VALID_MESSAGES_PANEL_MODES.has(persisted as TeamMessagesPanelMode)
+      ? (persisted as TeamMessagesPanelMode)
+      : DEFAULT_MESSAGES_PANEL_MODE;
+  } catch {
+    return DEFAULT_MESSAGES_PANEL_MODE;
+  }
+}
+
+export function savePersistedMessagesPanelMode(mode: TeamMessagesPanelMode): void {
+  try {
+    localStorage.setItem(MESSAGES_PANEL_MODE_STORAGE_KEY, mode);
+  } catch {
+    // ignore - best-effort UI preference persistence
+  }
+}
 
 export function getCurrentProvisioningProgressForTeam(
   state: Pick<TeamSlice, 'currentProvisioningRunIdByTeam' | 'provisioningRuns'>,
@@ -3440,10 +3471,13 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
   toolApprovalSettings: loadToolApprovalSettings(),
 
   // Messages panel UI state
-  messagesPanelMode: 'sidebar' as const,
+  messagesPanelMode: loadPersistedMessagesPanelMode(),
   messagesPanelWidth: 340,
   sidebarLogsHeight: 213,
-  setMessagesPanelMode: (mode: TeamMessagesPanelMode) => set({ messagesPanelMode: mode }),
+  setMessagesPanelMode: (mode: TeamMessagesPanelMode) => {
+    savePersistedMessagesPanelMode(mode);
+    set({ messagesPanelMode: mode });
+  },
   setMessagesPanelWidth: (width: number) => set({ messagesPanelWidth: width }),
   setSidebarLogsHeight: (height: number) => set({ sidebarLogsHeight: height }),
 
@@ -5572,7 +5606,11 @@ export const createTeamSlice: StateCreator<AppState, [], [], TeamSlice> = (set,
           description: request.description || '',
           color: request.color,
           memberCount: request.members.length,
-          members: request.members.map((m) => ({ name: m.name, role: m.role })),
+          members: request.members.map((m) => ({
+            name: m.name,
+            role: m.role,
+            mcpPolicy: m.mcpPolicy,
+          })),
           taskCount: 0,
           lastActivity: null,
           projectPath: request.cwd || undefined,
diff --git a/src/renderer/types/notifications.ts b/src/renderer/types/notifications.ts
index 784dbf76..1f9cf2b5 100644
--- a/src/renderer/types/notifications.ts
+++ b/src/renderer/types/notifications.ts
@@ -1,5 +1,5 @@
 /**
- * Notification and configuration types for Agent Teams UI.
+ * Notification and configuration types for Agent Teams AI.
  *
  * Re-exports types from shared for backwards compatibility.
  * The canonical definitions are in @shared/types/notifications.
diff --git a/src/renderer/utils/__tests__/teamEffortOptions.test.ts b/src/renderer/utils/__tests__/teamEffortOptions.test.ts
index 481a6236..445efdcd 100644
--- a/src/renderer/utils/__tests__/teamEffortOptions.test.ts
+++ b/src/renderer/utils/__tests__/teamEffortOptions.test.ts
@@ -10,7 +10,7 @@ function createProviderStatus(
   options: {
     source?: 'anthropic-models-api' | 'app-server' | 'static-fallback';
     configPassthrough?: boolean;
-    runtimeValues?: CliProviderStatus['runtimeCapabilities'];
+    runtimeValues?: CliProviderStatus['runtimeCapabilities'] | null;
   } = {}
 ): CliProviderStatus {
   const source =
@@ -40,14 +40,17 @@ function createProviderStatus(
       },
     },
     modelAvailability: [],
-    runtimeCapabilities: options.runtimeValues ?? {
-      modelCatalog: { dynamic: true, source },
-      reasoningEffort: {
-        supported: true,
-        values: model.supportedReasoningEfforts,
-        configPassthrough: options.configPassthrough === true,
-      },
-    },
+    runtimeCapabilities:
+      options.runtimeValues === undefined
+        ? {
+            modelCatalog: { dynamic: true, source },
+            reasoningEffort: {
+              supported: true,
+              values: model.supportedReasoningEfforts,
+              configPassthrough: options.configPassthrough === true,
+            },
+          }
+        : options.runtimeValues,
     canLoginFromUi: true,
     capabilities: {
       teamLaunch: true,
@@ -191,6 +194,90 @@ describe('team effort options', () => {
     ]);
   });
 
+  it('shows fallback Anthropic effort options for known models while catalog truth is unavailable', () => {
+    expect(
+      getTeamEffortOptions({
+        providerId: 'anthropic',
+        model: 'claude-opus-4-6[1m]',
+        providerStatus: {
+          providerId: 'anthropic',
+          displayName: 'Anthropic',
+          supported: true,
+          authenticated: true,
+          authMethod: 'claude.ai',
+          verificationState: 'verified',
+          models: ['claude-opus-4-6'],
+          modelCatalog: null,
+          modelAvailability: [],
+          runtimeCapabilities: null,
+          canLoginFromUi: true,
+          capabilities: {
+            teamLaunch: true,
+            oneShot: true,
+            extensions: {
+              plugins: { status: 'supported', ownership: 'shared', reason: null },
+              mcp: { status: 'supported', ownership: 'shared', reason: null },
+              skills: { status: 'supported', ownership: 'shared', reason: null },
+              apiKeys: { status: 'supported', ownership: 'shared', reason: null },
+            },
+          },
+        },
+      })
+    ).toEqual([
+      { value: '', label: 'Default' },
+      { value: 'low', label: 'Low' },
+      { value: 'medium', label: 'Medium' },
+      { value: 'high', label: 'High' },
+      { value: 'max', label: 'Max' },
+    ]);
+  });
+
+  it('does not invent Anthropic effort options for unknown models without catalog truth', () => {
+    expect(
+      getTeamEffortOptions({
+        providerId: 'anthropic',
+        model: 'claude-experimental-5',
+        providerStatus: null,
+      })
+    ).toEqual([{ value: '', label: 'Default' }]);
+  });
+
+  it('shows known Anthropic effort options when catalog lacks the exact selected model entry', () => {
+    const providerStatus = createProviderStatus(
+      'anthropic',
+      {
+        id: 'haiku',
+        launchModel: 'haiku',
+        displayName: 'Haiku 4.5',
+        hidden: false,
+        supportedReasoningEfforts: [],
+        defaultReasoningEffort: null,
+        inputModalities: ['text', 'image'],
+        supportsPersonality: false,
+        isDefault: true,
+        upgrade: false,
+        source: 'anthropic-models-api',
+      },
+      { runtimeValues: null }
+    );
+
+    const presentation = getTeamEffortSelectorPresentation({
+      providerId: 'anthropic',
+      model: 'claude-opus-4-6[1m]',
+      providerStatus,
+    });
+
+    expect(presentation.options).toEqual([
+      { value: '', label: 'Default' },
+      { value: 'low', label: 'Low' },
+      { value: 'medium', label: 'Medium' },
+      { value: 'high', label: 'High' },
+      { value: 'max', label: 'Max' },
+    ]);
+    expect(presentation.disabled).toBe(false);
+    expect(presentation.canValidateValue).toBe(false);
+  });
+
   it('shows only Default when the selected Anthropic model does not support effort', () => {
     const providerStatus = createProviderStatus('anthropic', {
       id: 'haiku',
diff --git a/src/renderer/utils/memberLaunchDiagnostics.ts b/src/renderer/utils/memberLaunchDiagnostics.ts
index 2ea06e17..a425beef 100644
--- a/src/renderer/utils/memberLaunchDiagnostics.ts
+++ b/src/renderer/utils/memberLaunchDiagnostics.ts
@@ -381,11 +381,6 @@ function buildDiagnosticHints(input: {
       'Bootstrap submit was rejected because local prompt/bash command queue was not empty.'
     );
   }
-  if (textIncludesAny(text, ['no stdin data received in 3s'])) {
-    hints.push(
-      'CLI read empty stdin before bootstrap submit; verify headless teammate runtime flag/env and startup input handling.'
-    );
-  }
   if (
     textIncludesAny(text, ['bootstrap_submit_rejected', 'submit rejected by local prompt handler'])
   ) {
@@ -393,6 +388,18 @@ function buildDiagnosticHints(input: {
       'The teammate process observed bootstrap mail, but local prompt submission did not accept the bootstrap turn.'
     );
   }
+  if (
+    textIncludesAny(text, [
+      'did not bootstrap-confirm',
+      'bootstrap-confirm before timeout',
+      'bootstrap was not confirmed',
+      'last transport stage: bootstrap_submitted',
+    ])
+  ) {
+    hints.push(
+      'Bootstrap prompt was submitted, but teammate did not bootstrap-confirm before timeout.'
+    );
+  }
   if (
     textIncludesAny(text, [
       'did not submit bootstrap prompt',
@@ -401,6 +408,11 @@ function buildDiagnosticHints(input: {
   ) {
     hints.push('Parent process timed out waiting for durable bootstrap_submitted evidence.');
   }
+  if (textIncludesAny(text, ['no stdin data received in 3s'])) {
+    hints.push(
+      'CLI read empty stdin before bootstrap submit; verify headless teammate runtime flag/env and startup input handling.'
+    );
+  }
   if (
     input.livenessKind === 'stale_metadata' ||
     textIncludesAny(text, ['persisted runtime pid is not alive'])
diff --git a/src/renderer/utils/sessionExporter.ts b/src/renderer/utils/sessionExporter.ts
index 879568b1..94b8826d 100644
--- a/src/renderer/utils/sessionExporter.ts
+++ b/src/renderer/utils/sessionExporter.ts
@@ -1,5 +1,5 @@
 /**
- * Session export utilities for Agent Teams UI.
+ * Session export utilities for Agent Teams AI.
  *
  * Provides formatters to export session data as plain text, Markdown, or JSON,
  * and a download trigger for browser-based file saving.
diff --git a/src/renderer/utils/teamEffortOptions.ts b/src/renderer/utils/teamEffortOptions.ts
index d07ce7e9..6ebc78cc 100644
--- a/src/renderer/utils/teamEffortOptions.ts
+++ b/src/renderer/utils/teamEffortOptions.ts
@@ -1,9 +1,13 @@
-import { resolveAnthropicRuntimeSelection } from '@features/anthropic-runtime-profile/renderer';
+import {
+  resolveAnthropicEffortSupport,
+  resolveAnthropicRuntimeSelection,
+} from '@features/anthropic-runtime-profile/renderer';
 
 import type { CliProviderStatus, EffortLevel, TeamProviderId } from '@shared/types';
 
 const BASE_EFFORT_OPTIONS = [{ value: '', label: 'Default' }] as const;
 const SAFE_SHARED_EFFORTS = new Set<EffortLevel>(['low', 'medium', 'high']);
+const ANTHROPIC_FALLBACK_EFFORTS: readonly EffortLevel[] = ['low', 'medium', 'high', 'max'];
 
 export const TEAM_EFFORT_LABELS: Record<EffortLevel, string> = {
   none: 'None',
@@ -67,6 +71,22 @@ function normalizeEfforts(
   return candidateEfforts.filter((effort) => SAFE_SHARED_EFFORTS.has(effort));
 }
 
+function getAnthropicEffortsFromRuntimeOrFallback(params: {
+  providerStatus?: CliProviderStatus | null;
+  selection: ReturnType<typeof resolveAnthropicRuntimeSelection>;
+}): EffortLevel[] {
+  const runtimeEfforts = params.providerStatus?.runtimeCapabilities?.reasoningEffort?.values ?? [];
+  const candidateEfforts = runtimeEfforts.length > 0 ? runtimeEfforts : ANTHROPIC_FALLBACK_EFFORTS;
+  return candidateEfforts.filter(
+    (effort): effort is EffortLevel =>
+      resolveAnthropicEffortSupport({
+        selection: params.selection,
+        effort,
+        runtimeCapabilities: params.providerStatus?.runtimeCapabilities,
+      }).kind === 'supported'
+  );
+}
+
 export function getTeamEffortOptions(params: {
   providerId?: TeamProviderId;
   model?: string;
@@ -90,9 +110,15 @@ export function getTeamEffortOptions(params: {
     const defaultLabel = selection.defaultEffort
       ? `Default (${TEAM_EFFORT_LABELS[selection.defaultEffort]})`
       : 'Default';
+    const effortValues = selection.catalogModel
+      ? selection.supportedEfforts
+      : getAnthropicEffortsFromRuntimeOrFallback({
+          providerStatus: params.providerStatus,
+          selection,
+        });
     return [
       { value: '', label: defaultLabel },
-      ...selection.supportedEfforts.map((effort) => ({
+      ...effortValues.map((effort) => ({
         value: effort,
         label: TEAM_EFFORT_LABELS[effort],
       })),
@@ -163,17 +189,16 @@ export function getTeamEffortSelectorPresentation(params: {
     selectedModel: params.model,
     limitContext: params.limitContext === true,
   });
-  const hasCatalogTruth =
-    selection.catalogSource !== 'unavailable' && selection.catalogStatus !== 'unavailable';
+  const hasExactCatalogTruth = selection.catalogModel !== null;
   const supportsConfigurableEffort = selection.supportedEfforts.length > 0;
 
-  if (!hasCatalogTruth || supportsConfigurableEffort) {
+  if (!hasExactCatalogTruth || supportsConfigurableEffort) {
     return {
       options,
       disabled: false,
       helperText: defaultHelperText,
       unavailableText: null,
-      canValidateValue: hasCatalogTruth,
+      canValidateValue: hasExactCatalogTruth,
     };
   }
 
diff --git a/src/shared/types/api.ts b/src/shared/types/api.ts
index 964decf6..26065421 100644
--- a/src/shared/types/api.ts
+++ b/src/shared/types/api.ts
@@ -84,6 +84,7 @@ import type {
   TeamLaunchResponse,
   TeamMemberActivityMeta,
   TeamMessageNotificationData,
+  TeamProvisioningModelCheckRequest,
   TeamProvisioningModelVerificationMode,
   TeamProvisioningPrepareResult,
   TeamProvisioningProgress,
@@ -494,7 +495,8 @@ export interface TeamsAPI {
     providerIds?: TeamLaunchRequest['providerId'][],
     selectedModels?: string[],
     limitContext?: boolean,
-    modelVerificationMode?: TeamProvisioningModelVerificationMode
+    modelVerificationMode?: TeamProvisioningModelVerificationMode,
+    selectedModelChecks?: TeamProvisioningModelCheckRequest[]
   ) => Promise<TeamProvisioningPrepareResult>;
   getWorktreeGitStatus: (projectPath: string) => Promise<TeamWorktreeGitStatus>;
   initializeGitRepository: (projectPath: string) => Promise<TeamWorktreeGitStatus>;
diff --git a/src/shared/types/notifications.ts b/src/shared/types/notifications.ts
index 8de0313f..2ff31565 100644
--- a/src/shared/types/notifications.ts
+++ b/src/shared/types/notifications.ts
@@ -1,5 +1,5 @@
 /**
- * Notification and configuration types for Agent Teams UI.
+ * Notification and configuration types for Agent Teams AI.
  *
  * These types define:
  * - Detected errors from session files
diff --git a/src/shared/types/team.ts b/src/shared/types/team.ts
index 117905ae..c3442c5b 100644
--- a/src/shared/types/team.ts
+++ b/src/shared/types/team.ts
@@ -15,12 +15,23 @@ export interface TeamMember {
   model?: string;
   effort?: EffortLevel;
   fastMode?: TeamFastMode;
+  mcpPolicy?: TeamMemberMcpPolicy;
   color?: string;
   joinedAt?: number;
   cwd?: string;
   removedAt?: number;
 }
 
+export type TeamMemberMcpScope = 'user' | 'project' | 'local';
+
+export type TeamMemberMcpMode = 'inheritLead' | 'inheritScopes' | 'strictAllowlist' | 'appOnly';
+
+export interface TeamMemberMcpPolicy {
+  mode: TeamMemberMcpMode;
+  scopes?: Partial<Record<TeamMemberMcpScope, boolean>>;
+  serverNames?: string[];
+}
+
 export interface TeamConfig {
   name: string;
   description?: string;
@@ -47,6 +58,7 @@ export interface TeamSummaryMember {
   agentId?: string;
   role?: string;
   color?: string;
+  mcpPolicy?: TeamMemberMcpPolicy;
 }
 
 export interface TeamSummary {
@@ -837,6 +849,7 @@ export interface ResolvedTeamMember {
   providerBackendId?: TeamProviderBackendId;
   model?: string;
   effort?: EffortLevel;
+  mcpPolicy?: TeamMemberMcpPolicy;
   selectedFastMode?: TeamFastMode;
   resolvedFastMode?: boolean;
   laneId?: string;
@@ -906,6 +919,7 @@ export interface TeamMemberSnapshot {
   providerBackendId?: TeamProviderBackendId;
   model?: string;
   effort?: EffortLevel;
+  mcpPolicy?: TeamMemberMcpPolicy;
   selectedFastMode?: TeamFastMode;
   resolvedFastMode?: boolean;
   laneId?: string;
@@ -1394,6 +1408,7 @@ export interface TeamProvisioningMemberInput {
   model?: string;
   effort?: EffortLevel;
   fastMode?: TeamFastMode;
+  mcpPolicy?: TeamMemberMcpPolicy;
 }
 
 export type TeamWorktreeGitBlockReason =
@@ -1466,6 +1481,12 @@ export interface TeamCreateResponse {
 
 export type TeamProvisioningModelVerificationMode = 'compatibility' | 'deep';
 
+export interface TeamProvisioningModelCheckRequest {
+  providerId: TeamProviderId;
+  model: string;
+  effort?: EffortLevel;
+}
+
 export type TeamProvisioningPrepareIssueScope = 'provider' | 'model';
 export type TeamProvisioningPrepareIssueSeverity = 'blocking' | 'warning';
 
@@ -1655,6 +1676,7 @@ export interface AddMemberRequest {
   providerId?: TeamProviderId;
   model?: string;
   effort?: EffortLevel;
+  mcpPolicy?: TeamMemberMcpPolicy;
 }
 
 export interface RemoveMemberRequest {
diff --git a/src/shared/types/visualization.ts b/src/shared/types/visualization.ts
index 4be1ad80..40cdb61c 100644
--- a/src/shared/types/visualization.ts
+++ b/src/shared/types/visualization.ts
@@ -1,5 +1,5 @@
 /**
- * Visualization-specific types for Agent Teams UI.
+ * Visualization-specific types for Agent Teams AI.
  *
  * These types are used for waterfall chart visualization
  * and are shared between main and renderer processes.
diff --git a/src/shared/utils/__tests__/ephemeralProjectPath.test.ts b/src/shared/utils/__tests__/ephemeralProjectPath.test.ts
index 63ef1877..e8da7ecb 100644
--- a/src/shared/utils/__tests__/ephemeralProjectPath.test.ts
+++ b/src/shared/utils/__tests__/ephemeralProjectPath.test.ts
@@ -34,6 +34,17 @@ describe('isEphemeralProjectPath', () => {
     );
   });
 
+  it('detects provider launch stress temp project paths only under temp roots', () => {
+    expect(
+      isEphemeralProjectPath(
+        '/private/var/folders/7b/ydmc_b0n251bc4hss4tz8y880000gn/T/provider-launch-stress-live-rn5TFr/project'
+      )
+    ).toBe(true);
+    expect(
+      isEphemeralProjectPath('/Users/test/projects/provider-launch-stress-live-real/project')
+    ).toBe(false);
+  });
+
   it('keeps normal project paths selectable', () => {
     expect(isEphemeralProjectPath('/Users/test/projects/claude_team')).toBe(false);
     expect(isEphemeralProjectPath('')).toBe(false);
diff --git a/src/shared/utils/ephemeralProjectPath.ts b/src/shared/utils/ephemeralProjectPath.ts
index 00ddc4cd..c198afe0 100644
--- a/src/shared/utils/ephemeralProjectPath.ts
+++ b/src/shared/utils/ephemeralProjectPath.ts
@@ -11,6 +11,13 @@ function getBasename(normalizedPath: string): string {
   return segments[segments.length - 1] ?? '';
 }
 
+function hasPathSegmentWithPrefix(normalizedPath: string, prefix: string): boolean {
+  return normalizedPath
+    .split('/')
+    .filter(Boolean)
+    .some((segment) => segment.startsWith(prefix));
+}
+
 function isKnownTempRoot(normalizedPath: string): boolean {
   return (
     normalizedPath.startsWith('/private/var/folders/') ||
@@ -37,5 +44,9 @@ export function isEphemeralProjectPath(projectPath: string | null | undefined):
   }
 
   const basename = getBasename(normalizedPath);
-  return basename.startsWith('codex-agent-teams-appstyle-') && isKnownTempRoot(normalizedPath);
+  return (
+    (basename.startsWith('codex-agent-teams-appstyle-') ||
+      hasPathSegmentWithPrefix(normalizedPath, 'provider-launch-stress-live-')) &&
+    isKnownTempRoot(normalizedPath)
+  );
 }
diff --git a/src/shared/utils/teamMemberMcpPolicy.ts b/src/shared/utils/teamMemberMcpPolicy.ts
new file mode 100644
index 00000000..83f4f171
--- /dev/null
+++ b/src/shared/utils/teamMemberMcpPolicy.ts
@@ -0,0 +1,141 @@
+import type { TeamMemberMcpMode, TeamMemberMcpPolicy, TeamMemberMcpScope } from '@shared/types';
+
+export const TEAM_MEMBER_MCP_SCOPES: readonly TeamMemberMcpScope[] = [
+  'user',
+  'project',
+  'local',
+] as const;
+
+const TEAM_MEMBER_MCP_MODES = new Set<TeamMemberMcpMode>([
+  'inheritLead',
+  'inheritScopes',
+  'strictAllowlist',
+  'appOnly',
+]);
+
+const DEFAULT_MCP_SCOPES: Record<TeamMemberMcpScope, boolean> = {
+  user: true,
+  project: true,
+  local: true,
+};
+
+function hasAnyResolvedMcpScope(scopes: Partial<Record<TeamMemberMcpScope, boolean>>): boolean {
+  return TEAM_MEMBER_MCP_SCOPES.some((scope) => scopes[scope] ?? DEFAULT_MCP_SCOPES[scope]);
+}
+
+function normalizeMcpMode(value: unknown): TeamMemberMcpMode | null {
+  return typeof value === 'string' && TEAM_MEMBER_MCP_MODES.has(value as TeamMemberMcpMode)
+    ? (value as TeamMemberMcpMode)
+    : null;
+}
+
+export function normalizeTeamMemberMcpScopes(
+  value: unknown
+): Partial<Record<TeamMemberMcpScope, boolean>> | undefined {
+  if (!value || typeof value !== 'object') {
+    return undefined;
+  }
+
+  const input = value as Record<string, unknown>;
+  const out: Partial<Record<TeamMemberMcpScope, boolean>> = {};
+  for (const scope of TEAM_MEMBER_MCP_SCOPES) {
+    if (typeof input[scope] === 'boolean') {
+      out[scope] = input[scope];
+    }
+  }
+
+  return Object.keys(out).length > 0 ? out : undefined;
+}
+
+export function normalizeTeamMemberMcpServerNames(value: unknown): string[] | undefined {
+  if (!Array.isArray(value)) {
+    return undefined;
+  }
+
+  const seen = new Set<string>();
+  const names: string[] = [];
+  for (const item of value) {
+    if (typeof item !== 'string') {
+      continue;
+    }
+    const name = item.trim();
+    if (!name || name.length > 128) {
+      continue;
+    }
+    const key = name.toLowerCase();
+    if (seen.has(key)) {
+      continue;
+    }
+    seen.add(key);
+    names.push(name);
+    if (names.length >= 100) {
+      break;
+    }
+  }
+
+  return names.length > 0 ? names : undefined;
+}
+
+export function normalizeTeamMemberMcpPolicy(value: unknown): TeamMemberMcpPolicy | undefined {
+  if (!value || typeof value !== 'object') {
+    return undefined;
+  }
+
+  const input = value as Record<string, unknown>;
+  const mode = normalizeMcpMode(input.mode);
+  if (!mode || mode === 'inheritLead') {
+    return undefined;
+  }
+
+  const scopes = normalizeTeamMemberMcpScopes(input.scopes);
+  const serverNames = normalizeTeamMemberMcpServerNames(input.serverNames);
+
+  if (mode === 'appOnly') {
+    return { mode };
+  }
+
+  if (scopes && !hasAnyResolvedMcpScope(scopes)) {
+    return {
+      mode: 'appOnly',
+    };
+  }
+
+  if (mode === 'strictAllowlist') {
+    return {
+      mode,
+      ...(scopes ? { scopes } : {}),
+      ...(serverNames ? { serverNames } : {}),
+    };
+  }
+
+  return {
+    mode,
+    ...(scopes ? { scopes } : {}),
+  };
+}
+
+export function resolveTeamMemberMcpScopes(
+  policy: TeamMemberMcpPolicy | undefined
+): Record<TeamMemberMcpScope, boolean> {
+  return {
+    user: policy?.scopes?.user ?? DEFAULT_MCP_SCOPES.user,
+    project: policy?.scopes?.project ?? DEFAULT_MCP_SCOPES.project,
+    local: policy?.scopes?.local ?? DEFAULT_MCP_SCOPES.local,
+  };
+}
+
+export function buildTeamMemberMcpSettingSources(policy: TeamMemberMcpPolicy | undefined): string {
+  if (policy?.mode !== 'inheritScopes') {
+    return 'user,project,local';
+  }
+
+  const scopes = resolveTeamMemberMcpScopes(policy);
+  const selected = TEAM_MEMBER_MCP_SCOPES.filter((scope) => scopes[scope]);
+  return selected.length > 0 ? selected.join(',') : 'user,project,local';
+}
+
+export function requiresStrictTeamMemberMcpConfig(
+  policy: TeamMemberMcpPolicy | undefined
+): boolean {
+  return policy?.mode === 'strictAllowlist' || policy?.mode === 'appOnly';
+}
diff --git a/test/features/anthropic-runtime-profile/resolveAnthropicRuntimeProfile.test.ts b/test/features/anthropic-runtime-profile/resolveAnthropicRuntimeProfile.test.ts
index c806d70b..997feb6d 100644
--- a/test/features/anthropic-runtime-profile/resolveAnthropicRuntimeProfile.test.ts
+++ b/test/features/anthropic-runtime-profile/resolveAnthropicRuntimeProfile.test.ts
@@ -1,13 +1,13 @@
-import { describe, expect, it } from 'vitest';
-
 import {
+  type AnthropicRuntimeProfileSource,
   reconcileAnthropicRuntimeSelections,
+  resolveAnthropicEffortSupport,
   resolveAnthropicFastMode,
   resolveAnthropicRuntimeSelection,
 } from '@features/anthropic-runtime-profile/renderer';
-import type { CliProviderModelCatalog, CliProviderRuntimeCapabilities } from '@shared/types';
+import { describe, expect, it } from 'vitest';
 
-import type { AnthropicRuntimeProfileSource } from '@features/anthropic-runtime-profile/renderer';
+import type { CliProviderModelCatalog, CliProviderRuntimeCapabilities } from '@shared/types';
 
 function createAnthropicSource(options: {
   models: CliProviderModelCatalog['models'];
@@ -227,6 +227,58 @@ describe('resolveAnthropicRuntimeProfile', () => {
     });
   });
 
+  it('keeps Default effort empty for Anthropic 1M models that do not support effort', () => {
+    const selection = resolveAnthropicRuntimeSelection({
+      source: createAnthropicSource({
+        defaultLaunchModel: 'opus[1m]',
+        models: [
+          {
+            id: 'opus[1m]',
+            launchModel: 'opus[1m]',
+            displayName: 'Opus 4.7 (1M)',
+            hidden: false,
+            supportedReasoningEfforts: [],
+            defaultReasoningEffort: null,
+            inputModalities: ['text', 'image'],
+            supportsFastMode: false,
+            supportsPersonality: false,
+            isDefault: true,
+            upgrade: false,
+            source: 'anthropic-models-api',
+          },
+        ],
+      }),
+      selectedModel: 'opus[1m]',
+      limitContext: false,
+    });
+
+    expect(selection.supportedEfforts).toEqual([]);
+    expect(selection.defaultEffort).toBeNull();
+    expect(
+      reconcileAnthropicRuntimeSelections({
+        selection,
+        selectedEffort: '',
+        selectedFastMode: 'inherit',
+        providerFastModeDefault: false,
+      })
+    ).toEqual({
+      nextEffort: '',
+      effortResetReason: null,
+      nextFastMode: 'inherit',
+      fastModeResetReason: null,
+    });
+    expect(
+      resolveAnthropicEffortSupport({
+        selection,
+        effort: 'medium',
+        runtimeCapabilities: createAnthropicSource({
+          defaultLaunchModel: 'opus[1m]',
+          models: [],
+        }).runtimeCapabilities,
+      })
+    ).toEqual({ kind: 'unsupported-by-catalog', supportedEfforts: [] });
+  });
+
   it('does not reset explicit max or fast while runtime catalog truth is still unavailable', () => {
     const selection = resolveAnthropicRuntimeSelection({
       source: {
@@ -260,6 +312,130 @@ describe('resolveAnthropicRuntimeProfile', () => {
     ).toBe('Anthropic runtime capability data is still loading.');
   });
 
+  it('does not reset effort when catalog exists but the exact known model entry is missing', () => {
+    const source = createAnthropicSource({
+      defaultLaunchModel: 'haiku',
+      models: [
+        {
+          id: 'haiku',
+          launchModel: 'haiku',
+          displayName: 'Haiku 4.5',
+          hidden: false,
+          supportedReasoningEfforts: [],
+          defaultReasoningEffort: null,
+          inputModalities: ['text', 'image'],
+          supportsFastMode: false,
+          supportsPersonality: false,
+          isDefault: true,
+          upgrade: false,
+          source: 'anthropic-models-api',
+        },
+      ],
+    });
+    const selection = resolveAnthropicRuntimeSelection({
+      source: {
+        modelCatalog: source.modelCatalog,
+        runtimeCapabilities: null,
+      },
+      selectedModel: 'claude-opus-4-6[1m]',
+      limitContext: false,
+    });
+
+    expect(selection.catalogModel).toBeNull();
+    expect(
+      resolveAnthropicEffortSupport({
+        selection,
+        effort: 'medium',
+        runtimeCapabilities: null,
+      })
+    ).toEqual({ kind: 'supported', source: 'static-fallback' });
+    expect(
+      reconcileAnthropicRuntimeSelections({
+        selection,
+        selectedEffort: 'medium',
+        selectedFastMode: 'inherit',
+        providerFastModeDefault: false,
+        runtimeCapabilities: null,
+      })
+    ).toEqual({
+      nextEffort: 'medium',
+      effortResetReason: null,
+      nextFastMode: 'inherit',
+      fastModeResetReason: null,
+    });
+  });
+
+  it('allows known Opus 1M effort when catalog is unavailable but runtime capability passthrough is present', () => {
+    const selection = resolveAnthropicRuntimeSelection({
+      source: {
+        modelCatalog: null,
+        runtimeCapabilities: {
+          reasoningEffort: {
+            supported: true,
+            values: ['low', 'medium', 'high', 'max'],
+            configPassthrough: true,
+          },
+        },
+      },
+      selectedModel: 'claude-opus-4-6[1m]',
+      limitContext: false,
+    });
+
+    expect(
+      resolveAnthropicEffortSupport({
+        selection,
+        effort: 'medium',
+        runtimeCapabilities: {
+          reasoningEffort: {
+            supported: true,
+            values: ['low', 'medium', 'high', 'max'],
+            configPassthrough: true,
+          },
+        },
+      })
+    ).toEqual({ kind: 'supported', source: 'runtime-capability' });
+  });
+
+  it('falls back to runtime launch model ids when catalog is unavailable', () => {
+    const selection = resolveAnthropicRuntimeSelection({
+      source: {
+        modelCatalog: null,
+        runtimeCapabilities: null,
+      },
+      selectedModel: 'claude-opus-4-6[1m]',
+      limitContext: false,
+      availableLaunchModels: ['claude-opus-4-6'],
+    });
+
+    expect(selection.resolvedLaunchModel).toBe('claude-opus-4-6');
+    expect(
+      resolveAnthropicEffortSupport({
+        selection,
+        effort: 'medium',
+        runtimeCapabilities: null,
+      })
+    ).toEqual({ kind: 'supported', source: 'static-fallback' });
+  });
+
+  it('does not infer effort support for unknown Anthropic models without catalog truth', () => {
+    const selection = resolveAnthropicRuntimeSelection({
+      source: {
+        modelCatalog: null,
+        runtimeCapabilities: null,
+      },
+      selectedModel: 'claude-experimental-5',
+      limitContext: false,
+    });
+
+    expect(
+      resolveAnthropicEffortSupport({
+        selection,
+        effort: 'medium',
+        runtimeCapabilities: null,
+      })
+    ).toEqual({ kind: 'unverified-catalog-missing' });
+  });
+
   it('keeps the fast control visible in degraded states and surfaces the provider reason', () => {
     const selection = resolveAnthropicRuntimeSelection({
       source: createAnthropicSource({
diff --git a/test/main/build/electronBuilderAfterPack.test.ts b/test/main/build/electronBuilderAfterPack.test.ts
index 8835dbfc..150cbaf8 100644
--- a/test/main/build/electronBuilderAfterPack.test.ts
+++ b/test/main/build/electronBuilderAfterPack.test.ts
@@ -157,7 +157,7 @@ describe('electron-builder afterPack', () => {
     tempDirs.push(tempDir);
 
     writeFile(
-      path.join(tempDir, 'Contents', 'MacOS', 'Agent Teams UI'),
+      path.join(tempDir, 'Contents', 'MacOS', 'Agent Teams AI'),
       createMachOBuffer('arm64')
     );
     writeFile(
@@ -229,7 +229,7 @@ describe('electron-builder afterPack', () => {
     const tempDir = createTempDir();
     tempDirs.push(tempDir);
 
-    writeFile(path.join(tempDir, 'Agent Teams UI.exe'), createPortableExecutableBuffer('x64'));
+    writeFile(path.join(tempDir, 'Agent Teams AI.exe'), createPortableExecutableBuffer('x64'));
     writeFile(
       path.join(
         tempDir,
diff --git a/test/main/build/electronBuilderDistScript.test.ts b/test/main/build/electronBuilderDistScript.test.ts
index 79ae4377..520ec55a 100644
--- a/test/main/build/electronBuilderDistScript.test.ts
+++ b/test/main/build/electronBuilderDistScript.test.ts
@@ -15,8 +15,8 @@ describe('electron-builder dist wrapper', () => {
           '--linux',
           '--publish',
           'never',
-          '--config.productName=Agent-Teams-UI',
-          '--config.linux.desktop.entry.Name=Agent Teams UI',
+          '--config.productName=Agent-Teams-AI',
+          '--config.linux.desktop.entry.Name=Agent Teams AI',
         ],
       },
     ]);
@@ -29,8 +29,8 @@ describe('electron-builder dist wrapper', () => {
           '--linux',
           '--publish',
           'never',
-          '--config.productName=Agent-Teams-UI',
-          '--config.linux.desktop.entry.Name=Agent Teams UI',
+          '--config.productName=Agent-Teams-AI',
+          '--config.linux.desktop.entry.Name=Agent Teams AI',
         ],
       },
     ]);
diff --git a/test/main/ipc/editor.test.ts b/test/main/ipc/editor.test.ts
index 3917a7c0..a174625d 100644
--- a/test/main/ipc/editor.test.ts
+++ b/test/main/ipc/editor.test.ts
@@ -133,6 +133,12 @@ function createStats(
   } as Awaited<ReturnType<typeof fs.stat>>;
 }
 
+function createFsError(code: string): NodeJS.ErrnoException {
+  const error = new Error(code) as NodeJS.ErrnoException;
+  error.code = code;
+  return error;
+}
+
 // =============================================================================
 // Tests
 // =============================================================================
@@ -354,6 +360,39 @@ describe('Editor IPC handlers', () => {
     });
   });
 
+  describe('project:listFiles', () => {
+    it('returns an empty list for deleted project paths', async () => {
+      vi.mocked(fs.stat).mockRejectedValue(createFsError('ENOENT'));
+
+      const result = await mockIpc.invoke('project:listFiles', '/tmp/deleted-project');
+
+      expect(result).toEqual({
+        success: true,
+        data: [],
+      });
+    });
+
+    it('returns an empty list for paths that are not directories', async () => {
+      vi.mocked(fs.stat).mockResolvedValue(createStats({ isDirectory: false, isFile: true }));
+
+      const result = await mockIpc.invoke('project:listFiles', '/tmp/project-file.txt');
+
+      expect(result).toEqual({
+        success: true,
+        data: [],
+      });
+    });
+
+    it('rejects empty explicit project paths', async () => {
+      const result = await mockIpc.invoke('project:listFiles', '');
+
+      expect(result).toEqual({
+        success: false,
+        error: expect.stringContaining('projectPath is required'),
+      });
+    });
+  });
+
   describe('editor:gitStatus', () => {
     it('rejects if editor not initialized', async () => {
       const result = await mockIpc.invoke('editor:gitStatus');
diff --git a/test/main/ipc/teams.test.ts b/test/main/ipc/teams.test.ts
index 95e05fa1..c611700e 100644
--- a/test/main/ipc/teams.test.ts
+++ b/test/main/ipc/teams.test.ts
@@ -462,6 +462,65 @@ describe('ipc teams handlers', () => {
     expect(handlers.has(TEAM_DELETE_TASK_ATTACHMENT)).toBe(true);
   });
 
+  it('forwards selected model checks with effort to prepareProvisioning', async () => {
+    const handler = handlers.get(TEAM_PREPARE_PROVISIONING)!;
+    const result = (await handler(
+      { sender: { send: vi.fn() } } as never,
+      os.tmpdir(),
+      'anthropic',
+      ['anthropic'],
+      ['claude-opus-4-6[1m]'],
+      false,
+      'compatibility',
+      [
+        {
+          providerId: 'anthropic',
+          model: 'claude-opus-4-6[1m]',
+          effort: 'medium',
+        },
+      ]
+    )) as { success: boolean };
+
+    expect(result.success).toBe(true);
+    expect(provisioningService.prepareForProvisioning).toHaveBeenCalledWith(os.tmpdir(), {
+      providerId: 'anthropic',
+      providerIds: ['anthropic'],
+      modelIds: ['claude-opus-4-6[1m]'],
+      limitContext: false,
+      modelVerificationMode: 'compatibility',
+      modelChecks: [
+        {
+          providerId: 'anthropic',
+          model: 'claude-opus-4-6[1m]',
+          effort: 'medium',
+        },
+      ],
+    });
+  });
+
+  it('rejects invalid selected model check effort for the provider', async () => {
+    const handler = handlers.get(TEAM_PREPARE_PROVISIONING)!;
+    const result = (await handler(
+      { sender: { send: vi.fn() } } as never,
+      os.tmpdir(),
+      'anthropic',
+      ['anthropic'],
+      ['claude-opus-4-6[1m]'],
+      false,
+      'compatibility',
+      [
+        {
+          providerId: 'anthropic',
+          model: 'claude-opus-4-6[1m]',
+          effort: 'xhigh',
+        },
+      ]
+    )) as { success: boolean; error: string };
+
+    expect(result.success).toBe(false);
+    expect(result.error).toContain('selectedModelChecks effort must be one of');
+  });
+
   it('updates change presence tracking for a team', async () => {
     const handler = handlers.get(TEAM_SET_CHANGE_PRESENCE_TRACKING);
     expect(handler).toBeDefined();
diff --git a/test/main/services/infrastructure/OpenCodeRuntimeInstallerService.test.ts b/test/main/services/infrastructure/OpenCodeRuntimeInstallerService.test.ts
index c43f8e1c..1219ad3a 100644
--- a/test/main/services/infrastructure/OpenCodeRuntimeInstallerService.test.ts
+++ b/test/main/services/infrastructure/OpenCodeRuntimeInstallerService.test.ts
@@ -2,10 +2,11 @@ import { createHash } from 'crypto';
 import { mkdir, mkdtemp, rm, writeFile } from 'fs/promises';
 import os from 'os';
 import path from 'path';
-import { gzipSync } from 'zlib';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { gzipSync } from 'zlib';
 
 const execCliMock = vi.hoisted(() => vi.fn());
+const buildMergedCliPathMock = vi.hoisted(() => vi.fn());
 const getCachedShellEnvMock = vi.hoisted(() => vi.fn());
 const resolveInteractiveShellEnvBestEffortMock = vi.hoisted(() => vi.fn());
 
@@ -13,6 +14,10 @@ vi.mock('@main/utils/childProcess', () => ({
   execCli: execCliMock,
 }));
 
+vi.mock('@main/utils/cliPathMerge', () => ({
+  buildMergedCliPath: () => buildMergedCliPathMock(),
+}));
+
 vi.mock('@main/utils/shellEnv', () => ({
   getCachedShellEnv: () => getCachedShellEnvMock(),
   resolveInteractiveShellEnvBestEffort: (
@@ -79,6 +84,8 @@ describe('OpenCodeRuntimeInstallerService resolver', () => {
     process.env.PATH = '';
     execCliMock.mockReset();
     execCliMock.mockResolvedValue({ stdout: 'opencode 1.0.0\n', stderr: '' });
+    buildMergedCliPathMock.mockReset();
+    buildMergedCliPathMock.mockReturnValue('');
     getCachedShellEnvMock.mockReset();
     getCachedShellEnvMock.mockReturnValue(null);
     resolveInteractiveShellEnvBestEffortMock.mockReset();
@@ -211,6 +218,22 @@ describe('OpenCodeRuntimeInstallerService resolver', () => {
     });
   });
 
+  it('returns a verified OpenCode binary from the merged CLI PATH without interactive shell env resolution', async () => {
+    const binaryPath = path.join(tempRoot!, 'merged-cli-path', 'bin', 'opencode');
+    await mkdir(path.dirname(binaryPath), { recursive: true });
+    await writeFile(binaryPath, 'binary', { mode: 0o755 });
+    buildMergedCliPathMock.mockReturnValue(path.dirname(binaryPath));
+
+    await expect(resolveVerifiedOpenCodeRuntimeBinaryPath({ shellEnvTimeoutMs: 0 })).resolves.toBe(
+      binaryPath
+    );
+    expect(resolveInteractiveShellEnvBestEffortMock).not.toHaveBeenCalled();
+    expect(execCliMock).toHaveBeenCalledWith(binaryPath, ['--version'], {
+      timeout: 10_000,
+      windowsHide: true,
+    });
+  });
+
   it('reports PATH-installed OpenCode as installed after best-effort shell env resolution', async () => {
     const binaryPath = path.join(tempRoot!, 'homebrew', 'bin', 'opencode');
     await mkdir(path.dirname(binaryPath), { recursive: true });
@@ -227,6 +250,53 @@ describe('OpenCodeRuntimeInstallerService resolver', () => {
       version: 'opencode 1.0.0',
     });
   });
+
+  it('prefers a working PATH OpenCode binary over a broken app-managed manifest', async () => {
+    const appManagedBinaryPath = path.join(
+      tempRoot!,
+      'data',
+      'runtimes',
+      'opencode',
+      'versions',
+      '1.0.0',
+      'opencode-test',
+      'opencode'
+    );
+    const pathBinaryPath = path.join(tempRoot!, 'homebrew', 'bin', 'opencode');
+    const manifestPath = path.join(tempRoot!, 'data', 'runtimes', 'opencode', 'current.json');
+    await mkdir(path.dirname(appManagedBinaryPath), { recursive: true });
+    await mkdir(path.dirname(pathBinaryPath), { recursive: true });
+    await mkdir(path.dirname(manifestPath), { recursive: true });
+    await writeFile(appManagedBinaryPath, 'broken binary', { mode: 0o755 });
+    await writeFile(pathBinaryPath, 'path binary', { mode: 0o755 });
+    await writeFile(
+      manifestPath,
+      `${JSON.stringify({
+        schemaVersion: 1,
+        version: '1.0.0',
+        platformPackage: 'opencode-test',
+        binaryPath: appManagedBinaryPath,
+        integrity: 'sha512-test',
+        installedAt: '2026-05-12T00:00:00.000Z',
+      })}\n`,
+      'utf8'
+    );
+    buildMergedCliPathMock.mockReturnValue(path.dirname(pathBinaryPath));
+    execCliMock.mockImplementation(async (binaryPath: string) => {
+      if (binaryPath === appManagedBinaryPath) {
+        throw new Error('broken app-managed runtime');
+      }
+      return { stdout: 'opencode 1.0.0\n', stderr: '' };
+    });
+
+    await expect(new OpenCodeRuntimeInstallerService().getStatus()).resolves.toMatchObject({
+      installed: true,
+      source: 'path',
+      state: 'ready',
+      binaryPath: pathBinaryPath,
+      version: 'opencode 1.0.0',
+    });
+  });
 });
 
 describe('OpenCodeRuntimeInstallerService package safety helpers', () => {
diff --git a/test/main/services/runtime/ClaudeMultimodelBridgeService.test.ts b/test/main/services/runtime/ClaudeMultimodelBridgeService.test.ts
index 78405b11..29d69644 100644
--- a/test/main/services/runtime/ClaudeMultimodelBridgeService.test.ts
+++ b/test/main/services/runtime/ClaudeMultimodelBridgeService.test.ts
@@ -13,8 +13,8 @@ const execCliMock = vi.fn();
 const buildProviderAwareCliEnvMock = vi.fn();
 const resolveInteractiveShellEnvMock = vi.fn<() => Promise<NodeJS.ProcessEnv>>();
 const readFileMock = vi.fn<(path: PathLike, encoding: BufferEncoding) => Promise<string>>();
-const enrichProviderStatusMock = vi.fn(
-  (provider, _options?: { hydrateModelCatalog?: boolean }) => Promise.resolve(provider)
+const enrichProviderStatusMock = vi.fn((provider, _options?: { hydrateModelCatalog?: boolean }) =>
+  Promise.resolve(provider)
 );
 const enrichProviderStatusesMock = vi.fn((providers) => Promise.resolve(providers));
 
@@ -343,6 +343,42 @@ describe('ClaudeMultimodelBridgeService', () => {
     expect(calls).not.toContain('model list --json --provider all');
   });
 
+  it('returns a scoped provider error when single-provider summary status times out', async () => {
+    execCliMock.mockImplementation((_binaryPath, args) => {
+      const normalizedArgs = Array.isArray(args) ? args.join(' ') : '';
+      if (normalizedArgs === 'runtime status --json --provider codex --summary') {
+        return Promise.reject(
+          new Error(
+            'Command timed out after 25000ms: /mock/agent_teams_orchestrator runtime status --json --provider codex --summary'
+          )
+        );
+      }
+
+      return Promise.reject(new Error(`Unexpected execCli call: ${normalizedArgs}`));
+    });
+
+    const { ClaudeMultimodelBridgeService } =
+      await import('@main/services/runtime/ClaudeMultimodelBridgeService');
+    const service = new ClaudeMultimodelBridgeService();
+
+    const provider = await service.getProviderStatus('/mock/agent_teams_orchestrator', 'codex');
+    const calls = execCliMock.mock.calls.map((call) => call[1].join(' '));
+
+    expect(provider).toMatchObject({
+      providerId: 'codex',
+      verificationState: 'error',
+      statusMessage: 'Provider status unavailable',
+    });
+    expect(provider.detailMessage).toContain('Command timed out after 25000ms');
+    expect(calls).toEqual(['runtime status --json --provider codex --summary']);
+    expect(vi.mocked(console.warn).mock.calls.map((call) => call.join(' '))).toEqual([
+      expect.stringContaining(
+        'Provider-scoped summary runtime status unavailable for codex, returning scoped error'
+      ),
+    ]);
+    vi.mocked(console.warn).mockClear();
+  });
+
   it('loads frontend providers with parallel provider-scoped runtime status probes', async () => {
     const providerPayloads = {
       anthropic: {
@@ -439,9 +475,7 @@ describe('ClaudeMultimodelBridgeService', () => {
     ).toEqual([8 * 1024 * 1024, 8 * 1024 * 1024, 8 * 1024 * 1024]);
     expect(enrichProviderStatusMock).toHaveBeenCalledTimes(3);
     expect(
-      enrichProviderStatusMock.mock.calls.every(
-        (call) => call[1]?.hydrateModelCatalog === false
-      )
+      enrichProviderStatusMock.mock.calls.every((call) => call[1]?.hydrateModelCatalog === false)
     ).toBe(true);
     expect(providers.map((provider) => provider.providerId)).toEqual([
       'anthropic',
@@ -506,10 +540,7 @@ describe('ClaudeMultimodelBridgeService', () => {
           ? (args[providerArgIndex + 1] as keyof typeof summaryPayloads)
           : null;
 
-      if (
-        normalizedArgs === 'runtime status --json --provider codex' &&
-        providerId === 'codex'
-      ) {
+      if (normalizedArgs === 'runtime status --json --provider codex' && providerId === 'codex') {
         return Promise.resolve({
           stdout: JSON.stringify({
             schemaVersion: 2,
@@ -711,6 +742,157 @@ describe('ClaudeMultimodelBridgeService', () => {
     });
   });
 
+  it('queues fresh single-provider catalog hydration behind an in-flight one', async () => {
+    let resolveHydration!: (value: { stdout: string; stderr: string; exitCode: number }) => void;
+    const hydration = new Promise<{ stdout: string; stderr: string; exitCode: number }>(
+      (resolve) => {
+        resolveHydration = resolve;
+      }
+    );
+    let fullStatusCalls = 0;
+
+    execCliMock.mockImplementation((_binaryPath, args) => {
+      const normalizedArgs = Array.isArray(args) ? args.join(' ') : '';
+
+      if (normalizedArgs === 'runtime status --json --provider codex --summary') {
+        return Promise.resolve({
+          stdout: JSON.stringify({
+            schemaVersion: 2,
+            providers: {
+              codex: {
+                providerId: 'codex',
+                displayName: 'Codex',
+                supported: true,
+                authenticated: true,
+                authMethod: 'api_key',
+                verificationState: 'verified',
+                canLoginFromUi: false,
+                statusMessage: null,
+                models: ['gpt-5.4'],
+                capabilities: { teamLaunch: true, oneShot: true },
+                runtimeCapabilities: { modelCatalog: { dynamic: true, source: 'app-server' } },
+              },
+            },
+          }),
+          stderr: '',
+          exitCode: 0,
+        });
+      }
+
+      if (normalizedArgs === 'runtime status --json --provider codex') {
+        fullStatusCalls += 1;
+        if (fullStatusCalls === 1) {
+          return hydration;
+        }
+        return Promise.resolve({
+          stdout: JSON.stringify({
+            schemaVersion: 2,
+            providers: {
+              codex: {
+                providerId: 'codex',
+                displayName: 'Codex',
+                supported: true,
+                authenticated: false,
+                authMethod: null,
+                verificationState: 'unknown',
+                canLoginFromUi: false,
+                statusMessage: 'fresh full status should not overwrite live summary',
+                models: ['gpt-5.4'],
+                capabilities: { teamLaunch: true, oneShot: true },
+                runtimeCapabilities: { modelCatalog: { dynamic: true, source: 'app-server' } },
+                modelCatalog: {
+                  schemaVersion: 1,
+                  providerId: 'codex',
+                  source: 'app-server',
+                  status: 'ready',
+                  fetchedAt: '2026-05-17T00:01:00.000Z',
+                  staleAt: '2026-05-17T00:11:00.000Z',
+                  defaultModelId: 'fresh-model',
+                  defaultLaunchModel: 'fresh-model',
+                  models: [],
+                  diagnostics: {
+                    configReadState: 'skipped',
+                    appServerState: 'healthy',
+                  },
+                },
+              },
+            },
+          }),
+          stderr: '',
+          exitCode: 0,
+        });
+      }
+
+      return Promise.reject(new Error(`Unexpected execCli call: ${normalizedArgs}`));
+    });
+
+    const { ClaudeMultimodelBridgeService } =
+      await import('@main/services/runtime/ClaudeMultimodelBridgeService');
+    const service = new ClaudeMultimodelBridgeService();
+    const firstUpdate = vi.fn();
+    const secondUpdate = vi.fn();
+
+    await service.getProviderStatus('/mock/agent_teams_orchestrator', 'codex', firstUpdate);
+    await service.getProviderStatus('/mock/agent_teams_orchestrator', 'codex', secondUpdate);
+    expect(
+      execCliMock.mock.calls.filter(
+        (call) => call[1].join(' ') === 'runtime status --json --provider codex'
+      )
+    ).toHaveLength(1);
+
+    resolveHydration({
+      stdout: JSON.stringify({
+        schemaVersion: 2,
+        providers: {
+          codex: {
+            providerId: 'codex',
+            displayName: 'Codex',
+            supported: true,
+            authenticated: false,
+            authMethod: null,
+            verificationState: 'unknown',
+            canLoginFromUi: false,
+            statusMessage: 'full status should not overwrite live summary',
+            models: ['gpt-5.4'],
+            capabilities: { teamLaunch: true, oneShot: true },
+            runtimeCapabilities: { modelCatalog: { dynamic: true, source: 'app-server' } },
+            modelCatalog: {
+              schemaVersion: 1,
+              providerId: 'codex',
+              source: 'app-server',
+              status: 'ready',
+              fetchedAt: '2026-05-17T00:00:00.000Z',
+              staleAt: '2026-05-17T00:10:00.000Z',
+              defaultModelId: 'gpt-5.4',
+              defaultLaunchModel: 'gpt-5.4',
+              models: [],
+              diagnostics: {
+                configReadState: 'skipped',
+                appServerState: 'healthy',
+              },
+            },
+          },
+        },
+      }),
+      stderr: '',
+      exitCode: 0,
+    });
+
+    await vi.waitFor(() => {
+      expect(secondUpdate).toHaveBeenCalledTimes(1);
+    });
+    expect(fullStatusCalls).toBe(2);
+    expect(firstUpdate).not.toHaveBeenCalled();
+    expect(secondUpdate.mock.calls[0]?.[0]).toMatchObject({
+      authenticated: true,
+      authMethod: 'api_key',
+      statusMessage: null,
+      modelCatalog: {
+        defaultModelId: 'fresh-model',
+      },
+    });
+  });
+
   it('hydrates Anthropic subscription rate limits after the live summary status', async () => {
     execCliMock.mockImplementation((_binaryPath, args) => {
       const normalizedArgs = Array.isArray(args) ? args.join(' ') : '';
@@ -1161,9 +1343,8 @@ describe('ClaudeMultimodelBridgeService', () => {
 
     const hasOldCatalogUpdate = [...firstUpdates.mock.calls, ...secondUpdates.mock.calls].some(
       ([providers]) =>
-        providers
-          .find((provider) => provider.providerId === 'codex')
-          ?.modelCatalog?.defaultModelId === 'old-model'
+        providers.find((provider) => provider.providerId === 'codex')?.modelCatalog
+          ?.defaultModelId === 'old-model'
     );
     expect(hasOldCatalogUpdate).toBe(false);
   });
diff --git a/test/main/services/team/AnthropicLaunchSelection.live.test.ts b/test/main/services/team/AnthropicLaunchSelection.live.test.ts
index 6a123ec0..e0fcb4da 100644
--- a/test/main/services/team/AnthropicLaunchSelection.live.test.ts
+++ b/test/main/services/team/AnthropicLaunchSelection.live.test.ts
@@ -35,10 +35,23 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
-const DEFAULT_LEAD_MODEL = 'sonnet';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
+const DEFAULT_LEAD_MODEL = 'claude-opus-4-6[1m]';
 const DEFAULT_MEMBER_MODEL = 'haiku';
-const DEFAULT_LEAD_EFFORT = 'low' as const;
+const DEFAULT_LEAD_EFFORT = 'medium' as const;
+const DISABLE_USER_HOOKS_SETTINGS_ARG = "--settings '{\"disableAllHooks\":true}'";
+
+interface LiveBootstrapSpec {
+  members: Array<{
+    name: string;
+    provider?: string;
+    model?: string;
+    effort?: string;
+    mcpConfigPath?: string;
+    mcpSettingSources?: string;
+    strictMcpConfig?: boolean;
+  }>;
+}
 
 liveDescribe('Anthropic launch selection live e2e', () => {
   let tempDir: string;
@@ -54,6 +67,8 @@ liveDescribe('Anthropic launch selection live e2e', () => {
   let previousAnthropicAuthToken: string | undefined;
   let previousDisableAppBootstrap: string | undefined;
   let previousDisableRuntimeBootstrap: string | undefined;
+  let previousRuntimeReadyTimeout: string | undefined;
+  let previousInboxPollerReadyTimeout: string | undefined;
   let previousClaudeJsonConfig: string | null | undefined;
   let svc: TeamProvisioningService | null;
   let teamName: string | null;
@@ -97,10 +112,16 @@ liveDescribe('Anthropic launch selection live e2e', () => {
     previousAnthropicAuthToken = process.env.ANTHROPIC_AUTH_TOKEN;
     previousDisableAppBootstrap = process.env.CLAUDE_APP_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
     previousDisableRuntimeBootstrap = process.env.CLAUDE_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP;
+    previousRuntimeReadyTimeout = process.env.CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS;
+    previousInboxPollerReadyTimeout = process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS;
 
     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_PROCESS_RUNTIME_READY_TIMEOUT_MS =
+      process.env.CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS?.trim() || '90000';
+    process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS =
+      process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS?.trim() || '30000';
     process.env.HOME = subscriptionAuth ? os.userInfo().homedir : tempHome;
     process.env.USERPROFILE = subscriptionAuth ? os.userInfo().homedir : tempHome;
     process.env.NODE_ENV = 'production';
@@ -116,6 +137,7 @@ liveDescribe('Anthropic launch selection live e2e', () => {
   });
 
   afterEach(async () => {
+    const preserveArtifacts = process.env.ANTHROPIC_LAUNCH_SELECTION_KEEP_TEMP === '1';
     const beforeStopSnapshot = svc && teamName ? await safeRuntimeSnapshot(svc, teamName) : null;
     if (svc && teamName) {
       await svc.stopTeam(teamName).catch(() => undefined);
@@ -124,10 +146,10 @@ liveDescribe('Anthropic launch selection live e2e', () => {
     const afterStopSnapshot = svc && teamName ? await safeRuntimeSnapshot(svc, teamName) : null;
     await terminateSmokeOwnedProcessBackends(afterStopSnapshot);
 
-    if (subscriptionAuth && projectPath) {
+    if (!preserveArtifacts && subscriptionAuth && projectPath) {
       await removeClaudeProjectArtifacts(tempClaudeRoot, projectPath);
     }
-    if (subscriptionAuth && teamName) {
+    if (!preserveArtifacts && subscriptionAuth && teamName) {
       await removeTeamArtifacts(teamName);
     }
     if (subscriptionAuth && previousClaudeJsonConfig !== undefined) {
@@ -144,30 +166,34 @@ liveDescribe('Anthropic launch selection live e2e', () => {
     restoreEnv('ANTHROPIC_AUTH_TOKEN', previousAnthropicAuthToken);
     restoreEnv('CLAUDE_APP_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP', previousDisableAppBootstrap);
     restoreEnv('CLAUDE_DISABLE_DETERMINISTIC_TEAM_BOOTSTRAP', previousDisableRuntimeBootstrap);
+    restoreEnv('CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS', previousRuntimeReadyTimeout);
+    restoreEnv('CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS', previousInboxPollerReadyTimeout);
+    clearBenignLiveWarningsIfOnlyBenign();
 
-    if (process.env.ANTHROPIC_LAUNCH_SELECTION_KEEP_TEMP === '1') {
+    if (preserveArtifacts) {
       process.stderr.write(`[AnthropicLaunchSelection.live] preserved temp dir: ${tempDir}\n`);
     } else {
       await removeTempDirWithRetries(tempDir);
     }
-    if (subscriptionAuth && projectPath) {
+    if (!preserveArtifacts && subscriptionAuth && projectPath) {
       await removeClaudeProjectArtifacts(tempClaudeRoot, projectPath);
     }
-    if (subscriptionAuth && teamName) {
+    if (!preserveArtifacts && subscriptionAuth && teamName) {
       await removeTeamArtifacts(teamName);
     }
-    if (subscriptionAuth && (projectPath || teamName)) {
+    if (!preserveArtifacts && subscriptionAuth && (projectPath || teamName)) {
       await new Promise((resolve) => setTimeout(resolve, 10_000));
     }
-    if (subscriptionAuth && projectPath) {
+    if (!preserveArtifacts && subscriptionAuth && projectPath) {
       await removeClaudeProjectArtifacts(tempClaudeRoot, projectPath);
     }
-    if (subscriptionAuth && teamName) {
+    if (!preserveArtifacts && subscriptionAuth && teamName) {
       await removeTeamArtifacts(teamName);
     }
+    discardKnownAnthropicLaunchSelectionWarnings();
   }, 180_000);
 
-  it('launches Sonnet low lead with explicit Haiku teammate without inherited effort', async () => {
+  it('launches Anthropic teammates with distinct model effort and MCP policies', async () => {
     const orchestratorCli = process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim();
     expect(orchestratorCli).toBeTruthy();
     await assertExecutable(orchestratorCli!);
@@ -191,6 +217,7 @@ liveDescribe('Anthropic launch selection live e2e', () => {
         model: leadModel,
         effort: leadEffort,
         skipPermissions: true,
+        extraCliArgs: DISABLE_USER_HOOKS_SETTINGS_ARG,
         prompt: 'Keep the team idle after bootstrap. Do not start extra work.',
         members: [
           {
@@ -198,10 +225,25 @@ liveDescribe('Anthropic launch selection live e2e', () => {
             role: 'Reviewer',
             providerId: 'anthropic',
             model: memberModel,
+            mcpPolicy: { mode: 'appOnly' },
           },
           {
             name: 'alice',
             role: 'Developer',
+            mcpPolicy: {
+              mode: 'inheritScopes',
+              scopes: { user: false, project: false, local: true },
+            },
+          },
+          {
+            name: 'bob',
+            role: 'Auditor',
+            providerId: 'anthropic',
+            model: memberModel,
+            mcpPolicy: {
+              mode: 'strictAllowlist',
+              serverNames: ['github'],
+            },
           },
         ],
       },
@@ -211,7 +253,15 @@ liveDescribe('Anthropic launch selection live e2e', () => {
     );
 
     const run = (
-      svc as unknown as { runs: Map<string, { allEffectiveMembers?: TeamMember[] }> }
+      svc as unknown as {
+        runs: Map<
+          string,
+          {
+            allEffectiveMembers?: TeamMember[];
+            bootstrapSpecPath?: string | null;
+          }
+        >;
+      }
     ).runs.get(response.runId);
     expect(run?.allEffectiveMembers).toEqual([
       expect.objectContaining({
@@ -219,14 +269,60 @@ liveDescribe('Anthropic launch selection live e2e', () => {
         providerId: 'anthropic',
         model: memberModel,
         effort: undefined,
+        mcpPolicy: { mode: 'appOnly' },
       }),
       expect.objectContaining({
         name: 'alice',
         providerId: 'anthropic',
         model: leadModel,
         effort: leadEffort,
+        mcpPolicy: {
+          mode: 'inheritScopes',
+          scopes: { user: false, project: false, local: true },
+        },
+      }),
+      expect.objectContaining({
+        name: 'bob',
+        providerId: 'anthropic',
+        model: memberModel,
+        effort: undefined,
+        mcpPolicy: {
+          mode: 'strictAllowlist',
+          serverNames: ['github'],
+        },
       }),
     ]);
+    expect(run?.bootstrapSpecPath).toEqual(expect.any(String));
+    const bootstrapSpec = JSON.parse(
+      await fs.readFile(run!.bootstrapSpecPath!, 'utf8')
+    ) as LiveBootstrapSpec;
+    const bootstrapMembersByName = new Map(
+      bootstrapSpec.members.map((member) => [member.name, member])
+    );
+    expect(bootstrapMembersByName.get('jack')).toMatchObject({
+      provider: 'anthropic',
+      model: memberModel,
+      mcpConfigPath: expect.any(String),
+      mcpSettingSources: 'user,project,local',
+      strictMcpConfig: true,
+    });
+    expect(bootstrapMembersByName.get('jack')).not.toHaveProperty('effort');
+    expect(bootstrapMembersByName.get('alice')).toMatchObject({
+      provider: 'anthropic',
+      model: leadModel,
+      effort: leadEffort,
+      mcpConfigPath: expect.any(String),
+      mcpSettingSources: 'local',
+      strictMcpConfig: false,
+    });
+    expect(bootstrapMembersByName.get('bob')).toMatchObject({
+      provider: 'anthropic',
+      model: memberModel,
+      mcpConfigPath: expect.any(String),
+      mcpSettingSources: 'user,project,local',
+      strictMcpConfig: true,
+    });
+    expect(bootstrapMembersByName.get('bob')).not.toHaveProperty('effort');
 
     await waitUntil(async () => {
       const last = progressEvents.at(-1);
@@ -242,7 +338,7 @@ liveDescribe('Anthropic launch selection live e2e', () => {
         if (statuses.teamLaunchState === 'partial_failure') {
           throw new Error(await formatLaunchDiagnostics(svc!, teamName!, progressEvents));
         }
-        return ['jack', 'alice'].every((memberName) => {
+        return ['jack', 'alice', 'bob'].every((memberName) => {
           const member = statuses.statuses[memberName];
           return (
             member?.status === 'online' &&
@@ -263,13 +359,16 @@ liveDescribe('Anthropic launch selection live e2e', () => {
           snapshot.members.jack?.providerId === 'anthropic' &&
           snapshot.members.jack.alive === true &&
           snapshot.members.alice?.providerId === 'anthropic' &&
-          snapshot.members.alice.alive === true
+          snapshot.members.alice.alive === true &&
+          snapshot.members.bob?.providerId === 'anthropic' &&
+          snapshot.members.bob.alive === true
         );
       },
       180_000,
       2_000,
       () => formatLaunchDiagnostics(svc!, teamName!, progressEvents)
     );
+    clearBenignLiveWarningsIfOnlyBenign();
   }, 480_000);
 });
 
@@ -286,6 +385,18 @@ function restoreEnv(name: string, previous: string | undefined): void {
   }
 }
 
+function discardKnownAnthropicLaunchSelectionWarnings(): void {
+  const warn = vi.mocked(console.warn);
+  if (!warn.mock) return;
+  const calls = warn.mock.calls;
+  for (let index = calls.length - 1; index >= 0; index -= 1) {
+    const text = calls[index]?.map((value) => String(value)).join(' ') ?? '';
+    if (text.includes('Failed to resolve login shell env: shell env resolve timeout')) {
+      calls.splice(index, 1);
+    }
+  }
+}
+
 async function assertExecutable(filePath: string): Promise<void> {
   await fs.access(filePath, fsConstants.X_OK);
 }
@@ -548,3 +659,15 @@ function redactSecrets(text: string): string {
     .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>');
 }
+
+function clearBenignLiveWarningsIfOnlyBenign(): void {
+  const warn = vi.mocked(console.warn);
+  if (
+    warn.mock.calls.length > 0 &&
+    warn.mock.calls.every((call) =>
+      call.map((part) => String(part)).join(' ').includes('[getConfig] slow read diag=')
+    )
+  ) {
+    warn.mockClear();
+  }
+}
diff --git a/test/main/services/team/AnthropicRuntimeMemory.live.test.ts b/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
index 2cd6a97a..09f97f43 100644
--- a/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
+++ b/test/main/services/team/AnthropicRuntimeMemory.live.test.ts
@@ -25,7 +25,7 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'haiku';
 
 liveDescribe('Anthropic runtime memory live e2e', () => {
diff --git a/test/main/services/team/ClaudeBinaryResolver.test.ts b/test/main/services/team/ClaudeBinaryResolver.test.ts
index fb0848c4..d8cd7eff 100644
--- a/test/main/services/team/ClaudeBinaryResolver.test.ts
+++ b/test/main/services/team/ClaudeBinaryResolver.test.ts
@@ -72,7 +72,7 @@ describe('ClaudeBinaryResolver', () => {
     });
     process.cwd = vi.fn(() => workspaceRoot);
     Object.defineProperty(process, 'resourcesPath', {
-      value: '/Applications/Agent Teams UI.app/Contents/Resources',
+      value: '/Applications/Agent Teams AI.app/Contents/Resources',
       configurable: true,
       writable: true,
     });
@@ -219,7 +219,7 @@ describe('ClaudeBinaryResolver', () => {
 
   it('prefers the bundled runtime binary for packaged agent_teams_orchestrator builds', async () => {
     const expectedBinary = path.join(
-      '/Applications/Agent Teams UI.app/Contents/Resources',
+      '/Applications/Agent Teams AI.app/Contents/Resources',
       'runtime',
       'claude-multimodel'
     );
diff --git a/test/main/services/team/ClaudeDoctorProbe.test.ts b/test/main/services/team/ClaudeDoctorProbe.test.ts
index 7b6f0639..83c9b820 100644
--- a/test/main/services/team/ClaudeDoctorProbe.test.ts
+++ b/test/main/services/team/ClaudeDoctorProbe.test.ts
@@ -25,14 +25,14 @@ describe('ClaudeDoctorProbe', () => {
 \u001B[2J────────────────────────────────────
   Diagnostics
   └ Invoked: /Applications/Agent Teams${' '}
-  UI.app/Contents/Resources/runtime/clau
+  AI.app/Contents/Resources/runtime/clau
   de-multimodel
   └ Config install method: native
   Press Enter to continue…
 `;
 
     expect(extractDoctorInvokedCandidates(output)).toEqual([
-      '/Applications/Agent Teams UI.app/Contents/Resources/runtime/claude-multimodel',
+      '/Applications/Agent Teams AI.app/Contents/Resources/runtime/claude-multimodel',
     ]);
   });
 
diff --git a/test/main/services/team/MemberWorkSyncClaudeStopHook.live.test.ts b/test/main/services/team/MemberWorkSyncClaudeStopHook.live.test.ts
index f9c3a956..bb211e99 100644
--- a/test/main/services/team/MemberWorkSyncClaudeStopHook.live.test.ts
+++ b/test/main/services/team/MemberWorkSyncClaudeStopHook.live.test.ts
@@ -18,15 +18,16 @@ import {
   getTeamsBasePath,
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
+
 import {
   assertExecutable,
   formatMemberWorkSyncDiagnostics,
   formatProgressDump,
+  type MemberWorkSyncLiveControlServer,
   readRuntimeTurnSettledProcessedMetas,
   restoreEnv,
   startMemberWorkSyncControlServer,
   throwIfClaudeTranscriptApiError,
-  type MemberWorkSyncLiveControlServer,
   waitUntil,
 } from './memberWorkSyncLiveHarness';
 
@@ -48,7 +49,7 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'sonnet';
 const DEFAULT_EFFORT = 'low' as const;
 
diff --git a/test/main/services/team/MemberWorkSyncCodex.live.test.ts b/test/main/services/team/MemberWorkSyncCodex.live.test.ts
index 88f7ef26..a85db0e4 100644
--- a/test/main/services/team/MemberWorkSyncCodex.live.test.ts
+++ b/test/main/services/team/MemberWorkSyncCodex.live.test.ts
@@ -12,15 +12,16 @@ import {
   getTeamsBasePath,
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
+
 import {
   assertExecutable,
   FatalWaitError,
   formatMemberWorkSyncDiagnostics,
   formatProgressDump,
+  type MemberWorkSyncLiveControlServer,
   readRuntimeTurnSettledProcessedMetas,
   restoreEnv,
   startMemberWorkSyncControlServer,
-  type MemberWorkSyncLiveControlServer,
   waitUntil,
 } from './memberWorkSyncLiveHarness';
 
@@ -45,7 +46,7 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'gpt-5.4-mini';
 const DEFAULT_EFFORT = 'low' as const;
 
diff --git a/test/main/services/team/MixedProviderTeamLaunch.live.test.ts b/test/main/services/team/MixedProviderTeamLaunch.live.test.ts
index ab85879f..db246ebd 100644
--- a/test/main/services/team/MixedProviderTeamLaunch.live.test.ts
+++ b/test/main/services/team/MixedProviderTeamLaunch.live.test.ts
@@ -11,11 +11,12 @@ import {
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
 import { killProcessByPid } from '../../../../src/main/utils/processKill';
+
 import {
   createOpenCodeLiveHarness,
+  type OpenCodeLiveHarness,
   waitForOpenCodeLanesStopped,
   waitUntil,
-  type OpenCodeLiveHarness,
 } from './openCodeLiveTestHarness';
 
 import type { TeamProvisioningProgress } from '../../../../src/shared/types';
@@ -36,7 +37,7 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_ANTHROPIC_MODEL = 'haiku';
 const DEFAULT_CODEX_MODEL = 'gpt-5.4-mini';
 const DEFAULT_OPENCODE_MODEL = 'openai/gpt-5.4-mini';
diff --git a/test/main/services/team/NativeAppManagedBootstrapContextBuilder.test.ts b/test/main/services/team/NativeAppManagedBootstrapContextBuilder.test.ts
index 51901da6..3c2da998 100644
--- a/test/main/services/team/NativeAppManagedBootstrapContextBuilder.test.ts
+++ b/test/main/services/team/NativeAppManagedBootstrapContextBuilder.test.ts
@@ -1,7 +1,6 @@
 import { mkdtemp, rm } from 'fs/promises';
 import { tmpdir } from 'os';
 import { join } from 'path';
-
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import {
@@ -135,7 +134,7 @@ describe('NativeAppManagedBootstrapContextBuilder', () => {
     expect(result.diagnostics.warning).toMatch(/Large native team startup context/);
   });
 
-  it('fails closed when aggregate native context budget is exceeded', async () => {
+  it('compacts twenty large native contexts within the aggregate budget', async () => {
     const hugeRole = 'x'.repeat(40_000);
     await new TeamMetaStore().writeMeta('large-native-team', {
       cwd: '/tmp/workspace',
@@ -145,23 +144,34 @@ describe('NativeAppManagedBootstrapContextBuilder', () => {
     });
     await new TeamMembersMetaStore().writeMembers(
       'large-native-team',
-      Array.from({ length: 16 }, (_, index) => ({
+      Array.from({ length: 20 }, (_, index) => ({
         name: `member-${index}`,
         providerId: 'anthropic' as const,
         role: hugeRole,
       }))
     );
 
-    await expect(
-      buildNativeAppManagedBootstrapSpecs({
-        teamName: 'large-native-team',
-        cwd: '/tmp/workspace',
-        members: Array.from({ length: 16 }, (_, index) => ({
-          name: `member-${index}`,
-          providerId: 'anthropic' as const,
-          role: hugeRole,
-        })),
-      })
-    ).rejects.toThrow(/aggregate size budget/);
+    const result = await buildNativeAppManagedBootstrapSpecsWithDiagnostics({
+      teamName: 'large-native-team',
+      cwd: '/tmp/workspace',
+      members: Array.from({ length: 20 }, (_, index) => ({
+        name: `member-${index}`,
+        providerId: 'anthropic' as const,
+        role: hugeRole,
+      })),
+    });
+    const totalContextChars = [...result.specs.values()].reduce(
+      (sum, spec) => sum + spec.contextText.length,
+      0
+    );
+    const firstContext = result.specs.get('member-0')?.contextText ?? '';
+
+    expect(result.specs.size).toBe(20);
+    expect(totalContextChars).toBeLessThanOrEqual(MAX_NATIVE_BOOTSTRAP_TOTAL_CONTEXT_CHARS);
+    expect(firstContext).toContain('The app loaded compact startup context');
+    expect(firstContext).toContain('Startup rules:');
+    expect(firstContext).toContain('Current task briefing:');
+    expect(firstContext).toContain('[truncated native bootstrap context]');
   });
+
 });
diff --git a/test/main/services/team/OpenCodeAcceptFastDelivery.live-e2e.test.ts b/test/main/services/team/OpenCodeAcceptFastDelivery.live-e2e.test.ts
index e8a7ce1d..ce320b64 100644
--- a/test/main/services/team/OpenCodeAcceptFastDelivery.live-e2e.test.ts
+++ b/test/main/services/team/OpenCodeAcceptFastDelivery.live-e2e.test.ts
@@ -1,7 +1,6 @@
 import { promises as fs } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import { createOpenCodePromptDeliveryLedgerStore } from '../../../../src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger';
@@ -15,11 +14,12 @@ import {
   getTeamsBasePath,
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
+
 import {
   createOpenCodeLiveHarness,
+  type OpenCodeLiveHarness,
   waitForOpenCodeLanesStopped,
   waitForOpenCodeMemberIdle,
-  type OpenCodeLiveHarness,
 } from './openCodeLiveTestHarness';
 
 import type { ClaudeMultimodelBridgeService } from '../../../../src/main/services/runtime/ClaudeMultimodelBridgeService';
@@ -31,7 +31,7 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'opencode/big-pickle';
 
 liveDescribe('OpenCode accept-fast delivery live e2e', () => {
diff --git a/test/main/services/team/OpenCodeBridgeCommandClient.test.ts b/test/main/services/team/OpenCodeBridgeCommandClient.test.ts
index e5700370..e7b13f6c 100644
--- a/test/main/services/team/OpenCodeBridgeCommandClient.test.ts
+++ b/test/main/services/team/OpenCodeBridgeCommandClient.test.ts
@@ -59,7 +59,15 @@ describe('OpenCodeBridgeCommandClient', () => {
     expect(runner.calls).toHaveLength(1);
     expect(runner.calls[0]).toMatchObject({
       binaryPath: '/usr/local/bin/agent-teams-controller',
-      args: ['runtime', 'opencode-command', '--json', '--input', expect.any(String)],
+      args: [
+        'runtime',
+        'opencode-command',
+        '--json',
+        '--input',
+        expect.any(String),
+        '--output',
+        expect.any(String),
+      ],
       cwd: '/tmp/project',
       timeoutMs: 10_000,
       env: expect.objectContaining({
@@ -68,6 +76,7 @@ describe('OpenCodeBridgeCommandClient', () => {
     });
 
     const inputPath = runner.calls[0].args[4];
+    const outputPath = runner.calls[0].args[6];
     expect(JSON.parse(await runner.readInputEnvelope(0))).toMatchObject({
       schemaVersion: 1,
       requestId: 'req-1',
@@ -77,6 +86,33 @@ describe('OpenCodeBridgeCommandClient', () => {
       body: { runId: 'run-1' },
     });
     await expect(fs.access(inputPath)).rejects.toThrow();
+    await expect(fs.access(outputPath)).rejects.toThrow();
+  });
+
+  it('reads bridge JSON from the output file when stdout is empty', async () => {
+    runner.nextResult = {
+      stdout: '',
+      stderr: '',
+      exitCode: 0,
+      timedOut: false,
+    };
+    runner.nextOutputFileContents = `${JSON.stringify(bridgeSuccess({ data: { runId: 'run-1' } }))}\n`;
+    const client = createClient();
+
+    const result = await client.execute(
+      'opencode.launchTeam',
+      { runId: 'run-1' },
+      {
+        cwd: '/tmp/project',
+        timeoutMs: 10_000,
+      }
+    );
+
+    expect(result).toMatchObject({
+      ok: true,
+      requestId: 'req-1',
+      command: 'opencode.launchTeam',
+    });
   });
 
   it('fails closed when stdout contains logs plus json', async () => {
@@ -109,9 +145,9 @@ describe('OpenCodeBridgeCommandClient', () => {
         type: 'opencode_bridge_contract_violation',
         severity: 'error',
         runId: 'run-1',
-        data: {
+        data: expect.objectContaining({
           stdoutPreview: 'debug token=[redacted]\n{"ok":true}\n',
-        },
+        }),
       })
     );
   });
@@ -183,6 +219,81 @@ describe('OpenCodeBridgeCommandClient', () => {
     });
   });
 
+  it('retries empty stdout once for readiness because it is read-only', async () => {
+    runner.nextResults = [
+      {
+        stdout: '',
+        stderr: '',
+        exitCode: 0,
+        timedOut: false,
+      },
+      {
+        stdout: `${JSON.stringify(
+          bridgeSuccess({
+            command: 'opencode.readiness',
+            data: { state: 'ready', launchAllowed: true },
+          })
+        )}\n`,
+        stderr: '',
+        exitCode: 0,
+        timedOut: false,
+      },
+    ];
+    const client = createClient();
+
+    const result = await client.execute(
+      'opencode.readiness',
+      { projectPath: '/tmp/project' },
+      {
+        cwd: '/tmp/project',
+        timeoutMs: 10_000,
+      }
+    );
+
+    expect(result).toMatchObject({
+      ok: true,
+      requestId: 'req-1',
+      command: 'opencode.readiness',
+    });
+    expect(runner.calls).toHaveLength(2);
+  });
+
+  it('does not retry empty stdout for state-changing bridge commands', async () => {
+    runner.nextResults = [
+      {
+        stdout: '',
+        stderr: '',
+        exitCode: 0,
+        timedOut: false,
+      },
+      {
+        stdout: `${JSON.stringify(bridgeSuccess({ data: { runId: 'run-1' } }))}\n`,
+        stderr: '',
+        exitCode: 0,
+        timedOut: false,
+      },
+    ];
+    const client = createClient();
+
+    const result = await client.execute(
+      'opencode.launchTeam',
+      { runId: 'run-1' },
+      {
+        cwd: '/tmp/project',
+        timeoutMs: 10_000,
+      }
+    );
+
+    expect(result).toMatchObject({
+      ok: false,
+      error: {
+        kind: 'contract_violation',
+        message: 'Bridge stdout was empty',
+      },
+    });
+    expect(runner.calls).toHaveLength(1);
+  });
+
   it('rejects bridge result envelope mismatches before caller can mutate state', async () => {
     runner.nextResult = {
       stdout: `${JSON.stringify(bridgeSuccess({ requestId: 'other-req' }))}\n`,
@@ -373,17 +484,25 @@ function bridgeSuccess(
 class FakeBridgeProcessRunner implements OpenCodeBridgeProcessRunner {
   calls: OpenCodeBridgeProcessRunInput[] = [];
   inputEnvelopes: string[] = [];
+  nextResults: OpenCodeBridgeProcessRunResult[] = [];
   nextResult: OpenCodeBridgeProcessRunResult = {
     stdout: '',
     stderr: '',
     exitCode: 0,
     timedOut: false,
   };
+  nextOutputFileContents: string | null = null;
 
   async run(input: OpenCodeBridgeProcessRunInput): Promise<OpenCodeBridgeProcessRunResult> {
     this.calls.push(input);
     this.inputEnvelopes.push(await fs.readFile(input.args[4], 'utf8'));
-    return this.nextResult;
+    const outputFlagIndex = input.args.indexOf('--output');
+    const outputPath = outputFlagIndex >= 0 ? input.args[outputFlagIndex + 1] : undefined;
+    if (this.nextOutputFileContents !== null && outputPath) {
+      await fs.writeFile(outputPath, this.nextOutputFileContents, 'utf8');
+      this.nextOutputFileContents = null;
+    }
+    return this.nextResults.shift() ?? this.nextResult;
   }
 
   async readInputEnvelope(index: number): Promise<string> {
diff --git a/test/main/services/team/OpenCodeMixedRecovery.live.test.ts b/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
index e220c012..e411fced 100644
--- a/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
+++ b/test/main/services/team/OpenCodeMixedRecovery.live.test.ts
@@ -1,9 +1,9 @@
 import { constants as fsConstants, promises as fs } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
+import { applyOpenCodeAutoUpdatePolicy } from '../../../../src/main/services/runtime/openCodeAutoUpdatePolicy';
 import { OpenCodeBridgeCommandClient } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient';
 import {
   createOpenCodeBridgeCommandLeaseStore,
@@ -15,30 +15,29 @@ import {
 } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeHandshakeClient';
 import { OpenCodeReadinessBridge } from '../../../../src/main/services/team/opencode/bridge/OpenCodeReadinessBridge';
 import { OpenCodeStateChangingBridgeCommandService } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
-import { getTeamBootstrapStatePath } from '../../../../src/main/services/team/TeamBootstrapStateReader';
-import { TeamMembersMetaStore } from '../../../../src/main/services/team/TeamMembersMetaStore';
-import { TeamMetaStore } from '../../../../src/main/services/team/TeamMetaStore';
-import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
-import { TeamRuntimeAdapterRegistry } from '../../../../src/main/services/team/runtime/TeamRuntimeAdapter';
-import { OpenCodeTeamRuntimeAdapter } from '../../../../src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter';
-import { resolveAgentTeamsMcpLaunchSpec } from '../../../../src/main/services/team/TeamMcpConfigBuilder';
 import {
   readOpenCodeRuntimeLaneIndex,
   upsertOpenCodeRuntimeLaneIndexEntry,
 } from '../../../../src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader';
-import { applyOpenCodeAutoUpdatePolicy } from '../../../../src/main/services/runtime/openCodeAutoUpdatePolicy';
+import { OpenCodeTeamRuntimeAdapter } from '../../../../src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter';
+import { TeamRuntimeAdapterRegistry } from '../../../../src/main/services/team/runtime/TeamRuntimeAdapter';
+import { getTeamBootstrapStatePath } from '../../../../src/main/services/team/TeamBootstrapStateReader';
+import { resolveAgentTeamsMcpLaunchSpec } from '../../../../src/main/services/team/TeamMcpConfigBuilder';
+import { TeamMembersMetaStore } from '../../../../src/main/services/team/TeamMembersMetaStore';
+import { TeamMetaStore } from '../../../../src/main/services/team/TeamMetaStore';
+import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
 import {
   getTeamsBasePath,
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
 
+import type { RuntimeStoreManifestEvidence } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandContract';
+import type { RuntimeStoreManifestReader } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
+import type { OpenCodeBridgeCommandExecutor } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
 import type {
   TeamRuntimeLaunchInput,
   TeamRuntimeStopInput,
 } from '../../../../src/main/services/team/runtime/TeamRuntimeAdapter';
-import type { RuntimeStoreManifestEvidence } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandContract';
-import type { RuntimeStoreManifestReader } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
-import type { OpenCodeBridgeCommandExecutor } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
 
 const liveDescribe =
   process.env.OPENCODE_E2E === '1' && process.env.OPENCODE_E2E_MIXED_RECOVERY === '1'
@@ -47,7 +46,7 @@ const liveDescribe =
 const liveMultiLaneIt = process.env.OPENCODE_E2E_MIXED_RECOVERY_MULTI === '1' ? it : it.skip;
 
 const PROJECT_PATH = process.env.OPENCODE_E2E_PROJECT_PATH?.trim() || process.cwd();
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'opencode/big-pickle';
 
 liveDescribe('OpenCode mixed recovery live e2e', () => {
@@ -348,7 +347,15 @@ async function commitMixedOpenCodeLaunchResult(input: {
   memberName: string;
   result: Awaited<ReturnType<OpenCodeTeamRuntimeAdapter['launch']>>;
 }): Promise<Awaited<ReturnType<OpenCodeTeamRuntimeAdapter['launch']>>> {
-  return (input.service as any).guardCommittedOpenCodeSecondaryLaneEvidence({
+  const service = input.service as unknown as {
+    guardCommittedOpenCodeSecondaryLaneEvidence(args: {
+      teamName: string;
+      laneId: string;
+      memberName: string;
+      result: Awaited<ReturnType<OpenCodeTeamRuntimeAdapter['launch']>>;
+    }): Promise<Awaited<ReturnType<OpenCodeTeamRuntimeAdapter['launch']>>>;
+  };
+  return service.guardCommittedOpenCodeSecondaryLaneEvidence({
     teamName: input.teamName,
     laneId: input.laneId,
     memberName: input.memberName,
diff --git a/test/main/services/team/OpenCodeRuntimeDeliveryAdvisoryPolicy.test.ts b/test/main/services/team/OpenCodeRuntimeDeliveryAdvisoryPolicy.test.ts
index 10312462..98220ce8 100644
--- a/test/main/services/team/OpenCodeRuntimeDeliveryAdvisoryPolicy.test.ts
+++ b/test/main/services/team/OpenCodeRuntimeDeliveryAdvisoryPolicy.test.ts
@@ -173,4 +173,56 @@ describe('OpenCodeRuntimeDeliveryAdvisoryPolicy', () => {
       })
     ).toMatchObject({ action: 'suppress' });
   });
+
+  it('does not suppress terminal failures with stale visible proof before the prompt window', () => {
+    const record = makeRecord({});
+
+    expect(
+      decideOpenCodeRuntimeDeliveryAdvisory({
+        record,
+        proof: {
+          visibleReplyAt: Date.parse(record.inboxTimestamp) - 6_000,
+          visibleReplyMessageId: 'old-reply',
+          visibleReplyInbox: 'user',
+        },
+        now: Date.parse(record.failedAt!) + OPENCODE_RUNTIME_DELIVERY_GENERIC_PROOF_GRACE_MS + 1,
+      })
+    ).toMatchObject({
+      action: 'surface',
+      severity: 'error',
+    });
+  });
+
+  it('does not suppress terminal failures with only unrelated later delivery success', () => {
+    const record = makeRecord({});
+
+    expect(
+      decideOpenCodeRuntimeDeliveryAdvisory({
+        record,
+        proof: {
+          latestSuccessAt: Date.parse(record.failedAt!) + 60_000,
+        },
+        now: Date.parse(record.failedAt!) + OPENCODE_RUNTIME_DELIVERY_GENERIC_PROOF_GRACE_MS + 1,
+      })
+    ).toMatchObject({
+      action: 'surface',
+      severity: 'error',
+    });
+  });
+
+  it('accepts visible proof inside the prompt timestamp skew window', () => {
+    const record = makeRecord({});
+
+    expect(
+      decideOpenCodeRuntimeDeliveryAdvisory({
+        record,
+        proof: {
+          visibleReplyAt: Date.parse(record.inboxTimestamp) - 4_000,
+          visibleReplyMessageId: 'nearby-reply',
+          visibleReplyInbox: 'user',
+        },
+        now: Date.parse(record.failedAt!) + OPENCODE_RUNTIME_DELIVERY_GENERIC_PROOF_GRACE_MS + 1,
+      })
+    ).toMatchObject({ action: 'suppress' });
+  });
 });
diff --git a/test/main/services/team/OpenCodeTeamLaunchReadiness.test.ts b/test/main/services/team/OpenCodeTeamLaunchReadiness.test.ts
index e86e7afa..d4efa6fb 100644
--- a/test/main/services/team/OpenCodeTeamLaunchReadiness.test.ts
+++ b/test/main/services/team/OpenCodeTeamLaunchReadiness.test.ts
@@ -3,13 +3,13 @@ import { describe, expect, it, vi } from 'vitest';
 import { createEmptyEndpointMap } from '../../../../src/main/services/team/opencode/capabilities/OpenCodeApiCapabilities';
 import { REQUIRED_AGENT_TEAMS_RUNTIME_TOOLS } from '../../../../src/main/services/team/opencode/mcp/OpenCodeMcpToolAvailability';
 import {
-  OpenCodeTeamLaunchReadinessService,
   type OpenCodeApiCapabilityPort,
-  type OpenCodeModelExecutionProbePort,
   type OpenCodeMcpToolProofPort,
+  type OpenCodeModelExecutionProbePort,
   type OpenCodeRuntimeInventory,
   type OpenCodeRuntimeInventoryPort,
   type OpenCodeRuntimeStoreReadinessPort,
+  OpenCodeTeamLaunchReadinessService,
 } from '../../../../src/main/services/team/opencode/readiness/OpenCodeTeamLaunchReadiness';
 
 import type {
@@ -38,7 +38,66 @@ describe('OpenCodeTeamLaunchReadinessService', () => {
     expect(ports.mcpTools.prove).not.toHaveBeenCalled();
   });
 
-  it('blocks unauthenticated OpenCode even when the binary is installed', async () => {
+  it('allows unauthenticated OpenCode when the selected model is a free route', async () => {
+    const ports = createPorts({
+      inventory: {
+        authenticated: false,
+        connectedProviders: [],
+        models: ['opencode/big-pickle'],
+      },
+    });
+
+    await expect(
+      service(ports).check(readinessInput({ selectedModel: 'opencode/big-pickle' }))
+    ).resolves.toMatchObject({
+      state: 'ready',
+      launchAllowed: true,
+      modelId: 'opencode/big-pickle',
+      diagnostics: [
+        'No connected OpenCode provider found. Proceeding with a free OpenCode model route that does not require provider authentication.',
+      ],
+    });
+    expect(ports.capabilities.detect).toHaveBeenCalled();
+    expect(ports.mcpTools.prove).toHaveBeenCalled();
+  });
+
+  it('uses the first free OpenCode model for unauthenticated default selection', async () => {
+    const ports = createPorts({
+      inventory: {
+        authenticated: false,
+        connectedProviders: [],
+        models: ['openai/gpt-5.4-mini', 'opencode/big-pickle'],
+      },
+    });
+
+    await expect(service(ports).check(readinessInput({ selectedModel: null }))).resolves.toMatchObject({
+      state: 'ready',
+      launchAllowed: true,
+      modelId: 'opencode/big-pickle',
+    });
+    expect(ports.capabilities.detect).toHaveBeenCalled();
+    expect(ports.mcpTools.prove).toHaveBeenCalled();
+  });
+
+  it('does not replace an explicit unauthenticated provider-backed model with a free route', async () => {
+    const ports = createPorts({
+      inventory: {
+        authenticated: false,
+        connectedProviders: [],
+        models: ['opencode/big-pickle', 'openai/gpt-5.4-mini'],
+      },
+    });
+
+    await expect(service(ports).check(readinessInput())).resolves.toMatchObject({
+      state: 'not_authenticated',
+      launchAllowed: false,
+      modelId: 'openai/gpt-5.4-mini',
+    });
+    expect(ports.capabilities.detect).not.toHaveBeenCalled();
+    expect(ports.mcpTools.prove).not.toHaveBeenCalled();
+  });
+
+  it('blocks unauthenticated OpenCode when the selected model needs a provider', async () => {
     const ports = createPorts({
       inventory: { authenticated: false, connectedProviders: [] },
     });
@@ -47,8 +106,12 @@ describe('OpenCodeTeamLaunchReadinessService', () => {
       state: 'not_authenticated',
       launchAllowed: false,
       opencodeVersion: '1.14.19',
-      diagnostics: ['No connected OpenCode providers found'],
+      diagnostics: [
+        'No connected OpenCode provider found. Choose a free OpenCode model such as Big Pickle, or connect a provider in OpenCode for provider-backed models.',
+      ],
     });
+    expect(ports.capabilities.detect).not.toHaveBeenCalled();
+    expect(ports.mcpTools.prove).not.toHaveBeenCalled();
   });
 
   it('blocks unsupported versions before MCP and model probes', async () => {
diff --git a/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts b/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
index f7c0f2d9..176b47b1 100644
--- a/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
+++ b/test/main/services/team/OpenCodeTeamProvisioning.live.test.ts
@@ -1,9 +1,9 @@
 import { constants as fsConstants, promises as fs } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
+import { applyOpenCodeAutoUpdatePolicy } from '../../../../src/main/services/runtime/openCodeAutoUpdatePolicy';
 import { OpenCodeBridgeCommandClient } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandClient';
 import {
   createOpenCodeBridgeCommandLeaseStore,
@@ -15,12 +15,11 @@ import {
 } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeHandshakeClient';
 import { OpenCodeReadinessBridge } from '../../../../src/main/services/team/opencode/bridge/OpenCodeReadinessBridge';
 import { OpenCodeStateChangingBridgeCommandService } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
-import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
-import { TeamRuntimeAdapterRegistry } from '../../../../src/main/services/team/runtime/TeamRuntimeAdapter';
-import { OpenCodeTeamRuntimeAdapter } from '../../../../src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter';
-import { resolveAgentTeamsMcpLaunchSpec } from '../../../../src/main/services/team/TeamMcpConfigBuilder';
 import { readOpenCodeRuntimeLaneIndex } from '../../../../src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader';
-import { applyOpenCodeAutoUpdatePolicy } from '../../../../src/main/services/runtime/openCodeAutoUpdatePolicy';
+import { OpenCodeTeamRuntimeAdapter } from '../../../../src/main/services/team/runtime/OpenCodeTeamRuntimeAdapter';
+import { TeamRuntimeAdapterRegistry } from '../../../../src/main/services/team/runtime/TeamRuntimeAdapter';
+import { resolveAgentTeamsMcpLaunchSpec } from '../../../../src/main/services/team/TeamMcpConfigBuilder';
+import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
 import {
   getTeamsBasePath,
   setClaudeBasePathOverride,
@@ -37,7 +36,7 @@ const liveDescribe =
     : describe.skip;
 
 const PROJECT_PATH = process.env.OPENCODE_E2E_PROJECT_PATH?.trim() || process.cwd();
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_MODEL = 'opencode/big-pickle';
 
 liveDescribe('OpenCode team provisioning live e2e', () => {
diff --git a/test/main/services/team/ProcessBootstrapTransportEvidence.test.ts b/test/main/services/team/ProcessBootstrapTransportEvidence.test.ts
index c1ed7b79..c247ff2c 100644
--- a/test/main/services/team/ProcessBootstrapTransportEvidence.test.ts
+++ b/test/main/services/team/ProcessBootstrapTransportEvidence.test.ts
@@ -1,5 +1,3 @@
-import { describe, expect, it } from 'vitest';
-
 import {
   buildProcessBootstrapPendingDiagnostic,
   buildProcessBootstrapTimeoutDiagnostic,
@@ -7,6 +5,7 @@ import {
   sanitizeProcessRuntimeEventFilePrefix,
   summarizeProcessBootstrapTransportEvents,
 } from '@main/services/team/ProcessBootstrapTransportEvidence';
+import { describe, expect, it } from 'vitest';
 
 describe('ProcessBootstrapTransportEvidence', () => {
   it('keeps retryable submit rejection non-terminal when a later submit succeeds', () => {
@@ -115,6 +114,83 @@ describe('ProcessBootstrapTransportEvidence', () => {
     );
   });
 
+  it('reports inbox poller readiness as progress without treating bootstrap as submitted', () => {
+    const summary = summarizeProcessBootstrapTransportEvents([
+      {
+        type: 'mailbox_bootstrap_written',
+        timestamp: '2026-05-07T10:00:00.000Z',
+        detail: 'messageId=bootstrap-1; readbackAttempts=1',
+      },
+      {
+        type: 'inbox_poller_ready',
+        timestamp: '2026-05-07T10:00:01.000Z',
+        detail: 'initial poll observed bootstrap prompt',
+      },
+    ]);
+
+    expect(summary).toMatchObject({
+      submitted: false,
+      hasProgress: true,
+      lastStage: 'inbox poller ready: initial poll observed bootstrap prompt',
+    });
+    expect(buildProcessBootstrapPendingDiagnostic(summary!)).toBe(
+      'Bootstrap prompt has not been submitted yet. Last transport stage: inbox poller ready: initial poll observed bootstrap prompt.'
+    );
+    expect(buildProcessBootstrapTimeoutDiagnostic(summary!)).toBe(
+      'Bootstrap prompt was not submitted before timeout. Last transport stage: inbox poller ready: initial poll observed bootstrap prompt'
+    );
+  });
+
+  it('treats runtime failure after mailbox write as terminal without marking bootstrap submitted', () => {
+    const summary = summarizeProcessBootstrapTransportEvents([
+      {
+        type: 'mailbox_bootstrap_written',
+        timestamp: '2026-05-07T10:00:00.000Z',
+        detail: 'messageId=bootstrap-1',
+      },
+      {
+        type: 'failed',
+        timestamp: '2026-05-07T10:00:01.000Z',
+        detail: 'teammate process exited before inbox_poller_ready',
+      },
+    ]);
+
+    expect(summary).toMatchObject({
+      submitted: false,
+      hasProgress: true,
+      lastStage: 'runtime failed: teammate process exited before inbox_poller_ready',
+      terminalFailure: {
+        kind: 'runtime_failed_before_confirmation',
+        reason: 'runtime failed: teammate process exited before inbox_poller_ready',
+      },
+    });
+  });
+
+  it('treats process exit after submit attempt as terminal without durable submit proof', () => {
+    const summary = summarizeProcessBootstrapTransportEvents([
+      {
+        type: 'bootstrap_submit_attempted',
+        timestamp: '2026-05-07T10:00:00.000Z',
+        detail: 'submitting bootstrap prompt',
+      },
+      {
+        type: 'exited',
+        timestamp: '2026-05-07T10:00:01.000Z',
+        detail: 'process exited before bootstrap_submitted',
+      },
+    ]);
+
+    expect(summary).toMatchObject({
+      submitted: false,
+      hasProgress: true,
+      lastStage: 'runtime exited: process exited before bootstrap_submitted',
+      terminalFailure: {
+        kind: 'process_exited_before_confirmation',
+        reason: 'runtime exited: process exited before bootstrap_submitted',
+      },
+    });
+  });
+
   it('distinguishes submitted bootstrap prompts from not-submitted transport timeouts', () => {
     const summary = summarizeProcessBootstrapTransportEvents([
       {
@@ -133,6 +209,67 @@ describe('ProcessBootstrapTransportEvidence', () => {
     );
   });
 
+  it('keeps submitted state when the runtime fails before bootstrap confirmation', () => {
+    const summary = summarizeProcessBootstrapTransportEvents([
+      {
+        type: 'mailbox_bootstrap_written',
+        timestamp: '2026-05-07T10:00:00.000Z',
+        detail: 'messageId=bootstrap-alice-1',
+      },
+      {
+        type: 'bootstrap_submitted',
+        timestamp: '2026-05-07T10:00:01.000Z',
+        detail: 'messageId=bootstrap-alice-1',
+      },
+      {
+        type: 'failed',
+        timestamp: '2026-05-07T10:00:02.000Z',
+        detail: 'bootstrap confirmation timeout',
+      },
+    ]);
+
+    expect(summary).toMatchObject({
+      submitted: true,
+      hasProgress: true,
+      lastStage: 'runtime failed: bootstrap confirmation timeout',
+      terminalFailure: {
+        kind: 'runtime_failed_before_confirmation',
+        reason: 'runtime failed: bootstrap confirmation timeout',
+      },
+    });
+    expect(buildProcessBootstrapTimeoutDiagnostic(summary!)).toBe(
+      'Bootstrap prompt was submitted, but teammate did not bootstrap-confirm before timeout. Last transport stage: runtime failed: bootstrap confirmation timeout'
+    );
+  });
+
+  it('keeps submitted state when the process exits after durable bootstrap submission', () => {
+    const summary = summarizeProcessBootstrapTransportEvents([
+      {
+        type: 'bootstrap_submitted',
+        timestamp: '2026-05-07T10:00:01.000Z',
+        detail: 'messageId=bootstrap-bob-1',
+      },
+      {
+        type: 'exited',
+        timestamp: '2026-05-07T10:00:02.000Z',
+        detail: 'process exited before bootstrap confirmation',
+      },
+    ]);
+
+    expect(summary).toMatchObject({
+      submitted: true,
+      hasProgress: true,
+      lastStage: 'runtime exited: process exited before bootstrap confirmation',
+      terminalFailure: {
+        kind: 'process_exited_before_confirmation',
+        reason: 'runtime exited: process exited before bootstrap confirmation',
+      },
+    });
+    expect(buildProcessBootstrapPendingDiagnostic(summary!)).toBe(
+      'Bootstrap prompt was submitted; waiting for bootstrap confirmation. Last transport stage: runtime exited: process exited before bootstrap confirmation.'
+    );
+  });
+
   it('keeps active phase pending and turns final timeout into final projection', () => {
     expect(deriveProcessTransportProjectionPhase({ launchPhase: 'active' })).toBe('active');
     expect(
diff --git a/test/main/services/team/ProviderLaunchStress.live-e2e.test.ts b/test/main/services/team/ProviderLaunchStress.live-e2e.test.ts
index 58402b28..c0863de4 100644
--- a/test/main/services/team/ProviderLaunchStress.live-e2e.test.ts
+++ b/test/main/services/team/ProviderLaunchStress.live-e2e.test.ts
@@ -5,16 +5,17 @@ import * as path from 'node:path';
 
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { createOpenCodeLiveHarness, waitForOpenCodeLanesStopped, waitUntil } from './openCodeLiveTestHarness';
+import { TeamDataService } from '../../../../src/main/services/team/TeamDataService';
+import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
+import { TeamTaskReader } from '../../../../src/main/services/team/TeamTaskReader';
 import {
   getTasksBasePath,
   getTeamsBasePath,
   setClaudeBasePathOverride,
 } from '../../../../src/main/utils/pathDecoder';
 import { killProcessByPid } from '../../../../src/main/utils/processKill';
-import { TeamDataService } from '../../../../src/main/services/team/TeamDataService';
-import { TeamProvisioningService } from '../../../../src/main/services/team/TeamProvisioningService';
-import { TeamTaskReader } from '../../../../src/main/services/team/TeamTaskReader';
+
+import { createOpenCodeLiveHarness, waitForOpenCodeLanesStopped, waitUntil } from './openCodeLiveTestHarness';
 
 import type {
   TeamAgentRuntimeSnapshot,
@@ -37,13 +38,34 @@ const liveDescribe =
     ? describe
     : describe.skip;
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 const DEFAULT_ANTHROPIC_MODEL = 'haiku';
 const DEFAULT_CODEX_MODEL = 'gpt-5.4-mini';
 const DEFAULT_CODEX_EFFORT = 'low' as const;
 const DEFAULT_OPENCODE_MODEL = 'openai/gpt-5.4-mini';
 const DEFAULT_ORDER: ProviderLaunchStressScenario[] = ['anthropic', 'codex', 'opencode', 'mixed'];
-const MEMBER_NAMES = ['alice', 'bob', 'jack', 'tom', 'atlas', 'nova', 'cody', 'oscar'];
+const MEMBER_NAMES = [
+  'alice',
+  'bob',
+  'jack',
+  'tom',
+  'atlas',
+  'nova',
+  'cody',
+  'oscar',
+  'maya',
+  'liam',
+  'ivy',
+  'noah',
+  'zoe',
+  'ryan',
+  'emma',
+  'owen',
+  'luna',
+  'finn',
+  'aria',
+  'milo',
+];
 const RESTART_CONFIRM_TIMEOUT_MS = 300_000;
 const POST_LAUNCH_WORK_TIMEOUT_MS = 300_000;
 let currentStressTempDir = '';
@@ -73,6 +95,8 @@ liveDescribe('provider launch stress live e2e', () => {
   let previousNodeEnv: string | undefined;
   let previousAnthropicApiKey: string | undefined;
   let previousAnthropicAuthToken: string | undefined;
+  let previousRuntimeReadyTimeout: string | undefined;
+  let previousInboxPollerReadyTimeout: string | undefined;
   let previousClaudeJsonConfig: string | null | undefined;
   const activeScenarios: ActiveScenario[] = [];
 
@@ -114,10 +138,16 @@ liveDescribe('provider launch stress live e2e', () => {
     previousNodeEnv = process.env.NODE_ENV;
     previousAnthropicApiKey = process.env.ANTHROPIC_API_KEY;
     previousAnthropicAuthToken = process.env.ANTHROPIC_AUTH_TOKEN;
+    previousRuntimeReadyTimeout = process.env.CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS;
+    previousInboxPollerReadyTimeout = process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS;
 
     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_PROCESS_RUNTIME_READY_TIMEOUT_MS =
+      process.env.CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS?.trim() || '90000';
+    process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS =
+      process.env.CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS?.trim() || '30000';
     process.env.CODEX_HOME = resolveConnectedCodexHome(previousCodexHome);
     process.env.HOME = usingAnthropicSubscriptionAuth() ? os.userInfo().homedir : tempHome;
     process.env.USERPROFILE = usingAnthropicSubscriptionAuth() ? os.userInfo().homedir : tempHome;
@@ -148,6 +178,8 @@ liveDescribe('provider launch stress live e2e', () => {
     restoreEnv('NODE_ENV', previousNodeEnv);
     restoreEnv('ANTHROPIC_API_KEY', previousAnthropicApiKey);
     restoreEnv('ANTHROPIC_AUTH_TOKEN', previousAnthropicAuthToken);
+    restoreEnv('CLAUDE_TEAM_PROCESS_RUNTIME_READY_TIMEOUT_MS', previousRuntimeReadyTimeout);
+    restoreEnv('CLAUDE_TEAM_PROCESS_INBOX_POLLER_READY_TIMEOUT_MS', previousInboxPollerReadyTimeout);
 
     if (process.env.PROVIDER_LAUNCH_STRESS_KEEP_TEMP === '1') {
       process.stderr.write(`[ProviderLaunchStress.live] preserved temp dir: ${tempDir}\n`);
@@ -159,7 +191,7 @@ liveDescribe('provider launch stress live e2e', () => {
   }, 240_000);
 
   it(
-    'launches, restarts, and exercises post-launch work for provider teams with five teammates each',
+    'launches, restarts, and exercises post-launch work for provider teams with the requested teammate count',
     async () => {
       const orchestratorCli = process.env.CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH?.trim();
       expect(orchestratorCli).toBeTruthy();
@@ -495,6 +527,7 @@ function buildStressCreateRequest(input: {
     effort: providerId === 'codex' ? input.selection.codexEffort : undefined,
     fastMode: providerId === 'codex' ? 'off' : undefined,
     skipPermissions: true,
+    extraCliArgs: process.env.PROVIDER_LAUNCH_STRESS_EXTRA_CLI_ARGS?.trim() || undefined,
     prompt: 'Keep the team idle after bootstrap. Do not start extra work.',
     members,
   };
@@ -534,7 +567,7 @@ function resolveStressMemberProvider(
   return providers[index % providers.length] ?? 'anthropic';
 }
 
-function resolveScenarioSelection(scenario: ProviderLaunchStressScenario): {
+function resolveScenarioSelection(_scenario: ProviderLaunchStressScenario): {
   anthropicModel: string;
   codexModel: string;
   codexEffort: 'low' | 'medium' | 'high' | 'xhigh';
diff --git a/test/main/services/team/TeamInboxWriter.test.ts b/test/main/services/team/TeamInboxWriter.test.ts
index 6d24dccb..2ef629a1 100644
--- a/test/main/services/team/TeamInboxWriter.test.ts
+++ b/test/main/services/team/TeamInboxWriter.test.ts
@@ -70,6 +70,7 @@ vi.mock('../../../../src/main/services/team/atomicWrite', () => ({
 
 vi.mock('../../../../src/main/services/team/fileLock', () => ({
   withFileLock: async (_path: string, fn: () => Promise<unknown>) => await fn(),
+  withFileLockSync: (_path: string, fn: () => unknown) => fn(),
 }));
 
 vi.mock('../../../../src/main/services/team/inboxLock', () => ({
diff --git a/test/main/services/team/TeamLaunchFailureArtifactPack.test.ts b/test/main/services/team/TeamLaunchFailureArtifactPack.test.ts
index 71c31e0c..a6a1fdb3 100644
--- a/test/main/services/team/TeamLaunchFailureArtifactPack.test.ts
+++ b/test/main/services/team/TeamLaunchFailureArtifactPack.test.ts
@@ -1,7 +1,6 @@
 import * as fs from 'fs/promises';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it } from 'vitest';
 
 import {
@@ -177,6 +176,133 @@ describe('TeamLaunchFailureArtifactPack', () => {
     });
   });
 
+  it('does not classify stdin warning as root cause after bootstrap transport evidence', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-mailbox-written',
+      reason:
+        'atlas: Teammate process atlas@signal-ops did not submit bootstrap prompt: timed out waiting for bootstrap_submitted; last transport stage: mailbox_bootstrap_written Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-atlas-1',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      lastTransportStage: 'mailbox_bootstrap_written',
+      noStdinWarning: true,
+      bootstrapSubmitted: false,
+    });
+  });
+
+  it('keeps inbox poller bootstrap stalls out of stdin_missing classification', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-inbox-ready-no-submit',
+      reason:
+        'atlas: Teammate process atlas@signal-ops did not submit bootstrap prompt: timed out waiting for bootstrap_submitted; last transport stage: inbox_poller_ready: initial poll observed bootstrap prompt Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-atlas-2',
+        'inbox_poller_ready detail=initial poll observed bootstrap prompt',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      lastTransportStage: 'inbox_poller_ready: initial poll observed bootstrap prompt',
+      noStdinWarning: true,
+      bootstrapSubmitted: false,
+    });
+  });
+
+  it('keeps submit-attempt stalls out of stdin_missing classification', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-submit-attempt-no-submit',
+      reason:
+        'bob: Teammate process bob@signal-ops did not submit bootstrap prompt: timed out waiting for bootstrap_submitted; last transport stage: bootstrap_submit_attempted: submitting bootstrap prompt Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-bob-1',
+        'bootstrap_submit_attempted detail=submitting bootstrap prompt',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      lastTransportStage: 'bootstrap_submit_attempted: submitting bootstrap prompt',
+      noStdinWarning: true,
+      bootstrapSubmitted: false,
+    });
+  });
+
+  it('keeps process exits after bootstrap transport evidence out of stdin_missing classification', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-submit-attempt-process-exit',
+      reason:
+        'alice: Teammate process alice@signal-ops did not submit bootstrap prompt: teammate process exited before bootstrap_submitted; last transport stage: bootstrap_submit_attempted: submitting bootstrap prompt Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-alice-1',
+        'bootstrap_submit_attempted detail=submitting bootstrap prompt',
+        'process exited before bootstrap_submitted',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      lastTransportStage: 'bootstrap_submit_attempted: submitting bootstrap prompt',
+      noStdinWarning: true,
+      bootstrapSubmitted: false,
+    });
+  });
+
+  it('keeps submitted bootstrap prompts out of stdin_missing classification while waiting for confirmation', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-submitted-no-confirm',
+      reason:
+        'alice: Teammate was registered but did not bootstrap-confirm before timeout. Last transport stage: bootstrap_submitted: messageId=bootstrap-alice-1 Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-alice-1',
+        'bootstrap_submit_attempted detail=submitting bootstrap prompt',
+        'event="bootstrap_submitted" detail=messageId=bootstrap-alice-1',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      lastTransportStage: 'bootstrap_submitted: messageId=bootstrap-alice-1',
+      noStdinWarning: true,
+      bootstrapSubmitted: true,
+    });
+  });
+
+  it('classifies accepted-without-uuid bootstrap submit failures as transport evidence', () => {
+    const input = {
+      teamName: 'artifact-team',
+      runId: 'run-submit-accepted-without-uuid',
+      reason:
+        'jack: Teammate process jack@signal-ops did not submit bootstrap prompt: teammate runtime failed before bootstrap_submitted (bootstrap_submit_accepted_without_uuid) Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+      progressTraceLines: [
+        'mailbox_bootstrap_written detail=messageId=bootstrap-jack-1',
+        'bootstrap_submit_attempted detail=submitting bootstrap prompt',
+        'bootstrap_submit_accepted_without_uuid detail=submit accepted without userMessageUuid',
+        'Warning: no stdin data received in 3s, proceeding without it.',
+      ],
+    };
+
+    expect(classifyLaunchFailureArtifact(input).code).toBe('model_no_bootstrap');
+    expect(extractLaunchBootstrapTransportBreadcrumb(input)).toMatchObject({
+      noStdinWarning: true,
+      bootstrapSubmitted: true,
+    });
+  });
+
   it('classifies provider quota separately from protocol errors', () => {
     expect(
       classifyLaunchFailureArtifact({
diff --git a/test/main/services/team/TeamMcpConfigBuilder.test.ts b/test/main/services/team/TeamMcpConfigBuilder.test.ts
index 9d4f96a8..94dcd4de 100644
--- a/test/main/services/team/TeamMcpConfigBuilder.test.ts
+++ b/test/main/services/team/TeamMcpConfigBuilder.test.ts
@@ -1,8 +1,8 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import * as fs from 'fs';
 import Module from 'module';
 import * as os from 'os';
 import * as path from 'path';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 type ExecCliMock = (
   binaryPath: string | null,
@@ -58,11 +58,11 @@ vi.mock('@main/utils/shellEnv', async (importOriginal) => {
   };
 });
 
-import { setAppDataBasePath, setClaudeBasePathOverride } from '@main/utils/pathDecoder';
 import {
-  TeamMcpConfigBuilder,
   clearResolvedNodePathForTests,
+  TeamMcpConfigBuilder,
 } from '@main/services/team/TeamMcpConfigBuilder';
+import { setAppDataBasePath, setClaudeBasePathOverride } from '@main/utils/pathDecoder';
 
 describe('TeamMcpConfigBuilder', () => {
   const createdPaths: string[] = [];
@@ -93,12 +93,12 @@ describe('TeamMcpConfigBuilder', () => {
 
   function readGeneratedServer(
     configPath: string
-  ): { command?: string; args?: string[]; env?: Record<string, string> } | undefined {
+  ): { command?: string; args?: string[]; enabled?: boolean; env?: Record<string, string> } | undefined {
     const raw = fs.readFileSync(configPath, 'utf8');
     const parsed = JSON.parse(raw) as {
       mcpServers?: Record<
         string,
-        { command?: string; args?: string[]; env?: Record<string, string> }
+        { command?: string; args?: string[]; enabled?: boolean; env?: Record<string, string> }
       >;
     };
     return parsed.mcpServers?.['agent-teams'];
@@ -465,6 +465,70 @@ describe('TeamMcpConfigBuilder', () => {
     expect(Object.keys(parsed.mcpServers)).toEqual(['agent-teams']);
   });
 
+  it('inlines allowlisted MCP servers for strict member policies with Claude precedence', async () => {
+    const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-home-'));
+    const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-project-'));
+    createdDirs.push(homeDir, projectDir);
+    mockHomeDir = homeDir;
+
+    fs.writeFileSync(
+      path.join(homeDir, '.claude.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            github: { type: 'http', url: 'https://user.example.com/mcp' },
+            sentry: { command: 'node', args: ['sentry.js'] },
+          },
+          projects: {
+            [projectDir]: {
+              mcpServers: {
+                github: { type: 'http', url: 'https://local.example.com/mcp' },
+              },
+            },
+          },
+        },
+        null,
+        2
+      )
+    );
+
+    fs.writeFileSync(
+      path.join(projectDir, '.mcp.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            github: { type: 'http', url: 'https://project.example.com/mcp' },
+            linear: { type: 'http', url: 'https://linear.example.com/mcp' },
+          },
+        },
+        null,
+        2
+      )
+    );
+
+    const builder = new TeamMcpConfigBuilder();
+    const configPath = await builder.writeConfigFile(projectDir, {
+      mode: 'strictAllowlist',
+      serverNames: ['GitHub', 'LINEAR'],
+    });
+    createdPaths.push(configPath);
+
+    const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
+      mcpServers: Record<string, { command?: string; args?: string[]; type?: string; url?: string }>;
+    };
+
+    expect(Object.keys(parsed.mcpServers).sort()).toEqual(['agent-teams', 'github', 'linear']);
+    expect(parsed.mcpServers.github).toEqual({
+      type: 'http',
+      url: 'https://local.example.com/mcp',
+    });
+    expect(parsed.mcpServers.linear).toEqual({
+      type: 'http',
+      url: 'https://linear.example.com/mcp',
+    });
+    expect(parsed.mcpServers.sentry).toBeUndefined();
+  });
+
   it('generated agent-teams server ignores same-named user MCP entry', async () => {
     const { sourceEntry, tsxCli } = mockSourceWorkspaceEntryAvailable();
     const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-home-'));
@@ -489,10 +553,122 @@ describe('TeamMcpConfigBuilder', () => {
     createdPaths.push(configPath);
 
     const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
-      mcpServers: Record<string, { command?: string; args?: string[] }>;
+      mcpServers: Record<string, { command?: string; args?: string[]; enabled?: boolean }>;
     };
 
     expectNodeTsxSourceEntry(parsed.mcpServers['agent-teams'], tsxCli, sourceEntry);
+    expect(parsed.mcpServers['agent-teams']?.enabled).toBe(true);
+  });
+
+  it('forces generated agent-teams MCP even when user, project, local, or allowlist settings shadow it', async () => {
+    const { sourceEntry, tsxCli } = mockSourceWorkspaceEntryAvailable();
+    const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-home-'));
+    const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-project-'));
+    createdDirs.push(homeDir, projectDir);
+    mockHomeDir = homeDir;
+
+    fs.writeFileSync(
+      path.join(homeDir, '.claude.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            'agent-teams': { command: 'node', args: ['user-shadow.js'], enabled: false },
+          },
+          projects: {
+            [projectDir]: {
+              mcpServers: {
+                'agent-teams': {
+                  command: 'node',
+                  args: ['local-shadow.js'],
+                  enabled: false,
+                },
+              },
+            },
+          },
+        },
+        null,
+        2
+      )
+    );
+    fs.writeFileSync(
+      path.join(projectDir, '.mcp.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            'agent-teams': { command: 'node', args: ['project-shadow.js'], enabled: false },
+          },
+        },
+        null,
+        2
+      )
+    );
+
+    const builder = new TeamMcpConfigBuilder();
+    const configPath = await builder.writeConfigFile(projectDir, {
+      mode: 'strictAllowlist',
+      serverNames: ['agent-teams'],
+    });
+    createdPaths.push(configPath);
+
+    const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
+      mcpServers: Record<string, { command?: string; args?: string[]; enabled?: boolean }>;
+    };
+
+    expect(Object.keys(parsed.mcpServers)).toEqual(['agent-teams']);
+    expectNodeTsxSourceEntry(parsed.mcpServers['agent-teams'], tsxCli, sourceEntry);
+    expect(parsed.mcpServers['agent-teams']?.enabled).toBe(true);
+  });
+
+  it('forces the generated agent-teams MCP server on regardless of user, local, or project settings', async () => {
+    const { sourceEntry, tsxCli } = mockSourceWorkspaceEntryAvailable();
+    const homeDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-home-'));
+    const projectDir = fs.mkdtempSync(path.join(os.tmpdir(), 'team-mcp-project-'));
+    createdDirs.push(homeDir, projectDir);
+    mockHomeDir = homeDir;
+
+    fs.writeFileSync(
+      path.join(homeDir, '.claude.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            'agent-teams': { command: 'node', args: ['user-disabled.js'], enabled: false },
+          },
+          projects: {
+            [projectDir]: {
+              mcpServers: {
+                'agent-teams': { command: 'node', args: ['local-disabled.js'], enabled: false },
+              },
+            },
+          },
+        },
+        null,
+        2
+      )
+    );
+    fs.writeFileSync(
+      path.join(projectDir, '.mcp.json'),
+      JSON.stringify(
+        {
+          mcpServers: {
+            'agent-teams': { command: 'node', args: ['project-disabled.js'], enabled: false },
+          },
+        },
+        null,
+        2
+      )
+    );
+
+    const builder = new TeamMcpConfigBuilder();
+    const configPath = await builder.writeConfigFile(projectDir);
+    createdPaths.push(configPath);
+
+    const parsed = JSON.parse(fs.readFileSync(configPath, 'utf8')) as {
+      mcpServers: Record<string, { command?: string; args?: string[]; enabled?: boolean }>;
+    };
+
+    expect(Object.keys(parsed.mcpServers)).toEqual(['agent-teams']);
+    expect(parsed.mcpServers['agent-teams']?.enabled).toBe(true);
+    expectNodeTsxSourceEntry(parsed.mcpServers['agent-teams'], tsxCli, sourceEntry);
   });
 
   it('passes the configured Claude root to the MCP server', async () => {
diff --git a/test/main/services/team/TeamMemberRuntimeAdvisoryService.test.ts b/test/main/services/team/TeamMemberRuntimeAdvisoryService.test.ts
index c891e7b4..3221df5b 100644
--- a/test/main/services/team/TeamMemberRuntimeAdvisoryService.test.ts
+++ b/test/main/services/team/TeamMemberRuntimeAdvisoryService.test.ts
@@ -1,13 +1,19 @@
+import * as fs from 'fs/promises';
 import * as os from 'os';
 import * as path from 'path';
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
-import * as fs from 'fs/promises';
-
 import { TeamMemberRuntimeAdvisoryService } from '../../../../src/main/services/team/TeamMemberRuntimeAdvisoryService';
 import { setClaudeBasePathOverride } from '../../../../src/main/utils/pathDecoder';
 
-import type { MemberRuntimeAdvisory, ResolvedTeamMember } from '../../../../src/shared/types/team';
+import type { OpenCodePromptDeliveryLedgerRecord } from '../../../../src/main/services/team/opencode/delivery/OpenCodePromptDeliveryLedger';
+import type {
+  InboxMessage,
+  MemberRuntimeAdvisory,
+  ResolvedTeamMember,
+  TaskRef,
+  TeamTask,
+} from '../../../../src/shared/types/team';
 
 interface Deferred<T> {
   promise: Promise<T>;
@@ -15,6 +21,11 @@ interface Deferred<T> {
   reject: (reason?: unknown) => void;
 }
 
+interface TeamMemberRuntimeAdvisoryServiceTestAccess {
+  extractApiRetryAdvisory(line: string): MemberRuntimeAdvisory | null;
+  extractApiErrorAdvisory(line: string, observedAtMs: number): MemberRuntimeAdvisory | null;
+}
+
 function createDeferred<T>(): Deferred<T> {
   let resolve!: (value: T) => void;
   let reject!: (reason?: unknown) => void;
@@ -43,6 +54,12 @@ function buildRetryingAdvisory(label: string): MemberRuntimeAdvisory {
   };
 }
 
+function serviceTestAccess(
+  service: TeamMemberRuntimeAdvisoryService
+): TeamMemberRuntimeAdvisoryServiceTestAccess {
+  return service as unknown as TeamMemberRuntimeAdvisoryServiceTestAccess;
+}
+
 function createStubbedServiceHarness() {
   const logsFinder = {
     findMemberLogs: vi.fn(async (_teamName: string, memberName: string) => [
@@ -67,6 +84,119 @@ function createStubbedServiceHarness() {
   return { service, logsFinder, advisoryByFilePath, readRecentApiRetryAdvisory };
 }
 
+function buildOpenCodeDeliveryRecord(
+  overrides: Partial<OpenCodePromptDeliveryLedgerRecord>
+): OpenCodePromptDeliveryLedgerRecord {
+  const now = '2026-05-19T12:19:04.252Z';
+  return {
+    id: 'opencode-prompt:test',
+    teamName: 'relay-release',
+    memberName: 'tom',
+    laneId: 'secondary:opencode:tom',
+    runId: 'run-1',
+    runtimeSessionId: 'session-1',
+    inboxMessageId: 'assignment-1',
+    inboxTimestamp: '2026-05-19T12:14:56.227Z',
+    source: 'watcher',
+    messageKind: null,
+    replyRecipient: 'team-lead',
+    actionMode: null,
+    taskRefs: [],
+    payloadHash: 'sha256:test',
+    status: 'failed_terminal',
+    responseState: 'reconcile_failed',
+    attempts: 3,
+    maxAttempts: 3,
+    acceptanceUnknown: false,
+    nextAttemptAt: null,
+    lastAttemptAt: '2026-05-19T12:19:04.203Z',
+    lastObservedAt: '2026-05-19T12:18:44.306Z',
+    acceptedAt: '2026-05-19T12:15:47.042Z',
+    respondedAt: '2026-05-19T12:16:09.712Z',
+    failedAt: now,
+    inboxReadCommittedAt: null,
+    inboxReadCommitError: null,
+    prePromptCursor: 'msg_before',
+    postPromptCursor: null,
+    deliveredUserMessageId: 'msg_user',
+    observedAssistantMessageId: 'msg_assistant',
+    observedAssistantPreview: null,
+    observedToolCallNames: [],
+    observedVisibleMessageId: null,
+    visibleReplyMessageId: null,
+    visibleReplyInbox: null,
+    visibleReplyCorrelation: null,
+    lastReason: 'OpenCode bridge command timed out',
+    diagnostics: [
+      'OpenCode prompt_async accepted; response observation will continue through durable app-side ledger reconciliation.',
+      'project_behavior_changed',
+      'opencode_session_stale_observe_scheduled_after_accepted_prompt',
+      'OpenCode bridge command timed out',
+    ],
+    createdAt: '2026-05-19T12:14:56.474Z',
+    updatedAt: now,
+    ...overrides,
+  };
+}
+
+async function writeOpenCodeDeliveryFixture(input: {
+  baseDir: string;
+  teamName: string;
+  laneId: string;
+  records: OpenCodePromptDeliveryLedgerRecord[];
+  inboxes?: Record<string, InboxMessage[]>;
+  tasks?: TeamTask[];
+}): Promise<void> {
+  const teamDir = path.join(input.baseDir, 'teams', input.teamName);
+  const laneDir = path.join(
+    teamDir,
+    '.opencode-runtime',
+    'lanes',
+    encodeURIComponent(input.laneId)
+  );
+  await fs.mkdir(laneDir, { recursive: true });
+  await fs.writeFile(
+    path.join(teamDir, '.opencode-runtime', 'lanes.json'),
+    JSON.stringify({
+      version: 1,
+      updatedAt: input.records[0]?.updatedAt ?? new Date().toISOString(),
+      lanes: {
+        [input.laneId]: {
+          laneId: input.laneId,
+          state: 'active',
+          updatedAt: input.records[0]?.updatedAt ?? new Date().toISOString(),
+        },
+      },
+    }),
+    'utf8'
+  );
+  await fs.writeFile(
+    path.join(laneDir, 'opencode-prompt-delivery-ledger.json'),
+    JSON.stringify({
+      schemaVersion: 1,
+      updatedAt: input.records[0]?.updatedAt ?? new Date().toISOString(),
+      data: input.records,
+    }),
+    'utf8'
+  );
+
+  if (input.inboxes) {
+    const inboxDir = path.join(teamDir, 'inboxes');
+    await fs.mkdir(inboxDir, { recursive: true });
+    for (const [inboxName, messages] of Object.entries(input.inboxes)) {
+      await fs.writeFile(path.join(inboxDir, `${inboxName}.json`), JSON.stringify(messages), 'utf8');
+    }
+  }
+
+  if (input.tasks) {
+    const tasksDir = path.join(input.baseDir, 'tasks', input.teamName);
+    await fs.mkdir(tasksDir, { recursive: true });
+    for (const task of input.tasks) {
+      await fs.writeFile(path.join(tasksDir, `${task.id}.json`), JSON.stringify(task), 'utf8');
+    }
+  }
+}
+
 describe('TeamMemberRuntimeAdvisoryService', () => {
   let tmpDir: string | null = null;
 
@@ -175,7 +305,7 @@ describe('TeamMemberRuntimeAdvisoryService', () => {
     ['backend_error', 'Unexpected backend blew up during request processing.'],
   ] as const)('classifies %s retry causes from api_error messages', async (expected, message) => {
     const service = new TeamMemberRuntimeAdvisoryService({} as never);
-    const advisory = (service as any).extractApiRetryAdvisory(
+    const advisory = serviceTestAccess(service).extractApiRetryAdvisory(
       JSON.stringify({
         type: 'system',
         subtype: 'api_error',
@@ -196,7 +326,7 @@ describe('TeamMemberRuntimeAdvisoryService', () => {
 
   it('classifies missing api_error message text as unknown', () => {
     const service = new TeamMemberRuntimeAdvisoryService({} as never);
-    const advisory = (service as any).extractApiRetryAdvisory(
+    const advisory = serviceTestAccess(service).extractApiRetryAdvisory(
       JSON.stringify({
         type: 'system',
         subtype: 'api_error',
@@ -211,7 +341,7 @@ describe('TeamMemberRuntimeAdvisoryService', () => {
   it('keeps terminal API errors visible after retries stop', () => {
     const service = new TeamMemberRuntimeAdvisoryService({} as never);
     const observedAt = '2099-04-09T10:00:00.000Z';
-    const advisory = (service as any).extractApiErrorAdvisory(
+    const advisory = serviceTestAccess(service).extractApiErrorAdvisory(
       JSON.stringify({
         type: 'assistant',
         timestamp: observedAt,
@@ -241,7 +371,7 @@ describe('TeamMemberRuntimeAdvisoryService', () => {
   it('treats Claude Code account access failures as auth errors', () => {
     const service = new TeamMemberRuntimeAdvisoryService({} as never);
     const observedAt = '2099-04-09T10:00:00.000Z';
-    const advisory = (service as any).extractApiErrorAdvisory(
+    const advisory = serviceTestAccess(service).extractApiErrorAdvisory(
       JSON.stringify({
         type: 'assistant',
         timestamp: observedAt,
@@ -558,6 +688,288 @@ describe('TeamMemberRuntimeAdvisoryService', () => {
     });
   });
 
+  it('suppresses stale OpenCode reconcile advisories after a later relayed runtime reply exists', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:26:30.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    const taskRef: TaskRef = {
+      teamName,
+      taskId: 'fb72209d-ea5b-45e0-9380-fe2e8235206e',
+      displayId: 'fb72209d',
+    };
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [
+        buildOpenCodeDeliveryRecord({
+          teamName,
+          laneId,
+          taskRefs: [taskRef],
+        }),
+      ],
+      inboxes: {
+        'team-lead': [
+          {
+            from: 'tom',
+            to: 'team-lead',
+            text: '#fb72209d done. API docs regenerated, diff empty.',
+            timestamp: '2026-05-19T12:25:56.384Z',
+            read: true,
+            relayOfMessageId: 'assignment-1',
+            source: 'runtime_delivery',
+            messageId: 'visible-reply-1',
+            taskRefs: [taskRef],
+            summary: '#fb72209d done',
+          },
+        ],
+      },
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toBeNull();
+  });
+
+  it('keeps stale OpenCode reconcile advisories visible until persisted proof exists', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:26:30.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [buildOpenCodeDeliveryRecord({ teamName, laneId })],
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toMatchObject({
+      kind: 'api_error',
+      reasonCode: 'backend_error',
+    });
+    expect(advisory?.message).toContain(
+      'opencode_session_stale_observe_scheduled_after_accepted_prompt'
+    );
+  });
+
+  it('keeps stale OpenCode advisories visible after unrelated later delivery success', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:30:00.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [
+        buildOpenCodeDeliveryRecord({ teamName, laneId }),
+        buildOpenCodeDeliveryRecord({
+          id: 'opencode-prompt:later-success',
+          teamName,
+          laneId,
+          inboxMessageId: 'later-assignment',
+          inboxTimestamp: '2026-05-19T12:24:00.000Z',
+          status: 'responded',
+          responseState: 'responded_visible_message',
+          taskRefs: [
+            {
+              teamName,
+              taskId: 'different-task',
+              displayId: 'different',
+            },
+          ],
+          failedAt: null,
+          respondedAt: '2026-05-19T12:25:30.000Z',
+          lastObservedAt: '2026-05-19T12:25:30.000Z',
+          updatedAt: '2026-05-19T12:25:45.000Z',
+          inboxReadCommittedAt: '2026-05-19T12:25:45.000Z',
+          visibleReplyMessageId: 'later-visible-reply',
+          visibleReplyInbox: 'team-lead',
+          visibleReplyCorrelation: 'relayOfMessageId',
+          lastReason: null,
+          diagnostics: [],
+        }),
+      ],
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toMatchObject({
+      kind: 'api_error',
+      reasonCode: 'backend_error',
+    });
+  });
+
+  it('does not suppress stale OpenCode advisories for same-member replies without relay or task proof', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:26:30.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    const taskRef: TaskRef = {
+      teamName,
+      taskId: 'fb72209d-ea5b-45e0-9380-fe2e8235206e',
+      displayId: 'fb72209d',
+    };
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [
+        buildOpenCodeDeliveryRecord({
+          teamName,
+          laneId,
+          taskRefs: [taskRef],
+        }),
+      ],
+      inboxes: {
+        'team-lead': [
+          {
+            from: 'tom',
+            to: 'team-lead',
+            text: 'Done on a different prompt.',
+            timestamp: '2026-05-19T12:25:56.384Z',
+            read: true,
+            source: 'runtime_delivery',
+            messageId: 'unrelated-reply',
+            summary: 'Done',
+          },
+        ],
+      },
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toMatchObject({
+      kind: 'api_error',
+      reasonCode: 'backend_error',
+    });
+  });
+
+  it('does not suppress stale OpenCode advisories for task progress from another member', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:26:30.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    const taskId = 'fb72209d-ea5b-45e0-9380-fe2e8235206e';
+    const taskRef: TaskRef = { teamName, taskId, displayId: 'fb72209d' };
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [
+        buildOpenCodeDeliveryRecord({
+          teamName,
+          laneId,
+          taskRefs: [taskRef],
+        }),
+      ],
+      tasks: [
+        {
+          id: taskId,
+          displayId: 'fb72209d',
+          subject: 'API docs',
+          owner: 'tom',
+          status: 'completed',
+          updatedAt: '2026-05-19T12:25:56.384Z',
+          comments: [
+            {
+              id: 'other-member-comment',
+              author: 'alice',
+              text: 'I verified this task.',
+              createdAt: '2026-05-19T12:25:56.384Z',
+              type: 'regular',
+            },
+          ],
+          historyEvents: [
+            {
+              id: 'other-member-status',
+              type: 'status_changed',
+              from: 'in_progress',
+              to: 'completed',
+              actor: 'alice',
+              timestamp: '2026-05-19T12:25:56.384Z',
+            },
+          ],
+        },
+      ],
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toMatchObject({
+      kind: 'api_error',
+      reasonCode: 'backend_error',
+    });
+  });
+
+  it('does not surface advisory for responded OpenCode records with committed visible proof', async () => {
+    vi.useFakeTimers();
+    vi.setSystemTime(new Date('2026-05-19T12:28:00.000Z'));
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
+    setClaudeBasePathOverride(tmpDir);
+
+    const teamName = 'relay-release';
+    const laneId = 'secondary:opencode:tom';
+    await writeOpenCodeDeliveryFixture({
+      baseDir: tmpDir,
+      teamName,
+      laneId,
+      records: [
+        buildOpenCodeDeliveryRecord({
+          teamName,
+          laneId,
+          status: 'responded',
+          responseState: 'responded_visible_message',
+          inboxReadCommittedAt: '2026-05-19T12:27:04.858Z',
+          visibleReplyMessageId: 'visible-reply-1',
+          visibleReplyInbox: 'team-lead',
+          visibleReplyCorrelation: 'relayOfMessageId',
+          updatedAt: '2026-05-19T12:27:04.858Z',
+        }),
+      ],
+    });
+
+    const service = new TeamMemberRuntimeAdvisoryService({
+      findMemberLogs: vi.fn(async () => []),
+    });
+    const advisory = await service.getMemberAdvisory(teamName, 'tom');
+
+    expect(advisory).toBeNull();
+  });
+
   it('suppresses stale OpenCode prompt delivery advisories after a visible runtime reply exists', async () => {
     tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'claude-team-advisory-'));
     setClaudeBasePathOverride(tmpDir);
diff --git a/test/main/services/team/TeamProvisioningService.test.ts b/test/main/services/team/TeamProvisioningService.test.ts
index 2a4fbbd5..f3d2ddfe 100644
--- a/test/main/services/team/TeamProvisioningService.test.ts
+++ b/test/main/services/team/TeamProvisioningService.test.ts
@@ -1,12 +1,12 @@
-import type { ChildProcess } from 'child_process';
+import { buildWorkspaceTrustPathCandidates } from '@features/workspace-trust/main';
 import { EventEmitter } from 'events';
 import * as fs from 'fs';
 import { promises as fsPromises } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { buildWorkspaceTrustPathCandidates } from '@features/workspace-trust/main';
+
+import type { ChildProcess } from 'child_process';
 
 const hoisted = vi.hoisted(() => ({
   paths: {
@@ -129,26 +129,19 @@ vi.mock('@main/utils/pathDecoder', async (importOriginal) => {
 });
 
 import {
-  getMixedLaunchFallbackRecoveryError,
-  TeamProvisioningService,
-} from '@main/services/team/TeamProvisioningService';
+  killTmuxPaneForCurrentPlatformSync,
+  listRuntimeProcessTableForCurrentPlatform,
+  listTmuxPanePidsForCurrentPlatform,
+  listTmuxPaneRuntimeInfoForCurrentPlatform,
+  sendKeysToTmuxPaneForCurrentPlatform,
+} from '@features/tmux-installer/main';
 import { agentTeamsMcpHttpServer } from '@main/services/team/AgentTeamsMcpHttpServer';
-import { TeamTaskActivityIntervalService } from '@main/services/team/TeamTaskActivityIntervalService';
 import {
   clearAutoResumeService,
   getAutoResumeService,
   initializeAutoResumeService,
 } from '@main/services/team/AutoResumeService';
-import { getTeamBootstrapStatePath } from '@main/services/team/TeamBootstrapStateReader';
-import {
-  createPersistedLaunchSnapshot,
-  snapshotFromRuntimeMemberStatuses,
-} from '@main/services/team/TeamLaunchStateEvaluator';
-import {
-  getTeamLaunchStatePath,
-  getTeamLaunchSummaryPath,
-} from '@main/services/team/TeamLaunchStateStore';
-import { TeamConfigReader } from '@main/services/team/TeamConfigReader';
+import { ClaudeBinaryResolver } from '@main/services/team/ClaudeBinaryResolver';
 import { OPEN_CODE_BRIDGE_SCHEMA_VERSION } from '@main/services/team/opencode/bridge/OpenCodeBridgeCommandContract';
 import { OpenCodeReadinessBridge } from '@main/services/team/opencode/bridge/OpenCodeReadinessBridge';
 import {
@@ -167,12 +160,26 @@ import {
   OPENCODE_RUNTIME_STORE_DESCRIPTORS,
   RuntimeStoreBatchWriter,
 } from '@main/services/team/opencode/store/RuntimeStoreManifest';
-import { ClaudeBinaryResolver } from '@main/services/team/ClaudeBinaryResolver';
 import { OpenCodeTeamRuntimeAdapter } from '@main/services/team/runtime/OpenCodeTeamRuntimeAdapter';
 import { TeamRuntimeAdapterRegistry } from '@main/services/team/runtime/TeamRuntimeAdapter';
+import { getTeamBootstrapStatePath } from '@main/services/team/TeamBootstrapStateReader';
+import { TeamConfigReader } from '@main/services/team/TeamConfigReader';
+import {
+  createPersistedLaunchSnapshot,
+  snapshotFromRuntimeMemberStatuses,
+} from '@main/services/team/TeamLaunchStateEvaluator';
+import {
+  getTeamLaunchStatePath,
+  getTeamLaunchSummaryPath,
+} from '@main/services/team/TeamLaunchStateStore';
+import {
+  getMixedLaunchFallbackRecoveryError,
+  TeamProvisioningService,
+} from '@main/services/team/TeamProvisioningService';
+import { TeamTaskActivityIntervalService } from '@main/services/team/TeamTaskActivityIntervalService';
 import { spawnCli } from '@main/utils/childProcess';
-import { killProcessByPid } from '@main/utils/processKill';
 import { encodePath } from '@main/utils/pathDecoder';
+import { killProcessByPid } from '@main/utils/processKill';
 import {
   listWindowsProcessTable,
   listWindowsProcessTableSync,
@@ -181,13 +188,6 @@ import {
   AGENT_TEAMS_NAMESPACED_LEAD_BOOTSTRAP_TOOL_NAMES,
   AGENT_TEAMS_NAMESPACED_TEAMMATE_OPERATIONAL_TOOL_NAMES,
 } from 'agent-teams-controller';
-import {
-  killTmuxPaneForCurrentPlatformSync,
-  listRuntimeProcessTableForCurrentPlatform,
-  listTmuxPanePidsForCurrentPlatform,
-  listTmuxPaneRuntimeInfoForCurrentPlatform,
-  sendKeysToTmuxPaneForCurrentPlatform,
-} from '@features/tmux-installer/main';
 import pidusage from 'pidusage';
 
 const EXPECTED_RUNTIME_PIDUSAGE_OPTIONS =
@@ -625,6 +625,37 @@ function createMemberSpawnRun(params?: {
   } as any;
 }
 
+type LeadActivityTestState = 'active' | 'idle' | 'offline';
+
+interface LeadActivityTestRun {
+  runId: string;
+  teamName: string;
+  leadActivityState: LeadActivityTestState;
+  request: {
+    members: { name: string; role: string }[];
+  };
+}
+
+interface LeadActivityServiceInternals {
+  runs: Map<string, LeadActivityTestRun>;
+  aliveRunByTeam: Map<string, string>;
+  setLeadActivity(run: LeadActivityTestRun, state: LeadActivityTestState): void;
+}
+
+function toLeadActivityTestRun(
+  params: Parameters<typeof createMemberSpawnRun>[0],
+  leadActivityState: LeadActivityTestState,
+  leadName: string
+): LeadActivityTestRun {
+  return {
+    ...createMemberSpawnRun(params),
+    leadActivityState,
+    request: {
+      members: [{ name: leadName, role: 'Team Lead' }],
+    },
+  };
+}
+
 const TEST_OPENCODE_APP_MANAGED_BOOTSTRAP_PROMPT = [
   'AGENT_TEAMS_APP_MANAGED_BOOTSTRAP_V1',
   '<agent_teams_app_managed_briefing_source>',
@@ -1274,6 +1305,7 @@ describe('TeamProvisioningService', () => {
           },
           expectedMembers: ['alice', 'bob'],
           allEffectiveMembers: [{ name: 'alice' }, { name: 'bob' }],
+          teamLaunchedNotificationFired: undefined as boolean | undefined,
           memberSpawnStatuses: new Map([
             [
               'alice',
@@ -1332,6 +1364,205 @@ describe('TeamProvisioningService', () => {
       }
     });
 
+    it('does not latch the launched notification flag when called before all teammates join', 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-early-launch-toast',
+          teamName: 'early-launch-toast-team',
+          isLaunch: true,
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'early-launch-toast-team',
+          },
+          expectedMembers: ['alice', 'bob'],
+          allEffectiveMembers: [{ name: 'alice' }, { name: 'bob' }],
+          teamLaunchedNotificationFired: undefined as boolean | undefined,
+          memberSpawnStatuses: new Map([
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+            [
+              'bob',
+              createMemberSpawnStatusEntry({
+                status: 'waiting',
+                launchState: 'runtime_pending_bootstrap',
+                runtimeAlive: true,
+                bootstrapConfirmed: false,
+              }),
+            ],
+          ]),
+        };
+        const internals = svc as unknown as {
+          fireTeamLaunchedNotification(targetRun: typeof run): Promise<void>;
+        };
+
+        await internals.fireTeamLaunchedNotification(run);
+
+        expect(addTeamNotification).not.toHaveBeenCalled();
+        expect(run.teamLaunchedNotificationFired).toBeUndefined();
+
+        run.memberSpawnStatuses.set(
+          'bob',
+          createMemberSpawnStatusEntry({
+            status: 'online',
+            launchState: 'confirmed_alive',
+            runtimeAlive: true,
+            bootstrapConfirmed: true,
+          })
+        );
+
+        await internals.fireTeamLaunchedNotification(run);
+
+        expect(addTeamNotification).toHaveBeenCalledTimes(1);
+      } finally {
+        NotificationManager.resetInstance();
+      }
+    });
+
+    it('waits for current mixed secondary lane evidence before firing team launched', 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 jackLane: {
+          laneId: string;
+          providerId: 'opencode';
+          member: { name: string; providerId: 'opencode' };
+          runId: string;
+          state: 'queued' | 'launching' | 'finished';
+          result: null | {
+            runId: string;
+            teamName: string;
+            launchPhase: 'finished';
+            teamLaunchState: 'clean_success';
+            members: Record<
+              string,
+              {
+                memberName: string;
+                providerId: 'opencode';
+                launchState: 'confirmed_alive';
+                agentToolAccepted: boolean;
+                runtimeAlive: boolean;
+                bootstrapConfirmed: boolean;
+                hardFailure: boolean;
+              }
+            >;
+            warnings: string[];
+            diagnostics: string[];
+          };
+          warnings: string[];
+          diagnostics: string[];
+        } = {
+          laneId: 'secondary:opencode:jack',
+          providerId: 'opencode',
+          member: { name: 'jack', providerId: 'opencode' },
+          runId: 'opencode-run-jack-current',
+          state: 'launching',
+          result: null,
+          warnings: [],
+          diagnostics: [],
+        };
+        const run = {
+          runId: 'run-mixed-lane-race',
+          teamName: 'mixed-lane-race-team',
+          isLaunch: true,
+          provisioningComplete: true,
+          processKilled: false,
+          cancelRequested: false,
+          progress: { state: 'ready' },
+          request: {
+            cwd: tempClaudeRoot,
+            displayName: 'mixed-lane-race-team',
+          },
+          expectedMembers: ['alice', 'jack'],
+          allEffectiveMembers: [{ name: 'alice' }, { name: 'jack', providerId: 'opencode' }],
+          mixedSecondaryLanes: [jackLane],
+          memberSpawnStatuses: new Map([
+            [
+              'alice',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+            [
+              'jack',
+              createMemberSpawnStatusEntry({
+                status: 'online',
+                launchState: 'confirmed_alive',
+                runtimeAlive: true,
+                bootstrapConfirmed: true,
+              }),
+            ],
+          ]),
+        };
+        const internals = svc as unknown as {
+          runs: Map<string, typeof run>;
+          aliveRunByTeam: Map<string, string>;
+          emitMemberSpawnChange(targetRun: typeof run, memberName: string): void;
+        };
+        internals.runs.set(run.runId, run);
+        internals.aliveRunByTeam.set(run.teamName, run.runId);
+
+        internals.emitMemberSpawnChange(run, 'jack');
+        await Promise.resolve();
+
+        expect(addTeamNotification).not.toHaveBeenCalled();
+
+        jackLane.state = 'finished';
+        jackLane.result = {
+          runId: 'opencode-run-jack-current',
+          teamName: 'mixed-lane-race-team',
+          launchPhase: 'finished',
+          teamLaunchState: 'clean_success',
+          members: {
+            jack: {
+              memberName: 'jack',
+              providerId: 'opencode',
+              launchState: 'confirmed_alive',
+              agentToolAccepted: true,
+              runtimeAlive: true,
+              bootstrapConfirmed: true,
+              hardFailure: false,
+            },
+          },
+          warnings: [],
+          diagnostics: [],
+        };
+
+        internals.emitMemberSpawnChange(run, 'jack');
+        await Promise.resolve();
+
+        expect(addTeamNotification).toHaveBeenCalledTimes(1);
+        expect(addTeamNotification).toHaveBeenCalledWith(
+          expect.objectContaining({
+            teamEventType: 'team_launched',
+            teamName: 'mixed-lane-race-team',
+            body: 'Team "mixed-lane-race-team" has been launched - all 2 teammates joined and are ready for tasks.',
+          })
+        );
+      } finally {
+        NotificationManager.resetInstance();
+      }
+    });
+
     it('does not fire incomplete notification for pending-only teammates still joining', async () => {
       const { NotificationManager } =
         await import('@main/services/infrastructure/NotificationManager');
@@ -2182,6 +2413,108 @@ describe('TeamProvisioningService', () => {
     });
   });
 
+  describe('lead activity task intervals', () => {
+    it('read-repairs active lead task intervals once when lead activity is polled', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:00:00.000Z'));
+      const resumeSpy = vi
+        .spyOn(TeamTaskActivityIntervalService.prototype, 'resumeActiveIntervalsForMember')
+        .mockReturnValue({ changedTasks: 1 });
+      try {
+        const svc = new TeamProvisioningService();
+        const internals = svc as unknown as LeadActivityServiceInternals;
+        const teamName = 'lead-activity-read-repair-team';
+        const run = toLeadActivityTestRun(
+          {
+            runId: 'run-lead-read-repair',
+            teamName,
+            expectedMembers: ['alice'],
+          },
+          'active',
+          'lead'
+        );
+        internals.runs.set(run.runId, run);
+        internals.aliveRunByTeam.set(teamName, run.runId);
+
+        expect(svc.getLeadActivityState(teamName)).toEqual({
+          state: 'active',
+          runId: run.runId,
+        });
+        expect(svc.getLeadActivityState(teamName)).toEqual({
+          state: 'active',
+          runId: run.runId,
+        });
+
+        expect(resumeSpy).toHaveBeenCalledTimes(1);
+        expect(resumeSpy).toHaveBeenCalledWith(teamName, 'lead', '2026-05-02T10:00:00.000Z');
+      } finally {
+        resumeSpy.mockRestore();
+      }
+    });
+
+    it('syncs lead task intervals only for the currently tracked run', () => {
+      vi.useFakeTimers();
+      vi.setSystemTime(new Date('2026-05-02T10:05:00.000Z'));
+      const resumeSpy = vi
+        .spyOn(TeamTaskActivityIntervalService.prototype, 'resumeActiveIntervalsForMember')
+        .mockReturnValue({ changedTasks: 1 });
+      const pauseSpy = vi
+        .spyOn(TeamTaskActivityIntervalService.prototype, 'pauseActiveIntervalsForMember')
+        .mockReturnValue({ changedTasks: 1 });
+      try {
+        const svc = new TeamProvisioningService();
+        const internals = svc as unknown as LeadActivityServiceInternals;
+        const teamName = 'lead-activity-current-run-team';
+        const run = toLeadActivityTestRun(
+          {
+            runId: 'run-current-lead-activity',
+            teamName,
+            expectedMembers: ['alice'],
+          },
+          'idle',
+          'team-lead'
+        );
+        internals.runs.set(run.runId, run);
+        internals.aliveRunByTeam.set(teamName, run.runId);
+
+        internals.setLeadActivity(run, 'active');
+        internals.setLeadActivity(run, 'active');
+        internals.setLeadActivity(run, 'idle');
+
+        expect(resumeSpy).toHaveBeenCalledTimes(1);
+        expect(resumeSpy).toHaveBeenCalledWith(
+          teamName,
+          'team-lead',
+          '2026-05-02T10:05:00.000Z'
+        );
+        expect(pauseSpy).toHaveBeenCalledTimes(1);
+        expect(pauseSpy).toHaveBeenCalledWith(
+          teamName,
+          'team-lead',
+          '2026-05-02T10:05:00.000Z'
+        );
+
+        const staleRun = toLeadActivityTestRun(
+          {
+            runId: 'run-stale-lead-activity',
+            teamName,
+            expectedMembers: ['alice'],
+          },
+          'active',
+          'team-lead'
+        );
+        internals.runs.set(staleRun.runId, staleRun);
+
+        internals.setLeadActivity(staleRun, 'offline');
+
+        expect(pauseSpy).toHaveBeenCalledTimes(1);
+      } finally {
+        resumeSpy.mockRestore();
+        pauseSpy.mockRestore();
+      }
+    });
+  });
+
   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();
@@ -14935,6 +15268,106 @@ describe('TeamProvisioningService', () => {
       expect(launchArgs).not.toContain('--strict-mcp-config');
     });
 
+    it('launches direct process teammate restarts with strict per-member MCP policy', async () => {
+      const teamName = 'process-strict-mcp-team';
+      const projectPath = path.join(tempProjectsBase, 'process-strict-mcp-project');
+      fs.mkdirSync(projectPath, { recursive: true });
+
+      vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
+      const child = Object.assign(new EventEmitter(), {
+        pid: 4568,
+        stdin: { on: vi.fn(), unref: vi.fn() },
+        stdout: { pipe: vi.fn(), unref: vi.fn() },
+        stderr: { pipe: vi.fn(), unref: vi.fn() },
+        unref: vi.fn(),
+      });
+      vi.mocked(spawnCli).mockReturnValue(child as any);
+
+      const mcpConfigBuilder = {
+        writeConfigFile: vi.fn(async () => '/mock/strict-mcp-config.json'),
+      };
+      const svc = new TeamProvisioningService(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        mcpConfigBuilder as any
+      );
+      const run = createMemberSpawnRun({
+        teamName,
+        expectedMembers: ['forge'],
+        memberSpawnStatuses: new Map(),
+      });
+      run.child = { pid: 111 };
+      run.request = { providerId: 'codex', skipPermissions: true };
+      run.detectedSessionId = 'lead-session-1';
+      const configuredMember = {
+        name: 'forge',
+        role: 'Developer',
+        providerId: 'codex',
+        model: 'gpt-5.4',
+        effort: 'medium',
+        agentType: 'general-purpose',
+        mcpPolicy: {
+          mode: 'strictAllowlist' as const,
+          scopes: { user: true, project: true, local: false },
+          serverNames: ['github'],
+        },
+      };
+      const config = {
+        name: 'Process Strict MCP Team',
+        projectPath,
+        leadSessionId: 'lead-session-1',
+        members: [{ name: 'team-lead', agentType: 'team-lead' }, configuredMember],
+      };
+
+      (svc as any).buildProvisioningEnv = vi.fn(async () => ({
+        env: { CODEX_API_KEY: 'test-openai-key' },
+        authSource: 'openai_api_key',
+        providerArgs: [],
+      }));
+      (svc as any).buildTeamRuntimeLaunchArgsPlan = vi.fn(async () => ({
+        fastModeArgs: [],
+        runtimeTurnSettledHookArgs: [],
+        providerArgs: [],
+        settingsArgs: [],
+        extraArgs: [],
+      }));
+      (svc as any).materializeDirectProcessNativeBootstrapContext = vi.fn(async () => ({}));
+      (svc as any).updateDirectTmuxRestartMemberConfig = vi.fn(async () => {});
+      (svc as any).enqueueDirectRestartPrompt = vi.fn();
+      (svc as any).appendDirectProcessRuntimeEvent = vi.fn(async () => {});
+
+      await (svc as any).launchDirectProcessMemberRestart({
+        run,
+        teamName,
+        displayName: 'Process Strict MCP Team',
+        leadName: 'team-lead',
+        memberName: 'forge',
+        config,
+        configuredMember,
+        persistedRuntimeMembers: [],
+      });
+
+      child.emit('close', 0, null);
+      await new Promise((resolve) => setTimeout(resolve, 25));
+
+      expect(mcpConfigBuilder.writeConfigFile).toHaveBeenCalledWith(
+        projectPath,
+        configuredMember.mcpPolicy
+      );
+      const launchArgs = vi.mocked(spawnCli).mock.calls[0]?.[1] as string[];
+      expect(launchArgs).toEqual(
+        expect.arrayContaining([
+          '--setting-sources',
+          'user,project,local',
+          '--mcp-config',
+          '/mock/strict-mcp-config.json',
+          '--strict-mcp-config',
+        ])
+      );
+    });
+
     it('rejects a second restart request while the first restart is still in flight', async () => {
       const svc = new TeamProvisioningService();
       const run = createMemberSpawnRun({
@@ -15440,7 +15873,9 @@ describe('TeamProvisioningService', () => {
       memberWorktreeManager?: { ensureMemberWorktree: ReturnType<typeof vi.fn> };
     }) {
       const mcpConfigBuilder = {
-        writeConfigFile: vi.fn(async () => path.join(tempClaudeRoot, 'mcp-config.json')),
+        writeConfigFile: vi.fn(async (_projectPath?: string, _policy?: unknown) =>
+          path.join(tempClaudeRoot, 'mcp-config.json')
+        ),
         removeConfigFile: vi.fn(async () => {}),
       };
       const membersMetaStore = {
@@ -15509,6 +15944,9 @@ describe('TeamProvisioningService', () => {
           model?: string;
           effort?: string;
           role?: string;
+          mcpConfigPath?: string;
+          mcpSettingSources?: string;
+          strictMcpConfig?: boolean;
         }>;
       };
     }
@@ -15718,6 +16156,96 @@ describe('TeamProvisioningService', () => {
       await svc.cancelProvisioning(runId);
     });
 
+    it('passes per-member MCP launch settings into deterministic bootstrap specs', async () => {
+      allowConsoleLogs();
+      vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
+      vi.mocked(spawnCli).mockReturnValue(createRunningChild() as any);
+
+      const { svc, mcpConfigBuilder } = createSafeLaunchService();
+      mcpConfigBuilder.writeConfigFile.mockImplementation(async (_projectPath, policy) => {
+        const mode =
+          policy && typeof policy === 'object' && 'mode' in policy
+            ? (policy as { mode?: unknown }).mode
+            : undefined;
+        if (mode === 'appOnly') return '/mock/member-mcp-app-only.json';
+        if (mode === 'inheritScopes') return '/mock/member-mcp-local-only.json';
+        if (mode === 'strictAllowlist') return '/mock/member-mcp-strict.json';
+        return '/mock/lead-mcp-config.json';
+      });
+
+      const { runId } = await svc.createTeam(
+        {
+          teamName: 'safe-member-mcp-policy-bootstrap',
+          cwd: tempClaudeRoot,
+          providerId: 'codex',
+          providerBackendId: 'codex-native',
+          model: 'gpt-5.4',
+          effort: 'medium',
+          members: [
+            {
+              name: 'alice',
+              providerId: 'codex',
+              mcpPolicy: { mode: 'appOnly' },
+            },
+            {
+              name: 'bob',
+              providerId: 'codex',
+              mcpPolicy: {
+                mode: 'inheritScopes',
+                scopes: { user: false, project: false, local: true },
+              },
+            },
+            {
+              name: 'jack',
+              providerId: 'codex',
+              mcpPolicy: {
+                mode: 'strictAllowlist',
+                serverNames: ['github'],
+              },
+            },
+          ],
+        },
+        () => {}
+      );
+
+      const spawnArgs = vi.mocked(spawnCli).mock.calls[0]?.[1] as string[];
+      const bootstrapSpec = readBootstrapSpecFromSpawnArgs(spawnArgs);
+      expect(bootstrapSpec.members).toEqual([
+        expect.objectContaining({
+          name: 'alice',
+          mcpConfigPath: '/mock/member-mcp-app-only.json',
+          mcpSettingSources: 'user,project,local',
+          strictMcpConfig: true,
+        }),
+        expect.objectContaining({
+          name: 'bob',
+          mcpConfigPath: '/mock/member-mcp-local-only.json',
+          mcpSettingSources: 'local',
+          strictMcpConfig: false,
+        }),
+        expect.objectContaining({
+          name: 'jack',
+          mcpConfigPath: '/mock/member-mcp-strict.json',
+          mcpSettingSources: 'user,project,local',
+          strictMcpConfig: true,
+        }),
+      ]);
+      expect(mcpConfigBuilder.writeConfigFile).toHaveBeenCalledWith(tempClaudeRoot, {
+        mode: 'appOnly',
+      });
+      expect(mcpConfigBuilder.writeConfigFile).toHaveBeenCalledWith(tempClaudeRoot, {
+        mode: 'inheritScopes',
+        scopes: { user: false, project: false, local: true },
+      });
+      expect(mcpConfigBuilder.writeConfigFile).toHaveBeenCalledWith(tempClaudeRoot, {
+        mode: 'strictAllowlist',
+        serverNames: ['github'],
+      });
+      expect(mcpConfigBuilder.writeConfigFile).toHaveBeenCalledWith(tempClaudeRoot);
+
+      await svc.cancelProvisioning(runId);
+    });
+
     it('starts an Anthropic team without injecting lead effort into explicit teammate models', async () => {
       allowConsoleLogs();
       vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/mock/claude');
@@ -18279,14 +18807,14 @@ describe('TeamProvisioningService', () => {
 
   it('fails before spawning when deterministic launch exceeds the current primary teammate cap', async () => {
     allowConsoleLogs();
-    const members = Array.from({ length: 17 }, (_, index) => `member-${index + 1}`);
+    const members = Array.from({ length: 21 }, (_, index) => `member-${index + 1}`);
 
     await expect(
       startDeterministicLaunchCloseHarness({
         teamName: 'launch-too-many-primary-members',
         members,
       })
-    ).rejects.toThrow(/up to 16 primary teammates/);
+    ).rejects.toThrow(/up to 20 primary teammates/);
     expect(spawnCli).not.toHaveBeenCalled();
   });
 
diff --git a/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts b/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
index 5309f8d1..25a990c2 100644
--- a/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
+++ b/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
@@ -75,6 +75,7 @@ vi.mock('../../../../src/main/services/team/atomicWrite', () => ({
 
 vi.mock('../../../../src/main/services/team/fileLock', () => ({
   withFileLock: async (_filePath: string, fn: () => Promise<unknown>) => await fn(),
+  withFileLockSync: (_filePath: string, fn: () => unknown) => fn(),
 }));
 
 vi.mock('../../../../src/main/services/team/inboxLock', () => ({
diff --git a/test/main/services/team/TeamProvisioningServicePostCompact.test.ts b/test/main/services/team/TeamProvisioningServicePostCompact.test.ts
index ff2d20c2..76541954 100644
--- a/test/main/services/team/TeamProvisioningServicePostCompact.test.ts
+++ b/test/main/services/team/TeamProvisioningServicePostCompact.test.ts
@@ -346,7 +346,7 @@ describe('TeamProvisioningService post-compact lifecycle', () => {
     expect(text).not.toContain('continue with any pending work');
     // Should be context-only
     expect(text).toContain('Do NOT start new work');
-    expect(text).toContain('Reply with a single word');
+    expect(text).toContain('Reply with one concise user-facing team status line');
     // Should contain persistent context
     expect(text).toContain('Constraints:');
     expect(text).toContain('Do NOT call TeamDelete');
diff --git a/test/main/services/team/TeamProvisioningServicePrepare.test.ts b/test/main/services/team/TeamProvisioningServicePrepare.test.ts
index 62dca346..deee5f14 100644
--- a/test/main/services/team/TeamProvisioningServicePrepare.test.ts
+++ b/test/main/services/team/TeamProvisioningServicePrepare.test.ts
@@ -1,10 +1,9 @@
+import { DEFAULT_PROVIDER_MODEL_SELECTION } from '@shared/utils/providerModelSelection';
 import { spawn } from 'child_process';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { DEFAULT_PROVIDER_MODEL_SELECTION } from '@shared/utils/providerModelSelection';
 
 vi.mock('@main/services/team/ClaudeBinaryResolver', () => ({
   ClaudeBinaryResolver: { resolve: vi.fn() },
@@ -95,13 +94,13 @@ vi.mock('@main/utils/childProcess', () => ({
   killProcessTree: vi.fn(),
 }));
 
-import {
-  TeamProvisioningService,
-  buildDirectTmuxRestartEnvAssignments,
-} from '@main/services/team/TeamProvisioningService';
+import { ProviderConnectionService } from '@main/services/runtime/ProviderConnectionService';
 import { ClaudeBinaryResolver } from '@main/services/team/ClaudeBinaryResolver';
 import { TeamRuntimeAdapterRegistry } from '@main/services/team/runtime';
-import { ProviderConnectionService } from '@main/services/runtime/ProviderConnectionService';
+import {
+  buildDirectTmuxRestartEnvAssignments,
+  TeamProvisioningService,
+} from '@main/services/team/TeamProvisioningService';
 import { spawnCli } from '@main/utils/childProcess';
 import { resolveInteractiveShellEnv } from '@main/utils/shellEnv';
 
@@ -667,7 +666,7 @@ describe('TeamProvisioningService prepare/auth behavior', () => {
         limitContext: false,
         facts,
       })
-    ).toThrow('does not support it in the current runtime');
+    ).toThrow('does not support Anthropic effort "low" in the current runtime');
   });
 
   afterEach(async () => {
@@ -2394,6 +2393,81 @@ describe('TeamProvisioningService prepare/auth behavior', () => {
     expect(spawnProbe).not.toHaveBeenCalled();
   });
 
+  it('allows selected Anthropic effort checks when model catalog is missing but model is known', async () => {
+    const svc = new TeamProvisioningService();
+    vi.spyOn(svc as any, 'buildProvisioningEnv').mockResolvedValue({
+      env: {
+        PATH: '/usr/bin',
+        SHELL: '/bin/zsh',
+      },
+      authSource: 'none',
+      geminiRuntimeAuth: null,
+      providerArgs: [],
+    });
+    vi.spyOn(svc as any, 'readRuntimeProviderLaunchFacts').mockResolvedValue({
+      defaultModel: null,
+      modelIds: new Set(['claude-opus-4-6[1m]']),
+      modelCatalog: null,
+      runtimeCapabilities: null,
+      providerStatus: null,
+    });
+
+    const result = await (svc as any).verifySelectedProviderModels({
+      claudePath: '/fake/claude',
+      cwd: tempRoot,
+      providerId: 'anthropic',
+      modelIds: ['claude-opus-4-6[1m]'],
+      modelChecks: [{ modelId: 'claude-opus-4-6[1m]', effort: 'medium' }],
+      limitContext: false,
+    });
+
+    expect(result.details).toEqual([
+      'Selected model claude-opus-4-6[1m] is available for launch.',
+    ]);
+    expect(result.blockingMessages).toEqual([]);
+  });
+
+  it('blocks selected Anthropic effort checks when model catalog cannot verify an unknown model', async () => {
+    const svc = new TeamProvisioningService();
+    vi.spyOn(svc as any, 'buildProvisioningEnv').mockResolvedValue({
+      env: {
+        PATH: '/usr/bin',
+        SHELL: '/bin/zsh',
+      },
+      authSource: 'none',
+      geminiRuntimeAuth: null,
+      providerArgs: [],
+    });
+    vi.spyOn(svc as any, 'readRuntimeProviderLaunchFacts').mockResolvedValue({
+      defaultModel: null,
+      modelIds: new Set(['claude-experimental-5']),
+      modelCatalog: null,
+      runtimeCapabilities: null,
+      providerStatus: null,
+    });
+
+    const result = await (svc as any).verifySelectedProviderModels({
+      claudePath: '/fake/claude',
+      cwd: tempRoot,
+      providerId: 'anthropic',
+      modelIds: ['claude-experimental-5'],
+      modelChecks: [{ modelId: 'claude-experimental-5', effort: 'medium' }],
+      limitContext: false,
+    });
+
+    expect(result.details).toEqual([]);
+    expect(result.blockingMessages).toEqual([
+      'Selected model claude-experimental-5 is unavailable. Anthropic runtime catalog was unavailable, so effort "medium" for claude-experimental-5 could not be verified.',
+    ]);
+    expect(result.issues).toEqual([
+      expect.objectContaining({
+        providerId: 'anthropic',
+        modelId: 'claude-experimental-5',
+        code: 'effort_unverified',
+      }),
+    ]);
+  });
+
   it('augments dynamic Codex compatibility checks with the app-server catalog', async () => {
     const svc = new TeamProvisioningService();
     vi.spyOn(svc as any, 'buildProvisioningEnv').mockResolvedValue({
@@ -3422,7 +3496,7 @@ describe('TeamProvisioningService prepare/auth behavior', () => {
         limitContext: false,
         facts,
       })
-    ).toThrow('does not support it in the current runtime');
+    ).toThrow('does not support Anthropic effort "max" in the current runtime');
 
     expect(() =>
       (svc as any).validateRuntimeLaunchSelection({
@@ -3436,6 +3510,75 @@ describe('TeamProvisioningService prepare/auth behavior', () => {
     ).toThrow('enables Anthropic Fast mode');
   });
 
+  it('allows known Anthropic effort when runtime catalog is unavailable', () => {
+    const svc = new TeamProvisioningService();
+    const facts = {
+      defaultModel: null,
+      modelIds: new Set<string>(),
+      modelCatalog: null,
+      runtimeCapabilities: {
+        reasoningEffort: {
+          supported: true,
+          values: ['low', 'medium', 'high', 'max'],
+          configPassthrough: true,
+        },
+      },
+    };
+
+    expect(() =>
+      (svc as any).validateRuntimeLaunchSelection({
+        actorLabel: 'Team lead',
+        providerId: 'anthropic',
+        model: 'claude-opus-4-6[1m]',
+        effort: 'medium',
+        limitContext: false,
+        facts,
+      })
+    ).not.toThrow();
+  });
+
+  it('allows known Anthropic effort when catalog is missing and model list only exposes the base launch id', () => {
+    const svc = new TeamProvisioningService();
+    const facts = {
+      defaultModel: null,
+      modelIds: new Set(['claude-opus-4-6']),
+      modelCatalog: null,
+      runtimeCapabilities: null,
+    };
+
+    expect(() =>
+      (svc as any).validateRuntimeLaunchSelection({
+        actorLabel: 'Team lead',
+        providerId: 'anthropic',
+        model: 'claude-opus-4-6[1m]',
+        effort: 'medium',
+        limitContext: false,
+        facts,
+      })
+    ).not.toThrow();
+  });
+
+  it('reports unknown Anthropic effort support as unverified when runtime catalog is unavailable', () => {
+    const svc = new TeamProvisioningService();
+    const facts = {
+      defaultModel: null,
+      modelIds: new Set<string>(),
+      modelCatalog: null,
+      runtimeCapabilities: null,
+    };
+
+    expect(() =>
+      (svc as any).validateRuntimeLaunchSelection({
+        actorLabel: 'Team lead',
+        providerId: 'anthropic',
+        model: 'claude-experimental-5',
+        effort: 'medium',
+        limitContext: false,
+        facts,
+      })
+    ).toThrow('could not be verified');
+  });
+
   it('emits a lead-message refresh after provisioning reaches ready', async () => {
     const svc = new TeamProvisioningService();
     const emitter = vi.fn();
diff --git a/test/main/services/team/TeamProvisioningServicePrompts.test.ts b/test/main/services/team/TeamProvisioningServicePrompts.test.ts
index bc8fef8e..86d0fe8d 100644
--- a/test/main/services/team/TeamProvisioningServicePrompts.test.ts
+++ b/test/main/services/team/TeamProvisioningServicePrompts.test.ts
@@ -146,6 +146,7 @@ function extractBootstrapSpec(callIndex = 0): {
   team?: { name?: string; cwd?: string };
   lead?: { permissionSeedTools?: string[] };
   members?: Array<Record<string, unknown>>;
+  launch?: { bootstrapTimeoutMs?: number; continueOnPartialFailure?: boolean };
 } {
   const args = vi.mocked(spawnCli).mock.calls[callIndex]?.[1] as string[] | undefined;
   const specFlagIndex = args?.indexOf('--team-bootstrap-spec') ?? -1;
@@ -158,6 +159,7 @@ function extractBootstrapSpec(callIndex = 0): {
     team?: { name?: string; cwd?: string };
     lead?: { permissionSeedTools?: string[] };
     members?: Array<Record<string, unknown>>;
+    launch?: { bootstrapTimeoutMs?: number; continueOnPartialFailure?: boolean };
   };
 }
 
@@ -286,7 +288,7 @@ describe('TeamProvisioningService prompt content (solo mode discipline)', () =>
     );
     expect(prompt).toContain('Do NOT start implementation in this turn.');
     expect(prompt).toContain(
-      'Use this turn only to refresh context, review the current board snapshot, and confirm you are ready.'
+      'Use this turn only to review the current board snapshot and confirm operational readiness.'
     );
     expect(prompt).toContain(
       'Do NOT create, assign, or delegate any new task in this turn. If the board is empty, stay silent and wait for a fresh user instruction.'
@@ -348,10 +350,61 @@ describe('TeamProvisioningService prompt content (solo mode discipline)', () =>
         cwd: process.cwd(),
       }),
     ]);
+    expect(bootstrapSpec.launch).toMatchObject({
+      bootstrapTimeoutMs: 120_000,
+      continueOnPartialFailure: true,
+    });
 
     await svc.cancelProvisioning(runId);
   });
 
+  it('createTeam scales deterministic bootstrap timeout with member count', async () => {
+    vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/fake/claude');
+    const { child } = createFakeChild();
+    vi.mocked(spawnCli).mockReturnValue(child as any);
+    const setTimeoutSpy = vi.spyOn(global, 'setTimeout');
+
+    const svc = new TeamProvisioningService();
+    (svc as any).buildProvisioningEnv = vi.fn(async () => ({
+      env: { ANTHROPIC_API_KEY: 'test' },
+      authSource: 'anthropic_api_key',
+    }));
+    (svc as any).validateAgentTeamsMcpRuntime = vi.fn(async () => {});
+    (svc as any).startFilesystemMonitor = vi.fn();
+    (svc as any).pathExists = vi.fn(async () => false);
+
+    let runId: string | undefined;
+    try {
+      const created = await svc.createTeam(
+        {
+          teamName: 'large-team',
+          cwd: process.cwd(),
+          members: [
+            { name: 'alice' },
+            { name: 'atlas' },
+            { name: 'bob' },
+            { name: 'jack' },
+            { name: 'tom' },
+          ],
+        },
+        () => {}
+      );
+      runId = created.runId;
+
+      expect(extractBootstrapSpec().launch).toMatchObject({
+        bootstrapTimeoutMs: 375_000,
+        continueOnPartialFailure: true,
+      });
+
+      expect(setTimeoutSpy.mock.calls.some((call) => call[1] === 405_000)).toBe(true);
+    } finally {
+      if (runId) {
+        await svc.cancelProvisioning(runId);
+      }
+      setTimeoutSpy.mockRestore();
+    }
+  });
+
   it('createTeam bootstrap spec includes worktree isolation only for selected teammates', async () => {
     vi.mocked(ClaudeBinaryResolver.resolve).mockResolvedValue('/fake/claude');
     const { child } = createFakeChild();
@@ -813,7 +866,7 @@ describe('TeamProvisioningService prompt content (solo mode discipline)', () =>
     );
     expect(prompt).toContain('Do NOT use Agent to spawn or restore teammates.');
     expect(prompt).toContain(
-      'Use this turn only to refresh context and review the current board snapshot.'
+      'Use this turn only to review the current board snapshot and teammate readiness.'
     );
     expect(prompt).toContain(
       'Do NOT create, assign, or delegate any new task in this turn. If the board is empty, stay silent and wait for a fresh user instruction.'
diff --git a/test/main/services/team/TeamProvisioningServiceRelay.test.ts b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
index 8028e288..ee8a5e2b 100644
--- a/test/main/services/team/TeamProvisioningServiceRelay.test.ts
+++ b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
@@ -113,6 +113,7 @@ vi.mock('../../../../src/main/services/team/atomicWrite', () => ({
 
 vi.mock('../../../../src/main/services/team/fileLock', () => ({
   withFileLock: async (_filePath: string, fn: () => Promise<unknown>) => await fn(),
+  withFileLockSync: (_filePath: string, fn: () => unknown) => fn(),
 }));
 
 vi.mock('../../../../src/main/services/team/inboxLock', () => ({
diff --git a/test/main/services/team/TeamTaskActivityIntervalService.test.ts b/test/main/services/team/TeamTaskActivityIntervalService.test.ts
index bdc3072e..aa3af821 100644
--- a/test/main/services/team/TeamTaskActivityIntervalService.test.ts
+++ b/test/main/services/team/TeamTaskActivityIntervalService.test.ts
@@ -1,11 +1,10 @@
 import * as fs from 'fs/promises';
 import * as os from 'os';
 import * as path from 'path';
-
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { setClaudeBasePathOverride } from '../../../../src/main/utils/pathDecoder';
 import { TeamTaskActivityIntervalService } from '../../../../src/main/services/team/TeamTaskActivityIntervalService';
+import { setClaudeBasePathOverride } from '../../../../src/main/utils/pathDecoder';
 
 let tempDir = '';
 
@@ -466,6 +465,50 @@ describe('TeamTaskActivityIntervalService', () => {
     ]);
   });
 
+  it('reopens and closes lead work intervals across activity changes', async () => {
+    await writeTask('alpha', {
+      id: 'lead-task',
+      subject: 'Lead follow-up',
+      owner: 'team-lead',
+      status: 'in_progress',
+      workIntervals: [
+        { startedAt: '2026-05-08T10:00:00.000Z', completedAt: '2026-05-08T10:05:00.000Z' },
+      ],
+      historyEvents: [
+        {
+          id: 'event-created-active',
+          type: 'task_created',
+          status: 'in_progress',
+          timestamp: '2026-05-08T10:00:00.000Z',
+          actor: 'team-lead',
+        },
+      ],
+    });
+
+    const service = new TeamTaskActivityIntervalService();
+    const resumeResult = service.resumeActiveIntervalsForMember(
+      'alpha',
+      'team-lead',
+      '2026-05-08T10:20:00.000Z'
+    );
+    expect(resumeResult.changedTasks).toBe(1);
+    expect((await readTask('alpha', 'lead-task')).workIntervals).toEqual([
+      { startedAt: '2026-05-08T10:00:00.000Z', completedAt: '2026-05-08T10:05:00.000Z' },
+      { startedAt: '2026-05-08T10:20:00.000Z' },
+    ]);
+
+    const pauseResult = service.pauseActiveIntervalsForMember(
+      'alpha',
+      'team-lead',
+      '2026-05-08T10:25:00.000Z'
+    );
+    expect(pauseResult.changedTasks).toBe(1);
+    expect((await readTask('alpha', 'lead-task')).workIntervals).toEqual([
+      { startedAt: '2026-05-08T10:00:00.000Z', completedAt: '2026-05-08T10:05:00.000Z' },
+      { startedAt: '2026-05-08T10:20:00.000Z', completedAt: '2026-05-08T10:25:00.000Z' },
+    ]);
+  });
+
   it('does not resume intervals before the active work or review start', async () => {
     await writeTask('alpha', {
       id: 'work-task',
diff --git a/test/main/services/team/openCodeLiveTestHarness.ts b/test/main/services/team/openCodeLiveTestHarness.ts
index 8d3d3afd..fa41c87c 100644
--- a/test/main/services/team/openCodeLiveTestHarness.ts
+++ b/test/main/services/team/openCodeLiveTestHarness.ts
@@ -1,9 +1,8 @@
+import Fastify from 'fastify';
 import { constants as fsConstants, promises as fs } from 'fs';
 import * as os from 'os';
 import * as path from 'path';
 
-import Fastify from 'fastify';
-
 import { buildMemberWorkSyncRuntimeTurnSettledEnvironment } from '../../../../src/features/member-work-sync/main';
 import { registerTeamRoutes } from '../../../../src/main/http/teams';
 import { applyOpenCodeAutoUpdatePolicy } from '../../../../src/main/services/runtime/openCodeAutoUpdatePolicy';
@@ -16,11 +15,10 @@ import {
   createOpenCodeBridgeClientIdentity,
   OpenCodeBridgeCommandHandshakePort,
 } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeHandshakeClient';
-import type { RuntimeStoreManifestEvidence } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandContract';
 import { OpenCodeReadinessBridge } from '../../../../src/main/services/team/opencode/bridge/OpenCodeReadinessBridge';
 import {
-  OpenCodeStateChangingBridgeCommandService,
   type OpenCodeBridgeCommandExecutor,
+  OpenCodeStateChangingBridgeCommandService,
   type RuntimeStoreManifestReader,
 } from '../../../../src/main/services/team/opencode/bridge/OpenCodeStateChangingBridgeCommandService';
 import { readOpenCodeRuntimeLaneIndex } from '../../../../src/main/services/team/opencode/store/OpenCodeRuntimeManifestEvidenceReader';
@@ -31,9 +29,10 @@ import { TeamProvisioningService } from '../../../../src/main/services/team/Team
 import { getClaudeBasePath, getTeamsBasePath } from '../../../../src/main/utils/pathDecoder';
 
 import type { HttpServices } from '../../../../src/main/http';
+import type { RuntimeStoreManifestEvidence } from '../../../../src/main/services/team/opencode/bridge/OpenCodeBridgeCommandContract';
 import type { TaskRef } from '../../../../src/shared/types';
 
-const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli';
+const DEFAULT_ORCHESTRATOR_CLI = '/Users/belief/dev/projects/claude/agent_teams_orchestrator/cli-source';
 
 export interface InboxMessage {
   from?: string;
diff --git a/test/main/services/team/stallMonitor/TeamTaskStallPolicy.test.ts b/test/main/services/team/stallMonitor/TeamTaskStallPolicy.test.ts
index 2317c57c..bde8a0b4 100644
--- a/test/main/services/team/stallMonitor/TeamTaskStallPolicy.test.ts
+++ b/test/main/services/team/stallMonitor/TeamTaskStallPolicy.test.ts
@@ -186,6 +186,84 @@ describe('TeamTaskStallPolicy', () => {
     });
   });
 
+  it.each([
+    ['turn_ended_after_touch', 4],
+    ['touch_then_other_turns', 5],
+    ['mid_turn_after_touch', 10],
+  ] as const)('uses the aggressive work threshold for %s', (signal, thresholdMinutes) => {
+    const task: TeamTask = {
+      id: 'task-work-threshold',
+      displayId: 'abcd4444',
+      subject: 'Work threshold',
+      owner: 'alice',
+      status: 'in_progress',
+      workIntervals: [{ startedAt: '2026-04-19T11:50:00.000Z' }],
+    };
+    const turnEndRow = createExactRow({
+      sourceOrder: 2,
+      messageUuid: 'msg-turn-end',
+      systemSubtype: 'turn_duration',
+      parsedMessage: createParsedMessage({
+        uuid: 'msg-turn-end',
+        type: 'system',
+      }),
+    });
+    const laterAssistantRow = createExactRow({
+      sourceOrder: 3,
+      messageUuid: 'msg-later',
+      parsedMessage: createParsedMessage({
+        uuid: 'msg-later',
+        type: 'assistant',
+      }),
+    });
+    const postTouchRows =
+      signal === 'touch_then_other_turns'
+        ? [turnEndRow, laterAssistantRow]
+        : signal === 'mid_turn_after_touch'
+          ? [laterAssistantRow]
+          : [turnEndRow];
+    const snapshot = createSnapshot({
+      activeTasks: [task],
+      allTasksById: new Map([[task.id, task]]),
+      inProgressTasks: [task],
+      recordsByTaskId: new Map([[task.id, [createRecord()]]]),
+      exactRowsByFilePath: new Map([
+        [
+          '/tmp/session.jsonl',
+          [
+            createExactRow({
+              messageUuid: 'msg-touch',
+              toolUseIds: ['tool-1'],
+            }),
+            ...postTouchRows,
+          ],
+        ],
+      ]),
+    });
+    const touchAtMs = Date.parse('2026-04-19T12:00:00.000Z');
+
+    expect(
+      policy.evaluateWork({
+        now: new Date(touchAtMs + thresholdMinutes * 60_000 - 1),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
+      status: 'skip',
+      skipReason: 'below_threshold',
+    });
+    expect(
+      policy.evaluateWork({
+        now: new Date(touchAtMs + thresholdMinutes * 60_000),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
+      status: 'alert',
+      signal,
+    });
+  });
+
   it('alerts OpenCode-owned tasks faster after weak start-only task comments', () => {
     const task: TeamTask = {
       id: 'task-open-weak',
@@ -259,13 +337,26 @@ describe('TeamTaskStallPolicy', () => {
       ]),
     });
 
-    const evaluation = policy.evaluateWork({
-      now: new Date('2026-04-19T12:07:00.000Z'),
-      task,
-      snapshot,
-    });
+    const touchAtMs = Date.parse('2026-04-19T12:00:00.000Z');
 
-    expect(evaluation).toMatchObject({
+    expect(
+      policy.evaluateWork({
+        now: new Date(touchAtMs + 100_000 - 1),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
+      status: 'skip',
+      taskId: 'task-open-weak',
+      skipReason: 'below_threshold',
+    });
+    expect(
+      policy.evaluateWork({
+        now: new Date(touchAtMs + 100_000),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
       status: 'alert',
       taskId: 'task-open-weak',
       progressSignal: 'weak_start_only',
@@ -273,7 +364,7 @@ describe('TeamTaskStallPolicy', () => {
     });
   });
 
-  it('keeps existing thresholds for weak comments from non-OpenCode owners', () => {
+  it('uses normal work thresholds for weak comments from non-OpenCode owners', () => {
     const task: TeamTask = {
       id: 'task-codex-weak',
       displayId: 'feed2222',
@@ -347,7 +438,7 @@ describe('TeamTaskStallPolicy', () => {
     });
 
     const evaluation = policy.evaluateWork({
-      now: new Date('2026-04-19T12:07:00.000Z'),
+      now: new Date('2026-04-19T12:03:00.000Z'),
       task,
       snapshot,
     });
@@ -433,7 +524,7 @@ describe('TeamTaskStallPolicy', () => {
     });
 
     const evaluation = policy.evaluateWork({
-      now: new Date('2026-04-19T12:07:00.000Z'),
+      now: new Date('2026-04-19T12:03:00.000Z'),
       task,
       snapshot,
     });
@@ -751,6 +842,123 @@ describe('TeamTaskStallPolicy', () => {
     });
   });
 
+  it.each([
+    ['turn_ended_after_touch', 5],
+    ['touch_then_other_turns', 6],
+    ['mid_turn_after_touch', 12],
+  ] as const)('uses the aggressive review threshold for %s', (signal, thresholdMinutes) => {
+    const task: TeamTask = {
+      id: 'task-review-threshold',
+      displayId: 'c0ffee55',
+      subject: 'Review threshold',
+      status: 'completed',
+      reviewState: 'review',
+      historyEvents: [
+        {
+          id: 'evt-review-started',
+          type: 'review_started',
+          timestamp: '2026-04-19T12:00:00.000Z',
+          from: 'review',
+          to: 'review',
+          actor: 'bob',
+        },
+      ],
+    };
+    const turnEndRow = createExactRow({
+      filePath: '/tmp/review-threshold.jsonl',
+      sourceOrder: 2,
+      messageUuid: 'msg-review-threshold-end',
+      systemSubtype: 'turn_duration',
+      parsedMessage: createParsedMessage({
+        uuid: 'msg-review-threshold-end',
+        type: 'system',
+      }),
+    });
+    const laterAssistantRow = createExactRow({
+      filePath: '/tmp/review-threshold.jsonl',
+      sourceOrder: 3,
+      messageUuid: 'msg-review-threshold-later',
+      parsedMessage: createParsedMessage({
+        uuid: 'msg-review-threshold-later',
+        type: 'assistant',
+      }),
+    });
+    const postTouchRows =
+      signal === 'touch_then_other_turns'
+        ? [turnEndRow, laterAssistantRow]
+        : signal === 'mid_turn_after_touch'
+          ? [laterAssistantRow]
+          : [turnEndRow];
+    const record = createRecord({
+      timestamp: '2026-04-19T12:00:00.000Z',
+      actor: {
+        memberName: 'bob',
+        role: 'member',
+        sessionId: 'session-b',
+        isSidechain: true,
+      },
+      actorContext: {
+        relation: 'same_task',
+        activePhase: 'review',
+      },
+      action: {
+        canonicalToolName: 'review_start',
+        category: 'review',
+        toolUseId: 'tool-review-threshold',
+      },
+      source: {
+        messageUuid: 'msg-review-threshold',
+        filePath: '/tmp/review-threshold.jsonl',
+        toolUseId: 'tool-review-threshold',
+        sourceOrder: 1,
+      },
+    });
+    const snapshot = createSnapshot({
+      activeTasks: [task],
+      allTasksById: new Map([[task.id, task]]),
+      reviewOpenTasks: [task],
+      resolvedReviewersByTaskId: new Map([
+        [task.id, { reviewer: 'bob', source: 'history_review_started_actor' }],
+      ]),
+      recordsByTaskId: new Map([[task.id, [record]]]),
+      exactRowsByFilePath: new Map([
+        [
+          '/tmp/review-threshold.jsonl',
+          [
+            createExactRow({
+              filePath: '/tmp/review-threshold.jsonl',
+              messageUuid: 'msg-review-threshold',
+              toolUseIds: ['tool-review-threshold'],
+            }),
+            ...postTouchRows,
+          ],
+        ],
+      ]),
+    });
+    const touchAtMs = Date.parse('2026-04-19T12:00:00.000Z');
+
+    expect(
+      policy.evaluateReview({
+        now: new Date(touchAtMs + thresholdMinutes * 60_000 - 1),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
+      status: 'skip',
+      skipReason: 'below_threshold',
+    });
+    expect(
+      policy.evaluateReview({
+        now: new Date(touchAtMs + thresholdMinutes * 60_000),
+        task,
+        snapshot,
+      })
+    ).toMatchObject({
+      status: 'alert',
+      signal,
+    });
+  });
+
   it('alerts for started-review stall when review_started actor is missing but same-task reviewer touch exists after the review start', () => {
     const task: TeamTask = {
       id: 'task-d',
diff --git a/test/main/services/team/stallMonitor/featureGates.test.ts b/test/main/services/team/stallMonitor/featureGates.test.ts
index 9ac0cf69..933b3fa7 100644
--- a/test/main/services/team/stallMonitor/featureGates.test.ts
+++ b/test/main/services/team/stallMonitor/featureGates.test.ts
@@ -1,8 +1,8 @@
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import {
-  getTeamTaskStallActivationGraceMs,
   getOpenCodeWeakStartStallThresholdMs,
+  getTeamTaskStallActivationGraceMs,
   getTeamTaskStallScanIntervalMs,
   getTeamTaskStallStartupGraceMs,
   isOpenCodeTaskStallRemediationEnabled,
@@ -21,10 +21,10 @@ describe('stallMonitor feature gates', () => {
     expect(isOpenCodeTaskStallRemediationEnabled()).toBe(true);
     expect(isTeamTaskStallScannerEnabled()).toBe(true);
     expect(isTeamTaskStallAlertsEnabled()).toBe(true);
-    expect(getTeamTaskStallScanIntervalMs()).toBe(60_000);
+    expect(getTeamTaskStallScanIntervalMs()).toBe(30_000);
     expect(getTeamTaskStallStartupGraceMs()).toBe(180_000);
-    expect(getTeamTaskStallActivationGraceMs()).toBe(120_000);
-    expect(getOpenCodeWeakStartStallThresholdMs()).toBe(120_000);
+    expect(getTeamTaskStallActivationGraceMs()).toBe(60_000);
+    expect(getOpenCodeWeakStartStallThresholdMs()).toBe(100_000);
   });
 
   it('parses truthy and falsy environment values', () => {
@@ -75,6 +75,6 @@ describe('stallMonitor feature gates', () => {
     expect(isOpenCodeTaskStallRemediationEnabled()).toBe(true);
     expect(isTeamTaskStallScannerEnabled()).toBe(true);
     expect(isTeamTaskStallAlertsEnabled()).toBe(true);
-    expect(getOpenCodeWeakStartStallThresholdMs()).toBe(120_000);
+    expect(getOpenCodeWeakStartStallThresholdMs()).toBe(100_000);
   });
 });
diff --git a/test/main/utils/childProcess.test.ts b/test/main/utils/childProcess.test.ts
index 63873485..65ed6dd2 100644
--- a/test/main/utils/childProcess.test.ts
+++ b/test/main/utils/childProcess.test.ts
@@ -546,6 +546,44 @@ describe('cli child process helpers', () => {
         vi.useRealTimers();
       }
     });
+
+    it('kills a POSIX launcher, Bun child, and nested shell on execFile timeout', async () => {
+      setPlatform('darwin');
+      vi.useFakeTimers();
+      const execFileMock = child.execFile as unknown as Mock;
+      const spawnSyncMock = child.spawnSync as unknown as Mock;
+      const killSpy = vi.spyOn(process, 'kill').mockImplementation(() => true);
+      const childProcess = new EventEmitter() as EventEmitter & {
+        pid: number;
+        stdout: EventEmitter;
+        stderr: EventEmitter;
+      };
+      childProcess.pid = 500;
+      childProcess.stdout = new EventEmitter();
+      childProcess.stderr = new EventEmitter();
+      spawnSyncMock.mockReturnValue({
+        status: 0,
+        stdout: ['500 1', '501 500', '502 501'].join('\n'),
+      });
+      execFileMock.mockImplementation(() => childProcess);
+
+      try {
+        const result = execCli('/tmp/cli-dev', ['runtime', 'status', '--json'], { timeout: 100 });
+        const expectation = expect(result).rejects.toMatchObject({
+          killed: true,
+          signal: 'SIGTERM',
+        });
+        await vi.advanceTimersByTimeAsync(100);
+
+        await expectation;
+        expect(killSpy.mock.calls.map(([pid]) => pid)).toEqual(
+          expect.arrayContaining([500, 501, 502])
+        );
+      } finally {
+        killSpy.mockRestore();
+        vi.useRealTimers();
+      }
+    });
   });
 
   describe('killProcessTree', () => {
diff --git a/test/main/utils/electronUserDataMigration.test.ts b/test/main/utils/electronUserDataMigration.test.ts
index d3096ff2..3b00d4ff 100644
--- a/test/main/utils/electronUserDataMigration.test.ts
+++ b/test/main/utils/electronUserDataMigration.test.ts
@@ -75,6 +75,7 @@ describe('electron userData migration', () => {
 
     expect(getLegacyElectronUserDataCandidates(currentPath)).toEqual([
       path.join(parentPath, 'agent-teams-ai'),
+      path.join(parentPath, 'Agent Teams AI'),
       path.join(parentPath, 'Claude Agent Teams UI'),
       path.join(parentPath, 'claude-agent-teams-ui'),
       path.join(parentPath, 'claude-devtools'),
@@ -291,6 +292,34 @@ describe('electron userData migration', () => {
     expect(readFile(currentProductPath, 'data/attachments/team-a/old.txt')).toBe('old');
   });
 
+  it('reuses existing agent-teams-ai data when the current product name is Agent Teams AI', () => {
+    const root = createTempRoot();
+    const completedNewPath = path.join(root, 'agent-teams-ai');
+    const currentProductPath = path.join(root, 'Agent Teams AI');
+    const olderProductPath = path.join(root, 'Agent Teams UI');
+    const app = new FakeElectronApp(currentProductPath);
+
+    writeFile(currentProductPath, 'Preferences', '{}');
+    writeFile(completedNewPath, 'data/attachments/team-a/current.txt', 'current');
+    writeFile(olderProductPath, 'data/attachments/team-a/old.txt', 'old');
+
+    const result = migrateElectronUserDataDirectory(app);
+
+    expect(result).toMatchObject({
+      currentPath: currentProductPath,
+      legacyPath: completedNewPath,
+      migrated: false,
+      fallbackToLegacy: false,
+      reason: 'legacy-reused',
+    });
+    expect(app.setPathCalls).toEqual([
+      { name: 'userData', value: completedNewPath },
+      { name: 'sessionData', value: completedNewPath },
+    ]);
+    expect(readFile(completedNewPath, 'data/attachments/team-a/current.txt')).toBe('current');
+    expect(readFile(olderProductPath, 'data/attachments/team-a/old.txt')).toBe('old');
+  });
+
   it('copies legacy app-owned state and durable renderer storage without Chromium caches', async () => {
     const root = createTempRoot();
     const legacyPath = path.join(root, 'Claude Agent Teams UI');
diff --git a/test/renderer/components/cli/CliStatusVisibility.test.ts b/test/renderer/components/cli/CliStatusVisibility.test.ts
index bcda1da9..e9105417 100644
--- a/test/renderer/components/cli/CliStatusVisibility.test.ts
+++ b/test/renderer/components/cli/CliStatusVisibility.test.ts
@@ -1,5 +1,6 @@
 import React, { act } from 'react';
 import { createRoot } from 'react-dom/client';
+
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
 import type { CodexAccountSnapshotDto } from '@features/codex-account/contracts';
@@ -637,6 +638,66 @@ describe('CLI status visibility during completed install state', () => {
     });
   });
 
+  it('does not show OpenCode retry install when the provider is effectively ready', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliInstallerState = 'idle';
+    storeState.openCodeRuntimeStatus = {
+      installed: false,
+      source: 'app-managed',
+      state: 'failed',
+      error: 'app-managed OpenCode install failed earlier',
+    };
+    storeState.openCodeRuntimeStatusLoading = false;
+    storeState.cliStatus = createInstalledCliStatus({
+      flavor: 'agent_teams_orchestrator',
+      displayName: 'Multimodel runtime',
+      supportsSelfUpdate: false,
+      showVersionDetails: false,
+      showBinaryPath: false,
+      authLoggedIn: true,
+      providers: [
+        {
+          providerId: 'opencode',
+          displayName: 'OpenCode (200+ models)',
+          supported: true,
+          authenticated: true,
+          authMethod: 'opencode_managed',
+          verificationState: 'verified',
+          statusMessage: 'Ready',
+          models: ['opencode/big-pickle'],
+          canLoginFromUi: false,
+          capabilities: {
+            teamLaunch: true,
+            oneShot: false,
+          },
+          backend: { kind: 'opencode-cli', label: 'OpenCode CLI' },
+          modelCatalog: null,
+        },
+      ],
+    });
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(React.createElement(CliStatusBanner));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Connected via opencode managed');
+    expect(host.textContent).not.toContain('Retry install');
+    const retryButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent?.trim() === 'Retry install'
+    );
+    expect(retryButton).toBeUndefined();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('always shows a provider-level Free models badge on the OpenCode dashboard card', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     storeState.cliInstallerState = 'idle';
diff --git a/test/renderer/components/team/TeamModelSelectorDisabledState.test.ts b/test/renderer/components/team/TeamModelSelectorDisabledState.test.ts
index 6476019b..e52ad71b 100644
--- a/test/renderer/components/team/TeamModelSelectorDisabledState.test.ts
+++ b/test/renderer/components/team/TeamModelSelectorDisabledState.test.ts
@@ -1,5 +1,6 @@
 import React, { act } from 'react';
 import { createRoot } from 'react-dom/client';
+
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import type { CodexAccountSnapshotDto } from '@features/codex-account/contracts';
@@ -29,11 +30,13 @@ vi.mock('@renderer/components/ui/tabs', () => {
       value,
       disabled,
       title,
+      'aria-disabled': ariaDisabled,
     }: {
       children: React.ReactNode;
       value: string;
       disabled?: boolean;
       title?: string;
+      'aria-disabled'?: boolean;
     }) =>
       React.createElement(
         'button',
@@ -41,6 +44,7 @@ vi.mock('@renderer/components/ui/tabs', () => {
           type: 'button',
           disabled,
           title,
+          'aria-disabled': ariaDisabled,
           'data-state': currentValue === value ? 'active' : 'inactive',
           onClick: () => {
             if (!disabled) {
@@ -207,6 +211,65 @@ describe('TeamModelSelector disabled Codex models', () => {
     });
   });
 
+  it('hides recommendation badges for Anthropic and Codex model tiles', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'codex',
+          models: ['gpt-5.5', 'gpt-5.4', 'gpt-5.4-mini', 'gpt-5.3-codex', 'gpt-5.2'],
+          modelVerificationState: 'idle',
+          modelAvailability: [],
+        },
+      ],
+    };
+
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'anthropic',
+          onProviderChange: () => undefined,
+          value: '',
+          onValueChange: () => undefined,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const anthropicButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('Opus 4.6')
+    );
+    expect(anthropicButton).toBeDefined();
+    expect(anthropicButton?.textContent).not.toContain('Recommended');
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'codex',
+          onProviderChange: () => undefined,
+          value: '',
+          onValueChange: () => undefined,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const codexButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('5.2')
+    );
+    expect(codexButton).toBeDefined();
+    expect(codexButton?.textContent).not.toContain('Recommended');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('uses the runtime-reported Codex list and clears stale unsupported selections', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     storeState.cliStatus = {
@@ -895,7 +958,7 @@ describe('TeamModelSelector disabled Codex models', () => {
     const activeButton = Array.from(host.querySelectorAll('button')).find((button) =>
       button.textContent?.includes('5.2')
     );
-    expect(activeButton?.textContent).toContain('Recommended');
+    expect(activeButton?.textContent).not.toContain('Recommended');
     expect(activeButton?.getAttribute('aria-disabled')).toBe('false');
 
     await act(async () => {
@@ -1283,7 +1346,7 @@ describe('TeamModelSelector disabled Codex models', () => {
     });
   });
 
-  it('shows OpenCode as readiness-gated and keeps it non-selectable', async () => {
+  it('opens readiness-gated OpenCode as diagnostics without selecting it', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     const host = document.createElement('div');
     document.body.appendChild(host);
@@ -1309,7 +1372,8 @@ describe('TeamModelSelector disabled Codex models', () => {
     const buttons = Array.from(host.querySelectorAll('button'));
     const openCodeButton = buttons.find((button) => button.textContent?.includes('OpenCode'));
     expect(openCodeButton).not.toBeNull();
-    expect(openCodeButton?.hasAttribute('disabled')).toBe(true);
+    expect(openCodeButton?.hasAttribute('disabled')).toBe(false);
+    expect(openCodeButton?.getAttribute('aria-disabled')).toBe('true');
     expect(openCodeButton?.getAttribute('title')).toContain(
       'OpenCode runtime status is still loading.'
     );
@@ -1320,6 +1384,15 @@ describe('TeamModelSelector disabled Codex models', () => {
     });
 
     expect(onProviderChange).not.toHaveBeenCalled();
+    const activeOpenCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('OpenCode')
+    );
+    expect(activeOpenCodeButton?.getAttribute('data-state')).toBe('active');
+    expect(host.textContent).toContain('OpenCode is not ready for team launch');
+    expect(host.textContent).toContain('OpenCode status: checking runtime');
+    expect(host.textContent).toContain(
+      'The app is still checking the OpenCode runtime. Wait for provider status to finish, then try again.'
+    );
 
     await act(async () => {
       root.unmount();
@@ -1361,11 +1434,474 @@ describe('TeamModelSelector disabled Codex models', () => {
     const openCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
       button.textContent?.includes('OpenCode')
     );
-    expect(openCodeButton?.hasAttribute('disabled')).toBe(true);
+    expect(openCodeButton?.hasAttribute('disabled')).toBe(false);
+    expect(openCodeButton?.getAttribute('aria-disabled')).toBe('true');
     expect(openCodeButton?.getAttribute('title')).toContain(
       'OpenCode runtime store needs recovery'
     );
-    expect(openCodeButton?.textContent).toContain('Gate');
+    expect(openCodeButton?.textContent).toContain('Setup');
+
+    await act(async () => {
+      openCodeButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('OpenCode is not ready for team launch');
+    expect(host.textContent).toContain(
+      'OpenCode status: runtime detected · provider connected · team launch blocked'
+    );
+    expect(host.textContent).toContain(
+      'OpenCode is installed and authenticated, but Agent Teams launch readiness is blocked.'
+    );
+    expect(host.textContent).toContain('Reason: OpenCode runtime store needs recovery');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('keeps inspected OpenCode explicit until the user selects it after readiness recovers', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: true,
+          statusMessage: 'OpenCode team launch is gated',
+          detailMessage: 'OpenCode runtime store needs recovery',
+          capabilities: { teamLaunch: false },
+          models: [],
+        },
+      ],
+    };
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onProviderChange = vi.fn();
+    const render = (): void => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'anthropic',
+          onProviderChange,
+          value: '',
+          onValueChange: () => undefined,
+        })
+      );
+    };
+
+    await act(async () => {
+      render();
+      await Promise.resolve();
+    });
+
+    const openCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('OpenCode')
+    );
+    await act(async () => {
+      openCodeButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).not.toHaveBeenCalled();
+    expect(host.textContent).toContain('OpenCode is not ready for team launch');
+
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: true,
+          detailMessage: null,
+          statusMessage: null,
+          capabilities: {
+            teamLaunch: true,
+          },
+          models: ['openrouter/minimax/minimax-m2.5-free'],
+        },
+      ],
+    };
+
+    await act(async () => {
+      render();
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).not.toHaveBeenCalled();
+    expect(host.textContent).toContain('OpenCode is ready');
+    expect(host.textContent).toContain('Use OpenCode');
+
+    const useOpenCodeButton = Array.from(host.querySelectorAll('button')).find(
+      (button) => button.textContent?.trim() === 'Use OpenCode'
+    );
+    await act(async () => {
+      useOpenCodeButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).toHaveBeenCalledWith('opencode');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('allows selecting unauthenticated OpenCode when free models are available', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: false,
+          statusMessage: 'Provider not connected',
+          detailMessage: null,
+          capabilities: { teamLaunch: false },
+          models: ['opencode/big-pickle'],
+          modelVerificationState: 'idle',
+          modelAvailability: [],
+        },
+      ],
+    };
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onProviderChange = vi.fn();
+
+    const ControlledSelector = (): React.JSX.Element => {
+      const [provider, setProvider] = React.useState<'anthropic' | 'opencode'>('anthropic');
+      return React.createElement(TeamModelSelector, {
+        providerId: provider,
+        onProviderChange: (nextProvider) => {
+          onProviderChange(nextProvider);
+          if (nextProvider === 'anthropic' || nextProvider === 'opencode') {
+            setProvider(nextProvider);
+          }
+        },
+        value: '',
+        onValueChange: () => undefined,
+      });
+    };
+
+    await act(async () => {
+      root.render(React.createElement(ControlledSelector));
+      await Promise.resolve();
+    });
+
+    const openCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('OpenCode')
+    );
+    expect(openCodeButton?.hasAttribute('disabled')).toBe(false);
+    expect(openCodeButton?.getAttribute('aria-disabled')).toBeNull();
+    expect(openCodeButton?.textContent).not.toContain('Auth');
+
+    await act(async () => {
+      openCodeButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).toHaveBeenCalledWith('opencode');
+    expect(host.textContent).toContain('OpenCode free models are available');
+    expect(host.textContent).toContain('provider connection optional');
+    expect(host.textContent).toContain(
+      'You can use free OpenCode models such as Big Pickle without connecting a provider.'
+    );
+    expect(host.textContent).not.toContain('OpenCode is not ready for team launch');
+    expect(host.textContent).not.toContain('team launch available');
+    expect(host.textContent).toContain('big-pickle');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('keeps unauthenticated OpenCode selectable but does not promise free models when none are listed', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: false,
+          statusMessage: 'Provider not connected',
+          detailMessage: null,
+          capabilities: { teamLaunch: false },
+          models: ['openai/gpt-5.4-mini'],
+          modelVerificationState: 'idle',
+          modelAvailability: [],
+        },
+      ],
+    };
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'opencode',
+          onProviderChange: () => undefined,
+          value: '',
+          onValueChange: () => undefined,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const openCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('OpenCode')
+    );
+    expect(openCodeButton?.hasAttribute('disabled')).toBe(false);
+    expect(host.textContent).toContain('OpenCode provider is not connected');
+    expect(host.textContent).toContain('no free OpenCode model is listed yet');
+    expect(host.textContent).toContain('provider-backed models need setup');
+    expect(host.textContent).not.toContain('team launch available');
+    expect(host.textContent).not.toContain('OpenCode free models are available');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('does not normalize the selected model while viewing OpenCode readiness diagnostics', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onValueChange = vi.fn();
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'anthropic',
+          onProviderChange: () => undefined,
+          value: 'claude-opus-4-7[1m]',
+          onValueChange,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const openCodeButton = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('OpenCode')
+    );
+    await act(async () => {
+      openCodeButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('OpenCode is not ready for team launch');
+    expect(onValueChange).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('can leave OpenCode diagnostics for another provider tab', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: true,
+          statusMessage: 'OpenCode team launch is gated',
+          detailMessage: 'OpenCode runtime store needs recovery',
+          capabilities: { teamLaunch: false },
+          models: [],
+        },
+      ],
+    };
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onProviderChange = vi.fn();
+
+    const ControlledSelector = (): React.JSX.Element => {
+      const [provider, setProvider] = React.useState<'anthropic' | 'codex'>('anthropic');
+      return React.createElement(TeamModelSelector, {
+        providerId: provider,
+        onProviderChange: (nextProvider) => {
+          onProviderChange(nextProvider);
+          if (nextProvider === 'anthropic' || nextProvider === 'codex') {
+            setProvider(nextProvider);
+          }
+        },
+        value: '',
+        onValueChange: () => undefined,
+      });
+    };
+
+    await act(async () => {
+      root.render(React.createElement(ControlledSelector));
+      await Promise.resolve();
+    });
+
+    const getTab = (label: string): HTMLButtonElement | undefined =>
+      Array.from(host.querySelectorAll('button')).find((button) =>
+        button.textContent?.includes(label)
+      );
+
+    await act(async () => {
+      getTab('OpenCode')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(getTab('OpenCode')?.getAttribute('data-state')).toBe('active');
+    expect(host.textContent).toContain('OpenCode is not ready for team launch');
+
+    await act(async () => {
+      getTab('Codex')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).toHaveBeenCalledWith('codex');
+    expect(getTab('Codex')?.getAttribute('data-state')).toBe('active');
+    expect(host.textContent).not.toContain('OpenCode is not ready for team launch');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('returns from OpenCode diagnostics to the selected provider without reselecting it', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onProviderChange = vi.fn();
+    const onValueChange = vi.fn();
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'anthropic',
+          onProviderChange,
+          value: 'claude-opus-4-7[1m]',
+          onValueChange,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const getTab = (label: string): HTMLButtonElement | undefined =>
+      Array.from(host.querySelectorAll('button')).find((button) =>
+        button.textContent?.includes(label)
+      );
+
+    await act(async () => {
+      getTab('OpenCode')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(getTab('OpenCode')?.getAttribute('data-state')).toBe('active');
+
+    await act(async () => {
+      getTab('Anthropic')?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(getTab('Anthropic')?.getAttribute('data-state')).toBe('active');
+    expect(onProviderChange).not.toHaveBeenCalled();
+    expect(onValueChange).not.toHaveBeenCalled();
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('commits the Anthropic fallback when a frozen Gemini selection is corrected', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onProviderChange = vi.fn();
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'gemini',
+          onProviderChange,
+          value: '',
+          onValueChange: () => undefined,
+          disableGeminiOption: true,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const anthropicTab = Array.from(host.querySelectorAll('button')).find((button) =>
+      button.textContent?.includes('Anthropic')
+    );
+    expect(anthropicTab?.getAttribute('data-state')).toBe('active');
+
+    await act(async () => {
+      anthropicTab?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
+      await Promise.resolve();
+    });
+
+    expect(onProviderChange).toHaveBeenCalledWith('anthropic');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
+  it('renders active provider notices inside the provider tab panel', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    storeState.cliStatus = {
+      providers: [
+        {
+          providerId: 'opencode',
+          supported: true,
+          authenticated: true,
+          detailMessage: null,
+          statusMessage: null,
+          capabilities: {
+            teamLaunch: true,
+          },
+          models: ['opencode/minimax-m2.5-free'],
+        },
+      ],
+    };
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+
+    await act(async () => {
+      root.render(
+        React.createElement(TeamModelSelector, {
+          providerId: 'opencode',
+          onProviderChange: () => undefined,
+          value: '',
+          onValueChange: () => undefined,
+          providerNoticeById: {
+            opencode: React.createElement('p', null, 'OpenCode cannot lead mixed-provider teams'),
+          },
+        })
+      );
+      await Promise.resolve();
+    });
+
+    const notice = host.querySelector('[data-testid="team-model-selector-provider-notice"]');
+    const modelGrid = host.querySelector('[data-testid="team-model-selector-model-grid"]');
+    expect(notice?.textContent).toContain('OpenCode cannot lead mixed-provider teams');
+    expect(modelGrid).not.toBeNull();
+    if (!notice || !modelGrid) {
+      throw new Error('Expected provider notice and model grid to render.');
+    }
+    expect(
+      Boolean(notice.compareDocumentPosition(modelGrid) & Node.DOCUMENT_POSITION_FOLLOWING)
+    ).toBe(true);
 
     await act(async () => {
       root.unmount();
@@ -1404,7 +1940,7 @@ describe('TeamModelSelector disabled Codex models', () => {
           onValueChange: () => undefined,
           providerDisabledReasonById: {
             opencode:
-              'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic, Codex, or Gemini for one-shot schedules.',
+              'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic or Codex for one-shot schedules.',
           },
           providerDisabledBadgeLabelById: {
             opencode: 'team only',
@@ -1419,7 +1955,7 @@ describe('TeamModelSelector disabled Codex models', () => {
     );
     expect(openCodeButton?.hasAttribute('disabled')).toBe(true);
     expect(openCodeButton?.getAttribute('title')).toBe(
-      'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic, Codex, or Gemini for one-shot schedules.'
+      'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic or Codex for one-shot schedules.'
     );
     expect(openCodeButton?.textContent).toContain('team only');
 
@@ -1509,9 +2045,12 @@ describe('TeamModelSelector disabled Codex models', () => {
 
     const buttons = Array.from(host.querySelectorAll('button'));
     const codexTab = buttons.find((button) => button.textContent?.trim() === 'Codex');
+    const providerTabIndex = (label: string): number =>
+      buttons.findIndex((button) => button.textContent?.includes(label));
     expect(codexTab).not.toBeNull();
     expect(host.textContent).toContain('Anthropic');
     expect(host.textContent).toContain('Codex');
+    expect(providerTabIndex('OpenCode')).toBeLessThan(providerTabIndex('Gemini'));
 
     await act(async () => {
       codexTab?.click();
diff --git a/test/renderer/components/team/dialogs/LaunchTeamDialog.test.ts b/test/renderer/components/team/dialogs/LaunchTeamDialog.test.ts
index 0a57af52..18399285 100644
--- a/test/renderer/components/team/dialogs/LaunchTeamDialog.test.ts
+++ b/test/renderer/components/team/dialogs/LaunchTeamDialog.test.ts
@@ -1,5 +1,7 @@
+/* eslint-disable @typescript-eslint/no-explicit-any, @typescript-eslint/no-empty-object-type -- Legacy dialog mocks use broad DTO shapes. */
 import React, { act } from 'react';
 import { createRoot } from 'react-dom/client';
+
 import { afterEach, describe, expect, it, vi } from 'vitest';
 
 const openDashboard = vi.fn();
@@ -238,10 +240,18 @@ vi.mock('@renderer/components/team/members/MembersEditorSection', () => ({
 vi.mock('@renderer/components/team/members/TeamRosterEditorSection', () => ({
   TeamRosterEditorSection: (props: any) => {
     teamRosterEditorSectionMock.lastProps = props;
+    const leadProviderNotice = props.leadProviderNoticeById?.[props.providerId] ?? null;
     return React.createElement(
       'div',
       null,
       props.headerTop,
+      leadProviderNotice
+        ? React.createElement(
+            'div',
+            { 'data-testid': 'mock-lead-provider-notice' },
+            leadProviderNotice
+          )
+        : null,
       'team-roster-editor',
       props.headerBottom
     );
@@ -450,9 +460,27 @@ vi.mock('@renderer/components/team/dialogs/ProvisioningProviderStatusList', () =
   failIncompleteProviderChecks: (checks: unknown) => checks,
   getPrimaryProvisioningFailureDetail: () => null,
   getProvisioningFailureHint: () => 'hint',
+  getProvisioningProviderProgressMessage: () => 'Checking selected providers in parallel...',
   getProvisioningProviderBackendSummary: () => null,
   shouldHideProvisioningProviderStatusList: () => false,
-  updateProviderCheck: (checks: unknown) => checks,
+  updateProviderCheck: (
+    checks: {
+      providerId: string;
+      status: string;
+      details: string[];
+      backendSummary?: string | null;
+    }[],
+    providerId: string,
+    patch: { status: string; details: string[]; backendSummary?: string | null }
+  ) =>
+    checks.map((check) =>
+      check.providerId === providerId
+        ? {
+            ...check,
+            ...patch,
+          }
+        : check
+    ),
 }));
 
 vi.mock('@renderer/components/team/dialogs/TeamModelSelector', () => ({
@@ -463,7 +491,7 @@ vi.mock('@renderer/components/team/dialogs/TeamModelSelector', () => ({
     [providerId, model, effort].filter(Boolean).join(' '),
   OPENCODE_ONE_SHOT_DISABLED_BADGE_LABEL: 'team only',
   OPENCODE_ONE_SHOT_DISABLED_REASON:
-    'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic, Codex, or Gemini for one-shot schedules.',
+    'OpenCode team launch is available for normal teams, but scheduled one-shot prompts still run through claude -p. Choose Anthropic or Codex for one-shot schedules.',
 }));
 
 vi.mock('@renderer/components/team/dialogs/EffortLevelSelector', () => ({
@@ -1314,6 +1342,11 @@ describe('LaunchTeamDialog', () => {
     });
 
     expect(host.textContent).toContain('OpenCode cannot lead mixed-provider teams');
+    const providerNotice = host.querySelector('[data-testid="mock-lead-provider-notice"]');
+    expect(providerNotice?.textContent).toContain('OpenCode cannot lead mixed-provider teams');
+    expect(providerNotice?.textContent).toContain(
+      'OpenCode can be added as a teammate under an Anthropic or Codex lead'
+    );
     const submitButton = Array.from(host.querySelectorAll('button')).find(
       (button) => button.textContent === 'Launch team'
     );
@@ -1881,7 +1914,7 @@ describe('LaunchTeamDialog', () => {
       .mocked(runProviderPrepareDiagnostics)
       .mock.calls.filter((call) => call[0]?.providerId === 'opencode');
     expect(inFlightOpencodePrepareCalls).toHaveLength(1);
-    expect(host.textContent).toContain('Selected providers are ready.');
+    expect(host.textContent).toContain('All selected providers are ready.');
 
     await act(async () => {
       root.unmount();
@@ -2015,7 +2048,8 @@ describe('LaunchTeamDialog', () => {
       await flush();
     });
 
-    const callsAfterSameSignatureRerender = vi.mocked(runProviderPrepareDiagnostics).mock.calls.length;
+    const callsAfterSameSignatureRerender = vi.mocked(runProviderPrepareDiagnostics).mock.calls
+      .length;
 
     await act(async () => {
       resolvePrepare({
@@ -2031,7 +2065,7 @@ describe('LaunchTeamDialog', () => {
     expect(vi.mocked(runProviderPrepareDiagnostics)).toHaveBeenCalledTimes(
       callsAfterSameSignatureRerender
     );
-    expect(host.textContent).toContain('Selected providers are ready.');
+    expect(host.textContent).toContain('All selected providers are ready.');
 
     await act(async () => {
       root.unmount();
diff --git a/test/renderer/components/team/dialogs/ProvisioningProviderStatusList.test.ts b/test/renderer/components/team/dialogs/ProvisioningProviderStatusList.test.ts
index 01af0818..06605c17 100644
--- a/test/renderer/components/team/dialogs/ProvisioningProviderStatusList.test.ts
+++ b/test/renderer/components/team/dialogs/ProvisioningProviderStatusList.test.ts
@@ -1,15 +1,16 @@
 import React, { act } from 'react';
 import { createRoot } from 'react-dom/client';
-import { afterEach, describe, expect, it, vi } from 'vitest';
 
 import {
+  createInitialProviderChecks,
   deriveEffectiveProvisioningPrepareState,
   getPrimaryProvisioningFailureDetail,
   getProvisioningFailureHint,
   getProvisioningProviderBackendSummary,
+  getProvisioningProviderProgressMessage,
   ProvisioningProviderStatusList,
-  createInitialProviderChecks,
 } from '@renderer/components/team/dialogs/ProvisioningProviderStatusList';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 
 describe('ProvisioningProviderStatusList', () => {
   afterEach(() => {
@@ -88,6 +89,7 @@ describe('ProvisioningProviderStatusList', () => {
     const host = document.createElement('div');
     document.body.appendChild(host);
     const root = createRoot(host);
+    const onOpenProviderSettings = vi.fn();
 
     await act(async () => {
       root.render(
@@ -102,6 +104,7 @@ describe('ProvisioningProviderStatusList', () => {
               ],
             },
           ],
+          onOpenProviderSettings,
         })
       );
       await Promise.resolve();
@@ -110,6 +113,7 @@ describe('ProvisioningProviderStatusList', () => {
     expect(host.textContent).toContain('OpenCode (OpenCode CLI): OpenCode app MCP unreachable');
     expect(host.textContent).not.toContain('Selected model checks');
     expect(host.textContent).not.toContain('model unavailable');
+    expect(host.querySelector('button')).toBeNull();
 
     await act(async () => {
       root.unmount();
@@ -200,6 +204,58 @@ describe('ProvisioningProviderStatusList', () => {
     });
   });
 
+  it('offers provider settings for actionable Codex auth notes', async () => {
+    vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
+    const host = document.createElement('div');
+    document.body.appendChild(host);
+    const root = createRoot(host);
+    const onOpenProviderSettings = vi.fn();
+
+    await act(async () => {
+      root.render(
+        React.createElement(ProvisioningProviderStatusList, {
+          checks: [
+            {
+              providerId: 'codex',
+              status: 'notes',
+              backendSummary: 'Codex native - auth required',
+              details: [
+                'Codex native requires OPENAI_API_KEY or CODEX_API_KEY, or a connected ChatGPT account. Add one before launching Codex.',
+                'Default - available for launch',
+                '5.5 - available for launch',
+              ],
+            },
+            {
+              providerId: 'anthropic',
+              status: 'notes',
+              details: ['Opus 4.6 - available for launch'],
+            },
+          ],
+          onOpenProviderSettings,
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain('Open Codex settings');
+    const buttons = host.querySelectorAll('button');
+    expect(buttons).toHaveLength(1);
+    const button = buttons[0];
+    expect(button).not.toBeNull();
+
+    await act(async () => {
+      button?.click();
+      await Promise.resolve();
+    });
+
+    expect(onOpenProviderSettings).toHaveBeenCalledWith('codex');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('summarizes OpenCode advisory ping misses without failure wording', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     const host = document.createElement('div');
@@ -237,6 +293,44 @@ describe('ProvisioningProviderStatusList', () => {
     });
   });
 
+  it('hides internal OpenCode MCP proof cache markers from preflight details', 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(ProvisioningProviderStatusList, {
+          checks: [
+            {
+              providerId: 'opencode',
+              status: 'ready',
+              backendSummary: 'OpenCode CLI',
+              details: ['opencode_app_mcp_tool_proof_persisted_cache_hit', 'big-pickle - verified'],
+            },
+          ],
+        })
+      );
+      await Promise.resolve();
+    });
+
+    expect(host.textContent).toContain(
+      'OpenCode (OpenCode CLI): Selected model checks - 1 verified'
+    );
+    expect(host.textContent).toContain('big-pickle - verified');
+    expect(host.textContent).not.toContain('opencode_app_mcp_tool_proof_persisted_cache_hit');
+
+    const detailLines = Array.from(host.querySelectorAll('p'));
+    expect(detailLines).toHaveLength(1);
+    expect(detailLines[0]?.textContent).toBe('big-pickle - verified');
+
+    await act(async () => {
+      root.unmount();
+      await Promise.resolve();
+    });
+  });
+
   it('summarizes OpenCode busy model checks as deferred notes', async () => {
     vi.stubGlobal('IS_REACT_ACT_ENVIRONMENT', true);
     const host = document.createElement('div');
@@ -482,7 +576,7 @@ describe('ProvisioningProviderStatusList', () => {
       })
     ).toEqual({
       state: 'ready',
-      message: 'Selected providers are ready.',
+      message: 'All selected providers are ready.',
     });
   });
 
@@ -529,4 +623,16 @@ describe('ProvisioningProviderStatusList', () => {
         'Deep verification is still running. OpenCode free models may take around 20 seconds.',
     });
   });
+
+  it('labels provider-scoped prepare refreshes without implying every provider restarted', () => {
+    expect(getProvisioningProviderProgressMessage(['opencode'], 3)).toBe(
+      'Checking OpenCode provider...'
+    );
+    expect(getProvisioningProviderProgressMessage(['anthropic', 'codex'], 3)).toBe(
+      'Checking Anthropic, Codex providers...'
+    );
+    expect(getProvisioningProviderProgressMessage(['anthropic', 'codex', 'opencode'], 3)).toBe(
+      'Checking selected providers in parallel...'
+    );
+  });
 });
diff --git a/test/renderer/components/team/dialogs/providerPrepareDiagnostics.test.ts b/test/renderer/components/team/dialogs/providerPrepareDiagnostics.test.ts
index 95080c26..5523c79b 100644
--- a/test/renderer/components/team/dialogs/providerPrepareDiagnostics.test.ts
+++ b/test/renderer/components/team/dialogs/providerPrepareDiagnostics.test.ts
@@ -1,11 +1,10 @@
-import { describe, expect, it, vi } from 'vitest';
-
 import {
   buildReusableProviderPrepareModelResults,
   mergeReusableProviderPrepareModelResults,
   runProviderPrepareDiagnostics,
 } from '@renderer/components/team/dialogs/providerPrepareDiagnostics';
 import { DEFAULT_PROVIDER_MODEL_SELECTION } from '@shared/utils/providerModelSelection';
+import { describe, expect, it, vi } from 'vitest';
 
 import type { TeamProviderId, TeamProvisioningPrepareResult } from '@shared/types';
 
@@ -96,6 +95,47 @@ describe('runProviderPrepareDiagnostics', () => {
     });
   });
 
+  it('passes selected model effort checks through compatibility preflight', async () => {
+    const prepareProvisioning = vi.fn(async (): Promise<TeamProvisioningPrepareResult> => ({
+      ready: true,
+      message: 'ready',
+      details: ['Selected model claude-opus-4-6[1m] is available for launch.'],
+    }));
+
+    const result = await runProviderPrepareDiagnostics({
+      cwd: '/tmp/project',
+      providerId: 'anthropic',
+      selectedModelIds: ['claude-opus-4-6[1m]'],
+      selectedModelChecks: [
+        {
+          providerId: 'anthropic',
+          model: 'claude-opus-4-6[1m]',
+          effort: 'medium',
+        },
+      ],
+      prepareProvisioning,
+      limitContext: false,
+    });
+
+    expect(result.status).toBe('ready');
+    expect(prepareProvisioning).toHaveBeenNthCalledWith(
+      1,
+      '/tmp/project',
+      'anthropic',
+      ['anthropic'],
+      ['claude-opus-4-6[1m]'],
+      false,
+      'compatibility',
+      [
+        {
+          providerId: 'anthropic',
+          model: 'claude-opus-4-6[1m]',
+          effort: 'medium',
+        },
+      ]
+    );
+  });
+
   it('removes a stale reusable model result when the latest result is advisory', () => {
     expect(
       mergeReusableProviderPrepareModelResults(
diff --git a/test/renderer/components/team/dialogs/providerPreparePlans.test.ts b/test/renderer/components/team/dialogs/providerPreparePlans.test.ts
new file mode 100644
index 00000000..c364dc3c
--- /dev/null
+++ b/test/renderer/components/team/dialogs/providerPreparePlans.test.ts
@@ -0,0 +1,119 @@
+import { buildProviderPreparePlans } from '@renderer/components/team/dialogs/providerPreparePlans';
+import { describe, expect, it } from 'vitest';
+
+import type {
+  CliProviderStatus,
+  TeamProviderId,
+  TeamProvisioningModelCheckRequest,
+} from '@shared/types';
+
+type RuntimeSignatureProvider = {
+  providerId: TeamProviderId;
+  [key: string]: unknown;
+};
+
+function providerStatusMap(
+  entries: readonly (readonly [TeamProviderId, RuntimeSignatureProvider])[]
+): ReadonlyMap<TeamProviderId, CliProviderStatus | null | undefined> {
+  return new Map(entries) as unknown as ReadonlyMap<
+    TeamProviderId,
+    CliProviderStatus | null | undefined
+  >;
+}
+
+function modelChecksMap(
+  entries: readonly (readonly [TeamProviderId, readonly TeamProvisioningModelCheckRequest[]])[]
+): ReadonlyMap<TeamProviderId, readonly TeamProvisioningModelCheckRequest[]> {
+  return new Map(entries);
+}
+
+describe('providerPreparePlans', () => {
+  it('keeps unchanged provider signatures and cache keys stable when another provider changes', () => {
+    const providerIds: TeamProviderId[] = ['codex', 'opencode'];
+    const selectedModelChecksByProvider = modelChecksMap([
+      ['codex', [{ providerId: 'codex', model: 'gpt-5.5' }]],
+      ['opencode', [{ providerId: 'opencode', model: 'opencode/big-pickle' }]],
+    ]);
+    const backendSummaryByProvider = new Map<TeamProviderId, string | null>([
+      ['codex', 'Codex native'],
+      ['opencode', 'OpenCode CLI'],
+    ]);
+    const first = buildProviderPreparePlans({
+      cwd: '/tmp/project',
+      providerIds,
+      selectedModelChecksByProvider,
+      backendSummaryByProvider,
+      limitContext: false,
+      runtimeProviderStatusById: providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: true,
+            authMethod: 'chatgpt',
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+          },
+        ],
+        [
+          'opencode',
+          {
+            providerId: 'opencode',
+            supported: true,
+            authenticated: true,
+            authMethod: 'oauth',
+            selectedBackendId: 'opencode-cli',
+            resolvedBackendId: 'opencode-cli',
+          },
+        ],
+      ]),
+      cachedModelResultsByCacheKey: new Map(),
+    });
+    const second = buildProviderPreparePlans({
+      cwd: '/tmp/project',
+      providerIds,
+      selectedModelChecksByProvider,
+      backendSummaryByProvider,
+      limitContext: false,
+      runtimeProviderStatusById: providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: false,
+            authMethod: null,
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+          },
+        ],
+        [
+          'opencode',
+          {
+            providerId: 'opencode',
+            supported: true,
+            authenticated: true,
+            authMethod: 'oauth',
+            selectedBackendId: 'opencode-cli',
+            resolvedBackendId: 'opencode-cli',
+          },
+        ],
+      ]),
+      cachedModelResultsByCacheKey: new Map(),
+    });
+
+    const firstByProvider = new Map(first.map((plan) => [plan.providerId, plan]));
+    const secondByProvider = new Map(second.map((plan) => [plan.providerId, plan]));
+
+    expect(firstByProvider.get('codex')?.requestSignature).not.toBe(
+      secondByProvider.get('codex')?.requestSignature
+    );
+    expect(firstByProvider.get('opencode')?.requestSignature).toBe(
+      secondByProvider.get('opencode')?.requestSignature
+    );
+    expect(firstByProvider.get('opencode')?.cacheKey).toBe(
+      secondByProvider.get('opencode')?.cacheKey
+    );
+  });
+});
diff --git a/test/renderer/components/team/dialogs/providerPrepareRequestSignature.test.ts b/test/renderer/components/team/dialogs/providerPrepareRequestSignature.test.ts
index 3df7d5ad..9b65eb4b 100644
--- a/test/renderer/components/team/dialogs/providerPrepareRequestSignature.test.ts
+++ b/test/renderer/components/team/dialogs/providerPrepareRequestSignature.test.ts
@@ -1,18 +1,33 @@
-import { describe, expect, it } from 'vitest';
-
 import {
   buildProviderPrepareMembersSignature,
   buildProviderPrepareModelChecksSignature,
   buildProviderPrepareRequestSignature,
   buildProviderPrepareRuntimeStatusSignature,
 } from '@renderer/components/team/dialogs/providerPrepareRequestSignature';
+import { describe, expect, it } from 'vitest';
+
+import type { CliProviderStatus, TeamProviderId } from '@shared/types';
+
+type RuntimeSignatureProvider = {
+  providerId: TeamProviderId;
+  [key: string]: unknown;
+};
+
+function providerStatusMap(
+  entries: readonly (readonly [TeamProviderId, RuntimeSignatureProvider])[]
+): ReadonlyMap<TeamProviderId, CliProviderStatus | null | undefined> {
+  return new Map(entries) as unknown as ReadonlyMap<
+    TeamProviderId,
+    CliProviderStatus | null | undefined
+  >;
+}
 
 describe('providerPrepareRequestSignature', () => {
   it('stays stable for semantically identical provider runtime snapshots', () => {
     const providerIds = ['codex'] as const;
     const first = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -53,11 +68,11 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
     const second = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -98,7 +113,7 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(first).toBe(second);
@@ -108,7 +123,7 @@ describe('providerPrepareRequestSignature', () => {
     const providerIds = ['codex'] as const;
     const authenticated = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -129,11 +144,11 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
     const unauthenticated = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -155,7 +170,7 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(authenticated).not.toBe(unauthenticated);
@@ -165,7 +180,7 @@ describe('providerPrepareRequestSignature', () => {
     const providerIds = ['codex'] as const;
     const first = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -215,11 +230,11 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
     const second = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'codex',
           {
@@ -269,7 +284,7 @@ describe('providerPrepareRequestSignature', () => {
             canLoginFromUi: true,
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(first).not.toBe(second);
@@ -279,7 +294,7 @@ describe('providerPrepareRequestSignature', () => {
     const providerIds = ['opencode'] as const;
     const first = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -309,11 +324,11 @@ describe('providerPrepareRequestSignature', () => {
             ],
           },
         ],
-      ]) as any
+      ])
     );
     const second = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -343,7 +358,7 @@ describe('providerPrepareRequestSignature', () => {
             ],
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(first).toBe(second);
@@ -353,7 +368,7 @@ describe('providerPrepareRequestSignature', () => {
     const providerIds = ['opencode'] as const;
     const first = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -371,11 +386,11 @@ describe('providerPrepareRequestSignature', () => {
             },
           },
         ],
-      ]) as any
+      ])
     );
     const second = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -401,7 +416,7 @@ describe('providerPrepareRequestSignature', () => {
             },
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(first).toBe(second);
@@ -410,7 +425,7 @@ describe('providerPrepareRequestSignature', () => {
   it('still changes the full request signature when selected OpenCode model checks change', () => {
     const runtimeStatusSignature = buildProviderPrepareRuntimeStatusSignature(
       ['opencode'],
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -420,21 +435,15 @@ describe('providerPrepareRequestSignature', () => {
             authMethod: 'oauth',
             selectedBackendId: 'opencode-cli',
             resolvedBackendId: 'opencode-cli',
-            models: [
-              'opencode/minimax-m2.5-free',
-              'opencode/qwen3.6-plus-free',
-            ],
+            models: ['opencode/minimax-m2.5-free', 'opencode/qwen3.6-plus-free'],
             modelCatalog: {
               source: 'live',
               status: 'ready',
-              models: [
-                { id: 'opencode/minimax-m2.5-free' },
-                { id: 'opencode/qwen3.6-plus-free' },
-              ],
+              models: [{ id: 'opencode/minimax-m2.5-free' }, { id: 'opencode/qwen3.6-plus-free' }],
             },
           },
         ],
-      ]) as any
+      ])
     );
 
     const first = buildProviderPrepareRequestSignature({
@@ -465,7 +474,7 @@ describe('providerPrepareRequestSignature', () => {
     const providerIds = ['opencode'] as const;
     const first = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -493,11 +502,11 @@ describe('providerPrepareRequestSignature', () => {
             ],
           },
         ],
-      ]) as any
+      ])
     );
     const second = buildProviderPrepareRuntimeStatusSignature(
       providerIds,
-      new Map([
+      providerStatusMap([
         [
           'opencode',
           {
@@ -525,12 +534,304 @@ describe('providerPrepareRequestSignature', () => {
             ],
           },
         ],
-      ]) as any
+      ])
     );
 
     expect(first).toBe(second);
   });
 
+  it('ignores backend option status churn when the selected backend identity is unchanged', () => {
+    const providerIds = ['opencode'] as const;
+    const first = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'opencode',
+          {
+            providerId: 'opencode',
+            supported: true,
+            authenticated: true,
+            authMethod: 'oauth',
+            selectedBackendId: 'opencode-cli',
+            resolvedBackendId: 'opencode-cli',
+            availableBackends: [
+              {
+                id: 'opencode-cli',
+                available: false,
+                selectable: true,
+                state: 'degraded',
+                recommended: true,
+                audience: 'general',
+                statusMessage: 'PONG probe still running',
+              },
+            ],
+          },
+        ],
+      ])
+    );
+    const second = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'opencode',
+          {
+            providerId: 'opencode',
+            supported: true,
+            authenticated: true,
+            authMethod: 'oauth',
+            selectedBackendId: 'opencode-cli',
+            resolvedBackendId: 'opencode-cli',
+            availableBackends: [
+              {
+                id: 'opencode-cli',
+                available: true,
+                selectable: true,
+                state: 'ready',
+                recommended: true,
+                audience: 'general',
+                statusMessage: 'Managed runtime verified',
+              },
+            ],
+          },
+        ],
+      ])
+    );
+
+    expect(first).toBe(second);
+  });
+
+  it('ignores launchable Codex account telemetry churn', () => {
+    const providerIds = ['codex'] as const;
+    const first = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: true,
+            authMethod: 'chatgpt',
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+            connection: {
+              supportsOAuth: false,
+              supportsApiKey: true,
+              configurableAuthModes: ['auto', 'chatgpt', 'api_key'],
+              configuredAuthMode: 'chatgpt',
+              apiKeyConfigured: false,
+              apiKeySource: null,
+              codex: {
+                preferredAuthMode: 'chatgpt',
+                effectiveAuthMode: 'chatgpt',
+                appServerState: 'healthy',
+                appServerStatusMessage: null,
+                managedAccount: {
+                  type: 'chatgpt',
+                  email: 'user@example.com',
+                  planType: 'plus',
+                },
+                requiresOpenaiAuth: false,
+                localAccountArtifactsPresent: true,
+                localActiveChatgptAccountPresent: true,
+                login: {
+                  status: 'idle',
+                  error: null,
+                  startedAt: null,
+                },
+                rateLimits: null,
+                launchAllowed: true,
+                launchIssueMessage: null,
+                launchReadinessState: 'ready_chatgpt',
+              },
+            },
+          },
+        ],
+      ])
+    );
+    const second = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: true,
+            authMethod: 'chatgpt',
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+            connection: {
+              supportsOAuth: false,
+              supportsApiKey: true,
+              configurableAuthModes: ['auto', 'chatgpt', 'api_key'],
+              configuredAuthMode: 'chatgpt',
+              apiKeyConfigured: false,
+              apiKeySource: null,
+              codex: {
+                preferredAuthMode: 'chatgpt',
+                effectiveAuthMode: 'chatgpt',
+                appServerState: 'degraded',
+                appServerStatusMessage: 'rate limits refresh failed',
+                managedAccount: {
+                  type: 'chatgpt',
+                  email: 'user@example.com',
+                  planType: 'plus',
+                },
+                requiresOpenaiAuth: false,
+                localAccountArtifactsPresent: false,
+                localActiveChatgptAccountPresent: true,
+                login: {
+                  status: 'pending',
+                  error: null,
+                  startedAt: '2026-05-19T00:00:00.000Z',
+                },
+                rateLimits: {
+                  limitId: 'codex',
+                  limitName: null,
+                  primary: {
+                    usedPercent: 87,
+                    windowDurationMins: 300,
+                    resetsAt: 1_779_120_000_000,
+                  },
+                  secondary: null,
+                  credits: null,
+                  planType: 'plus',
+                },
+                launchAllowed: true,
+                launchIssueMessage: 'Ready with degraded account verification.',
+                launchReadinessState: 'warning_degraded_but_launchable',
+              },
+            },
+          },
+        ],
+      ])
+    );
+
+    expect(first).toBe(second);
+  });
+
+  it('changes the Codex runtime signature when launchability changes', () => {
+    const providerIds = ['codex'] as const;
+    const ready = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: true,
+            authMethod: 'chatgpt',
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+            connection: {
+              supportsOAuth: false,
+              supportsApiKey: true,
+              configurableAuthModes: ['auto', 'chatgpt', 'api_key'],
+              configuredAuthMode: 'chatgpt',
+              apiKeyConfigured: false,
+              apiKeySource: null,
+              codex: {
+                preferredAuthMode: 'chatgpt',
+                effectiveAuthMode: 'chatgpt',
+                appServerState: 'healthy',
+                appServerStatusMessage: null,
+                managedAccount: {
+                  type: 'chatgpt',
+                  email: 'user@example.com',
+                  planType: 'plus',
+                },
+                requiresOpenaiAuth: false,
+                localAccountArtifactsPresent: true,
+                localActiveChatgptAccountPresent: true,
+                login: {
+                  status: 'idle',
+                  error: null,
+                  startedAt: null,
+                },
+                rateLimits: null,
+                launchAllowed: true,
+                launchIssueMessage: null,
+                launchReadinessState: 'ready_chatgpt',
+              },
+            },
+          },
+        ],
+      ])
+    );
+    const missingAuth = buildProviderPrepareRuntimeStatusSignature(
+      providerIds,
+      providerStatusMap([
+        [
+          'codex',
+          {
+            providerId: 'codex',
+            supported: true,
+            authenticated: false,
+            authMethod: null,
+            selectedBackendId: 'codex-native',
+            resolvedBackendId: 'codex-native',
+            connection: {
+              supportsOAuth: false,
+              supportsApiKey: true,
+              configurableAuthModes: ['auto', 'chatgpt', 'api_key'],
+              configuredAuthMode: 'chatgpt',
+              apiKeyConfigured: false,
+              apiKeySource: null,
+              codex: {
+                preferredAuthMode: 'chatgpt',
+                effectiveAuthMode: null,
+                appServerState: 'healthy',
+                appServerStatusMessage: null,
+                managedAccount: null,
+                requiresOpenaiAuth: true,
+                localAccountArtifactsPresent: true,
+                localActiveChatgptAccountPresent: false,
+                login: {
+                  status: 'idle',
+                  error: null,
+                  startedAt: null,
+                },
+                rateLimits: null,
+                launchAllowed: false,
+                launchIssueMessage: 'Connect a ChatGPT account.',
+                launchReadinessState: 'missing_auth',
+              },
+            },
+          },
+        ],
+      ])
+    );
+
+    expect(ready).not.toBe(missingAuth);
+  });
+
+  it('ignores volatile member draft ids in provider prepare signatures', () => {
+    const first = buildProviderPrepareMembersSignature([
+      {
+        id: 'draft-before-poll',
+        name: 'tom',
+        roleSelection: '',
+        customRole: 'Developer',
+        providerId: 'opencode',
+        model: 'opencode/big-pickle',
+      },
+    ]);
+    const second = buildProviderPrepareMembersSignature([
+      {
+        id: 'draft-after-poll',
+        name: 'tom',
+        roleSelection: '',
+        customRole: 'Developer',
+        providerId: 'opencode',
+        model: 'opencode/big-pickle',
+      },
+    ]);
+
+    expect(first).toBe(second);
+  });
+
   it('builds a stable composite request signature for unchanged member/model selections', () => {
     const membersSignature = buildProviderPrepareMembersSignature([
       {
@@ -573,4 +874,17 @@ describe('providerPrepareRequestSignature', () => {
       })
     );
   });
+
+  it('changes model checks signature when selected effort changes', () => {
+    const medium = buildProviderPrepareModelChecksSignature(
+      new Map([['anthropic', [{ model: 'claude-opus-4-6[1m]', effort: 'medium' }]]])
+    );
+    const high = buildProviderPrepareModelChecksSignature(
+      new Map([['anthropic', [{ model: 'claude-opus-4-6[1m]', effort: 'high' }]]])
+    );
+
+    expect(medium).not.toBe(high);
+    expect(medium).toContain('"effort":"medium"');
+    expect(high).toContain('"effort":"high"');
+  });
 });
diff --git a/test/renderer/components/team/dialogs/teammateRuntimeCompatibility.test.ts b/test/renderer/components/team/dialogs/teammateRuntimeCompatibility.test.ts
index bd799141..9a3afcce 100644
--- a/test/renderer/components/team/dialogs/teammateRuntimeCompatibility.test.ts
+++ b/test/renderer/components/team/dialogs/teammateRuntimeCompatibility.test.ts
@@ -1,6 +1,5 @@
-import { describe, expect, it } from 'vitest';
-
 import { analyzeTeammateRuntimeCompatibility } from '@renderer/components/team/dialogs/teammateRuntimeCompatibility';
+import { describe, expect, it } from 'vitest';
 
 import type { TmuxStatus } from '@features/tmux-installer/contracts';
 
@@ -52,6 +51,7 @@ describe('analyzeTeammateRuntimeCompatibility', () => {
 
     expect(result.blocksSubmission).toBe(false);
     expect(result.visible).toBe(false);
+    expect(result.providerNoticeProviderId).toBeNull();
     expect(result.memberWarningById).toEqual({});
   });
 
@@ -93,8 +93,12 @@ describe('analyzeTeammateRuntimeCompatibility', () => {
     });
 
     expect(result.blocksSubmission).toBe(true);
+    expect(result.providerNoticeProviderId).toBe('opencode');
     expect(result.title).toBe('OpenCode cannot lead mixed-provider teams');
     expect(result.message).toContain('mixed teams cannot use OpenCode as the lead');
+    expect(result.message).toContain('Anthropic or Codex lead');
+    expect(result.message).not.toContain('Gemini');
+    expect(result.tmuxDetail).toBeNull();
     expect(result.memberWarningById.bob).toContain('OpenCode cannot be the team lead');
   });
 
diff --git a/test/renderer/features/agent-graph/GraphActivityHud.test.ts b/test/renderer/features/agent-graph/GraphActivityHud.test.ts
index 2e0e8767..4afddf39 100644
--- a/test/renderer/features/agent-graph/GraphActivityHud.test.ts
+++ b/test/renderer/features/agent-graph/GraphActivityHud.test.ts
@@ -254,6 +254,13 @@ describe('GraphActivityHud', () => {
       button.textContent?.includes('+1 more')
     );
     expect(moreButton).not.toBeUndefined();
+    expect(moreButton?.className).toContain('pointer-events-auto');
+
+    const shell = host.querySelector('.z-10');
+    expect(shell?.className).toContain('pointer-events-none');
+    expect(host.querySelector('[data-activity-entry-id="item-1"]')?.className).toContain(
+      'pointer-events-auto'
+    );
 
     await act(async () => {
       moreButton?.dispatchEvent(new MouseEvent('click', { bubbles: true }));
diff --git a/test/renderer/features/agent-graph/TeamGraphAdapter.test.ts b/test/renderer/features/agent-graph/TeamGraphAdapter.test.ts
index 7fd2add3..c2eac2c3 100644
--- a/test/renderer/features/agent-graph/TeamGraphAdapter.test.ts
+++ b/test/renderer/features/agent-graph/TeamGraphAdapter.test.ts
@@ -1,12 +1,16 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
 import {
   TeamGraphAdapter,
   type TeamGraphData,
 } from '@features/agent-graph/renderer/adapters/TeamGraphAdapter';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import type { InboxMessage, TeamTaskWithKanban } from '@shared/types/team';
 import type { GraphDataPort } from '@claude-teams/agent-graph';
+import type {
+  InboxMessage,
+  MemberSpawnStatusEntry,
+  TeamAgentRuntimeEntry,
+  TeamTaskWithKanban,
+} from '@shared/types/team';
 
 function createBaseTeamData(
   overrides?: Partial<TeamGraphData> & {
@@ -62,6 +66,23 @@ function findNode(graph: GraphDataPort, nodeId: string) {
   return graph.nodes.find((node) => node.id === nodeId);
 }
 
+function createLiveRuntimeEntry(
+  memberName: string,
+  overrides: Partial<TeamAgentRuntimeEntry> = {}
+): TeamAgentRuntimeEntry {
+  return {
+    memberName,
+    alive: true,
+    restartable: true,
+    providerId: 'codex',
+    providerBackendId: 'codex-native',
+    livenessKind: 'runtime_process',
+    pid: 12345,
+    updatedAt: '2026-03-28T19:00:00.000Z',
+    ...overrides,
+  };
+}
+
 function adaptWithActiveTaskLogActivity(
   adapter: TeamGraphAdapter,
   teamData: TeamGraphData,
@@ -185,6 +206,62 @@ describe('TeamGraphAdapter particles', () => {
     expect(graph.layout?.mode).toBe('grid-under-lead');
   });
 
+  it('uses runtime entries when deriving member launch status', () => {
+    const adapter = TeamGraphAdapter.create();
+    const spawnStatuses: Record<string, MemberSpawnStatusEntry> = {
+      alice: {
+        status: 'online',
+        launchState: 'confirmed_alive',
+        runtimeAlive: true,
+        bootstrapConfirmed: true,
+        livenessKind: 'runtime_process',
+        updatedAt: '2026-03-28T19:00:00.000Z',
+      },
+    };
+    const teamData = createBaseTeamData({
+      members: [
+        {
+          name: 'team-lead',
+          status: 'active',
+          currentTaskId: null,
+          taskCount: 0,
+          lastActiveAt: null,
+          messageCount: 0,
+          agentType: 'team-lead',
+        },
+        {
+          name: 'alice',
+          status: 'active',
+          currentTaskId: null,
+          taskCount: 1,
+          lastActiveAt: null,
+          messageCount: 0,
+          providerId: 'codex',
+          providerBackendId: 'codex-native',
+        },
+      ],
+    });
+
+    const withoutRuntime = adapter.adapt(teamData, 'my-team', spawnStatuses);
+    expect(findNode(withoutRuntime, 'member:my-team:alice')?.launchStatusLabel).toBe(
+      'stale runtime'
+    );
+
+    const withRuntime = adapter.adapt(
+      {
+        ...teamData,
+        runtimeEntriesByMember: {
+          alice: createLiveRuntimeEntry('alice'),
+        },
+      },
+      'my-team',
+      spawnStatuses
+    );
+
+    expect(findNode(withRuntime, 'member:my-team:alice')?.launchStatusLabel).toBeUndefined();
+    expect(findNode(withRuntime, 'member:my-team:alice')?.launchVisualState).toBeUndefined();
+  });
+
   it('applies saved grid owner order only in grid-under-lead mode', () => {
     const adapter = TeamGraphAdapter.create();
     const teamData = createBaseTeamData({
diff --git a/test/renderer/features/agent-graph/collapseOverflowStacks.test.ts b/test/renderer/features/agent-graph/collapseOverflowStacks.test.ts
index d712659f..17c2d53a 100644
--- a/test/renderer/features/agent-graph/collapseOverflowStacks.test.ts
+++ b/test/renderer/features/agent-graph/collapseOverflowStacks.test.ts
@@ -1,11 +1,9 @@
-import { describe, expect, it } from 'vitest';
-
+import { type GraphNode, TASK_COLUMN_MAX_VISIBLE_ROWS } from '@claude-teams/agent-graph';
 import {
   collapseOverflowStacks,
   collapseOverflowStacksWithMeta,
 } from '@features/agent-graph/core/domain/collapseOverflowStacks';
-
-import type { GraphNode } from '@claude-teams/agent-graph';
+import { describe, expect, it } from 'vitest';
 
 function makeTaskNode(taskId: string, ownerName: string | null = 'alice'): GraphNode {
   return {
@@ -33,22 +31,23 @@ describe('collapseOverflowStacks', () => {
   });
 
   it('replaces the hidden tail with a single overflow stack node while preserving visible order', () => {
-    const nodes = Array.from({ length: 7 }, (_, index) => makeTaskNode(`task-${index + 1}`));
+    const nodes = Array.from({ length: 8 }, (_, index) => makeTaskNode(`task-${index + 1}`));
 
     const result = collapseOverflowStacks(nodes, 'my-team', 6);
 
-    expect(result).toHaveLength(6);
-    expect(result.slice(0, 5).map((node) => node.domainRef.kind === 'task' && node.domainRef.taskId)).toEqual([
+    expect(result).toHaveLength(7);
+    expect(result.slice(0, 6).map((node) => node.domainRef.kind === 'task' && node.domainRef.taskId)).toEqual([
       'task-1',
       'task-2',
       'task-3',
       'task-4',
       'task-5',
+      'task-6',
     ]);
-    expect(result[5]).toMatchObject({
+    expect(result[6]).toMatchObject({
       isOverflowStack: true,
       overflowCount: 2,
-      overflowTaskIds: ['task-6', 'task-7'],
+      overflowTaskIds: ['task-7', 'task-8'],
       domainRef: {
         kind: 'task_overflow',
         teamName: 'my-team',
@@ -58,15 +57,32 @@ describe('collapseOverflowStacks', () => {
     });
   });
 
+  it('uses the graph column row budget so task columns stay inside the stable slot', () => {
+    const nodes = Array.from({ length: 5 }, (_, index) => makeTaskNode(`task-${index + 1}`));
+
+    const result = collapseOverflowStacks(nodes, 'my-team', TASK_COLUMN_MAX_VISIBLE_ROWS);
+
+    expect(result).toHaveLength(TASK_COLUMN_MAX_VISIBLE_ROWS + 1);
+    expect(
+      result.slice(0, 3).map((node) => node.domainRef.kind === 'task' && node.domainRef.taskId)
+    ).toEqual(['task-1', 'task-2', 'task-3']);
+    expect(result[3]).toMatchObject({
+      isOverflowStack: true,
+      label: '+2 more',
+      overflowCount: 2,
+      overflowTaskIds: ['task-4', 'task-5'],
+    });
+  });
+
   it('applies the same stack rules to unassigned task columns', () => {
-    const nodes = Array.from({ length: 7 }, (_, index) => makeTaskNode(`task-${index + 1}`, null));
+    const nodes = Array.from({ length: 8 }, (_, index) => makeTaskNode(`task-${index + 1}`, null));
 
     const result = collapseOverflowStacks(nodes, 'my-team', 6);
     const stack = result.find((node) => node.isOverflowStack);
 
     expect(stack).toMatchObject({
       overflowCount: 2,
-      overflowTaskIds: ['task-6', 'task-7'],
+      overflowTaskIds: ['task-7', 'task-8'],
       ownerId: null,
       domainRef: {
         kind: 'task_overflow',
@@ -78,14 +94,15 @@ describe('collapseOverflowStacks', () => {
   });
 
   it('returns a visible-node mapping for hidden tasks behind the stack', () => {
-    const nodes = Array.from({ length: 7 }, (_, index) => makeTaskNode(`task-${index + 1}`));
+    const nodes = Array.from({ length: 8 }, (_, index) => makeTaskNode(`task-${index + 1}`));
 
     const result = collapseOverflowStacksWithMeta(nodes, 'my-team', 6);
     const stackNode = result.visibleNodes.find((node) => node.isOverflowStack);
 
     expect(stackNode).toBeDefined();
     expect(result.visibleNodeIdByTaskId.get('task-1')).toBe('task:my-team:task-1');
-    expect(result.visibleNodeIdByTaskId.get('task-6')).toBe(stackNode?.id);
+    expect(result.visibleNodeIdByTaskId.get('task-6')).toBe('task:my-team:task-6');
     expect(result.visibleNodeIdByTaskId.get('task-7')).toBe(stackNode?.id);
+    expect(result.visibleNodeIdByTaskId.get('task-8')).toBe(stackNode?.id);
   });
 });
diff --git a/test/renderer/store/teamSlice.test.ts b/test/renderer/store/teamSlice.test.ts
index 7319c924..da42c5cc 100644
--- a/test/renderer/store/teamSlice.test.ts
+++ b/test/renderer/store/teamSlice.test.ts
@@ -8,6 +8,8 @@ import {
   getActiveTeamPendingReplyWaits,
   hasActiveTeamPendingReplyWait,
   getCurrentProvisioningProgressForTeam,
+  loadPersistedMessagesPanelMode,
+  savePersistedMessagesPanelMode,
   selectMemberMessagesForTeamMember,
   selectResolvedMemberForTeamName,
   selectResolvedMembersForTeamName,
@@ -344,6 +346,7 @@ describe('teamSlice actions', () => {
     });
     hoisted.restartMember.mockResolvedValue(undefined);
     hoisted.skipMemberForLaunch.mockResolvedValue(undefined);
+    window.localStorage.removeItem('team:messagesPanelMode');
   });
 
   afterEach(() => {
@@ -351,6 +354,31 @@ describe('teamSlice actions', () => {
     vi.useRealTimers();
   });
 
+  it('restores the selected messages panel mode from localStorage', () => {
+    window.localStorage.setItem('team:messagesPanelMode', 'bottom-sheet');
+
+    const store = createSliceStore();
+
+    expect(store.getState().messagesPanelMode).toBe('bottom-sheet');
+  });
+
+  it('persists messages panel mode changes and ignores invalid stored values', () => {
+    const store = createSliceStore();
+
+    store.getState().setMessagesPanelMode('floating-composer');
+
+    expect(window.localStorage.getItem('team:messagesPanelMode')).toBe('floating-composer');
+    expect(loadPersistedMessagesPanelMode()).toBe('floating-composer');
+
+    window.localStorage.setItem('team:messagesPanelMode', 'bad-mode');
+
+    expect(loadPersistedMessagesPanelMode()).toBe('sidebar');
+
+    savePersistedMessagesPanelMode('inline');
+
+    expect(window.localStorage.getItem('team:messagesPanelMode')).toBe('inline');
+  });
+
   it('records terminal provisioning fanout diagnostics without changing visible graph hydrate behavior', () => {
     const store = createSliceStore();
     const fetchTeams = vi.fn(async () => undefined);
diff --git a/test/renderer/utils/memberLaunchDiagnostics.test.ts b/test/renderer/utils/memberLaunchDiagnostics.test.ts
index 32e57b57..3875a14a 100644
--- a/test/renderer/utils/memberLaunchDiagnostics.test.ts
+++ b/test/renderer/utils/memberLaunchDiagnostics.test.ts
@@ -1,12 +1,11 @@
-import { describe, expect, it } from 'vitest';
-
 import {
   buildMemberLaunchDiagnosticsPayload,
   formatMemberLaunchDiagnosticsPayload,
+  getMemberLaunchDiagnosticsErrorMessage,
   hasMemberLaunchDiagnosticsDetails,
   hasMemberLaunchDiagnosticsError,
-  getMemberLaunchDiagnosticsErrorMessage,
 } from '@renderer/utils/memberLaunchDiagnostics';
+import { describe, expect, it } from 'vitest';
 
 describe('member launch diagnostics', () => {
   it('builds a bounded copy payload from spawn and runtime evidence', () => {
@@ -1180,4 +1179,85 @@ describe('member launch diagnostics', () => {
       'Anthropic API error. resolved_behavior_changed:old->new'
     );
   });
+
+  it('prioritizes durable bootstrap timeout over no-stdin stderr noise', () => {
+    const payload = buildMemberLaunchDiagnosticsPayload({
+      teamName: 'signal-ops',
+      runId: 'run-mailbox-written-no-submit',
+      memberName: 'atlas',
+      spawnEntry: {
+        status: 'error',
+        launchState: 'failed_to_start',
+        hardFailure: true,
+        error:
+          'Teammate process atlas@signal-ops did not submit bootstrap prompt: timed out waiting for bootstrap_submitted; last transport stage: mailbox_bootstrap_written: messageId=bootstrap-atlas-1 Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+        livenessKind: 'stale_metadata',
+        runtimeDiagnostic: 'persisted runtime pid is not alive',
+        runtimeDiagnosticSeverity: 'warning',
+        updatedAt: '2026-05-19T13:53:36.668Z',
+      },
+    });
+
+    expect(payload.probableCause).toBe(
+      'Parent process timed out waiting for durable bootstrap_submitted evidence.'
+    );
+    expect(payload.diagnosticHints?.[0]).toBe(
+      'Parent process timed out waiting for durable bootstrap_submitted evidence.'
+    );
+    expect(payload.diagnosticHints).toContain(
+      'CLI read empty stdin before bootstrap submit; verify headless teammate runtime flag/env and startup input handling.'
+    );
+  });
+
+  it('prioritizes bootstrap submit rejection over no-stdin stderr noise', () => {
+    const payload = buildMemberLaunchDiagnosticsPayload({
+      teamName: 'signal-ops',
+      runId: 'run-submit-rejected-no-stdin',
+      memberName: 'bob',
+      spawnEntry: {
+        status: 'error',
+        launchState: 'failed_to_start',
+        hardFailure: true,
+        error:
+          'Teammate process bob@signal-ops did not submit bootstrap prompt: timed out waiting for bootstrap_submitted; last transport stage: bootstrap_submit_rejected: submit rejected by local prompt handler retryable=true Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+        updatedAt: '2026-05-19T13:53:36.668Z',
+      },
+    });
+
+    expect(payload.probableCause).toBe(
+      'The teammate process observed bootstrap mail, but local prompt submission did not accept the bootstrap turn.'
+    );
+    expect(payload.diagnosticHints?.[0]).toBe(
+      'The teammate process observed bootstrap mail, but local prompt submission did not accept the bootstrap turn.'
+    );
+    expect(payload.diagnosticHints).toContain(
+      'CLI read empty stdin before bootstrap submit; verify headless teammate runtime flag/env and startup input handling.'
+    );
+  });
+
+  it('prioritizes submitted-but-unconfirmed bootstrap over no-stdin stderr noise', () => {
+    const payload = buildMemberLaunchDiagnosticsPayload({
+      teamName: 'signal-ops',
+      runId: 'run-submitted-no-confirm',
+      memberName: 'alice',
+      spawnEntry: {
+        status: 'error',
+        launchState: 'failed_to_start',
+        hardFailure: true,
+        error:
+          'Teammate was registered but did not bootstrap-confirm before timeout. Last transport stage: bootstrap_submitted: messageId=bootstrap-alice-1 Last stderr: Warning: no stdin data received in 3s, proceeding without it.',
+        updatedAt: '2026-05-19T13:53:36.668Z',
+      },
+    });
+
+    expect(payload.probableCause).toBe(
+      'Bootstrap prompt was submitted, but teammate did not bootstrap-confirm before timeout.'
+    );
+    expect(payload.diagnosticHints?.[0]).toBe(
+      'Bootstrap prompt was submitted, but teammate did not bootstrap-confirm before timeout.'
+    );
+    expect(payload.diagnosticHints).toContain(
+      'CLI read empty stdin before bootstrap submit; verify headless teammate runtime flag/env and startup input handling.'
+    );
+  });
 });
diff --git a/test/scripts/liveSmokeRuntime.test.ts b/test/scripts/liveSmokeRuntime.test.ts
new file mode 100644
index 00000000..3b8bc74d
--- /dev/null
+++ b/test/scripts/liveSmokeRuntime.test.ts
@@ -0,0 +1,66 @@
+// @vitest-environment node
+
+import * as path from 'path';
+import { pathToFileURL } from 'url';
+import { describe, expect, it } from 'vitest';
+
+interface LiveSmokeRuntimeModule {
+  resolveLiveSmokeOrchestratorCliPath(input?: {
+    env?: NodeJS.ProcessEnv;
+    repoRoot?: string;
+  }): string;
+  resolveReleaseSmokeOrchestratorCliPath(input?: {
+    env?: NodeJS.ProcessEnv;
+    repoRoot?: string;
+  }): string;
+}
+
+describe('live smoke runtime launcher paths', () => {
+  const repoRoot = '/Users/belief/dev/projects/claude/claude_team';
+  const siblingRuntimeRoot = '/Users/belief/dev/projects/claude/agent_teams_orchestrator';
+
+  it('defaults live smoke to the source launcher', async () => {
+    const { resolveLiveSmokeOrchestratorCliPath } = await loadModule();
+
+    expect(resolveLiveSmokeOrchestratorCliPath({ env: {}, repoRoot })).toBe(
+      path.join(siblingRuntimeRoot, 'cli-source')
+    );
+  });
+
+  it('uses CLAUDE_DEV_RUNTIME_ROOT with cli-source for live smoke', async () => {
+    const { resolveLiveSmokeOrchestratorCliPath } = await loadModule();
+
+    expect(
+      resolveLiveSmokeOrchestratorCliPath({
+        env: { CLAUDE_DEV_RUNTIME_ROOT: '/tmp/runtime-source' },
+        repoRoot,
+      })
+    ).toBe(path.join('/tmp/runtime-source', 'cli-source'));
+  });
+
+  it('keeps explicit CLI path overrides authoritative', async () => {
+    const { resolveLiveSmokeOrchestratorCliPath } = await loadModule();
+
+    expect(
+      resolveLiveSmokeOrchestratorCliPath({
+        env: { CLAUDE_AGENT_TEAMS_ORCHESTRATOR_CLI_PATH: '  /custom/runtime/cli  ' },
+        repoRoot,
+      })
+    ).toBe('/custom/runtime/cli');
+  });
+
+  it('keeps release smoke pointed at the built wrapper', async () => {
+    const { resolveReleaseSmokeOrchestratorCliPath } = await loadModule();
+
+    expect(resolveReleaseSmokeOrchestratorCliPath({ env: {}, repoRoot })).toBe(
+      path.join(siblingRuntimeRoot, 'cli')
+    );
+  });
+});
+
+async function loadModule(): Promise<LiveSmokeRuntimeModule> {
+  const moduleUrl = pathToFileURL(
+    path.join(process.cwd(), 'scripts/lib/live-smoke-runtime.mjs')
+  ).href;
+  return (await import(`${moduleUrl}?t=${Date.now()}`)) as LiveSmokeRuntimeModule;
+}
diff --git a/test/scripts/opencodeLivePreflight.test.ts b/test/scripts/opencodeLivePreflight.test.ts
index 0176d371..32f768fc 100644
--- a/test/scripts/opencodeLivePreflight.test.ts
+++ b/test/scripts/opencodeLivePreflight.test.ts
@@ -17,6 +17,7 @@ interface StopChildOptions {
 
 interface OpenCodeLivePreflightTestHooks {
   __opencodeLivePreflightTestHooks: {
+    isHealthyOpenCodeHostResponse(response: { ok: boolean }): boolean;
     stopChild(child: FakeChild, options?: StopChildOptions): Promise<void>;
     taskkillProcessTree(pid: number): Promise<void>;
   };
@@ -38,6 +39,14 @@ describe('opencode live preflight cleanup', () => {
     }
   });
 
+  it('accepts an HTTP 2xx OpenCode health response without requiring a JSON body', async () => {
+    const { isHealthyOpenCodeHostResponse } = (await loadTestHooks())
+      .__opencodeLivePreflightTestHooks;
+
+    expect(isHealthyOpenCodeHostResponse({ ok: true })).toBe(true);
+    expect(isHealthyOpenCodeHostResponse({ ok: false })).toBe(false);
+  });
+
   it('waits for child close after Windows process-tree cleanup', async () => {
     const { stopChild } = (await loadTestHooks()).__opencodeLivePreflightTestHooks;
     const child = new FakeChild({ pid: 1234 });
diff --git a/test/shared/utils/inboxNoise.test.ts b/test/shared/utils/inboxNoise.test.ts
index 033fd803..f9f08ae4 100644
--- a/test/shared/utils/inboxNoise.test.ts
+++ b/test/shared/utils/inboxNoise.test.ts
@@ -93,6 +93,11 @@ describe('isThoughtProtocolNoise', () => {
     ).toBe(true);
   });
 
+  it('does not hide ordinary one-word acknowledgements', () => {
+    expect(isThoughtProtocolNoise('OK')).toBe(false);
+    expect(isThoughtProtocolNoise('ok.')).toBe(false);
+  });
+
   it('returns false for normal text', () => {
     expect(isThoughtProtocolNoise('Reviewing the PR now.')).toBe(false);
   });
diff --git a/test/shared/utils/teamMemberMcpPolicy.test.ts b/test/shared/utils/teamMemberMcpPolicy.test.ts
new file mode 100644
index 00000000..5e2e6c4f
--- /dev/null
+++ b/test/shared/utils/teamMemberMcpPolicy.test.ts
@@ -0,0 +1,48 @@
+import {
+  buildTeamMemberMcpSettingSources,
+  normalizeTeamMemberMcpPolicy,
+  requiresStrictTeamMemberMcpConfig,
+} from '@shared/utils/teamMemberMcpPolicy';
+import { describe, expect, it } from 'vitest';
+
+describe('teamMemberMcpPolicy', () => {
+  it('normalizes inheritLead to the default unset policy', () => {
+    expect(normalizeTeamMemberMcpPolicy({ mode: 'inheritLead' })).toBeUndefined();
+  });
+
+  it('keeps partial scope overrides while defaulting unspecified scopes to enabled', () => {
+    const policy = normalizeTeamMemberMcpPolicy({
+      mode: 'inheritScopes',
+      scopes: { user: false },
+    });
+
+    expect(policy).toEqual({ mode: 'inheritScopes', scopes: { user: false } });
+    expect(buildTeamMemberMcpSettingSources(policy)).toBe('project,local');
+    expect(requiresStrictTeamMemberMcpConfig(policy)).toBe(false);
+  });
+
+  it('turns explicit no-scope policies into appOnly', () => {
+    for (const mode of ['inheritScopes', 'strictAllowlist'] as const) {
+      const policy = normalizeTeamMemberMcpPolicy({
+        mode,
+        scopes: { user: false, project: false, local: false },
+        serverNames: ['github'],
+      });
+
+      expect(policy).toEqual({ mode: 'appOnly' });
+      expect(requiresStrictTeamMemberMcpConfig(policy)).toBe(true);
+    }
+  });
+
+  it('deduplicates strict allowlist names case-insensitively', () => {
+    expect(
+      normalizeTeamMemberMcpPolicy({
+        mode: 'strictAllowlist',
+        serverNames: ['github', ' GitHub ', 'sentry'],
+      })
+    ).toEqual({
+      mode: 'strictAllowlist',
+      serverNames: ['github', 'sentry'],
+    });
+  });
+});