diff --git a/.github/workflows/prcheck.yml b/.github/workflows/prcheck.yml
index 6f88f91c86..b77d37ad52 100644
--- a/.github/workflows/prcheck.yml
+++ b/.github/workflows/prcheck.yml
@@ -74,6 +74,9 @@ jobs:
       - name: format:check
         run: pnpm run format:check
 
+      - name: Check renderer architecture baseline
+        run: pnpm run architecture:renderer-baseline:check
+
       - name: Configure pnpm workspace for Linux ${{ matrix.arch }}
         run: pnpm run install:sharp
         env:
diff --git a/AGENTS.md b/AGENTS.md
index 391710c8e6..035031b1ee 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -3,7 +3,7 @@
 ## Project Structure & Module Organization
 - `src/main/`: Electron main process; presenters in `presenter/` (Window/Tab/Thread/Mcp/Config/LLMProvider), `eventbus.ts` for app events.
 - `src/preload/`: Secure IPC bridge (contextIsolation on).
-- `src/renderer/`: Vue 3 app. App code in `src/renderer/src` (`components/`, `stores`, `views`, `i18n`, `lib`). Secondary renderers live in `src/renderer/browser`, `src/renderer/settings`, `src/renderer/floating`, and `src/renderer/splash`.
+- `src/renderer/`: Vue 3 app. Main-window composition lives in `src/renderer/src/apps/chat-main`; shared main renderer code remains in `components/`, `stores`, `views`, `i18n`, and `lib`. Secondary renderers live in `src/renderer/browser-overlay`, `src/renderer/settings`, `src/renderer/floating`, and `src/renderer/splash`.
 - `src/shared/`: Shared TS types/utilities.
 - `test/`: Vitest suites (`test/main`, `test/renderer`) with setup files.
 - `scripts/`: Build/signing/runtime installers, commit checks.
diff --git a/docs/architecture/baselines/renderer-application-boundaries-baseline.json b/docs/architecture/baselines/renderer-application-boundaries-baseline.json
new file mode 100644
index 0000000000..3e5cfcd4df
--- /dev/null
+++ b/docs/architecture/baselines/renderer-application-boundaries-baseline.json
@@ -0,0 +1,727 @@
+{
+  "schemaVersion": 1,
+  "apps": [
+    {
+      "id": "chat-main",
+      "html": "src/renderer/index.html",
+      "entry": "src/renderer/src/main.ts",
+      "htmlExists": true,
+      "entryExists": true
+    },
+    {
+      "id": "browser-overlay",
+      "html": "src/renderer/browser-overlay/index.html",
+      "entry": "src/renderer/browser-overlay/main.ts",
+      "htmlExists": true,
+      "entryExists": true
+    },
+    {
+      "id": "floating",
+      "html": "src/renderer/floating/index.html",
+      "entry": "src/renderer/floating/main.ts",
+      "htmlExists": true,
+      "entryExists": true
+    },
+    {
+      "id": "splash",
+      "html": "src/renderer/splash/index.html",
+      "entry": "src/renderer/splash/main.ts",
+      "htmlExists": true,
+      "entryExists": true
+    },
+    {
+      "id": "settings",
+      "html": "src/renderer/settings/index.html",
+      "entry": "src/renderer/settings/main.ts",
+      "htmlExists": true,
+      "entryExists": true
+    }
+  ],
+  "browser": {
+    "legacyDirectoryExists": false,
+    "activeOverlayDirectory": "src/renderer/browser-overlay"
+  },
+  "settingsToChatAppImports": [
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/composables/useDeviceVersion"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/composables/useFontManager"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/lib/iconLoader"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/lib/startupDeferred"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/lib/storeInitializer"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "../src/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/components/settings/ModelCheckDialog.vue"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/ollamaStore"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/providerDeeplinkImport"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/startupWorkloadStore"
+    },
+    {
+      "file": "src/renderer/settings/App.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/AboutUsSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AboutUsSettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/AboutUsSettings.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/AboutUsSettings.vue",
+      "specifier": "@/stores/upgrade"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpDebugDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpDebugDialog.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpDependencyDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpProfileDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpSettings.vue",
+      "specifier": "@/components/agent/AgentTransferDialog.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpSettings.vue",
+      "specifier": "@/components/icons/AcpAgentIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpSettings.vue",
+      "specifier": "@/components/mcp-config/AgentMcpSelector.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AcpTerminalDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/AddCustomModelButton.vue",
+      "specifier": "@/components/settings/ModelConfigDialog.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/AddCustomProviderDialog.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/BedrockProviderSettingsDetail.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/BedrockProviderSettingsDetail.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/components/ModelSelect.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/stores/mcp"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/BuiltinKnowledgeSettings.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/common/AutoCompactionSettingsSection.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/common/DefaultModelSettingsSection.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/common/DefaultModelSettingsSection.vue",
+      "specifier": "@/components/ModelSelect.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/common/DefaultModelSettingsSection.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/common/DefaultModelSettingsSection.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/common/LoggingSettingsSection.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/common/LoggingSettingsSection.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/common/PrivacySettingsSection.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/common/PrivacySettingsSection.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/common/ProxySettingsSection.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/common/SettingToggleRow.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/CommonSettings.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/CronJobsSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/DataSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/DataSettings.vue",
+      "specifier": "@/lib/cloudSyncForm"
+    },
+    {
+      "file": "src/renderer/settings/components/DataSettings.vue",
+      "specifier": "@/lib/utils"
+    },
+    {
+      "file": "src/renderer/settings/components/DataSettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/DataSettings.vue",
+      "specifier": "@/stores/sync"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/components/agent/AgentTransferDialog.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/components/icons/AgentAvatar.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/components/ModelSelect.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/DeepChatAgentsSettings.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/DifyKnowledgeSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/DifyKnowledgeSettings.vue",
+      "specifier": "@/stores/mcp"
+    },
+    {
+      "file": "src/renderer/settings/components/display/FontSettingsSection.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/display/FontSettingsSection.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/DisplaySettings.vue",
+      "specifier": "@/stores/floatingButton"
+    },
+    {
+      "file": "src/renderer/settings/components/DisplaySettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/DisplaySettings.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/DisplaySettings.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/EnvironmentsSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/EnvironmentsSettings.vue",
+      "specifier": "@/stores/ui/project"
+    },
+    {
+      "file": "src/renderer/settings/components/FastGptKnowledgeSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/FastGptKnowledgeSettings.vue",
+      "specifier": "@/stores/mcp"
+    },
+    {
+      "file": "src/renderer/settings/components/GeminiSafetyConfig.vue",
+      "specifier": "@/lib/gemini"
+    },
+    {
+      "file": "src/renderer/settings/components/GitHubCopilotOAuth.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/GitHubCopilotOAuth.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/GrokOAuth.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/KnowledgeFile.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/KnowledgeFileItem.vue",
+      "specifier": "@/lib/utils"
+    },
+    {
+      "file": "src/renderer/settings/components/McpBuiltinMarket.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/components/mcp-config/components/McpServers.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/components/onboarding/GuidedOnboardingOverlay.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/composables/useGuidedOnboardingStep"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/stores/mcp"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/stores/ui/agent"
+    },
+    {
+      "file": "src/renderer/settings/components/McpSettings.vue",
+      "specifier": "@/stores/ui/session"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryConfigInlinePanel.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryConfigInlinePanel.vue",
+      "specifier": "@/components/ModelSelect.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryConfigInlinePanel.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryConfigInlinePanel.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryDiagnosticsPanel.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryInboxBar.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryInlinePanel.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryListView.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/MemoryPersonaPanel.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/components/onboarding/GuidedOnboardingOverlay.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/composables/useGuidedOnboardingStep"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/stores/startupWorkloadStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettings.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/lib/gemini"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/lib/gemini"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ModelProviderSettingsDetail.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/NotificationsHooksSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/NowledgeMemSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/OllamaProviderSettingsDetail.vue",
+      "specifier": "@/components/settings/ModelConfigItem.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/OllamaProviderSettingsDetail.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/OllamaProviderSettingsDetail.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/OllamaProviderSettingsDetail.vue",
+      "specifier": "@/stores/ollamaStore"
+    },
+    {
+      "file": "src/renderer/settings/components/OllamaProviderSettingsDetail.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/OpenAICodexOAuth.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/CustomPromptSettingsSection.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/CustomPromptSettingsSection.vue",
+      "specifier": "@/lib/download"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/CustomPromptSettingsSection.vue",
+      "specifier": "@/stores/prompts"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/PromptEditorSheet.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/PromptEditorSheet.vue",
+      "specifier": "@/lib/utils"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/SystemPromptSettingsSection.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/prompt/SystemPromptSettingsSection.vue",
+      "specifier": "@/stores/systemPromptStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderApiConfig.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderApiConfig.vue",
+      "specifier": "@/stores/modelCheck"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderConfigImportDialog.vue",
+      "specifier": "@/lib/utils"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderDeeplinkImportDialog.vue",
+      "specifier": "@/components/icons/ModelIcon.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderDeeplinkImportDialog.vue",
+      "specifier": "@/stores/theme"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderModelList.vue",
+      "specifier": "@/components/settings/ModelConfigItem.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderModelList.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderModelList.vue",
+      "specifier": "@/stores/uiSettingsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/ProviderRateLimitConfig.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/RagflowKnowledgeSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/RagflowKnowledgeSettings.vue",
+      "specifier": "@/stores/mcp"
+    },
+    {
+      "file": "src/renderer/settings/components/RemoteSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/SettingsOverview.vue",
+      "specifier": "@/stores/modelStore"
+    },
+    {
+      "file": "src/renderer/settings/components/SettingsOverview.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/SettingsOverview.vue",
+      "specifier": "@/stores/sync"
+    },
+    {
+      "file": "src/renderer/settings/components/SettingsOverview.vue",
+      "specifier": "@/stores/ui/agent"
+    },
+    {
+      "file": "src/renderer/settings/components/ShortcutSettings.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/ShortcutSettings.vue",
+      "specifier": "@/stores/shortcutKey"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/InstallFromGitDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/InstallSkillToAgentDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillAgentsTab.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillAgentsTab.vue",
+      "specifier": "@/stores/skillsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillDetailDialog.vue",
+      "specifier": "@/components/markdown/MarkdownRenderer.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillFolderTree.vue",
+      "specifier": "@/stores/skillsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillImportExportTab.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillInstallDialog.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillInstallDialog.vue",
+      "specifier": "@/stores/skillsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsHeader.vue",
+      "specifier": "@/stores/language"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/components/onboarding/GuidedOnboardingOverlay.vue"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/composables/useGuidedOnboardingStep"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/stores/skillsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/stores/ui/agent"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillsSettings.vue",
+      "specifier": "@/stores/ui/session"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillSyncDialog/ExportWizard.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillSyncDialog/ExportWizard.vue",
+      "specifier": "@/stores/skillsStore"
+    },
+    {
+      "file": "src/renderer/settings/components/skills/SkillSyncDialog/ImportWizard.vue",
+      "specifier": "@/components/use-toast"
+    },
+    {
+      "file": "src/renderer/settings/components/VertexProviderSettingsDetail.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/components/VoiceAIProviderConfig.vue",
+      "specifier": "@/stores/providerStore"
+    },
+    {
+      "file": "src/renderer/settings/lib/guidedOnboardingSettings.ts",
+      "specifier": "@/lib/onboardingResume"
+    },
+    {
+      "file": "src/renderer/settings/main.ts",
+      "specifier": "../src/lib/iconLoader"
+    },
+    {
+      "file": "src/renderer/settings/main.ts",
+      "specifier": "@/i18n"
+    }
+  ],
+  "settingsToChatAppImportCount": 170
+}
diff --git a/docs/architecture/chat-display-model-boundary/plan.md b/docs/architecture/chat-display-model-boundary/plan.md
new file mode 100644
index 0000000000..bce0141698
--- /dev/null
+++ b/docs/architecture/chat-display-model-boundary/plan.md
@@ -0,0 +1,34 @@
+# 实施计划
+
+## 1. 建立 feature model
+
+在 `src/renderer/src/features/chat-page/model/displayMessage.ts` 原样迁移
+`messageListItems.ts` 的所有 type 和 pure helper：
+
+- `DisplayMessage` 家族与 `MessageListItem`；
+- assistant block 的 internal tool、filter、presence 策略；
+- compaction 判定。
+
+新模块只保留对 `@shared/types/*` 的 type/value 依赖，因此可以被 feature、component、store 和
+纯 UI helper 使用而不引入运行时分层循环。
+
+## 2. 原子切换消费者
+
+把 renderer source、renderer tests 和 fixtures 的 import 改为
+`@/features/chat-page/model/displayMessage`。特别保留 component 对 feature model 的单向读取：
+组件不会导入 ChatPage、feature composable 或 store。
+
+删除旧的 `components/chat/messageListItems.ts`，不建立过渡 re-export；这样新增引用无法继续落在
+错误的 component 目录。
+
+## 3. 验证
+
+1. 搜索确认旧模块 import 为零。
+2. 执行 formatter；随后执行 i18n、lint 与 renderer type check。
+3. 运行直接覆盖消息 list/window、message block 和 chat feature composable 的 targeted suites；如
+   repository runner 支持，再执行完整 renderer test suite。
+
+## 兼容性与回滚
+
+模块导出名和实现不变，调用方数据格式与运行时行为不变。若出现解析或架构问题，单次提交即可将
+imports 和文件位置恢复，无需迁移数据或 IPC contract。
diff --git a/docs/architecture/chat-display-model-boundary/spec.md b/docs/architecture/chat-display-model-boundary/spec.md
new file mode 100644
index 0000000000..91fb983ab0
--- /dev/null
+++ b/docs/architecture/chat-display-model-boundary/spec.md
@@ -0,0 +1,35 @@
+# Chat 展示模型边界收敛
+
+## 背景
+
+`DisplayMessage`、其 block/usage 契约，以及 assistant block 的可渲染性策略目前定义在
+`src/renderer/src/components/chat/messageListItems.ts`。但记录到展示消息的转换、流式尾部拼装、
+是否显示空 assistant 消息的决策都由 `features/chat-page` 持有。feature 因而反向依赖 UI 目录以
+取得自己的领域展示模型，模型所有权与实际业务所有权不一致。
+
+这些契约同时被 chat list、message block 组件、message store、chat-only composable 与测试使用。
+它们不是可复用通用 UI 的模型，而是 chat-page feature 的输入/输出契约。
+
+## 目标
+
+1. 将 `DisplayMessage` 家族、`MessageListItem` 与 assistant block 可渲染性策略迁入
+   `src/renderer/src/features/chat-page/model/`。
+2. 所有消费者直接引用 feature model，不保留 `components/chat/messageListItems.ts` 作为第二个
+   定义或兼容 re-export。
+3. 保持类型形状、过滤条件与 compaction 判定完全不变；这是纯模块边界调整。
+4. 记录 chat 组件可以依赖该 feature 的**纯 model contract**：model 只依赖 shared types，
+   不依赖 Vue、Pinia、IPC、component 或 composable，且不得反向导入消费者。
+
+## 非目标
+
+- 不调整消息转换、流式缓存、虚拟化或 Markdown 渲染逻辑。
+- 不变更 `MessageList` / `MessageListRow` 的 props、events 或 template。
+- 不迁移通用 renderer foundation，也不改变 IPC/store 数据格式。
+- 不在本切片拆分 `ChatStatusBar` 或继续提取 ChatPage viewport 生命周期。
+
+## 验收标准
+
+1. `components/chat/messageListItems.ts` 不再存在，且 renderer 与测试中没有对其的 import。
+2. 所有原有导出的 type 和 helper 在 feature model 有同名导出，运行行为保持一致。
+3. feature model 不导入 Vue、Pinia、renderer store、renderer API 或 component。
+4. `pnpm run format`、`pnpm run i18n`、`pnpm run lint` 和相关 renderer type/test 校验通过。
diff --git a/docs/architecture/chat-display-model-boundary/tasks.md b/docs/architecture/chat-display-model-boundary/tasks.md
new file mode 100644
index 0000000000..4c91772991
--- /dev/null
+++ b/docs/architecture/chat-display-model-boundary/tasks.md
@@ -0,0 +1,7 @@
+# 任务清单
+
+- [x] 审计展示模型、renderability policy 与全部 source/test 消费者。
+- [x] 在 `features/chat-page/model/` 建立纯展示模型模块。
+- [x] 原子更新 renderer source、tests 与 fixtures 的 import。
+- [x] 删除旧 component-local 模块并确认无残留引用。
+- [x] 执行 format、i18n、lint、typecheck 与 targeted renderer tests。
diff --git a/docs/architecture/chatpage-decomposition/spec.md b/docs/architecture/chatpage-decomposition/spec.md
index b4d9f444e1..59fe8759aa 100644
--- a/docs/architecture/chatpage-decomposition/spec.md
+++ b/docs/architecture/chatpage-decomposition/spec.md
@@ -2,7 +2,8 @@
 
 ## 背景
 
-`src/renderer/src/pages/ChatPage.vue` 已膨胀到 3050 行，单个 `<script setup>` 承载 10+ 个关注点：
+ChatPage 原位于 `src/renderer/src/pages/ChatPage.vue`，膨胀到 3050 行；现已迁至
+`src/renderer/src/features/chat-page/ChatPage.vue`。单个 `<script setup>` 承载 10+ 个关注点：
 会话恢复、消息记录转换、虚拟窗口、测量批处理、手势/滚动、占位符状态机、Plan 快照生命周期、
 会话内搜索、语音输入、发送/排队/steer、消息操作。竞态治理靠散落的手写令牌
 （`sessionRestoreRequestId`、`voiceInputConfigToken`、`attachmentFilterToken`、
@@ -31,7 +32,7 @@
 - `composables/message/useMessageScroll.ts`（339 行）— 全项目零引用，旧 vue-virtual-scroller 实现。
 - `composables/message/types.ts` 中的 `ScrollInfo` 接口 — 仅被上文件引用（`CaptureOptions` 仍在用，保留）。
 
-## 分解目标（8 个关注点 → 7 个 composable）
+## 分解目标（12 个关注点 → 12 个 composable）
 
 | composable | 职责 | 收编的状态/竞态 |
 |---|---|---|
@@ -42,6 +43,11 @@
 | `usePlanFloatLifecycle` | Plan 快照跨会话生命周期 + 延迟清除 | `planSnapshotClearTimers`、3 lifecycleKey |
 | `useChatSearch` | 会话内搜索（包 `lib/chatSearch`） | 搜索 rAF、highlight 调度 |
 | `useComposerSubmit` | 发送/排队/steer/命令/compaction | 统一 gate 后的提交路径、`attachmentFilterToken` |
+| `useVoiceInput` | 语音输入可用性、识别与转写适配 | `voiceInputConfigToken`、模型配置订阅、speech cleanup |
+| `useToolInteraction` | 待处理工具/问题交互聚合与响应 | 子 agent progress 解析、响应单飞锁、当前页面会话刷新 |
+| `useMessageActions` | 消息重试、编辑、删除确认、fork、continue | 删除确认状态、消息操作刷新策略 |
+| `usePendingInputActions` | 已排队输入的编辑、移动、删除、steer | 队列项附件/技能保留、steer 守卫 |
+| `useChatPageEventBridge` | window 事件和 plan 更新订阅 | 显式 `start`/`stop`，避免监听泄漏与重复订阅 |
 
 > 决策记录：原计划独立的 `useAssistantPlaceholder` 并入 `useDisplayMessages`。占位符的
 > renderKey 交接直接写入消息转换缓存读取的 `assistantRenderKeyByMessageId`，显隐判定依赖
@@ -57,8 +63,17 @@
 
 ## 模块位置决策
 
-7 个 composable 放在 `pages/chat-page/` 而非全局 `lib/` / `components/`，是有意的
-feature-local 布局：它们是 `ChatPage.vue` 独占的私有逻辑，强耦合页面 props 与页面级
-store 组合，不面向复用。就近放置能让读者一眼看出归属、避免误当作通用工具被其他页面引用。
+`ChatPage.vue` 与其 12 个 composable 位于 `features/chat-page/`（分别是
+`features/chat-page/ChatPage.vue` 与 `features/chat-page/composables/`），而非全局 `lib/` /
+`components/`。这是有意的 feature-local 布局：它们是 ChatPage 独占的私有逻辑，强耦合页面
+props 与页面级 store 组合，不面向复用。`ChatTabView` 只通过
+`@/features/chat-page/ChatPage.vue` 组合该 feature；页面内部只使用相对的 `./composables/*`
+引用。就近放置能让读者一眼看出归属、避免误当作通用工具被其他页面引用。
+
+同一 feature 的纯展示契约位于 `features/chat-page/model/displayMessage.ts`：它拥有
+`DisplayMessage` 家族、assistant block 的 renderability policy 与 compaction 判定。chat list、
+message block 组件、store 与测试可读取该纯 contract，但不得反向依赖 ChatPage、feature composable
+或 store；该模块只依赖 shared types。
+
 `lint:architecture` guard 通过（未对该布局设硬约束）。若后续有第二个页面需要复用其中某个
 composable，再将其上提到 `lib/` 并补通用化改造。
diff --git a/docs/architecture/chatpage-decomposition/tasks.md b/docs/architecture/chatpage-decomposition/tasks.md
index c84570e376..86e424c71e 100644
--- a/docs/architecture/chatpage-decomposition/tasks.md
+++ b/docs/architecture/chatpage-decomposition/tasks.md
@@ -15,5 +15,14 @@
       中 linger 状态从 `ref` 降级为普通对象导致的响应性回归(完成后浮窗不再驻留 1200ms);
       其余确认零漂移
 - [x] 合并 origin/dev 并复核(Settings/Provider/sidepanel 的 18 个失败为 dev 既有,与本分支无关)
-- [ ] 后续(可选):主文件继续向 ~400 行收缩(语音输入、消息操作 handler、
-      工具交互 respond 等仍在主文件;当前 ~1710 行,较 3050 行已收缩 44%)
+- [x] 将 ChatPage 和 7 个私有 composable 迁至 `features/chat-page/` 并更新 route host、测试与
+      feature 内部导入；只变更模块解析路径，保留模板与运行逻辑
+- [x] 抽取 `useVoiceInput`：自持 `voiceInputConfigToken`、模型配置订阅与 speech cleanup；页面仅
+      装配当前模型选择和模板状态。新增竞态、订阅释放和 speech adapter 单测。
+- [x] 抽取 `useToolInteraction`：收束顶层/子 agent 待处理交互聚合、响应单飞锁和当前页面会话
+      刷新；新增过滤、单飞/动态 session 与失败复位单测。
+- [x] 抽取 `useMessageActions` / `usePendingInputActions`：收束消息重试、删除确认、编辑、fork、
+      continue 与队列项变更/steer；保持原有 session 刷新和交互守卫。
+- [x] 抽取 `useChatPageEventBridge`：通过显式 `start`/`stop` 管理 window 事件与 plan 更新订阅，
+      页面保留 viewport 生命周期顺序。
+- [ ] 后续(可选):主文件继续向 ~400 行收缩（viewport/session 装配另行切片）
diff --git a/docs/architecture/renderer-application-boundaries/plan.md b/docs/architecture/renderer-application-boundaries/plan.md
new file mode 100644
index 0000000000..5631600109
--- /dev/null
+++ b/docs/architecture/renderer-application-boundaries/plan.md
@@ -0,0 +1,84 @@
+# 实施计划
+
+## Phase 0：建立可验证边界与修复启动时序
+
+### 1. 保持 entry 稳定，先记录而不搬迁
+
+保留 [`electron.vite.config.ts`](../../../electron.vite.config.ts) 当前的 HTML entry 和每个 `main.ts`。审计 `browser` 与 `browser-overlay` 的实际消费者、alias 与 TypeScript include 后，再单独删除遗留配置或补齐覆盖范围；不能依据目录名直接重命名或移动 entry。
+
+新分层目录只在需要实际迁移代码时创建到 `src/renderer/src/`：`apps/`、`features/`、`platform/`、`foundation/`。不在 Phase 0 创建空目录或大规模改 import。
+
+### 2. 明确启动 owner，保留并行性
+
+`App.vue` 保留 main app shell 的 listener、图标、UI settings/provider 等工作，但移除其 session prefetch。`ChatTabView.vue` 作为 bootstrap snapshot、shell hydration、route init 和 session 首屏加载的唯一 owner：
+
+1. 请求 bootstrap snapshot。
+2. 成功路径应用 active session/project/agent shell snapshot，再初始化 route。
+3. fallback 路径先依据现有 session state 初始化 route。
+4. 在两条路径都形成确定 shell/route 后，只调用一次 `sessionStore.fetchSessions()`；该请求不阻塞 `isReady`。
+5. agent/project/model/ollama 继续 route init 后并行运行，deferred task 继续等待其 settle。
+
+这让 `fetchSessions()` 读取到 `applyBootstrapShell()` 已写入的 active session，同时保留现有首屏并行加载。
+
+### 3. 测试优先
+
+在改启动流程前新增/调整以下测试：
+
+- `App + ChatTabView` 组合只请求一次 session 首屏数据。
+- bootstrap active session 先写入，再构建 `listLightweight` 的 `prioritizeSessionId`。
+- bootstrap 成功与失败 fallback 均初始化正确 route 并进入 interactive。
+- main runtime listener 与 MCP deeplink 的注册/cleanup 保持完整；settings listener 保持 setup 注册。
+- ChatPage session keyed remount 的最近测量缓存恢复不回退。
+- settings 使用独立 Pinia/启动/readiness 的既有覆盖继续通过。
+
+### 4. 可观察基线与守卫
+
+扩展或新增专用 renderer architecture baseline，至少输出：
+
+- 五个 renderer app 的 entry、HTML entry、别名/TypeScript 覆盖状态；
+- `browser` 与 `browser-overlay` 的实际关系；
+- settings → `src/renderer/src` 的 direct import 清单及数量；
+- 新增跨 app import 的比较基线。
+
+现有 `generate-architecture-baseline.mjs` 主要面向 main-kernel migration；若直接扩展会混淆责任，优先新增 renderer 专用脚本并以 CI/lint hook 明确执行。Phase 0 先确保其可生成可审阅报告；当基线格式稳定后再把“禁止新增”作为 hard failure。
+
+### 5. Phase 1：迁移 chat-main composition root
+
+将现有主窗口 composition implementation 从根目录 `App.vue` 移至 `src/renderer/src/apps/chat-main/ChatMainApp.vue`。根目录 `App.vue` 保留为只渲染 `ChatMainApp` 的兼容 facade；`src/renderer/src/main.ts` 与 `src/renderer/index.html` 不改变，继续作为稳定 entry shim。
+
+本切片保留 `src/renderer/src/router/index.ts` 与 `src/renderer/src/views/ChatTabView.vue` 的路径、路由契约和启动职责：
+
+- `ChatMainApp` 继续承载主窗口的全局 chrome、runtime listener、MCP deeplink、welcome/onboarding 路由协调与 cleanup；
+- `ChatTabView` 继续独占 bootstrap snapshot、shell hydration、route init、首屏 session request 与 deferred hydration；
+- 不移动 ChatPage 或 feature-local 页面，不新增 IPC facade，也不改变 settings 的独立启动。
+
+验证通过根 `App.vue` 的既有 startup suite 覆盖 compatibility facade，同时运行 `ChatTabView` suite 以确认 bootstrap/session owner 未漂移。
+
+### 6. 后续迁移切片
+
+1. 已将 ChatPage 与现有 page-private composable 原样迁至 `features/chat-page/`；后续逐个继续提取
+   页面私有逻辑，并维持 `messageIpc.ts` stream gate 单一 owner。
+2. 为 settings 与 chat 真正共享的实现定义小而稳定的 contract，替换历史直接 import。
+3. 仅在存在真实跨 feature 编排重复时，提取 application service；不为 IPC client 建转发 facade。
+
+## 兼容性与回滚
+
+- 不改变 IPC channel、client 签名或持久化格式。
+- 不更改 Vite HTML entry 路径，因此可直接回滚启动 owner 调整。
+- session 单飞语义保留；改动只确保第一个 fetch 的输入在 snapshot 后已就绪。
+- fallback 仍在 bootstrap 失败时可用，避免把 startup outage 变为白屏。
+
+## 验证命令
+
+实施完成后执行：
+
+```bash
+pnpm exec vitest --config vitest.config.renderer.ts test/renderer/components/App.startup.test.ts
+pnpm run test:renderer
+pnpm run format
+pnpm run i18n
+pnpm run lint
+pnpm run typecheck
+```
+
+若新 architecture baseline 有脚本，也要在上述命令前后执行并审阅输出。
\ No newline at end of file
diff --git a/docs/architecture/renderer-application-boundaries/spec.md b/docs/architecture/renderer-application-boundaries/spec.md
new file mode 100644
index 0000000000..faf9ba8087
--- /dev/null
+++ b/docs/architecture/renderer-application-boundaries/spec.md
@@ -0,0 +1,96 @@
+# Renderer 应用边界与启动治理
+
+## 背景
+
+Renderer 当前由五个独立 HTML/Vite entry 驱动：主窗口、settings、floating、splash、browser-overlay。它们各自创建 Vue 应用、Pinia、i18n 与启动流程，不能假设共享单例或统一生命周期。
+
+主窗口的启动职责分散在 [`App.vue`](../../../src/renderer/src/App.vue) 与 [`ChatTabView.vue`](../../../src/renderer/src/views/ChatTabView.vue)：前者启动 shell 级 store、runtime listener、provider/model/session 预加载；后者取得 bootstrap snapshot、应用 route shell、启动 agent/project/model/ollama 的交互阶段加载。`sessionStore.fetchSessions()` 已以 `sessionFetchPromise` 保证单飞，但它可能在 bootstrap snapshot 写入 active session 前发起，进而以空的 `prioritizeSessionId` 请求首屏数据。
+
+settings 目前直接依赖主窗口实现模块；该现实需要被明确记录并冻结增量，而不是在没有等价契约前机械拆开。IPC transport 已由 [`renderer/api/core.ts`](../../../src/renderer/api/core.ts) 统一封装，35 个 typed `*Client` adapter 已被主窗口和 settings 大量直接使用；再建立按 feature 聚合的 bridge facade 只会增加第二个 transport 边界。
+
+## 目标
+
+1. 为每个 renderer app 明确运行时所有权、入口与独立性约束。
+2. 将新的 renderer 分层目录定位在 `src/renderer/src/` 下，兼容现有 `@` alias 和 TypeScript 覆盖范围。
+3. 为主窗口 bootstrap 定义显式状态与每项启动工作的唯一 owner，修复首屏 session 优先级时序，不降低当前并行加载策略。
+4. 保留 `renderer/api/*Client` 作为唯一 IPC transport adapter；禁止新增 feature-aggregate bridge facade。
+5. 把当前 settings → chat-app 的跨 app 依赖作为可观察基线，并禁止新增依赖。
+6. 为启动、listener 生命周期、route fallback、会话优先级和 keyed ChatPage 恢复补回归测试。
+
+## Phase 1：chat-main composition root
+
+Phase 1 将主窗口的 composition root 实现迁移到 `src/renderer/src/apps/chat-main/ChatMainApp.vue`。稳定 Vite/HTML entry 继续是 `src/renderer/src/main.ts` 与 `src/renderer/index.html`，根目录 `App.vue` 仅作为兼容 facade 组合 `ChatMainApp`。
+
+本切片不移动 `ChatTabView.vue`、route contract 或 feature-local 页面逻辑。`ChatTabView` 继续是 bootstrap snapshot、route init 和首屏 session fetch 的唯一 owner；迁移不得改变 Phase 0 已验证的启动时序。
+
+## 非目标
+
+- 不变更 main/preload IPC contract、权限模型或 `window.deepchat` 暴露面。
+- 不移动五个 HTML entry 或强制五个应用共用同一个 bootstrap composable。
+- 不在 Phase 0 重写既有 `*Client`、Store 或 ChatPage。
+- 不把不同 webContents 的 Pinia、Vue Query/Colada 或 store 实例共享到进程级。
+- 不在本阶段消除既有 settings → chat-app 依赖；仅冻结其增长并规划后续迁移。
+- 不更改 stream event ownership；`messageIpc.ts` 继续作为 stream tombstone/generation gate 的唯一 owner。
+
+## 已确认约束
+
+- `@` 指向 `src/renderer/src`；`apps/`、`features/`、`platform/` 和 `foundation/` 必须放在该目录内，才能使用 `@/apps/*` 等导入并被当前 TypeScript 范围覆盖。
+- 保留五个现有 `main.ts` 作为稳定 Vite/HTML entry shim。不同 app 可以拥有不同 readiness 与 listener 注册时机。
+- settings 的 MCP deeplink listener 必须在 `setup` 阶段注册，不能等待 `onMounted` 或 provider 初始化，否则可能丢失早到 IPC。
+- `modelStore.initialize()` 代表 interactive parallel load，不是 shell-blocking critical load。
+- `sessionFetchPromise` 单飞的输入在首个请求创建时固定；bootstrap shell 写入前不能开始首屏 session fetch。
+- 任何 directory 名称不得使用 renderer `shared`，以免与根目录 `src/shared` 的跨进程 contracts/utilities 混淆；使用 `foundation`。
+
+## Renderer app ownership
+
+| app | 稳定 entry | bootstrap 所有者 | 独立性要求 |
+| --- | --- | --- | --- |
+| chat main | `src/renderer/src/main.ts` | app shell + `ChatTabView` route host | 自己的 Pinia/i18n；shell snapshot 与交互数据分阶段启动 |
+| settings | `src/renderer/settings/main.ts` | settings `App.vue` | listener 早注册；不得依赖 chat app 已启动 |
+| floating | `src/renderer/floating/main.ts` | floating app | 不复用 chat main 的实例或 readiness |
+| splash | `src/renderer/splash/main.ts` | splash app | 仅保持其最小窗口职责 |
+| browser overlay | `src/renderer/browser-overlay/main.ts` | overlay app | 在 Phase 0 审计其与遗留 `browser` 配置的关系后再变更 |
+
+## 主窗口启动状态与 owner
+
+状态为 `uninitialized → snapshot-loading → shell-hydrated → interactive → deferred-settled`；任何失败可转入 `degraded`，仍应产生可用 fallback route。
+
+| 工作 | 唯一 owner | 时机 | 是否阻塞 interactive |
+| --- | --- | --- | --- |
+| app runtime / MCP deeplink listener | main app shell | setup/onMounted 前后保持现有无 race 时序 | 否 |
+| bootstrap snapshot | `ChatTabView` route host | `snapshot-loading` | 是 |
+| shell snapshot application + route initialization | `ChatTabView` route host | `shell-hydrated` | 是 |
+| first session page | `ChatTabView` route host | shell snapshot 后；fallback 也必须选择 route 后 | 否 |
+| UI settings/provider initialization | main app shell | 与 snapshot 并行 | 否 |
+| agents/projects/models/ollama | `ChatTabView` route host | route 初始化后并行 | 否 |
+| icon loading | main app shell | app mount | 否 |
+| deferred hydration | `ChatTabView` route host | interactive 后 | 否 |
+
+## 依赖规则
+
+目标目录（逐步迁移，不要求 Phase 0 一次完成）：
+
+```text
+src/renderer/src/
+  apps/          # 每个 renderer app 的 composition root / entry-adjacent assembly
+  features/      # feature-local views, composables, state composition
+  platform/      # browser/runtime infrastructure, app lifecycle helpers
+  foundation/    # renderer-only pure utilities、types、tokens
+```
+
+- `apps` 可以组合 `features`、`platform`、`foundation` 与 `api`。
+- `features` 可以依赖 `api`、跨进程 contracts、`platform` 与 `foundation`，不得 import 另一个 app 的 composition root。
+- `platform` 不得 import feature UI；`foundation` 不得 import Vue、Pinia、IPC 或 feature/app 模块。
+- `renderer/api/*Client` 是唯一 transport adapter；不得新增 `platform/bridge/*` 或按业务领域转发所有 client 的 facade。
+- 每个 app 创建自己的 Pinia/plugin 实例。可共享 store 定义、types 与 pure utilities，不可共享运行中的 store 实例。
+- settings → chat-app 的既有直接 import 是批准的历史基线；Phase 0 后不得新增，后续仅能减少或用明确 contract 替换。
+
+## 验收标准
+
+1. SDD 明确记录上述 ownership、状态、目录与依赖约束，且没有 `[NEEDS CLARIFICATION]`。
+2. 主窗口 session 首屏请求只由 route host 在 bootstrap shell 写入后触发；完整 app + route host 组合中只产生一次首屏 session request。
+3. bootstrap 成功和失败 fallback 都能得到确定 route，且不会阻塞 interactive readiness。
+4. runtime/deeplink listener 的注册与 cleanup 有测试；settings 保持 setup 阶段早注册。
+5. ChatPage keyed remount 仍恢复最近测量缓存。
+6. architecture baseline 记录五个 app、`browser`/`browser-overlay` 状态，以及 settings → chat-app import 数；增量校验会拒绝新增该跨 app import。
+7. 相关测试、format、i18n、lint 与类型检查通过。
diff --git a/docs/architecture/renderer-application-boundaries/tasks.md b/docs/architecture/renderer-application-boundaries/tasks.md
new file mode 100644
index 0000000000..fd1e4e90c8
--- /dev/null
+++ b/docs/architecture/renderer-application-boundaries/tasks.md
@@ -0,0 +1,32 @@
+# 任务清单
+
+## Phase 0
+
+- [x] 记录多窗口 app ownership、目录约束、IPC transport 原则和启动状态机。
+- [x] 审计 `browser` 与 `browser-overlay`：确认前者为无消费者的遗留 SVG 目录，后者为 active overlay renderer。
+- [x] 为 browser-overlay 补齐 TypeScript 覆盖范围，移除遗留 `@browser` alias、注释和目录；更新项目结构说明。
+- [x] 调整主窗口启动 owner：shell 不再发起首屏 session fetch，route host 在 snapshot/fallback route 确定后唯一发起。
+- [x] 补组合启动和 session priority 时序测试。
+- [x] 保持 runtime/deeplink listener 的注册与 cleanup、route fallback、ChatPage keyed remount、settings independent startup 回归测试；它们包含在 targeted suite 中。
+- [x] 建立 renderer architecture baseline，记录 entry 与 settings → chat-app 跨 app import 基线，并提供 `--check` 防止未经审阅的增量。
+- [x] 执行 targeted tests、format、i18n、lint、typecheck 和完整 renderer suite（167 files、1302 tests）。
+
+## Phase 1
+
+- [x] 将 main app composition 实现移至 `src/renderer/src/apps/chat-main/ChatMainApp.vue`，保留根 `App.vue` compatibility facade 与稳定 entry shim。
+- [x] 保留 `ChatTabView`、router 与 session/bootstrap owner 不变，并以现有 startup suites 保护时序。
+- [x] 执行 targeted startup suites、完整 renderer suite（167 files、1302 tests）、format、i18n、lint、typecheck 与 renderer baseline check。
+
+## 后续切片
+
+- [x] 将 ChatPage 与既有 7 个 page-private composable 迁入 `features/chat-page/`，更新 route host、
+      测试和 feature 内部路径；`messageIpc.ts` 的 stream gate 所有权保持不变。
+- [x] 抽取 page-private `useVoiceInput`，保留当前模型选择在 ChatPage 装配层，收束语音输入配置
+      epoch、模型配置订阅和底层 speech cleanup。
+- [x] 抽取 page-private `useToolInteraction`，收束待处理交互派生、响应单飞与刷新，不变更
+      `messageIpc.ts` 的 stream gate 所有权。
+- [x] 抽取 ChatPage 私有消息/队列动作与事件桥接 composable，保持模板事件契约和页面 viewport
+      生命周期顺序不变。
+- [ ] 后续：逐个迁移剩余 feature-local ChatPage 逻辑，并维持 `messageIpc.ts` 的 stream gate 单一所有权。
+- [ ] 后续：以明确 shared contract 替换 settings → chat-app 历史依赖。
+- [ ] 后续：当真实编排重复出现时，提取 application service；不创建 IPC facade。
diff --git a/docs/architecture/renderer-performance-diagnostics/plan.md b/docs/architecture/renderer-performance-diagnostics/plan.md
new file mode 100644
index 0000000000..b124bdc730
--- /dev/null
+++ b/docs/architecture/renderer-performance-diagnostics/plan.md
@@ -0,0 +1,88 @@
+# 实施计划
+
+## 架构与数据流
+
+```text
+ChatMainApp              ChatTabView              ChatPage
+shell-mounted            bootstrap / route        session viewport marks
+app-stores-ready          interactive / deferred          │
+      └──────────────────────────┬─────────────────────────┘
+                                 ▼
+                    renderer performance reporter
+                 (allowlist + elapsed + terminal dedupe)
+                                 ▼ typed route
+                       main performance log service
+                  (schema parse + loggingEnabled gate)
+                                 ▼
+       <userData>/logs/renderer-performance.ndjson (NDJSON)
+```
+
+### 1. 共享 contract 与 typed client
+
+在 `shared/contracts/routes/performance.routes.ts` 定义 renderer 性能记录输入/输出 schema，并注册到 routes union。输入使用 allowlisted enums 与严格 object，禁止自由文本、错误 payload 和任意 metadata。`renderer/api/PerformanceClient.ts` 仅调用该 typed route。
+
+这不是 feature-aggregate bridge：它是现有 `renderer/api/*Client` transport 模式下的单一诊断端口。
+
+### 2. 主进程持久化 owner
+
+新增 app-local `RendererPerformanceLogService`：
+
+- 用 SettingsStore 读取 `loggingEnabled`；关闭时 no-op；
+- 通过 `app.getPath('userData')` 写入既有 `logs/`；
+- 将每条 schema 已校验记录转成 server timestamp 后 append 到 `renderer-performance.ndjson`；
+- Promise 队列序列化追加，防止并发 IPC 交错；
+- 限制单文件行的 JSON 字段，不记录用户标识或应用状态原文；
+- 捕获 mkdir/append 失败，并避免将失败扩散到 renderer。
+
+`createAppRoutes` 注入一个窄的 `recordRendererPerformance` port；route 解析 input 后 await 该 port，再返回 `{ accepted: boolean }`。记录失败统一返回 false，不使性能诊断影响业务 flow。
+
+### 3. Renderer platform reporter
+
+新增 `platform/performance/rendererPerformance.ts`，而不是将跨 app runtime 逻辑放在 feature：
+
+- renderer 内以 monotonic `performance.now()` 建立 phase elapsed，API 缺失时安全 no-op；
+- `recordStartupPhase` 由 app/route shell 使用，允许固定 stage 与 fallback；
+- `observeStartupWorkload` 消费当前 store state，terminal `(runId, taskId)` 最多记录一次，并记录已有时间戳计算的耗时；
+- `recordChatSessionPhase` 接收既有 allowlisted ChatPage phase 和 epoch，绝不接收 session ID；
+- 所有 async submit 都 catch，开发/已启用日志下仅输出固定安全前缀的 console warning；不持有 Vue/Pinia，也不创建 listener。
+
+reporter 以实例方式在 `ChatMainApp` 创建，避免跨 renderer 共享状态。它只在已加载 settings 且 `loggingEnabled` 开启时提交；Performance Timeline marks 保持始终低成本、独立可用。
+
+### 4. 接入与生命周期
+
+- `ChatMainApp` 创建 reporter，mark `shell-mounted`，等待 `initAppStores()` 后启用 recorder、mark `app-stores-ready`，并观察 main startup tasks；unmount 停止 observer / 清空引用。
+- `ChatTabView` 接收可选 startup reporter 或使用 app-scoped injection，记录 bootstrap success/fallback、route ready、interactive、deferred settled。`startupRunId` 只来自 bootstrap response。
+- ChatPage 保留 feature-private `performance.mark`，改为将 safe phase/epoch 交给 injected/feature adapter，不传递 `sessionId` 到持久化链路。
+
+若 injection 会扩大测试装配复杂度，则使用 platform scoped registration with explicit cleanup in app shell；不得变为 Pinia singleton 或跨 renderer 共享实例。
+
+### 5. 测试策略
+
+- `RendererPerformanceLogService` main unit tests：关闭不写、有效记录写一行并带 recordedAt、顺序稳定、写失败不 reject。
+- route tests：input validation、accepted result、窄 port 调用。
+- renderer platform unit tests：阶段 elapsed、日志关闭/缺 API、workload terminal dedupe、无敏感输入 API。
+- `ChatTabView` startup suite：bootstrap/fallback/interactive/deferred phase 关系。
+- ChatPage tests：现有 marks 保留，新增 reporter 不接收 session ID。
+
+## 风险与缓解
+
+| 风险 | 缓解 |
+| --- | --- |
+| 诊断本身拖慢启动 | renderer 不等待 submit；main 写入队列独立；失败吞掉 |
+| 记录包含敏感信息 | strict schema + 不暴露自由 metadata + main 二次 parse |
+| 多窗口互相污染状态 | reporter 实例由各 app shell 自己创建，run id 随记录传递 |
+| workload event 重放导致重复记录 | terminal key 使用 runId/task id/updatedAt |
+| 文件并发写损坏 NDJSON | main service 单队列 append |
+
+## 验证命令
+
+```bash
+pnpm exec vitest --config vitest.config.renderer.ts test/renderer/lib/rendererPerformance.test.ts test/renderer/components/ChatTabView.test.ts
+pnpm exec vitest --config vitest.config.ts test/main/app/rendererPerformanceLogService.test.ts test/main/app/routes.test.ts
+pnpm run format
+pnpm run i18n
+pnpm run lint
+pnpm run typecheck
+pnpm run test:renderer
+pnpm run architecture:renderer-baseline:check
+```
diff --git a/docs/architecture/renderer-performance-diagnostics/spec.md b/docs/architecture/renderer-performance-diagnostics/spec.md
new file mode 100644
index 0000000000..003fac4f3f
--- /dev/null
+++ b/docs/architecture/renderer-performance-diagnostics/spec.md
@@ -0,0 +1,46 @@
+# Renderer 性能诊断链路
+
+## 背景
+
+主窗口已定义 `uninitialized → snapshot-loading → shell-hydrated → interactive → deferred-settled` 的启动 owner，也有 ChatPage 的 `performance.mark`。但这些信号没有同一个可查询、可保留、与 `startupRunId` 关联的记录链：控制台日志无法可靠比较耗时，主进程 startup workload 的任务耗时也不会汇入同一诊断文件。
+
+排查冷启动、fallback、会话恢复和后台任务变慢时，需要一个本地、低开销、可审阅的记录文件，而不是引入遥测上传或改写现有启动并行策略。
+
+## 目标
+
+1. 对 chat main 建立从 renderer shell 到 startup workload、session 首屏恢复的结构化性能记录链。
+2. 在用户已启用本地日志时，将经过 schema 校验和隐私裁剪的 NDJSON 记录写入 userData 的 logs 目录；文件可与现有 `main.log` 一同通过日志目录入口获取。
+3. 将记录关联到 `startupRunId`、阶段、相对耗时、fallback 结果和 workload task 完成状态，不记录会话内容、session ID、项目路径、模型/Provider 配置、错误原文或密钥。
+4. 保持 owner：`ChatMainApp` 负责 app shell 阶段，`ChatTabView` 负责 bootstrap/route/interactive/deferred 阶段，ChatPage feature 只负责其 session viewport 阶段；主进程只负责持久化已校验的诊断记录。
+5. 诊断路径失败、日志关闭、写入失败或性能 API 不可用时均不能阻塞启动、会话恢复或用户交互。
+
+## 非目标
+
+- 不上传遥测数据，不接入第三方监控服务，不新增网络请求。
+- 不新增 renderer 之间共享 store、bridge facade 或修改 preload 暴露面。
+- 不更改 IPC 权限模型、聊天 stream gate、session single-flight 或 startup workload 调度策略。
+- 不新增启动性能面板、toast 或用户可见文案；使用既有 `loggingEnabled` 本地日志开关和日志目录入口。
+- 不将完整异常对象、性能 API 的任意 detail、用户内容或持久化标识写入诊断文件。
+
+## 数据与隐私约束
+
+每行必须是独立 JSON 对象（NDJSON），由主进程附加 `recordedAt`，并且只允许以下字段：
+
+- schema 版本、固定 renderer source、scope、受控 phase、outcome；
+- 不超过 24 小时的 `elapsedMs`；
+- 受限长度的 `startupRunId`；
+- 可选 fallback flag、session epoch、受控 workload task id/state。
+
+主进程必须再次解析输入 schema，只有 `loggingEnabled` 为真时才入队写入 `logs/renderer-performance.ndjson`。单次写入故障仅输出安全的诊断告警，不能使 route reject 或影响 renderer。记录文件沿用日志目录，不包含用户数据；写入序列化以保持行边界。
+
+## 验收标准
+
+1. chat main 的每次启动可记录 `shell-mounted`、`app-stores-ready`、`bootstrap-ready` 或 `bootstrap-fallback`、`route-ready`、`interactive`、`deferred-settled`；成功 bootstrap 使用其 `startupRunId`。
+2. startup workload 的主窗口 task 在 terminal state 时最多记录一次，包含 task id/state 和由已有时间戳计算的耗时；不记录 task payload。
+3. ChatPage 的 session phase 保持现有 Performance Timeline 可见性，并以无 session ID 的 session epoch 关联可选结构化记录。
+4. 记录 route、main logging service、renderer reporter 与调用点均有针对性测试：schema 拒绝越界/未知字段，日志关闭不写文件，写入顺序稳定，失败不会向 renderer 冒泡，阶段/去重/elapsed 正确。
+5. 相关 SDD 计划和任务记录完整，无 `[NEEDS CLARIFICATION]`；format、i18n、lint、typecheck、targeted 与完整 renderer tests、architecture baseline check 均通过。
+
+## 兼容性与回滚
+
+记录是新的可选本地日志文件，不改变已有设置格式、用户数据 schema 或 IPC channel。关闭本地日志后不再追加记录。回滚时删除新的 route/client/reporter；已有 startup 行为与 ChatPage `performance.mark` 仍可独立工作。
diff --git a/docs/architecture/renderer-performance-diagnostics/tasks.md b/docs/architecture/renderer-performance-diagnostics/tasks.md
new file mode 100644
index 0000000000..c16bcbf085
--- /dev/null
+++ b/docs/architecture/renderer-performance-diagnostics/tasks.md
@@ -0,0 +1,11 @@
+# 任务清单
+
+- [x] 定义共享 renderer performance record schema、route 和 renderer typed client。
+- [x] 实现主进程 `RendererPerformanceLogService`，以本地日志开关、严格数据与串行 NDJSON 追加保护记录。
+- [x] 将性能记录 route 装配到 app composition，保持 failure isolation。
+- [x] 实现 renderer platform reporter：phase elapsed、workload terminal dedupe、chat session safe phase，并提供可释放生命周期。
+- [x] 在 `ChatMainApp`、`ChatTabView` 与 ChatPage 按已有 owner 接入，不改变启动并发/route/session ownership。
+- [x] 补 main、renderer platform、startup integration 测试与性能 record 隐私回归。
+- [x] 已完成已启动的 targeted validation；用户后续明确要求不再在本地运行 lint、test 或 typecheck，因此未运行完整 renderer suite 与 architecture baseline check。
+- [x] 独立 review 变更并修复发现的问题（workload terminal 去重改为 `(runId, taskId)`）。
+- [x] 提交、推送，更新现有 PR #1994 描述并转为 ready for review。
diff --git a/docs/guides/getting-started.md b/docs/guides/getting-started.md
index 4343e9904a..4220f285d3 100644
--- a/docs/guides/getting-started.md
+++ b/docs/guides/getting-started.md
@@ -75,7 +75,7 @@ src/main/
 | MCP | `src/main/mcp/` |
 | Memory | `src/main/memory/`、`src/main/agent/deepchat/memory/` |
 | import/export | `src/main/app/startupMigrations/`、`src/main/exporter/` |
-| Renderer chat UI | `src/renderer/src/pages/ChatPage.vue`、`components/message/` |
+| Renderer chat UI | `src/renderer/src/features/chat-page/ChatPage.vue`、`components/message/` |
 
 ## 质量门
 
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
index dfca39839f..40fe686e1c 100644
--- a/electron.vite.config.ts
+++ b/electron.vite.config.ts
@@ -120,7 +120,6 @@ export default defineConfig({
         ? [
             vueDevTools({
               appendTo: 'src/renderer/src/main.ts'
-              // appendTo:'src/renderer/browser/main.ts'
             })
           ]
         : [])
diff --git a/package.json b/package.json
index c4c0e19c3d..c307709a5c 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,8 @@
     "icons:generate": "node scripts/generate-icon-collections.mjs",
     "icons:check": "node scripts/generate-icon-collections.mjs --check",
     "architecture:baseline": "node scripts/generate-architecture-baseline.mjs",
+    "architecture:renderer-baseline": "node scripts/generate-renderer-architecture-baseline.mjs",
+    "architecture:renderer-baseline:check": "node scripts/generate-renderer-architecture-baseline.mjs --check",
     "typecheck:node": "tsgo --noEmit -p tsconfig.node.json --composite false",
     "typecheck:web": "vue-tsgo --project tsconfig.app.tsgo.json",
     "typecheck": "pnpm run typecheck:node && pnpm run typecheck:web",
diff --git a/scripts/agent-cleanup-guard.mjs b/scripts/agent-cleanup-guard.mjs
index 1626c76104..e8666e82ae 100644
--- a/scripts/agent-cleanup-guard.mjs
+++ b/scripts/agent-cleanup-guard.mjs
@@ -29,7 +29,7 @@ const PRIMARY_MAIN_GUARD_PATHS = [
 ]
 
 const RENDERER_CHAT_GUARD_PATHS = [
-  path.join(ROOT, 'src/renderer/src/pages/ChatPage.vue'),
+  path.join(ROOT, 'src/renderer/src/features/chat-page/ChatPage.vue'),
   path.join(ROOT, 'src/renderer/src/pages/NewThreadPage.vue'),
   path.join(ROOT, 'src/renderer/src/stores/ui'),
   path.join(ROOT, 'src/renderer/src/components/chat'),
@@ -163,7 +163,7 @@ async function findViolations() {
     path.join(ROOT, 'src/main/mcp/toolManager.ts'),
     path.join(ROOT, 'src/main/sync/index.ts'),
     path.join(ROOT, 'src/main/provider/providers'),
-    path.join(ROOT, 'src/renderer/src/pages/ChatPage.vue'),
+    path.join(ROOT, 'src/renderer/src/features/chat-page/ChatPage.vue'),
     path.join(ROOT, 'src/renderer/src/pages/NewThreadPage.vue'),
     path.join(ROOT, 'src/renderer/src/stores/ui'),
     path.join(ROOT, 'src/renderer/src/components/chat'),
diff --git a/scripts/generate-architecture-baseline.mjs b/scripts/generate-architecture-baseline.mjs
index ec66e5d901..92b0e05e21 100644
--- a/scripts/generate-architecture-baseline.mjs
+++ b/scripts/generate-architecture-baseline.mjs
@@ -225,7 +225,7 @@ const MIGRATED_RAW_CHANNEL_GUARD_PATHS = [
   path.join(ROOT, 'src/renderer/src/stores/ui/agent.ts'),
   path.join(ROOT, 'src/renderer/src/stores/ui/pendingInput.ts'),
   path.join(ROOT, 'src/renderer/src/stores/ui/pageRouter.ts'),
-  path.join(ROOT, 'src/renderer/src/pages/ChatPage.vue'),
+  path.join(ROOT, 'src/renderer/src/features/chat-page/ChatPage.vue'),
   path.join(ROOT, 'src/renderer/src/pages/NewThreadPage.vue'),
   path.join(ROOT, 'src/main/desktop/window'),
   path.join(ROOT, 'src/main/config'),
diff --git a/scripts/generate-icon-collections.mjs b/scripts/generate-icon-collections.mjs
index 1b1db8a462..36b269334f 100644
--- a/scripts/generate-icon-collections.mjs
+++ b/scripts/generate-icon-collections.mjs
@@ -33,7 +33,6 @@ const rendererRoots = [
   'src/shared',
   'src/renderer/src',
   'src/renderer/settings',
-  'src/renderer/browser',
   'src/renderer/floating',
   'src/renderer/splash'
 ].map((sourcePath) => path.join(repoRoot, sourcePath))
diff --git a/scripts/generate-renderer-architecture-baseline.mjs b/scripts/generate-renderer-architecture-baseline.mjs
new file mode 100644
index 0000000000..28f4a0385a
--- /dev/null
+++ b/scripts/generate-renderer-architecture-baseline.mjs
@@ -0,0 +1,132 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import process from 'node:process'
+
+const ROOT = process.cwd()
+const checkMode = process.argv.includes('--check')
+const REPORT_PATH = path.join(
+  ROOT,
+  'docs/architecture/baselines/renderer-application-boundaries-baseline.json'
+)
+
+const apps = [
+  {
+    id: 'chat-main',
+    html: 'src/renderer/index.html',
+    entry: 'src/renderer/src/main.ts'
+  },
+  {
+    id: 'browser-overlay',
+    html: 'src/renderer/browser-overlay/index.html',
+    entry: 'src/renderer/browser-overlay/main.ts'
+  },
+  {
+    id: 'floating',
+    html: 'src/renderer/floating/index.html',
+    entry: 'src/renderer/floating/main.ts'
+  },
+  {
+    id: 'splash',
+    html: 'src/renderer/splash/index.html',
+    entry: 'src/renderer/splash/main.ts'
+  },
+  {
+    id: 'settings',
+    html: 'src/renderer/settings/index.html',
+    entry: 'src/renderer/settings/main.ts'
+  }
+]
+
+const exists = async (relativePath) => {
+  try {
+    await fs.access(path.join(ROOT, relativePath))
+    return true
+  } catch {
+    return false
+  }
+}
+
+const walk = async (relativePath) => {
+  const directory = path.join(ROOT, relativePath)
+  const entries = await fs.readdir(directory, { withFileTypes: true })
+  const files = await Promise.all(
+    entries.map(async (entry) => {
+      const childPath = path.join(relativePath, entry.name)
+      if (entry.isDirectory()) return walk(childPath)
+      return [childPath]
+    })
+  )
+  return files.flat()
+}
+
+const isSourceFile = (file) => /\.(?:ts|tsx|vue|js|jsx)$/.test(file)
+const importPattern = /(?:from\s+|import\s*\()(['"])([^'"]+)\1/g
+
+const collectSettingsToChatImports = async () => {
+  const files = (await walk('src/renderer/settings')).filter(isSourceFile)
+  const imports = []
+
+  for (const file of files) {
+    const source = await fs.readFile(path.join(ROOT, file), 'utf8')
+    for (const match of source.matchAll(importPattern)) {
+      const specifier = match[2]
+      if (specifier.startsWith('@/') || specifier.startsWith('../src/')) {
+        imports.push({ file, specifier })
+      }
+    }
+  }
+
+  return imports.sort((left, right) =>
+    `${left.file}:${left.specifier}`.localeCompare(`${right.file}:${right.specifier}`)
+  )
+}
+
+const main = async () => {
+  const [settingsToChatImports, legacyBrowserDirectoryExists] = await Promise.all([
+    collectSettingsToChatImports(),
+    exists('src/renderer/browser')
+  ])
+  const appStatus = await Promise.all(
+    apps.map(async (app) => ({
+      ...app,
+      htmlExists: await exists(app.html),
+      entryExists: await exists(app.entry)
+    }))
+  )
+
+  const report = {
+    schemaVersion: 1,
+    apps: appStatus,
+    browser: {
+      legacyDirectoryExists: legacyBrowserDirectoryExists,
+      activeOverlayDirectory: 'src/renderer/browser-overlay'
+    },
+    settingsToChatAppImports: settingsToChatImports,
+    settingsToChatAppImportCount: settingsToChatImports.length
+  }
+
+  const serializedReport = `${JSON.stringify(report, null, 2)}\n`
+
+  if (checkMode) {
+    const existingReport = await fs.readFile(REPORT_PATH, 'utf8').catch(() => null)
+    if (existingReport !== serializedReport) {
+      throw new Error(
+        `renderer architecture baseline changed: ${path.relative(ROOT, REPORT_PATH)}. ` +
+          'Run pnpm run architecture:renderer-baseline and review the diff.'
+      )
+    }
+    console.info(
+      `renderer architecture baseline is current (settings→chat imports: ${settingsToChatImports.length})`
+    )
+    return
+  }
+
+  await fs.mkdir(path.dirname(REPORT_PATH), { recursive: true })
+  await fs.writeFile(REPORT_PATH, serializedReport)
+  console.info(
+    `renderer architecture baseline written: ${path.relative(ROOT, REPORT_PATH)} ` +
+      `(settings→chat imports: ${settingsToChatImports.length})`
+  )
+}
+
+await main()
diff --git a/src/main/app/composition.ts b/src/main/app/composition.ts
index 747bfe152a..cbd79f7690 100644
--- a/src/main/app/composition.ts
+++ b/src/main/app/composition.ts
@@ -56,6 +56,7 @@ import { KnowledgeService } from '../knowledge'
 import { WorkspaceService } from '../workspace'
 import { FileWatcherService } from '../platform/fileWatcher'
 import { LoggingService } from './logging'
+import { RendererPerformanceLogService } from './rendererPerformanceLogService'
 import type { PrivacySettings } from './privacy'
 import type { ProxySettings } from '@/platform/proxySettings'
 import type { McpSettings } from '@/mcp/settings'
@@ -519,6 +520,9 @@ export async function createMainProcessControl(dependencies: {
     },
     publishDeepchatEvent
   )
+  const rendererPerformanceLogService = new RendererPerformanceLogService(
+    dependencies.settingsStore
+  )
   projectService = new ProjectService(
     projectDatabase,
     sessionData.database,
@@ -1748,6 +1752,9 @@ export async function createMainProcessControl(dependencies: {
     })
     const appRoutes = createAppRoutes({
       logging: loggingService,
+      rendererPerformance: rendererPerformanceLogService,
+      isMainWindowContext: (context) =>
+        windowPresenter.mainWindow?.webContents.id === context.webContentsId,
       agentSettings,
       projects: projectService,
       databaseSecurity: databaseSecurityService,
diff --git a/src/main/app/rendererPerformanceLogService.ts b/src/main/app/rendererPerformanceLogService.ts
new file mode 100644
index 0000000000..3c4d793243
--- /dev/null
+++ b/src/main/app/rendererPerformanceLogService.ts
@@ -0,0 +1,95 @@
+import { app } from 'electron'
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import type { SettingsStore } from '@/config/settingsStore'
+import {
+  RendererPerformanceRecordSchema,
+  type RendererPerformanceRecord
+} from '@shared/contracts/routes'
+
+type PersistedRendererPerformanceRecord = RendererPerformanceRecord & {
+  recordedAt: number
+}
+
+type RendererPerformanceLogFs = Pick<
+  typeof fs,
+  'appendFile' | 'mkdir' | 'rename' | 'stat' | 'unlink'
+>
+
+const MAX_RENDERER_PERFORMANCE_LOG_BYTES = 10 * 1024 * 1024
+
+/**
+ * App-local persistence for renderer timing diagnostics. Input is parsed again at this boundary so
+ * renderer code can never turn the local performance file into a general-purpose log sink.
+ */
+export class RendererPerformanceLogService {
+  private writeQueue: Promise<boolean> = Promise.resolve(true)
+
+  constructor(
+    private readonly settings: Pick<SettingsStore, 'get'>,
+    private readonly getUserDataPath: () => string = () => app.getPath('userData'),
+    private readonly fsImpl: RendererPerformanceLogFs = fs,
+    private readonly now: () => number = Date.now,
+    private readonly onWriteError: () => void = () => {
+      console.warn('[RendererPerformance] Failed to persist diagnostic record')
+    }
+  ) {}
+
+  async record(rawRecord: unknown): Promise<boolean> {
+    if (!this.settings.get<boolean>('loggingEnabled')) {
+      return false
+    }
+
+    const parsed = RendererPerformanceRecordSchema.safeParse(rawRecord)
+    if (!parsed.success) {
+      return false
+    }
+
+    const record: PersistedRendererPerformanceRecord = {
+      ...parsed.data,
+      recordedAt: this.now()
+    }
+    const line = `${JSON.stringify(record)}\n`
+    const logDirectory = path.join(this.getUserDataPath(), 'logs')
+    const logPath = path.join(logDirectory, 'renderer-performance.ndjson')
+
+    const write = async (): Promise<boolean> => {
+      try {
+        await this.fsImpl.mkdir(logDirectory, { recursive: true })
+        await this.rotateIfNeeded(logPath, Buffer.byteLength(line, 'utf-8'))
+        await this.fsImpl.appendFile(logPath, line, 'utf-8')
+        return true
+      } catch {
+        this.onWriteError()
+        return false
+      }
+    }
+
+    this.writeQueue = this.writeQueue.then(write, write)
+    return await this.writeQueue
+  }
+
+  private async rotateIfNeeded(logPath: string, incomingBytes: number): Promise<void> {
+    try {
+      const { size } = await this.fsImpl.stat(logPath)
+      if (size + incomingBytes <= MAX_RENDERER_PERFORMANCE_LOG_BYTES) {
+        return
+      }
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code === 'ENOENT') {
+        return
+      }
+      throw error
+    }
+
+    const previousLogPath = `${logPath}.old`
+    try {
+      await this.fsImpl.unlink(previousLogPath)
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+        throw error
+      }
+    }
+    await this.fsImpl.rename(logPath, previousLogPath)
+  }
+}
diff --git a/src/main/app/routes.ts b/src/main/app/routes.ts
index 3ab7d27582..f95a351b7c 100644
--- a/src/main/app/routes.ts
+++ b/src/main/app/routes.ts
@@ -9,6 +9,7 @@ import {
   databaseSecurityGetStatusRoute,
   databaseSecurityRepairSchemaRoute,
   debugCreateMockChatSessionRoute,
+  performanceRecordRendererRoute,
   startupGetBootstrapRoute,
   type DatabaseSecurityStatus,
   type SettingsActivityInput
@@ -16,16 +17,19 @@ import {
 import type { DatabaseSecurityService } from './databaseSecurity'
 import type { StartupWorkloadCoordinator } from '@/app/startupWorkloadCoordinator'
 import type { SessionQuery } from '@/session/query'
-import { createRouteMap, type DeepchatRouteMap } from '@/routes/routeRegistry'
+import { createRouteMap, type DeepchatRouteMap, type RouteContext } from '@/routes/routeRegistry'
 import {
   createDebugMockChatSession,
   type DebugMockChatDatabase
 } from './debug/createMockChatSession'
 import type { ProjectService } from '@/project'
 import type { LoggingService } from './logging'
+import type { RendererPerformanceLogService } from './rendererPerformanceLogService'
 
 export function createAppRoutes(deps: {
   logging: Pick<LoggingService, 'openFolder'>
+  rendererPerformance: Pick<RendererPerformanceLogService, 'record'>
+  isMainWindowContext(context: RouteContext): boolean
   agentSettings: Pick<AgentSettingsPort, 'listAgents' | 'getAcpEnabled'>
   projects: Pick<ProjectService, 'getDefaultProjectPath'>
   databaseSecurity: Pick<DatabaseSecurityService, 'getStatus'>
@@ -124,6 +128,17 @@ export function createAppRoutes(deps: {
         })
       }
     ],
+    [
+      performanceRecordRendererRoute.name,
+      async (rawInput, context) => {
+        const record = performanceRecordRendererRoute.input.parse(rawInput)
+        if (!deps.isMainWindowContext(context)) {
+          return performanceRecordRendererRoute.output.parse({ accepted: false })
+        }
+        const accepted = await deps.rendererPerformance.record(record)
+        return performanceRecordRendererRoute.output.parse({ accepted })
+      }
+    ],
     [
       startupGetBootstrapRoute.name,
       async (rawInput, context) => {
diff --git a/src/renderer/api/PerformanceClient.ts b/src/renderer/api/PerformanceClient.ts
new file mode 100644
index 0000000000..09db505e03
--- /dev/null
+++ b/src/renderer/api/PerformanceClient.ts
@@ -0,0 +1,17 @@
+import type { DeepchatBridge } from '@shared/contracts/bridge'
+import type { RendererPerformanceRecord } from '@shared/contracts/routes'
+import { performanceRecordRendererRoute } from '@shared/contracts/routes'
+import { getDeepchatBridge } from './core'
+
+export function createPerformanceClient(bridge: DeepchatBridge = getDeepchatBridge()) {
+  async function recordRenderer(record: RendererPerformanceRecord): Promise<boolean> {
+    const result = await bridge.invoke(performanceRecordRendererRoute.name, record)
+    return result.accepted
+  }
+
+  return {
+    recordRenderer
+  }
+}
+
+export type PerformanceClient = ReturnType<typeof createPerformanceClient>
diff --git a/src/renderer/browser/assets/ChromeClose.svg b/src/renderer/browser/assets/ChromeClose.svg
deleted file mode 100644
index 07c2052e39..0000000000
--- a/src/renderer/browser/assets/ChromeClose.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M5 5.70801L0.854492 9.85352C0.756836 9.95117 0.639648 10 0.50293 10C0.359701 10 0.239258 9.9528 0.141602 9.8584C0.0472005 9.76074 0 9.6403 0 9.49707C0 9.36035 0.0488281 9.24316 0.146484 9.14551L4.29199 5L0.146484 0.854492C0.0488281 0.756836 0 0.638021 0 0.498047C0 0.429688 0.0130208 0.364583 0.0390625 0.302734C0.0651042 0.240885 0.100911 0.188802 0.146484 0.146484C0.192057 0.100911 0.245768 0.0651042 0.307617 0.0390625C0.369466 0.0130208 0.43457 0 0.50293 0C0.639648 0 0.756836 0.0488281 0.854492 0.146484L5 4.29199L9.14551 0.146484C9.24316 0.0488281 9.36198 0 9.50195 0C9.57031 0 9.63379 0.0130208 9.69238 0.0390625C9.75423 0.0651042 9.80794 0.100911 9.85352 0.146484C9.89909 0.192057 9.9349 0.245768 9.96094 0.307617C9.98698 0.366211 10 0.429688 10 0.498047C10 0.638021 9.95117 0.756836 9.85352 0.854492L5.70801 5L9.85352 9.14551C9.95117 9.24316 10 9.36035 10 9.49707C10 9.56543 9.98698 9.63053 9.96094 9.69238C9.9349 9.75423 9.89909 9.80794 9.85352 9.85352C9.8112 9.89909 9.75911 9.9349 9.69727 9.96094C9.63542 9.98698 9.57031 10 9.50195 10C9.36198 10 9.24316 9.95117 9.14551 9.85352L5 5.70801Z" fill="black" fill-opacity="0.8956"/>
-</svg>
diff --git a/src/renderer/browser/assets/ChromeMaximize-1.svg b/src/renderer/browser/assets/ChromeMaximize-1.svg
deleted file mode 100644
index 9aa8ea3dac..0000000000
--- a/src/renderer/browser/assets/ChromeMaximize-1.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.99902 2.96387C8.99902 2.69368 8.94531 2.43978 8.83789 2.20215C8.73047 1.96126 8.58398 1.75293 8.39844 1.57715C8.21615 1.39811 8.00293 1.25814 7.75879 1.15723C7.5179 1.05306 7.264 1.00098 6.99707 1.00098H2.08496C2.13704 0.851237 2.21029 0.714518 2.30469 0.59082C2.39909 0.467122 2.50814 0.361328 2.63184 0.273438C2.75553 0.185547 2.89062 0.118815 3.03711 0.0732422C3.18685 0.0244141 3.34147 0 3.50098 0H6.99707C7.41048 0 7.79948 0.0797526 8.16406 0.239258C8.52865 0.395508 8.84603 0.608724 9.11621 0.878906C9.38965 1.14909 9.60449 1.46647 9.76074 1.83105C9.92025 2.19564 10 2.58464 10 2.99805V6.49902C10 6.65853 9.97559 6.81315 9.92676 6.96289C9.88118 7.10938 9.81445 7.24447 9.72656 7.36816C9.63867 7.49186 9.53288 7.60091 9.40918 7.69531C9.28548 7.78971 9.14876 7.86296 8.99902 7.91504V2.96387ZM1.47461 10C1.2793 10 1.09212 9.96094 0.913086 9.88281C0.734049 9.80143 0.576172 9.69401 0.439453 9.56055C0.30599 9.42383 0.198568 9.26595 0.117188 9.08691C0.0390625 8.90788 0 8.7207 0 8.52539V3.47656C0 3.27799 0.0390625 3.09082 0.117188 2.91504C0.198568 2.736 0.30599 2.57975 0.439453 2.44629C0.576172 2.30957 0.732422 2.20215 0.908203 2.12402C1.08724 2.04264 1.27604 2.00195 1.47461 2.00195H6.52344C6.72201 2.00195 6.91081 2.04264 7.08984 2.12402C7.26888 2.20215 7.42513 2.30794 7.55859 2.44141C7.69206 2.57487 7.79785 2.73112 7.87598 2.91016C7.95736 3.08919 7.99805 3.27799 7.99805 3.47656V8.52539C7.99805 8.72396 7.95736 8.91276 7.87598 9.0918C7.79785 9.26758 7.69043 9.42383 7.55371 9.56055C7.42025 9.69401 7.264 9.80143 7.08496 9.88281C6.90918 9.96094 6.72201 10 6.52344 10H1.47461ZM6.49902 8.99902C6.56738 8.99902 6.63086 8.986 6.68945 8.95996C6.7513 8.93392 6.80501 8.89811 6.85059 8.85254C6.89941 8.80697 6.93685 8.75488 6.96289 8.69629C6.98893 8.63444 7.00195 8.56934 7.00195 8.50098V3.50098C7.00195 3.43262 6.98893 3.36751 6.96289 3.30566C6.93685 3.24382 6.90104 3.1901 6.85547 3.14453C6.8099 3.09896 6.75618 3.06315 6.69434 3.03711C6.63249 3.01107 6.56738 2.99805 6.49902 2.99805H1.49902C1.43066 2.99805 1.36556 3.01107 1.30371 3.03711C1.24512 3.06315 1.19303 3.10059 1.14746 3.14941C1.10189 3.19499 1.06608 3.2487 1.04004 3.31055C1.014 3.36914 1.00098 3.43262 1.00098 3.50098V8.50098C1.00098 8.56934 1.014 8.63444 1.04004 8.69629C1.06608 8.75488 1.10189 8.80697 1.14746 8.85254C1.19303 8.89811 1.24512 8.93392 1.30371 8.95996C1.36556 8.986 1.43066 8.99902 1.49902 8.99902H6.49902Z" fill="black" fill-opacity="0.8956"/>
-</svg>
diff --git a/src/renderer/browser/assets/ChromeMaximize.svg b/src/renderer/browser/assets/ChromeMaximize.svg
deleted file mode 100644
index b382fbe371..0000000000
--- a/src/renderer/browser/assets/ChromeMaximize.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="10" viewBox="0 0 10 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.47461 10C1.2793 10 1.09212 9.96094 0.913086 9.88281C0.734049 9.80143 0.576172 9.69401 0.439453 9.56055C0.30599 9.42383 0.198568 9.26595 0.117188 9.08691C0.0390625 8.90788 0 8.7207 0 8.52539V1.47461C0 1.2793 0.0390625 1.09212 0.117188 0.913086C0.198568 0.734049 0.30599 0.577799 0.439453 0.444336C0.576172 0.307617 0.734049 0.200195 0.913086 0.12207C1.09212 0.0406901 1.2793 0 1.47461 0H8.52539C8.7207 0 8.90788 0.0406901 9.08691 0.12207C9.26595 0.200195 9.4222 0.307617 9.55566 0.444336C9.69238 0.577799 9.7998 0.734049 9.87793 0.913086C9.95931 1.09212 10 1.2793 10 1.47461V8.52539C10 8.7207 9.95931 8.90788 9.87793 9.08691C9.7998 9.26595 9.69238 9.42383 9.55566 9.56055C9.4222 9.69401 9.26595 9.80143 9.08691 9.88281C8.90788 9.96094 8.7207 10 8.52539 10H1.47461ZM8.50098 8.99902C8.56934 8.99902 8.63281 8.986 8.69141 8.95996C8.75326 8.93392 8.80697 8.89811 8.85254 8.85254C8.89811 8.80697 8.93392 8.75488 8.95996 8.69629C8.986 8.63444 8.99902 8.56934 8.99902 8.50098V1.49902C8.99902 1.43066 8.986 1.36719 8.95996 1.30859C8.93392 1.24674 8.89811 1.19303 8.85254 1.14746C8.80697 1.10189 8.75326 1.06608 8.69141 1.04004C8.63281 1.014 8.56934 1.00098 8.50098 1.00098H1.49902C1.43066 1.00098 1.36556 1.014 1.30371 1.04004C1.24512 1.06608 1.19303 1.10189 1.14746 1.14746C1.10189 1.19303 1.06608 1.24674 1.04004 1.30859C1.014 1.36719 1.00098 1.43066 1.00098 1.49902V8.50098C1.00098 8.56934 1.014 8.63444 1.04004 8.69629C1.06608 8.75488 1.10189 8.80697 1.14746 8.85254C1.19303 8.89811 1.24512 8.93392 1.30371 8.95996C1.36556 8.986 1.43066 8.99902 1.49902 8.99902H8.50098Z" fill="black" fill-opacity="0.8956"/>
-</svg>
diff --git a/src/renderer/browser/assets/ChromeMinimize.svg b/src/renderer/browser/assets/ChromeMinimize.svg
deleted file mode 100644
index 2f4394ff74..0000000000
--- a/src/renderer/browser/assets/ChromeMinimize.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="10" height="1" viewBox="0 0 10 1" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M0.498047 1C0.429688 1 0.364583 0.986979 0.302734 0.960938C0.244141 0.934896 0.192057 0.899089 0.146484 0.853516C0.100911 0.807943 0.0651042 0.755859 0.0390625 0.697266C0.0130208 0.635417 0 0.570312 0 0.501953C0 0.433594 0.0130208 0.370117 0.0390625 0.311523C0.0651042 0.249674 0.100911 0.195964 0.146484 0.150391C0.192057 0.101562 0.244141 0.0641276 0.302734 0.0380859C0.364583 0.0120443 0.429688 -0.000976562 0.498047 -0.000976562H9.50195C9.57031 -0.000976562 9.63379 0.0120443 9.69238 0.0380859C9.75423 0.0641276 9.80794 0.101562 9.85352 0.150391C9.89909 0.195964 9.9349 0.249674 9.96094 0.311523C9.98698 0.370117 10 0.433594 10 0.501953C10 0.570312 9.98698 0.635417 9.96094 0.697266C9.9349 0.755859 9.89909 0.807943 9.85352 0.853516C9.80794 0.899089 9.75423 0.934896 9.69238 0.960938C9.63379 0.986979 9.57031 1 9.50195 1H0.498047Z" fill="black" fill-opacity="0.8956"/>
-</svg>
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index d6f040b42f..0c9822212c 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -1,623 +1,7 @@
 <script setup lang="ts">
-import { onMounted, ref, watch, onBeforeUnmount, computed } from 'vue'
-import { useEventListener } from '@vueuse/core'
-import { RouterView, useRoute, useRouter } from 'vue-router'
-import { createConfigClient } from '@api/ConfigClient'
-import { createOnboardingClient } from '@api/OnboardingClient'
-import SelectedTextContextMenu from './components/message/SelectedTextContextMenu.vue'
-import { useArtifactStore } from './stores/artifact'
-import { useSessionStore } from '@/stores/ui/session'
-import { useAgentStore } from '@/stores/ui/agent'
-import { useDraftStore, type StartDeeplinkPayload } from '@/stores/ui/draft'
-import { usePageRouterStore } from '@/stores/ui/pageRouter'
-import { Toaster } from '@shadcn/components/ui/sonner'
-import { useToast } from '@/components/use-toast'
-import { useUiSettingsStore } from '@/stores/uiSettingsStore'
-import { useThemeStore, type ThemeMode } from '@/stores/theme'
-import { useLanguageStore } from '@/stores/language'
-import { useI18n } from 'vue-i18n'
-import TranslatePopup from '@/components/popup/TranslatePopup.vue'
-import ModelCheckDialog from '@/components/settings/ModelCheckDialog.vue'
-import { useModelCheckStore } from '@/stores/modelCheck'
-import MessageDialog from './components/ui/MessageDialog.vue'
-import McpSamplingDialog from '@/components/mcp/McpSamplingDialog.vue'
-import { initAppStores, useMcpInstallDeeplinkHandler } from '@/lib/storeInitializer'
-import { ensureIconsLoaded } from '@/lib/iconLoader'
-import 'vue-sonner/style.css' // vue-sonner v2 requires this import
-import { useFontManager } from './composables/useFontManager'
-import AppBar from '@/components/AppBar.vue'
-import { useDeviceVersion } from '@/composables/useDeviceVersion'
-import WindowSideBar from './components/WindowSideBar.vue'
-import SpotlightOverlay from '@/components/spotlight/SpotlightOverlay.vue'
-import { useSpotlightStore } from '@/stores/ui/spotlight'
-import { useSidepanelStore } from '@/stores/ui/sidepanel'
-import { useSidebarStore } from '@/stores/ui/sidebar'
-import { useProviderStore } from '@/stores/providerStore'
-import { useModelStore } from '@/stores/modelStore'
-import { useAppIpcRuntime } from '@/composables/useAppIpcRuntime'
-import {
-  clearGuidedOnboardingResumeIntent,
-  GUIDED_ONBOARDING_RESUME_REQUESTED_EVENT,
-  readGuidedOnboardingResumeIntent,
-  type GuidedOnboardingResumeRequestDetail,
-  type GuidedOnboardingResumeTrigger
-} from '@/lib/onboardingResume'
-import type { GuidedOnboardingStepId } from '@shared/contracts/routes'
-import type { DatabaseRepairSuggestedPayload } from '@shared/types/databaseSchema'
-import { createWindowClient } from '@api/WindowClient'
-
-const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
-
-const route = useRoute()
-const configClient = createConfigClient()
-const onboardingClient = createOnboardingClient()
-const windowClient = createWindowClient()
-const artifactStore = useArtifactStore()
-const sessionStore = useSessionStore()
-const agentStore = useAgentStore()
-const draftStore = useDraftStore()
-const pageRouterStore = usePageRouterStore()
-const sidepanelStore = useSidepanelStore()
-const sidebarStore = useSidebarStore()
-const spotlightStore = useSpotlightStore()
-const { toast } = useToast()
-const uiSettingsStore = useUiSettingsStore()
-const { setupFontListener } = useFontManager()
-setupFontListener()
-
-const { isWinMacOS, isMacOS } = useDeviceVersion()
-
-watch(
-  isMacOS,
-  (mac) => {
-    if (typeof document === 'undefined') return
-    document.documentElement.dataset.platform = mac ? 'darwin' : 'other'
-  },
-  { immediate: true }
-)
-
-const themeStore = useThemeStore()
-const langStore = useLanguageStore()
-const modelCheckStore = useModelCheckStore()
-const providerStore = useProviderStore()
-const modelStore = useModelStore()
-const { t } = useI18n()
-const toasterTheme = computed(() =>
-  themeStore.themeMode === 'system' ? (themeStore.isDark ? 'dark' : 'light') : themeStore.themeMode
-)
-// Error notification queue and currently displayed error
-const errorQueue = ref<Array<{ id: string; title: string; message: string; type: string }>>([])
-const currentErrorId = ref<string | null>(null)
-let errorDisplayTimer: number | null = null
-
-const { setup: setupMcpDeeplink, cleanup: cleanupMcpDeeplink } = useMcpInstallDeeplinkHandler()
-
-const resolveThemeName = (themeMode: ThemeMode, isDark: boolean) => {
-  return themeMode === 'system' ? (isDark ? 'dark' : 'light') : themeMode
-}
-
-const syncAppearanceClasses = (themeName: string, fontSizeClass: string) => {
-  if (typeof document === 'undefined') {
-    return
-  }
-
-  const root = document.documentElement
-  // 切换期间临时禁用过渡，让主题瞬时生效，避免大量元素同时跑颜色过渡造成的重绘卡顿
-  root.classList.add('dc-theme-switching')
-
-  for (const target of [root, document.body]) {
-    target.classList.remove('light', 'dark', 'system')
-    target.classList.add(themeName)
-    target.classList.remove('text-xs', 'text-sm', 'text-base', 'text-lg', 'text-xl', 'text-2xl')
-    target.classList.add(fontSizeClass)
-  }
-
-  // 强制同步重算，使本次类切换在「过渡已禁用」的状态下完成
-  void root.offsetWidth
-  // 下一帧恢复过渡，不影响日常 hover 等交互动画
-  requestAnimationFrame(() => {
-    root.classList.remove('dc-theme-switching')
-  })
-}
-
-watch(
-  [() => themeStore.themeMode, () => themeStore.isDark, () => uiSettingsStore.fontSizeClass],
-  ([themeMode, isDark, fontSizeClass]) => {
-    const nextThemeName = resolveThemeName(themeMode, isDark)
-    syncAppearanceClasses(nextThemeName, fontSizeClass)
-  },
-  { immediate: true }
-)
-
-// Handle error notifications
-const showErrorToast = (error: { id: string; title: string; message: string; type: string }) => {
-  // Check if error with same ID already exists in queue to prevent duplicates
-  const existingErrorIndex = errorQueue.value.findIndex((e) => e.id === error.id)
-
-  if (existingErrorIndex === -1) {
-    // If there's currently an error being displayed, add new error to queue
-    if (currentErrorId.value) {
-      if (errorQueue.value.length > 5) {
-        errorQueue.value.shift()
-      }
-      errorQueue.value.push(error)
-    } else {
-      // Otherwise display this error directly
-      displayError(error)
-    }
-  }
-}
-
-// Display specified error
-const displayError = (error: { id: string; title: string; message: string; type: string }) => {
-  // Update currently displayed error ID
-  currentErrorId.value = error.id
-
-  // Show error notification
-  const { dismiss } = toast({
-    title: error.title,
-    description: error.message,
-    variant: 'destructive',
-    onOpenChange: (open) => {
-      if (!open) {
-        // Also show next error when user manually closes
-        handleErrorClosed()
-      }
-    }
-  })
-
-  // Set timer to automatically close current error after 3 seconds
-  if (errorDisplayTimer) {
-    clearTimeout(errorDisplayTimer)
-  }
-
-  errorDisplayTimer = window.setTimeout(() => {
-    // Handle logic after error is closed
-    dismiss()
-    handleErrorClosed()
-  }, 3000)
-}
-
-// Handle logic after error is closed
-const handleErrorClosed = () => {
-  // Clear current error ID
-  currentErrorId.value = null
-
-  // Display next error in queue (if any)
-  if (errorQueue.value.length > 0) {
-    const nextError = errorQueue.value.shift()
-    if (nextError) {
-      displayError(nextError)
-    }
-  } else {
-    // Queue is empty, clear timer
-    if (errorDisplayTimer) {
-      clearTimeout(errorDisplayTimer)
-      errorDisplayTimer = null
-    }
-  }
-}
-
-const router = useRouter()
-const activeTab = ref('chat')
-const isStartupRouteReady = ref(false)
-const processingStartDeeplinkToken = ref<number | null>(null)
-const processedStartDeeplinkToken = ref<number | null>(null)
-
-const isDevWelcomeOverrideEnabled = () => {
-  if (!import.meta.env.DEV) return false
-
-  try {
-    return window.sessionStorage.getItem(DEV_WELCOME_OVERRIDE_KEY) === '1'
-  } catch {
-    return false
-  }
-}
-
-const ensureStartupWelcomeState = async () => {
-  try {
-    await router.isReady()
-
-    const currentRoute = router.currentRoute.value
-    const isWelcomeRoute = currentRoute.name === 'welcome' || currentRoute.path === '/welcome'
-
-    if (isDevWelcomeOverrideEnabled()) {
-      if (!isWelcomeRoute) {
-        await router.replace({ name: 'welcome' })
-      }
-      return
-    }
-
-    const initComplete = Boolean(await configClient.getSetting('init_complete'))
-    let onboardingState: Awaited<ReturnType<typeof onboardingClient.getState>> | null = null
-
-    try {
-      onboardingState = await onboardingClient.getState()
-    } catch (error) {
-      console.warn('[App] Failed to load onboarding state during startup:', error)
-    }
-
-    if (onboardingState?.status === 'completed') {
-      if (isWelcomeRoute) {
-        await router.replace({ name: 'chat' })
-      }
-      return
-    }
-
-    if (!initComplete || onboardingState?.status === 'active') {
-      if (!initComplete && onboardingState?.status !== 'active') {
-        try {
-          onboardingState = await onboardingClient.start()
-        } catch (error) {
-          console.warn('[App] Failed to start onboarding during startup:', error)
-        }
-      }
-
-      if (!isWelcomeRoute) {
-        await router.replace({ name: 'welcome' })
-      }
-      return
-    }
-
-    if (isWelcomeRoute) {
-      await router.replace({ name: 'chat' })
-    }
-  } finally {
-    isStartupRouteReady.value = true
-  }
-}
-
-// Handle font scaling
-const handleZoomIn = () => {
-  // Font size increase logic
-  const currentLevel = uiSettingsStore.fontSizeLevel
-  uiSettingsStore.updateFontSizeLevel(currentLevel + 1)
-}
-
-const handleZoomOut = () => {
-  // Font size decrease logic
-  const currentLevel = uiSettingsStore.fontSizeLevel
-  uiSettingsStore.updateFontSizeLevel(currentLevel - 1)
-}
-
-const handleZoomResume = () => {
-  // Reset font size
-  uiSettingsStore.updateFontSizeLevel(1) // 1 corresponds to 'text-base', default font size
-}
-
-// Handle creating new conversation
-const handleCreateNewConversation = async () => {
-  try {
-    await sessionStore.startNewConversation({ refresh: true })
-  } catch (error) {
-    console.error('Failed to create new conversation:', error)
-  }
-}
-
-// Removed GO_SETTINGS handler; now handled in main via tab logic
-
-const activatePendingStartDeeplink = async () => {
-  const pendingStartDeeplink = draftStore.pendingStartDeeplink
-  if (!pendingStartDeeplink || !isStartupRouteReady.value) {
-    return
-  }
-
-  const token = pendingStartDeeplink.token
-  if (processingStartDeeplinkToken.value === token || processedStartDeeplinkToken.value === token) {
-    return
-  }
-
-  processingStartDeeplinkToken.value = token
-
-  try {
-    const initComplete = Boolean(await configClient.getSetting('init_complete'))
-    if (!initComplete) {
-      return
-    }
-
-    await router.isReady()
-    if (router.currentRoute.value.name !== 'chat') {
-      await router.push({ name: 'chat' })
-    }
-
-    agentStore.setSelectedAgent('deepchat')
-    if (sessionStore.hasActiveSession) {
-      await sessionStore.closeSession()
-      processedStartDeeplinkToken.value = token
-      return
-    }
-
-    pageRouterStore.goToNewThread({ refresh: true })
-    processedStartDeeplinkToken.value = token
-  } finally {
-    if (processingStartDeeplinkToken.value === token) {
-      processingStartDeeplinkToken.value = null
-    }
-  }
-}
-
-const handleStartDeeplink = (_event: unknown, payload?: Omit<StartDeeplinkPayload, 'token'>) => {
-  if (!payload?.msg) {
-    return
-  }
-
-  draftStore.setPendingStartDeeplink({
-    msg: payload.msg,
-    modelId: payload.modelId ?? null,
-    systemPrompt: payload.systemPrompt ?? '',
-    mentions: Array.isArray(payload.mentions) ? payload.mentions : [],
-    autoSend: Boolean(payload.autoSend)
-  })
-  void activatePendingStartDeeplink()
-}
-
-const handleDatabaseRepairSuggested = (payload: unknown) => {
-  const repairPayload = payload as DatabaseRepairSuggestedPayload | undefined
-  if (!repairPayload) {
-    return
-  }
-
-  toast({
-    title: t(repairPayload.title),
-    description: t(repairPayload.message, {
-      reason: t(`settings.data.databaseRepair.reasons.${repairPayload.reason}`)
-    }),
-    action: {
-      label: t('settings.data.databaseRepair.toastAction'),
-      onClick: () => {
-        void configClient.openSettings({
-          routeName: 'settings-database',
-          section: 'database-repair'
-        })
-      }
-    }
-  })
-}
-
-const handleStartGuidedOnboardingDev = async () => {
-  if (!import.meta.env.DEV) {
-    return
-  }
-
-  try {
-    clearGuidedOnboardingResumeIntent()
-    await onboardingClient.start({
-      force: true,
-      stepId: 'select-provider'
-    })
-
-    if (router.currentRoute.value.name !== 'welcome') {
-      await router.replace({ name: 'welcome' })
-    }
-  } catch (error) {
-    console.warn('[App] Failed to start guided onboarding from dev trigger:', error)
-  }
-}
-
-const CHAT_GUIDED_ONBOARDING_STEP_IDS = new Set<GuidedOnboardingStepId>([
-  'switch-agent',
-  'switch-model',
-  'first-chat'
-])
-
-const routeToGuidedOnboardingStep = async (stepId: GuidedOnboardingStepId | null) => {
-  if (stepId && CHAT_GUIDED_ONBOARDING_STEP_IDS.has(stepId)) {
-    if (router.currentRoute.value.name !== 'chat') {
-      await router.replace({ name: 'chat' })
-    }
-
-    pageRouterStore.goToNewThread({ refresh: true })
-    return
-  }
-
-  if (router.currentRoute.value.name !== 'welcome') {
-    await router.replace({ name: 'welcome' })
-  }
-}
-
-const handleResumeGuidedOnboarding = async (trigger: GuidedOnboardingResumeTrigger) => {
-  const resumeIntent = readGuidedOnboardingResumeIntent()
-  if (!resumeIntent || resumeIntent.trigger !== trigger) {
-    return
-  }
-
-  try {
-    const onboardingState = await onboardingClient.getState()
-
-    if (onboardingState.status !== 'active') {
-      clearGuidedOnboardingResumeIntent()
-      if (onboardingState.status === 'completed') {
-        if (router.currentRoute.value.name !== 'chat') {
-          await router.replace({ name: 'chat' })
-        }
-
-        pageRouterStore.goToNewThread({ refresh: true })
-      }
-      return
-    }
-
-    clearGuidedOnboardingResumeIntent()
-    await routeToGuidedOnboardingStep(onboardingState.currentStepId)
-  } catch (error) {
-    console.warn('[App] Failed to resume guided onboarding:', error)
-  }
-}
-
-const handleGuidedOnboardingResumeRequested = (event: Event) => {
-  const detail = (event as CustomEvent<GuidedOnboardingResumeRequestDetail>).detail
-  if (!detail?.trigger) {
-    return
-  }
-
-  void handleResumeGuidedOnboarding(detail.trigger)
-}
-
-const { setup: setupAppIpcRuntime, cleanup: cleanupAppIpcRuntime } = useAppIpcRuntime({
-  handleStartDeeplink: (payload) => {
-    handleStartDeeplink(undefined, payload as Omit<StartDeeplinkPayload, 'token'> | undefined)
-  },
-  handleStartGuidedOnboardingDev,
-  handleWindowFocused: () => handleResumeGuidedOnboarding('window-focus'),
-  showErrorToast,
-  handleDatabaseRepairSuggested,
-  handleZoomIn,
-  handleZoomOut,
-  handleZoomResume,
-  handleCreateNewConversation,
-  handleToggleSidebar: () => {
-    sidebarStore.toggleSidebar()
-  },
-  handleToggleWorkspace: () => {
-    if (pageRouterStore.currentRoute !== 'chat' || !pageRouterStore.chatSessionId) {
-      return
-    }
-
-    sidepanelStore.toggleWorkspace(pageRouterStore.chatSessionId)
-  },
-  openSpotlight: () => {
-    spotlightStore.openSpotlight()
-  },
-  handleSystemNotificationClick: (msg) => {
-    let sessionId: string | null = null
-
-    if (typeof msg === 'string' && msg.startsWith('chat/')) {
-      const parts = msg.split('/')
-      if (parts.length === 3) {
-        sessionId = parts[1]
-      }
-    } else if (msg && typeof msg === 'object' && 'threadId' in msg) {
-      sessionId = (msg as { threadId?: string }).threadId ?? null
-    }
-
-    if (sessionId) {
-      void sessionStore.selectSession(sessionId)
-    }
-  },
-  getCurrentRouteName: () => router.currentRoute.value.name
-})
-
-// Handle ESC key - close floating chat window
-const handleEscKey = (event: KeyboardEvent) => {
-  if (event.key === 'Escape') {
-    void windowClient.closeFloatingCurrent()
-  }
-}
-
-// Same listeners as before; VueUse owns register/unregister with the component scope.
-useEventListener(window, 'keydown', handleEscKey)
-useEventListener(
-  window,
-  GUIDED_ONBOARDING_RESUME_REQUESTED_EVENT,
-  handleGuidedOnboardingResumeRequested as EventListener
-)
-
-void ensureStartupWelcomeState()
-
-watch(
-  () =>
-    [isStartupRouteReady.value, route.name, draftStore.pendingStartDeeplink?.token ?? 0] as const,
-  () => {
-    void activatePendingStartDeeplink()
-  },
-  { immediate: true }
-)
-
-onMounted(() => {
-  // Ensure icons are loaded (load asynchronously, can happen in parallel with store init)
-  void ensureIconsLoaded()
-
-  // Start shell-critical data directly from the main window so it does not depend on settings.
-  void initAppStores()
-  void providerStore.ensureInitialized()
-  void modelStore.initialize()
-  void sessionStore.fetchSessions()
-  setupMcpDeeplink()
-  setupAppIpcRuntime()
-
-  watch(
-    () => activeTab.value,
-    (newVal) => {
-      router.push({ name: newVal })
-    }
-  )
-
-  watch(
-    () => route.fullPath,
-    (newVal) => {
-      const pathWithoutQuery = newVal.split('?')[0]
-      const newTab =
-        pathWithoutQuery === '/'
-          ? (route.name as string)
-          : pathWithoutQuery.split('/').filter(Boolean)[0] || ''
-      if (newTab !== activeTab.value) {
-        activeTab.value = newTab
-      }
-      // Close artifacts page when route changes
-      artifactStore.hideArtifact()
-    }
-  )
-
-  // Listen for changes to current conversation
-  watch(
-    () => sessionStore.activeSessionId,
-    () => {
-      // Close artifacts page when switching conversations
-      artifactStore.hideArtifact()
-    }
-  )
-})
-
-// Clear timers and event listeners before component unmounts
-onBeforeUnmount(() => {
-  if (errorDisplayTimer) {
-    clearTimeout(errorDisplayTimer)
-    errorDisplayTimer = null
-  }
-
-  cleanupAppIpcRuntime()
-  cleanupMcpDeeplink()
-})
+import ChatMainApp from '@/apps/chat-main/ChatMainApp.vue'
 </script>
 
 <template>
-  <div
-    data-testid="app-root"
-    class="flex flex-col h-screen"
-    :class="isWinMacOS ? 'bg-window-background' : 'bg-background'"
-  >
-    <AppBar />
-    <div class="flex flex-row h-0 grow relative overflow-hidden px-px py-px" :dir="langStore.dir">
-      <div class="flex flex-row w-full h-full">
-        <WindowSideBar></WindowSideBar>
-
-        <!-- Main content area -->
-        <div
-          data-testid="app-main"
-          class="flex h-full min-h-0 flex-1 min-w-0 flex-col overflow-hidden rounded-tl-xl border-l border-t border-black/20 bg-background dark:border-white/10"
-        >
-          <div class="min-h-0 flex-1">
-            <RouterView v-if="isStartupRouteReady" />
-          </div>
-        </div>
-      </div>
-    </div>
-    <!-- Global message dialog -->
-    <MessageDialog />
-    <McpSamplingDialog />
-    <!-- Global Toast notifications -->
-    <Toaster :theme="toasterTheme" />
-    <SelectedTextContextMenu />
-    <TranslatePopup />
-    <SpotlightOverlay />
-    <!-- Global model check dialog -->
-    <ModelCheckDialog
-      :open="modelCheckStore.isDialogOpen"
-      :provider-id="modelCheckStore.currentProviderId"
-      @update:open="
-        (open) => {
-          if (!open) modelCheckStore.closeDialog()
-        }
-      "
-    />
-  </div>
+  <ChatMainApp />
 </template>
diff --git a/src/renderer/src/apps/chat-main/ChatMainApp.vue b/src/renderer/src/apps/chat-main/ChatMainApp.vue
new file mode 100644
index 0000000000..eee16723d3
--- /dev/null
+++ b/src/renderer/src/apps/chat-main/ChatMainApp.vue
@@ -0,0 +1,646 @@
+<script setup lang="ts">
+import { onMounted, ref, watch, onBeforeUnmount, computed, provide } from 'vue'
+import { useEventListener } from '@vueuse/core'
+import { RouterView, useRoute, useRouter } from 'vue-router'
+import { createConfigClient } from '@api/ConfigClient'
+import { createOnboardingClient } from '@api/OnboardingClient'
+import SelectedTextContextMenu from '@/components/message/SelectedTextContextMenu.vue'
+import { useArtifactStore } from '@/stores/artifact'
+import { useSessionStore } from '@/stores/ui/session'
+import { useAgentStore } from '@/stores/ui/agent'
+import { useDraftStore, type StartDeeplinkPayload } from '@/stores/ui/draft'
+import { usePageRouterStore } from '@/stores/ui/pageRouter'
+import { Toaster } from '@shadcn/components/ui/sonner'
+import { useToast } from '@/components/use-toast'
+import { useUiSettingsStore } from '@/stores/uiSettingsStore'
+import { useThemeStore, type ThemeMode } from '@/stores/theme'
+import { useLanguageStore } from '@/stores/language'
+import { useI18n } from 'vue-i18n'
+import TranslatePopup from '@/components/popup/TranslatePopup.vue'
+import ModelCheckDialog from '@/components/settings/ModelCheckDialog.vue'
+import { useModelCheckStore } from '@/stores/modelCheck'
+import MessageDialog from '@/components/ui/MessageDialog.vue'
+import McpSamplingDialog from '@/components/mcp/McpSamplingDialog.vue'
+import { initAppStores, useMcpInstallDeeplinkHandler } from '@/lib/storeInitializer'
+import { ensureIconsLoaded } from '@/lib/iconLoader'
+import 'vue-sonner/style.css' // vue-sonner v2 requires this import
+import { useFontManager } from '@/composables/useFontManager'
+import AppBar from '@/components/AppBar.vue'
+import { useDeviceVersion } from '@/composables/useDeviceVersion'
+import WindowSideBar from '@/components/WindowSideBar.vue'
+import SpotlightOverlay from '@/components/spotlight/SpotlightOverlay.vue'
+import { useSpotlightStore } from '@/stores/ui/spotlight'
+import { useSidepanelStore } from '@/stores/ui/sidepanel'
+import { useSidebarStore } from '@/stores/ui/sidebar'
+import { useAppIpcRuntime } from '@/composables/useAppIpcRuntime'
+import {
+  clearGuidedOnboardingResumeIntent,
+  GUIDED_ONBOARDING_RESUME_REQUESTED_EVENT,
+  readGuidedOnboardingResumeIntent,
+  type GuidedOnboardingResumeRequestDetail,
+  type GuidedOnboardingResumeTrigger
+} from '@/lib/onboardingResume'
+import type { GuidedOnboardingStepId } from '@shared/contracts/routes'
+import type { DatabaseRepairSuggestedPayload } from '@shared/types/databaseSchema'
+import { createWindowClient } from '@api/WindowClient'
+import {
+  RENDERER_PERFORMANCE_REPORTER,
+  RendererPerformanceReporter
+} from '@/platform/performance/rendererPerformance'
+
+const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
+
+const performanceReporter = new RendererPerformanceReporter()
+provide(RENDERER_PERFORMANCE_REPORTER, performanceReporter)
+
+const route = useRoute()
+const configClient = createConfigClient()
+const onboardingClient = createOnboardingClient()
+const windowClient = createWindowClient()
+const artifactStore = useArtifactStore()
+const sessionStore = useSessionStore()
+const agentStore = useAgentStore()
+const draftStore = useDraftStore()
+const pageRouterStore = usePageRouterStore()
+const sidepanelStore = useSidepanelStore()
+const sidebarStore = useSidebarStore()
+const spotlightStore = useSpotlightStore()
+const { toast } = useToast()
+const uiSettingsStore = useUiSettingsStore()
+const { setupFontListener } = useFontManager()
+setupFontListener()
+
+const { isWinMacOS, isMacOS } = useDeviceVersion()
+
+watch(
+  isMacOS,
+  (mac) => {
+    if (typeof document === 'undefined') return
+    document.documentElement.dataset.platform = mac ? 'darwin' : 'other'
+  },
+  { immediate: true }
+)
+
+const themeStore = useThemeStore()
+const langStore = useLanguageStore()
+const modelCheckStore = useModelCheckStore()
+const { t } = useI18n()
+const toasterTheme = computed(() =>
+  themeStore.themeMode === 'system' ? (themeStore.isDark ? 'dark' : 'light') : themeStore.themeMode
+)
+// Error notification queue and currently displayed error
+const errorQueue = ref<Array<{ id: string; title: string; message: string; type: string }>>([])
+const currentErrorId = ref<string | null>(null)
+let errorDisplayTimer: number | null = null
+
+const { setup: setupMcpDeeplink, cleanup: cleanupMcpDeeplink } = useMcpInstallDeeplinkHandler()
+
+const resolveThemeName = (themeMode: ThemeMode, isDark: boolean) => {
+  return themeMode === 'system' ? (isDark ? 'dark' : 'light') : themeMode
+}
+
+const syncAppearanceClasses = (themeName: string, fontSizeClass: string) => {
+  if (typeof document === 'undefined') {
+    return
+  }
+
+  const root = document.documentElement
+  // 切换期间临时禁用过渡，让主题瞬时生效，避免大量元素同时跑颜色过渡造成的重绘卡顿
+  root.classList.add('dc-theme-switching')
+
+  for (const target of [root, document.body]) {
+    target.classList.remove('light', 'dark', 'system')
+    target.classList.add(themeName)
+    target.classList.remove('text-xs', 'text-sm', 'text-base', 'text-lg', 'text-xl', 'text-2xl')
+    target.classList.add(fontSizeClass)
+  }
+
+  // 强制同步重算，使本次类切换在「过渡已禁用」的状态下完成
+  void root.offsetWidth
+  // 下一帧恢复过渡，不影响日常 hover 等交互动画
+  requestAnimationFrame(() => {
+    root.classList.remove('dc-theme-switching')
+  })
+}
+
+watch(
+  [() => themeStore.themeMode, () => themeStore.isDark, () => uiSettingsStore.fontSizeClass],
+  ([themeMode, isDark, fontSizeClass]) => {
+    const nextThemeName = resolveThemeName(themeMode, isDark)
+    syncAppearanceClasses(nextThemeName, fontSizeClass)
+  },
+  { immediate: true }
+)
+
+// Handle error notifications
+const showErrorToast = (error: { id: string; title: string; message: string; type: string }) => {
+  // Check if error with same ID already exists in queue to prevent duplicates
+  const existingErrorIndex = errorQueue.value.findIndex((e) => e.id === error.id)
+
+  if (existingErrorIndex === -1) {
+    // If there's currently an error being displayed, add new error to queue
+    if (currentErrorId.value) {
+      if (errorQueue.value.length > 5) {
+        errorQueue.value.shift()
+      }
+      errorQueue.value.push(error)
+    } else {
+      // Otherwise display this error directly
+      displayError(error)
+    }
+  }
+}
+
+// Display specified error
+const displayError = (error: { id: string; title: string; message: string; type: string }) => {
+  // Update currently displayed error ID
+  currentErrorId.value = error.id
+
+  // Show error notification
+  const { dismiss } = toast({
+    title: error.title,
+    description: error.message,
+    variant: 'destructive',
+    onOpenChange: (open) => {
+      if (!open) {
+        // Also show the next error when the current toast closes.
+        handleErrorClosed(error.id)
+      }
+    }
+  })
+
+  // Set timer to automatically close current error after 3 seconds
+  if (errorDisplayTimer) {
+    clearTimeout(errorDisplayTimer)
+  }
+
+  errorDisplayTimer = window.setTimeout(() => {
+    // Dismissal invokes onOpenChange(false). Call the handler as a fallback for
+    // environments where it does not, while its ID guard prevents double advancement.
+    dismiss()
+    handleErrorClosed(error.id)
+  }, 3000)
+}
+
+// Handle logic after an error toast closes
+const handleErrorClosed = (errorId: string) => {
+  if (currentErrorId.value !== errorId) {
+    return
+  }
+
+  // Clear current error ID
+  currentErrorId.value = null
+
+  // Display next error in queue (if any)
+  if (errorQueue.value.length > 0) {
+    const nextError = errorQueue.value.shift()
+    if (nextError) {
+      displayError(nextError)
+    }
+  } else {
+    // Queue is empty, clear timer
+    if (errorDisplayTimer) {
+      clearTimeout(errorDisplayTimer)
+      errorDisplayTimer = null
+    }
+  }
+}
+
+const router = useRouter()
+const activeTab = ref('chat')
+const isStartupRouteReady = ref(false)
+const processingStartDeeplinkToken = ref<number | null>(null)
+const processedStartDeeplinkToken = ref<number | null>(null)
+
+const isDevWelcomeOverrideEnabled = () => {
+  if (!import.meta.env.DEV) return false
+
+  try {
+    return window.sessionStorage.getItem(DEV_WELCOME_OVERRIDE_KEY) === '1'
+  } catch {
+    return false
+  }
+}
+
+const ensureStartupWelcomeState = async () => {
+  try {
+    await router.isReady()
+
+    const currentRoute = router.currentRoute.value
+    const isWelcomeRoute = currentRoute.name === 'welcome' || currentRoute.path === '/welcome'
+
+    if (isDevWelcomeOverrideEnabled()) {
+      if (!isWelcomeRoute) {
+        await router.replace({ name: 'welcome' })
+      }
+      return
+    }
+
+    const initComplete = Boolean(await configClient.getSetting('init_complete'))
+    let onboardingState: Awaited<ReturnType<typeof onboardingClient.getState>> | null = null
+
+    try {
+      onboardingState = await onboardingClient.getState()
+    } catch (error) {
+      console.warn('[App] Failed to load onboarding state during startup:', error)
+    }
+
+    if (onboardingState?.status === 'completed') {
+      if (isWelcomeRoute) {
+        await router.replace({ name: 'chat' })
+      }
+      return
+    }
+
+    if (!initComplete || onboardingState?.status === 'active') {
+      if (!initComplete && onboardingState?.status !== 'active') {
+        try {
+          onboardingState = await onboardingClient.start()
+        } catch (error) {
+          console.warn('[App] Failed to start onboarding during startup:', error)
+        }
+      }
+
+      if (!isWelcomeRoute) {
+        await router.replace({ name: 'welcome' })
+      }
+      return
+    }
+
+    if (isWelcomeRoute) {
+      await router.replace({ name: 'chat' })
+    }
+  } finally {
+    isStartupRouteReady.value = true
+  }
+}
+
+// Handle font scaling
+const handleZoomIn = () => {
+  // Font size increase logic
+  const currentLevel = uiSettingsStore.fontSizeLevel
+  uiSettingsStore.updateFontSizeLevel(currentLevel + 1)
+}
+
+const handleZoomOut = () => {
+  // Font size decrease logic
+  const currentLevel = uiSettingsStore.fontSizeLevel
+  uiSettingsStore.updateFontSizeLevel(currentLevel - 1)
+}
+
+const handleZoomResume = () => {
+  // Reset font size
+  uiSettingsStore.updateFontSizeLevel(1) // 1 corresponds to 'text-base', default font size
+}
+
+// Handle creating new conversation
+const handleCreateNewConversation = async () => {
+  try {
+    await sessionStore.startNewConversation({ refresh: true })
+  } catch (error) {
+    console.error('Failed to create new conversation:', error)
+  }
+}
+
+// Removed GO_SETTINGS handler; now handled in main via tab logic
+
+const activatePendingStartDeeplink = async () => {
+  const pendingStartDeeplink = draftStore.pendingStartDeeplink
+  if (!pendingStartDeeplink || !isStartupRouteReady.value) {
+    return
+  }
+
+  const token = pendingStartDeeplink.token
+  if (processingStartDeeplinkToken.value === token || processedStartDeeplinkToken.value === token) {
+    return
+  }
+
+  processingStartDeeplinkToken.value = token
+
+  try {
+    const initComplete = Boolean(await configClient.getSetting('init_complete'))
+    if (!initComplete) {
+      return
+    }
+
+    await router.isReady()
+    if (router.currentRoute.value.name !== 'chat') {
+      await router.push({ name: 'chat' })
+    }
+
+    agentStore.setSelectedAgent('deepchat')
+    if (sessionStore.hasActiveSession) {
+      await sessionStore.closeSession()
+      processedStartDeeplinkToken.value = token
+      return
+    }
+
+    pageRouterStore.goToNewThread({ refresh: true })
+    processedStartDeeplinkToken.value = token
+  } finally {
+    if (processingStartDeeplinkToken.value === token) {
+      processingStartDeeplinkToken.value = null
+    }
+  }
+}
+
+const handleStartDeeplink = (_event: unknown, payload?: Omit<StartDeeplinkPayload, 'token'>) => {
+  if (!payload?.msg) {
+    return
+  }
+
+  draftStore.setPendingStartDeeplink({
+    msg: payload.msg,
+    modelId: payload.modelId ?? null,
+    systemPrompt: payload.systemPrompt ?? '',
+    mentions: Array.isArray(payload.mentions) ? payload.mentions : [],
+    autoSend: Boolean(payload.autoSend)
+  })
+  void activatePendingStartDeeplink()
+}
+
+const handleDatabaseRepairSuggested = (payload: unknown) => {
+  const repairPayload = payload as DatabaseRepairSuggestedPayload | undefined
+  if (!repairPayload) {
+    return
+  }
+
+  toast({
+    title: t(repairPayload.title),
+    description: t(repairPayload.message, {
+      reason: t(`settings.data.databaseRepair.reasons.${repairPayload.reason}`)
+    }),
+    action: {
+      label: t('settings.data.databaseRepair.toastAction'),
+      onClick: () => {
+        void configClient.openSettings({
+          routeName: 'settings-database',
+          section: 'database-repair'
+        })
+      }
+    }
+  })
+}
+
+const handleStartGuidedOnboardingDev = async () => {
+  if (!import.meta.env.DEV) {
+    return
+  }
+
+  try {
+    clearGuidedOnboardingResumeIntent()
+    await onboardingClient.start({
+      force: true,
+      stepId: 'select-provider'
+    })
+
+    if (router.currentRoute.value.name !== 'welcome') {
+      await router.replace({ name: 'welcome' })
+    }
+  } catch (error) {
+    console.warn('[App] Failed to start guided onboarding from dev trigger:', error)
+  }
+}
+
+const CHAT_GUIDED_ONBOARDING_STEP_IDS = new Set<GuidedOnboardingStepId>([
+  'switch-agent',
+  'switch-model',
+  'first-chat'
+])
+
+const routeToGuidedOnboardingStep = async (stepId: GuidedOnboardingStepId | null) => {
+  if (stepId && CHAT_GUIDED_ONBOARDING_STEP_IDS.has(stepId)) {
+    if (router.currentRoute.value.name !== 'chat') {
+      await router.replace({ name: 'chat' })
+    }
+
+    pageRouterStore.goToNewThread({ refresh: true })
+    return
+  }
+
+  if (router.currentRoute.value.name !== 'welcome') {
+    await router.replace({ name: 'welcome' })
+  }
+}
+
+const handleResumeGuidedOnboarding = async (trigger: GuidedOnboardingResumeTrigger) => {
+  const resumeIntent = readGuidedOnboardingResumeIntent()
+  if (!resumeIntent || resumeIntent.trigger !== trigger) {
+    return
+  }
+
+  try {
+    const onboardingState = await onboardingClient.getState()
+
+    if (onboardingState.status !== 'active') {
+      clearGuidedOnboardingResumeIntent()
+      if (onboardingState.status === 'completed') {
+        if (router.currentRoute.value.name !== 'chat') {
+          await router.replace({ name: 'chat' })
+        }
+
+        pageRouterStore.goToNewThread({ refresh: true })
+      }
+      return
+    }
+
+    clearGuidedOnboardingResumeIntent()
+    await routeToGuidedOnboardingStep(onboardingState.currentStepId)
+  } catch (error) {
+    console.warn('[App] Failed to resume guided onboarding:', error)
+  }
+}
+
+const handleGuidedOnboardingResumeRequested = (event: Event) => {
+  const detail = (event as CustomEvent<GuidedOnboardingResumeRequestDetail>).detail
+  if (!detail?.trigger) {
+    return
+  }
+
+  void handleResumeGuidedOnboarding(detail.trigger)
+}
+
+const { setup: setupAppIpcRuntime, cleanup: cleanupAppIpcRuntime } = useAppIpcRuntime({
+  handleStartDeeplink: (payload) => {
+    handleStartDeeplink(undefined, payload as Omit<StartDeeplinkPayload, 'token'> | undefined)
+  },
+  handleStartGuidedOnboardingDev,
+  handleWindowFocused: () => handleResumeGuidedOnboarding('window-focus'),
+  showErrorToast,
+  handleDatabaseRepairSuggested,
+  handleZoomIn,
+  handleZoomOut,
+  handleZoomResume,
+  handleCreateNewConversation,
+  handleToggleSidebar: () => {
+    sidebarStore.toggleSidebar()
+  },
+  handleToggleWorkspace: () => {
+    if (pageRouterStore.currentRoute !== 'chat' || !pageRouterStore.chatSessionId) {
+      return
+    }
+
+    sidepanelStore.toggleWorkspace(pageRouterStore.chatSessionId)
+  },
+  openSpotlight: () => {
+    spotlightStore.openSpotlight()
+  },
+  handleSystemNotificationClick: (msg) => {
+    let sessionId: string | null = null
+
+    if (typeof msg === 'string' && msg.startsWith('chat/')) {
+      const parts = msg.split('/')
+      if (parts.length === 3) {
+        sessionId = parts[1]
+      }
+    } else if (msg && typeof msg === 'object' && 'threadId' in msg) {
+      sessionId = (msg as { threadId?: string }).threadId ?? null
+    }
+
+    if (sessionId) {
+      void sessionStore.selectSession(sessionId)
+    }
+  },
+  getCurrentRouteName: () => router.currentRoute.value.name
+})
+
+// Handle ESC key - close floating chat window
+const handleEscKey = (event: KeyboardEvent) => {
+  if (event.key === 'Escape') {
+    void windowClient.closeFloatingCurrent()
+  }
+}
+
+// Same listeners as before; VueUse owns register/unregister with the component scope.
+useEventListener(window, 'keydown', handleEscKey)
+useEventListener(
+  window,
+  GUIDED_ONBOARDING_RESUME_REQUESTED_EVENT,
+  handleGuidedOnboardingResumeRequested as EventListener
+)
+
+void ensureStartupWelcomeState()
+
+watch(
+  () =>
+    [isStartupRouteReady.value, route.name, draftStore.pendingStartDeeplink?.token ?? 0] as const,
+  () => {
+    void activatePendingStartDeeplink()
+  },
+  { immediate: true }
+)
+
+onMounted(() => {
+  performanceReporter.recordStartup('shell-mounted')
+
+  // Ensure icons are loaded (load asynchronously, can happen in parallel with store init)
+  void ensureIconsLoaded()
+
+  // Start shell-critical data directly from the main window so it does not depend on settings.
+  void initAppStores()
+    .then(() => {
+      performanceReporter.setEnabled(uiSettingsStore.loggingEnabled)
+      performanceReporter.recordStartup('app-stores-ready')
+    })
+    .catch(() => {
+      performanceReporter.setEnabled(uiSettingsStore.loggingEnabled)
+      performanceReporter.recordStartup('app-stores-ready', { outcome: 'failed' })
+    })
+  setupMcpDeeplink()
+  setupAppIpcRuntime()
+
+  watch(
+    () => uiSettingsStore.loggingEnabled,
+    (enabled) => {
+      performanceReporter.setEnabled(enabled)
+    }
+  )
+
+  watch(
+    () => activeTab.value,
+    (newVal) => {
+      router.push({ name: newVal })
+    }
+  )
+
+  watch(
+    () => route.fullPath,
+    (newVal) => {
+      const pathWithoutQuery = newVal.split('?')[0]
+      const newTab =
+        pathWithoutQuery === '/'
+          ? (route.name as string)
+          : pathWithoutQuery.split('/').filter(Boolean)[0] || ''
+      if (newTab !== activeTab.value) {
+        activeTab.value = newTab
+      }
+      // Close artifacts page when route changes
+      artifactStore.hideArtifact()
+    }
+  )
+
+  // Listen for changes to current conversation
+  watch(
+    () => sessionStore.activeSessionId,
+    () => {
+      // Close artifacts page when switching conversations
+      artifactStore.hideArtifact()
+    }
+  )
+})
+
+// Clear timers and event listeners before component unmounts
+onBeforeUnmount(() => {
+  if (errorDisplayTimer) {
+    clearTimeout(errorDisplayTimer)
+    errorDisplayTimer = null
+  }
+
+  cleanupAppIpcRuntime()
+  cleanupMcpDeeplink()
+  performanceReporter.dispose()
+})
+</script>
+
+<template>
+  <div
+    data-testid="app-root"
+    class="flex flex-col h-screen"
+    :class="isWinMacOS ? 'bg-window-background' : 'bg-background'"
+  >
+    <AppBar />
+    <div class="flex flex-row h-0 grow relative overflow-hidden px-px py-px" :dir="langStore.dir">
+      <div class="flex flex-row w-full h-full">
+        <WindowSideBar></WindowSideBar>
+
+        <!-- Main content area -->
+        <div
+          data-testid="app-main"
+          class="flex h-full min-h-0 flex-1 min-w-0 flex-col overflow-hidden rounded-tl-xl border-l border-t border-black/20 bg-background dark:border-white/10"
+        >
+          <div class="min-h-0 flex-1">
+            <RouterView v-if="isStartupRouteReady" />
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- Global message dialog -->
+    <MessageDialog />
+    <McpSamplingDialog />
+    <!-- Global Toast notifications -->
+    <Toaster :theme="toasterTheme" />
+    <SelectedTextContextMenu />
+    <TranslatePopup />
+    <SpotlightOverlay />
+    <!-- Global model check dialog -->
+    <ModelCheckDialog
+      :open="modelCheckStore.isDialogOpen"
+      :provider-id="modelCheckStore.currentProviderId"
+      @update:open="
+        (open) => {
+          if (!open) modelCheckStore.closeDialog()
+        }
+      "
+    />
+  </div>
+</template>
diff --git a/src/renderer/src/components/chat/ChatToolInteractionOverlay.vue b/src/renderer/src/components/chat/ChatToolInteractionOverlay.vue
index 2548204813..0b0d3b4f2a 100644
--- a/src/renderer/src/components/chat/ChatToolInteractionOverlay.vue
+++ b/src/renderer/src/components/chat/ChatToolInteractionOverlay.vue
@@ -98,7 +98,7 @@ import { useI18n } from 'vue-i18n'
 import { Button } from '@shadcn/components/ui/button'
 import { Icon } from '@iconify/vue'
 import type { ToolInteractionResponse } from '@shared/types/agent-interface'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 type PendingInteractionView = {
   messageId: string
diff --git a/src/renderer/src/components/chat/MessageList.vue b/src/renderer/src/components/chat/MessageList.vue
index 77fc5939ed..87067c4358 100644
--- a/src/renderer/src/components/chat/MessageList.vue
+++ b/src/renderer/src/components/chat/MessageList.vue
@@ -51,7 +51,7 @@ import {
   type DisplayAssistantMessageBlock,
   type DisplayMessage,
   type MessageListItem
-} from './messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import MessageListRow from './MessageListRow.vue'
 
 const props = withDefaults(
diff --git a/src/renderer/src/components/chat/MessageListRow.vue b/src/renderer/src/components/chat/MessageListRow.vue
index b1b5aedcf8..49b854fa40 100644
--- a/src/renderer/src/components/chat/MessageListRow.vue
+++ b/src/renderer/src/components/chat/MessageListRow.vue
@@ -59,7 +59,7 @@ import {
   isCompactionMessageItem,
   type DisplayUserMessage,
   type MessageListItem
-} from './messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 
 const props = withDefaults(
   defineProps<{
diff --git a/src/renderer/src/components/message/MessageBlockAction.vue b/src/renderer/src/components/message/MessageBlockAction.vue
index 9fd3705b98..365ba02cea 100644
--- a/src/renderer/src/components/message/MessageBlockAction.vue
+++ b/src/renderer/src/components/message/MessageBlockAction.vue
@@ -48,7 +48,7 @@ import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { Button } from '@shadcn/components/ui/button'
 import { computed, ref, onMounted, onUnmounted } from 'vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 const { t } = useI18n()
 
diff --git a/src/renderer/src/components/message/MessageBlockActivityGroup.vue b/src/renderer/src/components/message/MessageBlockActivityGroup.vue
index 1754396209..bb9d4f8604 100644
--- a/src/renderer/src/components/message/MessageBlockActivityGroup.vue
+++ b/src/renderer/src/components/message/MessageBlockActivityGroup.vue
@@ -63,7 +63,7 @@ import { useI18n } from 'vue-i18n'
 import type {
   DisplayAssistantMessageBlock,
   DisplayMessageUsage
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import { formatActivityDuration } from './messageActivityGroups'
 import MessageBlockThink from './MessageBlockThink.vue'
 import MessageBlockToolCall from './MessageBlockToolCall.vue'
diff --git a/src/renderer/src/components/message/MessageBlockAudio.vue b/src/renderer/src/components/message/MessageBlockAudio.vue
index fa6405fcb0..19c9886751 100644
--- a/src/renderer/src/components/message/MessageBlockAudio.vue
+++ b/src/renderer/src/components/message/MessageBlockAudio.vue
@@ -35,7 +35,7 @@ import { computed, ref } from 'vue'
 import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
 import { Spinner } from '@shadcn/components/ui/spinner'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 const keyMap = {
   'mcp.sampling.contentType.audio': 'Audio',
diff --git a/src/renderer/src/components/message/MessageBlockContent.vue b/src/renderer/src/components/message/MessageBlockContent.vue
index f68920164c..4180c3761b 100644
--- a/src/renderer/src/components/message/MessageBlockContent.vue
+++ b/src/renderer/src/components/message/MessageBlockContent.vue
@@ -47,7 +47,7 @@ import ToolCallPreview from '../artifacts/ToolCallPreview.vue'
 import { useBlockContent, type ProcessedPart } from '@/composables/useArtifacts'
 import { useArtifactStore } from '@/stores/artifact'
 import MarkdownRenderer from '@/components/markdown/MarkdownRenderer.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 const artifactStore = useArtifactStore()
 const props = defineProps<{
diff --git a/src/renderer/src/components/message/MessageBlockError.vue b/src/renderer/src/components/message/MessageBlockError.vue
index 6131759034..66ae84cd9f 100644
--- a/src/renderer/src/components/message/MessageBlockError.vue
+++ b/src/renderer/src/components/message/MessageBlockError.vue
@@ -47,7 +47,7 @@
 import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { computed, ref, useId } from 'vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 const { t } = useI18n()
 
 const props = defineProps<{
diff --git a/src/renderer/src/components/message/MessageBlockImage.vue b/src/renderer/src/components/message/MessageBlockImage.vue
index fbdebad37b..b02a6517be 100644
--- a/src/renderer/src/components/message/MessageBlockImage.vue
+++ b/src/renderer/src/components/message/MessageBlockImage.vue
@@ -76,7 +76,7 @@ import { Button } from '@shadcn/components/ui/button'
 import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@shadcn/components/ui/dialog'
 import { Spinner } from '@shadcn/components/ui/spinner'
 import { Tooltip, TooltipContent, TooltipTrigger } from '@shadcn/components/ui/tooltip'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import ImageActionContextMenu from './ImageActionContextMenu.vue'
 import { useImageActions } from '@/composables/useImageActions'
 
diff --git a/src/renderer/src/components/message/MessageBlockQuestionRequest.vue b/src/renderer/src/components/message/MessageBlockQuestionRequest.vue
index 6468dd3a53..2b2d988faa 100644
--- a/src/renderer/src/components/message/MessageBlockQuestionRequest.vue
+++ b/src/renderer/src/components/message/MessageBlockQuestionRequest.vue
@@ -28,7 +28,7 @@
 <script setup lang="ts">
 import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import type { QuestionOption } from '@shared/types/core/question'
 
 const props = defineProps<{
diff --git a/src/renderer/src/components/message/MessageBlockThink.vue b/src/renderer/src/components/message/MessageBlockThink.vue
index 77bb49cc67..2d005b29ef 100644
--- a/src/renderer/src/components/message/MessageBlockThink.vue
+++ b/src/renderer/src/components/message/MessageBlockThink.vue
@@ -13,7 +13,7 @@ import { useI18n } from 'vue-i18n'
 import { ThinkContent } from '@/components/think-content'
 import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { createConfigClient } from '@api/ConfigClient'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import { useThrottleFn } from '@vueuse/core'
 const props = defineProps<{
   block: DisplayAssistantMessageBlock
diff --git a/src/renderer/src/components/message/MessageBlockToolCall.vue b/src/renderer/src/components/message/MessageBlockToolCall.vue
index 33b8b24601..8f344dda1f 100644
--- a/src/renderer/src/components/message/MessageBlockToolCall.vue
+++ b/src/renderer/src/components/message/MessageBlockToolCall.vue
@@ -213,7 +213,7 @@ import { summarizeToolCallPreview } from '@shared/lib/toolCallSummary'
 import { useThemeStore } from '@/stores/theme'
 import { useSessionStore } from '@/stores/ui/session'
 import { getLanguageFromFilename } from '@shared/utils/codeLanguage'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import { createDeviceClient } from '@api/DeviceClient'
 import MessageBlockToolCallImagePreview from './MessageBlockToolCallImagePreview.vue'
 
diff --git a/src/renderer/src/components/message/MessageBlockVideo.vue b/src/renderer/src/components/message/MessageBlockVideo.vue
index e8308b2f77..4c106cb885 100644
--- a/src/renderer/src/components/message/MessageBlockVideo.vue
+++ b/src/renderer/src/components/message/MessageBlockVideo.vue
@@ -38,7 +38,7 @@ import { computed, ref } from 'vue'
 import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
 import { Spinner } from '@shadcn/components/ui/spinner'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 const keyMap: Record<string, string> = {
   'common.video': 'Video',
diff --git a/src/renderer/src/components/message/MessageContent.vue b/src/renderer/src/components/message/MessageContent.vue
index 1cf9edd9c4..7e526dd223 100644
--- a/src/renderer/src/components/message/MessageContent.vue
+++ b/src/renderer/src/components/message/MessageContent.vue
@@ -55,7 +55,7 @@ import type {
   DisplayUserMessageMentionBlock,
   DisplayUserMessageSkillBlock,
   DisplayUserMessageTextBlock
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import { useLanguageStore } from '@/stores/language'
 import { getMimeTypeIcon } from '@/lib/utils'
 
diff --git a/src/renderer/src/components/message/MessageItemAssistant.vue b/src/renderer/src/components/message/MessageItemAssistant.vue
index d2e2841ba0..38be3ca188 100644
--- a/src/renderer/src/components/message/MessageItemAssistant.vue
+++ b/src/renderer/src/components/message/MessageItemAssistant.vue
@@ -203,7 +203,7 @@ import {
   type DisplayAssistantMessageBlock,
   filterRenderableAssistantBlocks,
   isInternalAssistantToolCallBlock
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import MessageBlockContent from './MessageBlockContent.vue'
 import MessageBlockThink from './MessageBlockThink.vue'
 import MessageBlockToolCall from './MessageBlockToolCall.vue'
diff --git a/src/renderer/src/components/message/MessageItemUser.vue b/src/renderer/src/components/message/MessageItemUser.vue
index 9db1066b30..e0b468d65e 100644
--- a/src/renderer/src/components/message/MessageItemUser.vue
+++ b/src/renderer/src/components/message/MessageItemUser.vue
@@ -124,7 +124,7 @@ import type {
   DisplayUserMessageInlineBlock,
   DisplayUserMessageMentionBlock,
   DisplayUserMessageSkillBlock
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
 import MessageInfo from './MessageInfo.vue'
diff --git a/src/renderer/src/components/message/messageActivityGroups.ts b/src/renderer/src/components/message/messageActivityGroups.ts
index b69b7795af..bbf6036986 100644
--- a/src/renderer/src/components/message/messageActivityGroups.ts
+++ b/src/renderer/src/components/message/messageActivityGroups.ts
@@ -1,4 +1,4 @@
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 export type AssistantRenderItem =
   | {
diff --git a/src/renderer/src/composables/message/useMessageWindow.ts b/src/renderer/src/composables/message/useMessageWindow.ts
index 9e22ed5994..57410b9743 100644
--- a/src/renderer/src/composables/message/useMessageWindow.ts
+++ b/src/renderer/src/composables/message/useMessageWindow.ts
@@ -1,5 +1,5 @@
 import { computed, shallowRef, triggerRef } from 'vue'
-import type { MessageListItem } from '@/components/chat/messageListItems'
+import type { MessageListItem } from '@/features/chat-page/model/displayMessage'
 
 export type MessageLayoutEntry = {
   id: string
diff --git a/src/renderer/src/composables/useArtifacts.ts b/src/renderer/src/composables/useArtifacts.ts
index f63ad82640..38d1b1d7b7 100644
--- a/src/renderer/src/composables/useArtifacts.ts
+++ b/src/renderer/src/composables/useArtifacts.ts
@@ -1,5 +1,5 @@
 import { computed } from 'vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 export interface ProcessedPart {
   type: 'text' | 'thinking' | 'artifact' | 'tool_call'
diff --git a/src/renderer/src/pages/ChatPage.vue b/src/renderer/src/features/chat-page/ChatPage.vue
similarity index 75%
rename from src/renderer/src/pages/ChatPage.vue
rename to src/renderer/src/features/chat-page/ChatPage.vue
index 70e3be05c0..6460bc8a04 100644
--- a/src/renderer/src/pages/ChatPage.vue
+++ b/src/renderer/src/features/chat-page/ChatPage.vue
@@ -247,7 +247,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, nextTick, onMounted, onUnmounted, toRaw } from 'vue'
+import { ref, computed, watch, nextTick, onMounted, onUnmounted, inject } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { TooltipProvider } from '@shadcn/components/ui/tooltip'
 import {
@@ -264,7 +264,6 @@ import ChatTopBar from '@/components/chat/ChatTopBar.vue'
 import ChatSearchBar from '@/components/chat/ChatSearchBar.vue'
 import ChatSessionSkeleton from '@/components/chat/ChatSessionSkeleton.vue'
 import MessageList from '@/components/chat/MessageList.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
 import ChatInputBox from '@/components/chat/ChatInputBox.vue'
 import ChatInputToolbar from '@/components/chat/ChatInputToolbar.vue'
 import AgentProgressFloat from '@/components/chat/AgentProgressFloat.vue'
@@ -275,7 +274,7 @@ import MemoryTurnDialog from '@/components/chat/MemoryTurnDialog.vue'
 import MemoryUpdateChip from '@/components/chat/MemoryUpdateChip.vue'
 import TraceDialog from '@/components/trace/TraceDialog.vue'
 import { useToast } from '@/components/use-toast'
-import { createChatClient } from '../../api/ChatClient'
+import { createChatClient } from '../../../api/ChatClient'
 import { createModelClient } from '@api/ModelClient'
 import { useUiSettingsStore } from '@/stores/uiSettingsStore'
 import { useSessionStore } from '@/stores/ui/session'
@@ -285,12 +284,9 @@ import { useAgentPlanStore } from '@/stores/ui/agentPlan'
 import { useSpotlightStore } from '@/stores/ui/spotlight'
 import { useModelStore } from '@/stores/modelStore'
 import { createSessionClient } from '@api/SessionClient'
-import { isManualCompactionCommand } from '@/components/chat/mentions/utils'
 import { clearChatSearchHighlights } from '@/lib/chatSearch'
 
 import { WORKSPACE_EVENTS } from '@/events'
-import { filterUnsupportedAudioAttachments } from '@/lib/audioInputSupport'
-import { useSpeechRecognition } from '@/components/chat/composables/useSpeechRecognition'
 import {
   useMessageWindow,
   type MessageMeasurementSnapshot
@@ -298,26 +294,48 @@ import {
 import { recentMessageMeasurementCache } from '@/composables/message/recentMessageMeasurementCache'
 import { useChatScrollController } from '@/composables/chat/useChatScrollController'
 import { markChatSessionPerformance } from '@/composables/chat/chatSessionPerformance'
+import {
+  RENDERER_PERFORMANCE_REPORTER,
+  type RendererPerformanceReporter
+} from '@/platform/performance/rendererPerformance'
 import { type ChatScrollReason, type ChatScrollTarget } from '@/composables/chat/chatScrollState'
 import { playChatInputHeroFlight } from '@/lib/chatInputHero'
-import { usePlanFloatLifecycle } from './chat-page/usePlanFloatLifecycle'
-import { useDisplayMessages } from './chat-page/useDisplayMessages'
-import { useChatSearch } from './chat-page/useChatSearch'
-import { useListGestures } from './chat-page/useListGestures'
-import { useMessageVirtualization } from './chat-page/useMessageVirtualization'
-import { useComposerSubmit } from './chat-page/useComposerSubmit'
-import { useSessionRestore } from './chat-page/useSessionRestore'
+import { usePlanFloatLifecycle } from './composables/usePlanFloatLifecycle'
+import { useDisplayMessages } from './composables/useDisplayMessages'
+import { useChatSearch } from './composables/useChatSearch'
+import { useListGestures } from './composables/useListGestures'
+import { useMessageVirtualization } from './composables/useMessageVirtualization'
+import { useComposerSubmit } from './composables/useComposerSubmit'
+import { useSessionRestore } from './composables/useSessionRestore'
+import { useVoiceInput } from './composables/useVoiceInput'
+import { useToolInteraction } from './composables/useToolInteraction'
+import { useMessageActions } from './composables/useMessageActions'
+import { usePendingInputActions } from './composables/usePendingInputActions'
+import { useChatPageEventBridge } from './composables/useChatPageEventBridge'
 import type {
   MessageFile,
   UserMessageInlineItem,
-  SendMessageInput,
-  ToolInteractionResponse
+  SendMessageInput
 } from '@shared/types/agent-interface'
 
 const props = defineProps<{
   sessionId: string
 }>()
 
+const performanceReporter = inject<RendererPerformanceReporter | null>(
+  RENDERER_PERFORMANCE_REPORTER,
+  null
+)
+
+function recordChatSessionPerformance(
+  phase: Parameters<typeof markChatSessionPerformance>[0],
+  sessionId: string,
+  sessionEpoch: number
+): void {
+  markChatSessionPerformance(phase, sessionId, sessionEpoch)
+  performanceReporter?.recordChatSession(phase, sessionEpoch)
+}
+
 const uiSettingsStore = useUiSettingsStore()
 const sessionStore = useSessionStore()
 const messageStore = useMessageStore()
@@ -378,7 +396,7 @@ const {
   pendingInputStore,
   initialRestoreCount: INITIAL_MESSAGE_RESTORE_COUNT,
   onSecondaryStateReady: (id) =>
-    markChatSessionPerformance('secondary-state-ready', id, chatScrollSessionEpoch)
+    recordChatSessionPerformance('secondary-state-ready', id, chatScrollSessionEpoch)
 })
 
 // --- Auto-scroll ---
@@ -402,8 +420,6 @@ const chatScrollController = useChatScrollController({
     if (container) syncMessageViewportMetrics(container)
   }
 })
-const pendingDeleteMessageId = ref<string | null>(null)
-const showDeleteMessageDialog = computed(() => Boolean(pendingDeleteMessageId.value))
 const TOP_HISTORY_THRESHOLD = 80
 const MESSAGE_JUMP_RETRY_INTERVAL = 80
 const MESSAGE_HIGHLIGHT_DURATION = 2000
@@ -421,7 +437,6 @@ const SESSION_RESTORE_SCROLL_INTENT_KEYS = new Set([
 const traceMessageId = ref<string | null>(null)
 let spotlightJumpTimer: number | null = null
 let scrollReadFrame: number | null = null
-let cancelPlanUpdatedListener: (() => void) | null = null
 // The immediate session watcher can call clearMessageWindowMeasurements before
 // messageWindow exists; keep this no-op forward reference and rebind it to
 // messageWindow.clearMeasurements after useMessageWindow is created below.
@@ -435,6 +450,7 @@ let restoreMessageWindowMeasurements = (snapshot: MessageMeasurementSnapshot) =>
 // is set up after the session-change watch that calls these on first run).
 let clearChatSearchStateRef = () => {}
 let cancelScheduledChatSearchRefreshRef = () => {}
+let clearMessageActionsForSessionChange = () => {}
 let measurementSessionId = ''
 let handledCommittedSessionId: string | null = null
 type HistoryLayoutAnchor = {
@@ -868,13 +884,13 @@ watch(
     }
     measurementSessionId = id
     listGestures.resetIntentForSessionChange()
-    pendingDeleteMessageId.value = null
+    clearMessageActionsForSessionChange()
     clearChatSearchStateRef()
     resetDisplayMessagesForSessionChange()
     beginSessionChange()
     chatScrollSessionEpoch = chatScrollController.beginSession(id)
-    markChatSessionPerformance('selected', id, chatScrollSessionEpoch)
-    markChatSessionPerformance('preparation-started', id, chatScrollSessionEpoch)
+    recordChatSessionPerformance('selected', id, chatScrollSessionEpoch)
+    recordChatSessionPerformance('preparation-started', id, chatScrollSessionEpoch)
     clearMessageWindowMeasurements()
     const activatedFromCache = id ? (messageStore.activateRecentSessionView?.(id) ?? false) : false
     const cachedMeasurements = activatedFromCache ? recentMessageMeasurementCache.get(id) : null
@@ -883,7 +899,7 @@ watch(
     }
     messageStore.clearStreamingStateForOtherSession(id)
     if (activatedFromCache) {
-      markChatSessionPerformance('cache-committed', id, chatScrollSessionEpoch)
+      recordChatSessionPerformance('cache-committed', id, chatScrollSessionEpoch)
     }
     pendingInputStore.clear()
     if (id) {
@@ -902,8 +918,8 @@ watch(
     }
 
     handledCommittedSessionId = id
-    markChatSessionPerformance('messages-prepared', id, chatScrollSessionEpoch)
-    markChatSessionPerformance('messages-committed', id, chatScrollSessionEpoch)
+    recordChatSessionPerformance('messages-prepared', id, chatScrollSessionEpoch)
+    recordChatSessionPerformance('messages-committed', id, chatScrollSessionEpoch)
     if (messageStore.committedSession?.id === id) {
       applyRestoredSessionSummary(messageStore.committedSession)
     }
@@ -923,7 +939,7 @@ watch(
         messageStore.currentSessionId === id &&
         messageStore.committedSessionId === id
       ) {
-        markChatSessionPerformance('first-message-paint', id, chatScrollSessionEpoch)
+        recordChatSessionPerformance('first-message-paint', id, chatScrollSessionEpoch)
       }
     })
     if (spotlightStore.pendingMessageJump?.sessionId === id) {
@@ -985,244 +1001,21 @@ const chatInputRef = ref<{
   consumePendingSkills?: () => string[]
   clearPendingSkills?: () => void
 } | null>(null)
-const isVoiceInputEnabled = ref(false)
-const isHandlingInteraction = ref(false)
-
-const handleVoiceInputError = (code: string) => {
-  if (code === 'aborted') {
-    return
-  }
-
-  if (code === 'not-allowed' || code === 'service-not-allowed' || code === 'audio-capture') {
-    toast({
-      title: t('chat.input.voiceRecognitionPermissionDeniedTitle'),
-      description: t('chat.input.voiceRecognitionPermissionDeniedDescription'),
-      variant: 'destructive'
-    })
-    return
-  }
-
-  toast({
-    title: t('chat.input.voiceRecognitionErrorTitle'),
-    description: t('chat.input.voiceRecognitionErrorDescription'),
-    variant: 'destructive'
-  })
-}
-
-const voiceInput = useSpeechRecognition({
-  onTranscript: (text) => {
-    chatInputRef.value?.insertRecognizedText?.(text)
-  },
-  transcribe: async ({ audioBase64, mimeType, filename }) => {
-    const selection = getActiveModelSelection()
-    if (!selection) {
-      throw new Error('transcription-target-unavailable')
-    }
-
-    return await modelClient.transcribeAudio(
-      selection.providerId,
-      selection.modelId,
-      audioBase64,
-      mimeType,
-      filename
-    )
-  },
-  onUnsupported: () => {
-    toast({
-      title: t('chat.input.voiceRecognitionUnsupportedTitle'),
-      description: t('chat.input.voiceRecognitionUnsupportedDescription'),
-      variant: 'destructive'
-    })
-  },
-  onError: handleVoiceInputError
-})
-const isVoiceInputListening = computed(() => voiceInput.isListening.value)
-const isVoiceInputTranscribing = computed(() => voiceInput.isTranscribing.value)
-let voiceInputConfigToken = 0
-
-async function refreshVoiceInputAvailability() {
-  const selection = getActiveModelSelection()
-  const token = ++voiceInputConfigToken
-
-  if (!selection) {
-    isVoiceInputEnabled.value = false
-    voiceInput.stop()
-    return
-  }
-
-  try {
-    const modelConfig = await modelClient.getModelConfig(selection.modelId, selection.providerId)
-    if (token !== voiceInputConfigToken) {
-      return
-    }
-
-    isVoiceInputEnabled.value = modelConfig.speechRecognition === true
-    if (!isVoiceInputEnabled.value) {
-      voiceInput.stop()
-    }
-  } catch (error) {
-    if (token !== voiceInputConfigToken) {
-      return
-    }
-
-    console.warn('[ChatPage] Failed to resolve voice input setting:', error)
-    isVoiceInputEnabled.value = false
-    voiceInput.stop()
-  }
-}
-
-watch(
-  () => [sessionStore.activeSession?.providerId, sessionStore.activeSession?.modelId],
-  () => {
-    void refreshVoiceInputAvailability()
-  },
-  { immediate: true }
-)
-
-const removeModelConfigChangedListener = modelClient.onModelConfigChanged((payload) => {
-  const selection = getActiveModelSelection()
-  if (!selection) {
-    return
-  }
-
-  if (payload.providerId !== selection.providerId || payload.modelId !== selection.modelId) {
-    return
-  }
-
-  void refreshVoiceInputAvailability()
-})
-
-const handleContextMenuAskAI = (event: Event) => {
-  if (isReadOnlySession.value) {
-    return
-  }
-
-  const detail = (event as CustomEvent<string>).detail
-  const text = typeof detail === 'string' ? detail.trim() : ''
-  if (!text) {
-    return
-  }
-  message.value = text
-}
-
-const handleWorkspaceInsertReferenceRequested = (event: Event) => {
-  if (isReadOnlySession.value) {
-    return
-  }
-
-  const detail = (event as CustomEvent<{ sessionId?: unknown; filePath?: unknown }>).detail
-  const sessionId = typeof detail?.sessionId === 'string' ? detail.sessionId.trim() : ''
-  const filePath = typeof detail?.filePath === 'string' ? detail.filePath.trim() : ''
-  if (sessionId !== props.sessionId || !filePath) {
-    return
-  }
-
-  chatInputRef.value?.insertWorkspaceReference?.(filePath)
-}
-
-type PendingInteractionView = {
-  sessionId: string
-  messageId: string
-  toolCallId: string
-  actionType: 'question_request' | 'tool_call_permission'
-  toolName: string
-  toolArgs: string
-  block: DisplayAssistantMessageBlock
-}
-
-type SubagentProgressPayload = {
-  tasks?: Array<{
-    sessionId?: string | null
-    waitingInteraction?: {
-      type: 'permission' | 'question'
-      messageId: string
-      toolCallId: string
-      actionBlock: DisplayAssistantMessageBlock
-    } | null
-  }>
-}
-
-function parseSubagentProgress(value: unknown): SubagentProgressPayload | null {
-  if (typeof value !== 'string' || !value.trim()) {
-    return null
-  }
-
-  try {
-    const parsed = JSON.parse(value) as SubagentProgressPayload
-    return Array.isArray(parsed?.tasks) ? parsed : null
-  } catch {
-    return null
-  }
-}
-
-const pendingInteractions = computed<PendingInteractionView[]>(() => {
-  const list: PendingInteractionView[] = []
 
-  for (const message of messageStore.messages) {
-    if (message.role !== 'assistant') continue
-    const blocks = messageStore.getAssistantMessageBlocks(message)
-
-    for (const block of blocks) {
-      if (
-        block.type !== 'action' ||
-        (block.action_type !== 'question_request' &&
-          block.action_type !== 'tool_call_permission') ||
-        block.status !== 'pending' ||
-        block.extra?.needsUserAction === false
-      ) {
-        continue
-      }
-
-      const toolCallId = block.tool_call?.id
-      if (!toolCallId) {
-        continue
-      }
-
-      list.push({
-        sessionId: props.sessionId,
-        messageId: message.id,
-        toolCallId,
-        actionType: block.action_type,
-        toolName: block.tool_call?.name || '',
-        toolArgs: block.tool_call?.params || '',
-        block
-      })
-    }
-
-    for (const block of blocks) {
-      if (block.type !== 'tool_call' || block.tool_call?.name !== 'subagent_orchestrator') {
-        continue
-      }
-
-      const progress = parseSubagentProgress(block.extra?.subagentProgress)
-      if (!progress?.tasks?.length) {
-        continue
-      }
-
-      for (const task of progress.tasks) {
-        const waiting = task.waitingInteraction
-        if (!waiting?.actionBlock || !task.sessionId) {
-          continue
-        }
-
-        list.push({
-          sessionId: task.sessionId,
-          messageId: waiting.messageId,
-          toolCallId: waiting.toolCallId,
-          actionType: waiting.type === 'question' ? 'question_request' : 'tool_call_permission',
-          toolName: waiting.actionBlock.tool_call?.name || block.tool_call?.name || '',
-          toolArgs: waiting.actionBlock.tool_call?.params || '',
-          block: waiting.actionBlock
-        })
-      }
-    }
-  }
-
-  return list
+const {
+  pendingInteractions,
+  activePendingInteraction,
+  isHandlingInteraction,
+  onToolInteractionRespond
+} = useToolInteraction({
+  sessionId: () => props.sessionId,
+  messageStore,
+  isReadOnlySession,
+  chatClient,
+  loadMessagesForSession,
+  applyRestoredSessionSummary
 })
 
-const activePendingInteraction = computed(() => pendingInteractions.value[0] ?? null)
-
 const {
   latestPlanSnapshot,
   isPlanFloatCollapsed,
@@ -1251,6 +1044,20 @@ function getActiveModelSelection(): { providerId: string; modelId: string } | nu
   }
 }
 
+const {
+  isVoiceInputEnabled,
+  isVoiceInputListening,
+  isVoiceInputTranscribing,
+  toggleVoiceInput,
+  cleanup: cleanupVoiceInput
+} = useVoiceInput({
+  chatInputRef,
+  getActiveModelSelection,
+  modelClient,
+  toast,
+  t
+})
+
 const {
   message,
   attachedFiles,
@@ -1293,6 +1100,63 @@ const {
   t
 })
 
+const {
+  showDeleteMessageDialog,
+  onMessageRetry,
+  onMessageDelete,
+  confirmMessageDelete,
+  cancelMessageDelete,
+  onDeleteMessageDialogOpenChange,
+  onMessageEditSave,
+  onMessageFork,
+  onMessageContinue,
+  clearForSessionChange
+} = useMessageActions({
+  sessionId: () => props.sessionId,
+  isReadOnlySession,
+  hasBlockingInteraction: () =>
+    Boolean(activePendingInteraction.value) || isHandlingInteraction.value,
+  messageStore,
+  sessionStore,
+  sessionClient,
+  beginPlanTurn,
+  clearPlanSnapshotForDeletedMessage,
+  loadMessagesForSession,
+  applyRestoredSessionSummary,
+  isCurrentSession: (sessionId) => props.sessionId === sessionId
+})
+clearMessageActionsForSessionChange = clearForSessionChange
+
+const { onPendingInputUpdate, onPendingInputMove, onPendingInputDelete, onPendingInputSteer } =
+  usePendingInputActions({
+    sessionId: () => props.sessionId,
+    isReadOnlySession,
+    isGenerating,
+    isAcpWorkdirMissing,
+    hasBlockingInteraction: () =>
+      Boolean(activePendingInteraction.value) || isHandlingInteraction.value,
+    pendingInputStore,
+    beginPlanTurn,
+    toast,
+    t
+  })
+
+const { start: startChatPageEventBridge, stop: stopChatPageEventBridge } = useChatPageEventBridge({
+  sessionId: () => props.sessionId,
+  isReadOnlySession,
+  chatInputRef,
+  setMessage: (text) => {
+    message.value = text
+  },
+  onWindowKeydown: handleWindowKeydown,
+  onPlanUpdated: (payload) => {
+    agentPlanStore.applySnapshot(payload)
+    scheduleInactivePlanSnapshotClear(payload.sessionId)
+  },
+  chatClient,
+  workspaceInsertReferenceEvent: WORKSPACE_EVENTS.INSERT_REFERENCE_REQUESTED
+})
+
 function onAttach() {
   chatInputRef.value?.triggerAttach()
 }
@@ -1302,36 +1166,7 @@ function onToggleVoiceInput() {
     return
   }
 
-  void voiceInput.toggle()
-}
-
-async function onToolInteractionRespond(response: ToolInteractionResponse) {
-  if (isReadOnlySession.value) {
-    return
-  }
-
-  const interaction = activePendingInteraction.value
-  if (!interaction || isHandlingInteraction.value) {
-    return
-  }
-
-  isHandlingInteraction.value = true
-  try {
-    const result = await chatClient.respondToolInteraction({
-      sessionId: interaction.sessionId,
-      messageId: interaction.messageId,
-      toolCallId: interaction.toolCallId,
-      response
-    })
-    applyRestoredSessionSummary(await loadMessagesForSession(props.sessionId))
-    if (result.handledInline) {
-      return
-    }
-  } catch (error) {
-    console.error('[ChatPage] respond tool interaction failed:', error)
-  } finally {
-    isHandlingInteraction.value = false
-  }
+  void toggleVoiceInput()
 }
 
 async function onStop() {
@@ -1345,149 +1180,12 @@ async function onStop() {
   }
 }
 
-async function onMessageRetry(messageId: string) {
-  if (isReadOnlySession.value) return
-  if (!messageId) return
-  if (activePendingInteraction.value || isHandlingInteraction.value) return
-  try {
-    beginPlanTurn(props.sessionId)
-    messageStore.clearStreamingState()
-    await sessionClient.retryMessage(props.sessionId, messageId)
-  } catch (error) {
-    console.error('[ChatPage] retry message failed:', error)
-    applyRestoredSessionSummary(await loadMessagesForSession(props.sessionId))
-  }
-}
-
-async function onMessageDelete(messageId: string) {
-  if (isReadOnlySession.value) return
-  if (!messageId) return
-  pendingDeleteMessageId.value = messageId
-}
-
-async function confirmMessageDelete() {
-  const messageId = pendingDeleteMessageId.value
-  if (!messageId) return
-  if (isReadOnlySession.value) return
-  const sessionId = props.sessionId
-  pendingDeleteMessageId.value = null
-  try {
-    messageStore.clearStreamingState()
-    await sessionClient.deleteMessage(sessionId, messageId)
-    clearPlanSnapshotForDeletedMessage(sessionId, messageId)
-    if (props.sessionId === sessionId) {
-      applyRestoredSessionSummary(await loadMessagesForSession(sessionId))
-    }
-  } catch (error) {
-    console.error('[ChatPage] delete message failed:', error)
-  }
-}
-
-function cancelMessageDelete() {
-  pendingDeleteMessageId.value = null
-}
-
-function onDeleteMessageDialogOpenChange(open: boolean) {
-  if (!open) {
-    cancelMessageDelete()
-  }
-}
-
-async function onMessageEditSave(payload: { messageId: string; text: string }) {
-  if (isReadOnlySession.value) return
-  const messageId = payload?.messageId
-  const text = payload?.text?.trim()
-  if (!messageId || !text) return
-
-  try {
-    await sessionClient.editUserMessage(props.sessionId, messageId, text)
-    await onMessageRetry(messageId)
-  } catch (error) {
-    console.error('[ChatPage] edit message failed:', error)
-  }
-}
-
-async function onMessageFork(messageId: string) {
-  if (isReadOnlySession.value) return
-  if (!messageId) return
-  try {
-    const forked = await sessionClient.forkSession(props.sessionId, messageId)
-    await sessionStore.fetchSessions()
-    await sessionStore.selectSession(forked.id)
-  } catch (error) {
-    console.error('[ChatPage] fork session failed:', error)
-  }
-}
-
-async function onMessageContinue(_conversationId: string, messageId: string) {
-  if (isReadOnlySession.value) return
-  if (!messageId) return
-  try {
-    beginPlanTurn(props.sessionId)
-    messageStore.clearStreamingState()
-    await sessionClient.retryMessage(props.sessionId, messageId)
-  } catch (error) {
-    console.error('[ChatPage] continue message failed:', error)
-    applyRestoredSessionSummary(await loadMessagesForSession(props.sessionId))
-  }
-}
-
 function onMessageTrace(messageId: string) {
   traceMessageId.value = messageId
 }
 
-async function onPendingInputUpdate(payload: { itemId: string; text: string }) {
-  if (isReadOnlySession.value) return
-  const target = pendingInputStore.queueItems.find((item) => item.id === payload.itemId)
-  if (!target) {
-    return
-  }
-
-  await pendingInputStore.updateQueueInput(props.sessionId, payload.itemId, {
-    text: payload.text,
-    files: target.payload.files ?? [],
-    activeSkills: target.payload.activeSkills ?? []
-  })
-}
-
-async function onPendingInputMove(payload: { itemId: string; toIndex: number }) {
-  if (isReadOnlySession.value) return
-  await pendingInputStore.moveQueueInput(props.sessionId, payload.itemId, payload.toIndex)
-}
-
-async function onPendingInputDelete(itemId: string) {
-  if (isReadOnlySession.value) return
-  await pendingInputStore.deleteInput(props.sessionId, itemId)
-}
-
-async function onPendingInputSteer(itemId: string) {
-  if (isReadOnlySession.value) return
-  if (!isGenerating.value) return
-  if (isAcpWorkdirMissing.value) return
-  if (activePendingInteraction.value || isHandlingInteraction.value) return
-  try {
-    await pendingInputStore.steerPendingInput(props.sessionId, itemId)
-    beginPlanTurn(props.sessionId)
-  } catch (error) {
-    console.error('[ChatPage] steer queued input failed:', error)
-    toast({
-      title: t('chat.pendingInput.steerFailed'),
-      variant: 'destructive'
-    })
-  }
-}
-
 onMounted(() => {
-  window.addEventListener('context-menu-ask-ai', handleContextMenuAskAI)
-  window.addEventListener(
-    WORKSPACE_EVENTS.INSERT_REFERENCE_REQUESTED,
-    handleWorkspaceInsertReferenceRequested
-  )
-  window.addEventListener('keydown', handleWindowKeydown)
-  cancelPlanUpdatedListener = chatClient.onPlanUpdated((payload) => {
-    agentPlanStore.applySnapshot(payload)
-    scheduleInactivePlanSnapshotClear(payload.sessionId)
-  })
+  startChatPageEventBridge()
   // 初始化滚动状态
   const el = scrollContainer.value
   if (el) {
@@ -1496,7 +1194,7 @@ onMounted(() => {
   }
   connectChatGeometryObserver()
   void nextTick(async () => {
-    markChatSessionPerformance('input-ready', props.sessionId, chatScrollSessionEpoch)
+    recordChatSessionPerformance('input-ready', props.sessionId, chatScrollSessionEpoch)
     await playChatInputHeroFlight(resolveChatInputBoxElement())
   })
 })
@@ -1505,17 +1203,9 @@ onUnmounted(() => {
   deactivateSessionRestore()
   invalidatePendingAttachmentFilter()
   cacheCurrentMessageMeasurements()
-  removeModelConfigChangedListener()
+  cleanupVoiceInput()
   cancelAllPlanSnapshotClearTimers()
-  cancelPlanUpdatedListener?.()
-  cancelPlanUpdatedListener = null
-  voiceInput.cleanup()
-  window.removeEventListener('context-menu-ask-ai', handleContextMenuAskAI)
-  window.removeEventListener(
-    WORKSPACE_EVENTS.INSERT_REFERENCE_REQUESTED,
-    handleWorkspaceInsertReferenceRequested
-  )
-  window.removeEventListener('keydown', handleWindowKeydown)
+  stopChatPageEventBridge()
   clearChatSearchHighlights(messageSearchRoot.value)
   if (spotlightJumpTimer) {
     window.clearTimeout(spotlightJumpTimer)
diff --git a/src/renderer/src/features/chat-page/composables/useChatPageEventBridge.ts b/src/renderer/src/features/chat-page/composables/useChatPageEventBridge.ts
new file mode 100644
index 0000000000..2f301a8572
--- /dev/null
+++ b/src/renderer/src/features/chat-page/composables/useChatPageEventBridge.ts
@@ -0,0 +1,95 @@
+import type { ComputedRef, Ref } from 'vue'
+import type { DeepchatEventPayload } from '@shared/contracts/events'
+
+type ChatInputHandle = {
+  insertWorkspaceReference?: (targetPath: string) => boolean
+}
+
+type PlanUpdatedPayload = DeepchatEventPayload<'chat.plan.updated'>
+
+type ChatClientLike = {
+  onPlanUpdated: (listener: (payload: PlanUpdatedPayload) => void) => () => void
+}
+
+type UseChatPageEventBridgeOptions = {
+  sessionId: () => string
+  isReadOnlySession: ComputedRef<boolean>
+  chatInputRef: Ref<ChatInputHandle | null>
+  setMessage: (text: string) => void
+  onWindowKeydown: (event: KeyboardEvent) => void
+  onPlanUpdated: (payload: PlanUpdatedPayload) => void
+  chatClient: ChatClientLike
+  workspaceInsertReferenceEvent: string
+}
+
+/**
+ * Owns the global event subscriptions that bridge ChatPage-local state to
+ * browser events and plan notifications. Lifecycle stays explicit so ChatPage
+ * retains its established mount/unmount ordering around viewport setup.
+ */
+export function useChatPageEventBridge(options: UseChatPageEventBridgeOptions) {
+  let unsubscribePlanUpdated: (() => void) | null = null
+  let started = false
+
+  const onContextMenuAskAI = (event: Event) => {
+    if (options.isReadOnlySession.value) {
+      return
+    }
+
+    const detail = (event as CustomEvent<string>).detail
+    const text = typeof detail === 'string' ? detail.trim() : ''
+    if (!text) {
+      return
+    }
+
+    options.setMessage(text)
+  }
+
+  const onWorkspaceInsertReferenceRequested = (event: Event) => {
+    if (options.isReadOnlySession.value) {
+      return
+    }
+
+    const detail = (event as CustomEvent<{ sessionId?: unknown; filePath?: unknown }>).detail
+    const sessionId = typeof detail?.sessionId === 'string' ? detail.sessionId.trim() : ''
+    const filePath = typeof detail?.filePath === 'string' ? detail.filePath.trim() : ''
+    if (sessionId !== options.sessionId() || !filePath) {
+      return
+    }
+
+    options.chatInputRef.value?.insertWorkspaceReference?.(filePath)
+  }
+
+  function start() {
+    if (started) {
+      return
+    }
+
+    started = true
+    window.addEventListener('context-menu-ask-ai', onContextMenuAskAI)
+    window.addEventListener(
+      options.workspaceInsertReferenceEvent,
+      onWorkspaceInsertReferenceRequested
+    )
+    window.addEventListener('keydown', options.onWindowKeydown)
+    unsubscribePlanUpdated = options.chatClient.onPlanUpdated(options.onPlanUpdated)
+  }
+
+  function stop() {
+    if (!started) {
+      return
+    }
+
+    started = false
+    unsubscribePlanUpdated?.()
+    unsubscribePlanUpdated = null
+    window.removeEventListener('context-menu-ask-ai', onContextMenuAskAI)
+    window.removeEventListener(
+      options.workspaceInsertReferenceEvent,
+      onWorkspaceInsertReferenceRequested
+    )
+    window.removeEventListener('keydown', options.onWindowKeydown)
+  }
+
+  return { start, stop }
+}
diff --git a/src/renderer/src/pages/chat-page/useChatSearch.ts b/src/renderer/src/features/chat-page/composables/useChatSearch.ts
similarity index 98%
rename from src/renderer/src/pages/chat-page/useChatSearch.ts
rename to src/renderer/src/features/chat-page/composables/useChatSearch.ts
index 2601792595..69da4a9a47 100644
--- a/src/renderer/src/pages/chat-page/useChatSearch.ts
+++ b/src/renderer/src/features/chat-page/composables/useChatSearch.ts
@@ -6,7 +6,7 @@ import {
   setActiveChatSearchResult,
   type ChatSearchResult
 } from '@/lib/chatSearch'
-import type { DisplayMessage } from '@/components/chat/messageListItems'
+import type { DisplayMessage } from '@/features/chat-page/model/displayMessage'
 import type { ChatScrollTarget, ChatScrollReason } from '@/composables/chat/chatScrollState'
 
 type UseChatSearchOptions = {
diff --git a/src/renderer/src/pages/chat-page/useComposerSubmit.ts b/src/renderer/src/features/chat-page/composables/useComposerSubmit.ts
similarity index 100%
rename from src/renderer/src/pages/chat-page/useComposerSubmit.ts
rename to src/renderer/src/features/chat-page/composables/useComposerSubmit.ts
diff --git a/src/renderer/src/pages/chat-page/useDisplayMessages.ts b/src/renderer/src/features/chat-page/composables/useDisplayMessages.ts
similarity index 99%
rename from src/renderer/src/pages/chat-page/useDisplayMessages.ts
rename to src/renderer/src/features/chat-page/composables/useDisplayMessages.ts
index 4f8ab102b0..d0506a875b 100644
--- a/src/renderer/src/pages/chat-page/useDisplayMessages.ts
+++ b/src/renderer/src/features/chat-page/composables/useDisplayMessages.ts
@@ -6,11 +6,11 @@ import type {
   DisplayAssistantMessageBlock,
   DisplayMessage,
   DisplayMessageUsage
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import {
   filterRenderableAssistantBlocks,
   hasRenderableAssistantBlocks
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import type { ChatMessageRecord, MessageMetadata } from '@shared/types/agent-interface'
 
 type MessageStore = ReturnType<typeof useMessageStore>
diff --git a/src/renderer/src/pages/chat-page/useListGestures.ts b/src/renderer/src/features/chat-page/composables/useListGestures.ts
similarity index 97%
rename from src/renderer/src/pages/chat-page/useListGestures.ts
rename to src/renderer/src/features/chat-page/composables/useListGestures.ts
index f8fcf81578..2f379eca86 100644
--- a/src/renderer/src/pages/chat-page/useListGestures.ts
+++ b/src/renderer/src/features/chat-page/composables/useListGestures.ts
@@ -179,13 +179,18 @@ export function useListGestures(options: UseListGesturesOptions) {
    * lifecycle so auto-follow yields to the user identically to pointer input.
    */
   function markKeyboardScrollIntent(isUpward: boolean): void {
-    options.onGestureStart('keyboard')
+    if (!isListScrolling.value) {
+      options.onGestureStart('keyboard')
+    }
     updateUpwardPaginationIntent(isUpward)
     markListScrolling()
   }
 
   /** Wheel intent: arm pagination direction and keep the scrolling state warm. */
   function markWheelScrollIntent(isUpward: boolean): void {
+    if (!isListScrolling.value) {
+      options.onGestureStart('wheel')
+    }
     updateUpwardPaginationIntent(isUpward)
     markListScrolling()
   }
diff --git a/src/renderer/src/features/chat-page/composables/useMessageActions.ts b/src/renderer/src/features/chat-page/composables/useMessageActions.ts
new file mode 100644
index 0000000000..c3d075ea39
--- /dev/null
+++ b/src/renderer/src/features/chat-page/composables/useMessageActions.ts
@@ -0,0 +1,141 @@
+import { computed, ref, type ComputedRef } from 'vue'
+import type { useMessageStore } from '@/stores/ui/message'
+import type { useSessionStore } from '@/stores/ui/session'
+
+type MessageStore = ReturnType<typeof useMessageStore>
+type SessionStore = ReturnType<typeof useSessionStore>
+
+type SessionClientLike = {
+  retryMessage: (sessionId: string, messageId: string) => Promise<unknown>
+  deleteMessage: (sessionId: string, messageId: string) => Promise<unknown>
+  editUserMessage: (sessionId: string, messageId: string, text: string) => Promise<unknown>
+  forkSession: (sessionId: string, messageId: string) => Promise<{ id: string }>
+}
+
+type UseMessageActionsOptions = {
+  sessionId: () => string
+  isReadOnlySession: ComputedRef<boolean>
+  hasBlockingInteraction: () => boolean
+  messageStore: MessageStore
+  sessionStore: SessionStore
+  sessionClient: SessionClientLike
+  beginPlanTurn: (sessionId: string) => void
+  clearPlanSnapshotForDeletedMessage: (sessionId: string, messageId: string) => void
+  loadMessagesForSession: (sessionId: string) => Promise<unknown>
+  applyRestoredSessionSummary: (session: unknown) => void
+  isCurrentSession: (sessionId: string) => boolean
+}
+
+/**
+ * Owns message-level user actions while preserving their existing retry,
+ * confirmation, and refresh semantics. The page remains responsible for the
+ * session-change lifecycle and calls clearForSessionChange at that boundary.
+ */
+export function useMessageActions(options: UseMessageActionsOptions) {
+  const pendingDeleteMessageId = ref<string | null>(null)
+  const showDeleteMessageDialog = computed(() => Boolean(pendingDeleteMessageId.value))
+
+  async function refreshAfterRetryFailure(sessionId: string) {
+    options.applyRestoredSessionSummary(await options.loadMessagesForSession(sessionId))
+  }
+
+  async function retryMessage(
+    messageId: string,
+    errorMessage: string,
+    blocksInteraction: boolean,
+    sessionId = options.sessionId()
+  ) {
+    if (options.isReadOnlySession.value || !messageId) return
+    if (blocksInteraction && options.hasBlockingInteraction()) return
+
+    try {
+      options.beginPlanTurn(sessionId)
+      options.messageStore.clearStreamingState()
+      await options.sessionClient.retryMessage(sessionId, messageId)
+    } catch (error) {
+      console.error(errorMessage, error)
+      await refreshAfterRetryFailure(sessionId)
+    }
+  }
+
+  async function onMessageRetry(messageId: string, sessionId = options.sessionId()) {
+    await retryMessage(messageId, '[ChatPage] retry message failed:', true, sessionId)
+  }
+
+  async function onMessageDelete(messageId: string) {
+    if (options.isReadOnlySession.value || !messageId) return
+    pendingDeleteMessageId.value = messageId
+  }
+
+  async function confirmMessageDelete() {
+    const messageId = pendingDeleteMessageId.value
+    if (!messageId || options.isReadOnlySession.value) return
+
+    const sessionId = options.sessionId()
+    pendingDeleteMessageId.value = null
+    try {
+      options.messageStore.clearStreamingState()
+      await options.sessionClient.deleteMessage(sessionId, messageId)
+      options.clearPlanSnapshotForDeletedMessage(sessionId, messageId)
+      if (options.isCurrentSession(sessionId)) {
+        options.applyRestoredSessionSummary(await options.loadMessagesForSession(sessionId))
+      }
+    } catch (error) {
+      console.error('[ChatPage] delete message failed:', error)
+    }
+  }
+
+  function cancelMessageDelete() {
+    pendingDeleteMessageId.value = null
+  }
+
+  function onDeleteMessageDialogOpenChange(open: boolean) {
+    if (!open) {
+      cancelMessageDelete()
+    }
+  }
+
+  async function onMessageEditSave(payload: { messageId: string; text: string }) {
+    if (options.isReadOnlySession.value) return
+    const messageId = payload?.messageId
+    const text = payload?.text?.trim()
+    if (!messageId || !text) return
+
+    const sessionId = options.sessionId()
+    try {
+      await options.sessionClient.editUserMessage(sessionId, messageId, text)
+      await onMessageRetry(messageId, sessionId)
+    } catch (error) {
+      console.error('[ChatPage] edit message failed:', error)
+    }
+  }
+
+  async function onMessageFork(messageId: string) {
+    if (options.isReadOnlySession.value || !messageId) return
+
+    try {
+      const forked = await options.sessionClient.forkSession(options.sessionId(), messageId)
+      await options.sessionStore.fetchSessions()
+      await options.sessionStore.selectSession(forked.id)
+    } catch (error) {
+      console.error('[ChatPage] fork session failed:', error)
+    }
+  }
+
+  async function onMessageContinue(_conversationId: string, messageId: string) {
+    await retryMessage(messageId, '[ChatPage] continue message failed:', false)
+  }
+
+  return {
+    showDeleteMessageDialog,
+    onMessageRetry,
+    onMessageDelete,
+    confirmMessageDelete,
+    cancelMessageDelete,
+    onDeleteMessageDialogOpenChange,
+    onMessageEditSave,
+    onMessageFork,
+    onMessageContinue,
+    clearForSessionChange: cancelMessageDelete
+  }
+}
diff --git a/src/renderer/src/pages/chat-page/useMessageVirtualization.ts b/src/renderer/src/features/chat-page/composables/useMessageVirtualization.ts
similarity index 99%
rename from src/renderer/src/pages/chat-page/useMessageVirtualization.ts
rename to src/renderer/src/features/chat-page/composables/useMessageVirtualization.ts
index ba06deee23..ed2b8c141e 100644
--- a/src/renderer/src/pages/chat-page/useMessageVirtualization.ts
+++ b/src/renderer/src/features/chat-page/composables/useMessageVirtualization.ts
@@ -1,6 +1,6 @@
 import { computed, ref, type ComputedRef, type Ref } from 'vue'
 import type { useMessageWindow } from '@/composables/message/useMessageWindow'
-import type { DisplayMessage } from '@/components/chat/messageListItems'
+import type { DisplayMessage } from '@/features/chat-page/model/displayMessage'
 
 type MessageWindow = ReturnType<typeof useMessageWindow>
 
diff --git a/src/renderer/src/features/chat-page/composables/usePendingInputActions.ts b/src/renderer/src/features/chat-page/composables/usePendingInputActions.ts
new file mode 100644
index 0000000000..fb3f31f94e
--- /dev/null
+++ b/src/renderer/src/features/chat-page/composables/usePendingInputActions.ts
@@ -0,0 +1,85 @@
+import type { ComputedRef } from 'vue'
+import type { usePendingInputStore } from '@/stores/ui/pendingInput'
+
+type PendingInputStore = ReturnType<typeof usePendingInputStore>
+
+type ToastFn = (options: {
+  title: string
+  description?: string
+  variant?: 'destructive'
+}) => unknown
+
+type UsePendingInputActionsOptions = {
+  sessionId: () => string
+  isReadOnlySession: ComputedRef<boolean>
+  isGenerating: ComputedRef<boolean>
+  isAcpWorkdirMissing: ComputedRef<boolean>
+  hasBlockingInteraction: () => boolean
+  pendingInputStore: PendingInputStore
+  beginPlanTurn: (sessionId: string) => void
+  toast: ToastFn
+  t: (key: string) => string
+}
+
+/**
+ * Owns operations on already-queued composer input. It intentionally stays
+ * separate from useComposerSubmit, which owns creating new drafts and submit
+ * dispatch, so queue-item mutations retain a narrow dependency surface.
+ */
+export function usePendingInputActions(options: UsePendingInputActionsOptions) {
+  async function onPendingInputUpdate(payload: { itemId: string; text: string }) {
+    if (options.isReadOnlySession.value) return
+
+    const target = options.pendingInputStore.queueItems.find((item) => item.id === payload.itemId)
+    if (!target) {
+      return
+    }
+
+    await options.pendingInputStore.updateQueueInput(options.sessionId(), payload.itemId, {
+      text: payload.text,
+      files: target.payload.files ?? [],
+      activeSkills: target.payload.activeSkills ?? [],
+      inlineItems: target.payload.inlineItems ?? []
+    })
+  }
+
+  async function onPendingInputMove(payload: { itemId: string; toIndex: number }) {
+    if (options.isReadOnlySession.value) return
+    await options.pendingInputStore.moveQueueInput(
+      options.sessionId(),
+      payload.itemId,
+      payload.toIndex
+    )
+  }
+
+  async function onPendingInputDelete(itemId: string) {
+    if (options.isReadOnlySession.value) return
+    await options.pendingInputStore.deleteInput(options.sessionId(), itemId)
+  }
+
+  async function onPendingInputSteer(itemId: string) {
+    if (options.isReadOnlySession.value) return
+    if (!options.isGenerating.value) return
+    if (options.isAcpWorkdirMissing.value) return
+    if (options.hasBlockingInteraction()) return
+
+    const sessionId = options.sessionId()
+    try {
+      await options.pendingInputStore.steerPendingInput(sessionId, itemId)
+      options.beginPlanTurn(sessionId)
+    } catch (error) {
+      console.error('[ChatPage] steer queued input failed:', error)
+      options.toast({
+        title: options.t('chat.pendingInput.steerFailed'),
+        variant: 'destructive'
+      })
+    }
+  }
+
+  return {
+    onPendingInputUpdate,
+    onPendingInputMove,
+    onPendingInputDelete,
+    onPendingInputSteer
+  }
+}
diff --git a/src/renderer/src/pages/chat-page/usePlanFloatLifecycle.ts b/src/renderer/src/features/chat-page/composables/usePlanFloatLifecycle.ts
similarity index 100%
rename from src/renderer/src/pages/chat-page/usePlanFloatLifecycle.ts
rename to src/renderer/src/features/chat-page/composables/usePlanFloatLifecycle.ts
diff --git a/src/renderer/src/pages/chat-page/useSessionRestore.ts b/src/renderer/src/features/chat-page/composables/useSessionRestore.ts
similarity index 100%
rename from src/renderer/src/pages/chat-page/useSessionRestore.ts
rename to src/renderer/src/features/chat-page/composables/useSessionRestore.ts
diff --git a/src/renderer/src/features/chat-page/composables/useToolInteraction.ts b/src/renderer/src/features/chat-page/composables/useToolInteraction.ts
new file mode 100644
index 0000000000..9d8cd5fae0
--- /dev/null
+++ b/src/renderer/src/features/chat-page/composables/useToolInteraction.ts
@@ -0,0 +1,172 @@
+import { computed, ref, type ComputedRef } from 'vue'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
+import type { useMessageStore } from '@/stores/ui/message'
+import type { ToolInteractionResponse } from '@shared/types/agent-interface'
+
+type MessageStore = ReturnType<typeof useMessageStore>
+
+type PendingInteractionView = {
+  sessionId: string
+  messageId: string
+  toolCallId: string
+  actionType: 'question_request' | 'tool_call_permission'
+  toolName: string
+  toolArgs: string
+  block: DisplayAssistantMessageBlock
+}
+
+type SubagentProgressPayload = {
+  tasks?: Array<{
+    sessionId?: string | null
+    waitingInteraction?: {
+      type: 'permission' | 'question'
+      messageId: string
+      toolCallId: string
+      actionBlock: DisplayAssistantMessageBlock
+    } | null
+  }>
+}
+
+type ChatClientLike = {
+  respondToolInteraction: (input: {
+    sessionId: string
+    messageId: string
+    toolCallId: string
+    response: ToolInteractionResponse
+  }) => Promise<{ handledInline?: boolean }>
+}
+
+type UseToolInteractionOptions = {
+  sessionId: () => string
+  messageStore: MessageStore
+  isReadOnlySession: ComputedRef<boolean>
+  chatClient: ChatClientLike
+  loadMessagesForSession: (sessionId: string) => Promise<unknown>
+  applyRestoredSessionSummary: (session: unknown) => void
+}
+
+function parseSubagentProgress(value: unknown): SubagentProgressPayload | null {
+  if (typeof value !== 'string' || !value.trim()) {
+    return null
+  }
+
+  try {
+    const parsed = JSON.parse(value) as SubagentProgressPayload
+    return Array.isArray(parsed?.tasks) ? parsed : null
+  } catch {
+    return null
+  }
+}
+
+/**
+ * Owns pending tool/question interaction discovery and response submission.
+ * It preserves the page's current-session refresh semantics after a response,
+ * while the page composes the returned state into its plan and composer gates.
+ */
+export function useToolInteraction(options: UseToolInteractionOptions) {
+  const isHandlingInteraction = ref(false)
+
+  const pendingInteractions = computed<PendingInteractionView[]>(() => {
+    const list: PendingInteractionView[] = []
+
+    for (const message of options.messageStore.messages) {
+      if (message.role !== 'assistant') continue
+      const blocks = options.messageStore.getAssistantMessageBlocks(message)
+
+      for (const block of blocks) {
+        if (
+          block.type !== 'action' ||
+          (block.action_type !== 'question_request' &&
+            block.action_type !== 'tool_call_permission') ||
+          block.status !== 'pending' ||
+          block.extra?.needsUserAction === false
+        ) {
+          continue
+        }
+
+        const toolCallId = block.tool_call?.id
+        if (!toolCallId) {
+          continue
+        }
+
+        list.push({
+          sessionId: options.sessionId(),
+          messageId: message.id,
+          toolCallId,
+          actionType: block.action_type,
+          toolName: block.tool_call?.name || '',
+          toolArgs: block.tool_call?.params || '',
+          block
+        })
+      }
+
+      for (const block of blocks) {
+        if (block.type !== 'tool_call' || block.tool_call?.name !== 'subagent_orchestrator') {
+          continue
+        }
+
+        const progress = parseSubagentProgress(block.extra?.subagentProgress)
+        if (!progress?.tasks?.length) {
+          continue
+        }
+
+        for (const task of progress.tasks) {
+          const waiting = task.waitingInteraction
+          if (!waiting?.actionBlock || !task.sessionId) {
+            continue
+          }
+
+          list.push({
+            sessionId: task.sessionId,
+            messageId: waiting.messageId,
+            toolCallId: waiting.toolCallId,
+            actionType: waiting.type === 'question' ? 'question_request' : 'tool_call_permission',
+            toolName: waiting.actionBlock.tool_call?.name || block.tool_call?.name || '',
+            toolArgs: waiting.actionBlock.tool_call?.params || '',
+            block: waiting.actionBlock
+          })
+        }
+      }
+    }
+
+    return list
+  })
+
+  const activePendingInteraction = computed(() => pendingInteractions.value[0] ?? null)
+
+  async function onToolInteractionRespond(response: ToolInteractionResponse) {
+    if (options.isReadOnlySession.value) {
+      return
+    }
+
+    const interaction = activePendingInteraction.value
+    if (!interaction || isHandlingInteraction.value) {
+      return
+    }
+
+    isHandlingInteraction.value = true
+    try {
+      const result = await options.chatClient.respondToolInteraction({
+        sessionId: interaction.sessionId,
+        messageId: interaction.messageId,
+        toolCallId: interaction.toolCallId,
+        response
+      })
+      options.applyRestoredSessionSummary(await options.loadMessagesForSession(options.sessionId()))
+      if (result.handledInline) {
+        return
+      }
+    } catch (error) {
+      console.error('[ChatPage] respond tool interaction failed:', error)
+    } finally {
+      isHandlingInteraction.value = false
+    }
+  }
+
+  return {
+    pendingInteractions,
+    activePendingInteraction,
+    isHandlingInteraction,
+    onToolInteractionRespond
+  }
+}
diff --git a/src/renderer/src/features/chat-page/composables/useVoiceInput.ts b/src/renderer/src/features/chat-page/composables/useVoiceInput.ts
new file mode 100644
index 0000000000..cceb8aba12
--- /dev/null
+++ b/src/renderer/src/features/chat-page/composables/useVoiceInput.ts
@@ -0,0 +1,174 @@
+import { computed, ref, watch, type Ref } from 'vue'
+import {
+  useSpeechRecognition,
+  type SpeechRecognitionErrorCode
+} from '@/components/chat/composables/useSpeechRecognition'
+
+type ModelSelection = {
+  providerId: string
+  modelId: string
+}
+
+type ChatInputHandle = {
+  insertRecognizedText?: (text: string) => void
+}
+
+type ModelClientLike = {
+  getModelConfig: (
+    modelId: string,
+    providerId?: string
+  ) => Promise<{ speechRecognition?: boolean | null }>
+  transcribeAudio: (
+    providerId: string,
+    modelId: string,
+    audioBase64: string,
+    mimeType: string,
+    filename?: string
+  ) => Promise<string>
+  onModelConfigChanged: (
+    listener: (payload: { providerId?: string; modelId?: string }) => void
+  ) => () => void
+}
+
+type ToastFn = (options: {
+  title: string
+  description?: string
+  variant?: 'destructive'
+}) => unknown
+
+type UseVoiceInputOptions = {
+  chatInputRef: Ref<ChatInputHandle | null>
+  getActiveModelSelection: () => ModelSelection | null
+  modelClient: ModelClientLike
+  toast: ToastFn
+  t: (key: string) => string
+}
+
+/**
+ * Owns the voice-input capability state and its model-configuration race gate.
+ * The page remains responsible for resolving the active model, while this
+ * composable prevents stale config reads from changing the current input state.
+ */
+export function useVoiceInput(options: UseVoiceInputOptions) {
+  const isVoiceInputEnabled = ref(false)
+  let voiceInputConfigToken = 0
+
+  const handleVoiceInputError = (code: SpeechRecognitionErrorCode) => {
+    if (code === 'aborted') {
+      return
+    }
+
+    if (code === 'not-allowed' || code === 'service-not-allowed' || code === 'audio-capture') {
+      options.toast({
+        title: options.t('chat.input.voiceRecognitionPermissionDeniedTitle'),
+        description: options.t('chat.input.voiceRecognitionPermissionDeniedDescription'),
+        variant: 'destructive'
+      })
+      return
+    }
+
+    options.toast({
+      title: options.t('chat.input.voiceRecognitionErrorTitle'),
+      description: options.t('chat.input.voiceRecognitionErrorDescription'),
+      variant: 'destructive'
+    })
+  }
+
+  const voiceInput = useSpeechRecognition({
+    onTranscript: (text) => {
+      options.chatInputRef.value?.insertRecognizedText?.(text)
+    },
+    transcribe: async ({ audioBase64, mimeType, filename }) => {
+      const selection = options.getActiveModelSelection()
+      if (!selection) {
+        throw new Error('transcription-target-unavailable')
+      }
+
+      return await options.modelClient.transcribeAudio(
+        selection.providerId,
+        selection.modelId,
+        audioBase64,
+        mimeType,
+        filename
+      )
+    },
+    onUnsupported: () => {
+      options.toast({
+        title: options.t('chat.input.voiceRecognitionUnsupportedTitle'),
+        description: options.t('chat.input.voiceRecognitionUnsupportedDescription'),
+        variant: 'destructive'
+      })
+    },
+    onError: handleVoiceInputError
+  })
+  const isVoiceInputListening = computed(() => voiceInput.isListening.value)
+  const isVoiceInputTranscribing = computed(() => voiceInput.isTranscribing.value)
+
+  async function refreshVoiceInputAvailability() {
+    const selection = options.getActiveModelSelection()
+    const token = ++voiceInputConfigToken
+
+    if (!selection) {
+      isVoiceInputEnabled.value = false
+      voiceInput.stop()
+      return
+    }
+
+    try {
+      const modelConfig = await options.modelClient.getModelConfig(
+        selection.modelId,
+        selection.providerId
+      )
+      if (token !== voiceInputConfigToken) {
+        return
+      }
+
+      isVoiceInputEnabled.value = modelConfig.speechRecognition === true
+      if (!isVoiceInputEnabled.value) {
+        voiceInput.stop()
+      }
+    } catch (error) {
+      if (token !== voiceInputConfigToken) {
+        return
+      }
+
+      console.warn('[ChatPage] Failed to resolve voice input setting:', error)
+      isVoiceInputEnabled.value = false
+      voiceInput.stop()
+    }
+  }
+
+  watch(
+    options.getActiveModelSelection,
+    () => {
+      void refreshVoiceInputAvailability()
+    },
+    { immediate: true }
+  )
+
+  const removeModelConfigChangedListener = options.modelClient.onModelConfigChanged((payload) => {
+    const selection = options.getActiveModelSelection()
+    if (!selection) {
+      return
+    }
+
+    if (payload.providerId !== selection.providerId || payload.modelId !== selection.modelId) {
+      return
+    }
+
+    void refreshVoiceInputAvailability()
+  })
+
+  const cleanup = () => {
+    removeModelConfigChangedListener()
+    voiceInput.cleanup()
+  }
+
+  return {
+    isVoiceInputEnabled,
+    isVoiceInputListening,
+    isVoiceInputTranscribing,
+    toggleVoiceInput: voiceInput.toggle,
+    cleanup
+  }
+}
diff --git a/src/renderer/src/components/chat/messageListItems.ts b/src/renderer/src/features/chat-page/model/displayMessage.ts
similarity index 100%
rename from src/renderer/src/components/chat/messageListItems.ts
rename to src/renderer/src/features/chat-page/model/displayMessage.ts
diff --git a/src/renderer/src/platform/performance/rendererPerformance.ts b/src/renderer/src/platform/performance/rendererPerformance.ts
new file mode 100644
index 0000000000..0c9f75ccbf
--- /dev/null
+++ b/src/renderer/src/platform/performance/rendererPerformance.ts
@@ -0,0 +1,245 @@
+import type { InjectionKey } from 'vue'
+import type {
+  RendererPerformanceRecord,
+  RendererPerformancePhase,
+  RendererStartupWorkloadTaskId,
+  RendererStartupWorkloadTaskState
+} from '@shared/contracts/routes'
+import { createPerformanceClient } from '@api/PerformanceClient'
+
+export type StartupWorkloadTaskSnapshot = {
+  id: RendererStartupWorkloadTaskId
+  state: RendererStartupWorkloadTaskState | 'pending' | 'running'
+  startedAt?: number
+  updatedAt?: number
+}
+
+type RendererPerformanceSubmit = (record: RendererPerformanceRecord) => Promise<boolean>
+
+type StartupPhaseOptions = {
+  startupRunId?: string
+  fallback?: boolean
+  outcome?: RendererPerformanceRecord['outcome']
+}
+
+const MAX_PENDING_RECORDS = 24
+const MAX_ELAPSED_MS = 24 * 60 * 60 * 1000
+
+function getMonotonicNow(): number | null {
+  if (typeof performance === 'undefined' || typeof performance.now !== 'function') {
+    return null
+  }
+  return performance.now()
+}
+
+function clampElapsed(elapsedMs: number): number {
+  return Math.max(0, Math.min(MAX_ELAPSED_MS, elapsedMs))
+}
+
+/**
+ * App-scoped renderer diagnostic reporter. It owns no Vue state and only accepts allowlisted
+ * metadata, so feature code cannot accidentally persist user content through performance logs.
+ */
+export class RendererPerformanceReporter {
+  private readonly startedAt = getMonotonicNow()
+  private enabled = false
+  private disposed = false
+  private startupRunId: string | undefined
+  private pendingRecords: RendererPerformanceRecord[] = []
+  private readonly observedWorkloadTerminals = new Set<string>()
+  private readonly sessionStartedAt = new Map<number, number | null>()
+
+  constructor(
+    private readonly submit: RendererPerformanceSubmit = (record) =>
+      createPerformanceClient().recordRenderer(record),
+    private readonly now: () => number | null = getMonotonicNow,
+    private readonly onSubmitError: () => void = () => {
+      console.warn('[RendererPerformance] Failed to submit diagnostic record')
+    }
+  ) {}
+
+  setEnabled(enabled: boolean): void {
+    if (this.disposed) return
+
+    this.enabled = enabled
+    if (!enabled) {
+      this.pendingRecords = []
+      return
+    }
+
+    if (this.startupRunId) {
+      this.flushPendingStartupRecords()
+      return
+    }
+
+    const pendingNonStartupRecords = this.pendingRecords.filter(
+      (record) => record.scope !== 'startup'
+    )
+    this.pendingRecords = this.pendingRecords.filter((record) => record.scope === 'startup')
+    for (const record of pendingNonStartupRecords) {
+      this.submitRecord(record)
+    }
+  }
+
+  recordStartup(
+    phase: Extract<
+      RendererPerformancePhase,
+      | 'shell-mounted'
+      | 'app-stores-ready'
+      | 'bootstrap-ready'
+      | 'bootstrap-fallback'
+      | 'route-ready'
+      | 'interactive'
+      | 'deferred-settled'
+    >,
+    options: StartupPhaseOptions = {}
+  ): void {
+    if (options.startupRunId) {
+      this.startupRunId = options.startupRunId
+      this.flushPendingStartupRecords()
+    }
+
+    this.record({
+      schemaVersion: 1,
+      source: 'chat-main',
+      scope: 'startup',
+      phase,
+      outcome: options.outcome ?? 'completed',
+      elapsedMs: this.elapsedSinceStart(),
+      startupRunId: this.startupRunId,
+      fallback: options.fallback
+    })
+  }
+
+  observeStartupWorkload(
+    startupRunId: string | null,
+    tasks: readonly StartupWorkloadTaskSnapshot[]
+  ): void {
+    if (!startupRunId) return
+
+    for (const task of tasks) {
+      if (task.state !== 'completed' && task.state !== 'failed' && task.state !== 'cancelled') {
+        continue
+      }
+      if (!task.startedAt || !task.updatedAt) {
+        continue
+      }
+
+      const terminalKey = `${startupRunId}:${task.id}`
+      if (this.observedWorkloadTerminals.has(terminalKey)) {
+        continue
+      }
+      this.observedWorkloadTerminals.add(terminalKey)
+      this.record({
+        schemaVersion: 1,
+        source: 'chat-main',
+        scope: 'workload',
+        phase: 'deferred-settled',
+        outcome: task.state,
+        elapsedMs: clampElapsed(task.updatedAt - task.startedAt),
+        startupRunId,
+        workloadTaskId: task.id,
+        workloadTaskState: task.state
+      })
+    }
+  }
+
+  recordChatSession(
+    phase: Extract<
+      RendererPerformancePhase,
+      | 'selected'
+      | 'preparation-started'
+      | 'cache-committed'
+      | 'messages-prepared'
+      | 'messages-committed'
+      | 'first-message-paint'
+      | 'input-ready'
+      | 'secondary-state-ready'
+    >,
+    sessionEpoch: number
+  ): void {
+    if (phase === 'selected') {
+      this.sessionStartedAt.set(sessionEpoch, this.now())
+    }
+    const sessionStartedAt = this.sessionStartedAt.get(sessionEpoch)
+    const now = this.now()
+    const elapsedMs =
+      sessionStartedAt === null || sessionStartedAt === undefined || now === null
+        ? 0
+        : clampElapsed(now - sessionStartedAt)
+
+    this.record({
+      schemaVersion: 1,
+      source: 'chat-main',
+      scope: 'chat-session',
+      phase,
+      outcome: 'completed',
+      elapsedMs,
+      startupRunId: this.startupRunId,
+      sessionEpoch
+    })
+  }
+
+  dispose(): void {
+    this.disposed = true
+    this.pendingRecords = []
+    this.observedWorkloadTerminals.clear()
+    this.sessionStartedAt.clear()
+  }
+
+  private elapsedSinceStart(): number {
+    const now = this.now()
+    if (this.startedAt === null || now === null) {
+      return 0
+    }
+    return clampElapsed(now - this.startedAt)
+  }
+
+  private record(record: RendererPerformanceRecord): void {
+    const normalizedRecord = Object.fromEntries(
+      Object.entries(record).filter(([, value]) => value !== undefined)
+    ) as RendererPerformanceRecord
+
+    if (this.disposed) return
+    if (!this.enabled) {
+      if (this.pendingRecords.length < MAX_PENDING_RECORDS) {
+        this.pendingRecords.push(normalizedRecord)
+      }
+      return
+    }
+    if (normalizedRecord.scope === 'startup' && !normalizedRecord.startupRunId) {
+      if (this.pendingRecords.length < MAX_PENDING_RECORDS) {
+        this.pendingRecords.push(normalizedRecord)
+      }
+      return
+    }
+    this.submitRecord(normalizedRecord)
+  }
+
+  private flushPendingStartupRecords(): void {
+    if (!this.enabled || !this.startupRunId) return
+
+    const activeStartupRunId = this.startupRunId
+    const pendingRecords = this.pendingRecords
+    this.pendingRecords = []
+    for (const record of pendingRecords) {
+      if (record.scope !== 'startup') {
+        this.submitRecord(record)
+        continue
+      }
+      if (record.startupRunId && record.startupRunId !== activeStartupRunId) {
+        this.pendingRecords.push(record)
+        continue
+      }
+      this.submitRecord({ ...record, startupRunId: activeStartupRunId })
+    }
+  }
+
+  private submitRecord(record: RendererPerformanceRecord): void {
+    void this.submit(record).catch(() => this.onSubmitError())
+  }
+}
+
+export const RENDERER_PERFORMANCE_REPORTER: InjectionKey<RendererPerformanceReporter> = Symbol(
+  'renderer-performance-reporter'
+)
diff --git a/src/renderer/src/stores/ui/message.ts b/src/renderer/src/stores/ui/message.ts
index 80f2d0c019..80010f49e5 100644
--- a/src/renderer/src/stores/ui/message.ts
+++ b/src/renderer/src/stores/ui/message.ts
@@ -13,7 +13,7 @@ import { createSessionClient } from '../../../api/SessionClient'
 import type {
   DisplayAssistantMessageBlock,
   DisplayUserMessageContent
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import type {
   AssistantMessageBlock,
   ChatMessageRecord,
diff --git a/src/renderer/src/views/ChatTabView.vue b/src/renderer/src/views/ChatTabView.vue
index fb5f2245eb..db48817d5b 100644
--- a/src/renderer/src/views/ChatTabView.vue
+++ b/src/renderer/src/views/ChatTabView.vue
@@ -42,12 +42,13 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, onMounted, ref } from 'vue'
+import { inject, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { createStartupClient } from '@api/StartupClient'
+import type { RendererStartupWorkloadTaskId } from '@shared/contracts/routes'
 import ChatSidePanel from '@/components/sidepanel/ChatSidePanel.vue'
 import AgentBrowserPiP from '@/components/browser/AgentBrowserPiP.vue'
 import NewThreadPage from '@/pages/NewThreadPage.vue'
-import ChatPage from '@/pages/ChatPage.vue'
+import ChatPage from '@/features/chat-page/ChatPage.vue'
 import AgentWelcomePage from '@/pages/AgentWelcomePage.vue'
 import { usePageRouterStore } from '@/stores/ui/pageRouter'
 import { useSessionStore } from '@/stores/ui/session'
@@ -57,6 +58,11 @@ import { useModelStore } from '@/stores/modelStore'
 import { useOllamaStore } from '@/stores/ollamaStore'
 import { useStartupWorkloadStore } from '@/stores/startupWorkloadStore'
 import { markStartupInteractive, scheduleStartupDeferredTask } from '@/lib/startupDeferred'
+import {
+  RENDERER_PERFORMANCE_REPORTER,
+  type RendererPerformanceReporter,
+  type StartupWorkloadTaskSnapshot
+} from '@/platform/performance/rendererPerformance'
 
 const pageRouter = usePageRouterStore()
 const sessionStore = useSessionStore()
@@ -64,6 +70,10 @@ const agentStore = useAgentStore()
 const projectStore = useProjectStore()
 const modelStore = useModelStore()
 const ollamaStore = useOllamaStore()
+const performanceReporter = inject<RendererPerformanceReporter | null>(
+  RENDERER_PERFORMANCE_REPORTER,
+  null
+)
 let startupWorkloadStore: ReturnType<typeof useStartupWorkloadStore> | null = null
 
 try {
@@ -74,6 +84,35 @@ try {
 const isReady = ref(false)
 let cancelDeferredHydration: (() => void) | null = null
 
+function isRendererStartupWorkloadTaskId(taskId: string): taskId is RendererStartupWorkloadTaskId {
+  return (
+    taskId === 'main.bootstrap' ||
+    taskId === 'main.session.firstPage' ||
+    taskId === 'main.provider.warmup'
+  )
+}
+
+watch(
+  () => ({
+    startupRunId: startupWorkloadStore?.runIds.main ?? null,
+    tasks: startupWorkloadStore?.mainTasks ?? []
+  }),
+  ({ startupRunId, tasks }) => {
+    const mainTasks: StartupWorkloadTaskSnapshot[] = []
+    for (const task of tasks) {
+      if (!isRendererStartupWorkloadTaskId(task.id)) continue
+      mainTasks.push({
+        id: task.id,
+        state: task.state,
+        startedAt: task.startedAt,
+        updatedAt: task.updatedAt
+      })
+    }
+    performanceReporter?.observeStartupWorkload(startupRunId, mainTasks)
+  },
+  { deep: true }
+)
+
 const initializeRouteFromFallbackState = async () => {
   if (sessionStore.error) {
     await pageRouter.initialize()
@@ -93,6 +132,9 @@ onMounted(async () => {
   try {
     const startupClient = createStartupClient()
     const bootstrap = await startupClient.getBootstrap()
+    performanceReporter?.recordStartup('bootstrap-ready', {
+      startupRunId: bootstrap.startupRunId
+    })
     console.info(
       `[Startup][Renderer] startup.bootstrap.ready run=${bootstrap.startupRunId} agents=${bootstrap.agents.length} activeSession=${bootstrap.activeSessionId ?? 'none'}`
     )
@@ -110,6 +152,7 @@ onMounted(async () => {
     await pageRouter.initialize({
       activeSessionId: bootstrap.activeSessionId
     })
+    performanceReporter?.recordStartup('route-ready')
 
     // Start loading agents, projects, models, and ollama immediately after router init
     // Don't block on them, they load in background while we mark interactive
@@ -122,19 +165,26 @@ onMounted(async () => {
       console.info('[Startup][Renderer] ChatTabView critical loads complete')
     })
   } catch (error) {
+    performanceReporter?.recordStartup('bootstrap-fallback', {
+      fallback: true,
+      outcome: 'failed'
+    })
     console.warn('[Startup][Renderer] ChatTabView critical hydration failed:', error)
     await Promise.allSettled([agentStore.fetchAgents(), projectStore.loadDefaultProjectPath()])
     await initializeRouteFromFallbackState()
+    performanceReporter?.recordStartup('route-ready', { fallback: true })
   } finally {
-    isReady.value = true
-    console.info('[Startup][Renderer] ChatTabView interactive ready')
-
-    // Session data is already loading in parallel from App.vue.onMounted
-    // Don't block on it here - let it load in background
+    // The route host owns the initial session request. It must start after bootstrap shell
+    // hydration (or fallback route recovery), otherwise its single-flight request can lose
+    // the bootstrap active session priority.
     if (!sessionStore.hasLoadedInitialPage) {
       void sessionStore.fetchSessions()
     }
 
+    isReady.value = true
+    performanceReporter?.recordStartup('interactive')
+    console.info('[Startup][Renderer] ChatTabView interactive ready')
+
     markStartupInteractive()
     cancelDeferredHydration = scheduleStartupDeferredTask(async () => {
       console.info('[Startup][Renderer] ChatTabView deferred hydration begin')
@@ -142,6 +192,7 @@ onMounted(async () => {
       if (criticalLoadPromises) {
         await criticalLoadPromises
       }
+      performanceReporter?.recordStartup('deferred-settled')
       console.info('[Startup][Renderer] ChatTabView deferred hydration complete')
     })
   }
diff --git a/src/shared/contracts/routes.ts b/src/shared/contracts/routes.ts
index 0c847ceea2..064cd38db5 100644
--- a/src/shared/contracts/routes.ts
+++ b/src/shared/contracts/routes.ts
@@ -345,6 +345,7 @@ import {
   shortcutUnregisterRoute
 } from './routes/shortcut.routes'
 import { startupGetBootstrapRoute } from './routes/startup.routes'
+import { performanceRecordRendererRoute } from './routes/performance.routes'
 import {
   sessionsActivateRoute,
   sessionsClearMessagesRoute,
@@ -519,6 +520,7 @@ export * from './routes/nowledgeMem.routes'
 export * from './routes/onboarding.routes'
 export * from './routes/oauth.routes'
 export * from './routes/plugins.routes'
+export * from './routes/performance.routes'
 export * from './routes/providers.routes'
 export * from './routes/project.routes'
 export * from './routes/remote-control.routes'
@@ -771,7 +773,8 @@ const DEEPCHAT_ROUTE_CATALOG_PART_3 = {
   [settingsListSystemFontsRoute.name]: settingsListSystemFontsRoute,
   [settingsUpdateRoute.name]: settingsUpdateRoute,
   [settingsActivityListRoute.name]: settingsActivityListRoute,
-  [startupGetBootstrapRoute.name]: startupGetBootstrapRoute
+  [startupGetBootstrapRoute.name]: startupGetBootstrapRoute,
+  [performanceRecordRendererRoute.name]: performanceRecordRendererRoute
 } satisfies Record<string, RouteContract>
 
 const DEEPCHAT_ROUTE_CATALOG_PART_4 = {
diff --git a/src/shared/contracts/routes/performance.routes.ts b/src/shared/contracts/routes/performance.routes.ts
new file mode 100644
index 0000000000..b5ad89a890
--- /dev/null
+++ b/src/shared/contracts/routes/performance.routes.ts
@@ -0,0 +1,70 @@
+import { z } from 'zod'
+import { defineRouteContract } from '../common'
+
+const MAX_RENDERER_PERFORMANCE_ELAPSED_MS = 24 * 60 * 60 * 1000
+const MAX_RENDERER_PERFORMANCE_RUN_ID_LENGTH = 160
+
+export const RendererPerformanceScopeSchema = z.enum(['startup', 'workload', 'chat-session'])
+
+export const RendererPerformancePhaseSchema = z.enum([
+  'shell-mounted',
+  'app-stores-ready',
+  'bootstrap-ready',
+  'bootstrap-fallback',
+  'route-ready',
+  'interactive',
+  'deferred-settled',
+  'selected',
+  'preparation-started',
+  'cache-committed',
+  'messages-prepared',
+  'messages-committed',
+  'first-message-paint',
+  'input-ready',
+  'secondary-state-ready'
+])
+
+export const RendererPerformanceOutcomeSchema = z.enum(['completed', 'failed', 'cancelled'])
+
+export const RendererStartupWorkloadTaskIdSchema = z.enum([
+  'main.bootstrap',
+  'main.session.firstPage',
+  'main.provider.warmup'
+])
+
+export const RendererStartupWorkloadTaskStateSchema = z.enum(['completed', 'failed', 'cancelled'])
+
+/**
+ * The renderer never sends user content, persistent entity IDs, paths, errors, or arbitrary metadata
+ * through this contract. Keep this allowlist narrow because records are persisted to the local log.
+ */
+export const RendererPerformanceRecordSchema = z
+  .object({
+    schemaVersion: z.literal(1),
+    source: z.literal('chat-main'),
+    scope: RendererPerformanceScopeSchema,
+    phase: RendererPerformancePhaseSchema,
+    outcome: RendererPerformanceOutcomeSchema.default('completed'),
+    elapsedMs: z.number().finite().min(0).max(MAX_RENDERER_PERFORMANCE_ELAPSED_MS),
+    startupRunId: z.string().min(1).max(MAX_RENDERER_PERFORMANCE_RUN_ID_LENGTH).optional(),
+    fallback: z.boolean().optional(),
+    sessionEpoch: z.number().int().min(0).max(Number.MAX_SAFE_INTEGER).optional(),
+    workloadTaskId: RendererStartupWorkloadTaskIdSchema.optional(),
+    workloadTaskState: RendererStartupWorkloadTaskStateSchema.optional()
+  })
+  .strict()
+
+export type RendererPerformanceRecord = z.output<typeof RendererPerformanceRecordSchema>
+export type RendererPerformancePhase = z.output<typeof RendererPerformancePhaseSchema>
+export type RendererStartupWorkloadTaskId = z.output<typeof RendererStartupWorkloadTaskIdSchema>
+export type RendererStartupWorkloadTaskState = z.output<
+  typeof RendererStartupWorkloadTaskStateSchema
+>
+
+export const performanceRecordRendererRoute = defineRouteContract({
+  name: 'performance.recordRenderer',
+  input: RendererPerformanceRecordSchema,
+  output: z.object({
+    accepted: z.boolean()
+  })
+})
diff --git a/test/fixtures/mockMessages.ts b/test/fixtures/mockMessages.ts
index 4e8332d61e..24bebce882 100644
--- a/test/fixtures/mockMessages.ts
+++ b/test/fixtures/mockMessages.ts
@@ -1,4 +1,4 @@
-import type { DisplayMessage } from '@/components/chat/messageListItems'
+import type { DisplayMessage } from '@/features/chat-page/model/displayMessage'
 
 type MockMessageKind = 'text' | 'long-markdown' | 'code' | 'tool' | 'image' | 'thinking'
 
diff --git a/test/main/app/rendererPerformanceLogService.test.ts b/test/main/app/rendererPerformanceLogService.test.ts
new file mode 100644
index 0000000000..bad0c68d60
--- /dev/null
+++ b/test/main/app/rendererPerformanceLogService.test.ts
@@ -0,0 +1,130 @@
+import { describe, expect, it, vi } from 'vitest'
+import { RendererPerformanceLogService } from '@/app/rendererPerformanceLogService'
+
+const createFs = (overrides: Record<string, unknown> = {}) => ({
+  appendFile: vi.fn().mockResolvedValue(undefined),
+  mkdir: vi.fn().mockResolvedValue(undefined),
+  rename: vi.fn().mockResolvedValue(undefined),
+  stat: vi.fn().mockRejectedValue(Object.assign(new Error('missing'), { code: 'ENOENT' })),
+  unlink: vi.fn().mockRejectedValue(Object.assign(new Error('missing'), { code: 'ENOENT' })),
+  ...overrides
+})
+
+const validRecord = {
+  schemaVersion: 1 as const,
+  source: 'chat-main' as const,
+  scope: 'startup' as const,
+  phase: 'interactive' as const,
+  outcome: 'completed' as const,
+  elapsedMs: 42,
+  startupRunId: 'main:run-1'
+}
+
+describe('RendererPerformanceLogService', () => {
+  it('does not create a diagnostics file when local logging is disabled', async () => {
+    const fs = createFs()
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => false) } as never,
+      () => '/user-data',
+      fs
+    )
+
+    await expect(service.record(validRecord)).resolves.toBe(false)
+    expect(fs.appendFile).not.toHaveBeenCalled()
+  })
+
+  it('persists a sanitized, timestamped NDJSON record', async () => {
+    const fs = createFs()
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => true) } as never,
+      () => '/user-data',
+      fs,
+      () => 1234
+    )
+
+    await expect(service.record(validRecord)).resolves.toBe(true)
+
+    expect(fs.mkdir).toHaveBeenCalledWith('/user-data/logs', { recursive: true })
+    expect(fs.appendFile).toHaveBeenCalledWith(
+      '/user-data/logs/renderer-performance.ndjson',
+      `${JSON.stringify({ ...validRecord, recordedAt: 1234 })}\n`,
+      'utf-8'
+    )
+  })
+
+  it('rejects unknown fields before they reach the local log', async () => {
+    const fs = createFs()
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => true) } as never,
+      () => '/user-data',
+      fs
+    )
+
+    await expect(
+      service.record({ ...validRecord, sessionId: 'sensitive-session-id' })
+    ).resolves.toBe(false)
+    expect(fs.appendFile).not.toHaveBeenCalled()
+  })
+
+  it('serializes concurrent writes to preserve NDJSON line ordering', async () => {
+    const writeOrder: string[] = []
+    let releaseFirstWrite!: () => void
+    const firstWrite = new Promise<void>((resolve) => {
+      releaseFirstWrite = resolve
+    })
+    const appendFile = vi
+      .fn()
+      .mockImplementationOnce(async () => {
+        writeOrder.push('first-start')
+        await firstWrite
+        writeOrder.push('first-end')
+      })
+      .mockImplementationOnce(async () => {
+        writeOrder.push('second')
+      })
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => true) } as never,
+      () => '/user-data',
+      createFs({ appendFile })
+    )
+
+    const first = service.record(validRecord)
+    const second = service.record({ ...validRecord, phase: 'route-ready' as const })
+    await vi.waitFor(() => expect(writeOrder).toEqual(['first-start']))
+    releaseFirstWrite()
+
+    await expect(Promise.all([first, second])).resolves.toEqual([true, true])
+    expect(writeOrder).toEqual(['first-start', 'first-end', 'second'])
+  })
+
+  it('rotates the bounded record file and retains only one previous generation', async () => {
+    const fs = createFs({ stat: vi.fn().mockResolvedValue({ size: 10 * 1024 * 1024 }) })
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => true) } as never,
+      () => '/user-data',
+      fs
+    )
+
+    await expect(service.record(validRecord)).resolves.toBe(true)
+
+    expect(fs.unlink).toHaveBeenCalledWith('/user-data/logs/renderer-performance.ndjson.old')
+    expect(fs.rename).toHaveBeenCalledWith(
+      '/user-data/logs/renderer-performance.ndjson',
+      '/user-data/logs/renderer-performance.ndjson.old'
+    )
+  })
+
+  it('contains write failures without rejecting the renderer route', async () => {
+    const onWriteError = vi.fn()
+    const service = new RendererPerformanceLogService(
+      { get: vi.fn(() => true) } as never,
+      () => '/user-data',
+      createFs({ appendFile: vi.fn().mockRejectedValue(new Error('disk unavailable')) }),
+      Date.now,
+      onWriteError
+    )
+
+    await expect(service.record(validRecord)).resolves.toBe(false)
+    expect(onWriteError).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/test/main/app/routes.test.ts b/test/main/app/routes.test.ts
new file mode 100644
index 0000000000..2f52962335
--- /dev/null
+++ b/test/main/app/routes.test.ts
@@ -0,0 +1,81 @@
+import { describe, expect, it, vi } from 'vitest'
+import { performanceRecordRendererRoute } from '@shared/contracts/routes'
+import { createAppRoutes } from '@/app/routes'
+
+const validRecord = {
+  schemaVersion: 1 as const,
+  source: 'chat-main' as const,
+  scope: 'startup' as const,
+  phase: 'interactive' as const,
+  outcome: 'completed' as const,
+  elapsedMs: 42,
+  startupRunId: 'main:run-1'
+}
+
+function createRoutes(overrides: Partial<Parameters<typeof createAppRoutes>[0]> = {}) {
+  return createAppRoutes({
+    logging: { openFolder: vi.fn() },
+    rendererPerformance: { record: vi.fn().mockResolvedValue(true) },
+    isMainWindowContext: vi.fn(() => true),
+    agentSettings: {
+      listAgents: vi.fn(),
+      getAcpEnabled: vi.fn()
+    },
+    projects: { getDefaultProjectPath: vi.fn() },
+    databaseSecurity: { getStatus: vi.fn() },
+    database: { repairSchema: vi.fn(), getDatabase: vi.fn() },
+    startupSession: { getLightweightByIds: vi.fn() },
+    desktopSession: { getActiveId: vi.fn() },
+    startup: {
+      scheduleTask: vi.fn(),
+      getRunId: vi.fn(),
+      replayTarget: vi.fn()
+    },
+    ensureDefaultWorkspace: vi.fn(),
+    enableDatabaseEncryption: vi.fn(),
+    changeDatabasePassword: vi.fn(),
+    disableDatabaseEncryption: vi.fn(),
+    recordActivity: vi.fn(),
+    publishSessionsUpdated: vi.fn(),
+    ...overrides
+  })
+}
+
+describe('app performance diagnostics route', () => {
+  it('records an allowlisted main-renderer performance record', async () => {
+    const rendererPerformance = { record: vi.fn().mockResolvedValue(true) }
+    const routes = createRoutes({ rendererPerformance })
+    const handler = routes.get(performanceRecordRendererRoute.name)
+
+    await expect(handler?.(validRecord, { webContentsId: 1, windowId: 1 })).resolves.toEqual({
+      accepted: true
+    })
+    expect(rendererPerformance.record).toHaveBeenCalledWith(validRecord)
+  })
+
+  it('does not persist records sent by another renderer', async () => {
+    const rendererPerformance = { record: vi.fn().mockResolvedValue(true) }
+    const routes = createRoutes({
+      rendererPerformance,
+      isMainWindowContext: vi.fn(() => false)
+    })
+    const handler = routes.get(performanceRecordRendererRoute.name)
+
+    await expect(handler?.(validRecord, { webContentsId: 2, windowId: 2 })).resolves.toEqual({
+      accepted: false
+    })
+    expect(rendererPerformance.record).not.toHaveBeenCalled()
+  })
+
+  it('rejects arbitrary record metadata at the route boundary', async () => {
+    const routes = createRoutes()
+    const handler = routes.get(performanceRecordRendererRoute.name)
+
+    await expect(
+      handler?.(
+        { ...validRecord, metadata: { sessionId: 'sensitive' } },
+        { webContentsId: 1, windowId: 1 }
+      )
+    ).rejects.toThrow()
+  })
+})
diff --git a/test/renderer/components/App.startup.test.ts b/test/renderer/components/App.startup.test.ts
index 0289d6059a..94b00d7ffa 100644
--- a/test/renderer/components/App.startup.test.ts
+++ b/test/renderer/components/App.startup.test.ts
@@ -23,8 +23,10 @@ const mountApp = async (options?: {
     | 'skills'
     | 'plugins'
     | null
+  trackRuntimeLifecycle?: boolean
 }) => {
   vi.resetModules()
+  vi.doUnmock('@/composables/useAppIpcRuntime')
 
   const initComplete = options?.initComplete ?? false
   const routeName = options?.routeName ?? 'chat'
@@ -33,6 +35,11 @@ const mountApp = async (options?: {
   const chatSessionId = options?.chatSessionId ?? (pageRouteName === 'chat' ? 'session-1' : null)
   const onboardingStatus = options?.onboardingStatus ?? 'idle'
   const onboardingCurrentStepId = options?.onboardingCurrentStepId ?? null
+  const trackRuntimeLifecycle = options?.trackRuntimeLifecycle ?? false
+  const setupMcpDeeplink = vi.fn()
+  const cleanupMcpDeeplink = vi.fn()
+  const setupAppIpcRuntime = vi.fn()
+  const cleanupAppIpcRuntime = vi.fn()
   const route = reactive({
     name: routeName,
     path: routeName === 'welcome' ? '/welcome' : '/chat',
@@ -405,10 +412,18 @@ const mountApp = async (options?: {
   vi.doMock('@/lib/storeInitializer', () => ({
     initAppStores: vi.fn(),
     useMcpInstallDeeplinkHandler: () => ({
-      setup: vi.fn(),
-      cleanup: vi.fn()
+      setup: setupMcpDeeplink,
+      cleanup: cleanupMcpDeeplink
     })
   }))
+  if (trackRuntimeLifecycle) {
+    vi.doMock('@/composables/useAppIpcRuntime', () => ({
+      useAppIpcRuntime: () => ({
+        setup: setupAppIpcRuntime,
+        cleanup: cleanupAppIpcRuntime
+      })
+    }))
+  }
   vi.doMock('@/composables/useFontManager', () => ({
     useFontManager: () => ({
       setupFontListener: vi.fn()
@@ -422,7 +437,7 @@ const mountApp = async (options?: {
 
   const App = (await import('@/App.vue')).default
 
-  mount(App, {
+  const wrapper = mount(App, {
     global: {
       stubs: {
         RouterView: true,
@@ -457,7 +472,12 @@ const mountApp = async (options?: {
     draftStore,
     sessionStore,
     ipcOn,
-    spotlightStore
+    spotlightStore,
+    wrapper,
+    setupMcpDeeplink,
+    cleanupMcpDeeplink,
+    setupAppIpcRuntime,
+    cleanupAppIpcRuntime
   }
 }
 
@@ -467,6 +487,34 @@ afterEach(() => {
 })
 
 describe('App startup welcome flow', () => {
+  it('registers runtime and MCP deeplink listeners on mount and cleans them up on unmount', async () => {
+    const {
+      wrapper,
+      setupMcpDeeplink,
+      cleanupMcpDeeplink,
+      setupAppIpcRuntime,
+      cleanupAppIpcRuntime
+    } = await mountApp({
+      initComplete: true,
+      routeName: 'chat',
+      trackRuntimeLifecycle: true
+    })
+
+    expect(setupMcpDeeplink).toHaveBeenCalledTimes(1)
+    expect(setupAppIpcRuntime).toHaveBeenCalledTimes(1)
+
+    wrapper.unmount()
+
+    expect(cleanupAppIpcRuntime).toHaveBeenCalledTimes(1)
+    expect(cleanupMcpDeeplink).toHaveBeenCalledTimes(1)
+  })
+
+  it('leaves the initial session request to the chat route host', async () => {
+    const { sessionStore } = await mountApp({ initComplete: true, routeName: 'chat' })
+
+    expect(sessionStore.fetchSessions).not.toHaveBeenCalled()
+  })
+
   it('routes to welcome when init is incomplete', async () => {
     const { router, configService, onboardingClient } = await mountApp({
       initComplete: false,
diff --git a/test/renderer/components/ChatPage.test.ts b/test/renderer/components/ChatPage.test.ts
index 1172d891d4..5da5de18d5 100644
--- a/test/renderer/components/ChatPage.test.ts
+++ b/test/renderer/components/ChatPage.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import { defineComponent, reactive } from 'vue'
+import { defineComponent, provide, reactive } from 'vue'
 import { flushPromises, mount } from '@vue/test-utils'
 import { WORKSPACE_EVENTS } from '@/events'
 
@@ -59,6 +59,9 @@ type SetupOptions = {
   deferStartupTasks?: boolean
   autoScrollEnabled?: boolean
   cachedMeasurements?: Readonly<Record<string, number>>
+  performanceReporter?: {
+    recordChatSession: ReturnType<typeof vi.fn>
+  }
 }
 
 const setup = async (options: SetupOptions = {}) => {
@@ -561,12 +564,19 @@ const setup = async (options: SetupOptions = {}) => {
     messageStore.activateRecentSessionView.mockReturnValue(true)
   }
 
-  const ChatPage = (await import('@/pages/ChatPage.vue')).default
-  const wrapper = mount(ChatPage, {
-    props: {
-      sessionId: 's1'
-    }
+  const ChatPage = (await import('@/features/chat-page/ChatPage.vue')).default
+  const { RENDERER_PERFORMANCE_REPORTER } =
+    await import('@/platform/performance/rendererPerformance')
+  const Host = defineComponent({
+    components: { ChatPage },
+    setup() {
+      if (options.performanceReporter) {
+        provide(RENDERER_PERFORMANCE_REPORTER, options.performanceReporter as never)
+      }
+    },
+    template: '<ChatPage session-id="s1" />'
   })
+  const wrapper = mount(Host)
 
   await flushPromises()
 
@@ -671,6 +681,17 @@ async function expectSessionRestoreTransactionStopsAfter(
 }
 
 describe('ChatPage', () => {
+  it('reports only safe chat-session phase and epoch metadata', async () => {
+    const performanceReporter = { recordChatSession: vi.fn() }
+
+    await setup({ performanceReporter })
+
+    expect(performanceReporter.recordChatSession).toHaveBeenCalledWith('selected', 1)
+    expect(performanceReporter.recordChatSession).toHaveBeenCalledWith('messages-prepared', 1)
+    expect(performanceReporter.recordChatSession).toHaveBeenCalledWith('messages-committed', 1)
+    expect(JSON.stringify(performanceReporter.recordChatSession.mock.calls)).not.toContain('s1')
+  })
+
   it('isolates header, message viewport, and composer into independent shell rows', async () => {
     const { wrapper } = await setup()
     const shell = wrapper.get('[data-testid="chat-page-shell"]')
diff --git a/test/renderer/components/ChatTabView.test.ts b/test/renderer/components/ChatTabView.test.ts
index 8bd45e7de0..6ba18baae5 100644
--- a/test/renderer/components/ChatTabView.test.ts
+++ b/test/renderer/components/ChatTabView.test.ts
@@ -1,5 +1,5 @@
 import { flushPromises, mount } from '@vue/test-utils'
-import { defineComponent, onUnmounted, reactive } from 'vue'
+import { defineComponent, onUnmounted, provide, reactive } from 'vue'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
 type SetupOptions = {
@@ -10,7 +10,12 @@ type SetupOptions = {
   newConversationTargetAgentId?: string | null
   sessionError?: string | null
   activeSessionId?: string | null
+  bootstrapActiveSessionId?: string | null
   bootstrapReject?: boolean
+  performanceReporter?: {
+    recordStartup: ReturnType<typeof vi.fn>
+    observeStartupWorkload: ReturnType<typeof vi.fn>
+  }
 }
 
 const setup = async (options: SetupOptions = {}) => {
@@ -43,7 +48,10 @@ const setup = async (options: SetupOptions = {}) => {
     error: options.sessionError ?? null,
     newConversationTargetAgentId: options.newConversationTargetAgentId ?? 'deepchat',
     hasLoadedInitialPage: false,
-    applyBootstrapShell: vi.fn().mockResolvedValue(undefined),
+    applyBootstrapShell: vi.fn().mockImplementation(async ({ activeSessionId, activeSession }) => {
+      sessionStore.activeSessionId = activeSessionId
+      sessionStore.activeSession = activeSession
+    }),
     fetchSessions: vi.fn().mockResolvedValue(undefined),
     startNewConversation: vi.fn().mockResolvedValue(undefined)
   })
@@ -97,8 +105,16 @@ const setup = async (options: SetupOptions = {}) => {
 
         return {
           startupRunId: 'run-1',
-          activeSessionId: sessionStore.activeSessionId,
-          activeSession: sessionStore.activeSession,
+          activeSessionId:
+            options.bootstrapActiveSessionId === undefined
+              ? sessionStore.activeSessionId
+              : options.bootstrapActiveSessionId,
+          activeSession:
+            options.bootstrapActiveSessionId === undefined
+              ? sessionStore.activeSession
+              : options.bootstrapActiveSessionId
+                ? { ...sessionStore.activeSession, id: options.bootstrapActiveSessionId }
+                : null,
           agents:
             agentStore.selectedAgentId === null
               ? []
@@ -172,7 +188,7 @@ const setup = async (options: SetupOptions = {}) => {
       template: '<div data-testid="new-thread-page" />'
     })
   }))
-  vi.doMock('@/pages/ChatPage.vue', () => ({
+  vi.doMock('@/features/chat-page/ChatPage.vue', () => ({
     default: defineComponent({
       name: 'ChatPage',
       props: {
@@ -198,7 +214,18 @@ const setup = async (options: SetupOptions = {}) => {
   }))
 
   const ChatTabView = (await import('@/views/ChatTabView.vue')).default
-  const wrapper = mount(ChatTabView)
+  const { RENDERER_PERFORMANCE_REPORTER } =
+    await import('@/platform/performance/rendererPerformance')
+  const Host = defineComponent({
+    components: { ChatTabView },
+    setup() {
+      if (options.performanceReporter) {
+        provide(RENDERER_PERFORMANCE_REPORTER, options.performanceReporter as never)
+      }
+    },
+    template: '<ChatTabView />'
+  })
+  const wrapper = mount(Host)
 
   await flushPromises()
   await vi.runAllTimersAsync()
@@ -239,6 +266,54 @@ describe('ChatTabView startup and routing', () => {
     expect(ollamaStore.initialize).toHaveBeenCalledTimes(1)
   })
 
+  it('records bootstrap, route, interactive, and deferred phases through the app-scoped reporter', async () => {
+    const performanceReporter = {
+      recordStartup: vi.fn(),
+      observeStartupWorkload: vi.fn()
+    }
+
+    await setup({ performanceReporter })
+
+    expect(performanceReporter.recordStartup).toHaveBeenCalledWith('bootstrap-ready', {
+      startupRunId: 'run-1'
+    })
+    expect(performanceReporter.recordStartup).toHaveBeenCalledWith('route-ready')
+    expect(performanceReporter.recordStartup).toHaveBeenCalledWith('interactive')
+    expect(performanceReporter.recordStartup).toHaveBeenCalledWith('deferred-settled')
+  })
+
+  it('starts the initial session request only after bootstrap shell hydration', async () => {
+    const { sessionStore } = await setup({
+      currentRoute: 'chat',
+      activeSessionId: null,
+      bootstrapActiveSessionId: 'bootstrap-session'
+    })
+
+    expect(sessionStore.applyBootstrapShell).toHaveBeenCalledWith(
+      expect.objectContaining({ activeSessionId: 'bootstrap-session' })
+    )
+    expect(sessionStore.fetchSessions).toHaveBeenCalledTimes(1)
+    expect(sessionStore.fetchSessions.mock.invocationCallOrder[0]).toBeGreaterThan(
+      sessionStore.applyBootstrapShell.mock.invocationCallOrder[0]
+    )
+    expect(sessionStore.activeSessionId).toBe('bootstrap-session')
+  })
+
+  it('preserves an explicit null bootstrap session id', async () => {
+    const { sessionStore } = await setup({
+      currentRoute: 'chat',
+      activeSessionId: 'session-1',
+      bootstrapActiveSessionId: null
+    })
+
+    expect(sessionStore.applyBootstrapShell).toHaveBeenCalledWith(
+      expect.objectContaining({
+        activeSessionId: null,
+        activeSession: null
+      })
+    )
+  })
+
   it('hydrates the route from the session store state and keeps provider warmup on demand', async () => {
     const { pageRouter, agentStore, projectStore, sessionStore, markStartupInteractive } =
       await setup({
diff --git a/test/renderer/components/MessageList.test.ts b/test/renderer/components/MessageList.test.ts
index 7d3395403e..41720dad3d 100644
--- a/test/renderer/components/MessageList.test.ts
+++ b/test/renderer/components/MessageList.test.ts
@@ -4,7 +4,7 @@ import { mount } from '@vue/test-utils'
 import type {
   DisplayAssistantMessageBlock,
   DisplayMessage
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
diff --git a/test/renderer/components/message/MessageBlockActivityGroup.test.ts b/test/renderer/components/message/MessageBlockActivityGroup.test.ts
index 4ec42ce714..72a9d27cdb 100644
--- a/test/renderer/components/message/MessageBlockActivityGroup.test.ts
+++ b/test/renderer/components/message/MessageBlockActivityGroup.test.ts
@@ -5,7 +5,7 @@ import MessageBlockActivityGroup from '@/components/message/MessageBlockActivity
 import type {
   DisplayAssistantMessageBlock,
   DisplayMessageUsage
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
diff --git a/test/renderer/components/message/MessageBlockBasics.test.ts b/test/renderer/components/message/MessageBlockBasics.test.ts
index 2d2f341adf..ad46df4c7d 100644
--- a/test/renderer/components/message/MessageBlockBasics.test.ts
+++ b/test/renderer/components/message/MessageBlockBasics.test.ts
@@ -5,7 +5,7 @@ import MessageBlockAction from '@/components/message/MessageBlockAction.vue'
 import MessageBlockError from '@/components/message/MessageBlockError.vue'
 import MessageBlockQuestionRequest from '@/components/message/MessageBlockQuestionRequest.vue'
 import ChatToolInteractionOverlay from '@/components/chat/ChatToolInteractionOverlay.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
diff --git a/test/renderer/components/message/MessageBlockContent.test.ts b/test/renderer/components/message/MessageBlockContent.test.ts
index 9a2b3a3093..21bee68cbc 100644
--- a/test/renderer/components/message/MessageBlockContent.test.ts
+++ b/test/renderer/components/message/MessageBlockContent.test.ts
@@ -2,7 +2,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { defineComponent } from 'vue'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import MessageBlockContent from '@/components/message/MessageBlockContent.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import type { MarkdownLinkContext } from '@/components/markdown/linkTypes'
 
 const { syncArtifactMock, completeArtifactMock } = vi.hoisted(() => ({
diff --git a/test/renderer/components/message/MessageBlockMedia.test.ts b/test/renderer/components/message/MessageBlockMedia.test.ts
index 45a6f54438..9c40f22f3a 100644
--- a/test/renderer/components/message/MessageBlockMedia.test.ts
+++ b/test/renderer/components/message/MessageBlockMedia.test.ts
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import { describe, expect, it, vi } from 'vitest'
 import MessageBlockAudio from '@/components/message/MessageBlockAudio.vue'
 import MessageBlockImage from '@/components/message/MessageBlockImage.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
diff --git a/test/renderer/components/message/MessageBlockToolCall.test.ts b/test/renderer/components/message/MessageBlockToolCall.test.ts
index c6ba794bb6..1ae1db45e6 100644
--- a/test/renderer/components/message/MessageBlockToolCall.test.ts
+++ b/test/renderer/components/message/MessageBlockToolCall.test.ts
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
 import { defineComponent, nextTick } from 'vue'
 import { afterEach, beforeEach, describe, it, expect, vi } from 'vitest'
 import MessageBlockToolCall from '@/components/message/MessageBlockToolCall.vue'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 
 const { selectSessionMock } = vi.hoisted(() => ({
   selectSessionMock: vi.fn()
diff --git a/test/renderer/components/message/MessageItemAssistant.test.ts b/test/renderer/components/message/MessageItemAssistant.test.ts
index b8e7abfd5d..be60c7bd51 100644
--- a/test/renderer/components/message/MessageItemAssistant.test.ts
+++ b/test/renderer/components/message/MessageItemAssistant.test.ts
@@ -5,7 +5,7 @@ import MessageItemAssistant from '@/components/message/MessageItemAssistant.vue'
 import type {
   DisplayAssistantMessage,
   DisplayAssistantMessageBlock
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 
 const memoryActivity = vi.hoisted(() => ({
   enabled: false,
diff --git a/test/renderer/components/message/MessageItemUser.test.ts b/test/renderer/components/message/MessageItemUser.test.ts
index a4576684bd..35615d0580 100644
--- a/test/renderer/components/message/MessageItemUser.test.ts
+++ b/test/renderer/components/message/MessageItemUser.test.ts
@@ -4,7 +4,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import type {
   DisplayUserMessage,
   DisplayUserMessageMentionBlock
-} from '@/components/chat/messageListItems'
+} from '@/features/chat-page/model/displayMessage'
 import type { MessageFile } from '@shared/types/agent-interface'
 import MessageItemUser from '@/components/message/MessageItemUser.vue'
 
diff --git a/test/renderer/components/message/messageActivityGroups.test.ts b/test/renderer/components/message/messageActivityGroups.test.ts
index 09439b9c83..bf564f53f6 100644
--- a/test/renderer/components/message/messageActivityGroups.test.ts
+++ b/test/renderer/components/message/messageActivityGroups.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import {
   type ActivityDurationLabels,
   buildAssistantRenderItems,
diff --git a/test/renderer/composables/useMessageWindow.test.ts b/test/renderer/composables/useMessageWindow.test.ts
index 105444f2f2..14aa9e196c 100644
--- a/test/renderer/composables/useMessageWindow.test.ts
+++ b/test/renderer/composables/useMessageWindow.test.ts
@@ -1,7 +1,10 @@
 import { describe, expect, it } from 'vitest'
 import { ref } from 'vue'
 import { useMessageWindow } from '@/composables/message/useMessageWindow'
-import type { MessageListItem, DisplayMessageUsage } from '@/components/chat/messageListItems'
+import type {
+  MessageListItem,
+  DisplayMessageUsage
+} from '@/features/chat-page/model/displayMessage'
 
 const usage: DisplayMessageUsage = {
   context_usage: 0,
diff --git a/test/renderer/features/chat-page/composables/useChatPageEventBridge.test.ts b/test/renderer/features/chat-page/composables/useChatPageEventBridge.test.ts
new file mode 100644
index 0000000000..ec249c17cf
--- /dev/null
+++ b/test/renderer/features/chat-page/composables/useChatPageEventBridge.test.ts
@@ -0,0 +1,108 @@
+import { computed, ref } from 'vue'
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import { useChatPageEventBridge } from '@/features/chat-page/composables/useChatPageEventBridge'
+
+function createHarness() {
+  const sessionId = ref('s1')
+  const isReadOnly = ref(false)
+  const insertWorkspaceReference = vi.fn()
+  const chatInputRef = ref({ insertWorkspaceReference })
+  const setMessage = vi.fn()
+  const onWindowKeydown = vi.fn()
+  const onPlanUpdated = vi.fn()
+  let planListener: ((payload: { sessionId: string }) => void) | null = null
+  const unsubscribe = vi.fn(() => {
+    planListener = null
+  })
+  const chatClient = {
+    onPlanUpdated: vi.fn((listener) => {
+      planListener = listener
+      return unsubscribe
+    })
+  }
+  const bridge = useChatPageEventBridge({
+    sessionId: () => sessionId.value,
+    isReadOnlySession: computed(() => isReadOnly.value),
+    chatInputRef,
+    setMessage,
+    onWindowKeydown,
+    onPlanUpdated,
+    chatClient: chatClient as any,
+    workspaceInsertReferenceEvent: 'workspace-insert-reference-requested'
+  })
+
+  return {
+    bridge,
+    sessionId,
+    isReadOnly,
+    insertWorkspaceReference,
+    setMessage,
+    onWindowKeydown,
+    onPlanUpdated,
+    chatClient,
+    unsubscribe,
+    emitPlanUpdated: (payload: { sessionId: string }) => planListener?.(payload)
+  }
+}
+
+describe('useChatPageEventBridge', () => {
+  let harness: ReturnType<typeof createHarness> | null = null
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  afterEach(() => {
+    harness?.bridge.stop()
+    harness = null
+  })
+
+  it('bridges validated global events using the latest session getter', () => {
+    harness = createHarness()
+    harness.bridge.start()
+
+    window.dispatchEvent(new CustomEvent('context-menu-ask-ai', { detail: '  ask this  ' }))
+    expect(harness.setMessage).toHaveBeenCalledWith('ask this')
+
+    window.dispatchEvent(
+      new CustomEvent('workspace-insert-reference-requested', {
+        detail: { sessionId: 'other', filePath: '/ignored.ts' }
+      })
+    )
+    expect(harness.insertWorkspaceReference).not.toHaveBeenCalled()
+
+    harness.sessionId.value = 's2'
+    window.dispatchEvent(
+      new CustomEvent('workspace-insert-reference-requested', {
+        detail: { sessionId: 's2', filePath: ' /active.ts ' }
+      })
+    )
+    expect(harness.insertWorkspaceReference).toHaveBeenCalledWith('/active.ts')
+
+    harness.isReadOnly.value = true
+    window.dispatchEvent(new CustomEvent('context-menu-ask-ai', { detail: 'ignored' }))
+    expect(harness.setMessage).toHaveBeenCalledTimes(1)
+  })
+
+  it('subscribes once and fully detaches global and plan listeners', () => {
+    harness = createHarness()
+    harness.bridge.start()
+    harness.bridge.start()
+
+    expect(harness.chatClient.onPlanUpdated).toHaveBeenCalledTimes(1)
+    harness.emitPlanUpdated({ sessionId: 's1' })
+    expect(harness.onPlanUpdated).toHaveBeenCalledWith({ sessionId: 's1' })
+
+    window.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowUp' }))
+    expect(harness.onWindowKeydown).toHaveBeenCalledTimes(1)
+
+    harness.bridge.stop()
+    harness.bridge.stop()
+    expect(harness.unsubscribe).toHaveBeenCalledTimes(1)
+
+    harness.emitPlanUpdated({ sessionId: 's2' })
+    window.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowDown' }))
+    expect(harness.onPlanUpdated).toHaveBeenCalledTimes(1)
+    expect(harness.onWindowKeydown).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/test/renderer/features/chat-page/composables/useMessageActions.test.ts b/test/renderer/features/chat-page/composables/useMessageActions.test.ts
new file mode 100644
index 0000000000..30597742fb
--- /dev/null
+++ b/test/renderer/features/chat-page/composables/useMessageActions.test.ts
@@ -0,0 +1,151 @@
+import { computed, effectScope, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useMessageActions } from '@/features/chat-page/composables/useMessageActions'
+
+function createHarness() {
+  const sessionId = ref('s1')
+  const isReadOnly = ref(false)
+  const isBlocking = ref(false)
+  const messageStore = { clearStreamingState: vi.fn() }
+  const sessionStore = { fetchSessions: vi.fn(), selectSession: vi.fn() }
+  const sessionClient = {
+    retryMessage: vi.fn().mockResolvedValue(undefined),
+    deleteMessage: vi.fn().mockResolvedValue(undefined),
+    editUserMessage: vi.fn().mockResolvedValue(undefined),
+    forkSession: vi.fn().mockResolvedValue({ id: 'forked' })
+  }
+  const beginPlanTurn = vi.fn()
+  const clearPlanSnapshotForDeletedMessage = vi.fn()
+  const loadMessagesForSession = vi.fn().mockResolvedValue({ id: 'loaded' })
+  const applyRestoredSessionSummary = vi.fn()
+  const isCurrentSession = vi.fn((id: string) => id === sessionId.value)
+  const scope = effectScope()
+  let actions!: ReturnType<typeof useMessageActions>
+
+  scope.run(() => {
+    actions = useMessageActions({
+      sessionId: () => sessionId.value,
+      isReadOnlySession: computed(() => isReadOnly.value),
+      hasBlockingInteraction: () => isBlocking.value,
+      messageStore: messageStore as any,
+      sessionStore: sessionStore as any,
+      sessionClient,
+      beginPlanTurn,
+      clearPlanSnapshotForDeletedMessage,
+      loadMessagesForSession,
+      applyRestoredSessionSummary,
+      isCurrentSession
+    })
+  })
+
+  return {
+    actions,
+    sessionId,
+    isReadOnly,
+    isBlocking,
+    messageStore,
+    sessionStore,
+    sessionClient,
+    beginPlanTurn,
+    clearPlanSnapshotForDeletedMessage,
+    loadMessagesForSession,
+    applyRestoredSessionSummary,
+    isCurrentSession,
+    stop: () => scope.stop()
+  }
+}
+
+describe('useMessageActions', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('retries only an actionable message and refreshes after a retry failure', async () => {
+    const harness = createHarness()
+
+    await harness.actions.onMessageRetry('message-1')
+
+    expect(harness.beginPlanTurn).toHaveBeenCalledWith('s1')
+    expect(harness.messageStore.clearStreamingState).toHaveBeenCalledTimes(1)
+    expect(harness.sessionClient.retryMessage).toHaveBeenCalledWith('s1', 'message-1')
+
+    harness.isBlocking.value = true
+    await harness.actions.onMessageRetry('blocked')
+    expect(harness.sessionClient.retryMessage).toHaveBeenCalledTimes(1)
+
+    harness.isBlocking.value = false
+    const error = new Error('retry failed')
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    harness.sessionClient.retryMessage.mockRejectedValueOnce(error)
+    await harness.actions.onMessageRetry('message-2')
+
+    expect(consoleError).toHaveBeenCalledWith('[ChatPage] retry message failed:', error)
+    expect(harness.loadMessagesForSession).toHaveBeenLastCalledWith('s1')
+    expect(harness.applyRestoredSessionSummary).toHaveBeenLastCalledWith({ id: 'loaded' })
+    consoleError.mockRestore()
+    harness.stop()
+  })
+
+  it('preserves delete-confirmation, current-session refresh, and read-only behavior', async () => {
+    const harness = createHarness()
+
+    await harness.actions.onMessageDelete('message-1')
+    expect(harness.actions.showDeleteMessageDialog.value).toBe(true)
+    expect(harness.sessionClient.deleteMessage).not.toHaveBeenCalled()
+
+    await harness.actions.confirmMessageDelete()
+    expect(harness.sessionClient.deleteMessage).toHaveBeenCalledWith('s1', 'message-1')
+    expect(harness.clearPlanSnapshotForDeletedMessage).toHaveBeenCalledWith('s1', 'message-1')
+    expect(harness.applyRestoredSessionSummary).toHaveBeenCalledWith({ id: 'loaded' })
+
+    await harness.actions.onMessageDelete('message-2')
+    harness.isReadOnly.value = true
+    await harness.actions.confirmMessageDelete()
+    expect(harness.actions.showDeleteMessageDialog.value).toBe(true)
+    expect(harness.sessionClient.deleteMessage).toHaveBeenCalledTimes(1)
+
+    harness.isReadOnly.value = false
+    harness.actions.clearForSessionChange()
+    expect(harness.actions.showDeleteMessageDialog.value).toBe(false)
+    harness.stop()
+  })
+
+  it('keeps an edited message retry bound to its original session', async () => {
+    const harness = createHarness()
+    let resolveEdit!: () => void
+    harness.sessionClient.editUserMessage.mockImplementationOnce(
+      () => new Promise<void>((resolve) => (resolveEdit = resolve))
+    )
+
+    const edit = harness.actions.onMessageEditSave({ messageId: 'message-1', text: 'updated' })
+    await vi.waitFor(() => expect(harness.sessionClient.editUserMessage).toHaveBeenCalledTimes(1))
+    harness.sessionId.value = 's2'
+    resolveEdit()
+    await edit
+
+    expect(harness.sessionClient.editUserMessage).toHaveBeenCalledWith('s1', 'message-1', 'updated')
+    expect(harness.sessionClient.retryMessage).toHaveBeenCalledWith('s1', 'message-1')
+    expect(harness.beginPlanTurn).toHaveBeenCalledWith('s1')
+    harness.stop()
+  })
+
+  it('edits then retries, forks in order, and continues without an interaction gate', async () => {
+    const harness = createHarness()
+
+    await harness.actions.onMessageEditSave({ messageId: 'message-1', text: '  updated  ' })
+    expect(harness.sessionClient.editUserMessage).toHaveBeenCalledWith('s1', 'message-1', 'updated')
+    expect(harness.sessionClient.retryMessage).toHaveBeenCalledWith('s1', 'message-1')
+
+    await harness.actions.onMessageFork('message-2')
+    expect(harness.sessionClient.forkSession).toHaveBeenCalledWith('s1', 'message-2')
+    expect(harness.sessionStore.fetchSessions).toHaveBeenCalledBefore(
+      harness.sessionStore.selectSession
+    )
+    expect(harness.sessionStore.selectSession).toHaveBeenCalledWith('forked')
+
+    harness.isBlocking.value = true
+    await harness.actions.onMessageContinue('ignored-conversation', 'message-3')
+    expect(harness.sessionClient.retryMessage).toHaveBeenLastCalledWith('s1', 'message-3')
+    harness.stop()
+  })
+})
diff --git a/test/renderer/features/chat-page/composables/usePendingInputActions.test.ts b/test/renderer/features/chat-page/composables/usePendingInputActions.test.ts
new file mode 100644
index 0000000000..da8fc8c51e
--- /dev/null
+++ b/test/renderer/features/chat-page/composables/usePendingInputActions.test.ts
@@ -0,0 +1,154 @@
+import { computed, effectScope, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { usePendingInputActions } from '@/features/chat-page/composables/usePendingInputActions'
+
+function createHarness() {
+  const sessionId = ref('s1')
+  const isReadOnly = ref(false)
+  const isGenerating = ref(true)
+  const isAcpWorkdirMissing = ref(false)
+  const isBlocking = ref(false)
+  const pendingInputStore = {
+    queueItems: [
+      {
+        id: 'item-1',
+        payload: {
+          text: 'draft',
+          files: [{ name: 'file.txt' }],
+          activeSkills: ['skill-a'],
+          inlineItems: [{ type: 'file', path: 'workspace://file.txt' }]
+        }
+      }
+    ],
+    updateQueueInput: vi.fn().mockResolvedValue(undefined),
+    moveQueueInput: vi.fn().mockResolvedValue(undefined),
+    deleteInput: vi.fn().mockResolvedValue(undefined),
+    steerPendingInput: vi.fn().mockResolvedValue(undefined)
+  }
+  const beginPlanTurn = vi.fn()
+  const toast = vi.fn()
+  const scope = effectScope()
+  let actions!: ReturnType<typeof usePendingInputActions>
+
+  scope.run(() => {
+    actions = usePendingInputActions({
+      sessionId: () => sessionId.value,
+      isReadOnlySession: computed(() => isReadOnly.value),
+      isGenerating: computed(() => isGenerating.value),
+      isAcpWorkdirMissing: computed(() => isAcpWorkdirMissing.value),
+      hasBlockingInteraction: () => isBlocking.value,
+      pendingInputStore: pendingInputStore as any,
+      beginPlanTurn,
+      toast,
+      t: (key) => key
+    })
+  })
+
+  return {
+    actions,
+    sessionId,
+    isReadOnly,
+    isGenerating,
+    isAcpWorkdirMissing,
+    isBlocking,
+    pendingInputStore,
+    beginPlanTurn,
+    toast,
+    stop: () => scope.stop()
+  }
+}
+
+describe('usePendingInputActions', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('updates an existing queue item without dropping files or skills', async () => {
+    const harness = createHarness()
+
+    await harness.actions.onPendingInputUpdate({ itemId: 'item-1', text: 'updated' })
+
+    expect(harness.pendingInputStore.updateQueueInput).toHaveBeenCalledWith('s1', 'item-1', {
+      text: 'updated',
+      files: [{ name: 'file.txt' }],
+      activeSkills: ['skill-a'],
+      inlineItems: [{ type: 'file', path: 'workspace://file.txt' }]
+    })
+
+    await harness.actions.onPendingInputUpdate({ itemId: 'missing', text: 'ignored' })
+    expect(harness.pendingInputStore.updateQueueInput).toHaveBeenCalledTimes(1)
+    harness.stop()
+  })
+
+  it('delegates move and delete only when writable', async () => {
+    const harness = createHarness()
+
+    await harness.actions.onPendingInputMove({ itemId: 'item-1', toIndex: 2 })
+    await harness.actions.onPendingInputDelete('item-1')
+    expect(harness.pendingInputStore.moveQueueInput).toHaveBeenCalledWith('s1', 'item-1', 2)
+    expect(harness.pendingInputStore.deleteInput).toHaveBeenCalledWith('s1', 'item-1')
+
+    harness.isReadOnly.value = true
+    await harness.actions.onPendingInputMove({ itemId: 'item-1', toIndex: 3 })
+    await harness.actions.onPendingInputDelete('item-1')
+    expect(harness.pendingInputStore.moveQueueInput).toHaveBeenCalledTimes(1)
+    expect(harness.pendingInputStore.deleteInput).toHaveBeenCalledTimes(1)
+    harness.stop()
+  })
+
+  it('keeps queued-input steering and plan state bound to one session', async () => {
+    const harness = createHarness()
+    let resolveSteer!: () => void
+    harness.pendingInputStore.steerPendingInput.mockImplementationOnce(
+      () => new Promise<void>((resolve) => (resolveSteer = resolve))
+    )
+
+    const steer = harness.actions.onPendingInputSteer('item-1')
+    await vi.waitFor(() =>
+      expect(harness.pendingInputStore.steerPendingInput).toHaveBeenCalledTimes(1)
+    )
+    harness.sessionId.value = 's2'
+    resolveSteer()
+    await steer
+
+    expect(harness.pendingInputStore.steerPendingInput).toHaveBeenCalledWith('s1', 'item-1')
+    expect(harness.beginPlanTurn).toHaveBeenCalledWith('s1')
+    harness.stop()
+  })
+
+  it('steers only after all gates pass and preserves plan state on failure', async () => {
+    const harness = createHarness()
+
+    harness.isGenerating.value = false
+    await harness.actions.onPendingInputSteer('item-1')
+    expect(harness.pendingInputStore.steerPendingInput).not.toHaveBeenCalled()
+
+    harness.isGenerating.value = true
+    harness.isAcpWorkdirMissing.value = true
+    await harness.actions.onPendingInputSteer('item-1')
+    expect(harness.pendingInputStore.steerPendingInput).not.toHaveBeenCalled()
+
+    harness.isAcpWorkdirMissing.value = false
+    harness.isBlocking.value = true
+    await harness.actions.onPendingInputSteer('item-1')
+    expect(harness.pendingInputStore.steerPendingInput).not.toHaveBeenCalled()
+
+    harness.isBlocking.value = false
+    await harness.actions.onPendingInputSteer('item-1')
+    expect(harness.pendingInputStore.steerPendingInput).toHaveBeenCalledWith('s1', 'item-1')
+    expect(harness.beginPlanTurn).toHaveBeenCalledWith('s1')
+
+    const error = new Error('steer failed')
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    harness.pendingInputStore.steerPendingInput.mockRejectedValueOnce(error)
+    await harness.actions.onPendingInputSteer('item-1')
+
+    expect(harness.toast).toHaveBeenCalledWith({
+      title: 'chat.pendingInput.steerFailed',
+      variant: 'destructive'
+    })
+    expect(harness.beginPlanTurn).toHaveBeenCalledTimes(1)
+    consoleError.mockRestore()
+    harness.stop()
+  })
+})
diff --git a/test/renderer/features/chat-page/composables/useToolInteraction.test.ts b/test/renderer/features/chat-page/composables/useToolInteraction.test.ts
new file mode 100644
index 0000000000..60327d74bc
--- /dev/null
+++ b/test/renderer/features/chat-page/composables/useToolInteraction.test.ts
@@ -0,0 +1,209 @@
+import { computed, effectScope, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { useToolInteraction } from '@/features/chat-page/composables/useToolInteraction'
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  let reject!: (reason?: unknown) => void
+  const promise = new Promise<T>((promiseResolve, promiseReject) => {
+    resolve = promiseResolve
+    reject = promiseReject
+  })
+
+  return { promise, resolve, reject }
+}
+
+function createAssistantMessage(id: string, blocks: unknown[]) {
+  return {
+    id,
+    role: 'assistant',
+    content: JSON.stringify(blocks)
+  }
+}
+
+function createHarness(messages: Array<Record<string, unknown>>) {
+  const sessionId = ref('s1')
+  const isReadOnlySession = computed(() => false)
+  const messageStore = {
+    messages,
+    getAssistantMessageBlocks: vi.fn((message: { content: string }) => JSON.parse(message.content))
+  }
+  const chatClient = {
+    respondToolInteraction: vi.fn().mockResolvedValue({ handledInline: false })
+  }
+  const loadMessagesForSession = vi.fn().mockResolvedValue({ id: 'restored' })
+  const applyRestoredSessionSummary = vi.fn()
+  const scope = effectScope()
+  let toolInteraction!: ReturnType<typeof useToolInteraction>
+
+  scope.run(() => {
+    toolInteraction = useToolInteraction({
+      sessionId: () => sessionId.value,
+      messageStore: messageStore as any,
+      isReadOnlySession,
+      chatClient,
+      loadMessagesForSession,
+      applyRestoredSessionSummary
+    })
+  })
+
+  return {
+    toolInteraction,
+    sessionId,
+    chatClient,
+    loadMessagesForSession,
+    applyRestoredSessionSummary,
+    stop: () => scope.stop()
+  }
+}
+
+describe('useToolInteraction', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('collects eligible top-level and subagent pending interactions only', () => {
+    const harness = createHarness([
+      createAssistantMessage('m1', [
+        {
+          type: 'action',
+          action_type: 'question_request',
+          status: 'pending',
+          tool_call: { id: 'question-1', name: 'ask', params: '{"question":"Continue?"}' }
+        },
+        {
+          type: 'action',
+          action_type: 'tool_call_permission',
+          status: 'pending',
+          extra: { needsUserAction: false },
+          tool_call: { id: 'ignored-user-action', name: 'write', params: '{}' }
+        },
+        {
+          type: 'action',
+          action_type: 'question_request',
+          status: 'success',
+          tool_call: { id: 'ignored-status', name: 'ask', params: '{}' }
+        },
+        {
+          type: 'tool_call',
+          tool_call: { name: 'subagent_orchestrator' },
+          extra: {
+            subagentProgress: JSON.stringify({
+              tasks: [
+                {
+                  sessionId: 'subagent-1',
+                  waitingInteraction: {
+                    type: 'permission',
+                    messageId: 'subagent-message',
+                    toolCallId: 'subagent-tool',
+                    actionBlock: {
+                      type: 'action',
+                      action_type: 'tool_call_permission',
+                      status: 'pending',
+                      tool_call: { name: 'read_file', params: '{"path":"README.md"}' }
+                    }
+                  }
+                }
+              ]
+            })
+          }
+        },
+        {
+          type: 'tool_call',
+          tool_call: { name: 'subagent_orchestrator' },
+          extra: { subagentProgress: '{invalid json' }
+        }
+      ])
+    ])
+
+    expect(harness.toolInteraction.pendingInteractions.value).toMatchObject([
+      {
+        sessionId: 's1',
+        messageId: 'm1',
+        toolCallId: 'question-1',
+        actionType: 'question_request',
+        toolName: 'ask'
+      },
+      {
+        sessionId: 'subagent-1',
+        messageId: 'subagent-message',
+        toolCallId: 'subagent-tool',
+        actionType: 'tool_call_permission',
+        toolName: 'read_file'
+      }
+    ])
+    expect(harness.toolInteraction.activePendingInteraction.value).toBe(
+      harness.toolInteraction.pendingInteractions.value[0]
+    )
+    harness.stop()
+  })
+
+  it('submits one response at a time and refreshes the current page session afterwards', async () => {
+    const response = deferred<{ handledInline?: boolean }>()
+    const harness = createHarness([
+      createAssistantMessage('m1', [
+        {
+          type: 'action',
+          action_type: 'tool_call_permission',
+          status: 'pending',
+          tool_call: { id: 'tool-1', name: 'write_file', params: '{}' }
+        }
+      ])
+    ])
+    harness.chatClient.respondToolInteraction.mockReturnValue(response.promise)
+
+    const firstResponse = harness.toolInteraction.onToolInteractionRespond({
+      kind: 'permission',
+      granted: true
+    } as any)
+    await vi.waitFor(() => expect(harness.toolInteraction.isHandlingInteraction.value).toBe(true))
+
+    await harness.toolInteraction.onToolInteractionRespond({
+      kind: 'permission',
+      granted: false
+    } as any)
+    expect(harness.chatClient.respondToolInteraction).toHaveBeenCalledTimes(1)
+
+    harness.sessionId.value = 's2'
+    response.resolve({ handledInline: true })
+    await firstResponse
+
+    expect(harness.chatClient.respondToolInteraction).toHaveBeenCalledWith({
+      sessionId: 's1',
+      messageId: 'm1',
+      toolCallId: 'tool-1',
+      response: { kind: 'permission', granted: true }
+    })
+    expect(harness.loadMessagesForSession).toHaveBeenCalledWith('s2')
+    expect(harness.applyRestoredSessionSummary).toHaveBeenCalledWith({ id: 'restored' })
+    expect(harness.toolInteraction.isHandlingInteraction.value).toBe(false)
+    harness.stop()
+  })
+
+  it('releases the response lock without refreshing when the client rejects', async () => {
+    const error = new Error('response failed')
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => undefined)
+    const harness = createHarness([
+      createAssistantMessage('m1', [
+        {
+          type: 'action',
+          action_type: 'question_request',
+          status: 'pending',
+          tool_call: { id: 'tool-1', name: 'question', params: '{}' }
+        }
+      ])
+    ])
+    harness.chatClient.respondToolInteraction.mockRejectedValue(error)
+
+    await harness.toolInteraction.onToolInteractionRespond({
+      kind: 'permission',
+      granted: true
+    } as any)
+
+    expect(harness.loadMessagesForSession).not.toHaveBeenCalled()
+    expect(harness.toolInteraction.isHandlingInteraction.value).toBe(false)
+    expect(consoleError).toHaveBeenCalledWith('[ChatPage] respond tool interaction failed:', error)
+    consoleError.mockRestore()
+    harness.stop()
+  })
+})
diff --git a/test/renderer/features/chat-page/composables/useVoiceInput.test.ts b/test/renderer/features/chat-page/composables/useVoiceInput.test.ts
new file mode 100644
index 0000000000..af9aee5b91
--- /dev/null
+++ b/test/renderer/features/chat-page/composables/useVoiceInput.test.ts
@@ -0,0 +1,194 @@
+import { effectScope, ref } from 'vue'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+const speechRecognitionMock = vi.hoisted(() => vi.fn())
+
+vi.mock('@/components/chat/composables/useSpeechRecognition', () => ({
+  useSpeechRecognition: speechRecognitionMock
+}))
+
+import { useVoiceInput } from '@/features/chat-page/composables/useVoiceInput'
+
+type ModelSelection = {
+  providerId: string
+  modelId: string
+}
+
+function deferred<T>() {
+  let resolve!: (value: T) => void
+  const promise = new Promise<T>((promiseResolve) => {
+    resolve = promiseResolve
+  })
+
+  return { promise, resolve }
+}
+
+function createSpeechInput() {
+  return {
+    isListening: ref(false),
+    isTranscribing: ref(false),
+    stop: vi.fn(),
+    toggle: vi.fn(),
+    cleanup: vi.fn()
+  }
+}
+
+function createModelClient() {
+  let modelConfigChangedListener:
+    | ((payload: { providerId?: string; modelId?: string }) => void)
+    | null = null
+  const unsubscribe = vi.fn(() => {
+    modelConfigChangedListener = null
+  })
+
+  return {
+    getModelConfig: vi.fn(),
+    transcribeAudio: vi.fn(),
+    onModelConfigChanged: vi.fn((listener) => {
+      modelConfigChangedListener = listener
+      return unsubscribe
+    }),
+    emitModelConfigChanged: (payload: { providerId?: string; modelId?: string }) => {
+      modelConfigChangedListener?.(payload)
+    },
+    unsubscribe
+  }
+}
+
+function createHarness(
+  selection = ref<ModelSelection | null>({ providerId: 'acp', modelId: 'a' }),
+  configureModelClient: (client: ReturnType<typeof createModelClient>) => void = (client) => {
+    client.getModelConfig.mockResolvedValue({ speechRecognition: true })
+  }
+) {
+  const speechInput = createSpeechInput()
+  speechRecognitionMock.mockReturnValue(speechInput)
+
+  const modelClient = createModelClient()
+  configureModelClient(modelClient)
+  const toast = vi.fn()
+  const insertRecognizedText = vi.fn()
+  const scope = effectScope()
+  let voiceInput!: ReturnType<typeof useVoiceInput>
+
+  scope.run(() => {
+    voiceInput = useVoiceInput({
+      chatInputRef: ref({ insertRecognizedText }),
+      getActiveModelSelection: () => selection.value,
+      modelClient,
+      toast,
+      t: (key) => key
+    })
+  })
+
+  return {
+    voiceInput,
+    selection,
+    speechInput,
+    modelClient,
+    toast,
+    insertRecognizedText,
+    stop: () => {
+      voiceInput.cleanup()
+      scope.stop()
+    }
+  }
+}
+
+describe('useVoiceInput', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('refreshes only the active model configuration and releases its resources', async () => {
+    const harness = createHarness()
+    harness.modelClient.getModelConfig.mockResolvedValue({ speechRecognition: true })
+
+    await vi.waitFor(() => expect(harness.voiceInput.isVoiceInputEnabled.value).toBe(true))
+    expect(harness.modelClient.getModelConfig).toHaveBeenCalledWith('a', 'acp')
+
+    harness.modelClient.emitModelConfigChanged({ providerId: 'other', modelId: 'model' })
+    await Promise.resolve()
+    expect(harness.modelClient.getModelConfig).toHaveBeenCalledTimes(1)
+
+    harness.modelClient.getModelConfig.mockResolvedValue({ speechRecognition: false })
+    harness.modelClient.emitModelConfigChanged({ providerId: 'acp', modelId: 'a' })
+
+    await vi.waitFor(() => expect(harness.voiceInput.isVoiceInputEnabled.value).toBe(false))
+    expect(harness.speechInput.stop).toHaveBeenCalledTimes(1)
+
+    harness.stop()
+    expect(harness.modelClient.unsubscribe).toHaveBeenCalledTimes(1)
+    expect(harness.speechInput.cleanup).toHaveBeenCalledTimes(1)
+  })
+
+  it('ignores stale model configuration responses after a selection change', async () => {
+    const selection = ref<ModelSelection | null>({ providerId: 'acp', modelId: 'a' })
+    const firstConfig = deferred<{ speechRecognition: boolean }>()
+    const secondConfig = deferred<{ speechRecognition: boolean }>()
+    const harness = createHarness(selection, (modelClient) => {
+      modelClient.getModelConfig.mockImplementation((modelId: string) =>
+        modelId === 'a' ? firstConfig.promise : secondConfig.promise
+      )
+    })
+
+    await vi.waitFor(() => expect(harness.modelClient.getModelConfig).toHaveBeenCalledTimes(1))
+
+    selection.value = { providerId: 'acp', modelId: 'b' }
+    await vi.waitFor(() => expect(harness.modelClient.getModelConfig).toHaveBeenCalledTimes(2))
+
+    secondConfig.resolve({ speechRecognition: true })
+    await vi.waitFor(() => expect(harness.voiceInput.isVoiceInputEnabled.value).toBe(true))
+
+    firstConfig.resolve({ speechRecognition: false })
+    await Promise.resolve()
+
+    expect(harness.voiceInput.isVoiceInputEnabled.value).toBe(true)
+    expect(harness.speechInput.stop).not.toHaveBeenCalled()
+    harness.stop()
+  })
+
+  it('adapts speech callbacks to the chat input, model client, and existing toasts', async () => {
+    const harness = createHarness()
+    harness.modelClient.getModelConfig.mockResolvedValue({ speechRecognition: true })
+
+    await vi.waitFor(() => expect(speechRecognitionMock).toHaveBeenCalledTimes(1))
+    const speechOptions = speechRecognitionMock.mock.calls[0]?.[0]
+
+    speechOptions.onTranscript('recognized text')
+    expect(harness.insertRecognizedText).toHaveBeenCalledWith('recognized text')
+
+    await expect(
+      speechOptions.transcribe({
+        audioBase64: 'audio',
+        mimeType: 'audio/wav',
+        filename: 'recording.wav'
+      })
+    ).resolves.toBeUndefined()
+    expect(harness.modelClient.transcribeAudio).toHaveBeenCalledWith(
+      'acp',
+      'a',
+      'audio',
+      'audio/wav',
+      'recording.wav'
+    )
+
+    speechOptions.onError('not-allowed')
+    expect(harness.toast).toHaveBeenCalledWith({
+      title: 'chat.input.voiceRecognitionPermissionDeniedTitle',
+      description: 'chat.input.voiceRecognitionPermissionDeniedDescription',
+      variant: 'destructive'
+    })
+
+    speechOptions.onError('aborted')
+    expect(harness.toast).toHaveBeenCalledTimes(1)
+
+    speechOptions.onUnsupported()
+    expect(harness.toast).toHaveBeenLastCalledWith({
+      title: 'chat.input.voiceRecognitionUnsupportedTitle',
+      description: 'chat.input.voiceRecognitionUnsupportedDescription',
+      variant: 'destructive'
+    })
+    harness.stop()
+  })
+})
diff --git a/test/renderer/lib/rendererPerformance.test.ts b/test/renderer/lib/rendererPerformance.test.ts
new file mode 100644
index 0000000000..2313de47c0
--- /dev/null
+++ b/test/renderer/lib/rendererPerformance.test.ts
@@ -0,0 +1,123 @@
+import { describe, expect, it, vi } from 'vitest'
+import { RendererPerformanceReporter } from '@/platform/performance/rendererPerformance'
+
+describe('RendererPerformanceReporter', () => {
+  it('buffers non-startup records until local logging becomes available', async () => {
+    const submit = vi.fn().mockResolvedValue(true)
+    const reporter = new RendererPerformanceReporter(submit, () => 120)
+
+    reporter.recordChatSession('selected', 3)
+    expect(submit).not.toHaveBeenCalled()
+
+    reporter.setEnabled(true)
+    reporter.recordChatSession('messages-committed', 3)
+
+    await vi.waitFor(() => expect(submit).toHaveBeenCalledTimes(2))
+    expect(submit.mock.calls.map(([record]) => record)).toEqual([
+      expect.objectContaining({
+        scope: 'chat-session',
+        phase: 'selected',
+        sessionEpoch: 3,
+        elapsedMs: 0
+      }),
+      expect.objectContaining({
+        scope: 'chat-session',
+        phase: 'messages-committed',
+        sessionEpoch: 3,
+        elapsedMs: 0
+      })
+    ])
+  })
+
+  it('correlates buffered startup phases with the bootstrap run without exposing session state', async () => {
+    const submit = vi.fn().mockResolvedValue(true)
+    const reporter = new RendererPerformanceReporter(submit, () => 150)
+    reporter.recordStartup('shell-mounted')
+    reporter.setEnabled(true)
+    expect(submit).not.toHaveBeenCalled()
+
+    reporter.recordStartup('bootstrap-ready', { startupRunId: 'main:run-1' })
+    reporter.recordStartup('interactive')
+
+    await vi.waitFor(() => expect(submit).toHaveBeenCalledTimes(3))
+    expect(submit.mock.calls.map(([record]) => record)).toEqual([
+      expect.objectContaining({ phase: 'shell-mounted', startupRunId: 'main:run-1' }),
+      expect.objectContaining({ phase: 'bootstrap-ready', startupRunId: 'main:run-1' }),
+      expect.objectContaining({ phase: 'interactive', startupRunId: 'main:run-1' })
+    ])
+    expect(JSON.stringify(submit.mock.calls)).not.toContain('sessionId')
+  })
+
+  it('flushes buffered startup records when local logging enables after bootstrap', async () => {
+    const submit = vi.fn().mockResolvedValue(true)
+    const reporter = new RendererPerformanceReporter(submit, () => 150)
+
+    reporter.recordStartup('bootstrap-ready', { startupRunId: 'main:run-1' })
+    reporter.setEnabled(true)
+
+    await vi.waitFor(() => expect(submit).toHaveBeenCalledTimes(1))
+    expect(submit).toHaveBeenCalledWith(
+      expect.objectContaining({
+        scope: 'startup',
+        phase: 'bootstrap-ready',
+        startupRunId: 'main:run-1'
+      })
+    )
+  })
+
+  it('records each terminal main workload task once with its existing elapsed time', async () => {
+    const submit = vi.fn().mockResolvedValue(true)
+    const reporter = new RendererPerformanceReporter(submit)
+    reporter.setEnabled(true)
+
+    const completedTask = {
+      id: 'main.session.firstPage' as const,
+      state: 'completed' as const,
+      startedAt: 100,
+      updatedAt: 360
+    }
+    reporter.observeStartupWorkload('main:run-1', [completedTask])
+    reporter.observeStartupWorkload('main:run-1', [
+      { ...completedTask, updatedAt: completedTask.updatedAt + 10 }
+    ])
+
+    await vi.waitFor(() => expect(submit).toHaveBeenCalledTimes(1))
+    expect(submit).toHaveBeenCalledWith(
+      expect.objectContaining({
+        scope: 'workload',
+        phase: 'deferred-settled',
+        workloadTaskId: 'main.session.firstPage',
+        workloadTaskState: 'completed',
+        elapsedMs: 260
+      })
+    )
+  })
+
+  it('drops records while disabled and stops accepting records after disposal', async () => {
+    const submit = vi.fn().mockResolvedValue(true)
+    const reporter = new RendererPerformanceReporter(submit)
+
+    reporter.recordChatSession('selected', 2)
+    reporter.setEnabled(false)
+    reporter.setEnabled(true)
+    reporter.dispose()
+    reporter.recordChatSession('messages-committed', 2)
+
+    await Promise.resolve()
+    expect(submit).not.toHaveBeenCalled()
+  })
+
+  it('isolates diagnostic transport failures from feature code', async () => {
+    const onSubmitError = vi.fn()
+    const reporter = new RendererPerformanceReporter(
+      vi.fn().mockRejectedValue(new Error('unavailable')),
+      () => 1,
+      onSubmitError
+    )
+    reporter.setEnabled(true)
+
+    reporter.recordChatSession('first-message-paint', 4)
+
+    await vi.waitFor(() => expect(onSubmitError).toHaveBeenCalledTimes(1))
+  })
+})
diff --git a/test/renderer/performance/chatRendering.perf.test.ts b/test/renderer/performance/chatRendering.perf.test.ts
index 85407addf5..d5458cc40a 100644
--- a/test/renderer/performance/chatRendering.perf.test.ts
+++ b/test/renderer/performance/chatRendering.perf.test.ts
@@ -3,7 +3,7 @@ import { defineComponent } from 'vue'
 import { mount } from '@vue/test-utils'
 import { generateMockMessages } from '../../fixtures/mockMessages'
 import { collectChatSearchResults } from '@/lib/chatSearch'
-import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
+import type { DisplayAssistantMessageBlock } from '@/features/chat-page/model/displayMessage'
 import MessageBlockToolCall from '@/components/message/MessageBlockToolCall.vue'
 
 vi.mock('vue-i18n', () => ({
diff --git a/test/renderer/stores/sessionStore.test.ts b/test/renderer/stores/sessionStore.test.ts
index fabf07d6e3..7b6e6814d5 100644
--- a/test/renderer/stores/sessionStore.test.ts
+++ b/test/renderer/stores/sessionStore.test.ts
@@ -1281,6 +1281,23 @@ describe('sessionStore streaming cleanup', () => {
 })
 
 describe('sessionStore pagination', () => {
+  it('prioritizes the active bootstrap session when the first page starts after shell hydration', async () => {
+    const { store, sessionClient } = await setupStore()
+
+    await store.applyBootstrapShell({
+      activeSessionId: 'bootstrap-session',
+      activeSession: createSession({ id: 'bootstrap-session' })
+    })
+    await store.fetchSessions()
+
+    expect(sessionClient.listLightweight).toHaveBeenCalledWith(
+      expect.objectContaining({
+        includeSubagents: false,
+        prioritizeSessionId: 'bootstrap-session'
+      })
+    )
+  })
+
   it('deduplicates concurrent initial fetch requests and allows a later fetch', async () => {
     const { store, sessionClient } = await setupStore()
     let resolveInitialFetch: (value: {
diff --git a/tsconfig.app.json b/tsconfig.app.json
index beb0562d51..04cc30745d 100644
--- a/tsconfig.app.json
+++ b/tsconfig.app.json
@@ -5,10 +5,9 @@
     "src/renderer/src/**/*",
     "src/renderer/src/**/*.vue",
     "src/renderer/src/assets/**/*",
-    "src/renderer/browser/env.d.ts",
-    "src/renderer/browser/**/*",
-    "src/renderer/browser/**/*.vue",
-    "src/renderer/browser/assets/**/*",
+    "src/renderer/browser-overlay/env.d.ts",
+    "src/renderer/browser-overlay/**/*",
+    "src/renderer/browser-overlay/**/*.vue",
     "src/renderer/floating/env.d.ts",
     "src/renderer/floating/**/*",
     "src/renderer/floating/**/*.vue",
@@ -36,9 +35,6 @@
       "@api/*": [
         "./src/renderer/api/*"
       ],
-      "@browser/*": [
-        "./src/renderer/browser/*"
-      ],
       "@shared/*": [
         "./src/shared/*"
       ],
diff --git a/tsconfig.app.tsgo.json b/tsconfig.app.tsgo.json
index b442523d62..17ee07165f 100644
--- a/tsconfig.app.tsgo.json
+++ b/tsconfig.app.tsgo.json
@@ -5,10 +5,9 @@
     "src/renderer/src/**/*",
     "src/renderer/src/**/*.vue",
     "src/renderer/src/assets/**/*",
-    "src/renderer/browser/env.d.ts",
-    "src/renderer/browser/**/*",
-    "src/renderer/browser/**/*.vue",
-    "src/renderer/browser/assets/**/*",
+    "src/renderer/browser-overlay/env.d.ts",
+    "src/renderer/browser-overlay/**/*",
+    "src/renderer/browser-overlay/**/*.vue",
     "src/renderer/floating/env.d.ts",
     "src/renderer/floating/**/*",
     "src/renderer/floating/**/*.vue",
@@ -37,9 +36,6 @@
       "@api/*": [
         "./src/renderer/api/*"
       ],
-      "@browser/*": [
-        "./src/renderer/browser/*"
-      ],
       "@shared/*": [
         "./src/shared/*"
       ],
diff --git a/vitest.config.renderer.ts b/vitest.config.renderer.ts
index 2fac87c1d0..a1567994ff 100644
--- a/vitest.config.renderer.ts
+++ b/vitest.config.renderer.ts
@@ -19,7 +19,6 @@ export default defineConfig({
     alias: {
       '@': resolve('src/renderer/src'),
       '@api': resolve('src/renderer/api'),
-      '@browser': resolve('src/renderer/browser'),
       '@shadcn': resolve('src/shadcn'),
       '@shared': resolve('src/shared'),
       vue: 'vue/dist/vue.esm-bundler.js'
diff --git a/vitest.config.ts b/vitest.config.ts
index d5c204898e..564d0c875b 100644
--- a/vitest.config.ts
+++ b/vitest.config.ts
@@ -40,7 +40,6 @@ export default defineConfig({
             // Renderer process aliases (match electron.vite.config.ts renderer config)
             { find: '@/', replacement: resolve('src/renderer/src/') + '/' },
             { find: '@api', replacement: resolve('src/renderer/api') },
-            { find: '@browser', replacement: resolve('src/renderer/browser/') },
             { find: '@shared', replacement: resolve('src/shared') },
             { find: '@shadcn', replacement: resolve('src/shadcn') },
             { find: 'electron', replacement: resolve('test/mocks/electron.ts') },