diff --git a/docs/specs/subagent-orchestrator/plan.md b/docs/specs/subagent-orchestrator/plan.md
new file mode 100644
index 000000000..439b34356
--- /dev/null
+++ b/docs/specs/subagent-orchestrator/plan.md
@@ -0,0 +1,200 @@
+# Subagent Orchestrator V1 实施计划
+
+## 1. 基线
+
+当前代码已经具备：
+
+1. `new_sessions` + `deepchat_sessions` 的新会话栈
+2. `NewAgentPresenter` 负责 session 生命周期与 renderer IPC
+3. `ToolPresenter -> AgentToolManager` 的 agent tool 路由
+4. `DeepChatAgentPresenter` 的 tool call / permission / question / resume 流
+5. renderer 的 `MessageBlockToolCall`、`ChatToolInteractionOverlay`、`WorkspacePanel`
+
+缺的部分是：
+
+1. session 级 subagent 元数据
+2. orchestrator tool 和 child session runtime bridge
+3. child 输出到 parent tool block 的 main-only progress 通道
+4. renderer 对 subagent cards / workspace child list / back link 的展示
+
+## 2. 设计决策
+
+### 2.1 数据层
+
+在 `new_sessions` 保存 parent/child 关系，而不是新建额外表：
+
+1. child session 已经是完整真实 session
+2. 删除、恢复、状态读取都能沿用现有 session 生命周期
+3. workspace 列表和 `getSessionList()` 只需增加过滤
+
+### 2.2 Runtime Port 扩展
+
+不让 `AgentToolManager` 直接依赖 presenter 实例，继续通过 `AgentToolRuntimePort` 间接访问：
+
+1. 查询当前会话是否允许 subagent tool
+2. 创建 child session
+3. 发送 child handoff message
+4. 读取 parent/child session 信息
+
+### 2.3 进度桥接
+
+采用 main-only event：
+
+1. `dispatch.flushBlocksToRenderer()` 在 child assistant block 流式刷新时，同时发 main-only event
+2. `DeepChatAgentPresenter.setSessionStatus()` 和 `emitMessageRefresh()` 也发 main-only event
+3. orchestrator 订阅这些事件，维护自己的内存态 queue
+
+这样避免：
+
+1. renderer 反向回传
+2. 轮询数据库
+3. 额外的 child polling loop
+
+### 2.4 Tool Progress 写回
+
+tool 执行时通过 `IToolPresenter.callTool(..., { onProgress })` 回调：
+
+1. `dispatch.executeTools()` 收到 progress 时直接更新当前 tool_call block 的 `extra.subagentProgress`
+2. tool 完成时写 `extra.subagentFinal`
+3. `tool_call.response` 始终保留最终 markdown 汇总文本
+
+### 2.5 Renderer Session 状态
+
+`sessionStore.sessions` 继续只存 sidebar 可见的 regular sessions；另增 `activeSessionRecord`：
+
+1. sidebar 默认不显示 child
+2. 当当前激活的是 child 时，`activeSession` 仍能拿到完整会话记录
+3. workspace 和 top bar 都能正确读取 child 的 parent metadata
+
+### 2.6 Workspace 子会话列表
+
+在 `WorkspacePanel` 左侧导航追加 `Subagents` section，而不是新建独立侧栏：
+
+1. 信息层级与 artifacts/files/git 一致
+2. 与 parent workspace 语义自然贴近
+3. 避免引入新的 sidepanel store 结构
+
+## 3. 分层改造
+
+### Phase 1：Shared & Storage
+
+1. 扩展 `DeepChatAgentConfig`、session record、tool progress、presenter interface
+2. 更新 `new_sessions` schema / migration / table accessors
+3. 扩展 `NewSessionManager` 与 `NewAgentPresenter` 的 create/list/delete API
+
+### Phase 2：Tool Runtime
+
+1. 扩展 `AgentToolRuntimePort`
+2. 在 `AgentToolManager` 中新增 `subagent_orchestrator` schema、definition、gating
+3. 实现 orchestrator 执行器：
+   - slot 校验
+   - child session 创建
+   - structured handoff
+   - parallel / chain 调度
+   - progress snapshot 生成
+   - final markdown 汇总
+
+### Phase 3：DeepChat Progress Bridge
+
+1. 增加 main-only subagent runtime event 常量
+2. `dispatch` 在 child assistant block streaming 时发 event
+3. `DeepChatAgentPresenter` 在 message refresh / session status change 时发 event
+4. `dispatch.executeTools()` 与 `executeDeferredToolCall()` 透传 `onProgress` / `signal`
+
+### Phase 4：Renderer
+
+1. `DeepChatAgentsSettings` 增加 subagent settings UI
+2. `draftStore` / `NewThreadPage` / `ChatStatusBar` 支持 session-level subagent toggle
+3. `MessageBlockToolCall` 对 `subagent_orchestrator` 渲染 card 视图
+4. `ChatPage` 扩展 pending interaction 扫描到 child progress
+5. `WorkspacePanel` 增加 `Subagents` section
+6. `ChatTopBar` 在 child session 显示 `Back to Parent`
+
+## 4. 关键实现细节
+
+### 4.1 child handoff 模板
+
+模板字段固定：
+
+1. Parent summary
+2. Slot role
+3. Task title
+4. Task prompt
+5. Expected output
+6. Workspace path
+
+模板输出必须英文，避免模型在 child 里混杂工具协议与 UI 本地化文案。
+
+### 4.2 preview 行提取
+
+从 child 最近一次 assistant blocks 中提取展示行：
+
+1. `content`
+2. `reasoning_content`
+3. `action.content`
+4. `tool_call.response`
+
+做法：
+
+1. 按 block 顺序拼平为文本行
+2. 去空白行
+3. 仅保留最近 3 行
+
+### 4.3 waiting 状态判断
+
+优先级：
+
+1. 当前存在 pending `tool_call_permission` -> `waiting_permission`
+2. 当前存在 pending `question_request` -> `waiting_question`
+3. runtime status=`generating` -> `running`
+4. aborted by signal -> `cancelled`
+5. runtime status=`error` -> `error`
+6. 否则 `completed`
+
+### 4.4 父删子级联
+
+在 `NewAgentPresenter.deleteSession()` 递归查 child：
+
+1. 父删除时先深度删除所有 child
+2. child 单独删除不反查父
+3. 删除 child 时不删除 parent
+
+## 5. 测试策略
+
+### Main
+
+1. SQLite migration / default columns
+2. `NewSessionManager` 读写新字段
+3. `NewAgentPresenter.getSessionList()` 过滤与级联删除
+4. `AgentToolManager` tool gating
+5. `subagent_orchestrator` 的 parallel / chain 执行顺序
+6. progress snapshot 与 preview 裁剪
+
+### Renderer
+
+1. `MessageBlockToolCall` subagent card 渲染与自动折叠
+2. `ChatPage` overlay 从 `subagentProgress` 提取 child interaction
+3. `WorkspacePanel` 子会话列表点击切换
+4. `ChatTopBar` child session back-to-parent
+5. `DeepChatAgentsSettings` slot 默认值、上限和保存载入
+
+## 6. 风险与缓解
+
+1. 风险：active child session 不在 sidebar sessions 中，导致顶部/状态栏读不到 session。
+   缓解：session store 维护独立 `activeSessionRecord`。
+
+2. 风险：tool progress 写回过于频繁，造成 renderer 抖动。
+   缓解：只在 child blocks/status 真变化时发 progress；preview 只保留 3 行。
+
+3. 风险：父会话取消时 child 仍继续跑。
+   缓解：`signal` 中断 orchestrator；对子 session 调 `cancelGeneration()` 并标记 `cancelled`。
+
+4. 风险：slot 指向 ACP 或禁用 agent。
+   缓解：tool gating 与执行前双重过滤，无效 slot 不暴露、不执行。
+
+## 7. 验证门槛
+
+1. `pnpm run format`
+2. `pnpm run i18n`
+3. `pnpm run lint`
+4. 关键 main / renderer 测试通过
diff --git a/docs/specs/subagent-orchestrator/spec.md b/docs/specs/subagent-orchestrator/spec.md
new file mode 100644
index 000000000..d86aa2e4f
--- /dev/null
+++ b/docs/specs/subagent-orchestrator/spec.md
@@ -0,0 +1,296 @@
+# Subagent Orchestrator V1 规格
+
+## 背景
+
+现有多工具式 subagent 方案把 child session 管理、等待、汇总拆散给模型，导致：
+
+1. 工具暴露面过大，模型需要自己编排 `run / wait / cancel / list`
+2. parent loop 会过早接触中间结果，增加 prompt 噪音
+3. child session 与父会话的 UI 关联不够稳定，权限/提问桥接也不够直接
+
+V1 目标是把能力收口为单一 agent tool `subagent_orchestrator`，由 tool 内部完成 child session 编排、监听和最终汇总。
+
+## 用户故事
+
+1. 作为 DeepChat regular session 用户，我希望模型只调用一个 subagent tool，就能并行或串行分派多个子任务。
+2. 作为父会话用户，我希望看到 child 的实时进度卡片，但模型只在全部 child 结束后收到一次最终汇总。
+3. 作为需要审批/回答问题的用户，我希望仍然只在父会话顶部 overlay 处理交互，不需要切到 child 才能继续。
+4. 作为查看上下文的用户，我希望 child 是真实独立 session，能在右侧 workspace 的 `Subagents` 区查看、切换、回到父会话。
+
+## 范围
+
+### In
+
+1. 单一公开 agent tool：`subagent_orchestrator`
+2. 两种执行模式：`parallel`、`chain`
+3. DeepChat agent 配置中的 subagent slot 管理
+4. parent -> child 单层关联
+5. main-process 内部 child 输出监听
+6. 父会话 tool block 进度卡片、顶部 overlay 桥接、workspace 子会话列表
+
+### Out
+
+1. `expanded` 模式
+2. child 再派生 child
+3. 多层树状工作流
+4. parent loop 消费 partial child tool result
+5. card 内直接批准权限或直接回答问题
+
+## 约束
+
+1. 单次 `subagent_orchestrator` 最多 5 个 task
+2. agent 配置 slot 最多 5 条
+3. 只允许引用当前父会话 agent 配置里已启用的 slot
+4. 只有 `sessionKind='regular'` 且 `agentType='deepchat'` 且 `subagentEnabled=true` 的父会话暴露该工具
+5. ACP session 与 subagent child session 不暴露该工具
+
+## 配置与数据模型
+
+### Agent 配置
+
+`DeepChatAgentConfig` 增加：
+
+1. `subagentEnabled: boolean`
+2. `subagents: DeepChatSubagentSlot[]`
+
+`DeepChatSubagentSlot` 定义：
+
+1. `id: string`
+2. `targetType: 'self' | 'agent'`
+3. `targetAgentId?: string`
+4. `displayName: string`
+5. `description: string`
+
+规则：
+
+1. 默认预置 1 条 `self` slot
+2. `self` 表示继承父会话 agent 逻辑，但 child 使用独立上下文
+3. 非法 `targetAgentId` 在读取配置和工具执行时都要过滤
+
+### Session 输入
+
+`CreateSessionInput` / `CreateDetachedSessionInput` 增加：
+
+1. `subagentEnabled?: boolean`
+
+### `new_sessions`
+
+新增列：
+
+1. `subagent_enabled INTEGER NOT NULL DEFAULT 0`
+2. `session_kind TEXT NOT NULL DEFAULT 'regular'`
+3. `parent_session_id TEXT`
+4. `subagent_meta_json TEXT`
+
+### Session 读取模型
+
+`SessionRecord` / `SessionWithState` 增加：
+
+1. `sessionKind: 'regular' | 'subagent'`
+2. `parentSessionId?: string | null`
+3. `subagentEnabled: boolean`
+4. `subagentMeta?: { slotId: string; displayName: string; targetAgentId?: string | null } | null`
+
+## Tool 接口
+
+`subagent_orchestrator` 参数固定为：
+
+```ts
+{
+  mode: 'parallel' | 'chain'
+  tasks: Array<{
+    id?: string
+    slotId: string
+    title: string
+    prompt: string
+    expectedOutput?: string
+  }>
+}
+```
+
+`IToolPresenter.callTool()` 增加可选参数：
+
+1. `onProgress?: (update: AgentToolProgressUpdate) => void`
+2. `signal?: AbortSignal`
+
+`AgentToolProgressUpdate` V1 只定义：
+
+```ts
+{
+  kind: 'subagent_orchestrator'
+  toolCallId: string
+  responseMarkdown: string
+  progressJson: string
+}
+```
+
+`AssistantMessageExtra` 增加：
+
+1. `subagentProgress?: string`
+2. `subagentFinal?: string`
+
+## Child Session 生命周期
+
+### 创建
+
+tool 内部通过 runtime port 调 `NewAgentPresenter` 创建 child session：
+
+1. `self` slot 继承父 `agentId`
+2. `agent` slot 使用 `slot.targetAgentId`
+3. 继承父 `projectDir`
+4. 继承父 session model / permission / generation settings
+5. child session 写入 `session_kind='subagent'`
+6. child session 写入 `parent_session_id=父 sessionId`
+7. child session 写入 `subagent_meta_json`
+
+### 首条 handoff
+
+child 首条消息固定使用 structured handoff 模板，仅包含：
+
+1. 父任务摘要
+2. slot 描述
+3. 当前子任务
+4. 输出契约
+5. 工作区路径
+
+不复制完整父 transcript。
+
+### 结束态
+
+child terminal status 归一为：
+
+1. `queued`
+2. `running`
+3. `waiting_permission`
+4. `waiting_question`
+5. `completed`
+6. `error`
+7. `cancelled`
+
+## 执行语义
+
+### `parallel`
+
+1. 立即创建并启动全部 child
+2. 并发等待全部 child 完成
+3. child 结果先缓存在 orchestrator 内部 queue
+4. 全部结束后按原 `tasks` 顺序聚合最终结果
+
+### `chain`
+
+1. 按 `tasks` 顺序逐个创建 child
+2. 每个 child 结束后再启动下一个
+3. 每个结果进入内部 queue
+4. 最终仍按原 `tasks` 顺序聚合
+
+### 共同行为
+
+1. parent loop 不消费 partial child output
+2. tool 完成前，父会话只写 progress，不把中间结果作为 tool message 喂给模型
+3. 最终 `tool_call.response` 与 tool output 都使用同一份 markdown 汇总文本
+
+## Progress Payload
+
+`subagentProgress` / `subagentFinal` 使用统一 JSON 结构：
+
+```ts
+{
+  runId: string
+  mode: 'parallel' | 'chain'
+  tasks: Array<{
+    taskId: string
+    title: string
+    slotId: string
+    sessionId: string | null
+    targetAgentId: string | null
+    targetAgentName: string
+    status: 'queued' | 'running' | 'waiting_permission' | 'waiting_question' | 'completed' | 'error' | 'cancelled'
+    previewMarkdown: string
+    updatedAt: number
+    waitingInteraction?: {
+      messageId: string
+      toolCallId: string
+      actionType: 'tool_call_permission' | 'question_request'
+      toolName: string
+      toolArgs: string
+    } | null
+    resultSummary?: string
+  }>
+}
+```
+
+规则：
+
+1. `previewMarkdown` 只保留最近 3 条非空展示行
+2. 进度事件来自 main-process 内部 child 输出观察通道，不依赖 renderer，不轮询 DB
+
+## 最终汇总
+
+最终 markdown 文本按原 `tasks` 顺序输出，每项包含：
+
+1. 序号
+2. 标题
+3. 子 agent 名称
+4. child sessionId
+5. 结果摘要
+
+## UI 验收
+
+### Agent Settings
+
+`DeepChat Agents` 扩展 `Subagents` 分区：
+
+1. 总开关
+2. slot 列表
+3. `+ Add Slot`
+4. target agent 选择
+5. 描述编辑
+6. 5 条上限
+
+### Session UI
+
+1. 会话层只保留一个 `Subagents` toggle
+2. 只在 DeepChat regular session 可见
+3. ACP 与 child session 隐藏
+
+### Tool Block
+
+`MessageBlockToolCall` 对 `subagent_orchestrator` 特判：
+
+1. 运行中自动展开
+2. 完成后自动折叠
+3. 详情区显示 subagent cards，不走普通 `pre`
+4. summary 固定为 `parallel · N subagents` 或 `chain · N subagents`
+
+### Overlay
+
+父会话顶部 overlay 继续复用 `ChatToolInteractionOverlay`：
+
+1. 同时扫描普通 action block 与 `subagent_orchestrator` 的 `extra.subagentProgress`
+2. child 进入等待态时显示待处理项
+3. 响应直接路由到 `respondToolInteraction(childSessionId, ...)`
+
+### Workspace
+
+父会话右侧 workspace 增加 `Subagents` section：
+
+1. 列出当前父会话全部 child
+2. 展示 `displayName / target agent / status / updatedAt`
+3. 点击切换 child session
+4. child 顶部有 `Back to Parent`
+
+## 兼容与迁移
+
+1. 旧库升级后，原有 session 默认 `session_kind='regular'`
+2. 旧库升级后，原有 session 默认 `subagent_enabled=0`
+3. 左侧 sidebar 默认仍只显示普通会话
+4. 父删子级联；子单删不影响父
+
+## 验收标准
+
+1. 只有 DeepChat regular session 且 subagentEnabled 打开时，模型能看到 `subagent_orchestrator`
+2. `parallel` 并发启动全部 child，`chain` 串行启动
+3. parent tool block 能随 child 输出实时更新 card 预览
+4. child 的 permission/question 会在父会话 overlay 中处理
+5. child session 在 workspace `Subagents` 区可切换
+6. 应用重启后，父子关联与 workspace 子会话列表仍可恢复
diff --git a/docs/specs/subagent-orchestrator/tasks.md b/docs/specs/subagent-orchestrator/tasks.md
new file mode 100644
index 000000000..e6b9e7511
--- /dev/null
+++ b/docs/specs/subagent-orchestrator/tasks.md
@@ -0,0 +1,50 @@
+# Subagent Orchestrator V1 任务拆分
+
+## 1. Shared / Schema
+
+1. 扩展 `DeepChatAgentConfig`、`DeepChatSubagentSlot`、session record、tool progress 类型
+2. 扩展 `INewAgentPresenter` / `IToolPresenter`
+3. 为 `new_sessions` 增加 subagent 相关列与迁移测试
+
+## 2. Main Session Layer
+
+1. 更新 `NewSessionsTable` / `NewSessionManager` create-get-list-update
+2. 更新 `NewAgentPresenter`：
+   - create session / detached session 支持 `subagentEnabled`
+   - `getSessionList()` 支持 `includeSubagents` / `parentSessionId`
+   - `setSessionSubagentEnabled()`
+   - 父删子级联
+3. 增加 runtime port 的 subagent session helper
+
+## 3. Tool Runtime
+
+1. 在 `AgentToolManager` 增加 `subagent_orchestrator` tool schema / definition / gating
+2. 实现 slot 校验与 `self` slot 继承逻辑
+3. 实现 child session 创建、handoff、parallel / chain 调度
+4. 生成 progress payload 与 final markdown
+5. 接入 abort signal
+
+## 4. DeepChat Bridge
+
+1. 定义 main-only subagent runtime events
+2. `dispatch` 发 child block update event
+3. `DeepChatAgentPresenter` 发 child status / refresh event
+4. `dispatch.executeTools()` / `executeDeferredToolCall()` 接 `onProgress`
+5. 把 `subagentProgress` / `subagentFinal` 写回 assistant block extra
+
+## 5. Renderer
+
+1. `draftStore` / `NewThreadPage` / `ChatStatusBar` 增加 session-level subagent toggle
+2. `DeepChatAgentsSettings` 增加 subagent settings UI
+3. `MessageBlockToolCall` 渲染 subagent cards
+4. `ChatPage` overlay bridge 扫描 child waiting interaction
+5. `WorkspacePanel` 增加 `Subagents` section
+6. `ChatTopBar` 增加 `Back to Parent`
+
+## 6. Tests & Validation
+
+1. main：migration / presenter / tool execution / progress
+2. renderer：tool cards / overlay / workspace / settings
+3. 运行 `pnpm run format`
+4. 运行 `pnpm run i18n`
+5. 运行 `pnpm run lint`
diff --git a/src/main/presenter/agentRepository/index.ts b/src/main/presenter/agentRepository/index.ts
index ceb5ddc84..effaf9592 100644
--- a/src/main/presenter/agentRepository/index.ts
+++ b/src/main/presenter/agentRepository/index.ts
@@ -13,6 +13,7 @@ import type {
   CreateDeepChatAgentInput,
   UpdateDeepChatAgentInput
 } from '@shared/types/agent-interface'
+import { normalizeDeepChatSubagentConfig } from '@shared/lib/deepchatSubagents'
 import type { SQLitePresenter } from '../sqlitePresenter'
 import type { AgentRow } from '../sqlitePresenter/tables/agents'
 
@@ -63,25 +64,28 @@ const clone = <T>(value: T): T => JSON.parse(JSON.stringify(value)) as T
 const mergeDeepChatConfig = (
   baseConfig: DeepChatAgentConfig,
   overrideConfig: DeepChatAgentConfig
-): DeepChatAgentConfig => ({
-  defaultModelPreset: overrideConfig.defaultModelPreset ?? baseConfig.defaultModelPreset ?? null,
-  assistantModel: overrideConfig.assistantModel ?? baseConfig.assistantModel ?? null,
-  visionModel: overrideConfig.visionModel ?? baseConfig.visionModel ?? null,
-  defaultProjectPath: overrideConfig.defaultProjectPath ?? baseConfig.defaultProjectPath ?? null,
-  systemPrompt: overrideConfig.systemPrompt ?? baseConfig.systemPrompt ?? '',
-  permissionMode: overrideConfig.permissionMode ?? baseConfig.permissionMode ?? 'full_access',
-  disabledAgentTools: overrideConfig.disabledAgentTools ?? baseConfig.disabledAgentTools ?? [],
-  autoCompactionEnabled:
-    overrideConfig.autoCompactionEnabled ?? baseConfig.autoCompactionEnabled ?? true,
-  autoCompactionTriggerThreshold:
-    overrideConfig.autoCompactionTriggerThreshold ??
-    baseConfig.autoCompactionTriggerThreshold ??
-    80,
-  autoCompactionRetainRecentPairs:
-    overrideConfig.autoCompactionRetainRecentPairs ??
-    baseConfig.autoCompactionRetainRecentPairs ??
-    2
-})
+): DeepChatAgentConfig =>
+  normalizeDeepChatSubagentConfig({
+    defaultModelPreset: overrideConfig.defaultModelPreset ?? baseConfig.defaultModelPreset ?? null,
+    assistantModel: overrideConfig.assistantModel ?? baseConfig.assistantModel ?? null,
+    visionModel: overrideConfig.visionModel ?? baseConfig.visionModel ?? null,
+    defaultProjectPath: overrideConfig.defaultProjectPath ?? baseConfig.defaultProjectPath ?? null,
+    systemPrompt: overrideConfig.systemPrompt ?? baseConfig.systemPrompt ?? '',
+    permissionMode: overrideConfig.permissionMode ?? baseConfig.permissionMode ?? 'full_access',
+    disabledAgentTools: overrideConfig.disabledAgentTools ?? baseConfig.disabledAgentTools ?? [],
+    subagentEnabled: overrideConfig.subagentEnabled ?? baseConfig.subagentEnabled ?? false,
+    subagents: overrideConfig.subagents ?? baseConfig.subagents ?? [],
+    autoCompactionEnabled:
+      overrideConfig.autoCompactionEnabled ?? baseConfig.autoCompactionEnabled ?? true,
+    autoCompactionTriggerThreshold:
+      overrideConfig.autoCompactionTriggerThreshold ??
+      baseConfig.autoCompactionTriggerThreshold ??
+      80,
+    autoCompactionRetainRecentPairs:
+      overrideConfig.autoCompactionRetainRecentPairs ??
+      baseConfig.autoCompactionRetainRecentPairs ??
+      2
+  })
 
 export class AgentRepository {
   constructor(private readonly sqlitePresenter: SQLitePresenter) {}
@@ -192,7 +196,8 @@ export class AgentRepository {
     if (!row || row.agent_type !== 'deepchat') {
       return null
     }
-    return parseJson<DeepChatAgentConfig>(row.config_json)
+    const config = parseJson<DeepChatAgentConfig>(row.config_json)
+    return config ? normalizeDeepChatSubagentConfig(config) : null
   }
 
   resolveDeepChatAgentConfig(agentId: string): DeepChatAgentConfig {
diff --git a/src/main/presenter/configPresenter/index.ts b/src/main/presenter/configPresenter/index.ts
index 353f3ac99..6a2125ebf 100644
--- a/src/main/presenter/configPresenter/index.ts
+++ b/src/main/presenter/configPresenter/index.ts
@@ -54,6 +54,7 @@ import { AcpLaunchSpecService } from './acpLaunchSpecService'
 import { AcpProvider } from '../llmProviderPresenter/providers/acpProvider'
 import { resolveAcpAgentAlias } from './acpRegistryConstants'
 import { AgentRepository, BUILTIN_DEEPCHAT_AGENT_ID } from '../agentRepository'
+import { normalizeDeepChatSubagentConfig } from '@shared/lib/deepchatSubagents'
 import type {
   HookEventName,
   HookTestResult,
@@ -443,7 +444,7 @@ export class ConfigPresenter implements IConfigPresenter {
     const autoCompactionTriggerThreshold = this.store.get('autoCompactionTriggerThreshold')
     const autoCompactionRetainRecentPairs = this.store.get('autoCompactionRetainRecentPairs')
 
-    return {
+    return normalizeDeepChatSubagentConfig({
       defaultModelPreset:
         defaultModel?.providerId && defaultModel?.modelId
           ? {
@@ -474,7 +475,7 @@ export class ConfigPresenter implements IConfigPresenter {
         typeof autoCompactionTriggerThreshold === 'number' ? autoCompactionTriggerThreshold : 80,
       autoCompactionRetainRecentPairs:
         typeof autoCompactionRetainRecentPairs === 'number' ? autoCompactionRetainRecentPairs : 2
-    }
+    })
   }
 
   private syncRegistryAgentsToRepository(
diff --git a/src/main/presenter/deepchatAgentPresenter/dispatch.ts b/src/main/presenter/deepchatAgentPresenter/dispatch.ts
index d47af2f1c..7e893058c 100644
--- a/src/main/presenter/deepchatAgentPresenter/dispatch.ts
+++ b/src/main/presenter/deepchatAgentPresenter/dispatch.ts
@@ -1,10 +1,16 @@
 import { eventBus, SendTarget } from '@/eventbus'
 import { STREAM_EVENTS } from '@/events'
 import { presenter } from '@/presenter'
-import type { MCPToolCall, MCPContentItem, MCPResourceContent } from '@shared/types/core/mcp'
+import type {
+  MCPToolCall,
+  MCPContentItem,
+  MCPResourceContent,
+  MCPToolResponse
+} from '@shared/types/core/mcp'
 import type { MCPToolDefinition } from '@shared/types/core/mcp'
 import type { SearchResult } from '@shared/types/core/search'
 import type { IToolPresenter } from '@shared/types/presenters/tool.presenter'
+import type { AgentToolProgressUpdate } from '@shared/types/presenters/tool.presenter'
 import type { AssistantMessageBlock, PermissionMode } from '@shared/types/agent-interface'
 import { parseQuestionToolArgs, QUESTION_TOOL_NAME } from '../../lib/agentRuntime/questionTool'
 import type {
@@ -19,6 +25,12 @@ import { nanoid } from 'nanoid'
 import type { ToolBatchOutputFitItem, ToolOutputGuard } from './toolOutputGuard'
 import { buildTerminalErrorBlocks } from './messageStore'
 import { finalizeTrailingPendingNarrativeBlocks } from './accumulator'
+import {
+  buildAssistantPreviewMarkdown,
+  buildAssistantResponseMarkdown,
+  emitDeepChatInternalSessionUpdate,
+  extractWaitingInteraction
+} from './internalSessionEvents'
 
 type PermissionType = 'read' | 'write' | 'all' | 'command'
 
@@ -206,6 +218,46 @@ function updateToolCallBlock(
   }
 }
 
+function updateSubagentToolCallBlock(
+  blocks: AssistantMessageBlock[],
+  toolCallId: string,
+  responseMarkdown: string,
+  progressJson?: string,
+  finalJson?: string
+): void {
+  const block = blocks.find(
+    (item) => item.type === 'tool_call' && item.tool_call?.id === toolCallId
+  )
+  if (!block?.tool_call) {
+    return
+  }
+
+  block.tool_call.response = responseMarkdown
+  block.status = typeof finalJson === 'string' ? 'success' : 'loading'
+  block.extra = {
+    ...block.extra,
+    ...(typeof progressJson === 'string' ? { subagentProgress: progressJson } : {}),
+    ...(typeof finalJson === 'string' ? { subagentFinal: finalJson } : {})
+  }
+}
+
+function extractSubagentToolState(rawData: MCPToolResponse): {
+  subagentProgress?: string
+  subagentFinal?: string
+} {
+  const toolResult =
+    rawData.toolResult && typeof rawData.toolResult === 'object'
+      ? (rawData.toolResult as Record<string, unknown>)
+      : null
+
+  return {
+    subagentProgress:
+      typeof toolResult?.subagentProgress === 'string' ? toolResult.subagentProgress : undefined,
+    subagentFinal:
+      typeof toolResult?.subagentFinal === 'string' ? toolResult.subagentFinal : undefined
+  }
+}
+
 function persistToolExecutionState(io: IoParams, state: StreamState): void {
   if (!state.dirty) {
     return
@@ -496,6 +548,16 @@ function flushBlocksToRenderer(io: IoParams, blocks: AssistantMessageBlock[]): v
     messageId: io.messageId,
     blocks: JSON.parse(JSON.stringify(blocks))
   })
+
+  emitDeepChatInternalSessionUpdate({
+    sessionId: io.sessionId,
+    kind: 'blocks',
+    updatedAt: Date.now(),
+    messageId: io.messageId,
+    previewMarkdown: buildAssistantPreviewMarkdown(blocks),
+    responseMarkdown: buildAssistantResponseMarkdown(blocks),
+    waitingInteraction: extractWaitingInteraction(blocks, io.messageId)
+  })
 }
 
 export async function executeTools(
@@ -661,7 +723,25 @@ export async function executeTools(
         params: tc.arguments
       })
 
-      const toolCallResult = await toolPresenter.callTool(toolCall)
+      const applyProgressUpdate = (update: AgentToolProgressUpdate) => {
+        if (update.kind !== 'subagent_orchestrator' || update.toolCallId !== tc.id) {
+          return
+        }
+
+        updateSubagentToolCallBlock(
+          state.blocks,
+          tc.id,
+          update.responseMarkdown,
+          update.progressJson
+        )
+        flushBlocksToRenderer(io, state.blocks)
+        io.messageStore.updateAssistantContent(io.messageId, state.blocks)
+      }
+
+      const toolCallResult = await toolPresenter.callTool(toolCall, {
+        onProgress: applyProgressUpdate,
+        signal: io.abortSignal
+      })
       let toolRawData = toolCallResult.rawData
 
       if (toolRawData?.requiresPermission) {
@@ -677,7 +757,10 @@ export async function executeTools(
         if (pendingPermission) {
           if (permissionMode === 'full_access') {
             await autoGrantPermission(io.sessionId, pendingPermission)
-            const retryCallResult = await toolPresenter.callTool(toolCall)
+            const retryCallResult = await toolPresenter.callTool(toolCall, {
+              onProgress: applyProgressUpdate,
+              signal: io.abortSignal
+            })
             toolRawData = retryCallResult.rawData
           } else {
             hooks?.onPermissionRequest?.(pendingPermission, {
@@ -698,6 +781,19 @@ export async function executeTools(
         }
       }
 
+      const subagentState = extractSubagentToolState(toolRawData)
+      if (subagentState.subagentProgress || subagentState.subagentFinal) {
+        updateSubagentToolCallBlock(
+          state.blocks,
+          tc.id,
+          typeof toolRawData.content === 'string'
+            ? toolRawData.content
+            : toolResponseToText(toolRawData.content),
+          subagentState.subagentProgress,
+          subagentState.subagentFinal
+        )
+      }
+
       if (hooks?.normalizeToolResult) {
         toolRawData = {
           ...toolRawData,
diff --git a/src/main/presenter/deepchatAgentPresenter/index.ts b/src/main/presenter/deepchatAgentPresenter/index.ts
index eaf527c24..06dead6fa 100644
--- a/src/main/presenter/deepchatAgentPresenter/index.ts
+++ b/src/main/presenter/deepchatAgentPresenter/index.ts
@@ -53,6 +53,12 @@ import type { ProviderRequestTracePayload } from '../llmProviderPresenter/reques
 import type { NewSessionHooksBridge } from '../hooksNotifications/newSessionBridge'
 import { providerDbLoader } from '../configPresenter/providerDbLoader'
 import { resolveSessionVisionTarget } from '../vision/sessionVisionResolver'
+import {
+  buildAssistantPreviewMarkdown,
+  buildAssistantResponseMarkdown,
+  emitDeepChatInternalSessionUpdate,
+  extractWaitingInteraction
+} from './internalSessionEvents'
 
 type PendingInteractionEntry = {
   interaction: PendingToolInteraction
@@ -130,6 +136,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
   private readonly runtimeState: Map<string, DeepChatSessionState> = new Map()
   private readonly sessionGenerationSettings: Map<string, SessionGenerationSettings> = new Map()
   private readonly abortControllers: Map<string, AbortController> = new Map()
+  private readonly deferredToolAbortControllers: Map<string, AbortController> = new Map()
   private readonly activeGenerations: Map<string, ActiveGeneration> = new Map()
   private readonly sessionAgentIds: Map<string, string> = new Map()
   private readonly sessionProjectDirs: Map<string, string | null> = new Map()
@@ -236,6 +243,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       controller.abort()
       this.abortControllers.delete(sessionId)
     }
+    this.abortDeferredToolAbortControllers(sessionId)
     this.activeGenerations.delete(sessionId)
 
     this.pendingInputCoordinator.deleteBySession(sessionId)
@@ -630,7 +638,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
               params: toolCall.params
             }
           })
-          const execution = await this.executeDeferredToolCall(sessionId, toolCall)
+          const execution = await this.executeDeferredToolCall(sessionId, messageId, toolCall)
           if (execution.terminalError) {
             this.dispatchHook('PostToolUseFailure', {
               sessionId,
@@ -896,6 +904,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         this.abortControllers.delete(sessionId)
       }
     }
+    this.abortDeferredToolAbortControllers(sessionId)
     this.setSessionStatus(sessionId, 'idle')
   }
 
@@ -1029,6 +1038,48 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     )
   }
 
+  private buildDeferredToolAbortKey(sessionId: string, toolCallId: string): string {
+    return `${sessionId}:${toolCallId}`
+  }
+
+  private registerDeferredToolAbortController(
+    sessionId: string,
+    toolCallId: string
+  ): AbortController {
+    const key = this.buildDeferredToolAbortKey(sessionId, toolCallId)
+    this.deferredToolAbortControllers.get(key)?.abort()
+    const controller = new AbortController()
+    this.deferredToolAbortControllers.set(key, controller)
+    return controller
+  }
+
+  private clearDeferredToolAbortController(
+    sessionId: string,
+    toolCallId: string,
+    controller?: AbortController
+  ): void {
+    const key = this.buildDeferredToolAbortKey(sessionId, toolCallId)
+    const current = this.deferredToolAbortControllers.get(key)
+    if (!current) {
+      return
+    }
+    if (controller && current !== controller) {
+      return
+    }
+    this.deferredToolAbortControllers.delete(key)
+  }
+
+  private abortDeferredToolAbortControllers(sessionId: string): void {
+    const prefix = `${sessionId}:`
+    for (const [key, controller] of this.deferredToolAbortControllers) {
+      if (!key.startsWith(prefix)) {
+        continue
+      }
+      controller.abort()
+      this.deferredToolAbortControllers.delete(key)
+    }
+  }
+
   private throwIfAbortRequested(signal?: AbortSignal): void {
     if (signal?.aborted) {
       throw createAbortError()
@@ -2793,6 +2844,47 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     toolBlock.status = isError ? 'error' : 'success'
   }
 
+  private updateSubagentToolCallProgress(
+    sessionId: string,
+    messageId: string,
+    toolCallId: string,
+    responseMarkdown: string,
+    progressJson?: string,
+    finalJson?: string
+  ): void {
+    try {
+      const message = this.messageStore.getMessage(messageId)
+      if (!message || message.role !== 'assistant') {
+        return
+      }
+
+      const latestMessage = this.messageStore.getMessage(messageId)
+      if (!latestMessage || latestMessage.role !== 'assistant') {
+        return
+      }
+
+      const blocks = JSON.parse(latestMessage.content) as AssistantMessageBlock[]
+      const toolBlock = blocks.find(
+        (block) => block.type === 'tool_call' && block.tool_call?.id === toolCallId
+      )
+      if (!toolBlock?.tool_call) {
+        return
+      }
+
+      toolBlock.tool_call.response = responseMarkdown
+      toolBlock.status = finalJson ? 'success' : 'loading'
+      toolBlock.extra = {
+        ...toolBlock.extra,
+        ...(typeof progressJson === 'string' ? { subagentProgress: progressJson } : {}),
+        ...(finalJson ? { subagentFinal: finalJson } : {})
+      }
+      this.messageStore.updateAssistantContent(messageId, blocks)
+      this.emitMessageRefresh(sessionId, messageId)
+    } catch (error) {
+      console.warn('[DeepChatAgent] Failed to persist subagent tool progress:', error)
+    }
+  }
+
   private async grantPermissionForPayload(
     sessionId: string,
     payload: PendingToolInteraction['permission'] | undefined,
@@ -2836,6 +2928,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
 
   private async executeDeferredToolCall(
     sessionId: string,
+    messageId: string,
     toolCall: NonNullable<AssistantMessageBlock['tool_call']>
   ): Promise<DeferredToolExecutionResult> {
     if (!this.toolPresenter) {
@@ -2893,9 +2986,32 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       conversationId: sessionId,
       providerId: sessionState?.providerId?.trim() || undefined
     }
+    const deferredAbortController = toolCall.id
+      ? this.registerDeferredToolAbortController(sessionId, toolCall.id)
+      : null
+    const deferredAbortSignal =
+      deferredAbortController?.signal ?? this.getAbortSignalForSession(sessionId)
 
     try {
-      const result = await this.toolPresenter.callTool(request)
+      const result = await this.toolPresenter.callTool(request, {
+        onProgress: (update) => {
+          if (
+            update.kind !== 'subagent_orchestrator' ||
+            update.toolCallId !== (toolCall.id || '')
+          ) {
+            return
+          }
+
+          this.updateSubagentToolCallProgress(
+            sessionId,
+            messageId,
+            toolCall.id || '',
+            update.responseMarkdown,
+            update.progressJson
+          )
+        },
+        signal: deferredAbortSignal
+      })
       const rawData = result.rawData as MCPToolResponse
       if (rawData.requiresPermission) {
         return {
@@ -2905,6 +3021,31 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
           permissionRequest: rawData.permissionRequest as PendingToolInteraction['permission']
         }
       }
+      const subagentToolResult =
+        rawData.toolResult && typeof rawData.toolResult === 'object'
+          ? (rawData.toolResult as Record<string, unknown>)
+          : null
+      if (typeof subagentToolResult?.subagentProgress === 'string') {
+        this.updateSubagentToolCallProgress(
+          sessionId,
+          messageId,
+          toolCall.id || '',
+          this.toolContentToText(rawData.content),
+          subagentToolResult.subagentProgress,
+          typeof subagentToolResult.subagentFinal === 'string'
+            ? subagentToolResult.subagentFinal
+            : undefined
+        )
+      } else if (typeof subagentToolResult?.subagentFinal === 'string') {
+        this.updateSubagentToolCallProgress(
+          sessionId,
+          messageId,
+          toolCall.id || '',
+          this.toolContentToText(rawData.content),
+          undefined,
+          subagentToolResult.subagentFinal
+        )
+      }
       const normalizedContent = await this.normalizeToolResultContent({
         sessionId,
         toolCallId: toolCall.id || '',
@@ -2912,7 +3053,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         toolArgs: toolCall.params || '{}',
         content: rawData.content,
         isError: rawData.isError === true,
-        abortSignal: this.getAbortSignalForSession(sessionId)
+        abortSignal: deferredAbortSignal
       })
       const responseText = this.toolContentToText(normalizedContent)
       const prepared = await this.toolOutputGuard.prepareToolOutput({
@@ -2941,6 +3082,14 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         responseText: `Error: ${errorText}`,
         isError: true
       }
+    } finally {
+      if (toolCall.id) {
+        this.clearDeferredToolAbortController(
+          sessionId,
+          toolCall.id,
+          deferredAbortController ?? undefined
+        )
+      }
     }
   }
 
@@ -3387,6 +3536,12 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       sessionId,
       status
     })
+    emitDeepChatInternalSessionUpdate({
+      sessionId,
+      kind: 'status',
+      updatedAt: Date.now(),
+      status
+    })
 
     try {
       void presenter.floatingButtonPresenter.refreshWidgetState()
@@ -3401,6 +3556,26 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       eventId: messageId,
       messageId
     })
+
+    const message = this.messageStore.getMessage(messageId)
+    if (!message || message.role !== 'assistant') {
+      return
+    }
+
+    try {
+      const blocks = JSON.parse(message.content) as AssistantMessageBlock[]
+      emitDeepChatInternalSessionUpdate({
+        sessionId,
+        kind: 'blocks',
+        updatedAt: Date.now(),
+        messageId,
+        previewMarkdown: buildAssistantPreviewMarkdown(blocks),
+        responseMarkdown: buildAssistantResponseMarkdown(blocks),
+        waitingInteraction: extractWaitingInteraction(blocks, messageId)
+      })
+    } catch (error) {
+      console.warn('[DeepChatAgent] Failed to emit internal message refresh:', error)
+    }
   }
 
   private normalizeProjectDir(projectDir?: string | null): string | null {
diff --git a/src/main/presenter/deepchatAgentPresenter/internalSessionEvents.ts b/src/main/presenter/deepchatAgentPresenter/internalSessionEvents.ts
new file mode 100644
index 000000000..6e25ad526
--- /dev/null
+++ b/src/main/presenter/deepchatAgentPresenter/internalSessionEvents.ts
@@ -0,0 +1,118 @@
+import { EventEmitter } from 'events'
+import type { AssistantMessageBlock } from '@shared/types/agent-interface'
+
+export type DeepChatInternalSessionRuntimeStatus = 'idle' | 'generating' | 'error'
+
+export interface DeepChatInternalSessionWaitingInteraction {
+  type: 'permission' | 'question'
+  messageId: string
+  toolCallId: string
+  actionBlock: AssistantMessageBlock
+}
+
+export interface DeepChatInternalSessionUpdate {
+  sessionId: string
+  kind: 'blocks' | 'status'
+  updatedAt: number
+  messageId?: string
+  status?: DeepChatInternalSessionRuntimeStatus
+  previewMarkdown?: string
+  responseMarkdown?: string
+  waitingInteraction?: DeepChatInternalSessionWaitingInteraction | null
+}
+
+const emitter = new EventEmitter()
+
+const extractBlockText = (block: AssistantMessageBlock): string[] => {
+  if (block.type === 'action') {
+    const questionText =
+      typeof block.extra?.questionText === 'string' ? block.extra.questionText : ''
+    const permissionText =
+      typeof block.content === 'string'
+        ? block.content
+        : typeof block.extra?.permissionRequest === 'string'
+          ? block.extra.permissionRequest
+          : ''
+
+    return [questionText || permissionText]
+  }
+
+  if (block.type === 'tool_call') {
+    return [typeof block.tool_call?.response === 'string' ? block.tool_call.response : '']
+  }
+
+  if (block.type === 'error') {
+    return [typeof block.content === 'string' ? block.content : '']
+  }
+
+  return [typeof block.content === 'string' ? block.content : '']
+}
+
+const toDisplayLines = (text: string): string[] => text.split(/\r?\n/)
+
+export const buildAssistantResponseMarkdown = (blocks: AssistantMessageBlock[]): string =>
+  blocks
+    .flatMap((block) => extractBlockText(block))
+    .flatMap((text) => toDisplayLines(text))
+    .join('\n')
+
+export const buildAssistantPreviewMarkdown = (blocks: AssistantMessageBlock[]): string => {
+  const lines = buildAssistantResponseMarkdown(blocks)
+    .split(/\r?\n/)
+    .map((line) => line.trim())
+    .filter(Boolean)
+
+  return lines.slice(-3).join('\n')
+}
+
+export const extractWaitingInteraction = (
+  blocks: AssistantMessageBlock[],
+  messageId: string
+): DeepChatInternalSessionWaitingInteraction | null => {
+  for (let index = 0; index < blocks.length; index += 1) {
+    const block = blocks[index]
+    if (
+      block.type !== 'action' ||
+      block.status !== 'pending' ||
+      block.extra?.needsUserAction !== true ||
+      !block.tool_call?.id
+    ) {
+      continue
+    }
+
+    if (block.action_type === 'tool_call_permission') {
+      return {
+        type: 'permission',
+        messageId,
+        toolCallId: block.tool_call.id,
+        actionBlock: JSON.parse(JSON.stringify(block)) as AssistantMessageBlock
+      }
+    }
+
+    if (block.action_type === 'question_request') {
+      return {
+        type: 'question',
+        messageId,
+        toolCallId: block.tool_call.id,
+        actionBlock: JSON.parse(JSON.stringify(block)) as AssistantMessageBlock
+      }
+    }
+  }
+
+  return null
+}
+
+export const emitDeepChatInternalSessionUpdate = (update: DeepChatInternalSessionUpdate): void => {
+  try {
+    emitter.emit('update', update)
+  } catch (error) {
+    console.error('[DeepChatInternalSessionEvents] Failed to emit session update:', error)
+  }
+}
+
+export const subscribeDeepChatInternalSessionUpdates = (
+  listener: (update: DeepChatInternalSessionUpdate) => void
+): (() => void) => {
+  emitter.on('update', listener)
+  return () => emitter.off('update', listener)
+}
diff --git a/src/main/presenter/index.ts b/src/main/presenter/index.ts
index 185eb9ccb..8db9dee68 100644
--- a/src/main/presenter/index.ts
+++ b/src/main/presenter/index.ts
@@ -71,6 +71,8 @@ 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'
 
 // IPC调用上下文接口
 interface IPCCallContext {
@@ -265,12 +267,68 @@ export class Presenter implements IPresenter {
           return null
         }
 
+        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)
+            : 'full_access'
+        const generationSettings =
+          typeof this.newAgentPresenter?.getSessionGenerationSettings === 'function'
+            ? await this.newAgentPresenter.getSessionGenerationSettings(session.id)
+            : null
+        const disabledAgentTools =
+          typeof this.newAgentPresenter?.getSessionDisabledAgentTools === 'function'
+            ? await this.newAgentPresenter.getSessionDisabledAgentTools(session.id)
+            : []
+        const activeSkills = await this.skillPresenter.getActiveSkills(session.id)
+        const availableSubagentSlots =
+          agentType === 'deepchat' && session.sessionKind === 'regular'
+            ? normalizeDeepChatSubagentSlots(
+                (await this.configPresenter.resolveDeepChatAgentConfig(session.agentId)).subagents
+              )
+            : []
+
         return {
+          sessionId: session.id,
           agentId: session.agentId,
+          agentName: agent?.name?.trim() || session.agentId,
+          agentType,
           providerId: session.providerId,
-          modelId: session.modelId
+          modelId: session.modelId,
+          projectDir: session.projectDir ?? null,
+          permissionMode,
+          generationSettings,
+          disabledAgentTools,
+          activeSkills,
+          sessionKind: session.sessionKind,
+          parentSessionId: session.parentSessionId ?? null,
+          subagentEnabled: session.subagentEnabled,
+          subagentMeta: session.subagentMeta ?? null,
+          availableSubagentSlots
         }
       },
+      createSubagentSession: async (input) => {
+        const newAgentPresenter = this.newAgentPresenter as INewAgentPresenter & {
+          createSubagentSession?: (createInput: typeof input) => Promise<{
+            id: string
+          } | null>
+        }
+        const created = await newAgentPresenter.createSubagentSession?.(input)
+        if (!created?.id) {
+          return null
+        }
+
+        return await agentToolRuntime.resolveConversationSessionInfo(created.id)
+      },
+      sendConversationMessage: async (conversationId, content) => {
+        await this.newAgentPresenter.sendMessage(conversationId, content)
+      },
+      cancelConversation: async (conversationId) => {
+        await this.newAgentPresenter.cancelGeneration(conversationId)
+      },
+      subscribeDeepChatSessionUpdates: (listener) =>
+        subscribeDeepChatInternalSessionUpdates(listener),
       getSkillPresenter: () => this.skillPresenter,
       getYoBrowserToolHandler: () => this.yoBrowserPresenter.toolHandler,
       getFilePresenter: () => ({
diff --git a/src/main/presenter/newAgentPresenter/index.ts b/src/main/presenter/newAgentPresenter/index.ts
index 5eab1dd43..9b9456a21 100644
--- a/src/main/presenter/newAgentPresenter/index.ts
+++ b/src/main/presenter/newAgentPresenter/index.ts
@@ -15,6 +15,7 @@ import type {
   PermissionMode,
   SessionCompactionState,
   SessionGenerationSettings,
+  DeepChatSubagentMeta,
   ToolInteractionResponse,
   ToolInteractionResult,
   UsageDashboardData,
@@ -122,6 +123,11 @@ export class NewAgentPresenter {
             input.disabledAgentTools ?? deepChatAgentConfig?.disabledAgentTools
           )
         : []
+    const subagentEnabled = this.resolveSessionSubagentEnabled(
+      agentType,
+      input.subagentEnabled,
+      deepChatAgentConfig?.subagentEnabled
+    )
 
     const agent = await this.resolveAgentImplementation(agentId)
 
@@ -160,7 +166,8 @@ export class NewAgentPresenter {
     const title = normalizedInput.text.slice(0, 50) || 'New Chat'
     const sessionId = this.sessionManager.create(agentId, title, projectDir, {
       isDraft: false,
-      disabledAgentTools
+      disabledAgentTools,
+      subagentEnabled
     })
     console.log(`[NewAgentPresenter] session created id=${sessionId} title="${title}"`)
 
@@ -211,6 +218,10 @@ export class NewAgentPresenter {
       projectDir,
       isPinned: false,
       isDraft: false,
+      sessionKind: 'regular',
+      parentSessionId: null,
+      subagentEnabled,
+      subagentMeta: null,
       createdAt: Date.now(),
       updatedAt: Date.now(),
       status: state?.status ?? 'idle',
@@ -255,6 +266,11 @@ export class NewAgentPresenter {
             input.disabledAgentTools ?? deepChatAgentConfig?.disabledAgentTools
           )
         : []
+    const subagentEnabled = this.resolveSessionSubagentEnabled(
+      agentType,
+      input.subagentEnabled,
+      deepChatAgentConfig?.subagentEnabled
+    )
     const agent = await this.resolveAgentImplementation(agentId)
 
     const defaultModel = this.configPresenter.getDefaultModel()
@@ -288,7 +304,8 @@ export class NewAgentPresenter {
 
     const sessionId = this.sessionManager.create(agentId, title, projectDir, {
       isDraft: false,
-      disabledAgentTools
+      disabledAgentTools,
+      subagentEnabled
     })
 
     try {
@@ -319,6 +336,10 @@ export class NewAgentPresenter {
       projectDir,
       isPinned: false,
       isDraft: false,
+      sessionKind: 'regular',
+      parentSessionId: null,
+      subagentEnabled,
+      subagentMeta: null,
       createdAt: Date.now(),
       updatedAt: Date.now(),
       status: state?.status ?? 'idle',
@@ -327,6 +348,84 @@ export class NewAgentPresenter {
     }
   }
 
+  async createSubagentSession(input: {
+    parentSessionId: string
+    agentId: string
+    slotId: string
+    displayName: string
+    targetAgentId?: string | null
+    projectDir?: string | null
+    providerId: string
+    modelId: string
+    permissionMode: PermissionMode
+    generationSettings?: Partial<SessionGenerationSettings>
+    disabledAgentTools?: string[]
+    activeSkills?: string[]
+  }): Promise<SessionWithState> {
+    const parentSessionId = input.parentSessionId?.trim()
+    if (!parentSessionId) {
+      throw new Error('Subagent session requires a parentSessionId.')
+    }
+
+    const slotId = input.slotId?.trim()
+    if (!slotId) {
+      throw new Error('Subagent session requires a slotId.')
+    }
+
+    const displayName = input.displayName?.trim() || 'Subagent'
+    const agentId = input.agentId?.trim()
+    if (!agentId) {
+      throw new Error('Subagent session requires an agentId.')
+    }
+
+    const projectDir = input.projectDir?.trim() || null
+    const disabledAgentTools = this.normalizeDisabledAgentTools(input.disabledAgentTools)
+    const subagentMeta: DeepChatSubagentMeta = {
+      slotId,
+      displayName,
+      targetAgentId: input.targetAgentId?.trim() || null
+    }
+
+    this.assertAcpSessionHasWorkdir(input.providerId, projectDir)
+
+    const agent = await this.resolveAgentImplementation(agentId)
+    const sessionId = this.sessionManager.create(agentId, displayName, projectDir, {
+      isDraft: false,
+      disabledAgentTools,
+      subagentEnabled: false,
+      sessionKind: 'subagent',
+      parentSessionId,
+      subagentMeta
+    })
+
+    try {
+      await this.initializeSessionRuntime(agent, sessionId, {
+        agentId,
+        providerId: input.providerId,
+        modelId: input.modelId,
+        projectDir,
+        permissionMode: input.permissionMode,
+        generationSettings: input.generationSettings
+      })
+    } catch (error) {
+      await this.cleanupFailedSessionInitialization(agent, sessionId)
+      throw error
+    }
+
+    if (input.activeSkills && input.activeSkills.length > 0 && this.skillPresenter) {
+      await this.skillPresenter.setActiveSkills(sessionId, input.activeSkills)
+    }
+
+    this.emitSessionListUpdated()
+
+    const record = this.sessionManager.get(sessionId)
+    if (!record) {
+      throw new Error(`Subagent session not found after creation: ${sessionId}`)
+    }
+
+    return (await this.buildSessionWithState(record)) as SessionWithState
+  }
+
   async ensureAcpDraftSession(input: {
     agentId: string
     projectDir: string
@@ -350,7 +449,8 @@ export class NewAgentPresenter {
     let record = await this.findReusableDraftSession(agentId, projectDir, agent)
     if (!record) {
       const sessionId = this.sessionManager.create(agentId, 'New Chat', projectDir, {
-        isDraft: true
+        isDraft: true,
+        subagentEnabled: false
       })
       try {
         await this.ensureSessionRuntimeInitialized(agent, sessionId, {
@@ -657,6 +757,8 @@ export class NewAgentPresenter {
   async getSessionList(filters?: {
     agentId?: string
     projectDir?: string
+    includeSubagents?: boolean
+    parentSessionId?: string
   }): Promise<SessionWithState[]> {
     const records = this.sessionManager.list(filters)
     const enriched: SessionWithState[] = []
@@ -1031,25 +1133,7 @@ export class NewAgentPresenter {
   }
 
   async deleteSession(sessionId: string): Promise<void> {
-    const session = this.sessionManager.get(sessionId)
-    if (!session) return
-    const agent = await this.resolveAgentImplementation(session.agentId)
-    const state = await agent.getSessionState(sessionId)
-    let providerId = state?.providerId ?? ''
-    if (!providerId) {
-      if ((await this.getAgentType(session.agentId)) === 'acp') {
-        providerId = 'acp'
-      }
-    }
-    if (providerId === 'acp') {
-      await this.llmProviderPresenter.clearAcpSession(sessionId)
-    }
-    await agent.destroySession(sessionId)
-    presenter.commandPermissionService.clearConversation(sessionId)
-    presenter.filePermissionService?.clearConversation(sessionId)
-    presenter.settingsPermissionService?.clearConversation(sessionId)
-    await this.skillPresenter?.clearNewAgentSessionSkills?.(sessionId)
-    this.sessionManager.delete(sessionId)
+    await this.deleteSessionInternal(sessionId)
     this.emitSessionListUpdated()
   }
 
@@ -1142,6 +1226,35 @@ export class NewAgentPresenter {
     await agent.setPermissionMode(sessionId, mode)
   }
 
+  async setSessionSubagentEnabled(sessionId: string, enabled: boolean): Promise<SessionWithState> {
+    const session = this.sessionManager.get(sessionId)
+    if (!session) {
+      throw new Error(`Session not found: ${sessionId}`)
+    }
+
+    if (session.sessionKind !== 'regular') {
+      throw new Error('Only regular sessions can change subagent state.')
+    }
+
+    if ((await this.getAgentType(session.agentId)) !== 'deepchat') {
+      throw new Error('Only DeepChat sessions can change subagent state.')
+    }
+
+    this.sessionManager.update(sessionId, { subagentEnabled: enabled })
+    const updated = this.sessionManager.get(sessionId)
+    if (!updated) {
+      throw new Error(`Session not found after update: ${sessionId}`)
+    }
+
+    this.emitSessionListUpdated()
+    const sessionWithState = await this.tryBuildSessionWithState(updated)
+    if (!sessionWithState) {
+      throw new Error(`Failed to build session state for sessionId: ${sessionId}`)
+    }
+
+    return sessionWithState
+  }
+
   async setSessionModel(
     sessionId: string,
     providerId: string,
@@ -1419,6 +1532,53 @@ export class NewAgentPresenter {
     return Object.keys(merged).length > 0 ? merged : undefined
   }
 
+  private resolveSessionSubagentEnabled(
+    agentType: 'deepchat' | 'acp' | null,
+    inputEnabled?: boolean,
+    configEnabled?: boolean
+  ): boolean {
+    if (agentType !== 'deepchat') {
+      return false
+    }
+
+    if (typeof inputEnabled === 'boolean') {
+      return inputEnabled
+    }
+
+    return configEnabled === true
+  }
+
+  private async deleteSessionInternal(sessionId: string): Promise<void> {
+    const session = this.sessionManager.get(sessionId)
+    if (!session) return
+
+    if (session.sessionKind === 'regular') {
+      const children = this.sessionManager.list({
+        includeSubagents: true,
+        parentSessionId: sessionId
+      })
+      for (const child of children) {
+        await this.deleteSessionInternal(child.id)
+      }
+    }
+
+    const agent = await this.resolveAgentImplementation(session.agentId)
+    const state = await agent.getSessionState(sessionId)
+    let providerId = state?.providerId ?? ''
+    if (!providerId && (await this.getAgentType(session.agentId)) === 'acp') {
+      providerId = 'acp'
+    }
+    if (providerId === 'acp') {
+      await this.llmProviderPresenter.clearAcpSession(sessionId)
+    }
+    await agent.destroySession(sessionId)
+    presenter.commandPermissionService.clearConversation(sessionId)
+    presenter.filePermissionService?.clearConversation(sessionId)
+    presenter.settingsPermissionService?.clearConversation(sessionId)
+    await this.skillPresenter?.clearNewAgentSessionSkills?.(sessionId)
+    this.sessionManager.delete(sessionId)
+  }
+
   private async isAcpBackedSession(sessionId: string, agentId: string): Promise<boolean> {
     const resolvedAgentId = resolveAcpAgentAlias(agentId)
     const agent = await this.resolveAgentImplementation(agentId)
diff --git a/src/main/presenter/newAgentPresenter/sessionManager.ts b/src/main/presenter/newAgentPresenter/sessionManager.ts
index 8db5feb11..4bc238d99 100644
--- a/src/main/presenter/newAgentPresenter/sessionManager.ts
+++ b/src/main/presenter/newAgentPresenter/sessionManager.ts
@@ -1,6 +1,34 @@
 import { nanoid } from 'nanoid'
 import type { SQLitePresenter } from '../sqlitePresenter'
-import type { SessionRecord } from '@shared/types/agent-interface'
+import type {
+  DeepChatSubagentMeta,
+  SessionKind,
+  SessionRecord
+} from '@shared/types/agent-interface'
+
+const parseSubagentMeta = (raw: string | null | undefined): DeepChatSubagentMeta | null => {
+  if (!raw) {
+    return null
+  }
+
+  try {
+    const parsed = JSON.parse(raw) as Partial<DeepChatSubagentMeta>
+    if (!parsed || typeof parsed !== 'object' || typeof parsed.slotId !== 'string') {
+      return null
+    }
+
+    return {
+      slotId: parsed.slotId,
+      displayName: typeof parsed.displayName === 'string' ? parsed.displayName : parsed.slotId,
+      targetAgentId:
+        parsed.targetAgentId === null || typeof parsed.targetAgentId === 'string'
+          ? parsed.targetAgentId
+          : undefined
+    }
+  } catch {
+    return null
+  }
+}
 
 export class NewSessionManager {
   private sqlitePresenter: SQLitePresenter
@@ -15,12 +43,23 @@ export class NewSessionManager {
     agentId: string,
     title: string,
     projectDir: string | null,
-    options?: { isDraft?: boolean; disabledAgentTools?: string[] }
+    options?: {
+      isDraft?: boolean
+      disabledAgentTools?: string[]
+      subagentEnabled?: boolean
+      sessionKind?: SessionKind
+      parentSessionId?: string | null
+      subagentMeta?: DeepChatSubagentMeta | null
+    }
   ): string {
     const id = nanoid()
     this.sqlitePresenter.newSessionsTable.create(id, agentId, title, projectDir, {
       isDraft: options?.isDraft,
-      disabledAgentTools: options?.disabledAgentTools
+      disabledAgentTools: options?.disabledAgentTools,
+      subagentEnabled: options?.subagentEnabled,
+      sessionKind: options?.sessionKind,
+      parentSessionId: options?.parentSessionId,
+      subagentMetaJson: options?.subagentMeta ? JSON.stringify(options.subagentMeta) : null
     })
     this.sqlitePresenter.newEnvironmentsTable.syncPath(projectDir)
     return id
@@ -36,12 +75,21 @@ export class NewSessionManager {
       projectDir: row.project_dir,
       isPinned: row.is_pinned === 1,
       isDraft: row.is_draft === 1,
+      sessionKind: row.session_kind === 'subagent' ? 'subagent' : 'regular',
+      parentSessionId: row.parent_session_id ?? null,
+      subagentEnabled: row.subagent_enabled === 1,
+      subagentMeta: parseSubagentMeta(row.subagent_meta_json),
       createdAt: row.created_at,
       updatedAt: row.updated_at
     }
   }
 
-  list(filters?: { agentId?: string; projectDir?: string }): SessionRecord[] {
+  list(filters?: {
+    agentId?: string
+    projectDir?: string
+    includeSubagents?: boolean
+    parentSessionId?: string
+  }): SessionRecord[] {
     const rows = this.sqlitePresenter.newSessionsTable.list(filters)
     return rows.map((row) => ({
       id: row.id,
@@ -50,6 +98,10 @@ export class NewSessionManager {
       projectDir: row.project_dir,
       isPinned: row.is_pinned === 1,
       isDraft: row.is_draft === 1,
+      sessionKind: row.session_kind === 'subagent' ? 'subagent' : 'regular',
+      parentSessionId: row.parent_session_id ?? null,
+      subagentEnabled: row.subagent_enabled === 1,
+      subagentMeta: parseSubagentMeta(row.subagent_meta_json),
       createdAt: row.created_at,
       updatedAt: row.updated_at
     }))
@@ -57,7 +109,19 @@ export class NewSessionManager {
 
   update(
     id: string,
-    fields: Partial<Pick<SessionRecord, 'title' | 'projectDir' | 'isPinned' | 'isDraft'>>
+    fields: Partial<
+      Pick<
+        SessionRecord,
+        | 'title'
+        | 'projectDir'
+        | 'isPinned'
+        | 'isDraft'
+        | 'sessionKind'
+        | 'parentSessionId'
+        | 'subagentEnabled'
+        | 'subagentMeta'
+      >
+    >
   ): void {
     const current = this.sqlitePresenter.newSessionsTable.get(id)
     if (!current) {
@@ -71,11 +135,25 @@ export class NewSessionManager {
       project_dir?: string | null
       is_pinned?: number
       is_draft?: number
+      subagent_enabled?: number
+      session_kind?: SessionKind
+      parent_session_id?: string | null
+      subagent_meta_json?: string | null
     } = {}
     if (fields.title !== undefined) dbFields.title = fields.title
     if (fields.projectDir !== undefined) dbFields.project_dir = fields.projectDir
     if (fields.isPinned !== undefined) dbFields.is_pinned = fields.isPinned ? 1 : 0
     if (fields.isDraft !== undefined) dbFields.is_draft = fields.isDraft ? 1 : 0
+    if (fields.subagentEnabled !== undefined) {
+      dbFields.subagent_enabled = fields.subagentEnabled ? 1 : 0
+    }
+    if (fields.sessionKind !== undefined) dbFields.session_kind = fields.sessionKind
+    if (fields.parentSessionId !== undefined) {
+      dbFields.parent_session_id = fields.parentSessionId
+    }
+    if (fields.subagentMeta !== undefined) {
+      dbFields.subagent_meta_json = fields.subagentMeta ? JSON.stringify(fields.subagentMeta) : null
+    }
     this.sqlitePresenter.newSessionsTable.update(id, dbFields)
 
     for (const path of this.sqlitePresenter.newEnvironmentsTable.listPathsForSession(id)) {
diff --git a/src/main/presenter/sqlitePresenter/tables/baseTable.ts b/src/main/presenter/sqlitePresenter/tables/baseTable.ts
index 7727e7236..697f7fa5a 100644
--- a/src/main/presenter/sqlitePresenter/tables/baseTable.ts
+++ b/src/main/presenter/sqlitePresenter/tables/baseTable.ts
@@ -27,6 +27,17 @@ export abstract class BaseTable {
     return !!result
   }
 
+  protected hasColumn(columnName: string): boolean {
+    if (!this.tableExists()) {
+      return false
+    }
+
+    const rows = this.db.prepare(`PRAGMA table_info(${this.tableName})`).all() as Array<{
+      name: string
+    }>
+    return rows.some((row) => row.name === columnName)
+  }
+
   protected getRecordedSchemaVersion(): number {
     const versionTable = this.db
       .prepare(`SELECT name FROM sqlite_master WHERE type='table' AND name='schema_versions'`)
diff --git a/src/main/presenter/sqlitePresenter/tables/newSessions.ts b/src/main/presenter/sqlitePresenter/tables/newSessions.ts
index b700dd35a..89f02ef95 100644
--- a/src/main/presenter/sqlitePresenter/tables/newSessions.ts
+++ b/src/main/presenter/sqlitePresenter/tables/newSessions.ts
@@ -10,6 +10,10 @@ export interface NewSessionRow {
   is_draft: number
   active_skills: string
   disabled_agent_tools: string
+  subagent_enabled: number
+  session_kind: 'regular' | 'subagent'
+  parent_session_id: string | null
+  subagent_meta_json: string | null
   created_at: number
   updated_at: number
 }
@@ -49,6 +53,14 @@ export class NewSessionsTable extends BaseTable {
     if (version >= 16) {
       columns.push("disabled_agent_tools TEXT NOT NULL DEFAULT '[]'")
     }
+    if (version >= 20) {
+      columns.push(
+        'subagent_enabled INTEGER NOT NULL DEFAULT 0',
+        "session_kind TEXT NOT NULL DEFAULT 'regular'",
+        'parent_session_id TEXT',
+        'subagent_meta_json TEXT'
+      )
+    }
 
     columns.push('created_at INTEGER NOT NULL', 'updated_at INTEGER NOT NULL')
 
@@ -71,11 +83,45 @@ export class NewSessionsTable extends BaseTable {
     if (version === 16) {
       return `ALTER TABLE new_sessions ADD COLUMN disabled_agent_tools TEXT NOT NULL DEFAULT '[]';`
     }
+    if (version === 20) {
+      return `
+        ALTER TABLE new_sessions ADD COLUMN subagent_enabled INTEGER NOT NULL DEFAULT 0;
+        ALTER TABLE new_sessions ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'regular';
+        ALTER TABLE new_sessions ADD COLUMN parent_session_id TEXT;
+        ALTER TABLE new_sessions ADD COLUMN subagent_meta_json TEXT;
+      `
+    }
+    if (version === 21) {
+      if (this.getRecordedSchemaVersion() < 20) {
+        return null
+      }
+
+      const statements: string[] = []
+
+      if (!this.hasColumn('subagent_enabled')) {
+        statements.push(
+          'ALTER TABLE new_sessions ADD COLUMN subagent_enabled INTEGER NOT NULL DEFAULT 0;'
+        )
+      }
+      if (!this.hasColumn('session_kind')) {
+        statements.push(
+          "ALTER TABLE new_sessions ADD COLUMN session_kind TEXT NOT NULL DEFAULT 'regular';"
+        )
+      }
+      if (!this.hasColumn('parent_session_id')) {
+        statements.push('ALTER TABLE new_sessions ADD COLUMN parent_session_id TEXT;')
+      }
+      if (!this.hasColumn('subagent_meta_json')) {
+        statements.push('ALTER TABLE new_sessions ADD COLUMN subagent_meta_json TEXT;')
+      }
+
+      return statements.length > 0 ? statements.join('\n') : null
+    }
     return null
   }
 
   getLatestVersion(): number {
-    return 16
+    return 21
   }
 
   create(
@@ -88,6 +134,10 @@ export class NewSessionsTable extends BaseTable {
       isPinned?: boolean
       activeSkills?: string[]
       disabledAgentTools?: string[]
+      subagentEnabled?: boolean
+      sessionKind?: 'regular' | 'subagent'
+      parentSessionId?: string | null
+      subagentMetaJson?: string | null
       createdAt?: number
       updatedAt?: number
     }
@@ -106,9 +156,13 @@ export class NewSessionsTable extends BaseTable {
           is_draft,
           active_skills,
           disabled_agent_tools,
+          subagent_enabled,
+          session_kind,
+          parent_session_id,
+          subagent_meta_json,
           created_at,
           updated_at
-        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
       )
       .run(
         id,
@@ -119,6 +173,10 @@ export class NewSessionsTable extends BaseTable {
         options?.isDraft ? 1 : 0,
         JSON.stringify(options?.activeSkills ?? []),
         JSON.stringify(options?.disabledAgentTools ?? []),
+        options?.subagentEnabled ? 1 : 0,
+        options?.sessionKind === 'subagent' ? 'subagent' : 'regular',
+        options?.parentSessionId ?? null,
+        options?.subagentMetaJson ?? null,
         createdAt,
         updatedAt
       )
@@ -130,7 +188,12 @@ export class NewSessionsTable extends BaseTable {
       | undefined
   }
 
-  list(filters?: { agentId?: string; projectDir?: string }): NewSessionRow[] {
+  list(filters?: {
+    agentId?: string
+    projectDir?: string
+    includeSubagents?: boolean
+    parentSessionId?: string
+  }): NewSessionRow[] {
     let sql = 'SELECT * FROM new_sessions'
     const conditions: string[] = []
     const params: unknown[] = []
@@ -143,6 +206,13 @@ export class NewSessionsTable extends BaseTable {
       conditions.push('project_dir = ?')
       params.push(filters.projectDir)
     }
+    if (filters?.includeSubagents !== true && filters?.parentSessionId === undefined) {
+      conditions.push("session_kind = 'regular'")
+    }
+    if (filters?.parentSessionId !== undefined) {
+      conditions.push('parent_session_id = ?')
+      params.push(filters.parentSessionId)
+    }
 
     if (conditions.length > 0) {
       sql += ' WHERE ' + conditions.join(' AND ')
@@ -163,6 +233,10 @@ export class NewSessionsTable extends BaseTable {
         | 'is_draft'
         | 'active_skills'
         | 'disabled_agent_tools'
+        | 'subagent_enabled'
+        | 'session_kind'
+        | 'parent_session_id'
+        | 'subagent_meta_json'
       >
     >
   ): void {
@@ -193,6 +267,22 @@ export class NewSessionsTable extends BaseTable {
       setClauses.push('disabled_agent_tools = ?')
       params.push(fields.disabled_agent_tools)
     }
+    if (fields.subagent_enabled !== undefined) {
+      setClauses.push('subagent_enabled = ?')
+      params.push(fields.subagent_enabled)
+    }
+    if (fields.session_kind !== undefined) {
+      setClauses.push('session_kind = ?')
+      params.push(fields.session_kind)
+    }
+    if (fields.parent_session_id !== undefined) {
+      setClauses.push('parent_session_id = ?')
+      params.push(fields.parent_session_id)
+    }
+    if (fields.subagent_meta_json !== undefined) {
+      setClauses.push('subagent_meta_json = ?')
+      params.push(fields.subagent_meta_json)
+    }
 
     if (setClauses.length === 0) return
 
diff --git a/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts b/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
index 7a25294b8..0fecb7f09 100644
--- a/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
+++ b/src/main/presenter/toolPresenter/agentTools/agentToolManager.ts
@@ -1,4 +1,5 @@
 import type { IConfigPresenter, MCPToolDefinition } from '@shared/presenter'
+import type { AgentToolProgressUpdate } from '@shared/types/presenters/tool.presenter'
 import { zodToJsonSchema } from 'zod-to-json-schema'
 import { z } from 'zod'
 import fs from 'fs'
@@ -21,6 +22,10 @@ import {
 import type { AgentToolRuntimePort } from '../runtimePorts'
 import { YO_BROWSER_TOOL_NAMES } from '../../browser/YoBrowserToolDefinitions'
 import { resolveSessionVisionTarget } from '../../vision/sessionVisionResolver'
+import {
+  SUBAGENT_ORCHESTRATOR_TOOL_NAME,
+  SubagentOrchestratorTool
+} from './subagentOrchestratorTool'
 
 // Consider moving to a shared handlers location in future refactoring
 import {
@@ -78,6 +83,7 @@ export class AgentToolManager {
   private skillTools: SkillTools | null = null
   private skillExecutionService: SkillExecutionService | null = null
   private chatSettingsHandler: ChatSettingsToolHandler | null = null
+  private subagentOrchestratorTool: SubagentOrchestratorTool | null = null
   private static readonly READ_FILE_AUTO_TRUNCATE_THRESHOLD = 4500
 
   private readonly fileSystemSchemas = {
@@ -246,6 +252,7 @@ export class AgentToolManager {
     this.configPresenter = options.configPresenter
     this.commandPermissionHandler = options.commandPermissionHandler
     this.runtimePort = options.runtimePort
+    this.subagentOrchestratorTool = new SubagentOrchestratorTool(this.runtimePort)
     if (this.agentWorkspacePath) {
       this.fileSystemHandler = new AgentFileSystemHandler([this.agentWorkspacePath])
       this.bashHandler = new AgentBashHandler(
@@ -296,6 +303,20 @@ export class AgentToolManager {
     // 2. Built-in question tool (all modes)
     defs.push(...this.getQuestionToolDefinitions())
 
+    // 2.5. Subagent orchestration tool (deepchat regular sessions only)
+    if (isAgentMode && context.conversationId && this.subagentOrchestratorTool) {
+      try {
+        const subagentToolDefinition = await this.subagentOrchestratorTool.getToolDefinition(
+          context.conversationId
+        )
+        if (subagentToolDefinition) {
+          defs.push(subagentToolDefinition)
+        }
+      } catch (error) {
+        logger.warn('[AgentToolManager] Failed to resolve subagent tool availability', { error })
+      }
+    }
+
     // 3. Skill tools (agent mode only)
     if (isAgentMode && this.isSkillsEnabled()) {
       const skillDefs = this.getSkillToolDefinitions()
@@ -351,7 +372,12 @@ export class AgentToolManager {
   async callTool(
     toolName: string,
     args: Record<string, unknown>,
-    conversationId?: string
+    conversationId?: string,
+    options?: {
+      toolCallId?: string
+      onProgress?: (update: AgentToolProgressUpdate) => void
+      signal?: AbortSignal
+    }
   ): Promise<AgentToolCallResult | string> {
     if (toolName === QUESTION_TOOL_NAME) {
       const validationResult = questionToolSchema.safeParse(args)
@@ -370,6 +396,14 @@ export class AgentToolManager {
       }
     }
 
+    if (toolName === SUBAGENT_ORCHESTRATOR_TOOL_NAME) {
+      if (!this.subagentOrchestratorTool) {
+        throw new Error('Subagent orchestrator is not available.')
+      }
+
+      return await this.subagentOrchestratorTool.call(args, conversationId, options)
+    }
+
     // Route to process tool
     if (this.isProcessTool(toolName)) {
       return await this.callProcessTool(toolName, args, conversationId)
diff --git a/src/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.ts b/src/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.ts
new file mode 100644
index 000000000..48a579630
--- /dev/null
+++ b/src/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.ts
@@ -0,0 +1,631 @@
+import { nanoid } from 'nanoid'
+import { z } from 'zod'
+import type { MCPToolDefinition } from '@shared/presenter'
+import type { DeepChatSubagentSlot } from '@shared/types/agent-interface'
+import type { AgentToolProgressUpdate } from '@shared/types/presenters/tool.presenter'
+import type { AgentToolCallResult } from './agentToolManager'
+import type { AgentToolRuntimePort, ConversationSessionInfo } from '../runtimePorts'
+
+export const SUBAGENT_ORCHESTRATOR_TOOL_NAME = 'subagent_orchestrator'
+const SUBAGENT_WORKDIR_RULE =
+  'Every child session inherits the same working directory as the parent session.'
+const SUBAGENT_PROMPT_DESCRIPTION = [
+  'Describe only the delegated subtask itself.',
+  'The child session uses the same working directory as the parent session.'
+].join(' ')
+
+export const subagentOrchestratorTaskSchema = z.object({
+  id: z.string().trim().min(1).optional(),
+  slotId: z.string().trim().min(1),
+  title: z.string().trim().min(1),
+  prompt: z.string().trim().min(1),
+  expectedOutput: z.string().trim().min(1).optional()
+})
+
+export const subagentOrchestratorSchema = z.object({
+  mode: z.enum(['parallel', 'chain']),
+  tasks: z.array(subagentOrchestratorTaskSchema).min(1).max(5)
+})
+
+type SubagentOrchestratorArgs = z.infer<typeof subagentOrchestratorSchema>
+type SubagentTerminalStatus =
+  | 'completed'
+  | 'error'
+  | 'cancelled'
+  | 'waiting_permission'
+  | 'waiting_question'
+  | 'running'
+  | 'queued'
+
+type MutableTaskState = {
+  taskId: string
+  index: number
+  slotId: string
+  title: string
+  prompt: string
+  expectedOutput?: string
+  targetAgentId: string | null
+  targetAgentName: string
+  slotDescription: string
+  sessionId: string | null
+  status: SubagentTerminalStatus
+  previewMarkdown: string
+  responseMarkdown: string
+  updatedAt: number
+  waitingInteraction: {
+    type: 'permission' | 'question'
+    messageId: string
+    toolCallId: string
+  } | null
+  resultSummary?: string
+  runtimeStatus?: 'idle' | 'generating' | 'error'
+  started: boolean
+  cancelRequested: boolean
+  completion: {
+    promise: Promise<void>
+    resolve: () => void
+  }
+}
+
+const createDeferred = (): MutableTaskState['completion'] => {
+  let resolve = () => {}
+  const promise = new Promise<void>((innerResolve) => {
+    resolve = innerResolve
+  })
+
+  return {
+    promise,
+    resolve
+  }
+}
+
+const truncate = (value: string, maxLength: number): string => {
+  if (value.length <= maxLength) {
+    return value
+  }
+
+  return `${value.slice(0, Math.max(0, maxLength - 3)).trimEnd()}...`
+}
+
+const summarizeResult = (value: string): string | undefined => {
+  const normalized = value.trim()
+  if (!normalized) {
+    return undefined
+  }
+
+  return truncate(normalized, 2000)
+}
+
+const renderProgressMarkdown = (
+  mode: SubagentOrchestratorArgs['mode'],
+  tasks: MutableTaskState[]
+): string => {
+  const lines: string[] = [`${mode} · ${tasks.length} subagents`, '']
+
+  for (const task of tasks) {
+    lines.push(`### ${task.index + 1}. ${task.title}`)
+    lines.push(`- Agent: ${task.targetAgentName}`)
+    lines.push(`- Status: ${task.status}`)
+    if (task.sessionId) {
+      lines.push(`- Session: \`${task.sessionId}\``)
+    }
+
+    const previewLines = task.previewMarkdown
+      .split(/\r?\n/)
+      .map((line) => line.trim())
+      .filter(Boolean)
+
+    if (previewLines.length > 0) {
+      lines.push('')
+      for (const line of previewLines.slice(-3)) {
+        lines.push(`> ${line}`)
+      }
+    }
+
+    lines.push('')
+  }
+
+  return lines.join('\n').trim()
+}
+
+const renderFinalMarkdown = (
+  mode: SubagentOrchestratorArgs['mode'],
+  tasks: MutableTaskState[]
+): string => {
+  const lines: string[] = [`${mode} · ${tasks.length} subagents`, '']
+
+  for (const task of tasks) {
+    lines.push(`## ${task.index + 1}. ${task.title}`)
+    lines.push(`Subagent: ${task.targetAgentName}`)
+    lines.push(`Child Session: \`${task.sessionId ?? 'unknown'}\``)
+    lines.push(`Status: ${task.status}`)
+    lines.push('')
+    lines.push(task.resultSummary?.trim() || '_No result produced._')
+    lines.push('')
+  }
+
+  return lines.join('\n').trim()
+}
+
+const buildHandoffMessage = (params: {
+  parent: ConversationSessionInfo
+  mode: SubagentOrchestratorArgs['mode']
+  totalTasks: number
+  task: MutableTaskState
+  inheritedWorkspace: string | null
+}): string => {
+  const contract =
+    params.task.expectedOutput?.trim() ||
+    'Return a concise markdown result with your answer, key findings, and any important file paths or commands.'
+
+  return [
+    '# Structured Handoff',
+    '',
+    'Parent Task Summary:',
+    `- The parent session delegated this work through \`${SUBAGENT_ORCHESTRATOR_TOOL_NAME}\`.`,
+    `- Orchestration mode: ${params.mode}.`,
+    `- Total delegated tasks in this run: ${params.totalTasks}.`,
+    '',
+    'Slot Description:',
+    params.task.slotDescription || 'No additional slot description provided.',
+    '',
+    'Current Subtask:',
+    `Title: ${params.task.title}`,
+    params.task.prompt,
+    '',
+    'Output Contract:',
+    contract,
+    '',
+    'Current Agent Working Directory:',
+    params.inheritedWorkspace?.trim() || '(none)',
+    '',
+    'Rules:',
+    '- You are a child session with an isolated context.',
+    '- Do not assume access to the full parent transcript.',
+    '- Ask for permission or clarification through the normal tool flow when needed.'
+  ].join('\n')
+}
+
+const isTerminalStatus = (status: SubagentTerminalStatus): boolean =>
+  status === 'completed' || status === 'error' || status === 'cancelled'
+
+export class SubagentOrchestratorTool {
+  constructor(private readonly runtimePort: AgentToolRuntimePort) {}
+
+  private async getAvailableSession(
+    conversationId?: string
+  ): Promise<ConversationSessionInfo | null> {
+    if (!conversationId) {
+      return null
+    }
+
+    const session = await this.runtimePort.resolveConversationSessionInfo(conversationId)
+    if (!session) {
+      return null
+    }
+
+    return session.agentType === 'deepchat' &&
+      session.sessionKind === 'regular' &&
+      session.subagentEnabled === true &&
+      session.availableSubagentSlots.length > 0
+      ? session
+      : null
+  }
+
+  async isAvailable(conversationId?: string): Promise<boolean> {
+    return Boolean(await this.getAvailableSession(conversationId))
+  }
+
+  private buildSlotIdParameter(slots: DeepChatSubagentSlot[]) {
+    const normalizedSlots = [...slots]
+      .map((slot) => ({
+        ...slot,
+        id: slot.id.trim(),
+        displayName: slot.displayName.trim(),
+        description: slot.description.trim(),
+        targetAgentId: slot.targetAgentId?.trim()
+      }))
+      .filter((slot) => Boolean(slot.id))
+      .sort((left, right) => {
+        return (
+          left.id.localeCompare(right.id) ||
+          left.displayName.localeCompare(right.displayName) ||
+          (left.targetAgentId ?? '').localeCompare(right.targetAgentId ?? '')
+        )
+      })
+
+    const slotIds = Array.from(new Set(normalizedSlots.map((slot) => slot.id)))
+
+    const slotLines = normalizedSlots.map((slot) => {
+      const target =
+        slot.targetType === 'self'
+          ? 'current agent'
+          : (slot.targetAgentId?.trim() ?? 'configured agent')
+      const summaryParts = [`${slot.id}: ${slot.displayName || slot.id}`, `target=${target}`]
+      if (slot.description) {
+        const description = slot.description.trim()
+        summaryParts.push(description)
+      }
+
+      return `- ${summaryParts.join(' | ')}`
+    })
+
+    const description =
+      slotLines.length > 0
+        ? ['Use one of the configured subagent slot IDs for this session.', ...slotLines].join('\n')
+        : 'Use one of the configured subagent slot IDs for this session.'
+
+    return slotIds.length > 0
+      ? {
+          type: 'string',
+          enum: slotIds,
+          description
+        }
+      : {
+          type: 'string',
+          description
+        }
+  }
+
+  async getToolDefinition(conversationId?: string): Promise<MCPToolDefinition | null> {
+    const session = await this.getAvailableSession(conversationId)
+    if (!session) {
+      return null
+    }
+
+    const slotIdParameter = this.buildSlotIdParameter(session.availableSubagentSlots)
+
+    return {
+      type: 'function',
+      function: {
+        name: SUBAGENT_ORCHESTRATOR_TOOL_NAME,
+        description: `Delegate up to 5 tasks to configured subagents, run them in parallel or in chain mode, and return a single aggregated markdown result after every child session finishes. ${SUBAGENT_WORKDIR_RULE}`,
+        parameters: {
+          type: 'object',
+          properties: {
+            mode: {
+              type: 'string',
+              enum: ['parallel', 'chain'],
+              description: 'Choose whether delegated tasks run concurrently or one by one.'
+            },
+            tasks: {
+              type: 'array',
+              maxItems: 5,
+              description: `Ordered delegated subtasks. ${SUBAGENT_WORKDIR_RULE}`,
+              items: {
+                type: 'object',
+                properties: {
+                  id: {
+                    type: 'string',
+                    description: 'Optional stable task identifier for this orchestrator run.'
+                  },
+                  slotId: slotIdParameter,
+                  title: {
+                    type: 'string',
+                    description:
+                      'Short task label shown in progress cards and the final aggregate result.'
+                  },
+                  prompt: {
+                    type: 'string',
+                    description: SUBAGENT_PROMPT_DESCRIPTION
+                  },
+                  expectedOutput: {
+                    type: 'string',
+                    description:
+                      'Optional output contract for the child session, such as structure, scope, or formatting requirements.'
+                  }
+                },
+                required: ['slotId', 'title', 'prompt']
+              }
+            }
+          },
+          required: ['mode', 'tasks']
+        }
+      },
+      server: {
+        name: 'agent-subagents',
+        icons: '🧩',
+        description: 'DeepChat subagent orchestration'
+      }
+    }
+  }
+
+  async call(
+    rawArgs: Record<string, unknown>,
+    conversationId: string | undefined,
+    options?: {
+      toolCallId?: string
+      onProgress?: (update: AgentToolProgressUpdate) => void
+      signal?: AbortSignal
+    }
+  ): Promise<AgentToolCallResult> {
+    const args = subagentOrchestratorSchema.parse(rawArgs)
+    if (!conversationId) {
+      throw new Error('subagent_orchestrator requires a conversationId.')
+    }
+
+    const parent = await this.runtimePort.resolveConversationSessionInfo(conversationId)
+    if (!parent) {
+      throw new Error(`Conversation not found: ${conversationId}`)
+    }
+
+    if (
+      parent.agentType !== 'deepchat' ||
+      parent.sessionKind !== 'regular' ||
+      parent.subagentEnabled !== true
+    ) {
+      throw new Error(
+        'subagent_orchestrator is only available in DeepChat regular sessions with subagents enabled.'
+      )
+    }
+
+    const inheritedWorkspace =
+      (await this.runtimePort.resolveConversationWorkdir(parent.sessionId))?.trim() ||
+      parent.projectDir?.trim() ||
+      null
+
+    const slotMap = new Map(parent.availableSubagentSlots.map((slot) => [slot.id, slot]))
+    const now = Date.now()
+    const tasks = args.tasks.map((task, index): MutableTaskState => {
+      const slot = slotMap.get(task.slotId)
+      if (!slot) {
+        throw new Error(`Subagent slot not found or not enabled: ${task.slotId}`)
+      }
+
+      const targetAgentId =
+        slot.targetType === 'self' ? parent.agentId : (slot.targetAgentId?.trim() ?? null)
+      if (!targetAgentId) {
+        throw new Error(`Subagent slot is missing a target agent: ${task.slotId}`)
+      }
+
+      return {
+        taskId: task.id?.trim() || `task-${index + 1}`,
+        index,
+        slotId: task.slotId,
+        title: task.title,
+        prompt: task.prompt,
+        expectedOutput: task.expectedOutput,
+        targetAgentId,
+        targetAgentName: slot.displayName || targetAgentId,
+        slotDescription: slot.description || '',
+        sessionId: null,
+        status: 'queued',
+        previewMarkdown: '',
+        responseMarkdown: '',
+        updatedAt: now,
+        waitingInteraction: null,
+        started: false,
+        cancelRequested: false,
+        completion: createDeferred()
+      }
+    })
+
+    const runId = nanoid()
+    const toolCallId = options?.toolCallId || ''
+    const sessionTaskMap = new Map<string, MutableTaskState>()
+
+    const emitProgress = () => {
+      if (!options?.onProgress) {
+        return
+      }
+
+      const progressPayload = {
+        runId,
+        mode: args.mode,
+        tasks: tasks.map((task) => ({
+          taskId: task.taskId,
+          title: task.title,
+          slotId: task.slotId,
+          sessionId: task.sessionId,
+          targetAgentId: task.targetAgentId,
+          targetAgentName: task.targetAgentName,
+          status: task.status,
+          previewMarkdown: task.previewMarkdown,
+          updatedAt: task.updatedAt,
+          waitingInteraction: task.waitingInteraction,
+          resultSummary: task.resultSummary
+        }))
+      }
+
+      options.onProgress({
+        kind: 'subagent_orchestrator',
+        toolCallId,
+        responseMarkdown: renderProgressMarkdown(args.mode, tasks),
+        progressJson: JSON.stringify(progressPayload)
+      })
+    }
+
+    const maybeResolveTask = (task: MutableTaskState) => {
+      if (isTerminalStatus(task.status)) {
+        task.completion.resolve()
+      }
+    }
+
+    const updateTaskStatusFromRuntime = (task: MutableTaskState) => {
+      if (task.cancelRequested) {
+        task.status = 'cancelled'
+        task.resultSummary = task.resultSummary || 'Cancelled by parent session.'
+        maybeResolveTask(task)
+        return
+      }
+
+      if (task.waitingInteraction?.type === 'permission') {
+        task.status = 'waiting_permission'
+        return
+      }
+
+      if (task.waitingInteraction?.type === 'question') {
+        task.status = 'waiting_question'
+        return
+      }
+
+      if (task.runtimeStatus === 'error') {
+        task.status = 'error'
+        task.resultSummary =
+          task.resultSummary || summarizeResult(task.responseMarkdown) || 'Child session failed.'
+        maybeResolveTask(task)
+        return
+      }
+
+      if (task.runtimeStatus === 'idle' && task.started) {
+        task.status = 'completed'
+        task.resultSummary =
+          summarizeResult(task.responseMarkdown) || task.resultSummary || 'Completed.'
+        maybeResolveTask(task)
+        return
+      }
+
+      if (task.started) {
+        task.status = 'running'
+      }
+    }
+
+    const unsubscribe = this.runtimePort.subscribeDeepChatSessionUpdates((update) => {
+      const task = sessionTaskMap.get(update.sessionId)
+      if (!task) {
+        return
+      }
+
+      task.updatedAt = update.updatedAt
+
+      if (update.kind === 'blocks') {
+        task.previewMarkdown = truncate(update.previewMarkdown?.trim() || '', 600)
+        task.responseMarkdown = truncate(update.responseMarkdown?.trim() || '', 12000)
+        task.waitingInteraction = update.waitingInteraction ?? null
+      } else if (update.kind === 'status' && update.status) {
+        task.runtimeStatus = update.status
+      }
+
+      updateTaskStatusFromRuntime(task)
+      emitProgress()
+    })
+
+    const abortListener = () => {
+      for (const task of tasks) {
+        if (isTerminalStatus(task.status)) {
+          continue
+        }
+
+        task.cancelRequested = true
+        task.updatedAt = Date.now()
+        updateTaskStatusFromRuntime(task)
+
+        if (task.sessionId) {
+          void this.runtimePort.cancelConversation(task.sessionId).catch(() => undefined)
+        }
+      }
+
+      emitProgress()
+    }
+
+    options?.signal?.addEventListener('abort', abortListener)
+
+    const runTask = async (task: MutableTaskState): Promise<void> => {
+      if (options?.signal?.aborted) {
+        abortListener()
+        return
+      }
+
+      try {
+        const child = await this.runtimePort.createSubagentSession({
+          parentSessionId: parent.sessionId,
+          agentId: task.targetAgentId || parent.agentId,
+          slotId: task.slotId,
+          displayName: task.targetAgentName,
+          targetAgentId: task.targetAgentId,
+          projectDir: inheritedWorkspace,
+          providerId: parent.providerId,
+          modelId: parent.modelId,
+          permissionMode: parent.permissionMode,
+          generationSettings: parent.generationSettings ?? undefined,
+          disabledAgentTools: parent.disabledAgentTools,
+          activeSkills: parent.activeSkills
+        })
+
+        if (!child) {
+          throw new Error(`Failed to create subagent session for slot ${task.slotId}.`)
+        }
+
+        task.sessionId = child.sessionId
+        task.targetAgentName = child.agentName || task.targetAgentName
+        task.updatedAt = Date.now()
+        sessionTaskMap.set(child.sessionId, task)
+        emitProgress()
+
+        const handoff = buildHandoffMessage({
+          parent,
+          mode: args.mode,
+          totalTasks: tasks.length,
+          task,
+          inheritedWorkspace
+        })
+        await this.runtimePort.sendConversationMessage(child.sessionId, handoff)
+        task.started = true
+        task.updatedAt = Date.now()
+        if (task.status === 'queued') {
+          task.status = 'running'
+        }
+        emitProgress()
+
+        await task.completion.promise
+      } catch (error) {
+        task.updatedAt = Date.now()
+        task.status = task.cancelRequested ? 'cancelled' : 'error'
+        task.resultSummary =
+          error instanceof Error ? error.message : 'Subagent session failed unexpectedly.'
+        maybeResolveTask(task)
+        emitProgress()
+      }
+    }
+
+    emitProgress()
+
+    try {
+      if (args.mode === 'parallel') {
+        await Promise.all(tasks.map((task) => runTask(task)))
+      } else {
+        for (const task of tasks) {
+          await runTask(task)
+        }
+      }
+    } finally {
+      unsubscribe()
+      options?.signal?.removeEventListener('abort', abortListener)
+    }
+
+    if (options?.signal?.aborted) {
+      throw new Error('subagent_orchestrator cancelled.')
+    }
+
+    const finalProgress = {
+      runId,
+      mode: args.mode,
+      tasks: tasks.map((task) => ({
+        taskId: task.taskId,
+        title: task.title,
+        slotId: task.slotId,
+        sessionId: task.sessionId,
+        targetAgentId: task.targetAgentId,
+        targetAgentName: task.targetAgentName,
+        status: task.status,
+        previewMarkdown: task.previewMarkdown,
+        updatedAt: task.updatedAt,
+        waitingInteraction: task.waitingInteraction,
+        resultSummary: task.resultSummary
+      }))
+    }
+    const finalMarkdown = renderFinalMarkdown(args.mode, tasks)
+
+    return {
+      content: finalMarkdown,
+      rawData: {
+        content: finalMarkdown,
+        isError: tasks.some((task) => task.status === 'error'),
+        toolResult: {
+          subagentFinal: JSON.stringify(finalProgress),
+          subagentProgress: JSON.stringify(finalProgress)
+        }
+      }
+    }
+  }
+}
diff --git a/src/main/presenter/toolPresenter/index.ts b/src/main/presenter/toolPresenter/index.ts
index 3ae6fa778..a3fdb69cc 100644
--- a/src/main/presenter/toolPresenter/index.ts
+++ b/src/main/presenter/toolPresenter/index.ts
@@ -5,6 +5,7 @@ import type {
   MCPToolCall,
   MCPToolResponse
 } from '@shared/presenter'
+import type { AgentToolProgressUpdate } from '@shared/types/presenters/tool.presenter'
 import { resolveToolOffloadTemplatePath } from '@/lib/agentRuntime/sessionPaths'
 import { QUESTION_TOOL_NAME } from '@/lib/agentRuntime/questionTool'
 import { ToolMapper } from './toolMapper'
@@ -49,7 +50,13 @@ export interface IToolPresenter {
     agentWorkspacePath?: string | null
     conversationId?: string
   }): Promise<MCPToolDefinition[]>
-  callTool(request: MCPToolCall): Promise<{ content: unknown; rawData: MCPToolResponse }>
+  callTool(
+    request: MCPToolCall,
+    options?: {
+      onProgress?: (update: AgentToolProgressUpdate) => void
+      signal?: AbortSignal
+    }
+  ): Promise<{ content: unknown; rawData: MCPToolResponse }>
   preCheckToolPermission?(request: MCPToolCall): Promise<PreCheckedPermissionResult | null>
   buildToolSystemPrompt(context: {
     conversationId?: string
@@ -176,7 +183,13 @@ export class ToolPresenter implements IToolPresenter {
   /**
    * Call a tool, routing to the appropriate source based on mapping
    */
-  async callTool(request: MCPToolCall): Promise<{ content: unknown; rawData: MCPToolResponse }> {
+  async callTool(
+    request: MCPToolCall,
+    options?: {
+      onProgress?: (update: AgentToolProgressUpdate) => void
+      signal?: AbortSignal
+    }
+  ): Promise<{ content: unknown; rawData: MCPToolResponse }> {
     const toolName = request.function.name
     const source = this.mapper.getToolSource(toolName)
 
@@ -207,7 +220,16 @@ export class ToolPresenter implements IToolPresenter {
           }
         }
       }
-      const response = await this.agentToolManager.callTool(toolName, args, request.conversationId)
+      const response = await this.agentToolManager.callTool(
+        toolName,
+        args,
+        request.conversationId,
+        {
+          toolCallId: request.id,
+          onProgress: options?.onProgress,
+          signal: options?.signal
+        }
+      )
       const resolvedResponse = this.resolveAgentToolResponse(response)
       const rawData = resolvedResponse.rawData ?? {}
       return {
diff --git a/src/main/presenter/toolPresenter/runtimePorts.ts b/src/main/presenter/toolPresenter/runtimePorts.ts
index 806b436c2..78646ab38 100644
--- a/src/main/presenter/toolPresenter/runtimePorts.ts
+++ b/src/main/presenter/toolPresenter/runtimePorts.ts
@@ -4,17 +4,60 @@ import type {
   IWindowPresenter,
   IYoBrowserPresenter
 } from '@shared/presenter'
+import type {
+  DeepChatSubagentMeta,
+  DeepChatSubagentSlot,
+  PermissionMode,
+  SendMessageInput,
+  SessionGenerationSettings,
+  SessionKind
+} from '@shared/types/agent-interface'
 import type { ISkillPresenter } from '@shared/types/skill'
+import type { DeepChatInternalSessionUpdate } from '../deepchatAgentPresenter/internalSessionEvents'
 
 export interface ConversationSessionInfo {
+  sessionId: string
+  agentId: string
+  agentName: string
+  agentType: 'deepchat' | 'acp' | null
+  providerId: string
+  modelId: string
+  projectDir: string | null
+  permissionMode: PermissionMode
+  generationSettings: SessionGenerationSettings | null
+  disabledAgentTools: string[]
+  activeSkills: string[]
+  sessionKind: SessionKind
+  parentSessionId: string | null
+  subagentEnabled: boolean
+  subagentMeta: DeepChatSubagentMeta | null
+  availableSubagentSlots: DeepChatSubagentSlot[]
+}
+
+export interface CreateSubagentSessionInput {
+  parentSessionId: string
   agentId: string
+  slotId: string
+  displayName: string
+  targetAgentId?: string | null
+  projectDir?: string | null
   providerId: string
   modelId: string
+  permissionMode: PermissionMode
+  generationSettings?: Partial<SessionGenerationSettings>
+  disabledAgentTools?: string[]
+  activeSkills?: string[]
 }
 
 export interface AgentToolRuntimePort {
   resolveConversationWorkdir(conversationId: string): Promise<string | null>
   resolveConversationSessionInfo(conversationId: string): Promise<ConversationSessionInfo | null>
+  createSubagentSession(input: CreateSubagentSessionInput): Promise<ConversationSessionInfo | null>
+  sendConversationMessage(conversationId: string, content: string | SendMessageInput): Promise<void>
+  cancelConversation(conversationId: string): Promise<void>
+  subscribeDeepChatSessionUpdates(
+    listener: (update: DeepChatInternalSessionUpdate) => void
+  ): () => void
   getSkillPresenter(): ISkillPresenter
   getYoBrowserToolHandler(): IYoBrowserPresenter['toolHandler']
   getFilePresenter(): Pick<IFilePresenter, 'getMimeType' | 'prepareFileCompletely'>
diff --git a/src/renderer/settings/components/DeepChatAgentsSettings.vue b/src/renderer/settings/components/DeepChatAgentsSettings.vue
index 9df6ca57a..5df70abeb 100644
--- a/src/renderer/settings/components/DeepChatAgentsSettings.vue
+++ b/src/renderer/settings/components/DeepChatAgentsSettings.vue
@@ -393,6 +393,102 @@
           </div>
         </section>
 
+        <section class="space-y-4 rounded-2xl border border-border p-5">
+          <div class="flex items-center justify-between gap-3">
+            <div>
+              <div class="text-sm font-semibold">
+                {{ t('settings.deepchatAgents.subagentsTitle') }}
+              </div>
+              <div class="text-xs text-muted-foreground">
+                {{ t('settings.deepchatAgents.subagentsDescription') }}
+              </div>
+            </div>
+            <Switch
+              :model-value="form.subagentEnabled"
+              :aria-label="t('settings.deepchatAgents.subagentsEnabled')"
+              @update:model-value="form.subagentEnabled = $event"
+            />
+          </div>
+
+          <div class="space-y-3">
+            <div
+              v-for="(slot, index) in form.subagents"
+              :key="slot.id"
+              class="rounded-xl border border-border p-4"
+            >
+              <div class="flex items-center justify-between gap-3">
+                <div
+                  class="text-xs font-semibold uppercase tracking-[0.08em] text-muted-foreground"
+                >
+                  {{ slot.id }}
+                </div>
+                <Button
+                  variant="ghost"
+                  size="sm"
+                  class="h-7 px-2 text-xs"
+                  @click="removeSubagentSlot(index)"
+                >
+                  {{ t('common.delete') }}
+                </Button>
+              </div>
+
+              <div class="mt-4 grid gap-4 md:grid-cols-2">
+                <label class="space-y-2">
+                  <div class="text-sm font-medium">
+                    {{ t('settings.deepchatAgents.subagentTargetAgentLabel') }}
+                  </div>
+                  <select
+                    :value="getSubagentTargetValue(slot)"
+                    class="flex h-10 w-full rounded-lg border border-border bg-background px-3 text-sm"
+                    @change="handleSubagentTargetChange(slot, $event)"
+                  >
+                    <option
+                      v-for="agentOption in subagentTargetOptions"
+                      :key="agentOption.value"
+                      :value="agentOption.value"
+                    >
+                      {{ agentOption.label }}
+                    </option>
+                  </select>
+                </label>
+
+                <label class="space-y-2">
+                  <div class="text-sm font-medium">
+                    {{ t('settings.deepchatAgents.subagentDisplayName') }}
+                  </div>
+                  <Input v-model="slot.displayName" />
+                </label>
+
+                <label class="space-y-2 md:col-span-2">
+                  <div class="text-sm font-medium">
+                    {{ t('settings.deepchatAgents.subagentDescription') }}
+                  </div>
+                  <Textarea v-model="slot.description" class="min-h-[72px]" />
+                </label>
+              </div>
+            </div>
+
+            <div class="flex items-center justify-between gap-3 text-xs text-muted-foreground">
+              <span>
+                {{
+                  t('settings.deepchatAgents.subagentLimit', {
+                    count: form.subagents.length,
+                    max: subagentSlotLimit
+                  })
+                }}
+              </span>
+              <Button
+                size="sm"
+                variant="outline"
+                :disabled="form.subagents.length >= subagentSlotLimit"
+                @click="addSubagentSlot"
+              >
+                {{ t('settings.deepchatAgents.addSubagentSlot') }}
+              </Button>
+            </div>
+          </div>
+        </section>
+
         <section class="space-y-4 rounded-2xl border border-border p-5">
           <div class="text-sm font-semibold">{{ t('settings.deepchatAgents.toolsTitle') }}</div>
           <div
@@ -533,10 +629,16 @@ import type { MCPToolDefinition } from '@shared/types/core/mcp'
 import type {
   Agent,
   AgentAvatar as AgentAvatarValue,
+  DeepChatSubagentSlot,
   PermissionMode,
   Project
 } from '@shared/types/agent-interface'
 import type { RENDERER_MODEL_META, SystemPrompt } from '@shared/presenter'
+import {
+  DEEPCHAT_SUBAGENT_SLOT_LIMIT,
+  createDefaultDeepChatSelfSubagentSlot,
+  normalizeDeepChatSubagentSlots
+} from '@shared/lib/deepchatSubagents'
 
 type ModelKey = 'chatModel' | 'assistantModel' | 'visionModel'
 type AvatarKind = 'default' | 'lucide' | 'monogram'
@@ -549,6 +651,11 @@ type SidebarAgentItem = {
   avatar: AgentAvatarValue | null
   icon?: string
 }
+type SelectOption = {
+  value: string
+  label: string
+}
+type EditableSubagentSlot = DeepChatSubagentSlot
 type ToolGroup = {
   name: string
   label: string
@@ -572,6 +679,8 @@ type FormState = {
   defaultProjectPath: string
   systemPrompt: string
   permissionMode: PermissionMode
+  subagentEnabled: boolean
+  subagents: EditableSubagentSlot[]
   disabledAgentTools: string[]
   autoCompactionEnabled: boolean
   autoCompactionTriggerThreshold: string
@@ -580,6 +689,7 @@ type FormState = {
 
 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 GROUP_ORDER = [
   'agent-filesystem',
   'agent-core',
@@ -592,8 +702,9 @@ const configPresenter = usePresenter('configPresenter')
 const projectPresenter = usePresenter('projectPresenter', { safeCall: false })
 const toolPresenter = usePresenter('toolPresenter')
 const modelStore = useModelStore()
+const subagentSlotLimit = DEEPCHAT_SUBAGENT_SLOT_LIMIT
 
-const agents = ref<Agent[]>([])
+const allAgents = ref<Agent[]>([])
 const tools = ref<MCPToolDefinition[]>([])
 const recentProjects = ref<Project[]>([])
 const saving = ref(false)
@@ -624,6 +735,8 @@ const form = reactive<FormState>({
   defaultProjectPath: '',
   systemPrompt: '',
   permissionMode: 'full_access',
+  subagentEnabled: false,
+  subagents: normalizeDeepChatSubagentSlots([createDefaultDeepChatSelfSubagentSlot()]),
   disabledAgentTools: [],
   autoCompactionEnabled: true,
   autoCompactionTriggerThreshold: '80',
@@ -763,6 +876,42 @@ const groupedTools = computed<ToolGroup[]>(() => {
       return left.name.localeCompare(right.name)
     })
 })
+const deepchatAgents = computed(() =>
+  allAgents.value
+    .filter((agent) => agent.type === 'deepchat')
+    .sort((a, b) =>
+      a.id === 'deepchat' ? -1 : b.id === 'deepchat' ? 1 : a.name.localeCompare(b.name)
+    )
+)
+const isAvailableSubagentTargetAgent = (agent: Agent) => {
+  if (agent.type === 'deepchat') {
+    return true
+  }
+
+  if (agent.type !== 'acp') {
+    return false
+  }
+
+  return agent.source !== 'registry' || agent.installState?.status === 'installed'
+}
+const availableSubagentTargetAgents = computed(() =>
+  allAgents.value.filter(isAvailableSubagentTargetAgent).sort((left, right) => {
+    if (left.type !== right.type) {
+      return left.type === 'deepchat' ? -1 : 1
+    }
+    return left.name.localeCompare(right.name)
+  })
+)
+const subagentTargetOptions = computed<SelectOption[]>(() => [
+  {
+    value: CURRENT_SUBAGENT_TARGET,
+    label: t('settings.deepchatAgents.subagentTargetSelf')
+  },
+  ...availableSubagentTargetAgents.value.map((agent) => ({
+    value: agent.id,
+    label: agent.name
+  }))
+])
 const draftSidebarAgent = computed<SidebarAgentItem>(() => ({
   id: DRAFT_AGENT_ID,
   name: form.name.trim() || t('settings.deepchatAgents.unnamed'),
@@ -771,7 +920,7 @@ const draftSidebarAgent = computed<SidebarAgentItem>(() => ({
   avatar: buildAvatar()
 }))
 const sidebarAgents = computed<SidebarAgentItem[]>(() => {
-  const savedAgents = agents.value.map((agent) => ({
+  const savedAgents = deepchatAgents.value.map((agent) => ({
     id: agent.id,
     name: agent.name,
     enabled: agent.enabled,
@@ -816,6 +965,8 @@ const emptyForm = (): FormState => ({
   defaultProjectPath: '',
   systemPrompt: '',
   permissionMode: 'full_access',
+  subagentEnabled: false,
+  subagents: normalizeDeepChatSubagentSlots([createDefaultDeepChatSelfSubagentSlot()]),
   disabledAgentTools: [],
   autoCompactionEnabled: true,
   autoCompactionTriggerThreshold: '80',
@@ -833,6 +984,8 @@ const parseNum = (value: string) => {
   const parsed = Number(normalized)
   return Number.isFinite(parsed) ? parsed : undefined
 }
+const createAgentSlotId = () =>
+  `slot-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 6)}`
 const numText = (value: unknown) =>
   typeof value === 'number' && Number.isFinite(value) ? String(value) : ''
 const buildAvatar = (): AgentAvatarValue | null => {
@@ -885,6 +1038,8 @@ const fromAgent = (agent?: Agent | null): FormState => {
     defaultProjectPath: normalizePath(config.defaultProjectPath) ?? '',
     systemPrompt: config.systemPrompt ?? '',
     permissionMode: config.permissionMode === 'default' ? 'default' : 'full_access',
+    subagentEnabled: config.subagentEnabled === true,
+    subagents: normalizeDeepChatSubagentSlots(config.subagents),
     disabledAgentTools: [...(config.disabledAgentTools ?? [])],
     autoCompactionEnabled: config.autoCompactionEnabled ?? true,
     autoCompactionTriggerThreshold: numText(config.autoCompactionTriggerThreshold ?? 80),
@@ -909,6 +1064,50 @@ const modelText = (selection: EditableModel | undefined) => {
 }
 const getModelLabel = (key: ModelKey) => modelText(form[key])
 const getModelIconId = (key: ModelKey) => form[key]?.modelId ?? ''
+const getSubagentTargetValue = (slot: EditableSubagentSlot) =>
+  slot.targetType === 'self'
+    ? CURRENT_SUBAGENT_TARGET
+    : (slot.targetAgentId ?? CURRENT_SUBAGENT_TARGET)
+
+const setSubagentTarget = (slot: EditableSubagentSlot, targetValue: string) => {
+  if (targetValue === CURRENT_SUBAGENT_TARGET) {
+    slot.targetType = 'self'
+    delete slot.targetAgentId
+    return
+  }
+
+  slot.targetType = 'agent'
+  slot.targetAgentId = targetValue
+}
+
+const handleSubagentTargetChange = (slot: EditableSubagentSlot, event: Event) => {
+  const target = event.target
+  if (!(target instanceof HTMLSelectElement)) {
+    return
+  }
+
+  setSubagentTarget(slot, target.value)
+}
+
+const addSubagentSlot = () => {
+  if (form.subagents.length >= subagentSlotLimit) {
+    return
+  }
+
+  form.subagents.push({
+    id: createAgentSlotId(),
+    targetType: 'self',
+    displayName: '',
+    description: ''
+  })
+}
+const removeSubagentSlot = (index: number) => {
+  if (!form.subagents[index]) {
+    return
+  }
+
+  form.subagents.splice(index, 1)
+}
 const clearModel = (key: ModelKey) => {
   form[key] = null
 }
@@ -1004,17 +1203,13 @@ const loadTools = async () => {
 }
 const loadAgents = async (preferredId?: string | null) => {
   const list = await configPresenter.listAgents()
-  agents.value = list
-    .filter((agent) => agent.type === 'deepchat')
-    .sort((a, b) =>
-      a.id === 'deepchat' ? -1 : b.id === 'deepchat' ? 1 : a.name.localeCompare(b.name)
-    )
+  allAgents.value = list
   const nextId =
-    preferredId && agents.value.some((agent) => agent.id === preferredId)
+    preferredId && deepchatAgents.value.some((agent) => agent.id === preferredId)
       ? preferredId
-      : (agents.value[0]?.id ?? null)
+      : (deepchatAgents.value[0]?.id ?? null)
   selectedAgentId.value = nextId
-  assignForm(fromAgent(agents.value.find((agent) => agent.id === nextId) ?? null))
+  assignForm(fromAgent(deepchatAgents.value.find((agent) => agent.id === nextId) ?? null))
 }
 const selectAgent = (agentId: string) => {
   if (agentId === DRAFT_AGENT_ID) {
@@ -1023,7 +1218,7 @@ const selectAgent = (agentId: string) => {
   }
 
   selectedAgentId.value = agentId
-  assignForm(fromAgent(agents.value.find((agent) => agent.id === agentId) ?? null))
+  assignForm(fromAgent(deepchatAgents.value.find((agent) => agent.id === agentId) ?? null))
 }
 const startCreate = () => {
   selectedAgentId.value = DRAFT_AGENT_ID
@@ -1054,6 +1249,8 @@ const saveAgent = async () => {
         defaultProjectPath: normalizePath(form.defaultProjectPath),
         systemPrompt: form.systemPrompt,
         permissionMode: form.permissionMode,
+        subagentEnabled: form.subagentEnabled,
+        subagents: normalizeDeepChatSubagentSlots(form.subagents),
         disabledAgentTools: [...form.disabledAgentTools],
         autoCompactionEnabled: form.autoCompactionEnabled,
         autoCompactionTriggerThreshold: parseNum(form.autoCompactionTriggerThreshold) ?? 80,
diff --git a/src/renderer/src/components/chat-input/McpIndicator.vue b/src/renderer/src/components/chat-input/McpIndicator.vue
index 39808e5bc..42bf21e32 100644
--- a/src/renderer/src/components/chat-input/McpIndicator.vue
+++ b/src/renderer/src/components/chat-input/McpIndicator.vue
@@ -110,20 +110,20 @@
 
                 <div class="flex flex-wrap gap-2">
                   <Button
-                    v-for="tool in group.tools"
-                    :key="tool.function.name"
+                    v-for="item in group.items"
+                    :key="item.id"
                     variant="outline"
                     size="sm"
                     class="h-7 rounded-md px-2.5 text-xs shadow-none transition-colors"
                     :class="
-                      isToolEnabled(tool.function.name)
+                      isGroupItemEnabled(item)
                         ? 'border-primary bg-primary text-primary-foreground hover:bg-primary/90 hover:text-primary-foreground'
                         : 'border-border bg-background text-muted-foreground hover:bg-muted hover:text-foreground'
                     "
-                    :disabled="isToolPending(tool.function.name)"
-                    @click="toggleAgentTool(tool.function.name)"
+                    :disabled="isGroupItemPending(item)"
+                    @click="toggleGroupItem(item)"
                   >
-                    {{ tool.function.name }}
+                    {{ item.label }}
                   </Button>
                 </div>
               </div>
@@ -227,10 +227,23 @@ import { useDraftStore } from '@/stores/ui/draft'
 import { useAgentStore } from '@/stores/ui/agent'
 import { useProjectStore } from '@/stores/ui/project'
 
+type ToolGroupItem =
+  | {
+      kind: 'tool'
+      id: string
+      label: string
+      toolName: string
+    }
+  | {
+      kind: 'subagent'
+      id: 'subagent'
+      label: string
+    }
+
 type ToolGroup = {
   name: string
   label: string
-  tools: MCPToolDefinition[]
+  items: ToolGroupItem[]
 }
 
 type SystemPromptMenuOption = {
@@ -253,18 +266,25 @@ const props = withDefaults(
     systemPromptOptions?: SystemPromptMenuOption[]
     selectedSystemPromptId?: string
     showCustomSystemPromptBadge?: boolean
+    showSubagentToggle?: boolean
+    subagentEnabled?: boolean
+    subagentTogglePending?: boolean
   }>(),
   {
     showSystemPromptSection: false,
     systemPromptOptions: () => [],
     selectedSystemPromptId: 'empty',
-    showCustomSystemPromptBadge: false
+    showCustomSystemPromptBadge: false,
+    showSubagentToggle: false,
+    subagentEnabled: false,
+    subagentTogglePending: false
   }
 )
 
 const emit = defineEmits<{
   (e: 'select-system-prompt', optionId: string): void
   (e: 'open-change', open: boolean): void
+  (e: 'toggle-subagents', enabled: boolean): void
 }>()
 
 const { t } = useI18n()
@@ -381,19 +401,34 @@ const getGroupLabel = (serverName: string) => {
 }
 
 const groupedAgentTools = computed<ToolGroup[]>(() => {
-  const groups = new Map<string, MCPToolDefinition[]>()
+  const groups = new Map<string, ToolGroupItem[]>()
 
   for (const tool of agentTools.value) {
     const existing = groups.get(tool.server.name) ?? []
-    existing.push(tool)
+    existing.push({
+      kind: 'tool',
+      id: tool.function.name,
+      label: tool.function.name,
+      toolName: tool.function.name
+    })
     groups.set(tool.server.name, existing)
   }
 
+  if (props.showSubagentToggle) {
+    const existing = groups.get('agent-core') ?? []
+    existing.push({
+      kind: 'subagent',
+      id: 'subagent',
+      label: t('chat.subagents.label')
+    })
+    groups.set('agent-core', existing)
+  }
+
   return Array.from(groups.entries())
-    .map(([name, tools]) => ({
+    .map(([name, items]) => ({
       name,
       label: getGroupLabel(name),
-      tools: [...tools].sort((left, right) => left.function.name.localeCompare(right.function.name))
+      items: [...items].sort((left, right) => left.label.localeCompare(right.label))
     }))
     .sort((left, right) => {
       const leftIndex = GROUP_ORDER.indexOf(left.name)
@@ -414,11 +449,14 @@ const groupedAgentTools = computed<ToolGroup[]>(() => {
 
 const isToolEnabled = (toolName: string) => !disabledToolNames.value.includes(toolName)
 const isToolPending = (toolName: string) => pendingToolNames.value.includes(toolName)
-const getGroupToolNames = (group: ToolGroup) => group.tools.map((tool) => tool.function.name)
-const isGroupEnabled = (group: ToolGroup) =>
-  getGroupToolNames(group).some((toolName) => isToolEnabled(toolName))
-const isGroupPending = (group: ToolGroup) =>
-  getGroupToolNames(group).some((toolName) => isToolPending(toolName))
+const isGroupItemEnabled = (item: ToolGroupItem) =>
+  item.kind === 'subagent' ? props.subagentEnabled : isToolEnabled(item.toolName)
+const isGroupItemPending = (item: ToolGroupItem) =>
+  item.kind === 'subagent' ? props.subagentTogglePending : isToolPending(item.toolName)
+const getGroupToolNames = (group: ToolGroup) =>
+  group.items.flatMap((item) => (item.kind === 'tool' ? [item.toolName] : []))
+const isGroupEnabled = (group: ToolGroup) => group.items.some((item) => isGroupItemEnabled(item))
+const isGroupPending = (group: ToolGroup) => group.items.some((item) => isGroupItemPending(item))
 
 const getServerLabel = (serverName: string) => {
   return t(`mcp.inmemory.${serverName}.name`, serverName)
@@ -544,6 +582,19 @@ const toggleAgentTool = async (toolName: string) => {
   await persistDisabledTools(nextList, [toolName])
 }
 
+const toggleGroupItem = async (item: ToolGroupItem) => {
+  if (item.kind === 'subagent') {
+    if (!isDeepchatContext.value || props.subagentTogglePending) {
+      return
+    }
+
+    emit('toggle-subagents', !props.subagentEnabled)
+    return
+  }
+
+  await toggleAgentTool(item.toolName)
+}
+
 const setGroupEnabled = async (group: ToolGroup, enabled: boolean) => {
   if (!isDeepchatContext.value || isGroupPending(group)) {
     return
@@ -561,11 +612,21 @@ const setGroupEnabled = async (group: ToolGroup, enabled: boolean) => {
   }
 
   const nextList = Array.from(nextDisabledTools).sort((left, right) => left.localeCompare(right))
-  if (nextList.join('\n') === disabledToolNames.value.join('\n')) {
+  const shouldUpdateTools = nextList.join('\n') !== disabledToolNames.value.join('\n')
+  const shouldUpdateSubagents =
+    group.items.some((item) => item.kind === 'subagent') && props.subagentEnabled !== enabled
+
+  if (!shouldUpdateTools && !shouldUpdateSubagents) {
     return
   }
 
-  await persistDisabledTools(nextList, groupToolNames)
+  if (shouldUpdateTools) {
+    await persistDisabledTools(nextList, groupToolNames)
+  }
+
+  if (shouldUpdateSubagents) {
+    emit('toggle-subagents', enabled)
+  }
 }
 
 watch(
diff --git a/src/renderer/src/components/chat/ChatStatusBar.vue b/src/renderer/src/components/chat/ChatStatusBar.vue
index a8b58875c..e398d486b 100644
--- a/src/renderer/src/components/chat/ChatStatusBar.vue
+++ b/src/renderer/src/components/chat/ChatStatusBar.vue
@@ -661,8 +661,12 @@
           :system-prompt-options="systemPromptMenuOptions"
           :selected-system-prompt-id="selectedSystemPromptId"
           :show-custom-system-prompt-badge="selectedSystemPromptId === '__custom__'"
+          :show-subagent-toggle="showSubagentToggle"
+          :subagent-enabled="subagentEnabled"
+          :subagent-toggle-pending="isSubagentToggleUpdating"
           @select-system-prompt="onSystemPromptSelect"
           @open-change="handleSessionPanelOpenChange"
+          @toggle-subagents="onSubagentToggle"
         />
 
         <DropdownMenu v-if="!isAcpAgent">
@@ -736,6 +740,7 @@ import type {
   PermissionMode,
   SessionGenerationSettings
 } from '@shared/types/agent-interface'
+import { normalizeDeepChatSubagentConfig } from '@shared/lib/deepchatSubagents'
 import type { ReasoningPortrait } from '@shared/types/model-db'
 import {
   normalizeLegacyThinkingBudgetValue,
@@ -817,6 +822,7 @@ const { t } = useI18n()
 
 const draftModelSelection = ref<ModelSelection | null>(null)
 const permissionMode = ref<PermissionMode>('full_access')
+const subagentEnabled = ref(false)
 const localSettings = ref<SessionGenerationSettings | null>(null)
 const loadedSettingsSelection = ref<ModelSelection | null>(null)
 const systemPromptList = ref<SystemPrompt[]>([])
@@ -857,6 +863,7 @@ let generationPersistTimer: ReturnType<typeof setTimeout> | null = null
 let pendingGenerationPatch: Partial<SessionGenerationSettings> = {}
 let generationPersistRequestToken = 0
 let generationLocalRevision = 0
+const isSubagentToggleUpdating = ref(false)
 
 const hasActiveSession = computed(() => sessionStore.hasActiveSession)
 const availableAgents = computed(() => (Array.isArray(agentStore.agents) ? agentStore.agents : []))
@@ -888,12 +895,12 @@ const resolveDeepChatAgentConfig = async (agentId: string): Promise<DeepChatAgen
       ? await configPresenter.getDefaultSystemPrompt()
       : await configPresenter.getSetting?.('default_system_prompt')) ?? ''
 
-  return {
+  return normalizeDeepChatSubagentConfig({
     defaultModelPreset: undefined,
     systemPrompt: typeof defaultSystemPrompt === 'string' ? defaultSystemPrompt : '',
     permissionMode: 'full_access',
     disabledAgentTools: []
-  }
+  })
 }
 
 const selectedAgentType = computed<'deepchat' | 'acp' | null>(() => {
@@ -972,6 +979,20 @@ const effectiveModelSelection = computed<ModelSelection | null>(() => {
 })
 
 const canSelectPermissionMode = computed(() => !isAcpAgent.value)
+const showSubagentToggle = computed(() => {
+  if (isAcpAgent.value) {
+    return false
+  }
+
+  if (hasActiveSession.value) {
+    return (
+      sessionStore.activeSession?.sessionKind === 'regular' &&
+      inferAgentType(sessionStore.activeSession?.agentId) === 'deepchat'
+    )
+  }
+
+  return selectedAgentType.value === 'deepchat'
+})
 
 const providerNameMap = computed(() => {
   const map = new Map<string, string>()
@@ -2219,6 +2240,29 @@ watch(
   { immediate: true }
 )
 
+watch(
+  [
+    () => sessionStore.activeSessionId,
+    showSubagentToggle,
+    () => sessionStore.activeSession?.subagentEnabled,
+    () => draftStore.subagentEnabled
+  ],
+  ([sessionId, canShow, activeEnabled, draftEnabled]) => {
+    if (!canShow) {
+      subagentEnabled.value = false
+      return
+    }
+
+    if (sessionId) {
+      subagentEnabled.value = activeEnabled === true
+      return
+    }
+
+    subagentEnabled.value = draftEnabled === true
+  },
+  { immediate: true }
+)
+
 watch(
   [
     () => sessionStore.activeSessionId,
@@ -2668,10 +2712,34 @@ async function selectPermissionMode(mode: PermissionMode) {
   }
 }
 
+async function onSubagentToggle(enabled: boolean) {
+  if (!showSubagentToggle.value || subagentEnabled.value === enabled) {
+    return
+  }
+
+  subagentEnabled.value = enabled
+  const sessionId = sessionStore.activeSessionId
+  if (!sessionId) {
+    draftStore.subagentEnabled = enabled
+    return
+  }
+
+  isSubagentToggleUpdating.value = true
+  try {
+    await sessionStore.setSessionSubagentEnabled(sessionId, enabled)
+  } catch (error) {
+    console.warn('[ChatStatusBar] Failed to set subagent toggle:', error)
+    subagentEnabled.value = sessionStore.activeSession?.subagentEnabled === true
+  } finally {
+    isSubagentToggleUpdating.value = false
+  }
+}
+
 defineExpose({
   acpConfigState,
   localSettings,
   permissionMode,
+  subagentEnabled,
   showSystemPromptSection,
   showReasoningEffort,
   onTemperatureInput,
diff --git a/src/renderer/src/components/chat/ChatTopBar.vue b/src/renderer/src/components/chat/ChatTopBar.vue
index 4e5f886ef..ee3a74cbf 100644
--- a/src/renderer/src/components/chat/ChatTopBar.vue
+++ b/src/renderer/src/components/chat/ChatTopBar.vue
@@ -4,6 +4,17 @@
     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">
+      <Button
+        v-if="parentSessionId"
+        variant="ghost"
+        size="sm"
+        class="h-7 gap-1 px-2 text-xs text-muted-foreground hover:text-foreground"
+        :title="t('chat.topbar.backToParent')"
+        @click="handleBackToParent"
+      >
+        <Icon icon="lucide:corner-up-left" class="h-3.5 w-3.5" />
+        <span>{{ t('chat.topbar.backToParent') }}</span>
+      </Button>
       <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>
@@ -55,7 +66,7 @@
         </DropdownMenuContent>
       </DropdownMenu>
 
-      <DropdownMenu>
+      <DropdownMenu v-if="!isReadOnly">
         <DropdownMenuTrigger as-child>
           <Button
             variant="ghost"
@@ -172,6 +183,7 @@ const props = defineProps<{
   sessionId: string
   title: string
   project: string
+  isReadOnly?: boolean
 }>()
 
 const attrs = useAttrs()
@@ -189,22 +201,36 @@ const projectName = computed(() => props.project.split('/').pop() ?? props.proje
 const currentSession = computed(
   () => sessionStore.sessions.find((session) => session.id === props.sessionId) ?? null
 )
+const parentSessionId = computed(() => currentSession.value?.parentSessionId ?? null)
 const isPinned = computed(() => Boolean(currentSession.value?.isPinned))
+const isReadOnly = computed(() => props.isReadOnly === true)
 
 const openRenameDialog = () => {
+  if (isReadOnly.value) {
+    return
+  }
   renameValue.value = currentSession.value?.title ?? props.title
   renameDialogOpen.value = true
 }
 
 const openClearDialog = () => {
+  if (isReadOnly.value) {
+    return
+  }
   clearDialogOpen.value = true
 }
 
 const openDeleteDialog = () => {
+  if (isReadOnly.value) {
+    return
+  }
   deleteDialogOpen.value = true
 }
 
 const handleTogglePin = async () => {
+  if (isReadOnly.value) {
+    return
+  }
   try {
     await sessionStore.toggleSessionPinned(props.sessionId, !isPinned.value)
   } catch (error) {
@@ -213,6 +239,9 @@ const handleTogglePin = async () => {
 }
 
 const handleRenameConfirm = async () => {
+  if (isReadOnly.value) {
+    return
+  }
   try {
     await sessionStore.renameSession(props.sessionId, renameValue.value)
   } catch (error) {
@@ -223,6 +252,9 @@ const handleRenameConfirm = async () => {
 }
 
 const handleClearConfirm = async () => {
+  if (isReadOnly.value) {
+    return
+  }
   try {
     await sessionStore.clearSessionMessages(props.sessionId)
   } catch (error) {
@@ -233,6 +265,9 @@ const handleClearConfirm = async () => {
 }
 
 const handleDeleteConfirm = async () => {
+  if (isReadOnly.value) {
+    return
+  }
   try {
     await sessionStore.deleteSession(props.sessionId)
   } catch (error) {
@@ -263,6 +298,18 @@ const handleExport = async (format: 'markdown' | 'html' | 'txt' | 'nowledge-mem'
     })
   }
 }
+
+const handleBackToParent = async () => {
+  if (!parentSessionId.value) {
+    return
+  }
+
+  try {
+    await sessionStore.selectSession(parentSessionId.value)
+  } catch (error) {
+    console.error('Failed to navigate to parent session:', error)
+  }
+}
 </script>
 
 <style scoped>
diff --git a/src/renderer/src/components/chat/MessageList.vue b/src/renderer/src/components/chat/MessageList.vue
index 08f40c8b0..b07b97317 100644
--- a/src/renderer/src/components/chat/MessageList.vue
+++ b/src/renderer/src/components/chat/MessageList.vue
@@ -22,6 +22,7 @@
         <MessageItemUser
           v-else-if="item.role === 'user'"
           :message="item as DisplayUserMessage"
+          :is-read-only="isReadOnly"
           @retry="onRetry"
           @delete="onDelete"
           @edit-save="onEditSave"
@@ -33,6 +34,7 @@
           :is-in-generating-thread="isGenerating"
           :show-trace="traceMessageIdSet.has(item.id)"
           :is-capturing-image="isCapturing"
+          :is-read-only="isReadOnly"
           @retry="onRetry"
           @delete="onDelete"
           @fork="onFork"
@@ -64,10 +66,12 @@ const props = withDefaults(
     messages: MessageListItem[]
     isGenerating?: boolean
     traceMessageIds?: string[]
+    isReadOnly?: boolean
   }>(),
   {
     isGenerating: false,
-    traceMessageIds: () => []
+    traceMessageIds: () => [],
+    isReadOnly: false
   }
 )
 
diff --git a/src/renderer/src/components/chat/messageListItems.ts b/src/renderer/src/components/chat/messageListItems.ts
index addc256bb..8f604b538 100644
--- a/src/renderer/src/components/chat/messageListItems.ts
+++ b/src/renderer/src/components/chat/messageListItems.ts
@@ -70,6 +70,8 @@ export type DisplayAssistantMessageExtra = Record<string, string | number | obje
   questionResolution?: 'asked' | 'replied' | 'rejected'
   answerText?: string
   answerMessageId?: string
+  subagentProgress?: string
+  subagentFinal?: string
 }
 
 export type DisplayAssistantMessageBlock = {
diff --git a/src/renderer/src/components/message/MessageBlockAction.vue b/src/renderer/src/components/message/MessageBlockAction.vue
index fa491c93c..9bfc5a383 100644
--- a/src/renderer/src/components/message/MessageBlockAction.vue
+++ b/src/renderer/src/components/message/MessageBlockAction.vue
@@ -44,7 +44,7 @@
         ></div>
       </div>
 
-      <div class="flex flex-row gap-2">
+      <div v-if="!isReadOnly" class="flex flex-row gap-2">
         <Button variant="outline" size="sm" class="h-7 text-xs" @click="handleQuickSettings">
           <Icon icon="lucide:settings" class="w-3 h-3 mr-1" />
           {{ t('chat.messages.rateLimitQuickSettings') }}
@@ -57,7 +57,7 @@
     </div>
 
     <Button
-      v-if="block.extra?.needContinue"
+      v-if="block.extra?.needContinue && !isReadOnly"
       class="bg-primary rounded-lg hover:bg-indigo-600/50 h-8"
       size="sm"
       @click="handleClick"
@@ -78,7 +78,7 @@
 import { useI18n } from 'vue-i18n'
 import { Icon } from '@iconify/vue'
 import { Button } from '@shadcn/components/ui/button'
-import { ref, onMounted, onUnmounted } from 'vue'
+import { computed, ref, onMounted, onUnmounted } from 'vue'
 import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
 
 const { t } = useI18n()
@@ -87,6 +87,7 @@ const props = defineProps<{
   messageId: string
   conversationId: string
   block: DisplayAssistantMessageBlock
+  isReadOnly?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -96,6 +97,7 @@ const emit = defineEmits<{
 
 const progressTimer = ref<number | null>(null)
 const currentTime = ref(Date.now())
+const isReadOnly = computed(() => props.isReadOnly === true)
 
 const getProviderName = (providerId?: string | number | boolean | object[]) => {
   if (!providerId || typeof providerId !== 'string') return 'Unknown Provider'
diff --git a/src/renderer/src/components/message/MessageBlockToolCall.vue b/src/renderer/src/components/message/MessageBlockToolCall.vue
index a05a28ce2..c9c86c388 100644
--- a/src/renderer/src/components/message/MessageBlockToolCall.vue
+++ b/src/renderer/src/components/message/MessageBlockToolCall.vue
@@ -52,7 +52,43 @@
         data-testid="tool-call-details"
         class="rounded-lg border bg-muted text-card-foreground px-2 py-3 mt-2 mb-4 w-full"
       >
-        <div class="flex flex-col gap-4">
+        <div v-if="isSubagentOrchestrator" class="flex flex-col gap-1.5">
+          <button
+            v-for="task in subagentTasks"
+            :key="task.normalizedId"
+            data-testid="subagent-task-trigger"
+            type="button"
+            :disabled="!task.sessionId"
+            :class="[
+              'tool-call-pill inline-flex w-full min-h-7 border rounded-lg items-center gap-2 px-2 py-1.5 text-xs leading-4 transition-colors duration-150 overflow-hidden',
+              task.sessionId
+                ? 'cursor-pointer bg-background hover:bg-accent/60'
+                : 'cursor-default bg-background/80 opacity-70'
+            ]"
+            @click.stop="handleSubagentSessionOpen(task)"
+          >
+            <span
+              :class="getSubagentStatusClass(task.status)"
+              class="shrink-0 rounded-full px-2 py-0.5 text-[10px] font-medium"
+            >
+              {{ getSubagentStatusLabel(task.status) }}
+            </span>
+            <span class="shrink-0 font-semibold text-foreground">
+              {{ task.targetAgentName }}
+            </span>
+            <span class="text-muted-foreground">·</span>
+            <span class="min-w-0 flex-1 truncate text-muted-foreground">
+              {{ task.title || task.label }}
+            </span>
+            <Icon
+              v-if="task.sessionId"
+              icon="lucide:chevron-right"
+              class="h-3.5 w-3.5 shrink-0 text-muted-foreground"
+            />
+          </button>
+        </div>
+
+        <div v-else class="flex flex-col gap-4">
           <div
             v-if="expandedToolTitle"
             data-testid="tool-call-expanded-title"
@@ -147,12 +183,14 @@ import { useI18n } from 'vue-i18n'
 import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
 import { CodeBlockNode } from 'markstream-vue'
 import { useThemeStore } from '@/stores/theme'
+import { useSessionStore } from '@/stores/ui/session'
 import { getLanguageFromFilename } from '@shared/utils/codeLanguage'
 import type { DisplayAssistantMessageBlock } from '@/components/chat/messageListItems'
 
 const { t } = useI18n()
 
 const themeStore = useThemeStore()
+const sessionStore = useSessionStore()
 
 const props = defineProps<{
   block: DisplayAssistantMessageBlock
@@ -279,11 +317,65 @@ const parsedParamsRecord = computed(() =>
 )
 
 const rawToolName = computed(() => props.block.tool_call?.name?.trim().toLowerCase() ?? '')
+const isSubagentOrchestrator = computed(() => rawToolName.value === 'subagent_orchestrator')
+
+type SubagentProgressTask = {
+  normalizedId: string
+  taskId: string
+  title: string
+  label: string
+  slotId: string
+  sessionId?: string | null
+  targetAgentId?: string | null
+  targetAgentName: string
+  status: string
+  previewMarkdown?: string
+  updatedAt?: number
+  resultSummary?: string
+}
+
+type RawSubagentProgressTask = Partial<SubagentProgressTask> & {
+  displayName?: string
+}
+
+type SubagentProgressPayload = {
+  runId: string
+  mode: 'parallel' | 'chain'
+  tasks: RawSubagentProgressTask[]
+}
+
+const parseSubagentProgress = (value: unknown): SubagentProgressPayload | null => {
+  if (typeof value !== 'string' || !value.trim()) {
+    return null
+  }
+
+  try {
+    const parsed = JSON.parse(value) as SubagentProgressPayload
+    return Array.isArray(parsed?.tasks) ? parsed : null
+  } catch {
+    return null
+  }
+}
 
 const matchesToolContractName = (toolName: string, expectedName: string): boolean =>
   toolName === expectedName || toolName.endsWith(`_${expectedName}`)
 
+const normalizeOptionalText = (value: unknown): string =>
+  typeof value === 'string' ? value.trim() : ''
+
 const summaryText = computed(() => {
+  if (isSubagentOrchestrator.value) {
+    const progress =
+      parseSubagentProgress(props.block.extra?.subagentProgress) ??
+      parseSubagentProgress(props.block.extra?.subagentFinal)
+    if (progress) {
+      return t('chat.toolCall.subagents.summary', {
+        mode: getSubagentModeLabel(progress.mode),
+        count: progress.tasks.length
+      })
+    }
+  }
+
   const raw = paramsText.value.trim()
   if (!raw) return ''
   if (!parsedParams.value.isJson) {
@@ -292,6 +384,38 @@ const summaryText = computed(() => {
   return formatSummaryValue(extractFirstSummaryValue(parsedParams.value.value))
 })
 
+const subagentTasks = computed<SubagentProgressTask[]>(() => {
+  const progress =
+    parseSubagentProgress(props.block.extra?.subagentProgress) ??
+    parseSubagentProgress(props.block.extra?.subagentFinal)
+  const unnamedAgentLabel = t('settings.deepchatAgents.unnamed')
+  const unnamedTaskLabel = t('chat.toolCall.subagents.unnamedTask')
+
+  return (progress?.tasks ?? []).map((task, index) => {
+    const slotId = normalizeOptionalText(task.slotId)
+    const displayName = normalizeOptionalText(task.displayName)
+    const normalizedId =
+      normalizeOptionalText(task.taskId) || slotId || `subagent-task-${index + 1}`
+    const label = displayName || slotId || unnamedTaskLabel
+    const title = normalizeOptionalText(task.title)
+
+    return {
+      ...task,
+      normalizedId,
+      taskId: normalizedId,
+      title,
+      label,
+      slotId: slotId || normalizedId,
+      sessionId: typeof task.sessionId === 'string' ? task.sessionId : (task.sessionId ?? null),
+      targetAgentId:
+        typeof task.targetAgentId === 'string' ? task.targetAgentId : (task.targetAgentId ?? null),
+      targetAgentName:
+        normalizeOptionalText(task.targetAgentName) || displayName || unnamedAgentLabel,
+      status: normalizeOptionalText(task.status) || 'running'
+    }
+  })
+})
+
 const updateSummaryOverflow = () => {
   const element = summaryElement.value
   if (!element || !summaryText.value) {
@@ -310,6 +434,9 @@ const isExecTool = computed(() => {
 const isProcessTool = computed(() => matchesToolContractName(rawToolName.value, 'process'))
 
 const shouldAutoExpand = computed(() => {
+  if (isSubagentOrchestrator.value) {
+    return props.block.status === 'loading'
+  }
   if (props.block.status !== 'loading') return false
   if (isProcessTool.value) return true
   if (!isExecTool.value || !parsedParamsRecord.value) return false
@@ -551,6 +678,59 @@ const copyResponse = async () => {
     console.error('[MessageBlockToolCall] Failed to copy response:', error)
   }
 }
+
+const getSubagentStatusClass = (status: string): string => {
+  if (status === 'completed') {
+    return 'bg-emerald-500/10 text-emerald-600'
+  }
+  if (status === 'error' || status === 'cancelled') {
+    return 'bg-destructive/10 text-destructive'
+  }
+  if (status.startsWith('waiting')) {
+    return 'bg-amber-500/10 text-amber-600'
+  }
+  return 'bg-muted text-muted-foreground'
+}
+
+const handleSubagentSessionOpen = (task: SubagentProgressTask) => {
+  if (!task.sessionId) {
+    return
+  }
+
+  void sessionStore.selectSession(task.sessionId)
+}
+
+function getSubagentModeLabel(mode: string): string {
+  switch (mode) {
+    case 'parallel':
+      return t('chat.toolCall.subagents.mode.parallel')
+    case 'chain':
+      return t('chat.toolCall.subagents.mode.chain')
+    default:
+      return mode
+  }
+}
+
+function getSubagentStatusLabel(status: string): string {
+  switch (status) {
+    case 'completed':
+      return t('chat.toolCall.subagents.status.completed')
+    case 'error':
+      return t('chat.toolCall.subagents.status.error')
+    case 'cancelled':
+      return t('chat.toolCall.subagents.status.cancelled')
+    case 'waiting_permission':
+      return t('chat.toolCall.subagents.status.waiting_permission')
+    case 'waiting_question':
+      return t('chat.toolCall.subagents.status.waiting_question')
+    case 'running':
+      return t('chat.toolCall.subagents.status.running')
+    case 'queued':
+      return t('chat.toolCall.subagents.status.queued')
+    default:
+      return status
+  }
+}
 </script>
 
 <style scoped>
diff --git a/src/renderer/src/components/message/MessageItemAssistant.vue b/src/renderer/src/components/message/MessageItemAssistant.vue
index 34f1494e0..cf428bbeb 100644
--- a/src/renderer/src/components/message/MessageItemAssistant.vue
+++ b/src/renderer/src/components/message/MessageItemAssistant.vue
@@ -66,6 +66,7 @@
                 :message-id="currentMessage.id"
                 :conversation-id="currentThreadId"
                 :block="block"
+                :is-read-only="isReadOnly"
                 @continue="handleBlockContinue"
                 @switch-provider="handleBlockSwitchProvider"
               />
@@ -93,6 +94,7 @@
             :is-in-generating-thread="resolvedIsInGeneratingThread"
             :is-capturing-image="isCapturingImage"
             :show-trace="showTrace"
+            :is-read-only="isReadOnly"
             @retry="handleAction('retry')"
             @delete="handleAction('delete')"
             @copy="handleAction('copy')"
@@ -115,7 +117,7 @@
         <ContextMenuItem @select="handleSelectionTranslate">
           {{ t('contextMenu.translate.title') }}
         </ContextMenuItem>
-        <ContextMenuItem @select="handleSelectionAskAI">
+        <ContextMenuItem v-if="!isReadOnly" @select="handleSelectionAskAI">
           {{ t('contextMenu.askAI.title') }}
         </ContextMenuItem>
       </template>
@@ -123,17 +125,18 @@
         <ContextMenuItem @select="handleAction('copy')">
           {{ t('thread.toolbar.copy') }}
         </ContextMenuItem>
-        <ContextMenuItem @select="handleAction('retry')">
+        <ContextMenuItem v-if="!isReadOnly" @select="handleAction('retry')">
           {{ t('thread.toolbar.retry') }}
         </ContextMenuItem>
         <ContextMenuItem
+          v-if="!isReadOnly"
           :disabled="message.status === 'pending' || resolvedIsInGeneratingThread"
           @select="handleAction('fork')"
         >
           {{ t('thread.toolbar.fork') }}
         </ContextMenuItem>
-        <ContextMenuSeparator />
-        <ContextMenuItem @select="handleAction('delete')">
+        <ContextMenuSeparator v-if="!isReadOnly" />
+        <ContextMenuItem v-if="!isReadOnly" @select="handleAction('delete')">
           {{ t('thread.toolbar.delete') }}
         </ContextMenuItem>
       </template>
@@ -206,6 +209,7 @@ const props = defineProps<{
   useLegacyActions?: boolean
   isInGeneratingThread?: boolean
   showTrace?: boolean
+  isReadOnly?: boolean
 }>()
 
 const themeStore = useThemeStore()
@@ -250,6 +254,7 @@ const currentThreadId = computed(() => props.message.conversationId || '')
 const useLegacyActions = computed(() => props.useLegacyActions !== false)
 const resolvedIsInGeneratingThread = computed(() => props.isInGeneratingThread ?? false)
 const showTrace = computed(() => props.showTrace ?? false)
+const isReadOnly = computed(() => props.isReadOnly === true)
 const rootRef = ref<HTMLElement | null>(null)
 const showSelectionMenu = ref(false)
 const lastSelectionText = ref('')
@@ -439,6 +444,10 @@ const handleSelectionTranslate = () => {
 }
 
 const handleSelectionAskAI = () => {
+  if (isReadOnly.value) {
+    return
+  }
+
   const text = resolveSelectionText()
   if (!text) {
     return
@@ -447,14 +456,24 @@ const handleSelectionAskAI = () => {
 }
 
 const handleBlockContinue = (conversationId: string, messageId: string) => {
+  if (isReadOnly.value) {
+    return
+  }
   emit('continue', conversationId, messageId)
 }
 
 const handleBlockSwitchProvider = () => {
+  if (isReadOnly.value) {
+    return
+  }
   emit('switchProvider')
 }
 
 const handleAction = (action: HandleActionType) => {
+  if (isReadOnly.value && (action === 'retry' || action === 'delete' || action === 'fork')) {
+    return
+  }
+
   if (action === 'retry') {
     emit('retry', currentMessage.value.id)
   } else if (action === 'delete') {
diff --git a/src/renderer/src/components/message/MessageItemUser.vue b/src/renderer/src/components/message/MessageItemUser.vue
index f564eed7e..8154a54e5 100644
--- a/src/renderer/src/components/message/MessageItemUser.vue
+++ b/src/renderer/src/components/message/MessageItemUser.vue
@@ -77,6 +77,7 @@
         :is-assistant="false"
         :is-edit-mode="isEditMode"
         :is-capturing-image="false"
+        :is-read-only="isReadOnly"
         @retry="onRetryAction"
         @delete="handleAction('delete')"
         @copy="handleAction('copy')"
@@ -106,6 +107,7 @@ const windowPresenter = usePresenter('windowPresenter')
 
 const props = defineProps<{
   message: DisplayUserMessage
+  isReadOnly?: boolean
 }>()
 
 const isEditMode = ref(false)
@@ -148,6 +150,10 @@ const previewFile = (filePath: string) => {
 }
 
 const startEdit = () => {
+  if (props.isReadOnly) {
+    return
+  }
+
   isEditMode.value = true
   if (props.message.content?.content && props.message.content.content.length > 0) {
     const textBlocks = props.message.content.content.filter((block) => block.type === 'text')
@@ -160,6 +166,10 @@ const startEdit = () => {
 }
 
 const saveEdit = async () => {
+  if (props.isReadOnly) {
+    return
+  }
+
   const nextText = editedText.value.trim()
   if (!nextText) return
 
@@ -177,6 +187,9 @@ const saveEdit = async () => {
 }
 
 const onRetryAction = () => {
+  if (props.isReadOnly) {
+    return
+  }
   emit('retry', props.message.id)
 }
 
@@ -201,6 +214,9 @@ const cancelEdit = () => {
 
 const handleAction = (action: 'delete' | 'copy') => {
   if (action === 'delete') {
+    if (props.isReadOnly) {
+      return
+    }
     emit('delete', props.message.id)
   } else if (action === 'copy') {
     window.api.copyText(getCopyText())
diff --git a/src/renderer/src/components/message/MessageToolbar.vue b/src/renderer/src/components/message/MessageToolbar.vue
index 38d27120c..1d18bcc54 100644
--- a/src/renderer/src/components/message/MessageToolbar.vue
+++ b/src/renderer/src/components/message/MessageToolbar.vue
@@ -38,10 +38,9 @@
 
           <!-- Normal mode buttons -->
           <template v-else>
-            <Tooltip :delayDuration="200">
+            <Tooltip v-if="!isAssistant && !isEditMode && !isReadOnly" :delayDuration="200">
               <TooltipTrigger as-child>
                 <Button
-                  v-show="!isAssistant && !isEditMode"
                   variant="ghost"
                   size="icon"
                   class="w-4 h-4 text-muted-foreground hover:text-primary hover:bg-transparent"
@@ -140,10 +139,9 @@
                 }}
               </TooltipContent>
             </Tooltip>
-            <Tooltip>
+            <Tooltip v-if="isAssistant && !isReadOnly">
               <TooltipTrigger as-child>
                 <Button
-                  v-show="isAssistant"
                   variant="ghost"
                   size="icon"
                   class="w-4 h-4 text-muted-foreground hover:text-primary hover:bg-transparent"
@@ -167,10 +165,9 @@
               </TooltipTrigger>
               <TooltipContent>{{ t('thread.toolbar.trace') }}</TooltipContent>
             </Tooltip>
-            <Tooltip>
+            <Tooltip v-if="isAssistant && !loading && !isInGeneratingThread && !isReadOnly">
               <TooltipTrigger as-child>
                 <Button
-                  v-show="isAssistant && !loading && !isInGeneratingThread"
                   variant="ghost"
                   size="icon"
                   class="w-4 h-4 text-muted-foreground hover:text-primary hover:bg-transparent"
@@ -181,10 +178,9 @@
               </TooltipTrigger>
               <TooltipContent>{{ t('thread.toolbar.fork') }}</TooltipContent>
             </Tooltip>
-            <Tooltip>
+            <Tooltip v-if="!isAssistant && !isEditMode && !isReadOnly">
               <TooltipTrigger as-child>
                 <Button
-                  v-show="!isAssistant && !isEditMode"
                   variant="ghost"
                   size="icon"
                   class="w-4 h-4 text-muted-foreground hover:text-primary hover:bg-transparent"
@@ -195,7 +191,7 @@
               </TooltipTrigger>
               <TooltipContent>{{ t('thread.toolbar.edit') }}</TooltipContent>
             </Tooltip>
-            <Tooltip>
+            <Tooltip v-if="!isReadOnly">
               <TooltipTrigger as-child>
                 <Button
                   variant="ghost"
@@ -309,6 +305,7 @@ const props = defineProps<{
   isInGeneratingThread?: boolean
   isCapturingImage: boolean
   showTrace?: boolean
+  isReadOnly?: boolean
 }>()
 const emit = defineEmits<{
   (e: 'retry'): void
@@ -328,6 +325,7 @@ const emit = defineEmits<{
 const hasTokensPerSecond = computed(() => props.usage.tokens_per_second > 0)
 const hasVariants = computed(() => (props.totalVariants || 0) > 1)
 const allowTrace = computed(() => props.showTrace ?? false)
+const isReadOnly = computed(() => props.isReadOnly === true)
 </script>
 
 <style scoped>
diff --git a/src/renderer/src/i18n/da-DK/chat.json b/src/renderer/src/i18n/da-DK/chat.json
index f6919666f..980577054 100644
--- a/src/renderer/src/i18n/da-DK/chat.json
+++ b/src/renderer/src/i18n/da-DK/chat.json
@@ -110,6 +110,23 @@
     "params": "parameter",
     "response": "Værktøjsrespons",
     "responseData": "Svardata",
+    "subagents": {
+      "summary": "{mode} · {count} underagenter",
+      "unnamedTask": "Unavngiven opgave",
+      "mode": {
+        "parallel": "Parallel",
+        "chain": "Kæde"
+      },
+      "status": {
+        "queued": "I kø",
+        "running": "Kører",
+        "completed": "Fuldført",
+        "error": "Fejl",
+        "cancelled": "Annulleret",
+        "waiting_permission": "Afventer tilladelse",
+        "waiting_question": "Afventer input"
+      }
+    },
     "title": "Værktøjsopkald"
   },
   "mode": {
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "Del",
-    "more": "Mere"
+    "more": "Mere",
+    "backToParent": "Tilbage til forælder"
   },
   "advancedSettings": {
     "button": "Avanceret",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "Filer",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "Underagenter"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "truncated": "[afkortet]"
       }
     },
-    "title": "arbejdsrum"
+    "title": "arbejdsrum",
+    "subagents": {
+      "empty": "Ingen undersessioner endnu",
+      "self": "Denne agent",
+      "status": {
+        "working": "Kører",
+        "error": "Fejl",
+        "idle": "Inaktiv"
+      }
+    }
   },
   "modelPicker": {
     "empty": "Ingen modeller fundet"
@@ -275,5 +303,8 @@
       "done": "Færdig",
       "error": "Fejl"
     }
+  },
+  "subagents": {
+    "label": "Underagenter"
   }
 }
diff --git a/src/renderer/src/i18n/da-DK/common.json b/src/renderer/src/i18n/da-DK/common.json
index 7795af12c..dae93a5f9 100644
--- a/src/renderer/src/i18n/da-DK/common.json
+++ b/src/renderer/src/i18n/da-DK/common.json
@@ -3,6 +3,7 @@
   "cancel": "Annuller",
   "clear": "ryd op",
   "close": "lukke",
+  "open": "Åbn",
   "next": "Næste",
   "back": "Tilbage",
   "collapse": "Skjul",
diff --git a/src/renderer/src/i18n/da-DK/settings.json b/src/renderer/src/i18n/da-DK/settings.json
index 461cc724b..27d2c0b64 100644
--- a/src/renderer/src/i18n/da-DK/settings.json
+++ b/src/renderer/src/i18n/da-DK/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "Disse standarder påvirker kun fremtidige DeepChat-sessioner.",
     "compactionThreshold": "Udløsningstærskel",
     "compactionRetainPairs": "Behold seneste par",
-    "deleteConfirm": "Slet agenten \"{name}\"? Dens historik falder tilbage til den indbyggede DeepChat-agent."
+    "deleteConfirm": "Slet agenten \"{name}\"? Dens historik falder tilbage til den indbyggede DeepChat-agent.",
+    "subagentsTitle": "Underagenter",
+    "subagentsDescription": "Konfigurer de genanvendelige slots til undersessioner, som `subagent_orchestrator` stiller til rådighed.",
+    "subagentsEnabled": "Aktivér underagenter",
+    "subagentTargetType": "Måltype",
+    "subagentTargetSelf": "Denne agent",
+    "subagentTargetAgent": "Agent",
+    "subagentDisplayName": "Visningsnavn",
+    "subagentDescription": "Slotbeskrivelse",
+    "subagentTargetAgentLabel": "Målagent",
+    "subagentLimit": "{count}/{max} pladser",
+    "addSubagentSlot": "+ Tilføj slot"
   }
 }
diff --git a/src/renderer/src/i18n/en-US/chat.json b/src/renderer/src/i18n/en-US/chat.json
index 14ba9737b..a937afd6d 100644
--- a/src/renderer/src/i18n/en-US/chat.json
+++ b/src/renderer/src/i18n/en-US/chat.json
@@ -114,7 +114,24 @@
     "clickToView": "Click to view details",
     "functionName": "Function",
     "params": "Parameters",
-    "responseData": "Response data"
+    "responseData": "Response data",
+    "subagents": {
+      "summary": "{mode} · {count} subagents",
+      "unnamedTask": "Unnamed task",
+      "mode": {
+        "parallel": "Parallel",
+        "chain": "Chain"
+      },
+      "status": {
+        "queued": "Queued",
+        "running": "Running",
+        "completed": "Completed",
+        "error": "Error",
+        "cancelled": "Cancelled",
+        "waiting_permission": "Waiting for permission",
+        "waiting_question": "Waiting for input"
+      }
+    }
   },
   "mode": {
     "current": "Current mode: {mode}",
@@ -122,9 +139,13 @@
     "acpAgent": "ACP Agent"
   },
   "topbar": {
+    "backToParent": "Back to Parent",
     "share": "Share",
     "more": "More"
   },
+  "subagents": {
+    "label": "Subagents"
+  },
   "advancedSettings": {
     "button": "Advanced",
     "title": "Advanced Settings",
@@ -182,7 +203,8 @@
     "sections": {
       "files": "Files",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "Subagents"
     },
     "plan": {
       "section": "Plan",
@@ -211,6 +233,15 @@
       "staged": "Staged",
       "unstaged": "Unstaged"
     },
+    "subagents": {
+      "empty": "No child sessions yet",
+      "self": "Self",
+      "status": {
+        "working": "Running",
+        "error": "Error",
+        "idle": "Idle"
+      }
+    },
     "browser": {
       "section": "Browser",
       "empty": "No tabs yet"
diff --git a/src/renderer/src/i18n/en-US/common.json b/src/renderer/src/i18n/en-US/common.json
index ed1612745..073c538cc 100644
--- a/src/renderer/src/i18n/en-US/common.json
+++ b/src/renderer/src/i18n/en-US/common.json
@@ -18,6 +18,7 @@
   "cancel": "Cancel",
   "confirm": "Confirm",
   "close": "Close",
+  "open": "Open",
   "next": "Next",
   "back": "Back",
   "error": {
diff --git a/src/renderer/src/i18n/en-US/settings.json b/src/renderer/src/i18n/en-US/settings.json
index 2be77d8bd..fc0f76266 100644
--- a/src/renderer/src/i18n/en-US/settings.json
+++ b/src/renderer/src/i18n/en-US/settings.json
@@ -119,6 +119,17 @@
     "permissionMode": "Default permission",
     "permissionFullAccess": "Full access",
     "permissionDefault": "Default permission",
+    "subagentsTitle": "Subagents",
+    "subagentsDescription": "Configure the reusable child-session slots exposed to subagent_orchestrator.",
+    "subagentsEnabled": "Enable subagents",
+    "subagentTargetType": "Target type",
+    "subagentTargetSelf": "Self",
+    "subagentTargetAgent": "Agent",
+    "subagentDisplayName": "Display name",
+    "subagentDescription": "Slot description",
+    "subagentTargetAgentLabel": "Target agent",
+    "subagentLimit": "{count}/{max} slots",
+    "addSubagentSlot": "+ Add Slot",
     "toolsTitle": "Built-in Tools",
     "compactionTitle": "Auto Compaction",
     "compactionEnabled": "Enable auto compaction",
diff --git a/src/renderer/src/i18n/fa-IR/chat.json b/src/renderer/src/i18n/fa-IR/chat.json
index 94f2d4914..d07ed5450 100644
--- a/src/renderer/src/i18n/fa-IR/chat.json
+++ b/src/renderer/src/i18n/fa-IR/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "برای مشاهده جزئیات کلیک کنید",
     "functionName": "نام تابع",
     "params": "پارامترها",
-    "responseData": "داده‌های پاسخ"
+    "responseData": "داده‌های پاسخ",
+    "subagents": {
+      "summary": "{mode} · {count} زیرایجنت",
+      "unnamedTask": "وظیفه بی‌نام",
+      "mode": {
+        "parallel": "موازی",
+        "chain": "زنجیره‌ای"
+      },
+      "status": {
+        "queued": "در صف",
+        "running": "در حال اجرا",
+        "completed": "تکمیل‌شده",
+        "error": "خطا",
+        "cancelled": "لغوشده",
+        "waiting_permission": "در انتظار مجوز",
+        "waiting_question": "در انتظار ورودی"
+      }
+    }
   },
   "mode": {
     "acpAgent": "نماینده ACP",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "اشتراک‌گذاری",
-    "more": "بیشتر"
+    "more": "بیشتر",
+    "backToParent": "بازگشت به نشست والد"
   },
   "advancedSettings": {
     "button": "پیشرفته",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "فایل‌ها",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "زیرایجنت‌ها"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
       },
       "noOutput": "بدون خروجی"
     },
-    "title": "فضای کار"
+    "title": "فضای کار",
+    "subagents": {
+      "empty": "هنوز هیچ نشست فرزندی وجود ندارد",
+      "self": "همین ایجنت",
+      "status": {
+        "working": "در حال اجرا",
+        "error": "خطا",
+        "idle": "بیکار"
+      }
+    }
   },
   "modelPicker": {
     "empty": "هیچ مدلی پیدا نشد"
@@ -275,5 +303,8 @@
       "done": "انجام شد",
       "error": "خطا"
     }
+  },
+  "subagents": {
+    "label": "زیرایجنت‌ها"
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/common.json b/src/renderer/src/i18n/fa-IR/common.json
index d76dc7016..45a0debfd 100644
--- a/src/renderer/src/i18n/fa-IR/common.json
+++ b/src/renderer/src/i18n/fa-IR/common.json
@@ -18,6 +18,7 @@
   "cancel": "رد کردن",
   "confirm": "پذیرفتن",
   "close": "بستن",
+  "open": "باز کردن",
   "next": "بعدی",
   "back": "قبلی",
   "error": {
diff --git a/src/renderer/src/i18n/fa-IR/settings.json b/src/renderer/src/i18n/fa-IR/settings.json
index b6170fb02..eafd4cde8 100644
--- a/src/renderer/src/i18n/fa-IR/settings.json
+++ b/src/renderer/src/i18n/fa-IR/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "این پیش‌فرض‌ها فقط بر نشست‌های جدید DeepChat اثر می‌گذارند.",
     "compactionThreshold": "آستانه فعال‌سازی",
     "compactionRetainPairs": "نگه‌داری جفت‌های اخیر",
-    "deleteConfirm": "ایجنت «{name}» حذف شود؟ تاریخچه آن به ایجنت داخلی DeepChat برمی‌گردد."
+    "deleteConfirm": "ایجنت «{name}» حذف شود؟ تاریخچه آن به ایجنت داخلی DeepChat برمی‌گردد.",
+    "subagentsTitle": "زیرایجنت‌ها",
+    "subagentsDescription": "اسلات‌های قابل‌استفاده‌مجددِ نشست فرزند را که `subagent_orchestrator` در اختیار می‌گذارد پیکربندی کنید.",
+    "subagentsEnabled": "فعال‌کردن زیرایجنت‌ها",
+    "subagentTargetType": "نوع مقصد",
+    "subagentTargetSelf": "همین ایجنت",
+    "subagentTargetAgent": "ایجنت",
+    "subagentDisplayName": "نام نمایشی",
+    "subagentDescription": "توضیح اسلات",
+    "subagentTargetAgentLabel": "ایجنت مقصد",
+    "subagentLimit": "{count}/{max} اسلات",
+    "addSubagentSlot": "+ افزودن اسلات"
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/chat.json b/src/renderer/src/i18n/fr-FR/chat.json
index aa33493e0..556902b70 100644
--- a/src/renderer/src/i18n/fr-FR/chat.json
+++ b/src/renderer/src/i18n/fr-FR/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "Cliquer pour voir les détails",
     "functionName": "Nom de la fonction",
     "params": "Paramètres",
-    "responseData": "Données de réponse"
+    "responseData": "Données de réponse",
+    "subagents": {
+      "summary": "{mode} · {count} sous-agents",
+      "unnamedTask": "Tâche sans nom",
+      "mode": {
+        "parallel": "Parallèle",
+        "chain": "En chaîne"
+      },
+      "status": {
+        "queued": "En attente",
+        "running": "En cours",
+        "completed": "Terminé",
+        "error": "Erreur",
+        "cancelled": "Annulé",
+        "waiting_permission": "En attente d'autorisation",
+        "waiting_question": "En attente d'entrée"
+      }
+    }
   },
   "mode": {
     "acpAgent": "Agent ACP",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "Partager",
-    "more": "Plus"
+    "more": "Plus",
+    "backToParent": "Retour à la session parente"
   },
   "advancedSettings": {
     "button": "Avancé",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "Fichiers",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "Sous-agents"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "truncated": "[Tronqué]"
       }
     },
-    "title": "espace de travail"
+    "title": "espace de travail",
+    "subagents": {
+      "empty": "Aucune session enfant pour le moment",
+      "self": "Cet agent",
+      "status": {
+        "working": "En cours",
+        "error": "Erreur",
+        "idle": "Inactif"
+      }
+    }
   },
   "modelPicker": {
     "empty": "Aucun modèle trouvé"
@@ -275,5 +303,8 @@
       "done": "Terminée",
       "error": "Erreur"
     }
+  },
+  "subagents": {
+    "label": "Sous-agents"
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/common.json b/src/renderer/src/i18n/fr-FR/common.json
index 223afb0e9..e85849f17 100644
--- a/src/renderer/src/i18n/fr-FR/common.json
+++ b/src/renderer/src/i18n/fr-FR/common.json
@@ -18,6 +18,7 @@
   "cancel": "Annuler",
   "confirm": "Confirmer",
   "close": "Fermer",
+  "open": "Ouvrir",
   "next": "Suivant",
   "back": "Retour",
   "error": {
diff --git a/src/renderer/src/i18n/fr-FR/settings.json b/src/renderer/src/i18n/fr-FR/settings.json
index 8b940d191..27c6b923f 100644
--- a/src/renderer/src/i18n/fr-FR/settings.json
+++ b/src/renderer/src/i18n/fr-FR/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "Ces valeurs ne s'appliquent qu'aux futures sessions DeepChat.",
     "compactionThreshold": "Seuil de déclenchement",
     "compactionRetainPairs": "Conserver les dernières paires",
-    "deleteConfirm": "Supprimer l'agent « {name} » ? Son historique sera rattaché à l'agent DeepChat intégré."
+    "deleteConfirm": "Supprimer l'agent « {name} » ? Son historique sera rattaché à l'agent DeepChat intégré.",
+    "subagentsTitle": "Sous-agents",
+    "subagentsDescription": "Configurez les emplacements de sessions enfants réutilisables exposés par `subagent_orchestrator`.",
+    "subagentsEnabled": "Activer les sous-agents",
+    "subagentTargetType": "Type de cible",
+    "subagentTargetSelf": "Cet agent",
+    "subagentTargetAgent": "Agent",
+    "subagentDisplayName": "Nom d'affichage",
+    "subagentDescription": "Description de l'emplacement",
+    "subagentTargetAgentLabel": "Agent cible",
+    "subagentLimit": "{count}/{max} emplacements",
+    "addSubagentSlot": "+ Ajouter un emplacement"
   }
 }
diff --git a/src/renderer/src/i18n/he-IL/chat.json b/src/renderer/src/i18n/he-IL/chat.json
index 1fb8ae956..13a25d3b7 100644
--- a/src/renderer/src/i18n/he-IL/chat.json
+++ b/src/renderer/src/i18n/he-IL/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "לחץ לצפייה בפרטים",
     "functionName": "פונקציה",
     "params": "פרמטרים",
-    "responseData": "נתוני תגובה"
+    "responseData": "נתוני תגובה",
+    "subagents": {
+      "summary": "{mode} · {count} סוכני משנה",
+      "unnamedTask": "משימה ללא שם",
+      "mode": {
+        "parallel": "במקביל",
+        "chain": "בטור"
+      },
+      "status": {
+        "queued": "ממתין בתור",
+        "running": "פועל",
+        "completed": "הושלם",
+        "error": "שגיאה",
+        "cancelled": "בוטל",
+        "waiting_permission": "ממתין לאישור",
+        "waiting_question": "ממתין לקלט"
+      }
+    }
   },
   "mode": {
     "acpAgent": "סוכן ACP",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "שיתוף",
-    "more": "עוד"
+    "more": "עוד",
+    "backToParent": "חזרה לשיחת האב"
   },
   "advancedSettings": {
     "button": "מתקדם",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "קבצים",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "סוכני משנה"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "truncated": "[מקוצר]"
       }
     },
-    "title": "סביבת עבודה"
+    "title": "סביבת עבודה",
+    "subagents": {
+      "empty": "עדיין אין שיחות-בת",
+      "self": "הסוכן הזה",
+      "status": {
+        "working": "פועל",
+        "error": "שגיאה",
+        "idle": "לא פעיל"
+      }
+    }
   },
   "modelPicker": {
     "empty": "לא נמצאו מודלים"
@@ -275,5 +303,8 @@
       "done": "הושלם",
       "error": "שגיאה"
     }
+  },
+  "subagents": {
+    "label": "סוכני משנה"
   }
 }
diff --git a/src/renderer/src/i18n/he-IL/common.json b/src/renderer/src/i18n/he-IL/common.json
index 6f0916f1c..f02e2a147 100644
--- a/src/renderer/src/i18n/he-IL/common.json
+++ b/src/renderer/src/i18n/he-IL/common.json
@@ -18,6 +18,7 @@
   "cancel": "ביטול",
   "confirm": "אישור",
   "close": "סגור",
+  "open": "פתח",
   "next": "הבא",
   "back": "חזור",
   "error": {
diff --git a/src/renderer/src/i18n/he-IL/settings.json b/src/renderer/src/i18n/he-IL/settings.json
index 3ebc6f040..3162dbc39 100644
--- a/src/renderer/src/i18n/he-IL/settings.json
+++ b/src/renderer/src/i18n/he-IL/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "ברירות המחדל האלה משפיעות רק על שיחות DeepChat חדשות.",
     "compactionThreshold": "סף הפעלה",
     "compactionRetainPairs": "שמירת הזוגות האחרונים",
-    "deleteConfirm": "למחוק את הסוכן \"{name}\"? ההיסטוריה שלו תחזור לסוכן DeepChat המובנה."
+    "deleteConfirm": "למחוק את הסוכן \"{name}\"? ההיסטוריה שלו תחזור לסוכן DeepChat המובנה.",
+    "subagentsTitle": "סוכני משנה",
+    "subagentsDescription": "הגדירו את משבצות שיחות-הבת הניתנות לשימוש חוזר ש-`subagent_orchestrator` חושף.",
+    "subagentsEnabled": "הפעלת סוכני משנה",
+    "subagentTargetType": "סוג יעד",
+    "subagentTargetSelf": "הסוכן הזה",
+    "subagentTargetAgent": "סוכן",
+    "subagentDisplayName": "שם תצוגה",
+    "subagentDescription": "תיאור המשבצת",
+    "subagentTargetAgentLabel": "סוכן יעד",
+    "subagentLimit": "{count}/{max} משבצות",
+    "addSubagentSlot": "+ הוספת משבצת"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/chat.json b/src/renderer/src/i18n/ja-JP/chat.json
index e620cb36c..7a8504052 100644
--- a/src/renderer/src/i18n/ja-JP/chat.json
+++ b/src/renderer/src/i18n/ja-JP/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "詳細を表示",
     "functionName": "関数名",
     "params": "パラメータ",
-    "responseData": "レスポンスデータ"
+    "responseData": "レスポンスデータ",
+    "subagents": {
+      "summary": "{mode} · {count} 個のサブエージェント",
+      "unnamedTask": "名前未設定のタスク",
+      "mode": {
+        "parallel": "並列",
+        "chain": "直列"
+      },
+      "status": {
+        "queued": "待機中",
+        "running": "実行中",
+        "completed": "完了",
+        "error": "エラー",
+        "cancelled": "キャンセル済み",
+        "waiting_permission": "権限待ち",
+        "waiting_question": "入力待ち"
+      }
+    }
   },
   "mode": {
     "acpAgent": "ACPエージェント",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "共有",
-    "more": "その他"
+    "more": "その他",
+    "backToParent": "親セッションに戻る"
   },
   "advancedSettings": {
     "button": "詳細設定",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "ファイル",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "サブエージェント"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "aborted": "中止"
       }
     },
-    "title": "ワークスペース"
+    "title": "ワークスペース",
+    "subagents": {
+      "empty": "子セッションはまだありません",
+      "self": "このエージェント",
+      "status": {
+        "working": "実行中",
+        "error": "エラー",
+        "idle": "待機中"
+      }
+    }
   },
   "modelPicker": {
     "empty": "モデルが見つかりません"
@@ -275,5 +303,8 @@
       "done": "完了",
       "error": "エラー"
     }
+  },
+  "subagents": {
+    "label": "サブエージェント"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/common.json b/src/renderer/src/i18n/ja-JP/common.json
index 2a8d9e3cf..731e17701 100644
--- a/src/renderer/src/i18n/ja-JP/common.json
+++ b/src/renderer/src/i18n/ja-JP/common.json
@@ -18,6 +18,7 @@
   "cancel": "キャンセル",
   "confirm": "確認",
   "close": "閉じる",
+  "open": "開く",
   "next": "次へ",
   "back": "戻る",
   "error": {
diff --git a/src/renderer/src/i18n/ja-JP/settings.json b/src/renderer/src/i18n/ja-JP/settings.json
index 0001c21dc..9133bb0a8 100644
--- a/src/renderer/src/i18n/ja-JP/settings.json
+++ b/src/renderer/src/i18n/ja-JP/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "これらの既定値は、今後作成する DeepChat セッションにのみ適用されます。",
     "compactionThreshold": "発動しきい値",
     "compactionRetainPairs": "保持する直近ペア数",
-    "deleteConfirm": "エージェント「{name}」を削除しますか？ その履歴は内蔵 DeepChat エージェントに戻されます。"
+    "deleteConfirm": "エージェント「{name}」を削除しますか？ その履歴は内蔵 DeepChat エージェントに戻されます。",
+    "subagentsTitle": "サブエージェント",
+    "subagentsDescription": "`subagent_orchestrator` で使える再利用可能な子セッションスロットを設定します。",
+    "subagentsEnabled": "サブエージェントを有効にする",
+    "subagentTargetType": "対象タイプ",
+    "subagentTargetSelf": "このエージェント",
+    "subagentTargetAgent": "エージェント",
+    "subagentDisplayName": "表示名",
+    "subagentDescription": "スロットの説明",
+    "subagentTargetAgentLabel": "対象エージェント",
+    "subagentLimit": "{count}/{max} スロット",
+    "addSubagentSlot": "+ スロットを追加"
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/chat.json b/src/renderer/src/i18n/ko-KR/chat.json
index 8421213ba..4118f7edf 100644
--- a/src/renderer/src/i18n/ko-KR/chat.json
+++ b/src/renderer/src/i18n/ko-KR/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "자세히 보려면 클릭하세요",
     "functionName": "함수 이름",
     "params": "매개변수",
-    "responseData": "응답 데이터"
+    "responseData": "응답 데이터",
+    "subagents": {
+      "summary": "{mode} · 하위 에이전트 {count}개",
+      "unnamedTask": "이름 없는 작업",
+      "mode": {
+        "parallel": "병렬",
+        "chain": "순차"
+      },
+      "status": {
+        "queued": "대기열",
+        "running": "실행 중",
+        "completed": "완료됨",
+        "error": "오류",
+        "cancelled": "취소됨",
+        "waiting_permission": "권한 대기",
+        "waiting_question": "입력 대기"
+      }
+    }
   },
   "mode": {
     "acpAgent": "ACP 에이전트",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "공유",
-    "more": "더보기"
+    "more": "더보기",
+    "backToParent": "상위 세션으로 돌아가기"
   },
   "advancedSettings": {
     "button": "고급 설정",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "파일",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "하위 에이전트"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "truncated": "[잘림]"
       }
     },
-    "title": "작업 공간"
+    "title": "작업 공간",
+    "subagents": {
+      "empty": "아직 하위 세션이 없습니다",
+      "self": "현재 에이전트",
+      "status": {
+        "working": "실행 중",
+        "error": "오류",
+        "idle": "대기 중"
+      }
+    }
   },
   "modelPicker": {
     "empty": "모델을 찾을 수 없습니다"
@@ -275,5 +303,8 @@
       "done": "완료",
       "error": "오류"
     }
+  },
+  "subagents": {
+    "label": "하위 에이전트"
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/common.json b/src/renderer/src/i18n/ko-KR/common.json
index a9149ed03..6affb622a 100644
--- a/src/renderer/src/i18n/ko-KR/common.json
+++ b/src/renderer/src/i18n/ko-KR/common.json
@@ -21,6 +21,7 @@
   "disabled": "비활성화",
   "disclaimer": "면책 조항",
   "close": "닫기",
+  "open": "열기",
   "error": {
     "requestFailed": "요청 실패...",
     "createChatFailed": "채팅 생성 실패",
diff --git a/src/renderer/src/i18n/ko-KR/settings.json b/src/renderer/src/i18n/ko-KR/settings.json
index d62e42a09..ee863133e 100644
--- a/src/renderer/src/i18n/ko-KR/settings.json
+++ b/src/renderer/src/i18n/ko-KR/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "이 기본값은 앞으로 만드는 DeepChat 세션에만 적용됩니다.",
     "compactionThreshold": "트리거 임계값",
     "compactionRetainPairs": "최근 페어 유지",
-    "deleteConfirm": "에이전트 \"{name}\"을(를) 삭제할까요? 기록은 내장 DeepChat 에이전트로 이동합니다."
+    "deleteConfirm": "에이전트 \"{name}\"을(를) 삭제할까요? 기록은 내장 DeepChat 에이전트로 이동합니다.",
+    "subagentsTitle": "하위 에이전트",
+    "subagentsDescription": "`subagent_orchestrator` 에서 노출하는 재사용 가능한 하위 세션 슬롯을 설정합니다.",
+    "subagentsEnabled": "하위 에이전트 사용",
+    "subagentTargetType": "대상 유형",
+    "subagentTargetSelf": "현재 에이전트",
+    "subagentTargetAgent": "에이전트",
+    "subagentDisplayName": "표시 이름",
+    "subagentDescription": "슬롯 설명",
+    "subagentTargetAgentLabel": "대상 에이전트",
+    "subagentLimit": "{count}/{max}개 슬롯",
+    "addSubagentSlot": "+ 슬롯 추가"
   }
 }
diff --git a/src/renderer/src/i18n/pt-BR/chat.json b/src/renderer/src/i18n/pt-BR/chat.json
index 1fda723c2..ea044d30a 100644
--- a/src/renderer/src/i18n/pt-BR/chat.json
+++ b/src/renderer/src/i18n/pt-BR/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "Clique para ver detalhes",
     "functionName": "Nome da função",
     "params": "Parâmetros",
-    "responseData": "Dados de resposta"
+    "responseData": "Dados de resposta",
+    "subagents": {
+      "summary": "{mode} · {count} subagentes",
+      "unnamedTask": "Tarefa sem nome",
+      "mode": {
+        "parallel": "Paralelo",
+        "chain": "Sequencial"
+      },
+      "status": {
+        "queued": "Na fila",
+        "running": "Em execução",
+        "completed": "Concluído",
+        "error": "Erro",
+        "cancelled": "Cancelado",
+        "waiting_permission": "Aguardando permissão",
+        "waiting_question": "Aguardando entrada"
+      }
+    }
   },
   "mode": {
     "acpAgent": "Agente ACP",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "Compartilhar",
-    "more": "Mais"
+    "more": "Mais",
+    "backToParent": "Voltar para a sessão pai"
   },
   "advancedSettings": {
     "button": "Avançado",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "Arquivos",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "Subagentes"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
       },
       "noOutput": "Sem saída"
     },
-    "title": "área de trabalho"
+    "title": "área de trabalho",
+    "subagents": {
+      "empty": "Ainda não há sessões filhas",
+      "self": "Este agente",
+      "status": {
+        "working": "Em execução",
+        "error": "Erro",
+        "idle": "Inativo"
+      }
+    }
   },
   "modelPicker": {
     "empty": "Nenhum modelo encontrado"
@@ -275,5 +303,8 @@
       "done": "Concluído",
       "error": "Erro"
     }
+  },
+  "subagents": {
+    "label": "Subagentes"
   }
 }
diff --git a/src/renderer/src/i18n/pt-BR/common.json b/src/renderer/src/i18n/pt-BR/common.json
index 2024ebca9..45cbc4478 100644
--- a/src/renderer/src/i18n/pt-BR/common.json
+++ b/src/renderer/src/i18n/pt-BR/common.json
@@ -18,6 +18,7 @@
   "cancel": "Cancelar",
   "confirm": "Confirmar",
   "close": "Fechar",
+  "open": "Abrir",
   "next": "Próximo",
   "back": "Voltar",
   "error": {
diff --git a/src/renderer/src/i18n/pt-BR/settings.json b/src/renderer/src/i18n/pt-BR/settings.json
index ba5d5a32e..2c30b4cc2 100644
--- a/src/renderer/src/i18n/pt-BR/settings.json
+++ b/src/renderer/src/i18n/pt-BR/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "Esses padrões afetam apenas futuras sessões do DeepChat.",
     "compactionThreshold": "Limite de ativação",
     "compactionRetainPairs": "Manter pares recentes",
-    "deleteConfirm": "Excluir o agente \"{name}\"? O histórico dele voltará para o agente DeepChat integrado."
+    "deleteConfirm": "Excluir o agente \"{name}\"? O histórico dele voltará para o agente DeepChat integrado.",
+    "subagentsTitle": "Subagentes",
+    "subagentsDescription": "Configure os slots reutilizáveis de sessões filhas expostos pelo `subagent_orchestrator`.",
+    "subagentsEnabled": "Ativar subagentes",
+    "subagentTargetType": "Tipo de destino",
+    "subagentTargetSelf": "Este agente",
+    "subagentTargetAgent": "Agente",
+    "subagentDisplayName": "Nome de exibição",
+    "subagentDescription": "Descrição do slot",
+    "subagentTargetAgentLabel": "Agente de destino",
+    "subagentLimit": "{count}/{max} slots",
+    "addSubagentSlot": "+ Adicionar slot"
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/chat.json b/src/renderer/src/i18n/ru-RU/chat.json
index a537b7566..9a388f38d 100644
--- a/src/renderer/src/i18n/ru-RU/chat.json
+++ b/src/renderer/src/i18n/ru-RU/chat.json
@@ -110,7 +110,24 @@
     "clickToView": "Нажмите, чтобы посмотреть детали",
     "functionName": "Имя функции",
     "params": "Параметры",
-    "responseData": "Данные ответа"
+    "responseData": "Данные ответа",
+    "subagents": {
+      "summary": "{mode} · {count} субагентов",
+      "unnamedTask": "Безымянная задача",
+      "mode": {
+        "parallel": "Параллельно",
+        "chain": "Последовательно"
+      },
+      "status": {
+        "queued": "В очереди",
+        "running": "Выполняется",
+        "completed": "Завершено",
+        "error": "Ошибка",
+        "cancelled": "Отменено",
+        "waiting_permission": "Ожидает разрешения",
+        "waiting_question": "Ожидает ввода"
+      }
+    }
   },
   "mode": {
     "acpAgent": "Агент АШП",
@@ -119,7 +136,8 @@
   },
   "topbar": {
     "share": "Поделиться",
-    "more": "Ещё"
+    "more": "Ещё",
+    "backToParent": "Вернуться к родительской сессии"
   },
   "advancedSettings": {
     "button": "Расширенные",
@@ -152,7 +170,8 @@
     "sections": {
       "files": "Файлы",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Артефакты",
+      "subagents": "Субагенты"
     },
     "files": {
       "contextMenu": {
@@ -206,7 +225,16 @@
         "truncated": "[обрезано]"
       }
     },
-    "title": "рабочее пространство"
+    "title": "рабочее пространство",
+    "subagents": {
+      "empty": "Дочерних сессий пока нет",
+      "self": "Этот агент",
+      "status": {
+        "working": "Выполняется",
+        "error": "Ошибка",
+        "idle": "Неактивно"
+      }
+    }
   },
   "modelPicker": {
     "empty": "Модели не найдены"
@@ -275,5 +303,8 @@
       "done": "Готово",
       "error": "Ошибка"
     }
+  },
+  "subagents": {
+    "label": "Субагенты"
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/common.json b/src/renderer/src/i18n/ru-RU/common.json
index 86351b67b..c725bbf6a 100644
--- a/src/renderer/src/i18n/ru-RU/common.json
+++ b/src/renderer/src/i18n/ru-RU/common.json
@@ -14,6 +14,7 @@
   "cancel": "Отмена",
   "confirm": "Подтвердить",
   "close": "Закрыть",
+  "open": "Открыть",
   "next": "Далее",
   "back": "Назад",
   "error": {
diff --git a/src/renderer/src/i18n/ru-RU/settings.json b/src/renderer/src/i18n/ru-RU/settings.json
index 27b693fb7..b1692366f 100644
--- a/src/renderer/src/i18n/ru-RU/settings.json
+++ b/src/renderer/src/i18n/ru-RU/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "Эти значения влияют только на будущие сессии DeepChat.",
     "compactionThreshold": "Порог срабатывания",
     "compactionRetainPairs": "Сохранять последние пары",
-    "deleteConfirm": "Удалить агента «{name}»? Его история будет возвращена встроенному агенту DeepChat."
+    "deleteConfirm": "Удалить агента «{name}»? Его история будет возвращена встроенному агенту DeepChat.",
+    "subagentsTitle": "Субагенты",
+    "subagentsDescription": "Настройте переиспользуемые слоты дочерних сессий, доступные через `subagent_orchestrator`.",
+    "subagentsEnabled": "Включить субагентов",
+    "subagentTargetType": "Тип цели",
+    "subagentTargetSelf": "Этот агент",
+    "subagentTargetAgent": "Агент",
+    "subagentDisplayName": "Отображаемое имя",
+    "subagentDescription": "Описание слота",
+    "subagentTargetAgentLabel": "Целевой агент",
+    "subagentLimit": "{count}/{max} слотов",
+    "addSubagentSlot": "+ Добавить слот"
   }
 }
diff --git a/src/renderer/src/i18n/zh-CN/chat.json b/src/renderer/src/i18n/zh-CN/chat.json
index a43c7a2db..e835bc124 100644
--- a/src/renderer/src/i18n/zh-CN/chat.json
+++ b/src/renderer/src/i18n/zh-CN/chat.json
@@ -114,7 +114,24 @@
     "clickToView": "点击查看详情",
     "functionName": "函数名称",
     "params": "参数",
-    "responseData": "响应数据"
+    "responseData": "响应数据",
+    "subagents": {
+      "summary": "{mode} · {count} 个 subagent",
+      "unnamedTask": "未命名任务",
+      "mode": {
+        "parallel": "并行",
+        "chain": "串行"
+      },
+      "status": {
+        "queued": "排队中",
+        "running": "运行中",
+        "completed": "已完成",
+        "error": "错误",
+        "cancelled": "已取消",
+        "waiting_permission": "等待权限批准",
+        "waiting_question": "等待补充输入"
+      }
+    }
   },
   "mode": {
     "current": "当前模式：{mode}",
@@ -122,9 +139,13 @@
     "acpAgent": "ACP Agent"
   },
   "topbar": {
+    "backToParent": "返回父会话",
     "share": "分享",
     "more": "更多"
   },
+  "subagents": {
+    "label": "subagent"
+  },
   "advancedSettings": {
     "button": "高级配置",
     "title": "高级配置",
@@ -182,7 +203,8 @@
     "sections": {
       "files": "文件",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "subagent"
     },
     "plan": {
       "section": "计划",
@@ -211,6 +233,15 @@
       "staged": "已暂存",
       "unstaged": "未暂存"
     },
+    "subagents": {
+      "empty": "暂无 subagent 会话",
+      "self": "当前智能体",
+      "status": {
+        "working": "运行中",
+        "error": "错误",
+        "idle": "空闲"
+      }
+    },
     "browser": {
       "section": "浏览器",
       "empty": "暂无标签页"
diff --git a/src/renderer/src/i18n/zh-CN/common.json b/src/renderer/src/i18n/zh-CN/common.json
index f76e86b71..7bcf4437f 100644
--- a/src/renderer/src/i18n/zh-CN/common.json
+++ b/src/renderer/src/i18n/zh-CN/common.json
@@ -21,6 +21,7 @@
   "disabled": "已禁用",
   "disclaimer": "免责声明",
   "close": "关闭",
+  "open": "打开",
   "image": "图片",
   "error": {
     "requestFailed": "请求失败...",
diff --git a/src/renderer/src/i18n/zh-CN/settings.json b/src/renderer/src/i18n/zh-CN/settings.json
index de148e66a..d6fb802bc 100644
--- a/src/renderer/src/i18n/zh-CN/settings.json
+++ b/src/renderer/src/i18n/zh-CN/settings.json
@@ -119,6 +119,17 @@
     "permissionMode": "默认权限",
     "permissionFullAccess": "全部启用",
     "permissionDefault": "默认权限",
+    "subagentsTitle": "subagent",
+    "subagentsDescription": "配置 `subagent_orchestrator` 可复用的 subagent 会话槽位。",
+    "subagentsEnabled": "启用 subagent",
+    "subagentTargetType": "目标类型",
+    "subagentTargetSelf": "当前智能体",
+    "subagentTargetAgent": "指定智能体",
+    "subagentDisplayName": "显示名称",
+    "subagentDescription": "槽位描述",
+    "subagentTargetAgentLabel": "目标智能体",
+    "subagentLimit": "{count}/{max} 个槽位",
+    "addSubagentSlot": "+ 添加槽位",
     "toolsTitle": "内置工具",
     "compactionTitle": "自动压缩",
     "compactionEnabled": "启用自动压缩",
diff --git a/src/renderer/src/i18n/zh-HK/chat.json b/src/renderer/src/i18n/zh-HK/chat.json
index 4ab05793e..d2c1b6ee0 100644
--- a/src/renderer/src/i18n/zh-HK/chat.json
+++ b/src/renderer/src/i18n/zh-HK/chat.json
@@ -114,7 +114,24 @@
     "clickToView": "點擊查看詳情",
     "functionName": "函數名稱",
     "params": "參數",
-    "responseData": "回應數據"
+    "responseData": "回應數據",
+    "subagents": {
+      "summary": "{mode} · {count} 個 subagent",
+      "unnamedTask": "未命名任務",
+      "mode": {
+        "parallel": "並行",
+        "chain": "串行"
+      },
+      "status": {
+        "queued": "排隊中",
+        "running": "執行中",
+        "completed": "已完成",
+        "error": "錯誤",
+        "cancelled": "已取消",
+        "waiting_permission": "等待權限批准",
+        "waiting_question": "等待補充輸入"
+      }
+    }
   },
   "mode": {
     "acpAgent": "ACP Agent",
@@ -123,7 +140,8 @@
   },
   "topbar": {
     "share": "分享",
-    "more": "更多"
+    "more": "更多",
+    "backToParent": "返回父會話"
   },
   "advancedSettings": {
     "button": "進階設定",
@@ -156,7 +174,8 @@
     "sections": {
       "files": "文件",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "subagent"
     },
     "files": {
       "contextMenu": {
@@ -210,7 +229,16 @@
         "truncated": "[已截斷]"
       }
     },
-    "title": "工作區"
+    "title": "工作區",
+    "subagents": {
+      "empty": "暫無 subagent 會話",
+      "self": "目前智能體",
+      "status": {
+        "working": "執行中",
+        "error": "錯誤",
+        "idle": "閒置"
+      }
+    }
   },
   "modelPicker": {
     "empty": "未找到模型"
@@ -275,5 +303,8 @@
       "done": "已完成",
       "error": "錯誤"
     }
+  },
+  "subagents": {
+    "label": "subagent"
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/common.json b/src/renderer/src/i18n/zh-HK/common.json
index 8f7fb40b8..f99f9e224 100644
--- a/src/renderer/src/i18n/zh-HK/common.json
+++ b/src/renderer/src/i18n/zh-HK/common.json
@@ -17,6 +17,7 @@
   "cancel": "取消",
   "confirm": "確認",
   "close": "關閉",
+  "open": "打開",
   "next": "下一步",
   "back": "上一步",
   "error": {
diff --git a/src/renderer/src/i18n/zh-HK/settings.json b/src/renderer/src/i18n/zh-HK/settings.json
index 9435cbea6..179ba715d 100644
--- a/src/renderer/src/i18n/zh-HK/settings.json
+++ b/src/renderer/src/i18n/zh-HK/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "這些預設值只會影響之後新建立的 DeepChat 會話。",
     "compactionThreshold": "觸發門檻",
     "compactionRetainPairs": "保留最近訊息對",
-    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。"
+    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。",
+    "subagentsTitle": "子代理",
+    "subagentsDescription": "設定 `subagent_orchestrator` 可重用的 subagent 會話槽位。",
+    "subagentsEnabled": "啟用 subagent",
+    "subagentTargetType": "目標類型",
+    "subagentTargetSelf": "目前智能體",
+    "subagentTargetAgent": "指定智能體",
+    "subagentDisplayName": "顯示名稱",
+    "subagentDescription": "槽位描述",
+    "subagentTargetAgentLabel": "目標智能體",
+    "subagentLimit": "{count}/{max} 個槽位",
+    "addSubagentSlot": "+ 新增槽位"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/chat.json b/src/renderer/src/i18n/zh-TW/chat.json
index 86baadc85..02fe2083f 100644
--- a/src/renderer/src/i18n/zh-TW/chat.json
+++ b/src/renderer/src/i18n/zh-TW/chat.json
@@ -114,7 +114,24 @@
     "clickToView": "點擊查看詳情",
     "functionName": "函式名稱",
     "params": "參數",
-    "responseData": "回應資料"
+    "responseData": "回應資料",
+    "subagents": {
+      "summary": "{mode} · {count} 個 subagent",
+      "unnamedTask": "未命名任務",
+      "mode": {
+        "parallel": "並行",
+        "chain": "串行"
+      },
+      "status": {
+        "queued": "排隊中",
+        "running": "執行中",
+        "completed": "已完成",
+        "error": "錯誤",
+        "cancelled": "已取消",
+        "waiting_permission": "等待權限批准",
+        "waiting_question": "等待補充輸入"
+      }
+    }
   },
   "mode": {
     "acpAgent": "ACP Agent",
@@ -123,7 +140,8 @@
   },
   "topbar": {
     "share": "分享",
-    "more": "更多"
+    "more": "更多",
+    "backToParent": "返回父會話"
   },
   "advancedSettings": {
     "button": "進階設定",
@@ -156,7 +174,8 @@
     "sections": {
       "files": "檔案",
       "git": "Git",
-      "artifacts": "Artifacts"
+      "artifacts": "Artifacts",
+      "subagents": "subagent"
     },
     "files": {
       "contextMenu": {
@@ -210,7 +229,16 @@
         "truncated": "[已截斷]"
       }
     },
-    "title": "工作區"
+    "title": "工作區",
+    "subagents": {
+      "empty": "暫無 subagent 會話",
+      "self": "目前智能體",
+      "status": {
+        "working": "執行中",
+        "error": "錯誤",
+        "idle": "閒置"
+      }
+    }
   },
   "modelPicker": {
     "empty": "未找到模型"
@@ -275,5 +303,8 @@
       "done": "已完成",
       "error": "錯誤"
     }
+  },
+  "subagents": {
+    "label": "subagent"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/common.json b/src/renderer/src/i18n/zh-TW/common.json
index 8e96e8e5c..ab7755cdc 100644
--- a/src/renderer/src/i18n/zh-TW/common.json
+++ b/src/renderer/src/i18n/zh-TW/common.json
@@ -16,6 +16,7 @@
   "disabled": "已停用",
   "disclaimer": "免責聲明",
   "close": "關閉",
+  "open": "開啟",
   "error": {
     "requestFailed": "請求失敗...",
     "createChatFailed": "建立對話失敗",
diff --git a/src/renderer/src/i18n/zh-TW/settings.json b/src/renderer/src/i18n/zh-TW/settings.json
index d4ca72e0e..71059bd1d 100644
--- a/src/renderer/src/i18n/zh-TW/settings.json
+++ b/src/renderer/src/i18n/zh-TW/settings.json
@@ -1626,6 +1626,17 @@
     "compactionDescription": "這些預設值只會影響之後新建立的 DeepChat 會話。",
     "compactionThreshold": "觸發門檻",
     "compactionRetainPairs": "保留最近訊息對",
-    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。"
+    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。",
+    "subagentsTitle": "subagent",
+    "subagentsDescription": "設定 `subagent_orchestrator` 可重用的 subagent 會話槽位。",
+    "subagentsEnabled": "啟用 subagent",
+    "subagentTargetType": "目標類型",
+    "subagentTargetSelf": "目前智能體",
+    "subagentTargetAgent": "指定智能體",
+    "subagentDisplayName": "顯示名稱",
+    "subagentDescription": "槽位描述",
+    "subagentTargetAgentLabel": "目標智能體",
+    "subagentLimit": "{count}/{max} 個槽位",
+    "addSubagentSlot": "+ 新增槽位"
   }
 }
diff --git a/src/renderer/src/pages/ChatPage.vue b/src/renderer/src/pages/ChatPage.vue
index 1c50d8a76..feaa5c95e 100644
--- a/src/renderer/src/pages/ChatPage.vue
+++ b/src/renderer/src/pages/ChatPage.vue
@@ -10,11 +10,13 @@
         :session-id="props.sessionId"
         :title="sessionTitle"
         :project="sessionProject"
+        :is-read-only="isReadOnlySession"
       />
       <MessageList
         :messages="displayMessages"
         :is-generating="isGenerating"
         :trace-message-ids="traceMessageIds"
+        :is-read-only="isReadOnlySession"
         @retry="onMessageRetry"
         @delete="onMessageDelete"
         @fork="onMessageFork"
@@ -25,7 +27,10 @@
       <TraceDialog :message-id="traceMessageId" @close="traceMessageId = null" />
 
       <!-- Input area (sticky bottom, messages scroll under) -->
-      <div class="chat-capture-hide sticky bottom-0 z-10 w-full px-6 pb-3 pt-3">
+      <div
+        v-if="!isReadOnlySession"
+        class="chat-capture-hide sticky bottom-0 z-10 w-full px-6 pb-3 pt-3"
+      >
         <div class="mx-auto flex w-full max-w-5xl min-w-0 flex-col items-center">
           <ChatToolInteractionOverlay
             v-if="activePendingInteraction"
@@ -122,6 +127,7 @@ const { t } = useI18n()
 
 const sessionTitle = computed(() => sessionStore.activeSession?.title ?? t('common.newChat'))
 const sessionProject = computed(() => sessionStore.activeSession?.projectDir ?? '')
+const isReadOnlySession = computed(() => sessionStore.activeSession?.sessionKind === 'subagent')
 const isGenerating = computed(
   () => sessionStore.activeSession?.status === 'working' || messageStore.isStreaming
 )
@@ -344,6 +350,10 @@ const chatInputRef = ref<{ triggerAttach: () => void } | null>(null)
 const isHandlingInteraction = ref(false)
 
 const handleContextMenuAskAI = (event: Event) => {
+  if (isReadOnlySession.value) {
+    return
+  }
+
   const detail = (event as CustomEvent<string>).detail
   const text = typeof detail === 'string' ? detail.trim() : ''
   if (!text) {
@@ -353,6 +363,7 @@ const handleContextMenuAskAI = (event: Event) => {
 }
 
 type PendingInteractionView = {
+  sessionId: string
   messageId: string
   toolCallId: string
   actionType: 'question_request' | 'tool_call_permission'
@@ -361,6 +372,18 @@ type PendingInteractionView = {
   block: AssistantMessageBlock
 }
 
+type SubagentProgressPayload = {
+  tasks?: Array<{
+    sessionId?: string | null
+    waitingInteraction?: {
+      type: 'permission' | 'question'
+      messageId: string
+      toolCallId: string
+      actionBlock: AssistantMessageBlock
+    } | null
+  }>
+}
+
 function parseAssistantBlocks(content: string): AssistantMessageBlock[] {
   try {
     const parsed = JSON.parse(content) as AssistantMessageBlock[]
@@ -370,6 +393,19 @@ function parseAssistantBlocks(content: string): AssistantMessageBlock[] {
   }
 }
 
+function parseSubagentProgress(value: unknown): SubagentProgressPayload | null {
+  if (typeof value !== 'string' || !value.trim()) {
+    return null
+  }
+
+  try {
+    const parsed = JSON.parse(value) as SubagentProgressPayload
+    return Array.isArray(parsed?.tasks) ? parsed : null
+  } catch {
+    return null
+  }
+}
+
 const pendingInteractions = computed<PendingInteractionView[]>(() => {
   const list: PendingInteractionView[] = []
 
@@ -394,6 +430,7 @@ const pendingInteractions = computed<PendingInteractionView[]>(() => {
       }
 
       list.push({
+        sessionId: props.sessionId,
         messageId: message.id,
         toolCallId,
         actionType: block.action_type,
@@ -402,6 +439,34 @@ const pendingInteractions = computed<PendingInteractionView[]>(() => {
         block
       })
     }
+
+    for (const block of blocks) {
+      if (block.type !== 'tool_call' || block.tool_call?.name !== 'subagent_orchestrator') {
+        continue
+      }
+
+      const progress = parseSubagentProgress(block.extra?.subagentProgress)
+      if (!progress?.tasks?.length) {
+        continue
+      }
+
+      for (const task of progress.tasks) {
+        const waiting = task.waitingInteraction
+        if (!waiting?.actionBlock || !task.sessionId) {
+          continue
+        }
+
+        list.push({
+          sessionId: task.sessionId,
+          messageId: waiting.messageId,
+          toolCallId: waiting.toolCallId,
+          actionType: waiting.type === 'question' ? 'question_request' : 'tool_call_permission',
+          toolName: waiting.actionBlock.tool_call?.name || block.tool_call?.name || '',
+          toolArgs: waiting.actionBlock.tool_call?.params || '',
+          block: waiting.actionBlock
+        })
+      }
+    }
   }
 
   return list
@@ -461,6 +526,7 @@ const showResumePendingQueue = computed(
 )
 
 async function onSubmit() {
+  if (isReadOnlySession.value) return
   if (isAcpWorkdirMissing.value) return
   if (activePendingInteraction.value || isHandlingInteraction.value) return
   const text = message.value.trim()
@@ -472,6 +538,7 @@ async function onSubmit() {
 }
 
 async function onCommandSubmit(command: string) {
+  if (isReadOnlySession.value) return
   if (isAcpWorkdirMissing.value) return
   if (activePendingInteraction.value || isHandlingInteraction.value) return
   const text = command.trim()
@@ -491,6 +558,10 @@ function onFilesChange(files: MessageFile[]) {
 }
 
 async function onToolInteractionRespond(response: ToolInteractionResponse) {
+  if (isReadOnlySession.value) {
+    return
+  }
+
   const interaction = activePendingInteraction.value
   if (!interaction || isHandlingInteraction.value) {
     return
@@ -499,7 +570,7 @@ async function onToolInteractionRespond(response: ToolInteractionResponse) {
   isHandlingInteraction.value = true
   try {
     await newAgentPresenter.respondToolInteraction(
-      props.sessionId,
+      interaction.sessionId,
       interaction.messageId,
       interaction.toolCallId,
       response
@@ -513,6 +584,7 @@ async function onToolInteractionRespond(response: ToolInteractionResponse) {
 }
 
 async function onStop() {
+  if (isReadOnlySession.value) return
   if (!isGenerating.value) return
   try {
     await newAgentPresenter.cancelGeneration(props.sessionId)
@@ -522,6 +594,7 @@ async function onStop() {
 }
 
 async function onMessageRetry(messageId: string) {
+  if (isReadOnlySession.value) return
   if (!messageId) return
   if (activePendingInteraction.value || isHandlingInteraction.value) return
   try {
@@ -534,6 +607,7 @@ async function onMessageRetry(messageId: string) {
 }
 
 async function onMessageDelete(messageId: string) {
+  if (isReadOnlySession.value) return
   if (!messageId) return
   try {
     messageStore.clearStreamingState()
@@ -545,6 +619,7 @@ async function onMessageDelete(messageId: string) {
 }
 
 async function onMessageEditSave(payload: { messageId: string; text: string }) {
+  if (isReadOnlySession.value) return
   const messageId = payload?.messageId
   const text = payload?.text?.trim()
   if (!messageId || !text) return
@@ -558,6 +633,7 @@ async function onMessageEditSave(payload: { messageId: string; text: string }) {
 }
 
 async function onMessageFork(messageId: string) {
+  if (isReadOnlySession.value) return
   if (!messageId) return
   try {
     const forked = await newAgentPresenter.forkSession(props.sessionId, messageId)
@@ -569,6 +645,7 @@ async function onMessageFork(messageId: string) {
 }
 
 async function onMessageContinue(_conversationId: string, messageId: string) {
+  if (isReadOnlySession.value) return
   if (!messageId) return
   try {
     messageStore.clearStreamingState()
@@ -584,6 +661,7 @@ function onMessageTrace(messageId: string) {
 }
 
 async function onPendingInputUpdate(payload: { itemId: string; text: string }) {
+  if (isReadOnlySession.value) return
   const target = pendingInputStore.queueItems.find((item) => item.id === payload.itemId)
   if (!target) {
     return
@@ -596,18 +674,22 @@ async function onPendingInputUpdate(payload: { itemId: string; text: string }) {
 }
 
 async function onPendingInputMove(payload: { itemId: string; toIndex: number }) {
+  if (isReadOnlySession.value) return
   await pendingInputStore.moveQueueInput(props.sessionId, payload.itemId, payload.toIndex)
 }
 
 async function onPendingInputConvert(itemId: string) {
+  if (isReadOnlySession.value) return
   await pendingInputStore.convertToSteer(props.sessionId, itemId)
 }
 
 async function onPendingInputDelete(itemId: string) {
+  if (isReadOnlySession.value) return
   await pendingInputStore.deleteInput(props.sessionId, itemId)
 }
 
 async function onResumePendingQueue() {
+  if (isReadOnlySession.value) return
   await pendingInputStore.resumeQueue(props.sessionId)
 }
 
diff --git a/src/renderer/src/pages/NewThreadPage.vue b/src/renderer/src/pages/NewThreadPage.vue
index ce1d5a505..28534f81f 100644
--- a/src/renderer/src/pages/NewThreadPage.vue
+++ b/src/renderer/src/pages/NewThreadPage.vue
@@ -109,6 +109,7 @@ import type {
   MessageFile,
   SessionGenerationSettings
 } from '@shared/types/agent-interface'
+import { normalizeDeepChatSubagentConfig } from '@shared/lib/deepchatSubagents'
 
 const projectStore = useProjectStore()
 const sessionStore = useSessionStore()
@@ -307,6 +308,7 @@ async function submitText(text: string, files: MessageFile[]) {
   const isAcp = isAcpSelectedAgent.value
   const draftPermissionMode = draftStore.permissionMode
   const draftDisabledAgentTools = [...draftStore.disabledAgentTools]
+  const draftSubagentEnabled = draftStore.subagentEnabled
   const draftGenerationSettings = draftStore.toGenerationSettings()
   if (isAcp && acpDraftSessionId.value) {
     await sessionStore.selectSession(acpDraftSessionId.value)
@@ -346,6 +348,7 @@ async function submitText(text: string, files: MessageFile[]) {
     modelId,
     permissionMode: draftPermissionMode,
     disabledAgentTools: isAcp ? undefined : draftDisabledAgentTools,
+    subagentEnabled: isAcp ? false : draftSubagentEnabled,
     generationSettings: draftGenerationSettings,
     activeSkills: dedupedPendingSkills.length > 0 ? dedupedPendingSkills : undefined
   })
@@ -366,12 +369,12 @@ const resolveDeepChatAgentConfig = async (agentId: string): Promise<DeepChatAgen
 
   const systemPrompt = await configPresenter.getSetting?.('default_system_prompt')
 
-  return {
+  return normalizeDeepChatSubagentConfig({
     defaultModelPreset: undefined,
     systemPrompt: typeof systemPrompt === 'string' ? systemPrompt : '',
     permissionMode: 'full_access',
     disabledAgentTools: []
-  }
+  })
 }
 
 const applyDraftDefaultsForSelectedAgent = async (): Promise<void> => {
@@ -383,6 +386,7 @@ const applyDraftDefaultsForSelectedAgent = async (): Promise<void> => {
   draftStore.modelId = undefined
   draftStore.permissionMode = 'full_access'
   draftStore.disabledAgentTools = []
+  draftStore.subagentEnabled = false
   draftStore.systemPrompt = undefined
   draftStore.temperature = undefined
   draftStore.contextLength = undefined
@@ -402,6 +406,7 @@ const applyDraftDefaultsForSelectedAgent = async (): Promise<void> => {
     draftStore.modelId = agentId
     draftStore.permissionMode = 'full_access'
     draftStore.disabledAgentTools = []
+    draftStore.subagentEnabled = false
     return
   }
 
@@ -422,6 +427,7 @@ const applyDraftDefaultsForSelectedAgent = async (): Promise<void> => {
   draftStore.modelId = config.defaultModelPreset?.modelId
   draftStore.permissionMode = config.permissionMode === 'default' ? 'default' : 'full_access'
   draftStore.disabledAgentTools = [...(config.disabledAgentTools ?? [])]
+  draftStore.subagentEnabled = config.subagentEnabled === true
   Object.assign(draftStore, buildDraftGenerationSettings(config))
 }
 
diff --git a/src/renderer/src/stores/ui/draft.ts b/src/renderer/src/stores/ui/draft.ts
index 455efaaa8..dd77db0e9 100644
--- a/src/renderer/src/stores/ui/draft.ts
+++ b/src/renderer/src/stores/ui/draft.ts
@@ -33,6 +33,7 @@ export const useDraftStore = defineStore('draft', () => {
   const forceInterleavedThinkingCompat = ref<boolean | undefined>(undefined)
   const permissionMode = ref<PermissionMode>('full_access')
   const disabledAgentTools = ref<string[]>([])
+  const subagentEnabled = ref(false)
   const pendingStartDeeplink = ref<StartDeeplinkPayload | null>(null)
   let nextStartToken = 0
 
@@ -64,6 +65,7 @@ export const useDraftStore = defineStore('draft', () => {
       modelId: modelId.value,
       permissionMode: permissionMode.value,
       disabledAgentTools: [...disabledAgentTools.value],
+      subagentEnabled: subagentEnabled.value,
       generationSettings: toGenerationSettings()
     }
   }
@@ -113,6 +115,7 @@ export const useDraftStore = defineStore('draft', () => {
     agentId.value = 'deepchat'
     permissionMode.value = 'full_access'
     disabledAgentTools.value = []
+    subagentEnabled.value = false
     resetGenerationSettings()
   }
 
@@ -146,6 +149,7 @@ export const useDraftStore = defineStore('draft', () => {
     forceInterleavedThinkingCompat,
     permissionMode,
     disabledAgentTools,
+    subagentEnabled,
     pendingStartDeeplink,
     toGenerationSettings,
     toCreateInput,
diff --git a/src/renderer/src/stores/ui/session.ts b/src/renderer/src/stores/ui/session.ts
index 58cb56b91..e28f60245 100644
--- a/src/renderer/src/stores/ui/session.ts
+++ b/src/renderer/src/stores/ui/session.ts
@@ -4,7 +4,9 @@ import type { ComputedRef } from 'vue'
 import { usePresenter } from '@/composables/usePresenter'
 import { SESSION_EVENTS } from '@/events'
 import type {
+  DeepChatSubagentMeta,
   SessionWithState,
+  SessionKind,
   CreateSessionInput,
   SendMessageInput
 } from '@shared/types/agent-interface'
@@ -26,6 +28,10 @@ export interface UISession {
   modelId: string
   isPinned: boolean
   isDraft: boolean
+  sessionKind: SessionKind
+  parentSessionId: string | null
+  subagentEnabled: boolean
+  subagentMeta: DeepChatSubagentMeta | null
   createdAt: number
   updatedAt: number
 }
@@ -64,6 +70,10 @@ function mapToUISession(session: SessionWithState): UISession {
     modelId: session.modelId,
     isPinned: Boolean(session.isPinned),
     isDraft: Boolean(session.isDraft),
+    sessionKind: session.sessionKind,
+    parentSessionId: session.parentSessionId ?? null,
+    subagentEnabled: session.subagentEnabled,
+    subagentMeta: session.subagentMeta ?? null,
     createdAt: session.createdAt,
     updatedAt: session.updatedAt
   }
@@ -172,7 +182,7 @@ export const useSessionStore = defineStore('session', () => {
       const webContentsId = window.api.getWebContentsId()
       const previousActiveSessionId = activeSessionId.value
       const [result, activeSession] = await Promise.all([
-        newAgentPresenter.getSessionList(),
+        newAgentPresenter.getSessionList({ includeSubagents: true }),
         newAgentPresenter.getActiveSession(webContentsId)
       ])
       sessions.value = result.map(mapToUISession)
@@ -277,6 +287,22 @@ 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 index = sessions.value.findIndex((item) => item.id === sessionId)
+      if (index >= 0) {
+        sessions.value[index] = mapToUISession(updated)
+      } else {
+        sessions.value.push(mapToUISession(updated))
+      }
+    } catch (e) {
+      error.value = `Failed to update subagent state: ${e}`
+      throw e
+    }
+  }
+
   async function renameSession(sessionId: string, title: string): Promise<void> {
     error.value = null
     try {
@@ -347,7 +373,9 @@ export const useSessionStore = defineStore('session', () => {
 
   function getPinnedSessions(agentId: string | null): UISession[] {
     const pinned = sessions.value
-      .filter((session) => session.isPinned && !session.isDraft)
+      .filter(
+        (session) => session.sessionKind === 'regular' && session.isPinned && !session.isDraft
+      )
       .sort((a, b) => b.updatedAt - a.updatedAt)
 
     if (agentId === null) return pinned
@@ -357,7 +385,7 @@ export const useSessionStore = defineStore('session', () => {
 
   function getFilteredGroups(agentId: string | null): SessionGroup[] {
     const visibleSessions = sessions.value.filter(
-      (session) => !session.isDraft && !session.isPinned
+      (session) => session.sessionKind === 'regular' && !session.isDraft && !session.isPinned
     )
     const grouped =
       groupMode.value === 'time' ? groupByTime(visibleSessions) : groupByProject(visibleSessions)
@@ -434,6 +462,7 @@ export const useSessionStore = defineStore('session', () => {
     clearSessionMessages,
     exportSession,
     deleteSession,
+    setSessionSubagentEnabled,
     toggleGroupMode,
     getPinnedSessions,
     getFilteredGroups
diff --git a/src/renderer/src/stores/ui/sidepanel.ts b/src/renderer/src/stores/ui/sidepanel.ts
index 06b17dd31..9ee99b44f 100644
--- a/src/renderer/src/stores/ui/sidepanel.ts
+++ b/src/renderer/src/stores/ui/sidepanel.ts
@@ -25,7 +25,8 @@ const createSessionState = (): WorkspaceSessionState => ({
   sections: {
     artifacts: true,
     files: true,
-    git: false
+    git: false,
+    subagents: true
   }
 })
 
diff --git a/src/shared/chat.d.ts b/src/shared/chat.d.ts
index 5853c4ecb..49d64d1eb 100644
--- a/src/shared/chat.d.ts
+++ b/src/shared/chat.d.ts
@@ -179,6 +179,8 @@ export type AssistantMessageExtra = Record<string, string | number | object[] |
   questionResolution?: 'asked' | 'replied' | 'rejected'
   answerText?: string
   answerMessageId?: string
+  subagentProgress?: string
+  subagentFinal?: string
 }
 // Search-related message block types
 export type SearchBlock = {
diff --git a/src/shared/lib/deepchatSubagents.ts b/src/shared/lib/deepchatSubagents.ts
new file mode 100644
index 000000000..cdc95d474
--- /dev/null
+++ b/src/shared/lib/deepchatSubagents.ts
@@ -0,0 +1,102 @@
+import type { DeepChatAgentConfig, DeepChatSubagentSlot } from '@shared/types/agent-interface'
+
+export const DEEPCHAT_SUBAGENT_SLOT_LIMIT = 5
+export const DEEPCHAT_SELF_SUBAGENT_SLOT_ID = 'self'
+
+export const createDefaultDeepChatSelfSubagentSlot = (): DeepChatSubagentSlot => ({
+  id: DEEPCHAT_SELF_SUBAGENT_SLOT_ID,
+  targetType: 'self',
+  displayName: 'Self Clone',
+  description: 'Inherit the current parent session agent logic with an isolated context.'
+})
+
+const normalizeDisplayName = (value: string | undefined, fallback: string): string => {
+  const normalized = value?.trim()
+  return normalized ? normalized : fallback
+}
+
+const normalizeDescription = (value: string | undefined, fallback: string): string => {
+  const normalized = value?.trim()
+  return normalized ? normalized : fallback
+}
+
+export const normalizeDeepChatSubagentSlots = (
+  slots?: DeepChatSubagentSlot[] | null
+): DeepChatSubagentSlot[] => {
+  const normalized: DeepChatSubagentSlot[] = []
+  const seenIds = new Set<string>()
+
+  const pushSlot = (slot: DeepChatSubagentSlot) => {
+    if (normalized.length >= DEEPCHAT_SUBAGENT_SLOT_LIMIT) {
+      return
+    }
+
+    const normalizedId = slot.id.trim()
+    if (!normalizedId || seenIds.has(normalizedId)) {
+      return
+    }
+
+    seenIds.add(normalizedId)
+    normalized.push(slot)
+  }
+
+  for (const slot of Array.isArray(slots) ? slots : []) {
+    if (!slot || typeof slot !== 'object') {
+      continue
+    }
+
+    const id = typeof slot.id === 'string' ? slot.id.trim() : ''
+    if (!id) {
+      continue
+    }
+
+    if (slot.targetType === 'self') {
+      pushSlot({
+        id,
+        targetType: 'self',
+        displayName: normalizeDisplayName(
+          typeof slot.displayName === 'string' ? slot.displayName : undefined,
+          'Self Clone'
+        ),
+        description: normalizeDescription(
+          typeof slot.description === 'string' ? slot.description : undefined,
+          ''
+        )
+      })
+      continue
+    }
+
+    if (slot.targetType !== 'agent') {
+      continue
+    }
+
+    const targetAgentId = typeof slot.targetAgentId === 'string' ? slot.targetAgentId.trim() : ''
+    if (!targetAgentId) {
+      continue
+    }
+
+    pushSlot({
+      id,
+      targetType: 'agent',
+      targetAgentId,
+      displayName: normalizeDisplayName(
+        typeof slot.displayName === 'string' ? slot.displayName : undefined,
+        targetAgentId
+      ),
+      description: normalizeDescription(
+        typeof slot.description === 'string' ? slot.description : undefined,
+        ''
+      )
+    })
+  }
+
+  return normalized
+}
+
+export const normalizeDeepChatSubagentConfig = (
+  config?: DeepChatAgentConfig | null
+): DeepChatAgentConfig => ({
+  ...config,
+  subagentEnabled: config?.subagentEnabled === true,
+  subagents: normalizeDeepChatSubagentSlots(config?.subagents)
+})
diff --git a/src/shared/types/agent-interface.d.ts b/src/shared/types/agent-interface.d.ts
index 7aa6aa822..e51e521f7 100644
--- a/src/shared/types/agent-interface.d.ts
+++ b/src/shared/types/agent-interface.d.ts
@@ -249,6 +249,8 @@ export interface AssistantMessageExtra {
   questionResolution?: 'asked' | 'replied' | 'rejected'
   answerText?: string
   answerMessageId?: string
+  subagentProgress?: string
+  subagentFinal?: string
   [key: string]: string | number | boolean | object[] | undefined
 }
 
@@ -447,6 +449,22 @@ export interface DeepChatAgentModelPreset extends DeepChatAgentModelSelection {
   forceInterleavedThinkingCompat?: boolean
 }
 
+export interface DeepChatSubagentSlot {
+  id: string
+  targetType: 'self' | 'agent'
+  targetAgentId?: string
+  displayName: string
+  description: string
+}
+
+export type SessionKind = 'regular' | 'subagent'
+
+export interface DeepChatSubagentMeta {
+  slotId: string
+  displayName: string
+  targetAgentId?: string | null
+}
+
 export interface DeepChatAgentConfig {
   defaultModelPreset?: DeepChatAgentModelPreset | null
   assistantModel?: DeepChatAgentModelSelection | null
@@ -455,6 +473,8 @@ export interface DeepChatAgentConfig {
   systemPrompt?: string
   permissionMode?: PermissionMode
   disabledAgentTools?: string[]
+  subagentEnabled?: boolean
+  subagents?: DeepChatSubagentSlot[]
   autoCompactionEnabled?: boolean
   autoCompactionTriggerThreshold?: number
   autoCompactionRetainRecentPairs?: number
@@ -508,6 +528,10 @@ export interface SessionRecord {
   projectDir: string | null
   isPinned: boolean
   isDraft?: boolean
+  sessionKind: SessionKind
+  parentSessionId?: string | null
+  subagentEnabled: boolean
+  subagentMeta?: DeepChatSubagentMeta | null
   createdAt: number
   updatedAt: number
 }
@@ -550,6 +574,7 @@ export interface CreateSessionInput {
   permissionMode?: PermissionMode
   activeSkills?: string[]
   disabledAgentTools?: string[]
+  subagentEnabled?: boolean
   generationSettings?: Partial<SessionGenerationSettings>
 }
 
@@ -562,6 +587,7 @@ export interface CreateDetachedSessionInput {
   permissionMode?: PermissionMode
   activeSkills?: string[]
   disabledAgentTools?: string[]
+  subagentEnabled?: boolean
   generationSettings?: Partial<SessionGenerationSettings>
 }
 
diff --git a/src/shared/types/presenters/legacy.presenters.d.ts b/src/shared/types/presenters/legacy.presenters.d.ts
index 2ad9a0ab3..d0c4cec32 100644
--- a/src/shared/types/presenters/legacy.presenters.d.ts
+++ b/src/shared/types/presenters/legacy.presenters.d.ts
@@ -1732,7 +1732,18 @@ export interface IMCPPresenter {
   getAllResources(): Promise<Array<ResourceListEntry & { client: { name: string; icon: string } }>>
   getPrompt(prompt: PromptListEntry, args?: Record<string, unknown>): Promise<unknown>
   readResource(resource: ResourceListEntry): Promise<Resource>
-  callTool(request: MCPToolCall): Promise<{ content: string; rawData: MCPToolResponse }>
+  callTool(
+    request: MCPToolCall,
+    options?: {
+      onProgress?: (update: {
+        kind: 'subagent_orchestrator'
+        toolCallId: string
+        responseMarkdown: string
+        progressJson: string
+      }) => void
+      signal?: AbortSignal
+    }
+  ): Promise<{ content: string; rawData: MCPToolResponse }>
   preCheckToolPermission?(request: MCPToolCall): Promise<{
     needsPermission: true
     toolName: string
diff --git a/src/shared/types/presenters/new-agent.presenter.d.ts b/src/shared/types/presenters/new-agent.presenter.d.ts
index fdef5f72c..8129eb0c9 100644
--- a/src/shared/types/presenters/new-agent.presenter.d.ts
+++ b/src/shared/types/presenters/new-agent.presenter.d.ts
@@ -53,7 +53,12 @@ export interface INewAgentPresenter {
     targetMessageId: string,
     newTitle?: string
   ): Promise<SessionWithState>
-  getSessionList(filters?: { agentId?: string; projectDir?: string }): Promise<SessionWithState[]>
+  getSessionList(filters?: {
+    agentId?: string
+    projectDir?: string
+    includeSubagents?: boolean
+    parentSessionId?: string
+  }): Promise<SessionWithState[]>
   getSession(sessionId: string): Promise<SessionWithState | null>
   getMessages(sessionId: string): Promise<ChatMessageRecord[]>
   getSessionCompactionState(sessionId: string): Promise<SessionCompactionState>
@@ -99,6 +104,7 @@ export interface INewAgentPresenter {
   ): Promise<AcpConfigState | null>
   getPermissionMode(sessionId: string): Promise<PermissionMode>
   setPermissionMode(sessionId: string, mode: PermissionMode): Promise<void>
+  setSessionSubagentEnabled(sessionId: string, enabled: boolean): Promise<SessionWithState>
   setSessionModel(sessionId: string, providerId: string, modelId: string): Promise<SessionWithState>
   getSessionGenerationSettings(sessionId: string): Promise<SessionGenerationSettings | null>
   getSessionDisabledAgentTools(sessionId: string): Promise<string[]>
diff --git a/src/shared/types/presenters/tool.presenter.d.ts b/src/shared/types/presenters/tool.presenter.d.ts
index c75fc5470..a08fd2577 100644
--- a/src/shared/types/presenters/tool.presenter.d.ts
+++ b/src/shared/types/presenters/tool.presenter.d.ts
@@ -5,6 +5,13 @@
 
 import type { MCPToolDefinition, MCPToolCall, MCPToolResponse } from '../core/mcp'
 
+export interface AgentToolProgressUpdate {
+  kind: 'subagent_orchestrator'
+  toolCallId: string
+  responseMarkdown: string
+  progressJson: string
+}
+
 /**
  * Tool Presenter interface
  * Unified interface for managing all tool sources (MCP, Agent)
@@ -27,7 +34,13 @@ export interface IToolPresenter {
    * Call a tool, routing to the appropriate source
    * @param request Tool call request
    */
-  callTool(request: MCPToolCall): Promise<{ content: unknown; rawData: MCPToolResponse }>
+  callTool(
+    request: MCPToolCall,
+    options?: {
+      onProgress?: (update: AgentToolProgressUpdate) => void
+      signal?: AbortSignal
+    }
+  ): Promise<{ content: unknown; rawData: MCPToolResponse }>
 
   /**
    * Pre-check tool permission without executing the tool.
diff --git a/src/shared/types/presenters/workspace.d.ts b/src/shared/types/presenters/workspace.d.ts
index bec86ac90..a217c8b6b 100644
--- a/src/shared/types/presenters/workspace.d.ts
+++ b/src/shared/types/presenters/workspace.d.ts
@@ -5,7 +5,7 @@
 
 export type SidePanelTab = 'workspace' | 'browser'
 
-export type WorkspaceNavSection = 'artifacts' | 'files' | 'git'
+export type WorkspaceNavSection = 'artifacts' | 'files' | 'git' | 'subagents'
 
 export type WorkspaceViewMode = 'preview' | 'code'
 
diff --git a/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts b/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts
index d09e9d16a..51870f992 100644
--- a/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts
+++ b/test/main/presenter/deepchatAgentPresenter/deepchatAgentPresenter.test.ts
@@ -2741,7 +2741,7 @@ describe('DeepChatAgentPresenter', () => {
 
       await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
 
-      const result = await (agent as any).executeDeferredToolCall('s1', {
+      const result = await (agent as any).executeDeferredToolCall('s1', 'm1', {
         id: 'tc1',
         name: 'exec',
         params: '{"command":"npm test"}'
@@ -2774,7 +2774,7 @@ describe('DeepChatAgentPresenter', () => {
 
       await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
 
-      await (agent as any).executeDeferredToolCall('s1', {
+      await (agent as any).executeDeferredToolCall('s1', 'm1', {
         id: 'tc1',
         name: 'echo',
         params: '{}'
@@ -2784,6 +2784,9 @@ describe('DeepChatAgentPresenter', () => {
         expect.objectContaining({
           conversationId: 's1',
           providerId: 'openai'
+        }),
+        expect.objectContaining({
+          signal: expect.any(Object)
         })
       )
     })
@@ -2819,7 +2822,7 @@ describe('DeepChatAgentPresenter', () => {
         modelId: 'gpt-4o'
       })
 
-      const result = await (agent as any).executeDeferredToolCall('s1', {
+      const result = await (agent as any).executeDeferredToolCall('s1', 'm1', {
         id: 'tc1',
         name: 'cdp_send',
         params: '{"method":"Page.captureScreenshot","params":{"format":"jpeg"}}'
@@ -2847,7 +2850,9 @@ describe('DeepChatAgentPresenter', () => {
         'gpt-4o',
         expect.any(Number),
         expect.any(Number),
-        undefined
+        expect.objectContaining({
+          signal: expect.any(Object)
+        })
       )
       expect(configPresenter.resolveDeepChatAgentConfig).not.toHaveBeenCalled()
       expect(result).toEqual(
@@ -2858,6 +2863,263 @@ describe('DeepChatAgentPresenter', () => {
       )
     })
 
+    it('registers a cancellable controller for deferred subagent tool calls', async () => {
+      toolPresenter.getAllToolDefinitions.mockResolvedValueOnce([
+        {
+          type: 'function',
+          function: {
+            name: 'subagent_orchestrator',
+            description: 'Run subagents',
+            parameters: { type: 'object', properties: {} }
+          },
+          server: { name: 'agent', icons: '', description: '' }
+        }
+      ])
+
+      let capturedSignal: AbortSignal | undefined
+      toolPresenter.callTool.mockImplementationOnce(async (_request: unknown, options?: any) => {
+        capturedSignal = options?.signal
+
+        return await new Promise((_, reject) => {
+          options?.signal?.addEventListener(
+            'abort',
+            () => {
+              const error = new Error('Aborted')
+              error.name = 'AbortError'
+              reject(error)
+            },
+            { once: true }
+          )
+        })
+      })
+
+      await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
+
+      const executionPromise = (agent as any).executeDeferredToolCall('s1', 'm1', {
+        id: 'tc-subagent',
+        name: 'subagent_orchestrator',
+        params: '{}'
+      })
+
+      await new Promise((resolve) => setTimeout(resolve, 0))
+
+      expect(capturedSignal).toBeDefined()
+      expect(capturedSignal?.aborted).toBe(false)
+      expect((agent as any).deferredToolAbortControllers.size).toBe(1)
+
+      await agent.cancelGeneration('s1')
+
+      expect(capturedSignal?.aborted).toBe(true)
+      await expect(executionPromise).resolves.toEqual(
+        expect.objectContaining({
+          isError: true,
+          responseText: 'Error: Aborted'
+        })
+      )
+      expect((agent as any).deferredToolAbortControllers.size).toBe(0)
+    })
+
+    it('persists final-only deferred subagent snapshots', async () => {
+      const subagentFinal = JSON.stringify({
+        runId: 'run-final',
+        mode: 'parallel',
+        tasks: [
+          {
+            taskId: 'task-1',
+            slotId: 'slot-1',
+            title: 'Inspect repo',
+            targetAgentName: 'ACP Coder',
+            status: 'completed'
+          }
+        ]
+      })
+
+      toolPresenter.getAllToolDefinitions.mockResolvedValueOnce([
+        {
+          type: 'function',
+          function: {
+            name: 'subagent_orchestrator',
+            description: 'Run subagents',
+            parameters: { type: 'object', properties: {} }
+          },
+          server: { name: 'agent', icons: '', description: '' }
+        }
+      ])
+      toolPresenter.callTool.mockResolvedValueOnce({
+        content: 'Final summary',
+        rawData: {
+          content: 'Final summary',
+          isError: false,
+          toolResult: { subagentFinal }
+        }
+      })
+      sqlitePresenter.deepchatMessagesTable.get.mockReturnValue({
+        id: 'm1',
+        session_id: 's1',
+        order_seq: 1,
+        role: 'assistant',
+        content: JSON.stringify([
+          {
+            type: 'tool_call',
+            status: 'loading',
+            timestamp: 1,
+            tool_call: {
+              id: 'tc-final',
+              name: 'subagent_orchestrator',
+              params: '{}',
+              response: ''
+            }
+          }
+        ]),
+        status: 'pending',
+        is_context_edge: 0,
+        metadata: '{}',
+        created_at: Date.now(),
+        updated_at: Date.now()
+      })
+
+      await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
+
+      const result = await (agent as any).executeDeferredToolCall('s1', 'm1', {
+        id: 'tc-final',
+        name: 'subagent_orchestrator',
+        params: '{}'
+      })
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          isError: false,
+          responseText: 'Final summary'
+        })
+      )
+
+      const updatedBlocks = JSON.parse(
+        sqlitePresenter.deepchatMessagesTable.updateContent.mock.calls[0][1]
+      )
+      expect(updatedBlocks[0].tool_call.response).toBe('Final summary')
+      expect(updatedBlocks[0].status).toBe('success')
+      expect(updatedBlocks[0].extra).toEqual(
+        expect.objectContaining({
+          subagentFinal
+        })
+      )
+    })
+
+    it('re-reads the latest message content before persisting subagent progress', async () => {
+      const staleRow = {
+        id: 'm1',
+        session_id: 's1',
+        order_seq: 1,
+        role: 'assistant',
+        content: JSON.stringify([
+          {
+            type: 'tool_call',
+            status: 'loading',
+            timestamp: 1,
+            tool_call: {
+              id: 'tc1',
+              name: 'subagent_orchestrator',
+              params: '{}',
+              response: ''
+            }
+          }
+        ]),
+        status: 'pending',
+        is_context_edge: 0,
+        metadata: '{}',
+        created_at: Date.now(),
+        updated_at: Date.now()
+      }
+      const latestRow = {
+        ...staleRow,
+        content: JSON.stringify([
+          {
+            type: 'tool_call',
+            status: 'loading',
+            timestamp: 1,
+            tool_call: {
+              id: 'tc1',
+              name: 'subagent_orchestrator',
+              params: '{}',
+              response: ''
+            }
+          },
+          {
+            type: 'content',
+            status: 'success',
+            timestamp: 2,
+            content: 'Locally appended block'
+          }
+        ])
+      }
+      toolPresenter.getAllToolDefinitions.mockResolvedValueOnce([
+        {
+          type: 'function',
+          function: {
+            name: 'subagent_orchestrator',
+            description: 'Run subagents',
+            parameters: { type: 'object', properties: {} }
+          },
+          server: { name: 'agent', icons: '', description: '' }
+        }
+      ])
+      const emitMessageRefreshSpy = vi
+        .spyOn(agent as any, 'emitMessageRefresh')
+        .mockImplementation(() => {})
+      toolPresenter.callTool.mockImplementationOnce(async (_request: unknown, options?: any) => {
+        options?.onProgress?.({
+          kind: 'subagent_orchestrator',
+          toolCallId: 'tc1',
+          responseMarkdown: 'Updated summary',
+          progressJson: '{"tasks":[]}'
+        })
+
+        return {
+          content: 'Updated summary',
+          rawData: {
+            content: 'Updated summary',
+            isError: false
+          }
+        }
+      })
+
+      sqlitePresenter.deepchatMessagesTable.get
+        .mockImplementationOnce((id: string) => (id === 'm1' ? staleRow : undefined))
+        .mockImplementationOnce((id: string) => (id === 'm1' ? latestRow : undefined))
+
+      await agent.initSession('s1', { providerId: 'openai', modelId: 'gpt-4' })
+
+      const result = await (agent as any).executeDeferredToolCall('s1', 'm1', {
+        id: 'tc1',
+        name: 'subagent_orchestrator',
+        params: '{}'
+      })
+
+      expect(result).toEqual(
+        expect.objectContaining({
+          isError: false,
+          responseText: 'Updated summary'
+        })
+      )
+      const updatedBlocks = JSON.parse(
+        sqlitePresenter.deepchatMessagesTable.updateContent.mock.calls[0][1]
+      )
+      expect(updatedBlocks).toHaveLength(2)
+      expect(updatedBlocks[0].tool_call.response).toBe('Updated summary')
+      expect(updatedBlocks[0].extra).toEqual(
+        expect.objectContaining({
+          subagentProgress: '{"tasks":[]}'
+        })
+      )
+      expect(updatedBlocks[1]).toEqual(
+        expect.objectContaining({
+          type: 'content',
+          content: 'Locally appended block'
+        })
+      )
+      expect(emitMessageRefreshSpy).toHaveBeenCalledWith('s1', 'm1')
+    })
+
     it('falls back to the current session agent vision model when the current model has no vision', async () => {
       sqlitePresenter.newSessionsTable.get.mockReturnValue({
         id: 's1',
diff --git a/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts b/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts
index b3939d227..baace17be 100644
--- a/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts
+++ b/test/main/presenter/deepchatAgentPresenter/dispatch.test.ts
@@ -206,6 +206,9 @@ describe('dispatch', () => {
           server: tools[0].server,
           conversationId: 's1',
           providerId: 'openai'
+        }),
+        expect.objectContaining({
+          signal: expect.any(Object)
         })
       )
 
@@ -221,6 +224,71 @@ describe('dispatch', () => {
       expect(toolBlock!.status).toBe('success')
     })
 
+    it('persists final-only subagent tool payloads', async () => {
+      const tools = [makeTool('subagent_orchestrator')]
+      const toolPresenter = createMockToolPresenter()
+      const subagentFinal = JSON.stringify({
+        runId: 'run-1',
+        mode: 'parallel',
+        tasks: [
+          {
+            slotId: 'worker-1',
+            displayName: 'Worker 1',
+            title: 'Inspect repo',
+            status: 'completed'
+          }
+        ]
+      })
+
+      ;(toolPresenter.callTool as ReturnType<typeof vi.fn>).mockResolvedValueOnce({
+        content: [{ type: 'text', text: 'Final summary' }],
+        rawData: {
+          toolCallId: 'tc1',
+          content: [{ type: 'text', text: 'Final summary' }],
+          isError: false,
+          toolResult: { subagentFinal }
+        }
+      })
+
+      state.blocks.push({
+        type: 'tool_call',
+        content: '',
+        status: 'pending',
+        timestamp: Date.now(),
+        tool_call: { id: 'tc1', name: 'subagent_orchestrator', params: '{}', response: '' }
+      })
+      state.completedToolCalls = [{ id: 'tc1', name: 'subagent_orchestrator', arguments: '{}' }]
+
+      await executeTools(
+        state,
+        [],
+        0,
+        tools,
+        toolPresenter,
+        'gpt-4',
+        io,
+        'full_access',
+        new ToolOutputGuard(),
+        32000,
+        1024
+      )
+
+      const toolBlock = state.blocks.find(
+        (block) => block.type === 'tool_call' && block.tool_call?.id === 'tc1'
+      )
+      expect(toolBlock?.tool_call?.response).toBe('Final summary')
+      expect(toolBlock?.status).toBe('success')
+      expect(toolBlock?.extra?.subagentFinal).toBe(subagentFinal)
+
+      const persistedBlocks = (
+        io.messageStore.updateAssistantContent as ReturnType<typeof vi.fn>
+      ).mock.calls.at(-1)?.[1] as StreamState['blocks'] | undefined
+      const persistedToolBlock = persistedBlocks?.find(
+        (block) => block.type === 'tool_call' && block.tool_call?.id === 'tc1'
+      )
+      expect(persistedToolBlock?.extra?.subagentFinal).toBe(subagentFinal)
+    })
+
     it('finalizes trailing narrative blocks before plain tool results run', async () => {
       const tools = [makeTool('get_weather')]
       const toolPresenter = createMockToolPresenter()
diff --git a/test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts b/test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts
new file mode 100644
index 000000000..d2976b408
--- /dev/null
+++ b/test/main/presenter/deepchatAgentPresenter/internalSessionEvents.test.ts
@@ -0,0 +1,106 @@
+import { describe, expect, it, vi, afterEach } from 'vitest'
+import {
+  buildAssistantResponseMarkdown,
+  extractWaitingInteraction,
+  emitDeepChatInternalSessionUpdate,
+  subscribeDeepChatInternalSessionUpdates
+} from '@/presenter/deepchatAgentPresenter/internalSessionEvents'
+
+describe('internalSessionEvents', () => {
+  afterEach(() => {
+    vi.restoreAllMocks()
+  })
+
+  it('swallows subscriber errors when emitting session updates', () => {
+    const consoleError = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const unsubscribe = subscribeDeepChatInternalSessionUpdates(() => {
+      throw new Error('listener failed')
+    })
+
+    try {
+      expect(() =>
+        emitDeepChatInternalSessionUpdate({
+          sessionId: 'session-1',
+          kind: 'status',
+          status: 'idle',
+          updatedAt: Date.now()
+        })
+      ).not.toThrow()
+
+      expect(consoleError).toHaveBeenCalledWith(
+        '[DeepChatInternalSessionEvents] Failed to emit session update:',
+        expect.any(Error)
+      )
+    } finally {
+      unsubscribe()
+    }
+  })
+
+  it('returns the earliest pending waiting interaction', () => {
+    const waitingInteraction = extractWaitingInteraction(
+      [
+        {
+          type: 'tool_call',
+          status: 'pending',
+          timestamp: 1,
+          tool_call: { id: 'tc1', name: 'ask_one', params: '{}', response: '' }
+        },
+        {
+          type: 'action',
+          action_type: 'question_request',
+          status: 'pending',
+          timestamp: 2,
+          content: 'First',
+          tool_call: { id: 'tc1', name: 'ask_one', params: '{}' },
+          extra: { needsUserAction: true, questionText: 'First' }
+        },
+        {
+          type: 'tool_call',
+          status: 'pending',
+          timestamp: 3,
+          tool_call: { id: 'tc2', name: 'ask_two', params: '{}', response: '' }
+        },
+        {
+          type: 'action',
+          action_type: 'question_request',
+          status: 'pending',
+          timestamp: 4,
+          content: 'Second',
+          tool_call: { id: 'tc2', name: 'ask_two', params: '{}' },
+          extra: { needsUserAction: true, questionText: 'Second' }
+        }
+      ],
+      'message-1'
+    )
+
+    expect(waitingInteraction).toEqual({
+      type: 'question',
+      messageId: 'message-1',
+      toolCallId: 'tc1',
+      actionBlock: {
+        type: 'action',
+        action_type: 'question_request',
+        status: 'pending',
+        timestamp: 2,
+        content: 'First',
+        tool_call: { id: 'tc1', name: 'ask_one', params: '{}' },
+        extra: { needsUserAction: true, questionText: 'First' }
+      }
+    })
+  })
+
+  it('preserves indentation and blank lines in assistant response markdown', () => {
+    const responseMarkdown = buildAssistantResponseMarkdown([
+      {
+        type: 'content',
+        status: 'success',
+        timestamp: 1,
+        content: ['```yaml', 'items:', '  - name: foo', '', '  - name: bar', '```'].join('\n')
+      }
+    ])
+
+    expect(responseMarkdown).toBe(
+      ['```yaml', 'items:', '  - name: foo', '', '  - name: bar', '```'].join('\n')
+    )
+  })
+})
diff --git a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
index a7b669d0b..efca92410 100644
--- a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
+++ b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
@@ -694,7 +694,11 @@ describe('NewAgentPresenter', () => {
         '/workspaces/remote-default',
         {
           isDraft: false,
-          disabledAgentTools: []
+          disabledAgentTools: [],
+          subagentEnabled: false,
+          sessionKind: undefined,
+          parentSessionId: undefined,
+          subagentMetaJson: null
         }
       )
     })
@@ -1287,6 +1291,42 @@ describe('NewAgentPresenter', () => {
     })
   })
 
+  describe('setSessionSubagentEnabled', () => {
+    it('throws when the updated session state cannot be rebuilt', async () => {
+      const row = {
+        id: 's1',
+        agent_id: 'deepchat',
+        title: 'Test',
+        project_dir: null,
+        is_pinned: 0,
+        is_draft: 0,
+        subagent_enabled: 0,
+        session_kind: 'regular',
+        parent_session_id: null,
+        subagent_meta_json: null,
+        created_at: 1000,
+        updated_at: 1000
+      }
+      sqlitePresenter.newSessionsTable.get.mockImplementation((id: string) =>
+        id === 's1' ? row : undefined
+      )
+      sqlitePresenter.newSessionsTable.update.mockImplementation((_: string, fields: any) => {
+        Object.assign(row, fields)
+      })
+      deepChatAgent.getSessionState.mockRejectedValueOnce(new Error('state unavailable'))
+
+      await expect(presenter.setSessionSubagentEnabled('s1', true)).rejects.toThrow(
+        'Failed to build session state for sessionId: s1'
+      )
+
+      expect(sqlitePresenter.newSessionsTable.update).toHaveBeenCalledWith('s1', {
+        subagent_enabled: 1
+      })
+      expect(row.subagent_enabled).toBe(1)
+      expect(eventBus.sendToRenderer).toHaveBeenCalledWith('session:list-updated', 'all')
+    })
+  })
+
   describe('setSessionModel', () => {
     it('updates deepchat session model and emits LIST_UPDATED', async () => {
       sqlitePresenter.newSessionsTable.get.mockReturnValue({
diff --git a/test/main/presenter/newAgentPresenter/sessionManager.test.ts b/test/main/presenter/newAgentPresenter/sessionManager.test.ts
index 96bc08b51..66686a1a7 100644
--- a/test/main/presenter/newAgentPresenter/sessionManager.test.ts
+++ b/test/main/presenter/newAgentPresenter/sessionManager.test.ts
@@ -43,7 +43,11 @@ describe('NewSessionManager', () => {
         '/tmp/workspace',
         {
           isDraft: undefined,
-          disabledAgentTools: undefined
+          disabledAgentTools: undefined,
+          subagentEnabled: undefined,
+          sessionKind: undefined,
+          parentSessionId: undefined,
+          subagentMetaJson: null
         }
       )
       expect(sqlitePresenter.newEnvironmentsTable.syncPath).toHaveBeenCalledWith('/tmp/workspace')
@@ -72,6 +76,10 @@ describe('NewSessionManager', () => {
         projectDir: '/tmp/proj',
         isPinned: true,
         isDraft: false,
+        sessionKind: 'regular',
+        parentSessionId: null,
+        subagentEnabled: false,
+        subagentMeta: null,
         createdAt: 1000,
         updatedAt: 2000
       })
diff --git a/test/main/presenter/sqlitePresenter.test.ts b/test/main/presenter/sqlitePresenter.test.ts
index fe039fb37..392e98f7a 100644
--- a/test/main/presenter/sqlitePresenter.test.ts
+++ b/test/main/presenter/sqlitePresenter.test.ts
@@ -238,6 +238,90 @@ describeIfSqlite('SQLitePresenter legacy schema bootstrap', () => {
     checkDb.close()
   })
 
+  it('migrates missing subagent columns when schema version is already 20', 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 (20, ${Date.now()});
+      CREATE TABLE IF NOT EXISTS new_sessions (
+        id TEXT PRIMARY KEY,
+        agent_id TEXT NOT NULL,
+        title TEXT NOT NULL,
+        project_dir TEXT,
+        is_pinned INTEGER DEFAULT 0,
+        is_draft INTEGER NOT NULL DEFAULT 0,
+        active_skills TEXT NOT NULL DEFAULT '[]',
+        disabled_agent_tools TEXT NOT NULL DEFAULT '[]',
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL
+      );
+    `)
+    bootstrapDb.close()
+
+    const presenter = new SQLitePresenterCtor(dbPath)
+    presenter.newSessionsTable.create('session-1', 'deepchat', 'Recovered session', null, {
+      subagentEnabled: true,
+      sessionKind: 'subagent',
+      parentSessionId: 'parent-1',
+      subagentMetaJson: JSON.stringify({
+        slotId: 'slot-1',
+        displayName: 'Reviewer',
+        targetAgentId: 'acp-reviewer'
+      })
+    })
+    presenter.close()
+
+    const checkDb = new DatabaseCtor(dbPath)
+    const newSessionColumns = checkDb.prepare('PRAGMA table_info(new_sessions)').all() as Array<{
+      name: string
+    }>
+    const columnNames = new Set(newSessionColumns.map((column) => column.name))
+
+    expect(columnNames.has('subagent_enabled')).toBe(true)
+    expect(columnNames.has('session_kind')).toBe(true)
+    expect(columnNames.has('parent_session_id')).toBe(true)
+    expect(columnNames.has('subagent_meta_json')).toBe(true)
+
+    const row = checkDb
+      .prepare(
+        `SELECT subagent_enabled, session_kind, parent_session_id, subagent_meta_json
+         FROM new_sessions
+         WHERE id = ?`
+      )
+      .get('session-1') as
+      | {
+          subagent_enabled: number
+          session_kind: string
+          parent_session_id: string | null
+          subagent_meta_json: string | null
+        }
+      | undefined
+
+    expect(row).toEqual({
+      subagent_enabled: 1,
+      session_kind: 'subagent',
+      parent_session_id: 'parent-1',
+      subagent_meta_json: JSON.stringify({
+        slotId: 'slot-1',
+        displayName: 'Reviewer',
+        targetAgentId: 'acp-reviewer'
+      })
+    })
+
+    const versions = checkDb
+      .prepare('SELECT version FROM schema_versions ORDER BY version ASC')
+      .all() as Array<{ version: number }>
+    expect(versions.map((entry) => entry.version)).toContain(21)
+    checkDb.close()
+  })
+
   it('migrates new_environments from existing session history when schema version is 16', async () => {
     const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'deepchat-sqlite-presenter-'))
     tempDirs.push(tempDir)
@@ -521,4 +605,36 @@ describeIfSqlite('SQLitePresenter legacy schema bootstrap', () => {
     expect(versions.map((entry) => entry.version)).toContain(19)
     checkDb.close()
   })
+
+  it('returns child sessions when filtering by parentSessionId without includeSubagents', async () => {
+    const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'deepchat-sqlite-presenter-'))
+    tempDirs.push(tempDir)
+
+    const dbPath = path.join(tempDir, 'agent.db')
+    const presenter = new SQLitePresenterCtor(dbPath)
+
+    presenter.newSessionsTable.create(
+      'parent-session',
+      'deepchat',
+      'Parent session',
+      '/workspace',
+      {
+        sessionKind: 'regular'
+      }
+    )
+    presenter.newSessionsTable.create('child-session', 'deepchat', 'Child session', '/workspace', {
+      sessionKind: 'subagent',
+      parentSessionId: 'parent-session'
+    })
+
+    const childRows = presenter.newSessionsTable.list({
+      parentSessionId: 'parent-session'
+    })
+    const defaultRows = presenter.newSessionsTable.list()
+
+    expect(childRows.map((row) => row.id)).toEqual(['child-session'])
+    expect(defaultRows.map((row) => row.id)).toEqual(['parent-session'])
+
+    presenter.close()
+  })
 })
diff --git a/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts b/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
index 1e05fd365..de9f4553e 100644
--- a/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
+++ b/test/main/presenter/toolPresenter/agentTools/agentToolManagerSettings.test.ts
@@ -27,6 +27,7 @@ describe('AgentToolManager DeepChat settings tool gating', () => {
     })
   } as any
   const resolveConversationWorkdir = vi.fn()
+  const resolveConversationSessionInfo = vi.fn()
   const getToolDefinitions = vi.fn().mockReturnValue([])
 
   const buildManager = () =>
@@ -35,7 +36,7 @@ describe('AgentToolManager DeepChat settings tool gating', () => {
       configPresenter,
       runtimePort: {
         resolveConversationWorkdir,
-        resolveConversationSessionInfo: vi.fn().mockResolvedValue(null),
+        resolveConversationSessionInfo,
         getSkillPresenter: () => skillPresenter,
         getYoBrowserToolHandler: () => ({
           getToolDefinitions,
@@ -58,6 +59,7 @@ describe('AgentToolManager DeepChat settings tool gating', () => {
   beforeEach(() => {
     vi.clearAllMocks()
     resolveConversationWorkdir.mockResolvedValue(null)
+    resolveConversationSessionInfo.mockResolvedValue(null)
     skillPresenter.listSkillScripts.mockResolvedValue([])
     getToolDefinitions.mockReturnValue([])
   })
@@ -132,4 +134,65 @@ describe('AgentToolManager DeepChat settings tool gating', () => {
     expect(workdir).toBe('/tmp/new-session-workdir')
     expect(resolveConversationWorkdir).toHaveBeenCalledWith('new-session-1')
   })
+
+  it('builds a stable slotId enum for subagent_orchestrator from the session config', async () => {
+    skillPresenter.getActiveSkills.mockResolvedValue([])
+    skillPresenter.getActiveSkillsAllowedTools.mockResolvedValue([])
+    resolveConversationSessionInfo.mockResolvedValue({
+      sessionId: 'conv-1',
+      agentId: 'deepchat',
+      agentName: 'DeepChat',
+      agentType: 'deepchat',
+      providerId: 'openai',
+      modelId: 'gpt-4.1',
+      projectDir: '/tmp/workspace',
+      permissionMode: 'full_access',
+      generationSettings: null,
+      disabledAgentTools: [],
+      activeSkills: [],
+      sessionKind: 'regular',
+      parentSessionId: null,
+      subagentEnabled: true,
+      subagentMeta: null,
+      availableSubagentSlots: [
+        {
+          id: 'writer',
+          targetType: 'self',
+          displayName: 'Writer Clone',
+          description: 'Handle drafting tasks.'
+        },
+        {
+          id: 'reviewer',
+          targetType: 'agent',
+          targetAgentId: 'acp-reviewer',
+          displayName: 'ACP Reviewer',
+          description: 'Review code changes.'
+        }
+      ]
+    })
+
+    const manager = buildManager()
+    const defs = await manager.getAllToolDefinitions({
+      chatMode: 'agent',
+      supportsVision: false,
+      agentWorkspacePath: null,
+      conversationId: 'conv-1'
+    })
+
+    const subagentDef = defs.find((def) => def.function.name === 'subagent_orchestrator')
+    const slotIdSchema = (subagentDef?.function.parameters as any)?.properties?.tasks?.items
+      ?.properties?.slotId
+    const promptSchema = (subagentDef?.function.parameters as any)?.properties?.tasks?.items
+      ?.properties?.prompt
+
+    expect(slotIdSchema?.enum).toEqual(['reviewer', 'writer'])
+    expect(slotIdSchema?.description).toContain('reviewer: ACP Reviewer | target=acp-reviewer')
+    expect(slotIdSchema?.description).toContain('writer: Writer Clone | target=current agent')
+    expect(subagentDef?.function.description).toContain(
+      'inherits the same working directory as the parent session'
+    )
+    expect(promptSchema?.description).toContain(
+      'The child session uses the same working directory as the parent session'
+    )
+  })
 })
diff --git a/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts b/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts
new file mode 100644
index 000000000..555a4380b
--- /dev/null
+++ b/test/main/presenter/toolPresenter/agentTools/subagentOrchestratorTool.test.ts
@@ -0,0 +1,138 @@
+import { describe, expect, it, vi } from 'vitest'
+import type { DeepChatInternalSessionUpdate } from '@/presenter/deepchatAgentPresenter/internalSessionEvents'
+import {
+  SubagentOrchestratorTool,
+  SUBAGENT_ORCHESTRATOR_TOOL_NAME
+} from '@/presenter/toolPresenter/agentTools/subagentOrchestratorTool'
+import type { ConversationSessionInfo } from '@/presenter/toolPresenter/runtimePorts'
+
+const buildSessionInfo = (
+  overrides: Partial<ConversationSessionInfo> = {}
+): ConversationSessionInfo => ({
+  sessionId: 'parent-session',
+  agentId: 'deepchat',
+  agentName: 'DeepChat',
+  agentType: 'deepchat',
+  providerId: 'openai',
+  modelId: 'gpt-4.1',
+  projectDir: '/workspace/parent-app',
+  permissionMode: 'full_access',
+  generationSettings: null,
+  disabledAgentTools: [],
+  activeSkills: [],
+  sessionKind: 'regular',
+  parentSessionId: null,
+  subagentEnabled: true,
+  subagentMeta: null,
+  availableSubagentSlots: [
+    {
+      id: 'reviewer',
+      targetType: 'self',
+      displayName: 'Reviewer Clone',
+      description: 'Review the delegated task.'
+    }
+  ],
+  ...overrides
+})
+
+describe('SubagentOrchestratorTool', () => {
+  it('includes the parent session workdir in the child handoff', async () => {
+    let listener: ((update: DeepChatInternalSessionUpdate) => void) | null = null
+    let handoffMessage = ''
+    const resolvedWorkdir = '/workspace/resolved-parent-workdir'
+
+    const parentSession = buildSessionInfo({
+      projectDir: '/workspace/parent-session-record'
+    })
+    const childSession = buildSessionInfo({
+      sessionId: 'child-session',
+      agentName: 'Reviewer Clone',
+      projectDir: '/workspace/child-session-record',
+      sessionKind: 'subagent',
+      parentSessionId: parentSession.sessionId,
+      subagentEnabled: false,
+      availableSubagentSlots: []
+    })
+    const resolveConversationWorkdir = vi.fn().mockResolvedValue(resolvedWorkdir)
+    const createSubagentSession = vi.fn().mockResolvedValue(childSession)
+
+    const tool = new SubagentOrchestratorTool({
+      resolveConversationWorkdir,
+      resolveConversationSessionInfo: vi
+        .fn()
+        .mockImplementation(async (conversationId: string) =>
+          conversationId === parentSession.sessionId ? parentSession : childSession
+        ),
+      createSubagentSession,
+      sendConversationMessage: vi.fn(async (conversationId: string, content: string) => {
+        handoffMessage = content
+        setTimeout(() => {
+          listener?.({
+            sessionId: conversationId,
+            kind: 'blocks',
+            updatedAt: Date.now(),
+            previewMarkdown: 'Checked auth routes',
+            responseMarkdown: 'Checked auth routes\nFound no directory mismatch in code.'
+          })
+          listener?.({
+            sessionId: conversationId,
+            kind: 'status',
+            updatedAt: Date.now() + 1,
+            status: 'idle'
+          })
+        }, 0)
+      }),
+      cancelConversation: vi.fn().mockResolvedValue(undefined),
+      subscribeDeepChatSessionUpdates: vi.fn((callback) => {
+        listener = callback
+        return () => {
+          listener = null
+        }
+      }),
+      getSkillPresenter: vi.fn(() => ({})),
+      getYoBrowserToolHandler: vi.fn(() => ({})),
+      getFilePresenter: vi.fn(() => ({
+        getMimeType: vi.fn(),
+        prepareFileCompletely: vi.fn()
+      })),
+      getLlmProviderPresenter: vi.fn(() => ({
+        generateCompletionStandalone: vi.fn()
+      })),
+      createSettingsWindow: vi.fn(),
+      sendToWindow: vi.fn(),
+      getApprovedFilePaths: vi.fn(() => []),
+      consumeSettingsApproval: vi.fn(() => false)
+    } as any)
+
+    const result = await tool.call(
+      {
+        mode: 'chain',
+        tasks: [
+          {
+            slotId: 'reviewer',
+            title: 'Inspect auth flow',
+            prompt:
+              'Analyze the auth flow. A previous guess mentioned /workspace/current-project, but verify against the inherited workspace instead.',
+            expectedOutput: 'Return concise markdown findings.'
+          }
+        ]
+      },
+      parentSession.sessionId,
+      {
+        toolCallId: `${SUBAGENT_ORCHESTRATOR_TOOL_NAME}-1`
+      }
+    )
+
+    expect(resolveConversationWorkdir).toHaveBeenCalledWith(parentSession.sessionId)
+    expect(createSubagentSession).toHaveBeenCalledWith(
+      expect.objectContaining({
+        projectDir: resolvedWorkdir
+      })
+    )
+    expect(handoffMessage).toContain('Current Agent Working Directory:')
+    expect(handoffMessage).toContain(resolvedWorkdir)
+    expect(handoffMessage).not.toContain(parentSession.projectDir as string)
+    expect(handoffMessage).not.toContain(childSession.projectDir as string)
+    expect(result.content).toContain('Inspect auth flow')
+  })
+})
diff --git a/test/renderer/components/ChatPage.test.ts b/test/renderer/components/ChatPage.test.ts
index abf794b3c..195d58d56 100644
--- a/test/renderer/components/ChatPage.test.ts
+++ b/test/renderer/components/ChatPage.test.ts
@@ -30,6 +30,7 @@ const buildAssistantMessage = (content: unknown) => ({
 type SetupOptions = {
   messages?: Array<Record<string, unknown>>
   pendingInputStorePatch?: Record<string, unknown>
+  sessionKind?: 'regular' | 'subagent'
 }
 
 const setup = async (options: SetupOptions = {}) => {
@@ -42,7 +43,8 @@ const setup = async (options: SetupOptions = {}) => {
       projectDir: 'C:/repo',
       providerId: 'acp',
       modelId: 'dimcode-acp',
-      status: 'idle'
+      status: 'idle',
+      sessionKind: options.sessionKind ?? 'regular'
     },
     sendMessage: vi.fn().mockResolvedValue(undefined),
     fetchSessions: vi.fn().mockResolvedValue(undefined),
@@ -127,7 +129,16 @@ const setup = async (options: SetupOptions = {}) => {
     TooltipProvider: passthrough('TooltipProvider')
   }))
   vi.doMock('@/components/chat/ChatTopBar.vue', () => ({
-    default: passthrough('ChatTopBar')
+    default: defineComponent({
+      name: 'ChatTopBar',
+      props: {
+        isReadOnly: {
+          type: Boolean,
+          default: false
+        }
+      },
+      template: '<div class="chat-top-bar-stub" :data-read-only="String(isReadOnly)" />'
+    })
   }))
   vi.doMock('@/components/chat/MessageList.vue', () => ({
     default: defineComponent({
@@ -144,9 +155,13 @@ const setup = async (options: SetupOptions = {}) => {
         traceMessageIds: {
           type: Array,
           default: () => []
+        },
+        isReadOnly: {
+          type: Boolean,
+          default: false
         }
       },
-      template: '<div class="message-list-stub" />'
+      template: '<div class="message-list-stub" :data-read-only="String(isReadOnly)" />'
     })
   }))
   vi.doMock('@/components/chat/ChatInputBox.vue', () => ({
@@ -376,4 +391,40 @@ describe('ChatPage', () => {
       files: [file]
     })
   })
+
+  it('renders subagent sessions as read-only display mode', async () => {
+    const { wrapper } = await setup({
+      sessionKind: 'subagent',
+      messages: [
+        buildAssistantMessage([
+          {
+            type: 'action',
+            action_type: 'question_request',
+            status: 'pending',
+            tool_call: {
+              id: 'tool-1',
+              name: 'question',
+              params: '{}'
+            }
+          }
+        ])
+      ],
+      pendingInputStorePatch: {
+        queueItems: [
+          {
+            id: 'p1',
+            mode: 'queue',
+            payload: { text: 'queued', files: [] }
+          }
+        ]
+      }
+    })
+
+    expect(wrapper.find('.chat-top-bar-stub').attributes('data-read-only')).toBe('true')
+    expect(wrapper.find('.message-list-stub').attributes('data-read-only')).toBe('true')
+    expect(wrapper.find('.chat-input-box-stub').exists()).toBe(false)
+    expect(wrapper.find('.pending-input-lane-stub').exists()).toBe(false)
+    expect(wrapper.find('.chat-tool-interaction-overlay-stub').exists()).toBe(false)
+    expect(wrapper.findComponent({ name: 'ChatStatusBar' }).exists()).toBe(false)
+  })
 })
diff --git a/test/renderer/components/ChatSidePanel.test.ts b/test/renderer/components/ChatSidePanel.test.ts
index 08a3f58f8..39f2b5918 100644
--- a/test/renderer/components/ChatSidePanel.test.ts
+++ b/test/renderer/components/ChatSidePanel.test.ts
@@ -76,7 +76,7 @@ describe('ChatSidePanel', () => {
     const handler = handlers.get('yo-browser:open-requested')
     expect(handler).toBeTypeOf('function')
 
-    handler?.({}, { windowId: 7 })
+    handler?.({}, { windowId: 7, sessionId: 'session-1' })
 
     expect(sidepanelStore.openBrowser).toHaveBeenCalledTimes(1)
   })
diff --git a/test/renderer/components/ChatStatusBar.test.ts b/test/renderer/components/ChatStatusBar.test.ts
index 8f0c4938d..f63f0b175 100644
--- a/test/renderer/components/ChatStatusBar.test.ts
+++ b/test/renderer/components/ChatStatusBar.test.ts
@@ -29,6 +29,8 @@ type SetupOptions = {
   activeProviderId?: string
   activeModelId?: string
   activeProjectDir?: string | null
+  activeSessionSubagentEnabled?: boolean
+  draftSubagentEnabled?: boolean
   supportsEffort?: boolean
   setSessionModelError?: Error
   defaultModel?: { providerId: string; modelId: string } | null
@@ -268,15 +270,25 @@ const setup = async (options: SetupOptions = {}) => {
     activeSession: hasActiveSession
       ? {
           id: 's1',
+          agentId: options.agentId ?? 'deepchat',
           providerId: options.activeProviderId ?? 'openai',
           modelId: options.activeModelId ?? 'gpt-4',
           projectDir: options.activeProjectDir ?? options.projectPath ?? null,
-          status: 'idle'
+          status: 'idle',
+          sessionKind: 'regular',
+          subagentEnabled: options.activeSessionSubagentEnabled === true
         }
       : null,
     setSessionModel: options.setSessionModelError
       ? vi.fn().mockRejectedValue(options.setSessionModelError)
-      : vi.fn().mockResolvedValue(undefined)
+      : vi.fn().mockResolvedValue(undefined),
+    setSessionSubagentEnabled: vi
+      .fn()
+      .mockImplementation(async (_sessionId: string, enabled: boolean) => {
+        if (sessionStore.activeSession) {
+          sessionStore.activeSession.subagentEnabled = enabled
+        }
+      })
   })
 
   const draftStore = reactive({
@@ -291,6 +303,7 @@ const setup = async (options: SetupOptions = {}) => {
     forceInterleavedThinkingCompat: undefined as boolean | undefined,
     reasoningEffort: undefined as 'minimal' | 'low' | 'medium' | 'high' | undefined,
     verbosity: undefined as 'low' | 'medium' | 'high' | undefined,
+    subagentEnabled: options.draftSubagentEnabled === true,
     ...options.draftGenerationSettings,
     updateGenerationSettings: vi.fn((patch: Record<string, unknown>) =>
       Object.assign(draftStore, patch)
@@ -471,10 +484,14 @@ const setup = async (options: SetupOptions = {}) => {
     default: defineComponent({
       name: 'McpIndicator',
       props: {
-        showSystemPromptSection: { type: Boolean, default: false }
+        showSystemPromptSection: { type: Boolean, default: false },
+        showSubagentToggle: { type: Boolean, default: false },
+        subagentEnabled: { type: Boolean, default: false },
+        subagentTogglePending: { type: Boolean, default: false }
       },
+      emits: ['toggle-subagents'],
       template:
-        '<div class="mcp-indicator-stub" :data-show-system-prompt-section="String(showSystemPromptSection)" />'
+        '<div class="mcp-indicator-stub" :data-show-system-prompt-section="String(showSystemPromptSection)" :data-show-subagent-toggle="String(showSubagentToggle)" :data-subagent-enabled="String(subagentEnabled)" :data-subagent-toggle-pending="String(subagentTogglePending)"><button class="mcp-subagents-toggle-stub" type="button" @click="$emit(\'toggle-subagents\', !subagentEnabled)" /></div>'
     })
   }))
 
@@ -567,6 +584,50 @@ describe('ChatStatusBar model and session panels', () => {
     expect(acp.wrapper.text()).not.toContain('chat.permissionMode.fullAccess')
   })
 
+  it('routes the subagent toggle through the unified tools panel', async () => {
+    const active = await setup({
+      agentId: 'deepchat',
+      hasActiveSession: true,
+      activeSessionSubagentEnabled: true
+    })
+
+    const activeIndicator = active.wrapper.find('.mcp-indicator-stub')
+    expect(activeIndicator.attributes('data-show-subagent-toggle')).toBe('true')
+    expect(activeIndicator.attributes('data-subagent-enabled')).toBe('true')
+    expect(active.wrapper.text()).not.toContain('chat.subagents.label')
+
+    await active.wrapper.get('.mcp-subagents-toggle-stub').trigger('click')
+    await flushPromises()
+
+    expect(active.sessionStore.setSessionSubagentEnabled).toHaveBeenCalledWith('s1', false)
+
+    const draft = await setup({
+      agentId: 'deepchat',
+      hasActiveSession: false,
+      draftSubagentEnabled: false
+    })
+
+    const draftIndicator = draft.wrapper.find('.mcp-indicator-stub')
+    expect(draftIndicator.attributes('data-show-subagent-toggle')).toBe('true')
+    expect(draftIndicator.attributes('data-subagent-enabled')).toBe('false')
+
+    await draft.wrapper.get('.mcp-subagents-toggle-stub').trigger('click')
+    await flushPromises()
+
+    expect(draft.draftStore.subagentEnabled).toBe(true)
+  })
+
+  it('hides the subagent toggle for active regular sessions that are not deepchat', async () => {
+    const active = await setup({
+      agentId: 'acp-agent',
+      hasActiveSession: true,
+      activeProviderId: 'openai'
+    })
+
+    const activeIndicator = active.wrapper.find('.mcp-indicator-stub')
+    expect(activeIndicator.attributes('data-show-subagent-toggle')).toBe('false')
+  })
+
   it('renders compact model ids in the trigger and list, and keeps chevron actions for settings', async () => {
     const { wrapper } = await setup({
       agentId: 'deepchat',
diff --git a/test/renderer/components/DeepChatAgentsSettings.test.ts b/test/renderer/components/DeepChatAgentsSettings.test.ts
index 4bb88dda7..1ff914eff 100644
--- a/test/renderer/components/DeepChatAgentsSettings.test.ts
+++ b/test/renderer/components/DeepChatAgentsSettings.test.ts
@@ -663,4 +663,179 @@ describe('DeepChatAgentsSettings', () => {
       })
     )
   })
+
+  it('uses a flat target agent select for subagent slots', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {
+        subagentEnabled: true,
+        subagents: [
+          {
+            id: 'slot-current',
+            targetType: 'self',
+            displayName: 'Current',
+            description: ''
+          },
+          {
+            id: 'slot-reviewer',
+            targetType: 'agent',
+            targetAgentId: 'acp-reviewer',
+            displayName: 'Reviewer',
+            description: ''
+          }
+        ]
+      }
+    }
+    const acpAgent = {
+      id: 'acp-reviewer',
+      type: 'acp',
+      name: 'ACP Reviewer',
+      enabled: true,
+      source: 'manual',
+      protected: false,
+      description: 'ACP reviewer',
+      avatar: null,
+      config: {}
+    }
+    const uninstalledRegistryAgent = {
+      id: 'acp-uninstalled',
+      type: 'acp',
+      name: 'ACP Not Installed',
+      enabled: true,
+      source: 'registry',
+      protected: false,
+      description: 'ACP not installed',
+      avatar: null,
+      config: {},
+      installState: {
+        status: 'not_installed'
+      }
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent, acpAgent, uninstalledRegistryAgent]),
+      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()
+
+    expect(wrapper.text()).not.toContain('settings.deepchatAgents.subagentTargetType')
+
+    const targetSelects = wrapper.findAll('select')
+    expect(targetSelects).toHaveLength(2)
+    expect(targetSelects[0].text()).toContain('settings.deepchatAgents.subagentTargetSelf')
+    expect(targetSelects[0].text()).toContain('ACP Reviewer')
+    expect(targetSelects[0].text()).not.toContain('ACP Not Installed')
+
+    await targetSelects[0].setValue('acp-reviewer')
+    await targetSelects[1].setValue('__current_agent__')
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    const [, payload] = configPresenter.updateDeepChatAgent.mock.calls[0]
+    expect(payload.config.subagents).toEqual([
+      {
+        id: 'slot-current',
+        targetType: 'agent',
+        targetAgentId: 'acp-reviewer',
+        displayName: 'Current',
+        description: ''
+      },
+      {
+        id: 'slot-reviewer',
+        targetType: 'self',
+        displayName: 'Reviewer',
+        description: ''
+      }
+    ])
+  })
 })
diff --git a/test/renderer/components/McpIndicator.test.ts b/test/renderer/components/McpIndicator.test.ts
index d9570caf7..a8f0f019f 100644
--- a/test/renderer/components/McpIndicator.test.ts
+++ b/test/renderer/components/McpIndicator.test.ts
@@ -27,7 +27,7 @@ const SwitchStub = defineComponent({
   },
   emits: ['update:modelValue'],
   template:
-    '<button role="switch" :aria-label="ariaLabel" :aria-checked="String(modelValue)" :disabled="disabled" @click="$emit(\'update:modelValue\', !modelValue)"><slot /></button>'
+    '<button v-bind="$attrs" role="switch" :aria-label="ariaLabel" :aria-checked="String(modelValue)" :disabled="disabled" @click="$emit(\'update:modelValue\', !modelValue)"><slot /></button>'
 })
 
 const buildTool = (name: string, serverName: string, source: 'mcp' | 'agent' = 'agent') => ({
@@ -53,6 +53,8 @@ const setup = async (options?: {
   activeAgentId?: string
   selectedAgentId?: string
   disabledAgentTools?: string[]
+  showSubagentToggle?: boolean
+  subagentEnabled?: boolean
 }) => {
   vi.resetModules()
 
@@ -151,6 +153,7 @@ const setup = async (options?: {
           'chat.advancedSettings.systemPrompt': 'System Prompt',
           'chat.advancedSettings.systemPromptPlaceholder': 'Select preset',
           'chat.advancedSettings.currentCustomPrompt': 'Current custom',
+          'chat.subagents.label': 'subagent',
           'chat.input.mcp.title': 'Enabled MCP',
           'chat.input.mcp.empty': 'No enabled services',
           'chat.input.mcp.openSettings': 'Open MCP settings',
@@ -179,6 +182,10 @@ const setup = async (options?: {
 
   const McpIndicator = (await import('@/components/chat-input/McpIndicator.vue')).default
   const wrapper = mount(McpIndicator, {
+    props: {
+      showSubagentToggle: options?.showSubagentToggle ?? false,
+      subagentEnabled: options?.subagentEnabled ?? false
+    },
     global: {
       stubs: {
         Button: ButtonStub,
@@ -294,4 +301,23 @@ describe('McpIndicator', () => {
     expect(draftStore.disabledAgentTools).toEqual(['exec'])
     expect(newAgentPresenter.updateSessionDisabledAgentTools).not.toHaveBeenCalled()
   })
+
+  it('renders subagent as a regular tool button inside Agent Core and emits updates', async () => {
+    const { wrapper } = await setup({
+      hasActiveSession: true,
+      activeAgentId: 'deepchat',
+      showSubagentToggle: true,
+      subagentEnabled: true
+    })
+
+    expect(wrapper.text()).toContain('Agent Core')
+
+    const subagentButton = wrapper.findAll('button').find((node) => node.text() === 'subagent')
+
+    expect(subagentButton).toBeTruthy()
+
+    await subagentButton!.trigger('click')
+
+    expect(wrapper.emitted('toggle-subagents')).toEqual([[false]])
+  })
 })
diff --git a/test/renderer/components/MessageList.test.ts b/test/renderer/components/MessageList.test.ts
index 44fd9830f..419ee41d7 100644
--- a/test/renderer/components/MessageList.test.ts
+++ b/test/renderer/components/MessageList.test.ts
@@ -20,9 +20,13 @@ vi.mock('@/components/message/MessageItemUser.vue', () => ({
       message: {
         type: Object,
         required: true
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
       }
     },
-    template: '<div class="user-item">{{ message.id }}</div>'
+    template: '<div class="user-item" :data-read-only="String(isReadOnly)">{{ message.id }}</div>'
   })
 }))
 
@@ -33,9 +37,14 @@ vi.mock('@/components/message/MessageItemAssistant.vue', () => ({
       message: {
         type: Object,
         required: true
+      },
+      isReadOnly: {
+        type: Boolean,
+        default: false
       }
     },
-    template: '<div class="assistant-item">{{ message.id }}</div>'
+    template:
+      '<div class="assistant-item" :data-read-only="String(isReadOnly)">{{ message.id }}</div>'
   })
 }))
 
@@ -146,4 +155,16 @@ describe('MessageList', () => {
     })
     expect(compactedWrapper.find('.compaction-divider__label--compacting').exists()).toBe(false)
   })
+
+  it('passes read-only state down to message items', () => {
+    const wrapper = mount(MessageList, {
+      props: {
+        messages: [createMessage('u1', 'user', 1), createMessage('a1', 'assistant', 2)],
+        isReadOnly: true
+      }
+    })
+
+    expect(wrapper.find('.user-item').attributes('data-read-only')).toBe('true')
+    expect(wrapper.find('.assistant-item').attributes('data-read-only')).toBe('true')
+  })
 })
diff --git a/test/renderer/components/WorkspacePanel.test.ts b/test/renderer/components/WorkspacePanel.test.ts
index e0b574644..cafe3e452 100644
--- a/test/renderer/components/WorkspacePanel.test.ts
+++ b/test/renderer/components/WorkspacePanel.test.ts
@@ -281,6 +281,21 @@ describe('WorkspacePanel', () => {
     wrapper.unmount()
   })
 
+  it('does not render a subagent section in the workspace navigation', async () => {
+    const wrapper = mount(WorkspacePanel, {
+      props: {
+        sessionId: 's1',
+        workspacePath: 'C:/repo'
+      }
+    })
+
+    await flushPromises()
+
+    expect(wrapper.text()).not.toContain('chat.workspace.sections.subagents')
+
+    wrapper.unmount()
+  })
+
   it('starts and stops workspace watchers with panel lifecycle', async () => {
     const wrapper = mount(WorkspacePanel, {
       props: {
diff --git a/test/renderer/components/message/MessageBlockToolCall.test.ts b/test/renderer/components/message/MessageBlockToolCall.test.ts
index 4dc13aed5..1f2d42ee5 100644
--- a/test/renderer/components/message/MessageBlockToolCall.test.ts
+++ b/test/renderer/components/message/MessageBlockToolCall.test.ts
@@ -6,6 +6,9 @@ import type { DisplayAssistantMessageBlock } from '@/components/chat/messageList
 
 const originalResizeObserver = globalThis.ResizeObserver
 let resizeObserverCallback: ResizeObserverCallback | null = null
+const { selectSessionMock } = vi.hoisted(() => ({
+  selectSessionMock: vi.fn()
+}))
 
 class MockResizeObserver {
   constructor(callback: ResizeObserverCallback) {
@@ -21,13 +24,37 @@ class MockResizeObserver {
 
 vi.mock('vue-i18n', () => ({
   useI18n: () => ({
-    t: (key: string, params?: { count?: number }) => {
+    t: (key: string, params?: { count?: number; mode?: string }) => {
       if (key === 'toolCall.replacementsCount') {
         return `${params?.count ?? 0} replacements`
       }
       if (key === 'toolCall.badge.rtk') {
         return 'RTK'
       }
+      if (key === 'chat.toolCall.subagents.summary') {
+        return `${params?.mode ?? 'mode'} · ${params?.count ?? 0} localized subagents`
+      }
+      if (key === 'chat.toolCall.subagents.mode.parallel') {
+        return 'localized parallel'
+      }
+      if (key === 'chat.toolCall.subagents.mode.chain') {
+        return 'localized chain'
+      }
+      if (key === 'chat.toolCall.subagents.status.running') {
+        return 'localized running'
+      }
+      if (key === 'chat.toolCall.subagents.status.waiting_permission') {
+        return 'localized waiting permission'
+      }
+      if (key === 'chat.toolCall.subagents.status.completed') {
+        return 'localized completed'
+      }
+      if (key === 'chat.toolCall.subagents.unnamedTask') {
+        return 'Unnamed Task'
+      }
+      if (key === 'settings.deepchatAgents.unnamed') {
+        return 'Unnamed Agent'
+      }
       return key
     }
   })
@@ -39,6 +66,12 @@ vi.mock('@/stores/theme', () => ({
   })
 }))
 
+vi.mock('@/stores/ui/session', () => ({
+  useSessionStore: () => ({
+    selectSession: selectSessionMock
+  })
+}))
+
 vi.mock('markstream-vue', () => ({
   CodeBlockNode: defineComponent({
     name: 'CodeBlockNode',
@@ -76,6 +109,7 @@ const createBlock = (
 
 beforeEach(() => {
   resizeObserverCallback = null
+  selectSessionMock.mockReset()
   globalThis.ResizeObserver = MockResizeObserver as unknown as typeof ResizeObserver
 })
 
@@ -616,4 +650,113 @@ describe('MessageBlockToolCall', () => {
 
     expect(wrapper.find('[data-testid="tool-call-details"]').exists()).toBe(false)
   })
+
+  it('localizes subagent orchestrator summary and statuses', async () => {
+    const wrapper = mount(MessageBlockToolCall, {
+      props: {
+        block: createBlock({
+          status: 'loading',
+          tool_call: {
+            id: 'subagent-1',
+            name: 'subagent_orchestrator',
+            params: '{"mode":"parallel"}',
+            response: ''
+          },
+          extra: {
+            subagentProgress: JSON.stringify({
+              runId: 'run-1',
+              mode: 'parallel',
+              tasks: [
+                {
+                  taskId: 'task-1',
+                  title: 'Inspect repo',
+                  slotId: 'slot-1',
+                  sessionId: 'child-1',
+                  targetAgentName: 'ACP Coder',
+                  status: 'running',
+                  previewMarkdown: 'line 1'
+                },
+                {
+                  taskId: 'task-2',
+                  title: 'Request approval',
+                  slotId: 'slot-2',
+                  sessionId: 'child-2',
+                  targetAgentName: 'Self Clone',
+                  status: 'waiting_permission',
+                  previewMarkdown: 'line 2'
+                }
+              ]
+            })
+          }
+        })
+      }
+    })
+
+    await nextTick()
+
+    expect(wrapper.text()).toContain('localized parallel · 2 localized subagents')
+    expect(wrapper.text()).toContain('localized running')
+    expect(wrapper.text()).toContain('localized waiting permission')
+    expect(wrapper.findAll('[data-testid="subagent-task-trigger"]')).toHaveLength(2)
+    expect(wrapper.text()).not.toContain('line 1')
+    expect(wrapper.text()).not.toContain('line 2')
+    expect(wrapper.text()).not.toContain('common.open')
+
+    await wrapper.get('[data-testid="subagent-task-trigger"]').trigger('click')
+
+    expect(selectSessionMock).toHaveBeenCalledWith('child-1')
+  })
+
+  it('normalizes subagent task identifiers and fallback labels', async () => {
+    const wrapper = mount(MessageBlockToolCall, {
+      props: {
+        block: createBlock({
+          status: 'loading',
+          tool_call: {
+            id: 'subagent-2',
+            name: 'subagent_orchestrator',
+            params: '{"mode":"parallel"}',
+            response: ''
+          },
+          extra: {
+            subagentProgress: JSON.stringify({
+              runId: 'run-2',
+              mode: 'parallel',
+              tasks: [
+                {
+                  slotId: 'slot-alpha',
+                  displayName: 'Planner',
+                  sessionId: 'child-alpha',
+                  status: 'running'
+                },
+                {
+                  slotId: 'slot-beta',
+                  sessionId: null,
+                  status: 'completed'
+                },
+                {
+                  sessionId: null,
+                  status: 'completed'
+                }
+              ]
+            })
+          }
+        })
+      }
+    })
+
+    await nextTick()
+
+    const tasks = wrapper.findAll('[data-testid="subagent-task-trigger"]')
+    expect(tasks).toHaveLength(3)
+    expect(tasks[0].text()).toContain('Planner')
+    expect(tasks[1].text()).toContain('Unnamed Agent')
+    expect(tasks[1].text()).toContain('slot-beta')
+    expect(tasks[2].text()).toContain('Unnamed Agent')
+    expect(tasks[2].text()).toContain('Unnamed Task')
+
+    await tasks[0].trigger('click')
+
+    expect(selectSessionMock).toHaveBeenCalledWith('child-alpha')
+  })
 })
diff --git a/test/renderer/components/message/MessageToolbar.trace.test.ts b/test/renderer/components/message/MessageToolbar.trace.test.ts
index effd585cd..96d12437e 100644
--- a/test/renderer/components/message/MessageToolbar.trace.test.ts
+++ b/test/renderer/components/message/MessageToolbar.trace.test.ts
@@ -75,7 +75,8 @@ const baseProps = {
   isAssistant: true,
   isCapturingImage: false,
   showTrace: true,
-  isInGeneratingThread: false
+  isInGeneratingThread: false,
+  isReadOnly: false
 }
 
 const mountToolbar = () =>
@@ -113,4 +114,19 @@ describe('MessageToolbar trace button visibility', () => {
 
     expect(wrapper.find('[data-icon="lucide:bug"]').exists()).toBe(false)
   })
+
+  it('hides mutating actions in read-only mode but keeps copy', () => {
+    traceDebugEnabled = true
+    const wrapper = mount(MessageToolbar, {
+      props: {
+        ...baseProps,
+        isReadOnly: true
+      }
+    })
+
+    expect(wrapper.find('[data-icon="lucide:refresh-cw"]').exists()).toBe(false)
+    expect(wrapper.find('[data-icon="lucide:git-branch"]').exists()).toBe(false)
+    expect(wrapper.find('[data-icon="lucide:trash-2"]').exists()).toBe(false)
+    expect(wrapper.find('[data-icon="lucide:copy"]').exists()).toBe(true)
+  })
 })