diff --git a/.agents/skills/deepchat-release/SKILL.md b/.agents/skills/deepchat-release/SKILL.md
new file mode 100644
index 000000000..671c7ab2e
--- /dev/null
+++ b/.agents/skills/deepchat-release/SKILL.md
@@ -0,0 +1,104 @@
+---
+name: deepchat-release
+description: Prepare and publish DeepChat releases in this repository. Use when Codex needs to bump the app version, update CHANGELOG.md, keep release notes bilingual from v1.0.1 onward with English bullets first and Chinese bullets second, run release checks, create or update versioned release branches such as release/v1.0.1, continue a half-finished release, fast-forward main with the documented release flow, create or push version tags, or clean up release branches after publishing.
+---
+
+# DeepChat Release
+
+## Overview
+
+Follow the repository-specific DeepChat release process. Prepare release metadata on `dev`, keep `CHANGELOG.md` concise, and publish through the documented fast-forward flow instead of merge commits on `main`.
+
+## Start With Repo State
+
+Inspect git state before changing anything:
+
+- Check the current branch and working tree.
+- Check whether `release/<version>` exists locally or on `origin`.
+- Check whether `v<version>` exists locally or on `origin`.
+
+If a local or remote tag already exists on the wrong commit, stop and ask before replacing it.
+
+## Choose The Release Mode
+
+Pick the mode that matches the user's request and current git state:
+
+1. `prepare metadata`
+   Update `package.json`, `CHANGELOG.md`, and the release notes commit on `dev`.
+2. `cut release branch`
+   Create `release/<version>` from the release-ready commit on `dev` and push it.
+3. `update existing release branch`
+   Use this when the release branch already exists but metadata changed afterward. Commit on `dev`, move `release/<version>` to the new `dev` commit, and force-push only the disposable release branch.
+4. `publish`
+   Use this only after the release PR is approved. Fast-forward `main`, create the version tag on the same commit, push the tag, and then delete the temporary release branch.
+
+Use [references/release-checklist.md](references/release-checklist.md) for exact commands.
+
+## Update Release Metadata
+
+When preparing a release on `dev`:
+
+- Update `package.json` to the target version.
+- Add a new `CHANGELOG.md` section at the top.
+- Summarize only user-visible or release-relevant changes since the previous tag.
+- Prefer deriving the notes from recent commits or the diff since the previous release tag.
+
+For `v1.0.1` and later, format changelog entries in this order:
+
+```md
+## vX.Y.Z (YYYY-MM-DD)
+- English bullet
+- English bullet
+- 中文条目
+- 中文条目
+```
+
+Use the current local date in `YYYY-MM-DD` form. Preserve older changelog sections unless the user explicitly asks to rewrite them.
+
+## Run Release Checks
+
+After editing release metadata, run these repo-required commands:
+
+- `pnpm run format`
+- `pnpm run i18n`
+- `pnpm run lint`
+
+Prefer running `pnpm run typecheck` before cutting the release branch. Run tests when the user asks, when the release touches behavior beyond metadata, or when risk is unclear. Report pre-existing failures separately from the release metadata work.
+
+## Follow Release Branch Policy
+
+- Keep `dev` as the integration branch.
+- Treat `release/<version>` as disposable and identical to a commit already on `dev`.
+- Never use the GitHub merge button for releases to `main`.
+- Never click "Update branch" on the release PR.
+- Use `pnpm run release:ff -- release/<version> --tag v<version>` to publish after approval.
+
+Read [../../../docs/release-flow.md](../../../docs/release-flow.md) when you need the full repository policy or if the checklist and repo docs ever diverge.
+
+## Common Recovery Case
+
+When the user says something like "the release branch already exists but the tag is not created yet" or "I fixed the changelog after cutting the release branch":
+
+1. Commit the metadata fix on `dev`.
+2. Push `dev`.
+3. Move `release/<version>` to `HEAD`.
+4. Force-push `release/<version>` with `--force-with-lease`.
+5. Continue with the existing or updated PR to `main`.
+6. After approval, publish and create the tag.
+
+## Response Rules
+
+- Act on the repo when the user wants the release advanced; do not stop at generic advice.
+- Tell the user exactly which step of the release flow they are currently in.
+- Use concrete versions and dates such as `v1.0.1` and `2026-04-02`.
+- Keep commands copy-pastable and repo-specific.
+- If checks fail, separate blocking failures from unrelated existing warnings.
+
+## Examples
+
+Activate this skill for requests like:
+
+- "准备发布 1.0.2，更新版本号和 changelog"
+- "继续发 1.0.1，release 分支已经有了，还没打 tag"
+- "帮我按项目流程把 release/v1.0.3 发出去"
+- "检查一下现在离发布 v1.0.4 还差什么"
diff --git a/.agents/skills/deepchat-release/agents/openai.yaml b/.agents/skills/deepchat-release/agents/openai.yaml
new file mode 100644
index 000000000..d0df4a155
--- /dev/null
+++ b/.agents/skills/deepchat-release/agents/openai.yaml
@@ -0,0 +1,4 @@
+interface:
+  display_name: "DeepChat Release"
+  short_description: "Prepare and publish DeepChat releases"
+  default_prompt: "Use $deepchat-release to prepare, continue, or publish a DeepChat version release."
diff --git a/.agents/skills/deepchat-release/references/release-checklist.md b/.agents/skills/deepchat-release/references/release-checklist.md
new file mode 100644
index 000000000..6fb941ec8
--- /dev/null
+++ b/.agents/skills/deepchat-release/references/release-checklist.md
@@ -0,0 +1,95 @@
+# DeepChat Release Checklist
+
+Use this file for the exact command sequence after you know the target version and the current git state.
+
+## 1. Inspect state
+
+```bash
+git status --short
+git branch --show-current
+git branch --list "release/vX.Y.Z"
+git branch -r --list "origin/release/vX.Y.Z"
+git rev-parse --verify --quiet "refs/tags/vX.Y.Z"
+git ls-remote --tags origin "refs/tags/vX.Y.Z"
+```
+
+If a tag already exists locally or remotely, verify it before continuing. Ask before replacing or deleting a tag.
+
+## 2. Prepare metadata on `dev`
+
+```bash
+git switch dev
+git pull --ff-only origin dev
+```
+
+Then update:
+
+- `package.json`
+- `CHANGELOG.md`
+
+Recommended checks:
+
+```bash
+pnpm run format
+pnpm run i18n
+pnpm run lint
+pnpm run typecheck
+```
+
+Commit and push:
+
+```bash
+git add package.json CHANGELOG.md
+git commit -m "chore(release): prepare vX.Y.Z"
+git push origin dev
+```
+
+## 3. Cut a new release branch
+
+Use this when `release/vX.Y.Z` does not exist yet.
+
+```bash
+git switch -c release/vX.Y.Z
+git push -u origin release/vX.Y.Z
+```
+
+Open a PR from `release/vX.Y.Z` to `main`.
+
+## 4. Update an existing release branch
+
+Use this when the release branch already exists and metadata changed afterward.
+
+```bash
+git switch dev
+git branch -f release/vX.Y.Z HEAD
+git push --force-with-lease origin release/vX.Y.Z
+```
+
+If a PR from `release/vX.Y.Z` to `main` already exists, let it update in place.
+
+## 5. Publish after PR approval
+
+```bash
+pnpm run release:ff -- release/vX.Y.Z --tag vX.Y.Z
+git tag vX.Y.Z release/vX.Y.Z
+git push origin vX.Y.Z
+```
+
+## 6. Clean up the disposable release branch
+
+```bash
+git push origin --delete release/vX.Y.Z
+git branch -d release/vX.Y.Z
+```
+
+## 7. Changelog format from `v1.0.1` onward
+
+```md
+## vX.Y.Z (YYYY-MM-DD)
+- English bullet
+- English bullet
+- 中文条目
+- 中文条目
+```
+
+Keep English bullets first, Chinese bullets second, and preserve older sections unless the user explicitly asks to rewrite history.
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 526286b2c..5fa32b747 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## v1.0.2 (2026-04-08)
+- Added provider model list filtering and sorting, and now remembers the sidebar session grouping mode
+- Added ACP Agent uninstall support and refined provider prompt cache configuration
+- Improved remote delivery ordering for Telegram and Feishu, and fixed db-backed model list sync stability
+- Refined dashboard and settings responsiveness, and fixed auto compact settings persistence
+- 新增 Provider 模型列表筛选排序能力，并记住侧边栏会话分组方式
+- 新增 ACP Agent 卸载支持，并完善 Provider Prompt Cache 配置体验
+- 优化 Telegram 与 Feishu 远程消息投递顺序，修复数据库驱动模型列表同步稳定性
+- 改进仪表盘与设置页响应式布局，并修复自动压缩设置保存问题
+
 ## v1.0.1 (2026-04-02)
 - Added in-chat search and Spotlight global search for faster access to messages and app entry points
 - Improved the provider database refresh flow and added manual model config refresh
diff --git a/archives/code/dead-code-batch-2/README.md b/archives/code/dead-code-batch-2/README.md
deleted file mode 100644
index c6cd9131b..000000000
--- a/archives/code/dead-code-batch-2/README.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Dead Code Batch 2
-
-- Purpose: archive dead code that no longer participates in the active renderer or main runtime.
-- Archived at: 2026-03-15
-- Rationale: static inspection confirmed these files have no live code references and are kept in
-  source form for precise rollback only.
-
-## Archived Paths
-
-- `src/renderer/src/components/NewThreadMock.vue`
-- `src/renderer/src/components/mock/MockChatPage.vue`
-- `src/renderer/src/components/mock/MockInputBox.vue`
-- `src/renderer/src/components/mock/MockInputToolbar.vue`
-- `src/renderer/src/components/mock/MockMessageList.vue`
-- `src/renderer/src/components/mock/MockStatusBar.vue`
-- `src/renderer/src/components/mock/MockTopBar.vue`
-- `src/renderer/src/components/mock/MockWelcomePage.vue`
-- `src/renderer/src/composables/useMockViewState.ts`
-- `src/main/presenter/agentPresenter/tools/questionTool.ts`
-- `src/main/presenter/agentPresenter/message/systemEnvPromptBuilder.ts`
-- `src/main/presenter/agentPresenter/events.ts`
-- `src/main/presenter/agentPresenter/message/index.ts`
-- `src/main/presenter/agentPresenter/permission/index.ts`
-- `src/main/presenter/agentPresenter/session/index.ts`
-- `src/main/presenter/agentPresenter/streaming/index.ts`
-- `src/main/presenter/agentPresenter/tool/index.ts`
-- `src/main/presenter/agentPresenter/utility/index.ts`
-- `src/main/presenter/searchPrompts/index.ts`
-- `src/main/presenter/sessionPresenter/persistence/index.ts`
-- `src/main/presenter/sessionPresenter/tab/index.ts`
-
-## Notes
-
-- This directory is not part of the runtime, build, typecheck, or test target set.
-- Restore by moving files back to their original paths if a later audit proves they are still
-  needed.
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/events.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/events.ts
deleted file mode 100644
index 336ce12bb..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/events.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {}
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/index.ts
deleted file mode 100644
index 4be94eb85..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export * from './messageBuilder'
-export * from './messageCompressor'
-export * from './messageFormatter'
-export * from './messageTruncator'
-export * from './systemEnvPromptBuilder'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/systemEnvPromptBuilder.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/systemEnvPromptBuilder.ts
deleted file mode 100644
index c39ec9ffb..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/message/systemEnvPromptBuilder.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  buildRuntimeCapabilitiesPrompt,
-  buildSystemEnvPrompt,
-  type BuildSystemEnvPromptOptions
-} from '../../../lib/agentRuntime/systemEnvPromptBuilder'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/permission/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/permission/index.ts
deleted file mode 100644
index 60da88787..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/permission/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PermissionHandler } from './permissionHandler'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/session/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/session/index.ts
deleted file mode 100644
index 44666fa75..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/session/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export type { SessionContext, SessionContextResolved, SessionStatus } from './sessionContext'
-export { resolveSessionContext } from './sessionResolver'
-export type { SessionResolveInput } from './sessionResolver'
-export { SessionManager } from './sessionManager'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/streaming/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/streaming/index.ts
deleted file mode 100644
index f86db5c7c..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/streaming/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { ContentBufferHandler } from './contentBufferHandler'
-export { LLMEventHandler } from './llmEventHandler'
-export { StreamGenerationHandler } from './streamGenerationHandler'
-export type { GeneratingMessageState } from './types'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tool/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tool/index.ts
deleted file mode 100644
index 824fcc298..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tool/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { ToolCallCenter } from './toolCallCenter'
-export { ToolRegistry } from './toolRegistry'
-export { resolveToolRoute } from './toolRouter'
-export type { ToolCallContext } from './toolCallCenter'
-export type { ToolRegistryEntry, ToolRegistrySource } from './toolRegistry'
-export type { ToolRouteDecision } from './toolRouter'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tools/questionTool.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tools/questionTool.ts
deleted file mode 100644
index 1979f7342..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/tools/questionTool.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export {
-  parseQuestionToolArgs,
-  QUESTION_TOOL_NAME,
-  questionToolSchema,
-  type QuestionToolInput
-} from '../../../lib/agentRuntime/questionTool'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/utility/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/utility/index.ts
deleted file mode 100644
index 7271098b3..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/agentPresenter/utility/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { UtilityHandler } from './utilityHandler'
-export { enhanceSystemPromptWithDateTime } from './promptEnhancer'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/searchPrompts/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/searchPrompts/index.ts
deleted file mode 100644
index 5bb802615..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/searchPrompts/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './searchPrompts'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/persistence/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/persistence/index.ts
deleted file mode 100644
index 60f29b2b6..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/persistence/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { ConversationPersister } from './conversationPersister.js'
-export { MessagePersister } from './messagePersister.js'
diff --git a/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/tab/index.ts b/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/tab/index.ts
deleted file mode 100644
index 30a2de58a..000000000
--- a/archives/code/dead-code-batch-2/src/main/presenter/sessionPresenter/tab/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { TabManager, type ITabAdapter, type TabMetadata } from './tabManager.js'
-export { TabAdapter } from './tabAdapter.js'
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/NewThreadMock.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/NewThreadMock.vue
deleted file mode 100644
index 55862f267..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/NewThreadMock.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<template>
-  <TooltipProvider :delay-duration="200">
-    <div class="h-full w-full flex flex-col">
-      <!-- Main content area (centered) -->
-      <div class="flex-1 flex flex-col items-center justify-center px-6">
-        <!-- Logo -->
-        <div class="mb-4">
-          <img src="@/assets/logo-dark.png" class="w-14 h-14" loading="lazy" />
-        </div>
-
-        <!-- Heading -->
-        <h1 class="text-3xl font-semibold text-foreground mb-4">
-          {{ t('chat.newThread.title') }}
-        </h1>
-
-        <!-- Project selector -->
-        <DropdownMenu>
-          <DropdownMenuTrigger as-child>
-            <Button
-              variant="ghost"
-              size="sm"
-              class="h-7 px-2.5 gap-1.5 text-xs text-muted-foreground hover:text-foreground mb-6"
-            >
-              <Icon icon="lucide:folder" class="w-3.5 h-3.5" />
-              <span>{{ selectedProject }}</span>
-              <Icon icon="lucide:chevron-down" class="w-3 h-3" />
-            </Button>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent align="center" class="min-w-[200px]">
-            <DropdownMenuLabel class="text-xs">{{ t('common.project.recent') }}</DropdownMenuLabel>
-            <DropdownMenuItem
-              v-for="project in recentProjects"
-              :key="project.path"
-              class="gap-2 text-xs py-1.5 px-2"
-              @click="selectedProject = project.name"
-            >
-              <Icon icon="lucide:folder" class="w-3.5 h-3.5 text-muted-foreground" />
-              <div class="flex flex-col min-w-0">
-                <span class="truncate">{{ project.name }}</span>
-                <span class="text-[10px] text-muted-foreground truncate">{{ project.path }}</span>
-              </div>
-            </DropdownMenuItem>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem class="gap-2 text-xs py-1.5 px-2" @click="selectCustomProject">
-              <Icon icon="lucide:folder-open" class="w-3.5 h-3.5 text-muted-foreground" />
-              <span>{{ t('common.project.openFolder') }}</span>
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-
-        <!-- Input area -->
-        <MockInputBox>
-          <template #toolbar>
-            <MockInputToolbar />
-          </template>
-        </MockInputBox>
-
-        <!-- Status bar -->
-        <MockStatusBar />
-      </div>
-    </div>
-  </TooltipProvider>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-import { useI18n } from 'vue-i18n'
-import { TooltipProvider } from '@shadcn/components/ui/tooltip'
-import { Button } from '@shadcn/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger
-} from '@shadcn/components/ui/dropdown-menu'
-import { Icon } from '@iconify/vue'
-import MockInputBox from './mock/MockInputBox.vue'
-import MockInputToolbar from './mock/MockInputToolbar.vue'
-import MockStatusBar from './mock/MockStatusBar.vue'
-
-const { t } = useI18n()
-
-const recentProjects = [
-  { name: 'deepchat', path: '~/Code/deepchat' },
-  { name: 'api-server', path: '~/Code/api-server' },
-  { name: 'infra', path: '~/Code/infra' },
-  { name: 'personal-site', path: '~/Projects/personal-site' }
-]
-
-const selectedProject = ref('deepchat')
-
-const selectCustomProject = () => {
-  // Mock: would open a native folder picker
-  selectedProject.value = 'Custom folder'
-}
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockChatPage.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockChatPage.vue
deleted file mode 100644
index fda8eaa27..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockChatPage.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <TooltipProvider :delay-duration="200">
-    <div class="h-full overflow-y-auto">
-      <MockTopBar :title="title" :project="project" />
-      <MockMessageList />
-
-      <!-- Input area (sticky bottom, messages scroll under) -->
-      <div class="sticky bottom-0 z-10 px-6 pt-3 pb-3">
-        <div class="flex flex-col items-center">
-          <MockInputBox>
-            <template #toolbar>
-              <MockInputToolbar />
-            </template>
-          </MockInputBox>
-          <MockStatusBar />
-        </div>
-      </div>
-    </div>
-  </TooltipProvider>
-</template>
-
-<script setup lang="ts">
-import { TooltipProvider } from '@shadcn/components/ui/tooltip'
-import MockTopBar from './MockTopBar.vue'
-import MockMessageList from './MockMessageList.vue'
-import MockInputBox from './MockInputBox.vue'
-import MockInputToolbar from './MockInputToolbar.vue'
-import MockStatusBar from './MockStatusBar.vue'
-
-defineProps<{
-  title: string
-  project: string
-}>()
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputBox.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputBox.vue
deleted file mode 100644
index 7e2fb8f50..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputBox.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-  <div
-    class="w-full max-w-2xl rounded-xl border bg-card/30 backdrop-blur-lg shadow-sm overflow-hidden"
-  >
-    <Textarea
-      :placeholder="t('chat.input.placeholder')"
-      class="min-h-[80px] resize-none border-0 shadow-none focus-visible:ring-0 focus-visible:border-0 bg-transparent! dark:bg-transparent placeholder:text-muted-foreground px-4 pt-4 pb-2 text-sm"
-      :model-value="''"
-    />
-
-    <slot name="toolbar" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Textarea } from '@shadcn/components/ui/textarea'
-import { useI18n } from 'vue-i18n'
-
-const { t } = useI18n()
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputToolbar.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputToolbar.vue
deleted file mode 100644
index 7c7d695ad..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputToolbar.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<template>
-  <div class="flex items-center justify-between px-3 py-2">
-    <div class="flex items-center gap-1">
-      <!-- Attach button -->
-      <Tooltip>
-        <TooltipTrigger as-child>
-          <Button
-            variant="ghost"
-            size="icon"
-            class="h-7 w-7 rounded-lg text-muted-foreground hover:text-foreground"
-          >
-            <Icon icon="lucide:plus" class="w-4 h-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>Attach</p>
-        </TooltipContent>
-      </Tooltip>
-    </div>
-
-    <div class="flex items-center gap-1">
-      <!-- Mic button -->
-      <Tooltip v-if="SHOW_VOICE_INPUT">
-        <TooltipTrigger as-child>
-          <Button
-            variant="ghost"
-            size="icon"
-            class="h-7 w-7 rounded-lg text-muted-foreground hover:text-foreground"
-          >
-            <Icon icon="lucide:mic" class="w-4 h-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>
-          <p>Voice input</p>
-        </TooltipContent>
-      </Tooltip>
-
-      <!-- Send button -->
-      <Button size="icon" class="h-7 w-7 rounded-full">
-        <Icon icon="lucide:arrow-up" class="w-4 h-4" />
-      </Button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Button } from '@shadcn/components/ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@shadcn/components/ui/tooltip'
-import { Icon } from '@iconify/vue'
-
-const SHOW_VOICE_INPUT = false
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockMessageList.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockMessageList.vue
deleted file mode 100644
index df483226e..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockMessageList.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div class="flex-1 overflow-y-auto">
-    <div class="max-w-3xl mx-auto px-4 py-6 space-y-6">
-      <div v-for="msg in messages" :key="msg.id">
-        <!-- User message -->
-        <div v-if="msg.role === 'user'" class="flex justify-end mb-6">
-          <div class="max-w-[80%] rounded-2xl bg-muted px-4 py-2.5">
-            <p class="text-sm whitespace-pre-wrap">{{ msg.content }}</p>
-          </div>
-        </div>
-
-        <!-- Assistant message -->
-        <div v-else class="flex gap-3 mb-6">
-          <div class="shrink-0 mt-1">
-            <div class="w-6 h-6 rounded-md bg-primary/10 flex items-center justify-center">
-              <ModelIcon model-id="anthropic" custom-class="w-4 h-4" :is-dark="themeStore.isDark" />
-            </div>
-          </div>
-          <div class="min-w-0 flex-1">
-            <p class="text-xs text-muted-foreground mb-1">Claude 4 Sonnet</p>
-            <div class="text-sm leading-relaxed whitespace-pre-wrap">{{ msg.content }}</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import ModelIcon from '../icons/ModelIcon.vue'
-import { useThemeStore } from '@/stores/theme'
-
-const themeStore = useThemeStore()
-
-const messages = [
-  {
-    id: '1',
-    role: 'user',
-    content:
-      'I\'m getting a login error when users try to sign in with their Google account. The error says "invalid_grant" and it happens intermittently.'
-  },
-  {
-    id: '2',
-    role: 'assistant',
-    content: `This is a common OAuth2 issue. The "invalid_grant" error typically occurs for a few reasons:
-
-1. Expired refresh token — Google refresh tokens can expire if the user hasn't used your app in 6 months, or if you've exceeded the 50 token limit per user account.
-
-2. Clock skew — If your server's clock is out of sync by more than a few minutes, token validation will fail.
-
-3. Token already used — Refresh tokens are single-use by default. If a retry mechanism sends the same token twice, the second attempt will fail.
-
-Can you share your OAuth configuration and the token refresh logic? That will help me narrow down the root cause.`
-  },
-  {
-    id: '3',
-    role: 'user',
-    content: `Here's our auth setup:
-
-const oauthConfig = {
-  clientId: process.env.GOOGLE_CLIENT_ID,
-  clientSecret: process.env.GOOGLE_CLIENT_SECRET,
-  tokenEndpoint: "https://oauth2.googleapis.com/token",
-  grantType: "refresh_token"
-}`
-  },
-  {
-    id: '4',
-    role: 'assistant',
-    content: `I can see a couple of potential issues:
-
-First, you should add retry logic with a fresh token fetch on failure. The intermittent nature suggests it might be a race condition where multiple requests try to refresh the same token simultaneously.
-
-Here's what I'd recommend:
-• Add a token refresh mutex/lock to prevent concurrent refresh attempts
-• Implement a retry mechanism that fetches a fresh token on "invalid_grant"
-• Store the refresh token atomically to prevent stale reads
-
-Second, make sure you're storing the new refresh token returned in each refresh response — Google rotates them on every use.
-
-Want me to write the updated token refresh handler with these fixes?`
-  },
-  {
-    id: '5',
-    role: 'user',
-    content: 'Yes please, that would be great.'
-  },
-  {
-    id: '6',
-    role: 'assistant',
-    content: `Here's the updated token refresh handler with mutex locking and retry logic:
-
-The key changes are:
-• Added a refresh lock using a simple promise-based mutex to prevent concurrent refresh attempts
-• On "invalid_grant" error, the handler invalidates the cached token and retries once with a fresh token
-• New refresh tokens from the response are stored atomically before using the access token
-• Added exponential backoff for transient network errors
-
-This should resolve the intermittent failures. The mutex ensures that when multiple API calls trigger a refresh simultaneously, only the first one actually performs the refresh and the others wait for its result.
-
-Let me know if you'd like me to also add logging to help debug any remaining issues.`
-  }
-]
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockStatusBar.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockStatusBar.vue
deleted file mode 100644
index 017b0b70e..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockStatusBar.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <div class="w-full max-w-2xl flex items-center justify-between px-1 py-2">
-    <div class="flex items-center gap-1">
-      <!-- Model selector -->
-      <DropdownMenu>
-        <DropdownMenuTrigger as-child>
-          <Button
-            variant="ghost"
-            size="sm"
-            class="h-6 px-2 gap-1 text-xs text-muted-foreground hover:text-foreground backdrop-blur-lg"
-          >
-            <ModelIcon
-              model-id="anthropic"
-              custom-class="w-3.5 h-3.5"
-              :is-dark="themeStore.isDark"
-            />
-            <span>Claude 4 Sonnet</span>
-            <Icon icon="lucide:chevron-down" class="w-3 h-3" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="start" class="min-w-0">
-          <DropdownMenuItem class="gap-2 text-xs py-1.5 px-2">
-            <ModelIcon
-              model-id="anthropic"
-              custom-class="w-3.5 h-3.5"
-              :is-dark="themeStore.isDark"
-            />
-            <span>Claude 4 Sonnet</span>
-          </DropdownMenuItem>
-          <DropdownMenuItem class="gap-2 text-xs py-1.5 px-2">
-            <ModelIcon model-id="openai" custom-class="w-3.5 h-3.5" :is-dark="themeStore.isDark" />
-            <span>GPT-4o</span>
-          </DropdownMenuItem>
-          <DropdownMenuItem class="gap-2 text-xs py-1.5 px-2">
-            <ModelIcon model-id="google" custom-class="w-3.5 h-3.5" :is-dark="themeStore.isDark" />
-            <span>Gemini 2.5 Pro</span>
-          </DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-
-      <!-- Effort selector -->
-      <DropdownMenu>
-        <DropdownMenuTrigger as-child>
-          <Button
-            variant="ghost"
-            size="sm"
-            class="h-6 px-2 gap-1 text-xs text-muted-foreground hover:text-foreground backdrop-blur-lg"
-          >
-            <Icon icon="lucide:gauge" class="w-3.5 h-3.5" />
-            <span>High</span>
-            <Icon icon="lucide:chevron-down" class="w-3 h-3" />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="start" class="min-w-0">
-          <DropdownMenuItem class="text-xs py-1.5 px-2">Low</DropdownMenuItem>
-          <DropdownMenuItem class="text-xs py-1.5 px-2">Medium</DropdownMenuItem>
-          <DropdownMenuItem class="text-xs py-1.5 px-2">High</DropdownMenuItem>
-          <DropdownMenuItem class="text-xs py-1.5 px-2">Extra High</DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    </div>
-
-    <!-- Permissions -->
-    <DropdownMenu>
-      <DropdownMenuTrigger as-child>
-        <Button
-          variant="ghost"
-          size="sm"
-          class="h-6 px-2 gap-1.5 text-xs text-muted-foreground hover:text-foreground backdrop-blur-lg"
-        >
-          <Icon icon="lucide:shield" class="w-3.5 h-3.5" />
-          <span>{{ t('chat.permissionMode.default') }}</span>
-          <Icon icon="lucide:chevron-down" class="w-3 h-3" />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" class="min-w-0">
-        <DropdownMenuItem class="text-xs py-1.5 px-2">{{
-          t('chat.permissionMode.default')
-        }}</DropdownMenuItem>
-        <DropdownMenuItem class="text-xs py-1.5 px-2">Restricted</DropdownMenuItem>
-        <DropdownMenuItem class="text-xs py-1.5 px-2">{{
-          t('chat.permissionMode.fullAccess')
-        }}</DropdownMenuItem>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Button } from '@shadcn/components/ui/button'
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger
-} from '@shadcn/components/ui/dropdown-menu'
-import { Icon } from '@iconify/vue'
-import { useI18n } from 'vue-i18n'
-import ModelIcon from '../icons/ModelIcon.vue'
-import { useThemeStore } from '@/stores/theme'
-
-const themeStore = useThemeStore()
-const { t } = useI18n()
-</script>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockTopBar.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockTopBar.vue
deleted file mode 100644
index 91ab932ec..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockTopBar.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<template>
-  <div
-    class="sticky top-0 z-10 flex items-center justify-between h-12 px-4 bg-background/60 backdrop-blur-lg window-drag-region"
-  >
-    <div class="flex items-center gap-2 min-w-0">
-      <div v-if="project" class="flex items-center gap-1.5 text-muted-foreground">
-        <Icon icon="lucide:folder" class="w-3.5 h-3.5 shrink-0" />
-        <span class="text-xs truncate">{{ projectName }}</span>
-        <Icon icon="lucide:chevron-right" class="w-3 h-3 shrink-0" />
-      </div>
-      <h2 class="text-sm font-medium truncate">{{ title }}</h2>
-    </div>
-
-    <div class="flex items-center gap-1">
-      <Tooltip>
-        <TooltipTrigger as-child>
-          <Button
-            variant="ghost"
-            size="icon"
-            class="h-7 w-7 text-muted-foreground hover:text-foreground"
-          >
-            <Icon icon="lucide:share" class="w-4 h-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>Share</TooltipContent>
-      </Tooltip>
-
-      <Tooltip>
-        <TooltipTrigger as-child>
-          <Button
-            variant="ghost"
-            size="icon"
-            class="h-7 w-7 text-muted-foreground hover:text-foreground"
-          >
-            <Icon icon="lucide:ellipsis" class="w-4 h-4" />
-          </Button>
-        </TooltipTrigger>
-        <TooltipContent>More</TooltipContent>
-      </Tooltip>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { Button } from '@shadcn/components/ui/button'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@shadcn/components/ui/tooltip'
-import { Icon } from '@iconify/vue'
-
-const props = defineProps<{
-  title: string
-  project: string
-}>()
-
-const projectName = computed(() => props.project.split('/').pop() ?? props.project)
-</script>
-
-<style scoped>
-.window-drag-region {
-  -webkit-app-region: drag;
-}
-
-button {
-  -webkit-app-region: no-drag;
-}
-</style>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockWelcomePage.vue b/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockWelcomePage.vue
deleted file mode 100644
index b25407d95..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockWelcomePage.vue
+++ /dev/null
@@ -1,130 +0,0 @@
-<template>
-  <div class="h-full w-full flex flex-col window-drag-region">
-    <div class="flex-1 flex flex-col items-center justify-center px-6">
-      <!-- Logo -->
-      <div class="mb-5">
-        <img src="@/assets/logo-dark.png" class="w-16 h-16" loading="lazy" />
-      </div>
-
-      <!-- Heading -->
-      <h1 class="text-3xl font-semibold text-foreground mb-2">
-        {{ t('welcome.page.title') }}
-      </h1>
-      <p class="text-sm text-muted-foreground text-center max-w-md mb-10">
-        {{ t('welcome.page.description') }}
-      </p>
-
-      <!-- Provider grid -->
-      <div class="grid grid-cols-3 gap-2 w-full max-w-sm mb-4">
-        <button
-          v-for="provider in providers"
-          :key="provider.id"
-          class="flex flex-col items-center gap-2 rounded-xl border border-border/60 bg-card/40 px-3 py-4 hover:bg-accent/50 hover:border-border transition-all duration-150"
-          @click="onAddProvider"
-        >
-          <ModelIcon :model-id="provider.id" custom-class="w-6 h-6" :is-dark="themeStore.isDark" />
-          <span class="text-xs text-foreground/80">{{ t(provider.nameKey) }}</span>
-        </button>
-      </div>
-
-      <button
-        class="text-xs text-muted-foreground hover:text-foreground transition-colors mb-12"
-        @click="onAddProvider"
-      >
-        {{ t('welcome.page.browseProviders') }}
-      </button>
-
-      <!-- ACP agent section (optional) -->
-      <div class="flex flex-col items-center gap-3 w-full max-w-sm">
-        <div class="flex items-center gap-3 w-full">
-          <div class="flex-1 h-px bg-border"></div>
-          <span class="text-xs text-muted-foreground/60">{{ t('welcome.page.connectAgent') }}</span>
-          <div class="flex-1 h-px bg-border"></div>
-        </div>
-
-        <button
-          class="flex items-center gap-3 w-full rounded-xl border border-dashed border-border/60 px-4 py-3 hover:bg-accent/30 hover:border-border transition-all duration-150"
-          @click="onSetupAcp"
-        >
-          <div class="flex items-center justify-center w-8 h-8 rounded-lg bg-muted/60 shrink-0">
-            <Icon icon="lucide:terminal" class="w-4 h-4 text-muted-foreground" />
-          </div>
-          <div class="text-left">
-            <p class="text-sm text-foreground/80">{{ t('welcome.page.acpTitle') }}</p>
-            <p class="text-xs text-muted-foreground/60">{{ t('welcome.page.acpDescription') }}</p>
-          </div>
-          <Icon icon="lucide:chevron-right" class="w-4 h-4 text-muted-foreground/40 ml-auto" />
-        </button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { Icon } from '@iconify/vue'
-import { useI18n } from 'vue-i18n'
-import { usePresenter } from '@/composables/usePresenter'
-import { SETTINGS_EVENTS } from '@/events'
-import { useThemeStore } from '@/stores/theme'
-import ModelIcon from '../icons/ModelIcon.vue'
-
-const { t } = useI18n()
-const windowPresenter = usePresenter('windowPresenter')
-const themeStore = useThemeStore()
-
-const providers = [
-  { id: 'claude', nameKey: 'welcome.page.providers.claude' },
-  { id: 'openai', nameKey: 'welcome.page.providers.openai' },
-  { id: 'deepseek', nameKey: 'welcome.page.providers.deepseek' },
-  { id: 'gemini', nameKey: 'welcome.page.providers.gemini' },
-  { id: 'ollama', nameKey: 'welcome.page.providers.ollama' },
-  { id: 'openrouter', nameKey: 'welcome.page.providers.openrouter' }
-]
-
-type SettingsRouteName = 'settings-provider' | 'settings-acp'
-
-const navigateToSettings = (windowId: number, routeName: SettingsRouteName) => {
-  windowPresenter.sendToWindow(windowId, SETTINGS_EVENTS.NAVIGATE, {
-    routeName
-  })
-}
-
-const openSettings = async (routeName: SettingsRouteName) => {
-  const windowId = window.api.getWindowId()
-  if (windowId != null) {
-    await windowPresenter.createSettingsWindow()
-    const settingsWindowId = windowPresenter.getSettingsWindowId()
-    if (settingsWindowId != null) {
-      navigateToSettings(settingsWindowId, routeName)
-      window.setTimeout(() => {
-        if (windowPresenter.getSettingsWindowId() === settingsWindowId) {
-          navigateToSettings(settingsWindowId, routeName)
-        }
-      }, 250)
-    }
-  }
-}
-
-const onAddProvider = async () => {
-  await openSettings('settings-provider')
-}
-
-const onSetupAcp = async () => {
-  await openSettings('settings-acp')
-}
-</script>
-
-<style scoped>
-.window-drag-region {
-  -webkit-app-region: drag;
-}
-
-button,
-a,
-input,
-select,
-textarea,
-[role='button'] {
-  -webkit-app-region: no-drag;
-}
-</style>
diff --git a/archives/code/dead-code-batch-2/src/renderer/src/composables/useMockViewState.ts b/archives/code/dead-code-batch-2/src/renderer/src/composables/useMockViewState.ts
deleted file mode 100644
index ebf8a8cb2..000000000
--- a/archives/code/dead-code-batch-2/src/renderer/src/composables/useMockViewState.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ref, computed } from 'vue'
-
-const _selectedSessionId = ref<string | null>(null)
-const _selectedSessionTitle = ref('')
-const _selectedSessionProject = ref('')
-const _showMockWelcome = ref(false)
-
-export function useMockViewState() {
-  const selectSession = (id: string | null, title: string = '', projectDir: string = '') => {
-    _selectedSessionId.value = id
-    _selectedSessionTitle.value = title
-    _selectedSessionProject.value = projectDir
-  }
-
-  return {
-    mockSessionId: _selectedSessionId,
-    mockSessionTitle: _selectedSessionTitle,
-    mockSessionProject: _selectedSessionProject,
-    showMockWelcome: _showMockWelcome,
-    isMockChatActive: computed(() => _selectedSessionId.value !== null),
-    selectSession
-  }
-}
diff --git a/archives/code/dead-code-batch-3/README.md b/archives/code/dead-code-batch-3/README.md
deleted file mode 100644
index bea975789..000000000
--- a/archives/code/dead-code-batch-3/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dead Code Batch 3
-
-- Purpose: archive retired MCP runtime code that is no longer part of the active in-memory server set.
-- Archived at: 2026-03-26
-- Rationale: `meetingServer.ts` has been removed from live MCP registration and default config, but is retained in source form for precise rollback if the feature is rebuilt later.
-
-## Archived Paths
-
-- `src/main/presenter/mcpPresenter/inMemoryServers/meetingServer.ts`
-
-## Notes
-
-- This directory is not part of the runtime, build, typecheck, or test target set.
-- Restore by moving files back to their original paths only if a future audit proves the retired MCP server is needed again.
diff --git a/archives/code/dead-code-batch-3/src/main/presenter/mcpPresenter/inMemoryServers/meetingServer.ts b/archives/code/dead-code-batch-3/src/main/presenter/mcpPresenter/inMemoryServers/meetingServer.ts
deleted file mode 100644
index 991bc4f38..000000000
--- a/archives/code/dead-code-batch-3/src/main/presenter/mcpPresenter/inMemoryServers/meetingServer.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
-import { Transport } from '@modelcontextprotocol/sdk/shared/transport.js'
-import { z } from 'zod'
-import { zodToJsonSchema } from 'zod-to-json-schema'
-
-const ParticipantSchema = z
-  .object({
-    tab_id: z.number().optional(),
-    tab_title: z.string().optional(),
-    profile: z.string().optional()
-  })
-  .refine(
-    (data) => {
-      const hasId = data.tab_id !== undefined && data.tab_id !== -1
-      const hasTitle = data.tab_title !== undefined && data.tab_title.trim() !== ''
-      return (hasId && !hasTitle) || (!hasId && hasTitle)
-    },
-    {
-      message:
-        '错误：必须且只能通过 "tab_id" 或 "tab_title" 中的一个来指定参会者，两者不能同时提供，也不能都为空。'
-    }
-  )
-
-const StartMeetingArgsSchema = z.object({
-  participants: z
-    .array(ParticipantSchema)
-    .min(2, { message: '会议至少需要两位参会者。' })
-    .describe('参会者列表。'),
-  topic: z.string().describe('会议的核心讨论主题。'),
-  rounds: z.number().optional().default(3).describe('讨论的轮次数，默认为3轮。')
-})
-
-export class MeetingServer {
-  private server: Server
-
-  constructor() {
-    this.server = new Server(
-      { name: 'meeting-server', version: '1.0.0' },
-      { capabilities: { tools: {} } }
-    )
-    this.setupRequestHandlers()
-  }
-
-  public startServer(transport: Transport): void {
-    this.server.connect(transport)
-  }
-
-  private setupRequestHandlers(): void {
-    this.server.setRequestHandler(ListToolsRequestSchema, async () => ({
-      tools: [
-        {
-          name: 'start_meeting',
-          description:
-            'Legacy helper. Disabled while the app migrates to the window-native architecture.',
-          inputSchema: zodToJsonSchema(StartMeetingArgsSchema),
-          annotations: {
-            title: 'Start Meeting',
-            destructiveHint: false
-          }
-        }
-      ]
-    }))
-
-    this.server.setRequestHandler(CallToolRequestSchema, async (request) => {
-      const { name, arguments: args } = request.params
-      if (name !== 'start_meeting') {
-        throw new Error(`未知的工具: ${name}`)
-      }
-
-      try {
-        StartMeetingArgsSchema.parse(args)
-        return {
-          content: [
-            {
-              type: 'text',
-              text: [
-                'Legacy helper disabled.',
-                'Reason: the old multi-tab meeting flow no longer matches the window-native architecture.'
-              ].join(' ')
-            }
-          ],
-          isError: true
-        }
-      } catch (error) {
-        return {
-          content: [
-            {
-              type: 'text',
-              text: `会议启动失败: ${error instanceof Error ? error.message : String(error)}`
-            }
-          ],
-          isError: true
-        }
-      }
-    })
-  }
-}
diff --git a/archives/code/dead-renderer-batch-1/README.md b/archives/code/dead-renderer-batch-1/README.md
deleted file mode 100644
index c7d250859..000000000
--- a/archives/code/dead-renderer-batch-1/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Dead Renderer Batch 1
-
-- Purpose: archive renderer dead code that is no longer on the active chat path.
-- Archived at: 2026-03-15
-- Rationale: static inspection confirmed there are no active references in `src/`, `test/`, or live docs. Files are kept in source form for precise rollback only.
-
-## Archived Paths
-
-- `src/renderer/src/components/message/MessageMinimap.vue`
-- `src/renderer/src/composables/message/useMessageMinimap.ts`
-- `src/renderer/src/components/MessageNavigationSidebar.vue`
-- `src/renderer/src/lib/messageRuntimeCache.ts`
-
-## Notes
-
-- This directory is not part of the runtime, build, typecheck, or test target set.
-- Restore by moving files back to their original paths if a later audit proves they are still needed.
diff --git a/archives/code/dead-renderer-batch-1/src/renderer/src/components/MessageNavigationSidebar.vue b/archives/code/dead-renderer-batch-1/src/renderer/src/components/MessageNavigationSidebar.vue
deleted file mode 100644
index 15d2fd9e1..000000000
--- a/archives/code/dead-renderer-batch-1/src/renderer/src/components/MessageNavigationSidebar.vue
+++ /dev/null
@@ -1,366 +0,0 @@
-<template>
-  <div
-    class="message-navigation-sidebar h-full w-full bg-card border-l border-border flex flex-col"
-  >
-    <!-- 头部 -->
-    <div class="flex items-center justify-between p-4 border-b border-border">
-      <h3 class="text-sm font-medium text-foreground">{{ t('chat.navigation.title') }}</h3>
-      <Button variant="ghost" size="icon" class="h-6 w-6" @click="$emit('close')">
-        <Icon icon="lucide:x" class="h-4 w-4" />
-      </Button>
-    </div>
-
-    <!-- 搜索框 -->
-    <div class="p-4 border-b border-border">
-      <div class="relative">
-        <Icon
-          icon="lucide:search"
-          class="absolute left-3 top-1/2 transform -translate-y-1/2 h-4 w-4 text-muted-foreground"
-        />
-        <Input
-          v-model="searchQuery"
-          :placeholder="t('chat.navigation.searchPlaceholder')"
-          class="pl-10 pr-8 h-8 text-sm"
-        />
-        <Button
-          v-if="searchQuery.trim()"
-          variant="ghost"
-          size="icon"
-          class="absolute right-1 top-1/2 transform -translate-y-1/2 h-6 w-6"
-          @click="searchQuery = ''"
-        >
-          <Icon icon="lucide:x" class="h-3 w-3" />
-        </Button>
-      </div>
-
-      <!-- 搜索结果计数 -->
-      <div v-if="searchQuery.trim()" class="mt-2 text-xs text-muted-foreground">
-        {{
-          t('chat.navigation.searchResults', {
-            count: filteredMessages.length,
-            total: totalMessages
-          })
-        }}
-      </div>
-    </div>
-
-    <!-- 消息列表 -->
-    <div ref="messagesContainer" class="flex-1 overflow-y-auto scroll-smooth relative">
-      <div class="p-2 space-y-1">
-        <div
-          v-for="(message, index) in filteredMessages"
-          :key="message.id"
-          class="message-nav-item p-3 rounded-lg cursor-pointer transition-colors hover:bg-accent/50"
-          :class="{
-            'bg-accent': activeMessageId === message.id,
-            'border-l-2 border-primary': activeMessageId === message.id
-          }"
-          @click="scrollToMessage(message.id)"
-        >
-          <div class="flex items-center justify-between mb-2">
-            <div class="flex items-center gap-2">
-              <div class="shrink-0">
-                <div
-                  v-if="message.role === 'assistant'"
-                  class="w-4 h-4 flex items-center justify-center bg-base-900/5 dark:bg-base-100/10 border border-input rounded-sm"
-                >
-                  <ModelIcon
-                    :model-id="message.model_provider || 'default'"
-                    class="w-2.5 h-2.5"
-                    :is-dark="themeStore.isDark"
-                  />
-                </div>
-                <div v-else class="w-4 h-4 bg-muted rounded-sm flex items-center justify-center">
-                  <Icon icon="lucide:user" class="w-2.5 h-2.5 text-muted-foreground" />
-                </div>
-              </div>
-
-              <span class="text-xs text-muted-foreground font-mono"> #{{ index + 1 }} </span>
-            </div>
-
-            <span class="text-xs text-muted-foreground">
-              {{ formatTime(message.timestamp) }}
-            </span>
-          </div>
-
-          <div class="text-sm text-foreground/80 line-clamp-2">
-            <span v-html="highlightSearchQuery(getMessagePreview(message))"></span>
-          </div>
-        </div>
-      </div>
-
-      <div
-        v-if="filteredMessages.length === 0"
-        class="flex flex-col items-center justify-center h-32 text-muted-foreground"
-      >
-        <Icon icon="lucide:message-circle" class="h-8 w-8 mb-2" />
-        <p class="text-sm">
-          {{ searchQuery ? t('chat.navigation.noResults') : t('chat.navigation.noMessages') }}
-        </p>
-      </div>
-
-      <!-- 滚动锚点 -->
-      <div ref="scrollAnchor" class="h-2" />
-
-      <!-- 滚动到底部按钮 -->
-      <div v-if="showScrollToBottomButton && !searchQuery.trim()" class="absolute bottom-4 right-4">
-        <Button
-          variant="outline"
-          size="icon"
-          class="h-8 w-8 rounded-full shadow-lg bg-background border"
-          @click="scrollToBottom"
-        >
-          <Icon icon="lucide:arrow-down" class="h-4 w-4" />
-        </Button>
-      </div>
-    </div>
-
-    <div class="p-4 border-t border-border">
-      <div class="text-xs text-muted-foreground text-center">
-        {{ t('chat.navigation.totalMessages', { count: totalMessages }) }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch, nextTick, onMounted, onUnmounted } from 'vue'
-import { Icon } from '@iconify/vue'
-import { Button } from '@shadcn/components/ui/button'
-import { Input } from '@shadcn/components/ui/input'
-import { useI18n } from 'vue-i18n'
-import { useThemeStore } from '@/stores/theme'
-import ModelIcon from '@/components/icons/ModelIcon.vue'
-import type { Message } from '@shared/chat'
-import { isSafeRegexPattern } from '@shared/regexValidator'
-
-interface Props {
-  messages: Message[]
-  totalMessages: number
-  isOpen: boolean
-  activeMessageId?: string
-}
-
-const props = defineProps<Props>()
-
-const emit = defineEmits<{
-  close: []
-  scrollToMessage: [messageId: string]
-}>()
-
-const { t } = useI18n()
-const themeStore = useThemeStore()
-
-const searchQuery = ref('')
-const messagesContainer = ref<HTMLDivElement>()
-const scrollAnchor = ref<HTMLDivElement>()
-const showScrollToBottomButton = ref(false)
-
-// 获取消息完整内容用于搜索
-const getFullMessageContent = (message: Message): string => {
-  if (message.role === 'user') {
-    const userContent = message.content as import('@shared/chat').UserMessageContent
-    return userContent.text || ''
-  } else if (message.role === 'assistant') {
-    const assistantMessage = message as import('@shared/chat').AssistantMessage
-    const contentToDisplay =
-      assistantMessage.content as import('@shared/chat').AssistantMessageBlock[]
-    return contentToDisplay
-      .filter((block: import('@shared/chat').AssistantMessageBlock) => block.type === 'content')
-      .map((block: import('@shared/chat').AssistantMessageBlock) => block.content || '')
-      .join(' ')
-  }
-  return ''
-}
-
-// 获取搜索匹配的上下文
-const getSearchContext = (content: string, query: string, contextLength: number = 30): string => {
-  const lowerContent = content.toLowerCase()
-  const lowerQuery = query.toLowerCase()
-  const matchIndex = lowerContent.indexOf(lowerQuery)
-  if (matchIndex === -1) return content.slice(0, 100)
-  const start = Math.max(0, matchIndex - contextLength)
-  const end = Math.min(content.length, matchIndex + query.length + contextLength)
-  let result = content.slice(start, end)
-  if (start > 0) result = '...' + result
-  if (end < content.length) result = result + '...'
-  return result
-}
-
-// 过滤消息
-const filteredMessages = computed(() => {
-  if (!searchQuery.value.trim()) {
-    return props.messages
-  }
-  const query = searchQuery.value.toLowerCase()
-  return props.messages.filter((message) => {
-    const fullContent = getFullMessageContent(message).toLowerCase()
-    return fullContent.includes(query)
-  })
-})
-
-// 获取消息预览文本
-const getMessagePreview = (message: Message): string => {
-  const fullContent = getFullMessageContent(message)
-  if (!fullContent) {
-    if (message.role === 'user') {
-      return t('chat.navigation.userMessage')
-    } else if (message.role === 'assistant') {
-      return t('chat.navigation.assistantMessage')
-    }
-    return t('chat.navigation.unknownMessage')
-  }
-  // 如果有搜索查询，显示搜索上下文
-  if (searchQuery.value.trim()) {
-    return getSearchContext(fullContent, searchQuery.value)
-  }
-  return fullContent.slice(0, 100) + (fullContent.length > 100 ? '...' : '')
-}
-
-// 格式化时间
-const formatTime = (timestamp: number): string => {
-  const date = new Date(timestamp)
-  const now = new Date()
-  const diff = now.getTime() - date.getTime()
-  if (diff < 24 * 60 * 60 * 1000 && date.getDate() === now.getDate()) {
-    return date.toLocaleTimeString('zh-CN', {
-      hour: '2-digit',
-      minute: '2-digit'
-    })
-  }
-  return date.toLocaleDateString('zh-CN', {
-    month: 'short',
-    day: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit'
-  })
-}
-
-// 高亮搜索关键词
-const highlightSearchQuery = (text: string): string => {
-  if (!searchQuery.value.trim()) {
-    return text
-  }
-
-  const query = searchQuery.value.trim()
-  // Escape special characters and validate pattern for ReDoS safety
-  const escapedQuery = query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-  const pattern = `(${escapedQuery})`
-  if (!isSafeRegexPattern(pattern)) {
-    // If pattern is unsafe, return text without highlighting
-    return text
-  }
-  const regex = new RegExp(pattern, 'gi')
-  return text.replace(
-    regex,
-    '<mark class="bg-yellow-200 dark:bg-yellow-800 px-1 rounded">$1</mark>'
-  )
-}
-
-// 滚动到底部
-const scrollToBottom = () => {
-  nextTick(() => {
-    scrollAnchor.value?.scrollIntoView({
-      behavior: 'instant',
-      block: 'end'
-    })
-  })
-}
-
-// 滚动到指定消息
-const scrollToMessage = (messageId: string) => {
-  emit('scrollToMessage', messageId)
-}
-
-watch(
-  () => props.messages.length,
-  (newLength, oldLength) => {
-    // 只在新增消息时滚动，避免过度滚动
-    if (newLength > oldLength && !searchQuery.value.trim()) {
-      nextTick(() => {
-        scrollToBottom()
-      })
-    }
-  }
-)
-
-watch(
-  () => props.isOpen,
-  (newIsOpen) => {
-    if (newIsOpen && !searchQuery.value.trim()) {
-      nextTick(() => {
-        scrollToBottom()
-        setupScrollObserver()
-      })
-    } else if (newIsOpen) {
-      nextTick(() => {
-        setupScrollObserver()
-      })
-    }
-  }
-)
-
-let intersectionObserver: IntersectionObserver | null = null
-
-const setupScrollObserver = () => {
-  if (intersectionObserver) {
-    intersectionObserver.disconnect()
-  }
-
-  intersectionObserver = new IntersectionObserver(
-    (entries) => {
-      const entry = entries[0]
-      showScrollToBottomButton.value = !entry.isIntersecting
-    },
-    {
-      root: messagesContainer.value,
-      rootMargin: '0px 0px 20px 0px',
-      threshold: 0
-    }
-  )
-
-  if (scrollAnchor.value) {
-    intersectionObserver.observe(scrollAnchor.value)
-  }
-}
-
-// 组件挂载时滚动到底部
-onMounted(() => {
-  if (props.isOpen && !searchQuery.value.trim()) {
-    nextTick(() => {
-      scrollToBottom()
-      setupScrollObserver()
-    })
-  } else {
-    nextTick(() => {
-      setupScrollObserver()
-    })
-  }
-})
-
-// 清理观察器
-onUnmounted(() => {
-  if (intersectionObserver) {
-    intersectionObserver.disconnect()
-    intersectionObserver = null
-  }
-})
-</script>
-
-<style scoped>
-.message-nav-item {
-  transition: all 0.2s ease;
-}
-
-.message-nav-item:hover {
-  transform: translateX(2px);
-}
-
-.line-clamp-2 {
-  display: -webkit-box;
-  -webkit-line-clamp: 2;
-  line-clamp: 2;
-  -webkit-box-orient: vertical;
-  overflow: hidden;
-}
-</style>
diff --git a/archives/code/dead-renderer-batch-1/src/renderer/src/components/message/MessageMinimap.vue b/archives/code/dead-renderer-batch-1/src/renderer/src/components/message/MessageMinimap.vue
deleted file mode 100644
index 2e440aa51..000000000
--- a/archives/code/dead-renderer-batch-1/src/renderer/src/components/message/MessageMinimap.vue
+++ /dev/null
@@ -1,291 +0,0 @@
-<template>
-  <div
-    class="absolute top-0 right-0 w-14 min-h-[148px] box-border rounded-md py-4 px-3 flex flex-col items-stretch gap-0 pointer-events-none z-[5] overflow-hidden"
-  >
-    <div
-      class="map-list relative max-h-[70vh] flex-1 flex justify-end w-full pointer-events-auto overflow-y-auto"
-    >
-      <TooltipProvider :delay-duration="80">
-        <div class="flex flex-col items-end gap-1 w-full relative z-2" role="list">
-          <TooltipRoot v-for="bar in bars" :key="bar.id">
-            <TooltipTrigger>
-              <button
-                type="button"
-                class="w-full h-2.5 pl-2 pr-1.5 flex items-center justify-end gap-1 rounded-sm transition-[transform,opacity] duration-200 ease-out outline-none border-0 cursor-pointer focus-visible:outline-none"
-                :class="[isActiveBar(bar.id) ? 'opacity-100' : 'opacity-60']"
-                :aria-label="bar.ariaLabel"
-                role="listitem"
-                @mouseenter="handleBarEnter(bar.id)"
-                @mouseleave="handleBarLeave"
-                @focus="handleBarEnter(bar.id)"
-                @blur="handleBarLeave"
-                @click.stop="handleBarClick(bar.id)"
-              >
-                <span
-                  class="block h-1.5 rounded-xs transition-[transform,background-color] duration-200 ease-out pointer-events-none"
-                  :class="[
-                    bar.role === 'assistant'
-                      ? isActiveBar(bar.id)
-                        ? 'bg-[rgba(37,37,37,0.75)] dark:bg-[rgba(255,255,255,0.95)]'
-                        : 'bg-[rgba(37,37,37,0.3)] dark:bg-[rgba(255,255,255,0.5)]'
-                      : isActiveBar(bar.id)
-                        ? 'bg-[rgba(37,37,37,0.55)] dark:bg-[rgba(255,255,255,0.8)]'
-                        : 'bg-[rgba(37,37,37,0.2)] dark:bg-[rgba(255,255,255,0.35)]',
-                    isActiveBar(bar.id) ? 'scale-x-110 -translate-x-0.5' : ''
-                  ]"
-                  :style="{ width: `${bar.width}px` }"
-                />
-              </button>
-            </TooltipTrigger>
-            <TooltipContent
-              v-if="getPreviewData(bar.id)"
-              class="max-w-64 border border-border/60 bg-background/95 dark:bg-base-900/90 text-[11px] leading-snug rounded-md shadow-sm px-3 py-2"
-              side="left"
-              :side-offset="6"
-              align="end"
-            >
-              <div class="text-[11px] font-medium text-muted-foreground mb-1 leading-none">
-                #{{ getPreviewData(bar.id)?.index }} · {{ getPreviewData(bar.id)?.role }}
-              </div>
-              <div class="text-[11px] text-foreground/85 whitespace-pre-line">
-                {{ getPreviewData(bar.id)?.preview }}
-              </div>
-            </TooltipContent>
-          </TooltipRoot>
-        </div>
-      </TooltipProvider>
-    </div>
-    <div
-      v-if="overallContextUsage !== null"
-      class="font-['Geist\\ Mono',ui-monospace,SFMono-Regular,SFMono,Menlo,Monaco,Consolas,'Liberation\\ Mono','Courier\\ New',monospace] text-[11px] leading-none text-[rgba(37,37,37,0.6)] mt-[6px] self-end pointer-events-auto dark:text-[rgba(255,255,255,0.6)]"
-    >
-      {{ overallContextUsage.toFixed(0) }}%
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue'
-import type { AssistantMessage, Message, UserMessage } from '@shared/chat'
-import { TooltipContent, TooltipProvider, TooltipRoot, TooltipTrigger } from 'reka-ui'
-
-interface ScrollInfo {
-  viewportHeight: number
-  contentHeight: number
-  scrollTop: number
-}
-
-interface Props {
-  messages: Message[]
-  hoveredMessageId?: string | null
-  activeMessageId?: string | null
-  scrollInfo?: ScrollInfo
-}
-
-const props = defineProps<Props>()
-
-const emit = defineEmits<{
-  (e: 'bar-hover', messageId: string | null): void
-  (e: 'bar-click', messageId: string): void
-}>()
-
-const localHoveredId = ref<string | null>(null)
-
-const MIN_WIDTH = 8
-const MAX_WIDTH = 20
-
-const getMessageContentLength = (message: Message) => {
-  if (message.role === 'assistant') {
-    const assistantMessage = message as AssistantMessage
-    const blocks = assistantMessage.content ?? []
-    const combined = blocks
-      .filter((block) => block.type === 'content' || block.type === 'reasoning_content')
-      .map((block) => block.content ?? '')
-      .join(' ')
-    const usageTokens = assistantMessage.usage?.total_tokens ?? 0
-    return usageTokens > 0 ? usageTokens : combined.length
-  }
-
-  const userMessage = message as UserMessage
-  const content = userMessage.content
-  const textParts: string[] = []
-  const resolveUserBlockText = (block: {
-    type?: string
-    content?: string
-    category?: string
-    id?: string
-  }) => {
-    if (block?.type === 'mention' && block?.category === 'context') {
-      const label = block.id?.trim() || 'context'
-      return `@${label}`
-    }
-    return typeof block?.content === 'string' ? block.content : ''
-  }
-
-  if (content?.text) {
-    textParts.push(content.text)
-  } else if (content?.content) {
-    content.content.forEach((block) => {
-      textParts.push(resolveUserBlockText(block))
-    })
-  }
-  if (content?.files?.length) {
-    textParts.push(content.files.map((file) => file.name ?? '').join(' '))
-  }
-  return textParts.join(' ').length || (userMessage.usage?.input_tokens ?? 0)
-}
-
-const bars = computed(() => {
-  if (!props.messages?.length) {
-    return []
-  }
-
-  const messageLengths = props.messages.map((message) => ({
-    id: message.id,
-    role: message.role,
-    length: getMessageContentLength(message),
-    contextUsage: message.usage?.context_usage ?? 0
-  }))
-
-  const maxLength = Math.max(...messageLengths.map((item) => item.length), 1)
-
-  return messageLengths.map((item, index) => {
-    const normalized = maxLength === 0 ? 0 : item.length / maxLength
-    const width = MIN_WIDTH + normalized * (MAX_WIDTH - MIN_WIDTH)
-    return {
-      id: item.id,
-      role: item.role,
-      width: Math.min(MAX_WIDTH, Math.max(MIN_WIDTH, width)),
-      ariaLabel: `Message ${index + 1}, ${item.role}`,
-      contextUsage: item.contextUsage
-    }
-  })
-})
-
-const overallContextUsage = computed(() => {
-  const usageValues = props.messages
-    ?.map((message) => message.usage?.context_usage)
-    .filter((value): value is number => typeof value === 'number' && !Number.isNaN(value))
-
-  if (!usageValues?.length) {
-    return null
-  }
-
-  return Math.max(...usageValues)
-})
-
-watch(
-  () => props.hoveredMessageId,
-  (value) => {
-    localHoveredId.value = value as string | null
-  }
-)
-
-const hoveredMessageId = computed(() => props.hoveredMessageId ?? localHoveredId.value)
-const activeMessageId = computed(() => props.activeMessageId ?? null)
-
-const formatUserBlock = (block: {
-  type?: string
-  content?: string
-  category?: string
-  id?: string
-}) => {
-  if (block?.type === 'mention' && block?.category === 'context') {
-    const label = block.id?.trim() || 'context'
-    return `@${label}`
-  }
-  return typeof block?.content === 'string' ? block.content : ''
-}
-
-const buildPreview = (message: Message) => {
-  if (message.role === 'assistant') {
-    const assistant = message as AssistantMessage
-    const text = (assistant.content ?? [])
-      .filter((block) => block.type === 'content' || block.type === 'reasoning_content')
-      .map((block) => block.content ?? '')
-      .join(' ')
-    return text || 'assistant'
-  }
-  const user = message as UserMessage
-  const parts: string[] = []
-  if (user.content?.text) parts.push(user.content.text)
-  if (Array.isArray(user.content?.content)) {
-    parts.push(...user.content.content.map((block) => formatUserBlock(block)))
-  }
-  if (user.content?.files?.length) {
-    parts.push(user.content.files.map((file) => file.name ?? '').join(' '))
-  }
-  return parts.join(' ').trim() || 'user'
-}
-
-const getPreviewData = (messageId: string) => {
-  const messageIndex = props.messages.findIndex((msg) => msg.id === messageId)
-  if (messageIndex === -1) return null
-  const message = props.messages[messageIndex]
-  const previewText = buildPreview(message)
-  const roleLabel = message.role === 'assistant' ? 'assistant' : 'user'
-  const truncated =
-    previewText.length > 30 ? `${previewText.slice(0, 27).trimEnd()}...` : previewText
-  return {
-    index: messageIndex + 1,
-    role: roleLabel,
-    preview: truncated
-  }
-}
-
-const isActiveBar = (messageId: string) => {
-  return hoveredMessageId.value === messageId || activeMessageId.value === messageId
-}
-
-const handleBarEnter = (messageId: string) => {
-  localHoveredId.value = messageId
-  emit('bar-hover', messageId)
-}
-
-const handleBarLeave = () => {
-  localHoveredId.value = null
-  emit('bar-hover', null)
-}
-
-const handleBarClick = (messageId: string) => {
-  emit('bar-click', messageId)
-}
-</script>
-
-<style scoped>
-/* 自定义滚动条样式，不占用布局空间 */
-.map-list::-webkit-scrollbar {
-  width: 4px;
-}
-
-.map-list::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-.map-list::-webkit-scrollbar-thumb {
-  background-color: rgba(0, 0, 0, 0.2);
-  border-radius: 2px;
-}
-
-.dark .map-list::-webkit-scrollbar-thumb {
-  background-color: rgba(255, 255, 255, 0.2);
-}
-
-.map-list::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(0, 0, 0, 0.3);
-}
-
-.dark .map-list::-webkit-scrollbar-thumb:hover {
-  background-color: rgba(255, 255, 255, 0.3);
-}
-
-/* Firefox */
-.map-list {
-  scrollbar-width: thin;
-  scrollbar-color: rgba(0, 0, 0, 0.2) transparent;
-}
-
-.dark .map-list {
-  scrollbar-color: rgba(255, 255, 255, 0.2) transparent;
-}
-</style>
diff --git a/archives/code/dead-renderer-batch-1/src/renderer/src/composables/message/useMessageMinimap.ts b/archives/code/dead-renderer-batch-1/src/renderer/src/composables/message/useMessageMinimap.ts
deleted file mode 100644
index d4f250ec3..000000000
--- a/archives/code/dead-renderer-batch-1/src/renderer/src/composables/message/useMessageMinimap.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { ref, readonly, type DeepReadonly } from 'vue'
-import type { ScrollInfo } from './types'
-
-export function useMessageMinimap(scrollInfoRef: DeepReadonly<ScrollInfo>) {
-  const hoveredMessageId = ref<string | null>(null)
-
-  const handleHover = (messageId: string | null) => {
-    hoveredMessageId.value = messageId
-  }
-
-  return {
-    hoveredMessageId: readonly(hoveredMessageId),
-    scrollInfo: scrollInfoRef,
-    handleHover
-  }
-}
diff --git a/archives/code/dead-renderer-batch-1/src/renderer/src/lib/messageRuntimeCache.ts b/archives/code/dead-renderer-batch-1/src/renderer/src/lib/messageRuntimeCache.ts
deleted file mode 100644
index 842b7b1e3..000000000
--- a/archives/code/dead-renderer-batch-1/src/renderer/src/lib/messageRuntimeCache.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import type { Message } from '@shared/chat'
-
-type DomInfo = {
-  top: number
-  height: number
-}
-
-type DomInfoEntry = {
-  id: string
-  top: number
-  height: number
-}
-
-const MAX_CACHE_ENTRIES = 800
-
-const messageCache = new Map<string, Message>()
-const messageThreadMap = new Map<string, string>()
-const messageDomInfo = new Map<string, DomInfo>()
-
-const touch = (messageId: string, message: Message) => {
-  if (!messageCache.has(messageId)) return
-  messageCache.delete(messageId)
-  messageCache.set(messageId, message)
-}
-
-const prune = () => {
-  while (messageCache.size > MAX_CACHE_ENTRIES) {
-    const oldestId = messageCache.keys().next().value as string | undefined
-    if (!oldestId) return
-    messageCache.delete(oldestId)
-    messageThreadMap.delete(oldestId)
-    messageDomInfo.delete(oldestId)
-  }
-}
-
-export const getCachedMessage = (messageId: string): Message | null => {
-  const message = messageCache.get(messageId)
-  if (!message) return null
-  touch(messageId, message)
-  return message
-}
-
-export const hasCachedMessage = (messageId: string): boolean => {
-  return messageCache.has(messageId)
-}
-
-export const cacheMessage = (message: Message) => {
-  messageCache.set(message.id, message)
-  messageThreadMap.set(message.id, message.conversationId)
-  touch(message.id, message)
-  prune()
-}
-
-export const cacheMessages = (messages: Message[]) => {
-  for (const message of messages) {
-    cacheMessage(message)
-  }
-}
-
-export const deleteCachedMessage = (messageId: string) => {
-  messageCache.delete(messageId)
-  messageThreadMap.delete(messageId)
-  messageDomInfo.delete(messageId)
-}
-
-export const clearCachedMessagesForThread = (threadId: string) => {
-  for (const [messageId, conversationId] of messageThreadMap.entries()) {
-    if (conversationId === threadId) {
-      messageCache.delete(messageId)
-      messageThreadMap.delete(messageId)
-      messageDomInfo.delete(messageId)
-    }
-  }
-}
-
-export const clearMessageCache = () => {
-  messageCache.clear()
-  messageThreadMap.clear()
-  messageDomInfo.clear()
-}
-
-export const setMessageDomInfo = (entries: Array<{ id: string; top: number; height: number }>) => {
-  for (const entry of entries) {
-    messageDomInfo.set(entry.id, { top: entry.top, height: entry.height })
-  }
-}
-
-export const getMessageDomInfo = (messageId: string): DomInfo | null => {
-  return messageDomInfo.get(messageId) ?? null
-}
-
-export const getAllMessageDomInfo = (): DomInfoEntry[] => {
-  return Array.from(messageDomInfo.entries()).map(([id, info]) => ({
-    id,
-    top: info.top,
-    height: info.height
-  }))
-}
-
-export const clearMessageDomInfo = () => {
-  messageDomInfo.clear()
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/README.md b/archives/code/legacy-agentpresenter-retirement/README.md
deleted file mode 100644
index cd30dfa9a..000000000
--- a/archives/code/legacy-agentpresenter-retirement/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Legacy AgentPresenter Retirement
-
-- Purpose: archive the retired `AgentPresenter` runtime after `newAgentPresenter + deepchatAgentPresenter` became the only live chat execution path.
-- Archived at: 2026-03-23
-- Rationale: the remaining legacy runtime wiring, legacy loop compatibility surface, and legacy-only tests were removed from the live tree. Retained ACP/tool/message-formatting helpers were moved to new owner modules before archiving.
-
-## Archived Paths
-
-- `src/main/presenter/agentPresenter/`
-- `src/shared/types/presenters/agent.presenter.d.ts`
-- `test/main/presenter/agentPresenter/`
-- `test/main/presenter/sessionPresenter/permissionHandler.test.ts`
-
-## Notes
-
-- This directory is not part of the runtime, build, typecheck, or test target set.
-- Restore by moving files back to their original paths only if a future audit proves the retired legacy runtime is still needed.
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/backgroundExecSessionManager.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/backgroundExecSessionManager.ts
deleted file mode 100644
index c4dc8700c..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/backgroundExecSessionManager.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  BackgroundExecSessionManager,
-  backgroundExecSessionManager,
-  type SessionMeta
-} from '@/lib/agentRuntime/backgroundExecSessionManager'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/index.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/index.ts
deleted file mode 100644
index fe82c8297..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/index.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-export type * from './types'
-
-export {
-  AcpProcessManager,
-  type AcpProcessHandle,
-  type SessionNotificationHandler,
-  type PermissionResolver
-} from './acpProcessManager'
-export { AcpSessionManager, type AcpSessionRecord } from './acpSessionManager'
-export { AcpSessionPersistence } from './acpSessionPersistence'
-export { buildClientCapabilities, type AcpCapabilityOptions } from './acpCapabilities'
-export { AcpMessageFormatter } from './acpMessageFormatter'
-export { AcpContentMapper } from './acpContentMapper'
-export {
-  LEGACY_MODEL_CONFIG_ID,
-  LEGACY_MODE_CONFIG_ID,
-  createEmptyAcpConfigState,
-  getAcpConfigOption,
-  getAcpConfigOptionByCategory,
-  getAcpConfigOptionLabel,
-  hasAcpConfigStateData,
-  getLegacyModeState,
-  normalizeAcpConfigState,
-  updateAcpConfigStateValue
-} from './acpConfigState'
-export { AcpFsHandler } from './acpFsHandler'
-export { AcpTerminalManager } from './acpTerminalManager'
-export { AgentFileSystemHandler } from './agentFileSystemHandler'
-export { AgentToolManager, type AgentToolCallResult } from './agentToolManager'
-export { AgentBashHandler } from './agentBashHandler'
-export {
-  BackgroundExecSessionManager,
-  backgroundExecSessionManager,
-  type SessionMeta
-} from './backgroundExecSessionManager'
-export { getShellEnvironment, clearShellEnvironmentCache } from './shellEnvHelper'
-export { convertMcpConfigToAcpFormat } from './mcpConfigConverter'
-export { filterMcpServersByTransportSupport } from './mcpTransportFilter'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/shellEnvHelper.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/shellEnvHelper.ts
deleted file mode 100644
index 846227653..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/shellEnvHelper.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export {
-  clearShellEnvironmentCache,
-  getShellEnvironment,
-  getUserShell
-} from '@/lib/agentRuntime/shellEnvHelper'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/agent/index.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/agent/index.ts
deleted file mode 100644
index 336ce12bb..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/agent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/index.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/index.ts
deleted file mode 100644
index 03b076f5f..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/index.ts
+++ /dev/null
@@ -1,674 +0,0 @@
-import type {
-  CONVERSATION,
-  IAgentPresenter,
-  IConfigPresenter,
-  ILlmProviderPresenter,
-  IMCPPresenter,
-  ISessionPresenter,
-  ISkillPresenter,
-  ISQLitePresenter,
-  IToolPresenter,
-  MESSAGE_METADATA
-} from '@shared/presenter'
-import type { AssistantMessage, AssistantMessageBlock, UserMessageContent } from '@shared/chat'
-import { eventBus, SendTarget } from '@/eventbus'
-import { STREAM_EVENTS } from '@/events'
-import type { SessionContextResolved } from './session/sessionContext'
-import type { SessionManager } from './session/sessionManager'
-import type { AgentSessionRuntimePort } from './session/sessionRuntimePort'
-import type {
-  AgentMcpRuntimePort,
-  AgentPermissionRuntimePort,
-  AgentPromptRuntimePort
-} from './runtimePorts'
-import { MessageManager } from '../sessionPresenter/managers/messageManager'
-import type { ThreadHandlerContext } from './types/handlerContext'
-import { CommandPermissionService } from '../permission/commandPermissionService'
-import { ContentBufferHandler } from './streaming/contentBufferHandler'
-import { LLMEventHandler } from './streaming/llmEventHandler'
-import { StreamGenerationHandler } from './streaming/streamGenerationHandler'
-import type { GeneratingMessageState } from './streaming/types'
-import { StreamUpdateScheduler } from './streaming/streamUpdateScheduler'
-import { ToolCallHandler } from './loop/toolCallHandler'
-import { PermissionHandler } from './permission/permissionHandler'
-import { UtilityHandler } from './utility/utilityHandler'
-
-type AgentPresenterDependencies = {
-  sessionPresenter: ISessionPresenter
-  sessionManager: SessionManager
-  sqlitePresenter: ISQLitePresenter
-  llmProviderPresenter: ILlmProviderPresenter
-  configPresenter: IConfigPresenter
-  mcpPresenter: IMCPPresenter
-  skillPresenter: ISkillPresenter
-  toolPresenter: IToolPresenter
-  commandPermissionService: CommandPermissionService
-  permissionRuntime: AgentPermissionRuntimePort
-  messageManager?: MessageManager
-}
-
-export class AgentPresenter implements IAgentPresenter {
-  private sessionPresenter: ISessionPresenter
-  private sessionManager: SessionManager
-  private sqlitePresenter: ISQLitePresenter
-  private llmProviderPresenter: ILlmProviderPresenter
-  private configPresenter: IConfigPresenter
-  private messageManager: MessageManager
-  private commandPermissionService: CommandPermissionService
-  private generatingMessages: Map<string, GeneratingMessageState> = new Map()
-  private contentBufferHandler: ContentBufferHandler
-  private toolCallHandler: ToolCallHandler
-  private llmEventHandler: LLMEventHandler
-  private streamGenerationHandler: StreamGenerationHandler
-  private permissionHandler: PermissionHandler
-  private utilityHandler: UtilityHandler
-  private streamUpdateScheduler: StreamUpdateScheduler
-  private readonly sessionRuntime: AgentSessionRuntimePort
-  private readonly mcpRuntime: AgentMcpRuntimePort
-  private readonly promptRuntime: AgentPromptRuntimePort
-  private readonly permissionRuntime: AgentPermissionRuntimePort
-
-  constructor(options: AgentPresenterDependencies) {
-    this.sessionPresenter = options.sessionPresenter
-    this.sessionManager = options.sessionManager
-    this.sqlitePresenter = options.sqlitePresenter
-    this.llmProviderPresenter = options.llmProviderPresenter
-    this.configPresenter = options.configPresenter
-    this.messageManager = options.messageManager ?? new MessageManager(options.sqlitePresenter)
-    this.commandPermissionService = options.commandPermissionService
-    this.permissionRuntime = options.permissionRuntime
-    this.sessionRuntime = {
-      getSession: (agentId) => this.sessionManager.getSession(agentId),
-      getSessionSync: (agentId) => this.sessionManager.getSessionSync(agentId),
-      resolveWorkspaceContext: (conversationId, modelId) =>
-        this.sessionManager.resolveWorkspaceContext(conversationId, modelId),
-      startLoop: (agentId, messageId, runtimeOptions) =>
-        this.sessionManager.startLoop(agentId, messageId, runtimeOptions),
-      setStatus: (agentId, status) => this.sessionManager.setStatus(agentId, status),
-      getStatus: (agentId) => this.sessionManager.getStatus(agentId),
-      updateRuntime: (agentId, updates) => this.sessionManager.updateRuntime(agentId, updates),
-      incrementToolCallCount: (agentId) => this.sessionManager.incrementToolCallCount(agentId),
-      clearPendingPermission: (agentId) => this.sessionManager.clearPendingPermission(agentId),
-      clearPendingQuestion: (agentId) => this.sessionManager.clearPendingQuestion(agentId),
-      addPendingPermission: (agentId, permission) =>
-        this.sessionManager.addPendingPermission(agentId, permission),
-      removePendingPermission: (agentId, messageId, toolCallId) =>
-        this.sessionManager.removePendingPermission(agentId, messageId, toolCallId),
-      getPendingPermissions: (agentId) => this.sessionManager.getPendingPermissions(agentId),
-      hasPendingPermissions: (agentId, messageId) =>
-        this.sessionManager.hasPendingPermissions(agentId, messageId),
-      acquirePermissionResumeLock: (agentId, messageId) =>
-        this.sessionManager.acquirePermissionResumeLock(agentId, messageId),
-      releasePermissionResumeLock: (agentId) =>
-        this.sessionManager.releasePermissionResumeLock(agentId),
-      getPermissionResumeLock: (agentId) => this.sessionManager.getPermissionResumeLock(agentId)
-    }
-    this.mcpRuntime = {
-      callTool: (request) => options.mcpPresenter.callTool(request),
-      grantPermission: (serverName, permissionType, remember, conversationId) =>
-        options.mcpPresenter.grantPermission(serverName, permissionType, remember, conversationId),
-      isServerRunning: (serverName) => options.mcpPresenter.isServerRunning(serverName)
-    }
-    this.promptRuntime = {
-      getInputChatMode: async () =>
-        options.configPresenter.getSetting<string>('input_chatMode') ?? undefined,
-      getSkillsEnabled: () => options.configPresenter.getSkillsEnabled(),
-      getActiveSkills: (conversationId) => options.skillPresenter.getActiveSkills(conversationId),
-      loadSkillContent: (name) => options.skillPresenter.loadSkillContent(name),
-      getMetadataPrompt: () => options.skillPresenter.getMetadataPrompt(),
-      getActiveSkillsAllowedTools: (conversationId) =>
-        options.skillPresenter.getActiveSkillsAllowedTools(conversationId)
-    }
-
-    this.streamUpdateScheduler = new StreamUpdateScheduler({
-      messageManager: this.messageManager
-    })
-
-    const handlerContext: ThreadHandlerContext = {
-      sqlitePresenter: this.sqlitePresenter,
-      messageManager: this.messageManager,
-      llmProviderPresenter: this.llmProviderPresenter,
-      configPresenter: this.configPresenter,
-      sessionRuntime: this.sessionRuntime,
-      toolPresenter: options.toolPresenter,
-      mcpRuntime: this.mcpRuntime,
-      promptRuntime: this.promptRuntime,
-      permissionRuntime: this.permissionRuntime
-    }
-
-    this.contentBufferHandler = new ContentBufferHandler({
-      generatingMessages: this.generatingMessages,
-      streamUpdateScheduler: this.streamUpdateScheduler
-    })
-
-    this.toolCallHandler = new ToolCallHandler({
-      sqlitePresenter: this.sqlitePresenter,
-      commandPermissionHandler: this.commandPermissionService,
-      streamUpdateScheduler: this.streamUpdateScheduler
-    })
-
-    this.llmEventHandler = new LLMEventHandler({
-      generatingMessages: this.generatingMessages,
-      messageManager: this.messageManager,
-      contentBufferHandler: this.contentBufferHandler,
-      toolCallHandler: this.toolCallHandler,
-      streamUpdateScheduler: this.streamUpdateScheduler,
-      sessionRuntime: this.sessionRuntime,
-      onConversationUpdated: (state) => this.handleConversationUpdates(state)
-    })
-
-    this.streamGenerationHandler = new StreamGenerationHandler(handlerContext, {
-      generatingMessages: this.generatingMessages,
-      llmEventHandler: this.llmEventHandler
-    })
-
-    this.permissionHandler = new PermissionHandler(handlerContext, {
-      generatingMessages: this.generatingMessages,
-      streamGenerationHandler: this.streamGenerationHandler,
-      llmEventHandler: this.llmEventHandler,
-      commandPermissionHandler: this.commandPermissionService
-    })
-
-    this.utilityHandler = new UtilityHandler(handlerContext, {
-      getActiveConversation: (webContentsId) =>
-        this.sessionPresenter.getActiveConversation(webContentsId),
-      getActiveConversationId: (webContentsId) =>
-        this.sessionPresenter.getActiveConversationId(webContentsId),
-      createConversation: (title, settings, webContentsId) =>
-        this.sessionPresenter.createConversation(title, settings, webContentsId)
-    })
-
-    // Legacy IPC surface: dynamic proxy for ISessionPresenter methods.
-    this.bindSessionPresenterMethods()
-  }
-
-  async sendMessage(
-    agentId: string,
-    content: string,
-    webContentsId?: number,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage | null> {
-    await this.logResolvedIfEnabled(agentId)
-
-    const conversation = await this.sessionPresenter.getConversation(agentId)
-    const userMessage = await this.messageManager.sendMessage(
-      agentId,
-      content,
-      'user',
-      '',
-      false,
-      this.buildMessageMetadata(conversation)
-    )
-    try {
-      await this.resolvePendingQuestionIfNeeded(agentId, userMessage.id, content)
-    } catch (error) {
-      console.warn('[AgentPresenter] Failed to auto-resolve pending question:', error)
-    }
-
-    const assistantMessage = await this.streamGenerationHandler.generateAIResponse(
-      agentId,
-      userMessage.id
-    )
-
-    this.trackGeneratingMessage(assistantMessage, agentId, webContentsId)
-    await this.updateConversationAfterUserMessage(agentId)
-    // Normal flow: skip lock acquisition (lock is only for permission resume)
-    await this.sessionManager.startLoop(agentId, assistantMessage.id, { skipLockAcquisition: true })
-
-    void this.streamGenerationHandler
-      .startStreamCompletion(agentId, assistantMessage.id, selectedVariantsMap)
-      .catch((error) => {
-        console.error('[AgentPresenter] Failed to start stream completion:', error)
-        const errorMessage = error instanceof Error ? error.message : String(error)
-        eventBus.sendToRenderer(STREAM_EVENTS.ERROR, SendTarget.ALL_WINDOWS, {
-          eventId: assistantMessage.id,
-          error: errorMessage
-        })
-      })
-
-    return assistantMessage
-  }
-
-  async continueLoop(
-    agentId: string,
-    messageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage | null> {
-    await this.logResolvedIfEnabled(agentId)
-
-    const assistantMessage = await this.createContinueMessage(agentId)
-    if (!assistantMessage) {
-      return null
-    }
-
-    this.trackGeneratingMessage(assistantMessage, agentId)
-    await this.updateConversationAfterUserMessage(agentId)
-    // Normal flow: skip lock acquisition (lock is only for permission resume)
-    await this.sessionManager.startLoop(agentId, assistantMessage.id, { skipLockAcquisition: true })
-
-    void this.streamGenerationHandler
-      .continueStreamCompletion(agentId, messageId, selectedVariantsMap)
-      .catch((error) => {
-        console.error('[AgentPresenter] Failed to continue stream completion:', error)
-        const errorMessage = error instanceof Error ? error.message : String(error)
-        eventBus.sendToRenderer(STREAM_EVENTS.ERROR, SendTarget.ALL_WINDOWS, {
-          eventId: assistantMessage.id,
-          error: errorMessage
-        })
-      })
-
-    return assistantMessage
-  }
-
-  async cancelLoop(messageId: string): Promise<void> {
-    try {
-      const message = await this.sessionPresenter.getMessage(messageId)
-      if (message) {
-        this.sessionManager.updateRuntime(message.conversationId, { userStopRequested: true })
-        this.sessionManager.setStatus(message.conversationId, 'paused')
-      }
-    } catch (error) {
-      console.warn('[AgentPresenter] Failed to update session state for cancel:', error)
-    }
-    await this.stopMessageGeneration(messageId)
-  }
-
-  async cleanupConversation(conversationId: string): Promise<void> {
-    for (const [messageId, state] of this.generatingMessages) {
-      if (state.conversationId === conversationId) {
-        await this.stopMessageGeneration(messageId)
-        break
-      }
-    }
-
-    this.sessionManager.removeSession(conversationId)
-
-    try {
-      await this.llmProviderPresenter.clearAcpSession(conversationId)
-    } catch (error) {
-      console.warn('[AgentPresenter] Failed to clear ACP session:', error)
-    }
-  }
-
-  async retryMessage(
-    messageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage> {
-    const message = await this.messageManager.getMessage(messageId)
-    if (message.role !== 'assistant') {
-      throw new Error('只能重试助手消息')
-    }
-
-    const userMessage = await this.messageManager.getMessage(message.parentId || '')
-    if (!userMessage) {
-      throw new Error('找不到对应的用户消息')
-    }
-
-    const conversation = await this.sessionPresenter.getConversation(message.conversationId)
-    const assistantMessage = (await this.messageManager.retryMessage(
-      messageId,
-      this.buildMessageMetadata(conversation)
-    )) as AssistantMessage
-
-    this.trackGeneratingMessage(assistantMessage, message.conversationId)
-    // Normal flow: skip lock acquisition (lock is only for permission resume)
-    await this.sessionManager.startLoop(message.conversationId, assistantMessage.id, {
-      skipLockAcquisition: true
-    })
-
-    void this.streamGenerationHandler
-      .startStreamCompletion(message.conversationId, messageId, selectedVariantsMap)
-      .catch((error) => {
-        console.error('[AgentPresenter] Failed to retry stream completion:', error)
-        const errorMessage = error instanceof Error ? error.message : String(error)
-        eventBus.sendToRenderer(STREAM_EVENTS.ERROR, SendTarget.ALL_WINDOWS, {
-          eventId: assistantMessage.id,
-          error: errorMessage
-        })
-      })
-
-    return assistantMessage
-  }
-
-  async regenerateFromUserMessage(
-    agentId: string,
-    userMessageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage> {
-    await this.logResolvedIfEnabled(agentId)
-    return this.streamGenerationHandler.regenerateFromUserMessage(
-      agentId,
-      userMessageId,
-      selectedVariantsMap
-    )
-  }
-
-  async translateText(text: string, webContentsId: number): Promise<string> {
-    return this.utilityHandler.translateText(text, webContentsId)
-  }
-
-  async askAI(text: string, webContentsId: number): Promise<string> {
-    return this.utilityHandler.askAI(text, webContentsId)
-  }
-
-  async handlePermissionResponse(
-    messageId: string,
-    toolCallId: string,
-    granted: boolean,
-    permissionType: 'read' | 'write' | 'all' | 'command',
-    remember?: boolean
-  ): Promise<void> {
-    await this.permissionHandler.handlePermissionResponse(
-      messageId,
-      toolCallId,
-      granted,
-      permissionType,
-      remember
-    )
-  }
-
-  async resolveQuestion(
-    messageId: string,
-    toolCallId: string,
-    answerText: string,
-    answerMessageId?: string
-  ): Promise<void> {
-    await this.handleQuestionResolution(messageId, toolCallId, {
-      resolution: 'replied',
-      answerText,
-      answerMessageId
-    })
-  }
-
-  async rejectQuestion(messageId: string, toolCallId: string): Promise<void> {
-    await this.handleQuestionResolution(messageId, toolCallId, {
-      resolution: 'rejected'
-    })
-  }
-
-  private async handleQuestionResolution(
-    messageId: string,
-    toolCallId: string,
-    payload: {
-      resolution: 'replied' | 'rejected'
-      answerText?: string
-      answerMessageId?: string
-    }
-  ): Promise<void> {
-    if (!messageId || !toolCallId) {
-      return
-    }
-
-    const message = await this.messageManager.getMessage(messageId)
-    if (!message || message.role !== 'assistant') {
-      throw new Error(`Message not found or not assistant (${messageId})`)
-    }
-
-    const content = message.content as AssistantMessageBlock[]
-    const questionBlock = content.find(
-      (block) =>
-        block.type === 'action' &&
-        block.action_type === 'question_request' &&
-        block.tool_call?.id === toolCallId
-    )
-
-    if (!questionBlock) {
-      throw new Error(
-        `Question block not found (messageId: ${messageId}, toolCallId: ${toolCallId})`
-      )
-    }
-
-    if (questionBlock.status !== 'pending') {
-      return
-    }
-
-    const isReplied = payload.resolution === 'replied'
-    questionBlock.status = isReplied ? 'success' : 'denied'
-    questionBlock.extra = {
-      ...questionBlock.extra,
-      needsUserAction: false,
-      questionResolution: payload.resolution,
-      ...(isReplied && payload.answerText ? { answerText: payload.answerText } : {}),
-      ...(isReplied && payload.answerMessageId ? { answerMessageId: payload.answerMessageId } : {})
-    }
-
-    const generatingState = this.generatingMessages.get(messageId)
-    if (generatingState) {
-      const questionIndex = generatingState.message.content.findIndex(
-        (block) =>
-          block.type === 'action' &&
-          block.action_type === 'question_request' &&
-          block.tool_call?.id === toolCallId
-      )
-      if (questionIndex !== -1) {
-        const stateBlock = generatingState.message.content[questionIndex]
-        generatingState.message.content[questionIndex] = {
-          ...stateBlock,
-          ...questionBlock,
-          extra: questionBlock.extra ? { ...questionBlock.extra } : undefined,
-          tool_call: questionBlock.tool_call ? { ...questionBlock.tool_call } : undefined
-        }
-      }
-    }
-
-    await this.messageManager.editMessage(messageId, JSON.stringify(content))
-    if (message.status === 'pending') {
-      await this.messageManager.updateMessageStatus(messageId, 'sent')
-    }
-    this.sessionRuntime.clearPendingQuestion(message.conversationId)
-    this.sessionRuntime.setStatus(message.conversationId, 'idle')
-  }
-
-  private async resolvePendingQuestionIfNeeded(
-    conversationId: string,
-    userMessageId: string,
-    rawContent: string
-  ): Promise<void> {
-    const session = await this.sessionManager.getSession(conversationId)
-    const pendingQuestion = session.runtime?.pendingQuestion
-    if (!pendingQuestion?.messageId || !pendingQuestion.toolCallId) {
-      return
-    }
-
-    const answerText = this.extractUserMessageText(rawContent)
-    if (!answerText.trim()) {
-      return
-    }
-
-    await this.handleQuestionResolution(pendingQuestion.messageId, pendingQuestion.toolCallId, {
-      resolution: 'replied',
-      answerText,
-      answerMessageId: userMessageId
-    })
-  }
-
-  private extractUserMessageText(rawContent: string): string {
-    if (!rawContent) return ''
-    try {
-      const parsed = JSON.parse(rawContent) as UserMessageContent
-      if (typeof parsed.text === 'string') {
-        return parsed.text
-      }
-      if (Array.isArray(parsed.content)) {
-        return parsed.content.map((block) => block.content || '').join('')
-      }
-    } catch (error) {
-      console.warn('[AgentPresenter] Failed to parse user message content:', error)
-    }
-    return rawContent
-  }
-
-  private buildMessageMetadata(conversation: CONVERSATION): MESSAGE_METADATA {
-    const { providerId, modelId } = conversation.settings
-    return {
-      contextUsage: 0,
-      totalTokens: 0,
-      generationTime: 0,
-      firstTokenTime: 0,
-      tokensPerSecond: 0,
-      inputTokens: 0,
-      outputTokens: 0,
-      model: modelId,
-      provider: providerId
-    }
-  }
-
-  private trackGeneratingMessage(
-    message: AssistantMessage,
-    conversationId: string,
-    webContentsId?: number
-  ): void {
-    this.generatingMessages.set(message.id, {
-      message,
-      conversationId,
-      startTime: Date.now(),
-      firstTokenTime: null,
-      promptTokens: 0,
-      reasoningStartTime: null,
-      reasoningEndTime: null,
-      lastReasoningTime: null,
-      webContentsId
-    })
-  }
-
-  private async updateConversationAfterUserMessage(conversationId: string): Promise<void> {
-    const { list: messages } = await this.messageManager.getMessageThread(conversationId, 1, 2)
-    if (messages.length === 1) {
-      await this.sqlitePresenter.updateConversation(conversationId, {
-        is_new: 0,
-        updatedAt: Date.now()
-      })
-      return
-    }
-
-    await this.sqlitePresenter.updateConversation(conversationId, {
-      updatedAt: Date.now()
-    })
-  }
-
-  private async createContinueMessage(agentId: string): Promise<AssistantMessage> {
-    const continuePayload = JSON.stringify({
-      text: 'continue',
-      files: [],
-      links: [],
-      search: false,
-      think: false,
-      continue: true
-    })
-
-    const conversation = await this.sessionPresenter.getConversation(agentId)
-    const userMessage = await this.messageManager.sendMessage(
-      agentId,
-      continuePayload,
-      'user',
-      '',
-      false,
-      this.buildMessageMetadata(conversation)
-    )
-
-    return this.streamGenerationHandler.generateAIResponse(agentId, userMessage.id)
-  }
-
-  private async handleConversationUpdates(state: GeneratingMessageState): Promise<void> {
-    const conversation = await this.sessionPresenter.getConversation(state.conversationId)
-
-    if (conversation.is_new === 1) {
-      try {
-        const title = await this.sessionPresenter.generateTitle(state.conversationId)
-        await this.sessionPresenter.renameConversation(state.conversationId, title)
-      } catch (error) {
-        console.error('[AgentPresenter] Failed to summarize title', {
-          conversationId: state.conversationId,
-          err: error
-        })
-      }
-    }
-
-    await this.sqlitePresenter.updateConversation(state.conversationId, {
-      updatedAt: Date.now()
-    })
-
-    const sessionPresenter = this.sessionPresenter as unknown as {
-      broadcastThreadListUpdate?: () => Promise<void>
-    }
-    if (sessionPresenter.broadcastThreadListUpdate) {
-      await sessionPresenter.broadcastThreadListUpdate()
-    }
-  }
-
-  private async stopMessageGeneration(messageId: string): Promise<void> {
-    const state = this.generatingMessages.get(messageId)
-    if (!state) {
-      return
-    }
-
-    this.sessionManager.updateRuntime(state.conversationId, { userStopRequested: true })
-    this.sessionManager.setStatus(state.conversationId, 'paused')
-    this.sessionManager.clearPendingPermission(state.conversationId)
-    this.sessionManager.clearPendingQuestion(state.conversationId)
-    state.isCancelled = true
-
-    if (state.adaptiveBuffer) {
-      await this.contentBufferHandler.flushAdaptiveBuffer(messageId)
-    }
-
-    this.contentBufferHandler.cleanupContentBuffer(state)
-
-    state.message.content.forEach((block) => {
-      if (
-        block.status === 'loading' ||
-        block.status === 'reading' ||
-        block.status === 'optimizing'
-      ) {
-        block.status = 'success'
-      }
-    })
-
-    state.message.content.push({
-      type: 'error',
-      content: 'common.error.userCanceledGeneration',
-      status: 'cancel',
-      timestamp: Date.now()
-    })
-
-    await this.messageManager.updateMessageStatus(messageId, 'error')
-    await this.messageManager.editMessage(messageId, JSON.stringify(state.message.content))
-    await this.llmProviderPresenter.stopStream(messageId)
-
-    this.generatingMessages.delete(messageId)
-  }
-
-  private shouldLogResolved(): boolean {
-    return import.meta.env.VITE_AGENT_PRESENTER_DEBUG === '1'
-  }
-
-  private async logResolvedIfEnabled(agentId: string): Promise<void> {
-    if (!this.shouldLogResolved()) {
-      return
-    }
-    try {
-      const resolved = await this.resolveSession(agentId)
-      console.log('[AgentPresenter] SessionContext.resolved', { agentId, resolved })
-    } catch (error) {
-      console.warn('[AgentPresenter] Failed to resolve session context', { agentId, error })
-    }
-  }
-
-  private async resolveSession(agentId: string): Promise<SessionContextResolved> {
-    const session = await this.sessionManager.getSession(agentId)
-    return session.resolved
-  }
-
-  private bindSessionPresenterMethods(): void {
-    const sessionPresenter = this.sessionPresenter as unknown as Record<string, unknown>
-    const sessionProto = Object.getPrototypeOf(sessionPresenter) as Record<string, unknown>
-    for (const key of Object.getOwnPropertyNames(sessionProto)) {
-      if (key === 'constructor') continue
-      if (key in this) continue
-      const value = sessionPresenter[key]
-      if (typeof value === 'function') {
-        ;(this as Record<string, unknown>)[key] = value.bind(this.sessionPresenter)
-      }
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/agentLoopHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/agentLoopHandler.ts
deleted file mode 100644
index 42f1e0440..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/agentLoopHandler.ts
+++ /dev/null
@@ -1,669 +0,0 @@
-import {
-  ChatMessage,
-  IConfigPresenter,
-  IToolPresenter,
-  LLMAgentEvent,
-  MCPToolCall
-} from '@shared/presenter'
-import { BaseLLMProvider } from '@/presenter/llmProviderPresenter/baseProvider'
-import { StreamState } from './loopState'
-import { RateLimitManager } from '@/presenter/llmProviderPresenter/managers/rateLimitManager'
-import { ToolCallProcessor } from './toolCallProcessor'
-import { getAgentFilteredTools } from '../../mcpPresenter/agentMcpFilter'
-import type { AgentSessionRuntimePort } from '../session/sessionRuntimePort'
-
-interface AgentLoopHandlerOptions {
-  configPresenter: IConfigPresenter
-  getProviderInstance: (providerId: string) => BaseLLMProvider
-  activeStreams: Map<string, StreamState>
-  canStartNewStream: () => boolean
-  rateLimitManager: RateLimitManager
-  sessionRuntime: Pick<AgentSessionRuntimePort, 'getSession' | 'resolveWorkspaceContext'>
-  getToolPresenter: () => IToolPresenter
-}
-
-export class AgentLoopHandler {
-  private readonly toolCallProcessor: ToolCallProcessor
-  private currentSupportsVision = false
-
-  constructor(private readonly options: AgentLoopHandlerOptions) {
-    this.toolCallProcessor = new ToolCallProcessor({
-      getAllToolDefinitions: async (context) => {
-        // Get modelId from session
-        let modelId: string | undefined
-        if (context.conversationId) {
-          try {
-            const session = await this.options.sessionRuntime.getSession(context.conversationId)
-            modelId = session?.resolved.modelId
-          } catch {
-            // Ignore errors, modelId will be undefined
-          }
-        }
-
-        const { chatMode, agentWorkspacePath } = await this.resolveWorkspaceContext(
-          context.conversationId,
-          modelId
-        )
-
-        const toolDefs = await this.getToolPresenter().getAllToolDefinitions({
-          enabledMcpTools: context.enabledMcpTools,
-          chatMode,
-          supportsVision: this.currentSupportsVision,
-          agentWorkspacePath,
-          conversationId: context.conversationId
-        })
-
-        return await this.filterToolsForChatMode(toolDefs, chatMode, modelId)
-      },
-      callTool: async (request: MCPToolCall) => {
-        return await this.getToolPresenter().callTool(request)
-      },
-      preCheckToolPermission: async (request: MCPToolCall) => {
-        const toolPresenter = this.getToolPresenter()
-        if (!toolPresenter.preCheckToolPermission) {
-          return null
-        }
-        return await toolPresenter.preCheckToolPermission(request)
-      }
-    })
-  }
-
-  private getToolPresenter(): IToolPresenter {
-    const toolPresenter = this.options.getToolPresenter()
-    if (!toolPresenter) {
-      throw new Error('ToolPresenter is unavailable')
-    }
-    return toolPresenter
-  }
-
-  /**
-   * Resolve workspace context (chatMode and agentWorkspacePath) for tool definitions
-   * @param conversationId Optional conversation ID
-   * @param modelId Optional model ID (required for acp agent mode)
-   * @returns Resolved workspace context
-   */
-  private async resolveWorkspaceContext(
-    conversationId?: string,
-    modelId?: string
-  ): Promise<{ chatMode: 'agent' | 'acp agent'; agentWorkspacePath: string | null }> {
-    return this.options.sessionRuntime.resolveWorkspaceContext(conversationId, modelId)
-  }
-
-  private requiresReasoningField(modelId: string): boolean {
-    const lower = modelId.toLowerCase()
-    return (
-      lower.includes('deepseek-reasoner') ||
-      lower.includes('kimi-k2-thinking') ||
-      lower.includes('glm-4.7')
-    )
-  }
-
-  private isAgentToolDefinition(tool: { server?: { name: string } }): boolean {
-    const name = tool.server?.name
-    return Boolean(name && (name === 'yo-browser' || name.startsWith('agent-')))
-  }
-
-  private async filterToolsForChatMode(
-    tools: Awaited<ReturnType<IToolPresenter['getAllToolDefinitions']>>,
-    chatMode: 'agent' | 'acp agent',
-    agentId?: string
-  ): Promise<Awaited<ReturnType<IToolPresenter['getAllToolDefinitions']>>> {
-    if (chatMode !== 'acp agent') return tools
-    if (!agentId) return []
-
-    const agentTools = tools.filter((tool) => this.isAgentToolDefinition(tool))
-    const mcpTools = tools.filter((tool) => !this.isAgentToolDefinition(tool))
-    const filteredMcp = await getAgentFilteredTools(
-      agentId,
-      undefined,
-      mcpTools,
-      this.options.configPresenter
-    )
-    return [...filteredMcp, ...agentTools]
-  }
-
-  async *startStreamCompletion(
-    providerId: string,
-    initialMessages: ChatMessage[],
-    modelId: string,
-    eventId: string,
-    temperature: number = 0.6,
-    maxTokens: number = 4096,
-    enabledMcpTools?: string[],
-    thinkingBudget?: number,
-    reasoningEffort?: 'minimal' | 'low' | 'medium' | 'high',
-    verbosity?: 'low' | 'medium' | 'high',
-    conversationId?: string
-  ): AsyncGenerator<LLMAgentEvent, void, unknown> {
-    console.log(`[Agent Loop] Starting agent loop for event: ${eventId} with model: ${modelId}`)
-    if (!this.options.canStartNewStream()) {
-      // Instead of throwing, yield an error event
-      yield { type: 'error', data: { eventId, error: 'Maximum concurrent stream limit reached' } }
-      return
-      // throw new Error('Maximum concurrent stream limit reached')
-    }
-
-    const provider = this.options.getProviderInstance(providerId)
-    const abortController = new AbortController()
-    const modelConfig = this.options.configPresenter.getModelConfig(modelId, providerId)
-
-    if (conversationId) {
-      modelConfig.conversationId = conversationId
-    }
-
-    if (thinkingBudget !== undefined) {
-      modelConfig.thinkingBudget = thinkingBudget
-    }
-    if (reasoningEffort !== undefined) {
-      modelConfig.reasoningEffort = reasoningEffort
-    }
-    if (verbosity !== undefined) {
-      modelConfig.verbosity = verbosity
-    }
-    this.currentSupportsVision = Boolean(modelConfig?.vision)
-
-    this.options.activeStreams.set(eventId, {
-      isGenerating: true,
-      providerId,
-      modelId,
-      abortController,
-      provider
-    })
-
-    // Agent Loop Variables
-    const conversationMessages: ChatMessage[] = [...initialMessages]
-    let needContinueConversation = true
-    let toolCallCount = 0
-    const MAX_TOOL_CALLS = BaseLLMProvider.getMaxToolCalls()
-    const totalUsage: {
-      prompt_tokens: number
-      completion_tokens: number
-      total_tokens: number
-      context_length: number
-    } = {
-      prompt_tokens: 0,
-      completion_tokens: 0,
-      total_tokens: 0,
-      context_length: modelConfig?.contextLength || 0
-    }
-
-    try {
-      // --- Agent Loop ---
-      while (needContinueConversation) {
-        if (abortController.signal.aborted) {
-          console.log('Agent loop aborted for event:', eventId)
-          break
-        }
-
-        if (toolCallCount >= MAX_TOOL_CALLS) {
-          console.warn('Maximum tool call limit reached for event:', eventId)
-          yield {
-            type: 'response',
-            data: {
-              eventId,
-              maximum_tool_calls_reached: true
-            }
-          }
-
-          break
-        }
-
-        needContinueConversation = false
-
-        // Prepare for LLM call
-        let currentContent = ''
-        let currentReasoning = ''
-        const currentToolCalls: Array<{
-          id: string
-          name: string
-          arguments: string
-        }> = []
-        const currentToolChunks: Record<
-          string,
-          {
-            name: string
-            arguments_chunk: string
-            server_name?: string
-            server_icons?: string
-            server_description?: string
-          }
-        > = {}
-
-        try {
-          console.log(`[Agent Loop] Iteration ${toolCallCount + 1} for event: ${eventId}`)
-          // Resolve workspace context
-          const { chatMode, agentWorkspacePath } = await this.resolveWorkspaceContext(
-            conversationId,
-            modelId
-          )
-
-          // Get all tool definitions using ToolPresenter
-          const toolDefs = await this.getToolPresenter().getAllToolDefinitions({
-            enabledMcpTools,
-            chatMode,
-            supportsVision: this.currentSupportsVision,
-            agentWorkspacePath,
-            conversationId
-          })
-          const filteredToolDefs = await this.filterToolsForChatMode(toolDefs, chatMode, modelId)
-
-          const canExecute = this.options.rateLimitManager.canExecuteImmediately(providerId)
-          if (!canExecute) {
-            const config = this.options.rateLimitManager.getProviderRateLimitConfig(providerId)
-            const currentQps = this.options.rateLimitManager.getCurrentQps(providerId)
-            const queueLength = this.options.rateLimitManager.getQueueLength(providerId)
-
-            yield {
-              type: 'response',
-              data: {
-                eventId,
-                rate_limit: {
-                  providerId,
-                  qpsLimit: config.qpsLimit,
-                  currentQps,
-                  queueLength,
-                  estimatedWaitTime: Math.max(0, 1000 - (Date.now() % 1000))
-                }
-              }
-            }
-
-            await this.options.rateLimitManager.executeWithRateLimit(providerId)
-          } else {
-            await this.options.rateLimitManager.executeWithRateLimit(providerId)
-          }
-
-          // Call the provider's core stream method, expecting LLMCoreStreamEvent
-          const stream = provider.coreStream(
-            conversationMessages,
-            modelId,
-            modelConfig,
-            temperature,
-            maxTokens,
-            filteredToolDefs
-          )
-
-          // Process the standardized stream events
-          for await (const chunk of stream) {
-            if (abortController.signal.aborted) {
-              break
-            }
-            // console.log('presenter chunk', JSON.stringify(chunk), currentContent)
-
-            // --- Event Handling (using LLMCoreStreamEvent structure) ---
-            switch (chunk.type) {
-              case 'text':
-                if (chunk.content) {
-                  currentContent += chunk.content
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      content: chunk.content
-                    }
-                  }
-                }
-                break
-              case 'reasoning':
-                if (chunk.reasoning_content) {
-                  currentReasoning += chunk.reasoning_content
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      reasoning_content: chunk.reasoning_content
-                    }
-                  }
-                }
-                break
-              case 'tool_call_start':
-                if (chunk.tool_call_id && chunk.tool_call_name) {
-                  const toolDef = filteredToolDefs.find(
-                    (tool) => tool.function.name === chunk.tool_call_name
-                  )
-                  const serverName = toolDef?.server?.name
-                  const serverIcons = toolDef?.server?.icons
-                  const serverDescription = toolDef?.server?.description
-
-                  currentToolChunks[chunk.tool_call_id] = {
-                    name: chunk.tool_call_name,
-                    arguments_chunk: '',
-                    server_name: serverName,
-                    server_icons: serverIcons,
-                    server_description: serverDescription
-                  }
-                  // Immediately send the start event to indicate the tool call has begun
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      tool_call: 'start',
-                      tool_call_id: chunk.tool_call_id,
-                      tool_call_name: chunk.tool_call_name,
-                      tool_call_params: '', // Initial parameters are empty
-                      tool_call_server_name: serverName,
-                      tool_call_server_icons: serverIcons,
-                      tool_call_server_description: serverDescription
-                    }
-                  }
-                }
-                break
-              case 'tool_call_chunk':
-                if (
-                  chunk.tool_call_id &&
-                  currentToolChunks[chunk.tool_call_id] &&
-                  chunk.tool_call_arguments_chunk
-                ) {
-                  currentToolChunks[chunk.tool_call_id].arguments_chunk +=
-                    chunk.tool_call_arguments_chunk
-
-                  // Send update event to update parameter content in real-time
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      tool_call: 'update',
-                      tool_call_id: chunk.tool_call_id,
-                      tool_call_name: currentToolChunks[chunk.tool_call_id].name,
-                      tool_call_params: currentToolChunks[chunk.tool_call_id].arguments_chunk,
-                      tool_call_server_name: currentToolChunks[chunk.tool_call_id].server_name,
-                      tool_call_server_icons: currentToolChunks[chunk.tool_call_id].server_icons,
-                      tool_call_server_description:
-                        currentToolChunks[chunk.tool_call_id].server_description
-                    }
-                  }
-                }
-                break
-              case 'tool_call_end':
-                if (chunk.tool_call_id && currentToolChunks[chunk.tool_call_id]) {
-                  const completeArgs =
-                    chunk.tool_call_arguments_complete ??
-                    currentToolChunks[chunk.tool_call_id].arguments_chunk
-                  const toolCallName = currentToolChunks[chunk.tool_call_id].name
-                  const serverName = currentToolChunks[chunk.tool_call_id].server_name
-                  const serverIcons = currentToolChunks[chunk.tool_call_id].server_icons
-                  const serverDescription = currentToolChunks[chunk.tool_call_id].server_description
-
-                  // For ACP provider, tool call execution is completed on agent side
-                  // The tool_call_arguments_complete contains the execution result
-                  // So we should immediately send 'end' event to mark it as successful
-                  if (providerId === 'acp') {
-                    // For ACP, tool_call_arguments_complete contains the execution result
-                    // Use it directly as the response
-                    yield {
-                      type: 'response',
-                      data: {
-                        eventId,
-                        tool_call: 'end',
-                        tool_call_id: chunk.tool_call_id,
-                        tool_call_name: toolCallName,
-                        tool_call_params: completeArgs,
-                        tool_call_response: completeArgs,
-                        tool_call_server_name: serverName,
-                        tool_call_server_icons: serverIcons,
-                        tool_call_server_description: serverDescription
-                      }
-                    }
-
-                    // Don't add to currentToolCalls for ACP - execution already completed
-                    delete currentToolChunks[chunk.tool_call_id]
-                  } else {
-                    // For non-ACP providers, tool call needs to be executed by ToolCallProcessor
-                    currentToolCalls.push({
-                      id: chunk.tool_call_id,
-                      name: toolCallName,
-                      arguments: completeArgs
-                    })
-
-                    // Send final update event to ensure parameter completeness
-                    yield {
-                      type: 'response',
-                      data: {
-                        eventId,
-                        tool_call: 'update',
-                        tool_call_id: chunk.tool_call_id,
-                        tool_call_name: toolCallName,
-                        tool_call_params: completeArgs,
-                        tool_call_server_name: serverName,
-                        tool_call_server_icons: serverIcons,
-                        tool_call_server_description: serverDescription
-                      }
-                    }
-
-                    delete currentToolChunks[chunk.tool_call_id]
-                  }
-                }
-                break
-              case 'permission': {
-                const permission = chunk.permission
-                const permissionType = permission.permissionType ?? 'read'
-                const description = permission.description ?? ''
-                const toolName = permission.tool_call_name ?? permission.tool_call_id
-                const serverName =
-                  permission.server_name ?? permission.agentName ?? permission.providerName ?? ''
-
-                yield {
-                  type: 'response',
-                  data: {
-                    eventId,
-                    tool_call: 'permission-required',
-                    tool_call_id: permission.tool_call_id,
-                    tool_call_name: toolName,
-                    tool_call_params: permission.tool_call_params,
-                    tool_call_server_name: serverName,
-                    tool_call_server_icons: permission.server_icons,
-                    tool_call_server_description:
-                      permission.server_description ?? permission.agentName,
-                    tool_call_response: description,
-                    permission_request: {
-                      toolName,
-                      serverName,
-                      permissionType,
-                      description,
-                      providerId: permission.providerId,
-                      requestId: permission.requestId,
-                      sessionId: permission.sessionId,
-                      agentId: permission.agentId,
-                      agentName: permission.agentName,
-                      conversationId: permission.conversationId,
-                      options: permission.options,
-                      rememberable: permission.metadata?.rememberable === false ? false : true
-                    }
-                  }
-                }
-                break
-              }
-              case 'usage':
-                if (chunk.usage) {
-                  // console.log('usage', chunk.usage, totalUsage)
-                  totalUsage.prompt_tokens += chunk.usage.prompt_tokens
-                  totalUsage.completion_tokens += chunk.usage.completion_tokens
-                  totalUsage.total_tokens += chunk.usage.total_tokens
-                  totalUsage.context_length = modelConfig.contextLength
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      totalUsage: { ...totalUsage } // Yield accumulated usage
-                    }
-                  }
-                }
-                break
-              case 'image_data':
-                if (chunk.image_data) {
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      image_data: chunk.image_data
-                    }
-                  }
-
-                  currentContent += `\n[Image data received: ${chunk.image_data.mimeType}]\n`
-                }
-                break
-              case 'error':
-                console.error(`Provider stream error for event ${eventId}:`, chunk.error_message)
-                yield {
-                  type: 'error',
-                  data: {
-                    eventId,
-                    error: chunk.error_message || 'Provider stream error'
-                  }
-                }
-
-                needContinueConversation = false
-                break // Break inner loop on provider error
-              case 'rate_limit':
-                if (chunk.rate_limit) {
-                  yield {
-                    type: 'response',
-                    data: {
-                      eventId,
-                      rate_limit: chunk.rate_limit
-                    }
-                  }
-                }
-                break
-              case 'stop':
-                console.log(
-                  `Provider stream stopped for event ${eventId}. Reason: ${chunk.stop_reason}`
-                )
-                if (chunk.stop_reason === 'tool_use') {
-                  // Consolidate any remaining tool call chunks
-                  for (const id in currentToolChunks) {
-                    currentToolCalls.push({
-                      id: id,
-                      name: currentToolChunks[id].name,
-                      arguments: currentToolChunks[id].arguments_chunk
-                    })
-                  }
-
-                  if (currentToolCalls.length > 0) {
-                    needContinueConversation = true
-                  } else {
-                    console.warn(
-                      `Stop reason was 'tool_use' but no tool calls were fully parsed for event ${eventId}.`
-                    )
-                    needContinueConversation = false // Don't continue if no tools parsed
-                  }
-                } else {
-                  needContinueConversation = false
-                }
-                // Stop event itself doesn't need to be yielded here, handled by loop logic
-                break
-            }
-          } // End of inner loop (for await...of stream)
-
-          if (abortController.signal.aborted) break // Break outer loop if aborted
-
-          // --- Post-Stream Processing ---
-
-          // 1. Add Assistant Message
-          const assistantMessage: ChatMessage = {
-            role: 'assistant',
-            content: currentContent
-          }
-          if (
-            this.requiresReasoningField(modelId) &&
-            currentToolCalls.length > 0 &&
-            currentReasoning
-          ) {
-            ;(assistantMessage as any).reasoning_content = currentReasoning
-          }
-          // Only add if there's content or tool calls are expected
-          if (currentContent || (needContinueConversation && currentToolCalls.length > 0)) {
-            conversationMessages.push(assistantMessage)
-          }
-
-          // 2. Execute Tool Calls if needed
-          if (needContinueConversation && currentToolCalls.length > 0) {
-            const processor = this.toolCallProcessor.process({
-              eventId,
-              toolCalls: currentToolCalls,
-              enabledMcpTools,
-              conversationMessages,
-              modelConfig,
-              providerId,
-              abortSignal: abortController.signal,
-              currentToolCallCount: toolCallCount,
-              maxToolCalls: MAX_TOOL_CALLS,
-              conversationId
-            })
-
-            while (true) {
-              const { value, done } = await processor.next()
-              if (done) {
-                toolCallCount = value.toolCallCount
-                needContinueConversation = value.needContinueConversation
-                break
-              }
-              yield value
-            }
-
-            if (abortController.signal.aborted) {
-              break // Check after tool loop
-            }
-
-            if (!needContinueConversation) {
-              // If max tool calls reached or explicit stop, break outer loop
-              break
-            }
-          } else {
-            // No tool calls needed or requested, end the loop
-            needContinueConversation = false
-          }
-        } catch (error) {
-          if (abortController.signal.aborted) {
-            console.log(`Agent loop aborted during inner try-catch for event ${eventId}`)
-            break // Break outer loop if aborted here
-          }
-          console.error(`Agent loop inner error for event ${eventId}:`, error)
-          yield {
-            type: 'error',
-            data: {
-              eventId,
-              error: error instanceof Error ? error.message : String(error)
-            }
-          }
-
-          needContinueConversation = false // Stop loop on inner error
-        }
-      } // --- End of Agent Loop (while) ---
-      console.log(
-        `[Agent Loop] Agent loop completed for event: ${eventId}, iterations: ${toolCallCount}`
-      )
-    } catch (error) {
-      // Catch errors from the generator setup phase (before the loop)
-      if (abortController.signal.aborted) {
-        console.log(`Agent loop aborted during outer try-catch for event ${eventId}`)
-      } else {
-        console.error(`Agent loop outer error for event ${eventId}:`, error)
-        yield {
-          type: 'error',
-          data: {
-            eventId,
-            error: error instanceof Error ? error.message : String(error)
-          }
-        }
-      }
-    } finally {
-      // Finalize stream regardless of how the loop ended (completion, error, abort)
-      const userStop = abortController.signal.aborted
-      if (!userStop) {
-        // Yield final aggregated usage if not aborted
-        yield {
-          type: 'response',
-          data: {
-            eventId,
-            totalUsage
-          }
-        }
-      }
-      // Yield the final END event
-      yield { type: 'end', data: { eventId, userStop } }
-
-      this.options.activeStreams.delete(eventId)
-      console.log('Agent loop finished for event:', eventId, 'User stopped:', userStop)
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/errorClassification.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/errorClassification.ts
deleted file mode 100644
index 9c028a96d..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/errorClassification.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Error classification utility to identify non-retryable errors.
- * Non-retryable errors should stop the agent loop, while all other errors
- * should allow the loop to continue so LLM can decide whether to retry.
- */
-
-/**
- * Checks if an error is non-retryable (should stop the agent loop).
- *
- * Non-retryable errors are those that won't be resolved by retrying:
- * - Invalid input format (invalid URL, malformed JSON, etc.)
- * - Explicit permission denied
- * - Schema validation failures
- * - Authentication errors that can't be resolved by retry
- * - Malformed requests that won't work on retry
- *
- * All other errors (network errors, timeouts, destroyed objects, etc.)
- * are considered retryable by default and should allow the loop to continue.
- *
- * @param error - The error to classify (Error object or string)
- * @returns true if the error is non-retryable (should stop loop), false otherwise
- */
-export function isNonRetryableError(error: Error | string): boolean {
-  const errorMessage = error instanceof Error ? error.message : String(error)
-  const lowerMessage = errorMessage.toLowerCase()
-
-  // Invalid URL format - won't work on retry
-  if (
-    lowerMessage.includes('invalid url') ||
-    lowerMessage.includes('malformed url') ||
-    lowerMessage.includes('url parse error') ||
-    lowerMessage.includes('invalid uri')
-  ) {
-    return true
-  }
-
-  // Invalid JSON format in arguments - won't work on retry
-  if (
-    lowerMessage.includes('invalid json') ||
-    lowerMessage.includes('json parse error') ||
-    lowerMessage.includes('unexpected token') ||
-    lowerMessage.includes('malformed json')
-  ) {
-    return true
-  }
-
-  // Schema validation failures - wrong parameter types, missing required fields
-  if (
-    lowerMessage.includes('schema validation') ||
-    lowerMessage.includes('validation error') ||
-    lowerMessage.includes('invalid argument') ||
-    lowerMessage.includes('invalid parameter') ||
-    lowerMessage.includes('required field') ||
-    lowerMessage.includes('missing required') ||
-    lowerMessage.includes('type error') ||
-    lowerMessage.includes('type mismatch')
-  ) {
-    return false
-  }
-
-  // Explicit permission denied (user explicitly denied, not a transient error)
-  if (
-    lowerMessage.includes('permission denied') &&
-    (lowerMessage.includes('explicitly') || lowerMessage.includes('user denied'))
-  ) {
-    return true
-  }
-
-  // Authentication errors that can't be resolved by retry
-  if (
-    lowerMessage.includes('authentication failed') &&
-    (lowerMessage.includes('invalid credentials') ||
-      lowerMessage.includes('invalid api key') ||
-      lowerMessage.includes('unauthorized'))
-  ) {
-    return true
-  }
-
-  // Malformed requests that won't work on retry
-  if (
-    lowerMessage.includes('malformed request') ||
-    lowerMessage.includes('invalid request format') ||
-    lowerMessage.includes('bad request format')
-  ) {
-    return true
-  }
-
-  // Tool definition not found - won't work on retry
-  if (lowerMessage.includes('tool definition not found') || lowerMessage.includes('unknown tool')) {
-    return true
-  }
-
-  // All other errors are considered retryable by default
-  // This includes:
-  // - "Object has been destroyed" / "WebContents destroyed"
-  // - Network errors (SSL failures, connection errors, error codes -3, -100)
-  // - Timeout errors
-  // - Loading errors
-  // - Transient service errors
-  // - Rate limiting
-  return false
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/index.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/index.ts
deleted file mode 100644
index 7892b7822..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { AgentLoopHandler } from './agentLoopHandler'
-export { LoopOrchestrator } from './loopOrchestrator'
-export { ToolCallHandler } from './toolCallHandler'
-export { ToolCallProcessor } from './toolCallProcessor'
-export { isNonRetryableError } from './errorClassification'
-export type { StreamState } from './loopState'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopOrchestrator.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopOrchestrator.ts
deleted file mode 100644
index 1e93f905c..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopOrchestrator.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { LLMAgentEvent, LLMAgentEventData } from '@shared/presenter'
-
-type LLMEventConsumer = {
-  handleLLMAgentResponse: (msg: LLMAgentEventData) => Promise<void>
-  handleLLMAgentError: (msg: LLMAgentEventData) => Promise<void>
-  handleLLMAgentEnd: (msg: LLMAgentEventData) => Promise<void>
-}
-
-export class LoopOrchestrator {
-  constructor(private readonly consumer: LLMEventConsumer) {}
-
-  async consume(stream: AsyncGenerator<LLMAgentEvent, void, unknown>): Promise<void> {
-    for await (const event of stream) {
-      const msg = event.data
-      if (event.type === 'response') {
-        await this.consumer.handleLLMAgentResponse(msg)
-      } else if (event.type === 'error') {
-        await this.consumer.handleLLMAgentError(msg)
-      } else if (event.type === 'end') {
-        await this.consumer.handleLLMAgentEnd(msg)
-      }
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopState.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopState.ts
deleted file mode 100644
index 4586112a3..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopState.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { BaseLLMProvider } from '@/presenter/llmProviderPresenter/baseProvider'
-
-export interface StreamState {
-  isGenerating: boolean
-  providerId: string
-  modelId: string
-  abortController: AbortController
-  provider: BaseLLMProvider
-}
-
-export type LoopState = {
-  loopId: string
-  conversationMessages: any[]
-  toolCallCount: number
-  needContinueConversation: boolean
-  currentContent: string
-  currentReasoning?: string
-  currentToolCalls: Array<{ id: string; name: string; arguments: string }>
-  totalUsage: {
-    prompt_tokens: number
-    completion_tokens: number
-    total_tokens: number
-    context_length: number
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallHandler.ts
deleted file mode 100644
index 835c6c32e..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallHandler.ts
+++ /dev/null
@@ -1,610 +0,0 @@
-import type { AssistantMessageBlock } from '@shared/chat'
-import type { QuestionInfo } from '@shared/types/core/question'
-import { finalizeAssistantMessageBlocks } from '@shared/chat/messageBlocks'
-import type {
-  LLMAgentEventData,
-  MCPToolResponse,
-  ISQLitePresenter,
-  MCPContentItem,
-  MCPResourceContent
-} from '@shared/presenter'
-import { nanoid } from 'nanoid'
-import type { GeneratingMessageState } from '../streaming/types'
-import type { StreamUpdateScheduler } from '../streaming/streamUpdateScheduler'
-import type { CommandPermissionService } from '../../permission/commandPermissionService'
-
-interface PermissionRequestPayload {
-  permissionType?: string
-  toolName?: string
-  serverName?: string
-  providerId?: string
-  requestId?: string
-  sessionId?: string
-  agentId?: string
-  agentName?: string
-  conversationId?: string
-  command?: string
-  commandSignature?: string
-  commandInfo?: {
-    command: string
-    riskLevel: 'low' | 'medium' | 'high' | 'critical'
-    suggestion: string
-    signature?: string
-    baseCommand?: string
-  }
-  rememberable?: boolean
-  [key: string]: unknown
-}
-
-export class ToolCallHandler {
-  private static readonly MCP_UI_MIME_TYPES = new Set([
-    'text/html',
-    'text/uri-list',
-    'application/vnd.mcp-ui.remote-dom'
-  ])
-
-  private readonly sqlitePresenter: ISQLitePresenter
-  private readonly commandPermissionHandler?: CommandPermissionService
-  private readonly streamUpdateScheduler: StreamUpdateScheduler
-
-  constructor(options: {
-    sqlitePresenter: ISQLitePresenter
-    commandPermissionHandler?: CommandPermissionService
-    streamUpdateScheduler: StreamUpdateScheduler
-  }) {
-    this.sqlitePresenter = options.sqlitePresenter
-    this.commandPermissionHandler = options.commandPermissionHandler
-    this.streamUpdateScheduler = options.streamUpdateScheduler
-  }
-
-  async processToolCallStart(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): Promise<void> {
-    this.finalizeLastBlock(state)
-    state.message.content.push({
-      type: 'tool_call',
-      content: '',
-      status: 'loading',
-      timestamp: currentTime,
-      tool_call: {
-        id: event.tool_call_id,
-        name: event.tool_call_name,
-        params: event.tool_call_params || '',
-        server_name: event.tool_call_server_name,
-        server_icons: event.tool_call_server_icons,
-        server_description: event.tool_call_server_description
-      }
-    })
-  }
-
-  async processToolCallUpdate(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData
-  ): Promise<void> {
-    const block = state.message.content.find(
-      (item) =>
-        item.type === 'tool_call' &&
-        item.tool_call?.id === event.tool_call_id &&
-        item.status === 'loading'
-    )
-
-    if (!block || block.type !== 'tool_call' || !block.tool_call) {
-      return
-    }
-
-    block.tool_call.params = event.tool_call_params || ''
-
-    if (event.tool_call_server_name) {
-      block.tool_call.server_name = event.tool_call_server_name
-    }
-    if (event.tool_call_server_icons) {
-      block.tool_call.server_icons = event.tool_call_server_icons
-    }
-    if (event.tool_call_server_description) {
-      block.tool_call.server_description = event.tool_call_server_description
-    }
-  }
-
-  async processToolCallEnd(state: GeneratingMessageState, event: LLMAgentEventData): Promise<void> {
-    const toolCallBlock = state.message.content.find(
-      (block) =>
-        block.type === 'tool_call' &&
-        block.tool_call?.id === event.tool_call_id &&
-        block.status === 'loading'
-    )
-
-    if (toolCallBlock && toolCallBlock.type === 'tool_call') {
-      toolCallBlock.status = 'success'
-      if (toolCallBlock.tool_call) {
-        toolCallBlock.tool_call.response = event.tool_call_response || ''
-      }
-    }
-
-    const lastBlock = state.message.content[state.message.content.length - 1]
-    if (
-      lastBlock &&
-      lastBlock.type === 'action' &&
-      lastBlock.action_type === 'tool_call_permission'
-    ) {
-      lastBlock.status = 'success'
-    }
-
-    state.pendingToolCall = undefined
-  }
-
-  async processToolCallError(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData
-  ): Promise<void> {
-    const toolCallBlock = state.message.content.find(
-      (block) =>
-        block.type === 'tool_call' &&
-        block.tool_call?.id === event.tool_call_id &&
-        block.status === 'loading'
-    )
-
-    if (toolCallBlock && toolCallBlock.type === 'tool_call') {
-      toolCallBlock.status = 'error'
-      if (toolCallBlock.tool_call) {
-        toolCallBlock.tool_call.response = event.tool_call_response || ''
-      }
-    }
-
-    state.pendingToolCall = undefined
-  }
-
-  async processToolCallPermission(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): Promise<void> {
-    if (event.tool_call === 'permission-required') {
-      this.handlePermissionRequired(state, event, currentTime)
-      return
-    }
-
-    const lastBlock = state.message.content[state.message.content.length - 1]
-    if (
-      lastBlock &&
-      lastBlock.type === 'action' &&
-      lastBlock.action_type === 'tool_call_permission'
-    ) {
-      if (event.tool_call === 'permission-granted') {
-        lastBlock.status = 'granted'
-        lastBlock.content = event.tool_call_response || ''
-        if (lastBlock.extra) {
-          lastBlock.extra.needsUserAction = false
-          if (
-            !lastBlock.extra.grantedPermissions &&
-            typeof lastBlock.extra.permissionType === 'string'
-          ) {
-            lastBlock.extra.grantedPermissions = lastBlock.extra.permissionType
-          }
-        }
-
-        // CRITICAL FIX: Create the tool_call block so processToolCallUpdate/End can find it
-        // This ensures frontend state updates correctly after permission is granted
-        this.finalizeLastBlock(state)
-        state.message.content.push({
-          type: 'tool_call',
-          content: '',
-          status: 'loading',
-          timestamp: currentTime,
-          tool_call: {
-            id: event.tool_call_id,
-            name: event.tool_call_name,
-            params: event.tool_call_params || '',
-            server_name: event.tool_call_server_name,
-            server_icons: event.tool_call_server_icons,
-            server_description: event.tool_call_server_description
-          }
-        })
-
-        state.pendingToolCall = this.buildPendingToolCall(event)
-        return
-      }
-
-      if (event.tool_call === 'permission-denied') {
-        lastBlock.status = 'denied'
-        lastBlock.content = event.tool_call_response || ''
-        if (lastBlock.extra) {
-          lastBlock.extra.needsUserAction = false
-        }
-        state.pendingToolCall = undefined
-        return
-      }
-
-      if (event.tool_call === 'continue') {
-        lastBlock.status = 'success'
-        return
-      }
-    }
-  }
-
-  async processQuestionRequest(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): Promise<void> {
-    const payload = event.question_request as QuestionInfo | undefined
-    if (!payload) return
-
-    this.finalizeLastBlock(state)
-
-    state.message.content.push({
-      type: 'action',
-      content: '',
-      status: 'pending',
-      timestamp: currentTime,
-      action_type: 'question_request',
-      tool_call: {
-        id: event.tool_call_id,
-        name: event.tool_call_name,
-        params: event.tool_call_params || '',
-        server_name: event.tool_call_server_name,
-        server_icons: event.tool_call_server_icons,
-        server_description: event.tool_call_server_description
-      },
-      extra: {
-        needsUserAction: true,
-        questionHeader: payload.header ?? '',
-        questionText: payload.question,
-        questionOptions: payload.options,
-        questionMultiple: Boolean(payload.multiple),
-        questionCustom: payload.custom !== false,
-        questionResolution: 'asked'
-      }
-    })
-
-    state.pendingToolCall = undefined
-  }
-
-  async processMcpUiResourcesFromToolCall(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): Promise<boolean> {
-    if (event.tool_call !== 'end') {
-      return false
-    }
-
-    try {
-      const response = event.tool_call_response_raw as MCPToolResponse | null
-      const contentItems = Array.isArray(response?.content)
-        ? (response.content as MCPContentItem[])
-        : []
-
-      const uiResourceItems = contentItems.filter((item): item is MCPResourceContent => {
-        if (item.type !== 'resource') {
-          return false
-        }
-        const uri = item.resource?.uri
-        const mimeType = item.resource?.mimeType || ''
-        return (
-          typeof uri === 'string' &&
-          uri.startsWith('ui://') &&
-          ToolCallHandler.MCP_UI_MIME_TYPES.has(mimeType)
-        )
-      })
-
-      if (uiResourceItems.length === 0) {
-        return false
-      }
-
-      const uiBlocks: AssistantMessageBlock[] = uiResourceItems
-        .map((item) => {
-          const resource = item.resource
-          if (!resource?.uri) {
-            return null
-          }
-
-          const mimeType = resource.mimeType || ''
-          if (!ToolCallHandler.MCP_UI_MIME_TYPES.has(mimeType)) {
-            return null
-          }
-          const typedMimeType = mimeType as
-            | 'text/html'
-            | 'text/uri-list'
-            | 'application/vnd.mcp-ui.remote-dom'
-
-          const meta = (
-            resource as MCPResourceContent['resource'] & { _meta?: Record<string, unknown> }
-          )._meta
-
-          return {
-            type: 'mcp_ui_resource',
-            status: 'success',
-            timestamp: currentTime,
-            mcp_ui_resource: {
-              uri: resource.uri,
-              mimeType: typedMimeType,
-              text: typeof resource.text === 'string' ? resource.text : undefined,
-              blob: typeof resource.blob === 'string' ? resource.blob : undefined,
-              _meta: meta && typeof meta === 'object' ? meta : undefined
-            }
-          }
-        })
-        .filter(Boolean) as AssistantMessageBlock[]
-
-      if (uiBlocks.length === 0) {
-        return false
-      }
-
-      this.finalizeLastBlock(state)
-      state.message.content.push(...uiBlocks)
-      this.streamUpdateScheduler.enqueueDelta(
-        event.eventId,
-        state.conversationId,
-        state.message.parentId,
-        Boolean(state.message.is_variant),
-        state.webContentsId,
-        {},
-        state.message.content
-      )
-      return true
-    } catch (error) {
-      console.error('[ToolCallHandler] Error processing MCP UI resources from tool call:', error)
-      return false
-    }
-  }
-
-  async processSearchResultsFromToolCall(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): Promise<boolean> {
-    if (event.tool_call !== 'end') {
-      return false
-    }
-
-    try {
-      const response = event.tool_call_response_raw as MCPToolResponse | null
-      const contentItems = Array.isArray(response?.content)
-        ? (response?.content as MCPContentItem[])
-        : []
-
-      const resourceItems = contentItems.filter((item): item is MCPResourceContent => {
-        return (
-          item.type === 'resource' && item.resource?.mimeType === 'application/deepchat-webpage'
-        )
-      })
-
-      if (resourceItems.length === 0) {
-        return false
-      }
-
-      const searchResults = resourceItems
-        .map((item) => {
-          try {
-            const blobContent = JSON.parse(item.resource?.text ?? '{}') as {
-              title?: string
-              url?: string
-              content?: string
-              icon?: string
-              description?: string
-              favicon?: string
-              rank?: number
-            }
-            return {
-              title: blobContent.title || '',
-              url: blobContent.url || item.resource?.uri || '',
-              content: blobContent.content || '',
-              description: blobContent.description || blobContent.content || '',
-              icon: blobContent.icon || '',
-              favicon: blobContent.favicon || '',
-              rank: blobContent.rank
-            }
-          } catch (error) {
-            console.error('[ToolCallHandler] Failed to parse search result blob:', error)
-            return null
-          }
-        })
-        .filter(Boolean) as Array<{
-        title: string
-        url: string
-        content: string
-        description: string
-        icon: string
-        favicon?: string
-        rank?: number
-      }>
-
-      if (searchResults.length === 0) {
-        return false
-      }
-
-      const searchId = nanoid()
-      const pages = searchResults
-        .filter((item) => item.icon || item.favicon)
-        .slice(0, 6)
-        .map((item) => ({
-          url: item.url,
-          icon: item.icon || item.favicon || ''
-        }))
-
-      const searchBlock: AssistantMessageBlock = {
-        id: searchId,
-        type: 'search',
-        content: '',
-        status: 'success',
-        timestamp: currentTime,
-        extra: {
-          total: searchResults.length,
-          searchId,
-          pages,
-          label: event.tool_call_name || 'web_search',
-          name: event.tool_call_name || 'web_search',
-          engine: event.tool_call_server_name || undefined,
-          provider: event.tool_call_server_name || undefined
-        }
-      }
-
-      this.finalizeLastBlock(state)
-      state.message.content.push(searchBlock)
-
-      for (const result of searchResults) {
-        await this.sqlitePresenter.addMessageAttachment(
-          event.eventId,
-          'search_result',
-          JSON.stringify({
-            title: result.title,
-            url: result.url,
-            content: result.content,
-            description: result.description,
-            icon: result.icon || result.favicon || '',
-            rank: typeof result.rank === 'number' ? result.rank : undefined,
-            searchId
-          })
-        )
-      }
-
-      this.streamUpdateScheduler.enqueueDelta(
-        event.eventId,
-        state.conversationId,
-        state.message.parentId,
-        Boolean(state.message.is_variant),
-        state.webContentsId,
-        {},
-        state.message.content
-      )
-      return true
-    } catch (error) {
-      console.error('[ToolCallHandler] Error processing search results from tool call:', error)
-      return false
-    }
-  }
-
-  private handlePermissionRequired(
-    state: GeneratingMessageState,
-    event: LLMAgentEventData,
-    currentTime: number
-  ): void {
-    const ALLOWED_PERMISSION_TYPES = ['read', 'write', 'all', 'command'] as const
-    type PermissionType = (typeof ALLOWED_PERMISSION_TYPES)[number]
-
-    let permissionType: PermissionType = 'read'
-    const requestedType = event.permission_request?.permissionType
-    if (typeof requestedType === 'string') {
-      const normalizedType = requestedType.toLowerCase()
-      if (ALLOWED_PERMISSION_TYPES.includes(normalizedType as PermissionType)) {
-        permissionType = normalizedType as PermissionType
-      } else {
-        console.warn(
-          `[ToolCallHandler] Invalid permission type received: "${requestedType}". Defaulting to "read".`
-        )
-      }
-    } else if (requestedType !== undefined) {
-      console.warn(
-        `[ToolCallHandler] Permission type is not a string: ${typeof requestedType}. Defaulting to "read".`
-      )
-    }
-
-    const lastBlock = state.message.content[state.message.content.length - 1]
-    if (lastBlock && lastBlock.type === 'tool_call' && lastBlock.tool_call) {
-    }
-
-    this.finalizeLastBlock(state)
-    const permissionExtra: Record<string, string | boolean> = {
-      needsUserAction: true
-    }
-
-    const permissionRequest = event.permission_request as PermissionRequestPayload | undefined
-    permissionExtra.permissionType = permissionRequest?.permissionType ?? permissionType
-    if (permissionRequest) {
-      permissionExtra.permissionRequest = JSON.stringify(permissionRequest)
-      if (permissionRequest.commandInfo) {
-        permissionExtra.commandInfo = JSON.stringify(permissionRequest.commandInfo)
-      } else {
-        const commandFromRequest = permissionRequest.command
-        if (commandFromRequest && this.commandPermissionHandler) {
-          permissionExtra.commandInfo = JSON.stringify(
-            this.commandPermissionHandler.buildCommandInfo(commandFromRequest)
-          )
-        }
-      }
-      if (permissionRequest.toolName) {
-        permissionExtra.toolName = permissionRequest.toolName
-      }
-      if (permissionRequest.serverName) {
-        permissionExtra.serverName = permissionRequest.serverName
-      }
-      if (permissionRequest.providerId) {
-        permissionExtra.providerId = permissionRequest.providerId
-      }
-      if (permissionRequest.requestId) {
-        permissionExtra.permissionRequestId = permissionRequest.requestId
-      }
-      if (permissionRequest.rememberable === false) {
-        permissionExtra.rememberable = false
-      }
-      if (permissionRequest.agentId) {
-        permissionExtra.agentId = permissionRequest.agentId
-      }
-      if (permissionRequest.agentName) {
-        permissionExtra.agentName = permissionRequest.agentName
-      }
-      if (permissionRequest.sessionId) {
-        permissionExtra.sessionId = permissionRequest.sessionId
-      }
-      if (!permissionExtra.commandInfo && this.commandPermissionHandler) {
-        try {
-          const parsedParams = JSON.parse(event.tool_call_params || '{}') as { command?: string }
-          if (typeof parsedParams.command === 'string' && parsedParams.command.trim()) {
-            permissionExtra.commandInfo = JSON.stringify(
-              this.commandPermissionHandler.buildCommandInfo(parsedParams.command)
-            )
-          }
-        } catch {
-          // Ignore parsing failures for command info fallback.
-        }
-      }
-    } else {
-      if (event.tool_call_name) {
-        permissionExtra.toolName = event.tool_call_name
-      }
-      if (event.tool_call_server_name) {
-        permissionExtra.serverName = event.tool_call_server_name
-      }
-    }
-
-    state.message.content.push({
-      type: 'action',
-      content: event.tool_call_response || '',
-      status: 'pending',
-      timestamp: currentTime,
-      action_type: 'tool_call_permission',
-      tool_call: {
-        id: event.tool_call_id,
-        name: event.tool_call_name,
-        params: event.tool_call_params || '',
-        server_name: event.tool_call_server_name,
-        server_icons: event.tool_call_server_icons,
-        server_description: event.tool_call_server_description
-      },
-      extra: permissionExtra
-    })
-
-    state.pendingToolCall = this.buildPendingToolCall(event)
-  }
-
-  private buildPendingToolCall(event: LLMAgentEventData) {
-    if (!event.tool_call_id && !event.tool_call_name) {
-      return undefined
-    }
-
-    return {
-      id: event.tool_call_id || '',
-      name: event.tool_call_name || '',
-      params: event.tool_call_params || '',
-      serverName: event.tool_call_server_name,
-      serverIcons: event.tool_call_server_icons,
-      serverDescription: event.tool_call_server_description
-    }
-  }
-
-  private finalizeLastBlock(state: GeneratingMessageState): void {
-    finalizeAssistantMessageBlocks(state.message.content)
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallProcessor.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallProcessor.ts
deleted file mode 100644
index 50a93f979..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallProcessor.ts
+++ /dev/null
@@ -1,726 +0,0 @@
-import {
-  ChatMessage,
-  LLMAgentEvent,
-  MCPToolCall,
-  MCPToolDefinition,
-  MCPToolResponse,
-  ModelConfig
-} from '@shared/presenter'
-import fs from 'fs/promises'
-import path from 'path'
-import { isNonRetryableError } from './errorClassification'
-import { resolveToolOffloadPath } from '../../sessionPresenter/sessionPaths'
-import { parseQuestionToolArgs, QUESTION_TOOL_NAME } from '@/lib/agentRuntime/questionTool'
-
-interface ToolCallProcessorOptions {
-  getAllToolDefinitions: (context: ToolCallExecutionContext) => Promise<MCPToolDefinition[]>
-  callTool: (request: MCPToolCall) => Promise<{ content: unknown; rawData: MCPToolResponse }>
-  preCheckToolPermission?: (request: MCPToolCall) => Promise<PermissionRequestPayload | null>
-  onToolCallFinished?: (info: {
-    toolName: string
-    toolCallId: string
-    toolServerName?: string
-    conversationId?: string
-    status: 'success' | 'error' | 'permission'
-  }) => void
-}
-
-interface ToolCallExecutionContext {
-  eventId: string
-  toolCalls: Array<{ id: string; name: string; arguments: string }>
-  enabledMcpTools?: string[]
-  conversationMessages: ChatMessage[]
-  modelConfig: ModelConfig
-  providerId?: string
-  abortSignal: AbortSignal
-  currentToolCallCount: number
-  maxToolCalls: number
-  conversationId?: string
-}
-
-interface ToolCallProcessResult {
-  toolCallCount: number
-  needContinueConversation: boolean
-}
-
-interface ToolCall {
-  id: string
-  name: string
-  arguments: string
-}
-
-type PermissionType = 'read' | 'write' | 'all' | 'command'
-
-interface CommandInfoPayload {
-  command: string
-  riskLevel: 'low' | 'medium' | 'high' | 'critical'
-  suggestion: string
-  signature?: string
-  baseCommand?: string
-}
-
-interface PermissionRequestPayload {
-  needsPermission: true
-  toolName: string
-  serverName: string
-  permissionType: PermissionType
-  description: string
-  command?: string
-  commandSignature?: string
-  commandInfo?: CommandInfoPayload
-  paths?: string[]
-  providerId?: string
-  requestId?: string
-  sessionId?: string
-  agentId?: string
-  agentName?: string
-  conversationId?: string
-  rememberable?: boolean
-  [key: string]: unknown
-}
-
-interface PermissionRequestInfo {
-  toolCall: ToolCall
-  serverName: string
-  serverIcons?: string
-  serverDescription?: string
-  payload: PermissionRequestPayload
-}
-
-const TOOL_OUTPUT_OFFLOAD_THRESHOLD = 5000
-const TOOL_OUTPUT_PREVIEW_LENGTH = 1024
-const QUESTION_ERROR_KEY = 'common.error.invalidQuestionRequest'
-
-// Tools that require offload when output exceeds threshold
-// Tools not in this list will never trigger offload (e.g., read has its own pagination)
-const TOOLS_REQUIRING_OFFLOAD = new Set(['exec', 'ls', 'find', 'grep', 'cdp_send'])
-
-export class ToolCallProcessor {
-  constructor(private readonly options: ToolCallProcessorOptions) {}
-
-  async *process(
-    context: ToolCallExecutionContext
-  ): AsyncGenerator<LLMAgentEvent, ToolCallProcessResult, void> {
-    let toolCallCount = context.currentToolCallCount
-    let needContinueConversation = context.toolCalls.length > 0
-    let toolDefinitions = await this.options.getAllToolDefinitions(context)
-
-    // Step 1: Pre-check all tool permissions in batch
-    // If any tool requires permission, we pause and request permission for all at once
-    const permissionCheckResult = await this.batchPreCheckPermissions(context, toolDefinitions)
-
-    if (permissionCheckResult.hasPendingPermissions) {
-      // Yield permission request event for all tools that need permission
-      for (const permissionRequest of permissionCheckResult.permissionRequests) {
-        const permissionPayload = {
-          ...permissionRequest.payload,
-          toolName: permissionRequest.toolCall.name,
-          serverName: permissionRequest.serverName,
-          permissionType: permissionRequest.payload.permissionType,
-          description: permissionRequest.payload.description,
-          conversationId: permissionRequest.payload.conversationId ?? context.conversationId,
-          // Mark this as part of a batch
-          isBatchPermission: true,
-          totalInBatch: permissionCheckResult.permissionRequests.length
-        }
-
-        yield {
-          type: 'response',
-          data: {
-            eventId: context.eventId,
-            tool_call: 'permission-required',
-            tool_call_id: permissionRequest.toolCall.id,
-            tool_call_name: permissionRequest.toolCall.name,
-            tool_call_params: permissionRequest.toolCall.arguments,
-            tool_call_server_name: permissionRequest.serverName,
-            tool_call_server_icons: permissionRequest.serverIcons,
-            tool_call_server_description: permissionRequest.serverDescription,
-            tool_call_response: permissionRequest.payload.description,
-            permission_request: permissionPayload
-          }
-        }
-      }
-
-      // Stop here and wait for user to grant permissions
-      // The loop will be restarted after permissions are granted
-      needContinueConversation = false
-      return {
-        toolCallCount,
-        needContinueConversation
-      }
-    }
-
-    const resolveToolDefinition = async (
-      toolName: string
-    ): Promise<MCPToolDefinition | undefined> => {
-      const match = toolDefinitions.find((tool) => tool.function.name === toolName)
-      if (match) return match
-      toolDefinitions = await this.options.getAllToolDefinitions(context)
-      return toolDefinitions.find((tool) => tool.function.name === toolName)
-    }
-
-    for (const [index, toolCall] of context.toolCalls.entries()) {
-      if (context.abortSignal.aborted) break
-
-      if (toolCallCount >= context.maxToolCalls) {
-        console.warn('Max tool calls reached during execution phase for event:', context.eventId)
-        yield {
-          type: 'response',
-          data: {
-            eventId: context.eventId,
-            maximum_tool_calls_reached: true,
-            tool_call_id: toolCall.id,
-            tool_call_name: toolCall.name
-          }
-        }
-
-        needContinueConversation = false
-        break
-      }
-
-      toolCallCount++
-
-      const toolDef = await resolveToolDefinition(toolCall.name)
-
-      if (!toolDef) {
-        console.error(`Tool definition not found for ${toolCall.name}. Skipping execution.`)
-        const errorMsg = `Tool definition for ${toolCall.name} not found.`
-        yield {
-          type: 'response',
-          data: {
-            eventId: context.eventId,
-            tool_call: 'error',
-            tool_call_id: toolCall.id,
-            tool_call_name: toolCall.name,
-            tool_call_response: errorMsg
-          }
-        }
-
-        context.conversationMessages.push({
-          role: 'user',
-          content: `Error: ${errorMsg}`
-        })
-        continue
-      }
-
-      const notifyToolCallFinished = (status: 'success' | 'error' | 'permission') => {
-        if (!this.options.onToolCallFinished) return
-        try {
-          this.options.onToolCallFinished({
-            toolName: toolCall.name,
-            toolCallId: toolCall.id,
-            toolServerName: toolDef.server?.name,
-            conversationId: context.conversationId,
-            status
-          })
-        } catch (error) {
-          console.warn('[ToolCallProcessor] onToolCallFinished handler failed:', error)
-        }
-      }
-
-      const mcpToolInput: MCPToolCall = {
-        id: toolCall.id,
-        type: 'function',
-        function: {
-          name: toolCall.name,
-          arguments: toolCall.arguments
-        },
-        server: toolDef.server,
-        conversationId: context.conversationId
-      }
-
-      if (toolCall.name === QUESTION_TOOL_NAME) {
-        const isStandalone = context.toolCalls.length === 1
-        const isLast = index === context.toolCalls.length - 1
-        if (!isStandalone || !isLast) {
-          notifyToolCallFinished('error')
-          this.appendToolError(
-            context.conversationMessages,
-            context.modelConfig,
-            toolCall,
-            'Question tool must be the only tool call in a turn.'
-          )
-          yield {
-            type: 'response',
-            data: {
-              eventId: context.eventId,
-              question_error: QUESTION_ERROR_KEY,
-              tool_call_id: toolCall.id,
-              tool_call_name: toolCall.name
-            }
-          }
-          continue
-        }
-
-        const parsedQuestion = parseQuestionToolArgs(toolCall.arguments || '')
-        if (!parsedQuestion.success) {
-          notifyToolCallFinished('error')
-          this.appendToolError(
-            context.conversationMessages,
-            context.modelConfig,
-            toolCall,
-            `Invalid question tool arguments: ${parsedQuestion.error}`
-          )
-          yield {
-            type: 'response',
-            data: {
-              eventId: context.eventId,
-              question_error: QUESTION_ERROR_KEY,
-              tool_call_id: toolCall.id,
-              tool_call_name: toolCall.name
-            }
-          }
-          continue
-        }
-
-        notifyToolCallFinished('success')
-        yield {
-          type: 'response',
-          data: {
-            eventId: context.eventId,
-            tool_call: 'question-required',
-            tool_call_id: toolCall.id,
-            tool_call_name: toolCall.name,
-            tool_call_params: toolCall.arguments,
-            tool_call_server_name: toolDef.server.name,
-            tool_call_server_icons: toolDef.server.icons,
-            tool_call_server_description: toolDef.server.description,
-            question_request: parsedQuestion.data
-          }
-        }
-
-        needContinueConversation = false
-        break
-      }
-
-      yield {
-        type: 'response',
-        data: {
-          eventId: context.eventId,
-          tool_call: 'running',
-          tool_call_id: toolCall.id,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.arguments,
-          tool_call_server_name: toolDef.server.name,
-          tool_call_server_icons: toolDef.server.icons,
-          tool_call_server_description: toolDef.server.description
-        }
-      }
-
-      try {
-        const toolResponse = await this.options.callTool(mcpToolInput)
-        const requiresPermission = Boolean(toolResponse.rawData?.requiresPermission)
-
-        if (requiresPermission) {
-          notifyToolCallFinished('permission')
-          console.log(
-            `[Agent Loop] Permission required for tool ${toolCall.name}, creating permission request`
-          )
-
-          yield {
-            type: 'response',
-            data: {
-              eventId: context.eventId,
-              tool_call: 'permission-required',
-              tool_call_id: toolCall.id,
-              tool_call_name: toolCall.name,
-              tool_call_params: toolCall.arguments,
-              tool_call_server_name: toolResponse.rawData.permissionRequest?.serverName,
-              tool_call_server_icons: toolDef.server.icons,
-              tool_call_server_description: toolDef.server.description,
-              tool_call_response: toolResponse.content,
-              permission_request: toolResponse.rawData.permissionRequest
-            }
-          }
-
-          needContinueConversation = false
-          break
-        }
-
-        notifyToolCallFinished('success')
-
-        if (context.abortSignal.aborted) break
-
-        const supportsFunctionCall = context.modelConfig?.functionCall || false
-
-        const toolContent = this.stringifyToolContent(toolResponse.content)
-        const toolContentForModel = await this.offloadToolContentIfNeeded(
-          toolContent,
-          toolCall.id,
-          context.conversationId,
-          toolCall.name
-        )
-
-        if (supportsFunctionCall) {
-          this.appendNativeFunctionCallMessages(context.conversationMessages, toolCall, {
-            content: toolContentForModel
-          })
-
-          yield {
-            type: 'response',
-            data: {
-              eventId: context.eventId,
-              tool_call: 'end',
-              tool_call_id: toolCall.id,
-              tool_call_response: toolContentForModel,
-              tool_call_name: toolCall.name,
-              tool_call_params: toolCall.arguments,
-              tool_call_server_name: toolDef.server.name,
-              tool_call_server_icons: toolDef.server.icons,
-              tool_call_server_description: toolDef.server.description,
-              tool_call_response_raw: toolResponse.rawData
-            }
-          }
-        } else {
-          this.appendLegacyFunctionCallMessages(context.conversationMessages, toolCall, {
-            content: toolContentForModel
-          })
-
-          yield {
-            type: 'response',
-            data: {
-              eventId: context.eventId,
-              tool_call: 'end',
-              tool_call_id: toolCall.id,
-              tool_call_response: toolContentForModel,
-              tool_call_name: toolCall.name,
-              tool_call_params: toolCall.arguments,
-              tool_call_server_name: toolDef.server.name,
-              tool_call_server_icons: toolDef.server.icons,
-              tool_call_server_description: toolDef.server.description,
-              tool_call_response_raw: toolResponse.rawData
-            }
-          }
-        }
-      } catch (toolError) {
-        notifyToolCallFinished('error')
-        if (context.abortSignal.aborted) break
-
-        console.error(
-          `Tool execution error for ${toolCall.name} (event ${context.eventId}):`,
-          toolError
-        )
-        const errorMessage = toolError instanceof Error ? toolError.message : String(toolError)
-
-        // Check if error is non-retryable (should stop the loop)
-        const errorForClassification: Error | string =
-          toolError instanceof Error ? toolError : String(toolError)
-        const isNonRetryable = isNonRetryableError(errorForClassification)
-
-        this.appendToolError(
-          context.conversationMessages,
-          context.modelConfig,
-          toolCall,
-          errorMessage
-        )
-
-        yield {
-          type: 'response',
-          data: {
-            eventId: context.eventId,
-            tool_call: 'error',
-            tool_call_id: toolCall.id,
-            tool_call_name: toolCall.name,
-            tool_call_params: toolCall.arguments,
-            tool_call_response: errorMessage,
-            tool_call_server_name: toolDef.server.name,
-            tool_call_server_icons: toolDef.server.icons,
-            tool_call_server_description: toolDef.server.description
-          }
-        }
-
-        // If error is non-retryable, stop the loop
-        // Otherwise, keep needContinueConversation = true (default) to let LLM decide
-        if (isNonRetryable) {
-          needContinueConversation = false
-          break
-        }
-        // For retryable errors, continue the loop (needContinueConversation remains true)
-      }
-    }
-
-    return {
-      toolCallCount,
-      needContinueConversation
-    }
-  }
-
-  private appendNativeFunctionCallMessages(
-    conversationMessages: ChatMessage[],
-    toolCall: { id: string; name: string; arguments: string },
-    toolResponse: { content: unknown }
-  ): void {
-    const lastAssistantMsg = conversationMessages.findLast(
-      (message) => message.role === 'assistant'
-    )
-    if (lastAssistantMsg) {
-      if (!lastAssistantMsg.tool_calls) lastAssistantMsg.tool_calls = []
-      lastAssistantMsg.tool_calls.push({
-        function: {
-          arguments: toolCall.arguments,
-          name: toolCall.name
-        },
-        id: toolCall.id,
-        type: 'function'
-      })
-    } else {
-      conversationMessages.push({
-        role: 'assistant',
-        tool_calls: [
-          {
-            function: {
-              arguments: toolCall.arguments,
-              name: toolCall.name
-            },
-            id: toolCall.id,
-            type: 'function'
-          }
-        ]
-      })
-    }
-
-    const toolContent = this.stringifyToolContent(toolResponse.content)
-    conversationMessages.push({
-      role: 'tool',
-      content: toolContent,
-      tool_call_id: toolCall.id
-    })
-  }
-
-  private appendLegacyFunctionCallMessages(
-    conversationMessages: ChatMessage[],
-    toolCall: { id: string; name: string; arguments: string },
-    toolResponse: { content: unknown; rawData?: unknown }
-  ): void {
-    const formattedToolRecordText =
-      '<function_call>' +
-      JSON.stringify({
-        function_call_record: {
-          name: toolCall.name,
-          arguments: toolCall.arguments,
-          response: toolResponse.content
-        }
-      }) +
-      '</function_call>'
-
-    let lastAssistantMessage = conversationMessages.findLast(
-      (message) => message.role === 'assistant'
-    )
-
-    if (lastAssistantMessage) {
-      if (typeof lastAssistantMessage.content === 'string') {
-        lastAssistantMessage.content += formattedToolRecordText + '\n'
-      } else if (Array.isArray(lastAssistantMessage.content)) {
-        lastAssistantMessage.content.push({
-          type: 'text',
-          text: formattedToolRecordText + '\n'
-        })
-      } else {
-        lastAssistantMessage.content = [{ type: 'text', text: formattedToolRecordText + '\n' }]
-      }
-    } else {
-      conversationMessages.push({
-        role: 'assistant',
-        content: [{ type: 'text', text: formattedToolRecordText + '\n' }]
-      })
-    }
-
-    const userPromptText =
-      '以上是你刚执行的工具调用及其响应信息，已帮你插入，请仔细阅读工具响应，并继续你的回答。'
-    conversationMessages.push({
-      role: 'user',
-      content: [{ type: 'text', text: userPromptText }]
-    })
-  }
-
-  private async offloadToolContentIfNeeded(
-    content: string,
-    toolCallId: string,
-    conversationId?: string,
-    toolName?: string
-  ): Promise<string> {
-    // Only offload tools in the whitelist
-    if (toolName && !TOOLS_REQUIRING_OFFLOAD.has(toolName)) {
-      return content
-    }
-
-    if (content.length <= TOOL_OUTPUT_OFFLOAD_THRESHOLD) return content
-    if (!conversationId) return content
-
-    const filePath = resolveToolOffloadPath(conversationId, toolCallId)
-    if (!filePath) return content
-    const sessionDir = path.dirname(filePath)
-
-    try {
-      await fs.mkdir(sessionDir, { recursive: true })
-      await fs.writeFile(filePath, content, 'utf-8')
-    } catch (error) {
-      console.warn('[ToolCallProcessor] Failed to offload tool output:', error)
-      return content
-    }
-
-    const preview = content.slice(0, TOOL_OUTPUT_PREVIEW_LENGTH)
-    return this.buildToolOutputStub(content.length, preview, filePath)
-  }
-
-  private buildToolOutputStub(totalLength: number, preview: string, filePath: string): string {
-    return [
-      '[Tool output offloaded]',
-      `Total characters: ${totalLength}`,
-      `Full output saved to: ${filePath}`,
-      `first ${preview.length} chars:`,
-      preview
-    ].join('\n')
-  }
-
-  private appendToolError(
-    conversationMessages: ChatMessage[],
-    modelConfig: ModelConfig,
-    toolCall: { id: string; name: string; arguments: string },
-    errorMessage: string
-  ): void {
-    if (modelConfig?.functionCall) {
-      // For native function-calling models, ensure every tool error is still paired
-      // with a preceding assistant message that declares the tool_call in tool_calls.
-      const toolCallEntry = {
-        id: toolCall.id,
-        type: 'function' as const,
-        function: {
-          name: toolCall.name,
-          arguments: toolCall.arguments
-        }
-      }
-
-      let lastAssistantMessage = conversationMessages.findLast(
-        (message) => message.role === 'assistant'
-      )
-
-      if (lastAssistantMessage) {
-        if (!lastAssistantMessage.tool_calls) {
-          lastAssistantMessage.tool_calls = []
-        }
-        lastAssistantMessage.tool_calls.push(toolCallEntry)
-      } else {
-        // Extremely defensive fallback – create a synthetic assistant message
-        // so the OpenAI API still sees a valid tool_calls declaration.
-        lastAssistantMessage = {
-          role: 'assistant',
-          tool_calls: [toolCallEntry]
-        }
-        conversationMessages.push(lastAssistantMessage)
-      }
-
-      conversationMessages.push({
-        role: 'tool',
-        content: `The tool call with ID ${toolCall.id} and name ${toolCall.name} failed to execute: ${errorMessage}`,
-        tool_call_id: toolCall.id
-      })
-      return
-    }
-
-    const formattedErrorText = `编号为 ${toolCall.id} 的工具 ${toolCall.name} 调用执行失败: ${errorMessage}`
-    let lastAssistantMessage = conversationMessages.findLast(
-      (message) => message.role === 'assistant'
-    )
-    if (lastAssistantMessage) {
-      if (typeof lastAssistantMessage.content === 'string') {
-        lastAssistantMessage.content += '\n' + formattedErrorText + '\n'
-      } else if (Array.isArray(lastAssistantMessage.content)) {
-        lastAssistantMessage.content.push({
-          type: 'text',
-          text: '\n' + formattedErrorText + '\n'
-        })
-      } else {
-        lastAssistantMessage.content = [{ type: 'text', text: '\n' + formattedErrorText + '\n' }]
-      }
-    } else {
-      conversationMessages.push({
-        role: 'assistant',
-        content: [{ type: 'text', text: formattedErrorText + '\n' }]
-      })
-    }
-
-    const userPromptText =
-      '以上是你刚调用的工具及其执行的错误信息，已帮你插入，请根据情况继续回答或重新尝试。'
-    conversationMessages.push({
-      role: 'user',
-      content: [{ type: 'text', text: userPromptText }]
-    })
-  }
-
-  private stringifyToolContent(content: unknown): string {
-    return typeof content === 'string' ? content : JSON.stringify(content)
-  }
-
-  /**
-   * Batch pre-check permissions for all tool calls
-   * Returns info about tools that need permission, or empty if all have permission
-   */
-  private async batchPreCheckPermissions(
-    context: ToolCallExecutionContext,
-    toolDefinitions: MCPToolDefinition[]
-  ): Promise<{
-    hasPendingPermissions: boolean
-    permissionRequests: PermissionRequestInfo[]
-  }> {
-    // If no permission pre-check function provided, skip batch check
-    if (!this.options.preCheckToolPermission) {
-      return { hasPendingPermissions: false, permissionRequests: [] }
-    }
-
-    const permissionRequests: PermissionRequestInfo[] = []
-    const toolNameToDefMap = new Map(toolDefinitions.map((t) => [t.function.name, t]))
-
-    for (const toolCall of context.toolCalls) {
-      const toolDef = toolNameToDefMap.get(toolCall.name)
-      if (!toolDef) continue
-
-      // Skip question tool for permission check
-      if (toolCall.name === QUESTION_TOOL_NAME) continue
-
-      const mcpToolInput: MCPToolCall = {
-        id: toolCall.id,
-        type: 'function',
-        function: {
-          name: toolCall.name,
-          arguments: toolCall.arguments
-        },
-        server: toolDef.server,
-        conversationId: context.conversationId
-      }
-
-      try {
-        const permissionResult = await this.options.preCheckToolPermission(mcpToolInput)
-        if (permissionResult) {
-          const permissionPayload: PermissionRequestPayload = {
-            ...permissionResult,
-            toolName: permissionResult.toolName || toolCall.name,
-            serverName: permissionResult.serverName || toolDef.server.name,
-            permissionType: permissionResult.permissionType,
-            description: permissionResult.description
-          }
-
-          // Preserve the full permission payload (paths and custom fields included)
-          permissionRequests.push({
-            toolCall,
-            serverName: permissionPayload.serverName,
-            serverIcons: toolDef.server?.icons,
-            serverDescription: toolDef.server?.description,
-            payload: permissionPayload
-          })
-        }
-      } catch (error) {
-        console.warn(
-          `[ToolCallProcessor] Failed to pre-check permission for ${toolCall.name}:`,
-          error
-        )
-        // If pre-check fails, we'll let the actual execution handle it
-      }
-    }
-
-    return {
-      hasPendingPermissions: permissionRequests.length > 0,
-      permissionRequests
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageBuilder.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageBuilder.ts
deleted file mode 100644
index 8599fe871..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageBuilder.ts
+++ /dev/null
@@ -1,405 +0,0 @@
-import { approximateTokenSize } from 'tokenx'
-import { AssistantMessage, Message, MessageFile, UserMessageContent } from '@shared/chat'
-import { ModelType } from '@shared/model'
-import {
-  CONVERSATION,
-  IToolPresenter,
-  ModelConfig,
-  SearchResult,
-  ChatMessage
-} from '@shared/presenter'
-import type { MCPToolDefinition } from '@shared/presenter'
-
-import { modelCapabilities } from '../../configPresenter/modelCapabilities'
-import { enhanceSystemPromptWithDateTime } from '../utility/promptEnhancer'
-import { ToolCallCenter } from '../tool/toolCallCenter'
-import { nanoid } from 'nanoid'
-
-import {
-  addContextMessages,
-  buildUserMessageContext,
-  formatMessagesForCompletion,
-  mergeConsecutiveMessages
-} from './messageFormatter'
-import { selectContextMessages } from './messageTruncator'
-import {
-  buildSkillsMetadataPrompt,
-  buildSkillsPrompt,
-  getSkillsAllowedTools
-} from './skillsPromptBuilder'
-import {
-  buildRuntimeCapabilitiesPrompt,
-  buildSystemEnvPrompt
-} from '@/lib/agentRuntime/systemEnvPromptBuilder'
-import type { AgentPromptRuntimePort } from '../runtimePorts'
-
-export type PendingToolCall = {
-  id: string
-  name: string
-  params: string
-  serverName?: string
-  serverIcons?: string
-  serverDescription?: string
-}
-
-export interface PreparePromptContentParams {
-  conversation: CONVERSATION
-  userContent: string
-  contextMessages: Message[]
-  searchResults: SearchResult[] | null
-  userMessage: Message
-  vision: boolean
-  imageFiles: MessageFile[]
-  supportsFunctionCall: boolean
-  modelType?: ModelType
-  toolPresenter: IToolPresenter
-  promptRuntime: AgentPromptRuntimePort
-}
-
-export interface ContinueToolCallContextParams {
-  conversation: CONVERSATION
-  contextMessages: Message[]
-  userMessage: Message
-  pendingToolCall: PendingToolCall
-  modelConfig: ModelConfig
-}
-
-export interface PostToolExecutionContextParams {
-  conversation: CONVERSATION
-  contextMessages: Message[]
-  userMessage: Message
-  currentAssistantMessage: AssistantMessage
-  completedToolCall: PendingToolCall & { response: string }
-  modelConfig: ModelConfig
-}
-
-function mergeToolSelections(base?: string[], extra?: string[]): string[] | undefined {
-  const merged = new Set<string>()
-  base?.forEach((tool) => merged.add(tool))
-  extra?.forEach((tool) => merged.add(tool))
-  if (merged.size === 0) {
-    return undefined
-  }
-  return Array.from(merged)
-}
-
-function appendPromptSection(base: string, section: string): string {
-  const trimmedSection = section.trim()
-  if (!trimmedSection) {
-    return base
-  }
-  if (!base) {
-    return trimmedSection
-  }
-  return `${base}\n\n${trimmedSection}`
-}
-
-export interface AgentSystemPromptSections {
-  basePrompt: string
-  runtimePrompt?: string
-  skillsMetadataPrompt?: string
-  skillsPrompt?: string
-  envPrompt?: string
-  toolingPrompt?: string
-}
-
-export function composeAgentSystemPromptSections(sections: AgentSystemPromptSections): string {
-  let composed = sections.basePrompt?.trim() ?? ''
-  composed = appendPromptSection(composed, sections.runtimePrompt ?? '')
-  composed = appendPromptSection(composed, sections.skillsMetadataPrompt ?? '')
-  composed = appendPromptSection(composed, sections.skillsPrompt ?? '')
-  composed = appendPromptSection(composed, sections.envPrompt ?? '')
-  composed = appendPromptSection(composed, sections.toolingPrompt ?? '')
-  return composed
-}
-
-export async function preparePromptContent({
-  conversation,
-  userContent,
-  contextMessages,
-  searchResults: _searchResults,
-  userMessage,
-  vision,
-  imageFiles,
-  supportsFunctionCall,
-  modelType,
-  toolPresenter,
-  promptRuntime
-}: PreparePromptContentParams): Promise<{
-  finalContent: ChatMessage[]
-  promptTokens: number
-}> {
-  const { systemPrompt, contextLength, artifacts, enabledMcpTools } = conversation.settings
-
-  function normalizeChatMode(mode: string | undefined): 'agent' | 'acp agent' | undefined {
-    if (mode === 'agent' || mode === 'acp agent') return mode
-    return undefined
-  }
-
-  const rawChatMode = conversation.settings.chatMode
-  const rawFallback = await promptRuntime.getInputChatMode()
-  const chatMode: 'agent' | 'acp agent' =
-    normalizeChatMode(rawChatMode) ?? normalizeChatMode(rawFallback) ?? 'agent'
-
-  const isImageGeneration = modelType === ModelType.ImageGeneration
-
-  const finalSystemPrompt = enhanceSystemPromptWithDateTime(systemPrompt, {
-    isImageGeneration,
-    agentWorkspacePath: conversation.settings.agentWorkspacePath?.trim() || null
-  })
-
-  const { providerId, modelId } = conversation.settings
-  const supportsVision = modelCapabilities.supportsVision(providerId, modelId)
-  const toolCallCenter = new ToolCallCenter(toolPresenter)
-  let toolDefinitions: MCPToolDefinition[] = []
-  let effectiveEnabledMcpTools = enabledMcpTools
-
-  if (!isImageGeneration && chatMode === 'agent') {
-    const skillsAllowedTools = await getSkillsAllowedTools(promptRuntime, conversation.id)
-    effectiveEnabledMcpTools = mergeToolSelections(enabledMcpTools, skillsAllowedTools)
-  }
-
-  if (!isImageGeneration) {
-    try {
-      toolDefinitions = await toolCallCenter.getAllToolDefinitions({
-        enabledMcpTools: effectiveEnabledMcpTools,
-        chatMode,
-        supportsVision,
-        agentWorkspacePath: conversation.settings.agentWorkspacePath?.trim() || null,
-        conversationId: conversation.id
-      })
-    } catch (error) {
-      console.warn('AgentPresenter: Failed to load tool definitions', error)
-      toolDefinitions = []
-    }
-  }
-
-  let runtimePrompt = ''
-  let skillsMetadataPrompt = ''
-  let skillsPrompt = ''
-  let envPrompt = ''
-  let toolingPrompt = ''
-
-  if (!isImageGeneration && chatMode === 'agent') {
-    runtimePrompt = buildRuntimeCapabilitiesPrompt()
-    try {
-      skillsMetadataPrompt = await buildSkillsMetadataPrompt(promptRuntime)
-      skillsPrompt = await buildSkillsPrompt(promptRuntime, conversation.id)
-    } catch (error) {
-      console.warn('AgentPresenter: Failed to build skills prompt', error)
-    }
-
-    try {
-      envPrompt = await buildSystemEnvPrompt({
-        providerId,
-        modelId,
-        workdir: conversation.settings.agentWorkspacePath?.trim() || null
-      })
-    } catch (error) {
-      console.warn('AgentPresenter: Failed to build system env prompt', error)
-    }
-  }
-
-  if (!isImageGeneration && toolDefinitions.length > 0) {
-    toolingPrompt = toolCallCenter.buildToolSystemPrompt({
-      conversationId: conversation.id
-    })
-  }
-
-  const finalSystemPromptWithExtras = composeAgentSystemPromptSections({
-    basePrompt: finalSystemPrompt,
-    runtimePrompt,
-    skillsMetadataPrompt,
-    skillsPrompt,
-    envPrompt,
-    toolingPrompt
-  })
-
-  const systemPromptTokens =
-    !isImageGeneration && finalSystemPromptWithExtras
-      ? approximateTokenSize(finalSystemPromptWithExtras)
-      : 0
-  const userMessageTokens = approximateTokenSize(userContent)
-  const toolDefinitionsTokens = toolDefinitions.reduce((acc, tool) => {
-    return acc + approximateTokenSize(JSON.stringify(tool))
-  }, 0)
-
-  const reservedTokens = systemPromptTokens + userMessageTokens + toolDefinitionsTokens
-  const remainingContextLength = contextLength - reservedTokens
-
-  const selectedContextMessages = selectContextMessages(
-    contextMessages,
-    userMessage,
-    remainingContextLength,
-    supportsFunctionCall,
-    vision
-  )
-
-  const formattedMessages = formatMessagesForCompletion(
-    selectedContextMessages,
-    isImageGeneration ? '' : finalSystemPromptWithExtras,
-    artifacts,
-    userContent,
-    '',
-    imageFiles,
-    vision,
-    supportsFunctionCall
-  )
-
-  const mergedMessages = mergeConsecutiveMessages(formattedMessages)
-
-  let promptTokens = 0
-  const imageTokenCost = imageFiles.reduce((acc, file) => acc + (file.token ?? 0), 0)
-  for (let i = 0; i < mergedMessages.length; i++) {
-    const msg = mergedMessages[i]
-
-    if (typeof msg.content === 'string' || msg.content === undefined) {
-      promptTokens += approximateTokenSize(msg.content || '')
-      continue
-    }
-
-    const textContent =
-      msg.content?.reduce((acc, item) => {
-        if (item.type === 'text' && typeof item.text === 'string') {
-          return acc + item.text
-        }
-        return acc
-      }, '') ?? ''
-
-    promptTokens += approximateTokenSize(textContent)
-
-    const isFinalUserWithImages =
-      i === mergedMessages.length - 1 &&
-      msg.role === 'user' &&
-      Array.isArray(msg.content) &&
-      msg.content.some((block) => block.type === 'image_url')
-
-    if (isFinalUserWithImages && imageTokenCost > 0) {
-      promptTokens += imageTokenCost
-    }
-  }
-
-  return { finalContent: mergedMessages, promptTokens }
-}
-
-export async function buildContinueToolCallContext({
-  conversation,
-  contextMessages,
-  userMessage,
-  pendingToolCall,
-  modelConfig
-}: ContinueToolCallContextParams): Promise<ChatMessage[]> {
-  const { systemPrompt } = conversation.settings
-  const formattedMessages: ChatMessage[] = []
-
-  if (systemPrompt) {
-    const finalSystemPrompt = enhanceSystemPromptWithDateTime(systemPrompt, {})
-    formattedMessages.push({
-      role: 'system',
-      content: finalSystemPrompt
-    })
-  }
-
-  const contextChatMessages = addContextMessages(contextMessages, false, modelConfig.functionCall)
-  formattedMessages.push(...contextChatMessages)
-
-  const userContent = userMessage.content as UserMessageContent
-  const finalUserContent = buildUserMessageContext(userContent)
-
-  formattedMessages.push({
-    role: 'user',
-    content: `${finalUserContent}\n\nTool call interrupted: ${pendingToolCall.name}`
-  })
-
-  return formattedMessages
-}
-
-export async function buildPostToolExecutionContext({
-  conversation,
-  contextMessages,
-  userMessage,
-  currentAssistantMessage,
-  completedToolCall,
-  modelConfig
-}: PostToolExecutionContextParams): Promise<ChatMessage[]> {
-  const { systemPrompt } = conversation.settings
-  const formattedMessages: ChatMessage[] = []
-  const supportsFunctionCall = Boolean(modelConfig?.functionCall)
-
-  if (systemPrompt) {
-    const finalSystemPrompt = enhanceSystemPromptWithDateTime(systemPrompt, {})
-    formattedMessages.push({
-      role: 'system',
-      content: finalSystemPrompt
-    })
-  }
-
-  const contextChatMessages = addContextMessages(contextMessages, false, modelConfig.functionCall)
-  formattedMessages.push(...contextChatMessages)
-
-  const userContent = userMessage.content as UserMessageContent
-  const finalUserContent = buildUserMessageContext(userContent)
-
-  formattedMessages.push({
-    role: 'user',
-    content: finalUserContent
-  })
-
-  const assistantText = currentAssistantMessage.content
-    .filter((block) => block.type === 'content')
-    .map((block) => block.content || '')
-    .join('\n')
-    .trim()
-
-  // OpenAI-compatible function-calling requires:
-  // assistant(tool_calls: [...]) -> tool(tool_call_id=...) pairing.
-  if (supportsFunctionCall) {
-    const toolCallId = completedToolCall.id || nanoid(8)
-    formattedMessages.push({
-      role: 'assistant',
-      content: assistantText || undefined,
-      tool_calls: [
-        {
-          id: toolCallId,
-          type: 'function',
-          function: {
-            name: completedToolCall.name,
-            arguments: completedToolCall.params || ''
-          }
-        }
-      ]
-    })
-
-    formattedMessages.push({
-      role: 'tool',
-      content: completedToolCall.response,
-      tool_call_id: toolCallId
-    })
-  } else {
-    const formattedToolRecordText =
-      '<function_call>' +
-      JSON.stringify({
-        function_call_record: {
-          name: completedToolCall.name,
-          arguments: completedToolCall.params,
-          response: completedToolCall.response
-        }
-      }) +
-      '</function_call>'
-
-    const combinedText = [assistantText, formattedToolRecordText].filter(Boolean).join('\n')
-    formattedMessages.push({
-      role: 'assistant',
-      content: combinedText || undefined
-    })
-
-    const userPromptText =
-      '以上是你刚执行的工具调用及其响应信息，已帮你插入，请仔细阅读工具响应，并继续你的回答。'
-    formattedMessages.push({
-      role: 'user',
-      content: userPromptText
-    })
-  }
-
-  return formattedMessages
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageCompressor.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageCompressor.ts
deleted file mode 100644
index 3ca9ea1f0..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageCompressor.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-import { approximateTokenSize } from 'tokenx'
-import type { AssistantMessageBlock, Message } from '@shared/chat'
-
-function calculateToolCallBlockTokens(block: AssistantMessageBlock): number {
-  if (block.type !== 'tool_call' || !block.tool_call?.response) {
-    return 0
-  }
-
-  const nameTokens = approximateTokenSize(block.tool_call.name || '')
-  const paramsTokens = approximateTokenSize(block.tool_call.params || '')
-  const responseTokens = approximateTokenSize(block.tool_call.response || '')
-
-  return nameTokens + paramsTokens + responseTokens
-}
-
-function cloneMessageWithContent(message: Message): Message {
-  const cloned: Message = { ...message }
-
-  if (Array.isArray(message.content)) {
-    cloned.content = message.content.map((block) => {
-      const clonedBlock: AssistantMessageBlock = { ...(block as AssistantMessageBlock) }
-      if (block.type === 'tool_call' && block.tool_call) {
-        clonedBlock.tool_call = { ...block.tool_call }
-      }
-      return clonedBlock
-    })
-  } else if (message.content && typeof message.content === 'object') {
-    cloned.content = JSON.parse(JSON.stringify(message.content))
-  } else {
-    cloned.content = message.content
-  }
-
-  return cloned
-}
-
-function removeToolCallsFromAssistant(message: Message): {
-  updatedMessage: Message
-  removedTokens: number
-  removedToolCalls: number
-} {
-  if (message.role !== 'assistant' || !Array.isArray(message.content)) {
-    return { updatedMessage: message, removedTokens: 0, removedToolCalls: 0 }
-  }
-
-  const clonedMessage = cloneMessageWithContent(message)
-  const clonedContent = clonedMessage.content as AssistantMessageBlock[]
-
-  let removedTokens = 0
-  let removedToolCalls = 0
-
-  const filteredBlocks = clonedContent.filter((block) => {
-    if (block.type !== 'tool_call' || !block.tool_call) {
-      return true
-    }
-
-    removedTokens += calculateToolCallBlockTokens(block)
-    removedToolCalls += 1
-    return false
-  })
-
-  clonedMessage.content = filteredBlocks
-
-  return { updatedMessage: clonedMessage, removedTokens, removedToolCalls }
-}
-
-export function compressToolCallsFromContext(
-  messages: Message[],
-  excessTokens: number,
-  supportsFunctionCall: boolean
-): { compressedMessages: Message[]; removedTokens: number } {
-  if (!supportsFunctionCall || excessTokens <= 0) {
-    return { compressedMessages: messages, removedTokens: 0 }
-  }
-
-  const messagesToEdit = messages.map((msg) => cloneMessageWithContent(msg))
-
-  const lastUserIndex = messagesToEdit.findLastIndex((message) => message.role === 'user')
-  let removedTokens = 0
-
-  for (let i = 0; i < messagesToEdit.length; i++) {
-    if (lastUserIndex !== -1 && i >= lastUserIndex) {
-      break
-    }
-
-    const message = messagesToEdit[i]
-    if (message.role !== 'assistant') {
-      continue
-    }
-
-    const {
-      updatedMessage,
-      removedTokens: toolCallTokens,
-      removedToolCalls
-    } = removeToolCallsFromAssistant(message)
-
-    if (removedToolCalls > 0) {
-      messagesToEdit[i] = updatedMessage
-      console.debug(
-        `MessageCompressor: removed ${removedToolCalls} tool call block(s) (${toolCallTokens} tokens) from context`
-      )
-    }
-
-    removedTokens += toolCallTokens
-
-    if (removedTokens >= excessTokens) {
-      break
-    }
-  }
-
-  return { compressedMessages: messagesToEdit, removedTokens }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageTruncator.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageTruncator.ts
deleted file mode 100644
index 00767b86d..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageTruncator.ts
+++ /dev/null
@@ -1,161 +0,0 @@
-import { approximateTokenSize } from 'tokenx'
-import type { AssistantMessageBlock, Message } from '@shared/chat'
-import type { ChatMessage } from '@shared/presenter'
-import { addContextMessages } from './messageFormatter'
-import { compressToolCallsFromContext } from './messageCompressor'
-
-function calculateToolCallTokens(toolCall: NonNullable<ChatMessage['tool_calls']>[number]): number {
-  const nameTokens = approximateTokenSize(toolCall.function?.name || '')
-  const argumentsTokens = approximateTokenSize(toolCall.function?.arguments || '')
-  return nameTokens + argumentsTokens
-}
-
-function calculateMessageTokens(message: ChatMessage): number {
-  let tokens = 0
-
-  if (typeof message.content === 'string') {
-    tokens += approximateTokenSize(message.content)
-  } else if (Array.isArray(message.content)) {
-    const textContent = message.content.reduce((acc, item) => {
-      if (item.type === 'text' && typeof item.text === 'string') {
-        return acc + item.text
-      }
-      return acc
-    }, '')
-    tokens += approximateTokenSize(textContent)
-  }
-
-  if (message.role === 'assistant' && Array.isArray(message.tool_calls)) {
-    message.tool_calls.forEach((toolCall) => {
-      tokens += calculateToolCallTokens(toolCall)
-    })
-  }
-
-  return tokens
-}
-
-function calculateMessagesTokens(messages: ChatMessage[]): number {
-  return messages.reduce((acc, message) => acc + calculateMessageTokens(message), 0)
-}
-
-function cloneMessageWithContent(message: Message): Message {
-  const cloned: Message = { ...message }
-
-  if (Array.isArray(message.content)) {
-    cloned.content = message.content.map((block) => {
-      const clonedBlock: AssistantMessageBlock = { ...(block as AssistantMessageBlock) }
-      if (block.type === 'tool_call' && block.tool_call) {
-        clonedBlock.tool_call = { ...block.tool_call }
-      }
-      return clonedBlock
-    })
-  } else if (message.content && typeof message.content === 'object') {
-    cloned.content = JSON.parse(JSON.stringify(message.content))
-  } else {
-    cloned.content = message.content
-  }
-
-  return cloned
-}
-
-export function selectContextMessages(
-  contextMessages: Message[],
-  userMessage: Message,
-  remainingContextLength: number,
-  supportsFunctionCall: boolean,
-  vision: boolean
-): Message[] {
-  if (remainingContextLength <= 0) {
-    return []
-  }
-
-  const messages = contextMessages
-    .filter((msg) => msg.id !== userMessage?.id)
-    .map((msg) => cloneMessageWithContent(msg))
-    .reverse()
-  let selectedMessages = messages.filter((msg) => msg.status === 'sent')
-
-  if (selectedMessages.length === 0) {
-    return []
-  }
-
-  let chatMessages = addContextMessages(selectedMessages, vision, supportsFunctionCall)
-  let totalTokens = calculateMessagesTokens(chatMessages)
-  console.log('totalTokens', totalTokens, 'remainingContextLength', remainingContextLength)
-  if (totalTokens > remainingContextLength) {
-    let excessTokens = totalTokens - remainingContextLength
-
-    if (supportsFunctionCall) {
-      const { removedTokens } = compressToolCallsFromContext(
-        selectedMessages,
-        excessTokens,
-        supportsFunctionCall
-      )
-
-      totalTokens = Math.max(0, totalTokens - removedTokens)
-      chatMessages = addContextMessages(selectedMessages, vision, supportsFunctionCall)
-      totalTokens = calculateMessagesTokens(chatMessages)
-    }
-
-    if (totalTokens > remainingContextLength) {
-      excessTokens = totalTokens - remainingContextLength
-      let removedTokens = 0
-
-      while (removedTokens < excessTokens && selectedMessages.length > 0) {
-        const userIndex = selectedMessages.findIndex((msg) => msg.role === 'user')
-        if (userIndex === -1) {
-          break
-        }
-
-        const lastUserIndex = selectedMessages.findLastIndex((msg) => msg.role === 'user')
-        if (userIndex === lastUserIndex) {
-          break
-        }
-
-        const userMsg = selectedMessages[userIndex]
-        const matchingAssistants = selectedMessages
-          .map((msg, idx) => ({ msg, idx }))
-          .filter(({ msg }) => msg.role === 'assistant' && msg.parentId === userMsg.id)
-          .sort((a, b) => a.msg.is_variant - b.msg.is_variant)
-
-        if (matchingAssistants.length === 0) {
-          selectedMessages.splice(userIndex, 1)
-          continue
-        }
-
-        const assistantIndex = matchingAssistants[0].idx
-
-        const startIndex = Math.min(userIndex, assistantIndex)
-        const endIndex = Math.max(userIndex, assistantIndex)
-
-        const pairMessages = selectedMessages.slice(startIndex, endIndex + 1)
-        const pairTokens = calculateMessagesTokens(
-          addContextMessages(pairMessages, vision, supportsFunctionCall)
-        )
-
-        console.log(
-          `PromptBuilder: removing one user/assistant pair from context (${pairTokens} tokens)`
-        )
-
-        selectedMessages.splice(startIndex, endIndex - startIndex + 1)
-        removedTokens += pairTokens
-        totalTokens = Math.max(0, totalTokens - pairTokens)
-      }
-    }
-
-    chatMessages = addContextMessages(selectedMessages, vision, supportsFunctionCall)
-    totalTokens = calculateMessagesTokens(chatMessages)
-  }
-
-  const userIds = new Set(
-    selectedMessages.filter((msg) => msg.role === 'user').map((msg) => msg.id)
-  )
-  selectedMessages = selectedMessages.filter((msg) => {
-    if (msg.role === 'assistant') {
-      return msg.parentId && userIds.has(msg.parentId)
-    }
-    return true
-  })
-
-  return selectedMessages.reverse()
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/skillsPromptBuilder.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/skillsPromptBuilder.ts
deleted file mode 100644
index 0f868c42f..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/skillsPromptBuilder.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import type { AgentPromptRuntimePort } from '../runtimePorts'
-
-/**
- * Build the skills prompt section for the system prompt.
- * Loads active skills content and formats them for injection.
- *
- * @param conversationId - The conversation ID to get active skills for
- * @returns A formatted string containing all active skill contents, or empty string if no skills active
- */
-export async function buildSkillsPrompt(
-  promptRuntime: AgentPromptRuntimePort,
-  conversationId: string
-): Promise<string> {
-  try {
-    if (!promptRuntime.getSkillsEnabled()) {
-      return ''
-    }
-
-    const activeSkills = await promptRuntime.getActiveSkills(conversationId)
-
-    if (activeSkills.length === 0) {
-      return ''
-    }
-
-    const skillContents: string[] = []
-
-    for (const skillName of activeSkills) {
-      const skillContent = await promptRuntime.loadSkillContent(skillName)
-      if (skillContent && skillContent.content) {
-        skillContents.push(`## Skill: ${skillName}\n\n${skillContent.content}`)
-      }
-    }
-
-    if (skillContents.length === 0) {
-      return ''
-    }
-
-    return `# Active Skills\n\nThe following skills are currently active and provide specialized guidance:\n\n${skillContents.join('\n\n---\n\n')}`
-  } catch (error) {
-    console.warn('[SkillsPromptBuilder] Failed to build skills prompt:', error)
-    return ''
-  }
-}
-
-/**
- * Build the skills metadata prompt section for the system prompt.
- * Lists available skills and how to activate them.
- * Delegates to skillPresenter.getMetadataPrompt() to avoid code duplication.
- */
-export async function buildSkillsMetadataPrompt(
-  promptRuntime: AgentPromptRuntimePort
-): Promise<string> {
-  try {
-    if (!promptRuntime.getSkillsEnabled()) {
-      return ''
-    }
-
-    return await promptRuntime.getMetadataPrompt()
-  } catch (error) {
-    console.warn('[SkillsPromptBuilder] Failed to build skills metadata prompt:', error)
-    return ''
-  }
-}
-
-/**
- * Get allowed tools from active skills for a conversation.
- * Used to extend MCP tool filtering based on skill requirements.
- *
- * @param conversationId - The conversation ID
- * @returns Array of allowed tool names from active skills
- */
-export async function getSkillsAllowedTools(
-  promptRuntime: AgentPromptRuntimePort,
-  conversationId: string
-): Promise<string[]> {
-  try {
-    if (!promptRuntime.getSkillsEnabled()) {
-      return []
-    }
-
-    return await promptRuntime.getActiveSkillsAllowedTools(conversationId)
-  } catch (error) {
-    console.warn('[SkillsPromptBuilder] Failed to get skills allowed tools:', error)
-    return []
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/permission/permissionHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/permission/permissionHandler.ts
deleted file mode 100644
index 5fd0ed4b2..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/permission/permissionHandler.ts
+++ /dev/null
@@ -1,1221 +0,0 @@
-import type { AssistantMessage, AssistantMessageBlock } from '@shared/chat'
-import type { MCPToolDefinition, MCPToolResponse } from '@shared/presenter'
-import { buildPostToolExecutionContext, type PendingToolCall } from '../message/messageBuilder'
-import type { GeneratingMessageState } from '../streaming/types'
-import type { StreamGenerationHandler } from '../streaming/streamGenerationHandler'
-import type { LLMEventHandler } from '../streaming/llmEventHandler'
-import { BaseHandler, type ThreadHandlerContext } from '../types/handlerContext'
-import { CommandPermissionService } from '../../permission/commandPermissionService'
-import { eventBus, SendTarget } from '@/eventbus'
-import { STREAM_EVENTS } from '@/events'
-
-// Permission level hierarchy: all > write > read
-// 'command' is a special type that only matches itself
-const PERMISSION_LEVELS: Record<string, number> = {
-  all: 3,
-  write: 2,
-  read: 1,
-  command: 0 // command only matches command (exact match required)
-}
-
-function isPermissionSufficient(granted: string, required: string): boolean {
-  // Special case: command permission only applies to command-type permissions
-  if (granted === 'command' || required === 'command') {
-    return granted === required
-  }
-  return (PERMISSION_LEVELS[granted] || 0) >= (PERMISSION_LEVELS[required] || 0)
-}
-
-function canBatchUpdate(
-  targetPermission: AssistantMessageBlock,
-  grantedPermission: AssistantMessageBlock,
-  grantedPermissionType: string
-): boolean {
-  if (targetPermission.status !== 'pending') return false
-  if (targetPermission.action_type !== 'tool_call_permission') return false
-
-  const targetServerName = targetPermission.extra?.serverName as string
-  const grantedServerName = grantedPermission.extra?.serverName as string
-
-  // Must be same server
-  if (targetServerName !== grantedServerName) return false
-
-  // CRITICAL FIX: Only batch the exact same tool call (same tool_call.id)
-  // This ensures user approval of one tool doesn't auto-approve other tools from the same server
-  if (targetPermission.tool_call?.id !== grantedPermission.tool_call?.id) return false
-
-  // Check permission type hierarchy
-  const targetPermissionType = (targetPermission.extra?.permissionType as string) || 'read'
-  if (!isPermissionSufficient(grantedPermissionType, targetPermissionType)) return false
-
-  // For special permission types, still require exact tool call matching (already checked above)
-  const targetType = targetPermission.extra?.permissionType as string
-  if (
-    targetType === 'command' ||
-    targetServerName === 'agent-filesystem' ||
-    targetServerName === 'deepchat-settings'
-  ) {
-    // Additional safety: these types should never be batched across different tool calls
-    return targetPermission.tool_call?.id === grantedPermission.tool_call?.id
-  }
-
-  return true
-}
-
-export class PermissionHandler extends BaseHandler {
-  private readonly generatingMessages: Map<string, GeneratingMessageState>
-  private readonly streamGenerationHandler: StreamGenerationHandler
-  private readonly llmEventHandler: LLMEventHandler
-  private readonly commandPermissionHandler: CommandPermissionService
-
-  constructor(
-    context: ThreadHandlerContext,
-    options: {
-      generatingMessages: Map<string, GeneratingMessageState>
-      streamGenerationHandler: StreamGenerationHandler
-      llmEventHandler: LLMEventHandler
-      commandPermissionHandler: CommandPermissionService
-    }
-  ) {
-    super(context)
-    this.generatingMessages = options.generatingMessages
-    this.streamGenerationHandler = options.streamGenerationHandler
-    this.llmEventHandler = options.llmEventHandler
-    this.commandPermissionHandler = options.commandPermissionHandler
-    this.assertDependencies()
-  }
-
-  private assertDependencies(): void {
-    void this.generatingMessages
-    void this.streamGenerationHandler
-    void this.llmEventHandler
-    void this.commandPermissionHandler
-  }
-
-  async handlePermissionResponse(
-    messageId: string,
-    toolCallId: string,
-    granted: boolean,
-    permissionType: 'read' | 'write' | 'all' | 'command',
-    remember: boolean = true
-  ): Promise<void> {
-    console.log('[PermissionHandler] Handling permission response', {
-      messageId,
-      toolCallId,
-      granted,
-      permissionType,
-      remember
-    })
-
-    try {
-      const message = await this.ctx.messageManager.getMessage(messageId)
-      if (!message || message.role !== 'assistant') {
-        throw new Error(`Message not found or not assistant message (${messageId})`)
-      }
-
-      const conversationId = message.conversationId
-
-      // Step 1: Update permission blocks status (separate from resume)
-      const { updatedCount, targetPermissionBlock } = await this.updatePermissionBlocks(
-        messageId,
-        toolCallId,
-        granted,
-        permissionType
-      )
-
-      console.log(`[PermissionHandler] Updated ${updatedCount} permission block(s)`)
-
-      // Debug: if updatedCount is 0, print details
-      if (updatedCount === 0) {
-        const content = message.content as AssistantMessageBlock[]
-        const pendingBlocks = content.filter(
-          (b) =>
-            b.type === 'action' &&
-            b.action_type === 'tool_call_permission' &&
-            b.status === 'pending'
-        )
-        console.log(
-          '[PermissionHandler] Debug - All pending permission blocks:',
-          pendingBlocks.map((b) => ({
-            toolCallId: b.tool_call?.id,
-            status: b.status,
-            serverName: b.extra?.serverName
-          }))
-        )
-        console.log('[PermissionHandler] Debug - Looking for toolCallId:', toolCallId)
-      }
-
-      // Step 2: Remove this permission from pending list (only if we actually updated something)
-      if (updatedCount > 0) {
-        this.sessionRuntime.removePendingPermission(conversationId, messageId, toolCallId)
-        this.notifyFrontendPermissionUpdate(conversationId, messageId)
-      } else {
-        console.warn(
-          '[PermissionHandler] No permission blocks were updated, skipping removal from pending list'
-        )
-        // Still need to notify frontend to refresh in case there's a mismatch
-        this.notifyFrontendPermissionUpdate(conversationId, messageId)
-        return
-      }
-
-      // Step 3: Check if this is ACP permission (special handling)
-      if (targetPermissionBlock) {
-        const parsedPermissionRequest = this.parsePermissionRequest(targetPermissionBlock)
-        const isAcpPermission = this.isAcpPermissionBlock(
-          targetPermissionBlock,
-          parsedPermissionRequest
-        )
-
-        if (isAcpPermission) {
-          await this.handleAcpPermissionFlow(
-            messageId,
-            targetPermissionBlock,
-            parsedPermissionRequest,
-            granted
-          )
-          this.sessionRuntime.clearPendingPermission(conversationId)
-          this.sessionRuntime.setStatus(conversationId, 'generating')
-          return
-        }
-      }
-
-      // Step 4: Handle specific permission types (command, agent-filesystem, deepchat-settings)
-      if (targetPermissionBlock && permissionType === 'command') {
-        if (granted) {
-          const command = this.getCommandFromPermissionBlock(targetPermissionBlock)
-          if (!command) {
-            throw new Error(`Unable to extract command from permission block (${messageId})`)
-          }
-          const signature = this.commandPermissionHandler.extractCommandSignature(command)
-          this.commandPermissionHandler.approve(conversationId, signature, remember)
-        }
-        // Continue to check for resume (don't return early)
-      } else if (targetPermissionBlock && granted && permissionType !== 'command') {
-        const serverName = targetPermissionBlock?.extra?.serverName as string
-        if (!serverName) {
-          throw new Error(`Server name not found in permission block (${messageId})`)
-        }
-
-        if (serverName === 'agent-filesystem') {
-          const parsedPermissionRequest = this.parsePermissionRequest(targetPermissionBlock)
-          const paths = this.getStringArrayFromObject(parsedPermissionRequest, 'paths')
-          if (paths.length === 0) {
-            console.warn('[PermissionHandler] Missing filesystem paths in permission request')
-            // Mark as denied and continue
-            await this.updatePermissionBlocks(messageId, toolCallId, false, permissionType)
-          } else {
-            this.permissionRuntime.approveFileAccess?.(conversationId, paths, remember)
-          }
-        } else if (serverName === 'deepchat-settings') {
-          const parsedPermissionRequest = this.parsePermissionRequest(targetPermissionBlock)
-          const toolName =
-            this.getStringFromObject(parsedPermissionRequest, 'toolName') ||
-            this.getStringFromObject(
-              targetPermissionBlock.extra as Record<string, unknown>,
-              'toolName'
-            )
-          if (!toolName) {
-            console.warn('[PermissionHandler] Missing tool name in settings permission request')
-            await this.updatePermissionBlocks(messageId, toolCallId, false, permissionType)
-          } else {
-            this.permissionRuntime.approveSettingsAccess?.(conversationId, toolName, remember)
-          }
-        } else {
-          // MCP server permission
-          try {
-            await this.mcpRuntime.grantPermission(
-              serverName,
-              permissionType,
-              remember,
-              conversationId
-            )
-            await this.waitForMcpServiceReady(serverName)
-          } catch (error) {
-            console.error('[PermissionHandler] Failed to grant MCP permission:', error)
-            throw error
-          }
-        }
-      }
-
-      // Step 5: Check if there are still pending permissions in this message
-      const hasPendingPermissions = await this.hasPendingPermissionsInMessage(messageId)
-      if (hasPendingPermissions) {
-        console.log(
-          '[PermissionHandler] Still has pending permissions, waiting for all to be resolved'
-        )
-        // Notify frontend to refresh permission UI (show next pending permission)
-        this.notifyFrontendPermissionUpdate(conversationId, messageId)
-        return
-      }
-
-      // Step 6: All permissions resolved - try to acquire resume lock and execute
-      const lockAcquired = this.sessionRuntime.acquirePermissionResumeLock(
-        conversationId,
-        messageId
-      )
-      if (!lockAcquired) {
-        console.log('[PermissionHandler] Resume already in progress for this message, skipping')
-        return
-      }
-
-      // Step 7: Resume tool execution (idempotent - only one resume per message)
-      // Resume all resolved tool calls in this message (granted and denied handling)
-      // CRITICAL: Lock is released inside resumeToolExecutionAfterPermissions (success or error)
-      await this.resumeToolExecutionAfterPermissions(messageId, granted)
-    } catch (error) {
-      console.error('[PermissionHandler] Failed to handle permission response:', error)
-
-      // CRITICAL: Ensure lock is released on error (belt-and-suspenders approach)
-      try {
-        const conversationId = await this.getConversationIdFromMessage(messageId)
-        if (conversationId) {
-          this.sessionRuntime.releasePermissionResumeLock(conversationId)
-        }
-      } catch (lockError) {
-        console.warn('[PermissionHandler] Failed to release lock during error handling:', lockError)
-      }
-
-      try {
-        const message = await this.ctx.messageManager.getMessage(messageId)
-        if (message) {
-          await this.ctx.messageManager.handleMessageError(messageId, String(error))
-        }
-      } catch (updateError) {
-        console.error('[PermissionHandler] Failed to update message status:', updateError)
-      }
-
-      throw error
-    }
-  }
-
-  /**
-   * Update permission block(s) status
-   * Returns the number of updated blocks and the target permission block
-   */
-  private async updatePermissionBlocks(
-    messageId: string,
-    toolCallId: string,
-    granted: boolean,
-    permissionType: string
-  ): Promise<{ updatedCount: number; targetPermissionBlock: AssistantMessageBlock | undefined }> {
-    const message = await this.ctx.messageManager.getMessage(messageId)
-    if (!message || message.role !== 'assistant') {
-      throw new Error(`Message not found or not assistant message (${messageId})`)
-    }
-
-    const content = message.content as AssistantMessageBlock[]
-    const targetPermissionBlock = content.find(
-      (block) =>
-        block.type === 'action' &&
-        block.action_type === 'tool_call_permission' &&
-        block.tool_call?.id === toolCallId
-    )
-
-    if (!targetPermissionBlock) {
-      throw new Error(
-        `Permission block not found (messageId: ${messageId}, toolCallId: ${toolCallId})`
-      )
-    }
-
-    let updatedCount = 0
-
-    // Batch update: only update blocks that can be safely batched
-    for (const block of content) {
-      if (canBatchUpdate(block, targetPermissionBlock, permissionType)) {
-        block.status = granted ? 'granted' : 'denied'
-        if (block.extra) {
-          block.extra.needsUserAction = false
-          if (granted) {
-            // Only store valid MCP permission types; 'command' is handled separately
-            if (
-              permissionType === 'read' ||
-              permissionType === 'write' ||
-              permissionType === 'all'
-            ) {
-              block.extra.grantedPermissions = permissionType
-            }
-          }
-        }
-        updatedCount++
-      }
-    }
-
-    // Update generating state snapshot
-    const generatingState = this.generatingMessages.get(messageId)
-    if (generatingState) {
-      for (let i = 0; i < generatingState.message.content.length; i++) {
-        const block = generatingState.message.content[i]
-        if (
-          block.type === 'action' &&
-          block.action_type === 'tool_call_permission' &&
-          block.status === 'pending'
-        ) {
-          // Check if this block was updated in the main content
-          const updatedBlock = content.find(
-            (b) =>
-              b.type === 'action' &&
-              b.action_type === 'tool_call_permission' &&
-              b.tool_call?.id === block.tool_call?.id
-          )
-          if (updatedBlock && updatedBlock.status !== 'pending') {
-            generatingState.message.content[i] = {
-              ...block,
-              status: updatedBlock.status,
-              extra: updatedBlock.extra
-            }
-          }
-        }
-      }
-    }
-
-    await this.ctx.messageManager.editMessage(messageId, JSON.stringify(content))
-
-    return { updatedCount, targetPermissionBlock }
-  }
-
-  /**
-   * Resume stream completion when no tools need to be executed
-   */
-  private async resumeStreamCompletion(conversationId: string, messageId: string): Promise<void> {
-    // Use streamGenerationHandler's startStreamCompletion which handles the full context
-    await this.streamGenerationHandler.startStreamCompletion(conversationId, messageId)
-  }
-
-  /**
-   * Check if there are still pending permissions in the message
-   */
-  private async hasPendingPermissionsInMessage(messageId: string): Promise<boolean> {
-    const message = await this.ctx.messageManager.getMessage(messageId)
-    if (!message || message.role !== 'assistant') {
-      return false
-    }
-
-    const content = message.content as AssistantMessageBlock[]
-    return content.some(
-      (block) =>
-        block.type === 'action' &&
-        block.action_type === 'tool_call_permission' &&
-        block.status === 'pending'
-    )
-  }
-
-  /**
-   * Get conversation ID from message ID
-   */
-  private async getConversationIdFromMessage(messageId: string): Promise<string | null> {
-    const message = await this.ctx.messageManager.getMessage(messageId)
-    if (!message) {
-      return null
-    }
-    return message.conversationId
-  }
-
-  /**
-   * Resume tool execution after permission is granted
-   * CRITICAL SECTION: Lock is held throughout the entire resume flow
-   * - Early-exit checks prevent stale execution
-   * - Synchronous flush before executing tools
-   * - Lock released only at single exit point
-   * - All tools executed atomically (no lock release between tools)
-   */
-  private async resumeToolExecutionAfterPermissions(
-    messageId: string,
-    _lastGranted: boolean,
-    grantedToolCallId?: string
-  ): Promise<void> {
-    console.log(
-      '[PermissionHandler] Resuming tool execution after permissions',
-      messageId,
-      'grantedToolCallId:',
-      grantedToolCallId
-    )
-
-    const conversationId = await this.getConversationIdFromMessage(messageId)
-    if (!conversationId) {
-      throw new Error(`Message not found (${messageId})`)
-    }
-
-    // CRITICAL SECTION: Lock must be held throughout this entire method
-    // Early-exit checks: Validate session state before proceeding
-    const session = this.sessionRuntime.getSessionSync(conversationId)
-    if (!session) {
-      console.warn('[PermissionHandler] Session not found, skipping resume:', conversationId)
-      this.sessionRuntime.releasePermissionResumeLock(conversationId)
-      return
-    }
-
-    // Verify the lock is still valid (same message)
-    const currentLock = this.sessionRuntime.getPermissionResumeLock(conversationId)
-    if (!currentLock || currentLock.messageId !== messageId) {
-      console.warn(
-        '[PermissionHandler] Lock mismatch or expired, skipping resume. Expected:',
-        messageId,
-        'Got:',
-        currentLock?.messageId
-      )
-      // CRITICAL: Always release lock if we don't proceed - it was acquired in handlePermissionResponse
-      if (currentLock) {
-        this.sessionRuntime.releasePermissionResumeLock(conversationId)
-      }
-      return
-    }
-
-    // Ensure status is appropriate for tool execution
-    // Transition from waiting_permission to generating since we're resuming
-    const currentStatus = this.sessionRuntime.getStatus(conversationId)
-    if (currentStatus === 'waiting_permission') {
-      console.log('[PermissionHandler] Transitioning session from waiting_permission to generating')
-      this.sessionRuntime.setStatus(conversationId, 'generating')
-    } else if (
-      currentStatus === 'idle' &&
-      this.sessionRuntime.hasPendingPermissions(conversationId, messageId)
-    ) {
-      console.warn(
-        '[PermissionHandler] Session was idle during permission resume, forcing generating status'
-      )
-      this.sessionRuntime.setStatus(conversationId, 'generating')
-    } else if (currentStatus !== 'generating') {
-      console.warn(
-        '[PermissionHandler] Session status not suitable for resume. Status:',
-        currentStatus
-      )
-      this.sessionRuntime.releasePermissionResumeLock(conversationId)
-      return
-    }
-
-    try {
-      // Step 1: Start the agent loop with pending permissions preservation
-      // skipLockAcquisition: PermissionHandler already holds the lock
-      await this.sessionRuntime.startLoop(conversationId, messageId, {
-        preservePendingPermissions: true,
-        skipLockAcquisition: true
-      })
-
-      // Step 2: Re-fetch message to get updated permission block statuses
-      const updatedMessage = await this.ctx.messageManager.getMessage(messageId)
-      if (!updatedMessage) {
-        throw new Error(`Message not found after permission update (${messageId})`)
-      }
-
-      // Step 3: Get tool calls to execute
-      const toolCallsToExecute = this.getToolCallsToExecute(
-        updatedMessage.content as AssistantMessageBlock[],
-        grantedToolCallId
-      )
-
-      if (toolCallsToExecute.length === 0) {
-        console.log(
-          '[PermissionHandler] No tool calls to execute, continuing with stream completion'
-        )
-        await this.resumeStreamCompletion(conversationId, messageId)
-        // SINGLE EXIT POINT: Release lock
-        this.sessionRuntime.releasePermissionResumeLock(conversationId)
-        return
-      }
-
-      // Step 4: Set up generating state
-      let state = this.generatingMessages.get(messageId)
-      if (!state) {
-        state = {
-          message: updatedMessage as AssistantMessage,
-          conversationId,
-          startTime: Date.now(),
-          firstTokenTime: null,
-          promptTokens: 0,
-          reasoningStartTime: null,
-          reasoningEndTime: null,
-          lastReasoningTime: null
-        }
-        this.generatingMessages.set(messageId, state)
-      } else {
-        // CRITICAL FIX: Sync state.message.content with database to ensure tool_call blocks
-        // created by the frontend are available for processToolCallEnd to update
-        state.message.content = (updatedMessage as AssistantMessage).content
-      }
-
-      // Step 5: SYNCHRONOUS FLUSH before executing tools
-      // This ensures all pending UI updates are persisted to DB before tool execution
-      await this.llmEventHandler.flushStreamUpdates(messageId)
-
-      // Step 6: Execute tools sequentially (lock held throughout - NO RELEASE BETWEEN TOOLS)
-      let hasNewPermissionRequest = false
-      for (const toolCall of toolCallsToExecute) {
-        const canContinue = await this.executeSingleToolCall(state, toolCall, conversationId)
-
-        if (!canContinue) {
-          // Permission required again - but we keep the lock until end of critical section
-          hasNewPermissionRequest = true
-          break
-        }
-      }
-
-      // Ensure tool_call end/error updates are persisted before rebuilding next-turn context.
-      await this.llmEventHandler.flushStreamUpdates(messageId)
-
-      // Step 7: Check if there are still pending permissions
-      const stillHasPending = await this.hasPendingPermissionsInMessage(messageId)
-      if (stillHasPending || hasNewPermissionRequest) {
-        console.log(
-          '[PermissionHandler] Tool(s) executed but more permissions pending, releasing lock and waiting'
-        )
-        // SINGLE EXIT POINT: Release lock
-        this.sessionRuntime.releasePermissionResumeLock(conversationId)
-        this.notifyFrontendPermissionUpdate(conversationId, messageId)
-        return
-      }
-
-      // Step 8: All permissions resolved, continue with stream completion
-      await this.continueAfterToolsExecuted(state, conversationId, messageId)
-      // SINGLE EXIT POINT: Release lock after successful completion
-      this.sessionRuntime.releasePermissionResumeLock(conversationId)
-    } catch (error) {
-      console.error('[PermissionHandler] Failed to resume tool execution:', error)
-      this.generatingMessages.delete(messageId)
-
-      try {
-        const message = await this.ctx.messageManager.getMessage(messageId)
-        if (message) {
-          await this.ctx.messageManager.handleMessageError(messageId, String(error))
-        }
-      } catch (updateError) {
-        console.error('[PermissionHandler] Failed to update message error status:', updateError)
-      }
-
-      // SINGLE EXIT POINT: Ensure lock is released on error
-      this.sessionRuntime.releasePermissionResumeLock(conversationId)
-      throw error
-    }
-  }
-
-  /**
-   * Get tool calls that should be executed
-   * If specificToolCallId is provided, only returns that specific tool call
-   * Otherwise returns all granted tool calls
-   */
-  private getToolCallsToExecute(
-    content: AssistantMessageBlock[],
-    specificToolCallId?: string
-  ): PendingToolCall[] {
-    const toolCalls: PendingToolCall[] = []
-
-    for (const block of content) {
-      if (block.type !== 'tool_call' || !block.tool_call) continue
-
-      const toolCallId = block.tool_call.id
-      if (!toolCallId) continue
-      // Only resume unfinished tool calls.
-      // Completed blocks (success/error) are historical records and must not be re-executed.
-      if (block.status !== 'loading') continue
-
-      // If specific tool call ID is specified, only process that one
-      if (specificToolCallId && toolCallId !== specificToolCallId) {
-        continue
-      }
-
-      // Find the associated permission block
-      const permissionBlock = content.find(
-        (b) =>
-          b.type === 'action' &&
-          b.action_type === 'tool_call_permission' &&
-          b.tool_call?.id === toolCallId
-      )
-
-      // If there's a permission block, check its status
-      if (permissionBlock) {
-        if (permissionBlock.status === 'granted') {
-          const pendingCall = this.buildPendingToolCallFromBlock(block)
-          if (pendingCall) toolCalls.push(pendingCall)
-        } else if (permissionBlock.status === 'denied') {
-          // Denied - will generate error response later
-          const pendingCall = this.buildPendingToolCallFromBlock(block)
-          if (pendingCall) {
-            toolCalls.push({ ...pendingCall, denied: true } as PendingToolCall)
-          }
-        }
-        // If pending, skip (should not happen after permission resolution)
-      } else {
-        // No permission block needed - execute directly
-        const pendingCall = this.buildPendingToolCallFromBlock(block)
-        if (pendingCall) toolCalls.push(pendingCall)
-      }
-    }
-
-    console.log(
-      `[PermissionHandler] Found ${toolCalls.length} tool calls to execute` +
-        (specificToolCallId ? ` (specific: ${specificToolCallId})` : ' (all granted)')
-    )
-    return toolCalls
-  }
-
-  private buildPendingToolCallFromBlock(block: AssistantMessageBlock): PendingToolCall | undefined {
-    if (!block.tool_call) return undefined
-
-    const { id, name, params } = block.tool_call
-    if (!id || !name) {
-      console.warn('[PermissionHandler] Incomplete tool call info:', block.tool_call)
-      return undefined
-    }
-
-    return {
-      id,
-      name,
-      params: params || '{}',
-      serverName: block.tool_call.server_name,
-      serverIcons: block.tool_call.server_icons,
-      serverDescription: block.tool_call.server_description
-    }
-  }
-
-  /**
-   * Execute a single tool call
-   * Returns false if permission is required again
-   */
-  private async executeSingleToolCall(
-    state: GeneratingMessageState,
-    toolCall: PendingToolCall,
-    conversationId: string
-  ): Promise<boolean> {
-    // Check if this tool was denied
-    const message = await this.ctx.messageManager.getMessage(state.message.id)
-    if (!message) {
-      console.warn(
-        '[PermissionHandler] Message not found while executing tool call, aborting execution:',
-        state.message.id
-      )
-      return false
-    }
-    const content = message.content as AssistantMessageBlock[]
-    const permissionBlock = content.find(
-      (b) =>
-        b.type === 'action' &&
-        b.action_type === 'tool_call_permission' &&
-        b.tool_call?.id === toolCall.id
-    )
-
-    if (permissionBlock?.status === 'denied') {
-      // Generate error response for denied tool
-      await this.llmEventHandler.handleLLMAgentResponse({
-        eventId: state.message.id,
-        tool_call: 'error',
-        tool_call_id: toolCall.id,
-        tool_call_name: toolCall.name,
-        tool_call_params: toolCall.params,
-        tool_call_response: 'User denied the request.',
-        tool_call_server_name: toolCall.serverName,
-        tool_call_server_icons: toolCall.serverIcons,
-        tool_call_server_description: toolCall.serverDescription
-      } as any)
-      return true
-    }
-
-    // Normal tool execution
-    try {
-      const { conversation } = await this.streamGenerationHandler.prepareConversationContext(
-        conversationId,
-        state.message.id
-      )
-
-      let toolDef: MCPToolDefinition | undefined
-      try {
-        const { chatMode, agentWorkspacePath } = await this.sessionRuntime.resolveWorkspaceContext(
-          conversationId,
-          conversation.settings.modelId
-        )
-        const toolDefinitions = await this.toolPresenter.getAllToolDefinitions({
-          enabledMcpTools: conversation.settings.enabledMcpTools,
-          chatMode,
-          supportsVision: false,
-          agentWorkspacePath,
-          conversationId
-        })
-        toolDef = toolDefinitions.find((definition) => {
-          if (definition.function.name !== toolCall.name) return false
-          if (toolCall.serverName) {
-            return definition.server.name === toolCall.serverName
-          }
-          return true
-        })
-      } catch (error) {
-        console.error('[PermissionHandler] Failed to load tool definitions:', error)
-      }
-
-      if (!toolDef) {
-        console.warn('[PermissionHandler] Tool definition not found:', toolCall.name)
-        return true // Continue with next tool
-      }
-
-      const resolvedServer = toolDef.server
-
-      // Emit running state
-      await this.llmEventHandler.handleLLMAgentResponse({
-        eventId: state.message.id,
-        tool_call: 'running',
-        tool_call_id: toolCall.id,
-        tool_call_name: toolCall.name,
-        tool_call_params: toolCall.params,
-        tool_call_server_name: resolvedServer?.name || toolCall.serverName,
-        tool_call_server_icons: resolvedServer?.icons || toolCall.serverIcons,
-        tool_call_server_description: resolvedServer?.description || toolCall.serverDescription
-      } as any)
-
-      // Execute tool
-      let toolContent = ''
-      let toolRawData: MCPToolResponse | null = null
-      try {
-        const toolCallResult = await this.toolPresenter.callTool({
-          id: toolCall.id,
-          type: 'function',
-          function: {
-            name: toolCall.name,
-            arguments: toolCall.params
-          },
-          server: resolvedServer,
-          conversationId
-        })
-        toolContent =
-          typeof toolCallResult.content === 'string'
-            ? toolCallResult.content
-            : JSON.stringify(toolCallResult.content)
-        toolRawData = toolCallResult.rawData
-      } catch (toolError) {
-        console.error('[PermissionHandler] Failed to execute tool:', toolError)
-        await this.llmEventHandler.handleLLMAgentResponse({
-          eventId: state.message.id,
-          tool_call: 'error',
-          tool_call_id: toolCall.id,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.params,
-          tool_call_response: toolError instanceof Error ? toolError.message : String(toolError),
-          tool_call_server_name: resolvedServer?.name || toolCall.serverName,
-          tool_call_server_icons: resolvedServer?.icons || toolCall.serverIcons,
-          tool_call_server_description: resolvedServer?.description || toolCall.serverDescription
-        } as any)
-        return true // Continue with next tool
-      }
-
-      // Check if permission is required again
-      if (toolRawData?.requiresPermission) {
-        // Add this permission to pending list and set session status
-        this.sessionRuntime.addPendingPermission(conversationId, {
-          messageId: state.message.id,
-          toolCallId: toolCall.id,
-          permissionType:
-            (toolRawData.permissionRequest?.permissionType as
-              | 'read'
-              | 'write'
-              | 'all'
-              | 'command') || 'read',
-          payload: toolRawData.permissionRequest ?? {}
-        })
-        this.sessionRuntime.setStatus(conversationId, 'waiting_permission')
-
-        await this.llmEventHandler.handleLLMAgentResponse({
-          eventId: state.message.id,
-          tool_call: 'permission-required',
-          tool_call_id: toolCall.id,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.params,
-          tool_call_server_name:
-            toolRawData.permissionRequest?.serverName ||
-            resolvedServer?.name ||
-            toolCall.serverName,
-          tool_call_server_icons: resolvedServer?.icons || toolCall.serverIcons,
-          tool_call_server_description: resolvedServer?.description || toolCall.serverDescription,
-          tool_call_response: toolContent,
-          permission_request: toolRawData.permissionRequest
-        } as any)
-        return false // Stop execution, permission required
-      }
-
-      // Tool completed successfully
-      await this.llmEventHandler.handleLLMAgentResponse({
-        eventId: state.message.id,
-        tool_call: 'end',
-        tool_call_id: toolCall.id,
-        tool_call_name: toolCall.name,
-        tool_call_params: toolCall.params,
-        tool_call_response: toolContent,
-        tool_call_server_name: resolvedServer?.name || toolCall.serverName,
-        tool_call_server_icons: resolvedServer?.icons || toolCall.serverIcons,
-        tool_call_server_description: resolvedServer?.description || toolCall.serverDescription,
-        tool_call_response_raw: toolRawData ?? undefined
-      } as any)
-
-      return true
-    } catch (error) {
-      console.error('[PermissionHandler] Error executing single tool call:', error)
-      return true // Continue with next tool
-    }
-  }
-
-  /**
-   * Continue with model generation after all tools are executed
-   */
-  private async continueAfterToolsExecuted(
-    _state: GeneratingMessageState,
-    conversationId: string,
-    messageId: string
-  ): Promise<void> {
-    // Simplified: use streamGenerationHandler which handles full context
-    await this.streamGenerationHandler.startStreamCompletion(conversationId, messageId)
-  }
-
-  /**
-   * Restart agent loop after permission is granted
-   * UNIFIED FLOW: Uses resumeToolExecutionAfterPermissions for all cases
-   */
-  async restartAgentLoopAfterPermission(messageId: string, toolCallId?: string): Promise<void> {
-    console.log('[PermissionHandler] Restarting agent loop after permission', messageId)
-
-    try {
-      const message = await this.ctx.messageManager.getMessage(messageId)
-      if (!message) {
-        throw new Error(`Message not found (${messageId})`)
-      }
-
-      // const conversationId = message.conversationId
-
-      // Check server permissions for logging/debugging
-      const content = message.content as AssistantMessageBlock[]
-      const permissionBlock = content.find(
-        (block) =>
-          block.type === 'action' &&
-          block.action_type === 'tool_call_permission' &&
-          block.tool_call?.id === toolCallId
-      )
-
-      if (permissionBlock?.extra?.serverName) {
-        try {
-          const servers = await this.ctx.configPresenter.getMcpServers()
-          const serverConfig = servers[permissionBlock.extra.serverName as string]
-          console.log('[PermissionHandler] Server permissions:', serverConfig?.autoApprove || [])
-        } catch (configError) {
-          console.warn('[PermissionHandler] Failed to verify server permissions:', configError)
-        }
-      }
-
-      if (!permissionBlock) {
-        console.warn('[PermissionHandler] Granted permission block missing; continuing', messageId)
-      }
-
-      // UNIFIED FLOW: Use resumeToolExecutionAfterPermissions for all cases
-      // This method handles:
-      // 1. Setting up the generating state
-      // 2. Finding and executing all granted tool calls
-      // 3. Continuing with stream completion
-      await this.resumeToolExecutionAfterPermissions(messageId, true)
-    } catch (error) {
-      console.error('[PermissionHandler] Failed to restart agent loop:', error)
-      this.generatingMessages.delete(messageId)
-
-      try {
-        await this.ctx.messageManager.handleMessageError(messageId, String(error))
-      } catch (updateError) {
-        console.error('[PermissionHandler] Failed to update message error status:', updateError)
-      }
-
-      throw error
-    }
-  }
-
-  async continueAfterPermissionDenied(
-    messageId: string,
-    resolvedPermissionBlock?: AssistantMessageBlock
-  ): Promise<void> {
-    console.log('[PermissionHandler] Continuing after permission denied', messageId)
-
-    try {
-      const message = await this.ctx.messageManager.getMessage(messageId)
-      if (!message || message.role !== 'assistant') {
-        throw new Error(`Message not found or not assistant (${messageId})`)
-      }
-
-      const conversationId = message.conversationId
-      // Permission denied flow: skip lock acquisition (not part of permission resume critical section)
-      await this.sessionRuntime.startLoop(conversationId, messageId, {
-        preservePendingPermissions: true,
-        skipLockAcquisition: true
-      })
-      const content = message.content as AssistantMessageBlock[]
-      const deniedPermissionBlock =
-        resolvedPermissionBlock ||
-        content.find(
-          (block) =>
-            block.type === 'action' &&
-            block.action_type === 'tool_call_permission' &&
-            block.status === 'denied'
-        )
-
-      if (!deniedPermissionBlock?.tool_call) {
-        console.warn('[PermissionHandler] No denied permission block for', messageId)
-        return
-      }
-
-      const toolCall = deniedPermissionBlock.tool_call
-      const errorMessage = 'User denied the request.'
-
-      let state = this.generatingMessages.get(messageId)
-      if (!state) {
-        state = {
-          message: message as AssistantMessage,
-          conversationId,
-          startTime: Date.now(),
-          firstTokenTime: null,
-          promptTokens: 0,
-          reasoningStartTime: null,
-          reasoningEndTime: null,
-          lastReasoningTime: null
-        }
-        this.generatingMessages.set(messageId, state)
-      }
-
-      state.pendingToolCall = undefined
-
-      await this.llmEventHandler.handleLLMAgentResponse({
-        eventId: messageId,
-        tool_call: 'error',
-        tool_call_id: toolCall.id,
-        tool_call_name: toolCall.name,
-        tool_call_params: toolCall.params,
-        tool_call_response: errorMessage,
-        tool_call_server_name: toolCall.server_name,
-        tool_call_server_icons: toolCall.server_icons,
-        tool_call_server_description: toolCall.server_description
-      } as any)
-
-      const { conversation, contextMessages, userMessage } =
-        await this.streamGenerationHandler.prepareConversationContext(conversationId, messageId)
-
-      const {
-        providerId,
-        modelId,
-        temperature,
-        maxTokens,
-        enabledMcpTools,
-        thinkingBudget,
-        reasoningEffort,
-        verbosity
-      } = conversation.settings
-
-      const modelConfig = this.ctx.configPresenter.getModelConfig(modelId, providerId)
-      const completedToolCall = {
-        id: toolCall.id || '',
-        name: toolCall.name || '',
-        params: toolCall.params || '',
-        response: errorMessage,
-        serverName: toolCall.server_name,
-        serverIcons: toolCall.server_icons,
-        serverDescription: toolCall.server_description
-      }
-
-      const finalContent = await buildPostToolExecutionContext({
-        conversation,
-        contextMessages,
-        userMessage,
-        currentAssistantMessage: state.message,
-        completedToolCall,
-        modelConfig
-      })
-
-      const stream = this.llmProviderPresenter.startStreamCompletion(
-        providerId,
-        finalContent,
-        modelId,
-        messageId,
-        temperature,
-        maxTokens,
-        enabledMcpTools,
-        thinkingBudget,
-        reasoningEffort,
-        verbosity,
-        conversation.id
-      )
-
-      for await (const event of stream) {
-        const msg = event.data
-        if (event.type === 'response') {
-          await this.llmEventHandler.handleLLMAgentResponse(msg)
-        } else if (event.type === 'error') {
-          await this.llmEventHandler.handleLLMAgentError(msg)
-        } else if (event.type === 'end') {
-          await this.llmEventHandler.handleLLMAgentEnd(msg)
-        }
-      }
-    } catch (error) {
-      console.error('[PermissionHandler] Failed to continue after permission denied:', error)
-      this.generatingMessages.delete(messageId)
-
-      try {
-        await this.ctx.messageManager.handleMessageError(messageId, String(error))
-      } catch (updateError) {
-        console.error('[PermissionHandler] Failed to update message error status:', updateError)
-      }
-
-      throw error
-    }
-  }
-
-  async waitForMcpServiceReady(serverName: string, maxWaitTime: number = 3000): Promise<void> {
-    const startTime = Date.now()
-    const checkInterval = 100
-
-    return new Promise((resolve) => {
-      const checkReady = async () => {
-        try {
-          const isRunning = await this.mcpRuntime.isServerRunning(serverName)
-          if (isRunning) {
-            setTimeout(() => resolve(), 200)
-            return
-          }
-
-          if (Date.now() - startTime > maxWaitTime) {
-            console.warn('[PermissionHandler] Timeout waiting for MCP service', serverName)
-            resolve()
-            return
-          }
-
-          setTimeout(checkReady, checkInterval)
-        } catch (error) {
-          console.error('[PermissionHandler] Error checking MCP service status:', error)
-          resolve()
-        }
-      }
-
-      checkReady()
-    })
-  }
-
-  private parsePermissionRequest(block: AssistantMessageBlock): Record<string, unknown> | null {
-    const raw = this.getExtraString(block, 'permissionRequest')
-    if (!raw) {
-      return null
-    }
-    try {
-      return JSON.parse(raw) as Record<string, unknown>
-    } catch (error) {
-      console.warn('[PermissionHandler] Failed to parse permissionRequest payload:', error)
-      return null
-    }
-  }
-
-  private isAcpPermissionBlock(
-    block: AssistantMessageBlock,
-    permissionRequest: Record<string, unknown> | null
-  ): boolean {
-    const providerIdFromExtra = this.getExtraString(block, 'providerId')
-    const providerIdFromPayload = this.getStringFromObject(permissionRequest, 'providerId')
-    return providerIdFromExtra === 'acp' || providerIdFromPayload === 'acp'
-  }
-
-  private async handleAcpPermissionFlow(
-    messageId: string,
-    block: AssistantMessageBlock,
-    permissionRequest: Record<string, unknown> | null,
-    granted: boolean
-  ): Promise<void> {
-    const requestId =
-      this.getExtraString(block, 'permissionRequestId') ||
-      this.getStringFromObject(permissionRequest, 'requestId')
-
-    if (!requestId) {
-      throw new Error(`Missing ACP permission request identifier for message ${messageId}`)
-    }
-
-    await this.ctx.llmProviderPresenter.resolveAgentPermission(requestId, granted)
-  }
-
-  private getExtraString(block: AssistantMessageBlock, key: string): string | undefined {
-    const extraValue = block.extra?.[key]
-    return typeof extraValue === 'string' ? extraValue : undefined
-  }
-
-  private getStringFromObject(
-    source: Record<string, unknown> | null,
-    key: string
-  ): string | undefined {
-    if (!source) {
-      return undefined
-    }
-    const value = source[key]
-    return typeof value === 'string' ? value : undefined
-  }
-
-  private getStringArrayFromObject(source: Record<string, unknown> | null, key: string): string[] {
-    if (!source) return []
-    const value = source[key]
-    if (!Array.isArray(value)) return []
-    return value.filter(
-      (entry): entry is string => typeof entry === 'string' && entry.trim().length > 0
-    )
-  }
-
-  private getCommandFromPermissionBlock(block: AssistantMessageBlock): string | undefined {
-    const extraCommandInfo = this.getExtraString(block, 'commandInfo')
-    if (extraCommandInfo) {
-      try {
-        const parsed = JSON.parse(extraCommandInfo) as { command?: string }
-        if (parsed?.command) {
-          return parsed.command
-        }
-      } catch (error) {
-        console.warn('[PermissionHandler] Failed to parse commandInfo:', error)
-      }
-    }
-
-    const permissionRequest = this.parsePermissionRequest(block)
-    const commandFromRequest = this.getStringFromObject(permissionRequest, 'command')
-    if (commandFromRequest) {
-      return commandFromRequest
-    }
-
-    const commandInfoFromRequest = permissionRequest?.commandInfo
-    if (commandInfoFromRequest && typeof commandInfoFromRequest === 'object') {
-      const commandValue = (commandInfoFromRequest as { command?: unknown }).command
-      if (typeof commandValue === 'string') {
-        return commandValue
-      }
-    }
-
-    const params = block.tool_call?.params
-    if (typeof params === 'string' && params.trim()) {
-      try {
-        const parsed = JSON.parse(params) as { command?: string }
-        if (typeof parsed.command === 'string') {
-          return parsed.command
-        }
-      } catch {
-        // Ignore parse errors; fall through to return undefined.
-      }
-    }
-
-    console.warn('[PermissionHandler] No command found in permission block')
-    return undefined
-  }
-
-  /**
-   * Notify frontend to refresh permission UI
-   * Called when a permission is processed and there may be more pending permissions
-   */
-  private notifyFrontendPermissionUpdate(conversationId: string, messageId: string): void {
-    try {
-      const pendingPermissions = this.sessionRuntime.getPendingPermissions(conversationId) ?? []
-      const nextPermission = pendingPermissions[0]
-      console.log('[PermissionHandler] Notifying frontend of permission update:', {
-        conversationId,
-        messageId,
-        remainingCount: pendingPermissions.length,
-        nextToolCallId: nextPermission?.toolCallId
-      })
-      // Always notify so renderer can clear stale permission UI when count becomes zero.
-      eventBus.sendToRenderer(STREAM_EVENTS.PERMISSION_UPDATED, SendTarget.ALL_WINDOWS, {
-        conversationId,
-        messageId,
-        type: 'permission_update',
-        pendingCount: pendingPermissions.length,
-        nextPermission
-      })
-    } catch (error) {
-      console.error('[PermissionHandler] Failed to notify frontend:', error)
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/persistence/index.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/persistence/index.ts
deleted file mode 100644
index 336ce12bb..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/persistence/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export {}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/runtimePorts.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/runtimePorts.ts
deleted file mode 100644
index f10baf47d..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/runtimePorts.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import type {
-  IFilePresenter,
-  ILlmProviderPresenter,
-  IMCPPresenter,
-  IWindowPresenter,
-  IYoBrowserPresenter
-} from '@shared/presenter'
-import type { ISkillPresenter, SkillContent } from '@shared/types/skill'
-
-export interface AgentMcpRuntimePort {
-  callTool: IMCPPresenter['callTool']
-  grantPermission: IMCPPresenter['grantPermission']
-  isServerRunning: IMCPPresenter['isServerRunning']
-}
-
-export interface AgentPromptRuntimePort {
-  getInputChatMode(): Promise<string | undefined>
-  getSkillsEnabled(): boolean
-  getActiveSkills(conversationId: string): Promise<string[]>
-  loadSkillContent(name: string): Promise<SkillContent | null>
-  getMetadataPrompt(): Promise<string>
-  getActiveSkillsAllowedTools(conversationId: string): Promise<string[]>
-}
-
-export interface AgentPermissionRuntimePort {
-  approveFileAccess?(conversationId: string, paths: string[], remember: boolean): void
-  getApprovedFilePaths?(conversationId: string): string[]
-  approveSettingsAccess?(conversationId: string, toolName: string, remember: boolean): void
-  consumeSettingsApproval?(conversationId: string, toolName: string): boolean
-}
-
-export interface AgentToolRuntimePort {
-  resolveConversationWorkdir(conversationId: string): Promise<string | null>
-  getSkillPresenter(): ISkillPresenter
-  getYoBrowserToolHandler(): IYoBrowserPresenter['toolHandler']
-  getFilePresenter(): Pick<IFilePresenter, 'getMimeType' | 'prepareFileCompletely'>
-  getLlmProviderPresenter(): Pick<ILlmProviderPresenter, 'generateCompletionStandalone'>
-  createSettingsWindow(): ReturnType<IWindowPresenter['createSettingsWindow']>
-  sendToWindow(
-    windowId: number,
-    channel: string,
-    ...args: unknown[]
-  ): ReturnType<IWindowPresenter['sendToWindow']>
-  getApprovedFilePaths?(conversationId: string): string[]
-  consumeSettingsApproval?(conversationId: string, toolName: string): boolean
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionContext.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionContext.ts
deleted file mode 100644
index 86f3e009a..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionContext.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-export type SessionStatus =
-  | 'idle'
-  | 'generating'
-  | 'paused'
-  | 'waiting_permission'
-  | 'waiting_question'
-  | 'error'
-
-export type SessionContextResolved = {
-  chatMode: 'agent' | 'acp agent'
-  providerId: string
-  modelId: string
-  supportsVision: boolean
-  supportsFunctionCall: boolean
-  agentWorkspacePath: string | null
-  enabledMcpTools?: string[]
-  acpWorkdirMap?: Record<string, string | null>
-}
-
-export type PendingPermission = {
-  messageId: string
-  toolCallId: string
-  permissionType: 'read' | 'write' | 'all' | 'command'
-  payload: unknown
-}
-
-export type PermissionResumeLock = {
-  messageId: string
-  startedAt: number
-}
-
-export type SessionContext = {
-  sessionId: string
-  agentId: string
-  status: SessionStatus
-  createdAt: number
-  updatedAt: number
-  resolved: SessionContextResolved
-  runtime?: {
-    loopId?: string
-    currentMessageId?: string
-    toolCallCount: number
-    userStopRequested: boolean
-    pendingPermission?: PendingPermission
-    pendingPermissions?: PendingPermission[]
-    permissionResumeLock?: PermissionResumeLock
-    pendingQuestion?: {
-      messageId: string
-      toolCallId: string
-    }
-    pendingQuestionInitialized?: boolean
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionManager.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionManager.ts
deleted file mode 100644
index 6b571d758..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionManager.ts
+++ /dev/null
@@ -1,438 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { app } from 'electron'
-import type { IConfigPresenter, ISessionPresenter } from '@shared/presenter'
-import type { AssistantMessageBlock } from '@shared/chat'
-import type {
-  PendingPermission,
-  SessionContext,
-  SessionContextResolved,
-  SessionStatus
-} from './sessionContext'
-import { resolveSessionContext, type ChatMode } from './sessionResolver'
-
-type WorkspaceContext = {
-  chatMode: ChatMode
-  agentWorkspacePath: string | null
-}
-
-interface SessionManagerOptions {
-  configPresenter: IConfigPresenter
-  sessionPresenter: ISessionPresenter
-}
-
-export class SessionManager {
-  private readonly sessions = new Map<string, SessionContext>()
-  private readonly options: SessionManagerOptions
-
-  constructor(options: SessionManagerOptions) {
-    this.options = options
-  }
-
-  /**
-   * Sessions are keyed by agentId (conversationId in agent/chat flows).
-   * ACP sessions use AcpSessionManager with separate ACP session IDs.
-   */
-  getSessionSync(agentId: string): SessionContext | null {
-    return this.sessions.get(agentId) ?? null
-  }
-
-  /** Resolves (or creates) the session keyed by agentId/conversationId. */
-  async getSession(agentId: string): Promise<SessionContext> {
-    const existing = this.sessions.get(agentId)
-    const resolved = await this.resolveSession(agentId)
-    const now = Date.now()
-
-    if (existing) {
-      existing.resolved = resolved
-      existing.updatedAt = now
-      this.ensureRuntime(existing)
-      await this.hydratePendingQuestion(existing)
-      return existing
-    }
-
-    const session: SessionContext = {
-      sessionId: agentId,
-      agentId,
-      status: 'idle',
-      createdAt: now,
-      updatedAt: now,
-      resolved,
-      runtime: {
-        toolCallCount: 0,
-        userStopRequested: false
-      }
-    }
-    this.sessions.set(agentId, session)
-    await this.hydratePendingQuestion(session)
-    return session
-  }
-
-  async resolveSession(agentId: string): Promise<SessionContextResolved> {
-    const conversation = await this.options.sessionPresenter.getConversation(agentId)
-    const rawFallback = this.options.configPresenter.getSetting('input_chatMode') as
-      | string
-      | undefined
-    const modelConfig = this.options.configPresenter.getModelDefaultConfig(
-      conversation.settings.modelId,
-      conversation.settings.providerId
-    )
-
-    const resolved = resolveSessionContext({
-      settings: conversation.settings,
-      fallbackChatMode: rawFallback === 'acp agent' ? 'acp agent' : undefined,
-      modelConfig
-    })
-
-    if (resolved.needsMigration) {
-      try {
-        await this.options.sessionPresenter.updateConversationSettings(agentId, {
-          chatMode: 'agent'
-        })
-      } catch (error) {
-        console.warn('[SessionManager] Failed to migrate legacy chatMode:', error)
-      }
-    }
-
-    if (rawFallback === 'chat') {
-      try {
-        await this.options.configPresenter.setSetting('input_chatMode', 'agent')
-      } catch (error) {
-        console.warn('[SessionManager] Failed to migrate legacy input_chatMode:', error)
-      }
-    }
-
-    if (resolved.chatMode === 'agent') {
-      resolved.agentWorkspacePath = await this.resolveAgentWorkspacePath(
-        agentId,
-        conversation.settings.agentWorkspacePath ?? null
-      )
-    } else if (resolved.chatMode === 'acp agent') {
-      const modelId = conversation.settings.modelId
-      resolved.agentWorkspacePath =
-        modelId && conversation.settings.acpWorkdirMap
-          ? (conversation.settings.acpWorkdirMap[modelId] ?? null)
-          : null
-      resolved.acpWorkdirMap = conversation.settings.acpWorkdirMap
-    } else {
-      resolved.agentWorkspacePath = null
-    }
-
-    return resolved
-  }
-
-  async resolveWorkspaceContext(
-    conversationId?: string,
-    modelId?: string
-  ): Promise<WorkspaceContext> {
-    if (!conversationId) {
-      const rawFallback = this.options.configPresenter.getSetting('input_chatMode') as
-        | string
-        | undefined
-      const fallbackChatMode: ChatMode = rawFallback === 'acp agent' ? 'acp agent' : 'agent'
-      return { chatMode: fallbackChatMode, agentWorkspacePath: null }
-    }
-
-    try {
-      const session = await this.getSession(conversationId)
-      const resolved = session.resolved
-      if (resolved.chatMode === 'acp agent') {
-        const resolvedModelId = modelId ?? resolved.modelId
-        const map = resolved.acpWorkdirMap
-        const agentWorkspacePath = resolvedModelId && map ? (map[resolvedModelId] ?? null) : null
-        return { chatMode: resolved.chatMode, agentWorkspacePath }
-      }
-
-      return {
-        chatMode: resolved.chatMode,
-        agentWorkspacePath: resolved.agentWorkspacePath ?? null
-      }
-    } catch (error) {
-      console.warn('[SessionManager] Failed to resolve workspace context:', error)
-      const rawFallback = this.options.configPresenter.getSetting('input_chatMode') as
-        | string
-        | undefined
-      const fallbackChatMode: ChatMode = rawFallback === 'acp agent' ? 'acp agent' : 'agent'
-      return { chatMode: fallbackChatMode, agentWorkspacePath: null }
-    }
-  }
-
-  async startLoop(
-    agentId: string,
-    messageId: string,
-    options?: { preservePendingPermissions?: boolean; skipLockAcquisition?: boolean }
-  ): Promise<void> {
-    const session = await this.getSession(agentId)
-    session.status = 'generating'
-    session.updatedAt = Date.now()
-    const runtime = this.ensureRuntime(session)
-    runtime.loopId = messageId
-    runtime.currentMessageId = messageId
-    runtime.toolCallCount = 0
-    runtime.userStopRequested = false
-
-    // CRITICAL: Acquire permission resume lock BEFORE clearing pending permissions
-    // This ensures atomic state transition during permission resume flow
-    // skipLockAcquisition is used when PermissionHandler already holds the lock
-    if (!options?.skipLockAcquisition) {
-      const hasExistingLock = this.acquirePermissionResumeLock(agentId, messageId)
-      if (!hasExistingLock) {
-        console.warn(
-          `[SessionManager] Lock already exists for message ${messageId}, skipping startLoop initialization`
-        )
-        return
-      }
-    }
-
-    // CRITICAL: Only clear pending permissions if not preserving them
-    // This is essential for multi-tool permission scenarios where we need to
-    // execute one tool while waiting for approval of others
-    if (!options?.preservePendingPermissions) {
-      runtime.pendingPermission = undefined
-      runtime.pendingPermissions = undefined
-    }
-    runtime.pendingQuestion = undefined
-
-    // Note: lock is held via permissionResumeLock, will be released in PermissionHandler
-    // after all tools in this resume batch are processed
-  }
-
-  setStatus(agentId: string, status: SessionStatus): void {
-    const session = this.sessions.get(agentId)
-    if (!session) return
-    session.status = status
-    session.updatedAt = Date.now()
-  }
-
-  getStatus(agentId: string): SessionStatus | null {
-    const session = this.sessions.get(agentId)
-    if (!session) return null
-    return session.status
-  }
-
-  updateRuntime(agentId: string, updates: Partial<SessionContext['runtime']>): void {
-    const session = this.sessions.get(agentId)
-    if (!session) return
-    const runtime = this.ensureRuntime(session)
-    session.runtime = { ...runtime, ...updates }
-    session.updatedAt = Date.now()
-  }
-
-  incrementToolCallCount(agentId: string): void {
-    const session = this.sessions.get(agentId)
-    if (!session) return
-    const runtime = this.ensureRuntime(session)
-    runtime.toolCallCount = (runtime.toolCallCount ?? 0) + 1
-    session.updatedAt = Date.now()
-  }
-
-  clearPendingPermission(agentId: string): void {
-    this.updateRuntime(agentId, { pendingPermission: undefined, pendingPermissions: undefined })
-  }
-
-  clearPendingQuestion(agentId: string): void {
-    this.updateRuntime(agentId, { pendingQuestion: undefined })
-  }
-
-  addPendingPermission(agentId: string, permission: PendingPermission): void {
-    const session = this.sessions.get(agentId)
-    if (!session) return
-    const runtime = this.ensureRuntime(session)
-    if (!runtime.pendingPermissions) {
-      runtime.pendingPermissions = []
-    }
-    const existingIndex = runtime.pendingPermissions.findIndex(
-      (p) => p.messageId === permission.messageId && p.toolCallId === permission.toolCallId
-    )
-    if (existingIndex >= 0) {
-      runtime.pendingPermissions[existingIndex] = permission
-    } else {
-      runtime.pendingPermissions.push(permission)
-    }
-    runtime.pendingPermission = runtime.pendingPermissions[0]
-    session.updatedAt = Date.now()
-  }
-
-  removePendingPermission(agentId: string, messageId: string, toolCallId: string): void {
-    const session = this.sessions.get(agentId)
-    if (!session) return
-    const runtime = this.ensureRuntime(session)
-    if (runtime.pendingPermissions) {
-      runtime.pendingPermissions = runtime.pendingPermissions.filter(
-        (p) => !(p.messageId === messageId && p.toolCallId === toolCallId)
-      )
-      runtime.pendingPermission = runtime.pendingPermissions[0]
-    }
-    session.updatedAt = Date.now()
-  }
-
-  getPendingPermissions(agentId: string): PendingPermission[] | undefined {
-    const session = this.sessions.get(agentId)
-    if (!session) return undefined
-    const runtime = this.ensureRuntime(session)
-    return runtime.pendingPermissions
-  }
-
-  hasPendingPermissions(agentId: string, messageId?: string): boolean {
-    const pendingPerms = this.getPendingPermissions(agentId)
-    if (!pendingPerms || pendingPerms.length === 0) return false
-    if (messageId) {
-      return pendingPerms.some((p) => p.messageId === messageId)
-    }
-    return true
-  }
-
-  acquirePermissionResumeLock(agentId: string, messageId: string): boolean {
-    const session = this.sessions.get(agentId)
-    if (!session) return false
-    const runtime = this.ensureRuntime(session)
-    if (runtime.permissionResumeLock?.messageId === messageId) {
-      return false
-    }
-    runtime.permissionResumeLock = { messageId, startedAt: Date.now() }
-    session.updatedAt = Date.now()
-    return true
-  }
-
-  releasePermissionResumeLock(agentId: string): void {
-    this.updateRuntime(agentId, { permissionResumeLock: undefined })
-  }
-
-  private ensureRuntime(session: SessionContext): NonNullable<SessionContext['runtime']> {
-    if (!session.runtime) {
-      session.runtime = {
-        toolCallCount: 0,
-        userStopRequested: false
-      }
-    } else {
-      if (session.runtime.toolCallCount === undefined) {
-        session.runtime.toolCallCount = 0
-      }
-      if (session.runtime.userStopRequested === undefined) {
-        session.runtime.userStopRequested = false
-      }
-    }
-    return session.runtime
-  }
-
-  getPermissionResumeLock(agentId: string): { messageId: string; startedAt: number } | undefined {
-    const session = this.sessions.get(agentId)
-    if (!session) return undefined
-    const runtime = this.ensureRuntime(session)
-    return runtime.permissionResumeLock
-  }
-
-  /**
-   * Remove a session and clean up all pending state.
-   * Critical for preventing stale permission data from affecting new sessions.
-   */
-  removeSession(agentId: string): void {
-    const session = this.sessions.get(agentId)
-    if (session?.runtime) {
-      // Clear pending permissions to prevent stale data
-      session.runtime.pendingPermissions = undefined
-      session.runtime.pendingPermission = undefined
-      // Clear permission resume lock
-      session.runtime.permissionResumeLock = undefined
-      // Clear pending question
-      session.runtime.pendingQuestion = undefined
-    }
-    this.sessions.delete(agentId)
-  }
-
-  private async hydratePendingQuestion(session: SessionContext): Promise<void> {
-    const runtime = this.ensureRuntime(session)
-    if (runtime.pendingQuestionInitialized) return
-    runtime.pendingQuestionInitialized = true
-    if (runtime.pendingQuestion) return
-
-    try {
-      const lastAssistant = await this.options.sessionPresenter.getLastAssistantMessage(
-        session.agentId
-      )
-      if (!lastAssistant || lastAssistant.role !== 'assistant') {
-        return
-      }
-
-      const blocks = lastAssistant.content as AssistantMessageBlock[]
-      if (!Array.isArray(blocks) || blocks.length === 0) {
-        return
-      }
-
-      const pendingQuestionBlock = [...blocks].reverse().find((block) => {
-        if (
-          block.type !== 'action' ||
-          block.action_type !== 'question_request' ||
-          block.status !== 'pending'
-        ) {
-          return false
-        }
-        if (block.extra && block.extra.needsUserAction === false) {
-          return false
-        }
-        return Boolean(block.tool_call?.id)
-      })
-
-      const toolCallId = pendingQuestionBlock?.tool_call?.id
-      if (!toolCallId) return
-
-      runtime.pendingQuestion = {
-        messageId: lastAssistant.id,
-        toolCallId
-      }
-      session.status = 'waiting_question'
-      session.updatedAt = Date.now()
-    } catch (error) {
-      console.warn('[SessionManager] Failed to hydrate pending question:', error)
-    }
-  }
-
-  private async resolveAgentWorkspacePath(
-    conversationId: string | null,
-    currentPath: string | null
-  ): Promise<string | null> {
-    const trimmedPath = currentPath?.trim()
-    if (trimmedPath) return trimmedPath
-
-    const fallback = await this.getDefaultAgentWorkspacePath(conversationId)
-    if (conversationId && fallback) {
-      try {
-        await this.options.sessionPresenter.updateConversationSettings(conversationId, {
-          agentWorkspacePath: fallback
-        })
-      } catch (error) {
-        console.warn('[SessionManager] Failed to persist agent workspace path:', error)
-      }
-    }
-    return fallback
-  }
-
-  private async getDefaultAgentWorkspacePath(conversationId?: string | null): Promise<string> {
-    const tempRoot = path.join(app.getPath('temp'), 'deepchat-agent', 'workspaces')
-    try {
-      await fs.promises.mkdir(tempRoot, { recursive: true })
-    } catch (error) {
-      console.warn(
-        '[SessionManager] Failed to create default workspace root, using system temp:',
-        error
-      )
-      return app.getPath('temp')
-    }
-
-    if (!conversationId) {
-      return tempRoot
-    }
-
-    const workspaceDir = path.join(tempRoot, conversationId)
-    try {
-      await fs.promises.mkdir(workspaceDir, { recursive: true })
-      return workspaceDir
-    } catch (error) {
-      console.warn(
-        '[SessionManager] Failed to create conversation workspace, using root temp workspace:',
-        error
-      )
-      return tempRoot
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionResolver.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionResolver.ts
deleted file mode 100644
index 614325631..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionResolver.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { CONVERSATION_SETTINGS, ModelConfig } from '@shared/presenter'
-import type { SessionContextResolved } from './sessionContext'
-
-export type ChatMode = 'agent' | 'acp agent'
-
-export type SessionResolveInput = {
-  settings: CONVERSATION_SETTINGS
-  fallbackChatMode?: ChatMode
-  modelConfig?: ModelConfig
-}
-
-export type SessionResolveResult = SessionContextResolved & {
-  needsMigration?: boolean
-}
-
-function validateChatMode(mode: string | undefined): ChatMode | undefined {
-  if (mode === 'acp agent') return 'acp agent'
-  if (mode === 'agent') return 'agent'
-  return undefined
-}
-
-function isLegacyChatMode(mode: string | undefined): boolean {
-  return mode === 'chat'
-}
-
-export function resolveSessionContext(input: SessionResolveInput): SessionResolveResult {
-  const { settings, modelConfig } = input
-
-  const rawChatMode = settings.chatMode
-  const rawFallback = input.fallbackChatMode
-
-  const settingsNeedsMigration = isLegacyChatMode(rawChatMode)
-
-  const chatMode = validateChatMode(rawChatMode) ?? validateChatMode(rawFallback) ?? 'agent'
-
-  return {
-    chatMode,
-    providerId: settings.providerId,
-    modelId: settings.modelId,
-    supportsVision: modelConfig?.vision ?? false,
-    supportsFunctionCall: modelConfig?.functionCall ?? false,
-    agentWorkspacePath: chatMode === 'agent' ? (settings.agentWorkspacePath ?? null) : null,
-    enabledMcpTools: settings.enabledMcpTools,
-    acpWorkdirMap: chatMode === 'acp agent' ? settings.acpWorkdirMap : undefined,
-    needsMigration: settingsNeedsMigration
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionRuntimePort.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionRuntimePort.ts
deleted file mode 100644
index 41c054308..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/session/sessionRuntimePort.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import type {
-  PendingPermission,
-  PermissionResumeLock,
-  SessionContext,
-  SessionStatus
-} from './sessionContext'
-
-export type SessionRuntimeLoopOptions = {
-  preservePendingPermissions?: boolean
-  skipLockAcquisition?: boolean
-}
-
-export type SessionRuntimeWorkspaceContext = {
-  chatMode: 'agent' | 'acp agent'
-  agentWorkspacePath: string | null
-}
-
-export interface AgentSessionRuntimePort {
-  getSession(agentId: string): Promise<SessionContext>
-  getSessionSync(agentId: string): SessionContext | null
-  resolveWorkspaceContext(
-    conversationId?: string,
-    modelId?: string
-  ): Promise<SessionRuntimeWorkspaceContext>
-  startLoop(agentId: string, messageId: string, options?: SessionRuntimeLoopOptions): Promise<void>
-  setStatus(agentId: string, status: SessionStatus): void
-  getStatus(agentId: string): SessionStatus | null
-  updateRuntime(agentId: string, updates: Partial<SessionContext['runtime']>): void
-  incrementToolCallCount(agentId: string): void
-  clearPendingPermission(agentId: string): void
-  clearPendingQuestion(agentId: string): void
-  addPendingPermission(agentId: string, permission: PendingPermission): void
-  removePendingPermission(agentId: string, messageId: string, toolCallId: string): void
-  getPendingPermissions(agentId: string): PendingPermission[] | undefined
-  hasPendingPermissions(agentId: string, messageId?: string): boolean
-  acquirePermissionResumeLock(agentId: string, messageId: string): boolean
-  releasePermissionResumeLock(agentId: string): void
-  getPermissionResumeLock(agentId: string): PermissionResumeLock | undefined
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/contentBufferHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/contentBufferHandler.ts
deleted file mode 100644
index 386c46b63..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/contentBufferHandler.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import { finalizeAssistantMessageBlocks } from '@shared/chat/messageBlocks'
-import type { GeneratingMessageState } from './types'
-import type { StreamUpdateScheduler } from './streamUpdateScheduler'
-
-export class ContentBufferHandler {
-  private readonly generatingMessages: Map<string, GeneratingMessageState>
-  private readonly streamUpdateScheduler: StreamUpdateScheduler
-
-  constructor(options: {
-    generatingMessages: Map<string, GeneratingMessageState>
-    streamUpdateScheduler: StreamUpdateScheduler
-  }) {
-    this.generatingMessages = options.generatingMessages
-    this.streamUpdateScheduler = options.streamUpdateScheduler
-  }
-
-  async flushAdaptiveBuffer(eventId: string): Promise<void> {
-    const state = this.generatingMessages.get(eventId)
-    if (!state?.adaptiveBuffer) return
-
-    const buffer = state.adaptiveBuffer
-    const now = Date.now()
-
-    if (state.flushTimeout) {
-      clearTimeout(state.flushTimeout)
-      state.flushTimeout = undefined
-    }
-
-    try {
-      if (buffer.content && buffer.sentPosition < buffer.content.length) {
-        const newContent = buffer.content.slice(buffer.sentPosition)
-        if (newContent) {
-          await this.processBufferedContent(state, eventId, newContent, now)
-          buffer.sentPosition = buffer.content.length
-        }
-      }
-    } catch (error) {
-      console.error('[ContentBufferHandler] ERROR flushing adaptive buffer', {
-        eventId,
-        err: error
-      })
-      throw error
-    } finally {
-      state.adaptiveBuffer = undefined
-    }
-  }
-
-  async processBufferedContent(
-    state: GeneratingMessageState,
-    eventId: string,
-    content: string,
-    currentTime: number
-  ): Promise<void> {
-    const buffer = state.adaptiveBuffer
-
-    if (buffer?.isLargeContent) {
-      await this.processLargeContentAsynchronously(state, eventId, content, currentTime)
-      return
-    }
-
-    await this.processNormalContent(state, eventId, content, currentTime)
-  }
-
-  async processLargeContentAsynchronously(
-    state: GeneratingMessageState,
-    eventId: string,
-    content: string,
-    currentTime: number
-  ): Promise<void> {
-    const buffer = state.adaptiveBuffer
-    if (!buffer) return
-
-    buffer.isProcessing = true
-
-    try {
-      const chunks = this.splitLargeContent(content)
-      const totalChunks = chunks.length
-
-      console.log(
-        `[ContentBufferHandler] Processing ${totalChunks} chunks asynchronously for ${content.length} bytes`
-      )
-
-      const lastBlock = state.message.content[state.message.content.length - 1]
-      let contentBlock: any
-
-      if (lastBlock && lastBlock.type === 'content') {
-        contentBlock = lastBlock
-      } else {
-        this.finalizeLastBlock(state)
-        contentBlock = {
-          type: 'content',
-          content: '',
-          status: 'loading',
-          timestamp: currentTime
-        }
-        state.message.content.push(contentBlock)
-      }
-
-      const batchSize = 5
-      for (let batchStart = 0; batchStart < chunks.length; batchStart += batchSize) {
-        const batchEnd = Math.min(batchStart + batchSize, chunks.length)
-        const batch = chunks.slice(batchStart, batchEnd)
-
-        const batchContent = batch.join('')
-        contentBlock.content += batchContent
-
-        this.streamUpdateScheduler.enqueueDelta(
-          eventId,
-          state.conversationId,
-          state.message.parentId,
-          Boolean(state.message.is_variant),
-          state.webContentsId,
-          { content: batchContent },
-          state.message.content
-        )
-
-        if (batchEnd < chunks.length) {
-          await new Promise((resolve) => setImmediate(resolve))
-        }
-      }
-
-      console.log(`[ContentBufferHandler] Completed processing ${totalChunks} chunks`)
-    } catch (error) {
-      console.error('[ContentBufferHandler] Error in processLargeContentAsynchronously:', error)
-    } finally {
-      buffer.isProcessing = false
-    }
-  }
-
-  async processNormalContent(
-    state: GeneratingMessageState,
-    eventId: string,
-    content: string,
-    currentTime: number
-  ): Promise<void> {
-    const lastBlock = state.message.content[state.message.content.length - 1]
-
-    if (lastBlock && lastBlock.type === 'content') {
-      lastBlock.content += content
-    } else {
-      this.finalizeLastBlock(state)
-      state.message.content.push({
-        type: 'content',
-        content,
-        status: 'loading',
-        timestamp: currentTime
-      })
-    }
-
-    this.streamUpdateScheduler.enqueueDelta(
-      eventId,
-      state.conversationId,
-      state.message.parentId,
-      Boolean(state.message.is_variant),
-      state.webContentsId,
-      { content },
-      state.message.content
-    )
-  }
-
-  splitLargeContent(content: string): string[] {
-    const chunks: string[] = []
-    let maxChunkSize = 4096
-
-    if (content.includes('data:image/')) {
-      maxChunkSize = 512
-    }
-
-    if (content.length > 50000) {
-      maxChunkSize = Math.min(maxChunkSize, 256)
-    }
-
-    for (let i = 0; i < content.length; i += maxChunkSize) {
-      chunks.push(content.slice(i, i + maxChunkSize))
-    }
-
-    return chunks
-  }
-
-  cleanupContentBuffer(state: GeneratingMessageState): void {
-    if (state.flushTimeout) {
-      clearTimeout(state.flushTimeout)
-      state.flushTimeout = undefined
-    }
-    if (state.throttleTimeout) {
-      clearTimeout(state.throttleTimeout)
-      state.throttleTimeout = undefined
-    }
-    state.adaptiveBuffer = undefined
-    state.lastRendererUpdateTime = undefined
-  }
-
-  private finalizeLastBlock(state: GeneratingMessageState): void {
-    finalizeAssistantMessageBlocks(state.message.content)
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/llmEventHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/llmEventHandler.ts
deleted file mode 100644
index 404d8b85a..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/llmEventHandler.ts
+++ /dev/null
@@ -1,569 +0,0 @@
-import { eventBus, SendTarget } from '@/eventbus'
-import { CONVERSATION_EVENTS, STREAM_EVENTS } from '@/events'
-import type { AssistantMessageBlock } from '@shared/chat'
-import { finalizeAssistantMessageBlocks } from '@shared/chat/messageBlocks'
-import type { LLMAgentEventData, MESSAGE_METADATA } from '@shared/presenter'
-import { approximateTokenSize } from 'tokenx'
-import type { MessageManager } from '../../sessionPresenter/managers/messageManager'
-import type { GeneratingMessageState } from './types'
-import type { ContentBufferHandler } from './contentBufferHandler'
-import type { ToolCallHandler } from '../loop/toolCallHandler'
-import type { StreamUpdateScheduler } from './streamUpdateScheduler'
-import type { AgentSessionRuntimePort } from '../session/sessionRuntimePort'
-
-type ConversationUpdateHandler = (state: GeneratingMessageState) => Promise<void>
-
-type HookErrorSnapshot = {
-  error: { message: string; stack?: string }
-  usage?: Record<string, number> | null
-  conversationId?: string
-  providerId?: string
-  modelId?: string
-}
-
-export class LLMEventHandler {
-  private readonly generatingMessages: Map<string, GeneratingMessageState>
-  private readonly messageManager: MessageManager
-  private readonly contentBufferHandler: ContentBufferHandler
-  private readonly toolCallHandler: ToolCallHandler
-  private readonly streamUpdateScheduler: StreamUpdateScheduler
-  private readonly sessionRuntime: AgentSessionRuntimePort
-  private readonly onConversationUpdated?: ConversationUpdateHandler
-  private readonly errorByEventId: Map<string, HookErrorSnapshot> = new Map()
-
-  constructor(options: {
-    generatingMessages: Map<string, GeneratingMessageState>
-    messageManager: MessageManager
-    contentBufferHandler: ContentBufferHandler
-    toolCallHandler: ToolCallHandler
-    streamUpdateScheduler: StreamUpdateScheduler
-    sessionRuntime: AgentSessionRuntimePort
-    onConversationUpdated?: ConversationUpdateHandler
-  }) {
-    this.generatingMessages = options.generatingMessages
-    this.messageManager = options.messageManager
-    this.contentBufferHandler = options.contentBufferHandler
-    this.toolCallHandler = options.toolCallHandler
-    this.streamUpdateScheduler = options.streamUpdateScheduler
-    this.sessionRuntime = options.sessionRuntime
-    this.onConversationUpdated = options.onConversationUpdated
-  }
-
-  async handleLLMAgentResponse(msg: LLMAgentEventData): Promise<void> {
-    const currentTime = Date.now()
-    const {
-      eventId,
-      content,
-      reasoning_content,
-      tool_call_id,
-      tool_call_name,
-      tool_call_params,
-      maximum_tool_calls_reached,
-      tool_call_server_name,
-      tool_call_server_icons,
-      tool_call_server_description,
-      tool_call_response_raw,
-      tool_call,
-      question_request,
-      question_error,
-      totalUsage,
-      image_data
-    } = msg
-
-    const state = this.generatingMessages.get(eventId)
-    if (!state) {
-      return
-    }
-
-    if (state.firstTokenTime === null && (content || reasoning_content)) {
-      state.firstTokenTime = currentTime
-      await this.messageManager.updateMessageMetadata(eventId, {
-        firstTokenTime: currentTime - state.startTime
-      })
-    }
-
-    if (totalUsage) {
-      state.totalUsage = totalUsage
-      state.promptTokens = totalUsage.prompt_tokens
-    }
-
-    if (maximum_tool_calls_reached) {
-      this.finalizeLastBlock(state)
-      state.message.content.push({
-        type: 'action',
-        content: 'common.error.maximumToolCallsReached',
-        status: 'success',
-        timestamp: currentTime,
-        action_type: 'maximum_tool_calls_reached',
-        tool_call: {
-          id: tool_call_id,
-          name: tool_call_name,
-          params: tool_call_params,
-          server_name: tool_call_server_name,
-          server_icons: tool_call_server_icons,
-          server_description: tool_call_server_description
-        },
-        extra: { needContinue: true }
-      })
-      this.streamUpdateScheduler.enqueueDelta(
-        eventId,
-        state.conversationId,
-        state.message.parentId,
-        Boolean(state.message.is_variant),
-        state.webContentsId,
-        {},
-        state.message.content
-      )
-      return
-    }
-
-    if (question_error) {
-      this.finalizeLastBlock(state)
-      state.message.content.push({
-        type: 'error',
-        content: question_error,
-        status: 'error',
-        timestamp: currentTime
-      })
-    }
-
-    if (reasoning_content) {
-      if (state.reasoningStartTime === null) {
-        state.reasoningStartTime = currentTime
-        await this.messageManager.updateMessageMetadata(eventId, {
-          reasoningStartTime: currentTime - state.startTime
-        })
-      }
-      state.lastReasoningTime = currentTime
-      // Update reasoningEndTime in metadata for real-time display
-      await this.messageManager.updateMessageMetadata(eventId, {
-        reasoningEndTime: currentTime - state.startTime
-      })
-    }
-
-    const lastBlock = state.message.content[state.message.content.length - 1]
-
-    if (tool_call_response_raw && tool_call === 'end') {
-      await this.toolCallHandler.processSearchResultsFromToolCall(state, msg, currentTime)
-      await this.toolCallHandler.processMcpUiResourcesFromToolCall(state, msg, currentTime)
-    }
-
-    const shouldSkipToolCall =
-      tool_call && tool_call_name === 'question' && tool_call !== 'question-required'
-    const isAcpProvider = state.message.model_provider === 'acp'
-
-    if (tool_call && !shouldSkipToolCall) {
-      if (isAcpProvider) {
-        // Legacy hook dispatch disabled. New session hooks are emitted by the new agent pipeline.
-      }
-
-      switch (tool_call) {
-        case 'start':
-          this.sessionRuntime.incrementToolCallCount(state.conversationId)
-          await this.toolCallHandler.processToolCallStart(state, msg, currentTime)
-          break
-        case 'update':
-        case 'running':
-          await this.toolCallHandler.processToolCallUpdate(state, msg)
-          break
-        case 'permission-required':
-          this.sessionRuntime.addPendingPermission(state.conversationId, {
-            messageId: eventId,
-            toolCallId: tool_call_id || '',
-            permissionType:
-              (msg.permission_request?.permissionType as 'read' | 'write' | 'all' | 'command') ||
-              'read',
-            payload: msg.permission_request ?? {}
-          })
-          this.sessionRuntime.setStatus(state.conversationId, 'waiting_permission')
-          await this.toolCallHandler.processToolCallPermission(state, msg, currentTime)
-          break
-        case 'question-required':
-          this.sessionRuntime.updateRuntime(state.conversationId, {
-            pendingQuestion: {
-              messageId: eventId,
-              toolCallId: tool_call_id || ''
-            }
-          })
-          this.sessionRuntime.setStatus(state.conversationId, 'waiting_question')
-          await this.toolCallHandler.processQuestionRequest(state, msg, currentTime)
-          break
-        case 'permission-granted':
-        case 'permission-denied':
-        case 'continue':
-          await this.toolCallHandler.processToolCallPermission(state, msg, currentTime)
-          break
-        case 'error':
-          await this.toolCallHandler.processToolCallError(state, msg)
-          break
-        case 'end':
-          await this.toolCallHandler.processToolCallEnd(state, msg)
-          break
-        default:
-          break
-      }
-    }
-
-    if (image_data?.data) {
-      const rawData = image_data.data ?? ''
-      let normalizedData = rawData
-      let normalizedMimeType = image_data.mimeType?.trim() ?? ''
-
-      if (
-        rawData.startsWith('imgcache://') ||
-        rawData.startsWith('http://') ||
-        rawData.startsWith('https://')
-      ) {
-        normalizedMimeType = 'deepchat/image-url'
-      } else if (rawData.startsWith('data:image/')) {
-        const match = rawData.match(/^data:([^;]+);base64,(.*)$/)
-        if (match?.[1] && match?.[2]) {
-          normalizedMimeType = match[1]
-          normalizedData = match[2]
-        }
-      } else if (!normalizedMimeType) {
-        normalizedMimeType = 'image/png'
-      }
-
-      const imageBlock: AssistantMessageBlock = {
-        type: 'image',
-        status: 'success',
-        timestamp: currentTime,
-        content: 'image',
-        image_data: {
-          data: normalizedData,
-          mimeType: normalizedMimeType
-        }
-      }
-      state.message.content.push(imageBlock)
-    }
-
-    if (content) {
-      if (!lastBlock || lastBlock.type !== 'content' || lastBlock.status !== 'loading') {
-        this.finalizeLastBlock(state)
-        state.message.content.push({
-          type: 'content',
-          content: content || '',
-          status: 'loading',
-          timestamp: currentTime
-        })
-      } else if (lastBlock.type === 'content') {
-        lastBlock.content += content
-      }
-    }
-
-    if (reasoning_content) {
-      // Re-get lastBlock in case new blocks were added above
-      const currentLastBlock = state.message.content[state.message.content.length - 1]
-      if (!currentLastBlock || currentLastBlock.type !== 'reasoning_content') {
-        this.finalizeLastBlock(state)
-        const reasoningStartTime = currentTime
-        state.message.content.push({
-          type: 'reasoning_content',
-          content: reasoning_content || '',
-          status: 'loading',
-          timestamp: currentTime,
-          reasoning_time: {
-            start: reasoningStartTime,
-            end: currentTime
-          }
-        })
-      } else if (currentLastBlock.type === 'reasoning_content') {
-        currentLastBlock.content += reasoning_content
-        // Update reasoning_time.end in real-time during streaming
-        if (currentLastBlock.reasoning_time) {
-          currentLastBlock.reasoning_time.end = currentTime
-        } else {
-          const reasoningStartTime = currentLastBlock.timestamp ?? currentTime
-          currentLastBlock.reasoning_time = {
-            start: reasoningStartTime,
-            end: currentTime
-          }
-        }
-      }
-    }
-
-    const delta: Partial<LLMAgentEventData> = {}
-    if (content) delta.content = content
-    if (reasoning_content) {
-      delta.reasoning_content = reasoning_content
-      // Get the current reasoning_time from the last reasoning_content block
-      const lastBlock = state.message.content[state.message.content.length - 1]
-      if (lastBlock?.type === 'reasoning_content' && lastBlock.reasoning_time) {
-        delta.reasoning_time = lastBlock.reasoning_time
-      }
-    }
-    if (image_data) delta.image_data = image_data
-    if (totalUsage) delta.totalUsage = totalUsage
-
-    if (tool_call && !shouldSkipToolCall) {
-      delta.tool_call = tool_call
-      delta.tool_call_id = tool_call_id
-      delta.tool_call_name = tool_call_name
-      delta.tool_call_params = tool_call_params
-      delta.tool_call_response = msg.tool_call_response
-      delta.tool_call_server_name = tool_call_server_name
-      delta.tool_call_server_icons = tool_call_server_icons
-      delta.tool_call_server_description = tool_call_server_description
-      delta.tool_call_response_raw = tool_call_response_raw
-      if (msg.permission_request !== undefined) {
-        delta.permission_request = msg.permission_request
-      }
-      if (question_request !== undefined) {
-        delta.question_request = question_request
-      }
-    }
-
-    if (question_error) {
-      delta.question_error = question_error
-    }
-
-    this.streamUpdateScheduler.enqueueDelta(
-      eventId,
-      state.conversationId,
-      state.message.parentId,
-      Boolean(state.message.is_variant),
-      state.webContentsId,
-      delta,
-      state.message.content
-    )
-  }
-
-  async handleLLMAgentError(msg: LLMAgentEventData): Promise<void> {
-    const { eventId, error } = msg
-    const errorMessage = error instanceof Error ? error.message : String(error)
-    const errorStack = error instanceof Error ? error.stack : undefined
-    const state = this.generatingMessages.get(eventId)
-    const errorSnapshot: HookErrorSnapshot = {
-      error: errorStack ? { message: errorMessage, stack: errorStack } : { message: errorMessage },
-      usage: state?.totalUsage,
-      conversationId: state?.conversationId,
-      providerId: state?.message.model_provider,
-      modelId: state?.message.model_id
-    }
-
-    if (!errorSnapshot.conversationId) {
-      try {
-        const message = await this.messageManager.getMessage(eventId)
-        errorSnapshot.conversationId = message.conversationId
-        errorSnapshot.providerId = errorSnapshot.providerId ?? message.model_provider
-        errorSnapshot.modelId = errorSnapshot.modelId ?? message.model_id
-      } catch {
-        // ignore
-      }
-    }
-
-    this.errorByEventId.set(eventId, errorSnapshot)
-
-    if (state) {
-      if (state.adaptiveBuffer) {
-        await this.contentBufferHandler.flushAdaptiveBuffer(eventId)
-      }
-
-      this.contentBufferHandler.cleanupContentBuffer(state)
-    }
-
-    // Flush stream buffers before persisting error to avoid stale snapshot overwrites.
-    await this.streamUpdateScheduler.flushAll(eventId, 'final')
-
-    await this.messageManager.handleMessageError(eventId, errorMessage)
-
-    if (state) {
-      this.generatingMessages.delete(eventId)
-      this.sessionRuntime.setStatus(state.conversationId, 'error')
-      this.sessionRuntime.clearPendingPermission(state.conversationId)
-      this.sessionRuntime.clearPendingQuestion(state.conversationId)
-    } else {
-      const message = await this.messageManager.getMessage(eventId)
-      if (message) {
-        this.sessionRuntime.setStatus(message.conversationId, 'error')
-        this.sessionRuntime.clearPendingPermission(message.conversationId)
-        this.sessionRuntime.clearPendingQuestion(message.conversationId)
-      }
-    }
-
-    eventBus.sendToRenderer(STREAM_EVENTS.ERROR, SendTarget.ALL_WINDOWS, msg)
-  }
-
-  async handleLLMAgentEnd(msg: LLMAgentEventData): Promise<void> {
-    const { eventId, userStop } = msg
-    const state = this.generatingMessages.get(eventId)
-    if (state) {
-      if (state.adaptiveBuffer) {
-        await this.contentBufferHandler.flushAdaptiveBuffer(eventId)
-      }
-
-      this.contentBufferHandler.cleanupContentBuffer(state)
-
-      const hasPendingPermissions = state.message.content.some(
-        (block) =>
-          block.type === 'action' &&
-          block.action_type === 'tool_call_permission' &&
-          block.status === 'pending'
-      )
-      const hasPendingQuestions = state.message.content.some(
-        (block) =>
-          block.type === 'action' &&
-          block.action_type === 'question_request' &&
-          block.status === 'pending'
-      )
-
-      if (hasPendingPermissions || hasPendingQuestions) {
-        state.message.content.forEach((block) => {
-          if (
-            !(
-              block.type === 'action' &&
-              (block.action_type === 'tool_call_permission' ||
-                block.action_type === 'question_request')
-            ) &&
-            block.status === 'loading'
-          ) {
-            if (block.type !== 'tool_call') {
-              block.status = 'success'
-            }
-          }
-        })
-        this.streamUpdateScheduler.enqueueDelta(
-          eventId,
-          state.conversationId,
-          state.message.parentId,
-          Boolean(state.message.is_variant),
-          state.webContentsId,
-          {},
-          state.message.content
-        )
-        if (hasPendingQuestions) {
-          // Question tool ends the assistant message even when waiting for user input.
-          await this.messageManager.updateMessageStatus(eventId, 'sent')
-        }
-        this.sessionRuntime.setStatus(state.conversationId, 'waiting_permission')
-        if (!hasPendingPermissions) {
-          this.sessionRuntime.setStatus(state.conversationId, 'waiting_question')
-        }
-        await this.streamUpdateScheduler.flushAll(eventId, 'final')
-        this.generatingMessages.delete(eventId)
-        eventBus.sendToRenderer(STREAM_EVENTS.END, SendTarget.ALL_WINDOWS, msg)
-        this.errorByEventId.delete(eventId)
-        return
-      }
-
-      await this.finalizeMessage(state, eventId, Boolean(userStop))
-      this.sessionRuntime.setStatus(state.conversationId, 'idle')
-      this.sessionRuntime.clearPendingPermission(state.conversationId)
-      this.sessionRuntime.clearPendingQuestion(state.conversationId)
-    }
-
-    try {
-      // Legacy hook dispatch disabled. New session hooks are emitted by the new agent pipeline.
-    } finally {
-      this.errorByEventId.delete(eventId)
-    }
-
-    await this.streamUpdateScheduler.flushAll(eventId, 'final')
-    eventBus.sendToRenderer(STREAM_EVENTS.END, SendTarget.ALL_WINDOWS, msg)
-  }
-
-  async finalizeMessage(
-    state: GeneratingMessageState,
-    eventId: string,
-    userStop: boolean
-  ): Promise<void> {
-    state.message.content.forEach((block) => {
-      if (
-        block.type === 'action' &&
-        (block.action_type === 'tool_call_permission' || block.action_type === 'question_request')
-      ) {
-        return
-      }
-      block.status = 'success'
-    })
-
-    let completionTokens = 0
-    if (state.totalUsage) {
-      completionTokens = state.totalUsage.completion_tokens
-    } else {
-      for (const block of state.message.content) {
-        if (
-          block.type === 'content' ||
-          block.type === 'reasoning_content' ||
-          block.type === 'tool_call'
-        ) {
-          completionTokens += approximateTokenSize(block.content)
-        }
-      }
-    }
-
-    const hasContentBlock = state.message.content.some(
-      (block) =>
-        block.type === 'content' ||
-        block.type === 'reasoning_content' ||
-        block.type === 'tool_call' ||
-        block.type === 'image'
-    )
-
-    if (!hasContentBlock && !userStop) {
-      state.message.content.push({
-        type: 'error',
-        content: 'common.error.noModelResponse',
-        status: 'error',
-        timestamp: Date.now()
-      })
-    }
-
-    const totalTokens = state.promptTokens + completionTokens
-    const generationTime = Date.now() - (state.firstTokenTime ?? state.startTime)
-    const safeMs = Math.max(1, generationTime)
-    const tokensPerSecond = completionTokens / (safeMs / 1000)
-    const contextUsage = state?.totalUsage?.context_length
-      ? (totalTokens / state.totalUsage.context_length) * 100
-      : 0
-
-    const metadata: Partial<MESSAGE_METADATA> = {
-      totalTokens,
-      inputTokens: state.promptTokens,
-      outputTokens: completionTokens,
-      generationTime,
-      firstTokenTime: state.firstTokenTime ? state.firstTokenTime - state.startTime : 0,
-      tokensPerSecond,
-      contextUsage
-    }
-
-    if (state.reasoningStartTime !== null && state.lastReasoningTime !== null) {
-      metadata.reasoningStartTime = state.reasoningStartTime - state.startTime
-      metadata.reasoningEndTime = state.lastReasoningTime - state.startTime
-    }
-
-    await this.messageManager.updateMessageMetadata(eventId, metadata)
-    await this.messageManager.updateMessageStatus(eventId, 'sent')
-    await this.messageManager.editMessage(eventId, JSON.stringify(state.message.content))
-    this.generatingMessages.delete(eventId)
-
-    if (this.onConversationUpdated) {
-      await this.onConversationUpdated(state)
-    }
-
-    const finalMessage = await this.messageManager.getMessage(eventId)
-    if (finalMessage) {
-      eventBus.sendToMain(CONVERSATION_EVENTS.MESSAGE_GENERATED, {
-        conversationId: finalMessage.conversationId,
-        message: finalMessage
-      })
-    }
-  }
-
-  finalizeLastBlock(state: GeneratingMessageState): void {
-    finalizeAssistantMessageBlocks(state.message.content)
-  }
-
-  /**
-   * Flush all pending stream updates for a message
-   * Used during permission resume to ensure UI state is synchronized with DB
-   */
-  async flushStreamUpdates(eventId: string): Promise<void> {
-    try {
-      await this.streamUpdateScheduler.flushAll(eventId, 'final')
-    } catch (error) {
-      console.error('[LLMEventHandler] Failed to flush stream updates:', error)
-    }
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts
deleted file mode 100644
index c91f30339..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts
+++ /dev/null
@@ -1,597 +0,0 @@
-import { eventBus, SendTarget } from '@/eventbus'
-import { STREAM_EVENTS } from '@/events'
-import type {
-  AssistantMessage,
-  AssistantMessageBlock,
-  Message,
-  MessageFile,
-  UserMessage,
-  UserMessageContent
-} from '@shared/chat'
-import type { CONVERSATION, MCPToolResponse } from '@shared/presenter'
-import { buildUserMessageContext, formatUserMessageContent } from '../message/messageFormatter'
-import { preparePromptContent } from '../message/messageBuilder'
-import type { GeneratingMessageState } from './types'
-import { BaseHandler, type ThreadHandlerContext } from '../types/handlerContext'
-import type { LLMEventHandler } from './llmEventHandler'
-import { LoopOrchestrator } from '../loop/loopOrchestrator'
-
-interface StreamGenerationHandlerDeps {
-  generatingMessages: Map<string, GeneratingMessageState>
-  llmEventHandler: LLMEventHandler
-}
-
-export class StreamGenerationHandler extends BaseHandler {
-  private readonly generatingMessages: Map<string, GeneratingMessageState>
-  private readonly llmEventHandler: LLMEventHandler
-  private readonly loopOrchestrator: LoopOrchestrator
-
-  constructor(context: ThreadHandlerContext, deps: StreamGenerationHandlerDeps) {
-    super(context)
-    this.generatingMessages = deps.generatingMessages
-    this.llmEventHandler = deps.llmEventHandler
-    this.loopOrchestrator = new LoopOrchestrator(this.llmEventHandler)
-    this.assertDependencies()
-  }
-
-  private assertDependencies(): void {
-    void this.generatingMessages
-    void this.llmEventHandler
-    void this.loopOrchestrator
-  }
-
-  async startStreamCompletion(
-    conversationId: string,
-    queryMsgId?: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<void> {
-    const state = this.findGeneratingState(conversationId)
-    if (!state) {
-      console.warn('[StreamGenerationHandler] State not found, conversationId:', conversationId)
-      return
-    }
-
-    try {
-      state.isCancelled = false
-      // Normal flow: skip lock acquisition (lock is only for permission resume)
-      await this.sessionRuntime.startLoop(conversationId, state.message.id, {
-        skipLockAcquisition: true
-      })
-
-      const { conversation, userMessage, contextMessages } = await this.prepareConversationContext(
-        conversationId,
-        queryMsgId,
-        selectedVariantsMap
-      )
-
-      const { chatMode, agentWorkspacePath } = await this.sessionRuntime.resolveWorkspaceContext(
-        conversationId,
-        conversation.settings.modelId
-      )
-      if (chatMode === 'agent' && agentWorkspacePath) {
-        conversation.settings.agentWorkspacePath = agentWorkspacePath
-      }
-
-      const { providerId, modelId } = conversation.settings
-      const modelConfig = this.ctx.configPresenter.getModelConfig(modelId, providerId)
-      if (!modelConfig) {
-        throw new Error(`Model config not found for provider ${providerId} and model ${modelId}`)
-      }
-
-      this.throwIfCancelled(state.message.id)
-
-      const { userContent, imageFiles } = await this.processUserMessageContent(
-        userMessage as UserMessage
-      )
-
-      this.throwIfCancelled(state.message.id)
-
-      const { finalContent, promptTokens } = await preparePromptContent({
-        conversation,
-        userContent,
-        contextMessages,
-        searchResults: null,
-        userMessage,
-        vision: Boolean(modelConfig?.vision),
-        imageFiles: modelConfig?.vision ? imageFiles : [],
-        supportsFunctionCall: modelConfig.functionCall,
-        modelType: modelConfig.type,
-        toolPresenter: this.toolPresenter,
-        promptRuntime: this.promptRuntime
-      })
-
-      this.throwIfCancelled(state.message.id)
-
-      await this.updateGenerationState(state, promptTokens)
-
-      this.throwIfCancelled(state.message.id)
-
-      const currentConversation = await this.getConversation(conversationId)
-      const {
-        providerId: currentProviderId,
-        modelId: currentModelId,
-        temperature: currentTemperature,
-        maxTokens: currentMaxTokens,
-        enabledMcpTools: currentEnabledMcpTools,
-        thinkingBudget: currentThinkingBudget,
-        reasoningEffort: currentReasoningEffort,
-        verbosity: currentVerbosity
-      } = currentConversation.settings
-
-      const stream = this.ctx.llmProviderPresenter.startStreamCompletion(
-        currentProviderId,
-        finalContent,
-        currentModelId,
-        state.message.id,
-        currentTemperature,
-        currentMaxTokens,
-        currentEnabledMcpTools,
-        currentThinkingBudget,
-        currentReasoningEffort,
-        currentVerbosity,
-        conversationId
-      )
-
-      await this.loopOrchestrator.consume(stream)
-    } catch (error) {
-      if (String(error).includes('userCanceledGeneration')) {
-        console.log('[StreamGenerationHandler] Message generation cancelled by user')
-        return
-      }
-
-      console.error('[StreamGenerationHandler] Error during streaming generation:', error)
-      await this.ctx.messageManager.handleMessageError(state.message.id, String(error))
-      throw error
-    }
-  }
-
-  async continueStreamCompletion(
-    conversationId: string,
-    queryMsgId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<void> {
-    const state = this.findGeneratingState(conversationId)
-    if (!state) {
-      console.warn('[StreamGenerationHandler] State not found, conversationId:', conversationId)
-      return
-    }
-
-    try {
-      state.isCancelled = false
-      // Normal flow: skip lock acquisition (lock is only for permission resume)
-      await this.sessionRuntime.startLoop(conversationId, state.message.id, {
-        skipLockAcquisition: true
-      })
-
-      const queryMessage = await this.ctx.messageManager.getMessage(queryMsgId)
-      if (!queryMessage) {
-        throw new Error('Message not found')
-      }
-
-      const content = queryMessage.content as AssistantMessageBlock[]
-      const lastActionBlock = content.filter((block) => block.type === 'action').pop()
-
-      if (!lastActionBlock || lastActionBlock.type !== 'action') {
-        throw new Error('Last action block not found')
-      }
-
-      let toolCallResponse: { content: string; rawData: MCPToolResponse } | null = null
-      const toolCall = lastActionBlock.tool_call
-
-      if (lastActionBlock.action_type === 'maximum_tool_calls_reached' && toolCall) {
-        if (lastActionBlock.extra) {
-          lastActionBlock.extra = {
-            ...lastActionBlock.extra,
-            needContinue: false
-          }
-        }
-        await this.ctx.messageManager.editMessage(queryMsgId, JSON.stringify(content))
-
-        if (!toolCall.id || !toolCall.name || !toolCall.params) {
-          console.warn('[StreamGenerationHandler] Tool call parameters incomplete')
-        } else {
-          toolCallResponse = await this.mcpRuntime.callTool({
-            id: toolCall.id,
-            type: 'function',
-            function: {
-              name: toolCall.name,
-              arguments: toolCall.params
-            },
-            server: {
-              name: toolCall.server_name || '',
-              icons: toolCall.server_icons || '',
-              description: toolCall.server_description || ''
-            }
-          })
-        }
-      }
-
-      this.throwIfCancelled(state.message.id)
-
-      const { conversation, contextMessages, userMessage } = await this.prepareConversationContext(
-        conversationId,
-        state.message.id,
-        selectedVariantsMap
-      )
-
-      this.throwIfCancelled(state.message.id)
-
-      const {
-        providerId,
-        modelId,
-        temperature,
-        maxTokens,
-        enabledMcpTools,
-        thinkingBudget,
-        reasoningEffort,
-        verbosity
-      } = conversation.settings
-      const modelConfig = this.ctx.configPresenter.getModelConfig(modelId, providerId)
-      if (!modelConfig) {
-        throw new Error(`Model config not found for ${providerId}/${modelId}`)
-      }
-
-      const { finalContent, promptTokens } = await preparePromptContent({
-        conversation,
-        userContent: 'continue',
-        contextMessages,
-        searchResults: null,
-        userMessage,
-        vision: false,
-        imageFiles: [],
-        supportsFunctionCall: modelConfig.functionCall,
-        modelType: modelConfig.type,
-        toolPresenter: this.toolPresenter,
-        promptRuntime: this.promptRuntime
-      })
-
-      await this.updateGenerationState(state, promptTokens)
-
-      if (toolCallResponse && toolCall) {
-        eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, {
-          eventId: state.message.id,
-          content: '',
-          tool_call: 'start',
-          tool_call_id: toolCall.id,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.params,
-          tool_call_response: toolCallResponse.content,
-          tool_call_server_name: toolCall.server_name,
-          tool_call_server_icons: toolCall.server_icons,
-          tool_call_server_description: toolCall.server_description
-        })
-        eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, {
-          eventId: state.message.id,
-          content: '',
-          tool_call: 'running',
-          tool_call_id: toolCall.id,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.params,
-          tool_call_response: toolCallResponse.content,
-          tool_call_server_name: toolCall.server_name,
-          tool_call_server_icons: toolCall.server_icons,
-          tool_call_server_description: toolCall.server_description
-        })
-        eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, {
-          eventId: state.message.id,
-          content: '',
-          tool_call: 'end',
-          tool_call_id: toolCall.id,
-          tool_call_response: toolCallResponse.content,
-          tool_call_name: toolCall.name,
-          tool_call_params: toolCall.params,
-          tool_call_server_name: toolCall.server_name,
-          tool_call_server_icons: toolCall.server_icons,
-          tool_call_server_description: toolCall.server_description,
-          tool_call_response_raw: toolCallResponse.rawData
-        })
-      }
-
-      const stream = this.ctx.llmProviderPresenter.startStreamCompletion(
-        providerId,
-        finalContent,
-        modelId,
-        state.message.id,
-        temperature,
-        maxTokens,
-        enabledMcpTools,
-        thinkingBudget,
-        reasoningEffort,
-        verbosity,
-        conversationId
-      )
-
-      await this.loopOrchestrator.consume(stream)
-    } catch (error) {
-      if (String(error).includes('userCanceledGeneration')) {
-        console.log('[StreamGenerationHandler] Message generation cancelled by user')
-        return
-      }
-
-      console.error('[StreamGenerationHandler] Error during continue generation:', error)
-      await this.ctx.messageManager.handleMessageError(state.message.id, String(error))
-      throw error
-    }
-  }
-
-  async prepareConversationContext(
-    conversationId: string,
-    queryMsgId?: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<{
-    conversation: CONVERSATION
-    userMessage: Message
-    contextMessages: Message[]
-  }> {
-    const hasUsableAssistantContent = (msg: Message): boolean => {
-      if (msg.role !== 'assistant') return true
-      const blocks = msg.content as AssistantMessageBlock[]
-      return (
-        Array.isArray(blocks) &&
-        blocks.some((block) => {
-          if (block.type === 'content' && block.content) return true
-          if (block.type === 'tool_call' && block.tool_call) return true
-          if (block.type === 'reasoning_content' && block.content) return true
-          return false
-        })
-      )
-    }
-
-    const applyVariantToAssistant = (msg: Message, variantId?: string): Message => {
-      if (msg.role !== 'assistant' || !msg.variants || msg.variants.length === 0) {
-        return msg
-      }
-
-      const variants = msg.variants
-
-      const findVariantById = (id?: string): Message | undefined =>
-        id ? variants.find((variant) => variant.id === id) : undefined
-
-      const findFallbackVariant = (): Message | undefined => {
-        for (let i = variants.length - 1; i >= 0; i--) {
-          const variant = variants[i]
-          if (hasUsableAssistantContent(variant)) {
-            return variant
-          }
-        }
-        return variants[variants.length - 1]
-      }
-
-      const selectedVariant = findVariantById(variantId) || findFallbackVariant()
-      if (!selectedVariant) return msg
-
-      return {
-        ...msg,
-        content: selectedVariant.content,
-        usage: selectedVariant.usage,
-        model_id: selectedVariant.model_id,
-        model_provider: selectedVariant.model_provider,
-        model_name: selectedVariant.model_name
-      }
-    }
-
-    const conversation = await this.getConversation(conversationId)
-    let contextMessages: Message[] = []
-    let userMessage: Message | null = null
-
-    if (queryMsgId) {
-      const queryMessage = await this.ctx.messageManager.getMessage(queryMsgId)
-      if (!queryMessage) {
-        throw new Error('Message not found')
-      }
-
-      if (queryMessage.role === 'user') {
-        userMessage = queryMessage
-      } else if (queryMessage.role === 'assistant') {
-        if (!queryMessage.parentId) {
-          throw new Error('Assistant message missing parentId')
-        }
-        userMessage = await this.ctx.messageManager.getMessage(queryMessage.parentId)
-        if (!userMessage) {
-          throw new Error('Trigger message not found')
-        }
-      } else {
-        throw new Error('Unsupported message type')
-      }
-
-      contextMessages = await this.ctx.messageManager.getMessageHistory(
-        userMessage.id,
-        conversation.settings.contextLength
-      )
-    } else {
-      userMessage = await this.ctx.messageManager.getLastUserMessage(conversationId)
-      if (!userMessage) {
-        throw new Error('User message not found')
-      }
-      contextMessages = await this.getContextMessages(conversation)
-    }
-
-    if (selectedVariantsMap && Object.keys(selectedVariantsMap).length > 0) {
-      contextMessages = contextMessages.map((msg) => {
-        if (msg.role === 'assistant' && selectedVariantsMap[msg.id] && msg.variants) {
-          return applyVariantToAssistant(msg, selectedVariantsMap[msg.id])
-        }
-        return msg
-      })
-    }
-
-    // Fallback: if assistant content is empty and no variant was explicitly chosen, pick a usable variant
-    contextMessages = contextMessages.map((msg) => {
-      if (msg.role === 'assistant' && !hasUsableAssistantContent(msg)) {
-        return applyVariantToAssistant(msg)
-      }
-      return msg
-    })
-
-    if (userMessage.role === 'user') {
-      const msgContent = userMessage.content as UserMessageContent
-      if (msgContent.content && !msgContent.text) {
-        msgContent.text = formatUserMessageContent(msgContent.content)
-      }
-    }
-
-    const thinkEnabled = this.ctx.configPresenter.getSetting('input_deepThinking') as boolean
-    ;(userMessage.content as UserMessageContent).think = thinkEnabled
-
-    return { conversation, userMessage, contextMessages }
-  }
-
-  async processUserMessageContent(
-    userMessage: UserMessage
-  ): Promise<{ userContent: string; imageFiles: MessageFile[] }> {
-    const userContent = buildUserMessageContext(userMessage.content)
-
-    const imageFiles =
-      userMessage.content.files?.filter((file) => {
-        const isImage =
-          file.mimeType.startsWith('data:image') ||
-          /\.(jpg|jpeg|png|gif|bmp|webp|svg)$/i.test(file.name || '')
-        return isImage
-      }) || []
-
-    return { userContent, imageFiles }
-  }
-
-  async updateGenerationState(state: GeneratingMessageState, promptTokens: number): Promise<void> {
-    this.generatingMessages.set(state.message.id, {
-      ...state,
-      startTime: Date.now(),
-      firstTokenTime: null,
-      promptTokens
-    })
-
-    await this.ctx.messageManager.updateMessageMetadata(state.message.id, {
-      totalTokens: promptTokens,
-      generationTime: 0,
-      firstTokenTime: 0,
-      tokensPerSecond: 0
-    })
-  }
-
-  findGeneratingState(conversationId: string): GeneratingMessageState | null {
-    return (
-      Array.from(this.generatingMessages.values()).find(
-        (state) => state.conversationId === conversationId
-      ) || null
-    )
-  }
-
-  async regenerateFromUserMessage(
-    conversationId: string,
-    userMessageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage> {
-    const userMessage = await this.ctx.messageManager.getMessage(userMessageId)
-    if (!userMessage || userMessage.role !== 'user') {
-      throw new Error('Can only regenerate based on user messages.')
-    }
-
-    const conversation = await this.getConversation(conversationId)
-    const { providerId, modelId } = conversation.settings
-
-    const assistantMessage = (await this.ctx.messageManager.sendMessage(
-      conversationId,
-      JSON.stringify([]),
-      'assistant',
-      userMessageId,
-      false,
-      {
-        totalTokens: 0,
-        generationTime: 0,
-        firstTokenTime: 0,
-        tokensPerSecond: 0,
-        contextUsage: 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        model: modelId,
-        provider: providerId
-      }
-    )) as AssistantMessage
-
-    this.generatingMessages.set(assistantMessage.id, {
-      message: assistantMessage,
-      conversationId,
-      startTime: Date.now(),
-      firstTokenTime: null,
-      promptTokens: 0,
-      reasoningStartTime: null,
-      reasoningEndTime: null,
-      lastReasoningTime: null
-    })
-
-    this.startStreamCompletion(conversationId, userMessageId, selectedVariantsMap).catch(
-      (error) => {
-        console.error(
-          '[StreamGenerationHandler] Failed to start regeneration from user message:',
-          error
-        )
-      }
-    )
-
-    return assistantMessage
-  }
-
-  async generateAIResponse(
-    conversationId: string,
-    userMessageId: string
-  ): Promise<AssistantMessage> {
-    try {
-      const triggerMessage = await this.ctx.messageManager.getMessage(userMessageId)
-      if (!triggerMessage) {
-        throw new Error('Trigger message not found')
-      }
-
-      await this.ctx.messageManager.updateMessageStatus(userMessageId, 'sent')
-
-      const conversation = await this.getConversation(conversationId)
-      const { providerId, modelId } = conversation.settings
-      const assistantMessage = (await this.ctx.messageManager.sendMessage(
-        conversationId,
-        JSON.stringify([]),
-        'assistant',
-        userMessageId,
-        false,
-        {
-          contextUsage: 0,
-          totalTokens: 0,
-          generationTime: 0,
-          firstTokenTime: 0,
-          tokensPerSecond: 0,
-          inputTokens: 0,
-          outputTokens: 0,
-          model: modelId,
-          provider: providerId
-        }
-      )) as AssistantMessage
-
-      return assistantMessage
-    } catch (error) {
-      await this.ctx.messageManager.updateMessageStatus(userMessageId, 'error')
-      console.error('[StreamGenerationHandler] Failed to generate AI response:', error)
-      throw error
-    }
-  }
-
-  async getMessageHistory(messageId: string, limit: number = 100): Promise<Message[]> {
-    return this.ctx.messageManager.getMessageHistory(messageId, limit)
-  }
-
-  private async getContextMessages(conversation: CONVERSATION): Promise<Message[]> {
-    let messageCount = Math.ceil(conversation.settings.contextLength / 300)
-    if (messageCount < 2) {
-      messageCount = 2
-    }
-    return this.ctx.messageManager.getContextMessages(conversation.id, messageCount)
-  }
-
-  private throwIfCancelled(messageId: string): void {
-    if (this.isMessageCancelled(messageId)) {
-      throw new Error('common.error.userCanceledGeneration')
-    }
-  }
-
-  private isMessageCancelled(messageId: string): boolean {
-    const state = this.generatingMessages.get(messageId)
-    return !state || state.isCancelled === true
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamUpdateScheduler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamUpdateScheduler.ts
deleted file mode 100644
index cbcf4e646..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamUpdateScheduler.ts
+++ /dev/null
@@ -1,433 +0,0 @@
-import { eventBus, SendTarget } from '@/eventbus'
-import { STREAM_EVENTS } from '@/events'
-import type { LLMAgentEventData } from '@shared/presenter'
-
-export const STREAM_RENDER_FLUSH_INTERVAL_MS = 120
-export const STREAM_DB_FLUSH_INTERVAL_MS = 600
-
-interface PendingDelta {
-  content?: string
-  reasoning_content?: string
-  reasoning_time?: { start: number; end: number }
-  tool_call?: LLMAgentEventData['tool_call']
-  tool_call_id?: string
-  tool_call_name?: string
-  tool_call_params?: string
-  tool_call_response?: string | Array<unknown>
-  tool_call_server_name?: string
-  tool_call_server_icons?: string
-  tool_call_server_description?: string
-  tool_call_response_raw?: unknown
-  permission_request?: LLMAgentEventData['permission_request']
-  question_request?: LLMAgentEventData['question_request']
-  question_error?: LLMAgentEventData['question_error']
-  maximum_tool_calls_reached?: boolean
-  image_data?: { data: string; mimeType: string }
-  rate_limit?: LLMAgentEventData['rate_limit']
-  totalUsage?: LLMAgentEventData['totalUsage']
-}
-
-interface SchedulerState {
-  eventId: string
-  conversationId: string
-  parentId?: string
-  isVariant: boolean
-  webContentsId?: number
-  pendingDelta: PendingDelta
-  contentSnapshot?: unknown
-  seq: number
-  hasSentInit: boolean
-  lastRenderFlushAt: number
-  lastDbFlushAt: number
-  renderTimer?: NodeJS.Timeout
-  dbTimer?: NodeJS.Timeout
-}
-
-export class StreamUpdateScheduler {
-  private readonly states: Map<string, SchedulerState> = new Map()
-  private readonly messageManager: any
-  private readonly onFlushRender?: () => void
-
-  constructor(options: { messageManager: any; onFlushRender?: () => void }) {
-    this.messageManager = options.messageManager
-    this.onFlushRender = options.onFlushRender
-  }
-
-  private getStateOrCreate(options: {
-    eventId: string
-    conversationId: string
-    parentId?: string
-    isVariant: boolean
-    webContentsId?: number
-  }): SchedulerState {
-    let state = this.states.get(options.eventId)
-    if (!state) {
-      state = {
-        eventId: options.eventId,
-        conversationId: options.conversationId,
-        parentId: options.parentId,
-        isVariant: options.isVariant,
-        webContentsId: options.webContentsId,
-        pendingDelta: {},
-        seq: 0,
-        hasSentInit: false,
-        lastRenderFlushAt: 0,
-        lastDbFlushAt: 0
-      }
-      this.states.set(options.eventId, state)
-    }
-    return state
-  }
-
-  enqueueDelta(
-    eventId: string,
-    conversationId: string,
-    parentId: string | undefined,
-    isVariant: boolean,
-    webContentsId: number | undefined,
-    delta: Partial<LLMAgentEventData>,
-    contentSnapshot?: unknown
-  ): void {
-    if (delta.content && delta.reasoning_content) {
-      const { content, reasoning_content, ...rest } = delta
-      this.enqueueDelta(
-        eventId,
-        conversationId,
-        parentId,
-        isVariant,
-        webContentsId,
-        {
-          ...rest,
-          content
-        },
-        contentSnapshot
-      )
-      this.enqueueDelta(
-        eventId,
-        conversationId,
-        parentId,
-        isVariant,
-        webContentsId,
-        {
-          reasoning_content
-        },
-        contentSnapshot
-      )
-      return
-    }
-
-    const state = this.getStateOrCreate({
-      eventId,
-      conversationId,
-      parentId,
-      isVariant,
-      webContentsId
-    })
-
-    if (contentSnapshot !== undefined) {
-      state.contentSnapshot = contentSnapshot
-    }
-
-    if (!state.hasSentInit) {
-      this.sendInit(state)
-    }
-
-    const shouldFlushImmediately = this.shouldFlushBeforeEnqueue(state, delta)
-    if (shouldFlushImmediately) {
-      this.flushRender(state)
-    }
-
-    if (delta.content) {
-      state.pendingDelta.content = (state.pendingDelta.content ?? '') + delta.content
-    }
-    if (delta.reasoning_content) {
-      state.pendingDelta.reasoning_content =
-        (state.pendingDelta.reasoning_content ?? '') + delta.reasoning_content
-    }
-    if (delta.reasoning_time) {
-      // Always use the latest reasoning_time (contains updated end time)
-      state.pendingDelta.reasoning_time = delta.reasoning_time
-    }
-    if (delta.tool_call !== undefined) {
-      state.pendingDelta.tool_call = delta.tool_call
-    }
-    if (delta.tool_call_id !== undefined) {
-      state.pendingDelta.tool_call_id = delta.tool_call_id
-    }
-    if (delta.tool_call_name !== undefined) {
-      state.pendingDelta.tool_call_name = delta.tool_call_name
-    }
-    if (delta.tool_call_params !== undefined) {
-      state.pendingDelta.tool_call_params = delta.tool_call_params
-    }
-    if (delta.tool_call_response !== undefined) {
-      state.pendingDelta.tool_call_response = delta.tool_call_response
-    }
-    if (delta.tool_call_server_name !== undefined) {
-      state.pendingDelta.tool_call_server_name = delta.tool_call_server_name
-    }
-    if (delta.tool_call_server_icons !== undefined) {
-      state.pendingDelta.tool_call_server_icons = delta.tool_call_server_icons
-    }
-    if (delta.tool_call_server_description !== undefined) {
-      state.pendingDelta.tool_call_server_description = delta.tool_call_server_description
-    }
-    if (delta.tool_call_response_raw !== undefined) {
-      state.pendingDelta.tool_call_response_raw = delta.tool_call_response_raw
-    }
-    if (delta.permission_request !== undefined) {
-      state.pendingDelta.permission_request = delta.permission_request
-    }
-    if (delta.question_request !== undefined) {
-      state.pendingDelta.question_request = delta.question_request
-    }
-    if (delta.question_error !== undefined) {
-      state.pendingDelta.question_error = delta.question_error
-    }
-    if (delta.maximum_tool_calls_reached !== undefined) {
-      state.pendingDelta.maximum_tool_calls_reached = delta.maximum_tool_calls_reached
-    }
-    if (delta.image_data !== undefined) {
-      state.pendingDelta.image_data = delta.image_data
-    }
-    if (delta.rate_limit !== undefined) {
-      state.pendingDelta.rate_limit = delta.rate_limit
-    }
-    if (delta.totalUsage !== undefined) {
-      state.pendingDelta.totalUsage = delta.totalUsage
-    }
-
-    const now = Date.now()
-
-    if (shouldFlushImmediately) {
-      this.flushRender(state)
-    } else {
-      const renderDelay = Math.max(
-        0,
-        STREAM_RENDER_FLUSH_INTERVAL_MS - (now - state.lastRenderFlushAt)
-      )
-      this.scheduleRenderFlush(state, renderDelay)
-    }
-
-    const dbDelay = Math.max(0, STREAM_DB_FLUSH_INTERVAL_MS - (now - state.lastDbFlushAt))
-    this.scheduleDbFlush(state, dbDelay)
-  }
-
-  private sendInit(state: SchedulerState): void {
-    state.hasSentInit = true
-
-    const eventData: LLMAgentEventData = {
-      eventId: state.eventId,
-      conversationId: state.conversationId,
-      parentId: state.parentId,
-      is_variant: state.isVariant,
-      stream_kind: 'init',
-      seq: state.seq
-    }
-
-    eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, eventData)
-  }
-
-  private scheduleRenderFlush(state: SchedulerState, delayMs: number): void {
-    if (state.renderTimer) return
-
-    state.renderTimer = setTimeout(() => {
-      this.flushRender(state)
-    }, delayMs)
-  }
-
-  private flushRender(state: SchedulerState): void {
-    if (state.renderTimer) {
-      clearTimeout(state.renderTimer)
-      state.renderTimer = undefined
-    }
-
-    const delta = state.pendingDelta
-    const hasContent = Object.keys(delta).length > 0
-
-    if (hasContent) {
-      state.lastRenderFlushAt = Date.now()
-      state.seq += 1
-
-      const eventData: LLMAgentEventData = {
-        eventId: state.eventId,
-        conversationId: state.conversationId,
-        parentId: state.parentId,
-        is_variant: state.isVariant,
-        stream_kind: 'delta',
-        seq: state.seq,
-        content: delta.content,
-        reasoning_content: delta.reasoning_content,
-        reasoning_time: delta.reasoning_time,
-        tool_call: delta.tool_call,
-        tool_call_id: delta.tool_call_id,
-        tool_call_name: delta.tool_call_name,
-        tool_call_params: delta.tool_call_params,
-        tool_call_response: delta.tool_call_response,
-        tool_call_server_name: delta.tool_call_server_name,
-        tool_call_server_icons: delta.tool_call_server_icons,
-        tool_call_server_description: delta.tool_call_server_description,
-        tool_call_response_raw: delta.tool_call_response_raw,
-        permission_request: delta.permission_request,
-        question_request: delta.question_request,
-        question_error: delta.question_error,
-        maximum_tool_calls_reached: delta.maximum_tool_calls_reached,
-        image_data: delta.image_data,
-        rate_limit: delta.rate_limit,
-        totalUsage: delta.totalUsage
-      }
-
-      eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, eventData)
-      state.pendingDelta = {}
-    }
-
-    this.onFlushRender?.()
-  }
-
-  private scheduleDbFlush(state: SchedulerState, delayMs: number): void {
-    if (state.dbTimer) return
-
-    state.dbTimer = setTimeout(() => {
-      void this.flushDb(state)
-    }, delayMs)
-  }
-
-  private getDeltaKind(
-    delta: Partial<LLMAgentEventData> | PendingDelta
-  ): 'tool_call' | 'image' | 'rate_limit' | 'reasoning' | 'content' | 'mixed' | null {
-    if (delta.tool_call !== undefined) return 'tool_call'
-    if (delta.image_data !== undefined) return 'image'
-    if (delta.rate_limit !== undefined) return 'rate_limit'
-    if (delta.content && delta.reasoning_content) return 'mixed'
-    if (delta.reasoning_content) return 'reasoning'
-    if (delta.content) return 'content'
-    return null
-  }
-
-  private shouldFlushBeforeEnqueue(
-    state: SchedulerState,
-    delta: Partial<LLMAgentEventData>
-  ): boolean {
-    if (Object.keys(state.pendingDelta).length === 0) return false
-
-    const pendingKind = this.getDeltaKind(state.pendingDelta)
-    const incomingKind = this.getDeltaKind(delta)
-    if (!pendingKind || !incomingKind) return false
-
-    if (pendingKind !== incomingKind) return true
-
-    if (pendingKind === 'image' || pendingKind === 'rate_limit') {
-      return true
-    }
-
-    if (pendingKind === 'tool_call') {
-      if (state.pendingDelta.tool_call !== delta.tool_call) return true
-      if (
-        state.pendingDelta.tool_call_id &&
-        delta.tool_call_id &&
-        state.pendingDelta.tool_call_id !== delta.tool_call_id
-      ) {
-        return true
-      }
-      if (
-        state.pendingDelta.tool_call_name &&
-        delta.tool_call_name &&
-        state.pendingDelta.tool_call_name !== delta.tool_call_name
-      ) {
-        return true
-      }
-    }
-
-    return false
-  }
-
-  private flushDb(state: SchedulerState): Promise<void> {
-    state.lastDbFlushAt = Date.now()
-
-    if (state.dbTimer) {
-      clearTimeout(state.dbTimer)
-      state.dbTimer = undefined
-    }
-
-    if (!state.contentSnapshot) {
-      return Promise.resolve()
-    }
-
-    return this.messageManager
-      .editMessageSilently(state.eventId, JSON.stringify(state.contentSnapshot))
-      .catch((err: unknown) => {
-        console.error('[StreamUpdateScheduler] Failed to flush DB:', err)
-      })
-  }
-
-  async flushAll(eventId: string, kind: 'final' = 'final'): Promise<void> {
-    const state = this.states.get(eventId)
-    if (!state) return
-
-    if (state.renderTimer) {
-      clearTimeout(state.renderTimer)
-      state.renderTimer = undefined
-    }
-    if (state.dbTimer) {
-      clearTimeout(state.dbTimer)
-      state.dbTimer = undefined
-    }
-
-    const delta = state.pendingDelta
-    const hasContent = Object.keys(delta).length > 0
-
-    if (hasContent) {
-      state.seq += 1
-
-      const eventData: LLMAgentEventData = {
-        eventId: state.eventId,
-        conversationId: state.conversationId,
-        parentId: state.parentId,
-        is_variant: state.isVariant,
-        stream_kind: kind,
-        seq: state.seq,
-        content: delta.content,
-        reasoning_content: delta.reasoning_content,
-        reasoning_time: delta.reasoning_time,
-        tool_call: delta.tool_call,
-        tool_call_id: delta.tool_call_id,
-        tool_call_name: delta.tool_call_name,
-        tool_call_params: delta.tool_call_params,
-        tool_call_response: delta.tool_call_response,
-        tool_call_server_name: delta.tool_call_server_name,
-        tool_call_server_icons: delta.tool_call_server_icons,
-        tool_call_server_description: delta.tool_call_server_description,
-        tool_call_response_raw: delta.tool_call_response_raw,
-        permission_request: delta.permission_request,
-        question_request: delta.question_request,
-        question_error: delta.question_error,
-        maximum_tool_calls_reached: delta.maximum_tool_calls_reached,
-        image_data: delta.image_data,
-        rate_limit: delta.rate_limit,
-        totalUsage: delta.totalUsage
-      }
-
-      eventBus.sendToRenderer(STREAM_EVENTS.RESPONSE, SendTarget.ALL_WINDOWS, eventData)
-    }
-
-    await this.flushDb(state)
-
-    this.states.delete(eventId)
-  }
-
-  cleanup(eventId: string): void {
-    const state = this.states.get(eventId)
-    if (!state) return
-
-    if (state.renderTimer) {
-      clearTimeout(state.renderTimer)
-      state.renderTimer = undefined
-    }
-    if (state.dbTimer) {
-      clearTimeout(state.dbTimer)
-      state.dbTimer = undefined
-    }
-
-    this.states.delete(eventId)
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/types.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/types.ts
deleted file mode 100644
index e960eedf5..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/types.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import type { AssistantMessage } from '@shared/chat'
-import type { PendingToolCall } from '../message/messageBuilder'
-
-export interface GeneratingMessageState {
-  message: AssistantMessage
-  conversationId: string
-  startTime: number
-  firstTokenTime: number | null
-  promptTokens: number
-  reasoningStartTime: number | null
-  reasoningEndTime: number | null
-  lastReasoningTime: number | null
-  isCancelled?: boolean
-  pendingToolCall?: PendingToolCall
-  totalUsage?: {
-    prompt_tokens: number
-    completion_tokens: number
-    total_tokens: number
-    context_length: number
-  }
-  adaptiveBuffer?: {
-    content: string
-    lastUpdateTime: number
-    updateCount: number
-    totalSize: number
-    isLargeContent: boolean
-    chunks?: string[]
-    currentChunkIndex?: number
-    sentPosition: number
-    isProcessing?: boolean
-  }
-  flushTimeout?: NodeJS.Timeout
-  throttleTimeout?: NodeJS.Timeout
-  lastRendererUpdateTime?: number
-  webContentsId?: number
-}
-
-export type { StreamUpdateScheduler } from './streamUpdateScheduler'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolCallCenter.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolCallCenter.ts
deleted file mode 100644
index 86e09d92d..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolCallCenter.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import type {
-  IToolPresenter,
-  MCPToolCall,
-  MCPToolDefinition,
-  MCPToolResponse
-} from '@shared/presenter'
-
-export type ToolCallContext = {
-  enabledMcpTools?: string[]
-  disabledAgentTools?: string[]
-  chatMode?: 'agent' | 'acp agent'
-  supportsVision?: boolean
-  agentWorkspacePath?: string | null
-  conversationId?: string
-}
-
-export class ToolCallCenter {
-  constructor(private readonly toolPresenter: IToolPresenter) {}
-
-  async getAllToolDefinitions(context: ToolCallContext): Promise<MCPToolDefinition[]> {
-    return this.toolPresenter.getAllToolDefinitions(context)
-  }
-
-  async callTool(request: MCPToolCall): Promise<{ content: unknown; rawData: MCPToolResponse }> {
-    return this.toolPresenter.callTool(request)
-  }
-
-  buildToolSystemPrompt(context: {
-    conversationId?: string
-    toolDefinitions?: MCPToolDefinition[]
-  }): string {
-    return this.toolPresenter.buildToolSystemPrompt(context)
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRegistry.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRegistry.ts
deleted file mode 100644
index 1836bb876..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRegistry.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-export type ToolRegistrySource = 'mcp' | 'agent' | 'browser' | 'builtin'
-
-export type ToolRegistryEntry = {
-  name: string
-  source: ToolRegistrySource
-}
-
-export class ToolRegistry {
-  private readonly registry = new Map<string, ToolRegistryEntry>()
-
-  register(entry: ToolRegistryEntry): void {
-    this.registry.set(entry.name, entry)
-  }
-
-  get(name: string): ToolRegistryEntry | undefined {
-    return this.registry.get(name)
-  }
-
-  list(): ToolRegistryEntry[] {
-    return Array.from(this.registry.values())
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRouter.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRouter.ts
deleted file mode 100644
index 15a70cd65..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/tool/toolRouter.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { ToolRegistrySource } from './toolRegistry'
-
-export type ToolRouteDecision = {
-  target: ToolRegistrySource
-  permissionType?: 'read' | 'write' | 'all' | 'command'
-}
-
-export function resolveToolRoute(_toolName: string): ToolRouteDecision {
-  return { target: 'mcp' }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types.ts
deleted file mode 100644
index 88ffb3de0..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type {
-  SessionContext,
-  SessionContextResolved,
-  SessionStatus
-} from './session/sessionContext'
-export type { SessionResolveInput } from './session/sessionResolver'
-export { resolveSessionContext } from './session/sessionResolver'
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types/handlerContext.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types/handlerContext.ts
deleted file mode 100644
index 08e76622a..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/types/handlerContext.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import type {
-  IConfigPresenter,
-  ILlmProviderPresenter,
-  ISQLitePresenter,
-  IToolPresenter
-} from '@shared/presenter'
-import type { CONVERSATION } from '@shared/presenter'
-import type { MessageManager } from '../../sessionPresenter/managers/messageManager'
-import type { AgentSessionRuntimePort } from '../session/sessionRuntimePort'
-import type {
-  AgentMcpRuntimePort,
-  AgentPermissionRuntimePort,
-  AgentPromptRuntimePort
-} from '../runtimePorts'
-
-export type ThreadHandlerContext = {
-  sqlitePresenter: ISQLitePresenter
-  messageManager: MessageManager
-  llmProviderPresenter: ILlmProviderPresenter
-  configPresenter: IConfigPresenter
-  sessionRuntime: AgentSessionRuntimePort
-  toolPresenter: IToolPresenter
-  mcpRuntime: AgentMcpRuntimePort
-  promptRuntime: AgentPromptRuntimePort
-  permissionRuntime: AgentPermissionRuntimePort
-}
-
-export class BaseHandler {
-  protected ctx: ThreadHandlerContext
-
-  constructor(context: ThreadHandlerContext) {
-    this.ctx = context
-  }
-
-  protected get sqlitePresenter(): ISQLitePresenter {
-    return this.ctx.sqlitePresenter
-  }
-
-  protected get messageManager(): MessageManager {
-    return this.ctx.messageManager
-  }
-
-  protected get llmProviderPresenter(): ILlmProviderPresenter {
-    return this.ctx.llmProviderPresenter
-  }
-
-  protected get configPresenter(): IConfigPresenter {
-    return this.ctx.configPresenter
-  }
-
-  protected get sessionRuntime(): AgentSessionRuntimePort {
-    return this.ctx.sessionRuntime
-  }
-
-  protected get toolPresenter(): IToolPresenter {
-    return this.ctx.toolPresenter
-  }
-
-  protected get mcpRuntime(): AgentMcpRuntimePort {
-    return this.ctx.mcpRuntime
-  }
-
-  protected get promptRuntime(): AgentPromptRuntimePort {
-    return this.ctx.promptRuntime
-  }
-
-  protected get permissionRuntime(): AgentPermissionRuntimePort {
-    return this.ctx.permissionRuntime
-  }
-
-  protected async getMessage(messageId: string) {
-    return this.messageManager.getMessage(messageId)
-  }
-
-  protected async getConversation(conversationId: string): Promise<CONVERSATION> {
-    const conversation = await this.ctx.sqlitePresenter.getConversation(conversationId)
-    if (!conversation) {
-      throw new Error('Conversation not found')
-    }
-    return conversation
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/promptEnhancer.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/promptEnhancer.ts
deleted file mode 100644
index 3f412787e..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/promptEnhancer.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-interface EnhanceOptions {
-  isImageGeneration?: boolean
-  agentWorkspacePath?: string | null
-  platform?: NodeJS.Platform
-}
-
-export function enhanceSystemPromptWithDateTime(
-  systemPrompt: string,
-  options: EnhanceOptions = {}
-): string {
-  const { isImageGeneration = false } = options
-
-  if (isImageGeneration) return systemPrompt
-
-  return systemPrompt?.trim() ?? ''
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/utilityHandler.ts b/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/utilityHandler.ts
deleted file mode 100644
index 39cc2ed69..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/utility/utilityHandler.ts
+++ /dev/null
@@ -1,329 +0,0 @@
-import type {
-  ChatMessage,
-  CONVERSATION,
-  CONVERSATION_SETTINGS,
-  LLMAgentEventData
-} from '@shared/presenter'
-import type { AssistantMessageBlock, Message, UserMessageContent } from '@shared/chat'
-import { BaseHandler, type ThreadHandlerContext } from '../types/handlerContext'
-import { buildUserMessageContext } from '../message/messageFormatter'
-import {
-  buildConversationExportContent,
-  generateExportFilename,
-  type ConversationExportFormat
-} from '../../exporter/formats/conversationExporter'
-
-// Translation constants
-const TRANSLATION_TEMPERATURE = 0.3
-const TRANSLATION_TIMEOUT_MS = 1000
-
-// Message length constant for context calculation
-const DEFAULT_MESSAGE_LENGTH = 300
-
-export interface UtilityHandlerOptions {
-  getActiveConversation: (webContentsId: number) => Promise<CONVERSATION | null>
-  getActiveConversationId: (webContentsId: number) => Promise<string | null>
-  createConversation: (
-    title: string,
-    settings: Partial<CONVERSATION_SETTINGS>,
-    webContentsId: number
-  ) => Promise<string>
-}
-
-export class UtilityHandler extends BaseHandler {
-  private readonly getActiveConversation: (webContentsId: number) => Promise<CONVERSATION | null>
-  private readonly getActiveConversationId: (webContentsId: number) => Promise<string | null>
-  private readonly createConversation: (
-    title: string,
-    settings: Partial<CONVERSATION_SETTINGS>,
-    webContentsId: number
-  ) => Promise<string>
-
-  constructor(context: ThreadHandlerContext, options: UtilityHandlerOptions) {
-    super(context)
-    this.getActiveConversation = options.getActiveConversation
-    this.getActiveConversationId = options.getActiveConversationId
-    this.createConversation = options.createConversation
-  }
-
-  async translateText(text: string, webContentsId: number): Promise<string> {
-    try {
-      let conversation = await this.getActiveConversation(webContentsId)
-      if (!conversation) {
-        // Create a temporary conversation for translation
-        const defaultProvider = this.ctx.configPresenter.getDefaultProviders()[0]
-        const models = await this.ctx.llmProviderPresenter.getModelList(defaultProvider.id)
-        const defaultModel = models[0]
-        const conversationId = await this.createConversation(
-          'Temporary translation conversation',
-          {
-            modelId: defaultModel.id,
-            providerId: defaultProvider.id
-          },
-          webContentsId
-        )
-        conversation = await this.getConversation(conversationId)
-      }
-
-      const { providerId, modelId } = conversation.settings
-      const messages: ChatMessage[] = [
-        {
-          role: 'system',
-          content:
-            'You are a translation assistant. Translate the user input to Chinese and return only the translated text without any additional content.'
-        },
-        {
-          role: 'user',
-          content: text
-        }
-      ]
-
-      let translatedText = ''
-      const stream = this.ctx.llmProviderPresenter.startStreamCompletion(
-        providerId,
-        messages,
-        modelId,
-        'translate-' + Date.now(),
-        TRANSLATION_TEMPERATURE,
-        TRANSLATION_TIMEOUT_MS
-      )
-
-      for await (const event of stream) {
-        if (event.type === 'response') {
-          const msg = event.data as LLMAgentEventData
-          if (msg.content) {
-            translatedText += msg.content
-          }
-        } else if (event.type === 'error') {
-          const msg = event.data as { eventId: string; error: string }
-          throw new Error(msg.error || 'Translation failed')
-        }
-      }
-
-      return translatedText.trim()
-    } catch (error) {
-      console.error('Translation failed:', error)
-      if (error instanceof Error) {
-        error.message = 'Translation failed'
-        throw error
-      }
-      throw new Error('Translation failed')
-    }
-  }
-
-  async askAI(text: string, webContentsId: number): Promise<string> {
-    try {
-      let conversation = await this.getActiveConversation(webContentsId)
-      if (!conversation) {
-        // Create a temporary conversation for AI query
-        const defaultProvider = this.ctx.configPresenter.getDefaultProviders()[0]
-        const models = await this.ctx.llmProviderPresenter.getModelList(defaultProvider.id)
-        const defaultModel = models[0]
-        const conversationId = await this.createConversation(
-          '临时AI对话',
-          {
-            modelId: defaultModel.id,
-            providerId: defaultProvider.id
-          },
-          webContentsId
-        )
-        conversation = await this.getConversation(conversationId)
-      }
-
-      const { providerId, modelId } = conversation.settings
-      const messages: ChatMessage[] = [
-        {
-          role: 'system',
-          content: '你是一个AI助手。请简洁地回答用户的问题。'
-        },
-        {
-          role: 'user',
-          content: text
-        }
-      ]
-
-      let aiAnswer = ''
-      const stream = this.ctx.llmProviderPresenter.startStreamCompletion(
-        providerId,
-        messages,
-        modelId,
-        'ask-ai-' + Date.now(),
-        0.7,
-        1000
-      )
-
-      for await (const event of stream) {
-        if (event.type === 'response') {
-          const msg = event.data as LLMAgentEventData
-          if (msg.content) {
-            aiAnswer += msg.content
-          }
-        } else if (event.type === 'error') {
-          const msg = event.data as { eventId: string; error: string }
-          throw new Error(msg.error || 'AI回答失败')
-        }
-      }
-
-      return aiAnswer.trim()
-    } catch (error) {
-      console.error('AI query failed:', error)
-      throw error
-    }
-  }
-
-  async exportConversation(
-    conversationId: string,
-    format: ConversationExportFormat = 'markdown'
-  ): Promise<{ filename: string; content: string }> {
-    try {
-      // Get conversation
-      const conversation = await this.getConversation(conversationId)
-      if (!conversation) {
-        throw new Error('Conversation not found')
-      }
-
-      // Get all messages
-      const { list: messages } = await this.ctx.messageManager.getMessageThread(
-        conversationId,
-        1,
-        10000
-      )
-
-      // Filter out unsent messages
-      const validMessages = messages.filter((msg) => msg.status === 'sent')
-
-      // Apply variant selection
-      const selectedVariantsMap = conversation.settings.selectedVariantsMap || {}
-      const variantAwareMessages = this.applyVariantSelection(validMessages, selectedVariantsMap)
-
-      // Generate filename
-      const filename = generateExportFilename(format)
-      const content = buildConversationExportContent(conversation, variantAwareMessages, format)
-
-      return { filename, content }
-    } catch (error) {
-      console.error('Failed to export conversation:', error)
-      throw error
-    }
-  }
-
-  async summaryTitles(webContentsId?: number, conversationId?: string): Promise<string> {
-    const activeId =
-      webContentsId !== undefined ? await this.getActiveConversationId(webContentsId) : null
-    const targetConversationId = conversationId ?? activeId ?? undefined
-    if (!targetConversationId) {
-      throw new Error('Conversation not found')
-    }
-    const conversation = await this.getConversation(targetConversationId)
-    if (!conversation) {
-      throw new Error('Conversation not found')
-    }
-
-    // Get context messages
-    let messageCount = Math.ceil(conversation.settings.contextLength / DEFAULT_MESSAGE_LENGTH)
-    if (messageCount < 2) {
-      messageCount = 2
-    }
-    const messages = await this.ctx.messageManager.getContextMessages(conversation.id, messageCount)
-
-    const selectedVariantsMap = conversation.settings.selectedVariantsMap || {}
-    const variantAwareMessages = this.applyVariantSelection(messages, selectedVariantsMap)
-    const messagesWithLength = variantAwareMessages
-      .map((msg) => {
-        if (msg.role === 'user') {
-          const userContent = msg.content as UserMessageContent
-          const serializedContent = buildUserMessageContext(userContent)
-          return {
-            message: msg,
-            length: serializedContent.length,
-            formattedMessage: {
-              role: 'user' as const,
-              content: serializedContent
-            }
-          }
-        } else {
-          const content = (msg.content as AssistantMessageBlock[])
-            .filter((block) => block.type === 'content')
-            .map((block) => block.content)
-            .join('\n')
-          return {
-            message: msg,
-            length: content.length,
-            formattedMessage: {
-              role: 'assistant' as const,
-              content: content
-            }
-          }
-        }
-      })
-      .filter((item) => item.formattedMessage.content.length > 0)
-    const assistantModel = this.ctx.configPresenter.getSetting<{
-      providerId: string
-      modelId: string
-    }>('assistantModel')
-    const fallbackProviderId = conversation.settings.providerId
-    const fallbackModelId = conversation.settings.modelId
-    const preferredProviderId = assistantModel?.providerId || fallbackProviderId
-    const preferredModelId = assistantModel?.modelId || fallbackModelId
-
-    let title: string
-    try {
-      title = await this.ctx.llmProviderPresenter.summaryTitles(
-        messagesWithLength.map((item) => item.formattedMessage),
-        preferredProviderId,
-        preferredModelId
-      )
-    } catch (error) {
-      const shouldFallback =
-        preferredProviderId !== fallbackProviderId || preferredModelId !== fallbackModelId
-      if (!shouldFallback) {
-        throw error
-      }
-      console.warn(
-        '[UtilityHandler] Failed to generate title with assistant model, fallback to conversation model',
-        {
-          preferredProviderId,
-          preferredModelId,
-          fallbackProviderId,
-          fallbackModelId,
-          error
-        }
-      )
-      title = await this.ctx.llmProviderPresenter.summaryTitles(
-        messagesWithLength.map((item) => item.formattedMessage),
-        fallbackProviderId,
-        fallbackModelId
-      )
-    }
-    let cleanedTitle = title.replace(/<think>.*?<\/think>/g, '').trim()
-    cleanedTitle = cleanedTitle.replace(/^<think>/, '').trim()
-    return cleanedTitle
-  }
-
-  /**
-   * Applies variant selection to messages based on selectedVariantsMap.
-   * Returns messages with selected variant fields applied when a variant is selected.
-   */
-  private applyVariantSelection(
-    messages: Message[],
-    selectedVariantsMap: Record<string, string>
-  ): Message[] {
-    return messages.map((msg) => {
-      if (msg.role === 'assistant' && selectedVariantsMap[msg.id] && msg.variants) {
-        const selectedVariantId = selectedVariantsMap[msg.id]
-        const selectedVariant = msg.variants.find((v) => v.id === selectedVariantId)
-
-        if (selectedVariant) {
-          const newMsg = JSON.parse(JSON.stringify(msg))
-          newMsg.content = selectedVariant.content
-          newMsg.usage = selectedVariant.usage
-          newMsg.model_id = selectedVariant.model_id
-          newMsg.model_provider = selectedVariant.model_provider
-          newMsg.model_name = selectedVariant.model_name
-          return newMsg
-        }
-      }
-      return msg
-    })
-  }
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/src/shared/types/presenters/agent.presenter.d.ts b/archives/code/legacy-agentpresenter-retirement/src/shared/types/presenters/agent.presenter.d.ts
deleted file mode 100644
index 84ef9a2d7..000000000
--- a/archives/code/legacy-agentpresenter-retirement/src/shared/types/presenters/agent.presenter.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { AssistantMessage } from '@shared/chat'
-
-export interface IAgentPresenter {
-  sendMessage(
-    agentId: string,
-    content: string,
-    webContentsId?: number,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage | null>
-  continueLoop(
-    agentId: string,
-    messageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage | null>
-  cancelLoop(messageId: string): Promise<void>
-  retryMessage(
-    messageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage>
-  regenerateFromUserMessage(
-    agentId: string,
-    userMessageId: string,
-    selectedVariantsMap?: Record<string, string>
-  ): Promise<AssistantMessage>
-  translateText(text: string, webContentsId: number): Promise<string>
-  askAI(text: string, webContentsId: number): Promise<string>
-  handlePermissionResponse(
-    messageId: string,
-    toolCallId: string,
-    granted: boolean,
-    permissionType: 'read' | 'write' | 'all' | 'command',
-    remember?: boolean
-  ): Promise<void>
-  resolveQuestion(
-    messageId: string,
-    toolCallId: string,
-    answerText: string,
-    answerMessageId?: string
-  ): Promise<void>
-  rejectQuestion(messageId: string, toolCallId: string): Promise<void>
-  cleanupConversation(conversationId: string): Promise<void>
-}
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/agentPresenter.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/agentPresenter.test.ts
deleted file mode 100644
index 32ebdf072..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/agentPresenter.test.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import * as agentPresenterModule from '../../../../src/main/presenter/agentPresenter'
-
-describe('AgentPresenter scaffolding', () => {
-  it('loads module entrypoint', () => {
-    expect(agentPresenterModule).toBeDefined()
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/agentLoopHandler.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/agentLoopHandler.test.ts
deleted file mode 100644
index 8b3203c8b..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/agentLoopHandler.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { AgentLoopHandler } from '@/presenter/agentPresenter/loop/agentLoopHandler'
-
-vi.mock('@/eventbus', () => ({
-  eventBus: {
-    sendToRenderer: vi.fn()
-  },
-  SendTarget: {
-    ALL_WINDOWS: 'ALL_WINDOWS'
-  }
-}))
-
-describe('AgentLoopHandler session runtime wiring', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('resolves model and workspace through injected session runtime in tool processing', async () => {
-    const toolPresenter = {
-      getAllToolDefinitions: vi.fn().mockResolvedValue([
-        {
-          function: {
-            name: 'read'
-          },
-          server: {
-            name: 'agent-filesystem',
-            icons: '',
-            description: 'Filesystem'
-          }
-        }
-      ]),
-      preCheckToolPermission: vi.fn().mockResolvedValue(null),
-      callTool: vi.fn().mockResolvedValue({
-        content: 'ok',
-        rawData: {}
-      })
-    }
-    const sessionRuntime = {
-      getSession: vi.fn().mockResolvedValue({
-        resolved: {
-          modelId: 'model-from-session'
-        }
-      }),
-      resolveWorkspaceContext: vi.fn().mockResolvedValue({
-        chatMode: 'agent',
-        agentWorkspacePath: 'C:/workspace'
-      })
-    }
-    const handler = new AgentLoopHandler({
-      configPresenter: {} as any,
-      getProviderInstance: vi.fn() as any,
-      activeStreams: new Map(),
-      canStartNewStream: vi.fn().mockReturnValue(true),
-      rateLimitManager: {} as any,
-      sessionRuntime,
-      getToolPresenter: () => toolPresenter as any
-    })
-
-    const processor = (handler as any).toolCallProcessor.process({
-      eventId: 'evt-loop',
-      toolCalls: [{ id: 'tool-1', name: 'read', arguments: '{}' }],
-      enabledMcpTools: [],
-      conversationMessages: [],
-      modelConfig: {
-        functionCall: false,
-        type: 'chat'
-      },
-      abortSignal: new AbortController().signal,
-      currentToolCallCount: 0,
-      maxToolCalls: 5,
-      conversationId: 'conv-loop',
-      providerId: 'mock-provider'
-    })
-
-    while (true) {
-      const next = await processor.next()
-      if (next.done) {
-        break
-      }
-    }
-
-    expect(sessionRuntime.getSession).toHaveBeenCalledWith('conv-loop')
-    expect(sessionRuntime.resolveWorkspaceContext).toHaveBeenCalledWith(
-      'conv-loop',
-      'model-from-session'
-    )
-    expect(toolPresenter.getAllToolDefinitions).toHaveBeenCalled()
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/toolCallProcessor.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/toolCallProcessor.test.ts
deleted file mode 100644
index b6efea844..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/loop/toolCallProcessor.test.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import fs from 'fs/promises'
-import os from 'os'
-import path from 'path'
-import { app } from 'electron'
-import { ToolCallProcessor } from '@/presenter/agentPresenter/loop/toolCallProcessor'
-import type {
-  ChatMessage,
-  MCPToolDefinition,
-  MCPToolResponse,
-  ModelConfig
-} from '@shared/presenter'
-
-vi.mock('@/presenter', () => ({
-  presenter: {
-    hooksNotifications: {
-      dispatchEvent: vi.fn()
-    }
-  }
-}))
-
-describe('ToolCallProcessor tool output offload', () => {
-  let tempHome: string
-  let getPathSpy: ReturnType<typeof vi.spyOn>
-
-  const toolDefinition = {
-    type: 'function',
-    function: {
-      name: 'exec',
-      description: 'execute command',
-      parameters: {
-        type: 'object',
-        properties: {}
-      }
-    },
-    server: {
-      name: 'mock',
-      icons: '',
-      description: ''
-    }
-  } as MCPToolDefinition
-
-  beforeEach(async () => {
-    tempHome = await fs.mkdtemp(path.join(os.tmpdir(), 'tool-offload-'))
-    getPathSpy = vi.spyOn(app, 'getPath').mockReturnValue(tempHome)
-  })
-
-  afterEach(async () => {
-    getPathSpy.mockRestore()
-    await fs.rm(tempHome, { recursive: true, force: true })
-  })
-
-  it('offloads large tool responses and returns stub content', async () => {
-    const longOutput = 'x'.repeat(5001)
-    const rawData = { content: longOutput } as MCPToolResponse
-    const processor = new ToolCallProcessor({
-      getAllToolDefinitions: async () => [toolDefinition],
-      callTool: async () => ({ content: longOutput, rawData })
-    })
-
-    const conversationMessages: ChatMessage[] = [{ role: 'assistant', content: 'hello' }]
-    const conversationId = 'conv-123'
-    const modelConfig = { functionCall: true } as ModelConfig
-
-    const events: any[] = []
-    for await (const event of processor.process({
-      eventId: 'event-1',
-      toolCalls: [{ id: 'tool:1', name: 'exec', arguments: '{}' }],
-      enabledMcpTools: [],
-      conversationMessages,
-      modelConfig,
-      abortSignal: new AbortController().signal,
-      currentToolCallCount: 0,
-      maxToolCalls: 5,
-      conversationId
-    })) {
-      events.push(event)
-    }
-
-    const endEvent = events.find(
-      (event) => event.type === 'response' && event.data?.tool_call === 'end'
-    )
-    expect(endEvent).toBeDefined()
-
-    const stub = endEvent.data.tool_call_response as string
-    const expectedPath = path.join(
-      tempHome,
-      '.deepchat',
-      'sessions',
-      conversationId,
-      'tool_tool_1.offload'
-    )
-    expect(stub).toContain('[Tool output offloaded]')
-    expect(stub).toContain(`Total characters: ${longOutput.length}`)
-    expect(stub).toContain(expectedPath)
-    expect(endEvent.data.tool_call_response_raw).toBe(rawData)
-
-    const saved = await fs.readFile(expectedPath, 'utf-8')
-    expect(saved).toBe(longOutput)
-
-    const toolMessage = conversationMessages.find((message) => message.role === 'tool')
-    expect(toolMessage?.content).toContain('[Tool output offloaded]')
-  })
-})
-
-describe('ToolCallProcessor question tool', () => {
-  const questionToolDef = {
-    type: 'function',
-    function: {
-      name: 'deepchat_question',
-      description: 'question tool',
-      parameters: {
-        type: 'object',
-        properties: {}
-      }
-    },
-    server: {
-      name: 'agent-core',
-      icons: '❓',
-      description: 'Agent core tools'
-    }
-  } as MCPToolDefinition
-
-  const executeCommandDef = {
-    type: 'function',
-    function: {
-      name: 'exec',
-      description: 'execute command',
-      parameters: {
-        type: 'object',
-        properties: {}
-      }
-    },
-    server: {
-      name: 'mock',
-      icons: '',
-      description: ''
-    }
-  } as MCPToolDefinition
-
-  const basicQuestionArgs = JSON.stringify({
-    question: 'Choose one',
-    options: [{ label: 'A' }, { label: 'B' }]
-  })
-
-  it('emits question-required and pauses the loop', async () => {
-    const callTool = vi.fn()
-    const processor = new ToolCallProcessor({
-      getAllToolDefinitions: async () => [questionToolDef],
-      callTool
-    })
-
-    const conversationMessages: ChatMessage[] = [{ role: 'assistant', content: 'hello' }]
-    const iterator = processor.process({
-      eventId: 'event-question-1',
-      toolCalls: [{ id: 'tool-q1', name: 'deepchat_question', arguments: basicQuestionArgs }],
-      enabledMcpTools: [],
-      conversationMessages,
-      modelConfig: { functionCall: true } as ModelConfig,
-      abortSignal: new AbortController().signal,
-      currentToolCallCount: 0,
-      maxToolCalls: 5,
-      conversationId: 'conv-question'
-    })
-
-    const events: any[] = []
-    let result: any = null
-    while (true) {
-      const { value, done } = await iterator.next()
-      if (done) {
-        result = value
-        break
-      }
-      events.push(value)
-    }
-
-    const questionEvent = events.find(
-      (event) => event.type === 'response' && event.data?.tool_call === 'question-required'
-    )
-    expect(questionEvent).toBeDefined()
-    expect(questionEvent.data.question_request?.question).toBe('Choose one')
-    expect(result.needContinueConversation).toBe(false)
-    expect(callTool).not.toHaveBeenCalled()
-  })
-
-  it('rejects non-standalone question tool calls', async () => {
-    const callTool = vi.fn(async () => ({
-      content: 'ok',
-      rawData: { content: 'ok' } as MCPToolResponse
-    }))
-    const processor = new ToolCallProcessor({
-      getAllToolDefinitions: async () => [questionToolDef, executeCommandDef],
-      callTool
-    })
-
-    const conversationMessages: ChatMessage[] = [{ role: 'assistant', content: 'hello' }]
-    const iterator = processor.process({
-      eventId: 'event-question-2',
-      toolCalls: [
-        { id: 'tool-q1', name: 'deepchat_question', arguments: basicQuestionArgs },
-        { id: 'tool-2', name: 'exec', arguments: '{}' }
-      ],
-      enabledMcpTools: [],
-      conversationMessages,
-      modelConfig: { functionCall: true } as ModelConfig,
-      abortSignal: new AbortController().signal,
-      currentToolCallCount: 0,
-      maxToolCalls: 5,
-      conversationId: 'conv-question'
-    })
-
-    const events: any[] = []
-    let result: any = null
-    while (true) {
-      const { value, done } = await iterator.next()
-      if (done) {
-        result = value
-        break
-      }
-      events.push(value)
-    }
-
-    const errorEvent = events.find(
-      (event) => event.type === 'response' && event.data?.question_error
-    )
-    expect(errorEvent).toBeDefined()
-    expect(result.needContinueConversation).toBe(true)
-    expect(callTool).toHaveBeenCalled()
-  })
-})
-
-describe('ToolCallProcessor batch permission pre-check', () => {
-  it('preserves extended permission payload fields for batch permission requests', async () => {
-    const toolDefinition = {
-      type: 'function',
-      function: {
-        name: 'edit',
-        description: 'edit file',
-        parameters: {
-          type: 'object',
-          properties: {}
-        }
-      },
-      server: {
-        name: 'agent-filesystem',
-        icons: '📁',
-        description: 'Agent filesystem'
-      }
-    } as MCPToolDefinition
-
-    const callTool = vi.fn(async () => ({
-      content: 'ok',
-      rawData: { content: 'ok' } as MCPToolResponse
-    }))
-    const preCheckToolPermission = vi.fn(async () => ({
-      needsPermission: true as const,
-      toolName: 'edit',
-      serverName: 'agent-filesystem',
-      permissionType: 'write' as const,
-      description: 'Write access requires approval',
-      paths: ['src/main.ts'],
-      customMeta: {
-        source: 'batch-precheck'
-      }
-    }))
-
-    const processor = new ToolCallProcessor({
-      getAllToolDefinitions: async () => [toolDefinition],
-      callTool,
-      preCheckToolPermission
-    })
-
-    const conversationMessages: ChatMessage[] = [{ role: 'assistant', content: 'hello' }]
-    const iterator = processor.process({
-      eventId: 'event-batch-permission',
-      toolCalls: [{ id: 'tool-1', name: 'edit', arguments: '{"path":"src/main.ts"}' }],
-      enabledMcpTools: [],
-      conversationMessages,
-      modelConfig: { functionCall: true } as ModelConfig,
-      abortSignal: new AbortController().signal,
-      currentToolCallCount: 0,
-      maxToolCalls: 5,
-      conversationId: 'conv-batch-permission'
-    })
-
-    const events: any[] = []
-    let result: any = null
-    while (true) {
-      const { value, done } = await iterator.next()
-      if (done) {
-        result = value
-        break
-      }
-      events.push(value)
-    }
-
-    const permissionEvent = events.find(
-      (event) => event.type === 'response' && event.data?.tool_call === 'permission-required'
-    )
-    expect(permissionEvent).toBeDefined()
-    expect(permissionEvent.data.permission_request.paths).toEqual(['src/main.ts'])
-    expect(permissionEvent.data.permission_request.customMeta).toEqual({
-      source: 'batch-precheck'
-    })
-    expect(permissionEvent.data.permission_request.isBatchPermission).toBe(true)
-    expect(permissionEvent.data.permission_request.totalInBatch).toBe(1)
-    expect(callTool).not.toHaveBeenCalled()
-    expect(result.needContinueConversation).toBe(false)
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/message/systemEnvPromptBuilder.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/message/systemEnvPromptBuilder.test.ts
deleted file mode 100644
index 4fef8fe73..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/message/systemEnvPromptBuilder.test.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import path from 'node:path'
-import * as fs from 'node:fs'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { presenter } from '@/presenter'
-import logger from '@shared/logger'
-import {
-  buildRuntimeCapabilitiesPrompt,
-  buildSystemEnvPrompt
-} from '@/lib/agentRuntime/systemEnvPromptBuilder'
-
-vi.mock('node:fs', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('node:fs')>()
-  return {
-    ...actual,
-    existsSync: vi.fn(),
-    promises: {
-      ...actual.promises,
-      readFile: vi.fn()
-    }
-  }
-})
-
-vi.mock('@/presenter', () => ({
-  presenter: {
-    configPresenter: {
-      getProviderModels: vi.fn(),
-      getCustomModels: vi.fn()
-    }
-  }
-}))
-
-vi.mock('@shared/logger', () => ({
-  default: {
-    warn: vi.fn()
-  }
-}))
-
-describe('systemEnvPromptBuilder', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    ;(presenter.configPresenter.getProviderModels as ReturnType<typeof vi.fn>).mockReturnValue([])
-    ;(presenter.configPresenter.getCustomModels as ReturnType<typeof vi.fn>).mockReturnValue([])
-    ;(fs.existsSync as unknown as ReturnType<typeof vi.fn>).mockReturnValue(false)
-    ;(fs.promises.readFile as unknown as ReturnType<typeof vi.fn>).mockRejectedValue(
-      new Error('ENOENT')
-    )
-  })
-
-  it('builds env prompt with git=yes and AGENTS instructions', async () => {
-    const workdir = path.resolve(path.sep, 'workspace', 'deepchat')
-    const gitPath = path.join(workdir, '.git')
-    const agentsPath = path.join(workdir, 'AGENTS.md')
-
-    ;(fs.existsSync as unknown as ReturnType<typeof vi.fn>).mockImplementation(
-      (targetPath: string) => targetPath === gitPath
-    )
-    ;(fs.promises.readFile as unknown as ReturnType<typeof vi.fn>).mockResolvedValue(
-      '# Repository Guidelines\nLine 2'
-    )
-    ;(presenter.configPresenter.getProviderModels as ReturnType<typeof vi.fn>).mockReturnValue([
-      { id: 'model-a', name: 'Model A' }
-    ])
-
-    const prompt = await buildSystemEnvPrompt({
-      providerId: 'provider-x',
-      modelId: 'model-a',
-      workdir,
-      platform: 'win32',
-      now: new Date('2026-02-11T12:00:00.000Z')
-    })
-
-    expect(prompt).toContain('You are powered by the model named Model A.')
-    expect(prompt).toContain('The exact model ID is provider-x/model-a')
-    expect(prompt).toContain(`Working directory: ${workdir}`)
-    expect(prompt).toContain('Is directory a git repo: yes')
-    expect(prompt).toContain('Platform: win32')
-    expect(prompt).toContain("Today's date: Wed Feb 11 2026")
-    expect(prompt).toContain(`Instructions from: ${agentsPath}`)
-    expect(prompt).toContain('# Repository Guidelines\nLine 2')
-  })
-
-  it('falls back when AGENTS.md is missing and git=no', async () => {
-    const workdir = path.resolve(path.sep, 'workspace', 'deepchat')
-    const prompt = await buildSystemEnvPrompt({
-      providerId: 'provider-y',
-      modelId: 'model-b',
-      workdir,
-      platform: 'linux',
-      now: new Date('2026-02-11T12:00:00.000Z')
-    })
-
-    expect(prompt).toContain('You are powered by the model named model-b.')
-    expect(prompt).toContain('The exact model ID is provider-y/model-b')
-    expect(prompt).toContain('Is directory a git repo: no')
-    expect(prompt).not.toContain('Instructions from:')
-    expect(prompt).not.toContain('[SystemEnvPromptBuilder] AGENTS.md not available')
-    expect(logger.warn).toHaveBeenCalledWith(
-      '[SystemEnvPromptBuilder] Failed to read AGENTS.md',
-      expect.objectContaining({ sourcePath: path.join(workdir, 'AGENTS.md') })
-    )
-  })
-
-  it('builds stable runtime capabilities prompt', () => {
-    const prompt = buildRuntimeCapabilitiesPrompt()
-    expect(prompt).toContain('## Runtime Capabilities')
-    expect(prompt).toContain('YoBrowser')
-    expect(prompt).toContain('process(list|poll|log|write|kill|remove)')
-  })
-
-  it('omits runtime capability lines when related tools are unavailable', () => {
-    const prompt = buildRuntimeCapabilitiesPrompt({
-      hasYoBrowser: false,
-      hasExec: false,
-      hasProcess: false
-    })
-
-    expect(prompt).toBe('')
-  })
-
-  it('builds a partial runtime capabilities prompt when only exec is enabled', () => {
-    const prompt = buildRuntimeCapabilitiesPrompt({
-      hasYoBrowser: false,
-      hasExec: true,
-      hasProcess: false
-    })
-
-    expect(prompt).toContain('exec(background: true)')
-    expect(prompt).toContain('yield window')
-    expect(prompt).not.toContain('YoBrowser')
-    expect(prompt).not.toContain('process(list|poll|log|write|kill|remove)')
-  })
-
-  it('falls back to unknown provider/model identity', async () => {
-    const workdir = path.resolve(path.sep, 'workspace', 'deepchat')
-    const prompt = await buildSystemEnvPrompt({
-      providerId: '  ',
-      modelId: '',
-      workdir,
-      now: new Date('2026-02-11T12:00:00.000Z')
-    })
-
-    expect(prompt).toContain('You are powered by the model named unknown-model.')
-    expect(prompt).toContain('The exact model ID is unknown-provider/unknown-model')
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageBuilder.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageBuilder.test.ts
deleted file mode 100644
index 0648c15e7..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageBuilder.test.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-
-// messageBuilder imports the full main-process presenter graph; mock it out so we can unit-test
-// pure message-building utilities without initializing Electron/main presenters.
-vi.mock('@/presenter', () => ({ presenter: {} }))
-
-describe('messageBuilder.composeAgentSystemPromptSections', () => {
-  it('keeps fixed V2.1 section order', async () => {
-    const { composeAgentSystemPromptSections } =
-      await import('@/presenter/agentPresenter/message/messageBuilder')
-
-    const composed = composeAgentSystemPromptSections({
-      basePrompt: 'BASE',
-      runtimePrompt: 'RUNTIME',
-      skillsMetadataPrompt: 'SKILLS_META',
-      skillsPrompt: 'SKILLS_ACTIVE',
-      envPrompt: 'ENV',
-      toolingPrompt: 'TOOLING'
-    })
-
-    expect(composed).toBe('BASE\n\nRUNTIME\n\nSKILLS_META\n\nSKILLS_ACTIVE\n\nENV\n\nTOOLING')
-  })
-})
-
-describe('messageBuilder.buildPostToolExecutionContext', () => {
-  it('emits assistant(tool_calls) -> tool(tool_call_id) pairing when functionCall is enabled', async () => {
-    const { buildPostToolExecutionContext } =
-      await import('@/presenter/agentPresenter/message/messageBuilder')
-
-    const messages = await buildPostToolExecutionContext({
-      conversation: { settings: { systemPrompt: '' } } as any,
-      contextMessages: [],
-      userMessage: { role: 'user', content: { text: 'hi', files: [] } } as any,
-      currentAssistantMessage: {
-        role: 'assistant',
-        content: [{ type: 'content', content: 'calling tool' }]
-      } as any,
-      completedToolCall: {
-        id: 'call_1',
-        name: 'exec',
-        params: '{"command":"pwd"}',
-        response: '/tmp'
-      },
-      modelConfig: { functionCall: true } as any
-    })
-
-    expect(messages.map((m) => m.role)).toEqual(['user', 'assistant', 'tool'])
-    expect(messages[1].tool_calls?.[0]?.id).toBe('call_1')
-    expect(messages[2].tool_call_id).toBe('call_1')
-  })
-
-  it('generates a stable tool_call_id when upstream id is empty', async () => {
-    const { buildPostToolExecutionContext } =
-      await import('@/presenter/agentPresenter/message/messageBuilder')
-
-    const messages = await buildPostToolExecutionContext({
-      conversation: { settings: { systemPrompt: '' } } as any,
-      contextMessages: [],
-      userMessage: { role: 'user', content: { text: 'hi', files: [] } } as any,
-      currentAssistantMessage: {
-        role: 'assistant',
-        content: [{ type: 'content', content: 'calling tool' }]
-      } as any,
-      completedToolCall: {
-        id: '',
-        name: 'exec',
-        params: '{"command":"pwd"}',
-        response: '/tmp'
-      },
-      modelConfig: { functionCall: true } as any
-    })
-
-    const toolCallId = messages[1].tool_calls?.[0]?.id
-    expect(typeof toolCallId).toBe('string')
-    expect(toolCallId).toBeTruthy()
-    expect(messages[2].tool_call_id).toBe(toolCallId)
-  })
-
-  it('falls back to legacy function_call_record injection when functionCall is disabled', async () => {
-    const { buildPostToolExecutionContext } =
-      await import('@/presenter/agentPresenter/message/messageBuilder')
-
-    const messages = await buildPostToolExecutionContext({
-      conversation: { settings: { systemPrompt: '' } } as any,
-      contextMessages: [],
-      userMessage: { role: 'user', content: { text: 'hi', files: [] } } as any,
-      currentAssistantMessage: {
-        role: 'assistant',
-        content: [{ type: 'content', content: 'calling tool' }]
-      } as any,
-      completedToolCall: {
-        id: 'call_1',
-        name: 'exec',
-        params: '{"command":"pwd"}',
-        response: '/tmp'
-      },
-      modelConfig: { functionCall: false } as any
-    })
-
-    expect(messages.map((m) => m.role)).toEqual(['user', 'assistant', 'user'])
-    expect(String(messages[1].content)).toContain('<function_call>')
-    expect(messages.some((m) => m.role === 'tool')).toBe(false)
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageCompressor.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageCompressor.test.ts
deleted file mode 100644
index 4fe004b73..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/messageCompressor.test.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import type { AssistantMessageBlock, Message, UserMessageContent } from '@shared/chat'
-import { compressToolCallsFromContext } from '@/presenter/agentPresenter/message/messageCompressor'
-
-const baseUsage = {
-  context_usage: 0,
-  tokens_per_second: 0,
-  total_tokens: 0,
-  generation_time: 0,
-  first_token_time: 0,
-  reasoning_start_time: 0,
-  reasoning_end_time: 0,
-  input_tokens: 0,
-  output_tokens: 0
-}
-
-function createMessage(id: string, role: Message['role'], content: Message['content']): Message {
-  return {
-    id,
-    role,
-    content,
-    timestamp: Date.now(),
-    avatar: '',
-    name: '',
-    model_name: '',
-    model_id: '',
-    model_provider: '',
-    status: 'sent',
-    error: '',
-    usage: baseUsage,
-    conversationId: 'conversation',
-    is_variant: 0
-  }
-}
-
-function createUserContent(text: string): UserMessageContent {
-  return {
-    files: [],
-    links: [],
-    think: false,
-    search: false,
-    text,
-    content: [{ type: 'text', content: text }]
-  }
-}
-
-function createAssistantWithToolCall(id: string): Message {
-  const toolCallBlock: AssistantMessageBlock = {
-    type: 'tool_call',
-    status: 'success',
-    timestamp: Date.now(),
-    tool_call: {
-      id: 'tool-1',
-      name: 'search',
-      params: '{"q":"hi"}',
-      response: 'ok'
-    }
-  }
-
-  return createMessage(id, 'assistant', [toolCallBlock])
-}
-
-describe('messageCompressor', () => {
-  it('removes tool calls before the last user message when over budget', () => {
-    const assistant = createAssistantWithToolCall('assistant-1')
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-
-    const { compressedMessages, removedTokens } = compressToolCallsFromContext(
-      [assistant, user],
-      1,
-      true
-    )
-
-    const assistantBlocks = compressedMessages[0].content as AssistantMessageBlock[]
-    const hasToolCall = assistantBlocks.some((block) => block.type === 'tool_call')
-
-    expect(hasToolCall).toBe(false)
-    expect(removedTokens).toBeGreaterThan(0)
-  })
-
-  it('keeps tool calls when function calling is disabled', () => {
-    const assistant = createAssistantWithToolCall('assistant-1')
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-
-    const { compressedMessages, removedTokens } = compressToolCallsFromContext(
-      [assistant, user],
-      1,
-      false
-    )
-
-    const assistantBlocks = compressedMessages[0].content as AssistantMessageBlock[]
-    const hasToolCall = assistantBlocks.some((block) => block.type === 'tool_call')
-
-    expect(hasToolCall).toBe(true)
-    expect(removedTokens).toBe(0)
-  })
-
-  it('does not remove tool calls after the last user message', () => {
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-    const assistant = createAssistantWithToolCall('assistant-1')
-
-    const { compressedMessages } = compressToolCallsFromContext([user, assistant], 1, true)
-
-    const assistantBlocks = compressedMessages[1].content as AssistantMessageBlock[]
-    const hasToolCall = assistantBlocks.some((block) => block.type === 'tool_call')
-
-    expect(hasToolCall).toBe(true)
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/permission/permissionHandler.resume.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/permission/permissionHandler.resume.test.ts
deleted file mode 100644
index 46d1000e7..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/permission/permissionHandler.resume.test.ts
+++ /dev/null
@@ -1,168 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AssistantMessage, AssistantMessageBlock } from '@shared/chat'
-import { PermissionHandler } from '@/presenter/agentPresenter/permission/permissionHandler'
-import type { ThreadHandlerContext } from '@/presenter/agentPresenter/types/handlerContext'
-import type { MessageManager } from '@/presenter/sessionPresenter/managers/messageManager'
-import type { StreamGenerationHandler } from '@/presenter/agentPresenter/streaming/streamGenerationHandler'
-import type { LLMEventHandler } from '@/presenter/agentPresenter/streaming/llmEventHandler'
-import type { GeneratingMessageState } from '@/presenter/agentPresenter/streaming/types'
-import { CommandPermissionService } from '@/presenter/permission'
-
-vi.mock('@/presenter', () => ({
-  presenter: {}
-}))
-
-describe('PermissionHandler resume behavior', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('resumes all resolved tool calls after the final permission decision', async () => {
-    const conversationId = 'conv-resume'
-    const messageId = 'msg-resume'
-    let content: AssistantMessageBlock[] = [
-      {
-        type: 'tool_call',
-        status: 'loading',
-        timestamp: Date.now(),
-        tool_call: { id: 'tool-1', name: 'read', params: '{}' }
-      },
-      {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'Permission required',
-        tool_call: { id: 'tool-1', name: 'read', params: '{}' },
-        extra: {
-          needsUserAction: true,
-          serverName: 'agent-filesystem',
-          permissionType: 'read',
-          permissionRequest: JSON.stringify({
-            toolName: 'read',
-            serverName: 'agent-filesystem',
-            permissionType: 'read',
-            description: 'Read access requires approval',
-            paths: ['src/a.txt']
-          })
-        }
-      },
-      {
-        type: 'tool_call',
-        status: 'loading',
-        timestamp: Date.now(),
-        tool_call: { id: 'tool-2', name: 'read', params: '{}' }
-      },
-      {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'Permission required',
-        tool_call: { id: 'tool-2', name: 'read', params: '{}' },
-        extra: {
-          needsUserAction: true,
-          serverName: 'agent-filesystem',
-          permissionType: 'read',
-          permissionRequest: JSON.stringify({
-            toolName: 'read',
-            serverName: 'agent-filesystem',
-            permissionType: 'read',
-            description: 'Read access requires approval',
-            paths: ['src/b.txt']
-          })
-        }
-      }
-    ]
-
-    const getCurrentMessage = (): AssistantMessage =>
-      ({
-        id: messageId,
-        conversationId,
-        role: 'assistant',
-        content
-      }) as AssistantMessage
-
-    const messageManager = {
-      getMessage: vi.fn(async () => getCurrentMessage()),
-      editMessage: vi.fn(async (_id: string, nextContent: string) => {
-        content = JSON.parse(nextContent) as AssistantMessageBlock[]
-        return getCurrentMessage()
-      }),
-      handleMessageError: vi.fn()
-    } as unknown as MessageManager
-
-    const sessionRuntime = {
-      removePendingPermission: vi.fn(),
-      acquirePermissionResumeLock: vi.fn().mockReturnValue(true),
-      releasePermissionResumeLock: vi.fn(),
-      getPendingPermissions: vi.fn().mockReturnValue([]),
-      clearPendingPermission: vi.fn(),
-      setStatus: vi.fn()
-    }
-    const mcpRuntime = {
-      grantPermission: vi.fn(),
-      isServerRunning: vi.fn().mockResolvedValue(true)
-    }
-    const permissionRuntime = {
-      approveFileAccess: vi.fn()
-    }
-
-    const ctx: ThreadHandlerContext = {
-      sqlitePresenter: {} as never,
-      messageManager,
-      llmProviderPresenter: {} as never,
-      configPresenter: {} as never,
-      sessionRuntime: sessionRuntime as never,
-      toolPresenter: {
-        getAllToolDefinitions: vi.fn(),
-        callTool: vi.fn(),
-        buildToolSystemPrompt: vi.fn()
-      } as never,
-      mcpRuntime: mcpRuntime as never,
-      promptRuntime: {
-        getInputChatMode: vi.fn(),
-        getSkillsEnabled: vi.fn(),
-        getActiveSkills: vi.fn(),
-        loadSkillContent: vi.fn(),
-        getMetadataPrompt: vi.fn(),
-        getActiveSkillsAllowedTools: vi.fn()
-      } as never,
-      permissionRuntime: permissionRuntime as never
-    }
-
-    const generatingMessages = new Map<string, GeneratingMessageState>()
-    generatingMessages.set(messageId, {
-      message: getCurrentMessage(),
-      conversationId,
-      startTime: Date.now(),
-      firstTokenTime: null,
-      promptTokens: 0,
-      reasoningStartTime: null,
-      reasoningEndTime: null,
-      lastReasoningTime: null
-    })
-
-    const handler = new PermissionHandler(ctx, {
-      generatingMessages,
-      streamGenerationHandler: {} as StreamGenerationHandler,
-      llmEventHandler: {} as LLMEventHandler,
-      commandPermissionHandler: new CommandPermissionService()
-    })
-
-    const resumeSpy = vi
-      .spyOn(
-        handler as unknown as { resumeToolExecutionAfterPermissions: (...args: any[]) => any },
-        'resumeToolExecutionAfterPermissions'
-      )
-      .mockResolvedValue(undefined)
-
-    await handler.handlePermissionResponse(messageId, 'tool-1', true, 'read', false)
-    expect(resumeSpy).not.toHaveBeenCalled()
-
-    await handler.handlePermissionResponse(messageId, 'tool-2', true, 'read', false)
-    expect(resumeSpy).toHaveBeenCalledTimes(1)
-    expect(resumeSpy).toHaveBeenCalledWith(messageId, true)
-    expect(resumeSpy.mock.calls[0][2]).toBeUndefined()
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/promptBuilder.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/promptBuilder.test.ts
deleted file mode 100644
index 8e075bcb3..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/promptBuilder.test.ts
+++ /dev/null
@@ -1,226 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { approximateTokenSize } from 'tokenx'
-import type { AssistantMessageBlock, Message, UserMessageContent } from '@shared/chat'
-import { buildUserMessageContext } from '@/presenter/agentPresenter/message/messageFormatter'
-import { selectContextMessages } from '@/presenter/agentPresenter/message/messageTruncator'
-
-const baseUsage = {
-  context_usage: 0,
-  tokens_per_second: 0,
-  total_tokens: 0,
-  generation_time: 0,
-  first_token_time: 0,
-  reasoning_start_time: 0,
-  reasoning_end_time: 0,
-  input_tokens: 0,
-  output_tokens: 0
-}
-
-function createUserContent(text: string): UserMessageContent {
-  return {
-    files: [],
-    links: [],
-    think: false,
-    search: false,
-    text,
-    content: [{ type: 'text', content: text }]
-  }
-}
-
-function createMessage(id: string, role: Message['role'], content: Message['content']): Message {
-  return {
-    id,
-    role,
-    content,
-    timestamp: Date.now(),
-    avatar: '',
-    name: '',
-    model_name: '',
-    model_id: '',
-    model_provider: '',
-    status: 'sent',
-    error: '',
-    usage: baseUsage,
-    conversationId: 'conversation',
-    is_variant: 0
-  }
-}
-
-function createAssistantBlocks(text: string, toolCall?: AssistantMessageBlock['tool_call']) {
-  const blocks: AssistantMessageBlock[] = [
-    {
-      type: 'content',
-      content: text,
-      status: 'success',
-      timestamp: Date.now()
-    }
-  ]
-
-  if (toolCall) {
-    blocks.push({
-      type: 'tool_call',
-      status: 'success',
-      timestamp: Date.now(),
-      tool_call: toolCall
-    })
-  }
-
-  return blocks
-}
-
-function countUserTokens(content: UserMessageContent): number {
-  return approximateTokenSize(buildUserMessageContext(content))
-}
-
-function countAssistantTokens(text: string): number {
-  return approximateTokenSize(text)
-}
-
-function countToolCallTokens(name: string, params: string, response: string): number {
-  return approximateTokenSize(name) + approximateTokenSize(params) + approximateTokenSize(response)
-}
-
-describe('selectContextMessages', () => {
-  it('drops oldest pairs when no tool calls are present', () => {
-    const user1 = createMessage('user-1', 'user', createUserContent('hello one'))
-    const assistant1 = createMessage('assistant-1', 'assistant', createAssistantBlocks('reply one'))
-    const user2 = createMessage('user-2', 'user', createUserContent('hello two'))
-    const assistant2 = createMessage('assistant-2', 'assistant', createAssistantBlocks('reply two'))
-    const currentUser = createMessage('user-3', 'user', createUserContent('new question'))
-
-    const pair2Tokens =
-      countUserTokens(user2.content as UserMessageContent) + countAssistantTokens('reply two')
-
-    const selected = selectContextMessages(
-      [user1, assistant1, user2, assistant2],
-      currentUser,
-      pair2Tokens,
-      false,
-      false
-    )
-
-    expect(selected.map((message) => message.id)).toEqual(['user-2', 'assistant-2'])
-  })
-
-  it('removes tool call blocks before deleting message pairs', () => {
-    const toolCall = {
-      id: 'tool-1',
-      name: 'search',
-      params: '{"q":"hi"}',
-      response: 'tool response'
-    }
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-    const assistant = createMessage(
-      'assistant-1',
-      'assistant',
-      createAssistantBlocks('reply', toolCall)
-    )
-    const currentUser = createMessage('user-2', 'user', createUserContent('new question'))
-
-    const totalTokens =
-      countUserTokens(user.content as UserMessageContent) +
-      countAssistantTokens('reply') +
-      countToolCallTokens(toolCall.name, toolCall.params, toolCall.response)
-
-    const remainingContextLength =
-      totalTokens - countToolCallTokens(toolCall.name, toolCall.params, toolCall.response) + 1
-
-    const selected = selectContextMessages(
-      [user, assistant],
-      currentUser,
-      remainingContextLength,
-      true,
-      false
-    )
-
-    const assistantBlocks = selected.find((message) => message.role === 'assistant')
-      ?.content as AssistantMessageBlock[]
-    const hasToolCallBlock = assistantBlocks.some((block) => block.type === 'tool_call')
-
-    expect(selected.map((message) => message.id)).toEqual(['user-1', 'assistant-1'])
-    expect(hasToolCallBlock).toBe(false)
-  })
-
-  it('removes tool calls then drops oldest pairs when still over limit', () => {
-    const toolCall = {
-      id: 'tool-1',
-      name: 'search',
-      params: '{"q":"hi"}',
-      response: 'tool response'
-    }
-    const user1 = createMessage('user-1', 'user', createUserContent('hello one'))
-    const assistant1 = createMessage(
-      'assistant-1',
-      'assistant',
-      createAssistantBlocks('reply one', toolCall)
-    )
-    const user2 = createMessage('user-2', 'user', createUserContent('hello two'))
-    const assistant2 = createMessage('assistant-2', 'assistant', createAssistantBlocks('reply two'))
-    const currentUser = createMessage('user-3', 'user', createUserContent('new question'))
-
-    const pair2Tokens =
-      countUserTokens(user2.content as UserMessageContent) + countAssistantTokens('reply two')
-
-    const remainingContextLength = pair2Tokens - 1
-
-    const selected = selectContextMessages(
-      [user1, assistant1, user2, assistant2],
-      currentUser,
-      remainingContextLength,
-      true,
-      false
-    )
-
-    expect(selected.map((message) => message.id)).toEqual(['user-2', 'assistant-2'])
-  })
-
-  it('returns empty when remaining context length is non-positive', () => {
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-    const assistant = createMessage('assistant-1', 'assistant', createAssistantBlocks('reply'))
-
-    const selected = selectContextMessages([user, assistant], user, 0, false, false)
-
-    expect(selected).toEqual([])
-  })
-
-  it('returns empty when no sent context messages exist', () => {
-    const user = createMessage('user-1', 'user', createUserContent('hello'))
-    const assistant = createMessage('assistant-1', 'assistant', createAssistantBlocks('reply'))
-    user.status = 'pending'
-    assistant.status = 'pending'
-
-    const selected = selectContextMessages([user, assistant], user, 100, false, false)
-
-    expect(selected).toEqual([])
-  })
-
-  it('retains image user messages when vision is enabled', () => {
-    const userWithImage = createMessage('user-1', 'user', createUserContent('hello'))
-    const imageContent = userWithImage.content as UserMessageContent & { images?: string[] }
-    imageContent.images = ['data:image/png;base64,abc']
-    const assistant = createMessage('assistant-1', 'assistant', createAssistantBlocks('reply'))
-    const currentUser = createMessage('user-2', 'user', createUserContent('new question'))
-
-    const selected = selectContextMessages(
-      [userWithImage, assistant],
-      currentUser,
-      1000,
-      true,
-      true
-    )
-
-    expect(selected.map((message) => message.id)).toEqual(['user-1', 'assistant-1'])
-  })
-
-  it('keeps context edge messages when within limits', () => {
-    const user = createMessage('user-1', 'user', createUserContent('edge message'))
-    const assistant = createMessage('assistant-1', 'assistant', createAssistantBlocks('reply'))
-    const edgeUser = user as Message & { is_context_edge?: boolean }
-    edgeUser.is_context_edge = true
-    const currentUser = createMessage('user-2', 'user', createUserContent('new question'))
-
-    const selected = selectContextMessages([user, assistant], currentUser, 1000, false, false)
-
-    expect(selected.map((message) => message.id)).toEqual(['user-1', 'assistant-1'])
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/sessionManager.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/sessionManager.test.ts
deleted file mode 100644
index e023f709f..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/sessionManager.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import path from 'path'
-import { SessionManager } from '@/presenter/agentPresenter/session/sessionManager'
-
-vi.mock('electron', () => ({
-  app: {
-    getPath: () => 'C:\\\\temp'
-  }
-}))
-
-const baseSettings = {
-  providerId: 'provider-1',
-  modelId: 'model-1',
-  chatMode: 'agent' as const,
-  enabledMcpTools: [],
-  acpWorkdirMap: {},
-  agentWorkspacePath: null
-}
-
-const createConversation = (overrides?: Partial<typeof baseSettings>) => ({
-  id: 'conv-1',
-  settings: {
-    ...baseSettings,
-    ...overrides
-  }
-})
-
-const createManager = (conversation: ReturnType<typeof createConversation>) => {
-  const sessionPresenter = {
-    getConversation: vi.fn().mockResolvedValue(conversation),
-    updateConversationSettings: vi.fn().mockResolvedValue(undefined)
-  } as any
-  const configPresenter = {
-    getSetting: vi.fn().mockReturnValue('agent'),
-    getModelDefaultConfig: vi.fn().mockReturnValue({
-      maxTokens: 0,
-      contextLength: 0,
-      vision: false,
-      functionCall: true,
-      reasoning: false,
-      type: 'chat'
-    })
-  } as any
-
-  return {
-    manager: new SessionManager({ configPresenter, sessionPresenter }),
-    sessionPresenter,
-    configPresenter
-  }
-}
-
-describe('SessionManager', () => {
-  it('migrates legacy chat mode to agent mode silently', async () => {
-    const conversation = createConversation({ chatMode: 'chat' as any })
-    const { manager } = createManager(conversation)
-
-    const context = await manager.resolveWorkspaceContext(
-      conversation.id,
-      conversation.settings.modelId
-    )
-
-    // Chat mode should be migrated to agent mode
-    expect(context.chatMode).toBe('agent')
-  })
-
-  it('generates and persists workspace path for agent mode', async () => {
-    const conversation = createConversation({ chatMode: 'agent', agentWorkspacePath: null })
-    const { manager, sessionPresenter } = createManager(conversation)
-
-    const context = await manager.resolveWorkspaceContext(
-      conversation.id,
-      conversation.settings.modelId
-    )
-    const expected = path.join('C:\\\\temp', 'deepchat-agent', 'workspaces', conversation.id)
-
-    expect(context.chatMode).toBe('agent')
-    expect(context.agentWorkspacePath).toBe(expected)
-    expect(sessionPresenter.updateConversationSettings).toHaveBeenCalledWith(conversation.id, {
-      agentWorkspacePath: expected
-    })
-  })
-
-  it('uses ACP workdir map for acp agent mode', async () => {
-    const conversation = createConversation({
-      chatMode: 'acp agent',
-      acpWorkdirMap: { 'model-1': 'C:\\\\acp-workdir' }
-    })
-    const { manager, sessionPresenter } = createManager(conversation)
-
-    const context = await manager.resolveWorkspaceContext(
-      conversation.id,
-      conversation.settings.modelId
-    )
-
-    expect(context.chatMode).toBe('acp agent')
-    expect(context.agentWorkspacePath).toBe('C:\\\\acp-workdir')
-    expect(sessionPresenter.updateConversationSettings).not.toHaveBeenCalled()
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/skillsPromptBuilder.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/skillsPromptBuilder.test.ts
deleted file mode 100644
index 237449ac8..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/skillsPromptBuilder.test.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import {
-  buildSkillsMetadataPrompt,
-  buildSkillsPrompt,
-  getSkillsAllowedTools
-} from '@/presenter/agentPresenter/message/skillsPromptBuilder'
-
-describe('skillsPromptBuilder', () => {
-  it('returns empty outputs when skills are disabled', async () => {
-    const promptRuntime = {
-      getSkillsEnabled: vi.fn().mockReturnValue(false),
-      getMetadataPrompt: vi.fn(),
-      getActiveSkills: vi.fn(),
-      loadSkillContent: vi.fn(),
-      getActiveSkillsAllowedTools: vi.fn()
-    } as any
-
-    await expect(buildSkillsMetadataPrompt(promptRuntime)).resolves.toBe('')
-    await expect(buildSkillsPrompt(promptRuntime, 'conv-1')).resolves.toBe('')
-    await expect(getSkillsAllowedTools(promptRuntime, 'conv-1')).resolves.toEqual([])
-    expect(promptRuntime.getMetadataPrompt).not.toHaveBeenCalled()
-    expect(promptRuntime.getActiveSkills).not.toHaveBeenCalled()
-  })
-
-  it('builds metadata, active skill prompt, and allowed tools from prompt runtime', async () => {
-    const promptRuntime = {
-      getSkillsEnabled: vi.fn().mockReturnValue(true),
-      getMetadataPrompt: vi.fn().mockResolvedValue('# Metadata'),
-      getActiveSkills: vi.fn().mockResolvedValue(['ocr', 'coder']),
-      loadSkillContent: vi.fn(async (name: string) =>
-        name === 'ocr'
-          ? { name: 'ocr', content: 'OCR content' }
-          : { name: 'coder', content: 'Coder content' }
-      ),
-      getActiveSkillsAllowedTools: vi.fn().mockResolvedValue(['read', 'grep'])
-    } as any
-
-    await expect(buildSkillsMetadataPrompt(promptRuntime)).resolves.toBe('# Metadata')
-    const prompt = await buildSkillsPrompt(promptRuntime, 'conv-1')
-    expect(prompt).toContain('## Skill: ocr')
-    expect(prompt).toContain('Coder content')
-    await expect(getSkillsAllowedTools(promptRuntime, 'conv-1')).resolves.toEqual(['read', 'grep'])
-  })
-
-  it('returns empty active skill prompt when no skill content can be loaded', async () => {
-    const promptRuntime = {
-      getSkillsEnabled: vi.fn().mockReturnValue(true),
-      getActiveSkills: vi.fn().mockResolvedValue(['ocr']),
-      loadSkillContent: vi.fn().mockResolvedValue(null)
-    } as any
-
-    await expect(buildSkillsPrompt(promptRuntime, 'conv-1')).resolves.toBe('')
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/llmEventHandler.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/llmEventHandler.test.ts
deleted file mode 100644
index f3c59a246..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/llmEventHandler.test.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { LLMEventHandler } from '@/presenter/agentPresenter/streaming/llmEventHandler'
-import type { AgentSessionRuntimePort } from '@/presenter/agentPresenter/session/sessionRuntimePort'
-import type { MessageManager } from '@/presenter/sessionPresenter/managers/messageManager'
-import type { GeneratingMessageState } from '@/presenter/agentPresenter/streaming/types'
-
-const eventBusMock = vi.hoisted(() => ({
-  sendToRenderer: vi.fn(),
-  sendToMain: vi.fn()
-}))
-
-vi.mock('@/eventbus', () => ({
-  eventBus: eventBusMock,
-  SendTarget: {
-    ALL_WINDOWS: 'ALL_WINDOWS'
-  }
-}))
-
-function createState(eventId: string, blocks: any[] = []): GeneratingMessageState {
-  return {
-    message: {
-      id: eventId,
-      conversationId: 'conv-1',
-      parentId: 'user-1',
-      is_variant: false,
-      content: blocks
-    } as any,
-    conversationId: 'conv-1',
-    startTime: Date.now(),
-    firstTokenTime: null,
-    promptTokens: 0,
-    reasoningStartTime: null,
-    reasoningEndTime: null,
-    lastReasoningTime: null
-  }
-}
-
-function createHandler(state: GeneratingMessageState) {
-  const generatingMessages = new Map([[state.message.id, state]])
-  const messageManager = {
-    updateMessageMetadata: vi.fn().mockResolvedValue(undefined),
-    handleMessageError: vi.fn().mockResolvedValue(undefined),
-    getMessage: vi.fn().mockResolvedValue(state.message),
-    updateMessageStatus: vi.fn().mockResolvedValue(undefined),
-    editMessage: vi.fn().mockResolvedValue(undefined)
-  } as unknown as MessageManager
-  const sessionRuntime = {
-    incrementToolCallCount: vi.fn(),
-    addPendingPermission: vi.fn(),
-    setStatus: vi.fn(),
-    updateRuntime: vi.fn(),
-    clearPendingPermission: vi.fn(),
-    clearPendingQuestion: vi.fn()
-  } as unknown as AgentSessionRuntimePort
-  const handler = new LLMEventHandler({
-    generatingMessages,
-    messageManager,
-    contentBufferHandler: {
-      cleanupContentBuffer: vi.fn(),
-      flushAdaptiveBuffer: vi.fn().mockResolvedValue(undefined)
-    } as any,
-    toolCallHandler: {
-      processToolCallStart: vi.fn().mockResolvedValue(undefined),
-      processToolCallUpdate: vi.fn().mockResolvedValue(undefined),
-      processToolCallPermission: vi.fn().mockResolvedValue(undefined),
-      processQuestionRequest: vi.fn().mockResolvedValue(undefined),
-      processToolCallError: vi.fn().mockResolvedValue(undefined),
-      processToolCallEnd: vi.fn().mockResolvedValue(undefined),
-      processSearchResultsFromToolCall: vi.fn().mockResolvedValue(undefined),
-      processMcpUiResourcesFromToolCall: vi.fn().mockResolvedValue(undefined)
-    } as any,
-    streamUpdateScheduler: {
-      enqueueDelta: vi.fn(),
-      flushAll: vi.fn().mockResolvedValue(undefined)
-    } as any,
-    sessionRuntime
-  })
-
-  return {
-    handler,
-    generatingMessages,
-    messageManager,
-    sessionRuntime
-  }
-}
-
-describe('LLMEventHandler session runtime wiring', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('stores pending permissions through injected session runtime', async () => {
-    const state = createState('evt-permission')
-    const { handler, sessionRuntime } = createHandler(state)
-
-    await handler.handleLLMAgentResponse({
-      eventId: state.message.id,
-      tool_call: 'permission-required',
-      tool_call_id: 'tool-1',
-      permission_request: {
-        permissionType: 'write'
-      }
-    } as any)
-
-    expect(sessionRuntime.addPendingPermission).toHaveBeenCalledWith('conv-1', {
-      messageId: state.message.id,
-      toolCallId: 'tool-1',
-      permissionType: 'write',
-      payload: {
-        permissionType: 'write'
-      }
-    })
-    expect(sessionRuntime.setStatus).toHaveBeenCalledWith('conv-1', 'waiting_permission')
-  })
-
-  it('stores pending question through injected session runtime', async () => {
-    const state = createState('evt-question')
-    const { handler, sessionRuntime } = createHandler(state)
-
-    await handler.handleLLMAgentResponse({
-      eventId: state.message.id,
-      tool_call: 'question-required',
-      tool_call_id: 'tool-2'
-    } as any)
-
-    expect(sessionRuntime.updateRuntime).toHaveBeenCalledWith('conv-1', {
-      pendingQuestion: {
-        messageId: state.message.id,
-        toolCallId: 'tool-2'
-      }
-    })
-    expect(sessionRuntime.setStatus).toHaveBeenCalledWith('conv-1', 'waiting_question')
-  })
-
-  it('marks runtime as error through injected session runtime', async () => {
-    const state = createState('evt-error')
-    const { handler, generatingMessages, messageManager, sessionRuntime } = createHandler(state)
-
-    await handler.handleLLMAgentError({
-      eventId: state.message.id,
-      error: 'boom'
-    } as any)
-
-    expect(messageManager.handleMessageError).toHaveBeenCalledWith(state.message.id, 'boom')
-    expect(sessionRuntime.setStatus).toHaveBeenCalledWith('conv-1', 'error')
-    expect(sessionRuntime.clearPendingPermission).toHaveBeenCalledWith('conv-1')
-    expect(sessionRuntime.clearPendingQuestion).toHaveBeenCalledWith('conv-1')
-    expect(generatingMessages.has(state.message.id)).toBe(false)
-  })
-
-  it('keeps waiting question status on end when pending question remains', async () => {
-    const state = createState('evt-end', [
-      {
-        type: 'action',
-        action_type: 'question_request',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'Need answer',
-        tool_call: { id: 'tool-3', name: 'question', params: '{}' }
-      }
-    ])
-    const { handler, messageManager, sessionRuntime } = createHandler(state)
-
-    await handler.handleLLMAgentEnd({
-      eventId: state.message.id
-    } as any)
-
-    expect(messageManager.updateMessageStatus).toHaveBeenCalledWith(state.message.id, 'sent')
-    expect(sessionRuntime.setStatus).toHaveBeenCalledWith('conv-1', 'waiting_permission')
-    expect(sessionRuntime.setStatus).toHaveBeenCalledWith('conv-1', 'waiting_question')
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/streamGenerationHandler.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/streamGenerationHandler.test.ts
deleted file mode 100644
index 4421bcfe8..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/agentPresenter/streaming/streamGenerationHandler.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { StreamGenerationHandler } from '@/presenter/agentPresenter/streaming/streamGenerationHandler'
-import type { ThreadHandlerContext } from '@/presenter/agentPresenter/types/handlerContext'
-import type { AgentSessionRuntimePort } from '@/presenter/agentPresenter/session/sessionRuntimePort'
-import type { MessageManager } from '@/presenter/sessionPresenter/managers/messageManager'
-import type { GeneratingMessageState } from '@/presenter/agentPresenter/streaming/types'
-
-vi.mock('@/presenter/agentPresenter/message/messageBuilder', () => ({
-  preparePromptContent: vi.fn().mockResolvedValue({
-    finalContent: [{ role: 'user', content: 'hello' }],
-    promptTokens: 12
-  })
-}))
-
-describe('StreamGenerationHandler session runtime wiring', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('uses injected session runtime for loop start and workspace resolution', async () => {
-    const conversationId = 'conv-stream'
-    const messageId = 'assistant-1'
-    const userMessageId = 'user-1'
-    const sessionRuntime = {
-      startLoop: vi.fn().mockResolvedValue(undefined),
-      resolveWorkspaceContext: vi.fn().mockResolvedValue({
-        chatMode: 'agent',
-        agentWorkspacePath: 'C:/workspace'
-      })
-    } as unknown as AgentSessionRuntimePort
-    const messageManager = {
-      getMessage: vi.fn().mockImplementation(async (id: string) => {
-        if (id === userMessageId) {
-          return {
-            id: userMessageId,
-            conversationId,
-            role: 'user',
-            content: {
-              text: 'hello',
-              files: []
-            }
-          }
-        }
-        throw new Error(`Unexpected message lookup: ${id}`)
-      }),
-      getMessageHistory: vi.fn().mockResolvedValue([]),
-      updateMessageMetadata: vi.fn().mockResolvedValue(undefined)
-    } as unknown as MessageManager
-    const ctx: ThreadHandlerContext = {
-      sqlitePresenter: {
-        getConversation: vi.fn().mockResolvedValue({
-          id: conversationId,
-          settings: {
-            providerId: 'mock-provider',
-            modelId: 'mock-model',
-            temperature: 0.7,
-            maxTokens: 1024,
-            enabledMcpTools: [],
-            thinkingBudget: undefined,
-            reasoningEffort: undefined,
-            verbosity: undefined,
-            contextLength: 2048
-          }
-        })
-      } as any,
-      messageManager,
-      llmProviderPresenter: {
-        startStreamCompletion: vi.fn().mockReturnValue(
-          (async function* () {
-            yield { type: 'end', data: { eventId: messageId } }
-          })()
-        )
-      } as any,
-      configPresenter: {
-        getModelConfig: vi.fn().mockReturnValue({
-          functionCall: false,
-          vision: false,
-          type: 'chat'
-        }),
-        getSetting: vi.fn().mockReturnValue(false)
-      } as any,
-      sessionRuntime,
-      toolPresenter: {
-        getAllToolDefinitions: vi.fn().mockResolvedValue([]),
-        buildToolSystemPrompt: vi.fn().mockReturnValue(''),
-        callTool: vi.fn()
-      } as any,
-      mcpRuntime: {
-        callTool: vi.fn(),
-        grantPermission: vi.fn(),
-        isServerRunning: vi.fn()
-      } as any,
-      promptRuntime: {
-        getInputChatMode: vi.fn(),
-        getSkillsEnabled: vi.fn().mockReturnValue(false),
-        getActiveSkills: vi.fn(),
-        loadSkillContent: vi.fn(),
-        getMetadataPrompt: vi.fn(),
-        getActiveSkillsAllowedTools: vi.fn().mockResolvedValue([])
-      } as any,
-      permissionRuntime: {} as any
-    }
-    const llmEventHandler = {
-      handleLLMAgentResponse: vi.fn().mockResolvedValue(undefined),
-      handleLLMAgentError: vi.fn().mockResolvedValue(undefined),
-      handleLLMAgentEnd: vi.fn().mockResolvedValue(undefined)
-    }
-    const generatingMessages = new Map<string, GeneratingMessageState>([
-      [
-        messageId,
-        {
-          message: {
-            id: messageId,
-            conversationId,
-            role: 'assistant',
-            content: [],
-            parentId: userMessageId
-          } as any,
-          conversationId,
-          startTime: Date.now(),
-          firstTokenTime: null,
-          promptTokens: 0,
-          reasoningStartTime: null,
-          reasoningEndTime: null,
-          lastReasoningTime: null
-        }
-      ]
-    ])
-
-    const handler = new StreamGenerationHandler(ctx, {
-      generatingMessages,
-      llmEventHandler: llmEventHandler as any
-    })
-
-    await handler.startStreamCompletion(conversationId, userMessageId)
-
-    expect(sessionRuntime.startLoop).toHaveBeenCalledWith(conversationId, messageId, {
-      skipLockAcquisition: true
-    })
-    expect(sessionRuntime.resolveWorkspaceContext).toHaveBeenCalledWith(
-      conversationId,
-      'mock-model'
-    )
-    expect(ctx.llmProviderPresenter.startStreamCompletion).toHaveBeenCalled()
-  })
-})
diff --git a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/sessionPresenter/permissionHandler.test.ts b/archives/code/legacy-agentpresenter-retirement/test/main/presenter/sessionPresenter/permissionHandler.test.ts
deleted file mode 100644
index 5718839cf..000000000
--- a/archives/code/legacy-agentpresenter-retirement/test/main/presenter/sessionPresenter/permissionHandler.test.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-import type { AssistantMessage, AssistantMessageBlock } from '@shared/chat'
-import type { ILlmProviderPresenter } from '@shared/presenter'
-import { PermissionHandler } from '@/presenter/agentPresenter/permission/permissionHandler'
-import { CommandPermissionService } from '@/presenter/permission'
-import { presenter } from '@/presenter'
-import type { ThreadHandlerContext } from '@/presenter/agentPresenter/types/handlerContext'
-import type { StreamGenerationHandler } from '@/presenter/agentPresenter/streaming/streamGenerationHandler'
-import type { LLMEventHandler } from '@/presenter/agentPresenter/streaming/llmEventHandler'
-import type { MessageManager } from '@/presenter/sessionPresenter/managers/messageManager'
-import type { GeneratingMessageState } from '@/presenter/agentPresenter/streaming/types'
-
-const sessionState = vi.hoisted(() => ({
-  pendingPermissions: new Map<
-    string,
-    Array<{
-      messageId: string
-      toolCallId: string
-      permissionType: 'read' | 'write' | 'all' | 'command'
-      payload: Record<string, unknown>
-    }>
-  >(),
-  locks: new Map<string, { messageId: string; startedAt: number }>(),
-  status: new Map<string, string>(),
-  sessions: new Map<string, { id: string }>()
-}))
-
-const presenterMock = vi.hoisted(() => ({
-  sessionManager: {
-    clearPendingPermission: vi.fn((agentId: string) => {
-      sessionState.pendingPermissions.delete(agentId)
-    }),
-    setStatus: vi.fn((agentId: string, status: string) => {
-      sessionState.status.set(agentId, status)
-    }),
-    getStatus: vi.fn((agentId: string) => {
-      return (
-        (sessionState.status.get(agentId) as
-          | 'idle'
-          | 'generating'
-          | 'waiting_permission'
-          | 'waiting_question'
-          | null) ?? 'waiting_permission'
-      )
-    }),
-    startLoop: vi.fn().mockResolvedValue(undefined),
-    removePendingPermission: vi.fn((agentId: string, messageId: string, toolCallId: string) => {
-      const pending = sessionState.pendingPermissions.get(agentId) ?? []
-      sessionState.pendingPermissions.set(
-        agentId,
-        pending.filter((item) => !(item.messageId === messageId && item.toolCallId === toolCallId))
-      )
-    }),
-    addPendingPermission: vi.fn(
-      (
-        agentId: string,
-        permission: {
-          messageId: string
-          toolCallId: string
-          permissionType: 'read' | 'write' | 'all' | 'command'
-          payload: Record<string, unknown>
-        }
-      ) => {
-        const pending = sessionState.pendingPermissions.get(agentId) ?? []
-        pending.push(permission)
-        sessionState.pendingPermissions.set(agentId, pending)
-      }
-    ),
-    getPendingPermissions: vi.fn((agentId: string) => {
-      return sessionState.pendingPermissions.get(agentId) ?? []
-    }),
-    hasPendingPermissions: vi.fn((agentId: string, messageId?: string) => {
-      const pending = sessionState.pendingPermissions.get(agentId) ?? []
-      if (!messageId) {
-        return pending.length > 0
-      }
-      return pending.some((item) => item.messageId === messageId)
-    }),
-    acquirePermissionResumeLock: vi.fn((agentId: string, messageId: string) => {
-      if (sessionState.locks.get(agentId)?.messageId === messageId) {
-        return false
-      }
-      sessionState.locks.set(agentId, { messageId, startedAt: Date.now() })
-      return true
-    }),
-    getPermissionResumeLock: vi.fn((agentId: string) => {
-      return sessionState.locks.get(agentId)
-    }),
-    releasePermissionResumeLock: vi.fn((agentId: string) => {
-      sessionState.locks.delete(agentId)
-    }),
-    getSessionSync: vi.fn((agentId: string) => {
-      return sessionState.sessions.get(agentId) ?? null
-    })
-  }
-}))
-
-vi.mock('@/presenter', () => ({
-  presenter: presenterMock
-}))
-
-const createAssistantMessage = (
-  blocks: AssistantMessageBlock[],
-  conversationId: string,
-  messageId: string
-): AssistantMessage => {
-  return {
-    id: messageId,
-    conversationId,
-    role: 'assistant',
-    content: blocks
-  } as AssistantMessage
-}
-
-const createPermissionHandler = (options: {
-  message: AssistantMessage
-  llmProviderPresenter?: ILlmProviderPresenter
-}) => {
-  let currentMessage = options.message
-  const messageManager = {
-    getMessage: vi.fn().mockImplementation(async () => currentMessage),
-    editMessage: vi.fn().mockImplementation(async (_id: string, rawContent: string) => {
-      const next = JSON.parse(rawContent) as AssistantMessageBlock[]
-      currentMessage = {
-        ...currentMessage,
-        content: next
-      }
-      return currentMessage
-    }),
-    handleMessageError: vi.fn()
-  } as unknown as MessageManager
-
-  const ctx: ThreadHandlerContext = {
-    sqlitePresenter: {} as never,
-    messageManager,
-    llmProviderPresenter: options.llmProviderPresenter ?? ({} as ILlmProviderPresenter),
-    configPresenter: {} as never,
-    sessionRuntime: presenter.sessionManager as never,
-    toolPresenter: {
-      getAllToolDefinitions: vi.fn(),
-      callTool: vi.fn(),
-      buildToolSystemPrompt: vi.fn()
-    } as never,
-    mcpRuntime: {
-      grantPermission: vi.fn(),
-      isServerRunning: vi.fn().mockResolvedValue(true),
-      callTool: vi.fn()
-    } as never,
-    promptRuntime: {
-      getInputChatMode: vi.fn(),
-      getSkillsEnabled: vi.fn(),
-      getActiveSkills: vi.fn(),
-      loadSkillContent: vi.fn(),
-      getMetadataPrompt: vi.fn(),
-      getActiveSkillsAllowedTools: vi.fn()
-    } as never,
-    permissionRuntime: {
-      approveFileAccess: vi.fn(),
-      approveSettingsAccess: vi.fn()
-    } as never
-  }
-
-  const generatingMessages = new Map<string, GeneratingMessageState>()
-  generatingMessages.set(currentMessage.id, {
-    message: currentMessage,
-    conversationId: currentMessage.conversationId,
-    startTime: Date.now(),
-    firstTokenTime: null,
-    promptTokens: 0,
-    reasoningStartTime: null,
-    reasoningEndTime: null,
-    lastReasoningTime: null
-  })
-
-  const handler = new PermissionHandler(ctx, {
-    generatingMessages,
-    streamGenerationHandler: {} as StreamGenerationHandler,
-    llmEventHandler: {} as LLMEventHandler,
-    commandPermissionHandler: new CommandPermissionService()
-  })
-
-  return { handler, messageManager, getCurrentMessage: () => currentMessage }
-}
-
-describe('PermissionHandler', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-    sessionState.pendingPermissions.clear()
-    sessionState.locks.clear()
-    sessionState.status.clear()
-    sessionState.sessions.clear()
-  })
-
-  describe('ACP permissions', () => {
-    it('routes granted permissions through llmProviderPresenter for ACP blocks', async () => {
-      const conversationId = 'conv-1'
-      const messageId = 'msg-1'
-      const toolCallId = 'tool-1'
-      sessionState.sessions.set(conversationId, { id: conversationId })
-
-      const permissionBlock = {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'components.messageBlockPermissionRequest.description.write',
-        tool_call: { id: toolCallId, name: 'acp-tool' },
-        extra: {
-          needsUserAction: true,
-          providerId: 'acp',
-          permissionRequestId: 'req-123',
-          permissionRequest: JSON.stringify({ providerId: 'acp', requestId: 'req-123' }),
-          permissionType: 'write'
-        }
-      } as AssistantMessageBlock
-
-      const message = createAssistantMessage([permissionBlock], conversationId, messageId)
-      const llmProviderPresenter = {
-        resolveAgentPermission: vi.fn().mockResolvedValue(undefined)
-      } as unknown as ILlmProviderPresenter
-
-      const { handler } = createPermissionHandler({
-        message,
-        llmProviderPresenter
-      })
-
-      await handler.handlePermissionResponse(messageId, toolCallId, true, 'write', false)
-
-      expect(llmProviderPresenter.resolveAgentPermission).toHaveBeenCalledWith('req-123', true)
-      expect(presenter.sessionManager.clearPendingPermission).toHaveBeenCalledWith(conversationId)
-      expect(presenter.sessionManager.setStatus).toHaveBeenCalledWith(conversationId, 'generating')
-    })
-
-    it('routes denied permissions through llmProviderPresenter for ACP blocks', async () => {
-      const conversationId = 'conv-1'
-      const messageId = 'msg-1'
-      const toolCallId = 'tool-1'
-      sessionState.sessions.set(conversationId, { id: conversationId })
-
-      const permissionBlock = {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'components.messageBlockPermissionRequest.description.write',
-        tool_call: { id: toolCallId, name: 'acp-tool' },
-        extra: {
-          needsUserAction: true,
-          providerId: 'acp',
-          permissionRequestId: 'req-123',
-          permissionRequest: JSON.stringify({ providerId: 'acp', requestId: 'req-123' }),
-          permissionType: 'write'
-        }
-      } as AssistantMessageBlock
-
-      const message = createAssistantMessage([permissionBlock], conversationId, messageId)
-      const llmProviderPresenter = {
-        resolveAgentPermission: vi.fn().mockResolvedValue(undefined)
-      } as unknown as ILlmProviderPresenter
-
-      const { handler } = createPermissionHandler({
-        message,
-        llmProviderPresenter
-      })
-
-      await handler.handlePermissionResponse(messageId, toolCallId, false, 'write', false)
-
-      expect(llmProviderPresenter.resolveAgentPermission).toHaveBeenCalledWith('req-123', false)
-    })
-  })
-
-  describe('Session manager helpers', () => {
-    it('stores and filters pending permissions by messageId', () => {
-      const sessionManager = presenter.sessionManager as unknown as {
-        addPendingPermission: (agentId: string, permission: any) => void
-        getPendingPermissions: (agentId: string) => Array<{ toolCallId: string }>
-        hasPendingPermissions: (agentId: string, messageId?: string) => boolean
-      }
-
-      sessionManager.addPendingPermission('agent-1', {
-        messageId: 'msg-1',
-        toolCallId: 'tool-1',
-        permissionType: 'read',
-        payload: {}
-      })
-      sessionManager.addPendingPermission('agent-1', {
-        messageId: 'msg-2',
-        toolCallId: 'tool-2',
-        permissionType: 'write',
-        payload: {}
-      })
-
-      const pending = sessionManager.getPendingPermissions('agent-1')
-      expect(pending).toHaveLength(2)
-      expect(sessionManager.hasPendingPermissions('agent-1', 'msg-1')).toBe(true)
-      expect(sessionManager.hasPendingPermissions('agent-1', 'msg-3')).toBe(false)
-    })
-
-    it('acquires and releases permission resume lock', () => {
-      const sessionManager = presenter.sessionManager as unknown as {
-        acquirePermissionResumeLock: (agentId: string, messageId: string) => boolean
-        getPermissionResumeLock: (
-          agentId: string
-        ) => { messageId: string; startedAt: number } | undefined
-        releasePermissionResumeLock: (agentId: string) => void
-      }
-
-      const firstAcquire = sessionManager.acquirePermissionResumeLock('agent-1', 'msg-1')
-      const secondAcquire = sessionManager.acquirePermissionResumeLock('agent-1', 'msg-1')
-      const lock = sessionManager.getPermissionResumeLock('agent-1')
-
-      expect(firstAcquire).toBe(true)
-      expect(secondAcquire).toBe(false)
-      expect(lock?.messageId).toBe('msg-1')
-      expect(lock?.startedAt).toBeGreaterThan(0)
-
-      sessionManager.releasePermissionResumeLock('agent-1')
-      expect(sessionManager.getPermissionResumeLock('agent-1')).toBeUndefined()
-    })
-  })
-
-  describe('Permission level hierarchy', () => {
-    it('updates same tool-call permission blocks with same or lower required levels', async () => {
-      const conversationId = 'conv-2'
-      const messageId = 'msg-2'
-      const toolCallId = 'tool-1'
-      sessionState.sessions.set(conversationId, { id: conversationId })
-
-      const readPermissionBlock: AssistantMessageBlock = {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'Permission required',
-        tool_call: {
-          id: toolCallId,
-          name: 'write_file',
-          params: '{"path":"a.txt"}'
-        },
-        extra: {
-          needsUserAction: true,
-          serverName: 'mock-server',
-          permissionType: 'read'
-        }
-      }
-
-      const writePermissionBlock: AssistantMessageBlock = {
-        type: 'action',
-        action_type: 'tool_call_permission',
-        status: 'pending',
-        timestamp: Date.now(),
-        content: 'Permission required',
-        tool_call: {
-          id: toolCallId,
-          name: 'write_file',
-          params: '{"path":"a.txt"}'
-        },
-        extra: {
-          needsUserAction: true,
-          serverName: 'mock-server',
-          permissionType: 'write'
-        }
-      }
-
-      const message = createAssistantMessage(
-        [readPermissionBlock, writePermissionBlock],
-        conversationId,
-        messageId
-      )
-      const { handler, messageManager } = createPermissionHandler({ message })
-      vi.spyOn(
-        handler as unknown as { resumeToolExecutionAfterPermissions: (...args: any[]) => any },
-        'resumeToolExecutionAfterPermissions'
-      ).mockResolvedValue(undefined)
-
-      await handler.handlePermissionResponse(messageId, toolCallId, true, 'write', false)
-
-      const updatedContent = JSON.parse(
-        (messageManager.editMessage as unknown as { mock: { calls: Array<[string, string]> } }).mock
-          .calls[0][1]
-      ) as AssistantMessageBlock[]
-
-      const updatedPermissionBlocks = updatedContent.filter(
-        (block) => block.type === 'action' && block.action_type === 'tool_call_permission'
-      )
-      expect(updatedPermissionBlocks).toHaveLength(2)
-      expect(updatedPermissionBlocks.every((block) => block.status === 'granted')).toBe(true)
-      expect(updatedPermissionBlocks.every((block) => block.extra?.needsUserAction === false)).toBe(
-        true
-      )
-    })
-  })
-})
diff --git a/docs/ARCHITECTURE.md b/docs/ARCHITECTURE.md
index e6a6e7173..a69af7b1c 100644
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -7,22 +7,22 @@
 ```mermaid
 flowchart LR
     Renderer["Renderer / Stores / Views"] --> Preload["preload IPC bridge"]
-    Preload --> NewAgent["newAgentPresenter"]
+    Preload --> NewAgent["agentSessionPresenter"]
     NewAgent --> Registry["AgentRegistry"]
-    Registry --> DeepChat["deepchatAgentPresenter"]
+    Registry --> DeepChat["agentRuntimePresenter"]
     DeepChat --> Tool["toolPresenter"]
     DeepChat --> Llm["llmProviderPresenter"]
     Tool --> Mcp["mcpPresenter"]
     Tool --> AgentTools["toolPresenter/agentTools"]
     Llm --> Acp["llmProviderPresenter/acp"]
     DeepChat --> SQLite["sqlitePresenter"]
-    NewAgent --> SessionDb["newAgentPresenter/sessionManager"]
+    NewAgent --> SessionDb["agentSessionPresenter/sessionManager"]
 ```
 
 主结论：
 
-- `newAgentPresenter` 是 renderer 唯一会话入口。
-- `deepchatAgentPresenter` 持有聊天 runtime、流式执行、工具交互、暂停恢复。
+- `agentSessionPresenter` 是 renderer 唯一会话入口。
+- `agentRuntimePresenter` 持有聊天 runtime、流式执行、工具交互、暂停恢复。
 - `toolPresenter` 统一路由 MCP tools 与本地 agent tools。
 - `llmProviderPresenter` 统一管理 provider 实例、流状态和 ACP provider helper。
 
@@ -31,8 +31,8 @@ flowchart LR
 | 模块 | 位置 | 职责 |
 | --- | --- | --- |
 | `Presenter` 组装层 | `src/main/presenter/index.ts` | 组装 presenter 依赖，暴露主进程能力 |
-| `NewAgentPresenter` | `src/main/presenter/newAgentPresenter/` | 会话创建、窗口绑定、agent 注册、IPC-facing API |
-| `DeepChatAgentPresenter` | `src/main/presenter/deepchatAgentPresenter/` | 聊天 runtime、stream loop、tool interaction、message persistence |
+| `AgentSessionPresenter` | `src/main/presenter/agentSessionPresenter/` | 会话创建、窗口绑定、agent 注册、IPC-facing API |
+| `AgentRuntimePresenter` | `src/main/presenter/agentRuntimePresenter/` | 聊天 runtime、stream loop、tool interaction、message persistence |
 | `ToolPresenter` | `src/main/presenter/toolPresenter/` | 工具定义聚合、调用路由、权限预检查 |
 | `Agent tools` | `src/main/presenter/toolPresenter/agentTools/` | 文件系统、命令、settings 等本地工具 |
 | `LLMProviderPresenter` | `src/main/presenter/llmProviderPresenter/` | provider 实例、stream state、model 管理、embedding、ACP provider |
@@ -43,7 +43,7 @@ flowchart LR
 
 ### 1. IPC / Session orchestration
 
-`newAgentPresenter` 负责：
+`agentSessionPresenter` 负责：
 
 - 创建/删除/激活会话
 - 绑定 `webContentsId -> sessionId`
@@ -53,7 +53,7 @@ flowchart LR
 
 ### 2. Chat runtime
 
-`deepchatAgentPresenter` 负责：
+`agentRuntimePresenter` 负责：
 
 - `processMessage()` 和 `processStream()` 主循环
 - `sessionStore` / `messageStore` / `pendingInputStore`
@@ -82,7 +82,7 @@ flowchart LR
 
 这次 retirement 后仍然保留的 legacy 边界只有：
 
-- `src/main/presenter/newAgentPresenter/legacyImportService.ts`
+- `src/main/presenter/agentSessionPresenter/legacyImportService.ts`
 - legacy import hook / status tracking
 - 旧 `conversations/messages` 表，作为 import-only 与导出数据源
 - `SessionPresenter` 作为 main 内部数据平面，不再是 renderer 主聊天入口
@@ -95,7 +95,7 @@ flowchart LR
 
 ## 归档与防回归
 
-- 退休代码已归档到 `archives/code/legacy-agentpresenter-retirement/`
+- 退休 runtime 的历史结构已经固化到 `docs/archives/` 文档，不再保留源码级导航入口
 - 历史架构文档见 [archives/legacy-agentpresenter-architecture.md](./archives/legacy-agentpresenter-architecture.md)
 - 历史流程文档见 [archives/legacy-agentpresenter-flows.md](./archives/legacy-agentpresenter-flows.md)
 - 防回归脚本：`scripts/agent-cleanup-guard.mjs`
diff --git a/docs/FLOWS.md b/docs/FLOWS.md
index 331399129..6b81c206b 100644
--- a/docs/FLOWS.md
+++ b/docs/FLOWS.md
@@ -8,9 +8,9 @@
 ```mermaid
 sequenceDiagram
     participant R as Renderer
-    participant N as NewAgentPresenter
+    participant N as AgentSessionPresenter
     participant A as AgentRegistry
-    participant D as DeepChatAgentPresenter
+    participant D as AgentRuntimePresenter
     participant S as NewSessionManager
 
     R->>N: createSession(input, webContentsId)
@@ -24,9 +24,9 @@ sequenceDiagram
 
 关键文件：
 
-- `src/main/presenter/newAgentPresenter/index.ts`
-- `src/main/presenter/newAgentPresenter/sessionManager.ts`
-- `src/main/presenter/deepchatAgentPresenter/index.ts`
+- `src/main/presenter/agentSessionPresenter/index.ts`
+- `src/main/presenter/agentSessionPresenter/sessionManager.ts`
+- `src/main/presenter/agentRuntimePresenter/index.ts`
 
 ## 2. DeepChat 消息处理主循环
 
@@ -48,16 +48,16 @@ flowchart TD
 
 关键文件：
 
-- `src/main/presenter/deepchatAgentPresenter/process.ts`
-- `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
-- `src/main/presenter/deepchatAgentPresenter/contextBuilder.ts`
-- `src/main/presenter/deepchatAgentPresenter/messageStore.ts`
+- `src/main/presenter/agentRuntimePresenter/process.ts`
+- `src/main/presenter/agentRuntimePresenter/dispatch.ts`
+- `src/main/presenter/agentRuntimePresenter/contextBuilder.ts`
+- `src/main/presenter/agentRuntimePresenter/messageStore.ts`
 
 ## 3. 工具调用与权限
 
 ```mermaid
 sequenceDiagram
-    participant D as DeepChatAgentPresenter
+    participant D as AgentRuntimePresenter
     participant T as ToolPresenter
     participant M as MCP Presenter
     participant G as AgentToolManager
@@ -94,8 +94,8 @@ sequenceDiagram
 ```mermaid
 sequenceDiagram
     participant R as Renderer
-    participant N as NewAgentPresenter
-    participant D as DeepChatAgentPresenter
+    participant N as AgentSessionPresenter
+    participant D as AgentRuntimePresenter
     participant L as LLMProviderPresenter
     participant A as ACP helpers
 
@@ -109,7 +109,7 @@ sequenceDiagram
 
 关键文件：
 
-- `src/main/presenter/newAgentPresenter/index.ts`
+- `src/main/presenter/agentSessionPresenter/index.ts`
 - `src/main/presenter/llmProviderPresenter/index.ts`
 - `src/main/presenter/llmProviderPresenter/acp/`
 
@@ -118,7 +118,7 @@ sequenceDiagram
 ```mermaid
 sequenceDiagram
     participant Hook as lifecycle import hook
-    participant N as NewAgentPresenter
+    participant N as AgentSessionPresenter
     participant I as LegacyChatImportService
     participant DB as SQLite / legacy tables
 
@@ -133,5 +133,5 @@ sequenceDiagram
 
 关键文件：
 
-- `src/main/presenter/newAgentPresenter/legacyImportService.ts`
+- `src/main/presenter/agentSessionPresenter/legacyImportService.ts`
 - `src/main/presenter/lifecyclePresenter/hooks/after-start/legacyImportHook.ts`
diff --git a/docs/README.md b/docs/README.md
index 86f523566..c4bf30e04 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -7,8 +7,8 @@
 ```text
 Renderer
   -> preload IPC
-  -> newAgentPresenter
-  -> deepchatAgentPresenter
+  -> agentSessionPresenter
+  -> agentRuntimePresenter
   -> llmProviderPresenter / toolPresenter / mcpPresenter
   -> sqlitePresenter
 ```
@@ -21,11 +21,13 @@ Renderer
 | --- | --- |
 | [ARCHITECTURE.md](./ARCHITECTURE.md) | 当前主架构总览 |
 | [FLOWS.md](./FLOWS.md) | 当前消息、工具、ACP、导入流程 |
-| [architecture/agent-system.md](./architecture/agent-system.md) | `newAgentPresenter` / `deepchatAgentPresenter` 细节 |
+| [architecture/agent-system.md](./architecture/agent-system.md) | `agentSessionPresenter` / `agentRuntimePresenter` 细节 |
 | [architecture/tool-system.md](./architecture/tool-system.md) | `ToolPresenter`、agent tools、ACP helper 分层 |
 | [architecture/session-management.md](./architecture/session-management.md) | 新会话管理与 legacy 数据平面边界 |
 | [guides/code-navigation.md](./guides/code-navigation.md) | 当前代码导航入口 |
 | [guides/getting-started.md](./guides/getting-started.md) | 新开发者快速上手 |
+| [architecture/baselines/dependency-report.md](./architecture/baselines/dependency-report.md) | 当前依赖与耦合基线 |
+| [architecture/baselines/test-failure-groups.md](./architecture/baselines/test-failure-groups.md) | 当前测试失败分组基线 |
 
 ## 本次清理落库
 
@@ -34,7 +36,9 @@ Renderer
 | [docs/specs/legacy-agentpresenter-retirement/spec.md](./specs/legacy-agentpresenter-retirement/spec.md) | 本次 retirement 的目标、范围、兼容边界 |
 | [docs/specs/legacy-agentpresenter-retirement/plan.md](./specs/legacy-agentpresenter-retirement/plan.md) | 迁移/归档/验证计划 |
 | [docs/specs/legacy-agentpresenter-retirement/tasks.md](./specs/legacy-agentpresenter-retirement/tasks.md) | 已执行清单 |
-| [archives/code/legacy-agentpresenter-retirement/README.md](../archives/code/legacy-agentpresenter-retirement/README.md) | 代码归档说明 |
+| [docs/specs/architecture-simplification/spec.md](./specs/architecture-simplification/spec.md) | 整体减负治理规格 |
+| [docs/specs/architecture-simplification/plan.md](./specs/architecture-simplification/plan.md) | 分层/基线/guard 计划 |
+| [docs/specs/architecture-simplification/tasks.md](./specs/architecture-simplification/tasks.md) | 首期实施清单 |
 | [docs/specs/agent-cleanup/spec.md](./specs/agent-cleanup/spec.md) | cleanup 主规格，已更新到 retirement 完成态 |
 
 ## 活跃架构地图
@@ -46,6 +50,7 @@ docs/
 ├── FLOWS.md
 ├── architecture/
 │   ├── agent-system.md
+│   ├── baselines/
 │   ├── session-management.md
 │   ├── tool-system.md
 │   ├── event-system.md
@@ -56,6 +61,7 @@ docs/
 │   └── debugging.md
 ├── specs/
 │   ├── agent-cleanup/
+│   ├── architecture-simplification/
 │   └── legacy-agentpresenter-retirement/
 └── archives/
     ├── legacy-agentpresenter-architecture.md
@@ -83,4 +89,4 @@ docs/
    - 聊天执行链路： [architecture/agent-system.md](./architecture/agent-system.md)
    - 工具与权限： [architecture/tool-system.md](./architecture/tool-system.md)
    - 会话与兼容边界： [architecture/session-management.md](./architecture/session-management.md)
-4. 如果需要对照旧实现，再去看 `archives/`。
+4. 如果需要对照旧实现，再去看 `archives/` 历史文档，不要依赖已经移除的历史源码快照。
diff --git a/docs/architecture/agent-system.md b/docs/architecture/agent-system.md
index ff0610ece..48422d0e3 100644
--- a/docs/architecture/agent-system.md
+++ b/docs/architecture/agent-system.md
@@ -7,9 +7,9 @@
 
 ```mermaid
 flowchart TD
-    UI["Renderer / IPC"] --> NewAgent["NewAgentPresenter"]
+    UI["Renderer / IPC"] --> NewAgent["AgentSessionPresenter"]
     NewAgent --> Registry["AgentRegistry"]
-    Registry --> DeepChat["DeepChatAgentPresenter"]
+    Registry --> DeepChat["AgentRuntimePresenter"]
     DeepChat --> Context["contextBuilder"]
     DeepChat --> Process["process.ts"]
     DeepChat --> Dispatch["dispatch.ts"]
@@ -21,16 +21,16 @@ flowchart TD
 
 主原则：
 
-- renderer 只面向 `newAgentPresenter`
-- `newAgentPresenter` 只做 session orchestration，不执行聊天 loop
-- `deepchatAgentPresenter` 独占聊天 runtime
+- renderer 只面向 `agentSessionPresenter`
+- `agentSessionPresenter` 只做 session orchestration，不执行聊天 loop
+- `agentRuntimePresenter` 独占聊天 runtime
 
 ## 模块布局
 
-### `newAgentPresenter/`
+### `agentSessionPresenter/`
 
 ```text
-newAgentPresenter/
+agentSessionPresenter/
 ├── index.ts
 ├── agentRegistry.ts
 ├── sessionManager.ts
@@ -46,10 +46,10 @@ newAgentPresenter/
 - 暴露 renderer IPC 方法
 - 保留 legacy import 流程
 
-### `deepchatAgentPresenter/`
+### `agentRuntimePresenter/`
 
 ```text
-deepchatAgentPresenter/
+agentRuntimePresenter/
 ├── index.ts
 ├── process.ts
 ├── dispatch.ts
@@ -75,12 +75,12 @@ deepchatAgentPresenter/
 
 | 层 | 主文件 | 责任 |
 | --- | --- | --- |
-| Session orchestration | `src/main/presenter/newAgentPresenter/index.ts` | session 生命周期与 IPC |
-| Agent runtime | `src/main/presenter/deepchatAgentPresenter/index.ts` | run state、取消、恢复、模型/权限切换 |
-| Stream loop | `src/main/presenter/deepchatAgentPresenter/process.ts` | 调用 provider、累计 blocks、驱动 tool loop |
-| Tool dispatch | `src/main/presenter/deepchatAgentPresenter/dispatch.ts` | 调用 `ToolPresenter`、暂停交互、生成 tool 结果 |
-| Context build | `src/main/presenter/deepchatAgentPresenter/contextBuilder.ts` | 历史裁剪、resume context、token budget |
-| Persistence | `src/main/presenter/deepchatAgentPresenter/messageStore.ts` | 消息持久化与故障恢复 |
+| Session orchestration | `src/main/presenter/agentSessionPresenter/index.ts` | session 生命周期与 IPC |
+| Agent runtime | `src/main/presenter/agentRuntimePresenter/index.ts` | run state、取消、恢复、模型/权限切换 |
+| Stream loop | `src/main/presenter/agentRuntimePresenter/process.ts` | 调用 provider、累计 blocks、驱动 tool loop |
+| Tool dispatch | `src/main/presenter/agentRuntimePresenter/dispatch.ts` | 调用 `ToolPresenter`、暂停交互、生成 tool 结果 |
+| Context build | `src/main/presenter/agentRuntimePresenter/contextBuilder.ts` | 历史裁剪、resume context、token budget |
+| Persistence | `src/main/presenter/agentRuntimePresenter/messageStore.ts` | 消息持久化与故障恢复 |
 
 ## 兼容边界
 
@@ -101,10 +101,10 @@ deepchatAgentPresenter/
 
 如果要追一条真实消息链路，推荐顺序：
 
-1. `src/main/presenter/newAgentPresenter/index.ts`
-2. `src/main/presenter/deepchatAgentPresenter/index.ts`
-3. `src/main/presenter/deepchatAgentPresenter/process.ts`
-4. `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+1. `src/main/presenter/agentSessionPresenter/index.ts`
+2. `src/main/presenter/agentRuntimePresenter/index.ts`
+3. `src/main/presenter/agentRuntimePresenter/process.ts`
+4. `src/main/presenter/agentRuntimePresenter/dispatch.ts`
 5. `src/main/presenter/toolPresenter/index.ts`
 
 ## 历史说明
@@ -117,4 +117,4 @@ deepchatAgentPresenter/
 - `permissionHandler`
 - `startStreamCompletion`
 
-需要对照旧实现时，只看归档文档和 `archives/code/legacy-agentpresenter-retirement/`。
+需要对照旧实现时，只看归档文档，不再把历史源码快照当作活跃导航入口。
diff --git a/docs/architecture/baselines/archive-reference-report.md b/docs/architecture/baselines/archive-reference-report.md
new file mode 100644
index 000000000..79b127297
--- /dev/null
+++ b/docs/architecture/baselines/archive-reference-report.md
@@ -0,0 +1,6 @@
+# Archive Reference Baseline
+
+Generated on 2026-04-03.
+
+- Total references: 0
+
diff --git a/docs/architecture/baselines/dependency-report.md b/docs/architecture/baselines/dependency-report.md
new file mode 100644
index 000000000..46a2b1137
--- /dev/null
+++ b/docs/architecture/baselines/dependency-report.md
@@ -0,0 +1,118 @@
+# Dependency Baseline
+
+Generated on 2026-04-03.
+
+## main
+
+- Total files: 333
+- Internal dependency edges: 826
+- Cycles detected: 30
+
+### Top outgoing dependencies
+
+- `presenter/index.ts`: 39
+- `presenter/llmProviderPresenter/managers/providerInstanceManager.ts`: 38
+- `presenter/configPresenter/index.ts`: 22
+- `presenter/agentRuntimePresenter/index.ts`: 20
+- `presenter/lifecyclePresenter/hooks/index.ts`: 17
+- `presenter/sqlitePresenter/index.ts`: 16
+- `presenter/remoteControlPresenter/index.ts`: 15
+- `presenter/llmProviderPresenter/index.ts`: 14
+- `presenter/toolPresenter/agentTools/agentToolManager.ts`: 14
+- `presenter/agentSessionPresenter/index.ts`: 13
+- `presenter/llmProviderPresenter/acp/index.ts`: 12
+- `presenter/filePresenter/mime.ts`: 11
+- `presenter/mcpPresenter/inMemoryServers/builder.ts`: 11
+- `presenter/skillSyncPresenter/adapters/index.ts`: 11
+- `presenter/filePresenter/FileAdapterConstructor.ts`: 10
+
+### Top incoming dependencies
+
+- `events.ts`: 58
+- `eventbus.ts`: 57
+- `presenter/index.ts`: 44
+- `presenter/llmProviderPresenter/runtimePorts.ts`: 34
+- `presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts`: 24
+- `presenter/llmProviderPresenter/baseProvider.ts`: 19
+- `presenter/remoteControlPresenter/types.ts`: 18
+- `presenter/sqlitePresenter/tables/baseTable.ts`: 16
+- `presenter/sqlitePresenter/index.ts`: 12
+- `presenter/configPresenter/modelCapabilities.ts`: 11
+- `presenter/filePresenter/BaseFileAdapter.ts`: 11
+- `presenter/proxyConfig.ts`: 10
+- `lib/runtimeHelper.ts`: 9
+- `presenter/configPresenter/providerDbLoader.ts`: 9
+- `presenter/configPresenter/acpRegistryConstants.ts`: 8
+
+### Cycle samples
+
+- `presenter/index.ts -> presenter/windowPresenter/index.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/windowPresenter/index.ts -> presenter/tabPresenter.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/windowPresenter/index.ts -> presenter/windowPresenter/FloatingChatWindow.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/shortcutPresenter.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/llmProviderPresenter/index.ts -> presenter/llmProviderPresenter/baseProvider.ts -> presenter/devicePresenter/index.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/llmProviderPresenter/index.ts -> presenter/llmProviderPresenter/managers/providerInstanceManager.ts -> presenter/llmProviderPresenter/providers/deepseekProvider.ts -> presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/llmProviderPresenter/index.ts -> presenter/llmProviderPresenter/managers/providerInstanceManager.ts -> presenter/llmProviderPresenter/providers/githubCopilotProvider.ts -> presenter/githubCopilotDeviceFlow.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/llmProviderPresenter/index.ts -> presenter/llmProviderPresenter/managers/providerInstanceManager.ts -> presenter/llmProviderPresenter/providers/openAIResponsesProvider.ts -> presenter/index.ts`
+- `presenter/filePresenter/mime.ts -> presenter/filePresenter/CsvFileAdapter.ts -> presenter/filePresenter/BaseFileAdapter.ts -> presenter/filePresenter/mime.ts`
+- `presenter/index.ts -> presenter/sessionPresenter/index.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/sessionPresenter/index.ts -> presenter/sessionPresenter/managers/conversationManager.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/serverManager.ts -> presenter/mcpPresenter/mcpClient.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/serverManager.ts -> presenter/mcpPresenter/mcpClient.ts -> presenter/mcpPresenter/inMemoryServers/builder.ts -> presenter/mcpPresenter/inMemoryServers/deepResearchServer.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/serverManager.ts -> presenter/mcpPresenter/mcpClient.ts -> presenter/mcpPresenter/inMemoryServers/builder.ts -> presenter/mcpPresenter/inMemoryServers/autoPromptingServer.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/serverManager.ts -> presenter/mcpPresenter/mcpClient.ts -> presenter/mcpPresenter/inMemoryServers/builder.ts -> presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/serverManager.ts -> presenter/mcpPresenter/mcpClient.ts -> presenter/mcpPresenter/inMemoryServers/builder.ts -> presenter/mcpPresenter/inMemoryServers/builtinKnowledgeServer.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/mcpPresenter/toolManager.ts -> presenter/index.ts`
+- `presenter/index.ts -> presenter/mcpPresenter/index.ts -> presenter/index.ts`
+- `presenter/sqlitePresenter/index.ts -> presenter/agentSessionPresenter/legacyImportService.ts -> presenter/sqlitePresenter/index.ts`
+- `presenter/index.ts -> presenter/syncPresenter/index.ts -> presenter/index.ts`
+
+## renderer
+
+- Total files: 235
+- Internal dependency edges: 478
+- Cycles detected: 4
+
+### Top outgoing dependencies
+
+- `App.vue`: 24
+- `pages/ChatPage.vue`: 17
+- `views/PlaygroundTabView.vue`: 16
+- `components/message/MessageItemAssistant.vue`: 15
+- `i18n/index.ts`: 12
+- `components/chat/ChatStatusBar.vue`: 11
+- `components/ChatConfig.vue`: 9
+- `components/sidepanel/WorkspacePanel.vue`: 9
+- `pages/NewThreadPage.vue`: 9
+- `views/ChatTabView.vue`: 9
+- `components/AppBar.vue`: 8
+- `components/WindowSideBar.vue`: 8
+- `components/mcp-config/components/McpServers.vue`: 8
+- `components/message/MessageBlockContent.vue`: 8
+- `components/chat/composables/useChatInputMentions.ts`: 7
+
+### Top incoming dependencies
+
+- `composables/usePresenter.ts`: 64
+- `events.ts`: 32
+- `components/chat/messageListItems.ts`: 16
+- `stores/ui/session.ts`: 15
+- `stores/artifact.ts`: 13
+- `stores/providerStore.ts`: 13
+- `stores/theme.ts`: 12
+- `stores/modelStore.ts`: 11
+- `stores/ui/agent.ts`: 11
+- `stores/uiSettingsStore.ts`: 10
+- `stores/mcp.ts`: 8
+- `stores/ui/sidepanel.ts`: 8
+- `components/icons/ModelIcon.vue`: 6
+- `components/use-toast.ts`: 6
+- `stores/language.ts`: 6
+
+### Cycle samples
+
+- `stores/ui/session.ts -> stores/ui/message.ts -> stores/ui/session.ts`
+- `components/json-viewer/JsonValue.ts -> components/json-viewer/JsonObject.ts -> components/json-viewer/JsonValue.ts`
+- `components/json-viewer/JsonArray.ts -> components/json-viewer/JsonValue.ts -> components/json-viewer/JsonArray.ts`
+- `composables/usePageCapture.example.ts -> composables/usePageCapture.example.ts`
+
diff --git a/docs/architecture/baselines/test-failure-groups.md b/docs/architecture/baselines/test-failure-groups.md
new file mode 100644
index 000000000..0ef19eaaf
--- /dev/null
+++ b/docs/architecture/baselines/test-failure-groups.md
@@ -0,0 +1,38 @@
+# Test Failure Groups
+
+Baseline captured on `2026-04-03`.
+
+## 真实行为回归 / 契约漂移
+
+- `test/main/presenter/agentSessionPresenter/integration.test.ts`
+  - `configPresenter.getAgentType()` mock 契约缺失暴露了会话编排对配置查询的硬依赖。
+- `test/main/presenter/floatingButtonPresenter/*.test.ts`
+  - 布局断言和当前窗口吸边行为不一致。
+- `test/main/presenter/skillSyncPresenter/*.test.ts`
+  - Cursor format / conversion warnings 的行为与测试契约漂移。
+- `test/renderer/stores/sessionStore.test.ts`
+  - sidebar group 逻辑对 `sessionKind` 缺省值不兼容。
+- `test/renderer/composables/useModelCapabilities.test.ts`
+  - search capability 返回值未对齐测试预期。
+
+## 测试陈旧 / 遗留测试未跟上实现
+
+- `test/main/presenter/mcpClient.test.ts`
+  - 仍然断言旧的 runtime command translation 细节。
+- `test/main/presenter/agentSessionPresenter/messageManager.test.ts`
+  - 仍然调用已不再暴露的方法。
+- `test/renderer/composables/useSearchConfig.test.ts`
+  - 测试存在，但实现文件缺失。
+- `test/renderer/components/MermaidArtifact.test.ts`
+  - 组件结构与测试查询方式不再匹配。
+- 多个 renderer store test 的 `pinia` mock
+  - 当前 mock 方式污染 `setActivePinia/createPinia`。
+
+## 环境问题
+
+- `test/main/presenter/SyncPresenter.test.ts`
+  - `better-sqlite3-multiple-ciphers` 二进制与当前 Node ABI 不匹配。
+- `test/main/presenter/llmProviderPresenter.test.ts`
+  - 用例依赖超时 / 网络模拟不稳定。
+- 若干 renderer test 中的 `jsdom` navigation not implemented
+  - 不是业务行为错误，而是测试环境能力限制。
diff --git a/docs/architecture/baselines/zero-inbound-candidates.md b/docs/architecture/baselines/zero-inbound-candidates.md
new file mode 100644
index 000000000..907b5d066
--- /dev/null
+++ b/docs/architecture/baselines/zero-inbound-candidates.md
@@ -0,0 +1,76 @@
+# Zero Inbound Candidates
+
+Generated on 2026-04-03.
+
+These files have no in-repo importers inside their scope and need manual classification before deletion.
+
+## main
+
+- Candidate count: 16
+
+- `env.d.ts`
+- `lib/system.ts`
+- `lib/terminalHelper.ts`
+- `presenter/browser/BrowserContextBuilder.ts`
+- `presenter/configPresenter/aes.ts`
+- `presenter/llmProviderPresenter/oauthHelper.ts`
+- `presenter/llmProviderPresenter/providers/openAIProvider.ts`
+- `presenter/mcpPresenter/agentMcpFilter.ts`
+- `presenter/searchPrompts/searchPrompts.ts`
+- `presenter/sessionPresenter/events.ts`
+- `presenter/sessionPresenter/persistence/conversationPersister.ts`
+- `presenter/sessionPresenter/persistence/messagePersister.ts`
+- `presenter/sessionPresenter/tab/tabAdapter.ts`
+- `presenter/sessionPresenter/types.ts`
+- `presenter/sqlitePresenter/tables/attachments.ts`
+- `presenter/workspacePresenter/fileCache.ts`
+
+## renderer
+
+- Candidate count: 44
+
+- `components/ChatConfig.vue`
+- `components/ChatConfig/ConfigSwitchField.vue`
+- `components/FileItem.vue`
+- `components/ModelSelect.vue`
+- `components/ScrollablePopover.vue`
+- `components/artifacts/ArtifactBlock.vue`
+- `components/chat-input/SkillsIndicator.vue`
+- `components/chat-input/VoiceCallWidget.vue`
+- `components/chat-input/components/ToolbarButton.vue`
+- `components/chat-input/composables/useAgentMcpData.ts`
+- `components/chat-input/composables/useContextLength.ts`
+- `components/chat-input/composables/useDragAndDrop.ts`
+- `components/chat-input/composables/useInputHistory.ts`
+- `components/chat-input/composables/useInputSettings.ts`
+- `components/chat-input/composables/usePromptInputFiles.ts`
+- `components/chat-input/composables/useRateLimitStatus.ts`
+- `components/editor/mention/PromptParamsDialog.vue`
+- `components/editor/mention/mention.ts`
+- `components/editor/mention/slashMention.ts`
+- `components/mcp-config/AgentMcpSelector.vue`
+- `components/message/MessageActionButtons.vue`
+- `components/message/MessageItemPlaceholder.vue`
+- `components/message/ReferencePreview.vue`
+- `components/settings/ModelConfigItem.vue`
+- `composables/message/useMessageScroll.ts`
+- `composables/useArtifactCodeEditor.ts`
+- `composables/useArtifactContext.ts`
+- `composables/useArtifactExport.ts`
+- `composables/useArtifactViewMode.ts`
+- `composables/useSearchConfig.ts`
+- `composables/useViewportSize.ts`
+- `env.d.ts`
+- `lib/float.cursor.ts`
+- `lib/gemini.ts`
+- `lib/sanitizeText.ts`
+- `main.ts`
+- `stores/floatingButton.ts`
+- `stores/prompts.ts`
+- `stores/providerDeeplinkImport.ts`
+- `stores/shortcutKey.ts`
+- `stores/sync.ts`
+- `stores/systemPromptStore.ts`
+- `utils/maxOutputTokens.ts`
+- `views/SettingsTabView.vue`
+
diff --git a/docs/architecture/new-ui-implementation-plan.md b/docs/architecture/new-ui-implementation-plan.md
index bab6f5058..b03c83387 100644
--- a/docs/architecture/new-ui-implementation-plan.md
+++ b/docs/architecture/new-ui-implementation-plan.md
@@ -556,8 +556,8 @@ sessionStore.selectSession(id)
 - `chat.ts`: Remove session management logic, keep message logic
 
 **Deprecated**:
-- `components/mock/*.vue`: Archived in `archives/code/dead-code-batch-2/`
-- `composables/useMockViewState.ts`: Archived in `archives/code/dead-code-batch-2/`
+- `components/mock/*.vue`: Removed after the new UI rollout, only historical docs remain
+- `composables/useMockViewState.ts`: Removed after stores took over the state flow
 
 ---
 
diff --git a/docs/architecture/session-management.md b/docs/architecture/session-management.md
index c07da96e4..2598678b5 100644
--- a/docs/architecture/session-management.md
+++ b/docs/architecture/session-management.md
@@ -2,18 +2,18 @@
 
 retirement 之后，会话管理被明确拆成两层：
 
-- 活跃聊天层：`newAgentPresenter` + `NewSessionManager`
+- 活跃聊天层：`agentSessionPresenter` + `NewSessionManager`
 - 兼容数据层：`SessionPresenter`
 
 ## 当前职责边界
 
 | 组件 | 位置 | 当前职责 |
 | --- | --- | --- |
-| `NewAgentPresenter` | `src/main/presenter/newAgentPresenter/index.ts` | renderer 唯一 session 入口 |
-| `NewSessionManager` | `src/main/presenter/newAgentPresenter/sessionManager.ts` | `new_sessions` 记录、窗口绑定、session CRUD |
-| `NewMessageManager` | `src/main/presenter/newAgentPresenter/messageManager.ts` | 新会话消息读取与 agent routing |
-| `DeepChatSessionStore` | `src/main/presenter/deepchatAgentPresenter/sessionStore.ts` | 活跃 runtime 状态 |
-| `DeepChatMessageStore` | `src/main/presenter/deepchatAgentPresenter/messageStore.ts` | 新消息持久化 |
+| `AgentSessionPresenter` | `src/main/presenter/agentSessionPresenter/index.ts` | renderer 唯一 session 入口 |
+| `NewSessionManager` | `src/main/presenter/agentSessionPresenter/sessionManager.ts` | `new_sessions` 记录、窗口绑定、session CRUD |
+| `NewMessageManager` | `src/main/presenter/agentSessionPresenter/messageManager.ts` | 新会话消息读取与 agent routing |
+| `DeepChatSessionStore` | `src/main/presenter/agentRuntimePresenter/sessionStore.ts` | 活跃 runtime 状态 |
+| `DeepChatMessageStore` | `src/main/presenter/agentRuntimePresenter/messageStore.ts` | 新消息持久化 |
 | `SessionPresenter` | `src/main/presenter/sessionPresenter/index.ts` | legacy conversation/thread/export 兼容层 |
 | `sessionPresenter/messageFormatter.ts` | `src/main/presenter/sessionPresenter/messageFormatter.ts` | 用户消息上下文格式化与 exporter 复用 |
 
@@ -22,9 +22,9 @@ retirement 之后，会话管理被明确拆成两层：
 ```mermaid
 sequenceDiagram
     participant R as Renderer
-    participant N as NewAgentPresenter
+    participant N as AgentSessionPresenter
     participant S as NewSessionManager
-    participant D as DeepChatAgentPresenter
+    participant D as AgentRuntimePresenter
 
     R->>N: createSession()
     N->>S: create()
@@ -70,4 +70,4 @@ sequenceDiagram
 - 维护 exporter 使用的用户消息归一化
 
 如果是当前聊天会话创建、发送消息、取消生成、tool interaction，请直接从
-`newAgentPresenter` 和 `deepchatAgentPresenter` 开始读。
+`agentSessionPresenter` 和 `agentRuntimePresenter` 开始读。
diff --git a/docs/architecture/tool-system.md b/docs/architecture/tool-system.md
index f5d05846a..e6730f2e1 100644
--- a/docs/architecture/tool-system.md
+++ b/docs/architecture/tool-system.md
@@ -20,7 +20,7 @@
 
 ```mermaid
 graph LR
-    DeepChat["DeepChatAgentPresenter"] --> ToolPresenter["ToolPresenter"]
+    DeepChat["AgentRuntimePresenter"] --> ToolPresenter["ToolPresenter"]
     ToolPresenter --> Mapper["ToolMapper"]
     ToolPresenter --> Mcp["McpPresenter"]
     ToolPresenter --> AgentTools["AgentToolManager"]
@@ -37,14 +37,14 @@ graph LR
 2. 从 `AgentToolManager` 拉取本地 agent tools。
 3. 用 `ToolMapper` 记录来源，并在重名时优先保留 MCP tool。
 
-这意味着 `deepchatAgentPresenter` 不需要知道 tool 的真实来源，只需要持有统一的
+这意味着 `agentRuntimePresenter` 不需要知道 tool 的真实来源，只需要持有统一的
 `MCPToolDefinition[]`。
 
 ## 调用工具
 
 ```mermaid
 sequenceDiagram
-    participant D as DeepChatAgentPresenter
+    participant D as AgentRuntimePresenter
     participant T as ToolPresenter
     participant Map as ToolMapper
     participant M as MCP tools
@@ -76,7 +76,7 @@ port 负责提供：
 - conversation workdir 解析
 - 已批准路径查询
 - settings approval 消费
-- `newAgentPresenter` 会话上下文桥接
+- `agentSessionPresenter` 会话上下文桥接
 
 权限能力拆分：
 
diff --git a/docs/archives/legacy-agentpresenter-architecture.md b/docs/archives/legacy-agentpresenter-architecture.md
index 4f96c4368..fc641c25f 100644
--- a/docs/archives/legacy-agentpresenter-architecture.md
+++ b/docs/archives/legacy-agentpresenter-architecture.md
@@ -2,7 +2,7 @@
 
 本文档从高层视角介绍 DeepChat 的系统架构，帮助开发者快速理解项目结构和组件关系。
 
-> **Note (2026-03-09):** 本文档描述的是原始 AgentPresenter 架构。新架构（P0 实现）使用 `newAgentPresenter` + `deepchatAgentPresenter` 作为主要入口，详见 [P0 Implementation Summary](./P0_IMPLEMENTATION_SUMMARY.md)。
+> **Note (2026-03-09):** 本文档描述的是原始 AgentPresenter 架构。当前主入口是 `agentSessionPresenter` + `agentRuntimePresenter`（formerly `newAgentPresenter` + `deepchatAgentPresenter`），详见 [P0 Implementation Summary](./P0_IMPLEMENTATION_SUMMARY.md)。
 
 ## 🏗️ 核心组件关系
 
@@ -118,16 +118,16 @@ graph TB
 
 **职责**：管理 Agent Loop、LLM 流式响应、工具调用、权限协调
 
-| 组件 | 文件位置 | 行数 | 核心职责 |
+| 组件 | 历史模块标识 | 行数 | 核心职责 |
 |------|---------|------|---------|
-| AgentPresenter | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/index.ts` | 472 | Agent 编排入口，sendMessage/cancelLoop/continueLoop |
-| agentLoopHandler | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/agentLoopHandler.ts` | 670 | Agent Loop 主循环（while 循环） |
-| streamGenerationHandler | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts` | 645 | 流生成协调，准备上下文、启动 Stream |
-| loopOrchestrator | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/loopOrchestrator.ts` | ~30 | Loop 状态管理 |
-| toolCallProcessor | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/toolCallProcessor.ts` | 445 | 工具调用执行、结果处理 |
-| llmEventHandler | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/llmEventHandler.ts` | ~400 | 标准化 LLM 事件到内部格式 |
-| permissionHandler | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/permission/permissionHandler.ts` | ~600 | 权限请求响应协调 |
-| messageBuilder | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageBuilder.ts` | ~285 | 提示词构建、上下文压缩 |
+| AgentPresenter | `legacy agent runtime / agentPresenter/index.ts` | 472 | Agent 编排入口，sendMessage/cancelLoop/continueLoop |
+| agentLoopHandler | `legacy agent runtime / loop/agentLoopHandler.ts` | 670 | Agent Loop 主循环（while 循环） |
+| streamGenerationHandler | `legacy agent runtime / streaming/streamGenerationHandler.ts` | 645 | 流生成协调，准备上下文、启动 Stream |
+| loopOrchestrator | `legacy agent runtime / loop/loopOrchestrator.ts` | ~30 | Loop 状态管理 |
+| toolCallProcessor | `legacy agent runtime / loop/toolCallProcessor.ts` | 445 | 工具调用执行、结果处理 |
+| llmEventHandler | `legacy agent runtime / streaming/llmEventHandler.ts` | ~400 | 标准化 LLM 事件到内部格式 |
+| permissionHandler | `legacy agent runtime / permission/permissionHandler.ts` | ~600 | 权限请求响应协调 |
+| messageBuilder | `legacy agent runtime / message/messageBuilder.ts` | ~285 | 提示词构建、上下文压缩 |
 
 **关键流程**：
 1. 用户发送消息 → `AgentPresenter.sendMessage()`
@@ -143,13 +143,13 @@ graph TB
 
 **职责**：统一管理所有工具（MCP + Agent）、工具名称解析、路由分发
 
-| 组件 | 文件位置 | 行数 | 核心职责 |
+| 组件 | 历史模块标识 | 行数 | 核心职责 |
 |------|---------|------|---------|
 | ToolPresenter | `src/main/presenter/toolPresenter/index.ts` | 161 | 统一工具定义接口、工具调用路由 |
 | ToolMapper | `src/main/presenter/toolPresenter/toolMapper.ts` | ~100 | 工具名→来源映射（mcp/agent） |
 | McpPresenter | `src/main/presenter/mcpPresenter/index.ts` | ~500 | MCP 服务器管理、工具定义、工具调用 |
-| AgentToolManager | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/agentToolManager.ts` | 577 | Agent 文件系统 + Browser 工具 |
-| AgentFileSystemHandler | `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/agentFileSystemHandler.ts` | 960 | 文件系统工具实现 |
+| AgentToolManager | `legacy agent runtime / acp/agentToolManager.ts` | 577 | Agent 文件系统 + Browser 工具 |
+| AgentFileSystemHandler | `legacy agent runtime / acp/agentFileSystemHandler.ts` | 960 | 文件系统工具实现 |
 
 **工具来源**：
 1. **MCP 工具**：外部 MCP 服务器提供，通过 `McpPresenter` 管理
@@ -291,16 +291,16 @@ const response = await toolPresenter.callTool({
 - ConversationManager: `src/main/presenter/sessionPresenter/managers/conversationManager.ts`
 
 **Agent 系统**：
-- AgentPresenter: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/index.ts:1-472`
-- Agent Loop: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/loop/agentLoopHandler.ts:1-670`
-- Stream Generation: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/streaming/streamGenerationHandler.ts:1-645`
-- Message Builder: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/message/messageBuilder.ts`
+- AgentPresenter: `legacy agent runtime / agentPresenter/index.ts`
+- Agent Loop: `legacy agent runtime / loop/agentLoopHandler.ts`
+- Stream Generation: `legacy agent runtime / streaming/streamGenerationHandler.ts`
+- Message Builder: `legacy agent runtime / message/messageBuilder.ts`
 
 **工具系统**：
 - ToolPresenter: `src/main/presenter/toolPresenter/index.ts:1-161`
 - ToolMapper: `src/main/presenter/toolPresenter/toolMapper.ts`
-- AgentToolManager: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/agentToolManager.ts:1-577`
-- AgentFileSystemHandler: `archives/code/legacy-agentpresenter-retirement/src/main/presenter/agentPresenter/acp/agentFileSystemHandler.ts:1-960`
+- AgentToolManager: `legacy agent runtime / acp/agentToolManager.ts`
+- AgentFileSystemHandler: `legacy agent runtime / acp/agentFileSystemHandler.ts`
 - McpPresenter: `src/main/presenter/mcpPresenter/index.ts`
 
 **事件系统**：
diff --git a/docs/archives/legacy-agentpresenter-flows.md b/docs/archives/legacy-agentpresenter-flows.md
index baf6d0c46..31a44cff7 100644
--- a/docs/archives/legacy-agentpresenter-flows.md
+++ b/docs/archives/legacy-agentpresenter-flows.md
@@ -2,7 +2,7 @@
 
 本文档使用时序图详细描述 DeepChat 的关键业务流程，帮助开发者理解运行时行为。
 
-> **Note (2026-03-09):** 本文档描述的是原始 AgentPresenter 流程。新架构流程（newAgentPresenter + deepchatAgentPresenter）已实现，核心流程类似但入口不同。详见 [P0 Implementation Summary](./P0_IMPLEMENTATION_SUMMARY.md)。
+> **Note (2026-03-09):** 本文档描述的是原始 AgentPresenter 流程。当前主流程入口是 `agentSessionPresenter` + `agentRuntimePresenter`（formerly `newAgentPresenter` + `deepchatAgentPresenter`）；核心流程类似但入口不同。详见 [P0 Implementation Summary](./P0_IMPLEMENTATION_SUMMARY.md)。
 
 ## 1. 发送消息完整流程
 
diff --git a/docs/guides/code-navigation.md b/docs/guides/code-navigation.md
index 61978b062..2c68751cd 100644
--- a/docs/guides/code-navigation.md
+++ b/docs/guides/code-navigation.md
@@ -7,10 +7,10 @@
 如果你要追主聊天链路，按这个顺序跳：
 
 1. `src/main/presenter/index.ts`
-2. `src/main/presenter/newAgentPresenter/index.ts`
-3. `src/main/presenter/deepchatAgentPresenter/index.ts`
-4. `src/main/presenter/deepchatAgentPresenter/process.ts`
-5. `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+2. `src/main/presenter/agentSessionPresenter/index.ts`
+3. `src/main/presenter/agentRuntimePresenter/index.ts`
+4. `src/main/presenter/agentRuntimePresenter/process.ts`
+5. `src/main/presenter/agentRuntimePresenter/dispatch.ts`
 
 ## 按功能找代码
 
@@ -18,30 +18,30 @@
 
 | 功能 | 位置 | 备注 |
 | --- | --- | --- |
-| 创建会话 | `src/main/presenter/newAgentPresenter/index.ts` | `createSession()` |
-| ACP draft 会话 | `src/main/presenter/newAgentPresenter/index.ts` | `ensureAcpDraftSession()` |
-| session 记录管理 | `src/main/presenter/newAgentPresenter/sessionManager.ts` | `create/get/delete/bindWindow` |
-| agent 注册 | `src/main/presenter/newAgentPresenter/agentRegistry.ts` | `register/resolve` |
+| 创建会话 | `src/main/presenter/agentSessionPresenter/index.ts` | `createSession()` |
+| ACP draft 会话 | `src/main/presenter/agentSessionPresenter/index.ts` | `ensureAcpDraftSession()` |
+| session 记录管理 | `src/main/presenter/agentSessionPresenter/sessionManager.ts` | `create/get/delete/bindWindow` |
+| agent 注册 | `src/main/presenter/agentSessionPresenter/agentRegistry.ts` | `register/resolve` |
 
 ### 消息发送与流式处理
 
 | 功能 | 位置 | 备注 |
 | --- | --- | --- |
-| 发送消息入口 | `src/main/presenter/newAgentPresenter/index.ts` | `sendMessage()` |
-| agent runtime 入口 | `src/main/presenter/deepchatAgentPresenter/index.ts` | `processMessage()` |
-| 主循环 | `src/main/presenter/deepchatAgentPresenter/process.ts` | stream + tool loop |
-| 工具调度 | `src/main/presenter/deepchatAgentPresenter/dispatch.ts` | tool call / paused interaction |
-| 上下文构建 | `src/main/presenter/deepchatAgentPresenter/contextBuilder.ts` | history fitting / resume context |
-| 流式 echo | `src/main/presenter/deepchatAgentPresenter/echo.ts` | renderer 增量回显 |
+| 发送消息入口 | `src/main/presenter/agentSessionPresenter/index.ts` | `sendMessage()` |
+| agent runtime 入口 | `src/main/presenter/agentRuntimePresenter/index.ts` | `processMessage()` |
+| 主循环 | `src/main/presenter/agentRuntimePresenter/process.ts` | stream + tool loop |
+| 工具调度 | `src/main/presenter/agentRuntimePresenter/dispatch.ts` | tool call / paused interaction |
+| 上下文构建 | `src/main/presenter/agentRuntimePresenter/contextBuilder.ts` | history fitting / resume context |
+| 流式 echo | `src/main/presenter/agentRuntimePresenter/echo.ts` | renderer 增量回显 |
 
 ### 消息与状态持久化
 
 | 功能 | 位置 | 备注 |
 | --- | --- | --- |
-| runtime session state | `src/main/presenter/deepchatAgentPresenter/sessionStore.ts` | provider/model/permission/status |
-| message persistence | `src/main/presenter/deepchatAgentPresenter/messageStore.ts` | assistant/user message write |
-| pending input | `src/main/presenter/deepchatAgentPresenter/pendingInputStore.ts` | 启动后恢复 |
-| compaction | `src/main/presenter/deepchatAgentPresenter/compactionService.ts` | 长上下文摘要 |
+| runtime session state | `src/main/presenter/agentRuntimePresenter/sessionStore.ts` | provider/model/permission/status |
+| message persistence | `src/main/presenter/agentRuntimePresenter/messageStore.ts` | assistant/user message write |
+| pending input | `src/main/presenter/agentRuntimePresenter/pendingInputStore.ts` | 启动后恢复 |
+| compaction | `src/main/presenter/agentRuntimePresenter/compactionService.ts` | 长上下文摘要 |
 
 ### 工具系统
 
@@ -67,7 +67,7 @@
 
 | 功能 | 位置 | 备注 |
 | --- | --- | --- |
-| legacy import | `src/main/presenter/newAgentPresenter/legacyImportService.ts` | 旧数据导入新表 |
+| legacy import | `src/main/presenter/agentSessionPresenter/legacyImportService.ts` | 旧数据导入新表 |
 | legacy 会话兼容 | `src/main/presenter/sessionPresenter/index.ts` | main 内部 compatibility layer |
 | 用户消息格式化 | `src/main/presenter/sessionPresenter/messageFormatter.ts` | exporter 复用 |
 
@@ -77,17 +77,17 @@
 
 ```bash
 rg "createSession\\(" src/main
-rg "processMessage\\(" src/main/presenter/deepchatAgentPresenter
+rg "processMessage\\(" src/main/presenter/agentRuntimePresenter
 rg "callTool\\(" src/main/presenter/toolPresenter
-rg --files src/main/presenter | rg "newAgentPresenter|deepchatAgentPresenter|agentTools|acp"
+rg --files src/main/presenter | rg "agentSessionPresenter|agentRuntimePresenter|agentTools|acp"
 ```
 
 ## 看到这些词时怎么理解
 
 | 词 | 当前含义 |
 | --- | --- |
-| `newAgentPresenter` | renderer 唯一聊天会话入口 |
-| `deepchatAgentPresenter` | 当前聊天 runtime |
+| `agentSessionPresenter` | renderer 唯一聊天会话入口 |
+| `agentRuntimePresenter` | 当前聊天 runtime |
 | `SessionPresenter` | legacy conversation 兼容层，不是主链路 |
 | `agentPresenter` | 已退休；只会出现在 archive 或历史 spec 里 |
 
@@ -104,4 +104,4 @@ rg --files src/main/presenter | rg "newAgentPresenter|deepchatAgentPresenter|age
 
 - `docs/archives/legacy-agentpresenter-architecture.md`
 - `docs/archives/legacy-agentpresenter-flows.md`
-- `archives/code/legacy-agentpresenter-retirement/`
+- `docs/archives/thread-presenter-migration-plan.md`
diff --git a/docs/guides/getting-started.md b/docs/guides/getting-started.md
index 2f5fc37d0..53cbaafa7 100644
--- a/docs/guides/getting-started.md
+++ b/docs/guides/getting-started.md
@@ -37,8 +37,8 @@ pnpm test
 
 ```text
 Renderer
-  -> newAgentPresenter
-  -> deepchatAgentPresenter
+  -> agentSessionPresenter
+  -> agentRuntimePresenter
   -> toolPresenter / llmProviderPresenter
 ```
 
@@ -51,8 +51,8 @@ Renderer
 src/
 ├── main/
 │   ├── presenter/
-│   │   ├── newAgentPresenter/        # 当前会话入口
-│   │   ├── deepchatAgentPresenter/   # 当前聊天 runtime
+│   │   ├── agentSessionPresenter/        # 当前会话入口
+│   │   ├── agentRuntimePresenter/   # 当前聊天 runtime
 │   │   ├── toolPresenter/            # 工具路由
 │   │   │   └── agentTools/           # 本地 agent tools
 │   │   ├── llmProviderPresenter/     # provider 管理
@@ -72,8 +72,8 @@ src/
 ## 进入代码的推荐顺序
 
 1. `src/main/presenter/index.ts`
-2. `src/main/presenter/newAgentPresenter/index.ts`
-3. `src/main/presenter/deepchatAgentPresenter/index.ts`
+2. `src/main/presenter/agentSessionPresenter/index.ts`
+3. `src/main/presenter/agentRuntimePresenter/index.ts`
 4. `src/main/presenter/toolPresenter/index.ts`
 5. `src/main/presenter/llmProviderPresenter/index.ts`
 
@@ -83,9 +83,9 @@ src/
 
 优先看：
 
-- `src/main/presenter/newAgentPresenter/index.ts`
-- `src/main/presenter/deepchatAgentPresenter/process.ts`
-- `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+- `src/main/presenter/agentSessionPresenter/index.ts`
+- `src/main/presenter/agentRuntimePresenter/process.ts`
+- `src/main/presenter/agentRuntimePresenter/dispatch.ts`
 
 ### 添加或修改 agent tool
 
@@ -110,7 +110,7 @@ src/
 
 优先看：
 
-- `src/main/presenter/newAgentPresenter/legacyImportService.ts`
+- `src/main/presenter/agentSessionPresenter/legacyImportService.ts`
 - `src/main/presenter/sessionPresenter/index.ts`
 - `src/main/presenter/exporter/formats/`
 
@@ -137,4 +137,4 @@ node scripts/agent-cleanup-guard.mjs
 
 - `docs/archives/legacy-agentpresenter-architecture.md`
 - `docs/archives/legacy-agentpresenter-flows.md`
-- `archives/code/legacy-agentpresenter-retirement/`
+- `docs/archives/thread-presenter-migration-plan.md`
diff --git a/docs/specs/acp-agent-uninstall/plan.md b/docs/specs/acp-agent-uninstall/plan.md
new file mode 100644
index 000000000..117ec3693
--- /dev/null
+++ b/docs/specs/acp-agent-uninstall/plan.md
@@ -0,0 +1,21 @@
+# ACP Agent Uninstall Plan
+
+## Main Process
+
+- Add `configPresenter.uninstallAcpRegistryAgent(agentId)` as the orchestration entrypoint.
+- Keep sqlite persistence in `AgentRepository`.
+- Add uninstall cleanup to `AcpLaunchSpecService` for registry install artifacts with path-boundary checks.
+- After uninstall, mark the agent disabled and set install state back to `not_installed`.
+- Reuse `handleAcpAgentsMutated([agentId])` so ACP processes are released and renderer state refreshes.
+
+## Renderer
+
+- Add uninstall actions in `AcpSettings.vue` for both installed cards and registry overlay rows.
+- Confirm uninstall with a lightweight AlertDialog-based confirmation flow (`AlertDialog` component/modal) so the renderer uses the built-in AlertDialog UI for lightweight confirmation.
+- Refresh ACP settings data after uninstall completes.
+
+## Tests
+
+- Cover binary uninstall cleanup and safe path handling in `AcpLaunchSpecService`.
+- Cover repository/state reset for registry agents.
+- Cover renderer uninstall CTA wiring in `AcpSettings.vue`.
diff --git a/docs/specs/acp-agent-uninstall/spec.md b/docs/specs/acp-agent-uninstall/spec.md
new file mode 100644
index 000000000..2b7922bea
--- /dev/null
+++ b/docs/specs/acp-agent-uninstall/spec.md
@@ -0,0 +1,25 @@
+# ACP Agent Uninstall
+
+## Summary
+
+Add uninstall support for registry-backed ACP agents. The current ACP settings flow can install and enable registry agents, but it cannot uninstall them after they are added.
+
+## User Stories
+
+- As a user, I can uninstall an installed ACP registry agent from settings.
+- As a user, uninstall removes local install artifacts and hides the agent from enabled ACP model choices.
+- As a user, old sessions referencing that agent are preserved and can recover by reinstalling later.
+
+## Acceptance Criteria
+
+- ACP settings shows an uninstall action for installed registry agents.
+- Uninstall deletes local binary install directories when the agent uses a binary distribution.
+- Uninstall resets registry install state to `not_installed` and disables the agent.
+- Uninstalled registry agents no longer appear in the enabled ACP model list.
+- Existing session records keep their `agentId`; uninstall does not delete session history.
+
+## Non-Goals
+
+- No hard-delete of the registry agent row.
+- No schema migration.
+- No forced rewrite of historical session, remote binding, or subagent references.
diff --git a/docs/specs/acp-session-config-options/plan.md b/docs/specs/acp-session-config-options/plan.md
index 07f3037c9..cb625505c 100644
--- a/docs/specs/acp-session-config-options/plan.md
+++ b/docs/specs/acp-session-config-options/plan.md
@@ -82,7 +82,7 @@ UI refinement：
 ### Phase 3：Presenter 与事件
 
 1. `AcpProvider` 增加 process/session config 读写接口
-2. `LLMProviderPresenter` 和 `NewAgentPresenter` 暴露代理方法
+2. `LLMProviderPresenter` 和 `AgentSessionPresenter` 暴露代理方法
 3. 发出 `SESSION_CONFIG_OPTIONS_READY`
 
 ### Phase 4：Renderer 状态栏
@@ -98,7 +98,7 @@ UI refinement：
 1. `AcpContentMapper` 覆盖 `config_option_update`
 2. `AcpProvider.prepareSession` 发出 config-ready 事件
 3. `AcpProvider.setSessionConfigOption` 使用 agent 返回的全量 state 回写缓存
-4. `NewAgentPresenter` 覆盖 ACP session config 读写代理
+4. `AgentSessionPresenter` 覆盖 ACP session config 读写代理
 
 ### 4.2 Renderer
 
diff --git a/docs/specs/acp-session-config-options/spec.md b/docs/specs/acp-session-config-options/spec.md
index 20478b9ff..124c15d10 100644
--- a/docs/specs/acp-session-config-options/spec.md
+++ b/docs/specs/acp-session-config-options/spec.md
@@ -65,7 +65,7 @@
 
 - [ ] 新增 `AcpConfigOption`、`AcpConfigOptionValue`、`AcpConfigState`
 - [ ] `ILlmProviderPresenter` 增加 ACP process/session config 读写接口
-- [ ] `INewAgentPresenter` 增加 ACP session config 读写接口
+- [ ] `IAgentSessionPresenter` 增加 ACP session config 读写接口
 - [ ] 新增 renderer 事件 `ACP_WORKSPACE_EVENTS.SESSION_CONFIG_OPTIONS_READY`
 
 ## 验收标准
diff --git a/docs/specs/acp-session-config-options/tasks.md b/docs/specs/acp-session-config-options/tasks.md
index 95eb0e862..cac639748 100644
--- a/docs/specs/acp-session-config-options/tasks.md
+++ b/docs/specs/acp-session-config-options/tasks.md
@@ -27,7 +27,7 @@
 - [x] `AcpProcessHandle` / `AcpSessionRecord` 缓存统一 config state
 - [x] 新增 `SESSION_CONFIG_OPTIONS_READY` 事件
 - [x] `ILlmProviderPresenter` 增加 ACP process/session config 读写接口
-- [x] `INewAgentPresenter` 增加 ACP session config 读写接口
+- [x] `IAgentSessionPresenter` 增加 ACP session config 读写接口
 
 ## T4 Renderer 状态栏
 
@@ -41,7 +41,7 @@
 
 - [x] 更新 `acpContentMapper.test.ts`
 - [x] 更新 `acpProvider.test.ts`
-- [x] 更新 `newAgentPresenter.test.ts`
+- [x] 更新 `agentSessionPresenter.test.ts`
 - [x] 更新 `ChatStatusBar.test.ts`
 
 ## T6 质量门禁
diff --git a/docs/specs/agent-cleanup/spec.md b/docs/specs/agent-cleanup/spec.md
index fc11936e5..99e78ed53 100644
--- a/docs/specs/agent-cleanup/spec.md
+++ b/docs/specs/agent-cleanup/spec.md
@@ -7,8 +7,8 @@ The cleanup reached final runtime retirement on March 23, 2026.
 Current primary flow:
 
 - renderer active chat pages/stores/components
-- `newAgentPresenter`
-- `deepchatAgentPresenter`
+- `agentSessionPresenter`
+- `agentRuntimePresenter`
 - `toolPresenter`
 - `llmProviderPresenter`
 
@@ -20,7 +20,7 @@ Completed in this retirement slice:
 - migrated retained ACP helpers into `src/main/presenter/llmProviderPresenter/acp/`
 - migrated retained agent tools into `src/main/presenter/toolPresenter/agentTools/`
 - moved retained user message formatting helpers into `src/main/presenter/sessionPresenter/`
-- archived retired source and tests under `archives/code/legacy-agentpresenter-retirement/`
+- removed retired source and tests from the active tree, with history preserved in docs
 
 ## Compatibility Boundary
 
@@ -49,17 +49,17 @@ It now protects these invariants:
 
 - shared helper ownership moved to `src/main/lib/agentRuntime`
 - active renderer chat path moved off legacy message protocol
-- dead renderer and mock/orphan code archived under `archives/code/`
+- dead renderer and mock/orphan code removed from the active tree
 - new-session skills persisted in `new_sessions.active_skills`
 - legacy `agentPresenter/**` removed from global presenter access
 - provider-layer MCP global access removed
-- final legacy runtime retirement completed and archived
+- final legacy runtime retirement completed and documented
 
 ## Remaining Backlog
 
 The remaining work is no longer runtime-retirement work. It is adjacent cleanup only:
 
-- export-only `@shared/chat` coupling in `newAgentPresenter`
+- export-only `@shared/chat` coupling in `agentSessionPresenter`
 - non-active renderer residual import in `PromptEditorSheet`
 - adjacent provider globals such as `devicePresenter` / `oauthPresenter`
 - optional archival/normalization of older specs that still mention retired paths
diff --git a/docs/specs/agent-cleanup/tasks.md b/docs/specs/agent-cleanup/tasks.md
index e2fcd6148..b2f0b1cb6 100644
--- a/docs/specs/agent-cleanup/tasks.md
+++ b/docs/specs/agent-cleanup/tasks.md
@@ -5,8 +5,8 @@
 - [x] Added cleanup docs and static guardrails
 - [x] Moved shared runtime helpers out of legacy presenter folders
 - [x] Moved active renderer chat path off `@shared/chat`
-- [x] Archived dead renderer path code in `archives/code/dead-renderer-batch-1/`
-- [x] Archived renderer mock/orphan code in `archives/code/dead-code-batch-2/`
+- [x] Removed dead renderer path code from the active tree
+- [x] Removed renderer mock/orphan code from the active tree
 - [x] Persisted new-session skills in `new_sessions.active_skills`
 - [x] Retired old-session skill fallback to legacy conversation settings
 - [x] Removed global `presenter.*` access from legacy runtime modules
@@ -17,7 +17,7 @@
 - [x] Migrated retained ACP helpers to `src/main/presenter/llmProviderPresenter/acp/`
 - [x] Migrated retained agent tools to `src/main/presenter/toolPresenter/agentTools/`
 - [x] Migrated retained message formatting helper to `src/main/presenter/sessionPresenter/`
-- [x] Archived retired source and tests in `archives/code/legacy-agentpresenter-retirement/`
+- [x] Removed retired source and tests from the active tree and preserved history in docs
 - [x] Refreshed active architecture / flow / navigation docs
 
 ## Kept Intentionally
@@ -30,13 +30,13 @@
 
 ## Remaining Backlog
 
-- [ ] remove export-only `@shared/chat` coupling in `src/main/presenter/newAgentPresenter/index.ts`
+- [ ] remove export-only `@shared/chat` coupling in `src/main/presenter/agentSessionPresenter/index.ts`
 - [ ] remove non-active renderer residual import in `PromptEditorSheet`
 - [ ] review adjacent provider globals such as `devicePresenter` / `oauthPresenter`
 - [ ] normalize older historical specs that still mention retired legacy paths
 
-## Archive Batches
+## Historical Cleanup Batches
 
-- [x] `archives/code/dead-renderer-batch-1/`
-- [x] `archives/code/dead-code-batch-2/`
-- [x] `archives/code/legacy-agentpresenter-retirement/`
+- [x] dead renderer batch
+- [x] mock / orphan UI batch
+- [x] legacy agent runtime batch
diff --git a/docs/specs/agent-db-legacy-import/plan.md b/docs/specs/agent-db-legacy-import/plan.md
index 3159dc53a..78b9ad031 100644
--- a/docs/specs/agent-db-legacy-import/plan.md
+++ b/docs/specs/agent-db-legacy-import/plan.md
@@ -10,12 +10,12 @@
      - `legacy_import_status`
 
 2. Searchresult migration
-   - `deepchatAgentPresenter/dispatch.ts` 解析 `application/deepchat-webpage`
+   - `agentRuntimePresenter/dispatch.ts` 解析 `application/deepchat-webpage`
    - 同时写入：
      - assistant `search` block
      - `deepchat_message_search_results`
-   - `newAgentPresenter.getSearchResults()` 从新表读取
-   - 前端引用点改为 `newAgentPresenter.getSearchResults()`
+   - `agentSessionPresenter.getSearchResults()` 从新表读取
+   - 前端引用点改为 `agentSessionPresenter.getSearchResults()`
 
 3. Legacy import pipeline
    - 新增 `LegacyChatImportService`
@@ -25,7 +25,7 @@
    - 导入状态与错误写入 `legacy_import_status`
 
 4. Retry and observability
-   - `newAgentPresenter` 暴露：
+   - `agentSessionPresenter` 暴露：
      - `getLegacyImportStatus()`
      - `retryLegacyImport()`
    - 失败后允许手动重试，重复导入保持幂等
diff --git a/docs/specs/agent-db-legacy-import/spec.md b/docs/specs/agent-db-legacy-import/spec.md
index f5845a23b..7c75a6f15 100644
--- a/docs/specs/agent-db-legacy-import/spec.md
+++ b/docs/specs/agent-db-legacy-import/spec.md
@@ -13,7 +13,7 @@
    - `message_attachments(search_result/search_results)` -> `deepchat_message_search_results`
 3. `searchresult` 读写统一走新结构：
    - 新链路写入：tool 结果中的 `application/deepchat-webpage`
-   - 新链路读取：`newAgentPresenter.getSearchResults()`
+   - 新链路读取：`agentSessionPresenter.getSearchResults()`
 4. 导入状态持久化与重试：
    - 新表 `legacy_import_status`
    - IPC：`getLegacyImportStatus` / `retryLegacyImport`
diff --git a/docs/specs/agent-input-advanced-config/plan.md b/docs/specs/agent-input-advanced-config/plan.md
index 76cfceea5..be421ee45 100644
--- a/docs/specs/agent-input-advanced-config/plan.md
+++ b/docs/specs/agent-input-advanced-config/plan.md
@@ -4,7 +4,7 @@
 
 1. 新增 `SessionGenerationSettings`（共享类型）。
 2. `CreateSessionInput` 增加 `generationSettings?: Partial<SessionGenerationSettings>`。
-3. `INewAgentPresenter` 增加：
+3. `IAgentSessionPresenter` 增加：
    - `getSessionGenerationSettings(sessionId)`
    - `updateSessionGenerationSettings(sessionId, settings)`
 4. `IAgentImplementation` 增加可选：
@@ -13,9 +13,9 @@
 
 ## 2. 主进程（newAgent + deepchat）
 
-1. `newAgentPresenter.createSession` 透传 `generationSettings` 到 `agent.initSession`。
-2. `newAgentPresenter` 新增 generation settings 读写代理，保持 permission 相关接口不变。
-3. `deepchatAgentPresenter`：
+1. `agentSessionPresenter.createSession` 透传 `generationSettings` 到 `agent.initSession`。
+2. `agentSessionPresenter` 新增 generation settings 读写代理，保持 permission 相关接口不变。
+3. `agentRuntimePresenter`：
    - `initSession` 构造并持久化会话配置（模型默认 + 默认 system prompt + 覆盖值）。
    - `processMessage` / `resumeAssistantMessage` 读取会话配置构建上下文。
    - `runStreamForMessage` 使用会话 `temperature/maxTokens`，并将
diff --git a/docs/specs/agent-input-advanced-config/tasks.md b/docs/specs/agent-input-advanced-config/tasks.md
index 3331854ba..b4234e46f 100644
--- a/docs/specs/agent-input-advanced-config/tasks.md
+++ b/docs/specs/agent-input-advanced-config/tasks.md
@@ -10,7 +10,7 @@
 
 - [x] 新增 `SessionGenerationSettings`
 - [x] `CreateSessionInput` 增加 `generationSettings`
-- [x] `INewAgentPresenter` 增加 generation settings 读写接口
+- [x] `IAgentSessionPresenter` 增加 generation settings 读写接口
 - [x] `IAgentImplementation` 增加可选 generation settings 读写接口
 
 ## T2 持久化层
@@ -50,10 +50,10 @@
 
 ## T7 测试
 
-- [x] 更新 `deepchatAgentPresenter.test.ts`
-- [x] 更新 `newAgentPresenter.test.ts`
+- [x] 更新 `agentRuntimePresenter.test.ts`
+- [x] 更新 `agentSessionPresenter.test.ts`
 - [x] 更新 `NewThreadPage.test.ts`
-- [x] 更新 `newAgentPresenter/integration.test.ts` 兼容新参数
+- [x] 更新 `agentSessionPresenter/integration.test.ts` 兼容新参数
 
 ## T8 质量门禁
 
diff --git a/docs/specs/agentpresenter-mvp-replacement/gap-analysis.md b/docs/specs/agentpresenter-mvp-replacement/gap-analysis.md
index 08d7882e1..9df5ae5e6 100644
--- a/docs/specs/agentpresenter-mvp-replacement/gap-analysis.md
+++ b/docs/specs/agentpresenter-mvp-replacement/gap-analysis.md
@@ -2,7 +2,7 @@
 
 ## Executive Summary
 
-This document analyzes the functional gaps between the old architecture (`agentPresenter` + `sessionPresenter` + `chatStore`) and the new architecture (`deepchatAgentPresenter` + `newAgentPresenter` + `sessionStore`/`messageStore`).
+This document analyzes the functional gaps between the old architecture (`agentPresenter` + `sessionPresenter` + `chatStore`) and the new architecture (`agentRuntimePresenter` + `agentSessionPresenter` + `sessionStore`/`messageStore`).
 
 **Critical Finding**: The new architecture has successfully implemented the core streaming and message persistence infrastructure, but lacks critical functionality in five key areas:
 
@@ -21,7 +21,7 @@ This document analyzes the functional gaps between the old architecture (`agentP
 ### Current State (New Architecture)
 
 **Implemented:**
-- ✅ Basic session creation via `newAgentPresenter.createSession()`
+- ✅ Basic session creation via `agentSessionPresenter.createSession()`
 - ✅ Model resolution from default settings (`configPresenter.getDefaultModel()`)
 - ✅ Preferred model fallback logic
 - ✅ Project/workspace binding via `projectStore.selectedProject.path`
@@ -29,7 +29,7 @@ This document analyzes the functional gaps between the old architecture (`agentP
 
 **File References:**
 - `src/renderer/src/pages/NewThreadPage.vue` (lines 70-112)
-- `src/main/presenter/newAgentPresenter/index.ts` (lines 24-60)
+- `src/main/presenter/agentSessionPresenter/index.ts` (lines 24-60)
 
 ### Missing Functionality
 
@@ -44,7 +44,7 @@ This document analyzes the functional gaps between the old architecture (`agentP
 
 **New Architecture:**
 - `ChatStatusBar.vue` line 91: Shows "Default permissions" as **read-only button** (no dropdown)
-- `newAgentPresenter` has no `permissionMode` parameter in `createSession()`
+- `agentSessionPresenter` has no `permissionMode` parameter in `createSession()`
 - `new_sessions` table has no `permission_mode` column
 
 **Impact**: Users cannot choose permission level; all sessions default to unknown behavior.
@@ -59,7 +59,7 @@ This document analyzes the functional gaps between the old architecture (`agentP
 
 **New Architecture:**
 - No validation in `NewThreadPage.onSubmit()`
-- No validation in `newAgentPresenter.createSession()`
+- No validation in `agentSessionPresenter.createSession()`
 
 #### 1.3 Default Model Loading from Settings
 
@@ -85,7 +85,7 @@ This document analyzes the functional gaps between the old architecture (`agentP
    - Disable "Full access" if `!projectStore.selectedProject`
    - Show tooltip: "Bind workspace first to enable Full access"
 
-3. **Update newAgentPresenter.createSession():**
+3. **Update agentSessionPresenter.createSession():**
    ```typescript
    async createSession(input: {
      message: string
@@ -104,12 +104,12 @@ This document analyzes the functional gaps between the old architecture (`agentP
 ### Current State (New Architecture)
 
 **Implemented:**
-- ✅ `deepchatAgentPresenter.process.ts` executes tool calls
-- ✅ `deepchatAgentPresenter.dispatch.ts` builds tool conversations
+- ✅ `agentRuntimePresenter.process.ts` executes tool calls
+- ✅ `agentRuntimePresenter.dispatch.ts` builds tool conversations
 
 **File References:**
-- `src/main/presenter/deepchatAgentPresenter/process.ts`
-- `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+- `src/main/presenter/agentRuntimePresenter/process.ts`
+- `src/main/presenter/agentRuntimePresenter/dispatch.ts`
 
 ### Missing Functionality
 
@@ -152,7 +152,7 @@ New Flow (BROKEN):
 - `handlePermissionResponse()` resumed loop with approved tool calls
 
 **New Architecture:**
-- `deepchatAgentPresenter` has no pause state
+- `agentRuntimePresenter` has no pause state
 - `processStream()` is synchronous - no yield points for user input
 - No IPC method to resume after permission approval
 
@@ -168,7 +168,7 @@ New Flow (BROKEN):
 **New Architecture:**
 - `messageStore` receives `STREAM_EVENTS.RESPONSE` with blocks
 - `MessageList` component unchanged (should still render blocks)
-- **Missing**: No handler to call `newAgentPresenter` permission methods (don't exist yet)
+- **Missing**: No handler to call `agentSessionPresenter` permission methods (don't exist yet)
 
 #### 2.4 Permission Approval Handler
 
@@ -187,8 +187,8 @@ async handlePermissionResponse(
 ```
 
 **New Architecture:**
-- ❌ No `handlePermissionResponse()` in `newAgentPresenter`
-- ❌ No `handlePermissionResponse()` in `deepchatAgentPresenter`
+- ❌ No `handlePermissionResponse()` in `agentSessionPresenter`
+- ❌ No `handlePermissionResponse()` in `agentRuntimePresenter`
 
 #### 2.5 Whitelist Management
 
@@ -260,9 +260,9 @@ NEW ARCHITECTURE (CURRENT - BROKEN):
 
 ### Required Implementation
 
-1. **Add permission checker to deepchatAgentPresenter:**
+1. **Add permission checker to agentRuntimePresenter:**
    ```typescript
-   // deepchatAgentPresenter/index.ts
+   // agentRuntimePresenter/index.ts
    private permissionChecker: PermissionChecker
    
    constructor(..., toolPresenter: IToolPresenter) {
@@ -290,7 +290,7 @@ NEW ARCHITECTURE (CURRENT - BROKEN):
 
 3. **Add IPC methods:**
    ```typescript
-   // newAgentPresenter/index.ts
+   // agentSessionPresenter/index.ts
    async handlePermissionResponse(
      sessionId: string,
      messageId: string,
@@ -315,15 +315,15 @@ NEW ARCHITECTURE (CURRENT - BROKEN):
 **Implemented:**
 - ✅ `NewSessionManager.create()` - creates session records
 - ✅ `NewSessionManager.bindWindow()` - binds session to window
-- ✅ `newAgentPresenter.createSession()` - full creation flow
-- ✅ `newAgentPresenter.activateSession()` - activation
-- ✅ `newAgentPresenter.deactivateSession()` - deactivation
+- ✅ `agentSessionPresenter.createSession()` - full creation flow
+- ✅ `agentSessionPresenter.activateSession()` - activation
+- ✅ `agentSessionPresenter.deactivateSession()` - deactivation
 - ✅ Session status tracking via `runtimeState` Map
 - ✅ Event emission: `SESSION_EVENTS.ACTIVATED`, `DEACTIVATED`, `STATUS_CHANGED`
 
 **File References:**
-- `src/main/presenter/newAgentPresenter/sessionManager.ts`
-- `src/main/presenter/newAgentPresenter/index.ts`
+- `src/main/presenter/agentSessionPresenter/sessionManager.ts`
+- `src/main/presenter/agentSessionPresenter/index.ts`
 - `src/renderer/src/stores/ui/session.ts`
 
 ### Missing Functionality
@@ -345,7 +345,7 @@ settings: {
 
 **New Architecture:**
 ```typescript
-// newAgentPresenter.createSession()
+// agentSessionPresenter.createSession()
 input: {
   message, projectDir, agentId, providerId, modelId
   // MISSING: temperature, contextLength, maxTokens, 
@@ -384,7 +384,7 @@ input: {
 **Notes:**
 - `new_sessions` table stores sessions
 - `sessionStore.fetchSessions()` loads from DB
-- State rebuilt from `deepchatAgentPresenter.getSessionState()`
+- State rebuilt from `agentRuntimePresenter.getSessionState()`
 
 #### 3.5 Session Deletion and Cleanup
 
@@ -464,9 +464,9 @@ createSession → initSession → bindWindow → processMessage → stream
 - ✅ Frontend `messageStore` listens to events and updates `streamingBlocks`
 
 **File References:**
-- `src/main/presenter/deepchatAgentPresenter/process.ts`
-- `src/main/presenter/deepchatAgentPresenter/accumulator.ts`
-- `src/main/presenter/deepchatAgentPresenter/messageStore.ts`
+- `src/main/presenter/agentRuntimePresenter/process.ts`
+- `src/main/presenter/agentRuntimePresenter/accumulator.ts`
+- `src/main/presenter/agentRuntimePresenter/messageStore.ts`
 - `src/renderer/src/stores/ui/message.ts`
 
 ### Missing Functionality
@@ -521,7 +521,7 @@ AssistantMessageBlock:
 **Status**: ✅ Implemented
 
 **Notes:**
-- Session status set to `'generating'` before stream (deepchatAgentPresenter line 101)
+- Session status set to `'generating'` before stream (agentRuntimePresenter line 101)
 - Status set to `'idle'` or `'error'` after completion (lines 167, 175)
 - `SESSION_EVENTS.STATUS_CHANGED` emitted
 - `sessionStore` updates session status
@@ -575,8 +575,8 @@ processMessage → create user message → create assistant message
 - ✅ Error handling for tool failures
 
 **File References:**
-- `src/main/presenter/deepchatAgentPresenter/process.ts`
-- `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+- `src/main/presenter/agentRuntimePresenter/process.ts`
+- `src/main/presenter/agentRuntimePresenter/dispatch.ts`
 
 ### Missing Functionality
 
@@ -771,7 +771,7 @@ NEW ARCHITECTURE (CURRENT):
 
 2. **Add resume method:**
    ```typescript
-   // deepchatAgentPresenter/index.ts
+   // agentRuntimePresenter/index.ts
    async resumeAfterPermission(
      sessionId: string,
      messageId: string,
@@ -809,7 +809,7 @@ NEW ARCHITECTURE (CURRENT):
    - Pause stream waiting for approval
 
 3. **Permission Response Handler**
-   - Add `handlePermissionResponse()` to newAgentPresenter
+   - Add `handlePermissionResponse()` to agentSessionPresenter
    - Implement resume mechanism after approval
    - Update session status ('paused' → 'generating')
 
@@ -847,7 +847,7 @@ NEW ARCHITECTURE (CURRENT):
 
 10. **Frontend Permission UI**
     - Ensure MessageList renders permission blocks
-    - Connect approve/reject buttons to newAgentPresenter
+    - Connect approve/reject buttons to agentSessionPresenter
     - Add "remember" checkbox
 
 ### P2: Medium (Nice to Have)
@@ -942,11 +942,11 @@ NEW ARCHITECTURE (CURRENT):
 
 | Component | File Path |
 |-----------|-----------|
-| NewAgentPresenter | `src/main/presenter/newAgentPresenter/index.ts` |
-| DeepChatAgentPresenter | `src/main/presenter/deepchatAgentPresenter/index.ts` |
-| ProcessStream | `src/main/presenter/deepchatAgentPresenter/process.ts` |
-| Dispatch | `src/main/presenter/deepchatAgentPresenter/dispatch.ts` |
-| MessageStore | `src/main/presenter/deepchatAgentPresenter/messageStore.ts` |
+| AgentSessionPresenter | `src/main/presenter/agentSessionPresenter/index.ts` |
+| AgentRuntimePresenter | `src/main/presenter/agentRuntimePresenter/index.ts` |
+| ProcessStream | `src/main/presenter/agentRuntimePresenter/process.ts` |
+| Dispatch | `src/main/presenter/agentRuntimePresenter/dispatch.ts` |
+| MessageStore | `src/main/presenter/agentRuntimePresenter/messageStore.ts` |
 | SessionStore (UI) | `src/renderer/src/stores/ui/session.ts` |
 | MessageStore (UI) | `src/renderer/src/stores/ui/message.ts` |
 | NewThreadPage | `src/renderer/src/pages/NewThreadPage.vue` |
diff --git a/docs/specs/agentpresenter-mvp-replacement/plan.md b/docs/specs/agentpresenter-mvp-replacement/plan.md
index 597125e3e..c41dc9d67 100644
--- a/docs/specs/agentpresenter-mvp-replacement/plan.md
+++ b/docs/specs/agentpresenter-mvp-replacement/plan.md
@@ -2,16 +2,16 @@
 
 ## 1. 当前基线（Updated 2026-02-28）
 
-1. 新旧双栈并存：`newAgentPresenter/deepchatAgentPresenter` 与旧 `sessionPresenter/useChatStore` 同时存在。
+1. 新旧双栈并存：`agentSessionPresenter/agentRuntimePresenter` 与旧 `sessionPresenter/useChatStore` 同时存在。
 2. 新 loop 已可运行，**streaming 和 message persistence 已完成**，但**权限流程完全缺失**。
 3. 产品方向已确定：MVP 先替换核心能力，再完成 chat 模式彻底移除。
-4. **关键发现**：`deepchatAgentPresenter/dispatch.ts` 的 `executeTools()` 直接调用工具，**无任何权限检查**。
+4. **关键发现**：`agentRuntimePresenter/dispatch.ts` 的 `executeTools()` 直接调用工具，**无任何权限检查**。
 
 ## 2. 核心架构决策
 
 1. 会话真源：`new_sessions + deepchat_sessions`。
 2. 消息真源：`deepchat_messages`。
-3. 主执行链路：`newAgentPresenter -> deepchatAgentPresenter`。
+3. 主执行链路：`agentSessionPresenter -> agentRuntimePresenter`。
 4. 新 UI 页面不再依赖 `useChatStore` 与旧 `sessionPresenter` 主流程。
 5. variants 本轮下线，fork 保留为唯一分叉能力。
 
@@ -65,7 +65,7 @@
 ### Phase 0：稳定主链路
 
 1. 清理新 UI 对 `useChatStore` 的依赖点。
-2. active session 查询与事件分发统一到 `newAgentPresenter`。
+2. active session 查询与事件分发统一到 `agentSessionPresenter`。
 3. 建立最小回归测试基线。
 
 ### Phase 1：权限 + Workspace（MVP 核心）
@@ -94,7 +94,7 @@
 
 ## 6. IPC 与类型面
 
-1. `INewAgentPresenter` 扩展：
+1. `IAgentSessionPresenter` 扩展：
    - `setSessionPermissionMode`
    - `editUserMessage`
    - `retryAssistantMessage`
@@ -138,9 +138,9 @@
 - ❌ Session configuration: PARTIAL (missing advanced options)
 
 **Immediate Next Steps**:
-1. Create `PermissionChecker` class in `deepchatAgentPresenter/`
+1. Create `PermissionChecker` class in `agentRuntimePresenter/`
 2. Modify `executeTools()` in `dispatch.ts` to check permissions before tool calls
-3. Add `handlePermissionResponse()` IPC method to `newAgentPresenter`
+3. Add `handlePermissionResponse()` IPC method to `agentSessionPresenter`
 4. Update `ChatStatusBar.vue` to show permission mode dropdown
 5. Add `permission_mode` column to `new_sessions` table
 6. Create `permission_whitelists` table for session-scoped whitelists
diff --git a/docs/specs/agentpresenter-mvp-replacement/spec.md b/docs/specs/agentpresenter-mvp-replacement/spec.md
index 7ae21bdd2..e09c7005a 100644
--- a/docs/specs/agentpresenter-mvp-replacement/spec.md
+++ b/docs/specs/agentpresenter-mvp-replacement/spec.md
@@ -2,7 +2,7 @@
 
 ## 概述
 
-以 `deepchatAgentPresenter` 新 loop 为唯一核心，分阶段替换旧 chat 体系。MVP 先完成权限、workspace 绑定、消息编辑、retry/regenerate、fork 五个核心能力，再推进设置收敛与 chat 模式清理。
+以 `agentRuntimePresenter` 新 loop 为唯一核心，分阶段替换旧 chat 体系。MVP 先完成权限、workspace 绑定、消息编辑、retry/regenerate、fork 五个核心能力，再推进设置收敛与 chat 模式清理。
 
 ## 背景与目标
 
@@ -61,8 +61,8 @@
 - [x] 权限判定与消息归属基于同一 `sessionId`。
 
 **Implementation Notes** (added 2026-02-28):
-- `newAgentPresenter.createSession()` already passes `projectDir` to session manager
-- `deepchatAgentPresenter.processStream()` uses `sessionId` throughout
+- `agentSessionPresenter.createSession()` already passes `projectDir` to session manager
+- `agentRuntimePresenter.processStream()` uses `sessionId` throughout
 - CRITICAL GAP: `executeTools()` in dispatch.ts does NOT check permissions before calling tools
 - Must add `PermissionChecker` class and integrate before tool execution
 
@@ -115,7 +115,7 @@
 **Implementation Notes** (added 2026-02-28):
 - PARTIALLY IMPLEMENTED: new architecture uses agent defaults
 - MISSING: session-level configuration (temperature, contextLength, maxTokens)
-- `newAgentPresenter.createSession()` only accepts providerId/modelId
+- `agentSessionPresenter.createSession()` only accepts providerId/modelId
 - Must extend CreateSessionInput to include all config options
 - Old architecture: CONVERSATION_SETTINGS had 12+ fields
 - New architecture: must decide which settings to persist at session level
@@ -123,7 +123,7 @@
 ### G. 架构替换
 
 - [x] 新 UI 主链路不依赖 `useChatStore` 与旧 `sessionPresenter`。
-- [x] `newAgentPresenter + deepchatAgentPresenter` 成为唯一主执行链路。
+- [x] `agentSessionPresenter + agentRuntimePresenter` 成为唯一主执行链路。
 
 **Implementation Notes** (added 2026-02-28):
 - MOSTLY COMPLETE: New UI uses sessionStore/messageStore
diff --git a/docs/specs/agentpresenter-mvp-replacement/tasks.md b/docs/specs/agentpresenter-mvp-replacement/tasks.md
index 8ce4e848a..0a51de678 100644
--- a/docs/specs/agentpresenter-mvp-replacement/tasks.md
+++ b/docs/specs/agentpresenter-mvp-replacement/tasks.md
@@ -16,7 +16,7 @@
   - **SQL**: `ALTER TABLE new_sessions ADD COLUMN permission_mode TEXT DEFAULT 'default'`
   - **File**: `src/main/presenter/sqlitePresenter/tables/newSessionsTable.ts`
 - [ ] session manager 增加读写 `permission_mode` 能力。
-  - **File**: `src/main/presenter/newAgentPresenter/sessionManager.ts`
+  - **File**: `src/main/presenter/agentSessionPresenter/sessionManager.ts`
   - Add `permissionMode` to `create()` method
   - Add getter/setter methods
 - [ ] 补齐迁移与回填策略测试。
@@ -38,7 +38,7 @@
 - [ ] `Full access` 禁用态提示“先绑定 workspace"。
   - Add tooltip on disabled option
 - [ ] 选择结果写回 session 并可恢复。
-  - Call `newAgentPresenter.updateSessionPermissionMode()` (NEW IPC)
+  - Call `agentSessionPresenter.updateSessionPermissionMode()` (NEW IPC)
   - Load on session activation
 
 **Priority**: P0 - MVP Blocker
@@ -49,13 +49,13 @@
 ## T3 Default 权限流程 🔴 P0 CRITICAL
 
 - [ ] 新链路接入权限请求消息块与审批动作。
-  - **File**: `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
+  - **File**: `src/main/presenter/agentRuntimePresenter/dispatch.ts`
   - Modify `executeTools()` to check permissions BEFORE calling tools
   - Create permission request block: `{ type: 'action', action_type: 'tool_call_permission', ... }`
   - Emit `STREAM_EVENTS.RESPONSE` with permission block
   - PAUSE stream processing (set session status to 'paused')
 - [ ] 实现 session 级白名单存储与查询。
-  - **CREATE**: `src/main/presenter/deepchatAgentPresenter/permissionChecker.ts`
+  - **CREATE**: `src/main/presenter/agentRuntimePresenter/permissionChecker.ts`
   - Create `permission_whitelists` table: `{ sessionId, toolName, pathPattern, permissionType, createdAt }`
   - Query: `SELECT * FROM permission_whitelists WHERE sessionId = ? AND toolName = ?`
 - [ ] 白名单匹配规则为 `toolName + pathPattern`。
@@ -71,14 +71,14 @@
 **Status**: NOT STARTED
 **Dependencies**: T1
 **Key Files**:
-- CREATE: `src/main/presenter/deepchatAgentPresenter/permissionChecker.ts`
-- MODIFY: `src/main/presenter/deepchatAgentPresenter/dispatch.ts`
-- MODIFY: `src/main/presenter/newAgentPresenter/index.ts`
+- CREATE: `src/main/presenter/agentRuntimePresenter/permissionChecker.ts`
+- MODIFY: `src/main/presenter/agentRuntimePresenter/dispatch.ts`
+- MODIFY: `src/main/presenter/agentSessionPresenter/index.ts`
 
 ## T4 Full access 边界控制 🔴 P0 CRITICAL
 
 - [ ] 实现自动通过逻辑（仅对 `projectDir` 内操作）。
-  - **File**: `src/main/presenter/deepchatAgentPresenter/permissionChecker.ts`
+  - **File**: `src/main/presenter/agentRuntimePresenter/permissionChecker.ts`
   - Check `session.permission_mode === 'full'`
   - If full access: auto-approve tools within projectDir
 - [ ] 实现路径归一化与越界检测。
@@ -99,9 +99,9 @@
 ## T5 Workspace 与会话绑定 ✅ P0 COMPLETE
 
 - [x] 工具执行上下文绑定 `session.projectDir`。
-  - **Status**: COMPLETE - `newAgentPresenter.createSession()` passes projectDir
+  - **Status**: COMPLETE - `agentSessionPresenter.createSession()` passes projectDir
 - [x] 统一传递 `conversationId = sessionId`。
-  - **Status**: COMPLETE - `deepchatAgentPresenter.processStream()` uses sessionId throughout
+  - **Status**: COMPLETE - `agentRuntimePresenter.processStream()` uses sessionId throughout
 - [x] 权限与消息归属链路统一按 `sessionId` 路由。
   - **Status**: COMPLETE - All new architecture uses sessionId
 
@@ -112,11 +112,11 @@
 ## T6 编辑历史 user 消息 🟡 P1 HIGH
 
 - [ ] 实现 `editUserMessage(sessionId, messageId, newContent)`。
-  - **File**: `src/main/presenter/newAgentPresenter/index.ts`
+  - **File**: `src/main/presenter/agentSessionPresenter/index.ts`
   - **IPC**: Add `editUserMessage(sessionId, messageId, newContent)` method
   - Validate: only user messages can be edited
 - [ ] 执行"编辑点后消息截断"。
-  - **File**: `src/main/presenter/deepchatAgentPresenter/messageStore.ts`
+  - **File**: `src/main/presenter/agentRuntimePresenter/messageStore.ts`
   - Add `deleteMessagesAfter(messageId)` method
   - Delete all messages with `orderSeq > editedMessage.orderSeq`
 - [ ] 自动触发 regenerate 并同步状态。
@@ -140,7 +140,7 @@
   - Old: `agentPresenter.retryMessage()` created variants
   - New: Must create NEW assistant message (not replace)
 - [ ] 实现 retry/regenerate 追加 assistant 消息。
-  - **File**: `src/main/presenter/newAgentPresenter/index.ts`
+  - **File**: `src/main/presenter/agentSessionPresenter/index.ts`
   - **IPC**: Add `retryMessage(sessionId, messageId)` method
   - Find the assistant message by messageId
   - Create new assistant message with same context
@@ -162,7 +162,7 @@
 ## T8 Fork 🟡 P1 HIGH
 
 - [ ] 实现 `forkSessionFromMessage(sessionId, messageId)`。
-  - **File**: `src/main/presenter/newAgentPresenter/index.ts`
+  - **File**: `src/main/presenter/agentSessionPresenter/index.ts`
   - **IPC**: Add `forkSessionFromMessage(sessionId, messageId)` method
   - Get all messages up to and including messageId
   - Create new session with copied messages
@@ -171,7 +171,7 @@
   - Include the assistant message at fork point
   - New session can continue from that point
 - [ ] fork 后新 session 可继续发送与生成。
-  - Initialize new session with deepchatAgentPresenter
+  - Initialize new session with agentRuntimePresenter
   - Enable sending messages and generating responses
 - [ ] 补齐 fork 前后消息隔离测试。
   - Test: fork creates independent session
@@ -191,7 +191,7 @@
   - Remove conversation settings UI from ChatPage
   - Migrate to session-level config
 - [ ] 将 agent 默认配置下沉到 session 存储。
-  - **File**: `src/main/presenter/newAgentPresenter/index.ts`
+  - **File**: `src/main/presenter/agentSessionPresenter/index.ts`
   - Extend `CreateSessionInput` to include:
     - `temperature?: number`
     - `contextLength?: number`
diff --git a/docs/specs/app-spotlight-search/plan.md b/docs/specs/app-spotlight-search/plan.md
index cd701d07e..1affdf968 100644
--- a/docs/specs/app-spotlight-search/plan.md
+++ b/docs/specs/app-spotlight-search/plan.md
@@ -142,7 +142,7 @@ Spotlight 作为 follow-up feature 分两层：
 
 新增 Presenter 接口：
 
-- `INewAgentPresenter.searchHistory(query, options?)`
+- `IAgentSessionPresenter.searchHistory(query, options?)`
 
 说明：
 
diff --git a/docs/specs/app-spotlight-search/tasks.md b/docs/specs/app-spotlight-search/tasks.md
index 156b76444..4973f3809 100644
--- a/docs/specs/app-spotlight-search/tasks.md
+++ b/docs/specs/app-spotlight-search/tasks.md
@@ -28,7 +28,7 @@
 
 - [ ] 新增 `HistorySearchOptions`
 - [ ] 新增 `HistorySearchHit / SessionHit / MessageHit`
-- [ ] `INewAgentPresenter` 增加 `searchHistory(query, options?)`
+- [ ] `IAgentSessionPresenter` 增加 `searchHistory(query, options?)`
 - [ ] 补充共享类型导出
 
 ## T4 设置导航 registry
diff --git a/docs/specs/architecture-simplification/plan.md b/docs/specs/architecture-simplification/plan.md
new file mode 100644
index 000000000..7008d31e1
--- /dev/null
+++ b/docs/specs/architecture-simplification/plan.md
@@ -0,0 +1,37 @@
+# Architecture Simplification Plan
+
+## Workstreams
+
+### 1. Quality Baseline
+
+- 添加 `scripts/generate-architecture-baseline.mjs`，把依赖环、零入边候选、归档引用报告落到 `docs/architecture/baselines/`。
+- 维护一份失败测试分组文档，区分真实行为回归、测试陈旧、环境问题。
+- 把这批基线纳入文档入口，后续每轮治理都基于同一套报告更新。
+
+### 2. Main Composition / Lifecycle
+
+- 新增 `ConfigQueryPort`、`SessionRuntimePort`、`WindowRoutingPort` 等窄接口。
+- 让 `Presenter` 只在 composition root 组装 port；`agentSessionPresenter`、`agentRuntimePresenter` 只依赖 port。
+- 首批迁移目标：
+  - 会话 UI 刷新
+  - 权限批准 / 清理
+  - model catalog 查询
+
+### 3. Renderer Transport / State
+
+- 增加 window context helper，避免各处各自读 `window.api`。
+- 增加 IPC subscription helper，把 `App.vue`、`stores/ui/session.ts`、`stores/ui/message.ts` 的监听注册收口。
+- 把流式状态拆到独立 `stream` store，消息缓存仍保留在 `message` store。
+
+### 4. Archive / Docs
+
+- 首先把开发者导航从历史源码快照切到稳定历史文档。
+- 在文档脱钩和 guard 到位后删除历史源码实体。
+
+## Validation
+
+- `pnpm run format`
+- `pnpm run i18n`
+- `pnpm run lint`
+- `pnpm run typecheck`
+- 针对本次改动的主链路测试与 composable/store 测试
diff --git a/docs/specs/architecture-simplification/spec.md b/docs/specs/architecture-simplification/spec.md
new file mode 100644
index 000000000..e18998936
--- /dev/null
+++ b/docs/specs/architecture-simplification/spec.md
@@ -0,0 +1,40 @@
+# Architecture Simplification
+
+## Summary
+
+本规格定义首期“整体减负治理”的目标：不引入新功能，优先降低 `main` / `renderer` 的心智负担，清理无用代码，减少隐式调用链，并把生命周期、边界与兼容层显式化。
+
+首期只做四类工作：
+
+- 基线收敛
+- 分层与依赖收口
+- 历史归档脱钩
+- 测试可信度恢复
+
+## Goals
+
+- 为 `main` 和 `renderer` 建立可持续更新的结构基线，而不是一次性口头结论。
+- 限制活跃路径继续依赖全局 `presenter`、分散 IPC 监听和历史归档代码。
+- 让 `agentSessionPresenter`、`agentRuntimePresenter`、`App.vue`、`stores/ui/*` 的职责边界更清楚。
+- 为后续删除历史源码归档目录和死文件清理建立前置条件。
+
+## Non-Goals
+
+- 不做新功能。
+- 不在首期重命名对外 IPC channel。
+- 不在首期移除 `SessionPresenter`、legacy import、旧表结构这些兼容边界。
+- 不要求一次性解决全部失败测试，只要求把失败分类、责任边界和修复入口理清。
+
+## Acceptance Criteria
+
+- 仓库存在一组可更新的基线报告，至少覆盖依赖环、零入边候选、归档引用、失败测试分组。
+- 活跃主链路新增 anti-regression guard，阻止历史源码重新进入运行时依赖，阻止首批主链路继续回跳全局 `presenter`。
+- `agentSessionPresenter` / `agentRuntimePresenter` 首批关键路径改为依赖窄接口 port，而不是直接 import `presenter/index.ts`。
+- `renderer` 至少将 `App`、`session`、`message` 这条活跃链路的 IPC 监听收口到 helper / subscription hub，并把流式状态独立成单独状态面。
+- 文档中存在本次治理的 `spec.md`、`plan.md`、`tasks.md`，并且 `docs/README.md` 能导航到这些内容。
+
+## Constraints
+
+- 行为兼容优先，优先保留用户可见行为和现有 IPC surface。
+- 只有经过人工分类的“真正死文件”可以删除。
+- 任何 archive 清理都要先完成文档脱钩。
diff --git a/docs/specs/architecture-simplification/tasks.md b/docs/specs/architecture-simplification/tasks.md
new file mode 100644
index 000000000..9c1421fad
--- /dev/null
+++ b/docs/specs/architecture-simplification/tasks.md
@@ -0,0 +1,31 @@
+# Architecture Simplification Tasks
+
+## Baseline
+
+- [x] 建立 architecture simplification spec / plan / tasks
+- [x] 新增依赖 / 死代码 / archive 引用基线生成脚本
+- [x] 新增失败测试分组基线文档
+
+## Main
+
+- [x] 引入窄接口 ports
+- [x] 将 `agentSessionPresenter` 的会话 UI 刷新与权限清理改成依赖 port
+- [x] 将 `agentRuntimePresenter` 的权限批准与 env prompt model lookup 改成依赖 port
+- [x] 让 `Presenter` 成为 port 的唯一组装入口
+
+## Renderer
+
+- [x] 引入 window context helper
+- [x] 引入 IPC subscription helper
+- [x] 收口 `App.vue`、`session`、`message` 的活跃监听链路
+- [x] 拆出独立 stream state store
+- [x] 修复 `session store` 对缺失 `sessionKind` 的兼容分类
+- [x] 补齐 `useSearchConfig` 与 search capability 组合逻辑
+
+## Guardrails / Docs
+
+- [x] 新增 architecture guard
+- [x] 将 lint 串上 architecture guard
+- [x] 更新 `docs/README.md`、`guides/*`、架构文档的治理入口
+- [x] 清理剩余 specs 对历史源码快照的直接文件级引用
+- [x] 删除历史源码归档实体
diff --git a/docs/specs/floating-agent-widget/plan.md b/docs/specs/floating-agent-widget/plan.md
index 45cb02bd5..11034c940 100644
--- a/docs/specs/floating-agent-widget/plan.md
+++ b/docs/specs/floating-agent-widget/plan.md
@@ -4,7 +4,7 @@
 
 1. 保留现有独立悬浮窗口入口，但将其内容从“按钮 + 外部悬浮聊天窗入口”收敛为“任务小部件”。
 2. 小部件数据由主进程聚合，renderer 只负责展示和交互。
-3. 仅复用 `newAgentPresenter.getSessionList()` 与 `DeepChatAgentPresenter` 的状态事件，不新增独立数据库表。
+3. 仅复用 `agentSessionPresenter.getSessionList()` 与 `AgentRuntimePresenter` 的状态事件，不新增独立数据库表。
 4. 点击会话时不再打开旧的 `FloatingChatWindow`，而是唤起主窗口并激活对应会话。
 
 ## 数据模型
@@ -17,7 +17,7 @@
 
 状态来源：
 
-- 会话列表：`newAgentPresenter.getSessionList({ agentId: 'deepchat' })`
+- 会话列表：`agentSessionPresenter.getSessionList({ agentId: 'deepchat' })`
 - 会话状态：`SessionWithState.status`
 - 语言：`configPresenter.getLanguage()`
 
@@ -39,8 +39,8 @@
 
 以下场景统一触发 `floatingButtonPresenter.refreshWidgetState()`：
 
-- `newAgentPresenter` 发出列表更新时
-- `deepchatAgentPresenter` 会话状态变化时
+- `agentSessionPresenter` 发出列表更新时
+- `agentRuntimePresenter` 会话状态变化时
 - 标题自动生成完成时
 
 主进程刷新后向悬浮 renderer 发送最新 snapshot。
@@ -49,7 +49,7 @@
 
 1. 悬浮 renderer 发送 `open-session(sessionId)`
 2. 主进程选择目标 chat 窗口；若不存在则创建
-3. 主进程调用 `newAgentPresenter.activateSession(targetWebContentsId, sessionId)`
+3. 主进程调用 `agentSessionPresenter.activateSession(targetWebContentsId, sessionId)`
 4. 主进程显示并聚焦目标窗口
 5. 目标 renderer 收到 `SESSION_EVENTS.ACTIVATED` 后切换到对应 chat route
 
diff --git a/docs/specs/legacy-agentpresenter-retirement/spec.md b/docs/specs/legacy-agentpresenter-retirement/spec.md
index 0c9799fa4..b80cd16e7 100644
--- a/docs/specs/legacy-agentpresenter-retirement/spec.md
+++ b/docs/specs/legacy-agentpresenter-retirement/spec.md
@@ -3,7 +3,7 @@
 ## Summary
 
 Retire the live legacy `AgentPresenter -> SessionManager -> streaming/permission/loop` runtime
-chain and make the current `newAgentPresenter + deepchatAgentPresenter` path the only active chat
+chain and make the current `agentSessionPresenter + agentRuntimePresenter` path the only active chat
 execution flow.
 
 ## Scope
@@ -16,7 +16,7 @@ In scope:
 - migrate still-needed ACP helpers into `llmProviderPresenter/acp/`
 - migrate still-needed agent tools into `toolPresenter/agentTools/`
 - migrate retained message-formatting helpers into `sessionPresenter/`
-- archive retired source and tests
+- retire source and tests from the active tree and preserve history in docs
 - document the retirement in active docs and specs
 
 Out of scope:
@@ -34,14 +34,12 @@ The boundary kept after retirement:
 - old `conversations/messages` tables as import-only or export-facing sources
 - `SessionPresenter` as a main-internal compatibility/data adapter
 
-## Archive Policy
+## Historical Preservation Policy
 
-Retired live code must move to:
+Retired live code must leave the active tree.
 
-- `archives/code/legacy-agentpresenter-retirement/`
-
-Only fully retired files go to archive. Files still used by active runtime are migrated into live
-modules instead of archived in place.
+Historical structure is preserved in `docs/archives/` and related cleanup specs. Files still used by
+active runtime are migrated into live modules instead of being kept as dormant source snapshots.
 
 ## Acceptance
 
@@ -51,5 +49,5 @@ The retirement is done when:
 2. renderer no longer has public `agentPresenter` / `sessionPresenter` dependency
 3. `ILlmProviderPresenter.startStreamCompletion()` is removed
 4. migrated ACP / agent tool helpers compile and tests pass from their new locations
-5. retired source/tests exist only under `archives/code/legacy-agentpresenter-retirement/`
+5. retired source/tests no longer exist in the active tree, and their historical shape is preserved in docs
 6. active docs describe the current architecture and link historical docs as archive material
diff --git a/docs/specs/message-toolbar-actions/plan.md b/docs/specs/message-toolbar-actions/plan.md
index 7552d97a7..3525e0062 100644
--- a/docs/specs/message-toolbar-actions/plan.md
+++ b/docs/specs/message-toolbar-actions/plan.md
@@ -2,7 +2,7 @@
 
 ## 1. 关键决策
 
-1. 新页面消息操作以 `newAgentPresenter` 为唯一目标接口。
+1. 新页面消息操作以 `agentSessionPresenter` 为唯一目标接口。
 2. 新架构下线 variants，不再做版本切换状态维护。
 3. 交付拆两阶段：
    - Phase 1：前端接线、显隐与禁用策略。
@@ -33,7 +33,7 @@
 
 ## 3. 新 API 设计（Phase 2）
 
-在 `INewAgentPresenter` 增加：
+在 `IAgentSessionPresenter` 增加：
 
 1. `editUserMessage(sessionId: string, messageId: string, newText: string): Promise<void>`
 2. `retryFromUserMessage(sessionId: string, messageId: string): Promise<void>`
diff --git a/docs/specs/message-toolbar-actions/spec.md b/docs/specs/message-toolbar-actions/spec.md
index 57b94c353..f1d961c8f 100644
--- a/docs/specs/message-toolbar-actions/spec.md
+++ b/docs/specs/message-toolbar-actions/spec.md
@@ -2,13 +2,13 @@
 
 ## 概述
 
-本规格定义新架构会话页（`ChatPage + stores/ui/* + newAgentPresenter`）下的 `MessageToolbar` 功能补齐范围，目标是让按钮行为与产品语义一致，避免“可见但不可用/行为不一致”。
+本规格定义新架构会话页（`ChatPage + stores/ui/* + agentSessionPresenter`）下的 `MessageToolbar` 功能补齐范围，目标是让按钮行为与产品语义一致，避免“可见但不可用/行为不一致”。
 
 本规格**不包含 Trace 数据落库设计**，Trace 由独立规格处理：`docs/specs/message-trace-storage/`。
 
 ## 背景与目标
 
-1. 新 UI 主链路已迁移到 `newAgentPresenter + deepchatAgentPresenter`，但 `MessageToolbar` 仍大量依赖旧 `chatStore/sessionPresenter` 语义。
+1. 新 UI 主链路已迁移到 `agentSessionPresenter + agentRuntimePresenter`，但 `MessageToolbar` 仍大量依赖旧 `chatStore/sessionPresenter` 语义。
 2. 当前按钮存在“新旧链路行为不一致”与“有 UI 无闭环”的问题。
 3. 需要明确分阶段交付：先修前端行为与禁用策略，再补后端消息操作 API。
 
@@ -38,7 +38,7 @@
 
 ### A. 架构范围
 
-- [ ] 新会话页链路仅使用 `stores/ui/session.ts`、`stores/ui/message.ts`、`newAgentPresenter`。
+- [ ] 新会话页链路仅使用 `stores/ui/session.ts`、`stores/ui/message.ts`、`agentSessionPresenter`。
 - [ ] 不再依赖旧 `chatStore` 作为新页面消息操作入口。
 - [ ] 旧页面链路可保留兼容，但不作为新页面实现基线。
 
diff --git a/docs/specs/message-toolbar-actions/tasks.md b/docs/specs/message-toolbar-actions/tasks.md
index 8ca603caa..dcc04ee75 100644
--- a/docs/specs/message-toolbar-actions/tasks.md
+++ b/docs/specs/message-toolbar-actions/tasks.md
@@ -16,9 +16,9 @@
 
 ## T2 Phase 2：新后端消息操作 API
 
-- [ ] `INewAgentPresenter` 增加消息操作接口定义
-- [ ] `newAgentPresenter` 增加消息操作代理实现
-- [ ] `deepchatAgentPresenter` 实现编辑/重试/删除/fork 语义
+- [ ] `IAgentSessionPresenter` 增加消息操作接口定义
+- [ ] `agentSessionPresenter` 增加消息操作代理实现
+- [ ] `agentRuntimePresenter` 实现编辑/重试/删除/fork 语义
 - [ ] MessageStore/SQLite 层补齐对应读写方法
 
 ## T3 渲染层动作闭环
diff --git a/docs/specs/message-trace-storage/plan.md b/docs/specs/message-trace-storage/plan.md
index f897ebaa8..f539e295f 100644
--- a/docs/specs/message-trace-storage/plan.md
+++ b/docs/specs/message-trace-storage/plan.md
@@ -35,7 +35,7 @@
 
 ### 3.1 Trace 上下文
 
-在 `deepchatAgentPresenter.runStreamForMessage` 构建 trace context：
+在 `agentRuntimePresenter.runStreamForMessage` 构建 trace context：
 
 1. `sessionId`
 2. `messageId`
@@ -69,7 +69,7 @@
 
 ### 5.1 IPC / Presenter
 
-在 `INewAgentPresenter` 增加：
+在 `IAgentSessionPresenter` 增加：
 
 1. `listMessageTraces(messageId: string): Promise<MessageTraceRecord[]>`
 2. `getMessageTraceCount(messageId: string): Promise<number>`（可选；也可在消息查询时聚合）
diff --git a/docs/specs/message-trace-storage/tasks.md b/docs/specs/message-trace-storage/tasks.md
index 76e88b1da..a5c8afc31 100644
--- a/docs/specs/message-trace-storage/tasks.md
+++ b/docs/specs/message-trace-storage/tasks.md
@@ -16,8 +16,8 @@
 ## T2 类型与接口
 
 - [x] 新增 `MessageTraceRecord` 共享类型
-- [x] `INewAgentPresenter` 增加 trace 查询接口
-- [x] `newAgentPresenter` 增加 trace 查询代理实现
+- [x] `IAgentSessionPresenter` 增加 trace 查询接口
+- [x] `agentSessionPresenter` 增加 trace 查询代理实现
 
 ## T3 脱敏与截断
 
diff --git a/docs/specs/new-agent/plan.md b/docs/specs/new-agent/plan.md
index 4ad4d7b64..7b0313084 100644
--- a/docs/specs/new-agent/plan.md
+++ b/docs/specs/new-agent/plan.md
@@ -33,23 +33,23 @@
 
 ## 2. Design Decisions
 
-### 2.1 Naming: `newAgentPresenter` not `agentPresenter`
+### 2.1 Naming: `agentSessionPresenter` not `agentPresenter`
 
-The old `agentPresenter` still exists and must keep working. The new one is registered as `newAgentPresenter` in IPresenter to avoid name collision. Renderer calls `usePresenter('newAgentPresenter')`. When old UI is removed, rename to `agentPresenter`.
+The old `agentPresenter` still exists and must keep working. The new one is registered as `agentSessionPresenter` in IPresenter to avoid name collision. Renderer calls `usePresenter('agentSessionPresenter')`. When old UI is removed, rename to `agentPresenter`.
 
 ### 2.2 Database: new tables in same chat.db
 
 No separate DB file. New tables coexist with old tables in `chat.db`:
 - `new_sessions` — agentPresenter's thin session registry
 - `new_projects` — project directory history
-- `deepchat_sessions` — deepchatAgentPresenter's session config
-- `deepchat_messages` — deepchatAgentPresenter's messages
+- `deepchat_sessions` — agentRuntimePresenter's session config
+- `deepchat_messages` — agentRuntimePresenter's messages
 
 Prefix `new_` on `sessions` and `projects` to avoid any conflict with potential future SQLite reserved words or collisions.
 
 ### 2.3 Stream handling: reuse LLMCoreStreamEvent, transform to LLMAgentEventData
 
-deepchatAgentPresenter consumes `LLMCoreStreamEvent` from `coreStream()` and:
+agentRuntimePresenter consumes `LLMCoreStreamEvent` from `coreStream()` and:
 1. Accumulates content into `AssistantMessageBlock[]` structure
 2. Persists structured JSON content to `deepchat_messages` (batched DB writes every 600ms)
 3. Transforms to `LLMAgentEventData` format with `conversationId` + `eventId` for routing
@@ -126,9 +126,9 @@ On stream end, both flush immediately with final content.
 
 - `Agent`, `Session`, `SessionStatus`, `CreateSessionInput`, `ChatMessage`, `UserMessageContent`, `AssistantMessageBlock`, `MessageMetadata`, `Project`
 
-**`presenters/new-agent.presenter.d.ts`** — IPC-facing interface:
+**`presenters/agent-session.presenter.d.ts`** — IPC-facing interface:
 
-- `INewAgentPresenter` — what the renderer can call: `createSession`, `sendMessage`, `getSessionList`, `getSession`, `getMessages`, `getMessageIds`, `getMessage`, `activateSession`, `deactivateSession`, `getActiveSession`, `getAgents`, `deleteSession`
+- `IAgentSessionPresenter` — what the renderer can call: `createSession`, `sendMessage`, `getSessionList`, `getSession`, `getMessages`, `getMessageIds`, `getMessage`, `activateSession`, `deactivateSession`, `getActiveSession`, `getAgents`, `deleteSession`
 
 **`presenters/project.presenter.d.ts`** — IPC-facing interface:
 
@@ -182,14 +182,14 @@ On stream end, both flush immediately with final content.
 
 Index: `CREATE INDEX idx_deepchat_messages_session ON deepchat_messages(session_id, order_seq)`
 
-### 3.3 agentPresenter (`src/main/presenter/newAgentPresenter/`)
+### 3.3 agentPresenter (`src/main/presenter/agentSessionPresenter/`)
 
-**`index.ts`** — main presenter class implementing `INewAgentPresenter`
+**`index.ts`** — main presenter class implementing `IAgentSessionPresenter`
 
 Owns:
 - `sessionManager` — thin CRUD over `new_sessions` table
 - `messageManager` — proxy that resolves agentId then delegates to agent
-- `agentRegistry` — `Map<string, IAgentImplementation>`, populated in constructor with deepchatAgentPresenter
+- `agentRegistry` — `Map<string, IAgentImplementation>`, populated in constructor with agentRuntimePresenter
 
 Methods (IPC-facing):
 - `createSession(input, webContentsId)` → sessionManager.create() + agent.initSession() + agent.processMessage() + emit ACTIVATED
@@ -230,7 +230,7 @@ Event relay:
 - `resolve(agentId)` → returns `IAgentImplementation` or throws
 - `getAll()` → returns `Agent[]` list (for v0: just deepchat)
 
-### 3.4 deepchatAgentPresenter (`src/main/presenter/deepchatAgentPresenter/`)
+### 3.4 agentRuntimePresenter (`src/main/presenter/agentRuntimePresenter/`)
 
 **`index.ts`** — implements `IAgentImplementation`
 
@@ -299,14 +299,14 @@ Methods:
 
 3 touchpoints:
 
-1. Import and add to IPresenter: `newAgentPresenter: INewAgentPresenter`, `projectPresenter: IProjectPresenter`
+1. Import and add to IPresenter: `agentSessionPresenter: IAgentSessionPresenter`, `projectPresenter: IProjectPresenter`
 2. Add class properties
 3. Instantiate in constructor:
-   - `this.deepchatAgentPresenter = new DeepChatAgentPresenter(this.llmProviderPresenter, this.configPresenter, this.sqlitePresenter)`
-   - `this.newAgentPresenter = new NewAgentPresenter(this.deepchatAgentPresenter, this.configPresenter, this.sqlitePresenter, this.eventBus)`
+   - `this.agentRuntimePresenter = new AgentRuntimePresenter(this.llmProviderPresenter, this.configPresenter, this.sqlitePresenter)`
+   - `this.agentSessionPresenter = new AgentSessionPresenter(this.agentRuntimePresenter, this.configPresenter, this.sqlitePresenter, this.eventBus)`
    - `this.projectPresenter = new ProjectPresenter(this.sqlitePresenter, this.devicePresenter)`
 
-Note: `deepchatAgentPresenter` is NOT exposed on IPresenter — it's internal. Only `newAgentPresenter` and `projectPresenter` are IPC-accessible.
+Note: `agentRuntimePresenter` is NOT exposed on IPresenter — it's internal. Only `agentSessionPresenter` and `projectPresenter` are IPC-accessible.
 
 ### 3.7 Events (`src/main/events.ts`)
 
@@ -327,14 +327,14 @@ STREAM_EVENTS reused as-is — same event names, same payload format. All stream
 
 **`session.ts`** — rewrite
 
-- Uses `usePresenter('newAgentPresenter')`
+- Uses `usePresenter('agentSessionPresenter')`
 - State: `sessions: Session[]`, `activeSessionId`, `groupMode`
 - Actions: `fetchSessions()`, `createSession(input)`, `selectSession(id)`, `closeSession()`
 - Listens to: `SESSION_EVENTS.LIST_UPDATED`, `SESSION_EVENTS.ACTIVATED`, `SESSION_EVENTS.DEACTIVATED`, `SESSION_EVENTS.STATUS_CHANGED`
 
 **`message.ts`** — new
 
-- Uses `usePresenter('newAgentPresenter')`
+- Uses `usePresenter('agentSessionPresenter')`
 - State: `messageIds: string[]`, `messageCache: Map<string, ChatMessage>`, `isStreaming: boolean`, `streamingBlocks: AssistantMessageBlock[]`
 - Actions: `loadMessages(sessionId)`, `getMessage(id)`
 - Listens to: `STREAM_EVENTS.RESPONSE` (update streaming blocks from `LLMAgentEventData`), `STREAM_EVENTS.END` (finalize), `STREAM_EVENTS.ERROR`
@@ -342,7 +342,7 @@ STREAM_EVENTS reused as-is — same event names, same payload format. All stream
 
 **`agent.ts`** — rewrite
 
-- Uses `usePresenter('newAgentPresenter')`
+- Uses `usePresenter('agentSessionPresenter')`
 - State: `agents: Agent[]`, `selectedAgentId`
 - Actions: `fetchAgents()`, `selectAgent(id)`
 
@@ -373,7 +373,7 @@ STREAM_EVENTS reused as-is — same event names, same payload format. All stream
 - `agentRegistry.register/resolve/getAll` — correct routing
 - `createSession` → calls sessionManager.create + agent.initSession + agent.processMessage
 
-**deepchatAgentPresenter:**
+**agentRuntimePresenter:**
 - `processMessage` → creates user message (JSON content), calls LLM, creates assistant message (JSON blocks)
 - `streamHandler` — given mock `AsyncGenerator<LLMCoreStreamEvent>`, verify: block accumulation, batched DB writes at 600ms, renderer flush at 120ms, final flush on stop
 - `messageStore` — CRUD operations against in-memory SQLite, verify JSON content round-trip
@@ -386,7 +386,7 @@ STREAM_EVENTS reused as-is — same event names, same payload format. All stream
 
 ### 4.2 Integration Tests
 
-- End-to-end: `newAgentPresenter.createSession()` → verify new_sessions row + deepchat_sessions row + deepchat_messages rows (with valid JSON content) + events emitted with conversationId
+- End-to-end: `agentSessionPresenter.createSession()` → verify new_sessions row + deepchat_sessions row + deepchat_messages rows (with valid JSON content) + events emitted with conversationId
 - Coexistence: old `sessionPresenter.createSession()` still works — old tables unaffected
 - Crash recovery: insert pending message, reinitialize presenter, verify status changed to error
 
diff --git a/docs/specs/new-agent/spec.md b/docs/specs/new-agent/spec.md
index 0e99a155e..9a9f58487 100644
--- a/docs/specs/new-agent/spec.md
+++ b/docs/specs/new-agent/spec.md
@@ -18,7 +18,7 @@ See [Full-Stack Mismatch Analysis](../../architecture/new-ui-store-presenter-mis
 
 1. **Agent interface protocol** — define the unified contract all agents implement
 2. **agentPresenter** — router, thin session registry, event relay
-3. **deepchatAgentPresenter** — single-turn chat: message → LLM → streamed response → persist
+3. **agentRuntimePresenter** — single-turn chat: message → LLM → streamed response → persist
 4. **projectPresenter** — thin project directory CRUD
 5. **New DB tables** — `new_sessions`, `new_projects`, `deepchat_sessions`, `deepchat_messages`
 6. **New renderer stores** — sessionStore, messageStore, agentStore, projectStore, draftStore
@@ -41,14 +41,14 @@ See [Full-Stack Mismatch Analysis](../../architecture/new-ui-store-presenter-mis
 **Main process:**
 - `src/shared/types/agent-interface.d.ts` — agent interface protocol
 - `src/shared/types/chat-types.d.ts` — Agent, Session, Project, CreateSessionInput, ChatMessage, MessageBlock types
-- `src/main/presenter/newAgentPresenter/index.ts` — agentPresenter (router)
-- `src/main/presenter/newAgentPresenter/sessionManager.ts` — thin session registry
-- `src/main/presenter/newAgentPresenter/messageManager.ts` — message proxy
-- `src/main/presenter/newAgentPresenter/agentRegistry.ts` — agent discovery + routing
-- `src/main/presenter/deepchatAgentPresenter/index.ts` — deepchat agent implementation
-- `src/main/presenter/deepchatAgentPresenter/sessionStore.ts` — agent-owned session persistence
-- `src/main/presenter/deepchatAgentPresenter/messageStore.ts` — agent-owned message persistence
-- `src/main/presenter/deepchatAgentPresenter/streamHandler.ts` — LLM stream → message persistence + event emission
+- `src/main/presenter/agentSessionPresenter/index.ts` — agentPresenter (router)
+- `src/main/presenter/agentSessionPresenter/sessionManager.ts` — thin session registry
+- `src/main/presenter/agentSessionPresenter/messageManager.ts` — message proxy
+- `src/main/presenter/agentSessionPresenter/agentRegistry.ts` — agent discovery + routing
+- `src/main/presenter/agentRuntimePresenter/index.ts` — deepchat agent implementation
+- `src/main/presenter/agentRuntimePresenter/sessionStore.ts` — agent-owned session persistence
+- `src/main/presenter/agentRuntimePresenter/messageStore.ts` — agent-owned message persistence
+- `src/main/presenter/agentRuntimePresenter/streamHandler.ts` — LLM stream → message persistence + event emission
 - `src/main/presenter/projectPresenter/index.ts` — project CRUD
 - `src/main/presenter/sqlitePresenter/tables/` — new table definitions
 - `src/main/events.ts` — add SESSION_EVENTS
@@ -81,13 +81,13 @@ See [Full-Stack Mismatch Analysis](../../architecture/new-ui-store-presenter-mis
 ### Functional Requirements
 
 - [ ] Agent interface protocol defined as TypeScript types in `src/shared/types/`
-- [ ] agentPresenter registered in Presenter class, accessible via `usePresenter('newAgentPresenter')`
+- [ ] agentPresenter registered in Presenter class, accessible via `usePresenter('agentSessionPresenter')`
 - [ ] agentPresenter.sessionManager creates session records in new `new_sessions` table
 - [ ] agentPresenter.agentRegistry returns `[{ id: 'deepchat', name: 'DeepChat', type: 'deepchat', enabled: true }]`
-- [ ] agentPresenter routes `sendMessage()` to deepchatAgentPresenter based on session's agentId
-- [ ] deepchatAgentPresenter calls LLM provider's `coreStream()` and receives `LLMCoreStreamEvent` stream
-- [ ] deepchatAgentPresenter persists user message and assistant message in `deepchat_messages` table with structured JSON content
-- [ ] deepchatAgentPresenter emits stream events (response/end/error) via EventBus with `conversationId` for routing
+- [ ] agentPresenter routes `sendMessage()` to agentRuntimePresenter based on session's agentId
+- [ ] agentRuntimePresenter calls LLM provider's `coreStream()` and receives `LLMCoreStreamEvent` stream
+- [ ] agentRuntimePresenter persists user message and assistant message in `deepchat_messages` table with structured JSON content
+- [ ] agentRuntimePresenter emits stream events (response/end/error) via EventBus with `conversationId` for routing
 - [ ] agentPresenter relays all stream events to renderer
 - [ ] Stream events batched: 120ms flush to renderer, 600ms flush to DB
 - [ ] On app restart, any messages with `status = 'pending'` are marked as `'error'` (crash recovery)
@@ -104,11 +104,11 @@ See [Full-Stack Mismatch Analysis](../../architecture/new-ui-store-presenter-mis
 - [ ] `pnpm run typecheck` passes
 - [ ] `pnpm run lint` passes
 - [ ] `pnpm run format` passes
-- [ ] Unit tests for agentPresenter routing, deepchatAgentPresenter stream handling, sessionManager CRUD
+- [ ] Unit tests for agentPresenter routing, agentRuntimePresenter stream handling, sessionManager CRUD
 
 ## Constraints
 
-- LLM provider HTTP clients are reused directly — deepchatAgentPresenter calls `BaseLLMProvider.coreStream()` and consumes the `AsyncGenerator<LLMCoreStreamEvent>`
+- LLM provider HTTP clients are reused directly — agentRuntimePresenter calls `BaseLLMProvider.coreStream()` and consumes the `AsyncGenerator<LLMCoreStreamEvent>`
 - New tables live in the same SQLite database (`chat.db`) alongside old tables — no separate DB file
 - IPC routing is dynamic (`presenter[name]`) — no route registration needed beyond the 3 touchpoints
 - v0 sends a single user message and gets a single assistant response — no multi-turn context, no tool use
diff --git a/docs/specs/new-agent/tasks.md b/docs/specs/new-agent/tasks.md
index 144c9cd32..da2e045ef 100644
--- a/docs/specs/new-agent/tasks.md
+++ b/docs/specs/new-agent/tasks.md
@@ -3,7 +3,7 @@
 ## T0 Shared Types & Events
 
 - [x] Create `src/shared/types/agent-interface.d.ts` — `IAgentImplementation`, `Agent`, `Session`, `SessionStatus`, `CreateSessionInput`, `ChatMessageRecord`, `UserMessageContent`, `AssistantMessageBlock`, `MessageMetadata`, `Project` (merged chat-types into this file)
-- [x] Create `src/shared/types/presenters/new-agent.presenter.d.ts` — `INewAgentPresenter` interface
+- [x] Create `src/shared/types/presenters/agent-session.presenter.d.ts` — `IAgentSessionPresenter` interface
 - [x] Create `src/shared/types/presenters/project.presenter.d.ts` — `IProjectPresenter` interface
 - [x] Export new types from `src/shared/types/presenters/index.d.ts`
 - [x] Add `SESSION_EVENTS` to `src/main/events.ts` (list-updated, activated, deactivated, status-changed)
@@ -17,24 +17,24 @@
 - [x] Create `src/main/presenter/sqlitePresenter/tables/deepchatMessages.ts` — `deepchat_messages` table with order_seq, JSON content, status (pending/sent/error), is_context_edge, metadata; index on (session_id, order_seq)
 - [x] Register new tables in `sqlitePresenter/index.ts` (initTables + migrate array)
 
-## T2 deepchatAgentPresenter
+## T2 agentRuntimePresenter
 
 - [x] Create `messageStore.ts` — CRUD over `deepchat_messages`
 - [x] Create `sessionStore.ts` — CRUD over `deepchat_sessions`
 - [x] Create `index.ts` — implements `IAgentImplementation`, wires sessionStore + messageStore + llmProviderPresenter, runs crash recovery on init
-- [x] Unit tests: processMessage, recoverPendingMessages (`deepchatAgentPresenter.test.ts`)
+- [x] Unit tests: processMessage, recoverPendingMessages (`agentRuntimePresenter.test.ts`)
 
-## T3 agentPresenter (newAgentPresenter)
+## T3 agentPresenter (agentSessionPresenter)
 
-- [x] Create `src/main/presenter/newAgentPresenter/agentRegistry.ts` — register/resolve/getAll
-- [x] Create `src/main/presenter/newAgentPresenter/sessionManager.ts` — CRUD over `new_sessions`, in-memory window bindings (webContentsId → sessionId)
-- [x] Create `src/main/presenter/newAgentPresenter/messageManager.ts` — proxy resolves agentId then delegates to agent
-- [x] Create `src/main/presenter/newAgentPresenter/index.ts` — implements `INewAgentPresenter`, wires sessionManager + messageManager + agentRegistry + event relay (all stream events carry conversationId)
-- [x] Unit tests: sessionManager CRUD + window bindings (`test/main/presenter/newAgentPresenter/sessionManager.test.ts`)
-- [x] Unit tests: agentRegistry register/resolve/getAll/has (`test/main/presenter/newAgentPresenter/agentRegistry.test.ts`)
-- [x] Unit tests: messageManager delegation (`test/main/presenter/newAgentPresenter/messageManager.test.ts`)
-- [x] Unit tests: createSession → verify sessionManager.create + agent.initSession + agent.processMessage called (`test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts`)
-- [x] Unit tests: sendMessage → verify agent routing (`test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts`)
+- [x] Create `src/main/presenter/agentSessionPresenter/agentRegistry.ts` — register/resolve/getAll
+- [x] Create `src/main/presenter/agentSessionPresenter/sessionManager.ts` — CRUD over `new_sessions`, in-memory window bindings (webContentsId → sessionId)
+- [x] Create `src/main/presenter/agentSessionPresenter/messageManager.ts` — proxy resolves agentId then delegates to agent
+- [x] Create `src/main/presenter/agentSessionPresenter/index.ts` — implements `IAgentSessionPresenter`, wires sessionManager + messageManager + agentRegistry + event relay (all stream events carry conversationId)
+- [x] Unit tests: sessionManager CRUD + window bindings (`test/main/presenter/agentSessionPresenter/sessionManager.test.ts`)
+- [x] Unit tests: agentRegistry register/resolve/getAll/has (`test/main/presenter/agentSessionPresenter/agentRegistry.test.ts`)
+- [x] Unit tests: messageManager delegation (`test/main/presenter/agentSessionPresenter/messageManager.test.ts`)
+- [x] Unit tests: createSession → verify sessionManager.create + agent.initSession + agent.processMessage called (`test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts`)
+- [x] Unit tests: sendMessage → verify agent routing (`test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts`)
 
 ## T4 projectPresenter
 
@@ -43,15 +43,15 @@
 
 ## T5 Presenter Registration
 
-- [x] Add `INewAgentPresenter` and `IProjectPresenter` to `IPresenter` interface in `src/shared/types/presenters/legacy.presenters.d.ts`
+- [x] Add `IAgentSessionPresenter` and `IProjectPresenter` to `IPresenter` interface in `src/shared/types/presenters/legacy.presenters.d.ts`
 - [x] Add properties and constructor instantiation in `src/main/presenter/index.ts`
-- [x] Verify: `usePresenter('newAgentPresenter')` and `usePresenter('projectPresenter')` callable from renderer
+- [x] Verify: `usePresenter('agentSessionPresenter')` and `usePresenter('projectPresenter')` callable from renderer
 
 ## T6 Renderer Stores
 
-- [x] Rewrite `src/renderer/src/stores/ui/session.ts` — uses `newAgentPresenter`, listens to `SESSION_EVENTS`, uses `webContentsId` for activation
-- [x] Create `src/renderer/src/stores/ui/message.ts` — uses `newAgentPresenter`, listens to `STREAM_EVENTS`, filters by conversationId, maintains streamingBlocks as AssistantMessageBlock[]
-- [x] Rewrite `src/renderer/src/stores/ui/agent.ts` — uses `newAgentPresenter.getAgents()`
+- [x] Rewrite `src/renderer/src/stores/ui/session.ts` — uses `agentSessionPresenter`, listens to `SESSION_EVENTS`, uses `webContentsId` for activation
+- [x] Create `src/renderer/src/stores/ui/message.ts` — uses `agentSessionPresenter`, listens to `STREAM_EVENTS`, filters by conversationId, maintains streamingBlocks as AssistantMessageBlock[]
+- [x] Rewrite `src/renderer/src/stores/ui/agent.ts` — uses `agentSessionPresenter.getAgents()`
 - [x] Rewrite `src/renderer/src/stores/ui/project.ts` — uses `projectPresenter`
 - [x] Create `src/renderer/src/stores/ui/draft.ts` — pre-session config, toCreateInput()
 
@@ -68,8 +68,8 @@
 - [x] `pnpm run lint` — passes (0 warnings, 0 errors)
 - [x] `pnpm run format` — passes
 - [x] Unit tests: all new modules passing
-- [x] Integration test: createSession end-to-end — new_sessions row + deepchat_sessions row + deepchat_messages rows (valid JSON content) + events with conversationId (`test/main/presenter/newAgentPresenter/integration.test.ts`)
-- [x] Integration test: crash recovery — insert pending message, reinit, verify status = error (`test/main/presenter/newAgentPresenter/integration.test.ts`)
+- [x] Integration test: createSession end-to-end — new_sessions row + deepchat_sessions row + deepchat_messages rows (valid JSON content) + events with conversationId (`test/main/presenter/agentSessionPresenter/integration.test.ts`)
+- [x] Integration test: crash recovery — insert pending message, reinit, verify status = error (`test/main/presenter/agentSessionPresenter/integration.test.ts`)
 - [x] Verify old UI regression: old `sessionPresenter` / `chatStore` still functional — zero impact
 - [x] Manual verify: run `pnpm run dev`, create session via NewThreadPage, see streamed response
 
@@ -80,7 +80,7 @@
 - [x] Create `contextBuilder.ts` — context assembly + truncation
 - [x] Modify `processMessage` in `index.ts` — wire context builder
 - [x] Unit tests for context builder (`contextBuilder.test.ts`)
-- [x] Update `deepchatAgentPresenter.test.ts` — mock `getDefaultSystemPrompt`, verify multi-turn messages
+- [x] Update `agentRuntimePresenter.test.ts` — mock `getDefaultSystemPrompt`, verify multi-turn messages
 - [x] Update `integration.test.ts` — verify multi-turn flow end-to-end
 - [x] Quality gate: typecheck, lint, format, tests
 
@@ -108,5 +108,5 @@
 - [x] Create `process.ts` — unified `processStream()` loop, single code path for tools and no-tools
 - [x] Update `index.ts` — replace `handleStream`/`agentLoop` with single `processStream()` call
 - [x] Delete `streamHandler.ts` and `agentLoop.ts`
-- [x] Tests: `throttle.test.ts` (7), `accumulator.test.ts` (14), `echo.test.ts` (5), `dispatch.test.ts` (14), `process.test.ts` (9), updated `deepchatAgentPresenter.test.ts` (19)
+- [x] Tests: `throttle.test.ts` (7), `accumulator.test.ts` (14), `echo.test.ts` (5), `dispatch.test.ts` (14), `process.test.ts` (9), updated `agentRuntimePresenter.test.ts` (19)
 - [x] Quality gate: typecheck, lint, format, 89 tests passing
diff --git a/docs/specs/new-agent/v2-spec.md b/docs/specs/new-agent/v2-spec.md
index 02c9cf93e..fb79edeb2 100644
--- a/docs/specs/new-agent/v2-spec.md
+++ b/docs/specs/new-agent/v2-spec.md
@@ -38,7 +38,7 @@ No new DB tables. Changes to existing types:
 The v2 goals are implemented in the v3 module structure. The original `streamHandler.ts` + `agentLoop.ts` were refactored into five focused modules:
 
 ```
-deepchatAgentPresenter/
+agentRuntimePresenter/
   index.ts           — session lifecycle + single processStream() call
   process.ts         — unified loop: stream → accumulate → echo → dispatch
   accumulator.ts     — accumulate(state, event): pure block mutations
diff --git a/docs/specs/new-agent/v3-spec.md b/docs/specs/new-agent/v3-spec.md
index f44bb005b..0cc94dec3 100644
--- a/docs/specs/new-agent/v3-spec.md
+++ b/docs/specs/new-agent/v3-spec.md
@@ -26,7 +26,7 @@ v3 refactored the stream processing into five focused pieces with clear boundari
 ## Current Structure
 
 ```
-deepchatAgentPresenter/
+agentRuntimePresenter/
   index.ts           — session lifecycle only (init, destroy, getState, cancel, getMessages)
   process.ts         — the loop: stream → accumulate → echo → dispatch
   accumulator.ts     — accumulate(state, event): mutate blocks by event type
diff --git a/docs/specs/new-ui-chat-components/spec.md b/docs/specs/new-ui-chat-components/spec.md
index 79fd0587d..7217a79bc 100644
--- a/docs/specs/new-ui-chat-components/spec.md
+++ b/docs/specs/new-ui-chat-components/spec.md
@@ -4,15 +4,15 @@
 
 Chat components handle message display, input, and status configuration during active sessions. Each component's visual design must match its mock counterpart exactly.
 
-## Archived Reference Files
+## Historical Reference Map
 
-| Component | Archived Mock File |
+| Component | Historical Mock |
 |-----------|-----------|
-| ChatTopBar | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockTopBar.vue` |
-| MessageList | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockMessageList.vue` |
-| InputBox | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputBox.vue` |
-| InputToolbar | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputToolbar.vue` |
-| StatusBar | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockStatusBar.vue` |
+| ChatTopBar | `MockTopBar` |
+| MessageList | `MockMessageList` |
+| InputBox | `MockInputBox` |
+| InputToolbar | `MockInputToolbar` |
+| StatusBar | `MockStatusBar` |
 
 ## File Locations
 
@@ -29,7 +29,7 @@ src/renderer/src/components/chat/
 
 ## 1. ChatTopBar
 
-**Archived mock reference**: `dead-code-batch-2/.../MockTopBar.vue`
+**Historical mock reference**: `MockTopBar` (removed from repo)
 
 **Layout**:
 ```
@@ -57,7 +57,7 @@ interface Props {
 
 ## 2. MessageList
 
-**Archived mock reference**: `dead-code-batch-2/.../MockMessageList.vue`
+**Historical mock reference**: `MockMessageList` (removed from repo)
 
 **Layout**:
 ```
@@ -96,7 +96,7 @@ Note: The existing `useChatStore` already handles message fetching and caching v
 
 ## 3. ChatInputBox
 
-**Archived mock reference**: `dead-code-batch-2/.../MockInputBox.vue`
+**Historical mock reference**: `MockInputBox` (removed from repo)
 
 **Layout**:
 ```
@@ -133,7 +133,7 @@ interface Emits {
 
 ## 4. ChatInputToolbar
 
-**Archived mock reference**: `dead-code-batch-2/.../MockInputToolbar.vue`
+**Historical mock reference**: `MockInputToolbar` (removed from repo)
 
 **Layout**:
 ```
@@ -159,7 +159,7 @@ interface Emits {
 
 ## 5. ChatStatusBar
 
-**Archived mock reference**: `dead-code-batch-2/.../MockStatusBar.vue`
+**Historical mock reference**: `MockStatusBar` (removed from repo)
 
 **Layout**:
 ```
diff --git a/docs/specs/new-ui-implementation/todo.md b/docs/specs/new-ui-implementation/todo.md
index 02e7e6c67..ea6674b93 100644
--- a/docs/specs/new-ui-implementation/todo.md
+++ b/docs/specs/new-ui-implementation/todo.md
@@ -6,20 +6,20 @@ This document tracks the development progress of new UI feature implementation.
 
 **Architecture Design**: [new-ui-implementation-plan.md](../../architecture/new-ui-implementation-plan.md)
 
-## Archived Reference File List
+## Historical Reference Map
 
-| Archived Mock File | Purpose | Target Replacement |
+| Historical Mock | Purpose | Target Replacement |
 |-----------|---------|-------------------|
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockWelcomePage.vue` | Welcome page | `pages/WelcomePage.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/NewThreadMock.vue` | NewThread page | `pages/NewThreadPage.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockChatPage.vue` | Chat page | `pages/ChatPage.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockTopBar.vue` | Top bar | `components/chat/ChatTopBar.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockMessageList.vue` | Message list | `components/chat/MessageList.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputBox.vue` | Input box | `components/chat/ChatInputBox.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockInputToolbar.vue` | Input toolbar | `components/chat/ChatInputToolbar.vue` |
-| `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockStatusBar.vue` | Status bar | `components/chat/ChatStatusBar.vue` |
+| `MockWelcomePage` | Welcome page | `pages/WelcomePage.vue` |
+| `NewThreadMock` | NewThread page | `pages/NewThreadPage.vue` |
+| `MockChatPage` | Chat page | `pages/ChatPage.vue` |
+| `MockTopBar` | Top bar | `components/chat/ChatTopBar.vue` |
+| `MockMessageList` | Message list | `components/chat/MessageList.vue` |
+| `MockInputBox` | Input box | `components/chat/ChatInputBox.vue` |
+| `MockInputToolbar` | Input toolbar | `components/chat/ChatInputToolbar.vue` |
+| `MockStatusBar` | Status bar | `components/chat/ChatStatusBar.vue` |
 | `components/WindowSideBar.vue` | Sidebar | (refactored in place) |
-| `archives/code/dead-code-batch-2/src/renderer/src/composables/useMockViewState.ts` | State management | Replaced by stores |
+| `useMockViewState` | State management | Replaced by stores |
 
 ---
 
@@ -240,15 +240,15 @@ This document tracks the development progress of new UI feature implementation.
 
 ### 5.5 Cleanup
 
-- [x] Archive `components/mock/MockWelcomePage.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockChatPage.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockTopBar.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockMessageList.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockInputBox.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockInputToolbar.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/mock/MockStatusBar.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `components/NewThreadMock.vue` -> `archives/code/dead-code-batch-2/`
-- [x] Archive `composables/useMockViewState.ts` -> `archives/code/dead-code-batch-2/`
+- [x] Remove `components/mock/MockWelcomePage.vue` from the active tree
+- [x] Remove `components/mock/MockChatPage.vue` from the active tree
+- [x] Remove `components/mock/MockTopBar.vue` from the active tree
+- [x] Remove `components/mock/MockMessageList.vue` from the active tree
+- [x] Remove `components/mock/MockInputBox.vue` from the active tree
+- [x] Remove `components/mock/MockInputToolbar.vue` from the active tree
+- [x] Remove `components/mock/MockStatusBar.vue` from the active tree
+- [x] Remove `components/NewThreadMock.vue` from the active tree
+- [x] Remove `composables/useMockViewState.ts` from the active tree
 
 ---
 
diff --git a/docs/specs/new-ui-pages/spec.md b/docs/specs/new-ui-pages/spec.md
index c6f1fcbce..c32903e17 100644
--- a/docs/specs/new-ui-pages/spec.md
+++ b/docs/specs/new-ui-pages/spec.md
@@ -4,13 +4,13 @@
 
 Three page components driven by the Page Router. No fallback to old ChatView — this is a full replacement.
 
-## Archived Reference Files
+## Historical Reference Map
 
-| Page | Archived Mock File |
+| Page | Historical Mock |
 |------|-----------|
-| WelcomePage | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockWelcomePage.vue` |
-| NewThreadPage | `archives/code/dead-code-batch-2/src/renderer/src/components/NewThreadMock.vue` |
-| ChatPage | `archives/code/dead-code-batch-2/src/renderer/src/components/mock/MockChatPage.vue` |
+| WelcomePage | `MockWelcomePage` |
+| NewThreadPage | `NewThreadMock` |
+| ChatPage | `MockChatPage` |
 
 ## File Locations
 
@@ -84,7 +84,7 @@ onMounted(async () => {
 
 ## 2. WelcomePage
 
-**Archived mock reference**: `dead-code-batch-2/.../MockWelcomePage.vue`
+**Historical mock reference**: `MockWelcomePage` (removed from repo)
 
 **Layout**:
 ```
@@ -133,7 +133,7 @@ onMounted(async () => {
 
 ## 3. NewThreadPage
 
-**Archived mock reference**: `dead-code-batch-2/.../NewThreadMock.vue`
+**Historical mock reference**: `NewThreadMock` (removed from repo)
 
 **Layout**:
 ```
@@ -188,7 +188,7 @@ const handleSubmit = (message: string) => {
 
 ## 4. ChatPage
 
-**Archived mock reference**: `dead-code-batch-2/.../MockChatPage.vue`
+**Historical mock reference**: `MockChatPage` (removed from repo)
 
 **Props**:
 ```typescript
diff --git a/docs/specs/remote-process-log/spec.md b/docs/specs/remote-process-log/spec.md
new file mode 100644
index 000000000..73fe4c94f
--- /dev/null
+++ b/docs/specs/remote-process-log/spec.md
@@ -0,0 +1,31 @@
+# Remote Process Log
+
+## Summary
+
+Replace the temporary remote status message with an ordered, persistent remote transcript for Telegram and Feishu. Each normal assistant turn keeps:
+
+- one ordered message sequence derived from assistant blocks
+- persistent process-log segments for tool-call progress
+- answer segments that stay in the same order as the desktop transcript
+
+Process segments survive after the turn completes and are not erased. New answer and process phases may create new remote messages instead of rewriting the earliest message in the turn.
+
+## Acceptance Criteria
+
+- `RemoteConversationSnapshot` exposes `deliverySegments`, ordered exactly as remote delivery should appear.
+- `deliverySegments` contain only `process`, `answer`, and `terminal` segments.
+- Process segments contain one line per completed tool-call argument payload using the format `EMOJI raw_tool_name: "preview"`.
+- Remote trace preview reuses the desktop tool-summary extraction rule: parse JSON when possible, summarize the first meaningful value, flatten to one line, then truncate for remote delivery.
+- Failed tool calls append an extra `❌ raw_tool_name: "error preview"` line inside the same process segment.
+- Consecutive tool calls merge into one process segment until an answer block appears.
+- Consecutive answer blocks merge into one answer segment, even if ignored remote-only block types appear between them.
+- Telegram and Feishu stop depending on separate trace/content tracks for normal turns and instead sync ordered delivery segments by key.
+- New later segments append after earlier ones; completion must not compact all answer text back into the first answer message.
+- Tool-only turns keep only the process segment and do not append the generic no-response fallback when the process log already explains the turn.
+- Timeout or terminal failure text appends as a trailing terminal segment only when existing answer/process segments do not already express that final state.
+
+## Non-Goals
+
+- Showing reasoning content in remote transcripts.
+- Showing tool result bodies, search result bodies, or image payloads in the process log.
+- Adding a user-facing settings toggle for remote transcript mode in this increment.
diff --git a/docs/specs/remote-tool-interactions/plan.md b/docs/specs/remote-tool-interactions/plan.md
index 9c758ec0d..096970dd2 100644
--- a/docs/specs/remote-tool-interactions/plan.md
+++ b/docs/specs/remote-tool-interactions/plan.md
@@ -2,7 +2,7 @@
 
 ## Summary
 
-Implement a structured remote interaction loop for Telegram and Feishu so remote endpoints can resolve paused permission and question interactions without falling back to a generic desktop-only notice. The feature stays inside Electron main and reuses the existing `RemoteConversationRunner`, `RemoteCommandRouter`, `FeishuCommandRouter`, and `newAgentPresenter.respondToolInteraction(...)` flow.
+Implement a structured remote interaction loop for Telegram and Feishu so remote endpoints can resolve paused permission and question interactions without falling back to a generic desktop-only notice. The feature stays inside Electron main and reuses the existing `RemoteConversationRunner`, `RemoteCommandRouter`, `FeishuCommandRouter`, and `agentSessionPresenter.respondToolInteraction(...)` flow.
 
 ## Goals
 
@@ -30,7 +30,7 @@ Implement a structured remote interaction loop for Telegram and Feishu so remote
 ## Dependencies
 
 - `RemoteConversationSnapshot.pendingInteraction` in `RemoteConversationRunner`
-- `newAgentPresenter.respondToolInteraction(...)`
+- `agentSessionPresenter.respondToolInteraction(...)`
 - Existing Telegram outbound edit/send flows in `TelegramPoller`
 - Existing Feishu outbound text flow extended with card sending in `FeishuRuntime`
 - In-memory callback/token state in `RemoteBindingStore`
diff --git a/docs/specs/settings-dashboard/plan.md b/docs/specs/settings-dashboard/plan.md
index 1bc7f2831..09b9113f9 100644
--- a/docs/specs/settings-dashboard/plan.md
+++ b/docs/specs/settings-dashboard/plan.md
@@ -27,7 +27,7 @@
 
 ## Dashboard Query
 
-- Expose `newAgentPresenter.getUsageDashboard()`.
+- Expose `agentSessionPresenter.getUsageDashboard()`.
 - Aggregate summary, 365-day calendar, provider breakdown, and model breakdown from `deepchat_usage_stats`.
 
 ## UI
diff --git a/docs/specs/settings-dashboard/tasks.md b/docs/specs/settings-dashboard/tasks.md
index b88f42874..fd2e3e02f 100644
--- a/docs/specs/settings-dashboard/tasks.md
+++ b/docs/specs/settings-dashboard/tasks.md
@@ -3,6 +3,6 @@
 1. Add shared dashboard types and cached token usage plumbing.
 2. Add `deepchat_usage_stats` table and wire it into `SQLitePresenter`.
 3. Record live usage stats on assistant finalize and error finalize.
-4. Implement one-time historical backfill and dashboard query methods in `NewAgentPresenter`.
+4. Implement one-time historical backfill and dashboard query methods in `AgentSessionPresenter`.
 5. Add settings route, dashboard page, and i18n strings.
 6. Add focused main/renderer tests and run format, i18n, and lint.
diff --git a/docs/specs/subagent-orchestrator/plan.md b/docs/specs/subagent-orchestrator/plan.md
index 439b34356..81986ebbb 100644
--- a/docs/specs/subagent-orchestrator/plan.md
+++ b/docs/specs/subagent-orchestrator/plan.md
@@ -5,9 +5,9 @@
 当前代码已经具备：
 
 1. `new_sessions` + `deepchat_sessions` 的新会话栈
-2. `NewAgentPresenter` 负责 session 生命周期与 renderer IPC
+2. `AgentSessionPresenter` 负责 session 生命周期与 renderer IPC
 3. `ToolPresenter -> AgentToolManager` 的 agent tool 路由
-4. `DeepChatAgentPresenter` 的 tool call / permission / question / resume 流
+4. `AgentRuntimePresenter` 的 tool call / permission / question / resume 流
 5. renderer 的 `MessageBlockToolCall`、`ChatToolInteractionOverlay`、`WorkspacePanel`
 
 缺的部分是：
@@ -41,7 +41,7 @@
 采用 main-only event：
 
 1. `dispatch.flushBlocksToRenderer()` 在 child assistant block 流式刷新时，同时发 main-only event
-2. `DeepChatAgentPresenter.setSessionStatus()` 和 `emitMessageRefresh()` 也发 main-only event
+2. `AgentRuntimePresenter.setSessionStatus()` 和 `emitMessageRefresh()` 也发 main-only event
 3. orchestrator 订阅这些事件，维护自己的内存态 queue
 
 这样避免：
@@ -80,7 +80,7 @@ tool 执行时通过 `IToolPresenter.callTool(..., { onProgress })` 回调：
 
 1. 扩展 `DeepChatAgentConfig`、session record、tool progress、presenter interface
 2. 更新 `new_sessions` schema / migration / table accessors
-3. 扩展 `NewSessionManager` 与 `NewAgentPresenter` 的 create/list/delete API
+3. 扩展 `NewSessionManager` 与 `AgentSessionPresenter` 的 create/list/delete API
 
 ### Phase 2：Tool Runtime
 
@@ -98,7 +98,7 @@ tool 执行时通过 `IToolPresenter.callTool(..., { onProgress })` 回调：
 
 1. 增加 main-only subagent runtime event 常量
 2. `dispatch` 在 child assistant block streaming 时发 event
-3. `DeepChatAgentPresenter` 在 message refresh / session status change 时发 event
+3. `AgentRuntimePresenter` 在 message refresh / session status change 时发 event
 4. `dispatch.executeTools()` 与 `executeDeferredToolCall()` 透传 `onProgress` / `signal`
 
 ### Phase 4：Renderer
@@ -153,7 +153,7 @@ tool 执行时通过 `IToolPresenter.callTool(..., { onProgress })` 回调：
 
 ### 4.4 父删子级联
 
-在 `NewAgentPresenter.deleteSession()` 递归查 child：
+在 `AgentSessionPresenter.deleteSession()` 递归查 child：
 
 1. 父删除时先深度删除所有 child
 2. child 单独删除不反查父
@@ -165,7 +165,7 @@ tool 执行时通过 `IToolPresenter.callTool(..., { onProgress })` 回调：
 
 1. SQLite migration / default columns
 2. `NewSessionManager` 读写新字段
-3. `NewAgentPresenter.getSessionList()` 过滤与级联删除
+3. `AgentSessionPresenter.getSessionList()` 过滤与级联删除
 4. `AgentToolManager` tool gating
 5. `subagent_orchestrator` 的 parallel / chain 执行顺序
 6. progress snapshot 与 preview 裁剪
diff --git a/docs/specs/subagent-orchestrator/spec.md b/docs/specs/subagent-orchestrator/spec.md
index d86aa2e4f..919b7bab3 100644
--- a/docs/specs/subagent-orchestrator/spec.md
+++ b/docs/specs/subagent-orchestrator/spec.md
@@ -133,7 +133,7 @@ V1 目标是把能力收口为单一 agent tool `subagent_orchestrator`，由 to
 
 ### 创建
 
-tool 内部通过 runtime port 调 `NewAgentPresenter` 创建 child session：
+tool 内部通过 runtime port 调 `AgentSessionPresenter` 创建 child session：
 
 1. `self` slot 继承父 `agentId`
 2. `agent` slot 使用 `slot.targetAgentId`
diff --git a/docs/specs/subagent-orchestrator/tasks.md b/docs/specs/subagent-orchestrator/tasks.md
index e6b9e7511..2e07710d0 100644
--- a/docs/specs/subagent-orchestrator/tasks.md
+++ b/docs/specs/subagent-orchestrator/tasks.md
@@ -3,13 +3,13 @@
 ## 1. Shared / Schema
 
 1. 扩展 `DeepChatAgentConfig`、`DeepChatSubagentSlot`、session record、tool progress 类型
-2. 扩展 `INewAgentPresenter` / `IToolPresenter`
+2. 扩展 `IAgentSessionPresenter` / `IToolPresenter`
 3. 为 `new_sessions` 增加 subagent 相关列与迁移测试
 
 ## 2. Main Session Layer
 
 1. 更新 `NewSessionsTable` / `NewSessionManager` create-get-list-update
-2. 更新 `NewAgentPresenter`：
+2. 更新 `AgentSessionPresenter`：
    - create session / detached session 支持 `subagentEnabled`
    - `getSessionList()` 支持 `includeSubagents` / `parentSessionId`
    - `setSessionSubagentEnabled()`
@@ -28,7 +28,7 @@
 
 1. 定义 main-only subagent runtime events
 2. `dispatch` 发 child block update event
-3. `DeepChatAgentPresenter` 发 child status / refresh event
+3. `AgentRuntimePresenter` 发 child status / refresh event
 4. `dispatch.executeTools()` / `executeDeferredToolCall()` 接 `onProgress`
 5. 把 `subagentProgress` / `subagentFinal` 写回 assistant block extra
 
diff --git a/docs/specs/telegram-remote-control/plan.md b/docs/specs/telegram-remote-control/plan.md
index 886ab706c..85c3f30ae 100644
--- a/docs/specs/telegram-remote-control/plan.md
+++ b/docs/specs/telegram-remote-control/plan.md
@@ -4,8 +4,8 @@
 
 - Add `src/main/presenter/remoteControlPresenter/` as a main-process presenter that exposes a small shared contract to the renderer through the existing `presenter:call` IPC path.
 - Keep Telegram transport in Electron main using native `fetch` and Bot API long polling.
-- Reuse `newAgentPresenter.sendMessage()` and `DeepChatAgentPresenter` for message persistence, stream state, title generation, and stop behavior.
-- Add detached session creation to `newAgentPresenter` so remote conversations do not require a renderer-bound window.
+- Reuse `agentSessionPresenter.sendMessage()` and `AgentRuntimePresenter` for message persistence, stream state, title generation, and stop behavior.
+- Add detached session creation to `agentSessionPresenter` so remote conversations do not require a renderer-bound window.
 
 ## Main-Process Modules
 
@@ -21,8 +21,8 @@
   - Creates detached sessions when needed.
   - Resolves a valid enabled DeepChat default agent before creating unbound Telegram sessions.
   - Lists recent sessions by the currently bound session's agent when a valid binding exists; otherwise falls back to the default DeepChat agent.
-  - Exposes current-session lookup and bound-session model switching through `newAgentPresenter.setSessionModel()`.
-  - Reuses `newAgentPresenter.sendMessage()` for plain-text Telegram input.
+  - Exposes current-session lookup and bound-session model switching through `agentSessionPresenter.setSessionModel()`.
+  - Reuses `agentSessionPresenter.sendMessage()` for plain-text Telegram input.
   - Tracks the active assistant message/event for `/stop`.
   - Exposes `statusText`, streamed answer `text`, and `finalText` for remote delivery while preserving compatibility snapshot fields.
 - `remoteCommandRouter`
@@ -80,7 +80,7 @@
 3. Telegram poller receives private updates through `getUpdates`.
 4. Parser normalizes message and callback payloads.
 5. Router applies auth, command handling, and `/model` inline-menu transitions.
-6. Plain text enters `newAgentPresenter.sendMessage()` using the bound or newly created detached session.
+6. Plain text enters `agentSessionPresenter.sendMessage()` using the bound or newly created detached session.
 7. `/model` callback actions edit a single bot menu message in place and answer the callback query.
 8. Poller watches assistant message state, edits a temporary status message as status changes, streams answer text into a separate message, and deletes the status message after final sync.
 9. If the assistant pauses on a permission/question action, Telegram returns a desktop-confirmation notice instead of bypassing approval.
diff --git a/docs/specs/telegram-remote-control/tasks.md b/docs/specs/telegram-remote-control/tasks.md
index a1beaf5cd..e5bcd65fa 100644
--- a/docs/specs/telegram-remote-control/tasks.md
+++ b/docs/specs/telegram-remote-control/tasks.md
@@ -5,7 +5,7 @@
    - Rebuild runtime on settings changes and app init.
 
 2. Detached session support
-   - Add `createDetachedSession()` to `newAgentPresenter`.
+   - Add `createDetachedSession()` to `agentSessionPresenter`.
    - Ensure first remote message still triggers title generation through the shared send path.
 
 3. Remote runtime services
diff --git a/docs/specs/tool-output-guardrails/plan.md b/docs/specs/tool-output-guardrails/plan.md
index 784ab5e35..3cd0e1bd8 100644
--- a/docs/specs/tool-output-guardrails/plan.md
+++ b/docs/specs/tool-output-guardrails/plan.md
@@ -15,7 +15,7 @@
   - downgrades tail items one by one to the fixed failure message
   - cleans up offload files for downgraded items
   - returns terminal fallback if the fully downgraded batch still does not fit
-- Refactor `executeTools()` in `deepchatAgentPresenter/dispatch.ts` into two phases:
+- Refactor `executeTools()` in `agentRuntimePresenter/dispatch.ts` into two phases:
   - execute tools and stage candidate outputs plus side effects
   - fit the staged batch, then commit final tool messages, blocks, hooks, and search persistence once
 - Keep `question` and `permission` pauses on the immediate path; they are not part of staged batch fitting.
diff --git a/package.json b/package.json
index 5412ac6c2..d5b2746df 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "DeepChat",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "DeepChat，一个简单易用的 Agent 客户端",
   "main": "./out/main/index.js",
   "author": "ThinkInAIXYZ",
@@ -21,8 +21,10 @@
     "test:ui": "vitest --ui",
     "format:check": "oxfmt --check .",
     "format": "oxfmt .",
-    "lint": "pnpm run lint:agent-cleanup && oxlint .",
+    "lint": "pnpm run lint:agent-cleanup && pnpm run lint:architecture && oxlint .",
+    "lint:architecture": "node scripts/architecture-guard.mjs",
     "lint:agent-cleanup": "node scripts/agent-cleanup-guard.mjs",
+    "architecture:baseline": "node scripts/generate-architecture-baseline.mjs",
     "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 5a6dcdd23..08a19e447 100644
--- a/scripts/agent-cleanup-guard.mjs
+++ b/scripts/agent-cleanup-guard.mjs
@@ -22,8 +22,8 @@ const LEGACY_MAIN_DIRS = [
 ]
 
 const PRIMARY_MAIN_GUARD_PATHS = [
-  path.join(ROOT, 'src/main/presenter/newAgentPresenter'),
-  path.join(ROOT, 'src/main/presenter/deepchatAgentPresenter'),
+  path.join(ROOT, 'src/main/presenter/agentSessionPresenter'),
+  path.join(ROOT, 'src/main/presenter/agentRuntimePresenter'),
   path.join(ROOT, 'src/main/presenter/skillPresenter'),
   path.join(ROOT, 'src/main/presenter/mcpPresenter/toolManager.ts'),
   path.join(ROOT, 'src/main/presenter/syncPresenter/index.ts')
@@ -52,7 +52,7 @@ const LEGACY_AGENT_RUNTIME_GLOBALS = [
   'skillPresenter',
   'filePermissionService',
   'settingsPermissionService',
-  'newAgentPresenter',
+  'agentSessionPresenter',
   'sessionPresenter',
   'yoBrowserPresenter',
   'filePresenter',
@@ -152,8 +152,8 @@ function buildViolation(kind, filePath, specifier) {
 
 async function findViolations() {
   const scanRoots = [
-    path.join(ROOT, 'src/main/presenter/newAgentPresenter'),
-    path.join(ROOT, 'src/main/presenter/deepchatAgentPresenter'),
+    path.join(ROOT, 'src/main/presenter/agentSessionPresenter'),
+    path.join(ROOT, 'src/main/presenter/agentRuntimePresenter'),
     path.join(ROOT, 'src/main/presenter/skillPresenter'),
     path.join(ROOT, 'src/main/presenter/mcpPresenter/toolManager.ts'),
     path.join(ROOT, 'src/main/presenter/syncPresenter/index.ts'),
diff --git a/scripts/architecture-guard.mjs b/scripts/architecture-guard.mjs
new file mode 100644
index 000000000..5fe127058
--- /dev/null
+++ b/scripts/architecture-guard.mjs
@@ -0,0 +1,152 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import process from 'node:process'
+
+const ROOT = process.cwd()
+const SOURCE_EXTENSIONS = new Set([
+  '.js',
+  '.jsx',
+  '.mjs',
+  '.cjs',
+  '.ts',
+  '.tsx',
+  '.mts',
+  '.cts',
+  '.vue'
+])
+
+const MAIN_GUARD_PATHS = [
+  path.join(ROOT, 'src/main/presenter/agentSessionPresenter'),
+  path.join(ROOT, 'src/main/presenter/agentRuntimePresenter'),
+  path.join(ROOT, 'src/main/lib/agentRuntime')
+]
+
+const RENDERER_IPC_GUARD_PATHS = [
+  path.join(ROOT, 'src/renderer/src/App.vue'),
+  path.join(ROOT, 'src/renderer/src/stores/ui/session.ts'),
+  path.join(ROOT, 'src/renderer/src/stores/ui/message.ts'),
+  path.join(ROOT, 'src/renderer/src/lib/storeInitializer.ts')
+]
+
+function toPosix(value) {
+  return value.split(path.sep).join('/')
+}
+
+function relativePath(filePath) {
+  return toPosix(path.relative(ROOT, filePath))
+}
+
+function isSourceFile(filePath) {
+  return SOURCE_EXTENSIONS.has(path.extname(filePath))
+}
+
+function isUnder(targetPath, parentPath) {
+  const normalizedTarget = path.resolve(targetPath)
+  const normalizedParent = path.resolve(parentPath)
+  return (
+    normalizedTarget === normalizedParent ||
+    normalizedTarget.startsWith(`${normalizedParent}${path.sep}`)
+  )
+}
+
+async function collectFiles(entryPath) {
+  const stats = await fs.stat(entryPath)
+  if (stats.isFile()) {
+    return isSourceFile(entryPath) ? [entryPath] : []
+  }
+
+  const entries = await fs.readdir(entryPath, { withFileTypes: true })
+  const files = []
+  for (const entry of entries) {
+    const nextPath = path.join(entryPath, entry.name)
+    if (entry.isDirectory()) {
+      files.push(...(await collectFiles(nextPath)))
+      continue
+    }
+    if (entry.isFile() && isSourceFile(nextPath)) {
+      files.push(nextPath)
+    }
+  }
+  return files
+}
+
+function extractModuleSpecifiers(source) {
+  const specifiers = new Set()
+  const patterns = [
+    /\bimport\s+(?:type\s+)?[\s\S]*?\bfrom\s*['"]([^'"]+)['"]/g,
+    /\bexport\s+[\s\S]*?\bfrom\s*['"]([^'"]+)['"]/g,
+    /\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g
+  ]
+
+  for (const pattern of patterns) {
+    let match
+    while ((match = pattern.exec(source)) !== null) {
+      specifiers.add(match[1])
+    }
+  }
+
+  return [...specifiers]
+}
+
+async function main() {
+  const scanRoots = [path.join(ROOT, 'src'), path.join(ROOT, 'docs')]
+  const fileSet = new Set()
+
+  for (const root of scanRoots) {
+    for (const file of await collectFiles(root)) {
+      fileSet.add(file)
+    }
+  }
+
+  const violations = []
+
+  for (const filePath of [...fileSet].sort()) {
+    const source = await fs.readFile(filePath, 'utf8')
+    const specifiers = extractModuleSpecifiers(source)
+
+    if (isUnder(filePath, path.join(ROOT, 'src'))) {
+      for (const specifier of specifiers) {
+        if (specifier.includes('archives/code/')) {
+          violations.push(`[archive-import] ${relativePath(filePath)} -> ${specifier}`)
+        }
+      }
+    }
+
+    if (MAIN_GUARD_PATHS.some((guardPath) => isUnder(filePath, guardPath))) {
+      for (const specifier of specifiers) {
+        if (
+          specifier === '@/presenter' ||
+          specifier === '@/presenter/index' ||
+          specifier === '../index' ||
+          specifier === '../../index'
+        ) {
+          violations.push(`[main-global-presenter] ${relativePath(filePath)} -> ${specifier}`)
+        }
+      }
+    }
+
+    if (RENDERER_IPC_GUARD_PATHS.some((guardPath) => isUnder(filePath, guardPath))) {
+      if (source.includes('window.electron.ipcRenderer.on(')) {
+        violations.push(`[renderer-direct-ipc] ${relativePath(filePath)}`)
+      }
+      if (source.includes('window.electron.ipcRenderer.removeAllListeners(')) {
+        violations.push(`[renderer-remove-all-listeners] ${relativePath(filePath)}`)
+      }
+    }
+  }
+
+  if (violations.length > 0) {
+    console.error('Architecture guard failed.')
+    for (const violation of violations) {
+      console.error(`- ${violation}`)
+    }
+    process.exit(1)
+  }
+
+  console.log('Architecture guard passed.')
+}
+
+main().catch((error) => {
+  console.error('Architecture guard failed to run:', error)
+  process.exit(1)
+})
diff --git a/scripts/generate-architecture-baseline.mjs b/scripts/generate-architecture-baseline.mjs
new file mode 100644
index 000000000..e1691eacd
--- /dev/null
+++ b/scripts/generate-architecture-baseline.mjs
@@ -0,0 +1,358 @@
+import fs from 'node:fs/promises'
+import path from 'node:path'
+import process from 'node:process'
+
+const ROOT = process.cwd()
+const REPORT_DIR = path.join(ROOT, 'docs/architecture/baselines')
+const SOURCE_EXTENSIONS = new Set(['.ts', '.tsx', '.js', '.jsx', '.vue', '.d.ts'])
+const EXCLUDED_DIRS = new Set(['node_modules', '.git', 'dist', 'out', 'build'])
+
+const ANALYSIS_TARGETS = [
+  {
+    label: 'main',
+    root: path.join(ROOT, 'src/main')
+  },
+  {
+    label: 'renderer',
+    root: path.join(ROOT, 'src/renderer/src')
+  }
+]
+
+function toPosix(value) {
+  return value.split(path.sep).join('/')
+}
+
+async function ensureDir(dirPath) {
+  await fs.mkdir(dirPath, { recursive: true })
+}
+
+async function walk(dirPath, output = []) {
+  const entries = await fs.readdir(dirPath, { withFileTypes: true })
+
+  for (const entry of entries) {
+    if (EXCLUDED_DIRS.has(entry.name)) {
+      continue
+    }
+
+    const nextPath = path.join(dirPath, entry.name)
+    if (entry.isDirectory()) {
+      await walk(nextPath, output)
+      continue
+    }
+
+    if (entry.isFile() && SOURCE_EXTENSIONS.has(path.extname(entry.name))) {
+      output.push(nextPath)
+    }
+  }
+
+  return output
+}
+
+function extractSpecifiers(source) {
+  const specifiers = new Set()
+  const patterns = [
+    /\bimport\s+(?:type\s+)?[\s\S]*?\bfrom\s*['"]([^'"]+)['"]/g,
+    /\bexport\s+[\s\S]*?\bfrom\s*['"]([^'"]+)['"]/g,
+    /\bimport\s*\(\s*['"]([^'"]+)['"]\s*\)/g
+  ]
+
+  for (const pattern of patterns) {
+    let match
+    while ((match = pattern.exec(source)) !== null) {
+      specifiers.add(match[1])
+    }
+  }
+
+  return [...specifiers]
+}
+
+async function resolveImport(specifier, importer, scopeRoot) {
+  const tryFile = async (basePath) => {
+    const candidates = [
+      basePath,
+      `${basePath}.ts`,
+      `${basePath}.tsx`,
+      `${basePath}.js`,
+      `${basePath}.jsx`,
+      `${basePath}.vue`,
+      `${basePath}.d.ts`,
+      path.join(basePath, 'index.ts'),
+      path.join(basePath, 'index.tsx'),
+      path.join(basePath, 'index.js'),
+      path.join(basePath, 'index.jsx'),
+      path.join(basePath, 'index.vue'),
+      path.join(basePath, 'index.d.ts')
+    ]
+
+    for (const candidate of candidates) {
+      try {
+        const stat = await fs.stat(candidate)
+        if (stat.isFile()) {
+          return candidate
+        }
+      } catch {}
+    }
+
+    return null
+  }
+
+  if (specifier.startsWith('@/')) {
+    return await tryFile(path.join(scopeRoot, specifier.slice(2)))
+  }
+
+  if (specifier.startsWith('@shared/')) {
+    return await tryFile(path.join(ROOT, 'src/shared', specifier.slice('@shared/'.length)))
+  }
+
+  if (specifier.startsWith('.')) {
+    return await tryFile(path.resolve(path.dirname(importer), specifier))
+  }
+
+  return null
+}
+
+async function analyzeScope(label, scopeRoot) {
+  const files = await walk(scopeRoot)
+  const fileSet = new Set(files)
+  const edges = new Map(files.map((file) => [file, new Set()]))
+  const reverseEdges = new Map(files.map((file) => [file, new Set()]))
+
+  for (const file of files) {
+    const source = await fs.readFile(file, 'utf8')
+    for (const specifier of extractSpecifiers(source)) {
+      const resolved = await resolveImport(specifier, file, scopeRoot)
+      if (!resolved || !fileSet.has(resolved)) {
+        continue
+      }
+
+      edges.get(file).add(resolved)
+      reverseEdges.get(resolved).add(file)
+    }
+  }
+
+  const cycles = []
+  const cycleKeys = new Set()
+  const visiting = new Set()
+  const visited = new Set()
+  const stack = []
+
+  function traverse(node) {
+    visiting.add(node)
+    stack.push(node)
+
+    for (const next of edges.get(node)) {
+      if (!visiting.has(next) && !visited.has(next)) {
+        traverse(next)
+        continue
+      }
+
+      if (visiting.has(next)) {
+        const startIndex = stack.indexOf(next)
+        const cycle = stack.slice(startIndex).concat(next)
+        const key = cycle
+          .slice(0, -1)
+          .map((file) => path.relative(scopeRoot, file))
+          .sort()
+          .join('|')
+
+        if (!cycleKeys.has(key)) {
+          cycleKeys.add(key)
+          cycles.push(cycle)
+        }
+      }
+    }
+
+    stack.pop()
+    visiting.delete(node)
+    visited.add(node)
+  }
+
+  for (const file of files) {
+    if (!visited.has(file)) {
+      traverse(file)
+    }
+  }
+
+  const topOutgoing = [...edges.entries()]
+    .map(([file, refs]) => ({
+      file: path.relative(scopeRoot, file),
+      count: refs.size
+    }))
+    .sort((left, right) => right.count - left.count)
+    .slice(0, 15)
+
+  const topIncoming = [...reverseEdges.entries()]
+    .map(([file, refs]) => ({
+      file: path.relative(scopeRoot, file),
+      count: refs.size
+    }))
+    .sort((left, right) => right.count - left.count)
+    .slice(0, 15)
+
+  const zeroInbound = [...reverseEdges.entries()]
+    .filter(([, refs]) => refs.size === 0)
+    .map(([file]) => path.relative(scopeRoot, file))
+    .filter((file) => !/index\.(ts|tsx|js|jsx|vue|d\.ts)$/.test(file))
+    .sort()
+
+  return {
+    label,
+    totalFiles: files.length,
+    totalEdges: [...edges.values()].reduce((sum, refs) => sum + refs.size, 0),
+    cycles: cycles.map((cycle) => cycle.map((file) => path.relative(scopeRoot, file))),
+    topOutgoing,
+    topIncoming,
+    zeroInbound
+  }
+}
+
+async function collectArchiveReferences() {
+  const scanRoots = [path.join(ROOT, 'docs'), path.join(ROOT, 'src')]
+  const references = []
+
+  for (const scanRoot of scanRoots) {
+    const files = await walk(scanRoot)
+    for (const file of files) {
+      const source = await fs.readFile(file, 'utf8')
+      const lines = source.split('\n')
+
+      lines.forEach((line, index) => {
+        if (!line.includes('archives/code/')) {
+          return
+        }
+
+        references.push({
+          file: toPosix(path.relative(ROOT, file)),
+          line: index + 1,
+          text: line.trim()
+        })
+      })
+    }
+  }
+
+  return references.sort((left, right) =>
+    `${left.file}:${left.line}`.localeCompare(`${right.file}:${right.line}`)
+  )
+}
+
+function renderDependencyReport(scopes) {
+  const lines = [
+    '# Dependency Baseline',
+    '',
+    `Generated on ${new Date().toISOString().slice(0, 10)}.`,
+    ''
+  ]
+
+  for (const scope of scopes) {
+    lines.push(`## ${scope.label}`)
+    lines.push('')
+    lines.push(`- Total files: ${scope.totalFiles}`)
+    lines.push(`- Internal dependency edges: ${scope.totalEdges}`)
+    lines.push(`- Cycles detected: ${scope.cycles.length}`)
+    lines.push('')
+    lines.push('### Top outgoing dependencies')
+    lines.push('')
+
+    for (const item of scope.topOutgoing) {
+      lines.push(`- \`${item.file}\`: ${item.count}`)
+    }
+
+    lines.push('')
+    lines.push('### Top incoming dependencies')
+    lines.push('')
+
+    for (const item of scope.topIncoming) {
+      lines.push(`- \`${item.file}\`: ${item.count}`)
+    }
+
+    lines.push('')
+    lines.push('### Cycle samples')
+    lines.push('')
+
+    if (scope.cycles.length === 0) {
+      lines.push('- None')
+    } else {
+      for (const cycle of scope.cycles.slice(0, 20)) {
+        lines.push(`- \`${cycle.join(' -> ')}\``)
+      }
+    }
+
+    lines.push('')
+  }
+
+  return lines.join('\n')
+}
+
+function renderZeroInboundReport(scopes) {
+  const lines = [
+    '# Zero Inbound Candidates',
+    '',
+    `Generated on ${new Date().toISOString().slice(0, 10)}.`,
+    '',
+    'These files have no in-repo importers inside their scope and need manual classification before deletion.',
+    ''
+  ]
+
+  for (const scope of scopes) {
+    lines.push(`## ${scope.label}`)
+    lines.push('')
+    lines.push(`- Candidate count: ${scope.zeroInbound.length}`)
+    lines.push('')
+    for (const file of scope.zeroInbound) {
+      lines.push(`- \`${file}\``)
+    }
+    lines.push('')
+  }
+
+  return lines.join('\n')
+}
+
+function renderArchiveReferenceReport(references) {
+  const lines = [
+    '# Archive Reference Baseline',
+    '',
+    `Generated on ${new Date().toISOString().slice(0, 10)}.`,
+    '',
+    `- Total references: ${references.length}`,
+    ''
+  ]
+
+  for (const reference of references) {
+    lines.push(`- \`${reference.file}:${reference.line}\` ${reference.text}`)
+  }
+
+  return lines.join('\n')
+}
+
+async function main() {
+  await ensureDir(REPORT_DIR)
+  const scopes = []
+
+  for (const target of ANALYSIS_TARGETS) {
+    scopes.push(await analyzeScope(target.label, target.root))
+  }
+
+  const archiveReferences = await collectArchiveReferences()
+
+  await Promise.all([
+    fs.writeFile(
+      path.join(REPORT_DIR, 'dependency-report.md'),
+      `${renderDependencyReport(scopes)}\n`
+    ),
+    fs.writeFile(
+      path.join(REPORT_DIR, 'zero-inbound-candidates.md'),
+      `${renderZeroInboundReport(scopes)}\n`
+    ),
+    fs.writeFile(
+      path.join(REPORT_DIR, 'archive-reference-report.md'),
+      `${renderArchiveReferenceReport(archiveReferences)}\n`
+    )
+  ])
+
+  console.log('Architecture baseline reports updated in docs/architecture/baselines.')
+}
+
+main().catch((error) => {
+  console.error('Failed to generate architecture baseline reports:', error)
+  process.exit(1)
+})
diff --git a/src/main/lib/agentRuntime/systemEnvPromptBuilder.ts b/src/main/lib/agentRuntime/systemEnvPromptBuilder.ts
index 1579b1196..5dfa52787 100644
--- a/src/main/lib/agentRuntime/systemEnvPromptBuilder.ts
+++ b/src/main/lib/agentRuntime/systemEnvPromptBuilder.ts
@@ -1,7 +1,7 @@
 import * as fs from 'node:fs'
 import path from 'node:path'
-import { presenter } from '@/presenter'
 import logger from '@shared/logger'
+import type { ConfigQueryPort } from '@/presenter/runtimePorts'
 
 export interface BuildSystemEnvPromptOptions {
   providerId?: string
@@ -10,6 +10,7 @@ export interface BuildSystemEnvPromptOptions {
   platform?: NodeJS.Platform
   now?: Date
   agentsFilePath?: string
+  modelLookup?: Pick<ConfigQueryPort, 'getProviderModels' | 'getCustomModels'>
 }
 
 export interface RuntimeCapabilitiesPromptOptions {
@@ -18,15 +19,19 @@ export interface RuntimeCapabilitiesPromptOptions {
   hasProcess?: boolean
 }
 
-function resolveModelDisplayName(providerId: string, modelId: string): string | undefined {
+function resolveModelDisplayName(
+  providerId: string,
+  modelId: string,
+  modelLookup?: Pick<ConfigQueryPort, 'getProviderModels' | 'getCustomModels'>
+): string | undefined {
   try {
-    const models = presenter.configPresenter?.getProviderModels?.(providerId) || []
+    const models = modelLookup?.getProviderModels(providerId) || []
     const match = models.find((model) => model.id === modelId)
     if (match?.name) {
       return match.name
     }
 
-    const customModels = presenter.configPresenter?.getCustomModels?.(providerId) || []
+    const customModels = modelLookup?.getCustomModels(providerId) || []
     const customMatch = customModels.find((model) => model.id === modelId)
     if (customMatch?.name) {
       return customMatch.name
@@ -43,14 +48,15 @@ function resolveModelDisplayName(providerId: string, modelId: string): string |
 
 function resolveModelIdentity(
   providerId?: string,
-  modelId?: string
+  modelId?: string,
+  modelLookup?: Pick<ConfigQueryPort, 'getProviderModels' | 'getCustomModels'>
 ): {
   modelName: string
   exactModelId: string
 } {
   const trimmedProviderId = providerId?.trim() || 'unknown-provider'
   const trimmedModelId = modelId?.trim() || 'unknown-model'
-  const displayName = resolveModelDisplayName(trimmedProviderId, trimmedModelId)
+  const displayName = resolveModelDisplayName(trimmedProviderId, trimmedModelId, modelLookup)
 
   return {
     modelName: displayName || trimmedModelId,
@@ -133,7 +139,11 @@ export async function buildSystemEnvPrompt(
     ? path.resolve(options.agentsFilePath)
     : path.join(workdir, 'AGENTS.md')
   const agentsContent = await readAgentsInstructions(agentsFilePath)
-  const { modelName, exactModelId } = resolveModelIdentity(options.providerId, options.modelId)
+  const { modelName, exactModelId } = resolveModelIdentity(
+    options.providerId,
+    options.modelId,
+    options.modelLookup
+  )
 
   const promptLines = [
     `You are powered by the model named ${modelName}.`,
diff --git a/src/main/presenter/agentRepository/index.ts b/src/main/presenter/agentRepository/index.ts
index effaf9592..e9de0ad2a 100644
--- a/src/main/presenter/agentRepository/index.ts
+++ b/src/main/presenter/agentRepository/index.ts
@@ -384,6 +384,24 @@ export class AgentRepository {
     return true
   }
 
+  clearRegistryAcpAgentInstallation(agentId: string, installState: AcpAgentInstallState): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp' || row.source !== 'registry') {
+      return false
+    }
+
+    const state = parseJson<StoredAgentState>(row.state_json) ?? {}
+    this.sqlitePresenter.agentsTable.update(agentId, {
+      enabled: false,
+      stateJson: stringifyJson({
+        ...state,
+        installState
+      } satisfies StoredAgentState)
+    })
+
+    return true
+  }
+
   toAcpAgentConfig(
     agentId: string,
     preview?: Pick<AcpAgentConfig, 'command' | 'args'>
diff --git a/src/main/presenter/deepchatAgentPresenter/accumulator.ts b/src/main/presenter/agentRuntimePresenter/accumulator.ts
similarity index 98%
rename from src/main/presenter/deepchatAgentPresenter/accumulator.ts
rename to src/main/presenter/agentRuntimePresenter/accumulator.ts
index c5b2cddda..b91905170 100644
--- a/src/main/presenter/deepchatAgentPresenter/accumulator.ts
+++ b/src/main/presenter/agentRuntimePresenter/accumulator.ts
@@ -168,6 +168,7 @@ export function accumulate(state: StreamState, event: LLMCoreStreamEvent): void
       state.metadata.outputTokens = event.usage.completion_tokens
       state.metadata.totalTokens = event.usage.total_tokens
       state.metadata.cachedInputTokens = event.usage.cached_tokens
+      state.metadata.cacheWriteInputTokens = event.usage.cache_write_tokens
       break
     }
     case 'stop': {
diff --git a/src/main/presenter/deepchatAgentPresenter/compactionService.ts b/src/main/presenter/agentRuntimePresenter/compactionService.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/compactionService.ts
rename to src/main/presenter/agentRuntimePresenter/compactionService.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/contextBuilder.ts b/src/main/presenter/agentRuntimePresenter/contextBuilder.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/contextBuilder.ts
rename to src/main/presenter/agentRuntimePresenter/contextBuilder.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/dispatch.ts b/src/main/presenter/agentRuntimePresenter/dispatch.ts
similarity index 95%
rename from src/main/presenter/deepchatAgentPresenter/dispatch.ts
rename to src/main/presenter/agentRuntimePresenter/dispatch.ts
index 7e893058c..1c3dc95a9 100644
--- a/src/main/presenter/deepchatAgentPresenter/dispatch.ts
+++ b/src/main/presenter/agentRuntimePresenter/dispatch.ts
@@ -1,6 +1,5 @@
 import { eventBus, SendTarget } from '@/eventbus'
 import { STREAM_EVENTS } from '@/events'
-import { presenter } from '@/presenter'
 import type {
   MCPToolCall,
   MCPContentItem,
@@ -399,41 +398,12 @@ function normalizePermissionRequest(
 }
 
 async function autoGrantPermission(
-  conversationId: string,
+  hooks: ProcessHooks | undefined,
+  _conversationId: string,
   permission: NonNullable<PendingToolInteraction['permission']>
 ): Promise<void> {
-  const type = permission.permissionType
-  const serverName = permission.serverName || ''
-  const toolName = permission.toolName || ''
-
-  if (type === 'command') {
-    const command = permission.command || permission.commandInfo?.command || ''
-    const signature =
-      permission.commandSignature ||
-      permission.commandInfo?.signature ||
-      (command ? presenter.commandPermissionService.extractCommandSignature(command) : '')
-    if (signature) {
-      presenter.commandPermissionService.approve(conversationId, signature, false)
-    }
-    return
-  }
-
-  if (
-    serverName === 'agent-filesystem' &&
-    Array.isArray(permission.paths) &&
-    permission.paths.length
-  ) {
-    presenter.filePermissionService?.approve(conversationId, permission.paths, false)
-    return
-  }
-
-  if (serverName === 'deepchat-settings' && toolName) {
-    presenter.settingsPermissionService?.approve(conversationId, toolName, false)
-    return
-  }
-
-  if (serverName && (type === 'read' || type === 'write' || type === 'all')) {
-    await presenter.mcpPresenter.grantPermission(serverName, type, false, conversationId)
+  if (hooks?.autoGrantPermission) {
+    await hooks.autoGrantPermission(permission)
   }
 }
 
@@ -698,7 +668,7 @@ export async function executeTools(
 
       if (preCheckedPermission) {
         if (permissionMode === 'full_access') {
-          await autoGrantPermission(io.sessionId, preCheckedPermission)
+          await autoGrantPermission(hooks, io.sessionId, preCheckedPermission)
         } else {
           hooks?.onPermissionRequest?.(preCheckedPermission, {
             callId: tc.id,
@@ -756,7 +726,7 @@ export async function executeTools(
 
         if (pendingPermission) {
           if (permissionMode === 'full_access') {
-            await autoGrantPermission(io.sessionId, pendingPermission)
+            await autoGrantPermission(hooks, io.sessionId, pendingPermission)
             const retryCallResult = await toolPresenter.callTool(toolCall, {
               onProgress: applyProgressUpdate,
               signal: io.abortSignal
diff --git a/src/main/presenter/deepchatAgentPresenter/echo.ts b/src/main/presenter/agentRuntimePresenter/echo.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/echo.ts
rename to src/main/presenter/agentRuntimePresenter/echo.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/index.ts b/src/main/presenter/agentRuntimePresenter/index.ts
similarity index 96%
rename from src/main/presenter/deepchatAgentPresenter/index.ts
rename to src/main/presenter/agentRuntimePresenter/index.ts
index 54c69daac..969c63518 100644
--- a/src/main/presenter/deepchatAgentPresenter/index.ts
+++ b/src/main/presenter/agentRuntimePresenter/index.ts
@@ -4,8 +4,10 @@ import type {
   DeepChatSessionState,
   IAgentImplementation,
   MessageFile,
+  PendingInputEnqueueSource,
   PendingSessionInputRecord,
   PermissionMode,
+  QueuePendingInputOptions,
   SendMessageInput,
   SessionCompactionState,
   SessionGenerationSettings,
@@ -18,6 +20,7 @@ import type { ChatMessage } from '@shared/types/core/chat-message'
 import type {
   IConfigPresenter,
   ILlmProviderPresenter,
+  ISkillPresenter,
   ModelConfig,
   RateLimitQueueSnapshot
 } from '@shared/presenter'
@@ -38,7 +41,6 @@ import {
   buildRuntimeCapabilitiesPrompt,
   buildSystemEnvPrompt
 } from '@/lib/agentRuntime/systemEnvPromptBuilder'
-import { presenter } from '@/presenter'
 import {
   buildContext,
   buildResumeContext,
@@ -58,6 +60,7 @@ import type { ProviderRequestTracePayload } from '../llmProviderPresenter/reques
 import type { NewSessionHooksBridge } from '../hooksNotifications/newSessionBridge'
 import { providerDbLoader } from '../configPresenter/providerDbLoader'
 import { resolveSessionVisionTarget } from '../vision/sessionVisionResolver'
+import type { ConfigQueryPort, SessionRuntimePort } from '../runtimePorts'
 import {
   buildAssistantPreviewMarkdown,
   buildAssistantResponseMarkdown,
@@ -131,7 +134,7 @@ const createAbortError = (): Error => {
   return error
 }
 
-export class DeepChatAgentPresenter implements IAgentImplementation {
+export class AgentRuntimePresenter implements IAgentImplementation {
   private readonly llmProviderPresenter: ILlmProviderPresenter
   private readonly configPresenter: IConfigPresenter
   private readonly sqlitePresenter: SQLitePresenter
@@ -155,6 +158,12 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
   private readonly compactionService: CompactionService
   private readonly toolOutputGuard: ToolOutputGuard
   private readonly hooksBridge?: NewSessionHooksBridge
+  private readonly configQueryPort: Pick<ConfigQueryPort, 'getProviderModels' | 'getCustomModels'>
+  private readonly sessionRuntimePort?: SessionRuntimePort
+  private readonly skillPresenter?: Pick<
+    ISkillPresenter,
+    'getMetadataList' | 'getActiveSkills' | 'loadSkillContent'
+  >
   private nextRunSequence = 0
 
   constructor(
@@ -162,7 +171,15 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     configPresenter: IConfigPresenter,
     sqlitePresenter: SQLitePresenter,
     toolPresenter?: IToolPresenter,
-    hooksBridge?: NewSessionHooksBridge
+    hooksBridge?: NewSessionHooksBridge,
+    runtimePorts?: {
+      configQueryPort?: Pick<ConfigQueryPort, 'getProviderModels' | 'getCustomModels'>
+      sessionRuntimePort?: SessionRuntimePort
+      skillPresenter?: Pick<
+        ISkillPresenter,
+        'getMetadataList' | 'getActiveSkills' | 'loadSkillContent'
+      >
+    }
   ) {
     this.llmProviderPresenter = llmProviderPresenter
     this.configPresenter = configPresenter
@@ -179,11 +196,21 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       this.configPresenter,
       async (sessionId) => {
         const agentId = this.getSessionAgentId(sessionId) ?? 'deepchat'
+        if (typeof this.configPresenter.resolveDeepChatAgentConfig !== 'function') {
+          return {}
+        }
+
         return await this.configPresenter.resolveDeepChatAgentConfig(agentId)
       }
     )
     this.toolOutputGuard = new ToolOutputGuard()
     this.hooksBridge = hooksBridge
+    this.configQueryPort = runtimePorts?.configQueryPort ?? {
+      getProviderModels: (providerId) => this.configPresenter.getProviderModels?.(providerId) ?? [],
+      getCustomModels: (providerId) => this.configPresenter.getCustomModels?.(providerId) ?? []
+    }
+    this.sessionRuntimePort = runtimePorts?.sessionRuntimePort
+    this.skillPresenter = runtimePorts?.skillPresenter
 
     const recovered = this.messageStore.recoverPendingMessages()
     if (recovered > 0) {
@@ -297,7 +324,8 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
 
   async queuePendingInput(
     sessionId: string,
-    content: string | SendMessageInput
+    content: string | SendMessageInput,
+    options?: QueuePendingInputOptions
   ): Promise<PendingSessionInputRecord> {
     const state = await this.getSessionState(sessionId)
     if (!state) {
@@ -305,7 +333,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     }
 
     const shouldClaimImmediately =
-      this.isAwaitingToolQuestionFollowUp(sessionId) ||
+      ((options?.source ?? 'send') === 'send' && this.isAwaitingToolQuestionFollowUp(sessionId)) ||
       this.shouldStartQueuedInputImmediately(sessionId, state.status)
     const record = this.pendingInputCoordinator.queuePendingInput(sessionId, content, {
       state: shouldClaimImmediately ? 'claimed' : 'pending'
@@ -314,7 +342,8 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     if (record.state === 'claimed') {
       void this.processMessage(sessionId, record.payload, {
         projectDir: this.resolveProjectDir(sessionId),
-        pendingQueueItemId: record.id
+        pendingQueueItemId: record.id,
+        pendingQueueItemSource: options?.source ?? 'send'
       })
       return record
     }
@@ -373,6 +402,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       projectDir?: string | null
       emitRefreshBeforeStream?: boolean
       pendingQueueItemId?: string
+      pendingQueueItemSource?: PendingInputEnqueueSource
     }
   ): Promise<void> {
     const state = this.runtimeState.get(sessionId)
@@ -503,7 +533,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       assistantMessageId = this.messageStore.createAssistantMessage(sessionId, assistantOrderSeq)
       this.throwIfAbortRequested(preStreamAbortSignal)
 
-      if (context?.pendingQueueItemId) {
+      if (context?.pendingQueueItemId && context.pendingQueueItemSource !== 'queue') {
         this.pendingInputCoordinator.consumeQueuedInput(sessionId, context.pendingQueueItemId)
         consumedPendingQueueItem = true
       }
@@ -521,6 +551,20 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         tools,
         interleavedReasoning
       })
+      if (context?.pendingQueueItemId && !consumedPendingQueueItem) {
+        if (context.pendingQueueItemSource === 'queue') {
+          if (result.status === 'completed' || result.status === 'paused') {
+            this.pendingInputCoordinator.consumeQueuedInput(sessionId, context.pendingQueueItemId)
+            consumedPendingQueueItem = true
+          } else {
+            this.rollbackClaimedQueueInputTurn(sessionId, context.pendingQueueItemId, userMessageId)
+            consumedPendingQueueItem = true
+          }
+        } else {
+          this.pendingInputCoordinator.consumeQueuedInput(sessionId, context.pendingQueueItemId)
+          consumedPendingQueueItem = true
+        }
+      }
       try {
         this.applyProcessResultStatus(sessionId, result, runId)
       } finally {
@@ -533,10 +577,15 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       console.error('[DeepChatAgent] processMessage error:', err)
       if (context?.pendingQueueItemId && !consumedPendingQueueItem) {
         try {
-          this.pendingInputCoordinator.releaseClaimedQueueInput(
-            sessionId,
-            context.pendingQueueItemId
-          )
+          if (context.pendingQueueItemSource === 'queue') {
+            this.rollbackClaimedQueueInputTurn(sessionId, context.pendingQueueItemId, userMessageId)
+          } else {
+            this.pendingInputCoordinator.releaseClaimedQueueInput(
+              sessionId,
+              context.pendingQueueItemId
+            )
+          }
+          consumedPendingQueueItem = true
         } catch (releaseError) {
           console.warn('[DeepChatAgent] failed to release claimed queue input:', releaseError)
         }
@@ -1405,7 +1454,8 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       maxTokens: generationSettings.maxTokens,
       thinkingBudget: generationSettings.thinkingBudget,
       reasoningEffort: generationSettings.reasoningEffort,
-      verbosity: generationSettings.verbosity
+      verbosity: generationSettings.verbosity,
+      conversationId: sessionId
     }
 
     const traceEnabled = this.configPresenter.getSetting<boolean>('traceDebugEnabled') === true
@@ -1594,6 +1644,9 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
               }
             })
           },
+          autoGrantPermission: async (permission) => {
+            await this.sessionRuntimePort?.approvePermission(sessionId, permission)
+          },
           normalizeToolResult: async (tool) =>
             await this.normalizeToolResultContent({
               sessionId: tool.sessionId,
@@ -1729,6 +1782,19 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     return (reason === 'enqueue' || reason === 'resume') && status === 'error'
   }
 
+  private rollbackClaimedQueueInputTurn(
+    sessionId: string,
+    pendingQueueItemId: string,
+    userMessageId: string | null
+  ): void {
+    const userMessage = userMessageId ? this.messageStore.getMessage(userMessageId) : null
+    if (userMessage) {
+      this.invalidateSummaryIfNeeded(sessionId, userMessage.orderSeq)
+      this.messageStore.deleteFromOrderSeq(sessionId, userMessage.orderSeq)
+    }
+    this.pendingInputCoordinator.releaseClaimedQueueInput(sessionId, pendingQueueItemId)
+  }
+
   private registerActiveGeneration(
     sessionId: string,
     messageId: string,
@@ -1997,7 +2063,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     const dayKey = this.buildLocalDayKey(now)
 
     const skillsEnabled = this.configPresenter.getSkillsEnabled()
-    const skillPresenter = presenter?.skillPresenter
+    const skillPresenter = this.skillPresenter
     const availableSkillNames: string[] = []
     const activeSkillNames: string[] = []
 
@@ -2101,7 +2167,8 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         providerId,
         modelId,
         workdir,
-        now
+        now,
+        modelLookup: this.configQueryPort
       })
     } catch (error) {
       console.warn(`[DeepChatAgent] Failed to build env prompt for session ${sessionId}:`, error)
@@ -3056,23 +3123,34 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
 
     if (permissionType === 'command') {
       const command = payload.command || payload.commandInfo?.command || ''
-      const signature =
-        payload.commandSignature ||
-        payload.commandInfo?.signature ||
-        (command ? presenter.commandPermissionService.extractCommandSignature(command) : '')
+      const signature = payload.commandSignature || payload.commandInfo?.signature || command
       if (signature) {
-        presenter.commandPermissionService.approve(sessionId, signature, false)
+        await this.sessionRuntimePort?.approvePermission(sessionId, {
+          permissionType: 'command',
+          command,
+          commandSignature: signature,
+          commandInfo: payload.commandInfo
+        })
       }
       return
     }
 
     if (serverName === 'agent-filesystem' && Array.isArray(payload.paths) && payload.paths.length) {
-      presenter.filePermissionService?.approve(sessionId, payload.paths, false)
+      await this.sessionRuntimePort?.approvePermission(sessionId, {
+        permissionType: 'write',
+        serverName,
+        toolName,
+        paths: payload.paths
+      })
       return
     }
 
     if (serverName === 'deepchat-settings' && toolName) {
-      presenter.settingsPermissionService?.approve(sessionId, toolName, false)
+      await this.sessionRuntimePort?.approvePermission(sessionId, {
+        permissionType: 'write',
+        serverName,
+        toolName
+      })
       return
     }
 
@@ -3080,7 +3158,11 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       serverName &&
       (permissionType === 'read' || permissionType === 'write' || permissionType === 'all')
     ) {
-      await presenter.mcpPresenter.grantPermission(serverName, permissionType, false, sessionId)
+      await this.sessionRuntimePort?.approvePermission(sessionId, {
+        permissionType,
+        serverName,
+        toolName
+      })
     }
   }
 
@@ -3719,11 +3801,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       status
     })
 
-    try {
-      void presenter.floatingButtonPresenter.refreshWidgetState()
-    } catch (error) {
-      console.warn('[DeepChatAgent] Failed to refresh floating widget state:', error)
-    }
+    this.sessionRuntimePort?.refreshSessionUi()
   }
 
   private emitMessageRefresh(sessionId: string, messageId: string): void {
diff --git a/src/main/presenter/deepchatAgentPresenter/internalSessionEvents.ts b/src/main/presenter/agentRuntimePresenter/internalSessionEvents.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/internalSessionEvents.ts
rename to src/main/presenter/agentRuntimePresenter/internalSessionEvents.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/messageStore.ts b/src/main/presenter/agentRuntimePresenter/messageStore.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/messageStore.ts
rename to src/main/presenter/agentRuntimePresenter/messageStore.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/messageTracePayload.ts b/src/main/presenter/agentRuntimePresenter/messageTracePayload.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/messageTracePayload.ts
rename to src/main/presenter/agentRuntimePresenter/messageTracePayload.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/pendingInputCoordinator.ts b/src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/pendingInputCoordinator.ts
rename to src/main/presenter/agentRuntimePresenter/pendingInputCoordinator.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/pendingInputStore.ts b/src/main/presenter/agentRuntimePresenter/pendingInputStore.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/pendingInputStore.ts
rename to src/main/presenter/agentRuntimePresenter/pendingInputStore.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/process.ts b/src/main/presenter/agentRuntimePresenter/process.ts
similarity index 98%
rename from src/main/presenter/deepchatAgentPresenter/process.ts
rename to src/main/presenter/agentRuntimePresenter/process.ts
index 6b341fabd..c075da570 100644
--- a/src/main/presenter/deepchatAgentPresenter/process.ts
+++ b/src/main/presenter/agentRuntimePresenter/process.ts
@@ -308,5 +308,8 @@ function buildUsageSnapshot(state: StreamState): Record<string, number> {
   if (typeof state.metadata.cachedInputTokens === 'number') {
     usage.cachedInputTokens = state.metadata.cachedInputTokens
   }
+  if (typeof state.metadata.cacheWriteInputTokens === 'number') {
+    usage.cacheWriteInputTokens = state.metadata.cacheWriteInputTokens
+  }
   return usage
 }
diff --git a/src/main/presenter/deepchatAgentPresenter/sessionStore.ts b/src/main/presenter/agentRuntimePresenter/sessionStore.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/sessionStore.ts
rename to src/main/presenter/agentRuntimePresenter/sessionStore.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/toolOutputGuard.ts b/src/main/presenter/agentRuntimePresenter/toolOutputGuard.ts
similarity index 100%
rename from src/main/presenter/deepchatAgentPresenter/toolOutputGuard.ts
rename to src/main/presenter/agentRuntimePresenter/toolOutputGuard.ts
diff --git a/src/main/presenter/deepchatAgentPresenter/types.ts b/src/main/presenter/agentRuntimePresenter/types.ts
similarity index 97%
rename from src/main/presenter/deepchatAgentPresenter/types.ts
rename to src/main/presenter/agentRuntimePresenter/types.ts
index df53d0936..84263e9d3 100644
--- a/src/main/presenter/deepchatAgentPresenter/types.ts
+++ b/src/main/presenter/agentRuntimePresenter/types.ts
@@ -76,6 +76,9 @@ export interface ProcessHooks {
     reasoningContentLength: number
     toolCallCount: number
   }) => void
+  autoGrantPermission?: (
+    permission: NonNullable<PendingToolInteraction['permission']>
+  ) => Promise<void>
   normalizeToolResult?: (tool: {
     sessionId: string
     toolCallId: string
diff --git a/src/main/presenter/newAgentPresenter/agentRegistry.ts b/src/main/presenter/agentSessionPresenter/agentRegistry.ts
similarity index 100%
rename from src/main/presenter/newAgentPresenter/agentRegistry.ts
rename to src/main/presenter/agentSessionPresenter/agentRegistry.ts
diff --git a/src/main/presenter/newAgentPresenter/index.ts b/src/main/presenter/agentSessionPresenter/index.ts
similarity index 94%
rename from src/main/presenter/newAgentPresenter/index.ts
rename to src/main/presenter/agentSessionPresenter/index.ts
index 0b1d776a6..ef662be83 100644
--- a/src/main/presenter/newAgentPresenter/index.ts
+++ b/src/main/presenter/agentSessionPresenter/index.ts
@@ -36,14 +36,13 @@ import type {
   CONVERSATION
 } from '@shared/presenter'
 import type { SQLitePresenter } from '../sqlitePresenter'
-import type { DeepChatAgentPresenter } from '../deepchatAgentPresenter'
+import type { AgentRuntimePresenter } from '../agentRuntimePresenter'
 import { AgentRegistry } from './agentRegistry'
 import { NewSessionManager } from './sessionManager'
 import { NewMessageManager } from './messageManager'
 import { LegacyChatImportService } from './legacyImportService'
 import { eventBus, SendTarget } from '@/eventbus'
 import { SESSION_EVENTS } from '@/events'
-import { presenter } from '@/presenter'
 import {
   buildConversationExportContent,
   generateExportFilename,
@@ -63,6 +62,7 @@ import {
 } from '../usageStats'
 import { rtkRuntimeService } from '@/lib/agentRuntime/rtkRuntimeService'
 import { resolveAcpAgentAlias } from '../configPresenter/acpRegistryConstants'
+import type { SessionRuntimePort } from '../runtimePorts'
 
 type SearchableSessionRow = {
   id: string
@@ -212,7 +212,7 @@ const extractSearchableMessageContent = (rawContent: string): string => {
   return rawContent
 }
 
-export class NewAgentPresenter {
+export class AgentSessionPresenter {
   private agentRegistry: AgentRegistry
   private sessionManager: NewSessionManager
   private messageManager: NewMessageManager
@@ -221,14 +221,16 @@ export class NewAgentPresenter {
   private configPresenter: IConfigPresenter
   private legacyImportService: LegacyChatImportService
   private skillPresenter?: Pick<ISkillPresenter, 'setActiveSkills' | 'clearNewAgentSessionSkills'>
+  private sessionRuntimePort?: SessionRuntimePort
   private usageStatsBackfillPromise: Promise<void> | null = null
 
   constructor(
-    deepchatAgent: DeepChatAgentPresenter,
+    agentRuntimePresenter: AgentRuntimePresenter,
     llmProviderPresenter: ILlmProviderPresenter,
     configPresenter: IConfigPresenter,
     sqlitePresenter: SQLitePresenter,
-    skillPresenter?: Pick<ISkillPresenter, 'setActiveSkills' | 'clearNewAgentSessionSkills'>
+    skillPresenter?: Pick<ISkillPresenter, 'setActiveSkills' | 'clearNewAgentSessionSkills'>,
+    sessionRuntimePort?: SessionRuntimePort
   ) {
     this.sqlitePresenter = sqlitePresenter
     this.llmProviderPresenter = llmProviderPresenter
@@ -238,11 +240,12 @@ export class NewAgentPresenter {
     this.sessionManager = new NewSessionManager(sqlitePresenter)
     this.messageManager = new NewMessageManager(this.agentRegistry)
     this.legacyImportService = new LegacyChatImportService(sqlitePresenter)
+    this.sessionRuntimePort = sessionRuntimePort
 
     // Register the built-in deepchat agent
     this.agentRegistry.register(
       { id: 'deepchat', name: 'DeepChat', type: 'deepchat', enabled: true },
-      deepchatAgent
+      agentRuntimePresenter
     )
   }
 
@@ -250,17 +253,17 @@ export class NewAgentPresenter {
 
   async createSession(input: CreateSessionInput, webContentsId: number): Promise<SessionWithState> {
     const agentId = input.agentId || 'deepchat'
-    console.log(`[NewAgentPresenter] createSession agent=${agentId} webContentsId=${webContentsId}`)
+    console.log(
+      `[AgentSessionPresenter] createSession agent=${agentId} webContentsId=${webContentsId}`
+    )
     const normalizedInput = this.normalizeCreateSessionInput(input)
     const agentType = await this.getAgentType(agentId)
     const deepChatAgentConfig =
-      agentType === 'deepchat'
-        ? await this.configPresenter.resolveDeepChatAgentConfig(agentId)
-        : null
+      agentType === 'deepchat' ? await this.resolveDeepChatAgentConfigCompat(agentId) : null
     const projectDir =
       input.projectDir?.trim() ||
       deepChatAgentConfig?.defaultProjectPath?.trim() ||
-      this.configPresenter.getDefaultProjectPath() ||
+      this.getDefaultProjectPathCompat() ||
       null
     const disabledAgentTools =
       agentType === 'deepchat'
@@ -300,7 +303,7 @@ export class NewAgentPresenter {
       deepChatAgentConfig,
       input.generationSettings
     )
-    console.log(`[NewAgentPresenter] resolved provider=${providerId} model=${modelId}`)
+    console.log(`[AgentSessionPresenter] resolved provider=${providerId} model=${modelId}`)
 
     if (!providerId || !modelId) {
       throw new Error('No provider or model configured. Please set a default model in settings.')
@@ -314,7 +317,7 @@ export class NewAgentPresenter {
       disabledAgentTools,
       subagentEnabled
     })
-    console.log(`[NewAgentPresenter] session created id=${sessionId} title="${title}"`)
+    console.log(`[AgentSessionPresenter] session created id=${sessionId} title="${title}"`)
 
     // Initialize agent-side session
     const initConfig: {
@@ -340,7 +343,7 @@ export class NewAgentPresenter {
       await this.cleanupFailedSessionInitialization(agent, sessionId)
       throw error
     }
-    console.log(`[NewAgentPresenter] agent.initSession done`)
+    console.log(`[AgentSessionPresenter] agent.initSession done`)
 
     // Bind to window and emit activated
     this.sessionManager.bindWindow(webContentsId, sessionId)
@@ -376,14 +379,14 @@ export class NewAgentPresenter {
 
     // Queue the first message (non-blocking) after returning session ID
     if (normalizedInput.text.trim() || (normalizedInput.files?.length ?? 0) > 0) {
-      console.log(`[NewAgentPresenter] firing queuePendingInput (non-blocking)`)
+      console.log(`[AgentSessionPresenter] firing queuePendingInput (non-blocking)`)
       if (agent.queuePendingInput) {
-        agent.queuePendingInput(sessionId, normalizedInput).catch((err) => {
-          console.error('[NewAgentPresenter] queuePendingInput failed:', err)
+        agent.queuePendingInput(sessionId, normalizedInput, { source: 'send' }).catch((err) => {
+          console.error('[AgentSessionPresenter] queuePendingInput failed:', err)
         })
       } else {
         agent.processMessage(sessionId, normalizedInput, { projectDir }).catch((err) => {
-          console.error('[NewAgentPresenter] processMessage failed:', err)
+          console.error('[AgentSessionPresenter] processMessage failed:', err)
         })
       }
     }
@@ -397,13 +400,11 @@ export class NewAgentPresenter {
     const title = input.title?.trim() || 'New Chat'
     const agentType = await this.getAgentType(agentId)
     const deepChatAgentConfig =
-      agentType === 'deepchat'
-        ? await this.configPresenter.resolveDeepChatAgentConfig(agentId)
-        : null
+      agentType === 'deepchat' ? await this.resolveDeepChatAgentConfigCompat(agentId) : null
     const projectDir =
       input.projectDir?.trim() ||
       deepChatAgentConfig?.defaultProjectPath?.trim() ||
-      this.configPresenter.getDefaultProjectPath() ||
+      this.getDefaultProjectPathCompat() ||
       null
     const disabledAgentTools =
       agentType === 'deepchat'
@@ -666,7 +667,7 @@ export class NewAgentPresenter {
       session.projectDir ?? null
     )
     if (agent.queuePendingInput) {
-      await agent.queuePendingInput(sessionId, normalizedInput)
+      await agent.queuePendingInput(sessionId, normalizedInput, { source: 'send' })
       if (!hadMessages && !wasDraft) {
         void this.generateSessionTitle(sessionId, session.title, providerId, state?.modelId ?? '')
       }
@@ -725,7 +726,7 @@ export class NewAgentPresenter {
       currentSession.agentId,
       currentSession.projectDir ?? null
     )
-    return await agent.queuePendingInput(sessionId, normalizedInput)
+    return await agent.queuePendingInput(sessionId, normalizedInput, { source: 'queue' })
   }
 
   async updateQueuedInput(sessionId: string, itemId: string, content: string | SendMessageInput) {
@@ -875,7 +876,7 @@ export class NewAgentPresenter {
         await agent.destroySession(targetSessionId)
       } catch (cleanupError) {
         console.warn(
-          `[NewAgentPresenter] Failed to cleanup forked session runtime ${targetSessionId}:`,
+          `[AgentSessionPresenter] Failed to cleanup forked session runtime ${targetSessionId}:`,
           cleanupError
         )
       }
@@ -1058,7 +1059,7 @@ export class NewAgentPresenter {
           searchId: result.searchId ?? row.search_id ?? undefined
         })
       } catch (error) {
-        console.warn('[NewAgentPresenter] Failed to parse search result row:', error)
+        console.warn('[AgentSessionPresenter] Failed to parse search result row:', error)
       }
     }
 
@@ -1643,18 +1644,16 @@ export class NewAgentPresenter {
       this.sessionManager.update(sessionId, { title: normalized })
       this.emitSessionListUpdated()
     } catch (error) {
-      console.warn(`[NewAgentPresenter] title generation skipped for session=${sessionId}:`, error)
+      console.warn(
+        `[AgentSessionPresenter] title generation skipped for session=${sessionId}:`,
+        error
+      )
     }
   }
 
   private emitSessionListUpdated(): void {
     eventBus.sendToRenderer(SESSION_EVENTS.LIST_UPDATED, SendTarget.ALL_WINDOWS)
-
-    try {
-      void presenter.floatingButtonPresenter.refreshWidgetState()
-    } catch (error) {
-      console.warn('[NewAgentPresenter] Failed to refresh floating widget state:', error)
-    }
+    this.sessionRuntimePort?.refreshSessionUi()
   }
 
   private async waitForSessionIdle(sessionId: string): Promise<boolean> {
@@ -1695,7 +1694,7 @@ export class NewAgentPresenter {
       return await this.buildSessionWithState(record)
     } catch (error) {
       console.warn(
-        `[NewAgentPresenter] Skipping unavailable session id=${record.id} agent=${record.agentId}:`,
+        `[AgentSessionPresenter] Skipping unavailable session id=${record.id} agent=${record.agentId}:`,
         error
       )
       return null
@@ -1725,18 +1724,54 @@ export class NewAgentPresenter {
   }
 
   private async getAgentType(agentId: string): Promise<'deepchat' | 'acp' | null> {
+    if (typeof this.configPresenter.getAgentType !== 'function') {
+      const resolvedAgentId = resolveAcpAgentAlias(agentId)
+      if (resolvedAgentId === 'deepchat') {
+        return 'deepchat'
+      }
+      const fallbackAgent = await this.configPresenter.getAgent?.(resolvedAgentId)
+      if (fallbackAgent?.type === 'acp' || fallbackAgent?.type === 'deepchat') {
+        return fallbackAgent.type
+      }
+
+      const acpAgents = await this.configPresenter.getAcpAgents?.()
+      if (acpAgents?.some((agent) => resolveAcpAgentAlias(agent.id) === resolvedAgentId)) {
+        return 'acp'
+      }
+
+      return null
+    }
+
     return await this.configPresenter.getAgentType(resolveAcpAgentAlias(agentId))
   }
 
+  private async resolveDeepChatAgentConfigCompat(
+    agentId: string
+  ): Promise<Awaited<ReturnType<IConfigPresenter['resolveDeepChatAgentConfig']>> | null> {
+    if (typeof this.configPresenter.resolveDeepChatAgentConfig !== 'function') {
+      return {} as Awaited<ReturnType<IConfigPresenter['resolveDeepChatAgentConfig']>>
+    }
+
+    return await this.configPresenter.resolveDeepChatAgentConfig(agentId)
+  }
+
+  private getDefaultProjectPathCompat(): string | null {
+    if (typeof this.configPresenter.getDefaultProjectPath !== 'function') {
+      return null
+    }
+
+    return this.configPresenter.getDefaultProjectPath() ?? null
+  }
+
   private async resolveAssistantModelSelection(
     agentId: string,
     fallbackProviderId: string,
     fallbackModelId: string
   ): Promise<{ providerId: string; modelId: string }> {
     if ((await this.getAgentType(agentId)) === 'deepchat') {
-      const config = await this.configPresenter.resolveDeepChatAgentConfig(agentId)
-      const providerId = config.assistantModel?.providerId?.trim()
-      const modelId = config.assistantModel?.modelId?.trim()
+      const config = await this.resolveDeepChatAgentConfigCompat(agentId)
+      const providerId = config?.assistantModel?.providerId?.trim()
+      const modelId = config?.assistantModel?.modelId?.trim()
       if (providerId && modelId) {
         return {
           providerId,
@@ -1809,9 +1844,7 @@ export class NewAgentPresenter {
       await this.llmProviderPresenter.clearAcpSession(sessionId)
     }
     await agent.destroySession(sessionId)
-    presenter.commandPermissionService.clearConversation(sessionId)
-    presenter.filePermissionService?.clearConversation(sessionId)
-    presenter.settingsPermissionService?.clearConversation(sessionId)
+    this.sessionRuntimePort?.clearSessionPermissions(sessionId)
     await this.skillPresenter?.clearNewAgentSessionSkills?.(sessionId)
     this.sessionManager.delete(sessionId)
   }
@@ -1854,7 +1887,7 @@ export class NewAgentPresenter {
       return ids.length > 0
     } catch (error) {
       console.warn(
-        `[NewAgentPresenter] Failed to inspect message ids for session=${sessionId}:`,
+        `[AgentSessionPresenter] Failed to inspect message ids for session=${sessionId}:`,
         error
       )
       return true
@@ -1937,7 +1970,7 @@ export class NewAgentPresenter {
         normalizedProjectDir
       )
     } catch (error) {
-      console.warn('[NewAgentPresenter] Failed to sync ACP workdir for session:', {
+      console.warn('[AgentSessionPresenter] Failed to sync ACP workdir for session:', {
         conversationId,
         agentId,
         projectDir: normalizedProjectDir,
@@ -1955,7 +1988,7 @@ export class NewAgentPresenter {
       await agent.destroySession(sessionId)
     } catch (cleanupError) {
       console.warn(
-        `[NewAgentPresenter] Failed to cleanup session runtime after initialization error ${sessionId}:`,
+        `[AgentSessionPresenter] Failed to cleanup session runtime after initialization error ${sessionId}:`,
         cleanupError
       )
     }
@@ -2143,6 +2176,7 @@ export class NewAgentPresenter {
     inputTokens?: number
     outputTokens?: number
     cachedInputTokens?: number
+    cacheWriteInputTokens?: number
     generationTime?: number
     firstTokenTime?: number
     tokensPerSecond?: number
@@ -2158,6 +2192,10 @@ export class NewAgentPresenter {
         outputTokens: typeof parsed.outputTokens === 'number' ? parsed.outputTokens : undefined,
         cachedInputTokens:
           typeof parsed.cachedInputTokens === 'number' ? parsed.cachedInputTokens : undefined,
+        cacheWriteInputTokens:
+          typeof parsed.cacheWriteInputTokens === 'number'
+            ? parsed.cacheWriteInputTokens
+            : undefined,
         generationTime:
           typeof parsed.generationTime === 'number' ? parsed.generationTime : undefined,
         firstTokenTime:
@@ -2208,7 +2246,8 @@ export class NewAgentPresenter {
           modelId,
           metadata: {
             ...metadata,
-            cachedInputTokens: 0
+            cachedInputTokens: metadata.cachedInputTokens ?? 0,
+            cacheWriteInputTokens: metadata.cacheWriteInputTokens ?? 0
           },
           source: 'backfill'
         })
diff --git a/src/main/presenter/newAgentPresenter/legacyImportService.ts b/src/main/presenter/agentSessionPresenter/legacyImportService.ts
similarity index 100%
rename from src/main/presenter/newAgentPresenter/legacyImportService.ts
rename to src/main/presenter/agentSessionPresenter/legacyImportService.ts
diff --git a/src/main/presenter/newAgentPresenter/messageManager.ts b/src/main/presenter/agentSessionPresenter/messageManager.ts
similarity index 100%
rename from src/main/presenter/newAgentPresenter/messageManager.ts
rename to src/main/presenter/agentSessionPresenter/messageManager.ts
diff --git a/src/main/presenter/newAgentPresenter/sessionManager.ts b/src/main/presenter/agentSessionPresenter/sessionManager.ts
similarity index 100%
rename from src/main/presenter/newAgentPresenter/sessionManager.ts
rename to src/main/presenter/agentSessionPresenter/sessionManager.ts
diff --git a/src/main/presenter/configPresenter/acpLaunchSpecService.ts b/src/main/presenter/configPresenter/acpLaunchSpecService.ts
index 4af55781a..bd2980983 100644
--- a/src/main/presenter/configPresenter/acpLaunchSpecService.ts
+++ b/src/main/presenter/configPresenter/acpLaunchSpecService.ts
@@ -52,6 +52,15 @@ const ensureDir = (dir: string): void => {
   }
 }
 
+const isPathWithinRoot = (candidatePath: string, rootPath: string, allowEqual = false): boolean => {
+  const relative = path.relative(rootPath, candidatePath)
+  if (!relative) {
+    return allowEqual
+  }
+
+  return !relative.startsWith('..') && !path.isAbsolute(relative)
+}
+
 const listFilesRecursive = (root: string): string[] => {
   if (!fs.existsSync(root)) {
     return []
@@ -218,6 +227,28 @@ export class AcpLaunchSpecService {
     }
   }
 
+  async uninstallRegistryAgent(
+    agent: AcpRegistryAgent,
+    installState: AcpAgentInstallState | null
+  ): Promise<void> {
+    const selection = this.selectRegistryDistribution(agent)
+    if (selection?.type !== 'binary') {
+      return
+    }
+
+    const candidateDirs = new Set<string>()
+    if (typeof installState?.installDir === 'string' && installState.installDir.trim()) {
+      candidateDirs.add(path.resolve(installState.installDir))
+    }
+    candidateDirs.add(this.getBinaryInstallDir(agent))
+
+    for (const installDir of candidateDirs) {
+      this.removeInstallDir(installDir)
+    }
+
+    this.pruneEmptyAgentInstallRoot(agent.id)
+  }
+
   async resolveRegistryLaunchSpec(
     agent: AcpRegistryAgent,
     installState: AcpAgentInstallState | null
@@ -289,10 +320,7 @@ export class AcpLaunchSpecService {
     const resolvedInstallDir = path.resolve(installDir)
     const resolvedInstallRoot = path.resolve(this.installRoot)
 
-    if (
-      resolvedInstallDir !== resolvedInstallRoot &&
-      !resolvedInstallDir.startsWith(`${resolvedInstallRoot}${path.sep}`)
-    ) {
+    if (!isPathWithinRoot(resolvedInstallDir, resolvedInstallRoot)) {
       throw new Error(`Unsafe ACP install directory for ${agent.id}@${agent.version}`)
     }
 
@@ -310,6 +338,36 @@ export class AcpLaunchSpecService {
     return listFilesRecursive(installDir).find((file) => path.basename(file) === basename) ?? null
   }
 
+  private removeInstallDir(installDir: string): void {
+    const resolvedInstallDir = path.resolve(installDir)
+    const resolvedInstallRoot = path.resolve(this.installRoot)
+
+    if (!isPathWithinRoot(resolvedInstallDir, resolvedInstallRoot)) {
+      throw new Error(`Unsafe ACP install directory for uninstall: ${installDir}`)
+    }
+
+    if (!fs.existsSync(resolvedInstallDir)) {
+      return
+    }
+
+    fs.rmSync(resolvedInstallDir, { recursive: true, force: true })
+  }
+
+  private pruneEmptyAgentInstallRoot(agentId: string): void {
+    const safeAgentId = sanitizeInstallSegment(agentId, 'agent id')
+    const agentRoot = path.resolve(path.join(this.installRoot, safeAgentId))
+    const resolvedInstallRoot = path.resolve(this.installRoot)
+
+    if (!isPathWithinRoot(agentRoot, resolvedInstallRoot) || !fs.existsSync(agentRoot)) {
+      return
+    }
+
+    const remainingEntries = fs.readdirSync(agentRoot)
+    if (remainingEntries.length === 0) {
+      fs.rmSync(agentRoot, { recursive: true, force: true })
+    }
+  }
+
   private getPlatformKey(): string | null {
     const platformMap: Record<string, string> = {
       darwin: 'darwin',
diff --git a/src/main/presenter/configPresenter/index.ts b/src/main/presenter/configPresenter/index.ts
index 22767fa29..5aafd5df5 100644
--- a/src/main/presenter/configPresenter/index.ts
+++ b/src/main/presenter/configPresenter/index.ts
@@ -1635,6 +1635,35 @@ export class ConfigPresenter implements IConfigPresenter {
     }
   }
 
+  async uninstallAcpRegistryAgent(agentId: string): Promise<void> {
+    const resolvedId = resolveAcpAgentAlias(agentId)
+    const registryAgent = this.getRegistryAgentOrThrow(resolvedId)
+    const currentState = this.getAgentRepositoryOrThrow().getAgentInstallState(registryAgent.id)
+
+    await this.acpLaunchSpecService.uninstallRegistryAgent(registryAgent, currentState)
+
+    const uninstalledState: AcpAgentInstallState = {
+      status: 'not_installed',
+      version: registryAgent.version,
+      distributionType:
+        this.acpLaunchSpecService.selectRegistryDistribution(registryAgent)?.type ?? undefined,
+      lastCheckedAt: Date.now(),
+      installedAt: null,
+      installDir: null,
+      error: null
+    }
+
+    const updated = this.getAgentRepositoryOrThrow().clearRegistryAcpAgentInstallation(
+      registryAgent.id,
+      uninstalledState
+    )
+    if (!updated) {
+      throw new Error(`ACP registry agent not found: ${registryAgent.id}`)
+    }
+
+    this.handleAcpAgentsMutated([registryAgent.id])
+  }
+
   async getAcpAgentInstallStatus(agentId: string): Promise<AcpAgentInstallState | null> {
     return this.agentRepository?.getAgentInstallState(resolveAcpAgentAlias(agentId)) ?? null
   }
diff --git a/src/main/presenter/configPresenter/providerDbLoader.ts b/src/main/presenter/configPresenter/providerDbLoader.ts
index 0cc742fcd..fd9c5906f 100644
--- a/src/main/presenter/configPresenter/providerDbLoader.ts
+++ b/src/main/presenter/configPresenter/providerDbLoader.ts
@@ -281,7 +281,7 @@ export class ProviderDbLoader {
       this.writeMeta(meta)
       this.cache = sanitized
       try {
-        const providersCount = Object.keys(sanitized.providers || {}).length
+        const providersCount = Object.keys(this.cache.providers || {}).length
         eventBus.send(PROVIDER_DB_EVENTS.UPDATED, SendTarget.ALL_WINDOWS, {
           providersCount,
           lastUpdated: meta.lastUpdated
diff --git a/src/main/presenter/floatingButtonPresenter/index.ts b/src/main/presenter/floatingButtonPresenter/index.ts
index f22aec505..6676aa5c8 100644
--- a/src/main/presenter/floatingButtonPresenter/index.ts
+++ b/src/main/presenter/floatingButtonPresenter/index.ts
@@ -545,28 +545,28 @@ export class FloatingButtonPresenter {
   }
 
   private async loadDeepChatSessions(): Promise<SessionWithState[]> {
-    const newAgentPresenter = presenter.newAgentPresenter as
+    const agentSessionPresenter = presenter.agentSessionPresenter as
       | {
           getSessionList?: (filters?: { agentId?: string }) => Promise<SessionWithState[]>
         }
       | undefined
 
-    if (!newAgentPresenter?.getSessionList) {
+    if (!agentSessionPresenter?.getSessionList) {
       return []
     }
 
-    return await newAgentPresenter.getSessionList({ agentId: 'deepchat' })
+    return await agentSessionPresenter.getSessionList({ agentId: 'deepchat' })
   }
 
   private async openSession(sessionId: string): Promise<void> {
     try {
-      const newAgentPresenter = presenter.newAgentPresenter as
+      const agentSessionPresenter = presenter.agentSessionPresenter as
         | {
             activateSession?: (webContentsId: number, sessionId: string) => Promise<void>
           }
         | undefined
 
-      if (!newAgentPresenter?.activateSession) {
+      if (!agentSessionPresenter?.activateSession) {
         return
       }
 
@@ -575,7 +575,7 @@ export class FloatingButtonPresenter {
         return
       }
 
-      await newAgentPresenter.activateSession(targetWindow.webContents.id, sessionId)
+      await agentSessionPresenter.activateSession(targetWindow.webContents.id, sessionId)
       presenter.windowPresenter.show(targetWindow.id, true)
       this.setExpanded(false)
     } catch (error) {
diff --git a/src/main/presenter/index.ts b/src/main/presenter/index.ts
index 03da74983..3f1c1f667 100644
--- a/src/main/presenter/index.ts
+++ b/src/main/presenter/index.ts
@@ -27,7 +27,7 @@ import {
   IYoBrowserPresenter,
   ISkillPresenter,
   ISkillSyncPresenter,
-  INewAgentPresenter,
+  IAgentSessionPresenter,
   IProjectPresenter,
   IRemoteControlPresenter
 } from '@shared/presenter'
@@ -64,15 +64,16 @@ import type { SkillSessionStatePort } from './skillPresenter'
 import { SkillSyncPresenter } from './skillSyncPresenter'
 import { HooksNotificationsService } from './hooksNotifications'
 import { NewSessionHooksBridge } from './hooksNotifications/newSessionBridge'
-import { NewAgentPresenter } from './newAgentPresenter'
-import { DeepChatAgentPresenter } from './deepchatAgentPresenter'
+import { AgentSessionPresenter } from './agentSessionPresenter'
+import { AgentRuntimePresenter } from './agentRuntimePresenter'
 import { ProjectPresenter } from './projectPresenter'
 import { RemoteControlPresenter } from './remoteControlPresenter'
 import type { RemoteControlPresenterLike } from './remoteControlPresenter/interface'
 import { AgentRepository } from './agentRepository'
 import type { SQLitePresenter } from './sqlitePresenter'
 import { normalizeDeepChatSubagentSlots } from '@shared/lib/deepchatSubagents'
-import { subscribeDeepChatInternalSessionUpdates } from './deepchatAgentPresenter/internalSessionEvents'
+import { subscribeDeepChatInternalSessionUpdates } from './agentRuntimePresenter/internalSessionEvents'
+import type { ConfigQueryPort, SessionRuntimePort } from './runtimePorts'
 
 // IPC调用上下文接口
 interface IPCCallContext {
@@ -113,7 +114,7 @@ export class Presenter implements IPresenter {
     'toolPresenter',
     'skillPresenter',
     'skillSyncPresenter',
-    'newAgentPresenter',
+    'agentSessionPresenter',
     'projectPresenter'
   ])
 
@@ -165,7 +166,7 @@ export class Presenter implements IPresenter {
   lifecycleManager: ILifecycleManager
   skillPresenter: ISkillPresenter
   skillSyncPresenter: ISkillSyncPresenter
-  newAgentPresenter: INewAgentPresenter
+  agentSessionPresenter: IAgentSessionPresenter
   projectPresenter: IProjectPresenter
   hooksNotifications: HooksNotificationsService
   commandPermissionService: CommandPermissionService
@@ -247,7 +248,7 @@ export class Presenter implements IPresenter {
     const agentToolRuntime: AgentToolRuntimePort = {
       resolveConversationWorkdir: async (conversationId) => {
         try {
-          const session = await this.newAgentPresenter?.getSession(conversationId)
+          const session = await this.agentSessionPresenter?.getSession(conversationId)
           const normalized = session?.projectDir?.trim()
           if (normalized) {
             return normalized
@@ -262,7 +263,7 @@ export class Presenter implements IPresenter {
         return null
       },
       resolveConversationSessionInfo: async (conversationId) => {
-        const session = await this.newAgentPresenter?.getSession(conversationId)
+        const session = await this.agentSessionPresenter?.getSession(conversationId)
         if (!session) {
           return null
         }
@@ -270,16 +271,16 @@ export class Presenter implements IPresenter {
         const agent = await this.configPresenter.getAgent(session.agentId)
         const agentType = await this.configPresenter.getAgentType(session.agentId)
         const permissionMode =
-          typeof this.newAgentPresenter?.getPermissionMode === 'function'
-            ? await this.newAgentPresenter.getPermissionMode(session.id)
+          typeof this.agentSessionPresenter?.getPermissionMode === 'function'
+            ? await this.agentSessionPresenter.getPermissionMode(session.id)
             : 'full_access'
         const generationSettings =
-          typeof this.newAgentPresenter?.getSessionGenerationSettings === 'function'
-            ? await this.newAgentPresenter.getSessionGenerationSettings(session.id)
+          typeof this.agentSessionPresenter?.getSessionGenerationSettings === 'function'
+            ? await this.agentSessionPresenter.getSessionGenerationSettings(session.id)
             : null
         const disabledAgentTools =
-          typeof this.newAgentPresenter?.getSessionDisabledAgentTools === 'function'
-            ? await this.newAgentPresenter.getSessionDisabledAgentTools(session.id)
+          typeof this.agentSessionPresenter?.getSessionDisabledAgentTools === 'function'
+            ? await this.agentSessionPresenter.getSessionDisabledAgentTools(session.id)
             : []
         const activeSkills = await this.skillPresenter.getActiveSkills(session.id)
         const availableSubagentSlots =
@@ -309,12 +310,12 @@ export class Presenter implements IPresenter {
         }
       },
       createSubagentSession: async (input) => {
-        const newAgentPresenter = this.newAgentPresenter as INewAgentPresenter & {
+        const agentSessionPresenter = this.agentSessionPresenter as IAgentSessionPresenter & {
           createSubagentSession?: (createInput: typeof input) => Promise<{
             id: string
           } | null>
         }
-        const created = await newAgentPresenter.createSubagentSession?.(input)
+        const created = await agentSessionPresenter.createSubagentSession?.(input)
         if (!created?.id) {
           return null
         }
@@ -322,10 +323,10 @@ export class Presenter implements IPresenter {
         return await agentToolRuntime.resolveConversationSessionInfo(created.id)
       },
       sendConversationMessage: async (conversationId, content) => {
-        await this.newAgentPresenter.sendMessage(conversationId, content)
+        await this.agentSessionPresenter.sendMessage(conversationId, content)
       },
       cancelConversation: async (conversationId) => {
-        await this.newAgentPresenter.cancelGeneration(conversationId)
+        await this.agentSessionPresenter.cancelGeneration(conversationId)
       },
       subscribeDeepChatSessionUpdates: (listener) =>
         subscribeDeepChatInternalSessionUpdates(listener),
@@ -376,7 +377,7 @@ export class Presenter implements IPresenter {
     const skillSessionStatePort: SkillSessionStatePort = {
       hasNewSession: async (conversationId) => {
         try {
-          return Boolean(await this.newAgentPresenter?.getSession(conversationId))
+          return Boolean(await this.agentSessionPresenter?.getSession(conversationId))
         } catch {
           return false
         }
@@ -392,10 +393,12 @@ export class Presenter implements IPresenter {
         sqlitePresenter.newEnvironmentsTable?.syncForSession(conversationId)
       },
       repairImportedLegacySessionSkills: async (conversationId) => {
-        const newAgentPresenter = this.newAgentPresenter as INewAgentPresenter & {
+        const agentSessionPresenter = this.agentSessionPresenter as IAgentSessionPresenter & {
           repairImportedLegacySessionSkills?: (sessionId: string) => Promise<string[]>
         }
-        return (await newAgentPresenter.repairImportedLegacySessionSkills?.(conversationId)) ?? []
+        return (
+          (await agentSessionPresenter.repairImportedLegacySessionSkills?.(conversationId)) ?? []
+        )
       }
     }
 
@@ -411,21 +414,84 @@ export class Presenter implements IPresenter {
       getMessage: async () => null
     })
     const newSessionHooksBridge = new NewSessionHooksBridge(this.hooksNotifications)
+    const configQueryPort: ConfigQueryPort = {
+      getProviderModels: (providerId) => this.configPresenter.getProviderModels?.(providerId) ?? [],
+      getCustomModels: (providerId) => this.configPresenter.getCustomModels?.(providerId) ?? [],
+      getAgentType: async (agentId) => await this.configPresenter.getAgentType(agentId)
+    }
+    const sessionRuntimePort: SessionRuntimePort = {
+      refreshSessionUi: () => {
+        try {
+          void this.floatingButtonPresenter.refreshWidgetState()
+        } catch (error) {
+          console.warn('[Presenter] Failed to refresh floating widget state:', error)
+        }
+      },
+      clearSessionPermissions: (sessionId) => {
+        this.commandPermissionService.clearConversation(sessionId)
+        this.filePermissionService.clearConversation(sessionId)
+        this.settingsPermissionService.clearConversation(sessionId)
+      },
+      approvePermission: async (sessionId, permission) => {
+        const permissionType = permission.permissionType
+        const serverName = permission.serverName || ''
+        const toolName = permission.toolName || ''
+
+        if (permissionType === 'command') {
+          const command = permission.command || permission.commandInfo?.command || ''
+          const signature =
+            permission.commandSignature ||
+            permission.commandInfo?.signature ||
+            (command ? this.commandPermissionService.extractCommandSignature(command) : '')
+          if (signature) {
+            this.commandPermissionService.approve(sessionId, signature, false)
+          }
+          return
+        }
+
+        if (
+          serverName === 'agent-filesystem' &&
+          Array.isArray(permission.paths) &&
+          permission.paths.length > 0
+        ) {
+          this.filePermissionService.approve(sessionId, permission.paths, false)
+          return
+        }
+
+        if (serverName === 'deepchat-settings' && toolName) {
+          this.settingsPermissionService.approve(sessionId, toolName, false)
+          return
+        }
+
+        if (
+          serverName &&
+          (permissionType === 'read' || permissionType === 'write' || permissionType === 'all')
+        ) {
+          await this.mcpPresenter.grantPermission(serverName, permissionType, false, sessionId)
+        }
+      }
+    }
 
     // Initialize new agent architecture presenters
-    const deepchatAgentPresenter = new DeepChatAgentPresenter(
+    const agentRuntimePresenter = new AgentRuntimePresenter(
       this.llmproviderPresenter as unknown as ILlmProviderPresenter,
       this.configPresenter,
       this.sqlitePresenter as unknown as import('./sqlitePresenter').SQLitePresenter,
       this.toolPresenter,
-      newSessionHooksBridge
+      newSessionHooksBridge,
+      {
+        configQueryPort,
+        sessionRuntimePort,
+        skillPresenter: this.skillPresenter
+      }
     )
-    this.newAgentPresenter = new NewAgentPresenter(
-      deepchatAgentPresenter,
+    this.agentSessionPresenter = new AgentSessionPresenter(
+      agentRuntimePresenter,
       this.llmproviderPresenter as unknown as ILlmProviderPresenter,
       this.configPresenter,
       this.sqlitePresenter as unknown as import('./sqlitePresenter').SQLitePresenter,
-      this.skillPresenter
+      this.skillPresenter,
+      sessionRuntimePort
     )
     this.projectPresenter = new ProjectPresenter(
       this.sqlitePresenter as unknown as import('./sqlitePresenter').SQLitePresenter,
@@ -433,8 +499,8 @@ export class Presenter implements IPresenter {
     )
     this.#remoteControlPresenter = new RemoteControlPresenter({
       configPresenter: this.configPresenter,
-      newAgentPresenter: this.newAgentPresenter,
-      deepchatAgentPresenter,
+      agentSessionPresenter: this.agentSessionPresenter,
+      agentRuntimePresenter,
       windowPresenter: this.windowPresenter,
       tabPresenter: this.tabPresenter,
       getHooksNotificationsConfig: () => this.configPresenter.getHooksNotificationsConfig(),
@@ -444,10 +510,10 @@ export class Presenter implements IPresenter {
     })
     this.#remoteControlBridge = this.#remoteControlPresenter
 
-    // Update hooksNotifications with actual dependencies now that newAgentPresenter is ready
+    // Update hooksNotifications with actual dependencies now that agentSessionPresenter is ready
     this.hooksNotifications = new HooksNotificationsService(this.configPresenter, {
-      getSession: this.newAgentPresenter.getSession.bind(this.newAgentPresenter),
-      getMessage: this.newAgentPresenter.getMessage.bind(this.newAgentPresenter)
+      getSession: this.agentSessionPresenter.getSession.bind(this.agentSessionPresenter),
+      getMessage: this.agentSessionPresenter.getMessage.bind(this.agentSessionPresenter)
     })
 
     this.setupEventBus() // 设置事件总线监听
diff --git a/src/main/presenter/lifecyclePresenter/hooks/after-start/legacyImportHook.ts b/src/main/presenter/lifecyclePresenter/hooks/after-start/legacyImportHook.ts
index 4ceae3b40..b5f695aad 100644
--- a/src/main/presenter/lifecyclePresenter/hooks/after-start/legacyImportHook.ts
+++ b/src/main/presenter/lifecyclePresenter/hooks/after-start/legacyImportHook.ts
@@ -12,15 +12,15 @@ export const legacyImportHook: LifecycleHook = {
       throw new Error('legacyImportHook: Presenter not initialized')
     }
 
-    const newAgentPresenter = presenter.newAgentPresenter as unknown as {
+    const agentSessionPresenter = presenter.agentSessionPresenter as unknown as {
       startLegacyImport?: () => Promise<void>
     }
-    if (!newAgentPresenter.startLegacyImport) {
+    if (!agentSessionPresenter.startLegacyImport) {
       return
     }
 
     // Fire and forget to avoid blocking app startup.
-    void newAgentPresenter.startLegacyImport().catch((error) => {
+    void agentSessionPresenter.startLegacyImport().catch((error) => {
       console.error('legacyImportHook: failed to start legacy import task:', error)
     })
   }
diff --git a/src/main/presenter/lifecyclePresenter/hooks/after-start/rtkHealthCheckHook.ts b/src/main/presenter/lifecyclePresenter/hooks/after-start/rtkHealthCheckHook.ts
index 7f2deb8b9..3c0f7f495 100644
--- a/src/main/presenter/lifecyclePresenter/hooks/after-start/rtkHealthCheckHook.ts
+++ b/src/main/presenter/lifecyclePresenter/hooks/after-start/rtkHealthCheckHook.ts
@@ -12,14 +12,14 @@ export const rtkHealthCheckHook: LifecycleHook = {
       throw new Error('rtkHealthCheckHook: Presenter not initialized')
     }
 
-    const newAgentPresenter = presenter.newAgentPresenter as unknown as {
+    const agentSessionPresenter = presenter.agentSessionPresenter as unknown as {
       startRtkHealthCheck?: () => Promise<void>
     }
-    if (!newAgentPresenter.startRtkHealthCheck) {
+    if (!agentSessionPresenter.startRtkHealthCheck) {
       return
     }
 
-    void newAgentPresenter.startRtkHealthCheck().catch((error) => {
+    void agentSessionPresenter.startRtkHealthCheck().catch((error) => {
       console.error('rtkHealthCheckHook: failed to start RTK health check:', error)
     })
   }
diff --git a/src/main/presenter/lifecyclePresenter/hooks/after-start/usageStatsBackfillHook.ts b/src/main/presenter/lifecyclePresenter/hooks/after-start/usageStatsBackfillHook.ts
index 178ea261f..6b3b06a42 100644
--- a/src/main/presenter/lifecyclePresenter/hooks/after-start/usageStatsBackfillHook.ts
+++ b/src/main/presenter/lifecyclePresenter/hooks/after-start/usageStatsBackfillHook.ts
@@ -12,14 +12,14 @@ export const usageStatsBackfillHook: LifecycleHook = {
       throw new Error('usageStatsBackfillHook: Presenter not initialized')
     }
 
-    const newAgentPresenter = presenter.newAgentPresenter as unknown as {
+    const agentSessionPresenter = presenter.agentSessionPresenter as unknown as {
       startUsageStatsBackfill?: () => Promise<void>
     }
-    if (!newAgentPresenter.startUsageStatsBackfill) {
+    if (!agentSessionPresenter.startUsageStatsBackfill) {
       return
     }
 
-    void newAgentPresenter.startUsageStatsBackfill().catch((error) => {
+    void agentSessionPresenter.startUsageStatsBackfill().catch((error) => {
       console.error('usageStatsBackfillHook: failed to start usage stats backfill:', error)
     })
   }
diff --git a/src/main/presenter/llmProviderPresenter/index.ts b/src/main/presenter/llmProviderPresenter/index.ts
index 20c756658..30c035f69 100644
--- a/src/main/presenter/llmProviderPresenter/index.ts
+++ b/src/main/presenter/llmProviderPresenter/index.ts
@@ -18,8 +18,9 @@ import {
   AcpDebugRunResult
 } from '@shared/presenter'
 import { ProviderChange, ProviderBatchUpdate } from '@shared/provider-operations'
+import { isProviderDbBackedProvider } from '@shared/providerDbCatalog'
 import { eventBus } from '@/eventbus'
-import { CONFIG_EVENTS } from '@/events'
+import { CONFIG_EVENTS, PROVIDER_DB_EVENTS } from '@/events'
 import { BaseLLMProvider } from './baseProvider'
 import { ProviderConfig, StreamState } from './types'
 import { RateLimitManager } from './managers/rateLimitManager'
@@ -47,6 +48,8 @@ const createAbortError = (): Error => {
 export class LLMProviderPresenter implements ILlmProviderPresenter {
   private currentProviderId: string | null = null
   private readonly activeStreams: Map<string, StreamState> = new Map()
+  private readonly modelRefreshPromises: Map<string, Promise<void>> = new Map()
+  private readonly configPresenter: IConfigPresenter
   private readonly config: ProviderConfig = {
     maxConcurrentStreams: 10
   }
@@ -63,6 +66,7 @@ export class LLMProviderPresenter implements ILlmProviderPresenter {
     sqlitePresenter: ISQLitePresenter,
     mcpRuntime?: ProviderMcpRuntimePort
   ) {
+    this.configPresenter = configPresenter
     this.rateLimitManager = new RateLimitManager(configPresenter)
     this.acpSessionPersistence = new AcpSessionPersistence(sqlitePresenter)
     this.providerInstanceManager = new ProviderInstanceManager({
@@ -105,6 +109,10 @@ export class LLMProviderPresenter implements ILlmProviderPresenter {
     eventBus.on(CONFIG_EVENTS.PROVIDER_BATCH_UPDATE, (batchUpdate: ProviderBatchUpdate) => {
       this.providerInstanceManager.handleProviderBatchUpdate(batchUpdate)
     })
+
+    eventBus.on(PROVIDER_DB_EVENTS.UPDATED, () => {
+      this.refreshEnabledProviderDbBackedModelsInBackground('provider-db-updated')
+    })
   }
 
   getProviders(): LLM_PROVIDER[] {
@@ -378,10 +386,58 @@ export class LLMProviderPresenter implements ILlmProviderPresenter {
     return provider.getKeyStatus()
   }
 
-  async refreshModels(providerId: string): Promise<void> {
-    try {
+  private getEnabledProviderIdsUsingProviderDb(): string[] {
+    return this.providerInstanceManager
+      .getProviders()
+      .filter((provider) => provider.enable && isProviderDbBackedProvider(provider.id))
+      .map((provider) => provider.id)
+  }
+
+  private async syncProviderDbBeforeRefresh(providerId: string): Promise<void> {
+    if (!isProviderDbBackedProvider(providerId)) {
+      return
+    }
+
+    const result = await this.configPresenter.refreshProviderDb(true)
+    if (result.status === 'error') {
+      throw new Error(result.message || 'Provider DB refresh failed')
+    }
+  }
+
+  private enqueueProviderModelRefresh(providerId: string): Promise<void> {
+    const existingRefresh = this.modelRefreshPromises.get(providerId)
+    if (existingRefresh) {
+      return existingRefresh
+    }
+
+    const refreshPromise = (async () => {
       const provider = this.getProviderInstance(providerId)
       await provider.refreshModels()
+    })().finally(() => {
+      if (this.modelRefreshPromises.get(providerId) === refreshPromise) {
+        this.modelRefreshPromises.delete(providerId)
+      }
+    })
+
+    this.modelRefreshPromises.set(providerId, refreshPromise)
+    return refreshPromise
+  }
+
+  private refreshEnabledProviderDbBackedModelsInBackground(reason: string): void {
+    for (const providerId of this.getEnabledProviderIdsUsingProviderDb()) {
+      void this.enqueueProviderModelRefresh(providerId).catch((error) => {
+        console.warn(
+          `[LLMProviderPresenter] Failed to refresh models for provider ${providerId} during ${reason}:`,
+          error
+        )
+      })
+    }
+  }
+
+  async refreshModels(providerId: string): Promise<void> {
+    try {
+      await this.syncProviderDbBeforeRefresh(providerId)
+      await this.enqueueProviderModelRefresh(providerId)
     } catch (error) {
       console.error(`Failed to refresh models for provider ${providerId}:`, error)
       const errorMessage = error instanceof Error ? error.message : String(error)
diff --git a/src/main/presenter/llmProviderPresenter/promptCacheCapabilities.ts b/src/main/presenter/llmProviderPresenter/promptCacheCapabilities.ts
new file mode 100644
index 000000000..242de3dfa
--- /dev/null
+++ b/src/main/presenter/llmProviderPresenter/promptCacheCapabilities.ts
@@ -0,0 +1,50 @@
+export type PromptCacheMode =
+  | 'disabled'
+  | 'openai_implicit'
+  | 'anthropic_auto'
+  | 'anthropic_explicit'
+
+function normalizeId(value: string | undefined): string {
+  return value?.trim().toLowerCase() ?? ''
+}
+
+function isClaudeModel(modelId: string): boolean {
+  return modelId.includes('claude')
+}
+
+export function resolvePromptCacheMode(providerId: string, modelId: string): PromptCacheMode {
+  const normalizedProviderId = normalizeId(providerId)
+  const normalizedModelId = normalizeId(modelId)
+
+  if (normalizedProviderId === 'openai') {
+    return 'openai_implicit'
+  }
+
+  if (normalizedProviderId === 'anthropic' && isClaudeModel(normalizedModelId)) {
+    return 'anthropic_auto'
+  }
+
+  if (
+    normalizedProviderId === 'zenmux' &&
+    normalizedModelId.startsWith('anthropic/') &&
+    isClaudeModel(normalizedModelId)
+  ) {
+    return 'anthropic_explicit'
+  }
+
+  if (
+    normalizedProviderId === 'aws-bedrock' &&
+    (normalizedModelId.includes('anthropic.claude') || isClaudeModel(normalizedModelId))
+  ) {
+    return 'anthropic_explicit'
+  }
+
+  if (
+    normalizedProviderId === 'openrouter' &&
+    (normalizedModelId.startsWith('anthropic/') || isClaudeModel(normalizedModelId))
+  ) {
+    return 'anthropic_explicit'
+  }
+
+  return 'disabled'
+}
diff --git a/src/main/presenter/llmProviderPresenter/promptCacheStrategy.ts b/src/main/presenter/llmProviderPresenter/promptCacheStrategy.ts
new file mode 100644
index 000000000..8de06538c
--- /dev/null
+++ b/src/main/presenter/llmProviderPresenter/promptCacheStrategy.ts
@@ -0,0 +1,328 @@
+import { createHash } from 'crypto'
+import Anthropic from '@anthropic-ai/sdk'
+import type { ChatCompletionContentPart, ChatCompletionMessageParam } from 'openai/resources'
+import type { MCPToolDefinition } from '@shared/presenter'
+import { resolvePromptCacheMode, type PromptCacheMode } from './promptCacheCapabilities'
+
+export type PromptCacheApiType = 'openai_chat' | 'openai_responses' | 'anthropic'
+export type PromptCacheTtl = '5m'
+
+export interface PromptCacheBreakpointPlan {
+  messageIndex: number
+  contentIndex: number
+}
+
+export interface PromptCachePlan {
+  mode: PromptCacheMode
+  ttl: PromptCacheTtl | null
+  cacheKey?: string
+  breakpointPlan?: PromptCacheBreakpointPlan
+}
+
+export interface ResolvePromptCachePlanParams {
+  providerId: string
+  apiType: PromptCacheApiType
+  modelId: string
+  messages: unknown[]
+  tools?: MCPToolDefinition[]
+  conversationId?: string
+}
+
+type EphemeralCacheControl = { type: 'ephemeral' }
+
+const EPHEMERAL_CACHE_CONTROL: EphemeralCacheControl = { type: 'ephemeral' }
+
+type AnthropicTextBlockWithCache = Anthropic.TextBlockParam & {
+  cache_control?: EphemeralCacheControl
+}
+
+function normalizeId(value: string | undefined): string {
+  return value?.trim().toLowerCase() ?? ''
+}
+
+function buildPromptCacheKey(
+  providerId: string,
+  modelId: string,
+  conversationId?: string
+): string | undefined {
+  const normalizedConversationId = conversationId?.trim()
+  if (!normalizedConversationId) {
+    return undefined
+  }
+
+  const digest = createHash('sha256')
+    .update(`${normalizeId(providerId)}:${normalizeId(modelId)}:${normalizedConversationId}`)
+    .digest('hex')
+    .slice(0, 20)
+
+  return `deepchat:${normalizeId(providerId)}:${normalizeId(modelId)}:${digest}`
+}
+
+function findOpenAIChatBreakpoint(
+  messages: ChatCompletionMessageParam[]
+): PromptCacheBreakpointPlan | undefined {
+  let prefixEnd = messages.length
+
+  while (prefixEnd > 0) {
+    const role = messages[prefixEnd - 1]?.role
+    if (role === 'user' || role === 'tool') {
+      prefixEnd -= 1
+      continue
+    }
+    break
+  }
+
+  for (let messageIndex = prefixEnd - 1; messageIndex >= 0; messageIndex -= 1) {
+    const message = messages[messageIndex]
+    if (!message || message.role === 'tool') {
+      continue
+    }
+
+    const content = 'content' in message ? message.content : undefined
+    if (typeof content === 'string') {
+      if (content.trim()) {
+        return { messageIndex, contentIndex: 0 }
+      }
+      continue
+    }
+
+    if (!Array.isArray(content)) {
+      continue
+    }
+
+    for (let contentIndex = content.length - 1; contentIndex >= 0; contentIndex -= 1) {
+      const part = content[contentIndex]
+      if (part?.type === 'text' && typeof part.text === 'string' && part.text.trim()) {
+        return { messageIndex, contentIndex }
+      }
+    }
+  }
+
+  return undefined
+}
+
+function findAnthropicBreakpoint(
+  messages: Anthropic.MessageParam[]
+): PromptCacheBreakpointPlan | undefined {
+  let prefixEnd = messages.length
+
+  while (prefixEnd > 0) {
+    const role = messages[prefixEnd - 1]?.role
+    if (role === 'user') {
+      prefixEnd -= 1
+      continue
+    }
+    break
+  }
+
+  for (let messageIndex = prefixEnd - 1; messageIndex >= 0; messageIndex -= 1) {
+    const message = messages[messageIndex]
+    if (!message) {
+      continue
+    }
+
+    const content = message.content
+    if (typeof content === 'string') {
+      if (content.trim()) {
+        return { messageIndex, contentIndex: 0 }
+      }
+      continue
+    }
+
+    if (!Array.isArray(content)) {
+      continue
+    }
+
+    for (let contentIndex = content.length - 1; contentIndex >= 0; contentIndex -= 1) {
+      const block = content[contentIndex]
+      if (block?.type === 'text' && typeof block.text === 'string' && block.text.trim()) {
+        return { messageIndex, contentIndex }
+      }
+    }
+  }
+
+  return undefined
+}
+
+export function resolvePromptCachePlan(params: ResolvePromptCachePlanParams): PromptCachePlan {
+  const mode = resolvePromptCacheMode(params.providerId, params.modelId)
+
+  if (mode === 'disabled') {
+    return { mode, ttl: null }
+  }
+
+  if (mode === 'openai_implicit') {
+    return {
+      mode,
+      ttl: null,
+      cacheKey: buildPromptCacheKey(params.providerId, params.modelId, params.conversationId)
+    }
+  }
+
+  if (mode === 'anthropic_auto') {
+    return {
+      mode,
+      ttl: '5m'
+    }
+  }
+
+  const breakpointPlan =
+    params.apiType === 'anthropic'
+      ? findAnthropicBreakpoint(params.messages as Anthropic.MessageParam[])
+      : findOpenAIChatBreakpoint(params.messages as ChatCompletionMessageParam[])
+
+  return {
+    mode,
+    ttl: '5m',
+    breakpointPlan
+  }
+}
+
+export function applyOpenAIPromptCacheKey<T extends Record<string, unknown>>(
+  requestParams: T,
+  plan: PromptCachePlan
+): T {
+  if (plan.mode !== 'openai_implicit' || !plan.cacheKey) {
+    return requestParams
+  }
+
+  return {
+    ...requestParams,
+    prompt_cache_key: plan.cacheKey
+  }
+}
+
+export function applyAnthropicTopLevelCacheControl<T extends Record<string, unknown>>(
+  requestParams: T,
+  plan: PromptCachePlan
+): T {
+  if (plan.mode !== 'anthropic_auto') {
+    return requestParams
+  }
+
+  return {
+    ...requestParams,
+    cache_control: EPHEMERAL_CACHE_CONTROL
+  }
+}
+
+export function applyOpenAIChatExplicitCacheBreakpoint(
+  messages: ChatCompletionMessageParam[],
+  plan: PromptCachePlan
+): ChatCompletionMessageParam[] {
+  if (plan.mode !== 'anthropic_explicit' || !plan.breakpointPlan) {
+    return messages
+  }
+
+  const { messageIndex, contentIndex } = plan.breakpointPlan
+  const target = messages[messageIndex]
+
+  if (!target || !('content' in target)) {
+    return messages
+  }
+
+  const content = target.content
+  let nextContent: ChatCompletionMessageParam['content'] =
+    content as ChatCompletionMessageParam['content']
+
+  if (typeof content === 'string') {
+    if (!content.trim() || contentIndex !== 0) {
+      return messages
+    }
+
+    nextContent = [
+      {
+        type: 'text',
+        text: content,
+        cache_control: EPHEMERAL_CACHE_CONTROL
+      } as unknown as ChatCompletionContentPart
+    ]
+  } else if (Array.isArray(content)) {
+    nextContent = content.map((part, index) => {
+      if (
+        index !== contentIndex ||
+        part?.type !== 'text' ||
+        typeof part.text !== 'string' ||
+        !part.text.trim()
+      ) {
+        return part
+      }
+
+      return {
+        ...part,
+        cache_control: EPHEMERAL_CACHE_CONTROL
+      } as unknown as ChatCompletionContentPart
+    }) as ChatCompletionMessageParam['content']
+  } else {
+    return messages
+  }
+
+  return messages.map((message, index) =>
+    index === messageIndex
+      ? ({
+          ...message,
+          content: nextContent
+        } as ChatCompletionMessageParam)
+      : message
+  )
+}
+
+export function applyAnthropicExplicitCacheBreakpoint(
+  messages: Anthropic.MessageParam[],
+  plan: PromptCachePlan
+): Anthropic.MessageParam[] {
+  if (plan.mode !== 'anthropic_explicit' || !plan.breakpointPlan) {
+    return messages
+  }
+
+  const { messageIndex, contentIndex } = plan.breakpointPlan
+  const target = messages[messageIndex]
+
+  if (!target) {
+    return messages
+  }
+
+  const content = target.content
+  let nextContent: Anthropic.MessageParam['content'] = content
+
+  if (typeof content === 'string') {
+    if (!content.trim() || contentIndex !== 0) {
+      return messages
+    }
+
+    nextContent = [
+      {
+        type: 'text',
+        text: content,
+        cache_control: EPHEMERAL_CACHE_CONTROL
+      } satisfies AnthropicTextBlockWithCache
+    ]
+  } else if (Array.isArray(content)) {
+    nextContent = content.map((block, index) => {
+      if (
+        index !== contentIndex ||
+        block?.type !== 'text' ||
+        typeof block.text !== 'string' ||
+        !block.text.trim()
+      ) {
+        return block
+      }
+
+      return {
+        ...block,
+        cache_control: EPHEMERAL_CACHE_CONTROL
+      } satisfies AnthropicTextBlockWithCache
+    })
+  } else {
+    return messages
+  }
+
+  return messages.map((message, index) =>
+    index === messageIndex
+      ? ({
+          ...message,
+          content: nextContent
+        } as Anthropic.MessageParam)
+      : message
+  )
+}
diff --git a/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts b/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts
index 296713ee7..5b29a7708 100644
--- a/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts
@@ -15,6 +15,67 @@ import { proxyConfig } from '../../proxyConfig'
 import { ProxyAgent } from 'undici'
 import type { Usage } from '@anthropic-ai/sdk/resources'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
+import {
+  applyAnthropicExplicitCacheBreakpoint,
+  applyAnthropicTopLevelCacheControl,
+  resolvePromptCachePlan
+} from '../promptCacheStrategy'
+
+type CacheAwareAnthropicUsage = Usage & {
+  cache_read_input_tokens?: number
+  cache_creation_input_tokens?: number
+  cacheReadInputTokens?: number
+  cacheWriteInputTokens?: number
+}
+
+function getAnthropicUsageNumber(
+  usage: CacheAwareAnthropicUsage | undefined,
+  snakeKey: 'cache_read_input_tokens' | 'cache_creation_input_tokens',
+  camelKey: 'cacheReadInputTokens' | 'cacheWriteInputTokens'
+): number {
+  const value = usage?.[snakeKey] ?? usage?.[camelKey]
+  return typeof value === 'number' && Number.isFinite(value) ? value : 0
+}
+
+function buildAnthropicUsageSnapshot(usage: CacheAwareAnthropicUsage | undefined): {
+  prompt_tokens: number
+  completion_tokens: number
+  total_tokens: number
+  cached_tokens?: number
+  cache_write_tokens?: number
+} | null {
+  if (!usage) {
+    return null
+  }
+
+  const uncachedInputTokens =
+    typeof usage.input_tokens === 'number' && Number.isFinite(usage.input_tokens)
+      ? usage.input_tokens
+      : 0
+  const completionTokens =
+    typeof usage.output_tokens === 'number' && Number.isFinite(usage.output_tokens)
+      ? usage.output_tokens
+      : 0
+  const cachedTokens = getAnthropicUsageNumber(
+    usage,
+    'cache_read_input_tokens',
+    'cacheReadInputTokens'
+  )
+  const cacheWriteTokens = getAnthropicUsageNumber(
+    usage,
+    'cache_creation_input_tokens',
+    'cacheWriteInputTokens'
+  )
+  const promptTokens = uncachedInputTokens + cachedTokens + cacheWriteTokens
+
+  return {
+    prompt_tokens: promptTokens,
+    completion_tokens: completionTokens,
+    total_tokens: promptTokens + completionTokens,
+    ...(cachedTokens > 0 ? { cached_tokens: cachedTokens } : {}),
+    ...(cacheWriteTokens > 0 ? { cache_write_tokens: cacheWriteTokens } : {})
+  }
+}
 
 export class AnthropicProvider extends BaseLLMProvider {
   private anthropic!: Anthropic
@@ -42,6 +103,30 @@ export class AnthropicProvider extends BaseLLMProvider {
     }
   }
 
+  private applyPromptCache<T extends Record<string, unknown>>(
+    requestParams: T,
+    modelId: string,
+    messages: Anthropic.MessageParam[],
+    conversationId?: string
+  ): T {
+    const plan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'anthropic',
+      modelId,
+      messages: messages as unknown[],
+      conversationId
+    })
+    const nextRequestParams =
+      plan.mode === 'anthropic_explicit'
+        ? {
+            ...requestParams,
+            messages: applyAnthropicExplicitCacheBreakpoint(messages, plan)
+          }
+        : requestParams
+
+    return applyAnthropicTopLevelCacheControl(nextRequestParams, plan)
+  }
+
   public onProxyResolved(): void {
     this.init()
   }
@@ -458,10 +543,16 @@ export class AnthropicProvider extends BaseLLMProvider {
         requestParams.system = formattedMessages.system
       }
 
+      const cachedRequestParams = this.applyPromptCache(
+        requestParams,
+        modelId,
+        formattedMessages.messages
+      )
+
       if (!this.anthropic) {
         throw new Error('Anthropic client is not initialized')
       }
-      const response = await this.anthropic.messages.create(requestParams)
+      const response = await this.anthropic.messages.create(cachedRequestParams)
 
       const resultResp: LLMResponse = {
         content: ''
@@ -469,10 +560,13 @@ export class AnthropicProvider extends BaseLLMProvider {
 
       // 添加usage信息
       if (response.usage) {
+        const usageSnapshot = buildAnthropicUsageSnapshot(
+          response.usage as CacheAwareAnthropicUsage
+        )
         resultResp.totalUsage = {
-          prompt_tokens: response.usage.input_tokens,
-          completion_tokens: response.usage.output_tokens,
-          total_tokens: response.usage.input_tokens + response.usage.output_tokens
+          prompt_tokens: usageSnapshot?.prompt_tokens ?? 0,
+          completion_tokens: usageSnapshot?.completion_tokens ?? 0,
+          total_tokens: usageSnapshot?.total_tokens ?? 0
         }
       }
 
@@ -546,10 +640,16 @@ ${text}
         requestParams.system = systemPrompt
       }
 
+      const cachedRequestParams = this.applyPromptCache(
+        requestParams,
+        modelId,
+        requestParams.messages
+      )
+
       if (!this.anthropic) {
         throw new Error('Anthropic client is not initialized')
       }
-      const response = await this.anthropic.messages.create(requestParams)
+      const response = await this.anthropic.messages.create(cachedRequestParams)
 
       return {
         content: response.content
@@ -588,10 +688,16 @@ ${context}
         requestParams.system = systemPrompt
       }
 
+      const cachedRequestParams = this.applyPromptCache(
+        requestParams,
+        modelId,
+        requestParams.messages
+      )
+
       if (!this.anthropic) {
         throw new Error('Anthropic client is not initialized')
       }
-      const response = await this.anthropic.messages.create(requestParams)
+      const response = await this.anthropic.messages.create(cachedRequestParams)
 
       const suggestions = response.content
         .filter((block: any) => block.type === 'text')
@@ -657,14 +763,20 @@ ${context}
         // @ts-ignore - 类型不匹配，但格式是正确的
         streamParams.tools = anthropicTools
       }
+      const cachedStreamParams = this.applyPromptCache(
+        streamParams as unknown as Record<string, unknown>,
+        modelId,
+        formattedMessagesObject.messages,
+        modelConfig.conversationId
+      ) as unknown as Anthropic.Messages.MessageCreateParamsStreaming
       await this.emitRequestTrace(modelConfig, {
         endpoint: this.buildAnthropicEndpoint(),
         headers: this.buildAnthropicApiKeyHeaders(),
-        body: streamParams
+        body: cachedStreamParams
       })
       // console.log('streamParams', JSON.stringify(streamParams.messages))
       // 创建Anthropic流
-      const stream = await this.anthropic.messages.create(streamParams)
+      const stream = await this.anthropic.messages.create(cachedStreamParams)
 
       // 状态变量
       let accumulatedJson = ''
@@ -820,11 +932,10 @@ ${context}
         }
       }
       if (usageMetadata) {
-        yield createStreamEvent.usage({
-          prompt_tokens: usageMetadata.input_tokens,
-          completion_tokens: usageMetadata.output_tokens,
-          total_tokens: usageMetadata.input_tokens + usageMetadata.output_tokens
-        })
+        const usageSnapshot = buildAnthropicUsageSnapshot(usageMetadata as CacheAwareAnthropicUsage)
+        if (usageSnapshot) {
+          yield createStreamEvent.usage(usageSnapshot)
+        }
       }
       // 发送停止事件
       yield createStreamEvent.stop(toolUseDetected ? 'tool_use' : 'complete')
diff --git a/src/main/presenter/llmProviderPresenter/providers/awsBedrockProvider.ts b/src/main/presenter/llmProviderPresenter/providers/awsBedrockProvider.ts
index f11b727e8..00ee51071 100644
--- a/src/main/presenter/llmProviderPresenter/providers/awsBedrockProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/awsBedrockProvider.ts
@@ -20,6 +20,66 @@ import {
 import Anthropic from '@anthropic-ai/sdk'
 import { Usage } from '@anthropic-ai/sdk/resources/messages'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
+import {
+  applyAnthropicExplicitCacheBreakpoint,
+  resolvePromptCachePlan
+} from '../promptCacheStrategy'
+
+type CacheAwareBedrockUsage = Usage & {
+  cache_read_input_tokens?: number
+  cache_creation_input_tokens?: number
+  cacheReadInputTokens?: number
+  cacheWriteInputTokens?: number
+}
+
+function getBedrockUsageNumber(
+  usage: CacheAwareBedrockUsage | undefined,
+  snakeKey: 'cache_read_input_tokens' | 'cache_creation_input_tokens',
+  camelKey: 'cacheReadInputTokens' | 'cacheWriteInputTokens'
+): number {
+  const value = usage?.[snakeKey] ?? usage?.[camelKey]
+  return typeof value === 'number' && Number.isFinite(value) ? value : 0
+}
+
+function buildBedrockUsageSnapshot(usage: CacheAwareBedrockUsage | undefined): {
+  prompt_tokens: number
+  completion_tokens: number
+  total_tokens: number
+  cached_tokens?: number
+  cache_write_tokens?: number
+} | null {
+  if (!usage) {
+    return null
+  }
+
+  const uncachedInputTokens =
+    typeof usage.input_tokens === 'number' && Number.isFinite(usage.input_tokens)
+      ? usage.input_tokens
+      : 0
+  const completionTokens =
+    typeof usage.output_tokens === 'number' && Number.isFinite(usage.output_tokens)
+      ? usage.output_tokens
+      : 0
+  const cachedTokens = getBedrockUsageNumber(
+    usage,
+    'cache_read_input_tokens',
+    'cacheReadInputTokens'
+  )
+  const cacheWriteTokens = getBedrockUsageNumber(
+    usage,
+    'cache_creation_input_tokens',
+    'cacheWriteInputTokens'
+  )
+  const promptTokens = uncachedInputTokens + cachedTokens + cacheWriteTokens
+
+  return {
+    prompt_tokens: promptTokens,
+    completion_tokens: completionTokens,
+    total_tokens: promptTokens + completionTokens,
+    ...(cachedTokens > 0 ? { cached_tokens: cachedTokens } : {}),
+    ...(cacheWriteTokens > 0 ? { cache_write_tokens: cacheWriteTokens } : {})
+  }
+}
 
 export class AwsBedrockProvider extends BaseLLMProvider {
   private bedrock!: BedrockClient
@@ -64,6 +124,21 @@ export class AwsBedrockProvider extends BaseLLMProvider {
     return body
   }
 
+  private applyPromptCache(
+    messages: Anthropic.MessageParam[],
+    modelId: string,
+    conversationId?: string
+  ): Anthropic.MessageParam[] {
+    const plan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'anthropic',
+      modelId,
+      messages: messages as unknown[],
+      conversationId
+    })
+    return applyAnthropicExplicitCacheBreakpoint(messages, plan)
+  }
+
   public onProxyResolved(): void {
     this.init()
   }
@@ -539,6 +614,7 @@ ${text}
       }
 
       const formattedMessages = this.formatMessages(messages)
+      const cachedMessages = this.applyPromptCache(formattedMessages.messages, modelId)
 
       // 创建基本请求参数
       const payload = {
@@ -546,7 +622,7 @@ ${text}
         max_tokens: maxTokens,
         temperature,
         system: formattedMessages.system,
-        messages
+        messages: cachedMessages
       }
 
       const command = new InvokeModelCommand({
@@ -566,10 +642,11 @@ ${text}
 
       // 添加usage信息
       if (response.usage) {
+        const usageSnapshot = buildBedrockUsageSnapshot(response.usage as CacheAwareBedrockUsage)
         resultResp.totalUsage = {
-          prompt_tokens: response.usage.input_tokens,
-          completion_tokens: response.usage.output_tokens,
-          total_tokens: response.usage.input_tokens + response.usage.output_tokens
+          prompt_tokens: usageSnapshot?.prompt_tokens ?? 0,
+          completion_tokens: usageSnapshot?.completion_tokens ?? 0,
+          total_tokens: usageSnapshot?.total_tokens ?? 0
         }
       }
 
@@ -628,6 +705,11 @@ ${text}
     try {
       // 格式化消息
       const formattedMessagesObject = this.formatMessages(messages)
+      const cachedMessages = this.applyPromptCache(
+        formattedMessagesObject.messages,
+        modelId,
+        modelConfig.conversationId
+      )
       console.log('formattedMessagesObject', JSON.stringify(formattedMessagesObject))
 
       // 将MCP工具转换为Anthropic工具格式
@@ -648,8 +730,8 @@ ${text}
         anthropic_version: 'bedrock-2023-05-31',
         max_tokens: maxTokens || 1024,
         temperature: temperature ?? 0.7,
-        // system: formattedMessagesObject.system,
-        messages: formattedMessagesObject.messages,
+        system: formattedMessagesObject.system,
+        messages: cachedMessages,
         thinking: undefined as any,
         tools: undefined as any
       }
@@ -888,11 +970,10 @@ ${text}
         }
       }
       if (usageMetadata) {
-        yield createStreamEvent.usage({
-          prompt_tokens: usageMetadata.input_tokens,
-          completion_tokens: usageMetadata.output_tokens,
-          total_tokens: usageMetadata.input_tokens + usageMetadata.output_tokens
-        })
+        const usageSnapshot = buildBedrockUsageSnapshot(usageMetadata as CacheAwareBedrockUsage)
+        if (usageSnapshot) {
+          yield createStreamEvent.usage(usageSnapshot)
+        }
       }
       // 发送停止事件
       yield createStreamEvent.stop(toolUseDetected ? 'tool_use' : 'complete')
diff --git a/src/main/presenter/llmProviderPresenter/providers/doubaoProvider.ts b/src/main/presenter/llmProviderPresenter/providers/doubaoProvider.ts
index 22dfdae67..f278913d8 100644
--- a/src/main/presenter/llmProviderPresenter/providers/doubaoProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/doubaoProvider.ts
@@ -16,21 +16,11 @@ import {
 } from '@shared/modelConfigDefaults'
 import { OpenAICompatibleProvider } from './openAICompatibleProvider'
 import { providerDbLoader } from '../../configPresenter/providerDbLoader'
-import { modelCapabilities } from '../../configPresenter/modelCapabilities'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
 
-export class DoubaoProvider extends OpenAICompatibleProvider {
-  // List of models that support thinking parameter
-  private static readonly THINKING_MODELS: string[] = [
-    'deepseek-v3-1-250821',
-    'doubao-seed-1-6-vision-250815',
-    'doubao-seed-1-6-250615',
-    'doubao-seed-1-6-flash-250615',
-    'doubao-1-5-thinking-vision-pro-250428',
-    'doubao-1-5-ui-tars-250428',
-    'doubao-1-5-thinking-pro-m-250428'
-  ]
+const DOUBAO_THINKING_NOTE = 'doubao-thinking-parameter'
 
+export class DoubaoProvider extends OpenAICompatibleProvider {
   constructor(
     provider: LLM_PROVIDER,
     configPresenter: IConfigPresenter,
@@ -41,7 +31,9 @@ export class DoubaoProvider extends OpenAICompatibleProvider {
   }
 
   private supportsThinking(modelId: string): boolean {
-    return DoubaoProvider.THINKING_MODELS.includes(modelId)
+    const model = providerDbLoader.getModel(this.provider.id, modelId)
+    const notes = model?.extra_capabilities?.reasoning?.notes
+    return Array.isArray(notes) && notes.includes(DOUBAO_THINKING_NOTE)
   }
 
   /**
@@ -93,8 +85,7 @@ export class DoubaoProvider extends OpenAICompatibleProvider {
   }
 
   protected async fetchOpenAIModels(): Promise<MODEL_META[]> {
-    const resolvedId = modelCapabilities.resolveProviderId(this.provider.id) || this.provider.id
-    const provider = providerDbLoader.getProvider(resolvedId)
+    const provider = providerDbLoader.getProvider(this.provider.id)
     if (!provider || !Array.isArray(provider.models)) {
       return []
     }
diff --git a/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts b/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts
index 8aedd633b..8d6c1640c 100644
--- a/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts
@@ -33,6 +33,11 @@ import { proxyConfig } from '../../proxyConfig'
 import { modelCapabilities } from '../../configPresenter/modelCapabilities'
 import { ProxyAgent } from 'undici'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
+import {
+  applyOpenAIChatExplicitCacheBreakpoint,
+  applyOpenAIPromptCacheKey,
+  resolvePromptCachePlan
+} from '../promptCacheStrategy'
 
 const OPENAI_REASONING_MODELS = [
   'o4-mini',
@@ -80,6 +85,17 @@ export function normalizeExtractedImageText(content: string): string {
 }
 
 function getOpenAIChatCachedTokens(usage: unknown): number | undefined {
+  return getOpenAIChatUsageDetail(usage, 'cached_tokens')
+}
+
+function getOpenAIChatCacheWriteTokens(usage: unknown): number | undefined {
+  return getOpenAIChatUsageDetail(usage, 'cache_write_tokens')
+}
+
+function getOpenAIChatUsageDetail(
+  usage: unknown,
+  key: 'cached_tokens' | 'cache_write_tokens'
+): number | undefined {
   if (!usage || typeof usage !== 'object') {
     return undefined
   }
@@ -88,11 +104,11 @@ function getOpenAIChatCachedTokens(usage: unknown): number | undefined {
   const inputTokensDetails = (usage as { input_tokens_details?: unknown }).input_tokens_details
   const promptCachedTokens =
     promptTokensDetails && typeof promptTokensDetails === 'object'
-      ? (promptTokensDetails as { cached_tokens?: unknown }).cached_tokens
+      ? (promptTokensDetails as Record<string, unknown>)[key]
       : undefined
   const inputCachedTokens =
     inputTokensDetails && typeof inputTokensDetails === 'object'
-      ? (inputTokensDetails as { cached_tokens?: unknown }).cached_tokens
+      ? (inputTokensDetails as Record<string, unknown>)[key]
       : undefined
   const cachedTokens =
     typeof promptCachedTokens === 'number' ? promptCachedTokens : inputCachedTokens
@@ -768,7 +784,7 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
     const modelConfig = this.configPresenter.getModelConfig(modelId, this.provider.id)
     const supportsFunctionCall = modelConfig?.functionCall || false
 
-    const requestParams: OpenAI.Chat.ChatCompletionCreateParams = {
+    const requestParams: OpenAI.Chat.ChatCompletionCreateParamsNonStreaming = {
       messages: this.formatMessages(messages, supportsFunctionCall),
       model: modelId,
       stream: false,
@@ -781,12 +797,27 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
         ? { max_completion_tokens: maxTokens }
         : { max_tokens: maxTokens })
     }
+    const promptCachePlan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'openai_chat',
+      modelId,
+      messages: requestParams.messages as unknown[],
+      conversationId: modelConfig?.conversationId
+    })
+    requestParams.messages = applyOpenAIChatExplicitCacheBreakpoint(
+      requestParams.messages as ChatCompletionMessageParam[],
+      promptCachePlan
+    )
     OPENAI_REASONING_MODELS.forEach((noTempId) => {
       if (modelId.startsWith(noTempId)) {
         delete requestParams.temperature
       }
     })
-    const completion = await this.openai.chat.completions.create(requestParams)
+    const cachedRequestParams = applyOpenAIPromptCacheKey(
+      requestParams as unknown as Record<string, unknown>,
+      promptCachePlan
+    ) as unknown as OpenAI.Chat.ChatCompletionCreateParamsNonStreaming
+    const completion = await this.openai.chat.completions.create(cachedRequestParams)
 
     const message = completion.choices[0].message as ChatCompletionMessage & {
       reasoning_content?: string
@@ -1012,7 +1043,8 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
               prompt_tokens: result.usage.input_tokens || 0,
               completion_tokens: result.usage.output_tokens || 0,
               total_tokens: result.usage.total_tokens || 0,
-              cached_tokens: getOpenAIChatCachedTokens(result.usage)
+              cached_tokens: getOpenAIChatCachedTokens(result.usage),
+              cache_write_tokens: getOpenAIChatCacheWriteTokens(result.usage)
             })
           }
 
@@ -1081,7 +1113,7 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
         : undefined
 
     // 构建请求参数
-    const requestParams: OpenAI.Chat.ChatCompletionCreateParams = {
+    const requestParams: OpenAI.Chat.ChatCompletionCreateParamsStreaming = {
       messages: processedMessages,
       model: modelId,
       stream: true,
@@ -1132,15 +1164,32 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
     // 如果存在 API 工具且支持函数调用，则添加到请求参数中
     if (apiTools && apiTools.length > 0 && supportsFunctionCall) requestParams.tools = apiTools
 
+    const promptCachePlan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'openai_chat',
+      modelId,
+      messages: processedMessages as unknown[],
+      tools,
+      conversationId: modelConfig?.conversationId
+    })
+    requestParams.messages = applyOpenAIChatExplicitCacheBreakpoint(
+      requestParams.messages as ChatCompletionMessageParam[],
+      promptCachePlan
+    )
+    const cachedRequestParams = applyOpenAIPromptCacheKey(
+      requestParams as unknown as Record<string, unknown>,
+      promptCachePlan
+    ) as unknown as OpenAI.Chat.ChatCompletionCreateParamsStreaming
+
     await this.emitRequestTrace(modelConfig, {
       endpoint: this.buildChatCompletionsEndpoint(),
       headers: this.buildChatCompletionsTraceHeaders(),
-      body: requestParams
+      body: cachedRequestParams
     })
 
     // console.log('[handleChatCompletion] requestParams', JSON.stringify(requestParams))
     // 发起 OpenAI 聊天补全请求
-    const stream = await this.openai.chat.completions.create(requestParams)
+    const stream = await this.openai.chat.completions.create(cachedRequestParams)
 
     //-----------------------------------------------------------------------------------------------------
     // 流处理状态定义 (已将相关变量声明提升到顶部，确保可见性)
@@ -1179,6 +1228,7 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
           completion_tokens: number
           total_tokens: number
           cached_tokens?: number
+          cache_write_tokens?: number
         }
       | undefined = undefined
 
@@ -1195,7 +1245,8 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
       if (chunk.usage) {
         usage = {
           ...chunk.usage,
-          cached_tokens: getOpenAIChatCachedTokens(chunk.usage)
+          cached_tokens: getOpenAIChatCachedTokens(chunk.usage),
+          cache_write_tokens: getOpenAIChatCacheWriteTokens(chunk.usage)
         }
       }
 
diff --git a/src/main/presenter/llmProviderPresenter/providers/openAIResponsesProvider.ts b/src/main/presenter/llmProviderPresenter/providers/openAIResponsesProvider.ts
index e4e4daa6c..67a477f4b 100644
--- a/src/main/presenter/llmProviderPresenter/providers/openAIResponsesProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/openAIResponsesProvider.ts
@@ -24,6 +24,7 @@ import { proxyConfig } from '../../proxyConfig'
 import { ProxyAgent } from 'undici'
 import { modelCapabilities } from '../../configPresenter/modelCapabilities'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
+import { applyOpenAIPromptCacheKey, resolvePromptCachePlan } from '../promptCacheStrategy'
 
 const OPENAI_REASONING_MODELS = [
   'o4-mini',
@@ -62,7 +63,9 @@ function getOpenAIResponseCachedTokens(
     | {
         input_tokens_details?: {
           cached_tokens?: number
+          cache_write_tokens?: number
         }
+        cache_write_tokens?: number
       }
     | null
     | undefined
@@ -73,6 +76,24 @@ function getOpenAIResponseCachedTokens(
     : undefined
 }
 
+function getOpenAIResponseCacheWriteTokens(usage: unknown): number | undefined {
+  if (!usage || typeof usage !== 'object') {
+    return undefined
+  }
+
+  const inputTokensDetails = (usage as { input_tokens_details?: unknown }).input_tokens_details
+  const nestedCacheWriteTokens =
+    inputTokensDetails && typeof inputTokensDetails === 'object'
+      ? (inputTokensDetails as Record<string, unknown>).cache_write_tokens
+      : undefined
+  const topLevelCacheWriteTokens = (usage as Record<string, unknown>).cache_write_tokens
+  const cacheWriteTokens =
+    typeof nestedCacheWriteTokens === 'number' ? nestedCacheWriteTokens : topLevelCacheWriteTokens
+  return typeof cacheWriteTokens === 'number' && Number.isFinite(cacheWriteTokens)
+    ? cacheWriteTokens
+    : undefined
+}
+
 export class OpenAIResponsesProvider extends BaseLLMProvider {
   protected openai!: OpenAI
   private isNoModelsApi: boolean = false
@@ -305,7 +326,7 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
     }
 
     const formattedMessages = this.formatMessages(messages)
-    const requestParams: OpenAI.Responses.ResponseCreateParams = {
+    const requestParams: OpenAI.Responses.ResponseCreateParamsNonStreaming = {
       model: modelId,
       input: formattedMessages,
       temperature: temperature,
@@ -314,6 +335,13 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
     }
 
     const modelConfig = this.configPresenter.getModelConfig(modelId, this.provider.id)
+    const promptCachePlan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'openai_responses',
+      modelId,
+      messages: formattedMessages as unknown[],
+      conversationId: modelConfig?.conversationId
+    })
     if (modelConfig.reasoningEffort && this.supportsEffortParameter(modelId)) {
       ;(requestParams as any).reasoning = {
         effort: modelConfig.reasoningEffort
@@ -333,7 +361,12 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
       }
     })
 
-    const response = await this.openai.responses.create(requestParams)
+    const cachedRequestParams = applyOpenAIPromptCacheKey(
+      requestParams as unknown as Record<string, unknown>,
+      promptCachePlan
+    ) as unknown as OpenAI.Responses.ResponseCreateParamsNonStreaming
+
+    const response = await this.openai.responses.create(cachedRequestParams)
     const resultResp: LLMResponse = {
       content: ''
     }
@@ -571,7 +604,8 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
               prompt_tokens: result.usage.input_tokens || 0,
               completion_tokens: result.usage.output_tokens || 0,
               total_tokens: result.usage.total_tokens || 0,
-              cached_tokens: getOpenAIResponseCachedTokens(result.usage)
+              cached_tokens: getOpenAIResponseCachedTokens(result.usage),
+              cache_write_tokens: getOpenAIResponseCacheWriteTokens(result.usage)
             })
           }
 
@@ -631,13 +665,21 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
         ? await this.mcpRuntime?.mcpToolsToOpenAIResponsesTools(tools, this.provider.id)
         : undefined
 
-    const requestParams: OpenAI.Responses.ResponseCreateParams = {
+    const requestParams: OpenAI.Responses.ResponseCreateParamsStreaming = {
       model: modelId,
       input: processedMessages,
       temperature,
       max_output_tokens: maxTokens,
       stream: true
     }
+    const promptCachePlan = resolvePromptCachePlan({
+      providerId: this.provider.id,
+      apiType: 'openai_responses',
+      modelId,
+      messages: processedMessages as unknown[],
+      tools,
+      conversationId: modelConfig?.conversationId
+    })
 
     // 如果模型支持函数调用且有工具,添加 tools 参数
     if (tools.length > 0 && supportsFunctionCall && apiTools) {
@@ -660,13 +702,18 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
       if (modelId.startsWith(noTempId)) delete requestParams.temperature
     })
 
+    const cachedRequestParams = applyOpenAIPromptCacheKey(
+      requestParams as unknown as Record<string, unknown>,
+      promptCachePlan
+    ) as unknown as OpenAI.Responses.ResponseCreateParamsStreaming
+
     await this.emitRequestTrace(modelConfig, {
       endpoint: this.buildResponsesEndpoint(),
       headers: this.buildResponsesTraceHeaders(),
-      body: requestParams
+      body: cachedRequestParams
     })
 
-    const stream = await this.openai.responses.create(requestParams)
+    const stream = await this.openai.responses.create(cachedRequestParams)
 
     // --- State Variables ---
     type TagState = 'none' | 'start' | 'inside' | 'end'
@@ -696,6 +743,7 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
           completion_tokens: number
           total_tokens: number
           cached_tokens?: number
+          cache_write_tokens?: number
         }
       | undefined = undefined
 
@@ -1006,7 +1054,8 @@ export class OpenAIResponsesProvider extends BaseLLMProvider {
             prompt_tokens: response.usage.input_tokens || 0,
             completion_tokens: response.usage.output_tokens || 0,
             total_tokens: response.usage.total_tokens || 0,
-            cached_tokens: getOpenAIResponseCachedTokens(response.usage)
+            cached_tokens: getOpenAIResponseCachedTokens(response.usage),
+            cache_write_tokens: getOpenAIResponseCacheWriteTokens(response.usage)
           }
           yield createStreamEvent.usage(usage)
         }
diff --git a/src/main/presenter/llmProviderPresenter/providers/zenmuxProvider.ts b/src/main/presenter/llmProviderPresenter/providers/zenmuxProvider.ts
index be1bf5c42..37b4d7efc 100644
--- a/src/main/presenter/llmProviderPresenter/providers/zenmuxProvider.ts
+++ b/src/main/presenter/llmProviderPresenter/providers/zenmuxProvider.ts
@@ -1,21 +1,228 @@
-import { IConfigPresenter, LLM_PROVIDER, MODEL_META } from '@shared/presenter'
+import Anthropic from '@anthropic-ai/sdk'
+import {
+  ChatMessage,
+  IConfigPresenter,
+  KeyStatus,
+  LLM_EMBEDDING_ATTRS,
+  LLM_PROVIDER,
+  LLMResponse,
+  LLMCoreStreamEvent,
+  MCPToolDefinition,
+  MODEL_META,
+  ModelConfig
+} from '@shared/presenter'
+import { ProxyAgent } from 'undici'
+import { BaseLLMProvider } from '../baseProvider'
+import { proxyConfig } from '../../proxyConfig'
+import { AnthropicProvider } from './anthropicProvider'
 import { OpenAICompatibleProvider } from './openAICompatibleProvider'
 import type { ProviderMcpRuntimePort } from '../runtimePorts'
 
-export class ZenmuxProvider extends OpenAICompatibleProvider {
+const ZENMUX_ANTHROPIC_BASE_URL = 'https://zenmux.ai/api/anthropic'
+
+class ZenmuxOpenAIDelegate extends OpenAICompatibleProvider {
+  protected override async init() {
+    this.isInitialized = true
+  }
+
+  public async fetchZenmuxModels(options?: { timeout: number }): Promise<MODEL_META[]> {
+    return super.fetchOpenAIModels(options)
+  }
+}
+
+class ZenmuxAnthropicDelegate extends AnthropicProvider {
+  private clientInitialized = false
+
+  protected override async init() {}
+
+  public async ensureClientInitialized(): Promise<void> {
+    const apiKey = this.provider.apiKey || process.env.ANTHROPIC_API_KEY || null
+    if (!apiKey) {
+      this.clientInitialized = false
+      this.isInitialized = false
+      return
+    }
+
+    const proxyUrl = proxyConfig.getProxyUrl()
+    const fetchOptions: { dispatcher?: ProxyAgent } = {}
+
+    if (proxyUrl) {
+      const proxyAgent = new ProxyAgent(proxyUrl)
+      fetchOptions.dispatcher = proxyAgent
+    }
+
+    const self = this as unknown as { anthropic?: Anthropic }
+    self.anthropic = new Anthropic({
+      apiKey,
+      baseURL: this.provider.baseUrl || ZENMUX_ANTHROPIC_BASE_URL,
+      defaultHeaders: this.defaultHeaders,
+      fetchOptions
+    })
+
+    this.clientInitialized = true
+    this.isInitialized = true
+  }
+
+  public isClientInitialized(): boolean {
+    return this.clientInitialized
+  }
+
+  public override onProxyResolved(): void {
+    void this.ensureClientInitialized()
+  }
+}
+
+export class ZenmuxProvider extends BaseLLMProvider {
+  private readonly openaiDelegate: ZenmuxOpenAIDelegate
+  private readonly anthropicDelegate: ZenmuxAnthropicDelegate
+
   constructor(
     provider: LLM_PROVIDER,
     configPresenter: IConfigPresenter,
     mcpRuntime?: ProviderMcpRuntimePort
   ) {
     super(provider, configPresenter, mcpRuntime)
+
+    this.openaiDelegate = new ZenmuxOpenAIDelegate(provider, configPresenter, mcpRuntime)
+    this.anthropicDelegate = new ZenmuxAnthropicDelegate(
+      {
+        ...provider,
+        apiType: 'anthropic',
+        baseUrl: ZENMUX_ANTHROPIC_BASE_URL
+      },
+      configPresenter,
+      mcpRuntime
+    )
+
+    this.init()
+  }
+
+  private isAnthropicModel(modelId: string): boolean {
+    return modelId.trim().toLowerCase().startsWith('anthropic/')
+  }
+
+  private async ensureAnthropicDelegateReady(): Promise<ZenmuxAnthropicDelegate> {
+    await this.anthropicDelegate.ensureClientInitialized()
+
+    if (!this.anthropicDelegate.isClientInitialized()) {
+      throw new Error('Anthropic SDK not initialized')
+    }
+
+    return this.anthropicDelegate
   }
 
-  protected async fetchOpenAIModels(options?: { timeout: number }): Promise<MODEL_META[]> {
-    const models = await super.fetchOpenAIModels(options)
+  protected async fetchProviderModels(): Promise<MODEL_META[]> {
+    const models = await this.openaiDelegate.fetchZenmuxModels()
     return models.map((model) => ({
       ...model,
       group: 'ZenMux'
     }))
   }
+
+  public onProxyResolved(): void {
+    this.openaiDelegate.onProxyResolved()
+
+    if (this.anthropicDelegate.isClientInitialized()) {
+      this.anthropicDelegate.onProxyResolved()
+    }
+  }
+
+  public async check(): Promise<{ isOk: boolean; errorMsg: string | null }> {
+    return this.openaiDelegate.check()
+  }
+
+  public async summaryTitles(messages: ChatMessage[], modelId: string): Promise<string> {
+    if (this.isAnthropicModel(modelId)) {
+      const delegate = await this.ensureAnthropicDelegateReady()
+      return delegate.summaryTitles(messages, modelId)
+    }
+
+    return this.openaiDelegate.summaryTitles(messages, modelId)
+  }
+
+  public async completions(
+    messages: ChatMessage[],
+    modelId: string,
+    temperature?: number,
+    maxTokens?: number
+  ): Promise<LLMResponse> {
+    if (this.isAnthropicModel(modelId)) {
+      const delegate = await this.ensureAnthropicDelegateReady()
+      return delegate.completions(messages, modelId, temperature, maxTokens)
+    }
+
+    return this.openaiDelegate.completions(messages, modelId, temperature, maxTokens)
+  }
+
+  public async summaries(
+    text: string,
+    modelId: string,
+    temperature?: number,
+    maxTokens?: number
+  ): Promise<LLMResponse> {
+    if (this.isAnthropicModel(modelId)) {
+      const delegate = await this.ensureAnthropicDelegateReady()
+      return delegate.summaries(text, modelId, temperature, maxTokens)
+    }
+
+    return this.openaiDelegate.summaries(text, modelId, temperature, maxTokens)
+  }
+
+  public async generateText(
+    prompt: string,
+    modelId: string,
+    temperature?: number,
+    maxTokens?: number
+  ): Promise<LLMResponse> {
+    if (this.isAnthropicModel(modelId)) {
+      const delegate = await this.ensureAnthropicDelegateReady()
+      return delegate.generateText(prompt, modelId, temperature, maxTokens)
+    }
+
+    return this.openaiDelegate.generateText(prompt, modelId, temperature, maxTokens)
+  }
+
+  public async *coreStream(
+    messages: ChatMessage[],
+    modelId: string,
+    modelConfig: ModelConfig,
+    temperature: number,
+    maxTokens: number,
+    tools: MCPToolDefinition[]
+  ): AsyncGenerator<LLMCoreStreamEvent> {
+    if (this.isAnthropicModel(modelId)) {
+      const delegate = await this.ensureAnthropicDelegateReady()
+      yield* delegate.coreStream(messages, modelId, modelConfig, temperature, maxTokens, tools)
+      return
+    }
+
+    yield* this.openaiDelegate.coreStream(
+      messages,
+      modelId,
+      modelConfig,
+      temperature,
+      maxTokens,
+      tools
+    )
+  }
+
+  public async getEmbeddings(modelId: string, texts: string[]): Promise<number[][]> {
+    if (this.isAnthropicModel(modelId)) {
+      throw new Error(`Embeddings not supported for Anthropic models: ${modelId}`)
+    }
+
+    return this.openaiDelegate.getEmbeddings(modelId, texts)
+  }
+
+  public async getDimensions(modelId: string): Promise<LLM_EMBEDDING_ATTRS> {
+    if (this.isAnthropicModel(modelId)) {
+      throw new Error(`Embeddings not supported for Anthropic models: ${modelId}`)
+    }
+
+    return this.openaiDelegate.getDimensions(modelId)
+  }
+
+  public async getKeyStatus(): Promise<KeyStatus | null> {
+    return this.openaiDelegate.getKeyStatus()
+  }
 }
diff --git a/src/main/presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts b/src/main/presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts
index 85a445624..74306ec15 100644
--- a/src/main/presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts
+++ b/src/main/presenter/mcpPresenter/inMemoryServers/conversationSearchServer.ts
@@ -266,11 +266,11 @@ export class ConversationSearchServer {
   // 获取对话历史
   private async getConversationHistory(conversationId: string, includeSystem: boolean = false) {
     try {
-      const session = await presenter.newAgentPresenter.getSession(conversationId)
+      const session = await presenter.agentSessionPresenter.getSession(conversationId)
       if (!session) {
         throw new Error(`Session not found: ${conversationId}`)
       }
-      const records = await presenter.newAgentPresenter.getMessages(conversationId)
+      const records = await presenter.agentSessionPresenter.getMessages(conversationId)
 
       const filteredMessages = includeSystem
         ? records
diff --git a/src/main/presenter/mcpPresenter/toolManager.ts b/src/main/presenter/mcpPresenter/toolManager.ts
index 282c04be9..134895241 100644
--- a/src/main/presenter/mcpPresenter/toolManager.ts
+++ b/src/main/presenter/mcpPresenter/toolManager.ts
@@ -281,7 +281,7 @@ export class ToolManager {
     }
 
     try {
-      const session = await presenter.newAgentPresenter.getSession(sessionId)
+      const session = await presenter.agentSessionPresenter.getSession(sessionId)
       const agentId = session?.agentId?.trim()
       const providerId = session?.providerId?.trim()
       if (session && providerId === 'acp' && agentId) {
diff --git a/src/main/presenter/remoteControlPresenter/feishu/feishuRuntime.ts b/src/main/presenter/remoteControlPresenter/feishu/feishuRuntime.ts
index 766dce897..97e38159f 100644
--- a/src/main/presenter/remoteControlPresenter/feishu/feishuRuntime.ts
+++ b/src/main/presenter/remoteControlPresenter/feishu/feishuRuntime.ts
@@ -4,6 +4,7 @@ import {
   FEISHU_INBOUND_DEDUP_TTL_MS,
   TELEGRAM_STREAM_POLL_INTERVAL_MS,
   buildFeishuEndpointKey,
+  type RemoteDeliverySegment,
   type FeishuInboundMessage,
   type FeishuOutboundAction,
   type FeishuRuntimeStatusSnapshot,
@@ -12,6 +13,7 @@ import {
 import { RemoteBindingStore } from '../services/remoteBindingStore'
 import { FeishuCommandRouter } from '../services/feishuCommandRouter'
 import type { RemoteConversationExecution } from '../services/remoteConversationRunner'
+import { REMOTE_NO_RESPONSE_TEXT } from '../services/remoteBlockRenderer'
 import {
   buildFeishuPendingInteractionCard,
   buildFeishuPendingInteractionText
@@ -44,10 +46,12 @@ type FeishuProcessedInboundEntry = {
 
 type FeishuRemoteDeliveryState = {
   sourceMessageId: string
-  statusMessageId: string | null
-  contentMessageIds: string[]
-  lastStatusText: string
-  lastContentText: string
+  segments: Array<{
+    key: string
+    kind: 'process' | 'answer' | 'terminal'
+    messageIds: Array<string | null>
+    lastText: string
+  }>
 }
 
 export class FeishuRuntime {
@@ -344,20 +348,10 @@ export class FeishuRuntime {
         sourceMessageId,
         deliveryState
       )
-      const statusText = snapshot.statusText?.trim() || ''
-      const streamText = snapshot.text?.trim() || ''
+      let deliverySegments = this.getSnapshotDeliverySegments(snapshot, sourceMessageId)
 
       if (sourceMessageId) {
-        deliveryState = deliveryState ?? {
-          sourceMessageId,
-          statusMessageId: null,
-          contentMessageIds: [],
-          lastStatusText: '',
-          lastContentText: ''
-        }
-
-        deliveryState = await this.syncStatusMessage(target, endpointKey, deliveryState, statusText)
-        deliveryState = await this.syncContentText(target, endpointKey, deliveryState, streamText)
+        deliveryState = deliveryState ?? this.createDeliveryState(sourceMessageId)
       }
 
       if (snapshot.completed) {
@@ -365,6 +359,14 @@ export class FeishuRuntime {
           return
         }
         if (snapshot.pendingInteraction) {
+          if (deliveryState && deliverySegments.length > 0) {
+            deliveryState = await this.syncDeliverySegments(
+              target,
+              endpointKey,
+              deliveryState,
+              deliverySegments
+            )
+          }
           await this.dispatchOutboundActions(
             target,
             [
@@ -379,15 +381,21 @@ export class FeishuRuntime {
           return
         }
 
-        const finalText = (snapshot.finalText ?? snapshot.fullText ?? snapshot.text).trim()
+        const finalText = this.getFinalDeliveryText(snapshot)
+        deliverySegments = this.appendTerminalDeliverySegment(
+          deliverySegments,
+          sourceMessageId,
+          finalText
+        )
         if (deliveryState) {
-          deliveryState = await this.syncFinalContentText(
-            target,
-            endpointKey,
-            deliveryState,
-            finalText
-          )
-          await this.deleteStatusMessage(deliveryState.statusMessageId)
+          if (deliverySegments.length > 0) {
+            deliveryState = await this.syncDeliverySegments(
+              target,
+              endpointKey,
+              deliveryState,
+              deliverySegments
+            )
+          }
           this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
         } else if (finalText) {
           await this.deps.client.sendText(target, finalText)
@@ -401,13 +409,12 @@ export class FeishuRuntime {
         }
         const timeoutText = 'The current conversation timed out before finishing. Please try again.'
         if (deliveryState) {
-          deliveryState = await this.syncFinalContentText(
+          deliveryState = await this.syncDeliverySegments(
             target,
             endpointKey,
             deliveryState,
-            timeoutText
+            this.appendTerminalDeliverySegment(deliverySegments, sourceMessageId, timeoutText)
           )
-          await this.deleteStatusMessage(deliveryState.statusMessageId)
           this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
         } else {
           await this.deps.client.sendText(target, timeoutText)
@@ -415,6 +422,15 @@ export class FeishuRuntime {
         return
       }
 
+      if (deliveryState && deliverySegments.length > 0) {
+        deliveryState = await this.syncDeliverySegments(
+          target,
+          endpointKey,
+          deliveryState,
+          deliverySegments
+        )
+      }
+
       await sleep(TELEGRAM_STREAM_POLL_INTERVAL_MS)
     }
   }
@@ -427,12 +443,15 @@ export class FeishuRuntime {
 
     return {
       sourceMessageId: state.sourceMessageId,
-      statusMessageId: typeof state.statusMessageId === 'string' ? state.statusMessageId : null,
-      contentMessageIds: state.contentMessageIds.filter(
-        (messageId): messageId is string => typeof messageId === 'string'
-      ),
-      lastStatusText: state.lastStatusText,
-      lastContentText: state.lastContentText
+      segments: state.segments.map((segment) => ({
+        key: segment.key,
+        kind: segment.kind,
+        messageIds: segment.messageIds.filter(
+          (messageId): messageId is string | null =>
+            typeof messageId === 'string' || messageId === null
+        ),
+        lastText: segment.lastText
+      }))
     }
   }
 
@@ -444,186 +463,224 @@ export class FeishuRuntime {
     return state
   }
 
+  private createDeliveryState(sourceMessageId: string): FeishuRemoteDeliveryState {
+    return {
+      sourceMessageId,
+      segments: []
+    }
+  }
+
   private async prepareDeliveryStateForSource(
     endpointKey: string,
     sourceMessageId: string | null,
     state: FeishuRemoteDeliveryState | null
   ): Promise<FeishuRemoteDeliveryState | null> {
     if (!state) {
-      return sourceMessageId
-        ? {
-            sourceMessageId,
-            statusMessageId: null,
-            contentMessageIds: [],
-            lastStatusText: '',
-            lastContentText: ''
-          }
-        : null
+      return sourceMessageId ? this.createDeliveryState(sourceMessageId) : null
     }
 
     if (sourceMessageId && state.sourceMessageId === sourceMessageId) {
       return state
     }
 
-    await this.deleteStatusMessage(state.statusMessageId)
     this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
 
     if (!sourceMessageId) {
       return null
     }
 
-    return {
-      sourceMessageId,
-      statusMessageId: null,
-      contentMessageIds: [],
-      lastStatusText: '',
-      lastContentText: ''
-    }
+    return this.createDeliveryState(sourceMessageId)
   }
 
-  private async syncStatusMessage(
-    target: FeishuTransportTarget,
-    endpointKey: string,
-    state: FeishuRemoteDeliveryState,
-    statusText: string
-  ): Promise<FeishuRemoteDeliveryState> {
-    const normalized = statusText.trim()
-    if (!normalized) {
-      return state
+  private getSnapshotDeliverySegments(
+    snapshot: Awaited<ReturnType<RemoteConversationExecution['getSnapshot']>>,
+    sourceMessageId: string | null
+  ): RemoteDeliverySegment[] {
+    if (snapshot.deliverySegments !== undefined) {
+      return snapshot.deliverySegments.filter((segment) => segment.text.trim().length > 0)
+    }
+
+    if (!sourceMessageId) {
+      return []
     }
 
-    if (!state.statusMessageId) {
-      const statusMessageId = await this.deps.client.sendText(target, normalized)
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        statusMessageId,
-        lastStatusText: normalized
+    const segments: RemoteDeliverySegment[] = []
+    const traceText = snapshot.traceText?.trim() || ''
+    const answerText = snapshot.text?.trim() || ''
+
+    if (traceText) {
+      segments.push({
+        key: `${sourceMessageId}:legacy:process`,
+        kind: 'process',
+        text: traceText,
+        sourceMessageId
       })
     }
 
-    if (normalized !== state.lastStatusText) {
-      await this.deps.client.updateText(state.statusMessageId, normalized)
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        lastStatusText: normalized
+    if (answerText) {
+      segments.push({
+        key: `${sourceMessageId}:legacy:answer`,
+        kind: 'answer',
+        text: answerText,
+        sourceMessageId
       })
     }
 
-    return state
+    return segments
   }
 
-  private async syncContentText(
-    target: FeishuTransportTarget,
-    endpointKey: string,
-    state: FeishuRemoteDeliveryState,
-    contentText: string
-  ): Promise<FeishuRemoteDeliveryState> {
-    const normalized = contentText.trim()
-    if (!normalized) {
-      return state
-    }
-
-    const nextChunks = chunkFeishuText(normalized)
-    const previousChunks = state.lastContentText ? chunkFeishuText(state.lastContentText) : []
-    const contentMessageIds = [...state.contentMessageIds]
+  private getFinalDeliveryText(
+    snapshot: Awaited<ReturnType<RemoteConversationExecution['getSnapshot']>>
+  ): string {
+    return (snapshot.finalText ?? snapshot.fullText ?? snapshot.text).trim()
+  }
 
-    if (contentMessageIds.length === 0) {
-      for (const chunk of nextChunks) {
-        const messageId = await this.deps.client.sendText(target, chunk)
-        if (messageId) {
-          contentMessageIds.push(messageId)
-        }
-      }
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        contentMessageIds,
-        lastContentText: normalized
-      })
+  private appendTerminalDeliverySegment(
+    segments: RemoteDeliverySegment[],
+    sourceMessageId: string | null,
+    finalText: string
+  ): RemoteDeliverySegment[] {
+    const normalized = finalText.trim()
+    if (!sourceMessageId || !normalized) {
+      return segments
     }
 
-    const editableIndex = Math.max(0, contentMessageIds.length - 1)
-    const retainedCount = Math.min(contentMessageIds.length, nextChunks.length)
-
-    for (let index = editableIndex; index < retainedCount; index += 1) {
-      if (previousChunks[index] === nextChunks[index]) {
-        continue
-      }
+    const lastAnswerSegment = [...segments].reverse().find((segment) => segment.kind === 'answer')
+    if (lastAnswerSegment?.text === normalized) {
+      return segments
+    }
 
-      await this.deps.client.updateText(contentMessageIds[index], nextChunks[index])
+    if (normalized === REMOTE_NO_RESPONSE_TEXT && segments.length > 0) {
+      return segments
     }
 
-    for (let index = contentMessageIds.length; index < nextChunks.length; index += 1) {
-      const messageId = await this.deps.client.sendText(target, nextChunks[index])
-      if (messageId) {
-        contentMessageIds.push(messageId)
+    return [
+      ...segments,
+      {
+        key: `${sourceMessageId}:terminal`,
+        kind: 'terminal',
+        text: normalized,
+        sourceMessageId
       }
+    ]
+  }
+
+  private isDeliveryStateCompatible(
+    state: FeishuRemoteDeliveryState,
+    segments: RemoteDeliverySegment[]
+  ): boolean {
+    if (segments.length < state.segments.length) {
+      return false
     }
 
-    return this.rememberDeliveryState(endpointKey, {
-      ...state,
-      contentMessageIds,
-      lastContentText: normalized
-    })
+    return state.segments.every((segment, index) => segments[index]?.key === segment.key)
   }
 
-  private async syncFinalContentText(
+  private async syncDeliverySegments(
     target: FeishuTransportTarget,
     endpointKey: string,
     state: FeishuRemoteDeliveryState,
-    finalText: string
+    segments: RemoteDeliverySegment[]
   ): Promise<FeishuRemoteDeliveryState> {
-    const normalized = finalText.trim()
-    if (!normalized) {
+    if (segments.length === 0) {
       return state
     }
 
-    const nextChunks = chunkFeishuText(normalized)
-    const previousChunks = state.lastContentText ? chunkFeishuText(state.lastContentText) : []
-    const contentMessageIds = [...state.contentMessageIds]
+    let nextState = state
+    if (!this.isDeliveryStateCompatible(nextState, segments)) {
+      this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
+      nextState = this.createDeliveryState(state.sourceMessageId)
+    }
 
-    for (let index = 0; index < nextChunks.length; index += 1) {
-      if (index < contentMessageIds.length) {
-        if (previousChunks[index] === nextChunks[index]) {
-          continue
-        }
+    const syncedSegments: FeishuRemoteDeliveryState['segments'] = []
 
-        await this.deps.client.updateText(contentMessageIds[index], nextChunks[index])
-        continue
+    for (const [index, segment] of segments.entries()) {
+      const syncedSegment = await this.syncDeliverySegment(
+        target,
+        nextState.segments[index] ?? null,
+        segment
+      )
+      syncedSegments.push(syncedSegment)
+    }
+
+    return this.rememberDeliveryState(endpointKey, {
+      sourceMessageId: nextState.sourceMessageId,
+      segments: syncedSegments
+    })
+  }
+
+  private async syncDeliverySegment(
+    target: FeishuTransportTarget,
+    existing: FeishuRemoteDeliveryState['segments'][number] | null,
+    segment: RemoteDeliverySegment
+  ): Promise<FeishuRemoteDeliveryState['segments'][number]> {
+    const normalized = segment.text.trim()
+    const nextChunks = chunkFeishuText(normalized)
+
+    if (!existing) {
+      const messageIds: Array<string | null> = []
+      for (const chunk of nextChunks) {
+        const messageId = await this.deps.client.sendText(target, chunk)
+        messageIds.push(messageId ?? null)
       }
 
-      const messageId = await this.deps.client.sendText(target, nextChunks[index])
-      if (messageId) {
-        contentMessageIds.push(messageId)
+      return {
+        key: segment.key,
+        kind: segment.kind,
+        messageIds,
+        lastText: normalized
       }
     }
 
-    for (const messageId of contentMessageIds.slice(nextChunks.length)) {
-      await this.deleteMessage(messageId)
+    const previousChunks = existing.lastText ? chunkFeishuText(existing.lastText) : []
+    if (
+      nextChunks.length < existing.messageIds.length ||
+      previousChunks.length < existing.messageIds.length ||
+      previousChunks
+        .slice(0, Math.max(0, existing.messageIds.length - 1))
+        .some((chunk, index) => chunk !== nextChunks[index])
+    ) {
+      const messageIds: Array<string | null> = []
+      for (const chunk of nextChunks) {
+        const messageId = await this.deps.client.sendText(target, chunk)
+        messageIds.push(messageId ?? null)
+      }
+
+      return {
+        key: segment.key,
+        kind: segment.kind,
+        messageIds,
+        lastText: normalized
+      }
     }
 
-    return this.rememberDeliveryState(endpointKey, {
-      ...state,
-      contentMessageIds: contentMessageIds.slice(0, nextChunks.length),
-      lastContentText: normalized
-    })
-  }
+    const messageIds = [...existing.messageIds]
+    const editableIndex = Math.max(0, messageIds.length - 1)
+    const retainedCount = Math.min(messageIds.length, nextChunks.length)
 
-  private async deleteStatusMessage(messageId: string | null): Promise<void> {
-    if (!messageId) {
-      return
+    for (let index = editableIndex; index < retainedCount; index += 1) {
+      if (previousChunks[index] === nextChunks[index]) {
+        continue
+      }
+
+      const messageId = messageIds[index]
+      if (!messageId) {
+        continue
+      }
+
+      await this.deps.client.updateText(messageId, nextChunks[index])
     }
 
-    await this.deleteMessage(messageId)
-  }
+    for (let index = messageIds.length; index < nextChunks.length; index += 1) {
+      const messageId = await this.deps.client.sendText(target, nextChunks[index])
+      messageIds.push(messageId ?? null)
+    }
 
-  private async deleteMessage(messageId: string): Promise<void> {
-    try {
-      await this.deps.client.deleteMessage(messageId)
-    } catch (error) {
-      console.warn('[FeishuRuntime] Failed to delete message:', {
-        messageId,
-        error
-      })
+    return {
+      key: segment.key,
+      kind: segment.kind,
+      messageIds,
+      lastText: normalized
     }
   }
 
diff --git a/src/main/presenter/remoteControlPresenter/index.ts b/src/main/presenter/remoteControlPresenter/index.ts
index 96965ff75..8f0c69343 100644
--- a/src/main/presenter/remoteControlPresenter/index.ts
+++ b/src/main/presenter/remoteControlPresenter/index.ts
@@ -683,8 +683,8 @@ export class RemoteControlPresenter {
     return new RemoteConversationRunner(
       {
         configPresenter: this.deps.configPresenter,
-        newAgentPresenter: this.deps.newAgentPresenter,
-        deepchatAgentPresenter: this.deps.deepchatAgentPresenter,
+        agentSessionPresenter: this.deps.agentSessionPresenter,
+        agentRuntimePresenter: this.deps.agentRuntimePresenter,
         windowPresenter: this.deps.windowPresenter,
         tabPresenter: this.deps.tabPresenter,
         resolveDefaultAgentId: async () =>
diff --git a/src/main/presenter/remoteControlPresenter/interface.ts b/src/main/presenter/remoteControlPresenter/interface.ts
index cdcd74b01..63b130564 100644
--- a/src/main/presenter/remoteControlPresenter/interface.ts
+++ b/src/main/presenter/remoteControlPresenter/interface.ts
@@ -2,18 +2,18 @@ import type { HookTestResult, HooksNotificationsSettings } from '@shared/hooksNo
 import type {
   FeishuRemoteSettings,
   IConfigPresenter,
-  INewAgentPresenter,
+  IAgentSessionPresenter,
   IRemoteControlPresenter,
   ITabPresenter,
   IWindowPresenter,
   TelegramRemoteSettings
 } from '@shared/presenter'
-import type { DeepChatAgentPresenter } from '../deepchatAgentPresenter'
+import type { AgentRuntimePresenter } from '../agentRuntimePresenter'
 
 export interface RemoteControlPresenterDeps {
   configPresenter: IConfigPresenter
-  newAgentPresenter: INewAgentPresenter
-  deepchatAgentPresenter: DeepChatAgentPresenter
+  agentSessionPresenter: IAgentSessionPresenter
+  agentRuntimePresenter: AgentRuntimePresenter
   windowPresenter: IWindowPresenter
   tabPresenter: ITabPresenter
   getHooksNotificationsConfig: () => HooksNotificationsSettings
diff --git a/src/main/presenter/remoteControlPresenter/services/remoteBindingStore.ts b/src/main/presenter/remoteControlPresenter/services/remoteBindingStore.ts
index b72f48ebe..224ed63ae 100644
--- a/src/main/presenter/remoteControlPresenter/services/remoteBindingStore.ts
+++ b/src/main/presenter/remoteControlPresenter/services/remoteBindingStore.ts
@@ -24,10 +24,12 @@ import {
 
 export interface RemoteDeliveryState {
   sourceMessageId: string
-  statusMessageId: string | number | null
-  contentMessageIds: Array<string | number>
-  lastStatusText: string
-  lastContentText: string
+  segments: Array<{
+    key: string
+    kind: 'process' | 'answer' | 'terminal'
+    messageIds: Array<string | number | null>
+    lastText: string
+  }>
 }
 
 export class RemoteBindingStore {
@@ -407,10 +409,12 @@ export class RemoteBindingStore {
   rememberRemoteDeliveryState(endpointKey: string, state: RemoteDeliveryState): void {
     this.remoteDeliveryStates.set(endpointKey, {
       sourceMessageId: state.sourceMessageId,
-      statusMessageId: state.statusMessageId,
-      contentMessageIds: [...state.contentMessageIds],
-      lastStatusText: state.lastStatusText,
-      lastContentText: state.lastContentText
+      segments: state.segments.map((segment) => ({
+        key: segment.key,
+        kind: segment.kind,
+        messageIds: [...segment.messageIds],
+        lastText: segment.lastText
+      }))
     })
   }
 
@@ -422,10 +426,12 @@ export class RemoteBindingStore {
 
     return {
       sourceMessageId: state.sourceMessageId,
-      statusMessageId: state.statusMessageId,
-      contentMessageIds: [...state.contentMessageIds],
-      lastStatusText: state.lastStatusText,
-      lastContentText: state.lastContentText
+      segments: state.segments.map((segment) => ({
+        key: segment.key,
+        kind: segment.kind,
+        messageIds: [...segment.messageIds],
+        lastText: segment.lastText
+      }))
     }
   }
 
diff --git a/src/main/presenter/remoteControlPresenter/services/remoteBlockRenderer.ts b/src/main/presenter/remoteControlPresenter/services/remoteBlockRenderer.ts
index 02ada6dcd..61b091398 100644
--- a/src/main/presenter/remoteControlPresenter/services/remoteBlockRenderer.ts
+++ b/src/main/presenter/remoteControlPresenter/services/remoteBlockRenderer.ts
@@ -1,14 +1,17 @@
 import type { AssistantMessageBlock } from '@shared/types/agent-interface'
 import type { SearchResult } from '@shared/types/core/search'
-import type { RemoteRenderableBlock } from '../types'
+import { summarizeToolCallPreview } from '@shared/lib/toolCallSummary'
+import type { RemoteDeliverySegment, RemoteRenderableBlock } from '../types'
 
 const TOOL_ARGS_PREVIEW_LIMIT = 1_200
 const TOOL_RESULT_PREVIEW_LIMIT = 1_600
 const SEARCH_RESULT_LIMIT = 5
 const SEARCH_SNIPPET_LIMIT = 220
+const TRACE_PREVIEW_LIMIT = 160
 const DEFAULT_REMOTE_STATUS_TEXT = 'Running...'
 export const REMOTE_WAITING_STATUS_TEXT = 'Waiting for your response...'
 const DEFAULT_REMOTE_ERROR_TEXT = 'The conversation ended with an error.'
+export const REMOTE_NO_RESPONSE_TEXT = 'No assistant response was produced.'
 
 const normalizeText = (value: string | undefined | null): string =>
   (value ?? '').replace(/\r\n/g, '\n').trim()
@@ -200,6 +203,113 @@ const formatImageNoticeBlock = (block: AssistantMessageBlock): string => {
 
 const formatErrorBlock = (content: string): string => buildSection('[Error]', content)
 
+const truncateSingleLine = (value: string, limit: number): string => {
+  const normalized = value.trim()
+  if (!normalized) {
+    return ''
+  }
+
+  if (normalized.length <= limit) {
+    return normalized
+  }
+
+  return `${normalized.slice(0, Math.max(0, limit - 3)).trimEnd()}...`
+}
+
+const escapeTracePreview = (value: string): string =>
+  value.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+
+const getTracePreview = (
+  value: string | undefined | null,
+  fallback: string = '(none)',
+  limit: number = TRACE_PREVIEW_LIMIT
+): string => {
+  const preview = summarizeToolCallPreview(value) || fallback
+  return escapeTracePreview(truncateSingleLine(preview, limit))
+}
+
+const getTraceEmoji = (toolName: string): string => {
+  const normalized = toolName.trim().toLowerCase()
+
+  if (!normalized) {
+    return '🛠'
+  }
+
+  if (normalized.includes('cron') || normalized.includes('schedule')) {
+    return '⏰'
+  }
+
+  if (
+    normalized === 'grep' ||
+    normalized === 'find' ||
+    normalized.includes('search') ||
+    normalized.includes('grep')
+  ) {
+    return '🔎'
+  }
+
+  if (
+    normalized === 'read' ||
+    normalized === 'cat' ||
+    normalized.includes('read') ||
+    normalized.includes('open')
+  ) {
+    return '📖'
+  }
+
+  if (
+    normalized === 'write' ||
+    normalized === 'edit' ||
+    normalized.includes('write') ||
+    normalized.includes('edit')
+  ) {
+    return '📝'
+  }
+
+  if (normalized === 'ls' || normalized.includes('list') || normalized.includes('directory')) {
+    return '📂'
+  }
+
+  if (
+    normalized === 'exec' ||
+    normalized === 'process' ||
+    normalized.includes('exec') ||
+    normalized.includes('process') ||
+    normalized.includes('terminal') ||
+    normalized.includes('shell') ||
+    normalized.includes('command')
+  ) {
+    return '💻'
+  }
+
+  return '🛠'
+}
+
+const getProcessLogLines = (block: AssistantMessageBlock): string[] => {
+  if (block.type !== 'tool_call' || !isToolCallArgsComplete(block)) {
+    return []
+  }
+
+  const toolName = normalizeText(block.tool_call?.name) || 'unknown_tool'
+  const lines = [
+    `${getTraceEmoji(toolName)} ${toolName}: "${getTracePreview(block.tool_call?.params)}"`
+  ]
+
+  if (block.status === 'error') {
+    lines.push(
+      `❌ ${toolName}: "${getTracePreview(block.tool_call?.response || block.content, 'error')}"`
+    )
+  }
+
+  return lines
+}
+
+export const buildRemoteTraceText = (blocks: AssistantMessageBlock[]): string =>
+  blocks
+    .flatMap((block) => getProcessLogLines(block))
+    .join('\n')
+    .trim()
+
 const isRenderableNarrativeBlock = (block: AssistantMessageBlock): boolean =>
   (block.type === 'content' || block.type === 'reasoning_content') &&
   block.status !== 'pending' &&
@@ -248,6 +358,78 @@ export const buildRemoteStreamText = (blocks: AssistantMessageBlock[]): string =
     .join('\n\n')
     .trim()
 
+export const buildRemoteDeliverySegments = (
+  messageId: string,
+  blocks: AssistantMessageBlock[]
+): RemoteDeliverySegment[] => {
+  const segments: RemoteDeliverySegment[] = []
+  let current: {
+    key: string
+    kind: 'process' | 'answer'
+    parts: string[]
+  } | null = null
+
+  const flushCurrent = () => {
+    if (!current) {
+      return
+    }
+
+    const text = current.parts.join(current.kind === 'process' ? '\n' : '\n\n').trim()
+    if (!text) {
+      current = null
+      return
+    }
+
+    segments.push({
+      key: current.key,
+      kind: current.kind,
+      text,
+      sourceMessageId: messageId
+    })
+    current = null
+  }
+
+  for (const [index, block] of blocks.entries()) {
+    const processLines = getProcessLogLines(block)
+    if (processLines.length > 0) {
+      if (!current || current.kind !== 'process') {
+        flushCurrent()
+        current = {
+          key: `${messageId}:${index}:process`,
+          kind: 'process',
+          parts: []
+        }
+      }
+      current.parts.push(...processLines)
+      continue
+    }
+
+    if (block.type !== 'content') {
+      continue
+    }
+
+    const content = normalizeText(block.content)
+    if (!content) {
+      continue
+    }
+
+    if (!current || current.kind !== 'answer') {
+      flushCurrent()
+      current = {
+        key: `${messageId}:${index}:answer`,
+        kind: 'answer',
+        parts: []
+      }
+    }
+
+    current.parts.push(content)
+  }
+
+  flushCurrent()
+
+  return segments
+}
+
 const isToolCallArgsComplete = (block: AssistantMessageBlock): boolean =>
   block.status !== 'pending' || block.extra?.toolCallArgsComplete === true
 
diff --git a/src/main/presenter/remoteControlPresenter/services/remoteConversationRunner.ts b/src/main/presenter/remoteControlPresenter/services/remoteConversationRunner.ts
index 71196f548..c18cb1836 100644
--- a/src/main/presenter/remoteControlPresenter/services/remoteConversationRunner.ts
+++ b/src/main/presenter/remoteControlPresenter/services/remoteConversationRunner.ts
@@ -7,14 +7,15 @@ import type {
 import type { SearchResult } from '@shared/types/core/search'
 import type {
   IConfigPresenter,
-  INewAgentPresenter,
+  IAgentSessionPresenter,
   RemoteChannel,
   ITabPresenter,
   IWindowPresenter
 } from '@shared/presenter'
-import type { DeepChatAgentPresenter } from '../../deepchatAgentPresenter'
+import type { AgentRuntimePresenter } from '../../agentRuntimePresenter'
 import {
   TELEGRAM_RECENT_SESSION_LIMIT,
+  type RemoteDeliverySegment,
   TELEGRAM_STREAM_POLL_INTERVAL_MS,
   type RemoteEndpointBindingMeta,
   type RemoteRenderableBlock,
@@ -23,11 +24,14 @@ import {
 } from '../types'
 import { safeParseAssistantBlocks } from '../telegram/telegramOutbound'
 import {
+  REMOTE_NO_RESPONSE_TEXT,
   REMOTE_WAITING_STATUS_TEXT,
+  buildRemoteDeliverySegments,
   buildRemoteDraftText,
   buildRemoteFinalText,
   buildRemoteFullText,
   buildRemoteRenderableBlocks,
+  buildRemoteTraceText,
   buildRemoteStreamText,
   buildRemoteStatusText
 } from './remoteBlockRenderer'
@@ -41,6 +45,8 @@ const sleep = async (ms: number): Promise<void> => {
 export interface RemoteConversationSnapshot {
   messageId: string | null
   text: string
+  traceText?: string
+  deliverySegments?: RemoteDeliverySegment[]
   statusText?: string
   finalText?: string
   draftText?: string
@@ -77,8 +83,8 @@ export type RemoteOpenSessionResult =
 
 type RemoteConversationRunnerDeps = {
   configPresenter: IConfigPresenter
-  newAgentPresenter: INewAgentPresenter
-  deepchatAgentPresenter: DeepChatAgentPresenter
+  agentSessionPresenter: IAgentSessionPresenter
+  agentRuntimePresenter: AgentRuntimePresenter
   windowPresenter: IWindowPresenter
   tabPresenter: ITabPresenter
   resolveDefaultAgentId: () => Promise<string>
@@ -113,7 +119,7 @@ export class RemoteConversationRunner {
       )
     }
 
-    const session = await this.deps.newAgentPresenter.createDetachedSession({
+    const session = await this.deps.agentSessionPresenter.createDetachedSession({
       title: title?.trim() || 'New Chat',
       agentId,
       ...(agentType === 'acp'
@@ -138,7 +144,7 @@ export class RemoteConversationRunner {
       return null
     }
 
-    const session = await this.deps.newAgentPresenter.getSession(binding.sessionId)
+    const session = await this.deps.agentSessionPresenter.getSession(binding.sessionId)
     if (!session) {
       this.bindingStore.clearBinding(endpointKey)
       return null
@@ -161,7 +167,7 @@ export class RemoteConversationRunner {
 
   async listSessions(endpointKey: string): Promise<SessionWithState[]> {
     const agentId = await this.resolveSessionListAgentId(endpointKey)
-    const sessions = await this.deps.newAgentPresenter.getSessionList({
+    const sessions = await this.deps.agentSessionPresenter.getSessionList({
       agentId
     })
     const sorted = [...sessions]
@@ -189,7 +195,7 @@ export class RemoteConversationRunner {
       throw new Error('Session index is out of range.')
     }
 
-    const session = await this.deps.newAgentPresenter.getSession(sessionId)
+    const session = await this.deps.agentSessionPresenter.getSession(sessionId)
     if (!session) {
       throw new Error('Selected session no longer exists.')
     }
@@ -231,7 +237,7 @@ export class RemoteConversationRunner {
       throw new Error('No bound session. Send a message, /new, or /use first.')
     }
 
-    return await this.deps.newAgentPresenter.setSessionModel(session.id, providerId, modelId)
+    return await this.deps.agentSessionPresenter.setSessionModel(session.id, providerId, modelId)
   }
 
   async sendText(
@@ -240,12 +246,12 @@ export class RemoteConversationRunner {
     bindingMeta?: RemoteEndpointBindingMeta
   ): Promise<RemoteConversationExecution> {
     const session = await this.ensureBoundSession(endpointKey, bindingMeta)
-    const beforeMessages = await this.deps.newAgentPresenter.getMessages(session.id)
+    const beforeMessages = await this.deps.agentSessionPresenter.getMessages(session.id)
     const lastOrderSeq = beforeMessages.at(-1)?.orderSeq ?? 0
     const previousActiveEventId =
-      this.deps.deepchatAgentPresenter.getActiveGeneration(session.id)?.eventId ?? null
+      this.deps.agentRuntimePresenter.getActiveGeneration(session.id)?.eventId ?? null
 
-    await this.deps.newAgentPresenter.sendMessage(session.id, text)
+    await this.deps.agentSessionPresenter.sendMessage(session.id, text)
 
     const seededMessage = await this.waitForAssistantMessage(session.id, lastOrderSeq, 800, {
       ignoreMessageId: previousActiveEventId
@@ -293,7 +299,7 @@ export class RemoteConversationRunner {
       throw new Error('No pending interaction was found.')
     }
 
-    const result = await this.deps.newAgentPresenter.respondToolInteraction(
+    const result = await this.deps.agentSessionPresenter.respondToolInteraction(
       session.id,
       interaction.messageId,
       interaction.toolCallId,
@@ -327,14 +333,14 @@ export class RemoteConversationRunner {
 
     const activeEventId =
       this.bindingStore.getActiveEvent(endpointKey) ??
-      this.deps.deepchatAgentPresenter.getActiveGeneration(session.id)?.eventId ??
+      this.deps.agentRuntimePresenter.getActiveGeneration(session.id)?.eventId ??
       null
 
     if (!activeEventId) {
       return false
     }
 
-    const stopped = await this.deps.deepchatAgentPresenter.cancelGenerationByEventId(
+    const stopped = await this.deps.agentRuntimePresenter.cancelGenerationByEventId(
       session.id,
       activeEventId
     )
@@ -359,7 +365,7 @@ export class RemoteConversationRunner {
       }
     }
 
-    await this.deps.newAgentPresenter.activateSession(window.webContents.id, session.id)
+    await this.deps.agentSessionPresenter.activateSession(window.webContents.id, session.id)
     this.deps.windowPresenter.show(window.id, true)
     return {
       status: 'ok',
@@ -382,7 +388,7 @@ export class RemoteConversationRunner {
 
     const activeEventId =
       this.bindingStore.getActiveEvent(endpointKey) ??
-      this.deps.deepchatAgentPresenter.getActiveGeneration(session.id)?.eventId ??
+      this.deps.agentRuntimePresenter.getActiveGeneration(session.id)?.eventId ??
       null
 
     return {
@@ -454,12 +460,14 @@ export class RemoteConversationRunner {
       ignoreMessageId: string | null
     }
   ): Promise<RemoteConversationSnapshot> {
-    const session = await this.deps.newAgentPresenter.getSession(sessionId)
+    const session = await this.deps.agentSessionPresenter.getSession(sessionId)
     if (!session) {
       this.bindingStore.clearBinding(endpointKey)
       return {
         messageId: null,
         text: 'The bound session no longer exists.',
+        traceText: '',
+        deliverySegments: [],
         statusText: '',
         finalText: 'The bound session no longer exists.',
         draftText: '',
@@ -470,7 +478,7 @@ export class RemoteConversationRunner {
       }
     }
 
-    const activeGeneration = this.deps.deepchatAgentPresenter.getActiveGeneration(sessionId)
+    const activeGeneration = this.deps.agentRuntimePresenter.getActiveGeneration(sessionId)
     const trackedMessage = await this.resolveTrackedAssistantMessage(
       sessionId,
       tracking,
@@ -490,11 +498,13 @@ export class RemoteConversationRunner {
       return {
         messageId: null,
         text: completed ? 'No assistant response was produced.' : '',
+        traceText: '',
+        deliverySegments: [],
         statusText: completed ? '' : buildRemoteStatusText([]),
-        finalText: completed ? 'No assistant response was produced.' : '',
+        finalText: completed ? REMOTE_NO_RESPONSE_TEXT : '',
         draftText: '',
         renderBlocks: [],
-        fullText: completed ? 'No assistant response was produced.' : '',
+        fullText: completed ? REMOTE_NO_RESPONSE_TEXT : '',
         completed,
         pendingInteraction: null
       }
@@ -502,7 +512,9 @@ export class RemoteConversationRunner {
 
     const blocks = safeParseAssistantBlocks(trackedMessage.content)
     const streamText = buildRemoteStreamText(blocks)
+    const traceText = buildRemoteTraceText(blocks)
     const draftText = buildRemoteDraftText(blocks)
+    const deliverySegments = buildRemoteDeliverySegments(trackedMessage.id, blocks)
     const renderBlocks = await buildRemoteRenderableBlocks({
       messageId: trackedMessage.id,
       blocks,
@@ -520,7 +532,7 @@ export class RemoteConversationRunner {
       preferTerminalError: trackedMessage.status === 'error',
       fallbackErrorText:
         trackedMessage.status === 'error' ? 'The conversation ended with an error.' : undefined,
-      fallbackNoResponseText: 'No assistant response was produced.'
+      fallbackNoResponseText: REMOTE_NO_RESPONSE_TEXT
     })
     const completed =
       Boolean(pendingInteraction) ||
@@ -534,6 +546,8 @@ export class RemoteConversationRunner {
     return {
       messageId: trackedMessage.id,
       text: streamText,
+      traceText,
+      deliverySegments,
       statusText: pendingInteraction ? REMOTE_WAITING_STATUS_TEXT : statusText,
       finalText,
       draftText,
@@ -547,12 +561,12 @@ export class RemoteConversationRunner {
   }
 
   private async loadSearchResults(messageId: string, searchId?: string): Promise<SearchResult[]> {
-    if (typeof this.deps.newAgentPresenter.getSearchResults !== 'function') {
+    if (typeof this.deps.agentSessionPresenter.getSearchResults !== 'function') {
       return []
     }
 
     try {
-      return await this.deps.newAgentPresenter.getSearchResults(messageId, searchId)
+      return await this.deps.agentSessionPresenter.getSearchResults(messageId, searchId)
     } catch (error) {
       console.warn('[RemoteConversationRunner] Failed to load search results:', {
         messageId,
@@ -573,9 +587,9 @@ export class RemoteConversationRunner {
   ): Promise<ChatMessageRecord | null> {
     const deadline = Date.now() + timeoutMs
     while (Date.now() < deadline) {
-      const activeGeneration = this.deps.deepchatAgentPresenter.getActiveGeneration(sessionId)
+      const activeGeneration = this.deps.agentRuntimePresenter.getActiveGeneration(sessionId)
       if (activeGeneration?.eventId && activeGeneration.eventId !== options?.ignoreMessageId) {
-        const message = await this.deps.newAgentPresenter.getMessage(activeGeneration.eventId)
+        const message = await this.deps.agentSessionPresenter.getMessage(activeGeneration.eventId)
         if (message?.role === 'assistant') {
           return message
         }
@@ -611,7 +625,7 @@ export class RemoteConversationRunner {
         continue
       }
 
-      const message = await this.deps.newAgentPresenter.getMessage(messageId)
+      const message = await this.deps.agentSessionPresenter.getMessage(messageId)
       if (message?.role === 'assistant') {
         return message
       }
@@ -629,7 +643,7 @@ export class RemoteConversationRunner {
     afterOrderSeq: number,
     ignoreMessageId?: string | null
   ): Promise<ChatMessageRecord | null> {
-    const messages = await this.deps.newAgentPresenter.getMessages(sessionId)
+    const messages = await this.deps.agentSessionPresenter.getMessages(sessionId)
     const assistants = messages.filter(
       (message) =>
         message.role === 'assistant' &&
@@ -662,7 +676,7 @@ export class RemoteConversationRunner {
   private async getCurrentPendingInteractionDetails(
     sessionId: string
   ): Promise<PendingInteractionDetails | null> {
-    const messages = await this.deps.newAgentPresenter.getMessages(sessionId)
+    const messages = await this.deps.agentSessionPresenter.getMessages(sessionId)
     const assistants = [...messages]
       .filter((message) => message.role === 'assistant')
       .sort((left, right) => right.orderSeq - left.orderSeq)
diff --git a/src/main/presenter/remoteControlPresenter/telegram/telegramPoller.ts b/src/main/presenter/remoteControlPresenter/telegram/telegramPoller.ts
index 6d4722f1a..a6fe8bce3 100644
--- a/src/main/presenter/remoteControlPresenter/telegram/telegramPoller.ts
+++ b/src/main/presenter/remoteControlPresenter/telegram/telegramPoller.ts
@@ -4,6 +4,7 @@ import {
   TELEGRAM_REMOTE_POLL_TIMEOUT_SEC,
   TELEGRAM_STREAM_POLL_INTERVAL_MS,
   TELEGRAM_TYPING_DELAY_MS,
+  type RemoteDeliverySegment,
   type RemotePendingInteraction,
   type TelegramInboundMessage,
   type TelegramOutboundAction,
@@ -11,11 +12,13 @@ import {
   type TelegramTransportTarget
 } from '../types'
 import { RemoteBindingStore } from '../services/remoteBindingStore'
+import { REMOTE_NO_RESPONSE_TEXT } from '../services/remoteBlockRenderer'
 import {
   RemoteCommandRouter,
   type RemoteCommandRouteContinuation,
   type RemoteCommandRouteResult
 } from '../services/remoteCommandRouter'
+import type { RemoteConversationExecution } from '../services/remoteConversationRunner'
 import { chunkTelegramText } from './telegramOutbound'
 import { buildTelegramPendingInteractionPrompt } from './telegramInteractionPrompt'
 import { TelegramApiRequestError, TelegramClient, type TelegramRawUpdate } from './telegramClient'
@@ -56,10 +59,12 @@ type TelegramPollerDeps = {
 
 type TelegramRemoteDeliveryState = {
   sourceMessageId: string
-  statusMessageId: number | null
-  contentMessageIds: number[]
-  lastStatusText: string
-  lastContentText: string
+  segments: Array<{
+    key: string
+    kind: 'process' | 'answer' | 'terminal'
+    messageIds: Array<number | null>
+    lastText: string
+  }>
 }
 
 export class TelegramPoller {
@@ -325,49 +330,62 @@ export class TelegramPoller {
       const sourceMessageId = snapshot.messageId ?? execution.eventId ?? null
       let deliveryState = this.getStoredDeliveryState(endpointKey)
       deliveryState = await this.prepareDeliveryStateForSource(
-        target,
         endpointKey,
         sourceMessageId,
         deliveryState
       )
-      const statusText = snapshot.statusText?.trim() || ''
-      const streamText = snapshot.text?.trim() || ''
+      let deliverySegments = this.getSnapshotDeliverySegments(snapshot, sourceMessageId)
 
       if (sourceMessageId) {
-        deliveryState = deliveryState ?? {
-          sourceMessageId,
-          statusMessageId: null,
-          contentMessageIds: [],
-          lastStatusText: '',
-          lastContentText: ''
-        }
-
-        deliveryState = await this.syncStatusMessage(target, endpointKey, deliveryState, statusText)
-        deliveryState = await this.syncContentText(target, endpointKey, deliveryState, streamText)
+        deliveryState = deliveryState ?? this.createDeliveryState(sourceMessageId)
       }
 
       if (snapshot.completed) {
         if (snapshot.pendingInteraction) {
+          if (deliveryState && deliverySegments.length > 0) {
+            deliveryState = await this.syncDeliverySegments(
+              target,
+              endpointKey,
+              deliveryState,
+              deliverySegments
+            )
+          }
           await this.sendPendingInteractionPrompt(target, snapshot.pendingInteraction)
           return
         }
 
-        const finalText = (snapshot.finalText ?? snapshot.fullText ?? snapshot.text).trim()
+        const finalText = this.getFinalDeliveryText(snapshot)
+        deliverySegments = this.appendTerminalDeliverySegment(
+          deliverySegments,
+          sourceMessageId,
+          finalText
+        )
+
         if (deliveryState) {
-          deliveryState = await this.syncFinalContentText(
-            target,
-            endpointKey,
-            deliveryState,
-            finalText
-          )
-          await this.deleteStatusMessage(target, deliveryState.statusMessageId)
+          if (deliverySegments.length > 0) {
+            deliveryState = await this.syncDeliverySegments(
+              target,
+              endpointKey,
+              deliveryState,
+              deliverySegments
+            )
+          }
           this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
-        } else {
+        } else if (finalText) {
           await this.sendChunkedMessage(target, finalText)
         }
         return
       }
 
+      if (deliveryState && deliverySegments.length > 0) {
+        deliveryState = await this.syncDeliverySegments(
+          target,
+          endpointKey,
+          deliveryState,
+          deliverySegments
+        )
+      }
+
       if (!typingSent && Date.now() - startedAt >= TELEGRAM_TYPING_DELAY_MS) {
         typingSent = true
         await this.sendTyping(target)
@@ -385,12 +403,15 @@ export class TelegramPoller {
 
     return {
       sourceMessageId: state.sourceMessageId,
-      statusMessageId: typeof state.statusMessageId === 'number' ? state.statusMessageId : null,
-      contentMessageIds: state.contentMessageIds.filter(
-        (messageId): messageId is number => typeof messageId === 'number'
-      ),
-      lastStatusText: state.lastStatusText,
-      lastContentText: state.lastContentText
+      segments: state.segments.map((segment) => ({
+        key: segment.key,
+        kind: segment.kind,
+        messageIds: segment.messageIds.filter(
+          (messageId): messageId is number | null =>
+            typeof messageId === 'number' || messageId === null
+        ),
+        lastText: segment.lastText
+      }))
     }
   }
 
@@ -402,201 +423,227 @@ export class TelegramPoller {
     return state
   }
 
+  private createDeliveryState(sourceMessageId: string): TelegramRemoteDeliveryState {
+    return {
+      sourceMessageId,
+      segments: []
+    }
+  }
+
   private async prepareDeliveryStateForSource(
-    target: TelegramTransportTarget,
     endpointKey: string,
     sourceMessageId: string | null,
     state: TelegramRemoteDeliveryState | null
   ): Promise<TelegramRemoteDeliveryState | null> {
     if (!state) {
-      return sourceMessageId
-        ? {
-            sourceMessageId,
-            statusMessageId: null,
-            contentMessageIds: [],
-            lastStatusText: '',
-            lastContentText: ''
-          }
-        : null
+      return sourceMessageId ? this.createDeliveryState(sourceMessageId) : null
     }
 
     if (sourceMessageId && state.sourceMessageId === sourceMessageId) {
       return state
     }
 
-    await this.deleteStatusMessage(target, state.statusMessageId)
     this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
 
     if (!sourceMessageId) {
       return null
     }
 
-    return {
-      sourceMessageId,
-      statusMessageId: null,
-      contentMessageIds: [],
-      lastStatusText: '',
-      lastContentText: ''
-    }
+    return this.createDeliveryState(sourceMessageId)
   }
 
-  private async syncStatusMessage(
-    target: TelegramTransportTarget,
-    endpointKey: string,
-    state: TelegramRemoteDeliveryState,
-    statusText: string
-  ): Promise<TelegramRemoteDeliveryState> {
-    const normalized = statusText.trim()
-    if (!normalized) {
-      return state
+  private getSnapshotDeliverySegments(
+    snapshot: Awaited<ReturnType<RemoteConversationExecution['getSnapshot']>>,
+    sourceMessageId: string | null
+  ): RemoteDeliverySegment[] {
+    if (snapshot.deliverySegments !== undefined) {
+      return snapshot.deliverySegments.filter((segment) => segment.text.trim().length > 0)
     }
 
-    if (state.statusMessageId == null) {
-      const statusMessageId = await this.deps.client.sendMessage(target, normalized)
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        statusMessageId,
-        lastStatusText: normalized
-      })
+    if (!sourceMessageId) {
+      return []
     }
 
-    if (normalized !== state.lastStatusText) {
-      await this.editMessageText(target, {
-        type: 'editMessageText',
-        messageId: state.statusMessageId,
-        text: normalized,
-        replyMarkup: null
+    const segments: RemoteDeliverySegment[] = []
+    const traceText = snapshot.traceText?.trim() || ''
+    const answerText = snapshot.text?.trim() || ''
+
+    if (traceText) {
+      segments.push({
+        key: `${sourceMessageId}:legacy:process`,
+        kind: 'process',
+        text: traceText,
+        sourceMessageId
       })
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        lastStatusText: normalized
+    }
+
+    if (answerText) {
+      segments.push({
+        key: `${sourceMessageId}:legacy:answer`,
+        kind: 'answer',
+        text: answerText,
+        sourceMessageId
       })
     }
 
-    return state
+    return segments
   }
 
-  private async syncContentText(
-    target: TelegramTransportTarget,
-    endpointKey: string,
-    state: TelegramRemoteDeliveryState,
-    contentText: string
-  ): Promise<TelegramRemoteDeliveryState> {
-    const normalized = contentText.trim()
-    if (!normalized) {
-      return state
-    }
+  private getFinalDeliveryText(
+    snapshot: Awaited<ReturnType<RemoteConversationExecution['getSnapshot']>>
+  ): string {
+    return (snapshot.finalText ?? snapshot.fullText ?? snapshot.text).trim()
+  }
 
-    const nextChunks = chunkTelegramText(normalized)
-    const previousChunks = state.lastContentText ? chunkTelegramText(state.lastContentText) : []
-    const contentMessageIds = [...state.contentMessageIds]
+  private appendTerminalDeliverySegment(
+    segments: RemoteDeliverySegment[],
+    sourceMessageId: string | null,
+    finalText: string
+  ): RemoteDeliverySegment[] {
+    const normalized = finalText.trim()
+    if (!sourceMessageId || !normalized) {
+      return segments
+    }
 
-    if (contentMessageIds.length === 0) {
-      for (const chunk of nextChunks) {
-        contentMessageIds.push(await this.deps.client.sendMessage(target, chunk))
-      }
-      return this.rememberDeliveryState(endpointKey, {
-        ...state,
-        contentMessageIds,
-        lastContentText: normalized
-      })
+    const lastAnswerSegment = [...segments].reverse().find((segment) => segment.kind === 'answer')
+    if (lastAnswerSegment?.text === normalized) {
+      return segments
     }
 
-    const editableIndex = Math.max(0, contentMessageIds.length - 1)
-    const retainedCount = Math.min(contentMessageIds.length, nextChunks.length)
+    if (normalized === REMOTE_NO_RESPONSE_TEXT && segments.length > 0) {
+      return segments
+    }
 
-    for (let index = editableIndex; index < retainedCount; index += 1) {
-      if (previousChunks[index] === nextChunks[index]) {
-        continue
+    return [
+      ...segments,
+      {
+        key: `${sourceMessageId}:terminal`,
+        kind: 'terminal',
+        text: normalized,
+        sourceMessageId
       }
+    ]
+  }
 
-      await this.editMessageText(target, {
-        type: 'editMessageText',
-        messageId: contentMessageIds[index],
-        text: nextChunks[index],
-        replyMarkup: null
-      })
-    }
-
-    for (let index = contentMessageIds.length; index < nextChunks.length; index += 1) {
-      contentMessageIds.push(await this.deps.client.sendMessage(target, nextChunks[index]))
+  private isDeliveryStateCompatible(
+    state: TelegramRemoteDeliveryState,
+    segments: RemoteDeliverySegment[]
+  ): boolean {
+    if (segments.length < state.segments.length) {
+      return false
     }
 
-    return this.rememberDeliveryState(endpointKey, {
-      ...state,
-      contentMessageIds,
-      lastContentText: normalized
-    })
+    return state.segments.every((segment, index) => segments[index]?.key === segment.key)
   }
 
-  private async syncFinalContentText(
+  private async syncDeliverySegments(
     target: TelegramTransportTarget,
     endpointKey: string,
     state: TelegramRemoteDeliveryState,
-    finalText: string
+    segments: RemoteDeliverySegment[]
   ): Promise<TelegramRemoteDeliveryState> {
-    const normalized = finalText.trim()
-    if (!normalized) {
+    if (segments.length === 0) {
       return state
     }
 
-    const nextChunks = chunkTelegramText(normalized)
-    const previousChunks = state.lastContentText ? chunkTelegramText(state.lastContentText) : []
-    const contentMessageIds = [...state.contentMessageIds]
-
-    for (let index = 0; index < nextChunks.length; index += 1) {
-      if (index < contentMessageIds.length) {
-        if (previousChunks[index] === nextChunks[index]) {
-          continue
-        }
-
-        await this.editMessageText(target, {
-          type: 'editMessageText',
-          messageId: contentMessageIds[index],
-          text: nextChunks[index],
-          replyMarkup: null
-        })
-        continue
-      }
-
-      contentMessageIds.push(await this.deps.client.sendMessage(target, nextChunks[index]))
+    let nextState = state
+    if (!this.isDeliveryStateCompatible(nextState, segments)) {
+      this.deps.bindingStore.clearRemoteDeliveryState(endpointKey)
+      nextState = this.createDeliveryState(state.sourceMessageId)
     }
 
-    for (const messageId of contentMessageIds.slice(nextChunks.length)) {
-      await this.deleteMessage(target, messageId)
+    const syncedSegments: TelegramRemoteDeliveryState['segments'] = []
+
+    for (const [index, segment] of segments.entries()) {
+      const syncedSegment = await this.syncDeliverySegment(
+        target,
+        nextState.segments[index] ?? null,
+        segment
+      )
+      syncedSegments.push(syncedSegment)
     }
 
     return this.rememberDeliveryState(endpointKey, {
-      ...state,
-      contentMessageIds: contentMessageIds.slice(0, nextChunks.length),
-      lastContentText: normalized
+      sourceMessageId: nextState.sourceMessageId,
+      segments: syncedSegments
     })
   }
 
-  private async deleteStatusMessage(
+  private async syncDeliverySegment(
     target: TelegramTransportTarget,
-    messageId: number | null
-  ): Promise<void> {
-    if (messageId == null) {
-      return
+    existing: TelegramRemoteDeliveryState['segments'][number] | null,
+    segment: RemoteDeliverySegment
+  ): Promise<TelegramRemoteDeliveryState['segments'][number]> {
+    const normalized = segment.text.trim()
+    const nextChunks = chunkTelegramText(normalized)
+
+    if (!existing) {
+      const messageIds: number[] = []
+      for (const chunk of nextChunks) {
+        messageIds.push(await this.deps.client.sendMessage(target, chunk))
+      }
+
+      return {
+        key: segment.key,
+        kind: segment.kind,
+        messageIds,
+        lastText: normalized
+      }
     }
 
-    await this.deleteMessage(target, messageId)
-  }
+    const previousChunks = existing.lastText ? chunkTelegramText(existing.lastText) : []
+    if (
+      nextChunks.length < existing.messageIds.length ||
+      previousChunks.length < existing.messageIds.length ||
+      previousChunks
+        .slice(0, Math.max(0, existing.messageIds.length - 1))
+        .some((chunk, index) => chunk !== nextChunks[index])
+    ) {
+      const messageIds: number[] = []
+      for (const chunk of nextChunks) {
+        messageIds.push(await this.deps.client.sendMessage(target, chunk))
+      }
 
-  private async deleteMessage(target: TelegramTransportTarget, messageId: number): Promise<void> {
-    try {
-      await this.deps.client.deleteMessage({
-        target,
-        messageId
-      })
-    } catch (error) {
-      console.warn('[TelegramPoller] Failed to delete message:', {
-        target,
+      return {
+        key: segment.key,
+        kind: segment.kind,
+        messageIds,
+        lastText: normalized
+      }
+    }
+
+    const messageIds = [...existing.messageIds]
+    const editableIndex = Math.max(0, messageIds.length - 1)
+    const retainedCount = Math.min(messageIds.length, nextChunks.length)
+
+    for (let index = editableIndex; index < retainedCount; index += 1) {
+      if (previousChunks[index] === nextChunks[index]) {
+        continue
+      }
+
+      const messageId = messageIds[index]
+      if (!messageId) {
+        continue
+      }
+
+      await this.editMessageText(target, {
+        type: 'editMessageText',
         messageId,
-        error
+        text: nextChunks[index],
+        replyMarkup: null
       })
     }
+
+    for (let index = messageIds.length; index < nextChunks.length; index += 1) {
+      messageIds.push(await this.deps.client.sendMessage(target, nextChunks[index]))
+    }
+
+    return {
+      key: segment.key,
+      kind: segment.kind,
+      messageIds,
+      lastText: normalized
+    }
   }
 
   private async sendTyping(target: TelegramTransportTarget): Promise<void> {
diff --git a/src/main/presenter/remoteControlPresenter/types.ts b/src/main/presenter/remoteControlPresenter/types.ts
index f2cfb3ffa..c94565c6c 100644
--- a/src/main/presenter/remoteControlPresenter/types.ts
+++ b/src/main/presenter/remoteControlPresenter/types.ts
@@ -295,6 +295,13 @@ export interface RemoteRenderableBlock {
   sourceMessageId: string
 }
 
+export interface RemoteDeliverySegment {
+  key: string
+  kind: 'process' | 'answer' | 'terminal'
+  text: string
+  sourceMessageId: string
+}
+
 export type TelegramOutboundAction =
   | {
       type: 'sendMessage'
diff --git a/src/main/presenter/runtimePorts.ts b/src/main/presenter/runtimePorts.ts
new file mode 100644
index 000000000..133dd251d
--- /dev/null
+++ b/src/main/presenter/runtimePorts.ts
@@ -0,0 +1,37 @@
+type ModelIdentity = {
+  id: string
+  name?: string | null
+}
+
+export type SessionPermissionRequest = {
+  permissionType: 'read' | 'write' | 'all' | 'command'
+  serverName?: string
+  toolName?: string
+  command?: string
+  commandSignature?: string
+  paths?: string[]
+  commandInfo?: {
+    command: string
+    riskLevel: 'low' | 'medium' | 'high' | 'critical'
+    suggestion: string
+    signature?: string
+    baseCommand?: string
+  }
+}
+
+export interface ConfigQueryPort {
+  getProviderModels(providerId: string): ModelIdentity[]
+  getCustomModels(providerId: string): ModelIdentity[]
+  getAgentType(agentId: string): Promise<'deepchat' | 'acp' | null>
+}
+
+export interface SessionRuntimePort {
+  refreshSessionUi(): void
+  clearSessionPermissions(sessionId: string): void
+  approvePermission(sessionId: string, permission: SessionPermissionRequest): Promise<void>
+}
+
+export interface WindowRoutingPort {
+  createSettingsWindow(): Promise<number>
+  sendToWindow(windowId: number, channel: string, ...args: unknown[]): void
+}
diff --git a/src/main/presenter/sqlitePresenter/index.ts b/src/main/presenter/sqlitePresenter/index.ts
index e1cf019fb..e3ff5e9b6 100644
--- a/src/main/presenter/sqlitePresenter/index.ts
+++ b/src/main/presenter/sqlitePresenter/index.ts
@@ -323,7 +323,7 @@ export class SQLitePresenter implements ISQLitePresenter {
     importedMessages: number
     importedSearchResults: number
   }> {
-    const { LegacyChatImportService } = await import('../newAgentPresenter/legacyImportService')
+    const { LegacyChatImportService } = await import('../agentSessionPresenter/legacyImportService')
     const service = new LegacyChatImportService(this)
     return await service.importFromSourceDb(sourceDbPath, mode)
   }
diff --git a/src/main/presenter/sqlitePresenter/tables/deepchatUsageStats.ts b/src/main/presenter/sqlitePresenter/tables/deepchatUsageStats.ts
index edada206e..a071f9474 100644
--- a/src/main/presenter/sqlitePresenter/tables/deepchatUsageStats.ts
+++ b/src/main/presenter/sqlitePresenter/tables/deepchatUsageStats.ts
@@ -12,6 +12,7 @@ export interface DeepChatUsageStatsRow {
   output_tokens: number
   total_tokens: number
   cached_input_tokens: number
+  cache_write_input_tokens: number
   estimated_cost_usd: number | null
   source: 'backfill' | 'live'
   created_at: number
@@ -93,6 +94,7 @@ export class DeepChatUsageStatsTable extends BaseTable {
         output_tokens INTEGER NOT NULL DEFAULT 0,
         total_tokens INTEGER NOT NULL DEFAULT 0,
         cached_input_tokens INTEGER NOT NULL DEFAULT 0,
+        cache_write_input_tokens INTEGER NOT NULL DEFAULT 0,
         estimated_cost_usd REAL,
         source TEXT NOT NULL DEFAULT 'live',
         created_at INTEGER NOT NULL,
@@ -108,11 +110,16 @@ export class DeepChatUsageStatsTable extends BaseTable {
     if (version === 17) {
       return this.getCreateTableSQL()
     }
+    if (version === 22) {
+      return this.hasColumn('cache_write_input_tokens')
+        ? null
+        : `ALTER TABLE deepchat_usage_stats ADD COLUMN cache_write_input_tokens INTEGER NOT NULL DEFAULT 0;`
+    }
     return null
   }
 
   getLatestVersion(): number {
-    return 17
+    return 22
   }
 
   upsert(row: UsageStatsRecordInput): void {
@@ -128,11 +135,12 @@ export class DeepChatUsageStatsTable extends BaseTable {
           output_tokens,
           total_tokens,
           cached_input_tokens,
+          cache_write_input_tokens,
           estimated_cost_usd,
           source,
           created_at,
           updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         ON CONFLICT(message_id) DO UPDATE SET
           session_id = excluded.session_id,
           usage_date = excluded.usage_date,
@@ -142,6 +150,7 @@ export class DeepChatUsageStatsTable extends BaseTable {
           output_tokens = excluded.output_tokens,
           total_tokens = excluded.total_tokens,
           cached_input_tokens = excluded.cached_input_tokens,
+          cache_write_input_tokens = excluded.cache_write_input_tokens,
           estimated_cost_usd = excluded.estimated_cost_usd,
           source = excluded.source,
           created_at = excluded.created_at,
@@ -157,6 +166,7 @@ export class DeepChatUsageStatsTable extends BaseTable {
         row.outputTokens,
         row.totalTokens,
         row.cachedInputTokens,
+        row.cacheWriteInputTokens,
         row.estimatedCostUsd,
         row.source,
         row.createdAt,
diff --git a/src/main/presenter/toolPresenter/runtimePorts.ts b/src/main/presenter/toolPresenter/runtimePorts.ts
index 12f52266e..84d7cd529 100644
--- a/src/main/presenter/toolPresenter/runtimePorts.ts
+++ b/src/main/presenter/toolPresenter/runtimePorts.ts
@@ -13,7 +13,7 @@ import type {
   SessionKind
 } from '@shared/types/agent-interface'
 import type { ISkillPresenter } from '@shared/types/skill'
-import type { DeepChatInternalSessionUpdate } from '../deepchatAgentPresenter/internalSessionEvents'
+import type { DeepChatInternalSessionUpdate } from '../agentRuntimePresenter/internalSessionEvents'
 
 export interface ConversationSessionInfo {
   sessionId: string
diff --git a/src/main/presenter/usageStats.ts b/src/main/presenter/usageStats.ts
index 495465737..9c550770a 100644
--- a/src/main/presenter/usageStats.ts
+++ b/src/main/presenter/usageStats.ts
@@ -22,6 +22,7 @@ export interface UsageStatsRecordInput {
   outputTokens: number
   totalTokens: number
   cachedInputTokens: number
+  cacheWriteInputTokens: number
   estimatedCostUsd: number | null
   source: UsageStatsSource
   createdAt: number
@@ -152,18 +153,24 @@ export function normalizeUsageCounts(metadata: MessageMetadata): {
   outputTokens: number
   totalTokens: number
   cachedInputTokens: number
+  cacheWriteInputTokens: number
 } {
   const inputTokens = toNonNegativeInteger(metadata.inputTokens) ?? 0
   const outputTokens = toNonNegativeInteger(metadata.outputTokens) ?? 0
   const totalTokens = toNonNegativeInteger(metadata.totalTokens) ?? inputTokens + outputTokens
   const rawCached = toNonNegativeInteger(metadata.cachedInputTokens) ?? 0
-  const cachedInputTokens = inputTokens > 0 ? Math.min(rawCached, inputTokens) : rawCached
+  const rawCacheWrite = toNonNegativeInteger(metadata.cacheWriteInputTokens) ?? 0
+  const cappedCachedInputTokens = inputTokens > 0 ? Math.min(rawCached, inputTokens) : rawCached
+  const remainingInputTokens = Math.max(inputTokens - cappedCachedInputTokens, 0)
+  const cacheWriteInputTokens =
+    inputTokens > 0 ? Math.min(rawCacheWrite, remainingInputTokens) : rawCacheWrite
 
   return {
     inputTokens,
     outputTokens,
     totalTokens,
-    cachedInputTokens
+    cachedInputTokens: cappedCachedInputTokens,
+    cacheWriteInputTokens
   }
 }
 
@@ -195,6 +202,7 @@ export function estimateUsageCostUsd(params: {
   inputTokens: number
   outputTokens: number
   cachedInputTokens: number
+  cacheWriteInputTokens: number
 }): number | null {
   const model = resolvePricedModel(params.providerId, params.modelId)
   const inputRate = getCostNumber(model, 'input')
@@ -205,12 +213,17 @@ export function estimateUsageCostUsd(params: {
   }
 
   const cacheReadRate = getCostNumber(model, 'cache_read')
-  const billableInput = Math.max(params.inputTokens - params.cachedInputTokens, 0)
+  const cacheWriteRate = getCostNumber(model, 'cache_write')
+  const uncachedInput = Math.max(
+    params.inputTokens - params.cachedInputTokens - params.cacheWriteInputTokens,
+    0
+  )
 
   return (
-    (billableInput * inputRate +
+    (uncachedInput * inputRate +
       params.outputTokens * outputRate +
-      params.cachedInputTokens * (cacheReadRate ?? inputRate)) /
+      params.cachedInputTokens * (cacheReadRate ?? inputRate) +
+      params.cacheWriteInputTokens * (cacheWriteRate ?? inputRate)) /
     1_000_000
   )
 }
@@ -247,12 +260,14 @@ export function buildUsageStatsRecord(params: {
     outputTokens: usage.outputTokens,
     totalTokens: usage.totalTokens,
     cachedInputTokens: usage.cachedInputTokens,
+    cacheWriteInputTokens: usage.cacheWriteInputTokens,
     estimatedCostUsd: estimateUsageCostUsd({
       providerId,
       modelId,
       inputTokens: usage.inputTokens,
       outputTokens: usage.outputTokens,
-      cachedInputTokens: usage.cachedInputTokens
+      cachedInputTokens: usage.cachedInputTokens,
+      cacheWriteInputTokens: usage.cacheWriteInputTokens
     }),
     source: params.source,
     createdAt: params.createdAt,
diff --git a/src/renderer/settings/components/AcpSettings.vue b/src/renderer/settings/components/AcpSettings.vue
index 80a11e9fe..e8a2d8f0b 100644
--- a/src/renderer/settings/components/AcpSettings.vue
+++ b/src/renderer/settings/components/AcpSettings.vue
@@ -125,11 +125,21 @@
                       {{ agent.description || t('settings.acp.builtinHint', { name: agent.name }) }}
                     </CardDescription>
                   </div>
-                  <Switch
-                    :model-value="agent.enabled"
-                    :disabled="Boolean(agentPending[agent.id])"
-                    @update:model-value="(value) => toggleRegistryAgent(agent, Boolean(value))"
-                  />
+                  <div class="flex items-center gap-2 shrink-0">
+                    <Button
+                      size="sm"
+                      variant="destructive"
+                      :disabled="Boolean(agentPending[agent.id])"
+                      @click="confirmRegistryAgentUninstall(agent)"
+                    >
+                      {{ t('settings.acp.registryUninstallAction') }}
+                    </Button>
+                    <Switch
+                      :model-value="agent.enabled"
+                      :disabled="Boolean(agentPending[agent.id])"
+                      @update:model-value="(value) => toggleRegistryAgent(agent, Boolean(value))"
+                    />
+                  </div>
                 </div>
               </CardHeader>
               <CardContent class="space-y-3">
@@ -520,6 +530,40 @@
       </DialogContent>
     </Dialog>
 
+    <AlertDialog
+      :open="uninstallDialog.open"
+      @update:open="(value) => handleRegistryUninstallDialogOpenChange(value)"
+    >
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>
+            {{
+              uninstallDialog.agent
+                ? t('settings.acp.registryUninstallConfirm', {
+                    name: uninstallDialog.agent.name
+                  })
+                : ''
+            }}
+          </AlertDialogTitle>
+          <AlertDialogDescription>
+            {{ t('settings.acp.registryUninstallDescription') }}
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogCancel @click="cancelRegistryAgentUninstall">
+            {{ t('common.cancel') }}
+          </AlertDialogCancel>
+          <AlertDialogAction
+            class="bg-destructive text-destructive-foreground hover:bg-destructive/90"
+            :disabled="!uninstallDialog.agent"
+            @click="confirmRegistryAgentUninstallAction"
+          >
+            {{ t('settings.acp.registryUninstallAction') }}
+          </AlertDialogAction>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+
     <AcpDebugDialog
       :open="debugDialog.open"
       :agent-id="debugDialog.agentId"
@@ -551,6 +595,16 @@ import { Input } from '@shadcn/components/ui/input'
 import { Textarea } from '@shadcn/components/ui/textarea'
 import { Label } from '@shadcn/components/ui/label'
 import { Collapsible, CollapsibleContent } from '@shadcn/components/ui/collapsible'
+import {
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle
+} from '@shadcn/components/ui/alert-dialog'
 import {
   Dialog,
   DialogContent,
@@ -605,6 +659,14 @@ const registryDialog = reactive({
   filter: 'all' as RegistryDialogFilter
 })
 
+const uninstallDialog = reactive<{
+  open: boolean
+  agent: AcpRegistryAgent | null
+}>({
+  open: false,
+  agent: null
+})
+
 const parseEnvBlock = (value: string): Record<string, string> => {
   return Object.fromEntries(
     value
@@ -722,10 +784,10 @@ const setAgentPending = (agentId: string, pending: boolean) => {
   }
 }
 
-const handleError = (error: unknown, description?: string) => {
+const handleError = (error: unknown, description?: string, title?: string) => {
   console.error('[ACP] settings error:', error)
   toast({
-    title: t('settings.acp.saveFailed'),
+    title: title ?? t('settings.acp.saveFailed'),
     description:
       description ?? (error instanceof Error ? error.message : t('common.error.requestFailed')),
     variant: 'destructive'
@@ -859,6 +921,44 @@ const repairRegistryAgent = async (agent: AcpRegistryAgent) => {
   }
 }
 
+const uninstallRegistryAgent = async (agent: AcpRegistryAgent) => {
+  setAgentPending(agent.id, true)
+  try {
+    await configPresenter.uninstallAcpRegistryAgent(agent.id)
+    await loadAcpData()
+    toast({ title: t('settings.acp.deleteSuccess') })
+  } catch (error) {
+    handleError(error, undefined, t('settings.acp.registryUninstallFailed'))
+  } finally {
+    setAgentPending(agent.id, false)
+  }
+}
+
+const handleRegistryUninstallDialogOpenChange = (open: boolean) => {
+  uninstallDialog.open = open
+}
+
+const confirmRegistryAgentUninstall = (agent: AcpRegistryAgent) => {
+  uninstallDialog.agent = agent
+  uninstallDialog.open = true
+}
+
+const cancelRegistryAgentUninstall = () => {
+  uninstallDialog.open = false
+  uninstallDialog.agent = null
+}
+
+const confirmRegistryAgentUninstallAction = async () => {
+  const agent = uninstallDialog.agent
+  if (!agent) {
+    return
+  }
+
+  uninstallDialog.open = false
+  await uninstallRegistryAgent(agent)
+  uninstallDialog.agent = null
+}
+
 const openInspector = (agentId: string, agentName: string) => {
   debugDialog.agentId = agentId
   debugDialog.agentName = agentName
@@ -949,7 +1049,7 @@ const openRegistryDialog = () => {
 
 const registryActionLabel = (agent: AcpRegistryAgent) => {
   const status = agent.installState?.status ?? 'not_installed'
-  if (status === 'installed') return t('settings.acp.installState.installed')
+  if (status === 'installed') return t('settings.acp.registryUninstallAction')
   if (status === 'installing') return t('settings.acp.installState.installing')
   if (status === 'error') return t('settings.acp.registryRepair')
   return t('settings.acp.registryInstallAction')
@@ -957,12 +1057,12 @@ const registryActionLabel = (agent: AcpRegistryAgent) => {
 
 const registryActionVariant = (agent: AcpRegistryAgent) => {
   const status = agent.installState?.status ?? 'not_installed'
-  return status === 'installed' ? 'outline' : 'default'
+  return status === 'installed' ? 'destructive' : 'default'
 }
 
 const registryActionIcon = (agent: AcpRegistryAgent) => {
   const status = agent.installState?.status ?? 'not_installed'
-  if (status === 'installed') return 'lucide:check'
+  if (status === 'installed') return 'lucide:trash-2'
   if (status === 'installing') return 'lucide:loader'
   if (status === 'error') return 'lucide:wrench'
   return 'lucide:download'
@@ -974,13 +1074,17 @@ const registryActionSpins = (agent: AcpRegistryAgent) => {
 
 const isRegistryActionDisabled = (agent: AcpRegistryAgent) => {
   const status = agent.installState?.status ?? 'not_installed'
-  return Boolean(agentPending[agent.id]) || status === 'installing' || status === 'installed'
+  return Boolean(agentPending[agent.id]) || status === 'installing'
 }
 
 const handleRegistryCatalogAction = async (agent: AcpRegistryAgent) => {
   if (isRegistryActionDisabled(agent)) {
     return
   }
+  if ((agent.installState?.status ?? 'not_installed') === 'installed') {
+    await confirmRegistryAgentUninstall(agent)
+    return
+  }
   await installRegistryAgent(agent)
 }
 
diff --git a/src/renderer/settings/components/DashboardSettings.vue b/src/renderer/settings/components/DashboardSettings.vue
index 9a3278e77..c75e1f1d5 100644
--- a/src/renderer/settings/components/DashboardSettings.vue
+++ b/src/renderer/settings/components/DashboardSettings.vue
@@ -1,7 +1,10 @@
 <template>
   <ScrollArea class="h-full w-full">
     <div class="mx-auto flex w-full max-w-7xl flex-col gap-6 p-4">
-      <div class="flex items-start gap-3 px-2 py-2">
+      <div
+        data-testid="dashboard-header"
+        class="flex flex-col gap-3 px-2 py-2 sm:flex-row sm:items-start sm:justify-between"
+      >
         <div class="min-w-0 flex-1">
           <h2 class="text-sm font-medium text-foreground">
             {{ t('settings.dashboard.title') }}
@@ -13,7 +16,7 @@
         <Button
           variant="outline"
           size="sm"
-          class="shrink-0"
+          class="w-full shrink-0 sm:w-auto"
           :disabled="isLoading"
           @click="void loadDashboard()"
         >
@@ -31,7 +34,7 @@
         data-testid="dashboard-backfill-banner"
         class="rounded-2xl border border-primary/20 bg-primary/10 px-4 py-3 text-sm text-foreground"
       >
-        <div class="flex items-center gap-3">
+        <div class="flex flex-col items-start gap-3 sm:flex-row sm:items-center">
           <span class="h-2 w-2 animate-pulse rounded-full bg-primary"></span>
           <div class="flex-1">
             <p class="font-medium">{{ t('settings.dashboard.backfill.runningTitle') }}</p>
@@ -64,10 +67,10 @@
 
       <section v-if="isLoading && !dashboard" class="grid gap-3 md:grid-cols-2 xl:grid-cols-4">
         <div
-          class="h-[17rem] animate-pulse rounded-2xl border border-border bg-muted/40 md:col-span-2 xl:col-span-3"
+          class="h-68 animate-pulse rounded-2xl border border-border bg-muted/40 md:col-span-2 xl:col-span-3"
         ></div>
         <div
-          class="h-[17rem] animate-pulse rounded-2xl border border-border bg-muted/40 md:col-span-2 xl:col-span-1"
+          class="h-68 animate-pulse rounded-2xl border border-border bg-muted/40 md:col-span-2 xl:col-span-1"
         ></div>
       </section>
 
@@ -84,12 +87,9 @@
             <CardContent class="space-y-4 pt-0">
               <div
                 data-testid="token-usage-trend-chart"
-                class="token-usage-trend-grid rounded-xl border border-border/40 bg-muted/10 px-3 py-3"
+                class="token-usage-trend-grid rounded-xl border border-border/40 bg-muted/10 px-2 py-2.5 sm:px-3 sm:py-3"
               >
-                <ChartContainer
-                  :config="tokenUsageChartConfig"
-                  class="aspect-auto h-[184px] w-full"
-                >
+                <ChartContainer :config="tokenUsageChartConfig" class="aspect-auto h-46 w-full">
                   <VisXYContainer
                     :data="tokenUsageCard.chartData"
                     :height="TOKEN_USAGE_CHART_HEIGHT"
@@ -154,7 +154,7 @@
                 </ChartContainer>
               </div>
 
-              <div data-testid="token-usage-list" class="grid gap-2 sm:grid-cols-2 xl:grid-cols-5">
+              <div data-testid="token-usage-list" class="dashboard-token-usage-list grid gap-2">
                 <div
                   data-testid="token-usage-total-row"
                   class="rounded-lg border border-border/30 bg-muted/5 px-3 py-2.5"
@@ -295,33 +295,33 @@
             class="flex h-full flex-col overflow-hidden border-border/70 bg-card/90 backdrop-blur-sm md:col-span-2 xl:col-span-1"
           >
             <CardHeader class="space-y-1 pb-1">
-              <CardTitle class="break-words whitespace-normal text-base leading-tight">
+              <CardTitle class="wrap-break-word whitespace-normal text-base leading-tight">
                 {{ t('settings.dashboard.summary.nostalgiaLabel') }}
               </CardTitle>
             </CardHeader>
             <CardContent
-              class="flex flex-1 flex-col gap-3 pt-0 md:grid md:grid-cols-[minmax(0,14rem)_minmax(0,1fr)] md:items-start md:gap-4 xl:flex xl:flex-col"
+              class="flex flex-1 flex-col gap-3 pt-0 lg:grid lg:grid-cols-[minmax(0,13rem)_minmax(0,1fr)] lg:items-start lg:gap-4 xl:flex xl:flex-col"
             >
-              <div class="flex min-h-[4.5rem] items-start md:min-h-[5rem] sm:min-h-[5rem]">
+              <div class="flex min-h-18 items-start sm:min-h-20">
                 <Transition name="nostalgia-fade" mode="out-in">
                   <CardTitle
                     :key="activeNostalgiaStat?.id ?? 'unavailable'"
                     data-testid="nostalgia-rotating-value"
-                    class="break-words whitespace-normal text-2xl font-semibold leading-tight tracking-tight sm:text-3xl"
+                    class="wrap-break-word whitespace-normal text-2xl font-semibold leading-tight tracking-tight sm:text-3xl"
                   >
                     {{ activeNostalgiaStat?.value ?? t('settings.dashboard.unavailable') }}
                   </CardTitle>
                 </Transition>
               </div>
 
-              <div data-testid="nostalgia-details" class="space-y-2 md:pt-0.5">
+              <div data-testid="nostalgia-details" class="space-y-2 lg:pt-0.5">
                 <div
                   v-for="item in nostalgiaCard.details"
                   :key="item.id"
                   :data-testid="`nostalgia-detail-${item.id}`"
                   class="rounded-lg border border-border/30 bg-muted/5 px-3 py-2.5"
                 >
-                  <p class="break-words whitespace-normal text-sm leading-6">
+                  <p class="wrap-break-word whitespace-normal text-sm leading-6">
                     {{ item.content }}
                   </p>
                 </div>
@@ -358,7 +358,7 @@
                   {{ t('settings.dashboard.calendar.description') }}
                 </CardDescription>
               </div>
-              <div class="flex items-center gap-2 text-xs text-muted-foreground">
+              <div class="flex flex-wrap items-center gap-2 text-xs text-muted-foreground">
                 <span>{{ t('settings.dashboard.calendar.legend') }}</span>
                 <div class="flex items-center gap-1">
                   <span
@@ -386,35 +386,52 @@
             </div>
           </CardHeader>
           <CardContent>
-            <div class="overflow-x-auto pb-2">
-              <div class="min-w-[760px]">
-                <div class="mb-2 flex pl-12 text-[11px] text-muted-foreground">
-                  <div
-                    v-for="month in calendarMonthLabels"
-                    :key="`${month.label}-${month.weekIndex}`"
-                    class="calendar-month-label"
-                    :style="{ width: `${month.span * 14}px` }"
-                  >
-                    {{ month.label }}
+            <div
+              data-testid="dashboard-calendar-scroll"
+              class="-mx-1 overflow-x-auto px-1 pb-2 sm:mx-0 sm:px-0"
+            >
+              <div data-testid="dashboard-calendar-heatmap" class="calendar-heatmap">
+                <div
+                  data-testid="dashboard-calendar-months"
+                  class="calendar-months-shell text-muted-foreground"
+                >
+                  <div aria-hidden="true"></div>
+                  <div class="calendar-months text-[11px]" :style="calendarGridStyle">
+                    <div
+                      v-for="month in calendarMonthLabels"
+                      :key="`${month.label}-${month.weekIndex}`"
+                      class="calendar-month-label"
+                      :style="{ gridColumn: `${month.weekIndex + 1} / span ${month.span}` }"
+                    >
+                      {{ month.label }}
+                    </div>
                   </div>
                 </div>
-                <div class="flex gap-2">
-                  <div class="mt-1 flex w-10 flex-col gap-1 text-[11px] text-muted-foreground">
-                    <span v-for="label in weekdayLabels" :key="label.key" class="h-3 leading-3">
+                <div class="calendar-body">
+                  <div class="calendar-weekday-labels text-muted-foreground">
+                    <span
+                      v-for="label in weekdayLabels"
+                      :key="label.key"
+                      class="calendar-weekday-label"
+                    >
                       {{ label.label }}
                     </span>
                   </div>
-                  <div class="flex gap-1">
+                  <div
+                    data-testid="dashboard-calendar-weeks"
+                    class="calendar-weeks"
+                    :style="calendarGridStyle"
+                  >
                     <div
                       v-for="(week, weekIndex) in calendarWeeks"
                       :key="`week-${weekIndex}`"
-                      class="flex flex-col gap-1"
+                      class="calendar-week"
                     >
                       <div
                         v-for="(day, dayIndex) in week"
                         :key="day ? day.date : `blank-${weekIndex}-${dayIndex}`"
                         data-testid="calendar-cell"
-                        class="calendar-cell rounded-[4px] border border-border/70"
+                        class="calendar-cell rounded-sm border border-border/70"
                         :class="day ? 'opacity-100' : 'opacity-0'"
                         :style="day ? calendarCellStyle(day.level) : undefined"
                         :title="day ? calendarCellTitle(day) : ''"
@@ -439,7 +456,7 @@
                   {{ t('settings.dashboard.rtk.description') }}
                 </CardDescription>
               </div>
-              <div class="flex items-center gap-2">
+              <div class="flex flex-wrap items-center gap-2">
                 <Badge
                   data-testid="rtk-status-badge"
                   variant="secondary"
@@ -469,7 +486,7 @@
               <p>{{ rtkStatusDescription }}</p>
             </div>
 
-            <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-4">
+            <div class="dashboard-rtk-summary-grid grid gap-3">
               <div
                 data-testid="rtk-summary-saved"
                 class="rounded-xl border border-border/40 bg-muted/5 px-4 py-3"
@@ -535,7 +552,7 @@
           </CardContent>
         </Card>
 
-        <div class="grid gap-4 2xl:grid-cols-2">
+        <div class="grid gap-4 xl:grid-cols-2">
           <Card class="border-border/70 bg-card/90 backdrop-blur-sm">
             <CardHeader class="pb-4">
               <CardTitle>{{ t('settings.dashboard.breakdown.providerTitle') }}</CardTitle>
@@ -553,7 +570,7 @@
               <div
                 v-else
                 data-testid="provider-breakdown-scroll"
-                class="max-h-[420px] overflow-y-auto pr-1"
+                class="max-h-105 overflow-y-auto pr-1"
               >
                 <div data-testid="provider-breakdown-chart">
                   <div
@@ -562,7 +579,7 @@
                     class="border-b border-border/40 py-3 last:border-b-0"
                   >
                     <div
-                      class="space-y-2.5 md:grid md:grid-cols-[minmax(0,180px)_minmax(0,1fr)_88px] md:items-center md:gap-4 md:space-y-0"
+                      class="space-y-2.5 lg:grid lg:grid-cols-[minmax(0,9.5rem)_minmax(0,1fr)_minmax(4.75rem,auto)] lg:items-center lg:gap-3 lg:space-y-0 xl:grid-cols-[minmax(0,10.5rem)_minmax(0,1fr)_88px]"
                     >
                       <div class="min-w-0">
                         <p class="truncate text-sm font-medium">{{ item.label }}</p>
@@ -574,7 +591,7 @@
                           }}
                         </p>
                       </div>
-                      <div class="min-w-0 md:px-1">
+                      <div class="min-w-0 lg:px-1">
                         <div class="h-1.5 rounded-full bg-muted/35">
                           <div
                             class="h-full rounded-full bg-[hsl(var(--usage-low)/0.9)]"
@@ -582,7 +599,7 @@
                           ></div>
                         </div>
                       </div>
-                      <div class="text-right text-xs text-muted-foreground">
+                      <div class="text-left text-xs text-muted-foreground lg:text-right">
                         <p :title="formatFullTokens(item.totalTokens)">
                           {{ formatTokens(item.totalTokens) }}
                         </p>
@@ -612,7 +629,7 @@
               <div
                 v-else
                 data-testid="model-breakdown-scroll"
-                class="max-h-[420px] overflow-y-auto pr-1"
+                class="max-h-105 overflow-y-auto pr-1"
               >
                 <div data-testid="model-breakdown-chart">
                   <div
@@ -621,7 +638,7 @@
                     class="border-b border-border/40 py-3 last:border-b-0"
                   >
                     <div
-                      class="space-y-2.5 md:grid md:grid-cols-[minmax(0,180px)_minmax(0,1fr)_88px] md:items-center md:gap-4 md:space-y-0"
+                      class="space-y-2.5 lg:grid lg:grid-cols-[minmax(0,9.5rem)_minmax(0,1fr)_minmax(4.75rem,auto)] lg:items-center lg:gap-3 lg:space-y-0 xl:grid-cols-[minmax(0,10.5rem)_minmax(0,1fr)_88px]"
                     >
                       <div class="min-w-0">
                         <p class="truncate text-sm font-medium">{{ item.label }}</p>
@@ -632,7 +649,7 @@
                           {{ item.secondaryLabel }}
                         </p>
                       </div>
-                      <div class="min-w-0 md:px-1">
+                      <div class="min-w-0 lg:px-1">
                         <div class="h-1.5 rounded-full bg-muted/35">
                           <div
                             class="h-full rounded-full bg-[hsl(var(--usage-low)/0.9)]"
@@ -640,7 +657,7 @@
                           ></div>
                         </div>
                       </div>
-                      <div class="text-right text-xs text-muted-foreground">
+                      <div class="text-left text-xs text-muted-foreground lg:text-right">
                         <p :title="formatFullTokens(item.totalTokens)">
                           {{ formatTokens(item.totalTokens) }}
                         </p>
@@ -718,7 +735,7 @@ type NostalgiaDetailItem = {
 }
 
 const { t, locale } = useI18n()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 
 const isLoading = ref(true)
 const isRetryingRtk = ref(false)
@@ -956,6 +973,10 @@ const activeNostalgiaStat = computed<NostalgiaRotatingStat | null>(() => {
   return stats[nostalgiaStatIndex.value % stats.length]
 })
 
+const calendarGridStyle = computed(() => ({
+  gridTemplateColumns: `repeat(${Math.max(calendarWeeks.value.length, 1)}, minmax(0, 1fr))`
+}))
+
 const calendarWeeks = computed<CalendarCell[][]>(() => {
   const days = dashboard.value?.calendar ?? []
   if (days.length === 0) {
@@ -1044,7 +1065,7 @@ async function loadDashboard(): Promise<void> {
   try {
     isLoading.value = true
     errorMessage.value = ''
-    const nextDashboard = await newAgentPresenter.getUsageDashboard()
+    const nextDashboard = await agentSessionPresenter.getUsageDashboard()
     if (!isDashboardMounted) {
       return
     }
@@ -1073,7 +1094,7 @@ async function retryRtkHealthCheck(): Promise<void> {
 
   try {
     isRetryingRtk.value = true
-    await newAgentPresenter.retryRtkHealthCheck()
+    await agentSessionPresenter.retryRtkHealthCheck()
     await loadDashboard()
   } catch (error) {
     errorMessage.value =
@@ -1374,6 +1395,68 @@ onBeforeUnmount(() => {
 </script>
 
 <style scoped>
+.dashboard-token-usage-list {
+  grid-template-columns: repeat(auto-fit, minmax(min(100%, 10.5rem), 1fr));
+}
+
+.dashboard-rtk-summary-grid {
+  grid-template-columns: repeat(auto-fit, minmax(min(100%, 11rem), 1fr));
+}
+
+.calendar-heatmap {
+  --calendar-column-gap: 1px;
+  --calendar-row-gap: 1px;
+  --calendar-section-gap: 0.375rem;
+  --calendar-weekday-width: 1.5rem;
+  --calendar-label-font-size: 9px;
+  width: 100%;
+}
+
+.calendar-months-shell,
+.calendar-body {
+  display: grid;
+  grid-template-columns: var(--calendar-weekday-width) minmax(0, 1fr);
+  column-gap: var(--calendar-section-gap);
+}
+
+.calendar-months-shell {
+  margin-bottom: 0.5rem;
+  align-items: end;
+}
+
+.calendar-months {
+  display: grid;
+  min-width: 0;
+  column-gap: var(--calendar-column-gap);
+}
+
+.calendar-weekday-labels {
+  display: grid;
+  grid-template-rows: repeat(7, 1fr);
+  row-gap: var(--calendar-row-gap);
+  min-width: 0;
+}
+
+.calendar-weekday-label {
+  display: flex;
+  align-items: center;
+  min-width: 0;
+  font-size: var(--calendar-label-font-size);
+  line-height: 1;
+}
+
+.calendar-weeks {
+  display: grid;
+  min-width: 0;
+  column-gap: var(--calendar-column-gap);
+}
+
+.calendar-week {
+  display: grid;
+  row-gap: var(--calendar-row-gap);
+  min-width: 0;
+}
+
 .nostalgia-fade-enter-active,
 .nostalgia-fade-leave-active {
   transition: opacity 220ms ease;
@@ -1385,8 +1468,8 @@ onBeforeUnmount(() => {
 }
 
 .calendar-cell {
-  width: 12px;
-  height: 12px;
+  width: 100%;
+  aspect-ratio: 1;
   transition:
     transform 160ms ease,
     box-shadow 160ms ease;
@@ -1398,7 +1481,10 @@ onBeforeUnmount(() => {
 }
 
 .calendar-month-label {
-  min-width: 14px;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .token-usage-trend-grid {
@@ -1406,13 +1492,46 @@ onBeforeUnmount(() => {
     linear-gradient(to right, hsl(var(--border) / 0.2) 1px, transparent 1px),
     linear-gradient(to bottom, hsl(var(--border) / 0.2) 1px, transparent 1px);
   background-size:
-    64px 100%,
-    100% 38px;
+    48px 100%,
+    100% 34px;
   background-position:
     0 0,
     0 100%;
 }
 
+@media (min-width: 640px) {
+  .calendar-heatmap {
+    --calendar-column-gap: 2px;
+    --calendar-row-gap: 2px;
+    --calendar-section-gap: 0.5rem;
+    --calendar-weekday-width: 1.875rem;
+    --calendar-label-font-size: 10px;
+  }
+}
+
+@media (min-width: 1024px) {
+  .calendar-heatmap {
+    --calendar-column-gap: 3px;
+    --calendar-row-gap: 3px;
+    --calendar-weekday-width: 2.25rem;
+    --calendar-label-font-size: 11px;
+  }
+}
+
+@media (min-width: 1280px) {
+  .calendar-heatmap {
+    --calendar-column-gap: 4px;
+    --calendar-row-gap: 4px;
+    --calendar-weekday-width: 2.5rem;
+  }
+
+  .token-usage-trend-grid {
+    background-size:
+      64px 100%,
+      100% 38px;
+  }
+}
+
 :deep([data-slot='chart']) .unovis-xy-container,
 :deep([data-slot='chart']) .unovis-single-container {
   overflow: visible;
diff --git a/src/renderer/settings/components/DeepChatAgentsSettings.vue b/src/renderer/settings/components/DeepChatAgentsSettings.vue
index 5df70abeb..c729fe551 100644
--- a/src/renderer/settings/components/DeepChatAgentsSettings.vue
+++ b/src/renderer/settings/components/DeepChatAgentsSettings.vue
@@ -56,8 +56,11 @@
     </aside>
 
     <main class="min-w-0 flex-1 overflow-y-auto">
-      <div class="mx-auto flex w-full max-w-5xl flex-col gap-6 px-6 py-6">
-        <div class="flex items-start justify-between gap-4">
+      <div
+        data-testid="deepchat-agents-sticky-header"
+        class="sticky top-0 z-20 border-b border-border/80 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/85"
+      >
+        <div class="mx-auto flex w-full max-w-5xl items-start justify-between gap-4 px-6 py-4">
           <div class="flex items-center gap-4">
             <div
               class="flex h-14 w-14 shrink-0 items-center justify-center rounded-2xl border border-border/70 bg-muted/40"
@@ -99,7 +102,9 @@
             </Button>
           </div>
         </div>
+      </div>
 
+      <div class="mx-auto flex w-full max-w-5xl flex-col gap-6 px-6 py-6">
         <section class="grid gap-4 rounded-2xl border border-border p-5 md:grid-cols-2">
           <label class="space-y-2">
             <div class="text-sm font-medium">{{ t('settings.deepchatAgents.name') }}</div>
@@ -550,7 +555,13 @@
               <div class="text-sm font-medium">
                 {{ `${t('settings.deepchatAgents.compactionThreshold')} (%)` }}
               </div>
-              <Input v-model="form.autoCompactionTriggerThreshold" type="number" min="5" max="95" />
+              <Input
+                v-model="form.autoCompactionTriggerThreshold"
+                data-testid="auto-compaction-trigger-threshold-input"
+                type="number"
+                min="5"
+                max="95"
+              />
             </label>
             <label class="space-y-2">
               <div class="text-sm font-medium">
@@ -558,6 +569,7 @@
               </div>
               <Input
                 v-model="form.autoCompactionRetainRecentPairs"
+                data-testid="auto-compaction-retain-recent-pairs-input"
                 type="number"
                 min="1"
                 max="10"
@@ -661,6 +673,7 @@ type ToolGroup = {
   label: string
   tools: MCPToolDefinition[]
 }
+type EditableNumberValue = string | number
 type FormState = {
   id: string | null
   protected: boolean
@@ -683,13 +696,19 @@ type FormState = {
   subagents: EditableSubagentSlot[]
   disabledAgentTools: string[]
   autoCompactionEnabled: boolean
-  autoCompactionTriggerThreshold: string
-  autoCompactionRetainRecentPairs: string
+  autoCompactionTriggerThreshold: EditableNumberValue
+  autoCompactionRetainRecentPairs: EditableNumberValue
 }
 
 const LUCIDE_ICONS = ['bot', 'sparkles', 'brain', 'code', 'book-open', 'pen-tool', 'rocket']
 const DRAFT_AGENT_ID = '__draft_deepchat_agent__'
 const CURRENT_SUBAGENT_TARGET = '__current_agent__'
+const AUTO_COMPACTION_TRIGGER_THRESHOLD_DEFAULT = 80
+const AUTO_COMPACTION_TRIGGER_THRESHOLD_MIN = 5
+const AUTO_COMPACTION_TRIGGER_THRESHOLD_MAX = 95
+const AUTO_COMPACTION_RETAIN_RECENT_PAIRS_DEFAULT = 2
+const AUTO_COMPACTION_RETAIN_RECENT_PAIRS_MIN = 1
+const AUTO_COMPACTION_RETAIN_RECENT_PAIRS_MAX = 10
 const GROUP_ORDER = [
   'agent-filesystem',
   'agent-core',
@@ -978,12 +997,35 @@ const normalizePath = (value: string | null | undefined) => {
   const normalized = value?.trim()
   return normalized ? normalized : null
 }
-const parseNum = (value: string) => {
-  const normalized = value.trim()
-  if (!normalized) return undefined
-  const parsed = Number(normalized)
-  return Number.isFinite(parsed) ? parsed : undefined
+const normalizeNumericInput = (
+  value: EditableNumberValue | null | undefined,
+  options: { fallback: number; min: number; max: number; integer?: boolean }
+) => {
+  if (value === '' || value === null || value === undefined) {
+    return options.fallback
+  }
+
+  const parsed = typeof value === 'number' ? value : Number(value.trim())
+  if (!Number.isFinite(parsed)) {
+    return options.fallback
+  }
+
+  const normalized = options.integer ? Math.round(parsed) : parsed
+  return Math.min(options.max, Math.max(options.min, normalized))
 }
+const normalizeAutoCompactionTriggerThreshold = (value: EditableNumberValue | null | undefined) =>
+  normalizeNumericInput(value, {
+    fallback: AUTO_COMPACTION_TRIGGER_THRESHOLD_DEFAULT,
+    min: AUTO_COMPACTION_TRIGGER_THRESHOLD_MIN,
+    max: AUTO_COMPACTION_TRIGGER_THRESHOLD_MAX
+  })
+const normalizeAutoCompactionRetainRecentPairs = (value: EditableNumberValue | null | undefined) =>
+  normalizeNumericInput(value, {
+    fallback: AUTO_COMPACTION_RETAIN_RECENT_PAIRS_DEFAULT,
+    min: AUTO_COMPACTION_RETAIN_RECENT_PAIRS_MIN,
+    max: AUTO_COMPACTION_RETAIN_RECENT_PAIRS_MAX,
+    integer: true
+  })
 const createAgentSlotId = () =>
   `slot-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`
 const numText = (value: unknown) =>
@@ -1042,8 +1084,12 @@ const fromAgent = (agent?: Agent | null): FormState => {
     subagents: normalizeDeepChatSubagentSlots(config.subagents),
     disabledAgentTools: [...(config.disabledAgentTools ?? [])],
     autoCompactionEnabled: config.autoCompactionEnabled ?? true,
-    autoCompactionTriggerThreshold: numText(config.autoCompactionTriggerThreshold ?? 80),
-    autoCompactionRetainRecentPairs: numText(config.autoCompactionRetainRecentPairs ?? 2)
+    autoCompactionTriggerThreshold: numText(
+      config.autoCompactionTriggerThreshold ?? AUTO_COMPACTION_TRIGGER_THRESHOLD_DEFAULT
+    ),
+    autoCompactionRetainRecentPairs: numText(
+      config.autoCompactionRetainRecentPairs ?? AUTO_COMPACTION_RETAIN_RECENT_PAIRS_DEFAULT
+    )
   }
 }
 const modelText = (selection: EditableModel | undefined) => {
@@ -1253,8 +1299,12 @@ const saveAgent = async () => {
         subagents: normalizeDeepChatSubagentSlots(form.subagents),
         disabledAgentTools: [...form.disabledAgentTools],
         autoCompactionEnabled: form.autoCompactionEnabled,
-        autoCompactionTriggerThreshold: parseNum(form.autoCompactionTriggerThreshold) ?? 80,
-        autoCompactionRetainRecentPairs: parseNum(form.autoCompactionRetainRecentPairs) ?? 2
+        autoCompactionTriggerThreshold: normalizeAutoCompactionTriggerThreshold(
+          form.autoCompactionTriggerThreshold
+        ),
+        autoCompactionRetainRecentPairs: normalizeAutoCompactionRetainRecentPairs(
+          form.autoCompactionRetainRecentPairs
+        )
       }
     }
     if (form.id) {
diff --git a/src/renderer/settings/components/ProviderApiConfig.vue b/src/renderer/settings/components/ProviderApiConfig.vue
index f62517f6f..83a9d2f7e 100644
--- a/src/renderer/settings/components/ProviderApiConfig.vue
+++ b/src/renderer/settings/components/ProviderApiConfig.vue
@@ -26,7 +26,21 @@
           <Icon icon="lucide:trash-2" class="w-4 h-4 mr-1" />{{ t('settings.provider.delete') }}
         </Button>
       </div>
+      <div v-if="showLockedBaseUrl" class="flex w-full items-center gap-2">
+        <div
+          :id="`${provider.id}-url`"
+          class="flex h-9 flex-1 items-center rounded-md border border-input bg-muted px-3 text-sm text-muted-foreground"
+        >
+          <span class="truncate">
+            {{ apiHost || t('settings.provider.urlPlaceholder') }}
+          </span>
+        </div>
+        <Button variant="outline" size="sm" class="shrink-0 text-xs" @click="requestBaseUrlUnlock">
+          {{ t('settings.provider.modifyBaseUrl') }}
+        </Button>
+      </div>
       <Input
+        v-else
         :id="`${provider.id}-url`"
         :model-value="apiHost"
         :placeholder="t('settings.provider.urlPlaceholder')"
@@ -35,7 +49,7 @@
         @update:model-value="apiHost = String($event)"
       />
       <div class="text-xs text-muted-foreground">
-        <TooltipProvider v-if="hasDefaultBaseUrl" :delayDuration="200">
+        <TooltipProvider v-if="hasDefaultBaseUrl && !showLockedBaseUrl" :delayDuration="200">
           <Tooltip>
             <TooltipTrigger as-child>
               <button
@@ -56,6 +70,9 @@
             </TooltipContent>
           </Tooltip>
         </TooltipProvider>
+        <span v-else-if="showLockedBaseUrl">
+          {{ t('settings.provider.baseUrlLockedHint') }}
+        </span>
         <span v-else>
           {{
             t('settings.provider.urlFormat', {
@@ -148,8 +165,10 @@
               : t('settings.provider.refreshModels')
           }}
         </Button>
-        <!-- Key Status Display -->
       </div>
+      <p v-if="shouldRefreshProviderDbFirst" class="text-xs leading-5 text-muted-foreground">
+        {{ t('settings.provider.refreshModelsWithMetadataHint') }}
+      </p>
       <div v-if="!provider.custom" class="text-xs text-muted-foreground">
         {{ t('settings.provider.howToGet') }}: {{ t('settings.provider.getKeyTip') }}
         <a :href="providerWebsites?.apiKey" target="_blank" class="text-primary">{{
@@ -176,8 +195,10 @@ import {
 import { Icon } from '@iconify/vue'
 import GitHubCopilotOAuth from './GitHubCopilotOAuth.vue'
 import { usePresenter } from '@/composables/usePresenter'
+import { useToast } from '@/components/use-toast'
 import { useModelCheckStore } from '@/stores/modelCheck'
 import type { LLM_PROVIDER, KeyStatus } from '@shared/presenter'
+import { isProviderDbBackedProvider } from '@shared/providerDbCatalog'
 
 interface ProviderWebsites {
   official: string
@@ -190,6 +211,18 @@ interface ProviderWebsites {
 const { t } = useI18n()
 const llmProviderPresenter = usePresenter('llmproviderPresenter')
 const modelCheckStore = useModelCheckStore()
+const { toast } = useToast()
+
+const EDITABLE_BASE_URL_PROVIDER_IDS = new Set([
+  'openai',
+  'openai-responses',
+  'anthropic',
+  'gemini',
+  'ollama',
+  'lmstudio',
+  'azure-openai',
+  'vertex'
+])
 
 const props = defineProps<{
   provider: LLM_PROVIDER
@@ -210,14 +243,23 @@ const apiHost = ref(props.provider.baseUrl || '')
 const keyStatus = ref<KeyStatus | null>(null)
 const isRefreshing = ref(false)
 const showApiKey = ref(false)
+const baseUrlUnlocked = ref(false)
 const defaultBaseUrl = computed(() => props.providerWebsites?.defaultBaseUrl?.trim() || '')
 const hasDefaultBaseUrl = computed(() => defaultBaseUrl.value.length > 0)
+const isBaseUrlEditableByDefault = computed(
+  () => props.provider.custom || EDITABLE_BASE_URL_PROVIDER_IDS.has(props.provider.id)
+)
+const showLockedBaseUrl = computed(
+  () => !isBaseUrlEditableByDefault.value && !baseUrlUnlocked.value
+)
+const shouldRefreshProviderDbFirst = computed(() => isProviderDbBackedProvider(props.provider.id))
 
 watch(
   () => props.provider,
   () => {
     apiKey.value = props.provider.apiKey || ''
     apiHost.value = props.provider.baseUrl || ''
+    baseUrlUnlocked.value = false
   },
   { immediate: true }
 )
@@ -242,7 +284,12 @@ const fillDefaultBaseUrl = () => {
   handleApiHostChange(defaultBaseUrl.value)
 }
 
+const requestBaseUrlUnlock = () => {
+  baseUrlUnlocked.value = true
+}
+
 const handleApiHostBlur = (event: FocusEvent) => {
+  if (showLockedBaseUrl.value) return
   const target = event.target as HTMLInputElement | null
   if (!target) return
   handleApiHostChange(target.value)
@@ -282,8 +329,27 @@ const refreshModels = async () => {
   isRefreshing.value = true
   try {
     await llmProviderPresenter.refreshModels(props.provider.id)
+    toast({
+      title: t('settings.provider.toast.refreshModelsSuccessTitle'),
+      description: t(
+        shouldRefreshProviderDbFirst.value
+          ? 'settings.provider.toast.refreshModelsSuccessDescriptionWithMetadata'
+          : 'settings.provider.toast.refreshModelsSuccessDescription'
+      ),
+      duration: 4000
+    })
   } catch (error) {
     console.error('Failed to refresh models:', error)
+    toast({
+      title: t('settings.provider.toast.refreshModelsFailedTitle'),
+      description: t(
+        shouldRefreshProviderDbFirst.value
+          ? 'settings.provider.toast.refreshModelsFailedDescriptionWithMetadata'
+          : 'settings.provider.toast.refreshModelsFailedDescription'
+      ),
+      variant: 'destructive',
+      duration: 4000
+    })
   } finally {
     isRefreshing.value = false
   }
diff --git a/src/renderer/settings/components/ProviderModelList.vue b/src/renderer/settings/components/ProviderModelList.vue
index 66fb5f4f5..431005094 100644
--- a/src/renderer/settings/components/ProviderModelList.vue
+++ b/src/renderer/settings/components/ProviderModelList.vue
@@ -2,21 +2,154 @@
   <div class="flex flex-col w-full gap-4">
     <div
       ref="searchContainerRef"
-      class="sticky z-30 backdrop-blur supports-[backdrop-filter]:bg-background/80 py-2 border-b border-border/60 flex gap-2"
+      class="sticky z-30 border-b border-border/60 py-2 backdrop-blur supports-backdrop-filter:bg-background/80"
       :style="{ top: `${searchStickyTop}px` }"
     >
-      <Input
-        class="flex-1"
-        v-model="modelSearchQuery"
-        :placeholder="t('model.search.placeholder')"
-      />
+      <div class="flex gap-2">
+        <Input
+          class="flex-1"
+          v-model="modelSearchQuery"
+          :placeholder="t('model.search.placeholder')"
+        />
+
+        <Popover v-model:open="filterPopoverOpen">
+          <PopoverTrigger as-child>
+            <Button
+              variant="outline"
+              class="px-3 text-xs"
+              :class="activeAdvancedFilterCount ? 'border-primary/40 bg-primary/5' : ''"
+            >
+              <Icon icon="lucide:funnel" class="mr-2 h-4 w-4 text-muted-foreground" />
+              {{ t('model.filter.label') }}
+              <Badge v-if="activeAdvancedFilterCount" variant="secondary" class="ml-2">
+                {{ activeAdvancedFilterCount }}
+              </Badge>
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent align="end" class="w-[320px] p-4">
+            <div class="space-y-4">
+              <div class="flex items-center justify-between gap-2">
+                <div class="text-sm font-medium">{{ t('model.filter.label') }}</div>
+                <Button
+                  size="sm"
+                  variant="ghost"
+                  class="h-7 px-2 text-xs"
+                  :disabled="!activeAdvancedFilterCount"
+                  @click="clearAdvancedFilters"
+                >
+                  {{ t('common.clear') }}
+                </Button>
+              </div>
+
+              <div class="space-y-2">
+                <div class="text-xs font-medium text-muted-foreground">
+                  {{ t('model.filter.capabilities') }}
+                </div>
+                <div class="grid gap-2 sm:grid-cols-2">
+                  <Button
+                    v-for="option in capabilityFilterOptions"
+                    :key="option.value"
+                    :data-testid="`model-capability-filter-${option.value}`"
+                    size="sm"
+                    class="justify-between px-3 text-xs"
+                    :variant="selectedCapabilities.includes(option.value) ? 'default' : 'outline'"
+                    @click="toggleCapabilityFilter(option.value)"
+                  >
+                    <span class="flex min-w-0 items-center gap-1.5">
+                      <Icon :icon="option.icon" class="h-3.5 w-3.5 shrink-0" />
+                      <span class="truncate">{{ option.label }}</span>
+                    </span>
+                    <span class="ml-2 text-[11px] opacity-70">{{ option.count }}</span>
+                  </Button>
+                </div>
+              </div>
 
-      <AddCustomModelButton :provider-id="newProviderModel" @saved="$emit('config-changed')" />
+              <div class="space-y-2">
+                <div class="text-xs font-medium text-muted-foreground">
+                  {{ t('model.filter.types') }}
+                </div>
+                <div class="grid gap-2 sm:grid-cols-2">
+                  <Button
+                    v-for="option in typeFilterOptions"
+                    :key="option.value"
+                    :data-testid="`model-type-filter-${option.value}`"
+                    size="sm"
+                    class="justify-between px-3 text-xs"
+                    :variant="selectedTypes.includes(option.value) ? 'default' : 'outline'"
+                    @click="toggleTypeFilter(option.value)"
+                  >
+                    <span class="flex min-w-0 items-center gap-1.5">
+                      <Icon :icon="option.icon" class="h-3.5 w-3.5 shrink-0" />
+                      <span class="truncate">{{ option.label }}</span>
+                    </span>
+                    <span class="ml-2 text-[11px] opacity-70">{{ option.count }}</span>
+                  </Button>
+                </div>
+              </div>
+            </div>
+          </PopoverContent>
+        </Popover>
+
+        <Popover v-model:open="sortPopoverOpen">
+          <PopoverTrigger as-child>
+            <Button variant="outline" class="px-3 text-xs">
+              <Icon icon="lucide:arrow-up-down" class="mr-2 h-4 w-4 text-muted-foreground" />
+              {{ currentSortLabel }}
+            </Button>
+          </PopoverTrigger>
+          <PopoverContent align="end" class="w-48 p-2">
+            <div class="space-y-1">
+              <Button
+                v-for="option in sortOptions"
+                :key="option.value"
+                :data-testid="`model-sort-${option.value}`"
+                size="sm"
+                variant="ghost"
+                class="w-full justify-between px-2! text-xs"
+                @click="setSort(option.value)"
+              >
+                <span>{{ option.label }}</span>
+                <Icon v-if="sortState === option.value" icon="lucide:check" class="h-2 w-2" />
+              </Button>
+            </div>
+          </PopoverContent>
+        </Popover>
+
+        <AddCustomModelButton :provider-id="newProviderModel" @saved="$emit('config-changed')" />
+      </div>
+
+      <div class="mt-2 flex flex-wrap items-center justify-between gap-2">
+        <div v-if="activeFilterTokens.length" class="flex flex-wrap items-center gap-2">
+          <Button
+            v-for="token in activeFilterTokens"
+            :key="`${token.kind}-${token.value}`"
+            size="sm"
+            variant="outline"
+            class="h-7 px-2.5 text-xs"
+            @click="removeFilterToken(token)"
+          >
+            <span>{{ token.label }}</span>
+            <Icon icon="lucide:x" class="ml-1 h-3.5 w-3.5" />
+          </Button>
+          <Button size="sm" variant="ghost" class="h-7 px-2 text-xs" @click="clearAllFilters">
+            {{ t('model.filter.clearAll') }}
+          </Button>
+        </div>
+
+        <div class="text-xs text-muted-foreground">
+          {{
+            t('model.filter.visibleCount', {
+              visible: visibleModelCount,
+              total: totalModelCount
+            })
+          }}
+        </div>
+      </div>
     </div>
 
     <div v-if="filteredCustomModels.length > 0" class="relative">
       <div
-        class="sticky z-20 backdrop-blur supports-[backdrop-filter]:bg-background/80 px-3 py-2 text-xs font-medium text-muted-foreground"
+        class="sticky z-20 backdrop-blur supports-backdrop-filter:bg-background/80 px-3 py-2 text-xs font-medium text-muted-foreground"
         :style="{ top: `${customLabelStickyTop}px` }"
       >
         {{ t('model.type.custom') }}
@@ -126,9 +259,11 @@
 </template>
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n'
-import { computed, ref, watch } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 import { Input } from '@shadcn/components/ui/input'
 import { Button } from '@shadcn/components/ui/button'
+import { Badge } from '@shadcn/components/ui/badge'
+import { Popover, PopoverContent, PopoverTrigger } from '@shadcn/components/ui/popover'
 import { Icon } from '@iconify/vue'
 import ModelConfigItem from '@/components/settings/ModelConfigItem.vue'
 import { type RENDERER_MODEL_META } from '@shared/presenter'
@@ -144,6 +279,44 @@ const { t } = useI18n()
 const modelSearchQuery = ref('')
 const modelStore = useModelStore()
 const MIN_MODEL_ITEM_HEIGHT = 56
+const modelNameCollator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' })
+
+type ModelSortKey = 'status' | 'name'
+type ModelCapabilityKey = 'vision' | 'functionCall' | 'reasoning' | 'search'
+type FilterToken = {
+  kind: 'capability' | 'type'
+  value: string
+  label: string
+}
+
+type FacetOption<Value extends string> = {
+  value: Value
+  label: string
+  icon: string
+  count: number
+}
+
+const CAPABILITY_ORDER: ModelCapabilityKey[] = ['vision', 'functionCall', 'reasoning', 'search']
+const TYPE_ORDER: ModelType[] = [
+  ModelType.Chat,
+  ModelType.Embedding,
+  ModelType.Rerank,
+  ModelType.ImageGeneration
+]
+
+const CAPABILITY_ICONS: Record<ModelCapabilityKey, string> = {
+  vision: 'lucide:eye',
+  functionCall: 'lucide:function-square',
+  reasoning: 'lucide:brain',
+  search: 'lucide:globe'
+}
+
+const TYPE_ICONS: Record<ModelType, string> = {
+  [ModelType.Chat]: 'lucide:messages-square',
+  [ModelType.Embedding]: 'lucide:database',
+  [ModelType.Rerank]: 'lucide:arrow-up-wide-narrow',
+  [ModelType.ImageGeneration]: 'lucide:image'
+}
 
 const props = defineProps<{
   providerModels: { providerId: string; models: RENDERER_MODEL_META[] }[]
@@ -158,6 +331,14 @@ const newProviderModel = computed(() => {
   return props.providers?.[0].id ?? ''
 })
 
+const filterPopoverOpen = ref(false)
+const sortPopoverOpen = ref(false)
+const filterState = reactive({
+  sort: 'status' as ModelSortKey,
+  capabilities: [] as ModelCapabilityKey[],
+  types: [] as ModelType[]
+})
+
 const emit = defineEmits<{
   enabledChange: [model: RENDERER_MODEL_META, enabled: boolean]
   'config-changed': []
@@ -165,44 +346,151 @@ const emit = defineEmits<{
 
 const stickyBaseOffset = computed(() => props.stickyOffset ?? 0)
 
-const filteredProviderModels = computed(() => {
-  if (!modelSearchQuery.value) {
-    return props.providerModels
+const normalizedSearchQuery = computed(() => modelSearchQuery.value.trim().toLowerCase())
+
+const getModelTypeValue = (model: RENDERER_MODEL_META): ModelType => model.type ?? ModelType.Chat
+
+const getModelCapabilityValues = (model: RENDERER_MODEL_META): ModelCapabilityKey[] => {
+  const capabilities: ModelCapabilityKey[] = []
+  if (model.vision) capabilities.push('vision')
+  if (model.functionCall) capabilities.push('functionCall')
+  if (model.reasoning) capabilities.push('reasoning')
+  if (model.enableSearch) capabilities.push('search')
+  return capabilities
+}
+
+const getModelTypeLabel = (type: ModelType) => t(`model.filter.typeOptions.${type}`)
+const getCapabilityLabel = (capability: ModelCapabilityKey) =>
+  t(`model.filter.capabilityOptions.${capability}`)
+
+const allModels = computed(() => [
+  ...props.customModels,
+  ...props.providerModels.flatMap((provider) => provider.models)
+])
+
+const totalModelCount = computed(() => allModels.value.length)
+
+const capabilityFilterOptions = computed<FacetOption<ModelCapabilityKey>[]>(() =>
+  CAPABILITY_ORDER.map((capability) => ({
+    value: capability,
+    label: getCapabilityLabel(capability),
+    icon: CAPABILITY_ICONS[capability],
+    count: allModels.value.filter((model) => getModelCapabilityValues(model).includes(capability))
+      .length
+  })).filter((option) => option.count > 0)
+)
+
+const typeFilterOptions = computed<FacetOption<ModelType>[]>(() =>
+  TYPE_ORDER.map((type) => ({
+    value: type,
+    label: getModelTypeLabel(type),
+    icon: TYPE_ICONS[type],
+    count: allModels.value.filter((model) => getModelTypeValue(model) === type).length
+  })).filter((option) => option.count > 0)
+)
+
+const sortOptions = computed(() => [
+  { value: 'status' as ModelSortKey, label: t('model.sort.status') },
+  { value: 'name' as ModelSortKey, label: t('model.sort.name') }
+])
+
+const currentSortLabel = computed(() => t(`model.sort.${filterState.sort}`))
+const sortState = computed(() => filterState.sort)
+const selectedCapabilities = computed(() => filterState.capabilities)
+const selectedTypes = computed(() => filterState.types)
+const activeAdvancedFilterCount = computed(
+  () => filterState.capabilities.length + filterState.types.length
+)
+
+const activeFilterTokens = computed<FilterToken[]>(() => {
+  const tokens: FilterToken[] = []
+
+  filterState.capabilities.forEach((capability) => {
+    tokens.push({
+      kind: 'capability',
+      value: capability,
+      label: getCapabilityLabel(capability)
+    })
+  })
+
+  filterState.types.forEach((type) => {
+    tokens.push({
+      kind: 'type',
+      value: type,
+      label: getModelTypeLabel(type)
+    })
+  })
+
+  return tokens
+})
+
+const hasListRefinements = computed(
+  () => normalizedSearchQuery.value.length > 0 || activeAdvancedFilterCount.value > 0
+)
+
+const matchesSearch = (model: RENDERER_MODEL_META) => {
+  if (!normalizedSearchQuery.value) {
+    return true
+  }
+
+  return [model.name, model.id, model.group, model.description]
+    .filter((value): value is string => typeof value === 'string' && value.trim().length > 0)
+    .some((value) => value.toLowerCase().includes(normalizedSearchQuery.value))
+}
+
+const matchesAdvancedFilters = (model: RENDERER_MODEL_META) => {
+  const capabilities = getModelCapabilityValues(model)
+  const type = getModelTypeValue(model)
+
+  if (
+    filterState.capabilities.length > 0 &&
+    !filterState.capabilities.some((capability) => capabilities.includes(capability))
+  ) {
+    return false
+  }
+
+  if (filterState.types.length > 0 && !filterState.types.includes(type)) {
+    return false
   }
 
+  return true
+}
+
+const statusSortWeight = (model: RENDERER_MODEL_META) => (model.enabled ? 0 : 1)
+
+const sortModels = (models: RENDERER_MODEL_META[]) =>
+  [...models].sort((left, right) => {
+    if (filterState.sort === 'name') {
+      return modelNameCollator.compare(left.name, right.name)
+    }
+
+    const statusDifference = statusSortWeight(left) - statusSortWeight(right)
+    if (statusDifference !== 0) {
+      return statusDifference
+    }
+
+    return modelNameCollator.compare(left.name, right.name)
+  })
+
+const filterAndSortModels = (models: RENDERER_MODEL_META[]) =>
+  sortModels(models.filter((model) => matchesSearch(model) && matchesAdvancedFilters(model)))
+
+const filteredProviderModels = computed(() => {
   return props.providerModels
     .map((provider) => ({
       providerId: provider.providerId,
-      models: provider.models.filter(
-        (model) =>
-          model.name.toLowerCase().includes(modelSearchQuery.value.toLowerCase()) ||
-          model.id.toLowerCase().includes(modelSearchQuery.value.toLowerCase())
-      )
+      models: filterAndSortModels(provider.models)
     }))
     .filter((provider) => provider.models.length > 0)
 })
 
-const filteredCustomModels = computed(() => {
-  const customModelsList: RENDERER_MODEL_META[] = []
-  for (const model of props.customModels) {
-    customModelsList.push(model)
-  }
-
-  if (!modelSearchQuery.value) {
-    return customModelsList
-  }
+const filteredCustomModels = computed(() => filterAndSortModels(props.customModels))
 
-  const filteredModels: RENDERER_MODEL_META[] = []
-  for (const model of customModelsList) {
-    if (
-      model.name.toLowerCase().includes(modelSearchQuery.value.toLowerCase()) ||
-      model.id.toLowerCase().includes(modelSearchQuery.value.toLowerCase())
-    ) {
-      filteredModels.push(model)
-    }
-  }
-  return filteredModels
-})
+const visibleModelCount = computed(
+  () =>
+    filteredCustomModels.value.length +
+    filteredProviderModels.value.reduce((total, provider) => total + provider.models.length, 0)
+)
 
 type VirtualModelListItem =
   | { id: string; type: 'label'; label: string }
@@ -227,11 +515,13 @@ const virtualItems = computed<VirtualModelListItem[]>(() => {
       officialLabelInserted = true
     }
 
-    items.push({
-      id: `${provider.providerId}-actions`,
-      type: 'provider-actions',
-      providerId: provider.providerId
-    })
+    if (!hasListRefinements.value) {
+      items.push({
+        id: `${provider.providerId}-actions`,
+        type: 'provider-actions',
+        providerId: provider.providerId
+      })
+    }
 
     provider.models.forEach((model) => {
       items.push({
@@ -313,6 +603,41 @@ const handleDeleteCustomModel = async (model: RENDERER_MODEL_META) => {
   }
 }
 
+const toggleCapabilityFilter = (capability: ModelCapabilityKey) => {
+  filterState.capabilities = filterState.capabilities.includes(capability)
+    ? filterState.capabilities.filter((item) => item !== capability)
+    : [...filterState.capabilities, capability]
+}
+
+const toggleTypeFilter = (type: ModelType) => {
+  filterState.types = filterState.types.includes(type)
+    ? filterState.types.filter((item) => item !== type)
+    : [...filterState.types, type]
+}
+
+const clearAdvancedFilters = () => {
+  filterState.capabilities = []
+  filterState.types = []
+}
+
+const clearAllFilters = () => {
+  clearAdvancedFilters()
+}
+
+const removeFilterToken = (token: FilterToken) => {
+  if (token.kind === 'capability') {
+    filterState.capabilities = filterState.capabilities.filter((item) => item !== token.value)
+    return
+  }
+
+  filterState.types = filterState.types.filter((item) => item !== token.value)
+}
+
+const setSort = (sort: ModelSortKey) => {
+  filterState.sort = sort
+  sortPopoverOpen.value = false
+}
+
 // 启用提供商下所有模型
 const enableAllModels = (providerId: string) => {
   modelStore.enableAllModels(providerId)
diff --git a/src/renderer/settings/components/RemoteSettings.vue b/src/renderer/settings/components/RemoteSettings.vue
index 069c2a943..07677bade 100644
--- a/src/renderer/settings/components/RemoteSettings.vue
+++ b/src/renderer/settings/components/RemoteSettings.vue
@@ -896,7 +896,7 @@ import type {
 
 const channels: RemoteChannel[] = ['telegram', 'feishu']
 const remoteControlPresenter = useRemoteControlPresenter()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const projectPresenter = usePresenter('projectPresenter')
 const { t } = useI18n()
 const { toast } = useToast()
@@ -1331,7 +1331,7 @@ const refreshPairingSnapshot = async (channel: RemoteChannel): Promise<RemotePai
 }
 
 const loadAvailableAgents = async () => {
-  availableAgents.value = await newAgentPresenter.getAgents()
+  availableAgents.value = await agentSessionPresenter.getAgents()
 }
 
 const loadRecentProjects = async () => {
diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
index 16c4f6b8d..62187761e 100644
--- a/src/renderer/src/App.vue
+++ b/src/renderer/src/App.vue
@@ -8,7 +8,6 @@ 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 { DEEPLINK_EVENTS, NOTIFICATION_EVENTS, SHORTCUT_EVENTS } from './events'
 import { Toaster } from '@shadcn/components/ui/sonner'
 import { useToast } from '@/components/use-toast'
 import { useUiSettingsStore } from '@/stores/uiSettingsStore'
@@ -28,6 +27,7 @@ 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 { useAppIpcRuntime } from '@/composables/useAppIpcRuntime'
 
 const DEV_WELCOME_OVERRIDE_KEY = '__deepchat_dev_force_welcome'
 
@@ -291,9 +291,44 @@ const handleStartDeeplink = (_event: unknown, payload?: Omit<StartDeeplinkPayloa
   void activatePendingStartDeeplink()
 }
 
-if (window?.electron?.ipcRenderer) {
-  window.electron.ipcRenderer.on(DEEPLINK_EVENTS.START, handleStartDeeplink)
-}
+const { setup: setupAppIpcRuntime, cleanup: cleanupAppIpcRuntime } = useAppIpcRuntime({
+  handleStartDeeplink: (event, payload) => {
+    handleStartDeeplink(event, payload as Omit<StartDeeplinkPayload, 'token'> | undefined)
+  },
+  showErrorToast,
+  handleZoomIn,
+  handleZoomOut,
+  handleZoomResume,
+  handleCreateNewConversation,
+  openSpotlight: () => {
+    spotlightStore.openSpotlight()
+  },
+  handleDataResetComplete: () => {
+    toast({
+      title: t('settings.data.resetCompleteDevTitle'),
+      description: t('settings.data.resetCompleteDevMessage'),
+      variant: 'default',
+      duration: 15000
+    })
+  },
+  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) => {
@@ -319,69 +354,7 @@ onMounted(() => {
   // initialize store data
   void initAppStores()
   setupMcpDeeplink()
-
-  // Listen for global error notification events
-  window.electron.ipcRenderer.on(NOTIFICATION_EVENTS.SHOW_ERROR, (_event, error) => {
-    showErrorToast(error)
-  })
-
-  // Listen for shortcut key events
-  window.electron.ipcRenderer.on(SHORTCUT_EVENTS.ZOOM_IN, () => {
-    handleZoomIn()
-  })
-
-  window.electron.ipcRenderer.on(SHORTCUT_EVENTS.ZOOM_OUT, () => {
-    handleZoomOut()
-  })
-
-  window.electron.ipcRenderer.on(SHORTCUT_EVENTS.ZOOM_RESUME, () => {
-    handleZoomResume()
-  })
-
-  window.electron.ipcRenderer.on(SHORTCUT_EVENTS.CREATE_NEW_CONVERSATION, () => {
-    // Check if current route is chat page
-    const currentRoute = router.currentRoute.value
-    if (currentRoute.name !== 'chat') {
-      return
-    }
-    void handleCreateNewConversation()
-  })
-
-  window.electron.ipcRenderer.on(SHORTCUT_EVENTS.TOGGLE_SPOTLIGHT, () => {
-    spotlightStore.openSpotlight()
-  })
-
-  // GO_SETTINGS is now handled in main process (open/focus Settings tab)
-
-  window.electron.ipcRenderer.on(NOTIFICATION_EVENTS.DATA_RESET_COMPLETE_DEV, () => {
-    toast({
-      title: t('settings.data.resetCompleteDevTitle'),
-      description: t('settings.data.resetCompleteDevMessage'),
-      variant: 'default',
-      duration: 15000
-    })
-  })
-
-  window.electron.ipcRenderer.on(NOTIFICATION_EVENTS.SYS_NOTIFY_CLICKED, (_, msg) => {
-    let sessionId: string | null = null
-
-    // Check if msg is string and starts with chat/
-    if (typeof msg === 'string' && msg.startsWith('chat/')) {
-      // Split by /, check if there are three segments
-      const parts = msg.split('/')
-      if (parts.length === 3) {
-        // Extract middle part as sessionId
-        sessionId = parts[1]
-      }
-    } else if (msg && msg.threadId) {
-      // Compatible with original format, if msg is object and contains threadId property
-      sessionId = msg.threadId
-    }
-
-    if (sessionId) {
-      void sessionStore.selectSession(sessionId)
-    }
-  })
+  setupAppIpcRuntime()
 
   watch(
     () => activeTab.value,
@@ -424,17 +397,7 @@ onBeforeUnmount(() => {
   }
 
   window.removeEventListener('keydown', handleEscKey)
-
-  // Remove shortcut key event listeners
-  window.electron.ipcRenderer.removeAllListeners(SHORTCUT_EVENTS.ZOOM_IN)
-  window.electron.ipcRenderer.removeAllListeners(SHORTCUT_EVENTS.ZOOM_OUT)
-  window.electron.ipcRenderer.removeAllListeners(SHORTCUT_EVENTS.ZOOM_RESUME)
-  window.electron.ipcRenderer.removeAllListeners(SHORTCUT_EVENTS.CREATE_NEW_CONVERSATION)
-  window.electron.ipcRenderer.removeAllListeners(SHORTCUT_EVENTS.TOGGLE_SPOTLIGHT)
-  // GO_SETTINGS listener removed; handled in main
-  window.electron.ipcRenderer.removeAllListeners(NOTIFICATION_EVENTS.SYS_NOTIFY_CLICKED)
-  window.electron.ipcRenderer.removeAllListeners(NOTIFICATION_EVENTS.DATA_RESET_COMPLETE_DEV)
-  window.electron.ipcRenderer.removeAllListeners(DEEPLINK_EVENTS.START)
+  cleanupAppIpcRuntime()
   cleanupMcpDeeplink()
 })
 </script>
diff --git a/src/renderer/src/components/chat-input/McpIndicator.vue b/src/renderer/src/components/chat-input/McpIndicator.vue
index 42bf21e32..55881a1f2 100644
--- a/src/renderer/src/components/chat-input/McpIndicator.vue
+++ b/src/renderer/src/components/chat-input/McpIndicator.vue
@@ -295,7 +295,7 @@ const agentStore = useAgentStore()
 const projectStore = useProjectStore()
 const windowPresenter = usePresenter('windowPresenter')
 const toolPresenter = usePresenter('toolPresenter')
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 
 const panelOpen = ref(false)
 const toolsLoading = ref(false)
@@ -503,7 +503,7 @@ const loadDeepchatTools = async () => {
         agentWorkspacePath: workspacePath.value
       }),
       deepchatSessionId.value
-        ? newAgentPresenter.getSessionDisabledAgentTools(deepchatSessionId.value)
+        ? agentSessionPresenter.getSessionDisabledAgentTools(deepchatSessionId.value)
         : Promise.resolve([...draftStore.disabledAgentTools])
     ])
 
@@ -554,7 +554,7 @@ const persistDisabledTools = async (nextList: string[], affectedToolNames: strin
 
   setToolsPending(affectedToolNames, true)
   try {
-    const persisted = await newAgentPresenter.updateSessionDisabledAgentTools(
+    const persisted = await agentSessionPresenter.updateSessionDisabledAgentTools(
       deepchatSessionId.value,
       nextList
     )
diff --git a/src/renderer/src/components/chat/ChatStatusBar.vue b/src/renderer/src/components/chat/ChatStatusBar.vue
index e398d486b..bcd1228a4 100644
--- a/src/renderer/src/components/chat/ChatStatusBar.vue
+++ b/src/renderer/src/components/chat/ChatStatusBar.vue
@@ -817,7 +817,7 @@ const draftStore = useDraftStore()
 const projectStore = useProjectStore()
 const configPresenter = usePresenter('configPresenter')
 const llmproviderPresenter = usePresenter('llmproviderPresenter')
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const { t } = useI18n()
 
 const draftModelSelection = ref<ModelSelection | null>(null)
@@ -1898,7 +1898,7 @@ const flushGenerationPatch = async () => {
   const requestToken = ++generationPersistRequestToken
   const localRevisionAtRequest = generationLocalRevision
   try {
-    const updated = await newAgentPresenter.updateSessionGenerationSettings(sessionId, patch)
+    const updated = await agentSessionPresenter.updateSessionGenerationSettings(sessionId, patch)
     if (requestToken !== generationPersistRequestToken) {
       return
     }
@@ -2003,7 +2003,7 @@ const syncGenerationSettings = async () => {
   const sessionId = sessionStore.activeSessionId
   if (sessionId) {
     try {
-      const settings = await newAgentPresenter.getSessionGenerationSettings(sessionId)
+      const settings = await agentSessionPresenter.getSessionGenerationSettings(sessionId)
       if (token !== generationSyncToken) {
         return
       }
@@ -2060,7 +2060,7 @@ const syncAcpConfigOptions = async () => {
     acpConfigLoadedRequestKey.value = null
 
     try {
-      const state = await newAgentPresenter.getAcpSessionConfigOptions(activeAcpSessionId.value)
+      const state = await agentSessionPresenter.getAcpSessionConfigOptions(activeAcpSessionId.value)
       if (token !== acpConfigSyncToken || acpConfigRequestKey.value !== requestKey) {
         return
       }
@@ -2144,7 +2144,11 @@ const updateAcpConfigOption = async (configId: string, value: string | boolean)
 
   acpOptionSavingIds.value = [...acpOptionSavingIds.value, configId]
   try {
-    const updated = await newAgentPresenter.setAcpSessionConfigOption(sessionId, configId, value)
+    const updated = await agentSessionPresenter.setAcpSessionConfigOption(
+      sessionId,
+      configId,
+      value
+    )
     setCachedAcpConfigState(agentId, updated)
     if (activeAcpSessionId.value !== sessionId) {
       return
@@ -2228,7 +2232,7 @@ watch(
     }
 
     try {
-      const mode = await newAgentPresenter.getPermissionMode(sessionId)
+      const mode = await agentSessionPresenter.getPermissionMode(sessionId)
       if (token !== permissionSyncToken) return
       permissionMode.value = mode === 'default' ? 'default' : 'full_access'
     } catch (error) {
@@ -2706,7 +2710,7 @@ async function selectPermissionMode(mode: PermissionMode) {
     return
   }
   try {
-    await newAgentPresenter.setPermissionMode(sessionId, mode)
+    await agentSessionPresenter.setPermissionMode(sessionId, mode)
   } catch (error) {
     console.warn('[ChatStatusBar] Failed to set permission mode:', error)
   }
diff --git a/src/renderer/src/components/chat/composables/useChatInputMentions.ts b/src/renderer/src/components/chat/composables/useChatInputMentions.ts
index 92f1de34a..90e37dd51 100644
--- a/src/renderer/src/components/chat/composables/useChatInputMentions.ts
+++ b/src/renderer/src/components/chat/composables/useChatInputMentions.ts
@@ -85,7 +85,7 @@ const normalizeAcpCommands = (commands: unknown): AcpSessionCommand[] => {
 
 export function useChatInputMentions(options: UseChatInputMentionsOptions) {
   const workspacePresenter = usePresenter('workspacePresenter')
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
   const skillPresenter = usePresenter('skillPresenter')
   const mcpStore = useMcpStore()
   const skillsStore = useSkillsStore()
@@ -237,7 +237,7 @@ export function useChatInputMentions(options: UseChatInputMentionsOptions) {
     }
 
     try {
-      const commands = await newAgentPresenter.getAcpSessionCommands(sessionId)
+      const commands = await agentSessionPresenter.getAcpSessionCommands(sessionId)
       if (fetchSeq !== acpCommandFetchSeq.value) {
         return
       }
diff --git a/src/renderer/src/components/markdown/MarkdownRenderer.vue b/src/renderer/src/components/markdown/MarkdownRenderer.vue
index 25a00d87c..586755066 100644
--- a/src/renderer/src/components/markdown/MarkdownRenderer.vue
+++ b/src/renderer/src/components/markdown/MarkdownRenderer.vue
@@ -41,7 +41,7 @@ const artifactStore = useArtifactStore()
 const fallbackMessageId = `artifact-msg-${nanoid()}`
 const fallbackThreadId = `artifact-thread-${nanoid()}`
 const referenceStore = useReferenceStore()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const referenceNode = ref<HTMLElement | null>(null)
 const debouncedContent = ref(props.content)
 const effectiveMessageId = computed(() => props.messageId ?? fallbackMessageId)
@@ -76,7 +76,7 @@ setCustomComponents({
       threadId: effectiveThreadId.value,
       onClick() {
         // TODO: remove this temporary fallback after search result loading is fully unified.
-        newAgentPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
+        agentSessionPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
           const index = parseInt(_props.node.id)
           if (index < results.length) {
             window.open(results[index - 1].url, '_blank', 'noopener,noreferrer')
@@ -86,7 +86,7 @@ setCustomComponents({
       onMouseEnter() {
         console.log('Mouse entered')
         referenceStore.hideReference()
-        newAgentPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
+        agentSessionPresenter.getSearchResults(effectiveMessageId.value).then((results) => {
           const index = parseInt(_props.node.id)
           if (index - 1 < results.length && referenceNode.value) {
             referenceStore.showReference(
diff --git a/src/renderer/src/components/message/MessageBlockContent.vue b/src/renderer/src/components/message/MessageBlockContent.vue
index 13674b5d5..acf368b20 100644
--- a/src/renderer/src/components/message/MessageBlockContent.vue
+++ b/src/renderer/src/components/message/MessageBlockContent.vue
@@ -34,7 +34,7 @@ import { ref, nextTick, watch, onMounted } from 'vue'
 import { usePresenter } from '@/composables/usePresenter'
 import type { SearchResult } from '@shared/types/core/search'
 
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const searchResults = ref<SearchResult[]>([])
 
 import ArtifactThinking from '../artifacts/ArtifactThinking.vue'
@@ -104,7 +104,7 @@ watch(
 onMounted(async () => {
   if (props.isSearchResult) {
     // TODO: remove this temporary fallback after search result loading is fully unified.
-    searchResults.value = await newAgentPresenter.getSearchResults(props.messageId)
+    searchResults.value = await agentSessionPresenter.getSearchResults(props.messageId)
   }
 })
 </script>
diff --git a/src/renderer/src/components/message/MessageBlockToolCall.vue b/src/renderer/src/components/message/MessageBlockToolCall.vue
index c9c86c388..2283f9102 100644
--- a/src/renderer/src/components/message/MessageBlockToolCall.vue
+++ b/src/renderer/src/components/message/MessageBlockToolCall.vue
@@ -182,6 +182,7 @@ import { Icon } from '@iconify/vue'
 import { useI18n } from 'vue-i18n'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { CodeBlockNode } from 'markstream-vue'
+import { summarizeToolCallPreview } from '@shared/lib/toolCallSummary'
 import { useThemeStore } from '@/stores/theme'
 import { useSessionStore } from '@/stores/ui/session'
 import { getLanguageFromFilename } from '@shared/utils/codeLanguage'
@@ -203,39 +204,6 @@ type ExpansionSource = 'auto' | 'manual' | null
 const isRecord = (value: unknown): value is Record<string, unknown> =>
   Boolean(value) && typeof value === 'object' && !Array.isArray(value)
 
-const normalizeInlineText = (value: string): string => value.replace(/\s+/g, ' ').trim()
-
-const extractFirstSummaryValue = (value: unknown): unknown => {
-  if (Array.isArray(value)) {
-    return value.length > 0 ? value[0] : ''
-  }
-  if (isRecord(value)) {
-    const entries = Object.entries(value)
-    return entries.length > 0 ? entries[0][1] : ''
-  }
-  return value
-}
-
-const formatSummaryValue = (value: unknown): string => {
-  if (typeof value === 'string') {
-    return normalizeInlineText(value)
-  }
-  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
-    return String(value)
-  }
-  if (value === null) {
-    return 'null'
-  }
-  if (value === undefined) {
-    return ''
-  }
-  try {
-    return normalizeInlineText(JSON.stringify(value))
-  } catch {
-    return normalizeInlineText(String(value))
-  }
-}
-
 const coerceNumericParam = (value: unknown): number | null => {
   if (typeof value === 'number' && Number.isFinite(value)) {
     return value
@@ -378,10 +346,7 @@ const summaryText = computed(() => {
 
   const raw = paramsText.value.trim()
   if (!raw) return ''
-  if (!parsedParams.value.isJson) {
-    return normalizeInlineText(raw)
-  }
-  return formatSummaryValue(extractFirstSummaryValue(parsedParams.value.value))
+  return summarizeToolCallPreview(raw)
 })
 
 const subagentTasks = computed<SubagentProgressTask[]>(() => {
diff --git a/src/renderer/src/components/popup/TranslatePopup.vue b/src/renderer/src/components/popup/TranslatePopup.vue
index c3b267d9c..513d5e5e6 100644
--- a/src/renderer/src/components/popup/TranslatePopup.vue
+++ b/src/renderer/src/components/popup/TranslatePopup.vue
@@ -44,7 +44,7 @@ import { Button } from '@shadcn/components/ui/button'
 import { Icon } from '@iconify/vue'
 
 const { t, locale } = useI18n()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const agentStore = useAgentStore()
 
 // 状态
@@ -127,7 +127,7 @@ const handleTranslateRequest = async (event: Event) => {
   translatedText.value = ''
 
   try {
-    const result = await newAgentPresenter.translateText(
+    const result = await agentSessionPresenter.translateText(
       newText,
       locale.value,
       agentStore.selectedAgentId ?? 'deepchat'
diff --git a/src/renderer/src/components/spotlight/SpotlightOverlay.vue b/src/renderer/src/components/spotlight/SpotlightOverlay.vue
index 602f68304..90b35e5c8 100644
--- a/src/renderer/src/components/spotlight/SpotlightOverlay.vue
+++ b/src/renderer/src/components/spotlight/SpotlightOverlay.vue
@@ -9,7 +9,7 @@
     >
       <div class="flex items-center gap-3 border-b border-border/60 px-4 py-3">
         <Icon icon="lucide:search" class="h-4 w-4 shrink-0 text-muted-foreground" />
-        <Input
+        <input
           ref="inputRef"
           :value="spotlightStore.query"
           class="h-9 w-full bg-transparent text-sm text-foreground outline-none placeholder:text-muted-foreground"
@@ -21,7 +21,7 @@
 
       <div ref="resultsContainerRef" class="max-h-[28rem] overflow-y-auto p-2">
         <template v-if="spotlightStore.results.length > 0">
-          <Button
+          <button
             v-for="(item, index) in spotlightStore.results"
             :key="item.id"
             type="button"
@@ -75,7 +75,7 @@
                 {{ item.snippet }}
               </span>
             </span>
-          </Button>
+          </button>
         </template>
 
         <div
diff --git a/src/renderer/src/components/trace/TraceDialog.vue b/src/renderer/src/components/trace/TraceDialog.vue
index 0af594f5f..7a0771cb1 100644
--- a/src/renderer/src/components/trace/TraceDialog.vue
+++ b/src/renderer/src/components/trace/TraceDialog.vue
@@ -100,7 +100,7 @@ import { useUiSettingsStore } from '@/stores/uiSettingsStore'
 import type { MessageTraceRecord } from '@shared/types/agent-interface'
 
 const { t } = useI18n()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const uiSettingsStore = useUiSettingsStore()
 
 const jsonEditor = ref<HTMLElement | null>(null)
@@ -274,7 +274,7 @@ const loadTraces = async (messageId: string) => {
   selectedTraceId.value = null
 
   try {
-    const result = await newAgentPresenter.listMessageTraces(messageId)
+    const result = await agentSessionPresenter.listMessageTraces(messageId)
     if (currentRequestId !== requestId.value) {
       return
     }
diff --git a/src/renderer/src/composables/useAppIpcRuntime.ts b/src/renderer/src/composables/useAppIpcRuntime.ts
new file mode 100644
index 000000000..7e0a19c23
--- /dev/null
+++ b/src/renderer/src/composables/useAppIpcRuntime.ts
@@ -0,0 +1,56 @@
+import { DEEPLINK_EVENTS, NOTIFICATION_EVENTS, SHORTCUT_EVENTS } from '@/events'
+import { createIpcSubscriptionScope } from '@/lib/ipcSubscription'
+
+interface UseAppIpcRuntimeOptions {
+  handleStartDeeplink: (event: unknown, payload?: unknown) => void
+  showErrorToast: (error: { id: string; title: string; message: string; type: string }) => void
+  handleZoomIn: () => void
+  handleZoomOut: () => void
+  handleZoomResume: () => void
+  handleCreateNewConversation: () => void | Promise<void>
+  openSpotlight: () => void
+  handleDataResetComplete: () => void
+  handleSystemNotificationClick: (payload: unknown) => void
+  getCurrentRouteName: () => string | symbol | null | undefined
+}
+
+export function useAppIpcRuntime(options: UseAppIpcRuntimeOptions) {
+  let cleanupListeners: (() => void) | null = null
+
+  const setup = () => {
+    cleanupListeners?.()
+    const scope = createIpcSubscriptionScope()
+
+    scope.on(DEEPLINK_EVENTS.START, options.handleStartDeeplink)
+    scope.on(NOTIFICATION_EVENTS.SHOW_ERROR, (_event, error) => {
+      options.showErrorToast(error as { id: string; title: string; message: string; type: string })
+    })
+    scope.on(SHORTCUT_EVENTS.ZOOM_IN, options.handleZoomIn)
+    scope.on(SHORTCUT_EVENTS.ZOOM_OUT, options.handleZoomOut)
+    scope.on(SHORTCUT_EVENTS.ZOOM_RESUME, options.handleZoomResume)
+    scope.on(SHORTCUT_EVENTS.CREATE_NEW_CONVERSATION, () => {
+      if (options.getCurrentRouteName() !== 'chat') {
+        return
+      }
+
+      void options.handleCreateNewConversation()
+    })
+    scope.on(SHORTCUT_EVENTS.TOGGLE_SPOTLIGHT, options.openSpotlight)
+    scope.on(NOTIFICATION_EVENTS.DATA_RESET_COMPLETE_DEV, options.handleDataResetComplete)
+    scope.on(NOTIFICATION_EVENTS.SYS_NOTIFY_CLICKED, (_event, payload) => {
+      options.handleSystemNotificationClick(payload)
+    })
+
+    cleanupListeners = scope.cleanup
+  }
+
+  const cleanup = () => {
+    cleanupListeners?.()
+    cleanupListeners = null
+  }
+
+  return {
+    setup,
+    cleanup
+  }
+}
diff --git a/src/renderer/src/composables/useModelCapabilities.ts b/src/renderer/src/composables/useModelCapabilities.ts
index ca6702b3a..df8255e3b 100644
--- a/src/renderer/src/composables/useModelCapabilities.ts
+++ b/src/renderer/src/composables/useModelCapabilities.ts
@@ -14,6 +14,12 @@ export interface ModelCapabilities {
     max?: number
     default?: number
   } | null
+  supportsSearch: boolean | null
+  searchDefaults: {
+    default?: boolean
+    forced?: boolean
+    strategy?: 'turbo' | 'max'
+  } | null
 }
 
 export interface UseModelCapabilitiesOptions {
@@ -36,12 +42,20 @@ export function useModelCapabilities(options: UseModelCapabilitiesOptions) {
     max?: number
     default?: number
   } | null>(null)
+  const capabilitySupportsSearch = ref<boolean | null>(null)
+  const capabilitySearchDefaults = ref<{
+    default?: boolean
+    forced?: boolean
+    strategy?: 'turbo' | 'max'
+  } | null>(null)
   const isLoading = ref(false)
 
   // === Internal Methods ===
   const resetCapabilities = () => {
     capabilitySupportsReasoning.value = null
     capabilityBudgetRange.value = null
+    capabilitySupportsSearch.value = null
+    capabilitySearchDefaults.value = null
   }
 
   const fetchCapabilities = async () => {
@@ -52,13 +66,17 @@ export function useModelCapabilities(options: UseModelCapabilitiesOptions) {
 
     isLoading.value = true
     try {
-      const [sr, br] = await Promise.all([
+      const [sr, br, ss, sd] = await Promise.all([
         configPresenter.supportsReasoningCapability?.(providerId.value, modelId.value),
-        configPresenter.getThinkingBudgetRange?.(providerId.value, modelId.value)
+        configPresenter.getThinkingBudgetRange?.(providerId.value, modelId.value),
+        configPresenter.supportsSearchCapability?.(providerId.value, modelId.value),
+        configPresenter.getSearchDefaults?.(providerId.value, modelId.value)
       ])
 
       capabilitySupportsReasoning.value = typeof sr === 'boolean' ? sr : null
       capabilityBudgetRange.value = br || {}
+      capabilitySupportsSearch.value = typeof ss === 'boolean' ? ss : null
+      capabilitySearchDefaults.value = sd || {}
     } catch (error) {
       resetCapabilities()
       console.error(error)
@@ -75,6 +93,8 @@ export function useModelCapabilities(options: UseModelCapabilitiesOptions) {
     // Read-only state
     supportsReasoning: capabilitySupportsReasoning,
     budgetRange: capabilityBudgetRange,
+    supportsSearch: capabilitySupportsSearch,
+    searchDefaults: capabilitySearchDefaults,
     isLoading,
     // Methods
     refresh: fetchCapabilities
diff --git a/src/renderer/src/composables/usePresenter.ts b/src/renderer/src/composables/usePresenter.ts
index a8db8fbcb..e8fd67105 100644
--- a/src/renderer/src/composables/usePresenter.ts
+++ b/src/renderer/src/composables/usePresenter.ts
@@ -1,23 +1,10 @@
 import { type IPresenter, type IRemoteControlPresenter } from '@shared/presenter'
 import { toRaw } from 'vue'
-
-// WebContentsId 缓存
-let cachedWebContentsId: number | null = null
+import { getRendererWindowContext } from '@/lib/windowContext'
 
 // 获取当前webContentsId
 export function getWebContentsId(): number | null {
-  if (cachedWebContentsId !== null) {
-    return cachedWebContentsId
-  }
-
-  try {
-    // 通过preload API获取webContentsId
-    cachedWebContentsId = window.api.getWebContentsId()
-    return cachedWebContentsId
-  } catch (error) {
-    console.warn('Failed to get webContentsId:', error)
-    return null
-  }
+  return getRendererWindowContext().webContentsId
 }
 // 安全的序列化函数，避免克隆不可序列化的对象
 function safeSerialize(obj: unknown): unknown {
diff --git a/src/renderer/src/composables/useSearchConfig.ts b/src/renderer/src/composables/useSearchConfig.ts
new file mode 100644
index 000000000..66f9bf26f
--- /dev/null
+++ b/src/renderer/src/composables/useSearchConfig.ts
@@ -0,0 +1,27 @@
+import { computed, type Ref } from 'vue'
+
+interface SearchDefaults {
+  forced?: boolean
+  strategy?: 'turbo' | 'max'
+}
+
+interface UseSearchConfigOptions {
+  supportsSearch: Ref<boolean | null>
+  searchDefaults: Ref<SearchDefaults | null>
+}
+
+export function useSearchConfig(options: UseSearchConfigOptions) {
+  const showSearchConfig = computed(() => options.supportsSearch.value === true)
+  const hasForcedSearchOption = computed(
+    () => showSearchConfig.value && typeof options.searchDefaults.value?.forced === 'boolean'
+  )
+  const hasSearchStrategyOption = computed(
+    () => showSearchConfig.value && typeof options.searchDefaults.value?.strategy === 'string'
+  )
+
+  return {
+    showSearchConfig,
+    hasForcedSearchOption,
+    hasSearchStrategyOption
+  }
+}
diff --git a/src/renderer/src/i18n/da-DK/model.json b/src/renderer/src/i18n/da-DK/model.json
index 0c6d39de0..03097e39e 100644
--- a/src/renderer/src/i18n/da-DK/model.json
+++ b/src/renderer/src/i18n/da-DK/model.json
@@ -20,6 +20,29 @@
     "enableAll": "Aktiver alle",
     "disableAll": "Deaktiver alle"
   },
+  "sort": {
+    "status": "Efter status",
+    "name": "Efter navn"
+  },
+  "filter": {
+    "label": "Filter",
+    "clearAll": "Ryd filtre",
+    "visibleCount": "Viser {visible} / {total}",
+    "capabilities": "Funktioner",
+    "types": "Typer",
+    "capabilityOptions": {
+      "vision": "Vision",
+      "functionCall": "Funktionskald",
+      "reasoning": "Ræsonnement",
+      "search": "Websøgning"
+    },
+    "typeOptions": {
+      "chat": "Chat",
+      "embedding": "Indlejring",
+      "rerank": "Genrangering",
+      "imageGeneration": "Billedgenerering"
+    }
+  },
   "tags": {
     "reasoning": "Ræsonnement",
     "chat": "Chat",
diff --git a/src/renderer/src/i18n/da-DK/settings.json b/src/renderer/src/i18n/da-DK/settings.json
index 97a04e788..e0e61b6bc 100644
--- a/src/renderer/src/i18n/da-DK/settings.json
+++ b/src/renderer/src/i18n/da-DK/settings.json
@@ -418,6 +418,9 @@
     "urlFormat": "API-eksempel: {defaultUrl}",
     "urlFormatFill": "Udfyld API-URL",
     "openaiResponsesNotice": "OpenAI bruger som standard Responses API. Hvis et tredjeparts-endpoint kun understøtter Chat Completions, skal du bruge OpenAI Completions-udbyderen.",
+    "modifyBaseUrl": "Rediger",
+    "baseUrlLockedHint": "Denne udbyder er låst til den anbefalede basis-URL for at mindske fejlkonfiguration.",
+    "refreshModelsWithMetadataHint": "Opdatering af denne udbyder synkroniserer først upstream-metadata og genopbygger derefter den lokale modelliste.",
     "modelList": "Modelliste",
     "enableModels": "Aktivér modeller",
     "disableAllModels": "Deaktiver alle modeller",
@@ -512,6 +515,12 @@
         "overwriteWarning": "Denne import vil overskrive den nuværende udbyderkonfiguration.",
         "confirming": "Importerer..."
       },
+      "baseUrlUnlock": {
+        "title": "Bekræft ændring af basis-URL",
+        "description": "Det anbefales ikke at ændre basis-URL'en for denne udbyder. Et forkert endpoint kan medføre fejl i forespørgsler eller anden uventet adfærd. Du kan stadig fortsætte, hvis du forstår risikoen.",
+        "confirm": "Fortsæt"
+      },
+
       "deleteProvider": {
         "title": "Bekræft sletning af udbyder",
         "content": "Er du sikker på, at du vil slette udbyderen \"{name}\"? Handlingen kan ikke fortrydes.",
@@ -586,7 +595,13 @@
       "backupSuccessTitle": "Backup fuldført",
       "backupSuccessMessage": "Backup gemt {time} ({size})",
       "importSuccessTitle": "Import fuldført",
-      "importSuccessMessage": "Importerede {count} samtaler"
+      "importSuccessMessage": "Importerede {count} samtaler",
+      "refreshModelsSuccessTitle": "Modeller opdateret",
+      "refreshModelsSuccessDescription": "Den nyeste modelliste er blevet synkroniseret for denne udbyder.",
+      "refreshModelsSuccessDescriptionWithMetadata": "Upstream-metadata og den nyeste modelliste er blevet synkroniseret for denne udbyder.",
+      "refreshModelsFailedTitle": "Opdatering mislykkedes",
+      "refreshModelsFailedDescription": "Modellerne for denne udbyder kunne ikke opdateres lige nu. Prøv igen senere.",
+      "refreshModelsFailedDescriptionWithMetadata": "Upstream-metadata og modeller for denne udbyder kunne ikke opdateres lige nu. Prøv igen senere."
     },
     "modelscope": {
       "mcpSync": {
@@ -1182,6 +1197,10 @@
     "installedEmptyDescription": "Install an agent from the ACP Registry first, then configure it here.",
     "registryOverlayEmpty": "No agents match the current filters.",
     "registryInstallAction": "Install",
+    "registryUninstallAction": "Afinstaller",
+    "registryUninstallConfirm": "Vil du afinstallere agenten \"{name}\"?",
+    "registryUninstallDescription": "DeepChat deaktiverer agenten og rydder lokalt administrerede installationsdata, når det er relevant. Du kan installere den igen senere fra ACP Registry.",
+    "registryUninstallFailed": "Kunne ikke afinstallere agenten",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Search, filter, and install ACP agents. Configure them back in settings after installation.",
     "registryLearnMore": "Learn More",
diff --git a/src/renderer/src/i18n/en-US/model.json b/src/renderer/src/i18n/en-US/model.json
index 926a1ade2..b3211c1ff 100644
--- a/src/renderer/src/i18n/en-US/model.json
+++ b/src/renderer/src/i18n/en-US/model.json
@@ -20,6 +20,29 @@
     "enableAll": "Enable All",
     "disableAll": "Disable All"
   },
+  "sort": {
+    "status": "By Status",
+    "name": "By Name"
+  },
+  "filter": {
+    "label": "Filter",
+    "clearAll": "Clear Filters",
+    "visibleCount": "Showing {visible} / {total}",
+    "capabilities": "Capabilities",
+    "types": "Types",
+    "capabilityOptions": {
+      "vision": "Vision",
+      "functionCall": "Function Calling",
+      "reasoning": "Reasoning",
+      "search": "Web Search"
+    },
+    "typeOptions": {
+      "chat": "Chat",
+      "embedding": "Embedding",
+      "rerank": "Rerank",
+      "imageGeneration": "Image Generation"
+    }
+  },
   "tags": {
     "reasoning": "Reasoning",
     "chat": "Chat",
diff --git a/src/renderer/src/i18n/en-US/settings.json b/src/renderer/src/i18n/en-US/settings.json
index 085d7eeef..85b7f68c8 100644
--- a/src/renderer/src/i18n/en-US/settings.json
+++ b/src/renderer/src/i18n/en-US/settings.json
@@ -546,6 +546,9 @@
     "urlFormat": "API Example: {defaultUrl}",
     "urlFormatFill": "Fill into API URL",
     "openaiResponsesNotice": "OpenAI defaults to the Responses API. If a third-party endpoint only supports Chat Completions, use the OpenAI Completions provider.",
+    "modifyBaseUrl": "Modify",
+    "baseUrlLockedHint": "This provider is pinned to the recommended Base URL to reduce misconfiguration.",
+    "refreshModelsWithMetadataHint": "Refreshing this provider will sync upstream metadata first, then rebuild the local model list.",
     "modelList": "Model List",
     "enableModels": "Enable Models",
     "disableAllModels": "Disable All Models",
@@ -608,6 +611,12 @@
         "overwriteWarning": "This import will overwrite the current provider configuration.",
         "confirming": "Importing..."
       },
+      "baseUrlUnlock": {
+        "title": "Confirm Base URL Change",
+        "description": "Changing the Base URL for this provider is not recommended. An incorrect endpoint may cause request failures or other unexpected behavior. You can still continue if you understand the risk.",
+        "confirm": "Continue"
+      },
+
       "deleteProvider": {
         "title": "Confirm Delete Provider",
         "content": "Are you sure you want to delete provider \"{name}\"? This action cannot be undone.",
@@ -682,7 +691,13 @@
       "backupSuccessTitle": "Backup completed",
       "backupSuccessMessage": "Backup saved at {time} ({size})",
       "importSuccessTitle": "Import completed",
-      "importSuccessMessage": "Successfully imported {count} conversations"
+      "importSuccessMessage": "Successfully imported {count} conversations",
+      "refreshModelsSuccessTitle": "Models refreshed",
+      "refreshModelsSuccessDescription": "The latest model list has been synced for this provider.",
+      "refreshModelsSuccessDescriptionWithMetadata": "Upstream metadata and the latest model list have been synced for this provider.",
+      "refreshModelsFailedTitle": "Refresh failed",
+      "refreshModelsFailedDescription": "Unable to refresh models for this provider right now. Please try again later.",
+      "refreshModelsFailedDescriptionWithMetadata": "Unable to refresh upstream metadata and models for this provider right now. Please try again later."
     },
     "modelscope": {
       "mcpSync": {
@@ -1163,6 +1178,10 @@
     "installedEmptyDescription": "Install an agent from the ACP Registry first, then configure it here.",
     "registryOverlayEmpty": "No agents match the current filters.",
     "registryInstallAction": "Install",
+    "registryUninstallAction": "Uninstall",
+    "registryUninstallConfirm": "Uninstall \"{name}\"?",
+    "registryUninstallDescription": "DeepChat will disable this agent and clear locally managed install data when applicable. You can install it again later from the ACP Registry.",
+    "registryUninstallFailed": "Failed to uninstall agent",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Search, filter, and install ACP agents. Configure them back in settings after installation.",
     "registryLearnMore": "Learn More",
diff --git a/src/renderer/src/i18n/fa-IR/model.json b/src/renderer/src/i18n/fa-IR/model.json
index c48f0c579..d6e2e25cc 100644
--- a/src/renderer/src/i18n/fa-IR/model.json
+++ b/src/renderer/src/i18n/fa-IR/model.json
@@ -20,6 +20,29 @@
     "enableAll": "روش ‌کردن همه",
     "disableAll": "خاموش کردن همه"
   },
+  "sort": {
+    "status": "بر اساس وضعیت",
+    "name": "بر اساس نام"
+  },
+  "filter": {
+    "label": "فیلتر",
+    "clearAll": "پاک کردن فیلترها",
+    "visibleCount": "نمایش {visible} / {total}",
+    "capabilities": "قابلیت‌ها",
+    "types": "انواع",
+    "capabilityOptions": {
+      "vision": "بینایی",
+      "functionCall": "فراخوانی تابع",
+      "reasoning": "استدلال",
+      "search": "جستجوی وب"
+    },
+    "typeOptions": {
+      "chat": "گفتگو",
+      "embedding": "جاسازی",
+      "rerank": "رتبه‌بندی مجدد",
+      "imageGeneration": "تولید تصویر"
+    }
+  },
   "tags": {
     "reasoning": "استدلال",
     "chat": "گفتگو",
diff --git a/src/renderer/src/i18n/fa-IR/settings.json b/src/renderer/src/i18n/fa-IR/settings.json
index 4750b5a0c..588099cad 100644
--- a/src/renderer/src/i18n/fa-IR/settings.json
+++ b/src/renderer/src/i18n/fa-IR/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "نمونه API: {defaultUrl}",
     "urlFormatFill": "قرار دادن در URL API",
     "openaiResponsesNotice": "OpenAI به صورت پیش‌فرض از Responses API استفاده می‌کند. اگر endpoint شخص ثالث فقط از Chat Completions پشتیبانی می‌کند، از ارائه‌دهنده OpenAI Completions استفاده کنید.",
+    "modifyBaseUrl": "ویرایش",
+    "baseUrlLockedHint": "این ارائه‌دهنده برای کاهش خطاهای پیکربندی روی آدرس پایه پیشنهادی قفل شده است.",
+    "refreshModelsWithMetadataHint": "نوسازی این ارائه‌دهنده ابتدا فرادادهٔ بالادستی را همگام می‌کند و سپس فهرست محلی مدل‌ها را بازسازی می‌کند.",
     "modelList": "فهرست مدل‌ها",
     "enableModels": "روشن کردن مدل‌ها",
     "disableAllModels": "خاموش کردن همه مدل‌ها",
@@ -578,6 +581,12 @@
         "overwriteWarning": "این درون‌ریزی پیکربندی فعلی فراهم‌کننده را بازنویسی می‌کند.",
         "confirming": "در حال درون‌ریزی..."
       },
+      "baseUrlUnlock": {
+        "title": "تأیید تغییر آدرس پایه",
+        "description": "تغییر آدرس پایه برای این ارائه‌دهنده توصیه نمی‌شود. یک نقطه‌پایان نادرست ممکن است باعث شکست درخواست‌ها یا رفتارهای غیرمنتظره دیگر شود. اگر از این ریسک آگاه هستید، می‌توانید ادامه دهید.",
+        "confirm": "ادامه"
+      },
+
       "deleteProvider": {
         "title": "پذیرش پاک کردن فراهم‌کننده",
         "content": "آیا مطمئن هستید که می‌خواهید فراهم‌کننده \"{name}\" را پاک کنید؟ این کنش بازگشت‌پذیر نیست.",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "پشتیبان‌گیری کامل شد",
       "backupSuccessMessage": "فایل پشتیبان در {time} ذخیره شد (حجم: {size})",
       "importSuccessTitle": "درون‌ریزی با موفقیت انجام شد",
-      "importSuccessMessage": "{count} گفتگو با موفقیت درون‌ریزی شد"
+      "importSuccessMessage": "{count} گفتگو با موفقیت درون‌ریزی شد",
+      "refreshModelsSuccessTitle": "مدل‌ها نوسازی شدند",
+      "refreshModelsSuccessDescription": "جدیدترین فهرست مدل برای این ارائه‌دهنده همگام شد.",
+      "refreshModelsSuccessDescriptionWithMetadata": "فرادادهٔ بالادستی و جدیدترین فهرست مدل برای این ارائه‌دهنده همگام شد.",
+      "refreshModelsFailedTitle": "نوسازی ناموفق بود",
+      "refreshModelsFailedDescription": "در حال حاضر امکان نوسازی مدل‌های این ارائه‌دهنده وجود ندارد. لطفاً بعداً دوباره تلاش کنید.",
+      "refreshModelsFailedDescriptionWithMetadata": "در حال حاضر امکان همگام‌سازی فرادادهٔ بالادستی و مدل‌های این ارائه‌دهنده وجود ندارد. لطفاً بعداً دوباره تلاش کنید."
     },
     "apiKeyLabel": "کلید API",
     "apiUrlLabel": "آدرس API",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "ابتدا یک عامل را از ACP Registry نصب کنید، سپس آن را اینجا پیکربندی کنید.",
     "registryOverlayEmpty": "هیچ عاملی با فیلترهای فعلی مطابقت ندارد.",
     "registryInstallAction": "نصب",
+    "registryUninstallAction": "حذف نصب",
+    "registryUninstallConfirm": "عامل «{name}» حذف نصب شود؟",
+    "registryUninstallDescription": "DeepChat این عامل را غیرفعال می‌کند و در صورت وجود، داده‌های نصبِ مدیریت‌شدهٔ محلی را پاک می‌کند. بعداً می‌توانید آن را دوباره از ACP Registry نصب کنید.",
+    "registryUninstallFailed": "حذف نصب عامل ناموفق بود",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "عامل‌های ACP را جست‌وجو، فیلتر و نصب کنید. پس از نصب برای پیکربندی به تنظیمات برگردید.",
     "registryLearnMore": "اطلاعات بیشتر",
diff --git a/src/renderer/src/i18n/fr-FR/model.json b/src/renderer/src/i18n/fr-FR/model.json
index 0b41196f9..fb8b24c74 100644
--- a/src/renderer/src/i18n/fr-FR/model.json
+++ b/src/renderer/src/i18n/fr-FR/model.json
@@ -20,6 +20,29 @@
     "enableAll": "Tout activer",
     "disableAll": "Tout désactiver"
   },
+  "sort": {
+    "status": "Par statut",
+    "name": "Par nom"
+  },
+  "filter": {
+    "label": "Filtrer",
+    "clearAll": "Effacer les filtres",
+    "visibleCount": "Affichage de {visible} / {total}",
+    "capabilities": "Capacités",
+    "types": "Types",
+    "capabilityOptions": {
+      "vision": "Vision",
+      "functionCall": "Appel de fonction",
+      "reasoning": "Raisonnement",
+      "search": "Recherche Web"
+    },
+    "typeOptions": {
+      "chat": "Discussion",
+      "embedding": "Incorporation",
+      "rerank": "Reclassement",
+      "imageGeneration": "Génération d'image"
+    }
+  },
   "tags": {
     "reasoning": "Raisonnement",
     "chat": "Discussion",
diff --git a/src/renderer/src/i18n/fr-FR/settings.json b/src/renderer/src/i18n/fr-FR/settings.json
index cbd781f85..8caf3a992 100644
--- a/src/renderer/src/i18n/fr-FR/settings.json
+++ b/src/renderer/src/i18n/fr-FR/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "Exemple d'API : {defaultUrl}",
     "urlFormatFill": "Renseigner l'URL de l'API",
     "openaiResponsesNotice": "OpenAI utilise par défaut l'API Responses. Si un endpoint tiers ne prend en charge que Chat Completions, utilisez le fournisseur OpenAI Completions.",
+    "modifyBaseUrl": "Modifier",
+    "baseUrlLockedHint": "Ce fournisseur est verrouillé sur l’URL de base recommandée afin de réduire les erreurs de configuration.",
+    "refreshModelsWithMetadataHint": "L’actualisation de ce fournisseur synchronise d’abord les métadonnées en amont, puis reconstruit la liste locale des modèles.",
     "modelList": "Liste des modèles",
     "enableModels": "Activer les modèles",
     "disableAllModels": "Désactiver tous les modèles",
@@ -578,6 +581,12 @@
         "overwriteWarning": "Cette importation écrasera la configuration actuelle du fournisseur.",
         "confirming": "Importation..."
       },
+      "baseUrlUnlock": {
+        "title": "Confirmer la modification de l’URL de base",
+        "description": "Il n’est pas recommandé de modifier l’URL de base de ce fournisseur. Un point de terminaison incorrect peut provoquer des échecs de requête ou d’autres comportements inattendus. Vous pouvez tout de même continuer si vous comprenez le risque.",
+        "confirm": "Continuer"
+      },
+
       "deleteProvider": {
         "title": "Confirmer la suppression du fournisseur",
         "content": "Êtes-vous sûr de vouloir supprimer le fournisseur \"{name}\" ? Cette action ne peut pas être annulée.",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "Sauvegarde terminée",
       "backupSuccessMessage": "Sauvegarde enregistrée à {time} ({size})",
       "importSuccessTitle": "Importation terminée",
-      "importSuccessMessage": "{count} conversations importées avec succès"
+      "importSuccessMessage": "{count} conversations importées avec succès",
+      "refreshModelsSuccessTitle": "Modèles actualisés",
+      "refreshModelsSuccessDescription": "La dernière liste de modèles a été synchronisée pour ce fournisseur.",
+      "refreshModelsSuccessDescriptionWithMetadata": "Les métadonnées en amont et la dernière liste de modèles ont été synchronisées pour ce fournisseur.",
+      "refreshModelsFailedTitle": "Actualisation échouée",
+      "refreshModelsFailedDescription": "Impossible d’actualiser les modèles de ce fournisseur pour le moment. Veuillez réessayer plus tard.",
+      "refreshModelsFailedDescriptionWithMetadata": "Impossible de synchroniser les métadonnées en amont et les modèles de ce fournisseur pour le moment. Veuillez réessayer plus tard."
     },
     "apiKeyLabel": "Clé API",
     "apiUrlLabel": "URL API",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "Installez d’abord un agent depuis l’ACP Registry, puis configurez-le ici.",
     "registryOverlayEmpty": "Aucun agent ne correspond aux filtres actuels.",
     "registryInstallAction": "Installer",
+    "registryUninstallAction": "Désinstaller",
+    "registryUninstallConfirm": "Désinstaller l’agent « {name} » ?",
+    "registryUninstallDescription": "DeepChat désactivera cet agent et supprimera, le cas échéant, les données d’installation gérées localement. Vous pourrez le réinstaller plus tard depuis l’ACP Registry.",
+    "registryUninstallFailed": "Échec de la désinstallation de l’agent",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Recherchez, filtrez et installez des agents ACP. Revenez ensuite dans les réglages pour les configurer.",
     "registryLearnMore": "En savoir plus",
diff --git a/src/renderer/src/i18n/he-IL/model.json b/src/renderer/src/i18n/he-IL/model.json
index f3d32b26c..21224c708 100644
--- a/src/renderer/src/i18n/he-IL/model.json
+++ b/src/renderer/src/i18n/he-IL/model.json
@@ -20,6 +20,29 @@
     "enableAll": "הפעל הכל",
     "disableAll": "השבת הכל"
   },
+  "sort": {
+    "status": "לפי סטטוס",
+    "name": "לפי שם"
+  },
+  "filter": {
+    "label": "סינון",
+    "clearAll": "נקה סינונים",
+    "visibleCount": "מציג {visible} / {total}",
+    "capabilities": "יכולות",
+    "types": "סוגים",
+    "capabilityOptions": {
+      "vision": "ראייה",
+      "functionCall": "קריאת פונקציה",
+      "reasoning": "חשיבה",
+      "search": "חיפוש ברשת"
+    },
+    "typeOptions": {
+      "chat": "צ'אט",
+      "embedding": "הטמעה",
+      "rerank": "דירוג מחדש",
+      "imageGeneration": "יצירת תמונות"
+    }
+  },
   "tags": {
     "reasoning": "חשיבה (Reasoning)",
     "chat": "צ'אט",
diff --git a/src/renderer/src/i18n/he-IL/settings.json b/src/renderer/src/i18n/he-IL/settings.json
index 52c62db9a..734c28374 100644
--- a/src/renderer/src/i18n/he-IL/settings.json
+++ b/src/renderer/src/i18n/he-IL/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "דוגמת API: {defaultUrl}",
     "urlFormatFill": "מילוי בכתובת ה-API",
     "openaiResponsesNotice": "OpenAI משתמשת כברירת מחדל ב-Responses API. אם endpoint של צד שלישי תומך רק ב-Chat Completions, השתמש בספק OpenAI Completions.",
+    "modifyBaseUrl": "ערוך",
+    "baseUrlLockedHint": "הספק הזה נעול לכתובת הבסיס המומלצת כדי לצמצם שגיאות תצורה.",
+    "refreshModelsWithMetadataHint": "רענון הספק הזה יסנכרן קודם את המטא־דאטה במעלה הזרם ולאחר מכן יבנה מחדש את רשימת המודלים המקומית.",
     "modelList": "רשימת מודלים",
     "enableModels": "הפעל מודלים",
     "disableAllModels": "השבת את כל המודלים",
@@ -578,6 +581,12 @@
         "overwriteWarning": "ייבוא זה ידרוס את תצורת הספק הנוכחית.",
         "confirming": "מייבא..."
       },
+      "baseUrlUnlock": {
+        "title": "אישור שינוי כתובת הבסיס",
+        "description": "לא מומלץ לשנות את כתובת הבסיס של הספק הזה. נקודת קצה שגויה עלולה לגרום לכשלי בקשות או להתנהגות בלתי צפויה אחרת. אפשר עדיין להמשיך אם מבינים את הסיכון.",
+        "confirm": "המשך"
+      },
+
       "deleteProvider": {
         "title": "אשר מחיקת ספק",
         "content": "האם אתה בטוח שברצונך למחוק את הספק \"{name}\"? לא ניתן לבטל פעולה זו.",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "הגיבוי הושלם",
       "backupSuccessMessage": "הגיבוי נשמר ב-{time} ({size})",
       "importSuccessTitle": "הייבוא הושלם",
-      "importSuccessMessage": "יובאו בהצלחה {count} שיחות"
+      "importSuccessMessage": "יובאו בהצלחה {count} שיחות",
+      "refreshModelsSuccessTitle": "המודלים רועננו",
+      "refreshModelsSuccessDescription": "רשימת המודלים העדכנית סונכרנה עבור הספק הזה.",
+      "refreshModelsSuccessDescriptionWithMetadata": "המטא־דאטה במעלה הזרם ורשימת המודלים העדכנית סונכרנו עבור הספק הזה.",
+      "refreshModelsFailedTitle": "הרענון נכשל",
+      "refreshModelsFailedDescription": "לא ניתן לרענן כעת את המודלים של הספק הזה. נסה שוב מאוחר יותר.",
+      "refreshModelsFailedDescriptionWithMetadata": "לא ניתן לסנכרן כעת את המטא־דאטה במעלה הזרם ואת המודלים של הספק הזה. נסה שוב מאוחר יותר."
     },
     "modelscope": {
       "mcpSync": {
@@ -1236,6 +1251,10 @@
     "installedEmptyDescription": "התקן תחילה סוכן מ-ACP Registry, ואז הגדר אותו כאן.",
     "registryOverlayEmpty": "אין סוכנים שתואמים למסננים הנוכחיים.",
     "registryInstallAction": "התקן",
+    "registryUninstallAction": "הסר התקנה",
+    "registryUninstallConfirm": "להסיר את ההתקנה של הסוכן \"{name}\"?",
+    "registryUninstallDescription": "DeepChat ישבית את הסוכן הזה, וכשיש צורך גם ינקה נתוני התקנה שמנוהלים מקומית. אפשר להתקין אותו שוב מאוחר יותר דרך ACP Registry.",
+    "registryUninstallFailed": "הסרת ההתקנה של הסוכן נכשלה",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "חיפוש, סינון והתקנה של סוכני ACP. לאחר ההתקנה חזור להגדרות כדי להגדיר אותם.",
     "registryLearnMore": "מידע נוסף",
diff --git a/src/renderer/src/i18n/ja-JP/model.json b/src/renderer/src/i18n/ja-JP/model.json
index 599e37ac4..d81fefa54 100644
--- a/src/renderer/src/i18n/ja-JP/model.json
+++ b/src/renderer/src/i18n/ja-JP/model.json
@@ -20,6 +20,29 @@
     "enableAll": "すべて有効にする",
     "disableAll": "すべて無効にする"
   },
+  "sort": {
+    "status": "ステータス順",
+    "name": "名前順"
+  },
+  "filter": {
+    "label": "フィルター",
+    "clearAll": "フィルターをクリア",
+    "visibleCount": "{visible} / {total} 件表示中",
+    "capabilities": "機能",
+    "types": "タイプ",
+    "capabilityOptions": {
+      "vision": "ビジョン",
+      "functionCall": "関数呼び出し",
+      "reasoning": "推論",
+      "search": "Web検索"
+    },
+    "typeOptions": {
+      "chat": "チャット",
+      "embedding": "埋め込み",
+      "rerank": "再ランク付け",
+      "imageGeneration": "画像生成"
+    }
+  },
   "tags": {
     "reasoning": "推論",
     "chat": "チャット",
diff --git a/src/renderer/src/i18n/ja-JP/settings.json b/src/renderer/src/i18n/ja-JP/settings.json
index 2ab4d10fa..a92ce9b91 100644
--- a/src/renderer/src/i18n/ja-JP/settings.json
+++ b/src/renderer/src/i18n/ja-JP/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "API例：{defaultUrl}",
     "urlFormatFill": "API URL に入力",
     "openaiResponsesNotice": "OpenAI 公式サービスはデフォルトで Responses API を使用します。サードパーティのエンドポイントが Chat Completions のみをサポートしている場合は、OpenAI Completions プロバイダーを使用してください。",
+    "modifyBaseUrl": "変更",
+    "baseUrlLockedHint": "このプロバイダーは設定ミスを減らすため、推奨されるベースURLに固定されています。",
+    "refreshModelsWithMetadataHint": "このプロバイダーを更新すると、まず上流メタデータを同期し、その後ローカルのモデル一覧を再構築します。",
     "modelList": "モデル一覧",
     "enableModels": "モデルを有効にする",
     "disableAllModels": "すべてのモデルを無効にする",
@@ -578,6 +581,12 @@
         "overwriteWarning": "このインポートにより、現在のプロバイダー設定が上書きされます。",
         "confirming": "インポート中..."
       },
+      "baseUrlUnlock": {
+        "title": "ベースURLの変更を確認",
+        "description": "このプロバイダーのベースURLを変更することは推奨されません。誤ったエンドポイントを設定すると、リクエストの失敗やその他の予期しない動作を引き起こす可能性があります。リスクを理解している場合は、そのまま続行できます。",
+        "confirm": "続行"
+      },
+
       "deleteProvider": {
         "title": "プロバイダーの削除確認",
         "content": "プロバイダー \"{name}\" を削除してもよろしいですか？この操作は元に戻せません。",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "バックアップが完了しました",
       "backupSuccessMessage": "バックアップを保存しました（時刻：{time}、サイズ：{size}）",
       "importSuccessTitle": "インポートが完了しました",
-      "importSuccessMessage": "{count} 件の会話を正常にインポートしました"
+      "importSuccessMessage": "{count} 件の会話を正常にインポートしました",
+      "refreshModelsSuccessTitle": "モデルを更新しました",
+      "refreshModelsSuccessDescription": "このプロバイダーの最新のモデル一覧を同期しました。",
+      "refreshModelsSuccessDescriptionWithMetadata": "このプロバイダーの上流メタデータと最新のモデル一覧を同期しました。",
+      "refreshModelsFailedTitle": "更新に失敗しました",
+      "refreshModelsFailedDescription": "現在、このプロバイダーのモデル一覧を更新できません。後でもう一度お試しください。",
+      "refreshModelsFailedDescriptionWithMetadata": "現在、このプロバイダーの上流メタデータとモデルを同期できません。後でもう一度お試しください。"
     },
     "apiKeyLabel": "API Key",
     "apiUrlLabel": "API URL",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "まず ACP Registry から Agent をインストールし、その後ここで設定してください。",
     "registryOverlayEmpty": "現在の絞り込み条件に一致する Agent はありません。",
     "registryInstallAction": "インストール",
+    "registryUninstallAction": "アンインストール",
+    "registryUninstallConfirm": "「{name}」をアンインストールしますか？",
+    "registryUninstallDescription": "DeepChat はこのエージェントを無効化し、該当する場合はローカルで管理しているインストールデータを削除します。必要になったら ACP Registry から再インストールできます。",
+    "registryUninstallFailed": "エージェントのアンインストールに失敗しました",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "ACP Agent を検索、絞り込み、インストールします。インストール後は設定画面に戻って構成してください。",
     "registryLearnMore": "詳しく見る",
diff --git a/src/renderer/src/i18n/ko-KR/model.json b/src/renderer/src/i18n/ko-KR/model.json
index 035c8ec88..923d42915 100644
--- a/src/renderer/src/i18n/ko-KR/model.json
+++ b/src/renderer/src/i18n/ko-KR/model.json
@@ -20,6 +20,29 @@
     "enableAll": "모두 활성화",
     "disableAll": "모두 비활성화"
   },
+  "sort": {
+    "status": "상태별",
+    "name": "이름별"
+  },
+  "filter": {
+    "label": "필터",
+    "clearAll": "필터 지우기",
+    "visibleCount": "{visible} / {total} 표시 중",
+    "capabilities": "기능",
+    "types": "유형",
+    "capabilityOptions": {
+      "vision": "비전",
+      "functionCall": "함수 호출",
+      "reasoning": "추론",
+      "search": "웹 검색"
+    },
+    "typeOptions": {
+      "chat": "채팅",
+      "embedding": "임베딩",
+      "rerank": "재순위",
+      "imageGeneration": "이미지 생성"
+    }
+  },
   "tags": {
     "reasoning": "추론",
     "chat": "채팅",
diff --git a/src/renderer/src/i18n/ko-KR/settings.json b/src/renderer/src/i18n/ko-KR/settings.json
index dcec41b51..c5b8af13c 100644
--- a/src/renderer/src/i18n/ko-KR/settings.json
+++ b/src/renderer/src/i18n/ko-KR/settings.json
@@ -575,6 +575,12 @@
         "overwriteWarning": "이 가져오기는 현재 제공자 설정을 덮어씁니다.",
         "confirming": "가져오는 중..."
       },
+      "baseUrlUnlock": {
+        "title": "기본 URL 변경 확인",
+        "description": "이 제공자의 기본 URL을 변경하는 것은 권장되지 않습니다. 잘못된 엔드포인트를 입력하면 요청 실패나 기타 예상치 못한 동작이 발생할 수 있습니다. 위험을 이해한다면 계속 진행할 수 있습니다.",
+        "confirm": "계속"
+      },
+
       "deleteProvider": {
         "title": "제공자 삭제",
         "content": "제공자 \"{name}\"을(를) 삭제하시겠습니까? 이 작업은 취소할 수 없습니다.",
@@ -614,6 +620,9 @@
     "urlFormat": "API 샘플 : {defaultUrl}",
     "urlFormatFill": "API URL에 입력",
     "openaiResponsesNotice": "OpenAI 공식 서비스는 기본적으로 Responses API를 사용합니다. 서드파티 엔드포인트가 Chat Completions만 지원하는 경우 OpenAI Completions 공급자를 사용하세요.",
+    "modifyBaseUrl": "수정",
+    "baseUrlLockedHint": "이 제공자는 잘못된 설정을 줄이기 위해 권장 기본 URL로 고정되어 있습니다.",
+    "refreshModelsWithMetadataHint": "이 공급자를 새로 고치면 먼저 상위 메타데이터를 동기화한 뒤 로컬 모델 목록을 다시 구성합니다.",
     "azureApiVersion": "API 버전",
     "safety": {
       "title": "보안 설정",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "백업이 완료되었습니다",
       "backupSuccessMessage": "백업이 저장되었습니다 (시간: {time}, 크기: {size})",
       "importSuccessTitle": "가져오기가 완료되었습니다",
-      "importSuccessMessage": "{count}개의 대화를 성공적으로 가져왔습니다"
+      "importSuccessMessage": "{count}개의 대화를 성공적으로 가져왔습니다",
+      "refreshModelsSuccessTitle": "모델을 새로 고쳤습니다",
+      "refreshModelsSuccessDescription": "이 공급자의 최신 모델 목록이 동기화되었습니다.",
+      "refreshModelsSuccessDescriptionWithMetadata": "이 공급자의 상위 메타데이터와 최신 모델 목록이 동기화되었습니다.",
+      "refreshModelsFailedTitle": "새로 고침에 실패했습니다",
+      "refreshModelsFailedDescription": "지금은 이 공급자의 모델 목록을 새로 고칠 수 없습니다. 나중에 다시 시도하세요.",
+      "refreshModelsFailedDescriptionWithMetadata": "지금은 이 공급자의 상위 메타데이터와 모델을 동기화할 수 없습니다. 나중에 다시 시도하세요."
     },
     "apiKeyLabel": "API Key",
     "apiUrlLabel": "API URL",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "Install an agent from the ACP Registry first, then configure it here.",
     "registryOverlayEmpty": "No agents match the current filters.",
     "registryInstallAction": "Install",
+    "registryUninstallAction": "제거",
+    "registryUninstallConfirm": "\"{name}\" 에이전트를 제거할까요?",
+    "registryUninstallDescription": "DeepChat이 이 에이전트를 비활성화하고, 해당하는 경우 로컬에서 관리하는 설치 데이터를 정리합니다. 나중에 ACP Registry에서 다시 설치할 수 있습니다.",
+    "registryUninstallFailed": "에이전트를 제거하지 못했습니다",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Search, filter, and install ACP agents. Configure them back in settings after installation.",
     "registryLearnMore": "Learn More",
diff --git a/src/renderer/src/i18n/pt-BR/model.json b/src/renderer/src/i18n/pt-BR/model.json
index 9b3993f0f..0fa6594ec 100644
--- a/src/renderer/src/i18n/pt-BR/model.json
+++ b/src/renderer/src/i18n/pt-BR/model.json
@@ -20,6 +20,29 @@
     "enableAll": "Ativar Todos",
     "disableAll": "Desativar Todos"
   },
+  "sort": {
+    "status": "Por Status",
+    "name": "Por Nome"
+  },
+  "filter": {
+    "label": "Filtrar",
+    "clearAll": "Limpar Filtros",
+    "visibleCount": "Mostrando {visible} / {total}",
+    "capabilities": "Capacidades",
+    "types": "Tipos",
+    "capabilityOptions": {
+      "vision": "Visão",
+      "functionCall": "Chamada de Função",
+      "reasoning": "Raciocínio",
+      "search": "Busca na Web"
+    },
+    "typeOptions": {
+      "chat": "Chat",
+      "embedding": "Incorporação",
+      "rerank": "Reclassificação",
+      "imageGeneration": "Geração de Imagem"
+    }
+  },
   "tags": {
     "reasoning": "Raciocínio",
     "chat": "Chat",
diff --git a/src/renderer/src/i18n/pt-BR/settings.json b/src/renderer/src/i18n/pt-BR/settings.json
index 900a56680..b2cc3a16d 100644
--- a/src/renderer/src/i18n/pt-BR/settings.json
+++ b/src/renderer/src/i18n/pt-BR/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "Exemplo de API: {defaultUrl}",
     "urlFormatFill": "Preencher na URL da API",
     "openaiResponsesNotice": "A OpenAI usa a API Responses por padrão. Se um endpoint de terceiros oferecer suporte apenas a Chat Completions, use o provedor OpenAI Completions.",
+    "modifyBaseUrl": "Modificar",
+    "baseUrlLockedHint": "Este provedor está fixado na URL base recomendada para reduzir erros de configuração.",
+    "refreshModelsWithMetadataHint": "Atualizar este provedor sincroniza primeiro os metadados upstream e depois reconstrói a lista local de modelos.",
     "modelList": "Lista de Modelos",
     "enableModels": "Habilitar Modelos",
     "disableAllModels": "Desabilitar Todos os Modelos",
@@ -578,6 +581,12 @@
         "overwriteWarning": "Esta importação substituirá a configuração atual do provedor.",
         "confirming": "Importando..."
       },
+      "baseUrlUnlock": {
+        "title": "Confirmar alteração da URL base",
+        "description": "Não é recomendado alterar a URL base deste provedor. Um endpoint incorreto pode causar falhas nas requisições ou outros comportamentos inesperados. Você ainda pode continuar se entender o risco.",
+        "confirm": "Continuar"
+      },
+
       "deleteProvider": {
         "title": "Confirmar Exclusão do Provedor",
         "content": "Tem certeza de que deseja excluir o provedor \"{name}\"? Esta ação não pode ser desfeita.",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "Backup concluído",
       "backupSuccessMessage": "Backup salvo em {time} ({size})",
       "importSuccessTitle": "Importação concluída",
-      "importSuccessMessage": "{count} conversas importadas com sucesso"
+      "importSuccessMessage": "{count} conversas importadas com sucesso",
+      "refreshModelsSuccessTitle": "Modelos atualizados",
+      "refreshModelsSuccessDescription": "A lista mais recente de modelos foi sincronizada para este provedor.",
+      "refreshModelsSuccessDescriptionWithMetadata": "Os metadados upstream e a lista mais recente de modelos foram sincronizados para este provedor.",
+      "refreshModelsFailedTitle": "Falha na atualização",
+      "refreshModelsFailedDescription": "Não foi possível atualizar os modelos deste provedor agora. Tente novamente mais tarde.",
+      "refreshModelsFailedDescriptionWithMetadata": "Não foi possível sincronizar os metadados upstream e os modelos deste provedor agora. Tente novamente mais tarde."
     },
     "modelscope": {
       "mcpSync": {
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "Install an agent from the ACP Registry first, then configure it here.",
     "registryOverlayEmpty": "No agents match the current filters.",
     "registryInstallAction": "Install",
+    "registryUninstallAction": "Desinstalar",
+    "registryUninstallConfirm": "Desinstalar o agente \"{name}\"?",
+    "registryUninstallDescription": "O DeepChat vai desativar este agente e limpar, quando houver, os dados de instalação gerenciados localmente. Depois, você poderá instalá-lo novamente pelo ACP Registry.",
+    "registryUninstallFailed": "Falha ao desinstalar o agente",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Search, filter, and install ACP agents. Configure them back in settings after installation.",
     "registryLearnMore": "Learn More",
diff --git a/src/renderer/src/i18n/ru-RU/model.json b/src/renderer/src/i18n/ru-RU/model.json
index 39de885a5..af11c965c 100644
--- a/src/renderer/src/i18n/ru-RU/model.json
+++ b/src/renderer/src/i18n/ru-RU/model.json
@@ -20,6 +20,29 @@
     "enableAll": "Включить все",
     "disableAll": "Выключить все"
   },
+  "sort": {
+    "status": "По статусу",
+    "name": "По имени"
+  },
+  "filter": {
+    "label": "Фильтр",
+    "clearAll": "Очистить фильтры",
+    "visibleCount": "Показано {visible} / {total}",
+    "capabilities": "Возможности",
+    "types": "Типы",
+    "capabilityOptions": {
+      "vision": "Видение",
+      "functionCall": "Вызов функций",
+      "reasoning": "Рассуждение",
+      "search": "Веб-поиск"
+    },
+    "typeOptions": {
+      "chat": "Чат",
+      "embedding": "Встраивание",
+      "rerank": "Переранжирование",
+      "imageGeneration": "Генерация изображений"
+    }
+  },
   "tags": {
     "reasoning": "Рассуждение",
     "chat": "Чат",
diff --git a/src/renderer/src/i18n/ru-RU/settings.json b/src/renderer/src/i18n/ru-RU/settings.json
index c0813928a..09594a042 100644
--- a/src/renderer/src/i18n/ru-RU/settings.json
+++ b/src/renderer/src/i18n/ru-RU/settings.json
@@ -575,6 +575,12 @@
         "overwriteWarning": "Этот импорт перезапишет текущую конфигурацию провайдера.",
         "confirming": "Импорт..."
       },
+      "baseUrlUnlock": {
+        "title": "Подтвердить изменение базового URL",
+        "description": "Изменять базовый URL для этого провайдера не рекомендуется. Неверный адрес конечной точки может привести к ошибкам запросов или другому непредвиденному поведению. Если вы понимаете риск, всё равно можно продолжить.",
+        "confirm": "Продолжить"
+      },
+
       "deleteProvider": {
         "title": "Подтверждение удаления провайдера",
         "content": "Вы уверены, что хотите удалить провайдера \"{name}\"? Это действие нельзя отменить.",
@@ -614,6 +620,9 @@
     "urlFormat": "Образец API: {defaultUrl}",
     "urlFormatFill": "Подставить в URL API",
     "openaiResponsesNotice": "OpenAI по умолчанию использует Responses API. Если сторонний endpoint поддерживает только Chat Completions, используйте провайдера OpenAI Completions.",
+    "modifyBaseUrl": "Изменить",
+    "baseUrlLockedHint": "Этот провайдер закреплён за рекомендуемым базовым URL, чтобы снизить риск ошибочной настройки.",
+    "refreshModelsWithMetadataHint": "Обновление этого провайдера сначала синхронизирует метаданные из upstream, а затем пересоберёт локальный список моделей.",
     "azureApiVersion": "Версия API",
     "safety": {
       "title": "Настройки безопасности",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "Резервное копирование завершено",
       "backupSuccessMessage": "Резервная копия сохранена (время: {time}, размер: {size})",
       "importSuccessTitle": "Импорт завершён",
-      "importSuccessMessage": "Успешно импортировано {count} бесед"
+      "importSuccessMessage": "Успешно импортировано {count} бесед",
+      "refreshModelsSuccessTitle": "Модели обновлены",
+      "refreshModelsSuccessDescription": "Для этого провайдера синхронизирован актуальный список моделей.",
+      "refreshModelsSuccessDescriptionWithMetadata": "Для этого провайдера синхронизированы upstream-метаданные и актуальный список моделей.",
+      "refreshModelsFailedTitle": "Не удалось обновить",
+      "refreshModelsFailedDescription": "Сейчас не удалось обновить модели этого провайдера. Попробуйте позже.",
+      "refreshModelsFailedDescriptionWithMetadata": "Сейчас не удалось синхронизировать upstream-метаданные и модели этого провайдера. Попробуйте позже."
     },
     "apiKeyLabel": "API ключ",
     "apiUrlLabel": "API URL",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "Install an agent from the ACP Registry first, then configure it here.",
     "registryOverlayEmpty": "No agents match the current filters.",
     "registryInstallAction": "Install",
+    "registryUninstallAction": "Удалить",
+    "registryUninstallConfirm": "Удалить агента «{name}»?",
+    "registryUninstallDescription": "DeepChat отключит этого агента и, если применимо, очистит локально управляемые данные установки. При необходимости его можно снова установить из ACP Registry.",
+    "registryUninstallFailed": "Не удалось удалить агента",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "Search, filter, and install ACP agents. Configure them back in settings after installation.",
     "registryLearnMore": "Learn More",
diff --git a/src/renderer/src/i18n/zh-CN/model.json b/src/renderer/src/i18n/zh-CN/model.json
index c89d63c0e..7bfdd8b45 100644
--- a/src/renderer/src/i18n/zh-CN/model.json
+++ b/src/renderer/src/i18n/zh-CN/model.json
@@ -20,6 +20,29 @@
     "enableAll": "全部启用",
     "disableAll": "全部禁用"
   },
+  "sort": {
+    "status": "按状态",
+    "name": "按名称"
+  },
+  "filter": {
+    "label": "筛选",
+    "clearAll": "清空筛选",
+    "visibleCount": "显示 {visible} / {total}",
+    "capabilities": "能力",
+    "types": "类型",
+    "capabilityOptions": {
+      "vision": "视觉",
+      "functionCall": "函数调用",
+      "reasoning": "推理",
+      "search": "联网搜索"
+    },
+    "typeOptions": {
+      "chat": "对话",
+      "embedding": "向量",
+      "rerank": "重排",
+      "imageGeneration": "图像生成"
+    }
+  },
   "tags": {
     "reasoning": "推理",
     "chat": "对话",
diff --git a/src/renderer/src/i18n/zh-CN/settings.json b/src/renderer/src/i18n/zh-CN/settings.json
index fd3925b75..191467515 100644
--- a/src/renderer/src/i18n/zh-CN/settings.json
+++ b/src/renderer/src/i18n/zh-CN/settings.json
@@ -547,6 +547,9 @@
     "urlFormat": "API样例：{defaultUrl}",
     "urlFormatFill": "填充到 API URL",
     "openaiResponsesNotice": "OpenAI 官方服务默认使用 Responses API；若第三方仅支持 Chat Completions，请使用 OpenAI Completions 服务商。",
+    "modifyBaseUrl": "修改",
+    "baseUrlLockedHint": "此类 provider 默认固定为推荐的 Base URL，避免误修改导致请求异常。",
+    "refreshModelsWithMetadataHint": "刷新该服务商时会先同步上游元数据，再重建本地模型列表。",
     "modelList": "模型列表",
     "enableModels": "启用模型",
     "disableAllModels": "禁用全部",
@@ -574,7 +577,13 @@
       "backupSuccessTitle": "备份完成",
       "backupSuccessMessage": "备份已保存（时间：{time}，大小：{size}）",
       "importSuccessTitle": "导入完成",
-      "importSuccessMessage": "成功导入 {count} 条会话"
+      "importSuccessMessage": "成功导入 {count} 条会话",
+      "refreshModelsSuccessTitle": "模型已刷新",
+      "refreshModelsSuccessDescription": "该服务商的最新模型列表已同步。",
+      "refreshModelsSuccessDescriptionWithMetadata": "该服务商的上游元数据和最新模型列表已同步。",
+      "refreshModelsFailedTitle": "刷新失败",
+      "refreshModelsFailedDescription": "暂时无法刷新该服务商的模型列表，请稍后重试。",
+      "refreshModelsFailedDescriptionWithMetadata": "暂时无法刷新该服务商的上游元数据和模型列表，请稍后重试。"
     },
     "modelscope": {
       "name": "ModelScope",
@@ -707,6 +716,12 @@
         "overwriteWarning": "本次导入会覆盖当前服务商配置。",
         "confirming": "导入中..."
       },
+      "baseUrlUnlock": {
+        "title": "确认修改 Base URL",
+        "description": "此类 provider 不建议修改 Base URL，错误的地址可能导致请求失败或行为异常。确认后仍可继续手动修改。",
+        "confirm": "继续修改"
+      },
+
       "deleteProvider": {
         "title": "确认删除服务商",
         "content": "是否确认删除服务商 \"{name}\"？此操作不可恢复。",
@@ -1167,6 +1182,10 @@
     "registryRefresh": "刷新 Registry",
     "registryRepair": "修复",
     "registryInstallAction": "安装",
+    "registryUninstallAction": "卸载",
+    "registryUninstallConfirm": "卸载“{name}”？",
+    "registryUninstallDescription": "DeepChat 会禁用该 Agent，并在适用时清理本地托管的安装数据，之后仍可在 ACP Registry 中重新安装。",
+    "registryUninstallFailed": "卸载 Agent 失败",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "搜索、筛选并安装 ACP Agent。安装完成后回到设置页配置。",
     "registryLearnMore": "了解更多",
diff --git a/src/renderer/src/i18n/zh-HK/model.json b/src/renderer/src/i18n/zh-HK/model.json
index 2d0fc89f2..e7145daea 100644
--- a/src/renderer/src/i18n/zh-HK/model.json
+++ b/src/renderer/src/i18n/zh-HK/model.json
@@ -20,6 +20,29 @@
     "enableAll": "啟用全部",
     "disableAll": "禁用全部"
   },
+  "sort": {
+    "status": "按狀態",
+    "name": "按名稱"
+  },
+  "filter": {
+    "label": "篩選",
+    "clearAll": "清空篩選",
+    "visibleCount": "顯示 {visible} / {total}",
+    "capabilities": "能力",
+    "types": "類型",
+    "capabilityOptions": {
+      "vision": "視覺",
+      "functionCall": "函式呼叫",
+      "reasoning": "推理",
+      "search": "聯網搜尋"
+    },
+    "typeOptions": {
+      "chat": "對話",
+      "embedding": "向量",
+      "rerank": "重排",
+      "imageGeneration": "圖像生成"
+    }
+  },
   "tags": {
     "reasoning": "推理",
     "chat": "對話",
diff --git a/src/renderer/src/i18n/zh-HK/settings.json b/src/renderer/src/i18n/zh-HK/settings.json
index 55c22408e..503432a83 100644
--- a/src/renderer/src/i18n/zh-HK/settings.json
+++ b/src/renderer/src/i18n/zh-HK/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "API範例：{defaultUrl}",
     "urlFormatFill": "填入 API URL",
     "openaiResponsesNotice": "OpenAI 官方服務預設使用 Responses API；若第三方僅支援 Chat Completions，請使用 OpenAI Completions 服務商。",
+    "modifyBaseUrl": "修改",
+    "baseUrlLockedHint": "此類 provider 預設固定為建議的 Base URL，避免誤修改導致請求異常。",
+    "refreshModelsWithMetadataHint": "刷新該服務商時會先同步上游元資料，再重建本地模型列表。",
     "modelList": "模型列表",
     "enableModels": "模型已經啟用",
     "verifyLink": "驗證鏈接",
@@ -573,6 +576,12 @@
         "overwriteWarning": "本次導入會覆蓋目前的服務商設定。",
         "confirming": "導入中..."
       },
+      "baseUrlUnlock": {
+        "title": "確認修改 Base URL",
+        "description": "此類 provider 不建議修改 Base URL，錯誤的位址可能導致請求失敗或行為異常。確認後仍可繼續手動修改。",
+        "confirm": "繼續修改"
+      },
+
       "deleteProvider": {
         "title": "確認刪除服務商",
         "content": "是否確認刪除服務商 \"{name}\"？此操作不可恢復。",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "備份完成",
       "backupSuccessMessage": "備份已儲存（時間：{time}，大小：{size}）",
       "importSuccessTitle": "匯入完成",
-      "importSuccessMessage": "成功匯入 {count} 個對話"
+      "importSuccessMessage": "成功匯入 {count} 個對話",
+      "refreshModelsSuccessTitle": "模型已刷新",
+      "refreshModelsSuccessDescription": "該服務商的最新模型列表已同步。",
+      "refreshModelsSuccessDescriptionWithMetadata": "該服務商的上游元資料和最新模型列表已同步。",
+      "refreshModelsFailedTitle": "刷新失敗",
+      "refreshModelsFailedDescription": "暫時無法刷新該服務商的模型列表，請稍後重試。",
+      "refreshModelsFailedDescriptionWithMetadata": "暫時無法刷新該服務商的上游元資料和模型列表，請稍後重試。"
     },
     "apiKeyLabel": "API Key",
     "apiUrlLabel": "API URL",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "先從 ACP Registry 安裝 Agent，安裝後才會在這裡顯示可配置介面。",
     "registryOverlayEmpty": "目前篩選條件下沒有可安裝的 Agent。",
     "registryInstallAction": "安裝",
+    "registryUninstallAction": "卸載",
+    "registryUninstallConfirm": "卸載「{name}」？",
+    "registryUninstallDescription": "DeepChat 會停用這個 Agent，並在適用時清理本機代管的安裝資料，之後仍可在 ACP Registry 重新安裝。",
+    "registryUninstallFailed": "卸載 Agent 失敗",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "搜尋、篩選並安裝 ACP Agent。安裝完成後回到設定頁配置。",
     "registryLearnMore": "了解更多",
diff --git a/src/renderer/src/i18n/zh-TW/model.json b/src/renderer/src/i18n/zh-TW/model.json
index f26b320f0..6d9b596d8 100644
--- a/src/renderer/src/i18n/zh-TW/model.json
+++ b/src/renderer/src/i18n/zh-TW/model.json
@@ -20,6 +20,29 @@
     "enableAll": "全部啟用",
     "disableAll": "全部停用"
   },
+  "sort": {
+    "status": "按狀態",
+    "name": "按名稱"
+  },
+  "filter": {
+    "label": "篩選",
+    "clearAll": "清空篩選",
+    "visibleCount": "顯示 {visible} / {total}",
+    "capabilities": "能力",
+    "types": "類型",
+    "capabilityOptions": {
+      "vision": "視覺",
+      "functionCall": "函式呼叫",
+      "reasoning": "推理",
+      "search": "聯網搜尋"
+    },
+    "typeOptions": {
+      "chat": "對話",
+      "embedding": "向量",
+      "rerank": "重排",
+      "imageGeneration": "圖像生成"
+    }
+  },
   "tags": {
     "reasoning": "推理",
     "chat": "對話",
diff --git a/src/renderer/src/i18n/zh-TW/settings.json b/src/renderer/src/i18n/zh-TW/settings.json
index f2fd931a0..1ff8868af 100644
--- a/src/renderer/src/i18n/zh-TW/settings.json
+++ b/src/renderer/src/i18n/zh-TW/settings.json
@@ -484,6 +484,9 @@
     "urlFormat": "API 範例：{defaultUrl}",
     "urlFormatFill": "填入 API URL",
     "openaiResponsesNotice": "OpenAI 官方服務預設使用 Responses API；若第三方僅支援 Chat Completions，請使用 OpenAI Completions 服務商。",
+    "modifyBaseUrl": "修改",
+    "baseUrlLockedHint": "此類 provider 預設固定為建議的 Base URL，避免誤修改導致請求異常。",
+    "refreshModelsWithMetadataHint": "重新整理該服務商時會先同步上游中繼資料，再重建本機模型清單。",
     "modelList": "模型清單",
     "enableModels": "啟用模型",
     "disableAllModels": "全部停用",
@@ -578,6 +581,12 @@
         "overwriteWarning": "這次匯入會覆蓋目前的服務商設定。",
         "confirming": "匯入中..."
       },
+      "baseUrlUnlock": {
+        "title": "確認修改 Base URL",
+        "description": "此類 provider 不建議修改 Base URL，錯誤的位址可能導致請求失敗或行為異常。確認後仍可繼續手動修改。",
+        "confirm": "繼續修改"
+      },
+
       "deleteProvider": {
         "title": "確認刪除服務提供者",
         "content": "是否確認刪除服務提供者「{name}」？此操作無法復原。",
@@ -652,7 +661,13 @@
       "backupSuccessTitle": "備份完成",
       "backupSuccessMessage": "備份已儲存（時間：{time}，大小：{size}）",
       "importSuccessTitle": "匯入完成",
-      "importSuccessMessage": "成功匯入 {count} 個對話"
+      "importSuccessMessage": "成功匯入 {count} 個對話",
+      "refreshModelsSuccessTitle": "模型已重新整理",
+      "refreshModelsSuccessDescription": "該服務商的最新模型清單已同步。",
+      "refreshModelsSuccessDescriptionWithMetadata": "該服務商的上游中繼資料和最新模型清單已同步。",
+      "refreshModelsFailedTitle": "重新整理失敗",
+      "refreshModelsFailedDescription": "目前無法重新整理該服務商的模型清單，請稍後再試。",
+      "refreshModelsFailedDescriptionWithMetadata": "目前無法同步該服務商的上游中繼資料和模型，請稍後再試。"
     },
     "apiKeyLabel": "API Key",
     "apiUrlLabel": "API URL",
@@ -1262,6 +1277,10 @@
     "installedEmptyDescription": "先從 ACP Registry 安裝 Agent，安裝後才會在這裡顯示可配置介面。",
     "registryOverlayEmpty": "目前篩選條件下沒有可安裝的 Agent。",
     "registryInstallAction": "安裝",
+    "registryUninstallAction": "卸載",
+    "registryUninstallConfirm": "卸載「{name}」？",
+    "registryUninstallDescription": "DeepChat 會停用這個 Agent，並在適用時清理本機代管的安裝資料，之後仍可在 ACP Registry 重新安裝。",
+    "registryUninstallFailed": "卸載 Agent 失敗",
     "registryInstallTitle": "ACP Registry",
     "registryInstallDescription": "搜尋、篩選並安裝 ACP Agent。安裝完成後回到設定頁配置。",
     "registryLearnMore": "了解更多",
diff --git a/src/renderer/src/lib/ipcSubscription.ts b/src/renderer/src/lib/ipcSubscription.ts
new file mode 100644
index 000000000..06f494b5a
--- /dev/null
+++ b/src/renderer/src/lib/ipcSubscription.ts
@@ -0,0 +1,43 @@
+type IpcListener = (...args: any[]) => void
+
+type IpcRegistration = {
+  channel: string
+  listener: IpcListener
+}
+
+function resolveIpcRenderer() {
+  return window?.electron?.ipcRenderer
+}
+
+export function createIpcSubscriptionScope() {
+  const registrations: IpcRegistration[] = []
+
+  const on = (channel: string, listener: IpcListener) => {
+    const ipcRenderer = resolveIpcRenderer()
+    if (!ipcRenderer) {
+      return
+    }
+
+    ipcRenderer.on(channel, listener)
+    registrations.push({ channel, listener })
+  }
+
+  const cleanup = () => {
+    const ipcRenderer = resolveIpcRenderer()
+    if (!ipcRenderer) {
+      registrations.length = 0
+      return
+    }
+
+    for (const registration of registrations.splice(0)) {
+      if (typeof ipcRenderer.removeListener === 'function') {
+        ipcRenderer.removeListener(registration.channel, registration.listener)
+      }
+    }
+  }
+
+  return {
+    on,
+    cleanup
+  }
+}
diff --git a/src/renderer/src/lib/storeInitializer.ts b/src/renderer/src/lib/storeInitializer.ts
index e92b937ff..5e8cff804 100644
--- a/src/renderer/src/lib/storeInitializer.ts
+++ b/src/renderer/src/lib/storeInitializer.ts
@@ -5,6 +5,7 @@ import { useModelStore } from '@/stores/modelStore'
 import { useOllamaStore } from '@/stores/ollamaStore'
 import { useMcpStore } from '@/stores/mcp'
 import { DEEPLINK_EVENTS } from '@/events'
+import { createIpcSubscriptionScope } from '@/lib/ipcSubscription'
 
 export const initAppStores = async () => {
   const uiSettingsStore = useUiSettingsStore()
@@ -26,6 +27,7 @@ export const initAppStores = async () => {
 export const useMcpInstallDeeplinkHandler = () => {
   const router = useRouter()
   const mcpStore = useMcpStore()
+  let cleanupIpcListeners: (() => void) | null = null
 
   const navigateToMcpSettings = async () => {
     await router.isReady()
@@ -78,11 +80,15 @@ export const useMcpInstallDeeplinkHandler = () => {
   }
 
   const setup = () => {
-    window.electron.ipcRenderer.on(DEEPLINK_EVENTS.MCP_INSTALL, handleMcpInstall)
+    cleanupIpcListeners?.()
+    const scope = createIpcSubscriptionScope()
+    scope.on(DEEPLINK_EVENTS.MCP_INSTALL, handleMcpInstall)
+    cleanupIpcListeners = scope.cleanup
   }
 
   const cleanup = () => {
-    window.electron.ipcRenderer.removeAllListeners(DEEPLINK_EVENTS.MCP_INSTALL)
+    cleanupIpcListeners?.()
+    cleanupIpcListeners = null
   }
 
   return { setup, cleanup }
diff --git a/src/renderer/src/lib/windowContext.ts b/src/renderer/src/lib/windowContext.ts
new file mode 100644
index 000000000..af99e5d70
--- /dev/null
+++ b/src/renderer/src/lib/windowContext.ts
@@ -0,0 +1,45 @@
+export interface RendererWindowContext {
+  windowId: number | null
+  webContentsId: number | null
+}
+
+let cachedWindowContext: RendererWindowContext | null = null
+
+function readWindowContext(): RendererWindowContext {
+  if (typeof window === 'undefined' || !window.api) {
+    return {
+      windowId: null,
+      webContentsId: null
+    }
+  }
+
+  try {
+    return {
+      windowId:
+        typeof window.api.getWindowId === 'function' ? (window.api.getWindowId() ?? null) : null,
+      webContentsId:
+        typeof window.api.getWebContentsId === 'function'
+          ? (window.api.getWebContentsId() ?? null)
+          : null
+    }
+  } catch (error) {
+    console.warn('Failed to read renderer window context:', error)
+    return {
+      windowId: null,
+      webContentsId: null
+    }
+  }
+}
+
+export function getRendererWindowContext(): RendererWindowContext {
+  if (cachedWindowContext) {
+    return cachedWindowContext
+  }
+
+  cachedWindowContext = readWindowContext()
+  return cachedWindowContext
+}
+
+export function resetRendererWindowContext(): void {
+  cachedWindowContext = null
+}
diff --git a/src/renderer/src/pages/ChatPage.vue b/src/renderer/src/pages/ChatPage.vue
index 494fa2f7c..78e2114ae 100644
--- a/src/renderer/src/pages/ChatPage.vue
+++ b/src/renderer/src/pages/ChatPage.vue
@@ -150,7 +150,7 @@ const messageStore = useMessageStore()
 const pendingInputStore = usePendingInputStore()
 const spotlightStore = useSpotlightStore()
 const modelStore = useModelStore()
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const { t } = useI18n()
 
 const sessionTitle = computed(() => sessionStore.activeSession?.title ?? t('common.newChat'))
@@ -814,7 +814,7 @@ async function onToolInteractionRespond(response: ToolInteractionResponse) {
 
   isHandlingInteraction.value = true
   try {
-    await newAgentPresenter.respondToolInteraction(
+    await agentSessionPresenter.respondToolInteraction(
       interaction.sessionId,
       interaction.messageId,
       interaction.toolCallId,
@@ -832,7 +832,7 @@ async function onStop() {
   if (isReadOnlySession.value) return
   if (!isGenerating.value) return
   try {
-    await newAgentPresenter.cancelGeneration(props.sessionId)
+    await agentSessionPresenter.cancelGeneration(props.sessionId)
   } catch (error) {
     console.error('[ChatPage] cancel generation failed:', error)
   }
@@ -844,7 +844,7 @@ async function onMessageRetry(messageId: string) {
   if (activePendingInteraction.value || isHandlingInteraction.value) return
   try {
     messageStore.clearStreamingState()
-    await newAgentPresenter.retryMessage(props.sessionId, messageId)
+    await agentSessionPresenter.retryMessage(props.sessionId, messageId)
   } catch (error) {
     console.error('[ChatPage] retry message failed:', error)
     await messageStore.loadMessages(props.sessionId)
@@ -856,7 +856,7 @@ async function onMessageDelete(messageId: string) {
   if (!messageId) return
   try {
     messageStore.clearStreamingState()
-    await newAgentPresenter.deleteMessage(props.sessionId, messageId)
+    await agentSessionPresenter.deleteMessage(props.sessionId, messageId)
     await messageStore.loadMessages(props.sessionId)
   } catch (error) {
     console.error('[ChatPage] delete message failed:', error)
@@ -870,7 +870,7 @@ async function onMessageEditSave(payload: { messageId: string; text: string }) {
   if (!messageId || !text) return
 
   try {
-    await newAgentPresenter.editUserMessage(props.sessionId, messageId, text)
+    await agentSessionPresenter.editUserMessage(props.sessionId, messageId, text)
     await onMessageRetry(messageId)
   } catch (error) {
     console.error('[ChatPage] edit message failed:', error)
@@ -881,7 +881,7 @@ async function onMessageFork(messageId: string) {
   if (isReadOnlySession.value) return
   if (!messageId) return
   try {
-    const forked = await newAgentPresenter.forkSession(props.sessionId, messageId)
+    const forked = await agentSessionPresenter.forkSession(props.sessionId, messageId)
     await sessionStore.fetchSessions()
     await sessionStore.selectSession(forked.id)
   } catch (error) {
@@ -894,7 +894,7 @@ async function onMessageContinue(_conversationId: string, messageId: string) {
   if (!messageId) return
   try {
     messageStore.clearStreamingState()
-    await newAgentPresenter.retryMessage(props.sessionId, messageId)
+    await agentSessionPresenter.retryMessage(props.sessionId, messageId)
   } catch (error) {
     console.error('[ChatPage] continue message failed:', error)
     await messageStore.loadMessages(props.sessionId)
diff --git a/src/renderer/src/pages/NewThreadPage.vue b/src/renderer/src/pages/NewThreadPage.vue
index 28534f81f..47329e395 100644
--- a/src/renderer/src/pages/NewThreadPage.vue
+++ b/src/renderer/src/pages/NewThreadPage.vue
@@ -117,7 +117,7 @@ const agentStore = useAgentStore()
 const modelStore = useModelStore()
 const draftStore = useDraftStore()
 const configPresenter = usePresenter('configPresenter')
-const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentSessionPresenter = usePresenter('agentSessionPresenter')
 const { t } = useI18n()
 
 const message = ref('')
@@ -459,7 +459,7 @@ const ensureAcpDraftSession = async (agentId: string, projectPath: string) => {
   const requestSeq = ++acpDraftRequestSeq.value
 
   try {
-    const session = await newAgentPresenter.ensureAcpDraftSession({
+    const session = await agentSessionPresenter.ensureAcpDraftSession({
       agentId,
       projectDir,
       permissionMode: draftStore.permissionMode
diff --git a/src/renderer/src/stores/ui/agent.ts b/src/renderer/src/stores/ui/agent.ts
index adc6491eb..17639d641 100644
--- a/src/renderer/src/stores/ui/agent.ts
+++ b/src/renderer/src/stores/ui/agent.ts
@@ -24,7 +24,7 @@ export interface UIAgent {
 // --- Store ---
 
 export const useAgentStore = defineStore('agent', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
 
   // --- State ---
   const agents = ref<UIAgent[]>([])
@@ -42,7 +42,7 @@ export const useAgentStore = defineStore('agent', () => {
     loading.value = true
     error.value = null
     try {
-      const result: Agent[] = await newAgentPresenter.getAgents()
+      const result: Agent[] = await agentSessionPresenter.getAgents()
       agents.value = result.map((a) => ({
         id: a.id,
         name: a.name,
@@ -57,11 +57,11 @@ export const useAgentStore = defineStore('agent', () => {
         config: a.config,
         installState: a.installState ?? null
       }))
-      if (
-        selectedAgentId.value !== null &&
-        !agents.value.some((agent) => agent.id === selectedAgentId.value)
-      ) {
-        selectedAgentId.value = null
+      if (selectedAgentId.value !== null) {
+        const selectedAgent = agents.value.find((agent) => agent.id === selectedAgentId.value)
+        if (!selectedAgent || !selectedAgent.enabled) {
+          selectedAgentId.value = null
+        }
       }
     } catch (e) {
       error.value = `Failed to load agents: ${e}`
diff --git a/src/renderer/src/stores/ui/message.ts b/src/renderer/src/stores/ui/message.ts
index 32b99f29c..50bbc253e 100644
--- a/src/renderer/src/stores/ui/message.ts
+++ b/src/renderer/src/stores/ui/message.ts
@@ -1,28 +1,26 @@
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { ref, computed, onScopeDispose, getCurrentScope } from 'vue'
 import { usePresenter } from '@/composables/usePresenter'
-import { STREAM_EVENTS } from '@/events'
 import type {
   ChatMessageRecord,
   AssistantMessageBlock,
   MessageFile
 } from '@shared/types/agent-interface'
 import { useSessionStore } from './session'
+import { useStreamStateStore } from './stream'
+import { bindMessageStoreIpc } from './messageIpc'
 
 const EPHEMERAL_STREAM_MESSAGE_PREFIXES = ['__rate_limit__:']
 
 // --- Store ---
 
 export const useMessageStore = defineStore('message', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
+  const streamStateStore = useStreamStateStore()
 
   // --- State ---
   const messageIds = ref<string[]>([])
   const messageCache = ref<Map<string, ChatMessageRecord>>(new Map())
-  const isStreaming = ref(false)
-  const streamingBlocks = ref<AssistantMessageBlock[]>([])
-  const currentStreamSessionId = ref<string | null>(null)
-  const currentStreamMessageId = ref<string | null>(null)
   const hydratingStreamMessageIds = new Set<string>()
   let latestLoadRequestId = 0
 
@@ -50,7 +48,7 @@ export const useMessageStore = defineStore('message', () => {
   async function loadMessages(sessionId: string): Promise<void> {
     const requestId = ++latestLoadRequestId
     try {
-      const result = await newAgentPresenter.getMessages(sessionId)
+      const result = await agentSessionPresenter.getMessages(sessionId)
       if (requestId !== latestLoadRequestId) {
         return
       }
@@ -71,7 +69,7 @@ export const useMessageStore = defineStore('message', () => {
     if (cached) return cached
 
     try {
-      const msg = await newAgentPresenter.getMessage(id)
+      const msg = await agentSessionPresenter.getMessage(id)
       if (msg) {
         messageCache.value.set(msg.id, msg)
       }
@@ -120,10 +118,7 @@ export const useMessageStore = defineStore('message', () => {
   }
 
   function clearStreamingState(): void {
-    isStreaming.value = false
-    streamingBlocks.value = []
-    currentStreamSessionId.value = null
-    currentStreamMessageId.value = null
+    streamStateStore.clearStreamingState()
   }
 
   function isEphemeralStreamMessageId(messageId: string): boolean {
@@ -151,7 +146,7 @@ export const useMessageStore = defineStore('message', () => {
     if (hydratingStreamMessageIds.has(messageId)) return
     hydratingStreamMessageIds.add(messageId)
 
-    void newAgentPresenter
+    void agentSessionPresenter
       .getMessage(messageId)
       .then((fetched) => {
         if (!fetched || fetched.sessionId !== conversationId) return
@@ -170,72 +165,24 @@ export const useMessageStore = defineStore('message', () => {
       })
   }
 
-  // --- Event Listeners ---
-
-  window.electron.ipcRenderer.on(
-    STREAM_EVENTS.RESPONSE,
-    (
-      _: unknown,
-      msg: {
-        conversationId: string
-        blocks: AssistantMessageBlock[]
-        messageId?: string
-        eventId?: string
-      }
-    ) => {
-      const sessionStore = useSessionStore()
-      if (msg.conversationId === sessionStore.activeSessionId) {
-        const streamMessageId = msg.messageId ?? msg.eventId
-        isStreaming.value = true
-        currentStreamSessionId.value = msg.conversationId
-        currentStreamMessageId.value = streamMessageId ?? null
-        streamingBlocks.value = msg.blocks
-        if (streamMessageId && !isEphemeralStreamMessageId(streamMessageId)) {
-          applyStreamingBlocksToMessage(streamMessageId, msg.conversationId, msg.blocks)
-        }
-      }
-    }
-  )
-
-  window.electron.ipcRenderer.on(
-    STREAM_EVENTS.END,
-    (_: unknown, msg: { conversationId: string; messageId?: string; eventId?: string }) => {
-      const sessionStore = useSessionStore()
-      if (msg.conversationId === sessionStore.activeSessionId) {
-        isStreaming.value = false
-        streamingBlocks.value = []
-        currentStreamSessionId.value = null
-        currentStreamMessageId.value = null
-        // Reload messages from DB to get finalized content
-        void loadMessages(msg.conversationId)
-      }
-    }
-  )
-
-  window.electron.ipcRenderer.on(
-    STREAM_EVENTS.ERROR,
-    (
-      _: unknown,
-      msg: { conversationId: string; error: string; messageId?: string; eventId?: string }
-    ) => {
-      const sessionStore = useSessionStore()
-      if (msg.conversationId === sessionStore.activeSessionId) {
-        isStreaming.value = false
-        streamingBlocks.value = []
-        currentStreamSessionId.value = null
-        currentStreamMessageId.value = null
-        // Reload messages from DB to get error state
-        void loadMessages(msg.conversationId)
-      }
-    }
-  )
+  const cleanupIpcBindings = bindMessageStoreIpc({
+    getActiveSessionId: () => useSessionStore().activeSessionId,
+    setStreamingState: ({ sessionId, messageId, blocks }) => {
+      streamStateStore.setStream(sessionId, blocks, messageId)
+    },
+    clearStreamingState,
+    loadMessages,
+    applyStreamingBlocksToMessage,
+    isEphemeralStreamMessageId
+  })
+  registerStoreCleanup(cleanupIpcBindings)
 
   return {
     messageIds,
     messageCache,
-    isStreaming,
-    streamingBlocks,
-    currentStreamMessageId,
+    isStreaming: streamStateStore.isStreaming,
+    streamingBlocks: streamStateStore.streamingBlocks,
+    currentStreamMessageId: streamStateStore.currentStreamMessageId,
     messages,
     loadMessages,
     getMessage,
@@ -244,3 +191,8 @@ export const useMessageStore = defineStore('message', () => {
     clear
   }
 })
+const registerStoreCleanup = (cleanup: () => void) => {
+  if (getCurrentScope()) {
+    onScopeDispose(cleanup)
+  }
+}
diff --git a/src/renderer/src/stores/ui/messageIpc.ts b/src/renderer/src/stores/ui/messageIpc.ts
new file mode 100644
index 000000000..0500b8f3a
--- /dev/null
+++ b/src/renderer/src/stores/ui/messageIpc.ts
@@ -0,0 +1,84 @@
+import { STREAM_EVENTS } from '@/events'
+import type { AssistantMessageBlock } from '@shared/types/agent-interface'
+import { createIpcSubscriptionScope } from '@/lib/ipcSubscription'
+
+interface BindMessageStoreIpcOptions {
+  getActiveSessionId: () => string | null
+  setStreamingState: (payload: {
+    sessionId: string
+    messageId?: string
+    blocks: AssistantMessageBlock[]
+  }) => void
+  clearStreamingState: () => void
+  loadMessages: (sessionId: string) => void | Promise<void>
+  applyStreamingBlocksToMessage: (
+    messageId: string,
+    sessionId: string,
+    blocks: AssistantMessageBlock[]
+  ) => void
+  isEphemeralStreamMessageId: (messageId: string) => boolean
+}
+
+export function bindMessageStoreIpc(options: BindMessageStoreIpcOptions): () => void {
+  const scope = createIpcSubscriptionScope()
+
+  scope.on(
+    STREAM_EVENTS.RESPONSE,
+    (
+      _event,
+      payload: {
+        conversationId: string
+        blocks: AssistantMessageBlock[]
+        messageId?: string
+        eventId?: string
+      }
+    ) => {
+      if (payload?.conversationId !== options.getActiveSessionId()) {
+        return
+      }
+
+      const streamMessageId = payload.messageId ?? payload.eventId
+      options.setStreamingState({
+        sessionId: payload.conversationId,
+        messageId: streamMessageId,
+        blocks: payload.blocks
+      })
+
+      if (streamMessageId && !options.isEphemeralStreamMessageId(streamMessageId)) {
+        options.applyStreamingBlocksToMessage(
+          streamMessageId,
+          payload.conversationId,
+          payload.blocks
+        )
+      }
+    }
+  )
+
+  const clearAndReload = (payload: { conversationId: string }) => {
+    if (payload?.conversationId !== options.getActiveSessionId()) {
+      return
+    }
+
+    options.clearStreamingState()
+    void options.loadMessages(payload.conversationId)
+  }
+
+  scope.on(
+    STREAM_EVENTS.END,
+    (_event, payload: { conversationId: string; messageId?: string; eventId?: string }) => {
+      clearAndReload(payload)
+    }
+  )
+
+  scope.on(
+    STREAM_EVENTS.ERROR,
+    (
+      _event,
+      payload: { conversationId: string; error: string; messageId?: string; eventId?: string }
+    ) => {
+      clearAndReload(payload)
+    }
+  )
+
+  return scope.cleanup
+}
diff --git a/src/renderer/src/stores/ui/pageRouter.ts b/src/renderer/src/stores/ui/pageRouter.ts
index 01c0e3306..0777c2067 100644
--- a/src/renderer/src/stores/ui/pageRouter.ts
+++ b/src/renderer/src/stores/ui/pageRouter.ts
@@ -8,7 +8,7 @@ type GoToNewThreadOptions = {
 }
 
 export const usePageRouterStore = defineStore('pageRouter', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
 
   // --- State ---
   const route = ref<PageRoute>({ name: 'newThread' })
@@ -19,11 +19,11 @@ export const usePageRouterStore = defineStore('pageRouter', () => {
 
   async function initialize(): Promise<void> {
     try {
-      // 1. Check for active new-agent session on this window content first
+      // 1. Check for the active agent session on this webContents first
       const webContentsId = window.api.getWebContentsId()
-      const activeNewSession = await newAgentPresenter.getActiveSession(webContentsId)
-      if (activeNewSession) {
-        route.value = { name: 'chat', sessionId: activeNewSession.id }
+      const activeAgentSession = await agentSessionPresenter.getActiveSession(webContentsId)
+      if (activeAgentSession) {
+        route.value = { name: 'chat', sessionId: activeAgentSession.id }
         return
       }
 
diff --git a/src/renderer/src/stores/ui/pendingInput.ts b/src/renderer/src/stores/ui/pendingInput.ts
index 342aaa4ba..fa77ac132 100644
--- a/src/renderer/src/stores/ui/pendingInput.ts
+++ b/src/renderer/src/stores/ui/pendingInput.ts
@@ -7,7 +7,7 @@ import type { PendingSessionInputRecord, SendMessageInput } from '@shared/types/
 const MAX_PENDING_INPUTS = 5
 
 export const usePendingInputStore = defineStore('pendingInput', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
 
   const currentSessionId = ref<string | null>(null)
   const items = ref<PendingSessionInputRecord[]>([])
@@ -29,7 +29,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
     loading.value = true
     error.value = null
     try {
-      const loadedItems = await newAgentPresenter.listPendingInputs(requestedId)
+      const loadedItems = await agentSessionPresenter.listPendingInputs(requestedId)
       if (requestedId !== currentSessionId.value) {
         return
       }
@@ -49,7 +49,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   async function queueInput(sessionId: string, input: string | SendMessageInput): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.queuePendingInput(sessionId, input)
+      await agentSessionPresenter.queuePendingInput(sessionId, input)
       if (currentSessionId.value === sessionId) {
         await loadPendingInputs(sessionId)
       }
@@ -66,7 +66,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   ): Promise<void> {
     error.value = null
     try {
-      const updated = await newAgentPresenter.updateQueuedInput(sessionId, itemId, input)
+      const updated = await agentSessionPresenter.updateQueuedInput(sessionId, itemId, input)
       items.value = items.value.map((item) => (item.id === updated.id ? updated : item))
       if (currentSessionId.value === sessionId) {
         await loadPendingInputs(sessionId)
@@ -80,7 +80,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   async function moveQueueInput(sessionId: string, itemId: string, toIndex: number): Promise<void> {
     error.value = null
     try {
-      items.value = await newAgentPresenter.moveQueuedInput(sessionId, itemId, toIndex)
+      items.value = await agentSessionPresenter.moveQueuedInput(sessionId, itemId, toIndex)
     } catch (e) {
       error.value = `Failed to reorder queued message: ${e}`
       throw e
@@ -90,7 +90,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   async function convertToSteer(sessionId: string, itemId: string): Promise<void> {
     error.value = null
     try {
-      const updated = await newAgentPresenter.convertPendingInputToSteer(sessionId, itemId)
+      const updated = await agentSessionPresenter.convertPendingInputToSteer(sessionId, itemId)
       items.value = items.value.map((item) => (item.id === updated.id ? updated : item))
       if (currentSessionId.value === sessionId) {
         await loadPendingInputs(sessionId)
@@ -104,7 +104,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   async function deleteInput(sessionId: string, itemId: string): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.deletePendingInput(sessionId, itemId)
+      await agentSessionPresenter.deletePendingInput(sessionId, itemId)
       items.value = items.value.filter((item) => item.id !== itemId)
     } catch (e) {
       error.value = `Failed to delete queued message: ${e}`
@@ -115,7 +115,7 @@ export const usePendingInputStore = defineStore('pendingInput', () => {
   async function resumeQueue(sessionId: string): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.resumePendingQueue(sessionId)
+      await agentSessionPresenter.resumePendingQueue(sessionId)
       if (currentSessionId.value === sessionId) {
         await loadPendingInputs(sessionId)
       }
diff --git a/src/renderer/src/stores/ui/session.ts b/src/renderer/src/stores/ui/session.ts
index e28f60245..c37e95743 100644
--- a/src/renderer/src/stores/ui/session.ts
+++ b/src/renderer/src/stores/ui/session.ts
@@ -1,8 +1,7 @@
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { ref, computed, onScopeDispose, getCurrentScope } from 'vue'
 import type { ComputedRef } from 'vue'
 import { usePresenter } from '@/composables/usePresenter'
-import { SESSION_EVENTS } from '@/events'
 import type {
   DeepChatSubagentMeta,
   SessionWithState,
@@ -13,6 +12,8 @@ import type {
 import { downloadBlob } from '@/lib/download'
 import { usePageRouterStore } from './pageRouter'
 import { useMessageStore } from './message'
+import { bindSessionStoreIpc } from './sessionIpc'
+import { getRendererWindowContext } from '@/lib/windowContext'
 
 // --- Type Definitions ---
 
@@ -44,6 +45,9 @@ export interface SessionGroup {
 
 export type GroupMode = 'time' | 'project'
 
+const SIDEBAR_GROUP_MODE_KEY = 'sidebar_group_mode'
+const DEFAULT_GROUP_MODE: GroupMode = 'project'
+
 // --- Helper Functions ---
 
 function mapSessionStatus(status: string): UISessionStatus {
@@ -79,6 +83,20 @@ function mapToUISession(session: SessionWithState): UISession {
   }
 }
 
+function isRegularSession(session: Pick<UISession, 'sessionKind'>): boolean {
+  return (session.sessionKind ?? 'regular') === 'regular'
+}
+
+function getCurrentWebContentsId(): number {
+  return getRendererWindowContext().webContentsId ?? -1
+}
+
+function registerStoreCleanup(cleanup: () => void): void {
+  if (getCurrentScope()) {
+    onScopeDispose(cleanup)
+  }
+}
+
 function startOfDay(timestamp: number): number {
   const d = new Date(timestamp)
   d.setHours(0, 0, 0, 0)
@@ -118,7 +136,7 @@ function groupByProject(sessions: UISession[]): SessionGroup[] {
     projectMap.get(dir)!.push(session)
   }
   return Array.from(projectMap.entries()).map(([dir, sessions]) => ({
-    label: dir === '__no_project__' ? 'common.project.none' : (dir.split('/').pop() ?? dir),
+    label: dir === '__no_project__' ? 'common.project.none' : (dir.split(/[\\/]/).pop() ?? dir),
     labelKey: dir === '__no_project__' ? 'common.project.none' : undefined,
     sessions
   }))
@@ -142,17 +160,22 @@ function getContentType(format: 'markdown' | 'html' | 'txt' | 'nowledge-mem'): s
 // --- Store ---
 
 export const useSessionStore = defineStore('session', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
   const tabPresenter = usePresenter('tabPresenter')
+  const configPresenter = usePresenter('configPresenter', { safeCall: false })
   const pageRouter = usePageRouterStore()
   const messageStore = useMessageStore()
-  const myWebContentsId = window.api.getWebContentsId()
+  const myWebContentsId = getCurrentWebContentsId()
   let rendererReadyNotified = false
+  let groupModeLoadPromise: Promise<void> | null = null
+  let groupModeWritePromise: Promise<void> = Promise.resolve()
+  let hasLoadedGroupMode = false
+  let groupModeUpdateVersion = 0
 
   // --- State ---
   const sessions = ref<UISession[]>([])
   const activeSessionId = ref<string | null>(null)
-  const groupMode = ref<GroupMode>('time')
+  const groupMode = ref<GroupMode>(DEFAULT_GROUP_MODE)
   const loading = ref(false)
   const error = ref<string | null>(null)
 
@@ -164,6 +187,41 @@ export const useSessionStore = defineStore('session', () => {
 
   notifyRendererReady()
 
+  const normalizeGroupMode = (value: unknown): GroupMode =>
+    value === 'time' || value === 'project' ? value : DEFAULT_GROUP_MODE
+
+  const loadGroupModePreference = async (): Promise<void> => {
+    const loadVersion = groupModeUpdateVersion
+
+    try {
+      const savedGroupMode = await configPresenter.getSetting<GroupMode>(SIDEBAR_GROUP_MODE_KEY)
+      if (groupModeUpdateVersion === loadVersion) {
+        groupMode.value = normalizeGroupMode(savedGroupMode)
+      }
+    } catch (error) {
+      if (groupModeUpdateVersion === loadVersion) {
+        groupMode.value = DEFAULT_GROUP_MODE
+      }
+      console.warn('[sessionStore] Failed to load sidebar group mode:', error)
+    } finally {
+      hasLoadedGroupMode = true
+    }
+  }
+
+  const ensureGroupModeLoaded = async (): Promise<void> => {
+    if (hasLoadedGroupMode) {
+      return
+    }
+
+    if (!groupModeLoadPromise) {
+      groupModeLoadPromise = loadGroupModePreference().finally(() => {
+        groupModeLoadPromise = null
+      })
+    }
+
+    await groupModeLoadPromise
+  }
+
   // --- Getters ---
   const activeSession: ComputedRef<UISession | undefined> = computed(() =>
     sessions.value.find((s) => s.id === activeSessionId.value)
@@ -179,11 +237,12 @@ export const useSessionStore = defineStore('session', () => {
     loading.value = true
     error.value = null
     try {
-      const webContentsId = window.api.getWebContentsId()
+      await ensureGroupModeLoaded()
+      const webContentsId = getCurrentWebContentsId()
       const previousActiveSessionId = activeSessionId.value
       const [result, activeSession] = await Promise.all([
-        newAgentPresenter.getSessionList({ includeSubagents: true }),
-        newAgentPresenter.getActiveSession(webContentsId)
+        agentSessionPresenter.getSessionList({ includeSubagents: true }),
+        agentSessionPresenter.getActiveSession(webContentsId)
       ])
       sessions.value = result.map(mapToUISession)
 
@@ -207,8 +266,8 @@ export const useSessionStore = defineStore('session', () => {
   async function createSession(input: CreateSessionInput): Promise<void> {
     error.value = null
     try {
-      const webContentsId = window.api.getWebContentsId()
-      const session = await newAgentPresenter.createSession(input, webContentsId)
+      const webContentsId = getCurrentWebContentsId()
+      const session = await agentSessionPresenter.createSession(input, webContentsId)
       activeSessionId.value = session.id
 
       await fetchSessions()
@@ -224,8 +283,8 @@ export const useSessionStore = defineStore('session', () => {
       if (activeSessionId.value && activeSessionId.value !== sessionId) {
         messageStore.clearStreamingState()
       }
-      const webContentsId = window.api.getWebContentsId()
-      await newAgentPresenter.activateSession(webContentsId, sessionId)
+      const webContentsId = getCurrentWebContentsId()
+      await agentSessionPresenter.activateSession(webContentsId, sessionId)
       activeSessionId.value = sessionId
       pageRouter.goToChat(sessionId)
     } catch (e) {
@@ -237,8 +296,8 @@ export const useSessionStore = defineStore('session', () => {
     error.value = null
     try {
       messageStore.clearStreamingState()
-      const webContentsId = window.api.getWebContentsId()
-      await newAgentPresenter.deactivateSession(webContentsId)
+      const webContentsId = getCurrentWebContentsId()
+      await agentSessionPresenter.deactivateSession(webContentsId)
       activeSessionId.value = null
       pageRouter.goToNewThread()
     } catch (e) {
@@ -249,7 +308,7 @@ export const useSessionStore = defineStore('session', () => {
   async function sendMessage(sessionId: string, content: string | SendMessageInput): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.sendMessage(sessionId, content)
+      await agentSessionPresenter.sendMessage(sessionId, content)
     } catch (e) {
       error.value = `Failed to send message: ${e}`
     }
@@ -262,7 +321,7 @@ export const useSessionStore = defineStore('session', () => {
   ): Promise<void> {
     error.value = null
     try {
-      const updated = await newAgentPresenter.setSessionModel(sessionId, providerId, modelId)
+      const updated = await agentSessionPresenter.setSessionModel(sessionId, providerId, modelId)
       const index = sessions.value.findIndex((item) => item.id === sessionId)
       if (index >= 0) {
         sessions.value[index] = mapToUISession(updated)
@@ -276,7 +335,7 @@ export const useSessionStore = defineStore('session', () => {
   async function deleteSession(sessionId: string): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.deleteSession(sessionId)
+      await agentSessionPresenter.deleteSession(sessionId)
       if (activeSessionId.value === sessionId) {
         activeSessionId.value = null
         pageRouter.goToNewThread()
@@ -290,7 +349,7 @@ export const useSessionStore = defineStore('session', () => {
   async function setSessionSubagentEnabled(sessionId: string, enabled: boolean): Promise<void> {
     error.value = null
     try {
-      const updated = await newAgentPresenter.setSessionSubagentEnabled(sessionId, enabled)
+      const updated = await agentSessionPresenter.setSessionSubagentEnabled(sessionId, enabled)
       const index = sessions.value.findIndex((item) => item.id === sessionId)
       if (index >= 0) {
         sessions.value[index] = mapToUISession(updated)
@@ -310,7 +369,7 @@ export const useSessionStore = defineStore('session', () => {
       if (!normalized) {
         return
       }
-      await newAgentPresenter.renameSession(sessionId, normalized)
+      await agentSessionPresenter.renameSession(sessionId, normalized)
       const target = sessions.value.find((session) => session.id === sessionId)
       if (target) {
         target.title = normalized
@@ -324,7 +383,7 @@ export const useSessionStore = defineStore('session', () => {
   async function toggleSessionPinned(sessionId: string, pinned: boolean): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.toggleSessionPinned(sessionId, pinned)
+      await agentSessionPresenter.toggleSessionPinned(sessionId, pinned)
       const target = sessions.value.find((session) => session.id === sessionId)
       if (target) {
         target.isPinned = pinned
@@ -338,7 +397,7 @@ export const useSessionStore = defineStore('session', () => {
   async function clearSessionMessages(sessionId: string): Promise<void> {
     error.value = null
     try {
-      await newAgentPresenter.clearSessionMessages(sessionId)
+      await agentSessionPresenter.clearSessionMessages(sessionId)
       if (activeSessionId.value === sessionId) {
         messageStore.clearStreamingState()
         await messageStore.loadMessages(sessionId)
@@ -355,7 +414,7 @@ export const useSessionStore = defineStore('session', () => {
   ): Promise<{ filename: string; content: string }> {
     error.value = null
     try {
-      const result = await newAgentPresenter.exportSession(sessionId, format)
+      const result = await agentSessionPresenter.exportSession(sessionId, format)
       const blob = new Blob([result.content], {
         type: getContentType(format)
       })
@@ -367,15 +426,31 @@ export const useSessionStore = defineStore('session', () => {
     }
   }
 
-  function toggleGroupMode(): void {
-    groupMode.value = groupMode.value === 'time' ? 'project' : 'time'
+  async function toggleGroupMode(): Promise<void> {
+    const previousMode = groupMode.value
+    groupMode.value = previousMode === 'time' ? 'project' : 'time'
+    const localVersion = ++groupModeUpdateVersion
+
+    groupModeWritePromise = groupModeWritePromise.then(async () => {
+      try {
+        await configPresenter.setSetting(SIDEBAR_GROUP_MODE_KEY, groupMode.value)
+        if (localVersion !== groupModeUpdateVersion) {
+          return
+        }
+      } catch (error) {
+        if (localVersion === groupModeUpdateVersion) {
+          groupMode.value = previousMode
+        }
+        console.warn('[sessionStore] Failed to persist sidebar group mode:', error)
+      }
+    })
+
+    await groupModeWritePromise
   }
 
   function getPinnedSessions(agentId: string | null): UISession[] {
     const pinned = sessions.value
-      .filter(
-        (session) => session.sessionKind === 'regular' && session.isPinned && !session.isDraft
-      )
+      .filter((session) => isRegularSession(session) && session.isPinned && !session.isDraft)
       .sort((a, b) => b.updatedAt - a.updatedAt)
 
     if (agentId === null) return pinned
@@ -385,7 +460,7 @@ export const useSessionStore = defineStore('session', () => {
 
   function getFilteredGroups(agentId: string | null): SessionGroup[] {
     const visibleSessions = sessions.value.filter(
-      (session) => session.sessionKind === 'regular' && !session.isDraft && !session.isPinned
+      (session) => isRegularSession(session) && !session.isDraft && !session.isPinned
     )
     const grouped =
       groupMode.value === 'time' ? groupByTime(visibleSessions) : groupByProject(visibleSessions)
@@ -401,46 +476,31 @@ export const useSessionStore = defineStore('session', () => {
       .filter((group) => group.sessions.length > 0)
   }
 
-  // --- Event Listeners ---
-
-  window.electron.ipcRenderer.on(SESSION_EVENTS.LIST_UPDATED, () => {
-    fetchSessions()
-  })
-
-  window.electron.ipcRenderer.on(
-    SESSION_EVENTS.ACTIVATED,
-    (_: unknown, msg: { webContentsId: number; sessionId: string }) => {
-      if (msg.webContentsId === myWebContentsId) {
-        if (activeSessionId.value && activeSessionId.value !== msg.sessionId) {
-          messageStore.clearStreamingState()
-        }
-        activeSessionId.value = msg.sessionId
-        pageRouter.goToChat(msg.sessionId)
-        void tabPresenter.onRendererTabActivated(msg.sessionId)
-      }
-    }
-  )
-
-  window.electron.ipcRenderer.on(
-    SESSION_EVENTS.DEACTIVATED,
-    (_: unknown, msg: { webContentsId: number }) => {
-      if (msg.webContentsId === myWebContentsId) {
+  const cleanupIpcBindings = bindSessionStoreIpc({
+    webContentsId: myWebContentsId,
+    fetchSessions,
+    onActivated: (sessionId) => {
+      if (activeSessionId.value && activeSessionId.value !== sessionId) {
         messageStore.clearStreamingState()
-        activeSessionId.value = null
-        pageRouter.goToNewThread()
       }
-    }
-  )
-
-  window.electron.ipcRenderer.on(
-    SESSION_EVENTS.STATUS_CHANGED,
-    (_: unknown, msg: { sessionId: string; status: string }) => {
-      const session = sessions.value.find((s) => s.id === msg.sessionId)
+      activeSessionId.value = sessionId
+      pageRouter.goToChat(sessionId)
+      void tabPresenter.onRendererTabActivated(sessionId)
+    },
+    onDeactivated: () => {
+      messageStore.clearStreamingState()
+      activeSessionId.value = null
+      pageRouter.goToNewThread()
+    },
+    onStatusChanged: (payload) => {
+      const session = sessions.value.find((item) => item.id === payload.sessionId)
       if (session) {
-        session.status = mapSessionStatus(msg.status)
+        session.status = mapSessionStatus(payload.status)
       }
     }
-  )
+  })
+  registerStoreCleanup(cleanupIpcBindings)
+  void ensureGroupModeLoaded()
 
   return {
     sessions,
diff --git a/src/renderer/src/stores/ui/sessionIpc.ts b/src/renderer/src/stores/ui/sessionIpc.ts
new file mode 100644
index 000000000..5e58f981a
--- /dev/null
+++ b/src/renderer/src/stores/ui/sessionIpc.ts
@@ -0,0 +1,46 @@
+import { SESSION_EVENTS } from '@/events'
+import { createIpcSubscriptionScope } from '@/lib/ipcSubscription'
+
+interface BindSessionStoreIpcOptions {
+  webContentsId: number | null
+  fetchSessions: () => void | Promise<void>
+  onActivated: (sessionId: string) => void
+  onDeactivated: () => void
+  onStatusChanged: (payload: { sessionId: string; status: string }) => void
+}
+
+export function bindSessionStoreIpc(options: BindSessionStoreIpcOptions): () => void {
+  const scope = createIpcSubscriptionScope()
+
+  scope.on(SESSION_EVENTS.LIST_UPDATED, () => {
+    void options.fetchSessions()
+  })
+
+  scope.on(
+    SESSION_EVENTS.ACTIVATED,
+    (_event, payload: { webContentsId: number; sessionId: string }) => {
+      if (payload?.webContentsId !== options.webContentsId) {
+        return
+      }
+
+      options.onActivated(payload.sessionId)
+    }
+  )
+
+  scope.on(SESSION_EVENTS.DEACTIVATED, (_event, payload: { webContentsId: number }) => {
+    if (payload?.webContentsId !== options.webContentsId) {
+      return
+    }
+
+    options.onDeactivated()
+  })
+
+  scope.on(
+    SESSION_EVENTS.STATUS_CHANGED,
+    (_event, payload: { sessionId: string; status: string }) => {
+      options.onStatusChanged(payload)
+    }
+  )
+
+  return scope.cleanup
+}
diff --git a/src/renderer/src/stores/ui/spotlight.ts b/src/renderer/src/stores/ui/spotlight.ts
index d8846e73d..3bbb5d142 100644
--- a/src/renderer/src/stores/ui/spotlight.ts
+++ b/src/renderer/src/stores/ui/spotlight.ts
@@ -126,7 +126,7 @@ const actionItems: Array<{
 ]
 
 export const useSpotlightStore = defineStore('spotlight', () => {
-  const newAgentPresenter = usePresenter('newAgentPresenter')
+  const agentSessionPresenter = usePresenter('agentSessionPresenter')
   const windowPresenter = usePresenter('windowPresenter')
   const providerStore = useProviderStore()
   const sessionStore = useSessionStore()
@@ -301,7 +301,7 @@ export const useSpotlightStore = defineStore('spotlight', () => {
       return
     }
 
-    const historyHits = await newAgentPresenter.searchHistory(normalizedQuery, {
+    const historyHits = await agentSessionPresenter.searchHistory(normalizedQuery, {
       limit: MAX_RESULTS
     })
 
diff --git a/src/renderer/src/stores/ui/stream.ts b/src/renderer/src/stores/ui/stream.ts
new file mode 100644
index 000000000..ecf0f1521
--- /dev/null
+++ b/src/renderer/src/stores/ui/stream.ts
@@ -0,0 +1,33 @@
+import { defineStore } from 'pinia'
+import { ref } from 'vue'
+import type { AssistantMessageBlock } from '@shared/types/agent-interface'
+
+export const useStreamStateStore = defineStore('streamState', () => {
+  const isStreaming = ref(false)
+  const streamingBlocks = ref<AssistantMessageBlock[]>([])
+  const currentStreamSessionId = ref<string | null>(null)
+  const currentStreamMessageId = ref<string | null>(null)
+
+  function setStream(sessionId: string, blocks: AssistantMessageBlock[], messageId?: string): void {
+    isStreaming.value = true
+    currentStreamSessionId.value = sessionId
+    currentStreamMessageId.value = messageId ?? null
+    streamingBlocks.value = blocks
+  }
+
+  function clearStreamingState(): void {
+    isStreaming.value = false
+    streamingBlocks.value = []
+    currentStreamSessionId.value = null
+    currentStreamMessageId.value = null
+  }
+
+  return {
+    isStreaming,
+    streamingBlocks,
+    currentStreamSessionId,
+    currentStreamMessageId,
+    setStream,
+    clearStreamingState
+  }
+})
diff --git a/src/shared/lib/toolCallSummary.ts b/src/shared/lib/toolCallSummary.ts
new file mode 100644
index 000000000..ae7150d98
--- /dev/null
+++ b/src/shared/lib/toolCallSummary.ts
@@ -0,0 +1,54 @@
+const normalizeInlineText = (value: string): string => value.replace(/\s+/g, ' ').trim()
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+  Boolean(value) && typeof value === 'object' && !Array.isArray(value)
+
+const extractFirstSummaryValue = (value: unknown): unknown => {
+  if (Array.isArray(value)) {
+    return value.length > 0 ? value[0] : ''
+  }
+
+  if (isRecord(value)) {
+    const entries = Object.entries(value)
+    return entries.length > 0 ? entries[0][1] : ''
+  }
+
+  return value
+}
+
+const formatSummaryValue = (value: unknown): string => {
+  if (typeof value === 'string') {
+    return normalizeInlineText(value)
+  }
+
+  if (typeof value === 'number' || typeof value === 'boolean' || typeof value === 'bigint') {
+    return String(value)
+  }
+
+  if (value === null) {
+    return 'null'
+  }
+
+  if (value === undefined) {
+    return ''
+  }
+
+  try {
+    return normalizeInlineText(JSON.stringify(value))
+  } catch {
+    return normalizeInlineText(String(value))
+  }
+}
+
+export const summarizeToolCallPreview = (value: string | undefined | null): string => {
+  const raw = value?.trim() ?? ''
+  if (!raw) {
+    return ''
+  }
+
+  try {
+    return formatSummaryValue(extractFirstSummaryValue(JSON.parse(raw) as unknown))
+  } catch {
+    return normalizeInlineText(raw)
+  }
+}
diff --git a/src/shared/providerDbCatalog.ts b/src/shared/providerDbCatalog.ts
new file mode 100644
index 000000000..b6d3eab91
--- /dev/null
+++ b/src/shared/providerDbCatalog.ts
@@ -0,0 +1,9 @@
+const PROVIDER_DB_BACKED_PROVIDER_IDS = new Set(['doubao', 'zhipu', 'minimax', 'o3fan'])
+
+export const isProviderDbBackedProvider = (providerId: string | undefined | null): boolean => {
+  if (!providerId) {
+    return false
+  }
+
+  return PROVIDER_DB_BACKED_PROVIDER_IDS.has(providerId.trim().toLowerCase())
+}
diff --git a/src/shared/types/agent-interface.d.ts b/src/shared/types/agent-interface.d.ts
index 6092aaa64..641eed68a 100644
--- a/src/shared/types/agent-interface.d.ts
+++ b/src/shared/types/agent-interface.d.ts
@@ -33,6 +33,12 @@ export interface DeepChatSessionState {
   permissionMode: PermissionMode
 }
 
+export type PendingInputEnqueueSource = 'send' | 'queue'
+
+export interface QueuePendingInputOptions {
+  source?: PendingInputEnqueueSource
+}
+
 export interface IAgentImplementation {
   /** Initialize a new session for this agent */
   initSession(
@@ -57,14 +63,20 @@ export interface IAgentImplementation {
   processMessage(
     sessionId: string,
     content: string | SendMessageInput,
-    context?: { projectDir?: string | null; emitRefreshBeforeStream?: boolean }
+    context?: {
+      projectDir?: string | null
+      emitRefreshBeforeStream?: boolean
+      pendingQueueItemId?: string
+      pendingQueueItemSource?: PendingInputEnqueueSource
+    }
   ): Promise<void>
 
   /** Manage waiting lane inputs */
   listPendingInputs?(sessionId: string): Promise<PendingSessionInputRecord[]>
   queuePendingInput?(
     sessionId: string,
-    content: string | SendMessageInput
+    content: string | SendMessageInput,
+    options?: QueuePendingInputOptions
   ): Promise<PendingSessionInputRecord>
   updateQueuedInput?(
     sessionId: string,
@@ -280,6 +292,7 @@ export interface MessageMetadata {
   inputTokens?: number
   outputTokens?: number
   cachedInputTokens?: number
+  cacheWriteInputTokens?: number
   generationTime?: number
   firstTokenTime?: number
   reasoningStartTime?: number
diff --git a/src/shared/types/core/llm-events.ts b/src/shared/types/core/llm-events.ts
index f1999ab89..b8645253d 100644
--- a/src/shared/types/core/llm-events.ts
+++ b/src/shared/types/core/llm-events.ts
@@ -58,6 +58,7 @@ export interface UsageStreamEvent {
     completion_tokens: number
     total_tokens: number
     cached_tokens?: number
+    cache_write_tokens?: number
   }
 }
 
@@ -136,6 +137,7 @@ export const createStreamEvent = {
     completion_tokens: number
     total_tokens: number
     cached_tokens?: number
+    cache_write_tokens?: number
   }): UsageStreamEvent => ({
     type: 'usage',
     usage
diff --git a/src/shared/types/presenters/new-agent.presenter.d.ts b/src/shared/types/presenters/agent-session.presenter.d.ts
similarity index 99%
rename from src/shared/types/presenters/new-agent.presenter.d.ts
rename to src/shared/types/presenters/agent-session.presenter.d.ts
index 1ea181ecc..625eb3bc0 100644
--- a/src/shared/types/presenters/new-agent.presenter.d.ts
+++ b/src/shared/types/presenters/agent-session.presenter.d.ts
@@ -42,7 +42,7 @@ export interface HistorySearchMessageHit {
 
 export type HistorySearchHit = HistorySearchSessionHit | HistorySearchMessageHit
 
-export interface INewAgentPresenter {
+export interface IAgentSessionPresenter {
   createSession(input: CreateSessionInput, webContentsId: number): Promise<SessionWithState>
   createDetachedSession(input: CreateDetachedSessionInput): Promise<SessionWithState>
   ensureAcpDraftSession(input: {
diff --git a/src/shared/types/presenters/index.d.ts b/src/shared/types/presenters/index.d.ts
index e2911af55..09adef9d4 100644
--- a/src/shared/types/presenters/index.d.ts
+++ b/src/shared/types/presenters/index.d.ts
@@ -82,12 +82,12 @@ export type { IToolPresenter } from './tool.presenter'
 
 // New agent architecture types
 export type {
-  INewAgentPresenter,
+  IAgentSessionPresenter,
   HistorySearchHit,
   HistorySearchMessageHit,
   HistorySearchOptions,
   HistorySearchSessionHit
-} from './new-agent.presenter'
+} from './agent-session.presenter'
 export type { IProjectPresenter } from './project.presenter'
 export type {
   FeishuPairingSnapshot,
diff --git a/src/shared/types/presenters/legacy.presenters.d.ts b/src/shared/types/presenters/legacy.presenters.d.ts
index c37201851..6778d9b58 100644
--- a/src/shared/types/presenters/legacy.presenters.d.ts
+++ b/src/shared/types/presenters/legacy.presenters.d.ts
@@ -19,7 +19,7 @@ import type { IWorkspacePresenter } from './workspace'
 import type { IToolPresenter } from './tool.presenter'
 import type { ISkillPresenter } from '../skill'
 import type { ISkillSyncPresenter } from '../skillSync'
-import type { INewAgentPresenter } from './new-agent.presenter'
+import type { IAgentSessionPresenter } from './agent-session.presenter'
 import type { IProjectPresenter } from './project.presenter'
 import type { BrowserPageInfo, DownloadInfo, ScreenshotOptions, YoBrowserStatus } from '../browser'
 import type {
@@ -488,7 +488,7 @@ export interface IPresenter {
   toolPresenter: IToolPresenter
   skillPresenter: ISkillPresenter
   skillSyncPresenter: ISkillSyncPresenter
-  newAgentPresenter: INewAgentPresenter
+  agentSessionPresenter: IAgentSessionPresenter
   projectPresenter: IProjectPresenter
   init(): void
   destroy(): Promise<void>
@@ -642,6 +642,7 @@ export interface IConfigPresenter {
   setAcpAgentEnvOverride(agentId: string, env: Record<string, string>): Promise<void>
   ensureAcpAgentInstalled(agentId: string): Promise<AcpAgentInstallState>
   repairAcpAgent(agentId: string): Promise<AcpAgentInstallState>
+  uninstallAcpRegistryAgent(agentId: string): Promise<void>
   getAcpAgentInstallStatus(agentId: string): Promise<AcpAgentInstallState | null>
   listManualAcpAgents(): Promise<AcpManualAgent[]>
   addManualAcpAgent(
diff --git a/src/types/i18n.d.ts b/src/types/i18n.d.ts
index 268d6012c..3c40aafab 100644
--- a/src/types/i18n.d.ts
+++ b/src/types/i18n.d.ts
@@ -165,6 +165,7 @@ declare module 'vue-i18n' {
     messages: {
       thinking: string
       rateLimitWaiting: string
+      rateLimitCompactLoading: string
       rateLimitTitle: string
       rateLimitQueue: string
       rateLimitEstimated: string
@@ -216,6 +217,23 @@ declare module 'vue-i18n' {
       functionName: string
       params: string
       responseData: string
+      subagents: {
+        summary: string
+        unnamedTask: string
+        mode: {
+          parallel: string
+          chain: string
+        }
+        status: {
+          queued: string
+          running: string
+          completed: string
+          error: string
+          cancelled: string
+          waiting_permission: string
+          waiting_question: string
+        }
+      }
     }
     mode: {
       current: string
@@ -223,9 +241,13 @@ declare module 'vue-i18n' {
       acpAgent: string
     }
     topbar: {
+      backToParent: string
       share: string
       more: string
     }
+    subagents: {
+      label: string
+    }
     advancedSettings: {
       button: string
       title: string
@@ -456,6 +478,7 @@ declare module 'vue-i18n' {
         files: string
         git: string
         artifacts: string
+        subagents: string
       }
       plan: {
         section: string
@@ -484,6 +507,15 @@ declare module 'vue-i18n' {
         staged: string
         unstaged: string
       }
+      subagents: {
+        empty: string
+        self: string
+        status: {
+          working: string
+          error: string
+          idle: string
+        }
+      }
       browser: {
         section: string
         empty: string
@@ -548,6 +580,31 @@ declare module 'vue-i18n' {
       pinned: string
       emptyTitle: string
       emptyDescription: string
+      searchPlaceholder: string
+      searchAriaLabel: string
+      searchEmptyTitle: string
+      searchEmptyDescription: string
+    }
+    spotlight: {
+      placeholder: string
+      searching: string
+      emptyTitle: string
+      emptyDescription: string
+      hints: string
+      kind: {
+        session: string
+        message: string
+        agent: string
+        setting: string
+        action: string
+      }
+    }
+    inlineSearch: {
+      placeholder: string
+      ariaLabel: string
+      previous: string
+      next: string
+      close: string
     }
     loading: string
     copied: string
@@ -564,6 +621,7 @@ declare module 'vue-i18n' {
     disabled: string
     disclaimer: string
     close: string
+    open: string
     image: string
     error: string
     resetDataConfirmTitle: string
@@ -928,10 +986,6 @@ declare module 'vue-i18n' {
         name: string
         desc: string
       }
-      imageServer: {
-        name: string
-        desc: string
-      }
       braveSearch: {
         name: string
         desc: string
@@ -1258,7 +1312,6 @@ declare module 'vue-i18n' {
       defaultModel: {
         title: string
         chatModel: string
-        visionModel: string
       }
     }
     deepchatAgents: {
@@ -1304,6 +1357,17 @@ declare module 'vue-i18n' {
       permissionMode: string
       permissionFullAccess: string
       permissionDefault: string
+      subagentsTitle: string
+      subagentsDescription: string
+      subagentsEnabled: string
+      subagentTargetType: string
+      subagentTargetSelf: string
+      subagentTargetAgent: string
+      subagentDisplayName: string
+      subagentDescription: string
+      subagentTargetAgentLabel: string
+      subagentLimit: string
+      addSubagentSlot: string
       toolsTitle: string
       compactionTitle: string
       compactionEnabled: string
@@ -1407,6 +1471,18 @@ declare module 'vue-i18n' {
         backupSuccessTitle: string
         backupSuccessMessage: string
       }
+      modelConfigUpdate: {
+        title: string
+        description: string
+        button: string
+        updating: string
+        updatedTitle: string
+        updatedDescription: string
+        upToDateTitle: string
+        upToDateDescription: string
+        failedTitle: string
+        failedDescription: string
+      }
       yoBrowser: {
         title: string
         description: string
@@ -1876,6 +1952,7 @@ declare module 'vue-i18n' {
       newWindow: string
       showHideWindow: string
       newConversation: string
+      quickSearch: string
       closeWindow: string
     }
     acp: {
@@ -1918,6 +1995,10 @@ declare module 'vue-i18n' {
       registryRefresh: string
       registryRepair: string
       registryInstallAction: string
+      registryUninstallAction: string
+      registryUninstallConfirm: string
+      registryUninstallDescription: string
+      registryUninstallFailed: string
       registryInstallTitle: string
       registryInstallDescription: string
       registryLearnMore: string
@@ -2148,6 +2229,9 @@ declare module 'vue-i18n' {
         allowedUserIdsPlaceholder: string
         defaultAgent: string
         defaultAgentPlaceholder: string
+        defaultWorkdir: string
+        defaultWorkdirPlaceholder: string
+        defaultWorkdirHelper: string
         openPairDialog: string
         manageBindings: string
         pairCode: string
diff --git a/test/main/presenter/agentRepository.test.ts b/test/main/presenter/agentRepository.test.ts
new file mode 100644
index 000000000..1df9343c6
--- /dev/null
+++ b/test/main/presenter/agentRepository.test.ts
@@ -0,0 +1,71 @@
+import { describe, expect, it } from 'vitest'
+import { AgentRepository } from '../../../src/main/presenter/agentRepository'
+
+describe('AgentRepository', () => {
+  it('clears registry ACP installation state without deleting the row', () => {
+    const row = {
+      id: 'codex-acp',
+      agent_type: 'acp' as const,
+      source: 'registry' as const,
+      name: 'Codex CLI',
+      enabled: 1,
+      protected: 0,
+      description: null,
+      icon: null,
+      avatar_json: null,
+      config_json: '{}',
+      state_json: JSON.stringify({
+        envOverride: {
+          OPENAI_API_KEY: 'secret'
+        },
+        installState: {
+          status: 'installed',
+          version: '0.10.0',
+          installDir: 'C:\\temp\\codex-acp'
+        }
+      }),
+      created_at: Date.now(),
+      updated_at: Date.now()
+    }
+
+    const sqlitePresenter = {
+      agentsTable: {
+        get: (id: string) => (id === row.id ? row : undefined),
+        update: (_id: string, input: { enabled?: boolean; stateJson?: string | null }) => {
+          if (typeof input.enabled === 'boolean') {
+            row.enabled = input.enabled ? 1 : 0
+          }
+          if (typeof input.stateJson === 'string') {
+            row.state_json = input.stateJson
+          }
+        }
+      }
+    }
+
+    const repository = new AgentRepository(sqlitePresenter as never)
+    const updated = repository.clearRegistryAcpAgentInstallation('codex-acp', {
+      status: 'not_installed',
+      version: '0.10.0',
+      distributionType: 'binary',
+      installDir: null,
+      installedAt: null,
+      error: null
+    })
+
+    expect(updated).toBe(true)
+    expect(row.enabled).toBe(0)
+    expect(JSON.parse(row.state_json ?? '{}')).toEqual({
+      envOverride: {
+        OPENAI_API_KEY: 'secret'
+      },
+      installState: {
+        status: 'not_installed',
+        version: '0.10.0',
+        distributionType: 'binary',
+        installDir: null,
+        installedAt: null,
+        error: null
+      }
+    })
+  })
+})
diff --git a/test/main/presenter/deepchatAgentPresenter/accumulator.test.ts b/test/main/presenter/agentRuntimePresenter/accumulator.test.ts
similarity index 95%
rename from test/main/presenter/deepchatAgentPresenter/accumulator.test.ts
rename to test/main/presenter/agentRuntimePresenter/accumulator.test.ts
index 7e2f99f18..e5b19ecda 100644
--- a/test/main/presenter/deepchatAgentPresenter/accumulator.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/accumulator.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest'
-import { accumulate } from '@/presenter/deepchatAgentPresenter/accumulator'
-import { createState } from '@/presenter/deepchatAgentPresenter/types'
-import type { StreamState } from '@/presenter/deepchatAgentPresenter/types'
+import { accumulate } from '@/presenter/agentRuntimePresenter/accumulator'
+import { createState } from '@/presenter/agentRuntimePresenter/types'
+import type { StreamState } from '@/presenter/agentRuntimePresenter/types'
 
 describe('accumulate', () => {
   let state: StreamState
@@ -186,13 +186,20 @@ describe('accumulate', () => {
   it('usage sets metadata', () => {
     accumulate(state, {
       type: 'usage',
-      usage: { prompt_tokens: 10, completion_tokens: 5, total_tokens: 15, cached_tokens: 3 }
+      usage: {
+        prompt_tokens: 10,
+        completion_tokens: 5,
+        total_tokens: 15,
+        cached_tokens: 3,
+        cache_write_tokens: 2
+      }
     })
 
     expect(state.metadata.inputTokens).toBe(10)
     expect(state.metadata.outputTokens).toBe(5)
     expect(state.metadata.totalTokens).toBe(15)
     expect(state.metadata.cachedInputTokens).toBe(3)
+    expect(state.metadata.cacheWriteInputTokens).toBe(2)
   })
 
   it('stop sets stopReason', () => {
diff --git a/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts b/test/main/presenter/agentRuntimePresenter/agentRuntimePresenter.test.ts
similarity index 98%
rename from test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts
rename to test/main/presenter/agentRuntimePresenter/agentRuntimePresenter.test.ts
index a1e6d4a8b..e888b5ea3 100644
--- a/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/agentRuntimePresenter.test.ts
@@ -4,7 +4,7 @@ import os from 'os'
 import path from 'path'
 import { app } from 'electron'
 import type { DeepChatSessionState } from '@shared/types/agent-interface'
-import { DeepChatAgentPresenter } from '@/presenter/deepchatAgentPresenter/index'
+import { AgentRuntimePresenter } from '@/presenter/agentRuntimePresenter/index'
 import { NewSessionHooksBridge } from '@/presenter/hooksNotifications/newSessionBridge'
 
 vi.mock('nanoid', () => ({ nanoid: vi.fn(() => 'mock-msg-id') }))
@@ -63,18 +63,26 @@ vi.mock('@/lib/agentRuntime/systemEnvPromptBuilder', () => ({
 }))
 
 // Mock processStream to avoid timer/async complexity
-vi.mock('@/presenter/deepchatAgentPresenter/process', () => ({
+vi.mock('@/presenter/agentRuntimePresenter/process', () => ({
   processStream: vi.fn().mockResolvedValue({ status: 'completed' })
 }))
 
 import { eventBus } from '@/eventbus'
-import { processStream } from '@/presenter/deepchatAgentPresenter/process'
+import { processStream } from '@/presenter/agentRuntimePresenter/process'
 import { presenter } from '@/presenter'
 import {
   buildRuntimeCapabilitiesPrompt,
   buildSystemEnvPrompt
 } from '@/lib/agentRuntime/systemEnvPromptBuilder'
 
+function getSkillPresenterMock() {
+  return presenter.skillPresenter as {
+    getMetadataList: ReturnType<typeof vi.fn>
+    getActiveSkills: ReturnType<typeof vi.fn>
+    loadSkillContent: ReturnType<typeof vi.fn>
+  }
+}
+
 function createMockSqlitePresenter() {
   const summaryState = {
     summary_text: null,
@@ -246,23 +254,19 @@ function createMockToolPresenter(toolDefs: any[] = []) {
   } as any
 }
 
-describe('DeepChatAgentPresenter', () => {
+describe('AgentRuntimePresenter', () => {
   let sqlitePresenter: ReturnType<typeof createMockSqlitePresenter>
   let llmProvider: ReturnType<typeof createMockLlmProviderPresenter>
   let configPresenter: ReturnType<typeof createMockConfigPresenter>
   let toolPresenter: ReturnType<typeof createMockToolPresenter>
-  let agent: DeepChatAgentPresenter
+  let agent: AgentRuntimePresenter
   let hookDispatcher: { dispatchEvent: ReturnType<typeof vi.fn> }
   let tempHome: string | null = null
   let getPathSpy: ReturnType<typeof vi.spyOn> | null = null
 
   beforeEach(() => {
     vi.clearAllMocks()
-    const skillPresenter = presenter.skillPresenter as {
-      getMetadataList: ReturnType<typeof vi.fn>
-      getActiveSkills: ReturnType<typeof vi.fn>
-      loadSkillContent: ReturnType<typeof vi.fn>
-    }
+    const skillPresenter = getSkillPresenterMock()
     skillPresenter.getMetadataList.mockResolvedValue([])
     skillPresenter.getActiveSkills.mockResolvedValue([])
     skillPresenter.loadSkillContent.mockResolvedValue(null)
@@ -271,12 +275,15 @@ describe('DeepChatAgentPresenter', () => {
     configPresenter = createMockConfigPresenter()
     toolPresenter = createMockToolPresenter()
     hookDispatcher = { dispatchEvent: vi.fn() }
-    agent = new DeepChatAgentPresenter(
+    agent = new AgentRuntimePresenter(
       llmProvider,
       configPresenter,
       sqlitePresenter,
       toolPresenter,
-      new NewSessionHooksBridge(hookDispatcher)
+      new NewSessionHooksBridge(hookDispatcher),
+      {
+        skillPresenter
+      }
     )
   })
 
@@ -307,7 +314,16 @@ describe('DeepChatAgentPresenter', () => {
         }
       ])
 
-      new DeepChatAgentPresenter(llmProvider, configPresenter, sqlitePresenter, toolPresenter)
+      new AgentRuntimePresenter(
+        llmProvider,
+        configPresenter,
+        sqlitePresenter,
+        toolPresenter,
+        undefined,
+        {
+          skillPresenter: getSkillPresenterMock()
+        }
+      )
 
       expect(consoleSpy).toHaveBeenCalledWith(
         'DeepChatAgent: recovered 1 pending messages to error status'
@@ -347,7 +363,16 @@ describe('DeepChatAgentPresenter', () => {
         sessionId === 's1' ? { id: 's1' } : null
       )
 
-      new DeepChatAgentPresenter(llmProvider, configPresenter, sqlitePresenter, toolPresenter)
+      new AgentRuntimePresenter(
+        llmProvider,
+        configPresenter,
+        sqlitePresenter,
+        toolPresenter,
+        undefined,
+        {
+          skillPresenter: getSkillPresenterMock()
+        }
+      )
 
       expect(sqlitePresenter.deepchatPendingInputsTable.update).toHaveBeenCalledTimes(1)
       expect(sqlitePresenter.deepchatPendingInputsTable.update).toHaveBeenCalledWith(
@@ -2231,6 +2256,35 @@ describe('DeepChatAgentPresenter', () => {
       )
       expect(result).toBe(claimedRecord)
     })
+
+    it('keeps queue-origin inputs pending while waiting for a tool follow-up', async () => {
+      await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
+
+      const pendingRecord = {
+        id: 'q1',
+        sessionId: 's1',
+        mode: 'queue',
+        state: 'pending',
+        payload: { text: 'Queued later', files: [] },
+        queueOrder: 1,
+        claimedAt: null,
+        consumedAt: null,
+        createdAt: 1,
+        updatedAt: 1
+      }
+      const queueSpy = vi
+        .spyOn((agent as any).pendingInputCoordinator, 'queuePendingInput')
+        .mockReturnValue(pendingRecord)
+      const processSpy = vi.spyOn(agent, 'processMessage').mockResolvedValue()
+      vi.spyOn(agent as any, 'isAwaitingToolQuestionFollowUp').mockReturnValue(true)
+      vi.spyOn(agent as any, 'shouldStartQueuedInputImmediately').mockReturnValue(false)
+
+      const result = await agent.queuePendingInput('s1', 'Queued later', { source: 'queue' })
+
+      expect(queueSpy).toHaveBeenCalledWith('s1', 'Queued later', { state: 'pending' })
+      expect(processSpy).not.toHaveBeenCalled()
+      expect(result).toBe(pendingRecord)
+    })
   })
 
   describe('getMessages / getMessageIds / getMessage', () => {
@@ -2540,11 +2594,15 @@ describe('DeepChatAgentPresenter', () => {
         permission_mode: 'full_access'
       })
 
-      const reopenedAgent = new DeepChatAgentPresenter(
+      const reopenedAgent = new AgentRuntimePresenter(
         llmProvider,
         configPresenter,
         sqlitePresenter,
-        toolPresenter
+        toolPresenter,
+        undefined,
+        {
+          skillPresenter: getSkillPresenterMock()
+        }
       )
       const compactionState = await reopenedAgent.getSessionCompactionState('s1')
 
diff --git a/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts b/test/main/presenter/agentRuntimePresenter/compactionService.test.ts
similarity index 97%
rename from test/main/presenter/deepchatAgentPresenter/compactionService.test.ts
rename to test/main/presenter/agentRuntimePresenter/compactionService.test.ts
index 0ec00e6a1..9fdeaaba8 100644
--- a/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/compactionService.test.ts
@@ -1,20 +1,20 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import * as contextBuilderModule from '@/presenter/deepchatAgentPresenter/contextBuilder'
+import * as contextBuilderModule from '@/presenter/agentRuntimePresenter/contextBuilder'
 import {
   appendSummarySection,
   CompactionService,
   type ModelSpec
-} from '@/presenter/deepchatAgentPresenter/compactionService'
-import type { SessionSummaryState } from '@/presenter/deepchatAgentPresenter/sessionStore'
+} from '@/presenter/agentRuntimePresenter/compactionService'
+import type { SessionSummaryState } from '@/presenter/agentRuntimePresenter/sessionStore'
 import type { DeepChatAgentConfig } from '@shared/types/agent-interface'
 
 vi.mock('tokenx', () => ({
   approximateTokenSize: vi.fn((text: string) => text.length)
 }))
 
-vi.mock('@/presenter/deepchatAgentPresenter/contextBuilder', async (importOriginal) => {
+vi.mock('@/presenter/agentRuntimePresenter/contextBuilder', async (importOriginal) => {
   const actual =
-    await importOriginal<typeof import('@/presenter/deepchatAgentPresenter/contextBuilder')>()
+    await importOriginal<typeof import('@/presenter/agentRuntimePresenter/contextBuilder')>()
   return {
     ...actual,
     buildHistoryTurns: vi.fn(actual.buildHistoryTurns)
diff --git a/test/main/presenter/deepchatAgentPresenter/contextBuilder.test.ts b/test/main/presenter/agentRuntimePresenter/contextBuilder.test.ts
similarity index 99%
rename from test/main/presenter/deepchatAgentPresenter/contextBuilder.test.ts
rename to test/main/presenter/agentRuntimePresenter/contextBuilder.test.ts
index 204971662..3184c6340 100644
--- a/test/main/presenter/deepchatAgentPresenter/contextBuilder.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/contextBuilder.test.ts
@@ -4,7 +4,7 @@ import {
   buildResumeContext,
   fitMessagesToContextWindow,
   truncateContext
-} from '@/presenter/deepchatAgentPresenter/contextBuilder'
+} from '@/presenter/agentRuntimePresenter/contextBuilder'
 
 vi.mock('tokenx', () => ({
   approximateTokenSize: vi.fn((text: string) => {
diff --git a/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts b/test/main/presenter/agentRuntimePresenter/dispatch.test.ts
similarity index 99%
rename from test/main/presenter/deepchatAgentPresenter/dispatch.test.ts
rename to test/main/presenter/agentRuntimePresenter/dispatch.test.ts
index baace17be..1ee50a6da 100644
--- a/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/dispatch.test.ts
@@ -8,12 +8,12 @@ import type {
   InterleavedReasoningConfig,
   IoParams,
   StreamState
-} from '@/presenter/deepchatAgentPresenter/types'
-import { createState } from '@/presenter/deepchatAgentPresenter/types'
-import { estimateMessagesTokens } from '@/presenter/deepchatAgentPresenter/contextBuilder'
+} from '@/presenter/agentRuntimePresenter/types'
+import { createState } from '@/presenter/agentRuntimePresenter/types'
+import { estimateMessagesTokens } from '@/presenter/agentRuntimePresenter/contextBuilder'
 import type { MCPToolDefinition } from '@shared/presenter'
 import type { IToolPresenter } from '@shared/types/presenters/tool.presenter'
-import { ToolOutputGuard } from '@/presenter/deepchatAgentPresenter/toolOutputGuard'
+import { ToolOutputGuard } from '@/presenter/agentRuntimePresenter/toolOutputGuard'
 import { QUESTION_TOOL_NAME } from '@/lib/agentRuntime/questionTool'
 
 vi.mock('@/eventbus', () => ({
@@ -47,8 +47,8 @@ import {
   executeTools as executeToolsInternal,
   finalize,
   finalizeError
-} from '@/presenter/deepchatAgentPresenter/dispatch'
-import { accumulate } from '@/presenter/deepchatAgentPresenter/accumulator'
+} from '@/presenter/agentRuntimePresenter/dispatch'
+import { accumulate } from '@/presenter/agentRuntimePresenter/accumulator'
 import { eventBus } from '@/eventbus'
 
 function createIo(overrides?: Partial<IoParams>): IoParams {
diff --git a/test/main/presenter/deepchatAgentPresenter/echo.test.ts b/test/main/presenter/agentRuntimePresenter/echo.test.ts
similarity index 93%
rename from test/main/presenter/deepchatAgentPresenter/echo.test.ts
rename to test/main/presenter/agentRuntimePresenter/echo.test.ts
index de2cdf89c..1366ffa65 100644
--- a/test/main/presenter/deepchatAgentPresenter/echo.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/echo.test.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest'
-import type { StreamState, IoParams } from '@/presenter/deepchatAgentPresenter/types'
-import { createState } from '@/presenter/deepchatAgentPresenter/types'
+import type { StreamState, IoParams } from '@/presenter/agentRuntimePresenter/types'
+import { createState } from '@/presenter/agentRuntimePresenter/types'
 
 vi.mock('@/eventbus', () => ({
   eventBus: { sendToRenderer: vi.fn() },
@@ -15,7 +15,7 @@ vi.mock('@/events', () => ({
   }
 }))
 
-import { startEcho } from '@/presenter/deepchatAgentPresenter/echo'
+import { startEcho } from '@/presenter/agentRuntimePresenter/echo'
 import { eventBus } from '@/eventbus'
 
 function createIo(): IoParams {
diff --git a/test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts b/test/main/presenter/agentRuntimePresenter/internalSessionEvents.test.ts
similarity index 97%
rename from test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts
rename to test/main/presenter/agentRuntimePresenter/internalSessionEvents.test.ts
index d2976b408..2f15c489e 100644
--- a/test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/internalSessionEvents.test.ts
@@ -4,7 +4,7 @@ import {
   extractWaitingInteraction,
   emitDeepChatInternalSessionUpdate,
   subscribeDeepChatInternalSessionUpdates
-} from '@/presenter/deepchatAgentPresenter/internalSessionEvents'
+} from '@/presenter/agentRuntimePresenter/internalSessionEvents'
 
 describe('internalSessionEvents', () => {
   afterEach(() => {
diff --git a/test/main/presenter/deepchatAgentPresenter/messageStore.test.ts b/test/main/presenter/agentRuntimePresenter/messageStore.test.ts
similarity index 98%
rename from test/main/presenter/deepchatAgentPresenter/messageStore.test.ts
rename to test/main/presenter/agentRuntimePresenter/messageStore.test.ts
index 907984cb8..615b66196 100644
--- a/test/main/presenter/deepchatAgentPresenter/messageStore.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/messageStore.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { DeepChatMessageStore } from '@/presenter/deepchatAgentPresenter/messageStore'
+import { DeepChatMessageStore } from '@/presenter/agentRuntimePresenter/messageStore'
 import logger from '@shared/logger'
 
 vi.mock('nanoid', () => ({ nanoid: vi.fn(() => 'mock-msg-id') }))
@@ -141,7 +141,8 @@ describe('DeepChatMessageStore', () => {
           inputTokens: 120,
           outputTokens: 30,
           totalTokens: 150,
-          cachedInputTokens: 20
+          cachedInputTokens: 20,
+          cacheWriteInputTokens: 12
         })
       )
 
@@ -155,6 +156,7 @@ describe('DeepChatMessageStore', () => {
           outputTokens: 30,
           totalTokens: 150,
           cachedInputTokens: 20,
+          cacheWriteInputTokens: 12,
           source: 'live'
         })
       )
@@ -184,7 +186,8 @@ describe('DeepChatMessageStore', () => {
             inputTokens: 120,
             outputTokens: 30,
             totalTokens: 150,
-            cachedInputTokens: 20
+            cachedInputTokens: 20,
+            cacheWriteInputTokens: 12
           })
         )
       ).not.toThrow()
diff --git a/test/main/presenter/deepchatAgentPresenter/messageTracePayload.test.ts b/test/main/presenter/agentRuntimePresenter/messageTracePayload.test.ts
similarity index 97%
rename from test/main/presenter/deepchatAgentPresenter/messageTracePayload.test.ts
rename to test/main/presenter/agentRuntimePresenter/messageTracePayload.test.ts
index 36cef22ee..b182aefe3 100644
--- a/test/main/presenter/deepchatAgentPresenter/messageTracePayload.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/messageTracePayload.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   buildPersistableMessageTracePayload,
   MESSAGE_TRACE_MAX_BYTES
-} from '@/presenter/deepchatAgentPresenter/messageTracePayload'
+} from '@/presenter/agentRuntimePresenter/messageTracePayload'
 
 describe('buildPersistableMessageTracePayload', () => {
   it('redacts sensitive headers/body with tail-4 mask strategy', () => {
diff --git a/test/main/presenter/deepchatAgentPresenter/pendingInputStore.test.ts b/test/main/presenter/agentRuntimePresenter/pendingInputStore.test.ts
similarity index 97%
rename from test/main/presenter/deepchatAgentPresenter/pendingInputStore.test.ts
rename to test/main/presenter/agentRuntimePresenter/pendingInputStore.test.ts
index 16ed62388..c827bfe46 100644
--- a/test/main/presenter/deepchatAgentPresenter/pendingInputStore.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/pendingInputStore.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 import { nanoid } from 'nanoid'
-import { DeepChatPendingInputStore } from '@/presenter/deepchatAgentPresenter/pendingInputStore'
+import { DeepChatPendingInputStore } from '@/presenter/agentRuntimePresenter/pendingInputStore'
 import type { DeepChatPendingInputRow } from '@/presenter/sqlitePresenter/tables/deepchatPendingInputs'
 
 vi.mock('nanoid', () => ({
diff --git a/test/main/presenter/deepchatAgentPresenter/process.test.ts b/test/main/presenter/agentRuntimePresenter/process.test.ts
similarity index 99%
rename from test/main/presenter/deepchatAgentPresenter/process.test.ts
rename to test/main/presenter/agentRuntimePresenter/process.test.ts
index 13b2576b4..381f8c6a9 100644
--- a/test/main/presenter/deepchatAgentPresenter/process.test.ts
+++ b/test/main/presenter/agentRuntimePresenter/process.test.ts
@@ -6,8 +6,8 @@ import { app } from 'electron'
 import type { LLMCoreStreamEvent } from '@shared/types/core/llm-events'
 import type { MCPToolDefinition } from '@shared/presenter'
 import type { IToolPresenter } from '@shared/types/presenters/tool.presenter'
-import type { ProcessParams } from '@/presenter/deepchatAgentPresenter/types'
-import { ToolOutputGuard } from '@/presenter/deepchatAgentPresenter/toolOutputGuard'
+import type { ProcessParams } from '@/presenter/agentRuntimePresenter/types'
+import { ToolOutputGuard } from '@/presenter/agentRuntimePresenter/toolOutputGuard'
 
 vi.mock('@/eventbus', () => ({
   eventBus: { sendToRenderer: vi.fn() },
@@ -36,7 +36,7 @@ vi.mock('@/presenter', () => ({
   }
 }))
 
-import { processStream } from '@/presenter/deepchatAgentPresenter/process'
+import { processStream } from '@/presenter/agentRuntimePresenter/process'
 import { eventBus } from '@/eventbus'
 
 const DEFAULT_INTERLEAVED_REASONING = {
diff --git a/test/main/presenter/newAgentPresenter/agentRegistry.test.ts b/test/main/presenter/agentSessionPresenter/agentRegistry.test.ts
similarity index 96%
rename from test/main/presenter/newAgentPresenter/agentRegistry.test.ts
rename to test/main/presenter/agentSessionPresenter/agentRegistry.test.ts
index 91e136bfc..8cf0c3afe 100644
--- a/test/main/presenter/newAgentPresenter/agentRegistry.test.ts
+++ b/test/main/presenter/agentSessionPresenter/agentRegistry.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi } from 'vitest'
-import { AgentRegistry } from '@/presenter/newAgentPresenter/agentRegistry'
+import { AgentRegistry } from '@/presenter/agentSessionPresenter/agentRegistry'
 import type { IAgentImplementation, Agent } from '@shared/types/agent-interface'
 
 function createMockAgent(): IAgentImplementation {
diff --git a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts b/test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts
similarity index 97%
rename from test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
rename to test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts
index 953ad0c1e..3a6d3d850 100644
--- a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
+++ b/test/main/presenter/agentSessionPresenter/agentSessionPresenter.test.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { NewAgentPresenter } from '@/presenter/newAgentPresenter/index'
+import { AgentSessionPresenter } from '@/presenter/agentSessionPresenter/index'
 
 vi.mock('nanoid', () => ({ nanoid: vi.fn(() => 'mock-session-id') }))
 
@@ -249,13 +249,13 @@ function createMockSqlitePresenter() {
   } as any
 }
 
-describe('NewAgentPresenter', () => {
+describe('AgentSessionPresenter', () => {
   let deepChatAgent: ReturnType<typeof createMockDeepChatAgent>
   let llmProviderPresenter: ReturnType<typeof createMockLlmProviderPresenter>
   let configPresenter: ReturnType<typeof createMockConfigPresenter>
   let sqlitePresenter: ReturnType<typeof createMockSqlitePresenter>
   let skillPresenter: ReturnType<typeof createMockSkillPresenter>
-  let presenter: NewAgentPresenter
+  let presenter: AgentSessionPresenter
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -264,7 +264,7 @@ describe('NewAgentPresenter', () => {
     configPresenter = createMockConfigPresenter()
     sqlitePresenter = createMockSqlitePresenter()
     skillPresenter = createMockSkillPresenter()
-    presenter = new NewAgentPresenter(
+    presenter = new AgentSessionPresenter(
       deepChatAgent as any,
       llmProviderPresenter,
       configPresenter,
@@ -849,6 +849,42 @@ describe('NewAgentPresenter', () => {
     })
   })
 
+  describe('queuePendingInput', () => {
+    it('passes queue-origin metadata to agents for explicit queued inputs', async () => {
+      const queuePendingInput = vi.fn().mockResolvedValue({
+        id: 'q1',
+        sessionId: 's1',
+        mode: 'queue',
+        state: 'pending',
+        payload: { text: 'Later', files: [] },
+        queueOrder: 1,
+        claimedAt: null,
+        consumedAt: null,
+        createdAt: 1,
+        updatedAt: 1
+      })
+      ;(deepChatAgent as any).queuePendingInput = queuePendingInput
+      sqlitePresenter.newSessionsTable.get.mockReturnValue({
+        id: 's1',
+        agent_id: 'deepchat',
+        title: 'Test',
+        project_dir: '/tmp/workspace',
+        is_pinned: 0,
+        is_draft: 0,
+        created_at: 1000,
+        updated_at: 1000
+      })
+
+      await presenter.queuePendingInput('s1', 'Later')
+
+      expect(queuePendingInput).toHaveBeenCalledWith(
+        's1',
+        { text: 'Later', files: [] },
+        { source: 'queue' }
+      )
+    })
+  })
+
   describe('ensureAcpDraftSession', () => {
     it('creates draft session and prepares ACP session setup', async () => {
       configPresenter.getAcpAgents.mockResolvedValue([
@@ -992,7 +1028,7 @@ describe('NewAgentPresenter', () => {
       expect(sessions).toHaveLength(1)
       expect(sessions[0].id).toBe('s1')
       expect(warnSpy).toHaveBeenCalledWith(
-        '[NewAgentPresenter] Skipping unavailable session id=missing-agent agent=disabled-agent:',
+        '[AgentSessionPresenter] Skipping unavailable session id=missing-agent agent=disabled-agent:',
         expect.any(Error)
       )
       warnSpy.mockRestore()
@@ -1037,7 +1073,7 @@ describe('NewAgentPresenter', () => {
       expect(sessions).toHaveLength(1)
       expect(sessions[0].id).toBe('healthy-state')
       expect(warnSpy).toHaveBeenCalledWith(
-        '[NewAgentPresenter] Skipping unavailable session id=broken-state agent=deepchat:',
+        '[AgentSessionPresenter] Skipping unavailable session id=broken-state agent=deepchat:',
         expect.any(Error)
       )
       warnSpy.mockRestore()
@@ -1080,7 +1116,7 @@ describe('NewAgentPresenter', () => {
 
       expect(await presenter.getSession('s-disabled')).toBeNull()
       expect(warnSpy).toHaveBeenCalledWith(
-        '[NewAgentPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
+        '[AgentSessionPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
         expect.any(Error)
       )
       warnSpy.mockRestore()
@@ -1773,7 +1809,7 @@ describe('NewAgentPresenter', () => {
       })
       await expect(presenter.getActiveSession(1)).resolves.toBeNull()
       expect(warnSpy).toHaveBeenCalledWith(
-        '[NewAgentPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
+        '[AgentSessionPresenter] Skipping unavailable session id=s-disabled agent=disabled-agent:',
         expect.any(Error)
       )
       warnSpy.mockRestore()
diff --git a/test/main/presenter/newAgentPresenter/integration.test.ts b/test/main/presenter/agentSessionPresenter/integration.test.ts
similarity index 96%
rename from test/main/presenter/newAgentPresenter/integration.test.ts
rename to test/main/presenter/agentSessionPresenter/integration.test.ts
index 029a4c5fb..e38e76da6 100644
--- a/test/main/presenter/newAgentPresenter/integration.test.ts
+++ b/test/main/presenter/agentSessionPresenter/integration.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { NewAgentPresenter } from '@/presenter/newAgentPresenter/index'
-import { DeepChatAgentPresenter } from '@/presenter/deepchatAgentPresenter/index'
-import { estimateMessagesTokens } from '@/presenter/deepchatAgentPresenter/contextBuilder'
+import { AgentSessionPresenter } from '@/presenter/agentSessionPresenter/index'
+import { AgentRuntimePresenter } from '@/presenter/agentRuntimePresenter/index'
+import { estimateMessagesTokens } from '@/presenter/agentRuntimePresenter/contextBuilder'
 import { NewSessionHooksBridge } from '@/presenter/hooksNotifications/newSessionBridge'
 
 vi.mock('nanoid', () => {
@@ -83,7 +83,35 @@ function createMockSqlitePresenter() {
         }
       ),
       get: vi.fn((id: string) => sessionsStore.get(id)),
-      list: vi.fn(() => Array.from(sessionsStore.values())),
+      list: vi.fn(
+        (filters?: {
+          agentId?: string
+          projectDir?: string
+          includeSubagents?: boolean
+          parentSessionId?: string
+        }) => {
+          return Array.from(sessionsStore.values())
+            .filter((row) => {
+              if (filters?.agentId && row.agent_id !== filters.agentId) {
+                return false
+              }
+              if (filters?.projectDir && row.project_dir !== filters.projectDir) {
+                return false
+              }
+              if (filters?.includeSubagents !== true && filters?.parentSessionId === undefined) {
+                return (row.session_kind ?? 'regular') === 'regular'
+              }
+              if (
+                filters?.parentSessionId !== undefined &&
+                (row.parent_session_id ?? null) !== filters.parentSessionId
+              ) {
+                return false
+              }
+              return true
+            })
+            .sort((left, right) => right.updated_at - left.updated_at)
+        }
+      ),
       getDisabledAgentTools: vi.fn().mockReturnValue([]),
       updateDisabledAgentTools: vi.fn(),
       update: vi.fn(),
@@ -439,6 +467,7 @@ function createMockLlmProviderPresenter() {
         })()
       })
     }),
+    executeWithRateLimit: vi.fn().mockResolvedValue(undefined),
     generateText: vi.fn().mockResolvedValue({
       content: ['## Current Goal', '- Continue the conversation'].join('\n')
     }),
@@ -484,7 +513,7 @@ describe('Integration: createSession end-to-end', () => {
   let sqlitePresenter: ReturnType<typeof createMockSqlitePresenter>
   let llmProvider: ReturnType<typeof createMockLlmProviderPresenter>
   let configPresenter: ReturnType<typeof createMockConfigPresenter>
-  let agentPresenter: NewAgentPresenter
+  let agentPresenter: AgentSessionPresenter
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -492,13 +521,13 @@ describe('Integration: createSession end-to-end', () => {
     llmProvider = createMockLlmProviderPresenter()
     configPresenter = createMockConfigPresenter()
 
-    const deepchatAgent = new DeepChatAgentPresenter(
+    const deepchatAgent = new AgentRuntimePresenter(
       llmProvider,
       configPresenter,
       sqlitePresenter,
       createMockToolPresenter()
     )
-    agentPresenter = new NewAgentPresenter(
+    agentPresenter = new AgentSessionPresenter(
       deepchatAgent as any,
       llmProvider,
       configPresenter,
@@ -631,7 +660,7 @@ describe('Integration: ACP hooks bridge', () => {
   let sqlitePresenter: ReturnType<typeof createMockSqlitePresenter>
   let llmProvider: ReturnType<typeof createMockLlmProviderPresenter>
   let configPresenter: ReturnType<typeof createMockConfigPresenter>
-  let agentPresenter: NewAgentPresenter
+  let agentPresenter: AgentSessionPresenter
   let hookDispatcher: { dispatchEvent: ReturnType<typeof vi.fn> }
 
   beforeEach(() => {
@@ -642,14 +671,14 @@ describe('Integration: ACP hooks bridge', () => {
     configPresenter.getAcpAgents.mockResolvedValue([{ id: 'coder', name: 'Coder' }])
     hookDispatcher = { dispatchEvent: vi.fn() }
 
-    const deepchatAgent = new DeepChatAgentPresenter(
+    const deepchatAgent = new AgentRuntimePresenter(
       llmProvider,
       configPresenter,
       sqlitePresenter,
       createMockToolPresenter(),
       new NewSessionHooksBridge(hookDispatcher)
     )
-    agentPresenter = new NewAgentPresenter(
+    agentPresenter = new AgentSessionPresenter(
       deepchatAgent as any,
       llmProvider,
       configPresenter,
@@ -713,8 +742,8 @@ describe('Integration: multi-turn context', () => {
   let sqlitePresenter: ReturnType<typeof createMockSqlitePresenter>
   let llmProvider: ReturnType<typeof createMockLlmProviderPresenter>
   let configPresenter: ReturnType<typeof createMockConfigPresenter>
-  let deepchatAgent: DeepChatAgentPresenter
-  let agentPresenter: NewAgentPresenter
+  let deepchatAgent: AgentRuntimePresenter
+  let agentPresenter: AgentSessionPresenter
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -722,13 +751,13 @@ describe('Integration: multi-turn context', () => {
     llmProvider = createMockLlmProviderPresenter()
     configPresenter = createMockConfigPresenter()
 
-    deepchatAgent = new DeepChatAgentPresenter(
+    deepchatAgent = new AgentRuntimePresenter(
       llmProvider,
       configPresenter,
       sqlitePresenter,
       createMockToolPresenter()
     )
-    agentPresenter = new NewAgentPresenter(
+    agentPresenter = new AgentSessionPresenter(
       deepchatAgent as any,
       llmProvider,
       configPresenter,
@@ -1236,7 +1265,7 @@ describe('Integration: crash recovery', () => {
     const consoleSpy = vi.spyOn(console, 'log').mockImplementation(() => {})
 
     // Creating the agent triggers crash recovery
-    new DeepChatAgentPresenter(
+    new AgentRuntimePresenter(
       llmProvider,
       configPresenter,
       sqlitePresenter,
diff --git a/test/main/presenter/newAgentPresenter/legacyImportService.test.ts b/test/main/presenter/agentSessionPresenter/legacyImportService.test.ts
similarity index 98%
rename from test/main/presenter/newAgentPresenter/legacyImportService.test.ts
rename to test/main/presenter/agentSessionPresenter/legacyImportService.test.ts
index 899757014..0bd8ce971 100644
--- a/test/main/presenter/newAgentPresenter/legacyImportService.test.ts
+++ b/test/main/presenter/agentSessionPresenter/legacyImportService.test.ts
@@ -15,7 +15,7 @@ vi.mock('better-sqlite3-multiple-ciphers', () => ({
   default: vi.fn()
 }))
 
-import { LegacyChatImportService } from '@/presenter/newAgentPresenter/legacyImportService'
+import { LegacyChatImportService } from '@/presenter/agentSessionPresenter/legacyImportService'
 
 function createMockSqlitePresenter() {
   const statusStore = new Map<string, any>()
diff --git a/test/main/presenter/newAgentPresenter/messageManager.test.ts b/test/main/presenter/agentSessionPresenter/messageManager.test.ts
similarity index 91%
rename from test/main/presenter/newAgentPresenter/messageManager.test.ts
rename to test/main/presenter/agentSessionPresenter/messageManager.test.ts
index f27383b06..8367e1c88 100644
--- a/test/main/presenter/newAgentPresenter/messageManager.test.ts
+++ b/test/main/presenter/agentSessionPresenter/messageManager.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from 'vitest'
-import { NewMessageManager } from '@/presenter/newAgentPresenter/messageManager'
-import type { AgentRegistry } from '@/presenter/newAgentPresenter/agentRegistry'
-import type { NewSessionManager } from '@/presenter/newAgentPresenter/sessionManager'
+import { NewMessageManager } from '@/presenter/agentSessionPresenter/messageManager'
+import type { AgentRegistry } from '@/presenter/agentSessionPresenter/agentRegistry'
+import type { NewSessionManager } from '@/presenter/agentSessionPresenter/sessionManager'
 import type { ChatMessageRecord } from '@shared/types/agent-interface'
 
 const mockMessage: ChatMessageRecord = {
diff --git a/test/main/presenter/newAgentPresenter/sessionManager.test.ts b/test/main/presenter/agentSessionPresenter/sessionManager.test.ts
similarity index 98%
rename from test/main/presenter/newAgentPresenter/sessionManager.test.ts
rename to test/main/presenter/agentSessionPresenter/sessionManager.test.ts
index 66686a1a7..d8dbc2c5e 100644
--- a/test/main/presenter/newAgentPresenter/sessionManager.test.ts
+++ b/test/main/presenter/agentSessionPresenter/sessionManager.test.ts
@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { NewSessionManager } from '@/presenter/newAgentPresenter/sessionManager'
+import { NewSessionManager } from '@/presenter/agentSessionPresenter/sessionManager'
 
 vi.mock('nanoid', () => ({ nanoid: vi.fn(() => 'mock-id-123') }))
 
diff --git a/test/main/presenter/newAgentPresenter/usageDashboard.test.ts b/test/main/presenter/agentSessionPresenter/usageDashboard.test.ts
similarity index 96%
rename from test/main/presenter/newAgentPresenter/usageDashboard.test.ts
rename to test/main/presenter/agentSessionPresenter/usageDashboard.test.ts
index 7c1fc1d37..09d882d1b 100644
--- a/test/main/presenter/newAgentPresenter/usageDashboard.test.ts
+++ b/test/main/presenter/agentSessionPresenter/usageDashboard.test.ts
@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { NewAgentPresenter } from '@/presenter/newAgentPresenter/index'
-import { DeepChatMessageStore } from '@/presenter/deepchatAgentPresenter/messageStore'
+import { AgentSessionPresenter } from '@/presenter/agentSessionPresenter/index'
+import { DeepChatMessageStore } from '@/presenter/agentRuntimePresenter/messageStore'
 import { DASHBOARD_STATS_BACKFILL_KEY, type UsageStatsRecordInput } from '@/presenter/usageStats'
 
 vi.mock('@/eventbus', () => ({
@@ -95,6 +95,7 @@ type UsageStatsRow = {
   output_tokens: number
   total_tokens: number
   cached_input_tokens: number
+  cache_write_input_tokens: number
   estimated_cost_usd: number | null
   source: 'backfill' | 'live'
   created_at: number
@@ -277,6 +278,7 @@ function createMockSqlitePresenter() {
         output_tokens: input.outputTokens,
         total_tokens: input.totalTokens,
         cached_input_tokens: input.cachedInputTokens,
+        cache_write_input_tokens: input.cacheWriteInputTokens,
         estimated_cost_usd: input.estimatedCostUsd,
         source: input.source,
         created_at: input.createdAt,
@@ -411,7 +413,7 @@ function createMockSqlitePresenter() {
   } as any
 }
 
-describe('NewAgentPresenter usage dashboard', () => {
+describe('AgentSessionPresenter usage dashboard', () => {
   beforeEach(() => {
     vi.clearAllMocks()
   })
@@ -419,7 +421,7 @@ describe('NewAgentPresenter usage dashboard', () => {
   function createPresenter() {
     const sqlitePresenter = createMockSqlitePresenter()
     const configPresenter = createMockConfigPresenter()
-    const presenter = new NewAgentPresenter(
+    const presenter = new AgentSessionPresenter(
       createMockDeepChatAgent() as any,
       createMockLlmProviderPresenter() as any,
       configPresenter as any,
@@ -447,7 +449,9 @@ describe('NewAgentPresenter usage dashboard', () => {
       metadata: JSON.stringify({
         inputTokens: 120,
         outputTokens: 80,
-        totalTokens: 200
+        totalTokens: 200,
+        cachedInputTokens: 15,
+        cacheWriteInputTokens: 5
       }),
       createdAt: Date.UTC(2026, 2, 10, 8, 0, 0),
       updatedAt: Date.UTC(2026, 2, 10, 8, 0, 1)
@@ -460,7 +464,8 @@ describe('NewAgentPresenter usage dashboard', () => {
       message_id: 'message-1',
       provider_id: 'openai',
       model_id: 'gpt-4o',
-      cached_input_tokens: 0,
+      cached_input_tokens: 15,
+      cache_write_input_tokens: 5,
       source: 'backfill'
     })
 
@@ -504,7 +509,8 @@ describe('NewAgentPresenter usage dashboard', () => {
         inputTokens: 140,
         outputTokens: 60,
         totalTokens: 200,
-        cachedInputTokens: 20
+        cachedInputTokens: 20,
+        cacheWriteInputTokens: 0
       })
     )
 
@@ -563,6 +569,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 80,
       totalTokens: 200,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: 0.01,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 3, 8, 0, 0),
@@ -578,6 +585,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 40,
       totalTokens: 100,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: 0.004,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 3, 8, 1, 0),
@@ -593,6 +601,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 20,
       totalTokens: 50,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: 0.002,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 4, 8, 0, 0),
@@ -622,6 +631,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 10,
       totalTokens: 20,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: null,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 5, 8, 0, 0),
@@ -637,6 +647,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 10,
       totalTokens: 20,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: null,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 5, 8, 1, 0),
@@ -652,6 +663,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 10,
       totalTokens: 20,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: null,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 6, 8, 0, 0),
@@ -667,6 +679,7 @@ describe('NewAgentPresenter usage dashboard', () => {
       outputTokens: 10,
       totalTokens: 20,
       cachedInputTokens: 0,
+      cacheWriteInputTokens: 0,
       estimatedCostUsd: null,
       source: 'live',
       createdAt: Date.UTC(2026, 2, 6, 8, 1, 0),
diff --git a/test/main/presenter/configPresenter/acpLaunchSpecService.test.ts b/test/main/presenter/configPresenter/acpLaunchSpecService.test.ts
index 3b10f17c7..d4c94a5d6 100644
--- a/test/main/presenter/configPresenter/acpLaunchSpecService.test.ts
+++ b/test/main/presenter/configPresenter/acpLaunchSpecService.test.ts
@@ -121,4 +121,88 @@ describe('AcpLaunchSpecService', () => {
       )
     ).rejects.toThrow('Unsafe ACP registry agent id')
   })
+
+  it('uninstalls binary registry agents by removing the install directory', async () => {
+    const service = createService()
+    const platformMap: Record<string, string> = {
+      darwin: 'darwin',
+      linux: 'linux',
+      win32: 'windows'
+    }
+    const archMap: Record<string, string> = {
+      arm64: 'aarch64',
+      x64: 'x86_64'
+    }
+    const platformKey = `${platformMap[process.platform]}-${archMap[process.arch]}`
+
+    const agent = {
+      id: 'codex-acp',
+      name: 'Codex CLI',
+      version: '0.10.0',
+      distribution: {
+        binary: {
+          [platformKey]: {
+            archive: 'https://example.com/codex.zip',
+            cmd: './codex-acp'
+          }
+        }
+      },
+      source: 'registry' as const,
+      enabled: false
+    }
+
+    const installDir = path.join(tempDirs[0], 'agents', agent.id, agent.version)
+    fs.mkdirSync(installDir, { recursive: true })
+    fs.writeFileSync(path.join(installDir, 'codex-acp'), 'binary')
+
+    await service.uninstallRegistryAgent(agent, {
+      status: 'installed',
+      distributionType: 'binary',
+      version: agent.version,
+      installDir
+    })
+
+    expect(fs.existsSync(installDir)).toBeFalsy()
+    expect(fs.existsSync(path.join(tempDirs[0], 'agents', agent.id))).toBeFalsy()
+  })
+
+  it('rejects uninstall paths outside the managed install root', async () => {
+    const service = createService()
+    const platformMap: Record<string, string> = {
+      darwin: 'darwin',
+      linux: 'linux',
+      win32: 'windows'
+    }
+    const archMap: Record<string, string> = {
+      arm64: 'aarch64',
+      x64: 'x86_64'
+    }
+    const platformKey = `${platformMap[process.platform]}-${archMap[process.arch]}`
+
+    await expect(
+      service.uninstallRegistryAgent(
+        {
+          id: 'codex-acp',
+          name: 'Codex CLI',
+          version: '0.10.0',
+          distribution: {
+            binary: {
+              [platformKey]: {
+                archive: 'https://example.com/codex.zip',
+                cmd: './codex-acp'
+              }
+            }
+          },
+          source: 'registry',
+          enabled: false
+        },
+        {
+          status: 'installed',
+          distributionType: 'binary',
+          version: '0.10.0',
+          installDir: path.join(os.tmpdir(), 'outside-deepchat-acp')
+        }
+      )
+    ).rejects.toThrow('Unsafe ACP install directory for uninstall')
+  })
 })
diff --git a/test/main/presenter/floatingButtonPresenter/index.test.ts b/test/main/presenter/floatingButtonPresenter/index.test.ts
index 993d00a35..070e16dce 100644
--- a/test/main/presenter/floatingButtonPresenter/index.test.ts
+++ b/test/main/presenter/floatingButtonPresenter/index.test.ts
@@ -138,7 +138,7 @@ vi.mock('../../../../src/main/presenter/floatingButtonPresenter/FloatingButtonWi
 
 vi.mock('../../../../src/main/presenter/index', () => ({
   presenter: {
-    newAgentPresenter: {
+    agentSessionPresenter: {
       getSessionList: vi.fn(async () => presenterState.sessions),
       activateSession: vi.fn()
     },
diff --git a/test/main/presenter/llmProviderPresenter/anthropicProvider.test.ts b/test/main/presenter/llmProviderPresenter/anthropicProvider.test.ts
index f4bd86b5c..825f12644 100644
--- a/test/main/presenter/llmProviderPresenter/anthropicProvider.test.ts
+++ b/test/main/presenter/llmProviderPresenter/anthropicProvider.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
-import type { IConfigPresenter, LLM_PROVIDER } from '../../../../src/shared/presenter'
+import type { IConfigPresenter, LLM_PROVIDER, ModelConfig } from '../../../../src/shared/presenter'
 import { AnthropicProvider } from '../../../../src/main/presenter/llmProviderPresenter/providers/anthropicProvider'
 
 const { mockAnthropicConstructor, mockMessagesCreate, mockModelsList, mockGetProxyUrl } =
@@ -61,6 +61,14 @@ const createConfigPresenter = () =>
     getModelStatus: vi.fn().mockReturnValue(true)
   }) as unknown as IConfigPresenter
 
+const createAsyncStream = (chunks: Array<Record<string, unknown>>) => ({
+  async *[Symbol.asyncIterator]() {
+    for (const chunk of chunks) {
+      yield chunk
+    }
+  }
+})
+
 const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
   id: 'anthropic',
   name: 'Anthropic',
@@ -73,6 +81,15 @@ const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
 
 describe('AnthropicProvider API-only behavior', () => {
   const originalEnvKey = process.env.ANTHROPIC_API_KEY
+  const streamModelConfig: ModelConfig = {
+    maxTokens: 1024,
+    contextLength: 8192,
+    vision: false,
+    functionCall: false,
+    reasoning: false,
+    type: 'chat',
+    conversationId: 'session-1'
+  }
 
   beforeEach(() => {
     vi.clearAllMocks()
@@ -172,4 +189,114 @@ describe('AnthropicProvider API-only behavior', () => {
       })
     )
   })
+
+  it('adds top-level cache_control for Claude streaming requests', async () => {
+    mockMessagesCreate.mockResolvedValue(
+      createAsyncStream([
+        {
+          type: 'message_start',
+          message: {
+            usage: {
+              input_tokens: 10,
+              output_tokens: 2
+            }
+          }
+        },
+        {
+          type: 'content_block_delta',
+          delta: {
+            type: 'text_delta',
+            text: 'hello'
+          }
+        }
+      ])
+    )
+
+    const provider = new AnthropicProvider(
+      createProvider({ enable: false }),
+      createConfigPresenter()
+    )
+    ;(provider as any).anthropic = {
+      messages: { create: mockMessagesCreate },
+      models: { list: mockModelsList }
+    }
+
+    const events = []
+    for await (const event of provider.coreStream(
+      [{ role: 'user', content: 'hi' }],
+      'claude-sonnet-4-5-20250929',
+      streamModelConfig,
+      0.2,
+      64,
+      []
+    )) {
+      events.push(event)
+    }
+
+    const request = mockMessagesCreate.mock.calls.at(-1)?.[0]
+    expect(request).toMatchObject({
+      cache_control: {
+        type: 'ephemeral'
+      }
+    })
+    expect(events.some((event) => event.type === 'text')).toBe(true)
+  })
+
+  it('normalizes cache read and cache write usage metadata for streams', async () => {
+    mockMessagesCreate.mockResolvedValue(
+      createAsyncStream([
+        {
+          type: 'message_start',
+          message: {
+            usage: {
+              input_tokens: 10,
+              output_tokens: 5,
+              cache_read_input_tokens: 20,
+              cache_creation_input_tokens: 30
+            }
+          }
+        },
+        {
+          type: 'content_block_delta',
+          delta: {
+            type: 'text_delta',
+            text: 'hello'
+          }
+        }
+      ])
+    )
+
+    const provider = new AnthropicProvider(
+      createProvider({ enable: false }),
+      createConfigPresenter()
+    )
+    ;(provider as any).anthropic = {
+      messages: { create: mockMessagesCreate },
+      models: { list: mockModelsList }
+    }
+
+    const events = []
+    for await (const event of provider.coreStream(
+      [{ role: 'user', content: 'hi' }],
+      'claude-sonnet-4-5-20250929',
+      streamModelConfig,
+      0.2,
+      64,
+      []
+    )) {
+      events.push(event)
+    }
+
+    const usageEvent = events.find((event) => event.type === 'usage')
+    expect(usageEvent).toMatchObject({
+      type: 'usage',
+      usage: {
+        prompt_tokens: 60,
+        completion_tokens: 5,
+        total_tokens: 65,
+        cached_tokens: 20,
+        cache_write_tokens: 30
+      }
+    })
+  })
 })
diff --git a/test/main/presenter/llmProviderPresenter/awsBedrockProvider.test.ts b/test/main/presenter/llmProviderPresenter/awsBedrockProvider.test.ts
new file mode 100644
index 000000000..bad73be9e
--- /dev/null
+++ b/test/main/presenter/llmProviderPresenter/awsBedrockProvider.test.ts
@@ -0,0 +1,207 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  AWS_BEDROCK_PROVIDER,
+  ChatMessage,
+  IConfigPresenter,
+  ModelConfig
+} from '../../../../src/shared/presenter'
+import { AwsBedrockProvider } from '../../../../src/main/presenter/llmProviderPresenter/providers/awsBedrockProvider'
+
+const { mockBedrockRuntimeSend, mockGetProxyUrl } = vi.hoisted(() => ({
+  mockBedrockRuntimeSend: vi.fn(),
+  mockGetProxyUrl: vi.fn().mockReturnValue(null)
+}))
+
+vi.mock('@aws-sdk/client-bedrock', () => ({
+  BedrockClient: vi.fn(),
+  ListFoundationModelsCommand: class ListFoundationModelsCommand {
+    input: unknown
+
+    constructor(input: unknown) {
+      this.input = input
+    }
+  }
+}))
+
+vi.mock('@aws-sdk/client-bedrock-runtime', () => ({
+  BedrockRuntimeClient: vi.fn(),
+  InvokeModelCommand: class InvokeModelCommand {
+    input: Record<string, unknown>
+
+    constructor(input: Record<string, unknown>) {
+      this.input = input
+    }
+  },
+  InvokeModelWithResponseStreamCommand: class InvokeModelWithResponseStreamCommand {
+    input: Record<string, unknown>
+
+    constructor(input: Record<string, unknown>) {
+      this.input = input
+    }
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/proxyConfig', () => ({
+  proxyConfig: {
+    getProxyUrl: mockGetProxyUrl
+  }
+}))
+
+const createConfigPresenter = () =>
+  ({
+    getProviderModels: vi.fn().mockReturnValue([]),
+    getCustomModels: vi.fn().mockReturnValue([]),
+    getModelConfig: vi.fn().mockReturnValue(undefined),
+    getDbProviderModels: vi.fn().mockReturnValue([]),
+    getSetting: vi.fn().mockReturnValue(undefined),
+    setProviderModels: vi.fn(),
+    getModelStatus: vi.fn().mockReturnValue(true)
+  }) as unknown as IConfigPresenter
+
+const createProvider = (overrides?: Partial<AWS_BEDROCK_PROVIDER>): AWS_BEDROCK_PROVIDER => ({
+  id: 'aws-bedrock',
+  name: 'AWS Bedrock',
+  apiType: 'aws-bedrock',
+  enable: false,
+  credential: {
+    accessKeyId: 'test-access-key',
+    secretAccessKey: 'test-secret',
+    region: 'us-east-1'
+  },
+  ...overrides
+})
+
+const createAsyncStream = (chunks: Array<Record<string, unknown>>) => ({
+  async *[Symbol.asyncIterator]() {
+    for (const chunk of chunks) {
+      yield chunk
+    }
+  }
+})
+
+const createBedrockChunk = (chunk: Record<string, unknown>) => ({
+  chunk: {
+    bytes: new TextEncoder().encode(JSON.stringify(chunk))
+  }
+})
+
+describe('AwsBedrockProvider prompt cache behavior', () => {
+  const modelConfig: ModelConfig = {
+    maxTokens: 1024,
+    contextLength: 8192,
+    vision: false,
+    functionCall: false,
+    reasoning: false,
+    type: 'chat',
+    conversationId: 'session-1'
+  }
+
+  const messages: ChatMessage[] = [
+    { role: 'system', content: 'system prompt' },
+    { role: 'user', content: 'history' },
+    { role: 'assistant', content: 'stable reply' },
+    { role: 'user', content: 'latest question' }
+  ]
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetProxyUrl.mockReturnValue(null)
+    mockBedrockRuntimeSend.mockResolvedValue({
+      body: Promise.resolve(
+        createAsyncStream([
+          createBedrockChunk({
+            type: 'message_start',
+            message: {
+              usage: {
+                input_tokens: 10,
+                output_tokens: 5,
+                cacheReadInputTokens: 20,
+                cacheWriteInputTokens: 30
+              }
+            }
+          }),
+          createBedrockChunk({
+            type: 'content_block_delta',
+            delta: {
+              type: 'text_delta',
+              text: 'hello'
+            }
+          })
+        ])
+      )
+    })
+  })
+
+  it('adds an explicit cache_control breakpoint before the latest user turn', async () => {
+    const provider = new AwsBedrockProvider(createProvider(), createConfigPresenter())
+    ;(provider as any).bedrockRuntime = {
+      send: mockBedrockRuntimeSend
+    }
+
+    const events = []
+    for await (const event of provider.coreStream(
+      messages,
+      'anthropic.claude-3-5-sonnet-20240620-v1:0',
+      modelConfig,
+      0.2,
+      64,
+      []
+    )) {
+      events.push(event)
+    }
+
+    const command = mockBedrockRuntimeSend.mock.calls[0][0] as {
+      input: {
+        body: string
+      }
+    }
+    const payload = JSON.parse(command.input.body)
+
+    expect(payload).not.toHaveProperty('cache_control')
+    expect(payload.system).toBe('system prompt\n')
+    expect(payload.messages[1]).toMatchObject({
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'stable reply',
+          cache_control: {
+            type: 'ephemeral'
+          }
+        }
+      ]
+    })
+    expect(events.some((event) => event.type === 'text')).toBe(true)
+  })
+
+  it('normalizes cache read and cache write usage fields from Bedrock streams', async () => {
+    const provider = new AwsBedrockProvider(createProvider(), createConfigPresenter())
+    ;(provider as any).bedrockRuntime = {
+      send: mockBedrockRuntimeSend
+    }
+
+    const events = []
+    for await (const event of provider.coreStream(
+      messages,
+      'anthropic.claude-3-5-sonnet-20240620-v1:0',
+      modelConfig,
+      0.2,
+      64,
+      []
+    )) {
+      events.push(event)
+    }
+
+    const usageEvent = events.find((event) => event.type === 'usage')
+    expect(usageEvent).toMatchObject({
+      type: 'usage',
+      usage: {
+        prompt_tokens: 60,
+        completion_tokens: 5,
+        total_tokens: 65,
+        cached_tokens: 20,
+        cache_write_tokens: 30
+      }
+    })
+  })
+})
diff --git a/test/main/presenter/llmProviderPresenter/backgroundModelSync.test.ts b/test/main/presenter/llmProviderPresenter/backgroundModelSync.test.ts
new file mode 100644
index 000000000..334074000
--- /dev/null
+++ b/test/main/presenter/llmProviderPresenter/backgroundModelSync.test.ts
@@ -0,0 +1,393 @@
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
+import type {
+  IConfigPresenter,
+  ISQLitePresenter,
+  LLM_PROVIDER
+} from '../../../../src/shared/presenter'
+import { LLMProviderPresenter } from '../../../../src/main/presenter/llmProviderPresenter'
+import { OpenAICompatibleProvider } from '../../../../src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider'
+
+const eventState = vi.hoisted(() => ({
+  handlers: new Map<string, Array<(...args: unknown[]) => void>>()
+}))
+
+const { mockModelsList, mockGetProxyUrl } = vi.hoisted(() => ({
+  mockModelsList: vi.fn().mockResolvedValue({ data: [] }),
+  mockGetProxyUrl: vi.fn().mockReturnValue(null)
+}))
+
+vi.mock('electron', () => ({
+  app: {
+    getName: vi.fn(() => 'DeepChat'),
+    getVersion: vi.fn(() => '0.0.0-test'),
+    getPath: vi.fn(() => '/mock/path'),
+    isReady: vi.fn(() => true),
+    on: vi.fn()
+  },
+  session: {},
+  ipcMain: {
+    on: vi.fn(),
+    handle: vi.fn(),
+    removeHandler: vi.fn()
+  },
+  BrowserWindow: vi.fn(() => ({
+    loadURL: vi.fn(),
+    loadFile: vi.fn(),
+    on: vi.fn(),
+    webContents: { send: vi.fn(), on: vi.fn(), isDestroyed: vi.fn(() => false) },
+    isDestroyed: vi.fn(() => false),
+    close: vi.fn(),
+    show: vi.fn(),
+    hide: vi.fn()
+  })),
+  dialog: {
+    showOpenDialog: vi.fn()
+  },
+  shell: {
+    openExternal: vi.fn()
+  }
+}))
+
+vi.mock('openai', () => {
+  class MockOpenAI {
+    chat = {
+      completions: {
+        create: vi.fn()
+      }
+    }
+    models = {
+      list: mockModelsList
+    }
+  }
+
+  return {
+    default: MockOpenAI,
+    AzureOpenAI: MockOpenAI
+  }
+})
+
+vi.mock('@/presenter', () => ({
+  presenter: {
+    devicePresenter: {
+      cacheImage: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/eventbus', () => ({
+  eventBus: {
+    on: vi.fn((eventName: string, handler: (...args: unknown[]) => void) => {
+      const handlers = eventState.handlers.get(eventName) ?? []
+      handlers.push(handler)
+      eventState.handlers.set(eventName, handlers)
+    }),
+    sendToRenderer: vi.fn(),
+    sendToMain: vi.fn(),
+    emit: vi.fn(),
+    send: vi.fn()
+  },
+  SendTarget: {
+    ALL_WINDOWS: 'ALL_WINDOWS'
+  }
+}))
+
+vi.mock('@/events', () => ({
+  CONFIG_EVENTS: {
+    PROXY_RESOLVED: 'config:proxy-resolved',
+    PROVIDER_ATOMIC_UPDATE: 'config:provider-atomic-update',
+    PROVIDER_BATCH_UPDATE: 'config:provider-batch-update',
+    MODEL_LIST_CHANGED: 'config:model-list-changed'
+  },
+  PROVIDER_DB_EVENTS: {
+    UPDATED: 'provider-db:updated'
+  },
+  NOTIFICATION_EVENTS: {
+    SHOW_ERROR: 'notification:show-error'
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/proxyConfig', () => ({
+  proxyConfig: {
+    getProxyUrl: mockGetProxyUrl
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/configPresenter/modelCapabilities', () => ({
+  modelCapabilities: {
+    supportsReasoningEffort: vi.fn().mockReturnValue(false),
+    supportsVerbosity: vi.fn().mockReturnValue(false),
+    supportsReasoning: vi.fn().mockReturnValue(false),
+    resolveProviderId: vi.fn((providerId: string) => providerId)
+  }
+}))
+
+const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
+  id: 'novita',
+  name: 'Novita',
+  apiType: 'openai-completions',
+  apiKey: 'test-key',
+  baseUrl: 'https://api.novita.ai/openai',
+  enable: true,
+  ...overrides
+})
+
+const createConfigPresenter = (provider = createProvider()) =>
+  ({
+    getProviders: vi.fn().mockReturnValue([provider]),
+    getProviderById: vi.fn().mockReturnValue(provider),
+    getProviderModels: vi.fn().mockReturnValue([]),
+    getCustomModels: vi.fn().mockReturnValue([]),
+    getModelConfig: vi.fn().mockReturnValue({
+      maxTokens: 4096,
+      contextLength: 8192,
+      temperature: 0.7,
+      vision: false,
+      functionCall: false,
+      reasoning: false,
+      type: 'chat'
+    }),
+    getSetting: vi.fn().mockReturnValue(undefined),
+    refreshProviderDb: vi.fn().mockResolvedValue({
+      status: 'updated',
+      lastUpdated: Date.now(),
+      providersCount: 1
+    }),
+    setProviderModels: vi.fn(),
+    getModelStatus: vi.fn().mockReturnValue(true),
+    updateCustomModel: vi.fn(),
+    addCustomModel: vi.fn(),
+    removeCustomModel: vi.fn()
+  }) as unknown as IConfigPresenter
+
+const mockSqlitePresenter = {
+  getAcpSession: vi.fn().mockResolvedValue(null),
+  upsertAcpSession: vi.fn().mockResolvedValue(undefined),
+  updateAcpSessionId: vi.fn().mockResolvedValue(undefined),
+  updateAcpWorkdir: vi.fn().mockResolvedValue(undefined),
+  updateAcpSessionStatus: vi.fn().mockResolvedValue(undefined),
+  deleteAcpSession: vi.fn().mockResolvedValue(undefined),
+  deleteAcpSessions: vi.fn().mockResolvedValue(undefined)
+} as unknown as ISQLitePresenter
+
+const emitMainEvent = async (eventName: string, ...args: unknown[]) => {
+  const handlers = eventState.handlers.get(eventName) ?? []
+  handlers.forEach((handler) => handler(...args))
+  await Promise.resolve()
+  await Promise.resolve()
+}
+
+describe('LLMProviderPresenter background model sync', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    eventState.handlers.clear()
+    mockModelsList.mockResolvedValue({ data: [] })
+    mockGetProxyUrl.mockReturnValue(null)
+  })
+
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('does not trigger an extra startup refresh for non DB-backed providers', async () => {
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    const presenter = new LLMProviderPresenter(createConfigPresenter(), mockSqlitePresenter)
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(presenter.getProviders()).toHaveLength(1)
+    expect(refreshSpy).not.toHaveBeenCalled()
+  })
+
+  it('re-syncs enabled DB-backed provider models when provider-db updates', async () => {
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    new LLMProviderPresenter(
+      createConfigPresenter(
+        createProvider({
+          id: 'doubao',
+          name: 'Doubao',
+          apiType: 'doubao',
+          baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+        })
+      ),
+      mockSqlitePresenter
+    )
+    await Promise.resolve()
+    await Promise.resolve()
+    refreshSpy.mockClear()
+
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+
+    expect(refreshSpy).toHaveBeenCalledTimes(1)
+  })
+
+  it('ignores provider-db updates for providers that do not use the provider DB catalog', async () => {
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    new LLMProviderPresenter(createConfigPresenter(), mockSqlitePresenter)
+    await Promise.resolve()
+    await Promise.resolve()
+
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+
+    expect(refreshSpy).not.toHaveBeenCalled()
+  })
+
+  it('coalesces duplicate background refreshes for the same provider', async () => {
+    let resolveRefresh: (() => void) | null = null
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockReturnValue(
+        new Promise<void>((resolve) => {
+          resolveRefresh = resolve
+        })
+      )
+
+    new LLMProviderPresenter(
+      createConfigPresenter(
+        createProvider({
+          id: 'doubao',
+          name: 'Doubao',
+          apiType: 'doubao',
+          baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+        })
+      ),
+      mockSqlitePresenter
+    )
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(refreshSpy).not.toHaveBeenCalled()
+
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+
+    expect(refreshSpy).toHaveBeenCalledTimes(1)
+
+    resolveRefresh?.()
+    await Promise.resolve()
+    await Promise.resolve()
+
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+
+    expect(refreshSpy).toHaveBeenCalledTimes(2)
+  })
+
+  it('refreshes provider DB before rebuilding DB-backed provider models', async () => {
+    const provider = createProvider({
+      id: 'doubao',
+      name: 'Doubao',
+      apiType: 'doubao',
+      baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+    })
+    const configPresenter = createConfigPresenter(provider)
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    const presenter = new LLMProviderPresenter(configPresenter, mockSqlitePresenter)
+    await presenter.refreshModels('doubao')
+
+    expect(configPresenter.refreshProviderDb).toHaveBeenCalledWith(true)
+    expect(refreshSpy).toHaveBeenCalledTimes(1)
+    expect(configPresenter.refreshProviderDb.mock.invocationCallOrder[0]).toBeLessThan(
+      refreshSpy.mock.invocationCallOrder[0]
+    )
+  })
+
+  it('surfaces provider DB refresh failures without rebuilding DB-backed provider models', async () => {
+    const provider = createProvider({
+      id: 'doubao',
+      name: 'Doubao',
+      apiType: 'doubao',
+      baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+    })
+    const configPresenter = createConfigPresenter(provider)
+    configPresenter.refreshProviderDb.mockResolvedValueOnce({
+      status: 'error',
+      lastUpdated: null,
+      providersCount: 1,
+      message: 'network down'
+    })
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    const presenter = new LLMProviderPresenter(configPresenter, mockSqlitePresenter)
+
+    await expect(presenter.refreshModels('doubao')).rejects.toThrow(
+      'Model refresh failed: network down'
+    )
+    expect(refreshSpy).not.toHaveBeenCalled()
+  })
+
+  it('does not refresh provider DB for providers that manage models themselves', async () => {
+    const configPresenter = createConfigPresenter()
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockResolvedValue(undefined)
+
+    const presenter = new LLMProviderPresenter(configPresenter, mockSqlitePresenter)
+    await presenter.refreshModels('novita')
+
+    expect(configPresenter.refreshProviderDb).not.toHaveBeenCalled()
+    expect(refreshSpy).toHaveBeenCalledTimes(1)
+  })
+
+  it('logs provider-db refresh failures without blocking presenter initialization', async () => {
+    const refreshSpy = vi
+      .spyOn(OpenAICompatibleProvider.prototype, 'refreshModels')
+      .mockRejectedValue(new Error('refresh failed'))
+    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => {})
+
+    const presenter = new LLMProviderPresenter(
+      createConfigPresenter(
+        createProvider({
+          id: 'doubao',
+          name: 'Doubao',
+          apiType: 'doubao',
+          baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+        })
+      ),
+      mockSqlitePresenter
+    )
+    await Promise.resolve()
+    await Promise.resolve()
+
+    await emitMainEvent('provider-db:updated', {
+      providersCount: 1,
+      lastUpdated: Date.now()
+    })
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(presenter.getProviders()).toHaveLength(1)
+    expect(refreshSpy).toHaveBeenCalledTimes(1)
+    expect(warnSpy).toHaveBeenCalledWith(
+      '[LLMProviderPresenter] Failed to refresh models for provider doubao during provider-db-updated:',
+      expect.any(Error)
+    )
+  })
+})
diff --git a/test/main/presenter/llmProviderPresenter/doubaoProvider.test.ts b/test/main/presenter/llmProviderPresenter/doubaoProvider.test.ts
new file mode 100644
index 000000000..2c8f63013
--- /dev/null
+++ b/test/main/presenter/llmProviderPresenter/doubaoProvider.test.ts
@@ -0,0 +1,220 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { IConfigPresenter, LLM_PROVIDER, ModelConfig } from '../../../../src/shared/presenter'
+import { DoubaoProvider } from '../../../../src/main/presenter/llmProviderPresenter/providers/doubaoProvider'
+
+const { mockChatCompletionsCreate, mockGetProvider, mockGetModel, mockGetProxyUrl } = vi.hoisted(
+  () => ({
+    mockChatCompletionsCreate: vi.fn(),
+    mockGetProvider: vi.fn(),
+    mockGetModel: vi.fn(),
+    mockGetProxyUrl: vi.fn().mockReturnValue(null)
+  })
+)
+
+vi.mock('openai', () => {
+  class MockOpenAI {
+    chat = {
+      completions: {
+        create: mockChatCompletionsCreate
+      }
+    }
+    models = {
+      list: vi.fn().mockResolvedValue({ data: [] })
+    }
+  }
+
+  return {
+    default: MockOpenAI,
+    AzureOpenAI: MockOpenAI
+  }
+})
+
+vi.mock('@/presenter', () => ({
+  presenter: {
+    devicePresenter: {
+      cacheImage: vi.fn()
+    }
+  }
+}))
+
+vi.mock('@/eventbus', () => ({
+  eventBus: {
+    on: vi.fn(),
+    sendToRenderer: vi.fn(),
+    sendToMain: vi.fn(),
+    emit: vi.fn(),
+    send: vi.fn()
+  },
+  SendTarget: {
+    ALL_WINDOWS: 'ALL_WINDOWS'
+  }
+}))
+
+vi.mock('@/events', () => ({
+  CONFIG_EVENTS: {
+    MODEL_LIST_CHANGED: 'MODEL_LIST_CHANGED'
+  },
+  NOTIFICATION_EVENTS: {
+    SHOW_ERROR: 'SHOW_ERROR'
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/proxyConfig', () => ({
+  proxyConfig: {
+    getProxyUrl: mockGetProxyUrl
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/configPresenter/providerDbLoader', () => ({
+  providerDbLoader: {
+    getProvider: mockGetProvider,
+    getModel: mockGetModel
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/configPresenter/modelCapabilities', () => ({
+  modelCapabilities: {
+    supportsReasoningEffort: vi.fn().mockReturnValue(false),
+    supportsVerbosity: vi.fn().mockReturnValue(false),
+    supportsReasoning: vi.fn().mockReturnValue(false)
+  }
+}))
+
+const createAsyncStream = (chunks: Array<Record<string, unknown>>) => ({
+  async *[Symbol.asyncIterator]() {
+    for (const chunk of chunks) {
+      yield chunk
+    }
+  }
+})
+
+const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
+  id: 'doubao',
+  name: 'Doubao',
+  apiType: 'doubao',
+  apiKey: 'test-key',
+  baseUrl: 'https://ark.cn-beijing.volces.com/api/v3',
+  enable: false,
+  ...overrides
+})
+
+const createConfigPresenter = () =>
+  ({
+    getProviderModels: vi.fn().mockReturnValue([]),
+    getCustomModels: vi.fn().mockReturnValue([]),
+    getModelConfig: vi.fn().mockReturnValue(undefined),
+    getSetting: vi.fn().mockReturnValue(undefined),
+    setProviderModels: vi.fn(),
+    getModelStatus: vi.fn().mockReturnValue(true)
+  }) as unknown as IConfigPresenter
+
+describe('DoubaoProvider', () => {
+  const modelConfig: ModelConfig = {
+    maxTokens: 1024,
+    contextLength: 8192,
+    vision: true,
+    functionCall: true,
+    reasoning: true,
+    type: 'chat'
+  }
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetProxyUrl.mockReturnValue(null)
+    mockChatCompletionsCreate.mockResolvedValue(
+      createAsyncStream([
+        {
+          choices: [
+            {
+              delta: {
+                content: 'ok'
+              },
+              finish_reason: 'stop'
+            }
+          ]
+        }
+      ])
+    )
+  })
+
+  it('maps doubao catalog entries into provider models', async () => {
+    mockGetProvider.mockReturnValue({
+      id: 'doubao',
+      name: 'Doubao',
+      models: [
+        {
+          id: 'doubao-seed-2.0-pro',
+          display_name: 'Doubao-Seed 2.0 Pro',
+          tool_call: true,
+          reasoning: {
+            supported: true
+          },
+          modalities: {
+            input: ['text', 'image', 'video'],
+            output: ['text']
+          },
+          limit: {
+            context: 256000,
+            output: 64000
+          }
+        }
+      ]
+    })
+
+    const provider = new DoubaoProvider(createProvider(), createConfigPresenter())
+    const models = await (provider as any).fetchOpenAIModels()
+
+    expect(models).toEqual([
+      expect.objectContaining({
+        id: 'doubao-seed-2.0-pro',
+        name: 'Doubao-Seed 2.0 Pro',
+        providerId: 'doubao',
+        vision: true,
+        functionCall: true,
+        reasoning: true
+      })
+    ])
+  })
+
+  it('adds Doubao thinking parameter for reasoning models based on metadata notes', async () => {
+    mockGetProvider.mockReturnValue({
+      id: 'doubao',
+      name: 'Doubao',
+      models: []
+    })
+    mockGetModel.mockReturnValue({
+      id: 'doubao-seed-2.0-pro',
+      extra_capabilities: {
+        reasoning: {
+          notes: ['doubao-thinking-parameter']
+        }
+      }
+    })
+
+    const provider = new DoubaoProvider(createProvider(), createConfigPresenter())
+    ;(provider as any).isInitialized = true
+
+    const events = []
+    for await (const event of provider.coreStream(
+      [{ role: 'user', content: 'hello' }],
+      'doubao-seed-2.0-pro',
+      modelConfig,
+      0.7,
+      1024,
+      []
+    )) {
+      events.push(event)
+    }
+
+    expect(events.some((event) => event.type === 'text')).toBe(true)
+    expect(mockChatCompletionsCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        model: 'doubao-seed-2.0-pro',
+        thinking: {
+          type: 'enabled'
+        }
+      }),
+      undefined
+    )
+  })
+})
diff --git a/test/main/presenter/llmProviderPresenter/openAICompatibleProvider.test.ts b/test/main/presenter/llmProviderPresenter/openAICompatibleProvider.test.ts
index e751dfc1d..aa98cfb2d 100644
--- a/test/main/presenter/llmProviderPresenter/openAICompatibleProvider.test.ts
+++ b/test/main/presenter/llmProviderPresenter/openAICompatibleProvider.test.ts
@@ -351,3 +351,131 @@ describe('normalizeExtractedImageText', () => {
     expect(normalizeExtractedImageText('[]()')).toBe('')
   })
 })
+
+describe('OpenAICompatibleProvider prompt cache behavior', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockModelsList.mockResolvedValue({ data: [] })
+    mockGetProxyUrl.mockReturnValue(null)
+    mockChatCompletionsCreate.mockResolvedValue(
+      createAsyncStream([
+        {
+          choices: [
+            {
+              delta: {
+                content: 'ok'
+              },
+              finish_reason: 'stop'
+            }
+          ],
+          usage: {
+            prompt_tokens: 80,
+            completion_tokens: 12,
+            total_tokens: 92,
+            prompt_tokens_details: {
+              cached_tokens: 24,
+              cache_write_tokens: 16
+            }
+          }
+        }
+      ])
+    )
+  })
+
+  it('injects prompt_cache_key only for official OpenAI chat completions', async () => {
+    const provider = new OpenAICompatibleProvider(
+      {
+        id: 'openai',
+        name: 'OpenAI',
+        apiType: 'openai-compatible',
+        apiKey: 'test-key',
+        baseUrl: 'https://api.openai.com/v1',
+        enable: false
+      },
+      createConfigPresenter([])
+    )
+    ;(provider as any).isInitialized = true
+
+    const modelConfig: ModelConfig = {
+      maxTokens: 1024,
+      contextLength: 8192,
+      vision: false,
+      functionCall: false,
+      reasoning: false,
+      type: 'chat',
+      conversationId: 'session-1'
+    }
+
+    const events = await collectEvents(
+      provider,
+      'gpt-5',
+      modelConfig,
+      [{ role: 'user', content: 'cache me' }],
+      []
+    )
+    const usageEvent = events.find((event) => event.type === 'usage')
+    const requestParams = mockChatCompletionsCreate.mock.calls[0]?.[0]
+
+    expect(requestParams.prompt_cache_key).toMatch(/^deepchat:openai:gpt-5:/)
+    expect(usageEvent).toMatchObject({
+      type: 'usage',
+      usage: {
+        cached_tokens: 24,
+        cache_write_tokens: 16
+      }
+    })
+  })
+
+  it('adds explicit cache_control breakpoint for OpenRouter Claude without top-level cache_control', async () => {
+    const provider = new OpenRouterProvider(
+      {
+        id: 'openrouter',
+        name: 'OpenRouter',
+        apiType: 'openai-compatible',
+        apiKey: 'test-key',
+        baseUrl: 'https://openrouter.ai/api/v1',
+        enable: false
+      },
+      createConfigPresenter([])
+    )
+    ;(provider as any).isInitialized = true
+
+    const modelConfig: ModelConfig = {
+      maxTokens: 1024,
+      contextLength: 8192,
+      vision: false,
+      functionCall: false,
+      reasoning: false,
+      type: 'chat',
+      conversationId: 'session-2'
+    }
+
+    await collectEvents(
+      provider,
+      'anthropic/claude-sonnet-4',
+      modelConfig,
+      [
+        { role: 'user', content: 'history' },
+        { role: 'assistant', content: 'stable reply' },
+        { role: 'user', content: 'latest question' }
+      ],
+      []
+    )
+
+    const requestParams = mockChatCompletionsCreate.mock.calls[0]?.[0]
+    expect(requestParams).not.toHaveProperty('cache_control')
+    expect(requestParams).not.toHaveProperty('prompt_cache_key')
+    expect(requestParams.messages[1]).toMatchObject({
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'stable reply',
+          cache_control: {
+            type: 'ephemeral'
+          }
+        }
+      ]
+    })
+  })
+})
diff --git a/test/main/presenter/llmProviderPresenter/openAIResponsesProvider.test.ts b/test/main/presenter/llmProviderPresenter/openAIResponsesProvider.test.ts
index 961404e31..b3a1318a0 100644
--- a/test/main/presenter/llmProviderPresenter/openAIResponsesProvider.test.ts
+++ b/test/main/presenter/llmProviderPresenter/openAIResponsesProvider.test.ts
@@ -174,7 +174,8 @@ describe('OpenAIResponsesProvider tool call id mapping', () => {
               output_tokens: 5,
               total_tokens: 15,
               input_tokens_details: {
-                cached_tokens: 4
+                cached_tokens: 4,
+                cache_write_tokens: 6
               }
             }
           }
@@ -218,7 +219,8 @@ describe('OpenAIResponsesProvider tool call id mapping', () => {
     expect(usageEvent).toMatchObject({
       type: 'usage',
       usage: expect.objectContaining({
-        cached_tokens: 4
+        cached_tokens: 4,
+        cache_write_tokens: 6
       })
     })
     expect(stopEvent?.stop_reason).toBe('tool_use')
@@ -530,4 +532,47 @@ describe('OpenAIResponsesProvider tool call id mapping', () => {
       stream: true
     })
   })
+
+  it('injects prompt_cache_key for official OpenAI Responses requests', async () => {
+    mockResponsesCreate.mockResolvedValue(
+      createAsyncStream([
+        {
+          type: 'response.completed',
+          response: {
+            usage: {
+              input_tokens: 8,
+              output_tokens: 2,
+              total_tokens: 10
+            }
+          }
+        }
+      ])
+    )
+
+    const provider = new OpenAIResponsesProvider(
+      mockProvider,
+      mockConfigPresenter,
+      mcpRuntime as any
+    )
+    ;(provider as any).isInitialized = true
+
+    const promptCacheModelConfig: ModelConfig = {
+      ...modelConfig,
+      conversationId: 'session-1'
+    }
+
+    for await (const _event of provider.coreStream(
+      [{ role: 'user', content: 'cache me' }],
+      'gpt-5',
+      promptCacheModelConfig,
+      0.7,
+      512,
+      []
+    )) {
+      // consume stream
+    }
+
+    const requestParams = mockResponsesCreate.mock.calls[0][0] as Record<string, unknown>
+    expect(requestParams.prompt_cache_key).toMatch(/^deepchat:openai:gpt-5:/)
+  })
 })
diff --git a/test/main/presenter/llmProviderPresenter/promptCacheStrategy.test.ts b/test/main/presenter/llmProviderPresenter/promptCacheStrategy.test.ts
new file mode 100644
index 000000000..6e1fcb466
--- /dev/null
+++ b/test/main/presenter/llmProviderPresenter/promptCacheStrategy.test.ts
@@ -0,0 +1,193 @@
+import { describe, expect, it } from 'vitest'
+import {
+  applyAnthropicExplicitCacheBreakpoint,
+  applyOpenAIChatExplicitCacheBreakpoint,
+  resolvePromptCachePlan
+} from '../../../../src/main/presenter/llmProviderPresenter/promptCacheStrategy'
+
+describe('promptCacheStrategy', () => {
+  it('builds prompt_cache_key for official OpenAI models', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'openai',
+      apiType: 'openai_chat',
+      modelId: 'gpt-5',
+      messages: [],
+      conversationId: 'session-1'
+    })
+
+    expect(plan).toMatchObject({
+      mode: 'openai_implicit',
+      ttl: null
+    })
+    expect(plan.cacheKey).toMatch(/^deepchat:openai:gpt-5:/)
+  })
+
+  it('enables top-level automatic cache control for Anthropic Claude', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'anthropic',
+      apiType: 'anthropic',
+      modelId: 'claude-sonnet-4-5-20250929',
+      messages: []
+    })
+
+    expect(plan).toEqual({
+      mode: 'anthropic_auto',
+      ttl: '5m'
+    })
+  })
+
+  it('creates an explicit cache breakpoint plan for ZenMux anthropic/* models', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'zenmux',
+      apiType: 'anthropic',
+      modelId: 'anthropic/claude-sonnet-4-5',
+      messages: [
+        { role: 'user', content: [{ type: 'text', text: 'history' }] },
+        { role: 'assistant', content: [{ type: 'text', text: 'stable reply' }] },
+        { role: 'user', content: [{ type: 'text', text: 'latest question' }] }
+      ]
+    })
+
+    expect(plan).toEqual({
+      mode: 'anthropic_explicit',
+      ttl: '5m',
+      breakpointPlan: {
+        messageIndex: 1,
+        contentIndex: 0
+      }
+    })
+  })
+
+  it('creates a single explicit breakpoint plan for Bedrock Claude', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'aws-bedrock',
+      apiType: 'anthropic',
+      modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
+      messages: [
+        { role: 'user', content: [{ type: 'text', text: 'history' }] },
+        { role: 'assistant', content: [{ type: 'text', text: 'stable reply' }] },
+        { role: 'user', content: [{ type: 'text', text: 'latest question' }] }
+      ]
+    })
+
+    expect(plan).toEqual({
+      mode: 'anthropic_explicit',
+      ttl: '5m',
+      breakpointPlan: {
+        messageIndex: 1,
+        contentIndex: 0
+      }
+    })
+  })
+
+  it('creates a single explicit breakpoint plan for OpenRouter Claude', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'openrouter',
+      apiType: 'openai_chat',
+      modelId: 'anthropic/claude-sonnet-4',
+      messages: [
+        { role: 'user', content: 'history' },
+        { role: 'assistant', content: 'stable reply' },
+        { role: 'user', content: 'latest question' }
+      ]
+    })
+
+    expect(plan).toEqual({
+      mode: 'anthropic_explicit',
+      ttl: '5m',
+      breakpointPlan: {
+        messageIndex: 1,
+        contentIndex: 0
+      }
+    })
+  })
+
+  it('keeps non-Claude OpenRouter models disabled for explicit request mutation', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'openrouter',
+      apiType: 'openai_chat',
+      modelId: 'openai/gpt-4o',
+      messages: []
+    })
+
+    expect(plan).toEqual({
+      mode: 'disabled',
+      ttl: null
+    })
+  })
+
+  it('returns disabled for unsupported providers', () => {
+    const plan = resolvePromptCachePlan({
+      providerId: 'gemini',
+      apiType: 'openai_chat',
+      modelId: 'gemini-2.5-pro',
+      messages: []
+    })
+
+    expect(plan).toEqual({
+      mode: 'disabled',
+      ttl: null
+    })
+  })
+
+  it('annotates the selected text block for explicit cache breakpoints', () => {
+    const anthropicPlan = resolvePromptCachePlan({
+      providerId: 'aws-bedrock',
+      apiType: 'anthropic',
+      modelId: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
+      messages: [
+        { role: 'user', content: [{ type: 'text', text: 'history' }] },
+        { role: 'assistant', content: [{ type: 'text', text: 'stable reply' }] },
+        { role: 'user', content: [{ type: 'text', text: 'latest question' }] }
+      ]
+    })
+    const anthropicMessages = applyAnthropicExplicitCacheBreakpoint(
+      [
+        { role: 'user', content: [{ type: 'text', text: 'history' }] },
+        { role: 'assistant', content: [{ type: 'text', text: 'stable reply' }] },
+        { role: 'user', content: [{ type: 'text', text: 'latest question' }] }
+      ] as any,
+      anthropicPlan
+    )
+
+    expect(anthropicMessages[1]?.content?.[0]).toMatchObject({
+      type: 'text',
+      text: 'stable reply',
+      cache_control: {
+        type: 'ephemeral'
+      }
+    })
+
+    const openAIPlan = resolvePromptCachePlan({
+      providerId: 'openrouter',
+      apiType: 'openai_chat',
+      modelId: 'anthropic/claude-sonnet-4',
+      messages: [
+        { role: 'user', content: 'history' },
+        { role: 'assistant', content: 'stable reply' },
+        { role: 'user', content: 'latest question' }
+      ]
+    })
+    const openAIMessages = applyOpenAIChatExplicitCacheBreakpoint(
+      [
+        { role: 'user', content: 'history' },
+        { role: 'assistant', content: 'stable reply' },
+        { role: 'user', content: 'latest question' }
+      ] as any,
+      openAIPlan
+    )
+
+    expect(openAIMessages[1]).toMatchObject({
+      role: 'assistant',
+      content: [
+        {
+          type: 'text',
+          text: 'stable reply',
+          cache_control: {
+            type: 'ephemeral'
+          }
+        }
+      ]
+    })
+  })
+})
diff --git a/test/main/presenter/llmProviderPresenter/zenmuxProvider.test.ts b/test/main/presenter/llmProviderPresenter/zenmuxProvider.test.ts
new file mode 100644
index 000000000..b8977106b
--- /dev/null
+++ b/test/main/presenter/llmProviderPresenter/zenmuxProvider.test.ts
@@ -0,0 +1,350 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import type { IConfigPresenter, LLM_PROVIDER } from '../../../../src/shared/presenter'
+import { ZenmuxProvider } from '../../../../src/main/presenter/llmProviderPresenter/providers/zenmuxProvider'
+
+const ZENMUX_ANTHROPIC_BASE_URL = 'https://zenmux.ai/api/anthropic'
+
+const {
+  mockOpenAIConstructor,
+  mockAnthropicConstructor,
+  mockChatCompletionsCreate,
+  mockOpenAIModelsList,
+  mockAnthropicMessagesCreate,
+  mockAnthropicModelsList,
+  mockGetProxyUrl,
+  mockCacheImage
+} = vi.hoisted(() => ({
+  mockOpenAIConstructor: vi.fn(),
+  mockAnthropicConstructor: vi.fn(),
+  mockChatCompletionsCreate: vi.fn(),
+  mockOpenAIModelsList: vi.fn().mockResolvedValue({ data: [] }),
+  mockAnthropicMessagesCreate: vi.fn(),
+  mockAnthropicModelsList: vi.fn().mockResolvedValue({ data: [] }),
+  mockGetProxyUrl: vi.fn().mockReturnValue(null),
+  mockCacheImage: vi.fn()
+}))
+
+vi.mock('electron', () => ({
+  app: {
+    getName: vi.fn(() => 'DeepChat'),
+    getVersion: vi.fn(() => '0.0.0-test'),
+    getPath: vi.fn(() => '/mock/path'),
+    isReady: vi.fn(() => true),
+    on: vi.fn()
+  },
+  session: {},
+  ipcMain: {
+    on: vi.fn(),
+    handle: vi.fn(),
+    removeHandler: vi.fn()
+  },
+  BrowserWindow: vi.fn(() => ({
+    loadURL: vi.fn(),
+    loadFile: vi.fn(),
+    on: vi.fn(),
+    webContents: { send: vi.fn(), on: vi.fn(), isDestroyed: vi.fn(() => false) },
+    isDestroyed: vi.fn(() => false),
+    close: vi.fn(),
+    show: vi.fn(),
+    hide: vi.fn()
+  })),
+  dialog: {
+    showOpenDialog: vi.fn()
+  },
+  shell: {
+    openExternal: vi.fn()
+  }
+}))
+
+vi.mock('openai', () => {
+  class MockOpenAI {
+    chat = {
+      completions: {
+        create: mockChatCompletionsCreate
+      }
+    }
+    models = {
+      list: mockOpenAIModelsList
+    }
+    embeddings = {
+      create: vi.fn()
+    }
+
+    constructor(options: Record<string, unknown>) {
+      mockOpenAIConstructor(options)
+    }
+  }
+
+  return {
+    default: MockOpenAI,
+    AzureOpenAI: MockOpenAI
+  }
+})
+
+vi.mock('@/presenter', () => ({
+  presenter: {
+    devicePresenter: {
+      cacheImage: mockCacheImage
+    }
+  }
+}))
+
+vi.mock('@anthropic-ai/sdk', () => ({
+  default: vi.fn().mockImplementation((options: Record<string, unknown>) => {
+    mockAnthropicConstructor(options)
+    return {
+      messages: {
+        create: mockAnthropicMessagesCreate
+      },
+      models: {
+        list: mockAnthropicModelsList
+      }
+    }
+  })
+}))
+
+vi.mock('@/eventbus', () => ({
+  eventBus: {
+    on: vi.fn(),
+    sendToRenderer: vi.fn(),
+    sendToMain: vi.fn(),
+    emit: vi.fn(),
+    send: vi.fn()
+  },
+  SendTarget: {
+    ALL_WINDOWS: 'ALL_WINDOWS'
+  }
+}))
+
+vi.mock('@/events', () => ({
+  CONFIG_EVENTS: {
+    PROXY_RESOLVED: 'PROXY_RESOLVED',
+    PROVIDER_ATOMIC_UPDATE: 'PROVIDER_ATOMIC_UPDATE',
+    PROVIDER_BATCH_UPDATE: 'PROVIDER_BATCH_UPDATE',
+    MODEL_LIST_CHANGED: 'MODEL_LIST_CHANGED'
+  },
+  NOTIFICATION_EVENTS: {
+    SHOW_ERROR: 'SHOW_ERROR'
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/proxyConfig', () => ({
+  proxyConfig: {
+    getProxyUrl: mockGetProxyUrl
+  }
+}))
+
+vi.mock('../../../../src/main/presenter/configPresenter/modelCapabilities', () => ({
+  modelCapabilities: {
+    supportsReasoningEffort: vi.fn().mockReturnValue(false),
+    supportsVerbosity: vi.fn().mockReturnValue(false),
+    supportsReasoning: vi.fn().mockReturnValue(false),
+    resolveProviderId: vi.fn((providerId: string) => providerId)
+  }
+}))
+
+const createConfigPresenter = () =>
+  ({
+    getProviderModels: vi.fn().mockReturnValue([]),
+    getCustomModels: vi.fn().mockReturnValue([]),
+    getModelConfig: vi.fn().mockReturnValue(undefined),
+    getDbProviderModels: vi.fn().mockReturnValue([]),
+    getSetting: vi.fn().mockReturnValue(undefined),
+    setProviderModels: vi.fn(),
+    getModelStatus: vi.fn().mockReturnValue(true)
+  }) as unknown as IConfigPresenter
+
+const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
+  id: 'zenmux',
+  name: 'ZenMux',
+  apiType: 'zenmux',
+  apiKey: 'test-key',
+  baseUrl: 'https://zenmux.ai/api/v1/',
+  enable: false,
+  ...overrides
+})
+
+describe('ZenmuxProvider', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+    mockGetProxyUrl.mockReturnValue(null)
+    mockOpenAIModelsList.mockResolvedValue({ data: [] })
+    mockAnthropicModelsList.mockResolvedValue({ data: [] })
+    mockChatCompletionsCreate.mockResolvedValue({
+      choices: [{ message: { content: 'openai-ok' } }]
+    })
+    mockAnthropicMessagesCreate.mockResolvedValue({
+      content: [{ type: 'text', text: 'anthropic-ok' }],
+      usage: undefined
+    })
+  })
+
+  it('routes anthropic/* models through the fixed Anthropic endpoint', async () => {
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+
+    const result = await provider.generateText('hello', 'anthropic/claude-sonnet-4-5')
+
+    expect(result.content).toBe('anthropic-ok')
+    expect(mockAnthropicConstructor).toHaveBeenCalledWith(
+      expect.objectContaining({
+        apiKey: 'test-key',
+        baseURL: ZENMUX_ANTHROPIC_BASE_URL
+      })
+    )
+    expect(mockAnthropicMessagesCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        model: 'anthropic/claude-sonnet-4-5'
+      })
+    )
+    expect(mockAnthropicMessagesCreate.mock.calls.at(-1)?.[0]).not.toHaveProperty('cache_control')
+    expect(mockChatCompletionsCreate).not.toHaveBeenCalled()
+  })
+
+  it('uses explicit Anthropic cache breakpoints for ZenMux Claude history', async () => {
+    mockAnthropicMessagesCreate.mockResolvedValueOnce({
+      content: [{ type: 'text', text: 'anthropic-ok' }],
+      usage: undefined
+    })
+
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+    const anthropicDelegate = (provider as any).anthropicDelegate
+    anthropicDelegate.clientInitialized = true
+    anthropicDelegate.isInitialized = true
+    anthropicDelegate.anthropic = {
+      messages: {
+        create: mockAnthropicMessagesCreate
+      },
+      models: {
+        list: mockAnthropicModelsList
+      }
+    }
+    vi.spyOn(anthropicDelegate, 'ensureClientInitialized').mockResolvedValue(undefined)
+
+    const result = await provider.completions(
+      [
+        { role: 'user', content: 'history' },
+        { role: 'assistant', content: 'stable reply' },
+        { role: 'user', content: 'latest question' }
+      ],
+      'anthropic/claude-sonnet-4-5'
+    )
+
+    expect(result.content).toBe('anthropic-ok')
+    expect(mockAnthropicMessagesCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        model: 'anthropic/claude-sonnet-4-5',
+        messages: [
+          {
+            role: 'user',
+            content: [{ type: 'text', text: 'history' }]
+          },
+          {
+            role: 'assistant',
+            content: [
+              {
+                type: 'text',
+                text: 'stable reply',
+                cache_control: {
+                  type: 'ephemeral'
+                }
+              }
+            ]
+          },
+          {
+            role: 'user',
+            content: [{ type: 'text', text: 'latest question' }]
+          }
+        ]
+      })
+    )
+    expect(mockAnthropicMessagesCreate.mock.calls.at(-1)?.[0]).not.toHaveProperty('cache_control')
+  })
+
+  it('routes non-anthropic models through the configured OpenAI-compatible endpoint', async () => {
+    const provider = new ZenmuxProvider(
+      createProvider({ baseUrl: 'https://custom.zenmux.ai/api/v1' }),
+      createConfigPresenter()
+    )
+
+    const result = await provider.generateText('hello', 'moonshotai/kimi-k2.5')
+
+    expect(result.content).toBe('openai-ok')
+    expect(mockOpenAIConstructor).toHaveBeenCalledWith(
+      expect.objectContaining({
+        apiKey: 'test-key',
+        baseURL: 'https://custom.zenmux.ai/api/v1'
+      })
+    )
+    expect(mockChatCompletionsCreate).toHaveBeenCalledWith(
+      expect.objectContaining({
+        model: 'moonshotai/kimi-k2.5'
+      })
+    )
+    expect(mockAnthropicMessagesCreate).not.toHaveBeenCalled()
+  })
+
+  it('fetches model metadata from the OpenAI-compatible models API and keeps the ZenMux group', async () => {
+    mockOpenAIModelsList.mockResolvedValue({
+      data: [{ id: 'moonshotai/kimi-k2.5' }, { id: 'anthropic/claude-sonnet-4-5' }]
+    })
+
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+    const models = await provider.fetchModels()
+
+    expect(mockOpenAIModelsList).toHaveBeenCalled()
+    expect(models).toEqual([
+      expect.objectContaining({
+        id: 'moonshotai/kimi-k2.5',
+        group: 'ZenMux',
+        providerId: 'zenmux'
+      }),
+      expect.objectContaining({
+        id: 'anthropic/claude-sonnet-4-5',
+        group: 'ZenMux',
+        providerId: 'zenmux'
+      })
+    ])
+  })
+
+  it('uses the OpenAI-compatible check path', async () => {
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+
+    const result = await provider.check()
+
+    expect(result).toEqual({ isOk: true, errorMsg: null })
+    expect(mockOpenAIModelsList).toHaveBeenCalled()
+    expect(mockAnthropicMessagesCreate).not.toHaveBeenCalled()
+  })
+
+  it('refreshes both delegates on proxy updates after the anthropic route has been initialized', async () => {
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+    const openaiDelegate = (provider as any).openaiDelegate
+    const anthropicDelegate = (provider as any).anthropicDelegate
+    const openaiProxySpy = vi.spyOn(openaiDelegate, 'onProxyResolved')
+    const anthropicProxySpy = vi.spyOn(anthropicDelegate, 'onProxyResolved')
+    await anthropicDelegate.ensureClientInitialized()
+
+    expect(anthropicDelegate.isClientInitialized()).toBe(true)
+
+    provider.onProxyResolved()
+
+    expect(openaiProxySpy).toHaveBeenCalledTimes(1)
+    expect(anthropicProxySpy).toHaveBeenCalledTimes(1)
+  })
+
+  it('fails fast for embeddings on anthropic/* models', async () => {
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+
+    await expect(provider.getEmbeddings('anthropic/claude-sonnet-4-5', ['hello'])).rejects.toThrow(
+      'Embeddings not supported for Anthropic models: anthropic/claude-sonnet-4-5'
+    )
+  })
+
+  it('fails fast for embedding dimensions on anthropic/* models', async () => {
+    const provider = new ZenmuxProvider(createProvider(), createConfigPresenter())
+
+    await expect(provider.getDimensions('anthropic/claude-sonnet-4-5')).rejects.toThrow(
+      'Embeddings not supported for Anthropic models: anthropic/claude-sonnet-4-5'
+    )
+  })
+})
diff --git a/test/main/presenter/mcpPresenter/toolManager.test.ts b/test/main/presenter/mcpPresenter/toolManager.test.ts
index 79e7e0e83..d39b690be 100644
--- a/test/main/presenter/mcpPresenter/toolManager.test.ts
+++ b/test/main/presenter/mcpPresenter/toolManager.test.ts
@@ -8,7 +8,7 @@ const eventBusMocks = vi.hoisted(() => ({
 }))
 
 const presenterMocks = vi.hoisted(() => ({
-  newAgentPresenter: {
+  agentSessionPresenter: {
     getSession: vi.fn()
   }
 }))
@@ -95,7 +95,7 @@ describe('ToolManager ACP MCP access control', () => {
     configPresenter.getAcpAgents.mockResolvedValue([{ id: 'agent-1', name: 'Agent 1' }])
     configPresenter.getAgentMcpSelections.mockResolvedValue([])
 
-    presenterMocks.newAgentPresenter.getSession.mockResolvedValue({
+    presenterMocks.agentSessionPresenter.getSession.mockResolvedValue({
       id: 'session-1',
       agentId: 'agent-1',
       title: 'New Chat',
@@ -137,7 +137,7 @@ describe('ToolManager ACP MCP access control', () => {
   it('skips ACP session resolution when provider hint is non-ACP', async () => {
     const client = createClient('open-server')
     const configPresenter = createConfigPresenter('open-server')
-    presenterMocks.newAgentPresenter.getSession.mockResolvedValue(null)
+    presenterMocks.agentSessionPresenter.getSession.mockResolvedValue(null)
 
     const manager = new ToolManager(
       configPresenter as never,
@@ -160,7 +160,7 @@ describe('ToolManager ACP MCP access control', () => {
     expect(result.isError).toBe(false)
     expect(result.content).toBe('ok')
     expect(client.callTool).toHaveBeenCalledWith('echo', {})
-    expect(presenterMocks.newAgentPresenter.getSession).not.toHaveBeenCalled()
+    expect(presenterMocks.agentSessionPresenter.getSession).not.toHaveBeenCalled()
     expect(configPresenter.getAgentMcpSelections).not.toHaveBeenCalled()
     expect(
       warnSpy.mock.calls.some((call) =>
@@ -173,7 +173,7 @@ describe('ToolManager ACP MCP access control', () => {
     const client = createClient('open-server')
     const configPresenter = createConfigPresenter('open-server')
 
-    presenterMocks.newAgentPresenter.getSession.mockResolvedValue({
+    presenterMocks.agentSessionPresenter.getSession.mockResolvedValue({
       id: 'session-2',
       agentId: 'deepchat',
       title: 'Normal Chat',
@@ -213,7 +213,7 @@ describe('ToolManager ACP MCP access control', () => {
   it('treats missing provider hint as a fallback to new session resolution', async () => {
     const client = createClient('open-server')
     const configPresenter = createConfigPresenter('open-server')
-    presenterMocks.newAgentPresenter.getSession.mockResolvedValue(null)
+    presenterMocks.agentSessionPresenter.getSession.mockResolvedValue(null)
 
     const manager = new ToolManager(
       configPresenter as never,
@@ -235,7 +235,7 @@ describe('ToolManager ACP MCP access control', () => {
     expect(result.isError).toBe(false)
     expect(result.content).toBe('ok')
     expect(client.callTool).toHaveBeenCalledWith('echo', {})
-    expect(presenterMocks.newAgentPresenter.getSession).toHaveBeenCalledWith('conv-fallback')
+    expect(presenterMocks.agentSessionPresenter.getSession).toHaveBeenCalledWith('conv-fallback')
     expect(configPresenter.getAgentMcpSelections).not.toHaveBeenCalled()
   })
 })
diff --git a/test/main/presenter/remoteControlPresenter/feishuRuntime.test.ts b/test/main/presenter/remoteControlPresenter/feishuRuntime.test.ts
index 986ab9b3f..fc1102240 100644
--- a/test/main/presenter/remoteControlPresenter/feishuRuntime.test.ts
+++ b/test/main/presenter/remoteControlPresenter/feishuRuntime.test.ts
@@ -2,6 +2,7 @@ import { describe, expect, it, vi } from 'vitest'
 import { FeishuRuntime } from '@/presenter/remoteControlPresenter/feishu/feishuRuntime'
 import {
   FEISHU_CONVERSATION_POLL_TIMEOUT_MS,
+  FEISHU_OUTBOUND_TEXT_LIMIT,
   TELEGRAM_STREAM_POLL_INTERVAL_MS,
   type FeishuInboundMessage
 } from '@/presenter/remoteControlPresenter/types'
@@ -72,7 +73,10 @@ const createHarness = async (options?: { logger?: { error: (...params: unknown[]
     rememberRemoteDeliveryState: vi.fn((endpointKey: string, state: any) => {
       deliveryStates.set(endpointKey, {
         ...state,
-        contentMessageIds: [...state.contentMessageIds]
+        segments: state.segments.map((segment: any) => ({
+          ...segment,
+          messageIds: [...segment.messageIds]
+        }))
       })
     }),
     clearRemoteDeliveryState: vi.fn((endpointKey: string) => {
@@ -104,7 +108,7 @@ const createHarness = async (options?: { logger?: { error: (...params: unknown[]
 }
 
 describe('FeishuRuntime', () => {
-  it('streams answer text beside a temporary status message', async () => {
+  it('streams answer text beside a persistent trace log', async () => {
     vi.useFakeTimers()
 
     try {
@@ -119,6 +123,15 @@ describe('FeishuRuntime', () => {
             .mockResolvedValueOnce({
               messageId: 'msg-1',
               text: '',
+              traceText: '💻 shell_command: "git status"',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:process',
+                  kind: 'process',
+                  text: '💻 shell_command: "git status"',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
               statusText: 'Running: thinking...',
               finalText: '',
               draftText: '',
@@ -127,9 +140,50 @@ describe('FeishuRuntime', () => {
               completed: false,
               pendingInteraction: null
             })
+            .mockResolvedValueOnce({
+              messageId: 'msg-1',
+              text: 'Draft answer',
+              traceText: '💻 shell_command: "git status"',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:process',
+                  kind: 'process',
+                  text: '💻 shell_command: "git status"',
+                  sourceMessageId: 'msg-1'
+                },
+                {
+                  key: 'msg-1:1:answer',
+                  kind: 'answer',
+                  text: 'Draft answer',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: '',
+              draftText: '',
+              renderBlocks: [],
+              fullText: '[Answer]\nDraft answer',
+              completed: false,
+              pendingInteraction: null
+            })
             .mockResolvedValue({
               messageId: 'msg-1',
               text: 'Draft answer',
+              traceText: '💻 shell_command: "git status"',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:process',
+                  kind: 'process',
+                  text: '💻 shell_command: "git status"',
+                  sourceMessageId: 'msg-1'
+                },
+                {
+                  key: 'msg-1:1:answer',
+                  kind: 'answer',
+                  text: 'Final answer',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
               statusText: 'Running: writing...',
               finalText: 'Final answer',
               draftText: '',
@@ -154,7 +208,7 @@ describe('FeishuRuntime', () => {
             threadId: null,
             replyToMessageId: 'om_incremental'
           },
-          'Running: thinking...'
+          '💻 shell_command: "git status"'
         )
       })
 
@@ -173,14 +227,23 @@ describe('FeishuRuntime', () => {
           'feishu:oc_1:root',
           expect.objectContaining({
             sourceMessageId: 'msg-1',
-            statusMessageId: 'om_bot_1',
-            contentMessageIds: ['om_bot_2'],
-            lastStatusText: 'Running: writing...',
-            lastContentText: 'Draft answer'
+            segments: [
+              {
+                key: 'msg-1:0:process',
+                kind: 'process',
+                messageIds: ['om_bot_1'],
+                lastText: '💻 shell_command: "git status"'
+              },
+              {
+                key: 'msg-1:1:answer',
+                kind: 'answer',
+                messageIds: ['om_bot_2'],
+                lastText: 'Draft answer'
+              }
+            ]
           })
         )
         expect(harness.client.updateText).toHaveBeenCalledWith('om_bot_2', 'Final answer')
-        expect(harness.client.deleteMessage).toHaveBeenCalledWith('om_bot_1')
         expect(harness.bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith(
           'feishu:oc_1:root'
         )
@@ -192,6 +255,95 @@ describe('FeishuRuntime', () => {
     }
   })
 
+  it('appends terminal text after a partial answer when the final state differs', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const harness = await createHarness()
+      harness.router.handleMessage.mockResolvedValue({
+        replies: [],
+        conversation: {
+          sessionId: 'session-1',
+          eventId: 'msg-1',
+          getSnapshot: vi
+            .fn()
+            .mockResolvedValueOnce({
+              messageId: 'msg-1',
+              text: 'Partial answer',
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: 'Partial answer',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: '',
+              completed: false,
+              pendingInteraction: null
+            })
+            .mockResolvedValue({
+              messageId: 'msg-1',
+              text: 'Partial answer',
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: 'Partial answer',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: 'The conversation ended with an error.',
+              completed: true,
+              pendingInteraction: null
+            })
+        }
+      })
+
+      await harness.onMessage({
+        parsed: createParsedMessage({
+          messageId: 'om_partial_error'
+        })
+      })
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_partial_error'
+          },
+          'Partial answer'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_partial_error'
+          },
+          'The conversation ended with an error.'
+        )
+        expect(harness.client.updateText).not.toHaveBeenCalledWith(
+          'om_bot_1',
+          'The conversation ended with an error.'
+        )
+      })
+
+      await harness.runtime.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
   it('keeps the latest answer chunk editable when streamed text exceeds the platform limit', async () => {
     vi.useFakeTimers()
 
@@ -210,6 +362,7 @@ describe('FeishuRuntime', () => {
             .mockResolvedValueOnce({
               messageId: 'msg-1',
               text: firstText,
+              traceText: '',
               statusText: 'Running: writing...',
               finalText: '',
               completed: false,
@@ -218,6 +371,7 @@ describe('FeishuRuntime', () => {
             .mockResolvedValueOnce({
               messageId: 'msg-1',
               text: expandedText,
+              traceText: '',
               statusText: 'Running: writing...',
               finalText: '',
               completed: false,
@@ -226,6 +380,7 @@ describe('FeishuRuntime', () => {
             .mockResolvedValue({
               messageId: 'msg-1',
               text: expandedText,
+              traceText: '',
               statusText: 'Running: writing...',
               finalText: expandedText,
               completed: true,
@@ -254,7 +409,7 @@ describe('FeishuRuntime', () => {
       await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
 
       await vi.waitFor(() => {
-        expect(harness.client.updateText).toHaveBeenCalledWith('om_bot_2', 'A'.repeat(8_000))
+        expect(harness.client.updateText).toHaveBeenCalledWith('om_bot_1', 'A'.repeat(8_000))
         expect(harness.client.sendText).toHaveBeenCalledWith(
           {
             chatId: 'oc_1',
@@ -268,7 +423,290 @@ describe('FeishuRuntime', () => {
       await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
 
       await vi.waitFor(() => {
-        expect(harness.client.deleteMessage).toHaveBeenCalledWith('om_bot_1')
+        expect(harness.client.deleteMessage).not.toHaveBeenCalled()
+      })
+
+      await harness.runtime.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('preserves null messageId holes so later updates do not target the wrong chunk', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const harness = await createHarness()
+      const firstChunk = 'A'.repeat(FEISHU_OUTBOUND_TEXT_LIMIT)
+      const changedMiddleChunk = 'D'.repeat(FEISHU_OUTBOUND_TEXT_LIMIT)
+      const initialText =
+        firstChunk + 'B'.repeat(FEISHU_OUTBOUND_TEXT_LIMIT) + 'C'.repeat(FEISHU_OUTBOUND_TEXT_LIMIT)
+      const updatedText = firstChunk + changedMiddleChunk + 'C'.repeat(FEISHU_OUTBOUND_TEXT_LIMIT)
+      const sendResults: Array<string | null> = ['om_bot_1', null, 'om_bot_3']
+
+      harness.client.sendText.mockImplementation(async () =>
+        sendResults.length > 0 ? (sendResults.shift() as string | null) : 'om_bot_4'
+      )
+      harness.router.handleMessage.mockResolvedValue({
+        replies: [],
+        conversation: {
+          sessionId: 'session-1',
+          eventId: 'msg-1',
+          getSnapshot: vi
+            .fn()
+            .mockResolvedValueOnce({
+              messageId: 'msg-1',
+              text: initialText,
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: initialText,
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: '',
+              completed: false,
+              pendingInteraction: null
+            })
+            .mockResolvedValue({
+              messageId: 'msg-1',
+              text: updatedText,
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: updatedText,
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: updatedText,
+              completed: true,
+              pendingInteraction: null
+            })
+        }
+      })
+
+      await harness.onMessage({
+        parsed: createParsedMessage({
+          messageId: 'om_hole_alignment'
+        })
+      })
+
+      await vi.waitFor(() => {
+        expect(harness.bindingStore.rememberRemoteDeliveryState).toHaveBeenCalled()
+      })
+
+      expect(harness.bindingStore.rememberRemoteDeliveryState.mock.calls[0]).toEqual([
+        'feishu:oc_1:root',
+        {
+          sourceMessageId: 'msg-1',
+          segments: [
+            {
+              key: 'msg-1:0:answer',
+              kind: 'answer',
+              messageIds: ['om_bot_1', null, 'om_bot_3'],
+              lastText: initialText
+            }
+          ]
+        }
+      ])
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(harness.client.updateText).not.toHaveBeenCalledWith('om_bot_3', changedMiddleChunk)
+      })
+
+      await harness.runtime.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('appends later process and answer segments in DeepChat order instead of rewriting the first answer', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const harness = await createHarness()
+      harness.router.handleMessage.mockResolvedValue({
+        replies: [],
+        conversation: {
+          sessionId: 'session-1',
+          eventId: 'msg-1',
+          getSnapshot: vi
+            .fn()
+            .mockResolvedValueOnce({
+              messageId: 'msg-1',
+              text: 'Let me inspect these files.',
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: 'Let me inspect these files.',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: '',
+              completed: false,
+              pendingInteraction: null
+            })
+            .mockResolvedValueOnce({
+              messageId: 'msg-1',
+              text: 'Let me inspect these files.',
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: 'Let me inspect these files.',
+                  sourceMessageId: 'msg-1'
+                },
+                {
+                  key: 'msg-1:1:process',
+                  kind: 'process',
+                  text: '📖 read_file: "/tmp/report.md"',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: calling read_file...',
+              finalText: '',
+              completed: false,
+              pendingInteraction: null
+            })
+            .mockResolvedValue({
+              messageId: 'msg-1',
+              text: 'Summary ready.',
+              traceText: '',
+              deliverySegments: [
+                {
+                  key: 'msg-1:0:answer',
+                  kind: 'answer',
+                  text: 'Let me inspect these files.',
+                  sourceMessageId: 'msg-1'
+                },
+                {
+                  key: 'msg-1:1:process',
+                  kind: 'process',
+                  text: '📖 read_file: "/tmp/report.md"',
+                  sourceMessageId: 'msg-1'
+                },
+                {
+                  key: 'msg-1:2:answer',
+                  kind: 'answer',
+                  text: 'Summary ready.',
+                  sourceMessageId: 'msg-1'
+                }
+              ],
+              statusText: 'Running: writing...',
+              finalText: 'Summary ready.',
+              completed: true,
+              pendingInteraction: null
+            })
+        }
+      })
+
+      await harness.onMessage({
+        parsed: createParsedMessage({
+          messageId: 'om_segment_order'
+        })
+      })
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_segment_order'
+          },
+          'Let me inspect these files.'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_segment_order'
+          },
+          '📖 read_file: "/tmp/report.md"'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_segment_order'
+          },
+          'Summary ready.'
+        )
+        expect(harness.client.updateText).not.toHaveBeenCalledWith('om_bot_1', 'Summary ready.')
+        expect(harness.bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith(
+          'feishu:oc_1:root'
+        )
+      })
+
+      await harness.runtime.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('keeps tool-only turns as trace-only without appending the no-response fallback', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const harness = await createHarness()
+      harness.router.handleMessage.mockResolvedValue({
+        replies: [],
+        conversation: {
+          sessionId: 'session-1',
+          eventId: 'msg-1',
+          getSnapshot: vi.fn().mockResolvedValue({
+            messageId: 'msg-1',
+            text: '',
+            traceText: '📖 read_file: "/tmp/report.md"',
+            statusText: 'Running: calling read_file...',
+            finalText: 'No assistant response was produced.',
+            renderBlocks: [],
+            completed: true,
+            pendingInteraction: null
+          })
+        }
+      })
+
+      await harness.onMessage({
+        parsed: createParsedMessage({
+          messageId: 'om_trace_only'
+        })
+      })
+
+      await vi.waitFor(() => {
+        expect(harness.client.sendText).toHaveBeenCalledTimes(1)
+        expect(harness.client.sendText).toHaveBeenCalledWith(
+          {
+            chatId: 'oc_1',
+            threadId: null,
+            replyToMessageId: 'om_trace_only'
+          },
+          '📖 read_file: "/tmp/report.md"'
+        )
+        expect(harness.bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith(
+          'feishu:oc_1:root'
+        )
       })
 
       await harness.runtime.stop()
@@ -844,14 +1282,6 @@ describe('FeishuRuntime', () => {
     })
 
     await vi.waitFor(() => {
-      expect(harness.client.sendText).toHaveBeenCalledWith(
-        {
-          chatId: 'oc_1',
-          threadId: null,
-          replyToMessageId: 'om-pending-card'
-        },
-        'Waiting for your response...'
-      )
       expect(harness.client.sendText).toHaveBeenCalledWith(
         {
           chatId: 'oc_1',
diff --git a/test/main/presenter/remoteControlPresenter/remoteBindingStore.test.ts b/test/main/presenter/remoteControlPresenter/remoteBindingStore.test.ts
index a492c0621..6506332fd 100644
--- a/test/main/presenter/remoteControlPresenter/remoteBindingStore.test.ts
+++ b/test/main/presenter/remoteControlPresenter/remoteBindingStore.test.ts
@@ -272,18 +272,38 @@ describe('RemoteBindingStore', () => {
 
     store.rememberRemoteDeliveryState('telegram:100:0', {
       sourceMessageId: 'msg-1',
-      statusMessageId: 100,
-      contentMessageIds: [101],
-      lastStatusText: 'Running: writing...',
-      lastContentText: 'Draft answer'
+      segments: [
+        {
+          key: 'msg-1:0:process',
+          kind: 'process',
+          messageIds: [100],
+          lastText: '💻 shell_command: "git status"'
+        },
+        {
+          key: 'msg-1:1:answer',
+          kind: 'answer',
+          messageIds: [101],
+          lastText: 'Draft answer'
+        }
+      ]
     })
 
     expect(store.getRemoteDeliveryState('telegram:100:0')).toEqual({
       sourceMessageId: 'msg-1',
-      statusMessageId: 100,
-      contentMessageIds: [101],
-      lastStatusText: 'Running: writing...',
-      lastContentText: 'Draft answer'
+      segments: [
+        {
+          key: 'msg-1:0:process',
+          kind: 'process',
+          messageIds: [100],
+          lastText: '💻 shell_command: "git status"'
+        },
+        {
+          key: 'msg-1:1:answer',
+          kind: 'answer',
+          messageIds: [101],
+          lastText: 'Draft answer'
+        }
+      ]
     })
 
     store.setBinding('telegram:100:0', 'session-2')
diff --git a/test/main/presenter/remoteControlPresenter/remoteBlockRenderer.test.ts b/test/main/presenter/remoteControlPresenter/remoteBlockRenderer.test.ts
index b5f088bc4..dd895dd17 100644
--- a/test/main/presenter/remoteControlPresenter/remoteBlockRenderer.test.ts
+++ b/test/main/presenter/remoteControlPresenter/remoteBlockRenderer.test.ts
@@ -1,10 +1,12 @@
 import { describe, expect, it, vi } from 'vitest'
 import {
+  buildRemoteDeliverySegments,
   buildRemoteDraftText,
   buildRemoteFinalText,
   buildRemoteFullText,
   buildRemoteRenderableBlocks,
   buildRemoteStreamText,
+  buildRemoteTraceText,
   buildRemoteStatusText
 } from '@/presenter/remoteControlPresenter/services/remoteBlockRenderer'
 
@@ -229,6 +231,189 @@ describe('remoteBlockRenderer', () => {
     expect(streamText).toBe('Visible answer\n\nMore answer')
   })
 
+  it('builds remote trace lines from raw tool names and summarized params', () => {
+    const traceText = buildRemoteTraceText([
+      {
+        type: 'tool_call',
+        content: '',
+        status: 'success',
+        timestamp: 1,
+        tool_call: {
+          id: 'tool-1',
+          name: 'search_files',
+          params: '{"query":"daily news|agent.dynamic|moti.send","limit":10}'
+        },
+        extra: {
+          toolCallArgsComplete: true
+        }
+      },
+      {
+        type: 'tool_call',
+        content: '',
+        status: 'success',
+        timestamp: 2,
+        tool_call: {
+          id: 'tool-2',
+          name: 'read_file',
+          params: '{"path":"/tmp/report.md"}'
+        },
+        extra: {
+          toolCallArgsComplete: true
+        }
+      }
+    ])
+
+    expect(traceText).toBe(
+      '🔎 search_files: "daily news|agent.dynamic|moti.send"\n📖 read_file: "/tmp/report.md"'
+    )
+  })
+
+  it('adds a separate error trace line for failed tool calls and truncates long previews', () => {
+    const traceText = buildRemoteTraceText([
+      {
+        type: 'tool_call',
+        content: '',
+        status: 'error',
+        timestamp: 1,
+        tool_call: {
+          id: 'tool-1',
+          name: 'shell_command',
+          params: JSON.stringify({
+            command: `ls ${'very-long-segment/'.repeat(20)}`
+          }),
+          response: JSON.stringify({
+            error: 'permission denied'
+          })
+        },
+        extra: {
+          toolCallArgsComplete: true
+        }
+      }
+    ])
+
+    expect(traceText).toContain('💻 shell_command: "ls very-long-segment/')
+    expect(traceText).toContain('..."')
+    expect(traceText).toContain('\n❌ shell_command: "permission denied"')
+  })
+
+  it('does not build trace text for answer-only turns', () => {
+    const traceText = buildRemoteTraceText([
+      {
+        type: 'content',
+        content: 'Only the final answer',
+        status: 'success',
+        timestamp: 1
+      }
+    ])
+
+    expect(traceText).toBe('')
+  })
+
+  it('builds ordered delivery segments that preserve answer and process transitions', () => {
+    const segments = buildRemoteDeliverySegments('msg-1', [
+      {
+        type: 'content',
+        content: 'Reviewing these files first.',
+        status: 'success',
+        timestamp: 1
+      },
+      {
+        type: 'tool_call',
+        content: '',
+        status: 'success',
+        timestamp: 2,
+        tool_call: {
+          id: 'tool-1',
+          name: 'read_file',
+          params: '{"path":"/tmp/a.md"}'
+        },
+        extra: {
+          toolCallArgsComplete: true
+        }
+      },
+      {
+        type: 'tool_call',
+        content: '',
+        status: 'error',
+        timestamp: 3,
+        tool_call: {
+          id: 'tool-2',
+          name: 'shell_command',
+          params: '{"command":"ls -la"}',
+          response: '{"error":"permission denied"}'
+        },
+        extra: {
+          toolCallArgsComplete: true
+        }
+      },
+      {
+        type: 'content',
+        content: 'Everything is organized.',
+        status: 'pending',
+        timestamp: 4
+      }
+    ])
+
+    expect(segments).toEqual([
+      {
+        key: 'msg-1:0:answer',
+        kind: 'answer',
+        text: 'Reviewing these files first.',
+        sourceMessageId: 'msg-1'
+      },
+      {
+        key: 'msg-1:1:process',
+        kind: 'process',
+        text: '📖 read_file: "/tmp/a.md"\n💻 shell_command: "ls -la"\n❌ shell_command: "permission denied"',
+        sourceMessageId: 'msg-1'
+      },
+      {
+        key: 'msg-1:3:answer',
+        kind: 'answer',
+        text: 'Everything is organized.',
+        sourceMessageId: 'msg-1'
+      }
+    ])
+  })
+
+  it('keeps consecutive answer blocks together when hidden blocks appear between them', () => {
+    const segments = buildRemoteDeliverySegments('msg-2', [
+      {
+        type: 'content',
+        content: 'Part 1',
+        status: 'success',
+        timestamp: 1
+      },
+      {
+        type: 'reasoning_content',
+        content: 'hidden',
+        status: 'success',
+        timestamp: 2
+      },
+      {
+        type: 'search',
+        content: '',
+        status: 'success',
+        timestamp: 3
+      },
+      {
+        type: 'content',
+        content: 'Part 2',
+        status: 'success',
+        timestamp: 4
+      }
+    ])
+
+    expect(segments).toEqual([
+      {
+        key: 'msg-2:0:answer',
+        kind: 'answer',
+        text: 'Part 1\n\nPart 2',
+        sourceMessageId: 'msg-2'
+      }
+    ])
+  })
+
   it('builds compact status text for tool execution and waiting states', () => {
     expect(
       buildRemoteStatusText([
diff --git a/test/main/presenter/remoteControlPresenter/remoteControlPresenter.test.ts b/test/main/presenter/remoteControlPresenter/remoteControlPresenter.test.ts
index 510727a1c..2f7a03dc0 100644
--- a/test/main/presenter/remoteControlPresenter/remoteControlPresenter.test.ts
+++ b/test/main/presenter/remoteControlPresenter/remoteControlPresenter.test.ts
@@ -127,8 +127,8 @@ describe('RemoteControlPresenter', () => {
 
     const presenter = new RemoteControlPresenter({
       configPresenter: configPresenter as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
@@ -175,8 +175,8 @@ describe('RemoteControlPresenter', () => {
 
     const presenter = new RemoteControlPresenter({
       configPresenter: configPresenter as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
@@ -210,8 +210,8 @@ describe('RemoteControlPresenter', () => {
 
     const presenter = new RemoteControlPresenter({
       configPresenter: configPresenter as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
@@ -278,8 +278,8 @@ describe('RemoteControlPresenter', () => {
 
     const presenter = new RemoteControlPresenter({
       configPresenter: configPresenter as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
@@ -344,8 +344,8 @@ describe('RemoteControlPresenter', () => {
         ...configPresenter,
         listAgents
       } as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
@@ -393,8 +393,8 @@ describe('RemoteControlPresenter', () => {
 
     const presenter = new RemoteControlPresenter({
       configPresenter: configPresenter as any,
-      newAgentPresenter: {} as any,
-      deepchatAgentPresenter: {} as any,
+      agentSessionPresenter: {} as any,
+      agentRuntimePresenter: {} as any,
       windowPresenter: {} as any,
       tabPresenter: {} as any,
       getHooksNotificationsConfig: () => hooksConfig,
diff --git a/test/main/presenter/remoteControlPresenter/remoteConversationRunner.test.ts b/test/main/presenter/remoteControlPresenter/remoteConversationRunner.test.ts
index 32ad38c0c..0da2e5d45 100644
--- a/test/main/presenter/remoteControlPresenter/remoteConversationRunner.test.ts
+++ b/test/main/presenter/remoteControlPresenter/remoteConversationRunner.test.ts
@@ -30,12 +30,12 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           createDetachedSession: vi
             .fn()
             .mockResolvedValue(createSession({ agentId: 'deepchat-alt' }))
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat-alt')
@@ -50,7 +50,7 @@ describe('RemoteConversationRunner', () => {
   })
 
   it('keeps using the bound session even after the default agent changes', async () => {
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       createDetachedSession: vi.fn(),
       getSession: vi.fn().mockResolvedValue(
         createSession({
@@ -78,7 +78,7 @@ describe('RemoteConversationRunner', () => {
       rememberActiveEvent: vi.fn(),
       setBinding: vi.fn()
     }
-    const deepchatAgentPresenter = {
+    const agentRuntimePresenter = {
       getActiveGeneration: vi.fn().mockReturnValue({
         eventId: 'msg-1',
         runId: 'run-1'
@@ -87,8 +87,8 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: newAgentPresenter as any,
-        deepchatAgentPresenter: deepchatAgentPresenter as any,
+        agentSessionPresenter: agentSessionPresenter as any,
+        agentRuntimePresenter: agentRuntimePresenter as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat-new')
@@ -99,12 +99,12 @@ describe('RemoteConversationRunner', () => {
     const execution = await runner.sendText('telegram:100:0', 'hello')
 
     expect(execution.sessionId).toBe('session-legacy')
-    expect(newAgentPresenter.sendMessage).toHaveBeenCalledWith('session-legacy', 'hello')
-    expect(newAgentPresenter.createDetachedSession).not.toHaveBeenCalled()
+    expect(agentSessionPresenter.sendMessage).toHaveBeenCalledWith('session-legacy', 'hello')
+    expect(agentSessionPresenter.createDetachedSession).not.toHaveBeenCalled()
   })
 
   it('lists recent sessions for the currently bound agent before falling back to default agent', async () => {
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       getSession: vi.fn().mockResolvedValue(
         createSession({
           id: 'session-bound',
@@ -134,8 +134,8 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: newAgentPresenter as any,
-        deepchatAgentPresenter: {} as any,
+        agentSessionPresenter: agentSessionPresenter as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat-default')
@@ -145,7 +145,7 @@ describe('RemoteConversationRunner', () => {
 
     const sessions = await runner.listSessions('telegram:100:0')
 
-    expect(newAgentPresenter.getSessionList).toHaveBeenCalledWith({
+    expect(agentSessionPresenter.getSessionList).toHaveBeenCalledWith({
       agentId: 'deepchat-bound'
     })
     expect(sessions.map((session) => session.id)).toEqual(['session-b', 'session-a'])
@@ -156,7 +156,7 @@ describe('RemoteConversationRunner', () => {
   })
 
   it('delegates remote model switching to the bound session', async () => {
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       getSession: vi.fn().mockResolvedValue(
         createSession({
           id: 'session-bound',
@@ -175,8 +175,8 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: newAgentPresenter as any,
-        deepchatAgentPresenter: {} as any,
+        agentSessionPresenter: agentSessionPresenter as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat-default')
@@ -191,7 +191,7 @@ describe('RemoteConversationRunner', () => {
 
     const updated = await runner.setSessionModel('telegram:100:0', 'anthropic', 'claude-3-5-sonnet')
 
-    expect(newAgentPresenter.setSessionModel).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.setSessionModel).toHaveBeenCalledWith(
       'session-bound',
       'anthropic',
       'claude-3-5-sonnet'
@@ -204,10 +204,10 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           getSession: vi.fn()
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {
           getAllWindows: vi.fn(),
           getFocusedWindow: vi.fn(),
@@ -236,11 +236,11 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           getSession: vi.fn().mockResolvedValue(createSession()),
           activateSession
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {
           getAllWindows: vi.fn().mockReturnValue([]),
           getFocusedWindow: vi.fn().mockReturnValue(null),
@@ -285,11 +285,11 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           getSession: vi.fn().mockResolvedValue(session),
           activateSession
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {
           getAllWindows: vi.fn().mockReturnValue([chatWindow]),
           getFocusedWindow: vi.fn().mockReturnValue(chatWindow),
@@ -334,7 +334,7 @@ describe('RemoteConversationRunner', () => {
       orderSeq: 2
     }
 
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       getSession: vi.fn().mockResolvedValue(session),
       getMessages: vi
         .fn()
@@ -361,7 +361,7 @@ describe('RemoteConversationRunner', () => {
       rememberActiveEvent: vi.fn(),
       setBinding: vi.fn()
     }
-    const deepchatAgentPresenter = {
+    const agentRuntimePresenter = {
       getActiveGeneration: vi
         .fn()
         .mockReturnValueOnce({
@@ -373,8 +373,8 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: newAgentPresenter as any,
-        deepchatAgentPresenter: deepchatAgentPresenter as any,
+        agentSessionPresenter: agentSessionPresenter as any,
+        agentRuntimePresenter: agentRuntimePresenter as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat-new')
@@ -394,6 +394,8 @@ describe('RemoteConversationRunner', () => {
     expect(snapshot).toEqual({
       messageId: null,
       text: 'No assistant response was produced.',
+      traceText: '',
+      deliverySegments: [],
       statusText: '',
       finalText: 'No assistant response was produced.',
       draftText: '',
@@ -410,7 +412,7 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           getSession: vi.fn().mockResolvedValue(createSession()),
           sendMessage: vi.fn().mockResolvedValue(undefined),
           getMessages: vi.fn().mockResolvedValue([
@@ -455,7 +457,7 @@ describe('RemoteConversationRunner', () => {
             }
           ])
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('deepchat')
@@ -492,7 +494,7 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           getSession: vi.fn().mockResolvedValue(createSession()),
           getMessages: vi.fn().mockResolvedValue([
             {
@@ -525,7 +527,7 @@ describe('RemoteConversationRunner', () => {
             ])
           })
         } as any,
-        deepchatAgentPresenter: {
+        agentRuntimePresenter: {
           getActiveGeneration: vi.fn().mockReturnValue({
             eventId: 'assistant-1',
             runId: 'run-1'
@@ -571,7 +573,7 @@ describe('RemoteConversationRunner', () => {
         }
       ])
     })
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       getSession: vi.fn().mockResolvedValue(createSession()),
       getMessages: vi
         .fn()
@@ -638,8 +640,8 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: newAgentPresenter as any,
-        deepchatAgentPresenter: {
+        agentSessionPresenter: agentSessionPresenter as any,
+        agentRuntimePresenter: {
           getActiveGeneration: vi.fn().mockReturnValue(null)
         } as any,
         windowPresenter: {} as any,
@@ -654,7 +656,7 @@ describe('RemoteConversationRunner', () => {
       granted: true
     })
 
-    expect(newAgentPresenter.respondToolInteraction).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.respondToolInteraction).toHaveBeenCalledWith(
       'session-1',
       'assistant-2',
       'tool-2',
@@ -669,6 +671,15 @@ describe('RemoteConversationRunner', () => {
     expect(snapshot).toEqual({
       messageId: 'assistant-2',
       text: 'Push completed.',
+      traceText: '',
+      deliverySegments: [
+        {
+          key: 'assistant-2:0:answer',
+          kind: 'answer',
+          text: 'Push completed.',
+          sourceMessageId: 'assistant-2'
+        }
+      ],
       statusText: 'Running: writing...',
       finalText: 'Push completed.',
       draftText: '',
@@ -696,10 +707,10 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           createDetachedSession
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('acp-agent')
@@ -729,8 +740,8 @@ describe('RemoteConversationRunner', () => {
         configPresenter: createConfigPresenter({
           getDefaultProjectPath: vi.fn(() => '/workspaces/global')
         }) as any,
-        newAgentPresenter: {} as any,
-        deepchatAgentPresenter: {} as any,
+        agentSessionPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('acp-agent')
@@ -749,10 +760,10 @@ describe('RemoteConversationRunner', () => {
     const runner = new RemoteConversationRunner(
       {
         configPresenter: createConfigPresenter() as any,
-        newAgentPresenter: {
+        agentSessionPresenter: {
           createDetachedSession: vi.fn()
         } as any,
-        deepchatAgentPresenter: {} as any,
+        agentRuntimePresenter: {} as any,
         windowPresenter: {} as any,
         tabPresenter: {} as any,
         resolveDefaultAgentId: vi.fn().mockResolvedValue('acp-agent')
diff --git a/test/main/presenter/remoteControlPresenter/telegramPoller.test.ts b/test/main/presenter/remoteControlPresenter/telegramPoller.test.ts
index 2a59def85..d87860628 100644
--- a/test/main/presenter/remoteControlPresenter/telegramPoller.test.ts
+++ b/test/main/presenter/remoteControlPresenter/telegramPoller.test.ts
@@ -1,7 +1,10 @@
 import { describe, expect, it, vi } from 'vitest'
 import { TelegramApiRequestError } from '@/presenter/remoteControlPresenter/telegram/telegramClient'
 import { TelegramPoller } from '@/presenter/remoteControlPresenter/telegram/telegramPoller'
-import { TELEGRAM_STREAM_POLL_INTERVAL_MS } from '@/presenter/remoteControlPresenter/types'
+import {
+  TELEGRAM_OUTBOUND_TEXT_LIMIT,
+  TELEGRAM_STREAM_POLL_INTERVAL_MS
+} from '@/presenter/remoteControlPresenter/types'
 
 const createClient = () => {
   let nextMessageId = 100
@@ -36,7 +39,10 @@ const createBindingStore = () => {
     rememberRemoteDeliveryState: vi.fn((endpointKey: string, state: any) => {
       deliveryStates.set(endpointKey, {
         ...state,
-        contentMessageIds: [...state.contentMessageIds]
+        segments: state.segments.map((segment: any) => ({
+          ...segment,
+          messageIds: [...segment.messageIds]
+        }))
       })
     }),
     clearRemoteDeliveryState: vi.fn((endpointKey: string) => {
@@ -387,7 +393,7 @@ describe('TelegramPoller', () => {
     await poller.stop()
   })
 
-  it('streams answer text beside a temporary status message', async () => {
+  it('streams answer text beside a persistent trace log', async () => {
     vi.useFakeTimers()
 
     try {
@@ -438,6 +444,15 @@ describe('TelegramPoller', () => {
                 .mockResolvedValueOnce({
                   messageId: 'msg-1',
                   text: '',
+                  traceText: '💻 shell_command: "git status"',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:process',
+                      kind: 'process',
+                      text: '💻 shell_command: "git status"',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
                   statusText: 'Running: thinking...',
                   finalText: '',
                   draftText: '',
@@ -449,6 +464,21 @@ describe('TelegramPoller', () => {
                 .mockResolvedValueOnce({
                   messageId: 'msg-1',
                   text: 'Draft answer',
+                  traceText: '💻 shell_command: "git status"',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:process',
+                      kind: 'process',
+                      text: '💻 shell_command: "git status"',
+                      sourceMessageId: 'msg-1'
+                    },
+                    {
+                      key: 'msg-1:1:answer',
+                      kind: 'answer',
+                      text: 'Draft answer',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
                   statusText: 'Running: writing...',
                   finalText: '',
                   draftText: '',
@@ -460,6 +490,21 @@ describe('TelegramPoller', () => {
                 .mockResolvedValue({
                   messageId: 'msg-1',
                   text: 'Draft answer',
+                  traceText: '💻 shell_command: "git status"',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:process',
+                      kind: 'process',
+                      text: '💻 shell_command: "git status"',
+                      sourceMessageId: 'msg-1'
+                    },
+                    {
+                      key: 'msg-1:1:answer',
+                      kind: 'answer',
+                      text: 'Final answer',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
                   statusText: 'Running: writing...',
                   finalText: 'Final answer',
                   draftText: '',
@@ -482,7 +527,7 @@ describe('TelegramPoller', () => {
             chatId: 100,
             messageThreadId: 0
           },
-          'Running: thinking...'
+          '💻 shell_command: "git status"'
         )
       })
 
@@ -496,23 +541,24 @@ describe('TelegramPoller', () => {
           },
           'Draft answer'
         )
-        expect(client.editMessageText).toHaveBeenCalledWith({
-          target: {
-            chatId: 100,
-            messageThreadId: 0
-          },
-          messageId: 100,
-          text: 'Running: writing...',
-          replyMarkup: undefined
-        })
         expect(bindingStore.rememberRemoteDeliveryState).toHaveBeenCalledWith(
           'telegram:100:0',
           expect.objectContaining({
             sourceMessageId: 'msg-1',
-            statusMessageId: 100,
-            contentMessageIds: [101],
-            lastStatusText: 'Running: writing...',
-            lastContentText: 'Draft answer'
+            segments: [
+              {
+                key: 'msg-1:0:process',
+                kind: 'process',
+                messageIds: [100],
+                lastText: '💻 shell_command: "git status"'
+              },
+              {
+                key: 'msg-1:1:answer',
+                kind: 'answer',
+                messageIds: [101],
+                lastText: 'Draft answer'
+              }
+            ]
           })
         )
       })
@@ -520,6 +566,11 @@ describe('TelegramPoller', () => {
       await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
 
       await vi.waitFor(() => {
+        expect(client.editMessageText).not.toHaveBeenCalledWith(
+          expect.objectContaining({
+            messageId: 100
+          })
+        )
         expect(client.editMessageText).toHaveBeenCalledWith({
           target: {
             chatId: 100,
@@ -529,13 +580,6 @@ describe('TelegramPoller', () => {
           text: 'Final answer',
           replyMarkup: undefined
         })
-        expect(client.deleteMessage).toHaveBeenCalledWith({
-          target: {
-            chatId: 100,
-            messageThreadId: 0
-          },
-          messageId: 100
-        })
         expect(bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith('telegram:100:0')
       })
 
@@ -599,6 +643,7 @@ describe('TelegramPoller', () => {
                 .mockResolvedValueOnce({
                   messageId: 'msg-1',
                   text: firstText,
+                  traceText: '',
                   statusText: 'Running: writing...',
                   finalText: '',
                   completed: false,
@@ -607,6 +652,7 @@ describe('TelegramPoller', () => {
                 .mockResolvedValueOnce({
                   messageId: 'msg-1',
                   text: expandedText,
+                  traceText: '',
                   statusText: 'Running: writing...',
                   finalText: '',
                   completed: false,
@@ -615,6 +661,7 @@ describe('TelegramPoller', () => {
                 .mockResolvedValue({
                   messageId: 'msg-1',
                   text: expandedText,
+                  traceText: '',
                   statusText: 'Running: writing...',
                   finalText: expandedText,
                   completed: true,
@@ -646,7 +693,7 @@ describe('TelegramPoller', () => {
             chatId: 100,
             messageThreadId: 0
           },
-          messageId: 101,
+          messageId: 100,
           text: 'A'.repeat(4_096),
           replyMarkup: undefined
         })
@@ -662,13 +709,610 @@ describe('TelegramPoller', () => {
       await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
 
       await vi.waitFor(() => {
-        expect(client.deleteMessage).toHaveBeenCalledWith({
-          target: {
+        expect(client.deleteMessage).not.toHaveBeenCalled()
+      })
+
+      await poller.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('preserves null messageId holes from stored delivery state so edits stay aligned', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const client = createClient()
+      const bindingStore = createBindingStore()
+      const firstChunk = 'A'.repeat(TELEGRAM_OUTBOUND_TEXT_LIMIT)
+      const changedMiddleChunk = 'D'.repeat(TELEGRAM_OUTBOUND_TEXT_LIMIT)
+      const initialText =
+        firstChunk +
+        ' ' +
+        'B'.repeat(TELEGRAM_OUTBOUND_TEXT_LIMIT) +
+        ' ' +
+        'C'.repeat(TELEGRAM_OUTBOUND_TEXT_LIMIT)
+      const updatedText =
+        firstChunk + ' ' + changedMiddleChunk + ' ' + 'C'.repeat(TELEGRAM_OUTBOUND_TEXT_LIMIT)
+
+      bindingStore.rememberRemoteDeliveryState('telegram:100:0', {
+        sourceMessageId: 'msg-1',
+        segments: [
+          {
+            key: 'msg-1:0:answer',
+            kind: 'answer',
+            messageIds: [100, null, 102],
+            lastText: initialText
+          }
+        ]
+      })
+
+      client.getUpdates
+        .mockResolvedValueOnce([
+          {
+            update_id: 1,
+            message: {
+              message_id: 20,
+              chat: {
+                id: 100,
+                type: 'private'
+              },
+              from: {
+                id: 123
+              },
+              text: 'hello'
+            }
+          }
+        ])
+        .mockImplementation(createBlockingUpdates())
+
+      const poller = new TelegramPoller({
+        client: client as any,
+        parser: {
+          parseUpdate: vi.fn().mockReturnValue({
+            kind: 'message',
+            updateId: 1,
+            chatId: 100,
+            messageThreadId: 0,
+            messageId: 20,
+            chatType: 'private',
+            fromId: 123,
+            text: 'hello',
+            command: null
+          })
+        } as any,
+        router: {
+          handleMessage: vi.fn().mockResolvedValue({
+            replies: [],
+            conversation: {
+              sessionId: 'session-1',
+              eventId: 'msg-1',
+              getSnapshot: vi.fn().mockResolvedValue({
+                messageId: 'msg-1',
+                text: updatedText,
+                traceText: '',
+                deliverySegments: [
+                  {
+                    key: 'msg-1:0:answer',
+                    kind: 'answer',
+                    text: updatedText,
+                    sourceMessageId: 'msg-1'
+                  }
+                ],
+                statusText: 'Running: writing...',
+                finalText: updatedText,
+                completed: true,
+                pendingInteraction: null
+              })
+            }
+          })
+        } as any,
+        bindingStore: bindingStore as any
+      })
+
+      await poller.start()
+
+      await vi.waitFor(() => {
+        expect(client.editMessageText).not.toHaveBeenCalledWith(
+          expect.objectContaining({
+            messageId: 102,
+            text: changedMiddleChunk
+          })
+        )
+      })
+
+      await poller.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('appends terminal text after a partial answer when the final state differs', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const client = createClient()
+      const bindingStore = createBindingStore()
+
+      client.getUpdates
+        .mockResolvedValueOnce([
+          {
+            update_id: 1,
+            message: {
+              message_id: 20,
+              chat: {
+                id: 100,
+                type: 'private'
+              },
+              from: {
+                id: 123
+              },
+              text: 'hello'
+            }
+          }
+        ])
+        .mockImplementation(createBlockingUpdates())
+
+      const poller = new TelegramPoller({
+        client: client as any,
+        parser: {
+          parseUpdate: vi.fn().mockReturnValue({
+            kind: 'message',
+            updateId: 1,
+            chatId: 100,
+            messageThreadId: 0,
+            messageId: 20,
+            chatType: 'private',
+            fromId: 123,
+            text: 'hello',
+            command: null
+          })
+        } as any,
+        router: {
+          handleMessage: vi.fn().mockResolvedValue({
+            replies: [],
+            conversation: {
+              sessionId: 'session-1',
+              eventId: 'msg-1',
+              getSnapshot: vi
+                .fn()
+                .mockResolvedValueOnce({
+                  messageId: 'msg-1',
+                  text: 'Partial answer',
+                  traceText: '',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:answer',
+                      kind: 'answer',
+                      text: 'Partial answer',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
+                  statusText: 'Running: writing...',
+                  finalText: '',
+                  completed: false,
+                  pendingInteraction: null
+                })
+                .mockResolvedValue({
+                  messageId: 'msg-1',
+                  text: 'Partial answer',
+                  traceText: '',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:answer',
+                      kind: 'answer',
+                      text: 'Partial answer',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
+                  statusText: 'Running: writing...',
+                  finalText: 'The conversation ended with an error.',
+                  completed: true,
+                  pendingInteraction: null
+                })
+            }
+          })
+        } as any,
+        bindingStore: bindingStore as any
+      })
+
+      await poller.start()
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
             chatId: 100,
             messageThreadId: 0
           },
-          messageId: 100
-        })
+          'Partial answer'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          'The conversation ended with an error.'
+        )
+        expect(client.editMessageText).not.toHaveBeenCalledWith(
+          expect.objectContaining({
+            messageId: 100,
+            text: 'The conversation ended with an error.'
+          })
+        )
+      })
+
+      await poller.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('does not append a terminal segment when the latest answer already matches after a process segment', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const client = createClient()
+      const bindingStore = createBindingStore()
+
+      client.getUpdates
+        .mockResolvedValueOnce([
+          {
+            update_id: 1,
+            message: {
+              message_id: 20,
+              chat: {
+                id: 100,
+                type: 'private'
+              },
+              from: {
+                id: 123
+              },
+              text: 'hello'
+            }
+          }
+        ])
+        .mockImplementation(createBlockingUpdates())
+
+      const poller = new TelegramPoller({
+        client: client as any,
+        parser: {
+          parseUpdate: vi.fn().mockReturnValue({
+            kind: 'message',
+            updateId: 1,
+            chatId: 100,
+            messageThreadId: 0,
+            messageId: 20,
+            chatType: 'private',
+            fromId: 123,
+            text: 'hello',
+            command: null
+          })
+        } as any,
+        router: {
+          handleMessage: vi.fn().mockResolvedValue({
+            replies: [],
+            conversation: {
+              sessionId: 'session-1',
+              eventId: 'msg-1',
+              getSnapshot: vi.fn().mockResolvedValueOnce({
+                messageId: 'msg-1',
+                text: 'Final answer',
+                traceText: '',
+                deliverySegments: [
+                  {
+                    key: 'msg-1:0:answer',
+                    kind: 'answer',
+                    text: 'Final answer',
+                    sourceMessageId: 'msg-1'
+                  },
+                  {
+                    key: 'msg-1:1:process',
+                    kind: 'process',
+                    text: '💻 shell_command: "git status"',
+                    sourceMessageId: 'msg-1'
+                  }
+                ],
+                statusText: 'Running: processing tool results...',
+                finalText: 'Final answer',
+                completed: true,
+                pendingInteraction: null
+              })
+            }
+          })
+        } as any,
+        bindingStore: bindingStore as any
+      })
+
+      await poller.start()
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          'Final answer'
+        )
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          '💻 shell_command: "git status"'
+        )
+      })
+
+      expect(client.sendMessage).not.toHaveBeenCalledWith(
+        {
+          chatId: 100,
+          messageThreadId: 0
+        },
+        'Final answer',
+        expect.anything()
+      )
+      expect(
+        client.sendMessage.mock.calls.filter(([, text]) => text === 'Final answer')
+      ).toHaveLength(1)
+
+      await poller.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('appends later process and answer segments in DeepChat order instead of rewriting the first answer', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const client = createClient()
+      const bindingStore = createBindingStore()
+
+      client.getUpdates
+        .mockResolvedValueOnce([
+          {
+            update_id: 1,
+            message: {
+              message_id: 20,
+              chat: {
+                id: 100,
+                type: 'private'
+              },
+              from: {
+                id: 123
+              },
+              text: 'hello'
+            }
+          }
+        ])
+        .mockImplementation(createBlockingUpdates())
+
+      const poller = new TelegramPoller({
+        client: client as any,
+        parser: {
+          parseUpdate: vi.fn().mockReturnValue({
+            kind: 'message',
+            updateId: 1,
+            chatId: 100,
+            messageThreadId: 0,
+            messageId: 20,
+            chatType: 'private',
+            fromId: 123,
+            text: 'hello',
+            command: null
+          })
+        } as any,
+        router: {
+          handleMessage: vi.fn().mockResolvedValue({
+            replies: [],
+            conversation: {
+              sessionId: 'session-1',
+              eventId: 'msg-1',
+              getSnapshot: vi
+                .fn()
+                .mockResolvedValueOnce({
+                  messageId: 'msg-1',
+                  text: 'Let me inspect these files.',
+                  traceText: '',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:answer',
+                      kind: 'answer',
+                      text: 'Let me inspect these files.',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
+                  statusText: 'Running: writing...',
+                  finalText: '',
+                  completed: false,
+                  pendingInteraction: null
+                })
+                .mockResolvedValueOnce({
+                  messageId: 'msg-1',
+                  text: 'Let me inspect these files.',
+                  traceText: '',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:answer',
+                      kind: 'answer',
+                      text: 'Let me inspect these files.',
+                      sourceMessageId: 'msg-1'
+                    },
+                    {
+                      key: 'msg-1:1:process',
+                      kind: 'process',
+                      text: '📖 read_file: "/tmp/report.md"',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
+                  statusText: 'Running: calling read_file...',
+                  finalText: '',
+                  completed: false,
+                  pendingInteraction: null
+                })
+                .mockResolvedValue({
+                  messageId: 'msg-1',
+                  text: 'Summary ready.',
+                  traceText: '',
+                  deliverySegments: [
+                    {
+                      key: 'msg-1:0:answer',
+                      kind: 'answer',
+                      text: 'Let me inspect these files.',
+                      sourceMessageId: 'msg-1'
+                    },
+                    {
+                      key: 'msg-1:1:process',
+                      kind: 'process',
+                      text: '📖 read_file: "/tmp/report.md"',
+                      sourceMessageId: 'msg-1'
+                    },
+                    {
+                      key: 'msg-1:2:answer',
+                      kind: 'answer',
+                      text: 'Summary ready.',
+                      sourceMessageId: 'msg-1'
+                    }
+                  ],
+                  statusText: 'Running: writing...',
+                  finalText: 'Summary ready.',
+                  completed: true,
+                  pendingInteraction: null
+                })
+            }
+          })
+        } as any,
+        bindingStore: bindingStore as any
+      })
+
+      await poller.start()
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          'Let me inspect these files.'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          '📖 read_file: "/tmp/report.md"'
+        )
+      })
+
+      await vi.advanceTimersByTimeAsync(TELEGRAM_STREAM_POLL_INTERVAL_MS)
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          'Summary ready.'
+        )
+        expect(client.editMessageText).not.toHaveBeenCalledWith(
+          expect.objectContaining({
+            messageId: 100,
+            text: 'Summary ready.'
+          })
+        )
+        expect(bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith('telegram:100:0')
+      })
+
+      await poller.stop()
+    } finally {
+      vi.useRealTimers()
+    }
+  })
+
+  it('keeps tool-only turns as trace-only without appending the no-response fallback', async () => {
+    vi.useFakeTimers()
+
+    try {
+      const client = createClient()
+      const bindingStore = createBindingStore()
+
+      client.getUpdates
+        .mockResolvedValueOnce([
+          {
+            update_id: 1,
+            message: {
+              message_id: 20,
+              chat: {
+                id: 100,
+                type: 'private'
+              },
+              from: {
+                id: 123
+              },
+              text: 'hello'
+            }
+          }
+        ])
+        .mockImplementation(createBlockingUpdates())
+
+      const poller = new TelegramPoller({
+        client: client as any,
+        parser: {
+          parseUpdate: vi.fn().mockReturnValue({
+            kind: 'message',
+            updateId: 1,
+            chatId: 100,
+            messageThreadId: 0,
+            messageId: 20,
+            chatType: 'private',
+            fromId: 123,
+            text: 'hello',
+            command: null
+          })
+        } as any,
+        router: {
+          handleMessage: vi.fn().mockResolvedValue({
+            replies: [],
+            conversation: {
+              sessionId: 'session-1',
+              eventId: 'msg-1',
+              getSnapshot: vi.fn().mockResolvedValue({
+                messageId: 'msg-1',
+                text: '',
+                traceText: '📖 read_file: "/tmp/report.md"',
+                statusText: 'Running: calling read_file...',
+                finalText: 'No assistant response was produced.',
+                renderBlocks: [],
+                completed: true,
+                pendingInteraction: null
+              })
+            }
+          })
+        } as any,
+        bindingStore: bindingStore as any
+      })
+
+      await poller.start()
+
+      await vi.waitFor(() => {
+        expect(client.sendMessage).toHaveBeenCalledTimes(1)
+        expect(client.sendMessage).toHaveBeenCalledWith(
+          {
+            chatId: 100,
+            messageThreadId: 0
+          },
+          '📖 read_file: "/tmp/report.md"'
+        )
+        expect(bindingStore.clearRemoteDeliveryState).toHaveBeenCalledWith('telegram:100:0')
       })
 
       await poller.stop()
@@ -1132,18 +1776,10 @@ describe('TelegramPoller', () => {
           chatId: 100,
           messageThreadId: 0
         },
-        'Waiting for your response...'
-      )
-      expect(client.sendMessage).toHaveBeenNthCalledWith(
-        2,
-        {
-          chatId: 100,
-          messageThreadId: 0
-        },
         'Partial answer'
       )
       expect(client.sendMessage).toHaveBeenNthCalledWith(
-        3,
+        2,
         {
           chatId: 100,
           messageThreadId: 0
diff --git a/test/main/presenter/sqlitePresenter.test.ts b/test/main/presenter/sqlitePresenter.test.ts
index 392e98f7a..e42c7998b 100644
--- a/test/main/presenter/sqlitePresenter.test.ts
+++ b/test/main/presenter/sqlitePresenter.test.ts
@@ -637,4 +637,104 @@ describeIfSqlite('SQLitePresenter legacy schema bootstrap', () => {
 
     presenter.close()
   })
+
+  it('migrates deepchat_usage_stats to include cache_write_input_tokens without losing rows', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'deepchat-sqlite-presenter-'))
+    tempDirs.push(tempDir)
+
+    const dbPath = path.join(tempDir, 'agent.db')
+    const bootstrapDb = new DatabaseCtor(dbPath)
+    bootstrapDb.exec(`
+      CREATE TABLE IF NOT EXISTS schema_versions (
+        version INTEGER PRIMARY KEY,
+        applied_at INTEGER NOT NULL
+      );
+      INSERT INTO schema_versions (version, applied_at) VALUES (21, ${Date.now()});
+      CREATE TABLE IF NOT EXISTS deepchat_usage_stats (
+        message_id TEXT PRIMARY KEY,
+        session_id TEXT NOT NULL,
+        usage_date TEXT NOT NULL,
+        provider_id TEXT NOT NULL,
+        model_id TEXT NOT NULL,
+        input_tokens INTEGER NOT NULL DEFAULT 0,
+        output_tokens INTEGER NOT NULL DEFAULT 0,
+        total_tokens INTEGER NOT NULL DEFAULT 0,
+        cached_input_tokens INTEGER NOT NULL DEFAULT 0,
+        estimated_cost_usd REAL,
+        source TEXT NOT NULL DEFAULT 'live',
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL
+      );
+      INSERT INTO deepchat_usage_stats (
+        message_id,
+        session_id,
+        usage_date,
+        provider_id,
+        model_id,
+        input_tokens,
+        output_tokens,
+        total_tokens,
+        cached_input_tokens,
+        estimated_cost_usd,
+        source,
+        created_at,
+        updated_at
+      ) VALUES (
+        'message-1',
+        'session-1',
+        '2026-03-10',
+        'openai',
+        'gpt-4o',
+        120,
+        30,
+        150,
+        20,
+        0.01,
+        'live',
+        1000,
+        2000
+      );
+    `)
+    bootstrapDb.close()
+
+    const presenter = new SQLitePresenterCtor(dbPath)
+    presenter.close()
+
+    const checkDb = new DatabaseCtor(dbPath)
+    const usageColumns = checkDb.prepare('PRAGMA table_info(deepchat_usage_stats)').all() as Array<{
+      name: string
+    }>
+    const columnNames = new Set(usageColumns.map((column) => column.name))
+    const row = checkDb
+      .prepare(
+        `SELECT
+          message_id,
+          cached_input_tokens,
+          cache_write_input_tokens,
+          estimated_cost_usd
+         FROM deepchat_usage_stats
+         WHERE message_id = ?`
+      )
+      .get('message-1') as
+      | {
+          message_id: string
+          cached_input_tokens: number
+          cache_write_input_tokens: number
+          estimated_cost_usd: number | null
+        }
+      | undefined
+    const versions = checkDb
+      .prepare('SELECT version FROM schema_versions ORDER BY version ASC')
+      .all() as Array<{ version: number }>
+
+    expect(columnNames.has('cache_write_input_tokens')).toBe(true)
+    expect(row).toEqual({
+      message_id: 'message-1',
+      cached_input_tokens: 20,
+      cache_write_input_tokens: 0,
+      estimated_cost_usd: 0.01
+    })
+    expect(versions.map((entry) => entry.version)).toContain(22)
+    checkDb.close()
+  })
 })
diff --git a/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts b/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts
index c7137db5d..4389f115b 100644
--- a/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts
+++ b/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { DeepChatInternalSessionUpdate } from '@/presenter/deepchatAgentPresenter/internalSessionEvents'
+import type { DeepChatInternalSessionUpdate } from '@/presenter/agentRuntimePresenter/internalSessionEvents'
 import {
   SubagentOrchestratorTool,
   SUBAGENT_ORCHESTRATOR_TOOL_NAME
diff --git a/test/main/presenter/usageStats.test.ts b/test/main/presenter/usageStats.test.ts
new file mode 100644
index 000000000..f22960a42
--- /dev/null
+++ b/test/main/presenter/usageStats.test.ts
@@ -0,0 +1,107 @@
+import { describe, expect, it, vi } from 'vitest'
+
+vi.mock('../../../src/main/presenter/configPresenter/providerDbLoader', () => ({
+  providerDbLoader: {
+    getModel: vi.fn((providerId: string, modelId: string) => {
+      if (providerId === 'anthropic' && modelId === 'claude-sonnet') {
+        return {
+          cost: {
+            input: 3,
+            output: 15,
+            cache_read: 0.3,
+            cache_write: 3.75
+          }
+        }
+      }
+      if (providerId === 'bedrock' && modelId === 'claude-bedrock') {
+        return {
+          cost: {
+            input: 4,
+            output: 20,
+            cache_read: 0.5
+          }
+        }
+      }
+      return undefined
+    })
+  }
+}))
+
+import {
+  buildUsageStatsRecord,
+  estimateUsageCostUsd,
+  normalizeUsageCounts
+} from '../../../src/main/presenter/usageStats'
+
+describe('usageStats cache pricing', () => {
+  it('charges uncached input, cache read, cache write, and output separately', () => {
+    const cost = estimateUsageCostUsd({
+      providerId: 'anthropic',
+      modelId: 'claude-sonnet',
+      inputTokens: 1_000,
+      outputTokens: 200,
+      cachedInputTokens: 400,
+      cacheWriteInputTokens: 100
+    })
+
+    expect(cost).toBeCloseTo((500 * 3 + 400 * 0.3 + 100 * 3.75 + 200 * 15) / 1_000_000)
+  })
+
+  it('falls back to the input price when cache_write pricing is unavailable', () => {
+    const cost = estimateUsageCostUsd({
+      providerId: 'bedrock',
+      modelId: 'claude-bedrock',
+      inputTokens: 900,
+      outputTokens: 100,
+      cachedInputTokens: 300,
+      cacheWriteInputTokens: 200
+    })
+
+    expect(cost).toBeCloseTo((400 * 4 + 300 * 0.5 + 200 * 4 + 100 * 20) / 1_000_000)
+  })
+
+  it('caps cached and cache-write counts against total input tokens', () => {
+    expect(
+      normalizeUsageCounts({
+        inputTokens: 100,
+        outputTokens: 20,
+        totalTokens: 120,
+        cachedInputTokens: 90,
+        cacheWriteInputTokens: 50
+      })
+    ).toEqual({
+      inputTokens: 100,
+      outputTokens: 20,
+      totalTokens: 120,
+      cachedInputTokens: 90,
+      cacheWriteInputTokens: 10
+    })
+  })
+
+  it('stores cache_write_input_tokens in usage records', () => {
+    const record = buildUsageStatsRecord({
+      messageId: 'message-1',
+      sessionId: 'session-1',
+      createdAt: Date.UTC(2026, 2, 10, 8, 0, 0),
+      updatedAt: Date.UTC(2026, 2, 10, 8, 0, 1),
+      providerId: 'anthropic',
+      modelId: 'claude-sonnet',
+      metadata: {
+        inputTokens: 1_000,
+        outputTokens: 200,
+        totalTokens: 1_200,
+        cachedInputTokens: 400,
+        cacheWriteInputTokens: 100
+      },
+      source: 'live'
+    })
+
+    expect(record).toMatchObject({
+      cachedInputTokens: 400,
+      cacheWriteInputTokens: 100
+    })
+    expect(record?.estimatedCostUsd).toBeCloseTo(
+      (500 * 3 + 400 * 0.3 + 100 * 3.75 + 200 * 15) / 1_000_000
+    )
+  })
+})
diff --git a/test/renderer/components/AcpSettings.test.ts b/test/renderer/components/AcpSettings.test.ts
new file mode 100644
index 000000000..066e46a3f
--- /dev/null
+++ b/test/renderer/components/AcpSettings.test.ts
@@ -0,0 +1,257 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, inject, provide } from 'vue'
+import { flushPromises, mount } from '@vue/test-utils'
+
+const passthrough = (name: string) =>
+  defineComponent({
+    name,
+    template: '<div><slot /></div>'
+  })
+
+const ButtonStub = defineComponent({
+  name: 'ButtonStub',
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  template: '<button :disabled="disabled" @click="$emit(\'click\', $event)"><slot /></button>'
+})
+
+const InputStub = defineComponent({
+  name: 'InputStub',
+  props: {
+    modelValue: {
+      type: String,
+      default: ''
+    }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<input :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />'
+})
+
+const TextareaStub = defineComponent({
+  name: 'TextareaStub',
+  props: {
+    modelValue: {
+      type: String,
+      default: ''
+    }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<textarea :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />'
+})
+
+const SwitchStub = defineComponent({
+  name: 'SwitchStub',
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<input type="checkbox" :checked="modelValue" @change="$emit(\'update:modelValue\', $event.target.checked)" />'
+})
+
+const DialogStub = defineComponent({
+  name: 'DialogStub',
+  props: {
+    open: {
+      type: Boolean,
+      default: false
+    }
+  },
+  template: '<div v-if="open"><slot /></div>'
+})
+
+const ALERT_DIALOG_CLOSE = Symbol('alert-dialog-close')
+
+const AlertDialogStub = defineComponent({
+  name: 'AlertDialogStub',
+  props: {
+    open: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['update:open'],
+  setup(_, { emit }) {
+    provide(ALERT_DIALOG_CLOSE, () => emit('update:open', false))
+  },
+  template: '<div v-if="open"><slot /></div>'
+})
+
+const AlertDialogActionStub = defineComponent({
+  name: 'AlertDialogActionStub',
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['click'],
+  setup(_, { emit }) {
+    const closeDialog = inject<() => void>(ALERT_DIALOG_CLOSE, () => {})
+
+    const handleClick = (event: MouseEvent) => {
+      closeDialog()
+      emit('click', event)
+    }
+
+    return {
+      handleClick
+    }
+  },
+  template: '<button :disabled="disabled" @click="handleClick"><slot /></button>'
+})
+
+afterEach(() => {
+  vi.clearAllMocks()
+})
+
+describe('AcpSettings', () => {
+  it('uninstalls an installed registry agent through the alert dialog', async () => {
+    vi.resetModules()
+    const toast = vi.fn()
+    const listAcpRegistryAgents = vi
+      .fn()
+      .mockResolvedValue([])
+      .mockResolvedValueOnce([
+        {
+          id: 'codex-acp',
+          name: 'Codex ACP',
+          version: '0.10.0',
+          description: 'Registry agent',
+          source: 'registry',
+          enabled: true,
+          distribution: {
+            npx: {
+              package: '@zed-industries/codex-acp'
+            }
+          },
+          installState: {
+            status: 'installed'
+          }
+        }
+      ])
+
+    const configPresenter = {
+      getAcpEnabled: vi.fn().mockResolvedValue(true),
+      listAcpRegistryAgents,
+      listManualAcpAgents: vi.fn().mockResolvedValue([]),
+      getAcpSharedMcpSelections: vi.fn().mockResolvedValue([]),
+      uninstallAcpRegistryAgent: vi.fn().mockResolvedValue(undefined)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: () => configPresenter
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string, params?: Record<string, string>) => {
+          if (key === 'settings.acp.registryUninstallAction') return 'Uninstall'
+          if (key === 'settings.acp.registryUninstallConfirm') {
+            return `confirm:${params?.name ?? ''}`
+          }
+          if (key === 'settings.acp.registryUninstallDescription') return 'desc'
+          if (key === 'settings.acp.deleteSuccess') return 'Deleted'
+          return key
+        }
+      })
+    }))
+    vi.doMock('@/components/use-toast', () => ({
+      useToast: () => ({ toast })
+    }))
+    vi.doMock('../../../src/renderer/settings/components/AcpDebugDialog.vue', () => ({
+      default: passthrough('AcpDebugDialog')
+    }))
+    vi.doMock('@/components/mcp-config/AgentMcpSelector.vue', () => ({
+      default: passthrough('AgentMcpSelector')
+    }))
+    vi.doMock('@/components/icons/AcpAgentIcon.vue', () => ({
+      default: passthrough('AcpAgentIcon')
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+
+    const AcpSettings = (await import('../../../src/renderer/settings/components/AcpSettings.vue'))
+      .default
+
+    const wrapper = mount(AcpSettings, {
+      global: {
+        stubs: {
+          Card: passthrough('Card'),
+          CardContent: passthrough('CardContent'),
+          CardDescription: passthrough('CardDescription'),
+          CardHeader: passthrough('CardHeader'),
+          CardTitle: passthrough('CardTitle'),
+          Badge: passthrough('Badge'),
+          Button: ButtonStub,
+          Switch: SwitchStub,
+          Separator: passthrough('Separator'),
+          Input: InputStub,
+          Textarea: TextareaStub,
+          Label: passthrough('Label'),
+          Collapsible: passthrough('Collapsible'),
+          CollapsibleContent: passthrough('CollapsibleContent'),
+          AlertDialog: AlertDialogStub,
+          AlertDialogAction: AlertDialogActionStub,
+          AlertDialogCancel: ButtonStub,
+          AlertDialogContent: passthrough('AlertDialogContent'),
+          AlertDialogDescription: passthrough('AlertDialogDescription'),
+          AlertDialogFooter: passthrough('AlertDialogFooter'),
+          AlertDialogHeader: passthrough('AlertDialogHeader'),
+          AlertDialogTitle: passthrough('AlertDialogTitle'),
+          Dialog: DialogStub,
+          DialogContent: passthrough('DialogContent'),
+          DialogDescription: passthrough('DialogDescription'),
+          DialogFooter: passthrough('DialogFooter'),
+          DialogHeader: passthrough('DialogHeader'),
+          DialogTitle: passthrough('DialogTitle'),
+          AcpDebugDialog: passthrough('AcpDebugDialog'),
+          AgentMcpSelector: passthrough('AgentMcpSelector'),
+          AcpAgentIcon: passthrough('AcpAgentIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    const uninstallButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('Uninstall'))
+
+    expect(uninstallButton).toBeDefined()
+
+    await uninstallButton!.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.text()).toContain('confirm:Codex ACP')
+    expect(wrapper.text()).toContain('desc')
+
+    const uninstallActions = wrapper
+      .findAll('button')
+      .filter((button) => button.text().includes('Uninstall'))
+
+    expect(uninstallActions).toHaveLength(2)
+
+    await uninstallActions[uninstallActions.length - 1].trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.uninstallAcpRegistryAgent).toHaveBeenCalledWith('codex-acp')
+    expect(configPresenter.listAcpRegistryAgents).toHaveBeenCalled()
+    expect(toast).toHaveBeenCalledWith({
+      title: 'Deleted'
+    })
+  })
+})
diff --git a/test/renderer/components/ChatPage.test.ts b/test/renderer/components/ChatPage.test.ts
index 821d184f5..c1ea922de 100644
--- a/test/renderer/components/ChatPage.test.ts
+++ b/test/renderer/components/ChatPage.test.ts
@@ -99,7 +99,7 @@ const setup = async (options: SetupOptions = {}) => {
     }))
   })
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     respondToolInteraction: vi.fn().mockResolvedValue(undefined),
     cancelGeneration: vi.fn().mockResolvedValue(undefined),
     retryMessage: vi.fn().mockResolvedValue(undefined),
@@ -128,7 +128,7 @@ const setup = async (options: SetupOptions = {}) => {
     useModelStore: () => modelStore
   }))
   vi.doMock('@/composables/usePresenter', () => ({
-    usePresenter: () => newAgentPresenter
+    usePresenter: () => agentSessionPresenter
   }))
   vi.doMock('@/stores/ui/spotlight', () => ({
     useSpotlightStore: () => spotlightStore
diff --git a/test/renderer/components/ChatStatusBar.test.ts b/test/renderer/components/ChatStatusBar.test.ts
index f63f0b175..481657b22 100644
--- a/test/renderer/components/ChatStatusBar.test.ts
+++ b/test/renderer/components/ChatStatusBar.test.ts
@@ -381,7 +381,7 @@ const setup = async (options: SetupOptions = {}) => {
   const sessionSettingsResult =
     options.sessionSettings === null ? null : ({ ...baseSessionSettings } as TestGenerationSettings)
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     getPermissionMode: vi.fn().mockResolvedValue('full_access'),
     setPermissionMode: vi.fn().mockResolvedValue(undefined),
     getSessionGenerationSettings: vi.fn().mockResolvedValue(sessionSettingsResult),
@@ -463,7 +463,7 @@ const setup = async (options: SetupOptions = {}) => {
     usePresenter: (name: string) => {
       if (name === 'configPresenter') return configPresenter
       if (name === 'llmproviderPresenter') return llmproviderPresenter
-      return newAgentPresenter
+      return agentSessionPresenter
     }
   }))
   vi.doMock('vue-i18n', () => ({
@@ -532,7 +532,7 @@ const setup = async (options: SetupOptions = {}) => {
 
   return {
     wrapper,
-    newAgentPresenter,
+    agentSessionPresenter,
     llmproviderPresenter,
     agentStore,
     sessionStore,
@@ -685,7 +685,7 @@ describe('ChatStatusBar model and session panels', () => {
   })
 
   it('keeps showing loading until settings finish loading for the current model selection', async () => {
-    const { wrapper, sessionStore, newAgentPresenter } = await setup({
+    const { wrapper, sessionStore, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4'
@@ -707,8 +707,10 @@ describe('ChatStatusBar model and session panels', () => {
         sessionStore.activeSession.modelId = 'claude-3-5-sonnet'
       }
     })
-    newAgentPresenter.getSessionGenerationSettings.mockClear()
-    newAgentPresenter.getSessionGenerationSettings.mockImplementation(() => pendingSettings.promise)
+    agentSessionPresenter.getSessionGenerationSettings.mockClear()
+    agentSessionPresenter.getSessionGenerationSettings.mockImplementation(
+      () => pendingSettings.promise
+    )
 
     await (wrapper.vm as any).openModelSettings('anthropic', 'claude-3-5-sonnet')
     await flushPromises()
@@ -874,7 +876,7 @@ describe('ChatStatusBar model and session panels', () => {
   })
 
   it('falls back to model defaults when the active session has no saved generation settings', async () => {
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       agentId: 'deepchat',
       hasActiveSession: true,
       activeProviderId: 'openai',
@@ -882,7 +884,7 @@ describe('ChatStatusBar model and session panels', () => {
       sessionSettings: null
     })
 
-    expect(newAgentPresenter.getSessionGenerationSettings).toHaveBeenCalledWith('s1')
+    expect(agentSessionPresenter.getSessionGenerationSettings).toHaveBeenCalledWith('s1')
     expect((wrapper.vm as any).localSettings).toEqual({
       systemPrompt: 'Default prompt',
       temperature: 0.7,
@@ -1013,7 +1015,7 @@ describe('ChatStatusBar model and session panels', () => {
   it('debounces generation setting persistence to a single session update', async () => {
     vi.useFakeTimers()
 
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4'
@@ -1027,13 +1029,13 @@ describe('ChatStatusBar model and session panels', () => {
 
     vi.advanceTimersByTime(299)
     await flushPromises()
-    expect(newAgentPresenter.updateSessionGenerationSettings).not.toHaveBeenCalled()
+    expect(agentSessionPresenter.updateSessionGenerationSettings).not.toHaveBeenCalled()
 
     vi.advanceTimersByTime(1)
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionGenerationSettings).toHaveBeenCalledTimes(1)
-    expect(newAgentPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.updateSessionGenerationSettings).toHaveBeenCalledTimes(1)
+    expect(agentSessionPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
       's1',
       expect.objectContaining({ temperature: 1.2 })
     )
@@ -1045,7 +1047,7 @@ describe('ChatStatusBar model and session panels', () => {
   it('turns thinking budget off with the switch and clears the persisted field', async () => {
     vi.useFakeTimers()
 
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4'
@@ -1059,7 +1061,7 @@ describe('ChatStatusBar model and session panels', () => {
     vi.advanceTimersByTime(300)
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
       's1',
       expect.objectContaining({ thinkingBudget: undefined })
     )
@@ -1071,7 +1073,7 @@ describe('ChatStatusBar model and session panels', () => {
   it('sends an explicit false when interleaved thinking is turned off', async () => {
     vi.useFakeTimers()
 
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4',
@@ -1099,7 +1101,7 @@ describe('ChatStatusBar model and session panels', () => {
     vi.advanceTimersByTime(300)
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.updateSessionGenerationSettings).toHaveBeenCalledWith(
       's1',
       expect.objectContaining({
         forceInterleavedThinkingCompat: false
@@ -1115,13 +1117,13 @@ describe('ChatStatusBar model and session panels', () => {
 
     const firstResponse = createDeferred<TestGenerationSettings>()
 
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4'
     })
 
-    newAgentPresenter.updateSessionGenerationSettings.mockImplementation(
+    agentSessionPresenter.updateSessionGenerationSettings.mockImplementation(
       () => firstResponse.promise
     )
 
@@ -1163,13 +1165,13 @@ describe('ChatStatusBar model and session panels', () => {
     const secondResponse = createDeferred<TestGenerationSettings>()
     const responseQueue = [firstResponse.promise, secondResponse.promise]
 
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeProviderId: 'openai',
       activeModelId: 'gpt-4'
     })
 
-    newAgentPresenter.updateSessionGenerationSettings.mockImplementation(
+    agentSessionPresenter.updateSessionGenerationSettings.mockImplementation(
       () => responseQueue.shift() ?? Promise.reject(new Error('missing mocked response'))
     )
 
@@ -1234,7 +1236,7 @@ describe('ChatStatusBar model and session panels', () => {
   })
 
   it('reloads active session generation settings after switching models', async () => {
-    const { wrapper, sessionStore, newAgentPresenter } = await setup({
+    const { wrapper, sessionStore, agentSessionPresenter } = await setup({
       agentId: 'deepchat',
       hasActiveSession: true,
       activeProviderId: 'openai',
@@ -1257,13 +1259,13 @@ describe('ChatStatusBar model and session panels', () => {
         sessionStore.activeSession.modelId = 'claude-3-5-sonnet'
       }
     })
-    newAgentPresenter.getSessionGenerationSettings.mockClear()
-    newAgentPresenter.getSessionGenerationSettings.mockResolvedValue(nextSettings)
+    agentSessionPresenter.getSessionGenerationSettings.mockClear()
+    agentSessionPresenter.getSessionGenerationSettings.mockResolvedValue(nextSettings)
 
     await (wrapper.vm as any).selectModel('anthropic', 'claude-3-5-sonnet')
     await flushPromises()
 
-    expect(newAgentPresenter.getSessionGenerationSettings).toHaveBeenCalledWith('s1')
+    expect(agentSessionPresenter.getSessionGenerationSettings).toHaveBeenCalledWith('s1')
     expect((wrapper.vm as any).localSettings).toEqual(nextSettings)
   })
 
@@ -1607,21 +1609,21 @@ describe('ChatStatusBar model and session panels', () => {
     const processConfig = createAcpConfigState({}, 'gpt-5')
     const sessionConfig = createAcpConfigState({}, 'gpt-5-mini')
     const pendingSessionConfig = createDeferred<AcpConfigState | null>()
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       agentId: 'acp-agent',
       hasActiveSession: false,
       projectPath: '/tmp/workspace',
       acpProcessConfig: processConfig
     })
 
-    newAgentPresenter.getAcpSessionConfigOptions.mockImplementation(
+    agentSessionPresenter.getAcpSessionConfigOptions.mockImplementation(
       () => pendingSessionConfig.promise
     )
 
     await wrapper.setProps({ acpDraftSessionId: 'draft-1' })
     await flushPromises()
 
-    expect(newAgentPresenter.getAcpSessionConfigOptions).toHaveBeenCalledWith('draft-1')
+    expect(agentSessionPresenter.getAcpSessionConfigOptions).toHaveBeenCalledWith('draft-1')
     expect((wrapper.vm as any).acpConfigState).toBeNull()
     expect((wrapper.vm as any).acpConfigReadOnly).toBe(true)
     expect(wrapper.findAll('.acp-inline-option')).toHaveLength(0)
@@ -1639,7 +1641,7 @@ describe('ChatStatusBar model and session panels', () => {
   it('switches from warmup config to session config and writes ACP options through the session presenter', async () => {
     const processConfig = createAcpConfigState({}, 'gpt-5')
     const sessionConfig = createAcpConfigState({}, 'gpt-5-mini')
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       agentId: 'acp-agent',
       hasActiveSession: false,
       projectPath: '/tmp/workspace',
@@ -1653,7 +1655,7 @@ describe('ChatStatusBar model and session panels', () => {
     await wrapper.setProps({ acpDraftSessionId: 'draft-1' })
     await flushPromises()
 
-    expect(newAgentPresenter.getAcpSessionConfigOptions).toHaveBeenCalledWith('draft-1')
+    expect(agentSessionPresenter.getAcpSessionConfigOptions).toHaveBeenCalledWith('draft-1')
     expect(wrapper.text()).toContain('gpt-5-mini')
     expect((wrapper.vm as any).acpConfigReadOnly).toBe(false)
     ;(wrapper.vm as any).onAcpInlineOptionOpenChange('model', true)
@@ -1664,7 +1666,7 @@ describe('ChatStatusBar model and session panels', () => {
       .trigger('click')
     await flushPromises()
 
-    expect(newAgentPresenter.setAcpSessionConfigOption).toHaveBeenCalledWith(
+    expect(agentSessionPresenter.setAcpSessionConfigOption).toHaveBeenCalledWith(
       'draft-1',
       'model',
       'gpt-5'
diff --git a/test/renderer/components/DashboardSettings.test.ts b/test/renderer/components/DashboardSettings.test.ts
index d5ade2e3c..6b0fdfad5 100644
--- a/test/renderer/components/DashboardSettings.test.ts
+++ b/test/renderer/components/DashboardSettings.test.ts
@@ -408,6 +408,10 @@ describe('DashboardSettings', () => {
   it('renders summary cards and breakdown rows when stats exist', async () => {
     const { wrapper, getUsageDashboard } = await setup(buildDashboard())
     const summaryCards = wrapper.findAll('[data-testid^="summary-card-"]')
+    const header = wrapper.get('[data-testid="dashboard-header"]')
+    const calendarHeatmap = wrapper.get('[data-testid="dashboard-calendar-heatmap"]')
+    const calendarWeeks = wrapper.get('[data-testid="dashboard-calendar-weeks"]')
+    const tokenUsageList = wrapper.get('[data-testid="token-usage-list"]')
 
     expect(getUsageDashboard).toHaveBeenCalledTimes(1)
     expect(wrapper.text()).toContain('OpenAI')
@@ -426,6 +430,8 @@ describe('DashboardSettings', () => {
     expect(wrapper.text()).toContain('Mar 9, 2026 was your most active day, with 2 messages.')
     expect(wrapper.text()).not.toContain('settings.dashboard.summary.cacheHitRate')
     expect(summaryCards).toHaveLength(2)
+    expect(header.classes()).toContain('flex-col')
+    expect(header.classes()).toContain('sm:flex-row')
     expect(wrapper.find('[data-testid="summary-card-tokenUsage"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="summary-card-nostalgia"]').exists()).toBe(true)
     expect(wrapper.find('[data-testid="token-usage-trend-chart"]').exists()).toBe(true)
@@ -451,12 +457,15 @@ describe('DashboardSettings', () => {
     expect(wrapper.find('[data-testid="model-breakdown-scroll"]').exists()).toBe(true)
     expect(wrapper.find('[title="1,200"]').exists()).toBe(true)
     expect(wrapper.findAll('[data-testid="calendar-cell"]').length).toBeGreaterThan(0)
+    expect(calendarHeatmap.classes()).toContain('calendar-heatmap')
+    expect(calendarWeeks.attributes('style')).toContain('repeat(4, minmax(0, 1fr))')
+    expect(tokenUsageList.classes()).toContain('dashboard-token-usage-list')
     expect(wrapper.find('[data-testid="summary-card-nostalgia"]').html()).toContain(
       'whitespace-normal'
     )
     expect(wrapper.find('[data-testid="summary-card-nostalgia"]').html()).toContain('md:col-span-2')
     expect(wrapper.find('[data-testid="summary-card-nostalgia"]').html()).toContain(
-      'md:grid-cols-[minmax(0,14rem)_minmax(0,1fr)]'
+      'lg:grid-cols-[minmax(0,13rem)_minmax(0,1fr)]'
     )
     expect(wrapper.find('[data-testid="nostalgia-details"]').html()).toContain('space-y-2')
     expect(wrapper.find('[data-testid="nostalgia-rotating-value"]').text()).toBe('17 days')
@@ -472,6 +481,7 @@ describe('DashboardSettings', () => {
     const { wrapper } = await setup(buildDashboard())
 
     expect(wrapper.find('[data-testid="rtk-card"]').exists()).toBe(true)
+    expect(wrapper.find('[data-testid="rtk-card"]').html()).toContain('dashboard-rtk-summary-grid')
     expect(wrapper.find('[data-testid="rtk-status-badge"]').text()).toBe('Bundled')
     expect(wrapper.find('[data-testid="rtk-summary-saved"]').text()).toContain('3.8k')
     expect(wrapper.find('[data-testid="rtk-summary-commands"]').text()).toContain('12')
diff --git a/test/renderer/components/DeepChatAgentsSettings.test.ts b/test/renderer/components/DeepChatAgentsSettings.test.ts
index 1ff914eff..4ce5c4bc9 100644
--- a/test/renderer/components/DeepChatAgentsSettings.test.ts
+++ b/test/renderer/components/DeepChatAgentsSettings.test.ts
@@ -251,6 +251,365 @@ describe('DeepChatAgentsSettings', () => {
     })
   })
 
+  it('keeps the editor header sticky so save actions stay visible while scrolling', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {}
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue(null)
+    }
+    const modelStore = {
+      allProviderModels: [],
+      findModelByIdOrName: vi.fn(() => null)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'projectPresenter') return projectPresenter
+        if (name === 'toolPresenter') return toolPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/modelStore', () => ({
+      useModelStore: () => modelStore
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+
+    const DeepChatAgentsSettings = (
+      await import('../../../src/renderer/settings/components/DeepChatAgentsSettings.vue')
+    ).default
+
+    const wrapper = mount(DeepChatAgentsSettings, {
+      global: {
+        stubs: {
+          Button: ButtonStub,
+          Badge: passthrough('Badge'),
+          Input: InputStub,
+          Textarea: TextareaStub,
+          Switch: SwitchStub,
+          Dialog: DialogStub,
+          DialogContent: passthrough('DialogContent'),
+          DialogHeader: passthrough('DialogHeader'),
+          DialogTitle: passthrough('DialogTitle'),
+          DropdownMenu: passthrough('DropdownMenu'),
+          DropdownMenuContent: passthrough('DropdownMenuContent'),
+          DropdownMenuItem: DropdownMenuItemStub,
+          DropdownMenuSeparator: passthrough('DropdownMenuSeparator'),
+          DropdownMenuTrigger: passthrough('DropdownMenuTrigger'),
+          Popover: passthrough('Popover'),
+          PopoverContent: passthrough('PopoverContent'),
+          PopoverTrigger: passthrough('PopoverTrigger'),
+          Select: passthrough('Select'),
+          SelectContent: passthrough('SelectContent'),
+          SelectItem: passthrough('SelectItem'),
+          SelectTrigger: passthrough('SelectTrigger'),
+          SelectValue: passthrough('SelectValue'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    const stickyHeader = wrapper.get('[data-testid="deepchat-agents-sticky-header"]')
+
+    expect(stickyHeader.classes()).toContain('sticky')
+    expect(stickyHeader.classes()).toContain('top-0')
+    expect(stickyHeader.text()).toContain('common.save')
+    expect(stickyHeader.text()).toContain('common.reset')
+  })
+
+  it('saves auto compaction settings when number inputs emit numeric values', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {
+        defaultModelPreset: null,
+        assistantModel: null,
+        visionModel: null,
+        systemPrompt: 'system prompt',
+        permissionMode: 'default',
+        disabledAgentTools: [],
+        autoCompactionEnabled: true,
+        autoCompactionTriggerThreshold: 72,
+        autoCompactionRetainRecentPairs: 4
+      }
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue(null)
+    }
+    const modelStore = {
+      allProviderModels: [],
+      findModelByIdOrName: vi.fn(() => null)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'projectPresenter') return projectPresenter
+        if (name === 'toolPresenter') return toolPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/modelStore', () => ({
+      useModelStore: () => modelStore
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+
+    const DeepChatAgentsSettings = (
+      await import('../../../src/renderer/settings/components/DeepChatAgentsSettings.vue')
+    ).default
+
+    const wrapper = mount(DeepChatAgentsSettings, {
+      global: {
+        stubs: {
+          Button: ButtonStub,
+          Badge: passthrough('Badge'),
+          Input: InputStub,
+          Textarea: TextareaStub,
+          Switch: SwitchStub,
+          Dialog: DialogStub,
+          DialogContent: passthrough('DialogContent'),
+          DialogHeader: passthrough('DialogHeader'),
+          DialogTitle: passthrough('DialogTitle'),
+          DropdownMenu: passthrough('DropdownMenu'),
+          DropdownMenuContent: passthrough('DropdownMenuContent'),
+          DropdownMenuItem: DropdownMenuItemStub,
+          DropdownMenuSeparator: passthrough('DropdownMenuSeparator'),
+          DropdownMenuTrigger: passthrough('DropdownMenuTrigger'),
+          Popover: passthrough('Popover'),
+          PopoverContent: passthrough('PopoverContent'),
+          PopoverTrigger: passthrough('PopoverTrigger'),
+          Select: passthrough('Select'),
+          SelectContent: passthrough('SelectContent'),
+          SelectItem: passthrough('SelectItem'),
+          SelectTrigger: passthrough('SelectTrigger'),
+          SelectValue: passthrough('SelectValue'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    wrapper
+      .findComponent('[data-testid="auto-compaction-trigger-threshold-input"]')
+      .vm.$emit('update:modelValue', 91)
+    wrapper
+      .findComponent('[data-testid="auto-compaction-retain-recent-pairs-input"]')
+      .vm.$emit('update:modelValue', 6)
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.updateDeepChatAgent).toHaveBeenCalledTimes(1)
+
+    const [, payload] = configPresenter.updateDeepChatAgent.mock.calls[0]
+    expect(payload.config.autoCompactionTriggerThreshold).toBe(91)
+    expect(payload.config.autoCompactionRetainRecentPairs).toBe(6)
+  })
+
+  it('falls back to default auto compaction values when inputs are blank or invalid', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {
+        defaultModelPreset: null,
+        assistantModel: null,
+        visionModel: null,
+        systemPrompt: 'system prompt',
+        permissionMode: 'default',
+        disabledAgentTools: [],
+        autoCompactionEnabled: true,
+        autoCompactionTriggerThreshold: 72,
+        autoCompactionRetainRecentPairs: 4
+      }
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue(null)
+    }
+    const modelStore = {
+      allProviderModels: [],
+      findModelByIdOrName: vi.fn(() => null)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'projectPresenter') return projectPresenter
+        if (name === 'toolPresenter') return toolPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/modelStore', () => ({
+      useModelStore: () => modelStore
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+
+    const DeepChatAgentsSettings = (
+      await import('../../../src/renderer/settings/components/DeepChatAgentsSettings.vue')
+    ).default
+
+    const wrapper = mount(DeepChatAgentsSettings, {
+      global: {
+        stubs: {
+          Button: ButtonStub,
+          Badge: passthrough('Badge'),
+          Input: InputStub,
+          Textarea: TextareaStub,
+          Switch: SwitchStub,
+          Dialog: DialogStub,
+          DialogContent: passthrough('DialogContent'),
+          DialogHeader: passthrough('DialogHeader'),
+          DialogTitle: passthrough('DialogTitle'),
+          DropdownMenu: passthrough('DropdownMenu'),
+          DropdownMenuContent: passthrough('DropdownMenuContent'),
+          DropdownMenuItem: DropdownMenuItemStub,
+          DropdownMenuSeparator: passthrough('DropdownMenuSeparator'),
+          DropdownMenuTrigger: passthrough('DropdownMenuTrigger'),
+          Popover: passthrough('Popover'),
+          PopoverContent: passthrough('PopoverContent'),
+          PopoverTrigger: passthrough('PopoverTrigger'),
+          Select: passthrough('Select'),
+          SelectContent: passthrough('SelectContent'),
+          SelectItem: passthrough('SelectItem'),
+          SelectTrigger: passthrough('SelectTrigger'),
+          SelectValue: passthrough('SelectValue'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    wrapper
+      .findComponent('[data-testid="auto-compaction-trigger-threshold-input"]')
+      .vm.$emit('update:modelValue', '')
+    wrapper
+      .findComponent('[data-testid="auto-compaction-retain-recent-pairs-input"]')
+      .vm.$emit('update:modelValue', 'oops')
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.updateDeepChatAgent).toHaveBeenCalledTimes(1)
+
+    const [, payload] = configPresenter.updateDeepChatAgent.mock.calls[0]
+    expect(payload.config.autoCompactionTriggerThreshold).toBe(80)
+    expect(payload.config.autoCompactionRetainRecentPairs).toBe(2)
+  })
+
   it('fills the system prompt field from a prompt template dialog', async () => {
     vi.resetModules()
 
diff --git a/test/renderer/components/McpIndicator.test.ts b/test/renderer/components/McpIndicator.test.ts
index a8f0f019f..ecd3142e5 100644
--- a/test/renderer/components/McpIndicator.test.ts
+++ b/test/renderer/components/McpIndicator.test.ts
@@ -104,7 +104,7 @@ const setup = async (options?: {
       ])
   }
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     getSessionDisabledAgentTools: vi
       .fn()
       .mockResolvedValue([...(options?.disabledAgentTools ?? [])]),
@@ -137,7 +137,7 @@ const setup = async (options?: {
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
       if (name === 'toolPresenter') return toolPresenter
-      if (name === 'newAgentPresenter') return newAgentPresenter
+      if (name === 'agentSessionPresenter') return agentSessionPresenter
       return windowPresenter
     }
   }))
@@ -209,13 +209,13 @@ const setup = async (options?: {
     wrapper,
     draftStore,
     toolPresenter,
-    newAgentPresenter
+    agentSessionPresenter
   }
 }
 
 describe('McpIndicator', () => {
   it('renders icon-only trigger for deepchat and keeps built-in tools session scoped', async () => {
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeAgentId: 'deepchat'
     })
@@ -232,11 +232,13 @@ describe('McpIndicator', () => {
     await execButton!.trigger('click')
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', ['exec'])
+    expect(agentSessionPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', [
+      'exec'
+    ])
   })
 
   it('supports enabling and disabling a whole tool group', async () => {
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeAgentId: 'deepchat',
       disabledAgentTools: ['exec']
@@ -250,14 +252,14 @@ describe('McpIndicator', () => {
     await filesystemSwitch.trigger('click')
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', [
+    expect(agentSessionPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', [
       'exec',
       'read'
     ])
   })
 
   it('resets a fully disabled tool group back to all enabled when switched on', async () => {
-    const { wrapper, newAgentPresenter } = await setup({
+    const { wrapper, agentSessionPresenter } = await setup({
       hasActiveSession: true,
       activeAgentId: 'deepchat',
       disabledAgentTools: ['exec', 'read']
@@ -271,7 +273,7 @@ describe('McpIndicator', () => {
     await filesystemSwitch.trigger('click')
     await flushPromises()
 
-    expect(newAgentPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', [])
+    expect(agentSessionPresenter.updateSessionDisabledAgentTools).toHaveBeenCalledWith('s1', [])
   })
 
   it('renders MCP badge for ACP sessions and keeps built-in tools hidden', async () => {
@@ -287,7 +289,7 @@ describe('McpIndicator', () => {
   })
 
   it('updates draft disabled tools for deepchat new thread mode', async () => {
-    const { wrapper, draftStore, newAgentPresenter } = await setup({
+    const { wrapper, draftStore, agentSessionPresenter } = await setup({
       hasActiveSession: false,
       selectedAgentId: 'deepchat'
     })
@@ -299,7 +301,7 @@ describe('McpIndicator', () => {
     await flushPromises()
 
     expect(draftStore.disabledAgentTools).toEqual(['exec'])
-    expect(newAgentPresenter.updateSessionDisabledAgentTools).not.toHaveBeenCalled()
+    expect(agentSessionPresenter.updateSessionDisabledAgentTools).not.toHaveBeenCalled()
   })
 
   it('renders subagent as a regular tool button inside Agent Core and emits updates', async () => {
diff --git a/test/renderer/components/NewThreadPage.test.ts b/test/renderer/components/NewThreadPage.test.ts
index 60e6d8cf6..0c89df8c8 100644
--- a/test/renderer/components/NewThreadPage.test.ts
+++ b/test/renderer/components/NewThreadPage.test.ts
@@ -126,7 +126,7 @@ const setup = async (options?: {
     )
   }
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     ensureAcpDraftSession: vi.fn().mockImplementation(
       options?.ensureAcpDraftSession ??
         (() => {
@@ -152,7 +152,7 @@ const setup = async (options?: {
   }))
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) =>
-      name === 'configPresenter' ? configPresenter : newAgentPresenter
+      name === 'configPresenter' ? configPresenter : agentSessionPresenter
   }))
   vi.doMock('vue-i18n', () => ({
     useI18n: () => ({
@@ -202,20 +202,20 @@ const setup = async (options?: {
     agentStore,
     modelStore,
     draftStore,
-    newAgentPresenter
+    agentSessionPresenter
   }
 }
 
 describe('NewThreadPage ACP draft session bootstrap', () => {
   it('uses the preselected project path when default project selection is already applied', async () => {
-    const { newAgentPresenter } = await setup({
+    const { agentSessionPresenter } = await setup({
       selectedProject: {
         path: '/tmp/default-workspace',
         name: 'default-workspace'
       }
     })
 
-    expect(newAgentPresenter.ensureAcpDraftSession).toHaveBeenCalledWith({
+    expect(agentSessionPresenter.ensureAcpDraftSession).toHaveBeenCalledWith({
       agentId: 'acp-agent',
       projectDir: '/tmp/default-workspace',
       permissionMode: 'full_access'
@@ -223,9 +223,9 @@ describe('NewThreadPage ACP draft session bootstrap', () => {
   })
 
   it('ensures ACP draft session and passes session-id to ChatInputBox', async () => {
-    const { wrapper, newAgentPresenter } = await setup()
+    const { wrapper, agentSessionPresenter } = await setup()
 
-    expect(newAgentPresenter.ensureAcpDraftSession).toHaveBeenCalledWith({
+    expect(agentSessionPresenter.ensureAcpDraftSession).toHaveBeenCalledWith({
       agentId: 'acp-agent',
       projectDir: '/tmp/workspace',
       permissionMode: 'full_access'
diff --git a/test/renderer/components/ProviderApiConfig.test.ts b/test/renderer/components/ProviderApiConfig.test.ts
new file mode 100644
index 000000000..c4bea6359
--- /dev/null
+++ b/test/renderer/components/ProviderApiConfig.test.ts
@@ -0,0 +1,314 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent } from 'vue'
+import { flushPromises, mount } from '@vue/test-utils'
+import type { LLM_PROVIDER } from '../../../src/shared/presenter'
+
+const passthrough = (name: string) =>
+  defineComponent({
+    name,
+    template: '<div><slot /></div>'
+  })
+
+const createInputStub = () =>
+  defineComponent({
+    name: 'Input',
+    inheritAttrs: false,
+    props: {
+      modelValue: {
+        type: [String, Number],
+        default: ''
+      }
+    },
+    emits: ['update:modelValue', 'update:model-value'],
+    setup(_, { emit }) {
+      const handleInput = (event: Event) => {
+        const value = (event.target as HTMLInputElement).value
+        emit('update:modelValue', value)
+        emit('update:model-value', value)
+      }
+
+      return {
+        handleInput
+      }
+    },
+    template: '<input v-bind="$attrs" :value="modelValue" @input="handleInput" />'
+  })
+
+const buttonStub = defineComponent({
+  name: 'Button',
+  inheritAttrs: false,
+  emits: ['click'],
+  template: '<button v-bind="$attrs" type="button" @click="$emit(\'click\')"><slot /></button>'
+})
+
+const labelStub = defineComponent({
+  name: 'Label',
+  inheritAttrs: false,
+  template: '<label v-bind="$attrs"><slot /></label>'
+})
+
+const createProvider = (overrides?: Partial<LLM_PROVIDER>): LLM_PROVIDER => ({
+  id: 'deepseek',
+  name: 'DeepSeek',
+  apiType: 'openai-compatible',
+  apiKey: 'test-key',
+  baseUrl: 'https://api.deepseek.com/v1',
+  enable: true,
+  custom: false,
+  ...overrides
+})
+
+async function setup(options?: {
+  provider?: LLM_PROVIDER
+  providerWebsites?: {
+    official: string
+    apiKey: string
+    docs: string
+    models: string
+    defaultBaseUrl: string
+  }
+}) {
+  vi.resetModules()
+
+  const toast = vi.fn()
+  const llmproviderPresenter = {
+    getKeyStatus: vi.fn().mockResolvedValue(null),
+    refreshModels: vi.fn().mockResolvedValue(undefined)
+  }
+  const modelCheckStore = {
+    openDialog: vi.fn()
+  }
+
+  vi.doMock('vue-i18n', () => ({
+    useI18n: () => ({
+      t: (key: string, params?: Record<string, unknown>) => {
+        if (key === 'settings.provider.modifyBaseUrl') return 'Modify'
+        if (key === 'settings.provider.baseUrlLockedHint') {
+          return 'This provider is pinned to the recommended Base URL.'
+        }
+        if (key === 'settings.provider.urlPlaceholder') return 'Enter API URL'
+        if (key === 'settings.provider.urlFormat') {
+          return `Default: ${params?.defaultUrl ?? ''}`
+        }
+        if (key === 'settings.provider.urlFormatFill') return 'Fill into API URL'
+        if (key === 'settings.provider.dialog.baseUrlUnlock.confirm') return 'Continue'
+        return key
+      }
+    })
+  }))
+
+  vi.doMock('@/composables/usePresenter', () => ({
+    usePresenter: (name: string) => {
+      if (name === 'llmproviderPresenter') return llmproviderPresenter
+      throw new Error(`Unexpected presenter: ${name}`)
+    }
+  }))
+
+  vi.doMock('@/stores/modelCheck', () => ({
+    useModelCheckStore: () => modelCheckStore
+  }))
+  vi.doMock('@/components/use-toast', () => ({
+    useToast: () => ({
+      toast
+    })
+  }))
+
+  vi.doMock('@shadcn/components/ui/input', () => ({
+    Input: createInputStub()
+  }))
+  vi.doMock('@shadcn/components/ui/button', () => ({
+    Button: buttonStub
+  }))
+  vi.doMock('@shadcn/components/ui/label', () => ({
+    Label: labelStub
+  }))
+  vi.doMock('@shadcn/components/ui/tooltip', () => ({
+    Tooltip: passthrough('Tooltip'),
+    TooltipContent: passthrough('TooltipContent'),
+    TooltipProvider: passthrough('TooltipProvider'),
+    TooltipTrigger: passthrough('TooltipTrigger')
+  }))
+  vi.doMock('@iconify/vue', () => ({
+    Icon: defineComponent({
+      name: 'Icon',
+      template: '<i />'
+    })
+  }))
+
+  const ProviderApiConfig = (
+    await import('../../../src/renderer/settings/components/ProviderApiConfig.vue')
+  ).default
+
+  const wrapper = mount(ProviderApiConfig, {
+    props: {
+      provider: options?.provider ?? createProvider(),
+      providerWebsites: options?.providerWebsites ?? {
+        official: 'https://example.com',
+        apiKey: 'https://example.com/key',
+        docs: 'https://example.com/docs',
+        models: 'https://example.com/models',
+        defaultBaseUrl: 'https://api.deepseek.com/v1'
+      }
+    },
+    global: {
+      stubs: {
+        GitHubCopilotOAuth: true
+      }
+    }
+  })
+
+  await flushPromises()
+
+  return {
+    wrapper,
+    toast,
+    llmproviderPresenter,
+    modelCheckStore
+  }
+}
+
+function findButtonByText(wrapper: ReturnType<typeof mount>, text: string) {
+  return wrapper.findAll('button').find((button) => button.text().trim() === text)
+}
+
+describe('ProviderApiConfig', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('shows a locked Base URL display for built-in providers outside the allowlist', async () => {
+    const { wrapper, llmproviderPresenter } = await setup()
+
+    expect(wrapper.find('input#deepseek-url').exists()).toBe(false)
+    expect(wrapper.text()).toContain('This provider is pinned to the recommended Base URL.')
+    expect(findButtonByText(wrapper, 'Modify')).toBeDefined()
+    expect(wrapper.html()).not.toContain('Fill into API URL')
+    expect(llmproviderPresenter.getKeyStatus).toHaveBeenCalledWith('deepseek')
+  })
+
+  it('switches directly into edit mode and hides the modify button', async () => {
+    const { wrapper } = await setup()
+    const modifyButton = findButtonByText(wrapper, 'Modify')
+
+    expect(modifyButton).toBeDefined()
+    await modifyButton!.trigger('click')
+    await flushPromises()
+
+    expect(wrapper.find('input#deepseek-url').exists()).toBe(true)
+    expect(findButtonByText(wrapper, 'Modify')).toBeUndefined()
+  })
+
+  it('preserves the existing save behavior after unlocking', async () => {
+    const { wrapper } = await setup()
+    const modifyButton = findButtonByText(wrapper, 'Modify')
+
+    expect(modifyButton).toBeDefined()
+    await modifyButton!.trigger('click')
+    await flushPromises()
+
+    const input = wrapper.get('input#deepseek-url')
+    await input.setValue('https://custom.deepseek.com/v1')
+    await input.trigger('blur')
+
+    expect(wrapper.emitted('api-host-change')).toEqual([['https://custom.deepseek.com/v1']])
+  })
+
+  it('keeps OpenAI Responses editable without the lock prompt', async () => {
+    const { wrapper } = await setup({
+      provider: createProvider({
+        id: 'openai-responses',
+        name: 'OpenAI Responses',
+        baseUrl: 'https://api.openai.com/v1'
+      })
+    })
+
+    expect(wrapper.find('input#openai-responses-url').exists()).toBe(true)
+    expect(findButtonByText(wrapper, 'Modify')).toBeUndefined()
+    expect(wrapper.text()).not.toContain('This provider is pinned to the recommended Base URL.')
+  })
+
+  it('keeps custom providers editable by default', async () => {
+    const { wrapper } = await setup({
+      provider: createProvider({
+        id: 'custom-demo',
+        name: 'Custom Demo',
+        custom: true,
+        baseUrl: 'https://custom.example.com/v1'
+      })
+    })
+
+    expect(wrapper.find('input#custom-demo-url').exists()).toBe(true)
+    expect(findButtonByText(wrapper, 'Modify')).toBeUndefined()
+  })
+
+  it('shows the metadata sync hint for DB-backed providers and delegates refresh to the presenter', async () => {
+    const { wrapper, toast, llmproviderPresenter } = await setup({
+      provider: createProvider({
+        id: 'doubao',
+        name: 'Doubao',
+        apiType: 'doubao',
+        baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+      })
+    })
+
+    expect(wrapper.text()).toContain('settings.provider.refreshModelsWithMetadataHint')
+
+    const refreshButton = findButtonByText(wrapper, 'settings.provider.refreshModels')
+    expect(refreshButton).toBeDefined()
+
+    await refreshButton!.trigger('click')
+    await flushPromises()
+
+    expect(llmproviderPresenter.refreshModels).toHaveBeenCalledWith('doubao')
+    expect(toast).toHaveBeenCalledWith({
+      title: 'settings.provider.toast.refreshModelsSuccessTitle',
+      description: 'settings.provider.toast.refreshModelsSuccessDescriptionWithMetadata',
+      duration: 4000
+    })
+  })
+
+  it('refreshes only models for non DB-backed providers', async () => {
+    const { wrapper, toast, llmproviderPresenter } = await setup()
+
+    expect(wrapper.text()).not.toContain('settings.provider.refreshModelsWithMetadataHint')
+
+    const refreshButton = findButtonByText(wrapper, 'settings.provider.refreshModels')
+    expect(refreshButton).toBeDefined()
+
+    await refreshButton!.trigger('click')
+    await flushPromises()
+
+    expect(llmproviderPresenter.refreshModels).toHaveBeenCalledWith('deepseek')
+    expect(toast).toHaveBeenCalledWith({
+      title: 'settings.provider.toast.refreshModelsSuccessTitle',
+      description: 'settings.provider.toast.refreshModelsSuccessDescription',
+      duration: 4000
+    })
+  })
+
+  it('shows a destructive toast when metadata-backed refresh fails', async () => {
+    const { wrapper, toast, llmproviderPresenter } = await setup({
+      provider: createProvider({
+        id: 'doubao',
+        name: 'Doubao',
+        apiType: 'doubao',
+        baseUrl: 'https://ark.cn-beijing.volces.com/api/v3'
+      })
+    })
+    llmproviderPresenter.refreshModels.mockRejectedValueOnce(new Error('network down'))
+
+    const refreshButton = findButtonByText(wrapper, 'settings.provider.refreshModels')
+    expect(refreshButton).toBeDefined()
+
+    await refreshButton!.trigger('click')
+    await flushPromises()
+
+    expect(llmproviderPresenter.refreshModels).toHaveBeenCalledWith('doubao')
+    expect(toast).toHaveBeenCalledWith({
+      title: 'settings.provider.toast.refreshModelsFailedTitle',
+      description: 'settings.provider.toast.refreshModelsFailedDescriptionWithMetadata',
+      variant: 'destructive',
+      duration: 4000
+    })
+  })
+})
diff --git a/test/renderer/components/ProviderModelList.test.ts b/test/renderer/components/ProviderModelList.test.ts
new file mode 100644
index 000000000..4fe6e5422
--- /dev/null
+++ b/test/renderer/components/ProviderModelList.test.ts
@@ -0,0 +1,187 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent, ref } from 'vue'
+import { flushPromises, mount } from '@vue/test-utils'
+import { ModelType } from '../../../src/shared/model'
+
+const passthrough = (name: string) =>
+  defineComponent({
+    name,
+    template: '<div><slot /></div>'
+  })
+
+const ButtonStub = defineComponent({
+  name: 'ButtonStub',
+  props: {
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  emits: ['click'],
+  template: '<button :disabled="disabled" @click="$emit(\'click\', $event)"><slot /></button>'
+})
+
+const InputStub = defineComponent({
+  name: 'InputStub',
+  props: {
+    modelValue: {
+      type: String,
+      default: ''
+    }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<input :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />'
+})
+
+const DynamicScrollerStub = defineComponent({
+  name: 'DynamicScrollerStub',
+  props: {
+    items: {
+      type: Array,
+      default: () => []
+    }
+  },
+  template: '<div><slot v-for="item in items" :key="item.id" :item="item" :active="true" /></div>'
+})
+
+const DynamicScrollerItemStub = defineComponent({
+  name: 'DynamicScrollerItemStub',
+  template: '<div><slot /></div>'
+})
+
+const ModelConfigItemStub = defineComponent({
+  name: 'ModelConfigItemStub',
+  props: {
+    modelId: {
+      type: String,
+      required: true
+    },
+    modelName: {
+      type: String,
+      required: true
+    }
+  },
+  template: '<div class="model-item" :data-model-id="modelId">{{ modelName }}</div>'
+})
+
+afterEach(() => {
+  vi.clearAllMocks()
+})
+
+describe('ProviderModelList', () => {
+  it('filters by capability and type, then switches sorting from status to name', async () => {
+    vi.resetModules()
+
+    const modelStore = {
+      removeCustomModel: vi.fn().mockResolvedValue(undefined),
+      enableAllModels: vi.fn(),
+      disableAllModels: vi.fn()
+    }
+
+    vi.doMock('@/stores/modelStore', () => ({
+      useModelStore: () => modelStore
+    }))
+    vi.doMock('@vueuse/core', () => ({
+      useElementSize: () => ({ height: ref(48) })
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string, params?: Record<string, number | string>) => {
+          if (key === 'model.filter.visibleCount') {
+            return `visible:${params?.visible}/${params?.total}`
+          }
+          return key
+        }
+      })
+    }))
+
+    const ProviderModelList = (
+      await import('../../../src/renderer/settings/components/ProviderModelList.vue')
+    ).default
+
+    const wrapper = mount(ProviderModelList, {
+      props: {
+        providerModels: [
+          {
+            providerId: 'anthropic',
+            models: [
+              {
+                id: 'zeta-vision',
+                name: 'Zeta Vision',
+                group: 'default',
+                providerId: 'anthropic',
+                enabled: true,
+                vision: true,
+                type: ModelType.Chat
+              },
+              {
+                id: 'alpha-vision',
+                name: 'Alpha Vision',
+                group: 'default',
+                providerId: 'anthropic',
+                enabled: false,
+                vision: true,
+                type: ModelType.Chat
+              },
+              {
+                id: 'beta-embedding',
+                name: 'Beta Embedding',
+                group: 'default',
+                providerId: 'anthropic',
+                enabled: true,
+                type: ModelType.Embedding
+              }
+            ]
+          }
+        ],
+        customModels: [
+          {
+            id: 'custom-reasoner',
+            name: 'Custom Reasoner',
+            group: 'default',
+            providerId: 'anthropic',
+            enabled: true,
+            reasoning: true,
+            type: ModelType.Chat,
+            isCustom: true
+          }
+        ],
+        providers: [{ id: 'anthropic', name: 'Anthropic' }],
+        isLoading: false
+      },
+      global: {
+        stubs: {
+          Input: InputStub,
+          Button: ButtonStub,
+          Badge: passthrough('Badge'),
+          Popover: passthrough('Popover'),
+          PopoverContent: passthrough('PopoverContent'),
+          PopoverTrigger: passthrough('PopoverTrigger'),
+          DynamicScroller: DynamicScrollerStub,
+          DynamicScrollerItem: DynamicScrollerItemStub,
+          AddCustomModelButton: passthrough('AddCustomModelButton'),
+          ModelConfigItem: ModelConfigItemStub,
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    await wrapper.get('[data-testid="model-capability-filter-vision"]').trigger('click')
+    await wrapper.get('[data-testid="model-type-filter-chat"]').trigger('click')
+    await flushPromises()
+
+    const getVisibleIds = () =>
+      wrapper.findAll('[data-model-id]').map((item) => item.attributes('data-model-id'))
+
+    expect(getVisibleIds()).toEqual(['zeta-vision', 'alpha-vision'])
+    expect(wrapper.text()).toContain('visible:2/4')
+
+    await wrapper.get('[data-testid="model-sort-name"]').trigger('click')
+    await flushPromises()
+
+    expect(getVisibleIds()).toEqual(['alpha-vision', 'zeta-vision'])
+  })
+})
diff --git a/test/renderer/components/RemoteSettings.test.ts b/test/renderer/components/RemoteSettings.test.ts
index 9c0de3d82..2bf2a18a3 100644
--- a/test/renderer/components/RemoteSettings.test.ts
+++ b/test/renderer/components/RemoteSettings.test.ts
@@ -321,7 +321,7 @@ const setup = async (options: SetupOptions = {}) => {
     }))
   }
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     getAgents: vi.fn(async () => [
       { id: 'deepchat', name: 'DeepChat', type: 'deepchat', enabled: true },
       { id: 'deepchat-alt', name: 'DeepChat Alt', type: 'deepchat', enabled: false },
@@ -435,7 +435,7 @@ const setup = async (options: SetupOptions = {}) => {
 
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
-      if (name === 'newAgentPresenter') return newAgentPresenter
+      if (name === 'agentSessionPresenter') return agentSessionPresenter
       if (name === 'projectPresenter') return projectPresenter
       return null
     },
@@ -562,7 +562,7 @@ const setup = async (options: SetupOptions = {}) => {
     remoteState,
     feishuState,
     remoteControlPresenter,
-    newAgentPresenter,
+    agentSessionPresenter,
     projectPresenter,
     toast,
     tabsComponents
diff --git a/test/renderer/composables/usePresenter.test.ts b/test/renderer/composables/usePresenter.test.ts
index 28d0f727b..fe1e23c63 100644
--- a/test/renderer/composables/usePresenter.test.ts
+++ b/test/renderer/composables/usePresenter.test.ts
@@ -15,7 +15,7 @@ describe('usePresenter', () => {
 
   it('preserves undefined properties in object payloads across IPC', async () => {
     const { usePresenter } = await import('@/composables/usePresenter')
-    const presenter = usePresenter('newAgentPresenter')
+    const presenter = usePresenter('agentSessionPresenter')
 
     await presenter.updateSessionGenerationSettings('s1', {
       temperature: 0.7,
diff --git a/test/renderer/pages/NewThreadPage.test.ts b/test/renderer/pages/NewThreadPage.test.ts
index c92a8f29f..de7ebca8a 100644
--- a/test/renderer/pages/NewThreadPage.test.ts
+++ b/test/renderer/pages/NewThreadPage.test.ts
@@ -77,7 +77,7 @@ const setup = async (pendingModelId: string) => {
       disabledAgentTools: []
     })
   }
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     ensureAcpDraftSession: vi.fn()
   }
 
@@ -99,7 +99,7 @@ const setup = async (pendingModelId: string) => {
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
       if (name === 'configPresenter') return configPresenter
-      if (name === 'newAgentPresenter') return newAgentPresenter
+      if (name === 'agentSessionPresenter') return agentSessionPresenter
       return {}
     }
   }))
diff --git a/test/renderer/stores/messageStore.test.ts b/test/renderer/stores/messageStore.test.ts
index c6a26ae07..ce5d5012a 100644
--- a/test/renderer/stores/messageStore.test.ts
+++ b/test/renderer/stores/messageStore.test.ts
@@ -12,7 +12,7 @@ function createDeferred<T>() {
 const setupStore = async () => {
   vi.resetModules()
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     getMessages: vi.fn().mockResolvedValue([]),
     getMessage: vi.fn().mockResolvedValue(null)
   }
@@ -25,7 +25,7 @@ const setupStore = async () => {
   }))
 
   vi.doMock('@/composables/usePresenter', () => ({
-    usePresenter: () => newAgentPresenter
+    usePresenter: () => agentSessionPresenter
   }))
 
   vi.doMock('@/stores/ui/session', () => ({
@@ -40,13 +40,13 @@ const setupStore = async () => {
 
   const { useMessageStore } = await import('@/stores/ui/message')
   const store = useMessageStore()
-  return { store, newAgentPresenter }
+  return { store, agentSessionPresenter }
 }
 
 describe('messageStore', () => {
   it('loadMessages only hydrates persisted messages', async () => {
-    const { store, newAgentPresenter } = await setupStore()
-    newAgentPresenter.getMessages.mockResolvedValueOnce([
+    const { store, agentSessionPresenter } = await setupStore()
+    agentSessionPresenter.getMessages.mockResolvedValueOnce([
       {
         id: 'm1',
         sessionId: 's1',
@@ -64,17 +64,17 @@ describe('messageStore', () => {
 
     await store.loadMessages('s1')
 
-    expect(newAgentPresenter.getMessages).toHaveBeenCalledWith('s1')
+    expect(agentSessionPresenter.getMessages).toHaveBeenCalledWith('s1')
     expect(store.messages.value).toHaveLength(1)
     expect(store.messages.value[0]?.metadata).toContain('"messageType":"compaction"')
   })
 
   it('ignores stale loadMessages results', async () => {
-    const { store, newAgentPresenter } = await setupStore()
+    const { store, agentSessionPresenter } = await setupStore()
     const firstLoad = createDeferred<any[]>()
     const secondLoad = createDeferred<any[]>()
 
-    newAgentPresenter.getMessages
+    agentSessionPresenter.getMessages
       .mockReturnValueOnce(firstLoad.promise)
       .mockReturnValueOnce(secondLoad.promise)
 
@@ -120,7 +120,7 @@ describe('messageStore', () => {
   })
 
   it('keeps rate-limit stream messages ephemeral and skips message hydration', async () => {
-    const { store, newAgentPresenter } = await setupStore()
+    const { store, agentSessionPresenter } = await setupStore()
     const responseHandler = (
       (window as any).electron.ipcRenderer.on as ReturnType<typeof vi.fn>
     ).mock.calls.find(([eventName]) => eventName === 'stream:response')?.[1]
@@ -154,7 +154,7 @@ describe('messageStore', () => {
     expect(store.currentStreamMessageId.value).toBe('__rate_limit__:s1:1')
     expect(store.streamingBlocks.value).toHaveLength(1)
     expect(store.messages.value).toHaveLength(0)
-    expect(newAgentPresenter.getMessage).not.toHaveBeenCalled()
+    expect(agentSessionPresenter.getMessage).not.toHaveBeenCalled()
 
     responseHandler(
       {},
@@ -167,6 +167,6 @@ describe('messageStore', () => {
 
     expect(store.streamingBlocks.value).toEqual([])
     expect(store.messages.value).toHaveLength(0)
-    expect(newAgentPresenter.getMessage).not.toHaveBeenCalled()
+    expect(agentSessionPresenter.getMessage).not.toHaveBeenCalled()
   })
 })
diff --git a/test/renderer/stores/pageRouter.test.ts b/test/renderer/stores/pageRouter.test.ts
index 07c184e2e..16871cf6c 100644
--- a/test/renderer/stores/pageRouter.test.ts
+++ b/test/renderer/stores/pageRouter.test.ts
@@ -1,9 +1,9 @@
 import { describe, expect, it, vi } from 'vitest'
 
-const setupStore = async (options?: { activeNewSession?: { id: string } | null }) => {
+const setupStore = async (options?: { activeAgentSession?: { id: string } | null }) => {
   vi.resetModules()
-  const newAgentPresenter = {
-    getActiveSession: vi.fn().mockResolvedValue(options?.activeNewSession ?? null)
+  const agentSessionPresenter = {
+    getActiveSession: vi.fn().mockResolvedValue(options?.activeAgentSession ?? null)
   }
 
   vi.doMock('pinia', () => ({
@@ -12,7 +12,7 @@ const setupStore = async (options?: { activeNewSession?: { id: string } | null }
 
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
-      if (name === 'newAgentPresenter') return newAgentPresenter
+      if (name === 'agentSessionPresenter') return agentSessionPresenter
       return {}
     }
   }))
@@ -31,36 +31,36 @@ const setupStore = async (options?: { activeNewSession?: { id: string } | null }
 
   return {
     store,
-    newAgentPresenter
+    agentSessionPresenter
   }
 }
 
 describe('pageRouter.initialize', () => {
-  it('uses the active new-agent session when it exists', async () => {
-    const { store, newAgentPresenter } = await setupStore({
-      activeNewSession: { id: 'new-session-1' }
+  it('uses the active agent session when it exists', async () => {
+    const { store, agentSessionPresenter } = await setupStore({
+      activeAgentSession: { id: 'new-session-1' }
     })
 
     await store.initialize()
 
-    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledWith(1)
+    expect(agentSessionPresenter.getActiveSession).toHaveBeenCalledWith(1)
     expect(store.route.value).toEqual({ name: 'chat', sessionId: 'new-session-1' })
   })
 
-  it('defaults to new thread when no new-agent active session exists', async () => {
-    const { store, newAgentPresenter } = await setupStore({
-      activeNewSession: null
+  it('defaults to new thread when no active agent session exists', async () => {
+    const { store, agentSessionPresenter } = await setupStore({
+      activeAgentSession: null
     })
 
     await store.initialize()
 
-    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledWith(1)
+    expect(agentSessionPresenter.getActiveSession).toHaveBeenCalledWith(1)
     expect(store.route.value).toEqual({ name: 'newThread' })
   })
 
   it('allows manually going to new thread', async () => {
     const { store } = await setupStore({
-      activeNewSession: null
+      activeAgentSession: null
     })
     store.goToNewThread()
 
@@ -69,7 +69,7 @@ describe('pageRouter.initialize', () => {
 
   it('can force-refresh the new thread view', async () => {
     const { store } = await setupStore({
-      activeNewSession: null
+      activeAgentSession: null
     })
 
     expect(store.newThreadRefreshKey.value).toBe(0)
@@ -84,7 +84,7 @@ describe('pageRouter.initialize', () => {
   it('falls back to new thread when active session lookup fails', async () => {
     vi.resetModules()
 
-    const newAgentPresenter = {
+    const agentSessionPresenter = {
       getActiveSession: vi.fn().mockRejectedValue(new Error('boom'))
     }
 
@@ -94,7 +94,7 @@ describe('pageRouter.initialize', () => {
 
     vi.doMock('@/composables/usePresenter', () => ({
       usePresenter: (name: string) => {
-        if (name === 'newAgentPresenter') return newAgentPresenter
+        if (name === 'agentSessionPresenter') return agentSessionPresenter
         return {}
       }
     }))
diff --git a/test/renderer/stores/pendingInputStore.test.ts b/test/renderer/stores/pendingInputStore.test.ts
index a130ab7e3..d613d0220 100644
--- a/test/renderer/stores/pendingInputStore.test.ts
+++ b/test/renderer/stores/pendingInputStore.test.ts
@@ -31,7 +31,7 @@ const setupStore = async () => {
   vi.resetModules()
   setActivePinia(createPinia())
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     listPendingInputs: vi.fn(),
     queuePendingInput: vi.fn(),
     updateQueuedInput: vi.fn(),
@@ -42,7 +42,7 @@ const setupStore = async () => {
   }
 
   vi.doMock('@/composables/usePresenter', () => ({
-    usePresenter: () => newAgentPresenter
+    usePresenter: () => agentSessionPresenter
   }))
   ;(
     window as typeof window & {
@@ -64,17 +64,17 @@ const setupStore = async () => {
 
   return {
     store: usePendingInputStore(),
-    newAgentPresenter
+    agentSessionPresenter
   }
 }
 
 describe('pendingInput store', () => {
   it('ignores stale load results after the active session changes', async () => {
-    const { store, newAgentPresenter } = await setupStore()
+    const { store, agentSessionPresenter } = await setupStore()
     const firstLoad = createDeferred<ReturnType<typeof createPendingItem>[]>()
     const secondLoad = createDeferred<ReturnType<typeof createPendingItem>[]>()
 
-    newAgentPresenter.listPendingInputs
+    agentSessionPresenter.listPendingInputs
       .mockReturnValueOnce(firstLoad.promise)
       .mockReturnValueOnce(secondLoad.promise)
 
@@ -99,10 +99,10 @@ describe('pendingInput store', () => {
   })
 
   it('preserves clear state when an in-flight load later fails', async () => {
-    const { store, newAgentPresenter } = await setupStore()
+    const { store, agentSessionPresenter } = await setupStore()
     const load = createDeferred<ReturnType<typeof createPendingItem>[]>()
 
-    newAgentPresenter.listPendingInputs.mockReturnValueOnce(load.promise)
+    agentSessionPresenter.listPendingInputs.mockReturnValueOnce(load.promise)
 
     const loadPromise = store.loadPendingInputs('s1')
     expect(store.currentSessionId).toBe('s1')
diff --git a/test/renderer/stores/sessionStore.test.ts b/test/renderer/stores/sessionStore.test.ts
index ea5387ddc..cd1d9469a 100644
--- a/test/renderer/stores/sessionStore.test.ts
+++ b/test/renderer/stores/sessionStore.test.ts
@@ -1,9 +1,17 @@
 import { describe, expect, it, vi } from 'vitest'
 
-const setupStore = async () => {
+type SetupStoreOptions = {
+  initialSettings?: Record<string, unknown>
+  failGetSetting?: boolean
+  failSetSetting?: boolean
+}
+
+const SIDEBAR_GROUP_MODE_KEY = 'sidebar_group_mode'
+
+const setupStore = async (options: SetupStoreOptions = {}) => {
   vi.resetModules()
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     getSessionList: vi.fn().mockResolvedValue([]),
     getActiveSession: vi.fn().mockResolvedValue(null),
     createSession: vi.fn(),
@@ -25,6 +33,21 @@ const setupStore = async () => {
     goToNewThread: vi.fn(),
     currentRoute: 'chat'
   }
+  const settings = { ...(options.initialSettings ?? {}) }
+  const configPresenter = {
+    getSetting: vi.fn(async <T>(key: string) => {
+      if (options.failGetSetting) {
+        throw new Error('failed to read setting')
+      }
+      return settings[key] as T | undefined
+    }),
+    setSetting: vi.fn(async <T>(key: string, value: T) => {
+      if (options.failSetSetting) {
+        throw new Error('failed to write setting')
+      }
+      settings[key] = value
+    })
+  }
   const listeners = new Map<string, Array<(...args: any[]) => void>>()
 
   vi.doMock('pinia', () => ({
@@ -32,7 +55,11 @@ const setupStore = async () => {
   }))
 
   vi.doMock('@/composables/usePresenter', () => ({
-    usePresenter: (name: string) => (name === 'tabPresenter' ? tabPresenter : newAgentPresenter)
+    usePresenter: (name: string) => {
+      if (name === 'tabPresenter') return tabPresenter
+      if (name === 'configPresenter') return configPresenter
+      return agentSessionPresenter
+    }
   }))
 
   vi.doMock('@/stores/ui/pageRouter', () => ({
@@ -67,12 +94,26 @@ const setupStore = async () => {
       handler(undefined, payload)
     }
   }
-  return { store, clearStreamingState, newAgentPresenter, pageRouter, emitIpc, SESSION_EVENTS }
+  return {
+    store,
+    settings,
+    configPresenter,
+    clearStreamingState,
+    agentSessionPresenter,
+    pageRouter,
+    emitIpc,
+    SESSION_EVENTS
+  }
 }
 
 describe('sessionStore.getFilteredGroups', () => {
   it('hides draft sessions from grouped sidebar lists', async () => {
-    const { store } = await setupStore()
+    const { store } = await setupStore({
+      initialSettings: {
+        [SIDEBAR_GROUP_MODE_KEY]: 'time'
+      }
+    })
+    await store.fetchSessions()
     const now = Date.now()
 
     store.sessions.value = [
@@ -152,22 +193,139 @@ describe('sessionStore.getFilteredGroups', () => {
     expect(groupIds).toEqual(['normal-1'])
     expect(pinnedIds).toEqual(['pinned-1'])
   })
+
+  it('uses the last path segment for Windows project labels', async () => {
+    const { store } = await setupStore()
+    const now = Date.now()
+
+    await store.fetchSessions()
+    store.sessions.value = [
+      {
+        id: 'windows-1',
+        title: 'Windows Chat',
+        agentId: 'deepchat',
+        status: 'none',
+        projectDir: 'C:\\Users\\DeepChat\\workspace',
+        providerId: 'openai',
+        modelId: 'gpt-4',
+        isPinned: false,
+        isDraft: false,
+        createdAt: now,
+        updatedAt: now
+      }
+    ]
+
+    const groups = store.getFilteredGroups(null)
+
+    expect(groups).toHaveLength(1)
+    expect(groups[0]?.label).toBe('workspace')
+  })
+})
+
+describe('sessionStore group mode preferences', () => {
+  it('falls back to project when no saved preference exists', async () => {
+    const { store } = await setupStore()
+
+    await store.fetchSessions()
+
+    expect(store.groupMode.value).toBe('project')
+  })
+
+  it('restores the saved group mode preference', async () => {
+    const { store } = await setupStore({
+      initialSettings: {
+        [SIDEBAR_GROUP_MODE_KEY]: 'time'
+      }
+    })
+
+    await store.fetchSessions()
+
+    expect(store.groupMode.value).toBe('time')
+  })
+
+  it('falls back to project when the saved preference is invalid', async () => {
+    const { store } = await setupStore({
+      initialSettings: {
+        [SIDEBAR_GROUP_MODE_KEY]: 'invalid-mode'
+      }
+    })
+
+    await store.fetchSessions()
+
+    expect(store.groupMode.value).toBe('project')
+  })
+
+  it('persists toggled group mode changes', async () => {
+    const { store, settings, configPresenter } = await setupStore()
+
+    await store.fetchSessions()
+    await store.toggleGroupMode()
+
+    expect(store.groupMode.value).toBe('time')
+    expect(configPresenter.setSetting).toHaveBeenCalledWith(SIDEBAR_GROUP_MODE_KEY, 'time')
+    expect(settings[SIDEBAR_GROUP_MODE_KEY]).toBe('time')
+  })
+
+  it('rolls back the group mode when persistence fails', async () => {
+    const { store, configPresenter } = await setupStore({
+      failSetSetting: true
+    })
+
+    await store.fetchSessions()
+    await store.toggleGroupMode()
+
+    expect(store.groupMode.value).toBe('project')
+    expect(configPresenter.setSetting).toHaveBeenCalledWith(SIDEBAR_GROUP_MODE_KEY, 'time')
+  })
+
+  it('serializes concurrent group mode writes and persists the last toggle', async () => {
+    const { store, settings, configPresenter } = await setupStore()
+    const pendingResolvers: Array<() => void> = []
+
+    await store.fetchSessions()
+    configPresenter.setSetting.mockImplementation(async <T>(key: string, value: T) => {
+      await new Promise<void>((resolve) => {
+        pendingResolvers.push(() => {
+          settings[key] = value
+          resolve()
+        })
+      })
+    })
+
+    const firstToggle = store.toggleGroupMode()
+    const secondToggle = store.toggleGroupMode()
+
+    await Promise.resolve()
+
+    expect(store.groupMode.value).toBe('project')
+    expect(configPresenter.setSetting).toHaveBeenCalledTimes(1)
+
+    pendingResolvers.shift()?.()
+    await new Promise((resolve) => setTimeout(resolve, 0))
+
+    expect(configPresenter.setSetting).toHaveBeenCalledTimes(2)
+
+    pendingResolvers.shift()?.()
+    await Promise.all([firstToggle, secondToggle])
+
+    expect(settings[SIDEBAR_GROUP_MODE_KEY]).toBe('project')
+  })
 })
 
 describe('sessionStore streaming cleanup', () => {
   it('clears streaming state when switching active session', async () => {
-    const { store, clearStreamingState, newAgentPresenter } = await setupStore()
+    const { store, clearStreamingState, agentSessionPresenter } = await setupStore()
     store.activeSessionId.value = 'session-a'
 
     await store.selectSession('session-b')
 
-    expect(newAgentPresenter.activateSession).toHaveBeenCalledWith(1, 'session-b')
+    expect(agentSessionPresenter.activateSession).toHaveBeenCalledWith(1, 'session-b')
     expect(clearStreamingState).toHaveBeenCalledTimes(1)
   })
 
   it('syncs active session from presenter when fetching sessions', async () => {
-    const { store, newAgentPresenter } = await setupStore()
-    newAgentPresenter.getSessionList.mockResolvedValueOnce([
+    const { store, agentSessionPresenter } = await setupStore()
+    agentSessionPresenter.getSessionList.mockResolvedValueOnce([
       {
         id: 'session-sync-1',
         title: 'Session Sync',
@@ -182,20 +340,20 @@ describe('sessionStore streaming cleanup', () => {
         updatedAt: 2
       }
     ])
-    newAgentPresenter.getActiveSession.mockResolvedValueOnce({
+    agentSessionPresenter.getActiveSession.mockResolvedValueOnce({
       id: 'session-sync-1'
     })
 
     await store.fetchSessions()
 
-    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledWith(1)
+    expect(agentSessionPresenter.getActiveSession).toHaveBeenCalledWith(1)
     expect(store.activeSessionId.value).toBe('session-sync-1')
   })
 
   it('clears streaming when fetch detects active session switch', async () => {
-    const { store, clearStreamingState, newAgentPresenter } = await setupStore()
+    const { store, clearStreamingState, agentSessionPresenter } = await setupStore()
     store.activeSessionId.value = 'session-a'
-    newAgentPresenter.getActiveSession.mockResolvedValueOnce({
+    agentSessionPresenter.getActiveSession.mockResolvedValueOnce({
       id: 'session-b'
     })
 
@@ -206,10 +364,10 @@ describe('sessionStore streaming cleanup', () => {
   })
 
   it('returns to new thread when active session becomes unavailable', async () => {
-    const { store, clearStreamingState, newAgentPresenter, pageRouter } = await setupStore()
+    const { store, clearStreamingState, agentSessionPresenter, pageRouter } = await setupStore()
     store.activeSessionId.value = 'session-a'
     pageRouter.currentRoute = 'chat'
-    newAgentPresenter.getActiveSession.mockResolvedValueOnce(null)
+    agentSessionPresenter.getActiveSession.mockResolvedValueOnce(null)
 
     await store.fetchSessions()
 
@@ -219,13 +377,13 @@ describe('sessionStore streaming cleanup', () => {
   })
 
   it('reloads sessions when the session list update event fires', async () => {
-    const { newAgentPresenter, emitIpc, SESSION_EVENTS } = await setupStore()
+    const { agentSessionPresenter, emitIpc, SESSION_EVENTS } = await setupStore()
 
     emitIpc(SESSION_EVENTS.LIST_UPDATED)
     await new Promise((resolve) => setTimeout(resolve, 0))
 
-    expect(newAgentPresenter.getSessionList).toHaveBeenCalledTimes(1)
-    expect(newAgentPresenter.getActiveSession).toHaveBeenCalledTimes(1)
+    expect(agentSessionPresenter.getSessionList).toHaveBeenCalledTimes(1)
+    expect(agentSessionPresenter.getActiveSession).toHaveBeenCalledTimes(1)
   })
 
   it('routes to chat when an external session activation targets this renderer', async () => {
diff --git a/test/renderer/stores/spotlight.test.ts b/test/renderer/stores/spotlight.test.ts
index 5f8d805a3..b51cec64a 100644
--- a/test/renderer/stores/spotlight.test.ts
+++ b/test/renderer/stores/spotlight.test.ts
@@ -8,7 +8,7 @@ const setupStore = async (options?: {
 }) => {
   vi.resetModules()
 
-  const newAgentPresenter = {
+  const agentSessionPresenter = {
     searchHistory: vi.fn().mockResolvedValue(options?.historyHits ?? [])
   }
   const windowPresenter = {
@@ -56,8 +56,8 @@ const setupStore = async (options?: {
 
   vi.doMock('@/composables/usePresenter', () => ({
     usePresenter: (name: string) => {
-      if (name === 'newAgentPresenter') {
-        return newAgentPresenter
+      if (name === 'agentSessionPresenter') {
+        return agentSessionPresenter
       }
 
       if (name === 'windowPresenter') {