diff --git a/src/main/events.ts b/src/main/events.ts
index 130c392e2..1d959c698 100644
--- a/src/main/events.ts
+++ b/src/main/events.ts
@@ -43,7 +43,8 @@ export const CONFIG_EVENTS = {
   DEFAULT_SYSTEM_PROMPT_CHANGED: 'config:default-system-prompt-changed', // Default system prompt changed event
   CUSTOM_PROMPTS_CHANGED: 'config:custom-prompts-changed', // 自定义提示词变更事件
   NOWLEDGE_MEM_CONFIG_UPDATED: 'config:nowledge-mem-config-updated', // Nowledge-mem configuration updated event
-  DEFAULT_PROJECT_PATH_CHANGED: 'config:default-project-path-changed'
+  DEFAULT_PROJECT_PATH_CHANGED: 'config:default-project-path-changed',
+  AGENTS_CHANGED: 'config:agents-changed'
 }
 
 // Provider DB（聚合 JSON）相关事件
@@ -120,6 +121,7 @@ export const WINDOW_EVENTS = {
 
 // Settings related events
 export const SETTINGS_EVENTS = {
+  READY: 'settings:ready',
   NAVIGATE: 'settings:navigate',
   CHECK_FOR_UPDATES: 'settings:check-for-updates'
 }
diff --git a/src/main/presenter/agentRepository/index.ts b/src/main/presenter/agentRepository/index.ts
new file mode 100644
index 000000000..ceb5ddc84
--- /dev/null
+++ b/src/main/presenter/agentRepository/index.ts
@@ -0,0 +1,482 @@
+import { nanoid } from 'nanoid'
+import type {
+  AcpAgentConfig,
+  AcpAgentInstallState,
+  AcpAgentState,
+  AcpManualAgent,
+  AcpRegistryAgent
+} from '@shared/presenter'
+import type {
+  Agent,
+  AgentAvatar,
+  DeepChatAgentConfig,
+  CreateDeepChatAgentInput,
+  UpdateDeepChatAgentInput
+} from '@shared/types/agent-interface'
+import type { SQLitePresenter } from '../sqlitePresenter'
+import type { AgentRow } from '../sqlitePresenter/tables/agents'
+
+type StoredAgentState = {
+  envOverride?: Record<string, string>
+  installState?: AcpAgentInstallState | null
+}
+
+type StoredAcpManualConfig = {
+  command: string
+  args?: string[]
+  env?: Record<string, string>
+}
+
+type StoredAcpRegistryConfig = {
+  version?: string
+  distribution?: AcpRegistryAgent['distribution']
+}
+
+const BUILTIN_DEEPCHAT_AGENT_ID = 'deepchat'
+
+const parseJson = <T>(raw?: string | null): T | null => {
+  if (!raw) {
+    return null
+  }
+
+  try {
+    return JSON.parse(raw) as T
+  } catch {
+    return null
+  }
+}
+
+const stringifyJson = (value: unknown): string | null => {
+  if (value === undefined || value === null) {
+    return null
+  }
+  return JSON.stringify(value)
+}
+
+const sanitizeString = (value?: string | null): string | null => {
+  const normalized = value?.trim()
+  return normalized ? normalized : null
+}
+
+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
+})
+
+export class AgentRepository {
+  constructor(private readonly sqlitePresenter: SQLitePresenter) {}
+
+  listAgents(filters?: { agentType?: 'deepchat' | 'acp'; enabled?: boolean }): Agent[] {
+    const rows = this.sqlitePresenter.agentsTable.list({
+      agentType: filters?.agentType,
+      enabled: filters?.enabled
+    })
+    return rows.map((row) => this.toAgent(row))
+  }
+
+  getAgent(agentId: string): Agent | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    return row ? this.toAgent(row) : null
+  }
+
+  getAgentType(agentId: string): 'deepchat' | 'acp' | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    return row?.agent_type ?? null
+  }
+
+  ensureBuiltinDeepChatAgent(defaults?: {
+    name?: string
+    icon?: string | null
+    avatar?: AgentAvatar | null
+    config?: DeepChatAgentConfig | null
+  }): Agent {
+    const existing = this.sqlitePresenter.agentsTable.get(BUILTIN_DEEPCHAT_AGENT_ID)
+    if (!existing) {
+      this.sqlitePresenter.agentsTable.create({
+        id: BUILTIN_DEEPCHAT_AGENT_ID,
+        agentType: 'deepchat',
+        source: 'builtin',
+        name: defaults?.name?.trim() || 'DeepChat',
+        enabled: true,
+        protected: true,
+        icon: sanitizeString(defaults?.icon),
+        avatarJson: stringifyJson(defaults?.avatar ?? null),
+        configJson: stringifyJson(defaults?.config ?? null)
+      })
+      return this.getAgent(BUILTIN_DEEPCHAT_AGENT_ID) as Agent
+    }
+
+    this.sqlitePresenter.agentsTable.update(BUILTIN_DEEPCHAT_AGENT_ID, {
+      enabled: true,
+      protected: true
+    })
+    return this.getAgent(BUILTIN_DEEPCHAT_AGENT_ID) as Agent
+  }
+
+  createDeepChatAgent(input: CreateDeepChatAgentInput): Agent {
+    const id = `deepchat-${nanoid(8)}`
+    this.sqlitePresenter.agentsTable.create({
+      id,
+      agentType: 'deepchat',
+      source: 'manual',
+      name: input.name.trim(),
+      enabled: input.enabled !== false,
+      protected: false,
+      description: sanitizeString(input.description),
+      icon: sanitizeString(input.icon),
+      avatarJson: stringifyJson(input.avatar ?? null),
+      configJson: stringifyJson(input.config ?? null)
+    })
+    return this.getAgent(id) as Agent
+  }
+
+  updateDeepChatAgent(agentId: string, updates: UpdateDeepChatAgentInput): Agent | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'deepchat') {
+      return null
+    }
+
+    const currentConfig = parseJson<DeepChatAgentConfig>(row.config_json) ?? {}
+    const nextConfig =
+      updates.config === undefined
+        ? currentConfig
+        : { ...currentConfig, ...clone(updates.config ?? {}) }
+
+    this.sqlitePresenter.agentsTable.update(agentId, {
+      name: updates.name?.trim() || row.name,
+      enabled: updates.enabled ?? row.enabled === 1,
+      description:
+        updates.description === undefined ? row.description : sanitizeString(updates.description),
+      icon: updates.icon === undefined ? row.icon : sanitizeString(updates.icon),
+      avatarJson:
+        updates.avatar === undefined ? row.avatar_json : stringifyJson(updates.avatar ?? null),
+      configJson: updates.config === undefined ? row.config_json : stringifyJson(nextConfig)
+    })
+
+    return this.getAgent(agentId)
+  }
+
+  deleteDeepChatAgent(agentId: string): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'deepchat' || row.protected === 1) {
+      return false
+    }
+
+    this.sqlitePresenter.newSessionsTable.reassignAgentId(agentId, BUILTIN_DEEPCHAT_AGENT_ID)
+    this.sqlitePresenter.agentsTable.delete(agentId)
+    return true
+  }
+
+  getDeepChatAgentConfig(agentId: string): DeepChatAgentConfig | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'deepchat') {
+      return null
+    }
+    return parseJson<DeepChatAgentConfig>(row.config_json)
+  }
+
+  resolveDeepChatAgentConfig(agentId: string): DeepChatAgentConfig {
+    const builtin = this.getDeepChatAgentConfig(BUILTIN_DEEPCHAT_AGENT_ID) ?? {}
+    if (agentId === BUILTIN_DEEPCHAT_AGENT_ID) {
+      return mergeDeepChatConfig({}, builtin)
+    }
+
+    const current = this.getDeepChatAgentConfig(agentId) ?? {}
+    return mergeDeepChatConfig(builtin, current)
+  }
+
+  listManualAcpAgents(): AcpManualAgent[] {
+    return this.sqlitePresenter.agentsTable
+      .list({ agentType: 'acp', source: 'manual' })
+      .map((row) => this.toAcpManualAgent(row))
+      .filter((agent): agent is AcpManualAgent => Boolean(agent))
+  }
+
+  getManualAcpAgent(agentId: string): AcpManualAgent | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp' || row.source !== 'manual') {
+      return null
+    }
+    return this.toAcpManualAgent(row)
+  }
+
+  createManualAcpAgent(
+    agent: Omit<AcpManualAgent, 'id' | 'source'> & { id?: string }
+  ): AcpManualAgent {
+    const id = agent.id?.trim() || nanoid(8)
+    this.sqlitePresenter.agentsTable.upsert({
+      id,
+      agentType: 'acp',
+      source: 'manual',
+      name: agent.name.trim(),
+      enabled: agent.enabled,
+      protected: false,
+      description: sanitizeString(agent.description),
+      icon: sanitizeString(agent.icon),
+      configJson: stringifyJson({
+        command: agent.command,
+        args: agent.args,
+        env: agent.env
+      } satisfies StoredAcpManualConfig),
+      stateJson: stringifyJson({})
+    })
+    return this.getManualAcpAgent(id) as AcpManualAgent
+  }
+
+  updateManualAcpAgent(
+    agentId: string,
+    updates: Partial<Omit<AcpManualAgent, 'id' | 'source'>>
+  ): AcpManualAgent | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp' || row.source !== 'manual') {
+      return null
+    }
+
+    const currentConfig = parseJson<StoredAcpManualConfig>(row.config_json) ?? { command: '' }
+    const nextConfig: StoredAcpManualConfig = {
+      command: updates.command?.trim() || currentConfig.command,
+      args: updates.args ?? currentConfig.args,
+      env: updates.env ?? currentConfig.env
+    }
+
+    this.sqlitePresenter.agentsTable.update(agentId, {
+      name: updates.name?.trim() || row.name,
+      enabled: updates.enabled ?? row.enabled === 1,
+      description:
+        updates.description === undefined ? row.description : sanitizeString(updates.description),
+      icon: updates.icon === undefined ? row.icon : sanitizeString(updates.icon),
+      configJson: stringifyJson(nextConfig)
+    })
+
+    return this.getManualAcpAgent(agentId)
+  }
+
+  removeManualAcpAgent(agentId: string): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp' || row.source !== 'manual') {
+      return false
+    }
+    this.sqlitePresenter.agentsTable.delete(agentId)
+    return true
+  }
+
+  syncRegistryAgents(
+    agents: AcpRegistryAgent[],
+    legacyStateById?: Record<string, AcpAgentState>,
+    legacyInstallStateById?: Record<string, AcpAgentInstallState>
+  ): void {
+    for (const agent of agents) {
+      const currentRow = this.sqlitePresenter.agentsTable.get(agent.id)
+      const currentState = parseJson<StoredAgentState>(currentRow?.state_json) ?? {}
+      const legacyState = legacyStateById?.[agent.id]
+      const legacyInstallState = legacyInstallStateById?.[agent.id]
+      const mergedState: StoredAgentState = {
+        envOverride: currentState.envOverride ?? legacyState?.envOverride,
+        installState: currentState.installState ?? legacyInstallState ?? null
+      }
+
+      this.sqlitePresenter.agentsTable.upsert({
+        id: agent.id,
+        agentType: 'acp',
+        source: 'registry',
+        name: agent.name,
+        enabled: currentRow ? currentRow.enabled === 1 : (legacyState?.enabled ?? false),
+        protected: false,
+        description: sanitizeString(agent.description),
+        icon: sanitizeString(agent.icon),
+        configJson: stringifyJson({
+          version: agent.version,
+          distribution: agent.distribution
+        } satisfies StoredAcpRegistryConfig),
+        stateJson: stringifyJson(mergedState),
+        createdAt: currentRow?.created_at,
+        updatedAt: Date.now()
+      })
+    }
+  }
+
+  getAcpAgentState(agentId: string): AcpAgentState | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp') {
+      return null
+    }
+
+    const state = parseJson<StoredAgentState>(row.state_json) ?? {}
+    return {
+      agentId: row.id,
+      enabled: row.enabled === 1,
+      envOverride: state.envOverride,
+      updatedAt: row.updated_at
+    }
+  }
+
+  setAgentEnabled(agentId: string, enabled: boolean): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row) {
+      return false
+    }
+    this.sqlitePresenter.agentsTable.update(agentId, { enabled })
+    return true
+  }
+
+  setAgentEnvOverride(agentId: string, env: Record<string, string>): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp') {
+      return false
+    }
+
+    const state = parseJson<StoredAgentState>(row.state_json) ?? {}
+    this.sqlitePresenter.agentsTable.update(agentId, {
+      stateJson: stringifyJson({
+        ...state,
+        envOverride: clone(env)
+      } satisfies StoredAgentState)
+    })
+    return true
+  }
+
+  getAgentInstallState(agentId: string): AcpAgentInstallState | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp') {
+      return null
+    }
+    return parseJson<StoredAgentState>(row.state_json)?.installState ?? null
+  }
+
+  setAgentInstallState(agentId: string, installState: AcpAgentInstallState | null): boolean {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp') {
+      return false
+    }
+
+    const state = parseJson<StoredAgentState>(row.state_json) ?? {}
+    this.sqlitePresenter.agentsTable.update(agentId, {
+      stateJson: stringifyJson({
+        ...state,
+        installState
+      } satisfies StoredAgentState)
+    })
+    return true
+  }
+
+  toAcpAgentConfig(
+    agentId: string,
+    preview?: Pick<AcpAgentConfig, 'command' | 'args'>
+  ): AcpAgentConfig | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp') {
+      return null
+    }
+
+    if (row.source === 'manual') {
+      const manual = this.toAcpManualAgent(row)
+      if (!manual) {
+        return null
+      }
+      return {
+        id: manual.id,
+        name: manual.name,
+        command: manual.command,
+        args: manual.args,
+        env: manual.env,
+        description: manual.description,
+        icon: manual.icon,
+        source: 'manual',
+        installState: null
+      }
+    }
+
+    if (!preview) {
+      return null
+    }
+
+    return {
+      id: row.id,
+      name: row.name,
+      command: preview.command,
+      args: preview.args,
+      description: row.description ?? undefined,
+      icon: row.icon ?? undefined,
+      source: 'registry',
+      installState: this.getAgentInstallState(row.id)
+    }
+  }
+
+  getAcpRegistryOverlay(agentId: string): {
+    enabled: boolean
+    envOverride?: Record<string, string>
+    installState?: AcpAgentInstallState | null
+  } | null {
+    const row = this.sqlitePresenter.agentsTable.get(agentId)
+    if (!row || row.agent_type !== 'acp' || row.source !== 'registry') {
+      return null
+    }
+    const state = parseJson<StoredAgentState>(row.state_json) ?? {}
+    return {
+      enabled: row.enabled === 1,
+      envOverride: state.envOverride,
+      installState: state.installState ?? null
+    }
+  }
+
+  private toAcpManualAgent(row: AgentRow): AcpManualAgent | null {
+    const config = parseJson<StoredAcpManualConfig>(row.config_json)
+    if (!config?.command) {
+      return null
+    }
+
+    return {
+      id: row.id,
+      name: row.name,
+      command: config.command,
+      args: config.args,
+      env: config.env,
+      enabled: row.enabled === 1,
+      description: row.description ?? undefined,
+      icon: row.icon ?? undefined,
+      source: 'manual'
+    }
+  }
+
+  private toAgent(row: AgentRow): Agent {
+    return {
+      id: row.id,
+      name: row.name,
+      type: row.agent_type,
+      agentType: row.agent_type,
+      enabled: row.enabled === 1,
+      protected: row.protected === 1,
+      icon: row.icon ?? undefined,
+      description: row.description ?? undefined,
+      source: row.source,
+      avatar: parseJson<AgentAvatar>(row.avatar_json),
+      config:
+        row.agent_type === 'deepchat'
+          ? (parseJson<DeepChatAgentConfig>(row.config_json) ?? null)
+          : null,
+      installState: this.getAgentInstallState(row.id)
+    }
+  }
+}
+
+export { BUILTIN_DEEPCHAT_AGENT_ID }
diff --git a/src/main/presenter/configPresenter/index.ts b/src/main/presenter/configPresenter/index.ts
index 3c0dc6852..12a9a7fb9 100644
--- a/src/main/presenter/configPresenter/index.ts
+++ b/src/main/presenter/configPresenter/index.ts
@@ -53,11 +53,19 @@ import { AcpRegistryService } from './acpRegistryService'
 import { AcpLaunchSpecService } from './acpLaunchSpecService'
 import { AcpProvider } from '../llmProviderPresenter/providers/acpProvider'
 import { resolveAcpAgentAlias } from './acpRegistryConstants'
+import { AgentRepository, BUILTIN_DEEPCHAT_AGENT_ID } from '../agentRepository'
 import type {
   HookEventName,
   HookTestResult,
   HooksNotificationsSettings
 } from '@shared/hooksNotifications'
+import type {
+  Agent,
+  AgentType,
+  CreateDeepChatAgentInput,
+  DeepChatAgentConfig,
+  UpdateDeepChatAgentInput
+} from '@shared/types/agent-interface'
 import {
   createDefaultHooksNotificationsConfig,
   normalizeHooksNotificationsConfig
@@ -97,6 +105,7 @@ interface IAppSettings {
   defaultVisionModel?: { providerId: string; modelId: string } // Default vision model for image tools
   defaultProjectPath?: string | null
   acpRegistryMigrationVersion?: number
+  unifiedAgentsMigrationVersion?: number
   [key: string]: unknown // Allow arbitrary keys, using unknown type instead of any
 }
 
@@ -116,6 +125,7 @@ const defaultProviders = DEFAULT_PROVIDERS.map((provider) => ({
 }))
 
 const PROVIDERS_STORE_KEY = 'providers'
+const UNIFIED_AGENTS_MIGRATION_VERSION = 1
 type AnthropicLegacyProvider = LLM_PROVIDER & { authMode?: 'apikey' | 'oauth' }
 type ModelSelection = { providerId: string; modelId: string }
 type AnthropicModelSettingKey = 'defaultModel' | 'assistantModel' | 'defaultVisionModel'
@@ -197,6 +207,7 @@ export class ConfigPresenter implements IConfigPresenter {
   private providerModelHelper: ProviderModelHelper
   private systemPromptHelper: SystemPromptHelper
   private uiSettingsHelper: UiSettingsHelper
+  private agentRepository: AgentRepository | null = null
   // Custom prompts cache for high-frequency read operations
   private customPromptsCache: Prompt[] | null = null
 
@@ -296,6 +307,7 @@ export class ConfigPresenter implements IConfigPresenter {
     void this.acpRegistryService
       .initialize()
       .then(() => {
+        this.syncRegistryAgentsToRepository()
         this.notifyAcpAgentsChanged()
       })
       .catch((error) => {
@@ -347,6 +359,119 @@ export class ConfigPresenter implements IConfigPresenter {
     }
   }
 
+  setAgentRepository(agentRepository: AgentRepository): void {
+    this.agentRepository = agentRepository
+    this.initializeUnifiedAgents()
+  }
+
+  private getAgentRepositoryOrThrow(): AgentRepository {
+    if (!this.agentRepository) {
+      throw new Error('Unified agent repository is not attached.')
+    }
+    return this.agentRepository
+  }
+
+  private initializeUnifiedAgents(): void {
+    const repository = this.getAgentRepositoryOrThrow()
+
+    repository.ensureBuiltinDeepChatAgent({
+      name: 'DeepChat',
+      config: this.buildLegacyBuiltinDeepChatConfig()
+    })
+
+    const migratedVersion = this.getSetting<number>('unifiedAgentsMigrationVersion') ?? 0
+    if (migratedVersion < UNIFIED_AGENTS_MIGRATION_VERSION) {
+      this.acpConfHelper.getManualAgents().forEach((agent) => {
+        repository.createManualAcpAgent(agent)
+      })
+
+      this.syncRegistryAgentsToRepository(
+        this.acpConfHelper.getRegistryStates(),
+        this.acpConfHelper.getInstallStates()
+      )
+      this.store.set('unifiedAgentsMigrationVersion', UNIFIED_AGENTS_MIGRATION_VERSION)
+      return
+    }
+
+    this.syncRegistryAgentsToRepository()
+  }
+
+  private buildLegacyBuiltinDeepChatConfig(): DeepChatAgentConfig {
+    const defaultModel = this.store.get('defaultModel') as ModelSelection | undefined
+    const assistantModel = this.store.get('assistantModel') as ModelSelection | undefined
+    const visionModel = this.store.get('defaultVisionModel') as ModelSelection | undefined
+    const autoCompactionEnabled = this.store.get('autoCompactionEnabled')
+    const autoCompactionTriggerThreshold = this.store.get('autoCompactionTriggerThreshold')
+    const autoCompactionRetainRecentPairs = this.store.get('autoCompactionRetainRecentPairs')
+
+    return {
+      defaultModelPreset:
+        defaultModel?.providerId && defaultModel?.modelId
+          ? {
+              providerId: defaultModel.providerId,
+              modelId: defaultModel.modelId
+            }
+          : null,
+      assistantModel:
+        assistantModel?.providerId && assistantModel?.modelId
+          ? {
+              providerId: assistantModel.providerId,
+              modelId: assistantModel.modelId
+            }
+          : null,
+      visionModel:
+        visionModel?.providerId && visionModel?.modelId
+          ? {
+              providerId: visionModel.providerId,
+              modelId: visionModel.modelId
+            }
+          : null,
+      systemPrompt: (this.store.get('default_system_prompt') as string | undefined) ?? '',
+      permissionMode: 'full_access',
+      disabledAgentTools: [],
+      autoCompactionEnabled:
+        typeof autoCompactionEnabled === 'boolean' ? autoCompactionEnabled : true,
+      autoCompactionTriggerThreshold:
+        typeof autoCompactionTriggerThreshold === 'number' ? autoCompactionTriggerThreshold : 80,
+      autoCompactionRetainRecentPairs:
+        typeof autoCompactionRetainRecentPairs === 'number' ? autoCompactionRetainRecentPairs : 2
+    }
+  }
+
+  private syncRegistryAgentsToRepository(
+    legacyStateById?: Record<string, AcpAgentState>,
+    legacyInstallStateById?: Record<string, AcpAgentInstallState>
+  ): void {
+    if (!this.agentRepository) {
+      return
+    }
+
+    try {
+      this.agentRepository.syncRegistryAgents(
+        this.acpRegistryService.listAgents(),
+        legacyStateById,
+        legacyInstallStateById
+      )
+    } catch (error) {
+      console.warn('[Agents] Failed to sync ACP registry agents into sqlite:', error)
+    }
+  }
+
+  private getBuiltinDeepChatConfig(): DeepChatAgentConfig {
+    return this.agentRepository?.resolveDeepChatAgentConfig(BUILTIN_DEEPCHAT_AGENT_ID) ?? {}
+  }
+
+  private updateBuiltinDeepChatConfig(updates: Partial<DeepChatAgentConfig>): void {
+    if (!this.agentRepository) {
+      return
+    }
+
+    this.agentRepository.updateDeepChatAgent(BUILTIN_DEEPCHAT_AGENT_ID, {
+      config: updates
+    })
+    this.notifyAcpAgentsChanged()
+  }
+
   private initProviderModelsDir(): void {
     const modelsDir = path.join(this.userDataPath, PROVIDER_MODELS_DIR)
     if (!fs.existsSync(modelsDir)) {
@@ -648,6 +773,20 @@ export class ConfigPresenter implements IConfigPresenter {
 
   getSetting<T>(key: string): T | undefined {
     try {
+      if (this.agentRepository) {
+        if (key === 'defaultModel') {
+          return this.getDefaultModel() as T | undefined
+        }
+        if (key === 'assistantModel') {
+          return this.getBuiltinDeepChatConfig().assistantModel as T | undefined
+        }
+        if (key === 'defaultVisionModel') {
+          return this.getDefaultVisionModel() as T | undefined
+        }
+        if (key === 'default_system_prompt') {
+          return this.getBuiltinDeepChatConfig().systemPrompt as T | undefined
+        }
+      }
       return this.store.get(key) as T
     } catch (error) {
       console.error(`[Config] Failed to get setting ${key}:`, error)
@@ -657,6 +796,31 @@ export class ConfigPresenter implements IConfigPresenter {
 
   setSetting<T>(key: string, value: T): void {
     try {
+      if (this.agentRepository) {
+        if (key === 'defaultModel') {
+          this.setDefaultModel(value as { providerId: string; modelId: string } | undefined)
+          return
+        }
+        if (key === 'assistantModel') {
+          this.updateBuiltinDeepChatConfig({
+            assistantModel: value as { providerId: string; modelId: string } | null | undefined
+          })
+          eventBus.sendToMain(CONFIG_EVENTS.SETTING_CHANGED, key, value)
+          return
+        }
+        if (key === 'defaultVisionModel') {
+          this.setDefaultVisionModel(value as { providerId: string; modelId: string } | undefined)
+          return
+        }
+        if (key === 'default_system_prompt') {
+          this.updateBuiltinDeepChatConfig({
+            systemPrompt: typeof value === 'string' ? value : ''
+          })
+          eventBus.sendToMain(CONFIG_EVENTS.SETTING_CHANGED, key, value)
+          return
+        }
+      }
+
       this.store.set(key, value)
       // Trigger setting change event (main process internal use only)
       eventBus.sendToMain(CONFIG_EVENTS.SETTING_CHANGED, key, value)
@@ -1082,27 +1246,42 @@ export class ConfigPresenter implements IConfigPresenter {
   }
 
   getAutoCompactionEnabled(): boolean {
-    return this.uiSettingsHelper.getAutoCompactionEnabled()
+    return (
+      this.getBuiltinDeepChatConfig().autoCompactionEnabled ??
+      this.uiSettingsHelper.getAutoCompactionEnabled()
+    )
   }
 
   setAutoCompactionEnabled(enabled: boolean): void {
-    this.uiSettingsHelper.setAutoCompactionEnabled(enabled)
+    this.updateBuiltinDeepChatConfig({
+      autoCompactionEnabled: Boolean(enabled)
+    })
   }
 
   getAutoCompactionTriggerThreshold(): number {
-    return this.uiSettingsHelper.getAutoCompactionTriggerThreshold()
+    return (
+      this.getBuiltinDeepChatConfig().autoCompactionTriggerThreshold ??
+      this.uiSettingsHelper.getAutoCompactionTriggerThreshold()
+    )
   }
 
   setAutoCompactionTriggerThreshold(threshold: number): void {
-    this.uiSettingsHelper.setAutoCompactionTriggerThreshold(threshold)
+    this.updateBuiltinDeepChatConfig({
+      autoCompactionTriggerThreshold: threshold
+    })
   }
 
   getAutoCompactionRetainRecentPairs(): number {
-    return this.uiSettingsHelper.getAutoCompactionRetainRecentPairs()
+    return (
+      this.getBuiltinDeepChatConfig().autoCompactionRetainRecentPairs ??
+      this.uiSettingsHelper.getAutoCompactionRetainRecentPairs()
+    )
   }
 
   setAutoCompactionRetainRecentPairs(count: number): void {
-    this.uiSettingsHelper.setAutoCompactionRetainRecentPairs(count)
+    this.updateBuiltinDeepChatConfig({
+      autoCompactionRetainRecentPairs: count
+    })
   }
 
   getContentProtectionEnabled(): boolean {
@@ -1255,23 +1434,27 @@ export class ConfigPresenter implements IConfigPresenter {
 
   // ===================== ACP configuration methods =====================
   async listAcpRegistryAgents(): Promise<AcpRegistryAgent[]> {
+    this.syncRegistryAgentsToRepository()
     const registryAgents = this.acpRegistryService.listAgents()
-    const registryStates = this.acpConfHelper.getRegistryStates()
-    const installStates = this.acpConfHelper.getInstallStates()
 
     return registryAgents.map((agent) => {
-      const state = registryStates[agent.id]
+      const overlay = this.agentRepository?.getAcpRegistryOverlay(agent.id) ?? {
+        enabled: this.acpConfHelper.getRegistryStates()[agent.id]?.enabled ?? false,
+        envOverride: this.acpConfHelper.getRegistryStates()[agent.id]?.envOverride,
+        installState: this.acpConfHelper.getInstallStates()[agent.id] ?? null
+      }
       return {
         ...agent,
-        enabled: state?.enabled ?? false,
-        envOverride: state?.envOverride,
-        installState: installStates[agent.id] ?? null
+        enabled: overlay.enabled,
+        envOverride: overlay.envOverride,
+        installState: overlay.installState ?? null
       }
     })
   }
 
   async refreshAcpRegistry(force = true): Promise<AcpRegistryAgent[]> {
     await this.acpRegistryService.refresh(force)
+    this.syncRegistryAgentsToRepository()
     const agents = await this.listAcpRegistryAgents()
     this.notifyAcpAgentsChanged()
     return agents
@@ -1282,12 +1465,12 @@ export class ConfigPresenter implements IConfigPresenter {
   }
 
   async getAcpAgentState(agentId: string): Promise<AcpAgentState | null> {
-    return this.acpConfHelper.getAgentState(agentId)
+    return this.agentRepository?.getAcpAgentState(resolveAcpAgentAlias(agentId)) ?? null
   }
 
   async setAcpAgentEnabled(agentId: string, enabled: boolean): Promise<void> {
     const resolvedId = resolveAcpAgentAlias(agentId)
-    this.acpConfHelper.setAgentEnabled(resolvedId, enabled)
+    this.getAgentRepositoryOrThrow().setAgentEnabled(resolvedId, enabled)
     this.handleAcpAgentsMutated([resolvedId])
 
     if (enabled) {
@@ -1299,17 +1482,17 @@ export class ConfigPresenter implements IConfigPresenter {
 
   async setAcpAgentEnvOverride(agentId: string, env: Record<string, string>): Promise<void> {
     const resolvedId = resolveAcpAgentAlias(agentId)
-    const installState = this.acpConfHelper.getInstallState(resolvedId)
+    const installState = this.getAgentRepositoryOrThrow().getAgentInstallState(resolvedId)
     if (installState?.status !== 'installed') {
       throw new Error(`ACP registry agent is not installed: ${resolvedId}`)
     }
-    this.acpConfHelper.setAgentEnvOverride(resolvedId, env)
+    this.getAgentRepositoryOrThrow().setAgentEnvOverride(resolvedId, env)
     this.handleAcpAgentsMutated([resolvedId])
   }
 
   async ensureAcpAgentInstalled(agentId: string): Promise<AcpAgentInstallState> {
     const registryAgent = this.getRegistryAgentOrThrow(agentId)
-    const currentState = this.acpConfHelper.getInstallState(registryAgent.id)
+    const currentState = this.getAgentRepositoryOrThrow().getAgentInstallState(registryAgent.id)
     const installingState: AcpAgentInstallState = {
       status: 'installing',
       version: registryAgent.version,
@@ -1320,7 +1503,7 @@ export class ConfigPresenter implements IConfigPresenter {
       installDir: currentState?.installDir ?? null,
       error: null
     }
-    this.acpConfHelper.setInstallState(registryAgent.id, installingState)
+    this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, installingState)
     this.notifyAcpAgentsChanged()
 
     try {
@@ -1328,7 +1511,7 @@ export class ConfigPresenter implements IConfigPresenter {
         registryAgent,
         currentState
       )
-      this.acpConfHelper.setInstallState(registryAgent.id, installedState)
+      this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, installedState)
       this.notifyAcpAgentsChanged()
       return installedState
     } catch (error) {
@@ -1342,7 +1525,7 @@ export class ConfigPresenter implements IConfigPresenter {
         installDir: currentState?.installDir ?? null,
         error: error instanceof Error ? error.message : String(error)
       }
-      this.acpConfHelper.setInstallState(registryAgent.id, failedState)
+      this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, failedState)
       this.notifyAcpAgentsChanged()
       throw error
     }
@@ -1350,7 +1533,7 @@ export class ConfigPresenter implements IConfigPresenter {
 
   async repairAcpAgent(agentId: string): Promise<AcpAgentInstallState> {
     const registryAgent = this.getRegistryAgentOrThrow(agentId)
-    const currentState = this.acpConfHelper.getInstallState(registryAgent.id)
+    const currentState = this.getAgentRepositoryOrThrow().getAgentInstallState(registryAgent.id)
     const repairingState: AcpAgentInstallState = {
       status: 'installing',
       version: registryAgent.version,
@@ -1361,7 +1544,7 @@ export class ConfigPresenter implements IConfigPresenter {
       installDir: currentState?.installDir ?? null,
       error: null
     }
-    this.acpConfHelper.setInstallState(registryAgent.id, repairingState)
+    this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, repairingState)
     this.notifyAcpAgentsChanged()
 
     try {
@@ -1370,7 +1553,7 @@ export class ConfigPresenter implements IConfigPresenter {
         currentState,
         { repair: true }
       )
-      this.acpConfHelper.setInstallState(registryAgent.id, installedState)
+      this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, installedState)
       this.handleAcpAgentsMutated([registryAgent.id])
       return installedState
     } catch (error) {
@@ -1384,24 +1567,24 @@ export class ConfigPresenter implements IConfigPresenter {
         installDir: currentState?.installDir ?? null,
         error: error instanceof Error ? error.message : String(error)
       }
-      this.acpConfHelper.setInstallState(registryAgent.id, failedState)
+      this.getAgentRepositoryOrThrow().setAgentInstallState(registryAgent.id, failedState)
       this.notifyAcpAgentsChanged()
       throw error
     }
   }
 
   async getAcpAgentInstallStatus(agentId: string): Promise<AcpAgentInstallState | null> {
-    return this.acpConfHelper.getInstallState(agentId)
+    return this.agentRepository?.getAgentInstallState(resolveAcpAgentAlias(agentId)) ?? null
   }
 
   async listManualAcpAgents(): Promise<AcpManualAgent[]> {
-    return this.acpConfHelper.getManualAgents()
+    return this.getAgentRepositoryOrThrow().listManualAcpAgents()
   }
 
   async addManualAcpAgent(
     agent: Omit<AcpManualAgent, 'id' | 'source'> & { id?: string }
   ): Promise<AcpManualAgent> {
-    const created = this.acpConfHelper.addManualAgent(agent)
+    const created = this.getAgentRepositoryOrThrow().createManualAcpAgent(agent)
     this.handleAcpAgentsMutated([created.id])
     return created
   }
@@ -1410,7 +1593,7 @@ export class ConfigPresenter implements IConfigPresenter {
     agentId: string,
     updates: Partial<Omit<AcpManualAgent, 'id' | 'source'>>
   ): Promise<AcpManualAgent | null> {
-    const updated = this.acpConfHelper.updateManualAgent(agentId, updates)
+    const updated = this.getAgentRepositoryOrThrow().updateManualAcpAgent(agentId, updates)
     if (updated) {
       this.handleAcpAgentsMutated([updated.id])
     }
@@ -1418,7 +1601,7 @@ export class ConfigPresenter implements IConfigPresenter {
   }
 
   async removeManualAcpAgent(agentId: string): Promise<boolean> {
-    const removed = this.acpConfHelper.removeManualAgent(agentId)
+    const removed = this.getAgentRepositoryOrThrow().removeManualAcpAgent(agentId)
     if (removed) {
       this.handleAcpAgentsMutated([agentId])
     }
@@ -1449,15 +1632,13 @@ export class ConfigPresenter implements IConfigPresenter {
 
   async resolveAcpLaunchSpec(agentId: string, _workdir?: string): Promise<AcpResolvedLaunchSpec> {
     const resolvedId = resolveAcpAgentAlias(agentId)
-    const manualAgent = this.acpConfHelper
-      .getManualAgents()
-      .find((agent) => agent.id === resolvedId)
+    const manualAgent = this.getAgentRepositoryOrThrow().getManualAcpAgent(resolvedId)
     if (manualAgent) {
       return this.acpLaunchSpecService.resolveManualLaunchSpec(manualAgent)
     }
 
     const registryAgent = this.getRegistryAgentOrThrow(resolvedId)
-    const installState = this.acpConfHelper.getInstallState(registryAgent.id)
+    const installState = this.getAgentRepositoryOrThrow().getAgentInstallState(registryAgent.id)
     const launchSpec = await this.acpLaunchSpecService.resolveRegistryLaunchSpec(
       registryAgent,
       installState
@@ -1472,7 +1653,7 @@ export class ConfigPresenter implements IConfigPresenter {
       installDir: launchSpec.installDir ?? null,
       error: null
     }
-    this.acpConfHelper.setInstallState(resolvedId, nextInstallState)
+    this.getAgentRepositoryOrThrow().setAgentInstallState(resolvedId, nextInstallState)
     return launchSpec
   }
 
@@ -1485,6 +1666,53 @@ export class ConfigPresenter implements IConfigPresenter {
     this.handleAcpAgentsMutated()
   }
 
+  async listAgents(): Promise<Agent[]> {
+    return this.getAgentRepositoryOrThrow().listAgents()
+  }
+
+  async getAgent(agentId: string): Promise<Agent | null> {
+    return this.getAgentRepositoryOrThrow().getAgent(agentId)
+  }
+
+  async getAgentType(agentId: string): Promise<AgentType | null> {
+    return this.getAgentRepositoryOrThrow().getAgentType(agentId)
+  }
+
+  async getDeepChatAgentConfig(agentId: string): Promise<DeepChatAgentConfig | null> {
+    return this.getAgentRepositoryOrThrow().getDeepChatAgentConfig(agentId)
+  }
+
+  async resolveDeepChatAgentConfig(agentId: string): Promise<DeepChatAgentConfig> {
+    return this.getAgentRepositoryOrThrow().resolveDeepChatAgentConfig(
+      agentId || BUILTIN_DEEPCHAT_AGENT_ID
+    )
+  }
+
+  async createDeepChatAgent(input: CreateDeepChatAgentInput): Promise<Agent> {
+    const created = this.getAgentRepositoryOrThrow().createDeepChatAgent(input)
+    this.notifyAcpAgentsChanged()
+    return created
+  }
+
+  async updateDeepChatAgent(
+    agentId: string,
+    updates: UpdateDeepChatAgentInput
+  ): Promise<Agent | null> {
+    const updated = this.getAgentRepositoryOrThrow().updateDeepChatAgent(agentId, updates)
+    if (updated) {
+      this.notifyAcpAgentsChanged()
+    }
+    return updated
+  }
+
+  async deleteDeepChatAgent(agentId: string): Promise<boolean> {
+    const removed = this.getAgentRepositoryOrThrow().deleteDeepChatAgent(agentId)
+    if (removed) {
+      this.notifyAcpAgentsChanged()
+    }
+    return removed
+  }
+
   async getAgentMcpSelections(agentId: string, isBuiltin?: boolean): Promise<string[]> {
     return await this.acpConfHelper.getAgentMcpSelections(agentId, isBuiltin)
   }
@@ -1572,6 +1800,7 @@ export class ConfigPresenter implements IConfigPresenter {
   private notifyAcpAgentsChanged() {
     console.log('[ACP] notifyAcpAgentsChanged: sending MODEL_LIST_CHANGED event for provider "acp"')
     eventBus.sendToRenderer(CONFIG_EVENTS.MODEL_LIST_CHANGED, SendTarget.ALL_WINDOWS, 'acp')
+    eventBus.sendToRenderer(CONFIG_EVENTS.AGENTS_CHANGED, SendTarget.ALL_WINDOWS)
     eventBus.sendToRenderer(SESSION_EVENTS.LIST_UPDATED, SendTarget.ALL_WINDOWS)
   }
 
@@ -2060,19 +2289,53 @@ export class ConfigPresenter implements IConfigPresenter {
   }
 
   getDefaultModel(): { providerId: string; modelId: string } | undefined {
-    return this.getSetting<{ providerId: string; modelId: string }>('defaultModel')
+    const selection = this.getBuiltinDeepChatConfig().defaultModelPreset
+    if (selection?.providerId && selection?.modelId) {
+      return {
+        providerId: selection.providerId,
+        modelId: selection.modelId
+      }
+    }
+    return this.store.get('defaultModel') as { providerId: string; modelId: string } | undefined
   }
 
   setDefaultModel(model: { providerId: string; modelId: string } | undefined): void {
-    this.setSetting('defaultModel', model)
+    this.updateBuiltinDeepChatConfig({
+      defaultModelPreset:
+        model?.providerId && model?.modelId
+          ? {
+              providerId: model.providerId,
+              modelId: model.modelId
+            }
+          : null
+    })
+    eventBus.sendToMain(CONFIG_EVENTS.SETTING_CHANGED, 'defaultModel', model)
   }
 
   getDefaultVisionModel(): { providerId: string; modelId: string } | undefined {
-    return this.getSetting<{ providerId: string; modelId: string }>('defaultVisionModel')
+    const selection = this.getBuiltinDeepChatConfig().visionModel
+    if (selection?.providerId && selection?.modelId) {
+      return {
+        providerId: selection.providerId,
+        modelId: selection.modelId
+      }
+    }
+    return this.store.get('defaultVisionModel') as
+      | { providerId: string; modelId: string }
+      | undefined
   }
 
   setDefaultVisionModel(model: { providerId: string; modelId: string } | undefined): void {
-    this.setSetting('defaultVisionModel', model)
+    this.updateBuiltinDeepChatConfig({
+      visionModel:
+        model?.providerId && model?.modelId
+          ? {
+              providerId: model.providerId,
+              modelId: model.modelId
+            }
+          : null
+    })
+    eventBus.sendToMain(CONFIG_EVENTS.SETTING_CHANGED, 'defaultVisionModel', model)
   }
 
   getDefaultProjectPath(): string | null {
diff --git a/src/main/presenter/deepchatAgentPresenter/compactionService.ts b/src/main/presenter/deepchatAgentPresenter/compactionService.ts
index 3057f8b4a..aa107c373 100644
--- a/src/main/presenter/deepchatAgentPresenter/compactionService.ts
+++ b/src/main/presenter/deepchatAgentPresenter/compactionService.ts
@@ -3,7 +3,8 @@ import type {
   ChatMessageRecord,
   SendMessageInput,
   AssistantMessageBlock,
-  MessageMetadata
+  MessageMetadata,
+  DeepChatAgentConfig
 } from '@shared/types/agent-interface'
 import type { IConfigPresenter, ILlmProviderPresenter } from '@shared/presenter'
 import type { DeepChatMessageStore } from './messageStore'
@@ -198,10 +199,13 @@ export class CompactionService {
     private readonly sessionStore: DeepChatSessionStore,
     private readonly messageStore: DeepChatMessageStore,
     private readonly llmProviderPresenter: ILlmProviderPresenter,
-    private readonly configPresenter: IConfigPresenter
+    private readonly configPresenter: IConfigPresenter,
+    private readonly resolveSessionConfig: (
+      sessionId: string
+    ) => Promise<DeepChatAgentConfig> = async () => ({})
   ) {}
 
-  prepareForNextUserTurn(params: {
+  async prepareForNextUserTurn(params: {
     sessionId: string
     providerId: string
     modelId: string
@@ -211,8 +215,8 @@ export class CompactionService {
     supportsVision: boolean
     preserveInterleavedReasoning: boolean
     newUserContent: string | SendMessageInput
-  }): CompactionIntent | null {
-    const settings = this.getCompactionSettings()
+  }): Promise<CompactionIntent | null> {
+    const settings = await this.getCompactionSettings(params.sessionId)
     if (!settings.enabled) {
       return null
     }
@@ -231,7 +235,7 @@ export class CompactionService {
     })
   }
 
-  prepareForResumeTurn(params: {
+  async prepareForResumeTurn(params: {
     sessionId: string
     messageId: string
     providerId: string
@@ -241,8 +245,8 @@ export class CompactionService {
     reserveTokens: number
     supportsVision: boolean
     preserveInterleavedReasoning: boolean
-  }): CompactionIntent | null {
-    const settings = this.getCompactionSettings()
+  }): Promise<CompactionIntent | null> {
+    const settings = await this.getCompactionSettings(params.sessionId)
     if (!settings.enabled) {
       return null
     }
@@ -278,6 +282,7 @@ export class CompactionService {
   async applyCompaction(intent: CompactionIntent): Promise<CompactionExecutionResult> {
     try {
       const nextSummary = await this.generateRollingSummary({
+        sessionId: intent.sessionId,
         previousSummary: intent.previousState.summaryText,
         summaryBlocks: intent.summaryBlocks,
         currentModel: intent.currentModel,
@@ -393,11 +398,12 @@ export class CompactionService {
     }
   }
 
-  private getCompactionSettings(): CompactionSettings {
+  private async getCompactionSettings(sessionId: string): Promise<CompactionSettings> {
+    const config = await this.resolveSessionConfig(sessionId)
     return {
-      enabled: this.configPresenter.getAutoCompactionEnabled(),
-      triggerThreshold: this.configPresenter.getAutoCompactionTriggerThreshold(),
-      retainRecentPairs: this.configPresenter.getAutoCompactionRetainRecentPairs()
+      enabled: config.autoCompactionEnabled ?? true,
+      triggerThreshold: config.autoCompactionTriggerThreshold ?? 80,
+      retainRecentPairs: config.autoCompactionRetainRecentPairs ?? 2
     }
   }
 
@@ -414,10 +420,11 @@ export class CompactionService {
     }
   }
 
-  private getAssistantModelSpec(currentModel: ModelSpec): ModelSpec | null {
-    const assistantModel = this.configPresenter.getSetting<{ providerId: string; modelId: string }>(
-      'assistantModel'
-    )
+  private async getAssistantModelSpec(
+    sessionId: string,
+    currentModel: ModelSpec
+  ): Promise<ModelSpec | null> {
+    const assistantModel = (await this.resolveSessionConfig(sessionId)).assistantModel
     const providerId = assistantModel?.providerId?.trim()
     const modelId = assistantModel?.modelId?.trim()
     if (!providerId || !modelId) {
@@ -484,13 +491,14 @@ export class CompactionService {
   }
 
   private async generateRollingSummary(params: {
+    sessionId: string
     previousSummary: string | null
     summaryBlocks: string[]
     currentModel: ModelSpec
     reserveTokens: number
   }): Promise<string> {
     const currentModel = params.currentModel
-    const assistantModel = this.getAssistantModelSpec(currentModel)
+    const assistantModel = await this.getAssistantModelSpec(params.sessionId, currentModel)
     const previousSummaryTokens = approximateTokenSize(params.previousSummary || '')
     const blockTokens = params.summaryBlocks.reduce(
       (total, block) => total + approximateTokenSize(block),
diff --git a/src/main/presenter/deepchatAgentPresenter/index.ts b/src/main/presenter/deepchatAgentPresenter/index.ts
index 949460e37..4775c67a4 100644
--- a/src/main/presenter/deepchatAgentPresenter/index.ts
+++ b/src/main/presenter/deepchatAgentPresenter/index.ts
@@ -151,7 +151,11 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
       this.sessionStore,
       this.messageStore,
       this.llmProviderPresenter,
-      this.configPresenter
+      this.configPresenter,
+      async (sessionId) => {
+        const agentId = this.getSessionAgentId(sessionId) ?? 'deepchat'
+        return await this.configPresenter.resolveDeepChatAgentConfig(agentId)
+      }
     )
     this.toolOutputGuard = new ToolOutputGuard()
     this.hooksBridge = hooksBridge
@@ -388,7 +392,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
         think: false
       }
 
-      const compactionIntent = this.compactionService.prepareForNextUserTurn({
+      const compactionIntent = await this.compactionService.prepareForNextUserTurn({
         sessionId,
         providerId: state.providerId,
         modelId: state.modelId,
@@ -2997,7 +3001,7 @@ export class DeepChatAgentPresenter implements IAgentImplementation {
     supportsVision: boolean
     preserveInterleavedReasoning: boolean
   }): Promise<SessionSummaryState> {
-    const intent = this.compactionService.prepareForResumeTurn(params)
+    const intent = await this.compactionService.prepareForResumeTurn(params)
     return await this.applyCompactionIntent(params.sessionId, intent)
   }
 
diff --git a/src/main/presenter/floatingButtonPresenter/layout.ts b/src/main/presenter/floatingButtonPresenter/layout.ts
index 1bc0703dd..b8a9ea358 100644
--- a/src/main/presenter/floatingButtonPresenter/layout.ts
+++ b/src/main/presenter/floatingButtonPresenter/layout.ts
@@ -55,7 +55,7 @@ export function buildFloatingWidgetSnapshot(
   expanded: boolean
 ): FloatingWidgetSnapshot {
   const mappedSessions: FloatingWidgetSessionItem[] = sessions
-    .filter((session) => session.agentId === 'deepchat' && !session.isDraft)
+    .filter((session) => session.providerId !== 'acp' && !session.isDraft)
     .map((session) => ({
       id: session.id,
       title: session.title.trim(),
diff --git a/src/main/presenter/index.ts b/src/main/presenter/index.ts
index 8f01bb612..88236e504 100644
--- a/src/main/presenter/index.ts
+++ b/src/main/presenter/index.ts
@@ -66,6 +66,8 @@ import { NewSessionHooksBridge } from './hooksNotifications/newSessionBridge'
 import { NewAgentPresenter } from './newAgentPresenter'
 import { DeepChatAgentPresenter } from './deepchatAgentPresenter'
 import { ProjectPresenter } from './projectPresenter'
+import { AgentRepository } from './agentRepository'
+import type { SQLitePresenter } from './sqlitePresenter'
 
 // IPC调用上下文接口
 interface IPCCallContext {
@@ -126,6 +128,12 @@ export class Presenter implements IPresenter {
     const context = lifecycleManager.getLifecycleContext()
     this.configPresenter = context.config as IConfigPresenter
     this.sqlitePresenter = context.database as ISQLitePresenter
+    const agentRepository = new AgentRepository(this.sqlitePresenter as unknown as SQLitePresenter)
+    ;(
+      this.configPresenter as IConfigPresenter & {
+        setAgentRepository?: (repository: AgentRepository) => void
+      }
+    ).setAgentRepository?.(agentRepository)
 
     // 初始化各个 Presenter 实例及其依赖
     this.windowPresenter = new WindowPresenter(this.configPresenter)
diff --git a/src/main/presenter/lifecyclePresenter/hooks/ready/eventListenerSetupHook.ts b/src/main/presenter/lifecyclePresenter/hooks/ready/eventListenerSetupHook.ts
index d87d045cb..8a13972bb 100644
--- a/src/main/presenter/lifecyclePresenter/hooks/ready/eventListenerSetupHook.ts
+++ b/src/main/presenter/lifecyclePresenter/hooks/ready/eventListenerSetupHook.ts
@@ -89,13 +89,6 @@ export const eventListenerSetupHook: LifecycleHook = {
 
         navigateToAbout()
         triggerUpdateCheck()
-
-        setTimeout(() => {
-          if (presenter.windowPresenter.getSettingsWindowId() === settingsWindowId) {
-            navigateToAbout()
-            triggerUpdateCheck()
-          }
-        }, 250)
       } catch (error) {
         console.error(
           'eventListenerSetupHook: Failed to route tray update check to settings window:',
diff --git a/src/main/presenter/newAgentPresenter/index.ts b/src/main/presenter/newAgentPresenter/index.ts
index 2e2313ae6..5920a302c 100644
--- a/src/main/presenter/newAgentPresenter/index.ts
+++ b/src/main/presenter/newAgentPresenter/index.ts
@@ -104,19 +104,50 @@ export class NewAgentPresenter {
   async createSession(input: CreateSessionInput, webContentsId: number): Promise<SessionWithState> {
     const agentId = input.agentId || 'deepchat'
     console.log(`[NewAgentPresenter] createSession agent=${agentId} webContentsId=${webContentsId}`)
-    const projectDir = input.projectDir?.trim() ? input.projectDir.trim() : null
     const normalizedInput = this.normalizeCreateSessionInput(input)
+    const agentType = await this.getAgentType(agentId)
+    const deepChatAgentConfig =
+      agentType === 'deepchat'
+        ? await this.configPresenter.resolveDeepChatAgentConfig(agentId)
+        : null
+    const projectDir =
+      input.projectDir?.trim() ||
+      deepChatAgentConfig?.defaultProjectPath?.trim() ||
+      this.configPresenter.getDefaultProjectPath() ||
+      null
     const disabledAgentTools =
-      agentId === 'deepchat' ? this.normalizeDisabledAgentTools(input.disabledAgentTools) : []
+      agentType === 'deepchat'
+        ? this.normalizeDisabledAgentTools(
+            input.disabledAgentTools ?? deepChatAgentConfig?.disabledAgentTools
+          )
+        : []
 
     const agent = await this.resolveAgentImplementation(agentId)
 
     // Resolve provider/model
     const defaultModel = this.configPresenter.getDefaultModel()
-    const providerId = input.providerId ?? defaultModel?.providerId ?? ''
-    const modelId = input.modelId ?? defaultModel?.modelId ?? ''
+    const providerId =
+      input.providerId ??
+      deepChatAgentConfig?.defaultModelPreset?.providerId ??
+      defaultModel?.providerId ??
+      ''
+    const modelId =
+      input.modelId ??
+      deepChatAgentConfig?.defaultModelPreset?.modelId ??
+      defaultModel?.modelId ??
+      ''
     const permissionMode: PermissionMode =
-      input.permissionMode === 'default' ? 'default' : 'full_access'
+      input.permissionMode !== undefined
+        ? input.permissionMode === 'default'
+          ? 'default'
+          : 'full_access'
+        : deepChatAgentConfig?.permissionMode === 'default'
+          ? 'default'
+          : 'full_access'
+    const generationSettings = this.mergeDeepChatDefaultGenerationSettings(
+      deepChatAgentConfig,
+      input.generationSettings
+    )
     console.log(`[NewAgentPresenter] resolved provider=${providerId} model=${modelId}`)
 
     if (!providerId || !modelId) {
@@ -147,8 +178,8 @@ export class NewAgentPresenter {
       projectDir,
       permissionMode
     }
-    if (input.generationSettings) {
-      initConfig.generationSettings = input.generationSettings
+    if (generationSettings) {
+      initConfig.generationSettings = generationSettings
     }
     try {
       await this.initializeSessionRuntime(agent, sessionId, initConfig)
@@ -284,8 +315,7 @@ export class NewAgentPresenter {
     const state = await agent.getSessionState(sessionId)
     let providerId = state?.providerId ?? ''
     if (!providerId) {
-      const acpAgents = await this.configPresenter.getAcpAgents()
-      if (acpAgents.some((item) => item.id === session.agentId)) {
+      if ((await this.getAgentType(session.agentId)) === 'acp') {
         providerId = 'acp'
       }
     }
@@ -339,8 +369,7 @@ export class NewAgentPresenter {
 
     let providerId = (await agent.getSessionState(sessionId))?.providerId ?? ''
     if (!providerId) {
-      const acpAgents = await this.configPresenter.getAcpAgents()
-      if (acpAgents.some((item) => item.id === currentSession.agentId)) {
+      if ((await this.getAgentType(currentSession.agentId)) === 'acp') {
         providerId = 'acp'
       }
     }
@@ -753,19 +782,20 @@ export class NewAgentPresenter {
     return this.messageManager.getMessage(messageId)
   }
 
-  async translateText(text: string, locale?: string): Promise<string> {
+  async translateText(text: string, locale?: string, agentId?: string): Promise<string> {
     const input = text?.trim()
     if (!input) {
       return ''
     }
 
-    const assistantModel = this.configPresenter.getSetting<{
-      providerId: string
-      modelId: string
-    }>('assistantModel')
     const defaultModel = this.configPresenter.getDefaultModel()
-    const providerId = assistantModel?.providerId || defaultModel?.providerId || ''
-    const modelId = assistantModel?.modelId || defaultModel?.modelId || ''
+    const assistantSelection = await this.resolveAssistantModelSelection(
+      agentId ?? 'deepchat',
+      defaultModel?.providerId || '',
+      defaultModel?.modelId || ''
+    )
+    const providerId = assistantSelection.providerId
+    const modelId = assistantSelection.modelId
     if (!providerId || !modelId) {
       throw new Error('No provider or model configured. Please set a default model in settings.')
     }
@@ -818,24 +848,12 @@ export class NewAgentPresenter {
   }
 
   async getAgents(): Promise<Agent[]> {
-    const builtins = this.agentRegistry.getAll()
-    const acpAgents = await this.configPresenter.getAcpAgents()
-    const acpList: Agent[] = acpAgents.map((agent) => ({
-      id: agent.id,
-      name: agent.name,
-      type: 'acp',
-      enabled: true,
-      icon: agent.icon,
-      description: agent.description,
-      source: agent.source,
-      installState: agent.installState ?? null
-    }))
-
-    const map = new Map<string, Agent>()
-    for (const item of [...builtins, ...acpList]) {
-      map.set(item.id, item)
-    }
-    return Array.from(map.values())
+    const [agents, acpEnabled] = await Promise.all([
+      this.configPresenter.listAgents(),
+      this.configPresenter.getAcpEnabled()
+    ])
+
+    return agents.filter((agent) => agent.type === 'deepchat' || acpEnabled)
   }
 
   async renameSession(sessionId: string, title: string): Promise<void> {
@@ -895,7 +913,7 @@ export class NewAgentPresenter {
     const providerId = state?.providerId?.trim() ?? ''
     const modelId = state?.modelId?.trim() ?? ''
 
-    const conversation = this.buildExportConversation(
+    const conversation = await this.buildExportConversation(
       session,
       providerId,
       modelId,
@@ -919,8 +937,7 @@ export class NewAgentPresenter {
     const state = await agent.getSessionState(sessionId)
     let providerId = state?.providerId ?? ''
     if (!providerId) {
-      const acpAgents = await this.configPresenter.getAcpAgents()
-      if (acpAgents.some((item) => item.id === session.agentId)) {
+      if ((await this.getAgentType(session.agentId)) === 'acp') {
         providerId = 'acp'
       }
     }
@@ -1041,8 +1058,7 @@ export class NewAgentPresenter {
       throw new Error('setSessionModel requires providerId and modelId.')
     }
 
-    const acpAgents = await this.configPresenter.getAcpAgents()
-    if (session.agentId !== 'deepchat' && acpAgents.some((item) => item.id === session.agentId)) {
+    if ((await this.getAgentType(session.agentId)) === 'acp') {
       throw new Error('ACP session model is locked.')
     }
 
@@ -1141,12 +1157,13 @@ export class NewAgentPresenter {
       const titleMessages = this.buildTitleMessages(records)
       if (titleMessages.length === 0) return
 
-      const assistantModel = this.configPresenter.getSetting<{
-        providerId: string
-        modelId: string
-      }>('assistantModel')
-      const preferredProviderId = assistantModel?.providerId || fallbackProviderId
-      const preferredModelId = assistantModel?.modelId || fallbackModelId
+      const assistantSelection = await this.resolveAssistantModelSelection(
+        currentSession.agentId,
+        fallbackProviderId,
+        fallbackModelId
+      )
+      const preferredProviderId = assistantSelection.providerId
+      const preferredModelId = assistantSelection.modelId
 
       let generatedTitle: string
       try {
@@ -1242,9 +1259,8 @@ export class NewAgentPresenter {
       return this.agentRegistry.resolve(resolvedAgentId)
     }
 
-    const acpAgents = await this.configPresenter.getAcpAgents()
-    const isAcpAgent = acpAgents.some((agent) => agent.id === resolvedAgentId)
-    if (isAcpAgent) {
+    const agentType = await this.getAgentType(resolvedAgentId)
+    if (agentType === 'deepchat' || agentType === 'acp') {
       return this.agentRegistry.resolve('deepchat')
     }
 
@@ -1253,20 +1269,63 @@ export class NewAgentPresenter {
 
   private async assertAcpAgent(agentId: string): Promise<void> {
     const resolvedAgentId = resolveAcpAgentAlias(agentId)
-    const acpAgents = await this.configPresenter.getAcpAgents()
-    if (!acpAgents.some((agent) => agent.id === resolvedAgentId)) {
+    if ((await this.getAgentType(resolvedAgentId)) !== 'acp') {
       throw new Error(`Agent ${agentId} is not an ACP agent.`)
     }
   }
 
+  private async getAgentType(agentId: string): Promise<'deepchat' | 'acp' | null> {
+    return await this.configPresenter.getAgentType(resolveAcpAgentAlias(agentId))
+  }
+
+  private async resolveAssistantModelSelection(
+    agentId: string,
+    fallbackProviderId: string,
+    fallbackModelId: string
+  ): Promise<{ providerId: string; modelId: string }> {
+    if ((await this.getAgentType(agentId)) === 'deepchat') {
+      const config = await this.configPresenter.resolveDeepChatAgentConfig(agentId)
+      const providerId = config.assistantModel?.providerId?.trim()
+      const modelId = config.assistantModel?.modelId?.trim()
+      if (providerId && modelId) {
+        return {
+          providerId,
+          modelId
+        }
+      }
+    }
+
+    return {
+      providerId: fallbackProviderId,
+      modelId: fallbackModelId
+    }
+  }
+
+  private mergeDeepChatDefaultGenerationSettings(
+    config: Awaited<ReturnType<IConfigPresenter['resolveDeepChatAgentConfig']>> | null,
+    overrides?: Partial<SessionGenerationSettings>
+  ): Partial<SessionGenerationSettings> | undefined {
+    const defaults: Partial<SessionGenerationSettings> = {}
+
+    if (typeof config?.systemPrompt === 'string') {
+      defaults.systemPrompt = config.systemPrompt
+    }
+
+    const merged = {
+      ...defaults,
+      ...overrides
+    }
+
+    return Object.keys(merged).length > 0 ? merged : undefined
+  }
+
   private async isAcpBackedSession(sessionId: string, agentId: string): Promise<boolean> {
     const resolvedAgentId = resolveAcpAgentAlias(agentId)
     const agent = await this.resolveAgentImplementation(agentId)
     const state = await agent.getSessionState(sessionId)
     let providerId = state?.providerId ?? ''
     if (!providerId) {
-      const acpAgents = await this.configPresenter.getAcpAgents()
-      if (acpAgents.some((item) => item.id === resolvedAgentId)) {
+      if ((await this.getAgentType(resolvedAgentId)) === 'acp') {
         providerId = 'acp'
       }
     }
@@ -1407,14 +1466,15 @@ export class NewAgentPresenter {
     this.sessionManager.delete(sessionId)
   }
 
-  private buildExportConversation(
+  private async buildExportConversation(
     session: SessionRecord,
     providerId: string,
     modelId: string,
     generationSettings: SessionGenerationSettings | null
-  ): CONVERSATION {
-    const resolvedProviderId = providerId || (session.agentId !== 'deepchat' ? 'acp' : '')
-    const resolvedModelId = modelId || (session.agentId !== 'deepchat' ? session.agentId : '')
+  ): Promise<CONVERSATION> {
+    const isAcpAgent = (await this.getAgentType(session.agentId)) === 'acp'
+    const resolvedProviderId = providerId || (isAcpAgent ? 'acp' : '')
+    const resolvedModelId = modelId || (isAcpAgent ? session.agentId : '')
     const modelConfig =
       resolvedProviderId && resolvedModelId
         ? this.configPresenter.getModelConfig(resolvedModelId, resolvedProviderId)
diff --git a/src/main/presenter/sqlitePresenter/index.ts b/src/main/presenter/sqlitePresenter/index.ts
index 3591c8b14..1d41056a4 100644
--- a/src/main/presenter/sqlitePresenter/index.ts
+++ b/src/main/presenter/sqlitePresenter/index.ts
@@ -23,6 +23,7 @@ import { DeepChatMessageSearchResultsTable } from './tables/deepchatMessageSearc
 import { DeepChatPendingInputsTable } from './tables/deepchatPendingInputs'
 import { DeepChatUsageStatsTable } from './tables/deepchatUsageStats'
 import { LegacyImportStatusTable } from './tables/legacyImportStatus'
+import { AgentsTable } from './tables/agents'
 
 /**
  * 导入模式枚举
@@ -48,6 +49,7 @@ export class SQLitePresenter implements ISQLitePresenter {
   public deepchatPendingInputsTable!: DeepChatPendingInputsTable
   public deepchatUsageStatsTable!: DeepChatUsageStatsTable
   public legacyImportStatusTable!: LegacyImportStatusTable
+  public agentsTable!: AgentsTable
   private currentVersion: number = 0
   private dbPath: string
   private password?: string
@@ -168,6 +170,7 @@ export class SQLitePresenter implements ISQLitePresenter {
     this.deepchatPendingInputsTable = new DeepChatPendingInputsTable(this.db)
     this.deepchatUsageStatsTable = new DeepChatUsageStatsTable(this.db)
     this.legacyImportStatusTable = new LegacyImportStatusTable(this.db)
+    this.agentsTable = new AgentsTable(this.db)
 
     // Create only active tables for the new stack.
     this.acpSessionsTable.createTable()
@@ -181,6 +184,7 @@ export class SQLitePresenter implements ISQLitePresenter {
     this.deepchatPendingInputsTable.createTable()
     this.deepchatUsageStatsTable.createTable()
     this.legacyImportStatusTable.createTable()
+    this.agentsTable.createTable()
   }
 
   private initVersionTable() {
@@ -212,7 +216,8 @@ export class SQLitePresenter implements ISQLitePresenter {
       this.deepchatMessageSearchResultsTable,
       this.deepchatPendingInputsTable,
       this.deepchatUsageStatsTable,
-      this.legacyImportStatusTable
+      this.legacyImportStatusTable,
+      this.agentsTable
     ]
 
     // 获取最新的迁移版本
diff --git a/src/main/presenter/sqlitePresenter/tables/agents.ts b/src/main/presenter/sqlitePresenter/tables/agents.ts
new file mode 100644
index 000000000..d18153a4e
--- /dev/null
+++ b/src/main/presenter/sqlitePresenter/tables/agents.ts
@@ -0,0 +1,262 @@
+import Database from 'better-sqlite3-multiple-ciphers'
+import { BaseTable } from './baseTable'
+
+export interface AgentRow {
+  id: string
+  agent_type: 'deepchat' | 'acp'
+  source: 'builtin' | 'manual' | 'registry'
+  name: string
+  enabled: number
+  protected: number
+  description: string | null
+  icon: string | null
+  avatar_json: string | null
+  config_json: string | null
+  state_json: string | null
+  created_at: number
+  updated_at: number
+}
+
+type AgentCreateInput = {
+  id: string
+  agentType: AgentRow['agent_type']
+  source: AgentRow['source']
+  name: string
+  enabled?: boolean
+  protected?: boolean
+  description?: string | null
+  icon?: string | null
+  avatarJson?: string | null
+  configJson?: string | null
+  stateJson?: string | null
+  createdAt?: number
+  updatedAt?: number
+}
+
+type AgentUpdateInput = Partial<{
+  name: string
+  enabled: boolean
+  protected: boolean
+  description: string | null
+  icon: string | null
+  avatarJson: string | null
+  configJson: string | null
+  stateJson: string | null
+}>
+
+export class AgentsTable extends BaseTable {
+  constructor(db: Database.Database) {
+    super(db, 'agents')
+  }
+
+  getCreateTableSQL(): string {
+    return `
+      CREATE TABLE IF NOT EXISTS agents (
+        id TEXT PRIMARY KEY,
+        agent_type TEXT NOT NULL,
+        source TEXT NOT NULL,
+        name TEXT NOT NULL,
+        enabled INTEGER NOT NULL DEFAULT 1,
+        protected INTEGER NOT NULL DEFAULT 0,
+        description TEXT,
+        icon TEXT,
+        avatar_json TEXT,
+        config_json TEXT,
+        state_json TEXT,
+        created_at INTEGER NOT NULL,
+        updated_at INTEGER NOT NULL
+      );
+      CREATE INDEX IF NOT EXISTS idx_agents_type ON agents(agent_type);
+      CREATE INDEX IF NOT EXISTS idx_agents_enabled ON agents(enabled);
+    `
+  }
+
+  getMigrationSQL(version: number): string | null {
+    if (version === 20) {
+      return this.getCreateTableSQL()
+    }
+    return null
+  }
+
+  getLatestVersion(): number {
+    return 20
+  }
+
+  create(input: AgentCreateInput): void {
+    const now = Date.now()
+    const createdAt = input.createdAt ?? now
+    const updatedAt = input.updatedAt ?? createdAt
+    this.db
+      .prepare(
+        `INSERT INTO agents (
+          id,
+          agent_type,
+          source,
+          name,
+          enabled,
+          protected,
+          description,
+          icon,
+          avatar_json,
+          config_json,
+          state_json,
+          created_at,
+          updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      )
+      .run(
+        input.id,
+        input.agentType,
+        input.source,
+        input.name,
+        input.enabled === false ? 0 : 1,
+        input.protected ? 1 : 0,
+        input.description ?? null,
+        input.icon ?? null,
+        input.avatarJson ?? null,
+        input.configJson ?? null,
+        input.stateJson ?? null,
+        createdAt,
+        updatedAt
+      )
+  }
+
+  upsert(input: AgentCreateInput): void {
+    const now = Date.now()
+    const createdAt = input.createdAt ?? now
+    const updatedAt = input.updatedAt ?? now
+    this.db
+      .prepare(
+        `INSERT INTO agents (
+          id,
+          agent_type,
+          source,
+          name,
+          enabled,
+          protected,
+          description,
+          icon,
+          avatar_json,
+          config_json,
+          state_json,
+          created_at,
+          updated_at
+        ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+        ON CONFLICT(id) DO UPDATE SET
+          agent_type = excluded.agent_type,
+          source = excluded.source,
+          name = excluded.name,
+          enabled = excluded.enabled,
+          protected = excluded.protected,
+          description = excluded.description,
+          icon = excluded.icon,
+          avatar_json = excluded.avatar_json,
+          config_json = excluded.config_json,
+          state_json = excluded.state_json,
+          updated_at = excluded.updated_at`
+      )
+      .run(
+        input.id,
+        input.agentType,
+        input.source,
+        input.name,
+        input.enabled === false ? 0 : 1,
+        input.protected ? 1 : 0,
+        input.description ?? null,
+        input.icon ?? null,
+        input.avatarJson ?? null,
+        input.configJson ?? null,
+        input.stateJson ?? null,
+        createdAt,
+        updatedAt
+      )
+  }
+
+  get(id: string): AgentRow | undefined {
+    return this.db.prepare('SELECT * FROM agents WHERE id = ?').get(id) as AgentRow | undefined
+  }
+
+  list(filters?: {
+    agentType?: AgentRow['agent_type']
+    source?: AgentRow['source']
+    enabled?: boolean
+  }): AgentRow[] {
+    let sql = 'SELECT * FROM agents'
+    const conditions: string[] = []
+    const params: unknown[] = []
+
+    if (filters?.agentType) {
+      conditions.push('agent_type = ?')
+      params.push(filters.agentType)
+    }
+
+    if (filters?.source) {
+      conditions.push('source = ?')
+      params.push(filters.source)
+    }
+
+    if (typeof filters?.enabled === 'boolean') {
+      conditions.push('enabled = ?')
+      params.push(filters.enabled ? 1 : 0)
+    }
+
+    if (conditions.length > 0) {
+      sql += ` WHERE ${conditions.join(' AND ')}`
+    }
+
+    sql += ' ORDER BY protected DESC, updated_at DESC, created_at ASC'
+    return this.db.prepare(sql).all(...params) as AgentRow[]
+  }
+
+  update(id: string, input: AgentUpdateInput): void {
+    const updates: string[] = []
+    const params: unknown[] = []
+
+    if (Object.prototype.hasOwnProperty.call(input, 'name')) {
+      updates.push('name = ?')
+      params.push(input.name)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'enabled')) {
+      updates.push('enabled = ?')
+      params.push(input.enabled ? 1 : 0)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'protected')) {
+      updates.push('protected = ?')
+      params.push(input.protected ? 1 : 0)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'description')) {
+      updates.push('description = ?')
+      params.push(input.description ?? null)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'icon')) {
+      updates.push('icon = ?')
+      params.push(input.icon ?? null)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'avatarJson')) {
+      updates.push('avatar_json = ?')
+      params.push(input.avatarJson ?? null)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'configJson')) {
+      updates.push('config_json = ?')
+      params.push(input.configJson ?? null)
+    }
+    if (Object.prototype.hasOwnProperty.call(input, 'stateJson')) {
+      updates.push('state_json = ?')
+      params.push(input.stateJson ?? null)
+    }
+
+    if (updates.length === 0) {
+      return
+    }
+
+    updates.push('updated_at = ?')
+    params.push(Date.now())
+    params.push(id)
+
+    this.db.prepare(`UPDATE agents SET ${updates.join(', ')} WHERE id = ?`).run(...params)
+  }
+
+  delete(id: string): void {
+    this.db.prepare('DELETE FROM agents WHERE id = ?').run(id)
+  }
+}
diff --git a/src/main/presenter/sqlitePresenter/tables/newSessions.ts b/src/main/presenter/sqlitePresenter/tables/newSessions.ts
index 1f91bfa00..b700dd35a 100644
--- a/src/main/presenter/sqlitePresenter/tables/newSessions.ts
+++ b/src/main/presenter/sqlitePresenter/tables/newSessions.ts
@@ -231,6 +231,12 @@ export class NewSessionsTable extends BaseTable {
     this.update(id, { disabled_agent_tools: JSON.stringify(disabledAgentTools) })
   }
 
+  reassignAgentId(fromAgentId: string, toAgentId: string): void {
+    this.db
+      .prepare('UPDATE new_sessions SET agent_id = ?, updated_at = ? WHERE agent_id = ?')
+      .run(toAgentId, Date.now(), fromAgentId)
+  }
+
   private parseActiveSkills(raw: string | null | undefined): string[] {
     return this.parseStringArray(raw)
   }
diff --git a/src/main/presenter/windowPresenter/index.ts b/src/main/presenter/windowPresenter/index.ts
index 6b1ff811b..94532ad1d 100644
--- a/src/main/presenter/windowPresenter/index.ts
+++ b/src/main/presenter/windowPresenter/index.ts
@@ -13,13 +13,24 @@ import iconWin from '../../../../resources/icon.ico?asset' // App icon (Windows)
 import { is } from '@electron-toolkit/utils' // Electron utilities
 import { IConfigPresenter, IWindowPresenter } from '@shared/presenter' // Window Presenter interface
 import { eventBus } from '@/eventbus' // Event bus
-import { CONFIG_EVENTS, SHORTCUT_EVENTS, SYSTEM_EVENTS, WINDOW_EVENTS } from '@/events' // System/Window/Config/Shortcut event constants
+import {
+  CONFIG_EVENTS,
+  SETTINGS_EVENTS,
+  SHORTCUT_EVENTS,
+  SYSTEM_EVENTS,
+  WINDOW_EVENTS
+} from '@/events' // System/Window/Config/Shortcut event constants
 import { presenter } from '../' // Global presenter registry
 import windowStateManager from 'electron-window-state' // Window state manager
 // TrayPresenter is globally managed in main/index.ts, this Presenter is not responsible for its lifecycle
 import { TabPresenter } from '../tabPresenter' // TabPresenter type
 import { FloatingChatWindow } from './FloatingChatWindow' // Floating chat window
 
+type PendingSettingsMessage = {
+  channel: string
+  args: unknown[]
+}
+
 /**
  * Window Presenter, responsible for managing all BrowserWindow instances and their lifecycles.
  * Including creation, destruction, minimization, maximization, hiding, showing, focus management, and interaction with tabs.
@@ -36,6 +47,8 @@ export class WindowPresenter implements IWindowPresenter {
   private mainWindowId: number | null = null
   private floatingChatWindow: FloatingChatWindow | null = null
   private settingsWindow: BrowserWindow | null = null
+  private settingsWindowReady = false
+  private pendingSettingsMessages: PendingSettingsMessage[] = []
 
   constructor(configPresenter: IConfigPresenter) {
     this.windows = new Map()
@@ -95,6 +108,10 @@ export class WindowPresenter implements IWindowPresenter {
       }
     })
 
+    ipcMain.on(SETTINGS_EVENTS.READY, (event) => {
+      this.handleSettingsWindowReady(event.sender.id)
+    })
+
     // 监听系统主题更新事件，通知所有窗口 Renderer
     eventBus.on(SYSTEM_EVENTS.SYSTEM_THEME_UPDATED, (isDark: boolean) => {
       console.log('System theme updated, notifying all windows.')
@@ -426,6 +443,10 @@ export class WindowPresenter implements IWindowPresenter {
       !this.settingsWindow.isDestroyed() &&
       this.settingsWindow.id === windowId
     ) {
+      if (this.shouldQueueSettingsMessage(channel)) {
+        this.pendingSettingsMessages.push({ channel, args })
+        return true
+      }
       try {
         this.settingsWindow.webContents.send(channel, ...args)
         return true
@@ -1220,6 +1241,7 @@ export class WindowPresenter implements IWindowPresenter {
     }
 
     this.settingsWindow = settingsWindow
+    this.resetSettingsWindowState()
     const windowId = settingsWindow.id
 
     // Manage window state to track position and size changes
@@ -1256,11 +1278,18 @@ export class WindowPresenter implements IWindowPresenter {
       }
     })
 
+    settingsWindow.webContents.on('did-start-loading', () => {
+      if (this.settingsWindow?.id === windowId) {
+        this.settingsWindowReady = false
+      }
+    })
+
     settingsWindow.on('closed', () => {
       console.log(`Settings window ${windowId} closed.`)
       // Unmanage window state when window is closed
       settingsWindowState.unmanage()
       this.settingsWindow = null
+      this.resetSettingsWindowState(true)
     })
 
     // Load settings renderer HTML
@@ -1318,6 +1347,53 @@ export class WindowPresenter implements IWindowPresenter {
     return this.settingsWindow !== null && !this.settingsWindow.isDestroyed()
   }
 
+  private shouldQueueSettingsMessage(channel: string): boolean {
+    return channel.startsWith('settings:') && !this.settingsWindowReady
+  }
+
+  private handleSettingsWindowReady(senderWebContentsId: number): void {
+    if (
+      !this.settingsWindow ||
+      this.settingsWindow.isDestroyed() ||
+      this.settingsWindow.webContents.isDestroyed() ||
+      this.settingsWindow.webContents.id !== senderWebContentsId
+    ) {
+      return
+    }
+
+    this.settingsWindowReady = true
+    this.flushPendingSettingsMessages()
+  }
+
+  private flushPendingSettingsMessages(): void {
+    if (
+      !this.settingsWindow ||
+      this.settingsWindow.isDestroyed() ||
+      this.settingsWindow.webContents.isDestroyed() ||
+      !this.settingsWindowReady ||
+      this.pendingSettingsMessages.length === 0
+    ) {
+      return
+    }
+
+    const pending = [...this.pendingSettingsMessages]
+    this.pendingSettingsMessages = []
+    pending.forEach(({ channel, args }) => {
+      try {
+        this.settingsWindow?.webContents.send(channel, ...args)
+      } catch (error) {
+        console.error(`Error flushing settings message "${channel}":`, error)
+      }
+    })
+  }
+
+  private resetSettingsWindowState(clearQueue = false): void {
+    this.settingsWindowReady = false
+    if (clearQueue) {
+      this.pendingSettingsMessages = []
+    }
+  }
+
   public isApplicationQuitting(): boolean {
     return this.isQuitting
   }
diff --git a/src/renderer/settings/App.vue b/src/renderer/settings/App.vue
index 4988aca60..4ccc31704 100644
--- a/src/renderer/settings/App.vue
+++ b/src/renderer/settings/App.vue
@@ -124,6 +124,10 @@ const handleSettingsNavigate = async (
 if (window?.electron?.ipcRenderer) {
   window.electron.ipcRenderer.on(SETTINGS_EVENTS.NAVIGATE, handleSettingsNavigate)
 }
+
+const notifySettingsReady = () => {
+  window.electron?.ipcRenderer?.send(SETTINGS_EVENTS.READY)
+}
 const settings: Ref<
   {
     title: string
@@ -285,6 +289,7 @@ onMounted(async () => {
 
   // Wait for router to be ready
   await router.isReady()
+  notifySettingsReady()
 
   // Check for pending MCP install from localStorage
   try {
diff --git a/src/renderer/settings/components/CommonSettings.vue b/src/renderer/settings/components/CommonSettings.vue
index bb4a8d8ca..46510f768 100644
--- a/src/renderer/settings/components/CommonSettings.vue
+++ b/src/renderer/settings/components/CommonSettings.vue
@@ -2,8 +2,6 @@
   <ScrollArea class="w-full h-full">
     <div class="w-full h-full flex flex-col gap-3 p-4">
       <UploadFileSettingsSection />
-      <DefaultModelSettingsSection />
-      <AutoCompactionSettingsSection />
       <ProxySettingsSection />
       <SettingToggleRow
         id="auto-scroll-switch"
@@ -36,12 +34,10 @@ import { computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { ScrollArea } from '@shadcn/components/ui/scroll-area'
 import { useUiSettingsStore } from '@/stores/uiSettingsStore'
-import AutoCompactionSettingsSection from './common/AutoCompactionSettingsSection.vue'
 import ProxySettingsSection from './common/ProxySettingsSection.vue'
 import LoggingSettingsSection from './common/LoggingSettingsSection.vue'
 import SettingToggleRow from './common/SettingToggleRow.vue'
 import UploadFileSettingsSection from './common/UploadFileSettingsSection.vue'
-import DefaultModelSettingsSection from './common/DefaultModelSettingsSection.vue'
 
 const { t } = useI18n()
 const uiSettingsStore = useUiSettingsStore()
diff --git a/src/renderer/settings/components/DeepChatAgentsSettings.vue b/src/renderer/settings/components/DeepChatAgentsSettings.vue
new file mode 100644
index 000000000..9df6ca57a
--- /dev/null
+++ b/src/renderer/settings/components/DeepChatAgentsSettings.vue
@@ -0,0 +1,1089 @@
+<template>
+  <div class="flex h-full w-full">
+    <aside class="flex w-[300px] shrink-0 flex-col border-r border-border">
+      <div class="flex items-center justify-between gap-3 px-4 py-4">
+        <div>
+          <div class="text-lg font-semibold">{{ t('settings.deepchatAgents.title') }}</div>
+          <div class="text-xs text-muted-foreground">
+            {{ t('settings.deepchatAgents.description') }}
+          </div>
+        </div>
+        <Button size="sm" @click="startCreate">{{ t('common.add') }}</Button>
+      </div>
+
+      <div class="flex-1 space-y-3 overflow-y-auto px-4 pb-4">
+        <button
+          v-for="agent in sidebarAgents"
+          :key="agent.id"
+          class="w-full rounded-2xl border p-4 text-left transition-colors"
+          :class="
+            selectedAgentId === agent.id
+              ? 'border-primary bg-accent/40'
+              : 'border-border hover:bg-accent/20'
+          "
+          @click="selectAgent(agent.id)"
+        >
+          <div class="flex items-start gap-3">
+            <div
+              class="flex h-11 w-11 shrink-0 items-center justify-center rounded-2xl border border-border/70 bg-muted/40"
+            >
+              <AgentAvatar
+                :agent="{
+                  id: agent.id,
+                  name: agent.name,
+                  type: 'deepchat',
+                  icon: agent.icon,
+                  avatar: agent.avatar
+                }"
+                class-name="h-6 w-6"
+                fallback-class-name="rounded-xl"
+              />
+            </div>
+            <div class="min-w-0 flex-1">
+              <div class="flex items-center gap-2">
+                <div class="truncate text-sm font-semibold">{{ agent.name }}</div>
+                <Badge v-if="agent.protected" variant="secondary">
+                  {{ t('settings.deepchatAgents.builtIn') }}
+                </Badge>
+              </div>
+              <div class="mt-1 text-xs text-muted-foreground">
+                {{ agent.enabled ? t('common.enabled') : t('common.disabled') }}
+              </div>
+            </div>
+          </div>
+        </button>
+      </div>
+    </aside>
+
+    <main class="min-w-0 flex-1 overflow-y-auto">
+      <div class="mx-auto flex w-full max-w-5xl flex-col gap-6 px-6 py-6">
+        <div class="flex items-start justify-between gap-4">
+          <div class="flex items-center gap-4">
+            <div
+              class="flex h-14 w-14 shrink-0 items-center justify-center rounded-2xl border border-border/70 bg-muted/40"
+            >
+              <AgentAvatar
+                :agent="previewAgent"
+                class-name="h-8 w-8"
+                fallback-class-name="rounded-xl"
+              />
+            </div>
+            <div>
+              <div class="text-xl font-semibold">
+                {{
+                  form.id
+                    ? t('settings.deepchatAgents.editTitle')
+                    : t('settings.deepchatAgents.createTitle')
+                }}
+              </div>
+              <div class="text-sm text-muted-foreground">
+                {{ form.name.trim() || t('settings.deepchatAgents.unnamed') }}
+              </div>
+            </div>
+          </div>
+
+          <div class="flex items-center gap-2">
+            <Button variant="outline" :disabled="saving" @click="resetEditor">
+              {{ t('common.reset') }}
+            </Button>
+            <Button
+              v-if="form.id && !form.protected"
+              variant="destructive"
+              :disabled="saving || deleting"
+              @click="removeAgent"
+            >
+              {{ t('common.delete') }}
+            </Button>
+            <Button :disabled="saving || !form.name.trim()" @click="saveAgent">
+              {{ saving ? t('common.saving') : t('common.save') }}
+            </Button>
+          </div>
+        </div>
+
+        <section class="grid gap-4 rounded-2xl border border-border p-5 md:grid-cols-2">
+          <label class="space-y-2">
+            <div class="text-sm font-medium">{{ t('settings.deepchatAgents.name') }}</div>
+            <Input
+              v-model="form.name"
+              :placeholder="t('settings.deepchatAgents.namePlaceholder')"
+            />
+          </label>
+          <label class="space-y-2">
+            <div class="text-sm font-medium">{{ t('settings.deepchatAgents.enabledLabel') }}</div>
+            <div
+              class="flex h-10 items-center justify-between rounded-lg border border-border px-3"
+            >
+              <span class="text-sm text-muted-foreground">
+                {{ form.enabled ? t('common.enabled') : t('common.disabled') }}
+              </span>
+              <Switch :model-value="form.enabled" @update:model-value="form.enabled = $event" />
+            </div>
+          </label>
+          <label class="space-y-2 md:col-span-2">
+            <div class="text-sm font-medium">
+              {{ t('settings.deepchatAgents.descriptionLabel') }}
+            </div>
+            <Textarea
+              v-model="form.description"
+              class="min-h-[84px]"
+              :placeholder="t('settings.deepchatAgents.descriptionPlaceholder')"
+            />
+          </label>
+        </section>
+
+        <section class="space-y-4 rounded-2xl border border-border p-5">
+          <div class="text-sm font-semibold">{{ t('settings.deepchatAgents.avatarTitle') }}</div>
+          <div class="grid gap-3 md:grid-cols-3">
+            <button
+              v-for="option in avatarKindOptions"
+              :key="option.value"
+              class="rounded-xl border px-4 py-3 text-left"
+              :class="
+                form.avatarKind === option.value
+                  ? 'border-primary bg-accent/40'
+                  : 'border-border hover:bg-accent/20'
+              "
+              @click="form.avatarKind = option.value"
+            >
+              <div class="text-sm font-medium">{{ option.label }}</div>
+              <div class="mt-1 text-xs text-muted-foreground">{{ option.description }}</div>
+            </button>
+          </div>
+
+          <div v-if="form.avatarKind === 'lucide'" class="grid gap-4 md:grid-cols-2">
+            <label class="space-y-2 md:col-span-2">
+              <div class="text-sm font-medium">{{ t('settings.deepchatAgents.lucideIcon') }}</div>
+              <Input v-model="form.lucideIcon" placeholder="bot" />
+            </label>
+            <div class="flex flex-wrap gap-2 md:col-span-2">
+              <Button
+                v-for="iconName in lucideIcons"
+                :key="iconName"
+                size="sm"
+                variant="outline"
+                class="gap-2"
+                @click="form.lucideIcon = iconName"
+              >
+                <Icon :icon="`lucide:${iconName}`" class="h-4 w-4" />
+                <span>{{ iconName }}</span>
+              </Button>
+            </div>
+            <label class="space-y-2">
+              <div class="text-sm font-medium">{{ t('settings.deepchatAgents.lightColor') }}</div>
+              <div class="flex items-center gap-3 rounded-lg border border-border px-3 py-2">
+                <input v-model="form.lightColor" type="color" class="h-8 w-10 shrink-0" />
+                <Input v-model="form.lightColor" />
+              </div>
+            </label>
+            <label class="space-y-2">
+              <div class="text-sm font-medium">{{ t('settings.deepchatAgents.darkColor') }}</div>
+              <div class="flex items-center gap-3 rounded-lg border border-border px-3 py-2">
+                <input v-model="form.darkColor" type="color" class="h-8 w-10 shrink-0" />
+                <Input v-model="form.darkColor" />
+              </div>
+            </label>
+          </div>
+
+          <div v-else-if="form.avatarKind === 'monogram'" class="grid gap-4 md:grid-cols-2">
+            <label class="space-y-2">
+              <div class="text-sm font-medium">{{ t('settings.deepchatAgents.monogramText') }}</div>
+              <Input
+                v-model="form.monogramText"
+                :placeholder="t('settings.deepchatAgents.monogramPlaceholder')"
+              />
+            </label>
+            <label class="space-y-2">
+              <div class="text-sm font-medium">
+                {{ t('settings.deepchatAgents.backgroundColor') }}
+              </div>
+              <div class="flex items-center gap-3 rounded-lg border border-border px-3 py-2">
+                <input
+                  v-model="form.monogramBackgroundColor"
+                  type="color"
+                  class="h-8 w-10 shrink-0"
+                />
+                <Input v-model="form.monogramBackgroundColor" />
+              </div>
+            </label>
+          </div>
+        </section>
+
+        <section class="space-y-4 rounded-2xl border border-border p-5">
+          <div class="text-sm font-semibold">{{ t('settings.deepchatAgents.modelsTitle') }}</div>
+          <div class="grid gap-3 md:grid-cols-2 xl:grid-cols-3">
+            <div v-for="field in modelFields" :key="field.key" class="space-y-1.5">
+              <div class="text-[11px] font-medium text-muted-foreground">{{ field.label }}</div>
+              <Popover v-model:open="field.open.value">
+                <PopoverTrigger as-child>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    class="h-8 w-full min-w-0 justify-between gap-1.5 rounded-lg px-2.5 text-xs"
+                  >
+                    <div class="flex min-w-0 items-center gap-1.5">
+                      <ModelIcon
+                        v-if="getModelIconId(field.key)"
+                        :model-id="getModelIconId(field.key)"
+                        custom-class="h-3.5 w-3.5 shrink-0"
+                      />
+                      <Icon
+                        v-else
+                        icon="lucide:box"
+                        class="h-3.5 w-3.5 shrink-0 text-muted-foreground"
+                      />
+                      <span class="truncate">{{ getModelLabel(field.key) }}</span>
+                    </div>
+                    <Icon
+                      icon="lucide:chevron-down"
+                      class="h-3 w-3 shrink-0 text-muted-foreground"
+                    />
+                  </Button>
+                </PopoverTrigger>
+                <PopoverContent class="w-[320px] p-0" align="start">
+                  <div class="flex items-center justify-between border-b px-3 py-2">
+                    <div class="text-sm font-medium">{{ field.label }}</div>
+                    <Button
+                      v-if="form[field.key]"
+                      variant="ghost"
+                      size="sm"
+                      class="h-7 px-2 text-xs"
+                      @click="clearModel(field.key)"
+                    >
+                      {{ t('common.clear') }}
+                    </Button>
+                  </div>
+                  <ModelSelect
+                    :exclude-providers="['acp']"
+                    :vision-only="field.key === 'visionModel'"
+                    @update:model="(model, providerId) => selectModel(field.key, model, providerId)"
+                  />
+                </PopoverContent>
+              </Popover>
+            </div>
+
+            <div class="space-y-1.5">
+              <div class="text-[11px] font-medium text-muted-foreground">
+                {{ t('settings.deepchatAgents.defaultProjectPath') }}
+              </div>
+              <DropdownMenu>
+                <DropdownMenuTrigger as-child>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    class="h-8 w-full min-w-0 justify-between gap-1.5 rounded-lg px-2.5 text-xs"
+                    :title="defaultProjectPathTitle"
+                  >
+                    <div class="flex min-w-0 items-center gap-1.5">
+                      <Icon
+                        icon="lucide:folder"
+                        class="h-3.5 w-3.5 shrink-0 text-muted-foreground"
+                      />
+                      <span class="truncate">{{ defaultProjectPathLabel }}</span>
+                    </div>
+                    <Icon
+                      icon="lucide:chevron-down"
+                      class="h-3 w-3 shrink-0 text-muted-foreground"
+                    />
+                  </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start" class="w-[20rem]">
+                  <DropdownMenuItem
+                    v-for="project in directoryOptions"
+                    :key="project.path"
+                    class="gap-2 px-2 py-1.5 text-xs"
+                    @select="selectDefaultProjectPath(project.path)"
+                  >
+                    <Icon icon="lucide:folder" class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+                    <div class="min-w-0 flex-1">
+                      <div class="truncate">{{ project.name }}</div>
+                      <div class="truncate text-[10px] text-muted-foreground">
+                        {{ project.path }}
+                      </div>
+                    </div>
+                    <Icon
+                      v-if="normalizePath(form.defaultProjectPath) === project.path"
+                      icon="lucide:check"
+                      class="h-3.5 w-3.5 shrink-0"
+                    />
+                  </DropdownMenuItem>
+                  <DropdownMenuSeparator />
+                  <DropdownMenuItem
+                    class="gap-2 px-2 py-1.5 text-xs"
+                    @select="pickDefaultProjectPath"
+                  >
+                    <Icon
+                      icon="lucide:folder-open"
+                      class="h-3.5 w-3.5 shrink-0 text-muted-foreground"
+                    />
+                    <span>{{ t('common.project.openFolder') }}</span>
+                  </DropdownMenuItem>
+                  <DropdownMenuItem
+                    v-if="form.defaultProjectPath"
+                    class="gap-2 px-2 py-1.5 text-xs"
+                    @select="clearDefaultProjectPath"
+                  >
+                    <Icon icon="lucide:x" class="h-3.5 w-3.5 shrink-0 text-muted-foreground" />
+                    <span>{{ t('common.clear') }}</span>
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </div>
+
+            <div class="space-y-1.5">
+              <div class="text-[11px] font-medium text-muted-foreground">
+                {{ t('settings.deepchatAgents.permissionMode') }}
+              </div>
+              <DropdownMenu>
+                <DropdownMenuTrigger as-child>
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    :class="[
+                      'h-8 w-full min-w-0 justify-between gap-1.5 rounded-lg px-2.5 text-xs',
+                      form.permissionMode === 'full_access'
+                        ? 'text-orange-500 hover:text-orange-600'
+                        : 'text-muted-foreground hover:text-foreground'
+                    ]"
+                  >
+                    <div class="flex min-w-0 items-center gap-1.5">
+                      <Icon :icon="permissionIcon" class="h-3.5 w-3.5 shrink-0" />
+                      <span class="truncate">{{ permissionModeLabel }}</span>
+                    </div>
+                    <Icon
+                      icon="lucide:chevron-down"
+                      class="h-3 w-3 shrink-0 text-muted-foreground"
+                    />
+                  </Button>
+                </DropdownMenuTrigger>
+                <DropdownMenuContent align="start" class="min-w-48">
+                  <DropdownMenuItem
+                    v-for="option in permissionOptions"
+                    :key="option.value"
+                    class="gap-2 px-2 py-1.5 text-xs"
+                    @select="form.permissionMode = option.value"
+                  >
+                    <Icon :icon="option.icon" :class="['h-3.5 w-3.5 shrink-0', option.iconClass]" />
+                    <span class="flex-1">{{ option.label }}</span>
+                    <Icon
+                      v-if="form.permissionMode === option.value"
+                      icon="lucide:check"
+                      class="h-3.5 w-3.5 shrink-0"
+                    />
+                  </DropdownMenuItem>
+                </DropdownMenuContent>
+              </DropdownMenu>
+            </div>
+          </div>
+        </section>
+
+        <section class="space-y-4 rounded-2xl border border-border p-5">
+          <div class="space-y-2">
+            <div class="flex items-center justify-between gap-3">
+              <div class="text-sm font-medium">{{ t('settings.deepchatAgents.systemPrompt') }}</div>
+              <Button variant="outline" size="sm" class="gap-2" @click="openSystemPromptPicker">
+                <Icon icon="lucide:library-big" class="h-4 w-4" />
+                <span>{{ t('promptSetting.selectSystemPrompt') }}</span>
+              </Button>
+            </div>
+            <Textarea
+              v-model="form.systemPrompt"
+              class="min-h-[140px] font-mono text-xs"
+              :placeholder="t('settings.deepchatAgents.systemPromptPlaceholder')"
+            />
+          </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
+            v-if="groupedTools.length === 0"
+            class="rounded-lg border border-dashed px-3 py-3 text-xs text-muted-foreground"
+          >
+            {{ t('chat.input.tools.builtinEmpty') }}
+          </div>
+
+          <div v-else class="space-y-4">
+            <div v-for="group in groupedTools" :key="group.name" class="space-y-2">
+              <div class="flex items-center justify-between gap-3">
+                <div class="text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
+                  {{ group.label }}
+                </div>
+                <Switch
+                  :model-value="isGroupEnabled(group)"
+                  :aria-label="group.label"
+                  @update:model-value="(value) => setGroupEnabled(group, value)"
+                />
+              </div>
+
+              <div class="flex flex-wrap gap-2">
+                <Button
+                  v-for="tool in group.tools"
+                  :key="tool.function.name"
+                  type="button"
+                  variant="outline"
+                  size="sm"
+                  class="h-10 rounded-xl px-4 text-sm shadow-none transition-colors"
+                  :class="
+                    isToolEnabled(tool.function.name)
+                      ? 'border-primary bg-primary text-primary-foreground hover:bg-primary/90 hover:text-primary-foreground'
+                      : 'border-border bg-background text-foreground hover:bg-muted'
+                  "
+                  @click="toggleTool(tool.function.name)"
+                >
+                  {{ tool.function.name }}
+                </Button>
+              </div>
+            </div>
+          </div>
+        </section>
+
+        <section class="space-y-4 rounded-2xl border border-border p-5">
+          <div class="flex items-center justify-between gap-3">
+            <div class="text-sm font-semibold">
+              {{ t('settings.deepchatAgents.compactionTitle') }}
+            </div>
+            <Switch
+              :model-value="form.autoCompactionEnabled"
+              :aria-label="t('settings.deepchatAgents.compactionEnabled')"
+              @update:model-value="form.autoCompactionEnabled = $event"
+            />
+          </div>
+
+          <div v-if="form.autoCompactionEnabled" class="grid gap-4 md:grid-cols-2">
+            <label class="space-y-2">
+              <div class="text-sm font-medium">
+                {{ `${t('settings.deepchatAgents.compactionThreshold')} (%)` }}
+              </div>
+              <Input v-model="form.autoCompactionTriggerThreshold" type="number" min="5" max="95" />
+            </label>
+            <label class="space-y-2">
+              <div class="text-sm font-medium">
+                {{ t('settings.deepchatAgents.compactionRetainPairs') }}
+              </div>
+              <Input
+                v-model="form.autoCompactionRetainRecentPairs"
+                type="number"
+                min="1"
+                max="10"
+              />
+            </label>
+          </div>
+        </section>
+      </div>
+    </main>
+
+    <Dialog
+      :open="systemPromptDialogOpen"
+      @update:open="(value) => (systemPromptDialogOpen = value)"
+    >
+      <DialogContent class="sm:max-w-[640px]">
+        <DialogHeader class="text-left">
+          <DialogTitle>{{ t('promptSetting.selectSystemPrompt') }}</DialogTitle>
+        </DialogHeader>
+
+        <div v-if="loadingSystemPrompts" class="py-8 text-center text-sm text-muted-foreground">
+          {{ t('common.loading') }}
+        </div>
+
+        <div v-else class="max-h-[420px] space-y-2 overflow-y-auto pr-1">
+          <button
+            v-for="prompt in systemPromptTemplates"
+            :key="prompt.id"
+            type="button"
+            class="w-full rounded-xl border border-border px-4 py-3 text-left transition-colors hover:bg-accent/20"
+            @click="applySystemPromptTemplate(prompt)"
+          >
+            <div class="text-sm font-medium">{{ prompt.name }}</div>
+            <div
+              class="mt-1 max-h-14 overflow-hidden whitespace-pre-wrap text-xs text-muted-foreground"
+            >
+              {{ prompt.content }}
+            </div>
+          </button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, onMounted, reactive, ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { Icon } from '@iconify/vue'
+import { Button } from '@shadcn/components/ui/button'
+import { Badge } from '@shadcn/components/ui/badge'
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger
+} from '@shadcn/components/ui/dropdown-menu'
+import { Input } from '@shadcn/components/ui/input'
+import { Textarea } from '@shadcn/components/ui/textarea'
+import { Switch } from '@shadcn/components/ui/switch'
+import { Popover, PopoverContent, PopoverTrigger } from '@shadcn/components/ui/popover'
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@shadcn/components/ui/dialog'
+import ModelSelect from '@/components/ModelSelect.vue'
+import AgentAvatar from '@/components/icons/AgentAvatar.vue'
+import ModelIcon from '@/components/icons/ModelIcon.vue'
+import { usePresenter } from '@/composables/usePresenter'
+import { useModelStore } from '@/stores/modelStore'
+import type { MCPToolDefinition } from '@shared/types/core/mcp'
+import type {
+  Agent,
+  AgentAvatar as AgentAvatarValue,
+  PermissionMode,
+  Project
+} from '@shared/types/agent-interface'
+import type { RENDERER_MODEL_META, SystemPrompt } from '@shared/presenter'
+
+type ModelKey = 'chatModel' | 'assistantModel' | 'visionModel'
+type AvatarKind = 'default' | 'lucide' | 'monogram'
+type EditableModel = { providerId: string; modelId: string } | null
+type SidebarAgentItem = {
+  id: string
+  name: string
+  enabled: boolean
+  protected: boolean
+  avatar: AgentAvatarValue | null
+  icon?: string
+}
+type ToolGroup = {
+  name: string
+  label: string
+  tools: MCPToolDefinition[]
+}
+type FormState = {
+  id: string | null
+  protected: boolean
+  name: string
+  enabled: boolean
+  description: string
+  avatarKind: AvatarKind
+  lucideIcon: string
+  lightColor: string
+  darkColor: string
+  monogramText: string
+  monogramBackgroundColor: string
+  chatModel: EditableModel
+  assistantModel: EditableModel
+  visionModel: EditableModel
+  defaultProjectPath: string
+  systemPrompt: string
+  permissionMode: PermissionMode
+  disabledAgentTools: string[]
+  autoCompactionEnabled: boolean
+  autoCompactionTriggerThreshold: string
+  autoCompactionRetainRecentPairs: string
+}
+
+const LUCIDE_ICONS = ['bot', 'sparkles', 'brain', 'code', 'book-open', 'pen-tool', 'rocket']
+const DRAFT_AGENT_ID = '__draft_deepchat_agent__'
+const GROUP_ORDER = [
+  'agent-filesystem',
+  'agent-core',
+  'agent-skills',
+  'deepchat-settings',
+  'yobrowser'
+]
+const { t } = useI18n()
+const configPresenter = usePresenter('configPresenter')
+const projectPresenter = usePresenter('projectPresenter', { safeCall: false })
+const toolPresenter = usePresenter('toolPresenter')
+const modelStore = useModelStore()
+
+const agents = ref<Agent[]>([])
+const tools = ref<MCPToolDefinition[]>([])
+const recentProjects = ref<Project[]>([])
+const saving = ref(false)
+const deleting = ref(false)
+const selectedAgentId = ref<string | null>(null)
+const chatOpen = ref(false)
+const assistantOpen = ref(false)
+const visionOpen = ref(false)
+const systemPromptDialogOpen = ref(false)
+const loadingSystemPrompts = ref(false)
+const systemPromptTemplates = ref<SystemPrompt[]>([])
+
+const form = reactive<FormState>({
+  id: null,
+  protected: false,
+  name: '',
+  enabled: true,
+  description: '',
+  avatarKind: 'default',
+  lucideIcon: 'bot',
+  lightColor: '#111827',
+  darkColor: '#f8fafc',
+  monogramText: '',
+  monogramBackgroundColor: '#dbeafe',
+  chatModel: null,
+  assistantModel: null,
+  visionModel: null,
+  defaultProjectPath: '',
+  systemPrompt: '',
+  permissionMode: 'full_access',
+  disabledAgentTools: [],
+  autoCompactionEnabled: true,
+  autoCompactionTriggerThreshold: '80',
+  autoCompactionRetainRecentPairs: '2'
+})
+
+const avatarKindOptions = computed(() => [
+  {
+    value: 'default' as const,
+    label: t('settings.deepchatAgents.avatarDefault'),
+    description: t('settings.deepchatAgents.avatarDefaultDesc')
+  },
+  {
+    value: 'lucide' as const,
+    label: t('settings.deepchatAgents.avatarLucide'),
+    description: t('settings.deepchatAgents.avatarLucideDesc')
+  },
+  {
+    value: 'monogram' as const,
+    label: t('settings.deepchatAgents.avatarMonogram'),
+    description: t('settings.deepchatAgents.avatarMonogramDesc')
+  }
+])
+const lucideIcons = computed(() => LUCIDE_ICONS)
+const modelFields = computed(() => [
+  { key: 'chatModel' as const, label: t('settings.deepchatAgents.chatModel'), open: chatOpen },
+  {
+    key: 'assistantModel' as const,
+    label: t('settings.deepchatAgents.assistantModel'),
+    open: assistantOpen
+  },
+  { key: 'visionModel' as const, label: t('settings.deepchatAgents.visionModel'), open: visionOpen }
+])
+const permissionOptions = computed(() => [
+  {
+    value: 'default' as const,
+    label: t('settings.deepchatAgents.permissionDefault'),
+    icon: 'lucide:shield',
+    iconClass: 'text-muted-foreground'
+  },
+  {
+    value: 'full_access' as const,
+    label: t('settings.deepchatAgents.permissionFullAccess'),
+    icon: 'lucide:shield-alert',
+    iconClass: 'text-orange-500'
+  }
+])
+const permissionModeLabel = computed(
+  () => permissionOptions.value.find((option) => option.value === form.permissionMode)?.label ?? ''
+)
+const permissionIcon = computed(
+  () =>
+    permissionOptions.value.find((option) => option.value === form.permissionMode)?.icon ??
+    'lucide:shield'
+)
+const pathLabel = (value: string) => value.split(/[/\\]/).pop() ?? value
+const directoryOptions = computed(() => {
+  const normalizedCurrentPath = normalizePath(form.defaultProjectPath)
+  const options = new Map<string, { path: string; name: string }>()
+
+  if (normalizedCurrentPath) {
+    options.set(normalizedCurrentPath, {
+      path: normalizedCurrentPath,
+      name: pathLabel(normalizedCurrentPath)
+    })
+  }
+
+  for (const project of recentProjects.value) {
+    const normalizedPath = normalizePath(project.path)
+    if (!normalizedPath || options.has(normalizedPath)) {
+      continue
+    }
+
+    options.set(normalizedPath, {
+      path: normalizedPath,
+      name: project.name || pathLabel(normalizedPath)
+    })
+  }
+
+  return Array.from(options.values())
+})
+const defaultProjectPathLabel = computed(() => {
+  const normalized = normalizePath(form.defaultProjectPath)
+  return normalized
+    ? pathLabel(normalized)
+    : t('settings.deepchatAgents.defaultProjectPathPlaceholder')
+})
+const defaultProjectPathTitle = computed(
+  () =>
+    normalizePath(form.defaultProjectPath) ??
+    t('settings.deepchatAgents.defaultProjectPathPlaceholder')
+)
+const getGroupLabel = (serverName: string) => {
+  switch (serverName) {
+    case 'agent-filesystem':
+      return t('chat.input.tools.groups.agentFilesystem')
+    case 'agent-core':
+      return t('chat.input.tools.groups.agentCore')
+    case 'agent-skills':
+      return t('chat.input.tools.groups.agentSkills')
+    case 'deepchat-settings':
+      return t('chat.input.tools.groups.deepchatSettings')
+    case 'yobrowser':
+      return t('chat.input.tools.groups.yobrowser')
+    default:
+      return serverName
+  }
+}
+const groupedTools = computed<ToolGroup[]>(() => {
+  const groups = new Map<string, MCPToolDefinition[]>()
+
+  for (const tool of tools.value) {
+    const existing = groups.get(tool.server.name) ?? []
+    existing.push(tool)
+    groups.set(tool.server.name, existing)
+  }
+
+  return Array.from(groups.entries())
+    .map(([name, items]) => ({
+      name,
+      label: getGroupLabel(name),
+      tools: [...items].sort((left, right) => left.function.name.localeCompare(right.function.name))
+    }))
+    .sort((left, right) => {
+      const leftIndex = GROUP_ORDER.indexOf(left.name)
+      const rightIndex = GROUP_ORDER.indexOf(right.name)
+
+      if (leftIndex >= 0 && rightIndex >= 0) {
+        return leftIndex - rightIndex
+      }
+      if (leftIndex >= 0) {
+        return -1
+      }
+      if (rightIndex >= 0) {
+        return 1
+      }
+      return left.name.localeCompare(right.name)
+    })
+})
+const draftSidebarAgent = computed<SidebarAgentItem>(() => ({
+  id: DRAFT_AGENT_ID,
+  name: form.name.trim() || t('settings.deepchatAgents.unnamed'),
+  enabled: form.enabled,
+  protected: false,
+  avatar: buildAvatar()
+}))
+const sidebarAgents = computed<SidebarAgentItem[]>(() => {
+  const savedAgents = agents.value.map((agent) => ({
+    id: agent.id,
+    name: agent.name,
+    enabled: agent.enabled,
+    protected: Boolean(agent.protected),
+    avatar: agent.avatar ?? null,
+    icon: agent.icon
+  }))
+
+  if (selectedAgentId.value !== DRAFT_AGENT_ID) {
+    return savedAgents
+  }
+
+  if (savedAgents[0]?.id === 'deepchat') {
+    return [savedAgents[0], draftSidebarAgent.value, ...savedAgents.slice(1)]
+  }
+
+  return [draftSidebarAgent.value, ...savedAgents]
+})
+const previewAgent = computed(() => ({
+  id: form.id ?? 'preview',
+  name: form.name || t('settings.deepchatAgents.unnamed'),
+  type: 'deepchat' as const,
+  icon: undefined,
+  avatar: buildAvatar()
+}))
+
+const emptyForm = (): FormState => ({
+  id: null,
+  protected: false,
+  name: '',
+  enabled: true,
+  description: '',
+  avatarKind: 'default',
+  lucideIcon: 'bot',
+  lightColor: '#111827',
+  darkColor: '#f8fafc',
+  monogramText: '',
+  monogramBackgroundColor: '#dbeafe',
+  chatModel: null,
+  assistantModel: null,
+  visionModel: null,
+  defaultProjectPath: '',
+  systemPrompt: '',
+  permissionMode: 'full_access',
+  disabledAgentTools: [],
+  autoCompactionEnabled: true,
+  autoCompactionTriggerThreshold: '80',
+  autoCompactionRetainRecentPairs: '2'
+})
+
+const assignForm = (next: FormState) => Object.assign(form, next)
+const normalizePath = (value: string | null | undefined) => {
+  const normalized = value?.trim()
+  return normalized ? normalized : null
+}
+const parseNum = (value: string) => {
+  const normalized = value.trim()
+  if (!normalized) return undefined
+  const parsed = Number(normalized)
+  return Number.isFinite(parsed) ? parsed : undefined
+}
+const numText = (value: unknown) =>
+  typeof value === 'number' && Number.isFinite(value) ? String(value) : ''
+const buildAvatar = (): AgentAvatarValue | null => {
+  if (form.avatarKind === 'lucide' && form.lucideIcon.trim()) {
+    return {
+      kind: 'lucide',
+      icon: form.lucideIcon.trim(),
+      lightColor: form.lightColor || null,
+      darkColor: form.darkColor || null
+    }
+  }
+  if (form.avatarKind === 'monogram' && form.monogramText.trim()) {
+    return {
+      kind: 'monogram',
+      text: form.monogramText.trim(),
+      backgroundColor: form.monogramBackgroundColor || null
+    }
+  }
+  return null
+}
+const fromAgent = (agent?: Agent | null): FormState => {
+  if (!agent) return emptyForm()
+  const config = agent.config ?? {}
+  return {
+    id: agent.id,
+    protected: Boolean(agent.protected),
+    name: agent.name,
+    enabled: agent.enabled,
+    description: agent.description ?? '',
+    avatarKind: agent.avatar?.kind ?? 'default',
+    lucideIcon: agent.avatar?.kind === 'lucide' ? agent.avatar.icon : 'bot',
+    lightColor:
+      agent.avatar?.kind === 'lucide' ? (agent.avatar.lightColor ?? '#111827') : '#111827',
+    darkColor: agent.avatar?.kind === 'lucide' ? (agent.avatar.darkColor ?? '#f8fafc') : '#f8fafc',
+    monogramText: agent.avatar?.kind === 'monogram' ? agent.avatar.text : '',
+    monogramBackgroundColor:
+      agent.avatar?.kind === 'monogram' ? (agent.avatar.backgroundColor ?? '#dbeafe') : '#dbeafe',
+    chatModel: config.defaultModelPreset
+      ? {
+          providerId: config.defaultModelPreset.providerId,
+          modelId: config.defaultModelPreset.modelId
+        }
+      : null,
+    assistantModel: config.assistantModel
+      ? { providerId: config.assistantModel.providerId, modelId: config.assistantModel.modelId }
+      : null,
+    visionModel: config.visionModel
+      ? { providerId: config.visionModel.providerId, modelId: config.visionModel.modelId }
+      : null,
+    defaultProjectPath: normalizePath(config.defaultProjectPath) ?? '',
+    systemPrompt: config.systemPrompt ?? '',
+    permissionMode: config.permissionMode === 'default' ? 'default' : 'full_access',
+    disabledAgentTools: [...(config.disabledAgentTools ?? [])],
+    autoCompactionEnabled: config.autoCompactionEnabled ?? true,
+    autoCompactionTriggerThreshold: numText(config.autoCompactionTriggerThreshold ?? 80),
+    autoCompactionRetainRecentPairs: numText(config.autoCompactionRetainRecentPairs ?? 2)
+  }
+}
+const modelText = (selection: EditableModel | undefined) => {
+  if (!selection?.providerId || !selection?.modelId) {
+    return t('common.selectModel')
+  }
+
+  const providerModels = modelStore.allProviderModels.find(
+    (entry) => entry.providerId === selection.providerId
+  )
+  const matchedModel = providerModels?.models.find((model) => model.id === selection.modelId)
+  if (matchedModel) {
+    return matchedModel.name || matchedModel.id
+  }
+
+  const fallbackMatch = modelStore.findModelByIdOrName(selection.modelId)
+  return fallbackMatch?.model.name || selection.modelId
+}
+const getModelLabel = (key: ModelKey) => modelText(form[key])
+const getModelIconId = (key: ModelKey) => form[key]?.modelId ?? ''
+const clearModel = (key: ModelKey) => {
+  form[key] = null
+}
+const selectModel = (key: ModelKey, model: RENDERER_MODEL_META, providerId: string) => {
+  form[key] = { providerId, modelId: model.id }
+  if (key === 'chatModel') chatOpen.value = false
+  if (key === 'assistantModel') assistantOpen.value = false
+  if (key === 'visionModel') visionOpen.value = false
+}
+const loadSystemPromptTemplates = async () => {
+  loadingSystemPrompts.value = true
+  try {
+    const prompts = await configPresenter.getSystemPrompts()
+    systemPromptTemplates.value = Array.isArray(prompts)
+      ? [...prompts].sort(
+          (a, b) =>
+            Number(Boolean(b.isDefault)) - Number(Boolean(a.isDefault)) ||
+            a.name.localeCompare(b.name)
+        )
+      : []
+  } catch {
+    systemPromptTemplates.value = []
+  } finally {
+    loadingSystemPrompts.value = false
+  }
+}
+const openSystemPromptPicker = () => {
+  systemPromptDialogOpen.value = true
+  void loadSystemPromptTemplates()
+}
+const applySystemPromptTemplate = (prompt: SystemPrompt) => {
+  form.systemPrompt = prompt.content ?? ''
+  systemPromptDialogOpen.value = false
+}
+const pickDefaultProjectPath = async () => {
+  try {
+    const selectedPath = await projectPresenter.selectDirectory()
+    if (selectedPath) {
+      form.defaultProjectPath = selectedPath
+    }
+  } catch (error) {
+    console.warn('[DeepChatAgentsSettings] Failed to select default project path:', error)
+  }
+}
+const clearDefaultProjectPath = () => {
+  form.defaultProjectPath = ''
+}
+const selectDefaultProjectPath = (projectPath: string) => {
+  form.defaultProjectPath = projectPath
+}
+const isToolEnabled = (toolName: string) => !form.disabledAgentTools.includes(toolName)
+const toggleTool = (toolName: string) => {
+  setToolEnabled(toolName, !isToolEnabled(toolName))
+}
+const setToolEnabled = (toolName: string, enabled: boolean) => {
+  const next = new Set(form.disabledAgentTools)
+  if (enabled) next.delete(toolName)
+  else next.add(toolName)
+  form.disabledAgentTools = Array.from(next).sort((a, b) => a.localeCompare(b))
+}
+const getGroupToolNames = (group: ToolGroup) => group.tools.map((tool) => tool.function.name)
+const isGroupEnabled = (group: ToolGroup) =>
+  getGroupToolNames(group).some((toolName) => isToolEnabled(toolName))
+const setGroupEnabled = (group: ToolGroup, enabled: boolean) => {
+  const next = new Set(form.disabledAgentTools)
+
+  for (const toolName of getGroupToolNames(group)) {
+    if (enabled) next.delete(toolName)
+    else next.add(toolName)
+  }
+
+  form.disabledAgentTools = Array.from(next).sort((a, b) => a.localeCompare(b))
+}
+const loadRecentProjects = async () => {
+  try {
+    const result = await projectPresenter.getRecentProjects(8)
+    recentProjects.value = Array.isArray(result) ? result : []
+  } catch {
+    recentProjects.value = []
+  }
+}
+const loadTools = async () => {
+  try {
+    const definitions = await toolPresenter.getAllToolDefinitions({ chatMode: 'agent' })
+    tools.value = Array.isArray(definitions)
+      ? definitions
+          .filter((tool) => tool.source === 'agent')
+          .sort((a, b) => a.function.name.localeCompare(b.function.name))
+      : []
+  } catch {
+    tools.value = []
+  }
+}
+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)
+    )
+  const nextId =
+    preferredId && agents.value.some((agent) => agent.id === preferredId)
+      ? preferredId
+      : (agents.value[0]?.id ?? null)
+  selectedAgentId.value = nextId
+  assignForm(fromAgent(agents.value.find((agent) => agent.id === nextId) ?? null))
+}
+const selectAgent = (agentId: string) => {
+  if (agentId === DRAFT_AGENT_ID) {
+    selectedAgentId.value = DRAFT_AGENT_ID
+    return
+  }
+
+  selectedAgentId.value = agentId
+  assignForm(fromAgent(agents.value.find((agent) => agent.id === agentId) ?? null))
+}
+const startCreate = () => {
+  selectedAgentId.value = DRAFT_AGENT_ID
+  assignForm(emptyForm())
+}
+const resetEditor = () => {
+  if (selectedAgentId.value === DRAFT_AGENT_ID) startCreate()
+  else selectAgent(selectedAgentId.value)
+}
+const saveAgent = async () => {
+  if (!form.name.trim()) return
+  saving.value = true
+  try {
+    const payload = {
+      name: form.name.trim(),
+      enabled: form.enabled,
+      description: form.description.trim() || undefined,
+      avatar: buildAvatar(),
+      config: {
+        defaultModelPreset: form.chatModel
+          ? {
+              providerId: form.chatModel.providerId,
+              modelId: form.chatModel.modelId
+            }
+          : null,
+        assistantModel: form.assistantModel,
+        visionModel: form.visionModel,
+        defaultProjectPath: normalizePath(form.defaultProjectPath),
+        systemPrompt: form.systemPrompt,
+        permissionMode: form.permissionMode,
+        disabledAgentTools: [...form.disabledAgentTools],
+        autoCompactionEnabled: form.autoCompactionEnabled,
+        autoCompactionTriggerThreshold: parseNum(form.autoCompactionTriggerThreshold) ?? 80,
+        autoCompactionRetainRecentPairs: parseNum(form.autoCompactionRetainRecentPairs) ?? 2
+      }
+    }
+    if (form.id) {
+      const updated = await configPresenter.updateDeepChatAgent(form.id, payload)
+      await loadAgents(updated?.id ?? form.id)
+    } else {
+      const created = await configPresenter.createDeepChatAgent(payload)
+      await loadAgents(created.id)
+    }
+  } finally {
+    saving.value = false
+  }
+}
+const removeAgent = async () => {
+  if (!form.id || form.protected) return
+  if (!window.confirm(t('settings.deepchatAgents.deleteConfirm', { name: form.name }))) return
+  deleting.value = true
+  try {
+    await configPresenter.deleteDeepChatAgent(form.id)
+    await loadAgents('deepchat')
+  } finally {
+    deleting.value = false
+  }
+}
+
+onMounted(async () => {
+  await Promise.all([loadTools(), loadRecentProjects(), loadAgents('deepchat')])
+})
+</script>
diff --git a/src/renderer/settings/main.ts b/src/renderer/settings/main.ts
index 3423cdef3..01e61c875 100644
--- a/src/renderer/settings/main.ts
+++ b/src/renderer/settings/main.ts
@@ -69,7 +69,7 @@ const router = createRouter({
       meta: {
         titleKey: 'routes.settings-dashboard',
         icon: 'lucide:layout-dashboard',
-        position: 3.5
+        position: 4.5
       }
     },
     {
@@ -79,7 +79,17 @@ const router = createRouter({
       meta: {
         titleKey: 'routes.settings-mcp',
         icon: 'lucide:server',
-        position: 4
+        position: 5
+      }
+    },
+    {
+      path: '/deepchat-agents',
+      name: 'settings-deepchat-agents',
+      component: () => import('./components/DeepChatAgentsSettings.vue'),
+      meta: {
+        titleKey: 'routes.settings-deepchat-agents',
+        icon: 'lucide:bot',
+        position: 3.5
       }
     },
     {
@@ -89,7 +99,7 @@ const router = createRouter({
       meta: {
         titleKey: 'routes.settings-acp',
         icon: 'lucide:shield-check',
-        position: 5
+        position: 4
       }
     },
     {
diff --git a/src/renderer/src/components/WindowSideBar.vue b/src/renderer/src/components/WindowSideBar.vue
index 3a828c839..17238e81f 100644
--- a/src/renderer/src/components/WindowSideBar.vue
+++ b/src/renderer/src/components/WindowSideBar.vue
@@ -39,7 +39,7 @@
               "
               @click="handleAgentSelect(agent.id)"
             >
-              <ModelIcon :model-id="agent.id" custom-class="w-4 h-4" :is-dark="themeStore.isDark" />
+              <AgentAvatar :agent="agent" class-name="w-4 h-4" />
             </Button>
           </TooltipTrigger>
           <TooltipContent side="right">{{ agent.name }}</TooltipContent>
@@ -245,16 +245,14 @@ import {
   DialogTitle
 } from '@shadcn/components/ui/dialog'
 import { usePresenter } from '@/composables/usePresenter'
-import { useThemeStore } from '@/stores/theme'
 import { useAgentStore } from '@/stores/ui/agent'
 import { useSessionStore, type UISession } from '@/stores/ui/session'
-import ModelIcon from './icons/ModelIcon.vue'
+import AgentAvatar from './icons/AgentAvatar.vue'
 import WindowSideBarSessionItem from './WindowSideBarSessionItem.vue'
 import { useI18n } from 'vue-i18n'
 
 const windowPresenter = usePresenter('windowPresenter')
 const { t } = useI18n()
-const themeStore = useThemeStore()
 const agentStore = useAgentStore()
 const sessionStore = useSessionStore()
 
diff --git a/src/renderer/src/components/chat-input/McpIndicator.vue b/src/renderer/src/components/chat-input/McpIndicator.vue
index 7355fb260..39808e5bc 100644
--- a/src/renderer/src/components/chat-input/McpIndicator.vue
+++ b/src/renderer/src/components/chat-input/McpIndicator.vue
@@ -286,15 +286,50 @@ let latestLoadToken = 0
 
 const enabledServers = computed(() => mcpStore.enabledServers)
 const enabledServerCount = computed(() => mcpStore.enabledServerCount)
+const availableAgents = computed(() => (Array.isArray(agentStore.agents) ? agentStore.agents : []))
+const resolveAgentType = (agentId: string | null | undefined): 'deepchat' | 'acp' => {
+  if (!agentId) {
+    return 'deepchat'
+  }
+
+  const matchedAgent = availableAgents.value.find((agent) => agent.id === agentId)
+  const selectedAgent =
+    agentStore.selectedAgent && agentStore.selectedAgent.id === agentId
+      ? agentStore.selectedAgent
+      : null
+  const explicitType = matchedAgent?.agentType ?? matchedAgent?.type ?? selectedAgent?.type
+  if (explicitType === 'deepchat' || explicitType === 'acp') {
+    return explicitType
+  }
+
+  return agentId === 'deepchat' ? 'deepchat' : 'acp'
+}
 
-const currentAgentId = computed(() => {
+const currentAgent = computed(() => {
   if (sessionStore.hasActiveSession) {
-    return sessionStore.activeSession?.agentId ?? 'deepchat'
+    const sessionAgentId = sessionStore.activeSession?.agentId ?? 'deepchat'
+    return (
+      availableAgents.value.find((agent) => agent.id === sessionAgentId) ?? {
+        id: sessionAgentId,
+        type:
+          sessionStore.activeSession?.providerId === 'acp'
+            ? 'acp'
+            : resolveAgentType(sessionAgentId)
+      }
+    )
   }
-  return agentStore.selectedAgentId ?? 'deepchat'
+  const selectedAgent = availableAgents.value.find(
+    (agent) => agent.id === agentStore.selectedAgentId
+  )
+  return (
+    agentStore.selectedAgent ?? {
+      id: agentStore.selectedAgentId ?? 'deepchat',
+      type: selectedAgent?.type ?? resolveAgentType(agentStore.selectedAgentId)
+    }
+  )
 })
 
-const isDeepchatContext = computed(() => currentAgentId.value === 'deepchat')
+const isDeepchatContext = computed(() => currentAgent.value.type === 'deepchat')
 const deepchatSessionId = computed(() =>
   isDeepchatContext.value && sessionStore.hasActiveSession ? sessionStore.activeSessionId : null
 )
@@ -465,15 +500,9 @@ const navigateToMcpSettings = (windowId: number) => {
 }
 
 const openSettings = async () => {
-  await windowPresenter.createSettingsWindow()
-  const settingsWindowId = windowPresenter.getSettingsWindowId()
+  const settingsWindowId = await windowPresenter.createSettingsWindow()
   if (settingsWindowId != null) {
     navigateToMcpSettings(settingsWindowId)
-    window.setTimeout(() => {
-      if (windowPresenter.getSettingsWindowId() === settingsWindowId) {
-        navigateToMcpSettings(settingsWindowId)
-      }
-    }, 250)
   }
   panelOpen.value = false
 }
diff --git a/src/renderer/src/components/chat/ChatStatusBar.vue b/src/renderer/src/components/chat/ChatStatusBar.vue
index e64745899..a8b58875c 100644
--- a/src/renderer/src/components/chat/ChatStatusBar.vue
+++ b/src/renderer/src/components/chat/ChatStatusBar.vue
@@ -731,7 +731,11 @@ import type {
   RENDERER_MODEL_META,
   SystemPrompt
 } from '@shared/presenter'
-import type { PermissionMode, SessionGenerationSettings } from '@shared/types/agent-interface'
+import type {
+  DeepChatAgentConfig,
+  PermissionMode,
+  SessionGenerationSettings
+} from '@shared/types/agent-interface'
 import type { ReasoningPortrait } from '@shared/types/model-db'
 import {
   normalizeLegacyThinkingBudgetValue,
@@ -855,13 +859,58 @@ let generationPersistRequestToken = 0
 let generationLocalRevision = 0
 
 const hasActiveSession = computed(() => sessionStore.hasActiveSession)
+const availableAgents = computed(() => (Array.isArray(agentStore.agents) ? agentStore.agents : []))
+const inferAgentType = (agentId: string | null | undefined): 'deepchat' | 'acp' | null => {
+  if (!agentId) {
+    return null
+  }
+
+  const matchedAgent = availableAgents.value.find((agent) => agent.id === agentId)
+  const selectedAgent =
+    agentStore.selectedAgent && agentStore.selectedAgent.id === agentId
+      ? agentStore.selectedAgent
+      : null
+  const explicitType = matchedAgent?.agentType ?? matchedAgent?.type ?? selectedAgent?.type
+  if (explicitType === 'deepchat' || explicitType === 'acp') {
+    return explicitType
+  }
+
+  return agentId === 'deepchat' ? 'deepchat' : 'acp'
+}
+
+const resolveDeepChatAgentConfig = async (agentId: string): Promise<DeepChatAgentConfig> => {
+  if (typeof configPresenter.resolveDeepChatAgentConfig === 'function') {
+    return configPresenter.resolveDeepChatAgentConfig(agentId)
+  }
+
+  const defaultSystemPrompt =
+    (typeof configPresenter.getDefaultSystemPrompt === 'function'
+      ? await configPresenter.getDefaultSystemPrompt()
+      : await configPresenter.getSetting?.('default_system_prompt')) ?? ''
+
+  return {
+    defaultModelPreset: undefined,
+    systemPrompt: typeof defaultSystemPrompt === 'string' ? defaultSystemPrompt : '',
+    permissionMode: 'full_access',
+    disabledAgentTools: []
+  }
+}
+
+const selectedAgentType = computed<'deepchat' | 'acp' | null>(() => {
+  return inferAgentType(agentStore.selectedAgentId)
+})
+const selectedDeepChatAgentId = computed(() => {
+  if (selectedAgentType.value === 'acp') {
+    return null
+  }
+  return agentStore.selectedAgentId ?? 'deepchat'
+})
 
 const isAcpAgent = computed(() => {
   if (hasActiveSession.value) {
     return sessionStore.activeSession?.providerId === 'acp'
   }
-  const agentId = agentStore.selectedAgentId
-  return agentId !== null && agentId !== 'deepchat'
+  return selectedAgentType.value === 'acp'
 })
 
 const activeAcpAgentId = computed(() => {
@@ -869,7 +918,7 @@ const activeAcpAgentId = computed(() => {
     return sessionStore.activeSession.modelId || null
   }
   const selectedAgentId = agentStore.selectedAgentId
-  return selectedAgentId && selectedAgentId !== 'deepchat' ? selectedAgentId : null
+  return selectedAgentType.value === 'acp' ? selectedAgentId : null
 })
 
 const activeAcpSessionId = computed(() => {
@@ -892,7 +941,7 @@ const lockedAcpModelId = computed(() => {
     return sessionStore.activeSession.modelId || null
   }
   const selectedAgentId = agentStore.selectedAgentId
-  return selectedAgentId && selectedAgentId !== 'deepchat' ? selectedAgentId : null
+  return selectedAgentType.value === 'acp' ? selectedAgentId : null
 })
 
 const isModelSelectionLocked = computed(() => isAcpAgent.value && Boolean(lockedAcpModelId.value))
@@ -915,7 +964,9 @@ const effectiveModelSelection = computed<ModelSelection | null>(() => {
   }
   if (isAcpAgent.value) {
     const agentId = agentStore.selectedAgentId
-    return agentId && agentId !== 'deepchat' ? { providerId: 'acp', modelId: agentId } : null
+    return selectedAgentType.value === 'acp' && agentId
+      ? { providerId: 'acp', modelId: agentId }
+      : null
   }
   return draftModelSelection.value
 })
@@ -1680,12 +1731,32 @@ const syncDraftModelSelection = async () => {
   if (isAcpAgent.value) {
     const agentId = agentStore.selectedAgentId
     applyDraftSelection(
-      agentId && agentId !== 'deepchat' ? { providerId: 'acp', modelId: agentId } : null
+      selectedAgentType.value === 'acp' && agentId ? { providerId: 'acp', modelId: agentId } : null
     )
     return
   }
 
   try {
+    const currentDraft = findEnabledModel(draftStore.providerId || '', draftStore.modelId || '')
+    if (currentDraft) {
+      applyDraftSelection(currentDraft)
+      return
+    }
+
+    const deepChatAgentId = selectedDeepChatAgentId.value ?? 'deepchat'
+    const agentConfig = await resolveDeepChatAgentConfig(deepChatAgentId)
+    if (token !== draftModelSyncToken) return
+    if (isModelSelection(agentConfig.defaultModelPreset)) {
+      const resolvedAgentDefault = findEnabledModel(
+        agentConfig.defaultModelPreset.providerId,
+        agentConfig.defaultModelPreset.modelId
+      )
+      if (resolvedAgentDefault) {
+        applyDraftSelection(resolvedAgentDefault)
+        return
+      }
+    }
+
     const preferredModel = (await configPresenter.getSetting('preferredModel')) as unknown
     if (token !== draftModelSyncToken) return
     if (isModelSelection(preferredModel)) {
@@ -1715,17 +1786,18 @@ const syncDraftModelSelection = async () => {
 
 const resolveDefaultGenerationSettings = async (
   providerId: string,
-  modelId: string
+  modelId: string,
+  agentId: string = 'deepchat'
 ): Promise<SessionGenerationSettings> => {
+  const agentConfig = await resolveDeepChatAgentConfig(agentId)
   const modelConfig = await configPresenter.getModelConfig(modelId, providerId)
-  const defaultSystemPrompt = await configPresenter.getDefaultSystemPrompt()
   const portrait = (await configPresenter.getReasoningPortrait?.(providerId, modelId)) ?? null
   const contextLengthDefault = toValidNonNegativeInteger(modelConfig.contextLength) ?? 32000
   const maxTokensDefault =
     toValidNonNegativeInteger(modelConfig.maxTokens) ?? Math.min(4096, contextLengthDefault)
 
   const defaults: SessionGenerationSettings = {
-    systemPrompt: defaultSystemPrompt ?? '',
+    systemPrompt: agentConfig.systemPrompt ?? '',
     temperature: parseFiniteNumericValue(modelConfig.temperature) ?? 0.7,
     contextLength: contextLengthDefault,
     maxTokens:
@@ -1920,7 +1992,8 @@ const syncGenerationSettings = async () => {
       } else {
         const defaults = await resolveDefaultGenerationSettings(
           selection.providerId,
-          selection.modelId
+          selection.modelId,
+          sessionStore.activeSession?.agentId ?? 'deepchat'
         )
         if (token !== generationSyncToken) {
           return
@@ -1934,7 +2007,11 @@ const syncGenerationSettings = async () => {
     }
   }
 
-  const defaults = await resolveDefaultGenerationSettings(selection.providerId, selection.modelId)
+  const defaults = await resolveDefaultGenerationSettings(
+    selection.providerId,
+    selection.modelId,
+    selectedDeepChatAgentId.value ?? 'deepchat'
+  )
   if (token !== generationSyncToken) {
     return
   }
diff --git a/src/renderer/src/components/icons/AgentAvatar.vue b/src/renderer/src/components/icons/AgentAvatar.vue
new file mode 100644
index 000000000..1a5fec14e
--- /dev/null
+++ b/src/renderer/src/components/icons/AgentAvatar.vue
@@ -0,0 +1,104 @@
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Icon } from '@iconify/vue'
+import type { UIAgent } from '@/stores/ui/agent'
+import { useThemeStore } from '@/stores/theme'
+import AcpAgentIcon from './AcpAgentIcon.vue'
+import deepchatLogo from '@/assets/logo.png?url'
+
+const props = withDefaults(
+  defineProps<{
+    agent: Pick<UIAgent, 'id' | 'name' | 'type' | 'icon' | 'avatar'>
+    className?: string
+    fallbackClassName?: string
+  }>(),
+  {
+    className: 'h-4 w-4',
+    fallbackClassName: 'rounded-md'
+  }
+)
+
+const themeStore = useThemeStore()
+
+const initials = computed(() => {
+  const name = props.agent.name.trim()
+  if (!name) {
+    return '?'
+  }
+
+  const latin = name.match(/[A-Za-z]/g)
+  if (latin && latin.length > 0) {
+    return latin.slice(0, 2).join('').toUpperCase()
+  }
+
+  return name.slice(0, 1)
+})
+
+const monogramBackground = computed(
+  () => props.agent.avatar?.kind === 'monogram' && props.agent.avatar.backgroundColor
+)
+
+const lucideColor = computed(() => {
+  if (props.agent.avatar?.kind !== 'lucide') {
+    return undefined
+  }
+  return themeStore.isDark ? props.agent.avatar.darkColor : props.agent.avatar.lightColor
+})
+
+const showBuiltinDeepChatLogo = computed(
+  () =>
+    props.agent.id === 'deepchat' &&
+    props.agent.type === 'deepchat' &&
+    !props.agent.avatar &&
+    !props.agent.icon
+)
+
+const showAcpIcon = computed(() => props.agent.type === 'acp' && Boolean(props.agent.icon?.trim()))
+
+const showImageIcon = computed(
+  () =>
+    Boolean(props.agent.icon?.trim()) &&
+    !showBuiltinDeepChatLogo.value &&
+    !showAcpIcon.value &&
+    props.agent.avatar?.kind !== 'lucide'
+)
+</script>
+
+<template>
+  <AcpAgentIcon
+    v-if="showAcpIcon"
+    :agent-id="agent.id"
+    :icon="agent.icon"
+    :alt="agent.name"
+    :fallback-text="agent.name"
+    :custom-class="className"
+  />
+  <img
+    v-else-if="showBuiltinDeepChatLogo || showImageIcon"
+    :src="showBuiltinDeepChatLogo ? deepchatLogo : agent.icon"
+    :alt="agent.name"
+    :class="['object-contain', className]"
+  />
+  <span
+    v-else-if="agent.avatar?.kind === 'lucide'"
+    :class="[
+      'inline-flex items-center justify-center text-foreground',
+      className,
+      fallbackClassName
+    ]"
+    :style="lucideColor ? { color: lucideColor } : undefined"
+  >
+    <Icon :icon="`lucide:${agent.avatar.icon}`" class="h-full w-full" />
+  </span>
+  <span
+    v-else
+    :class="[
+      'inline-flex items-center justify-center bg-muted/70 text-[0.72em] font-semibold text-foreground',
+      className,
+      fallbackClassName
+    ]"
+    :style="monogramBackground ? { backgroundColor: monogramBackground } : undefined"
+  >
+    {{ agent.avatar?.kind === 'monogram' ? agent.avatar.text : initials }}
+  </span>
+</template>
diff --git a/src/renderer/src/components/popup/TranslatePopup.vue b/src/renderer/src/components/popup/TranslatePopup.vue
index 744da10cf..c3b267d9c 100644
--- a/src/renderer/src/components/popup/TranslatePopup.vue
+++ b/src/renderer/src/components/popup/TranslatePopup.vue
@@ -39,11 +39,13 @@
 import { ref, onMounted, onUnmounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { usePresenter } from '@/composables/usePresenter'
+import { useAgentStore } from '@/stores/ui/agent'
 import { Button } from '@shadcn/components/ui/button'
 import { Icon } from '@iconify/vue'
 
 const { t, locale } = useI18n()
 const newAgentPresenter = usePresenter('newAgentPresenter')
+const agentStore = useAgentStore()
 
 // 状态
 const isOpen = ref(false)
@@ -125,7 +127,11 @@ const handleTranslateRequest = async (event: Event) => {
   translatedText.value = ''
 
   try {
-    const result = await newAgentPresenter.translateText(newText, locale.value)
+    const result = await newAgentPresenter.translateText(
+      newText,
+      locale.value,
+      agentStore.selectedAgentId ?? 'deepchat'
+    )
     translatedText.value = result
   } catch (error) {
     translatedText.value = t('contextMenu.translate.error')
diff --git a/src/renderer/src/events.ts b/src/renderer/src/events.ts
index 31a452996..7732f08b8 100644
--- a/src/renderer/src/events.ts
+++ b/src/renderer/src/events.ts
@@ -32,7 +32,8 @@ export const CONFIG_EVENTS = {
   FONT_SIZE_CHANGED: 'config:font-size-changed',
   DEFAULT_SYSTEM_PROMPT_CHANGED: 'config:default-system-prompt-changed',
   CUSTOM_PROMPTS_CHANGED: 'config:custom-prompts-changed',
-  DEFAULT_PROJECT_PATH_CHANGED: 'config:default-project-path-changed'
+  DEFAULT_PROJECT_PATH_CHANGED: 'config:default-project-path-changed',
+  AGENTS_CHANGED: 'config:agents-changed'
 }
 
 // 会话相关事件
@@ -75,6 +76,7 @@ export const WINDOW_EVENTS = {
 
 // Settings related events
 export const SETTINGS_EVENTS = {
+  READY: 'settings:ready',
   NAVIGATE: 'settings:navigate',
   CHECK_FOR_UPDATES: 'settings:check-for-updates'
 }
diff --git a/src/renderer/src/i18n/da-DK/chat.json b/src/renderer/src/i18n/da-DK/chat.json
index a4c017046..58910f066 100644
--- a/src/renderer/src/i18n/da-DK/chat.json
+++ b/src/renderer/src/i18n/da-DK/chat.json
@@ -47,7 +47,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "Indbyggede værktøjer",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/da-DK/routes.json b/src/renderer/src/i18n/da-DK/routes.json
index 265f700f6..d8b874237 100644
--- a/src/renderer/src/i18n/da-DK/routes.json
+++ b/src/renderer/src/i18n/da-DK/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "Dashboard",
-  "settings-environments": "Miljøer"
+  "settings-environments": "Miljøer",
+  "settings-deepchat-agents": "DeepChat-agenter"
 }
diff --git a/src/renderer/src/i18n/da-DK/settings.json b/src/renderer/src/i18n/da-DK/settings.json
index b41254416..69340ccb2 100644
--- a/src/renderer/src/i18n/da-DK/settings.json
+++ b/src/renderer/src/i18n/da-DK/settings.json
@@ -1243,9 +1243,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "Automatisk fallback",
+        "system": "System-runtime",
+        "builtin": "Indbygget runtime"
       }
     },
     "empty": "Ingen færdigheder",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "Kunne ikke åbne mappe"
     }
+  },
+  "deepchatAgents": {
+    "title": "DeepChat-agenter",
+    "description": "Administrer DeepChat-agenter og de standardværdier, de bruger i nye sessioner.",
+    "builtIn": "Indbygget",
+    "editTitle": "Rediger DeepChat-agent",
+    "createTitle": "Opret DeepChat-agent",
+    "unnamed": "Unavngiven agent",
+    "name": "Navn",
+    "namePlaceholder": "For eksempel: Skribent / Research / Oversæt",
+    "enabledLabel": "Aktiveret",
+    "descriptionLabel": "Beskrivelse",
+    "descriptionPlaceholder": "Valgfri note om, hvad denne agent bruges til",
+    "avatarTitle": "Avatar",
+    "avatarDefault": "Standard",
+    "avatarDefaultDesc": "DeepChat beholder det indbyggede ikon. Andre agenter bruger en tekstavatar.",
+    "avatarLucide": "Lucide-ikon",
+    "avatarLucideDesc": "Vælg et Lucide-ikon, og angiv farver til lys/mørk tilstand.",
+    "avatarMonogram": "Monogram",
+    "avatarMonogramDesc": "Brug to latinske bogstaver eller det første CJK-tegn.",
+    "lucideIcon": "Lucide-ikonnavn",
+    "lightColor": "Lys farve",
+    "darkColor": "Mørk farve",
+    "monogramText": "Monogram",
+    "monogramPlaceholder": "For eksempel: WR / 研",
+    "backgroundColor": "Baggrundsfarve",
+    "modelsTitle": "Modelstandarder",
+    "chatModel": "Standard chatmodel",
+    "assistantModel": "Assistentmodel",
+    "visionModel": "Visionsmodel",
+    "temperature": "Temperatur",
+    "contextLength": "Kontekstlængde",
+    "maxTokens": "Maks. tokens",
+    "thinkingBudget": "Tænkningsbudget",
+    "reasoningEffort": "Ræsonnementsniveau",
+    "verbosity": "Detaljegrad",
+    "interleaved": "Gennemtving kompatibilitet for interleaved thinking",
+    "systemPrompt": "Standard systemprompt",
+    "systemPromptPlaceholder": "Lad stå tomt for en tom systemprompt",
+    "defaultProjectPath": "Standardmappe (valgfri)",
+    "defaultProjectPathPlaceholder": "Lad stå tomt for at bruge den globale standardmappe",
+    "permissionMode": "Standardtilladelse",
+    "permissionFullAccess": "Fuld adgang",
+    "permissionDefault": "Standardtilladelse",
+    "toolsTitle": "Indbyggede værktøjer",
+    "compactionTitle": "Automatisk komprimering",
+    "compactionEnabled": "Aktivér automatisk komprimering",
+    "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."
   }
 }
diff --git a/src/renderer/src/i18n/da-DK/welcome.json b/src/renderer/src/i18n/da-DK/welcome.json
index 5c3c3c9cf..8db519d00 100644
--- a/src/renderer/src/i18n/da-DK/welcome.json
+++ b/src/renderer/src/i18n/da-DK/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "Vælg en agent for at begynde at skabe",
+    "deepchatType": "DeepChat-agent",
+    "acpType": "ACP-agent",
+    "manageAgents": "Administrer DeepChat-agenter"
   }
 }
diff --git a/src/renderer/src/i18n/en-US/routes.json b/src/renderer/src/i18n/en-US/routes.json
index 5fc3502cc..dfb4579a0 100644
--- a/src/renderer/src/i18n/en-US/routes.json
+++ b/src/renderer/src/i18n/en-US/routes.json
@@ -6,6 +6,7 @@
   "settings-common": "Common Settings",
   "settings-provider": "Providers",
   "settings-mcp": "MCP Settings",
+  "settings-deepchat-agents": "DeepChat Agents",
   "settings-database": "Data",
   "settings-about": "About",
   "settings-shortcut": "Shortcuts",
diff --git a/src/renderer/src/i18n/en-US/settings.json b/src/renderer/src/i18n/en-US/settings.json
index 1ca5ba1aa..ea408858b 100644
--- a/src/renderer/src/i18n/en-US/settings.json
+++ b/src/renderer/src/i18n/en-US/settings.json
@@ -77,6 +77,57 @@
       "visionModel": "Default Vision Model"
     }
   },
+  "deepchatAgents": {
+    "title": "DeepChat Agents",
+    "description": "Manage DeepChat agents and the defaults they seed into new sessions.",
+    "builtIn": "Built-in",
+    "editTitle": "Edit DeepChat Agent",
+    "createTitle": "Create DeepChat Agent",
+    "unnamed": "Unnamed Agent",
+    "name": "Name",
+    "namePlaceholder": "For example: Writer / Research / Translate",
+    "enabledLabel": "Enabled",
+    "descriptionLabel": "Description",
+    "descriptionPlaceholder": "Optional note about what this agent is for",
+    "avatarTitle": "Avatar",
+    "avatarDefault": "Default",
+    "avatarDefaultDesc": "DeepChat keeps the built-in icon. Other agents use a text avatar.",
+    "avatarLucide": "Lucide Icon",
+    "avatarLucideDesc": "Pick a Lucide icon and set light/dark colors.",
+    "avatarMonogram": "Monogram",
+    "avatarMonogramDesc": "Use two Latin letters or the first CJK character.",
+    "lucideIcon": "Lucide icon name",
+    "lightColor": "Light color",
+    "darkColor": "Dark color",
+    "monogramText": "Monogram",
+    "monogramPlaceholder": "For example: WR / 研",
+    "backgroundColor": "Background color",
+    "modelsTitle": "Model Defaults",
+    "chatModel": "Default Chat Model",
+    "assistantModel": "Assistant Model",
+    "visionModel": "Vision Model",
+    "temperature": "Temperature",
+    "contextLength": "Context Length",
+    "maxTokens": "Max Tokens",
+    "thinkingBudget": "Thinking Budget",
+    "reasoningEffort": "Reasoning Effort",
+    "verbosity": "Verbosity",
+    "interleaved": "Force interleaved thinking compat",
+    "systemPrompt": "Default system prompt",
+    "systemPromptPlaceholder": "Leave blank for an empty system prompt",
+    "defaultProjectPath": "Default directory (optional)",
+    "defaultProjectPathPlaceholder": "Leave empty to use the global default directory",
+    "permissionMode": "Default permission",
+    "permissionFullAccess": "Full access",
+    "permissionDefault": "Default permission",
+    "toolsTitle": "Built-in Tools",
+    "compactionTitle": "Auto Compaction",
+    "compactionEnabled": "Enable auto compaction",
+    "compactionDescription": "These defaults only affect future DeepChat sessions.",
+    "compactionThreshold": "Trigger threshold",
+    "compactionRetainPairs": "Retain recent pairs",
+    "deleteConfirm": "Delete agent \"{name}\"? Its history will fall back to the built-in DeepChat agent."
+  },
   "notificationsHooks": {
     "title": "Hooks",
     "description": "Configure webhook notifications and lifecycle hooks.",
diff --git a/src/renderer/src/i18n/en-US/welcome.json b/src/renderer/src/i18n/en-US/welcome.json
index 8a58fe1f0..e1bac35b8 100644
--- a/src/renderer/src/i18n/en-US/welcome.json
+++ b/src/renderer/src/i18n/en-US/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "Choose an Agent to Start Creating",
+    "deepchatType": "DeepChat Agent",
+    "acpType": "ACP Agent",
+    "manageAgents": "Manage DeepChat Agents"
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/chat.json b/src/renderer/src/i18n/fa-IR/chat.json
index 445353dc8..d4ccb6c78 100644
--- a/src/renderer/src/i18n/fa-IR/chat.json
+++ b/src/renderer/src/i18n/fa-IR/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "ابزارهای داخلی",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/fa-IR/routes.json b/src/renderer/src/i18n/fa-IR/routes.json
index 04ac33823..6688bf73e 100644
--- a/src/renderer/src/i18n/fa-IR/routes.json
+++ b/src/renderer/src/i18n/fa-IR/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "هوک‌ها",
   "settings-dashboard": "داشبورد",
-  "settings-environments": "محیط‌ها"
+  "settings-environments": "محیط‌ها",
+  "settings-deepchat-agents": "ایجنت‌های DeepChat"
 }
diff --git a/src/renderer/src/i18n/fa-IR/settings.json b/src/renderer/src/i18n/fa-IR/settings.json
index 50724723a..28204d50b 100644
--- a/src/renderer/src/i18n/fa-IR/settings.json
+++ b/src/renderer/src/i18n/fa-IR/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "بازگشت خودکار",
+        "system": "رانتایم سیستم",
+        "builtin": "رانتایم داخلی"
       }
     },
     "empty": "بدون مهارت",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "باز کردن پوشه ناموفق بود"
     }
+  },
+  "deepchatAgents": {
+    "title": "ایجنت‌های DeepChat",
+    "description": "ایجنت‌های DeepChat و پیش‌فرض‌هایی را که برای نشست‌های جدید اعمال می‌کنند مدیریت کنید.",
+    "builtIn": "داخلی",
+    "editTitle": "ویرایش ایجنت DeepChat",
+    "createTitle": "ایجاد ایجنت DeepChat",
+    "unnamed": "ایجنت بی‌نام",
+    "name": "نام",
+    "namePlaceholder": "مثلاً: نویسنده / پژوهش / ترجمه",
+    "enabledLabel": "فعال",
+    "descriptionLabel": "توضیحات",
+    "descriptionPlaceholder": "توضیح اختیاری درباره کاربرد این ایجنت",
+    "avatarTitle": "آواتار",
+    "avatarDefault": "پیش‌فرض",
+    "avatarDefaultDesc": "DeepChat از آیکن داخلی خود استفاده می‌کند. ایجنت‌های دیگر از آواتار متنی استفاده می‌کنند.",
+    "avatarLucide": "آیکن Lucide",
+    "avatarLucideDesc": "یک آیکن از Lucide انتخاب کنید و رنگ حالت روشن/تیره را تنظیم کنید.",
+    "avatarMonogram": "حروف نشان",
+    "avatarMonogramDesc": "از دو حرف لاتین یا اولین نویسه چینی/ژاپنی/کره‌ای استفاده کنید.",
+    "lucideIcon": "نام آیکن Lucide",
+    "lightColor": "رنگ حالت روشن",
+    "darkColor": "رنگ حالت تیره",
+    "monogramText": "حروف نشان",
+    "monogramPlaceholder": "مثلاً: WR / 研",
+    "backgroundColor": "رنگ پس‌زمینه",
+    "modelsTitle": "پیش‌فرض‌های مدل",
+    "chatModel": "مدل پیش‌فرض گفتگو",
+    "assistantModel": "مدل دستیار",
+    "visionModel": "مدل بینایی",
+    "temperature": "دما",
+    "contextLength": "طول کانتکست",
+    "maxTokens": "حداکثر توکن",
+    "thinkingBudget": "بودجه تفکر",
+    "reasoningEffort": "سطح استدلال",
+    "verbosity": "میزان توضیح",
+    "interleaved": "اجبار به سازگاری با تفکر درهم‌تنیده",
+    "systemPrompt": "پرامپت سیستمی پیش‌فرض",
+    "systemPromptPlaceholder": "برای استفاده از پرامپت سیستمی خالی، اینجا را خالی بگذارید",
+    "defaultProjectPath": "پوشه پیش‌فرض (اختیاری)",
+    "defaultProjectPathPlaceholder": "برای استفاده از پوشه پیش‌فرض سراسری، خالی بگذارید",
+    "permissionMode": "مجوز پیش‌فرض",
+    "permissionFullAccess": "دسترسی کامل",
+    "permissionDefault": "مجوز پیش‌فرض",
+    "toolsTitle": "ابزارهای داخلی",
+    "compactionTitle": "فشرده‌سازی خودکار",
+    "compactionEnabled": "فعال‌سازی فشرده‌سازی خودکار",
+    "compactionDescription": "این پیش‌فرض‌ها فقط بر نشست‌های جدید DeepChat اثر می‌گذارند.",
+    "compactionThreshold": "آستانه فعال‌سازی",
+    "compactionRetainPairs": "نگه‌داری جفت‌های اخیر",
+    "deleteConfirm": "ایجنت «{name}» حذف شود؟ تاریخچه آن به ایجنت داخلی DeepChat برمی‌گردد."
   }
 }
diff --git a/src/renderer/src/i18n/fa-IR/welcome.json b/src/renderer/src/i18n/fa-IR/welcome.json
index 67a85e590..8b74ca516 100644
--- a/src/renderer/src/i18n/fa-IR/welcome.json
+++ b/src/renderer/src/i18n/fa-IR/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "یک ایجنت انتخاب کنید و خلق را شروع کنید",
+    "deepchatType": "ایجنت DeepChat",
+    "acpType": "ایجنت ACP",
+    "manageAgents": "مدیریت ایجنت‌های DeepChat"
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/chat.json b/src/renderer/src/i18n/fr-FR/chat.json
index 7db8a89fb..a5ff7372a 100644
--- a/src/renderer/src/i18n/fr-FR/chat.json
+++ b/src/renderer/src/i18n/fr-FR/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "Outils intégrés",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/fr-FR/routes.json b/src/renderer/src/i18n/fr-FR/routes.json
index 7a33d911d..236d17995 100644
--- a/src/renderer/src/i18n/fr-FR/routes.json
+++ b/src/renderer/src/i18n/fr-FR/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "Tableau de bord",
-  "settings-environments": "Environnements"
+  "settings-environments": "Environnements",
+  "settings-deepchat-agents": "Agents DeepChat"
 }
diff --git a/src/renderer/src/i18n/fr-FR/settings.json b/src/renderer/src/i18n/fr-FR/settings.json
index 96adab2bd..6c3ca06e4 100644
--- a/src/renderer/src/i18n/fr-FR/settings.json
+++ b/src/renderer/src/i18n/fr-FR/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "Repli automatique",
+        "system": "Runtime système",
+        "builtin": "Runtime intégré"
       }
     },
     "empty": "Aucune compétence pour le moment",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "Échec de l'ouverture du dossier"
     }
+  },
+  "deepchatAgents": {
+    "title": "Agents DeepChat",
+    "description": "Gérez les agents DeepChat et les valeurs par défaut qu'ils injectent dans les nouvelles sessions.",
+    "builtIn": "Intégré",
+    "editTitle": "Modifier l'agent DeepChat",
+    "createTitle": "Créer un agent DeepChat",
+    "unnamed": "Agent sans nom",
+    "name": "Nom",
+    "namePlaceholder": "Par exemple : Rédaction / Recherche / Traduction",
+    "enabledLabel": "Activé",
+    "descriptionLabel": "Description",
+    "descriptionPlaceholder": "Note facultative sur l'usage de cet agent",
+    "avatarTitle": "Avatar",
+    "avatarDefault": "Par défaut",
+    "avatarDefaultDesc": "DeepChat conserve son icône intégrée. Les autres agents utilisent un avatar textuel.",
+    "avatarLucide": "Icône Lucide",
+    "avatarLucideDesc": "Choisissez une icône Lucide et définissez les couleurs clair/sombre.",
+    "avatarMonogram": "Monogramme",
+    "avatarMonogramDesc": "Utilisez deux lettres latines ou le premier caractère CJK.",
+    "lucideIcon": "Nom de l'icône Lucide",
+    "lightColor": "Couleur claire",
+    "darkColor": "Couleur sombre",
+    "monogramText": "Monogramme",
+    "monogramPlaceholder": "Par exemple : WR / 研",
+    "backgroundColor": "Couleur d'arrière-plan",
+    "modelsTitle": "Valeurs par défaut du modèle",
+    "chatModel": "Modèle de chat par défaut",
+    "assistantModel": "Modèle d'assistant",
+    "visionModel": "Modèle de vision",
+    "temperature": "Température",
+    "contextLength": "Longueur du contexte",
+    "maxTokens": "Nombre max. de tokens",
+    "thinkingBudget": "Budget de réflexion",
+    "reasoningEffort": "Niveau de raisonnement",
+    "verbosity": "Niveau de détail",
+    "interleaved": "Forcer la compatibilité avec le raisonnement intercalé",
+    "systemPrompt": "Prompt système par défaut",
+    "systemPromptPlaceholder": "Laissez vide pour utiliser un prompt système vide",
+    "defaultProjectPath": "Répertoire par défaut (facultatif)",
+    "defaultProjectPathPlaceholder": "Laissez vide pour utiliser le répertoire par défaut global",
+    "permissionMode": "Autorisation par défaut",
+    "permissionFullAccess": "Accès complet",
+    "permissionDefault": "Autorisation par défaut",
+    "toolsTitle": "Outils intégrés",
+    "compactionTitle": "Compaction automatique",
+    "compactionEnabled": "Activer la compaction automatique",
+    "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é."
   }
 }
diff --git a/src/renderer/src/i18n/fr-FR/welcome.json b/src/renderer/src/i18n/fr-FR/welcome.json
index 9a7cc2caa..807e47226 100644
--- a/src/renderer/src/i18n/fr-FR/welcome.json
+++ b/src/renderer/src/i18n/fr-FR/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "Choisissez un agent pour commencer à créer",
+    "deepchatType": "Agent DeepChat",
+    "acpType": "Agent ACP",
+    "manageAgents": "Gérer les agents DeepChat"
   }
 }
diff --git a/src/renderer/src/i18n/he-IL/chat.json b/src/renderer/src/i18n/he-IL/chat.json
index 970814aa5..111a0ebb9 100644
--- a/src/renderer/src/i18n/he-IL/chat.json
+++ b/src/renderer/src/i18n/he-IL/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "כלים מובנים",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/he-IL/routes.json b/src/renderer/src/i18n/he-IL/routes.json
index 7932e17b7..199fada48 100644
--- a/src/renderer/src/i18n/he-IL/routes.json
+++ b/src/renderer/src/i18n/he-IL/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "Dashboard",
-  "settings-environments": "סביבות"
+  "settings-environments": "סביבות",
+  "settings-deepchat-agents": "סוכני DeepChat"
 }
diff --git a/src/renderer/src/i18n/he-IL/settings.json b/src/renderer/src/i18n/he-IL/settings.json
index 5a558087e..160ec3bb0 100644
--- a/src/renderer/src/i18n/he-IL/settings.json
+++ b/src/renderer/src/i18n/he-IL/settings.json
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "פתיחת התיקייה נכשלה"
     }
+  },
+  "deepchatAgents": {
+    "title": "סוכני DeepChat",
+    "description": "נהלו את סוכני DeepChat ואת הברירות שהם מחילים על שיחות חדשות.",
+    "builtIn": "מובנה",
+    "editTitle": "עריכת סוכן DeepChat",
+    "createTitle": "יצירת סוכן DeepChat",
+    "unnamed": "סוכן ללא שם",
+    "name": "שם",
+    "namePlaceholder": "לדוגמה: כתיבה / מחקר / תרגום",
+    "enabledLabel": "פעיל",
+    "descriptionLabel": "תיאור",
+    "descriptionPlaceholder": "הערה אופציונלית על מטרת הסוכן",
+    "avatarTitle": "אווטאר",
+    "avatarDefault": "ברירת מחדל",
+    "avatarDefaultDesc": "DeepChat שומר על הסמל המובנה. סוכנים אחרים משתמשים באווטאר טקסטואלי.",
+    "avatarLucide": "סמל Lucide",
+    "avatarLucideDesc": "בחרו סמל מתוך Lucide והגדירו צבעים למצב בהיר/כהה.",
+    "avatarMonogram": "מונוגרמה",
+    "avatarMonogramDesc": "השתמשו בשתי אותיות לטיניות או בתו הראשון בשפות סיניות/יפניות/קוריאניות.",
+    "lucideIcon": "שם סמל Lucide",
+    "lightColor": "צבע בהיר",
+    "darkColor": "צבע כהה",
+    "monogramText": "מונוגרמה",
+    "monogramPlaceholder": "לדוגמה: WR / 研",
+    "backgroundColor": "צבע רקע",
+    "modelsTitle": "ברירות מחדל למודל",
+    "chatModel": "מודל שיחה ברירת מחדל",
+    "assistantModel": "מודל עוזר",
+    "visionModel": "מודל ראייה",
+    "temperature": "טמפרטורה",
+    "contextLength": "אורך הקשר",
+    "maxTokens": "מספר טוקנים מרבי",
+    "thinkingBudget": "תקציב חשיבה",
+    "reasoningEffort": "רמת נימוק",
+    "verbosity": "רמת פירוט",
+    "interleaved": "כפיית תאימות לחשיבה משולבת",
+    "systemPrompt": "הנחיית מערכת ברירת מחדל",
+    "systemPromptPlaceholder": "השאירו ריק כדי להשתמש בהנחיית מערכת ריקה",
+    "defaultProjectPath": "תיקיית ברירת מחדל (אופציונלי)",
+    "defaultProjectPathPlaceholder": "השאירו ריק כדי להשתמש בתיקיית ברירת המחדל הגלובלית",
+    "permissionMode": "הרשאת ברירת מחדל",
+    "permissionFullAccess": "גישה מלאה",
+    "permissionDefault": "הרשאת ברירת מחדל",
+    "toolsTitle": "כלים מובנים",
+    "compactionTitle": "דחיסה אוטומטית",
+    "compactionEnabled": "הפעלת דחיסה אוטומטית",
+    "compactionDescription": "ברירות המחדל האלה משפיעות רק על שיחות DeepChat חדשות.",
+    "compactionThreshold": "סף הפעלה",
+    "compactionRetainPairs": "שמירת הזוגות האחרונים",
+    "deleteConfirm": "למחוק את הסוכן \"{name}\"? ההיסטוריה שלו תחזור לסוכן DeepChat המובנה."
   }
 }
diff --git a/src/renderer/src/i18n/he-IL/welcome.json b/src/renderer/src/i18n/he-IL/welcome.json
index cbf82dc22..5a3949216 100644
--- a/src/renderer/src/i18n/he-IL/welcome.json
+++ b/src/renderer/src/i18n/he-IL/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "בחרו סוכן כדי להתחיל ליצור",
+    "deepchatType": "סוכן DeepChat",
+    "acpType": "סוכן ACP",
+    "manageAgents": "ניהול סוכני DeepChat"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/chat.json b/src/renderer/src/i18n/ja-JP/chat.json
index 6a1df7314..1c235db86 100644
--- a/src/renderer/src/i18n/ja-JP/chat.json
+++ b/src/renderer/src/i18n/ja-JP/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "内蔵ツール",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/ja-JP/routes.json b/src/renderer/src/i18n/ja-JP/routes.json
index e3dfebf9f..d98af7259 100644
--- a/src/renderer/src/i18n/ja-JP/routes.json
+++ b/src/renderer/src/i18n/ja-JP/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "フック",
   "settings-dashboard": "Dashboard",
-  "settings-environments": "環境"
+  "settings-environments": "環境",
+  "settings-deepchat-agents": "DeepChatエージェント"
 }
diff --git a/src/renderer/src/i18n/ja-JP/settings.json b/src/renderer/src/i18n/ja-JP/settings.json
index be8127aed..ff543d7e5 100644
--- a/src/renderer/src/i18n/ja-JP/settings.json
+++ b/src/renderer/src/i18n/ja-JP/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "自動フォールバック",
+        "system": "システムランタイム",
+        "builtin": "内蔵ランタイム"
       }
     },
     "empty": "スキルなし",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "ディレクトリを開けませんでした"
     }
+  },
+  "deepchatAgents": {
+    "title": "DeepChatエージェント",
+    "description": "DeepChatエージェントと、新しいセッションに適用する既定値を管理します。",
+    "builtIn": "内蔵",
+    "editTitle": "DeepChatエージェントを編集",
+    "createTitle": "DeepChatエージェントを作成",
+    "unnamed": "名称未設定のエージェント",
+    "name": "名称",
+    "namePlaceholder": "例: 執筆 / 調査 / 翻訳",
+    "enabledLabel": "有効",
+    "descriptionLabel": "説明",
+    "descriptionPlaceholder": "このエージェントの用途を補足する任意のメモ",
+    "avatarTitle": "アバター",
+    "avatarDefault": "デフォルト",
+    "avatarDefaultDesc": "DeepChat は内蔵アイコンを使用し、他のエージェントは文字アバターを使用します。",
+    "avatarLucide": "Lucide アイコン",
+    "avatarLucideDesc": "Lucide アイコンを選び、ライト/ダーク用の色を設定します。",
+    "avatarMonogram": "文字アバター",
+    "avatarMonogramDesc": "英字2文字、または最初の CJK 文字を使用します。",
+    "lucideIcon": "Lucide アイコン名",
+    "lightColor": "ライト時の色",
+    "darkColor": "ダーク時の色",
+    "monogramText": "文字アバター",
+    "monogramPlaceholder": "例: WR / 研",
+    "backgroundColor": "背景色",
+    "modelsTitle": "モデルの既定値",
+    "chatModel": "既定の会話モデル",
+    "assistantModel": "アシスタントモデル",
+    "visionModel": "ビジョンモデル",
+    "temperature": "温度",
+    "contextLength": "コンテキスト長",
+    "maxTokens": "最大トークン数",
+    "thinkingBudget": "思考予算",
+    "reasoningEffort": "推論強度",
+    "verbosity": "詳細度",
+    "interleaved": "インターリーブ思考互換を強制",
+    "systemPrompt": "既定のシステムプロンプト",
+    "systemPromptPlaceholder": "空欄のシステムプロンプトにする場合は空のままにします",
+    "defaultProjectPath": "既定のディレクトリ（任意）",
+    "defaultProjectPathPlaceholder": "未設定の場合はグローバル既定ディレクトリを使用します",
+    "permissionMode": "既定の権限",
+    "permissionFullAccess": "フルアクセス",
+    "permissionDefault": "既定の権限",
+    "toolsTitle": "内蔵ツール",
+    "compactionTitle": "自動圧縮",
+    "compactionEnabled": "自動圧縮を有効にする",
+    "compactionDescription": "これらの既定値は、今後作成する DeepChat セッションにのみ適用されます。",
+    "compactionThreshold": "発動しきい値",
+    "compactionRetainPairs": "保持する直近ペア数",
+    "deleteConfirm": "エージェント「{name}」を削除しますか？ その履歴は内蔵 DeepChat エージェントに戻されます。"
   }
 }
diff --git a/src/renderer/src/i18n/ja-JP/welcome.json b/src/renderer/src/i18n/ja-JP/welcome.json
index 1d097a119..8d3ae3a8a 100644
--- a/src/renderer/src/i18n/ja-JP/welcome.json
+++ b/src/renderer/src/i18n/ja-JP/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "エージェントを選んで作成を始める",
+    "deepchatType": "DeepChatエージェント",
+    "acpType": "ACPエージェント",
+    "manageAgents": "DeepChatエージェントを管理"
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/chat.json b/src/renderer/src/i18n/ko-KR/chat.json
index a7a911b62..cb6e03833 100644
--- a/src/renderer/src/i18n/ko-KR/chat.json
+++ b/src/renderer/src/i18n/ko-KR/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "내장 도구",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/ko-KR/routes.json b/src/renderer/src/i18n/ko-KR/routes.json
index 1f038823f..ac3e46997 100644
--- a/src/renderer/src/i18n/ko-KR/routes.json
+++ b/src/renderer/src/i18n/ko-KR/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "훅",
   "settings-dashboard": "Dashboard",
-  "settings-environments": "환경"
+  "settings-environments": "환경",
+  "settings-deepchat-agents": "DeepChat 에이전트"
 }
diff --git a/src/renderer/src/i18n/ko-KR/settings.json b/src/renderer/src/i18n/ko-KR/settings.json
index 01d2bcc21..ed478302b 100644
--- a/src/renderer/src/i18n/ko-KR/settings.json
+++ b/src/renderer/src/i18n/ko-KR/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "자동 대체",
+        "system": "시스템 런타임",
+        "builtin": "내장 런타임"
       }
     },
     "empty": "스킬 없음",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "디렉터리를 열지 못했습니다"
     }
+  },
+  "deepchatAgents": {
+    "title": "DeepChat 에이전트",
+    "description": "DeepChat 에이전트와 새 세션에 적용할 기본값을 관리합니다.",
+    "builtIn": "내장",
+    "editTitle": "DeepChat 에이전트 편집",
+    "createTitle": "DeepChat 에이전트 만들기",
+    "unnamed": "이름 없는 에이전트",
+    "name": "이름",
+    "namePlaceholder": "예: 작성 / 리서치 / 번역",
+    "enabledLabel": "사용",
+    "descriptionLabel": "설명",
+    "descriptionPlaceholder": "이 에이전트의 용도를 설명하는 선택 메모",
+    "avatarTitle": "아바타",
+    "avatarDefault": "기본값",
+    "avatarDefaultDesc": "DeepChat은 기본 아이콘을 유지하고, 다른 에이전트는 문자 아바타를 사용합니다.",
+    "avatarLucide": "Lucide 아이콘",
+    "avatarLucideDesc": "Lucide 아이콘을 고르고 라이트/다크 색상을 설정합니다.",
+    "avatarMonogram": "문자 아바타",
+    "avatarMonogramDesc": "라틴 문자 2개 또는 첫 번째 CJK 문자를 사용합니다.",
+    "lucideIcon": "Lucide 아이콘 이름",
+    "lightColor": "라이트 색상",
+    "darkColor": "다크 색상",
+    "monogramText": "문자 아바타",
+    "monogramPlaceholder": "예: WR / 研",
+    "backgroundColor": "배경색",
+    "modelsTitle": "모델 기본값",
+    "chatModel": "기본 대화 모델",
+    "assistantModel": "보조 모델",
+    "visionModel": "비전 모델",
+    "temperature": "온도",
+    "contextLength": "컨텍스트 길이",
+    "maxTokens": "최대 토큰",
+    "thinkingBudget": "사고 예산",
+    "reasoningEffort": "추론 강도",
+    "verbosity": "응답 상세도",
+    "interleaved": "인터리브드 사고 호환 강제",
+    "systemPrompt": "기본 시스템 프롬프트",
+    "systemPromptPlaceholder": "빈 시스템 프롬프트를 쓰려면 비워 두세요",
+    "defaultProjectPath": "기본 디렉터리(선택)",
+    "defaultProjectPathPlaceholder": "비워 두면 전역 기본 디렉터리를 사용합니다",
+    "permissionMode": "기본 권한",
+    "permissionFullAccess": "전체 접근",
+    "permissionDefault": "기본 권한",
+    "toolsTitle": "내장 도구",
+    "compactionTitle": "자동 압축",
+    "compactionEnabled": "자동 압축 사용",
+    "compactionDescription": "이 기본값은 앞으로 만드는 DeepChat 세션에만 적용됩니다.",
+    "compactionThreshold": "트리거 임계값",
+    "compactionRetainPairs": "최근 페어 유지",
+    "deleteConfirm": "에이전트 \"{name}\"을(를) 삭제할까요? 기록은 내장 DeepChat 에이전트로 이동합니다."
   }
 }
diff --git a/src/renderer/src/i18n/ko-KR/welcome.json b/src/renderer/src/i18n/ko-KR/welcome.json
index eed762ed3..6a6eebc40 100644
--- a/src/renderer/src/i18n/ko-KR/welcome.json
+++ b/src/renderer/src/i18n/ko-KR/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "에이전트를 선택해 제작 시작",
+    "deepchatType": "DeepChat 에이전트",
+    "acpType": "ACP 에이전트",
+    "manageAgents": "DeepChat 에이전트 관리"
   }
 }
diff --git a/src/renderer/src/i18n/pt-BR/chat.json b/src/renderer/src/i18n/pt-BR/chat.json
index 069a35abd..0e69ee984 100644
--- a/src/renderer/src/i18n/pt-BR/chat.json
+++ b/src/renderer/src/i18n/pt-BR/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "Ferramentas internas",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/pt-BR/routes.json b/src/renderer/src/i18n/pt-BR/routes.json
index 8647fa8a1..4c4001707 100644
--- a/src/renderer/src/i18n/pt-BR/routes.json
+++ b/src/renderer/src/i18n/pt-BR/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "Dashboard",
-  "settings-environments": "Ambientes"
+  "settings-environments": "Ambientes",
+  "settings-deepchat-agents": "Agentes do DeepChat"
 }
diff --git a/src/renderer/src/i18n/pt-BR/settings.json b/src/renderer/src/i18n/pt-BR/settings.json
index 9063f71b1..52081a205 100644
--- a/src/renderer/src/i18n/pt-BR/settings.json
+++ b/src/renderer/src/i18n/pt-BR/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "Automático",
+        "system": "Runtime do sistema",
+        "builtin": "Runtime integrado"
       }
     },
     "empty": "Sem skill",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "Falha ao abrir diretório"
     }
+  },
+  "deepchatAgents": {
+    "title": "Agentes do DeepChat",
+    "description": "Gerencie os agentes do DeepChat e os padrões que eles aplicam às novas sessões.",
+    "builtIn": "Integrado",
+    "editTitle": "Editar agente do DeepChat",
+    "createTitle": "Criar agente do DeepChat",
+    "unnamed": "Agente sem nome",
+    "name": "Nome",
+    "namePlaceholder": "Por exemplo: Escrita / Pesquisa / Tradução",
+    "enabledLabel": "Ativado",
+    "descriptionLabel": "Descrição",
+    "descriptionPlaceholder": "Observação opcional sobre para que este agente serve",
+    "avatarTitle": "Avatar",
+    "avatarDefault": "Padrão",
+    "avatarDefaultDesc": "O DeepChat mantém o ícone integrado. Os outros agentes usam um avatar textual.",
+    "avatarLucide": "Ícone Lucide",
+    "avatarLucideDesc": "Escolha um ícone Lucide e defina as cores para claro/escuro.",
+    "avatarMonogram": "Monograma",
+    "avatarMonogramDesc": "Use duas letras latinas ou o primeiro caractere CJK.",
+    "lucideIcon": "Nome do ícone Lucide",
+    "lightColor": "Cor clara",
+    "darkColor": "Cor escura",
+    "monogramText": "Monograma",
+    "monogramPlaceholder": "Por exemplo: WR / 研",
+    "backgroundColor": "Cor de fundo",
+    "modelsTitle": "Padrões do modelo",
+    "chatModel": "Modelo de chat padrão",
+    "assistantModel": "Modelo auxiliar",
+    "visionModel": "Modelo de visão",
+    "temperature": "Temperatura",
+    "contextLength": "Tamanho do contexto",
+    "maxTokens": "Máx. de tokens",
+    "thinkingBudget": "Orçamento de raciocínio",
+    "reasoningEffort": "Nível de raciocínio",
+    "verbosity": "Nível de detalhamento",
+    "interleaved": "Forçar compatibilidade com raciocínio intercalado",
+    "systemPrompt": "Prompt de sistema padrão",
+    "systemPromptPlaceholder": "Deixe em branco para usar um prompt de sistema vazio",
+    "defaultProjectPath": "Diretório padrão (opcional)",
+    "defaultProjectPathPlaceholder": "Deixe em branco para usar o diretório padrão global",
+    "permissionMode": "Permissão padrão",
+    "permissionFullAccess": "Acesso total",
+    "permissionDefault": "Permissão padrão",
+    "toolsTitle": "Ferramentas internas",
+    "compactionTitle": "Compactação automática",
+    "compactionEnabled": "Ativar compactação automática",
+    "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."
   }
 }
diff --git a/src/renderer/src/i18n/pt-BR/welcome.json b/src/renderer/src/i18n/pt-BR/welcome.json
index 4b5b93e8c..214a000a2 100644
--- a/src/renderer/src/i18n/pt-BR/welcome.json
+++ b/src/renderer/src/i18n/pt-BR/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "Escolha um agente para começar a criar",
+    "deepchatType": "Agente do DeepChat",
+    "acpType": "Agente ACP",
+    "manageAgents": "Gerenciar agentes do DeepChat"
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/chat.json b/src/renderer/src/i18n/ru-RU/chat.json
index 85274d680..7b335b0d8 100644
--- a/src/renderer/src/i18n/ru-RU/chat.json
+++ b/src/renderer/src/i18n/ru-RU/chat.json
@@ -40,7 +40,7 @@
       "badge": "Tools",
       "title": "Tools",
       "mcpSection": "MCP",
-      "builtinSection": "Built-in Tools",
+      "builtinSection": "Встроенные инструменты",
       "loading": "Loading tools...",
       "builtinEmpty": "No built-in tools available",
       "groups": {
diff --git a/src/renderer/src/i18n/ru-RU/routes.json b/src/renderer/src/i18n/ru-RU/routes.json
index f6c842fa2..d42398c14 100644
--- a/src/renderer/src/i18n/ru-RU/routes.json
+++ b/src/renderer/src/i18n/ru-RU/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills",
   "settings-notifications-hooks": "Хуки",
   "settings-dashboard": "Панель",
-  "settings-environments": "Окружения"
+  "settings-environments": "Окружения",
+  "settings-deepchat-agents": "Агенты DeepChat"
 }
diff --git a/src/renderer/src/i18n/ru-RU/settings.json b/src/renderer/src/i18n/ru-RU/settings.json
index f5ef3f0b2..a10d672fb 100644
--- a/src/renderer/src/i18n/ru-RU/settings.json
+++ b/src/renderer/src/i18n/ru-RU/settings.json
@@ -1297,9 +1297,9 @@
       "scriptDescription": "Description Override",
       "scriptDescriptionPlaceholder": "Optional description shown to the agent",
       "runtime": {
-        "auto": "Auto fallback",
-        "system": "System runtime",
-        "builtin": "Built-in runtime"
+        "auto": "Автопереход",
+        "system": "Системная среда выполнения",
+        "builtin": "Встроенная среда выполнения"
       }
     },
     "empty": "Временно нет навыков",
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "Не удалось открыть каталог"
     }
+  },
+  "deepchatAgents": {
+    "title": "Агенты DeepChat",
+    "description": "Управляйте агентами DeepChat и значениями по умолчанию, которые они применяют к новым сессиям.",
+    "builtIn": "Встроенный",
+    "editTitle": "Редактировать агент DeepChat",
+    "createTitle": "Создать агент DeepChat",
+    "unnamed": "Агент без имени",
+    "name": "Название",
+    "namePlaceholder": "Например: Писатель / Исследование / Перевод",
+    "enabledLabel": "Включен",
+    "descriptionLabel": "Описание",
+    "descriptionPlaceholder": "Необязательная заметка о назначении этого агента",
+    "avatarTitle": "Аватар",
+    "avatarDefault": "По умолчанию",
+    "avatarDefaultDesc": "DeepChat сохраняет встроенную иконку. Остальные агенты используют текстовый аватар.",
+    "avatarLucide": "Иконка Lucide",
+    "avatarLucideDesc": "Выберите иконку Lucide и задайте цвета для светлой и тёмной темы.",
+    "avatarMonogram": "Монограмма",
+    "avatarMonogramDesc": "Используйте две латинские буквы или первый символ CJK.",
+    "lucideIcon": "Имя иконки Lucide",
+    "lightColor": "Цвет для светлой темы",
+    "darkColor": "Цвет для тёмной темы",
+    "monogramText": "Монограмма",
+    "monogramPlaceholder": "Например: WR / 研",
+    "backgroundColor": "Цвет фона",
+    "modelsTitle": "Параметры модели по умолчанию",
+    "chatModel": "Модель чата по умолчанию",
+    "assistantModel": "Модель помощника",
+    "visionModel": "Визуальная модель",
+    "temperature": "Температура",
+    "contextLength": "Длина контекста",
+    "maxTokens": "Макс. токенов",
+    "thinkingBudget": "Бюджет мышления",
+    "reasoningEffort": "Уровень рассуждения",
+    "verbosity": "Степень подробности",
+    "interleaved": "Принудительная совместимость с чередующимся рассуждением",
+    "systemPrompt": "Системный промпт по умолчанию",
+    "systemPromptPlaceholder": "Оставьте пустым, чтобы использовать пустой системный промпт",
+    "defaultProjectPath": "Каталог по умолчанию (необязательно)",
+    "defaultProjectPathPlaceholder": "Оставьте пустым, чтобы использовать глобальный каталог по умолчанию",
+    "permissionMode": "Разрешения по умолчанию",
+    "permissionFullAccess": "Полный доступ",
+    "permissionDefault": "Стандартные разрешения",
+    "toolsTitle": "Встроенные инструменты",
+    "compactionTitle": "Автосжатие",
+    "compactionEnabled": "Включить автосжатие",
+    "compactionDescription": "Эти значения влияют только на будущие сессии DeepChat.",
+    "compactionThreshold": "Порог срабатывания",
+    "compactionRetainPairs": "Сохранять последние пары",
+    "deleteConfirm": "Удалить агента «{name}»? Его история будет возвращена встроенному агенту DeepChat."
   }
 }
diff --git a/src/renderer/src/i18n/ru-RU/welcome.json b/src/renderer/src/i18n/ru-RU/welcome.json
index afd111150..824e97065 100644
--- a/src/renderer/src/i18n/ru-RU/welcome.json
+++ b/src/renderer/src/i18n/ru-RU/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "Выберите агента, чтобы начать работу",
+    "deepchatType": "Агент DeepChat",
+    "acpType": "Агент ACP",
+    "manageAgents": "Управление агентами DeepChat"
   }
 }
diff --git a/src/renderer/src/i18n/zh-CN/routes.json b/src/renderer/src/i18n/zh-CN/routes.json
index 4c79bd49c..84cf7ed2d 100644
--- a/src/renderer/src/i18n/zh-CN/routes.json
+++ b/src/renderer/src/i18n/zh-CN/routes.json
@@ -6,6 +6,7 @@
   "settings-common": "通用设置",
   "settings-provider": "服务商设置",
   "settings-mcp": "MCP设置",
+  "settings-deepchat-agents": "DeepChat Agent",
   "settings-database": "数据设置",
   "settings-about": "关于",
   "settings-shortcut": "快捷键",
diff --git a/src/renderer/src/i18n/zh-CN/settings.json b/src/renderer/src/i18n/zh-CN/settings.json
index efa223409..89acc25a5 100644
--- a/src/renderer/src/i18n/zh-CN/settings.json
+++ b/src/renderer/src/i18n/zh-CN/settings.json
@@ -77,6 +77,57 @@
       "visionModel": "默认视觉模型"
     }
   },
+  "deepchatAgents": {
+    "title": "DeepChat Agents",
+    "description": "管理 DeepChat Agent 以及它们的新会话默认值。",
+    "builtIn": "内置",
+    "editTitle": "编辑 DeepChat Agent",
+    "createTitle": "新建 DeepChat Agent",
+    "unnamed": "未命名 Agent",
+    "name": "名称",
+    "namePlaceholder": "例如 Writer / Research / Translate",
+    "enabledLabel": "启用状态",
+    "descriptionLabel": "描述",
+    "descriptionPlaceholder": "可选，用来说明这个 Agent 的用途",
+    "avatarTitle": "头像",
+    "avatarDefault": "默认",
+    "avatarDefaultDesc": "DeepChat 使用默认图标，其他 Agent 使用文字头像。",
+    "avatarLucide": "Lucide 图标",
+    "avatarLucideDesc": "从 Lucide 图标里选择，并分别设置浅色/深色颜色。",
+    "avatarMonogram": "文字头像",
+    "avatarMonogramDesc": "用前两个英文字母或首个汉字来区分 Agent。",
+    "lucideIcon": "Lucide 图标名",
+    "lightColor": "浅色颜色",
+    "darkColor": "深色颜色",
+    "monogramText": "文字头像",
+    "monogramPlaceholder": "例如 WR / 研",
+    "backgroundColor": "背景色",
+    "modelsTitle": "模型默认值",
+    "chatModel": "默认对话模型",
+    "assistantModel": "助手模型",
+    "visionModel": "视觉模型",
+    "temperature": "Temperature",
+    "contextLength": "Context Length",
+    "maxTokens": "Max Tokens",
+    "thinkingBudget": "Thinking Budget",
+    "reasoningEffort": "Reasoning Effort",
+    "verbosity": "Verbosity",
+    "interleaved": "强制兼容交错思考",
+    "systemPrompt": "默认系统提示词",
+    "systemPromptPlaceholder": "留空则使用空白系统提示词",
+    "defaultProjectPath": "默认目录（可选）",
+    "defaultProjectPathPlaceholder": "留空则使用全局默认目录",
+    "permissionMode": "默认权限",
+    "permissionFullAccess": "全部启用",
+    "permissionDefault": "默认权限",
+    "toolsTitle": "内置工具",
+    "compactionTitle": "自动压缩",
+    "compactionEnabled": "启用自动压缩",
+    "compactionDescription": "这些设置只影响后续新建的 DeepChat 会话。",
+    "compactionThreshold": "触发阈值",
+    "compactionRetainPairs": "保留最近消息对",
+    "deleteConfirm": "确定删除 Agent “{name}” 吗？它的历史会话会自动回落到内置 DeepChat。"
+  },
   "notificationsHooks": {
     "title": "Hooks",
     "description": "配置 webhook 通知与生命周期 hooks。",
diff --git a/src/renderer/src/i18n/zh-CN/welcome.json b/src/renderer/src/i18n/zh-CN/welcome.json
index 95f7f6acb..de02fd2c7 100644
--- a/src/renderer/src/i18n/zh-CN/welcome.json
+++ b/src/renderer/src/i18n/zh-CN/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "选择 Agent 开始创作",
+    "deepchatType": "DeepChat Agent",
+    "acpType": "ACP Agent",
+    "manageAgents": "管理 DeepChat Agent"
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/routes.json b/src/renderer/src/i18n/zh-HK/routes.json
index 307227055..dab0d6310 100644
--- a/src/renderer/src/i18n/zh-HK/routes.json
+++ b/src/renderer/src/i18n/zh-HK/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills設置",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "資料看板",
-  "settings-environments": "目錄環境"
+  "settings-environments": "目錄環境",
+  "settings-deepchat-agents": "DeepChat 智能體"
 }
diff --git a/src/renderer/src/i18n/zh-HK/settings.json b/src/renderer/src/i18n/zh-HK/settings.json
index 9122edbef..fbc51762b 100644
--- a/src/renderer/src/i18n/zh-HK/settings.json
+++ b/src/renderer/src/i18n/zh-HK/settings.json
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "打開目錄失敗"
     }
+  },
+  "deepchatAgents": {
+    "title": "DeepChat 智能體",
+    "description": "管理 DeepChat 智能體，以及它們為新會話帶入的預設值。",
+    "builtIn": "內建",
+    "editTitle": "編輯 DeepChat 智能體",
+    "createTitle": "新增 DeepChat 智能體",
+    "unnamed": "未命名智能體",
+    "name": "名稱",
+    "namePlaceholder": "例如：寫作 / 研究 / 翻譯",
+    "enabledLabel": "啟用狀態",
+    "descriptionLabel": "描述",
+    "descriptionPlaceholder": "選填，用來說明這個智能體的用途",
+    "avatarTitle": "頭像",
+    "avatarDefault": "預設",
+    "avatarDefaultDesc": "DeepChat 會使用內建圖示，其他智能體則使用文字頭像。",
+    "avatarLucide": "Lucide 圖示",
+    "avatarLucideDesc": "從 Lucide 圖示中選擇，並設定淺色 / 深色配色。",
+    "avatarMonogram": "文字頭像",
+    "avatarMonogramDesc": "用前兩個英文字母或首個 CJK 字元來區分智能體。",
+    "lucideIcon": "Lucide 圖示名稱",
+    "lightColor": "淺色配色",
+    "darkColor": "深色配色",
+    "monogramText": "文字頭像",
+    "monogramPlaceholder": "例如：WR / 研",
+    "backgroundColor": "背景色",
+    "modelsTitle": "模型預設值",
+    "chatModel": "預設對話模型",
+    "assistantModel": "助手模型",
+    "visionModel": "視覺模型",
+    "temperature": "溫度",
+    "contextLength": "上下文長度",
+    "maxTokens": "最大 Token 數",
+    "thinkingBudget": "思考預算",
+    "reasoningEffort": "推理強度",
+    "verbosity": "詳細程度",
+    "interleaved": "強制相容交錯思考",
+    "systemPrompt": "預設系統提示詞",
+    "systemPromptPlaceholder": "留空即使用空白系統提示詞",
+    "defaultProjectPath": "預設目錄（可選）",
+    "defaultProjectPathPlaceholder": "留空則使用全域預設目錄",
+    "permissionMode": "預設權限",
+    "permissionFullAccess": "完整權限",
+    "permissionDefault": "預設權限",
+    "toolsTitle": "內建工具",
+    "compactionTitle": "自動壓縮",
+    "compactionEnabled": "啟用自動壓縮",
+    "compactionDescription": "這些預設值只會影響之後新建立的 DeepChat 會話。",
+    "compactionThreshold": "觸發門檻",
+    "compactionRetainPairs": "保留最近訊息對",
+    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。"
   }
 }
diff --git a/src/renderer/src/i18n/zh-HK/welcome.json b/src/renderer/src/i18n/zh-HK/welcome.json
index d599e8fa3..5115121bd 100644
--- a/src/renderer/src/i18n/zh-HK/welcome.json
+++ b/src/renderer/src/i18n/zh-HK/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "選擇 Agent 開始創作",
+    "deepchatType": "DeepChat 智能體",
+    "acpType": "ACP 智能體",
+    "manageAgents": "管理 DeepChat Agent"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/routes.json b/src/renderer/src/i18n/zh-TW/routes.json
index 9815ef690..f2575cb6f 100644
--- a/src/renderer/src/i18n/zh-TW/routes.json
+++ b/src/renderer/src/i18n/zh-TW/routes.json
@@ -17,5 +17,6 @@
   "settings-skills": "Skills設定",
   "settings-notifications-hooks": "Hooks",
   "settings-dashboard": "資料看板",
-  "settings-environments": "目錄環境"
+  "settings-environments": "目錄環境",
+  "settings-deepchat-agents": "DeepChat 智能體"
 }
diff --git a/src/renderer/src/i18n/zh-TW/settings.json b/src/renderer/src/i18n/zh-TW/settings.json
index c45d8ca78..080a0153c 100644
--- a/src/renderer/src/i18n/zh-TW/settings.json
+++ b/src/renderer/src/i18n/zh-TW/settings.json
@@ -1468,5 +1468,56 @@
     "errors": {
       "openTitle": "開啟目錄失敗"
     }
+  },
+  "deepchatAgents": {
+    "title": "DeepChat 智能體",
+    "description": "管理 DeepChat 智能體，以及它們為新會話帶入的預設值。",
+    "builtIn": "內建",
+    "editTitle": "編輯 DeepChat 智能體",
+    "createTitle": "新增 DeepChat 智能體",
+    "unnamed": "未命名智能體",
+    "name": "名稱",
+    "namePlaceholder": "例如：寫作 / 研究 / 翻譯",
+    "enabledLabel": "啟用狀態",
+    "descriptionLabel": "描述",
+    "descriptionPlaceholder": "選填，用來說明這個智能體的用途",
+    "avatarTitle": "頭像",
+    "avatarDefault": "預設",
+    "avatarDefaultDesc": "DeepChat 會使用內建圖示，其他智能體則使用文字頭像。",
+    "avatarLucide": "Lucide 圖示",
+    "avatarLucideDesc": "從 Lucide 圖示中選擇，並設定淺色 / 深色配色。",
+    "avatarMonogram": "文字頭像",
+    "avatarMonogramDesc": "用前兩個英文字母或首個 CJK 字元來區分智能體。",
+    "lucideIcon": "Lucide 圖示名稱",
+    "lightColor": "淺色配色",
+    "darkColor": "深色配色",
+    "monogramText": "文字頭像",
+    "monogramPlaceholder": "例如：WR / 研",
+    "backgroundColor": "背景色",
+    "modelsTitle": "模型預設值",
+    "chatModel": "預設對話模型",
+    "assistantModel": "助手模型",
+    "visionModel": "視覺模型",
+    "temperature": "溫度",
+    "contextLength": "上下文長度",
+    "maxTokens": "最大 Token 數",
+    "thinkingBudget": "思考預算",
+    "reasoningEffort": "推理強度",
+    "verbosity": "詳細程度",
+    "interleaved": "強制相容交錯思考",
+    "systemPrompt": "預設系統提示詞",
+    "systemPromptPlaceholder": "留空即使用空白系統提示詞",
+    "defaultProjectPath": "預設目錄（可選）",
+    "defaultProjectPathPlaceholder": "留空則使用全域預設目錄",
+    "permissionMode": "預設權限",
+    "permissionFullAccess": "完整權限",
+    "permissionDefault": "預設權限",
+    "toolsTitle": "內建工具",
+    "compactionTitle": "自動壓縮",
+    "compactionEnabled": "啟用自動壓縮",
+    "compactionDescription": "這些預設值只會影響之後新建立的 DeepChat 會話。",
+    "compactionThreshold": "觸發門檻",
+    "compactionRetainPairs": "保留最近訊息對",
+    "deleteConfirm": "確定要刪除智能體「{name}」嗎？它的歷史會話會自動回退到內建 DeepChat 智能體。"
   }
 }
diff --git a/src/renderer/src/i18n/zh-TW/welcome.json b/src/renderer/src/i18n/zh-TW/welcome.json
index 209b9967f..f3350e03b 100644
--- a/src/renderer/src/i18n/zh-TW/welcome.json
+++ b/src/renderer/src/i18n/zh-TW/welcome.json
@@ -49,5 +49,11 @@
       "ollama": "Ollama",
       "openrouter": "OpenRouter"
     }
+  },
+  "agentPage": {
+    "title": "選擇 Agent 開始創作",
+    "deepchatType": "DeepChat 智能體",
+    "acpType": "ACP 智能體",
+    "manageAgents": "管理 DeepChat Agent"
   }
 }
diff --git a/src/renderer/src/pages/AgentWelcomePage.vue b/src/renderer/src/pages/AgentWelcomePage.vue
new file mode 100644
index 000000000..974aafee8
--- /dev/null
+++ b/src/renderer/src/pages/AgentWelcomePage.vue
@@ -0,0 +1,89 @@
+<template>
+  <div class="h-full w-full flex flex-col window-drag-region">
+    <div class="flex-1 flex flex-col items-center justify-center px-6">
+      <div class="mb-5">
+        <img src="@/assets/logo-dark.png" class="w-16 h-16" loading="lazy" />
+      </div>
+
+      <h1 class="mb-10 text-3xl font-semibold text-foreground">
+        {{ t('welcome.agentPage.title') }}
+      </h1>
+
+      <div class="grid w-full max-w-3xl grid-cols-3 gap-3">
+        <button
+          v-for="agent in displayedAgents"
+          :key="agent.id"
+          class="flex items-center gap-3 rounded-xl border border-border/60 bg-card/40 px-4 py-3 text-left transition-all duration-150 hover:border-border hover:bg-accent/40"
+          @click="selectAgent(agent.id)"
+        >
+          <div
+            class="flex h-10 w-10 shrink-0 items-center justify-center rounded-xl bg-muted/50 text-foreground"
+          >
+            <AgentAvatar :agent="agent" class-name="h-6 w-6" fallback-class-name="rounded-lg" />
+          </div>
+          <div class="min-w-0 flex-1">
+            <div class="truncate text-sm font-semibold text-foreground">{{ agent.name }}</div>
+            <div class="truncate text-xs text-muted-foreground">
+              {{
+                agent.type === 'deepchat'
+                  ? t('welcome.agentPage.deepchatType')
+                  : t('welcome.agentPage.acpType')
+              }}
+            </div>
+          </div>
+          <Icon icon="lucide:chevron-right" class="h-4 w-4 text-muted-foreground/50" />
+        </button>
+      </div>
+
+      <button
+        class="mt-8 text-xs text-muted-foreground transition-colors hover:text-foreground"
+        @click="openAgentSettings"
+      >
+        {{ t('welcome.agentPage.manageAgents') }}
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { Icon } from '@iconify/vue'
+import { useI18n } from 'vue-i18n'
+import { usePresenter } from '@/composables/usePresenter'
+import { SETTINGS_EVENTS } from '@/events'
+import { useAgentStore } from '@/stores/ui/agent'
+import AgentAvatar from '@/components/icons/AgentAvatar.vue'
+
+const { t } = useI18n()
+const windowPresenter = usePresenter('windowPresenter')
+const agentStore = useAgentStore()
+const displayedAgents = computed(() => agentStore.enabledAgents.slice(0, 9))
+
+const selectAgent = (agentId: string) => {
+  agentStore.setSelectedAgent(agentId)
+}
+
+const navigateToSettings = (windowId: number) => {
+  windowPresenter.sendToWindow(windowId, SETTINGS_EVENTS.NAVIGATE, {
+    routeName: 'settings-deepchat-agents'
+  })
+}
+
+const openAgentSettings = async () => {
+  const settingsWindowId = await windowPresenter.createSettingsWindow()
+  if (settingsWindowId != null) {
+    navigateToSettings(settingsWindowId)
+  }
+}
+</script>
+
+<style scoped>
+.window-drag-region {
+  -webkit-app-region: drag;
+}
+
+button,
+[role='button'] {
+  -webkit-app-region: no-drag;
+}
+</style>
diff --git a/src/renderer/src/pages/NewThreadPage.vue b/src/renderer/src/pages/NewThreadPage.vue
index 02d6c8cec..06339b818 100644
--- a/src/renderer/src/pages/NewThreadPage.vue
+++ b/src/renderer/src/pages/NewThreadPage.vue
@@ -58,7 +58,7 @@
           :files="attachedFiles"
           :session-id="acpDraftSessionId"
           :workspace-path="projectStore.selectedProject?.path ?? null"
-          :is-acp-session="(agentStore.selectedAgentId ?? 'deepchat') !== 'deepchat'"
+          :is-acp-session="isAcpSelectedAgent"
           :submit-disabled="isAcpWorkdirMissing"
           @update:files="onFilesChange"
           @pending-skills-change="onPendingSkillsChange"
@@ -104,7 +104,11 @@ import { useAgentStore } from '@/stores/ui/agent'
 import { useModelStore } from '@/stores/modelStore'
 import { useDraftStore } from '@/stores/ui/draft'
 import { usePresenter } from '@/composables/usePresenter'
-import type { MessageFile } from '@shared/types/agent-interface'
+import type {
+  DeepChatAgentConfig,
+  MessageFile,
+  SessionGenerationSettings
+} from '@shared/types/agent-interface'
 
 const projectStore = useProjectStore()
 const sessionStore = useSessionStore()
@@ -125,12 +129,47 @@ const chatInputRef = ref<{
 const acpDraftSessionId = ref<string | null>(null)
 const lastAcpDraftKey = ref<string | null>(null)
 const acpDraftRequestSeq = ref(0)
+const availableAgents = computed(() => (Array.isArray(agentStore.agents) ? agentStore.agents : []))
+const resolveAgentType = (agentId: string | null | undefined): 'deepchat' | 'acp' => {
+  if (!agentId) {
+    return 'deepchat'
+  }
+
+  const matchedAgent = availableAgents.value.find((agent) => agent.id === agentId)
+  const selectedAgent =
+    agentStore.selectedAgent && agentStore.selectedAgent.id === agentId
+      ? agentStore.selectedAgent
+      : null
+  const explicitType = matchedAgent?.agentType ?? matchedAgent?.type ?? selectedAgent?.type
+  if (explicitType === 'deepchat' || explicitType === 'acp') {
+    return explicitType
+  }
+
+  return agentId === 'deepchat' ? 'deepchat' : 'acp'
+}
+const selectedAgent = computed(() => {
+  const selectedAgentId = agentStore.selectedAgentId ?? 'deepchat'
+  const matchedAgent = availableAgents.value.find((agent) => agent.id === selectedAgentId)
+  if (matchedAgent) {
+    return matchedAgent
+  }
+
+  if (agentStore.selectedAgent && agentStore.selectedAgent.id === selectedAgentId) {
+    return agentStore.selectedAgent
+  }
+
+  return { id: selectedAgentId, type: resolveAgentType(selectedAgentId) }
+})
+const isAcpSelectedAgent = computed(() => selectedAgent.value.type === 'acp')
+const normalizeProjectPath = (value: string | null | undefined) => {
+  const normalized = value?.trim()
+  return normalized ? normalized : null
+}
 const selectedProjectName = computed(
   () => projectStore.selectedProject?.name ?? t('common.project.select')
 )
 const isAcpWorkdirMissing = computed(() => {
-  const selectedAgentId = agentStore.selectedAgentId ?? 'deepchat'
-  if (selectedAgentId === 'deepchat') {
+  if (!isAcpSelectedAgent.value) {
     return false
   }
   return !projectStore.selectedProject?.path?.trim()
@@ -209,8 +248,11 @@ async function onCommandSubmit(command: string) {
 async function submitText(text: string, files: MessageFile[]) {
   if (!text.trim()) return
 
-  const agentId = agentStore.selectedAgentId ?? 'deepchat'
-  const isAcp = agentId !== 'deepchat'
+  const agentId = selectedAgent.value.id
+  const isAcp = isAcpSelectedAgent.value
+  const draftPermissionMode = draftStore.permissionMode
+  const draftDisabledAgentTools = [...draftStore.disabledAgentTools]
+  const draftGenerationSettings = draftStore.toGenerationSettings()
   if (isAcp && acpDraftSessionId.value) {
     await sessionStore.selectSession(acpDraftSessionId.value)
     await sessionStore.sendMessage(acpDraftSessionId.value, {
@@ -247,13 +289,87 @@ async function submitText(text: string, files: MessageFile[]) {
     agentId,
     providerId,
     modelId,
-    permissionMode: draftStore.permissionMode,
-    disabledAgentTools: agentId === 'deepchat' ? [...draftStore.disabledAgentTools] : undefined,
-    generationSettings: draftStore.toGenerationSettings(),
+    permissionMode: draftPermissionMode,
+    disabledAgentTools: isAcp ? undefined : draftDisabledAgentTools,
+    generationSettings: draftGenerationSettings,
     activeSkills: dedupedPendingSkills.length > 0 ? dedupedPendingSkills : undefined
   })
 }
 
+const buildDraftGenerationSettings = (
+  config: DeepChatAgentConfig
+): Partial<SessionGenerationSettings> => {
+  return {
+    systemPrompt: config.systemPrompt ?? ''
+  }
+}
+
+const resolveDeepChatAgentConfig = async (agentId: string): Promise<DeepChatAgentConfig> => {
+  if (typeof configPresenter.resolveDeepChatAgentConfig === 'function') {
+    return configPresenter.resolveDeepChatAgentConfig(agentId)
+  }
+
+  const systemPrompt = await configPresenter.getSetting?.('default_system_prompt')
+
+  return {
+    defaultModelPreset: undefined,
+    systemPrompt: typeof systemPrompt === 'string' ? systemPrompt : '',
+    permissionMode: 'full_access',
+    disabledAgentTools: []
+  }
+}
+
+const applyDraftDefaultsForSelectedAgent = async (): Promise<void> => {
+  const agentId = selectedAgent.value.id
+  const globalDefaultProjectPath = normalizeProjectPath(projectStore.defaultProjectPath)
+  const currentProjectPath = normalizeProjectPath(projectStore.selectedProject?.path)
+  draftStore.agentId = agentId
+  draftStore.providerId = undefined
+  draftStore.modelId = undefined
+  draftStore.permissionMode = 'full_access'
+  draftStore.disabledAgentTools = []
+  draftStore.systemPrompt = undefined
+  draftStore.temperature = undefined
+  draftStore.contextLength = undefined
+  draftStore.maxTokens = undefined
+  draftStore.thinkingBudget = undefined
+  draftStore.reasoningEffort = undefined
+  draftStore.verbosity = undefined
+  draftStore.forceInterleavedThinkingCompat = undefined
+
+  if (selectedAgent.value.type === 'acp') {
+    const resolvedProjectPath = currentProjectPath ?? globalDefaultProjectPath
+    if (!currentProjectPath && globalDefaultProjectPath) {
+      projectStore.selectProject(globalDefaultProjectPath, 'default')
+    }
+    draftStore.projectDir = resolvedProjectPath ?? undefined
+    draftStore.providerId = 'acp'
+    draftStore.modelId = agentId
+    draftStore.permissionMode = 'full_access'
+    draftStore.disabledAgentTools = []
+    return
+  }
+
+  const config = await resolveDeepChatAgentConfig(agentId)
+  const agentDefaultProjectPath = normalizeProjectPath(config.defaultProjectPath)
+  const resolvedProjectPath =
+    agentDefaultProjectPath ?? currentProjectPath ?? globalDefaultProjectPath
+  if (agentDefaultProjectPath) {
+    projectStore.selectProject(
+      agentDefaultProjectPath,
+      agentDefaultProjectPath === globalDefaultProjectPath ? 'default' : 'manual'
+    )
+  } else if (!currentProjectPath && globalDefaultProjectPath) {
+    projectStore.selectProject(globalDefaultProjectPath, 'default')
+  }
+  draftStore.projectDir = resolvedProjectPath ?? undefined
+  draftStore.providerId = config.defaultModelPreset?.providerId
+  draftStore.modelId = config.defaultModelPreset?.modelId
+  draftStore.permissionMode = config.permissionMode === 'default' ? 'default' : 'full_access'
+  draftStore.disabledAgentTools = [...(config.disabledAgentTools ?? [])]
+  Object.assign(draftStore, buildDraftGenerationSettings(config))
+}
+
 function onAttach() {
   chatInputRef.value?.triggerAttach()
 }
@@ -318,7 +434,7 @@ watch(
   () => [agentStore.selectedAgentId, projectStore.selectedProject?.path] as const,
   ([selectedAgentId, projectPath]) => {
     acpDraftRequestSeq.value += 1
-    if (!selectedAgentId || selectedAgentId === 'deepchat' || !projectPath?.trim()) {
+    if (!selectedAgentId || selectedAgent.value.type === 'deepchat' || !projectPath?.trim()) {
       acpDraftSessionId.value = null
       lastAcpDraftKey.value = null
       return
@@ -328,12 +444,23 @@ watch(
   { immediate: true }
 )
 
+watch(
+  () => [selectedAgent.value.id, selectedAgent.value.type] as const,
+  () => {
+    void applyDraftDefaultsForSelectedAgent()
+  },
+  { immediate: true }
+)
+
+watch(
+  () => projectStore.selectedProject?.path,
+  (projectDir) => {
+    draftStore.projectDir = projectDir
+  },
+  { immediate: true }
+)
+
 onMounted(() => {
-  // Keep new-thread selection page-scoped: start each NewThread page with no manual override.
-  draftStore.providerId = undefined
-  draftStore.modelId = undefined
-  draftStore.permissionMode = 'full_access'
-  draftStore.disabledAgentTools = []
-  draftStore.resetGenerationSettings()
+  draftStore.projectDir = projectStore.selectedProject?.path
 })
 </script>
diff --git a/src/renderer/src/pages/WelcomePage.vue b/src/renderer/src/pages/WelcomePage.vue
index 5c309cb6d..b83abf96b 100644
--- a/src/renderer/src/pages/WelcomePage.vue
+++ b/src/renderer/src/pages/WelcomePage.vue
@@ -108,15 +108,9 @@ const openSettings = async (routeName: SettingsRouteName) => {
     await router.replace({ name: 'chat' })
   }
 
-  await windowPresenter.createSettingsWindow()
-  const settingsWindowId = windowPresenter.getSettingsWindowId()
+  const settingsWindowId = await windowPresenter.createSettingsWindow()
   if (settingsWindowId != null) {
     navigateToSettings(settingsWindowId, routeName)
-    window.setTimeout(() => {
-      if (windowPresenter.getSettingsWindowId() === settingsWindowId) {
-        navigateToSettings(settingsWindowId, routeName)
-      }
-    }, 250)
   }
 }
 
diff --git a/src/renderer/src/stores/ui/agent.ts b/src/renderer/src/stores/ui/agent.ts
index 31920a411..adc6491eb 100644
--- a/src/renderer/src/stores/ui/agent.ts
+++ b/src/renderer/src/stores/ui/agent.ts
@@ -10,10 +10,14 @@ export interface UIAgent {
   id: string
   name: string
   type: 'deepchat' | 'acp'
+  agentType?: 'deepchat' | 'acp'
   enabled: boolean
+  protected?: boolean
   icon?: string
   description?: string
-  source?: 'registry' | 'manual'
+  source?: 'builtin' | 'registry' | 'manual'
+  avatar?: Agent['avatar']
+  config?: Agent['config']
   installState?: Agent['installState']
 }
 
@@ -43,12 +47,22 @@ export const useAgentStore = defineStore('agent', () => {
         id: a.id,
         name: a.name,
         type: a.type,
+        agentType: a.agentType,
         enabled: a.enabled,
+        protected: a.protected,
         icon: a.icon,
         description: a.description,
         source: a.source,
+        avatar: a.avatar,
+        config: a.config,
         installState: a.installState ?? null
       }))
+      if (
+        selectedAgentId.value !== null &&
+        !agents.value.some((agent) => agent.id === selectedAgentId.value)
+      ) {
+        selectedAgentId.value = null
+      }
     } catch (e) {
       error.value = `Failed to load agents: ${e}`
     } finally {
@@ -73,6 +87,10 @@ export const useAgentStore = defineStore('agent', () => {
     }
   )
 
+  window.electron.ipcRenderer.on(CONFIG_EVENTS.AGENTS_CHANGED, () => {
+    void fetchAgents()
+  })
+
   return {
     agents,
     selectedAgentId,
diff --git a/src/renderer/src/views/ChatTabView.vue b/src/renderer/src/views/ChatTabView.vue
index 75fe215c6..ed8b3571e 100644
--- a/src/renderer/src/views/ChatTabView.vue
+++ b/src/renderer/src/views/ChatTabView.vue
@@ -2,7 +2,10 @@
   <div class="flex h-full w-full flex-row overflow-hidden">
     <div class="flex h-full min-w-0 w-0 flex-1 transition-[width] duration-200 ease-out">
       <template v-if="isReady">
-        <NewThreadPage v-if="pageRouter.currentRoute === 'newThread'" />
+        <AgentWelcomePage
+          v-if="pageRouter.currentRoute === 'newThread' && agentStore.selectedAgentId === null"
+        />
+        <NewThreadPage v-else-if="pageRouter.currentRoute === 'newThread'" />
         <ChatPage
           v-else-if="pageRouter.currentRoute === 'chat' && pageRouter.chatSessionId"
           :session-id="pageRouter.chatSessionId"
@@ -22,6 +25,7 @@ import { onMounted, ref } from 'vue'
 import ChatSidePanel from '@/components/sidepanel/ChatSidePanel.vue'
 import NewThreadPage from '@/pages/NewThreadPage.vue'
 import ChatPage from '@/pages/ChatPage.vue'
+import AgentWelcomePage from '@/pages/AgentWelcomePage.vue'
 import { usePageRouterStore } from '@/stores/ui/pageRouter'
 import { useSessionStore } from '@/stores/ui/session'
 import { useAgentStore } from '@/stores/ui/agent'
diff --git a/src/shared/types/agent-interface.d.ts b/src/shared/types/agent-interface.d.ts
index d6df22a65..91ddcc480 100644
--- a/src/shared/types/agent-interface.d.ts
+++ b/src/shared/types/agent-interface.d.ts
@@ -409,14 +409,82 @@ export interface MessageTraceRecord {
 
 // ---- Session / Agent Types ----
 
+export type AgentType = 'deepchat' | 'acp'
+export type AgentSource = 'builtin' | 'manual' | 'registry'
+
+export interface AgentAvatarLucide {
+  kind: 'lucide'
+  icon: string
+  lightColor?: string | null
+  darkColor?: string | null
+}
+
+export interface AgentAvatarMonogram {
+  kind: 'monogram'
+  text: string
+  backgroundColor?: string | null
+}
+
+export type AgentAvatar = AgentAvatarLucide | AgentAvatarMonogram
+
+export interface DeepChatAgentModelSelection {
+  providerId: string
+  modelId: string
+}
+
+export interface DeepChatAgentModelPreset extends DeepChatAgentModelSelection {
+  temperature?: number
+  contextLength?: number
+  maxTokens?: number
+  thinkingBudget?: number
+  reasoningEffort?: SessionGenerationSettings['reasoningEffort']
+  verbosity?: SessionGenerationSettings['verbosity']
+  forceInterleavedThinkingCompat?: boolean
+}
+
+export interface DeepChatAgentConfig {
+  defaultModelPreset?: DeepChatAgentModelPreset | null
+  assistantModel?: DeepChatAgentModelSelection | null
+  visionModel?: DeepChatAgentModelSelection | null
+  defaultProjectPath?: string | null
+  systemPrompt?: string
+  permissionMode?: PermissionMode
+  disabledAgentTools?: string[]
+  autoCompactionEnabled?: boolean
+  autoCompactionTriggerThreshold?: number
+  autoCompactionRetainRecentPairs?: number
+}
+
+export interface CreateDeepChatAgentInput {
+  name: string
+  enabled?: boolean
+  description?: string
+  icon?: string
+  avatar?: AgentAvatar | null
+  config?: DeepChatAgentConfig | null
+}
+
+export interface UpdateDeepChatAgentInput {
+  name?: string
+  enabled?: boolean
+  description?: string
+  icon?: string
+  avatar?: AgentAvatar | null
+  config?: DeepChatAgentConfig | null
+}
+
 export interface Agent {
   id: string
   name: string
-  type: 'deepchat' | 'acp'
+  type: AgentType
+  agentType?: AgentType
   enabled: boolean
+  protected?: boolean
   icon?: string
   description?: string
-  source?: 'registry' | 'manual'
+  source?: AgentSource
+  avatar?: AgentAvatar | null
+  config?: DeepChatAgentConfig | null
   installState?: {
     status: 'not_installed' | 'installing' | 'installed' | 'error'
     distributionType?: 'binary' | 'npx' | 'uvx' | 'manual' | null
diff --git a/src/shared/types/presenters/legacy.presenters.d.ts b/src/shared/types/presenters/legacy.presenters.d.ts
index deb138e6d..97d0745e2 100644
--- a/src/shared/types/presenters/legacy.presenters.d.ts
+++ b/src/shared/types/presenters/legacy.presenters.d.ts
@@ -22,6 +22,13 @@ import type { ISkillSyncPresenter } from '../skillSync'
 import type { INewAgentPresenter } from './new-agent.presenter'
 import type { IProjectPresenter } from './project.presenter'
 import type { BrowserPageInfo, DownloadInfo, ScreenshotOptions, YoBrowserStatus } from '../browser'
+import type {
+  Agent,
+  AgentType,
+  CreateDeepChatAgentInput,
+  DeepChatAgentConfig,
+  UpdateDeepChatAgentInput
+} from '../agent-interface'
 
 export type SQLITE_MESSAGE = {
   id: string
@@ -632,6 +639,14 @@ export interface IConfigPresenter {
   resolveAcpLaunchSpec(agentId: string, workdir?: string): Promise<AcpResolvedLaunchSpec>
   getAcpSharedMcpSelections(): Promise<string[]>
   setAcpSharedMcpSelections(mcpIds: string[]): Promise<void>
+  listAgents(): Promise<Agent[]>
+  getAgent(agentId: string): Promise<Agent | null>
+  getAgentType(agentId: string): Promise<AgentType | null>
+  getDeepChatAgentConfig(agentId: string): Promise<DeepChatAgentConfig | null>
+  resolveDeepChatAgentConfig(agentId: string): Promise<DeepChatAgentConfig>
+  createDeepChatAgent(input: CreateDeepChatAgentInput): Promise<Agent>
+  updateDeepChatAgent(agentId: string, updates: UpdateDeepChatAgentInput): Promise<Agent | null>
+  deleteDeepChatAgent(agentId: string): Promise<boolean>
   // Nowledge-mem configuration methods
   getNowledgeMemConfig(): Promise<{
     baseUrl: string
diff --git a/src/shared/types/presenters/new-agent.presenter.d.ts b/src/shared/types/presenters/new-agent.presenter.d.ts
index 9e35bf0ba..531f2e325 100644
--- a/src/shared/types/presenters/new-agent.presenter.d.ts
+++ b/src/shared/types/presenters/new-agent.presenter.d.ts
@@ -62,7 +62,7 @@ export interface INewAgentPresenter {
   getMessageTraceCount(messageId: string): Promise<number>
   getMessageIds(sessionId: string): Promise<string[]>
   getMessage(messageId: string): Promise<ChatMessageRecord | null>
-  translateText(text: string, locale?: string): Promise<string>
+  translateText(text: string, locale?: string, agentId?: string): Promise<string>
   activateSession(webContentsId: number, sessionId: string): Promise<void>
   deactivateSession(webContentsId: number): Promise<void>
   getActiveSession(webContentsId: number): Promise<SessionWithState | null>
diff --git a/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts b/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts
index c3919654c..5296c32d1 100644
--- a/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts
+++ b/test/main/presenter/deepchatAgentPresenter/compactionService.test.ts
@@ -6,6 +6,7 @@ import {
   type ModelSpec
 } from '@/presenter/deepchatAgentPresenter/compactionService'
 import type { SessionSummaryState } from '@/presenter/deepchatAgentPresenter/sessionStore'
+import type { DeepChatAgentConfig } from '@shared/types/agent-interface'
 
 vi.mock('tokenx', () => ({
   approximateTokenSize: vi.fn((text: string) => text.length)
@@ -110,6 +111,7 @@ function makePendingAssistantRecord(orderSeq: number, text: string, id = `assist
 function createService(options?: {
   summaryState?: SessionSummaryState
   compareAndSetResult?: { applied: boolean; currentState: SessionSummaryState }
+  sessionConfig?: DeepChatAgentConfig
 }) {
   const summaryState =
     options?.summaryState ??
@@ -151,11 +153,20 @@ function createService(options?: {
     getAutoCompactionRetainRecentPairs: vi.fn().mockReturnValue(2)
   } as any
 
+  const sessionConfig: DeepChatAgentConfig = {
+    autoCompactionEnabled: true,
+    autoCompactionTriggerThreshold: 80,
+    autoCompactionRetainRecentPairs: 2,
+    ...options?.sessionConfig
+  }
+  const resolveSessionConfig = vi.fn().mockImplementation(async () => sessionConfig)
+
   const service = new CompactionService(
     sessionStore,
     messageStore,
     llmProviderPresenter,
-    configPresenter
+    configPresenter,
+    resolveSessionConfig
   )
 
   return {
@@ -163,7 +174,9 @@ function createService(options?: {
     sessionStore,
     messageStore,
     llmProviderPresenter,
-    configPresenter
+    configPresenter,
+    resolveSessionConfig,
+    sessionConfig
   }
 }
 
@@ -172,7 +185,7 @@ describe('CompactionService', () => {
     vi.clearAllMocks()
   })
 
-  it('preserves file bodies and image metadata in user summary blocks', () => {
+  it('preserves file bodies and image metadata in user summary blocks', async () => {
     const { service, messageStore } = createService()
 
     messageStore.getMessages.mockReturnValue([
@@ -197,7 +210,7 @@ describe('CompactionService', () => {
       makeAssistantRecord(6, 'Third reply '.repeat(20))
     ])
 
-    const intent = service.prepareForNextUserTurn({
+    const intent = await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -215,9 +228,12 @@ describe('CompactionService', () => {
     expect(intent?.summaryBlocks[0]).not.toContain('data:image/png')
   })
 
-  it('returns null when auto compaction is disabled', () => {
-    const { service, messageStore, configPresenter } = createService()
-    configPresenter.getAutoCompactionEnabled.mockReturnValue(false)
+  it('returns null when auto compaction is disabled', async () => {
+    const { service, messageStore } = createService({
+      sessionConfig: {
+        autoCompactionEnabled: false
+      }
+    })
     messageStore.getMessages.mockReturnValue([
       makeUserRecord(1, 'A'.repeat(120)),
       makeAssistantRecord(2, 'B'.repeat(120)),
@@ -227,7 +243,7 @@ describe('CompactionService', () => {
       makeAssistantRecord(6, 'F'.repeat(120))
     ])
 
-    const intent = service.prepareForNextUserTurn({
+    const intent = await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -242,8 +258,8 @@ describe('CompactionService', () => {
     expect(intent).toBeNull()
   })
 
-  it('triggers compaction at the configured threshold before hard overflow', () => {
-    const { service, messageStore, configPresenter } = createService()
+  it('triggers compaction at the configured threshold before hard overflow', async () => {
+    const { service, messageStore, sessionConfig } = createService()
     messageStore.getMessages.mockReturnValue([
       makeUserRecord(1, 'A'.repeat(100)),
       makeAssistantRecord(2, 'B'.repeat(100)),
@@ -253,8 +269,8 @@ describe('CompactionService', () => {
       makeAssistantRecord(6, 'F'.repeat(100))
     ])
 
-    configPresenter.getAutoCompactionTriggerThreshold.mockReturnValue(100)
-    const noIntentAtFullBudget = service.prepareForNextUserTurn({
+    sessionConfig.autoCompactionTriggerThreshold = 100
+    const noIntentAtFullBudget = await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -266,8 +282,8 @@ describe('CompactionService', () => {
       newUserContent: 'latest turn'
     })
 
-    configPresenter.getAutoCompactionTriggerThreshold.mockReturnValue(80)
-    const intentAtEightyPercent = service.prepareForNextUserTurn({
+    sessionConfig.autoCompactionTriggerThreshold = 80
+    const intentAtEightyPercent = await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -283,9 +299,12 @@ describe('CompactionService', () => {
     expect(intentAtEightyPercent).not.toBeNull()
   })
 
-  it('retains only the configured recent message pairs for the next user turn', () => {
-    const { service, messageStore, configPresenter } = createService()
-    configPresenter.getAutoCompactionRetainRecentPairs.mockReturnValue(1)
+  it('retains only the configured recent message pairs for the next user turn', async () => {
+    const { service, messageStore } = createService({
+      sessionConfig: {
+        autoCompactionRetainRecentPairs: 1
+      }
+    })
     messageStore.getMessages.mockReturnValue([
       makeUserRecord(1, 'A'.repeat(100)),
       makeAssistantRecord(2, 'B'.repeat(100)),
@@ -295,7 +314,7 @@ describe('CompactionService', () => {
       makeAssistantRecord(6, 'F'.repeat(100))
     ])
 
-    const intent = service.prepareForNextUserTurn({
+    const intent = await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -312,7 +331,7 @@ describe('CompactionService', () => {
     expect(intent?.targetCursorOrderSeq).toBe(5)
   })
 
-  it('passes preserveInterleavedReasoning through to buildHistoryTurns', () => {
+  it('passes preserveInterleavedReasoning through to buildHistoryTurns', async () => {
     const { service, messageStore } = createService()
     messageStore.getMessages.mockReturnValue([
       makeUserRecord(1, 'turn one'),
@@ -325,7 +344,7 @@ describe('CompactionService', () => {
 
     const buildHistoryTurns = vi.mocked(contextBuilderModule.buildHistoryTurns)
 
-    service.prepareForNextUserTurn({
+    await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -336,7 +355,7 @@ describe('CompactionService', () => {
       preserveInterleavedReasoning: false,
       newUserContent: 'next turn'
     })
-    service.prepareForNextUserTurn({
+    await service.prepareForNextUserTurn({
       sessionId: 's1',
       providerId: 'openai',
       modelId: 'gpt-4o',
@@ -352,9 +371,12 @@ describe('CompactionService', () => {
     expect(buildHistoryTurns).toHaveBeenNthCalledWith(2, expect.any(Array), false, true)
   })
 
-  it('retains the configured recent pairs plus the resume target turn', () => {
-    const { service, messageStore, configPresenter } = createService()
-    configPresenter.getAutoCompactionRetainRecentPairs.mockReturnValue(1)
+  it('retains the configured recent pairs plus the resume target turn', async () => {
+    const { service, messageStore } = createService({
+      sessionConfig: {
+        autoCompactionRetainRecentPairs: 1
+      }
+    })
     messageStore.getMessages.mockReturnValue([
       makeUserRecord(1, 'A'.repeat(100)),
       makeAssistantRecord(2, 'B'.repeat(100)),
@@ -366,7 +388,7 @@ describe('CompactionService', () => {
       makePendingAssistantRecord(8, 'resume body', 'resume-target')
     ])
 
-    const intent = service.prepareForResumeTurn({
+    const intent = await service.prepareForResumeTurn({
       sessionId: 's1',
       messageId: 'resume-target',
       providerId: 'openai',
diff --git a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
index 58c88ce0c..e12768aeb 100644
--- a/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
+++ b/test/main/presenter/newAgentPresenter/newAgentPresenter.test.ts
@@ -85,9 +85,21 @@ function createMockDeepChatAgent() {
 function createMockConfigPresenter() {
   return {
     getDefaultModel: vi.fn().mockReturnValue({ providerId: 'openai', modelId: 'gpt-4' }),
+    getDefaultProjectPath: vi.fn().mockReturnValue(null),
     getModelConfig: vi.fn().mockReturnValue({}),
     getSetting: vi.fn().mockReturnValue(undefined),
-    getAcpAgents: vi.fn().mockResolvedValue([])
+    getAcpAgents: vi.fn().mockResolvedValue([]),
+    getAcpEnabled: vi.fn().mockResolvedValue(true),
+    listAgents: vi
+      .fn()
+      .mockResolvedValue([{ id: 'deepchat', name: 'DeepChat', type: 'deepchat', enabled: true }]),
+    getAgentType: vi.fn().mockImplementation(async (agentId: string) => {
+      if (agentId === 'deepchat') {
+        return 'deepchat'
+      }
+      return agentId.startsWith('acp') ? 'acp' : null
+    }),
+    resolveDeepChatAgentConfig: vi.fn().mockResolvedValue({})
   } as any
 }
 
@@ -319,6 +331,49 @@ describe('NewAgentPresenter', () => {
       )
     })
 
+    it('uses the DeepChat agent default directory when createSession does not provide one', async () => {
+      configPresenter.resolveDeepChatAgentConfig.mockResolvedValue({
+        defaultProjectPath: '/workspaces/agent-default'
+      })
+
+      await presenter.createSession({ agentId: 'deepchat', message: 'Hi' }, 1)
+
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          projectDir: '/workspaces/agent-default'
+        })
+      )
+      expect(sqlitePresenter.newSessionsTable.create).toHaveBeenCalledWith(
+        'mock-session-id',
+        'deepchat',
+        'Hi',
+        '/workspaces/agent-default',
+        expect.any(Object)
+      )
+    })
+
+    it('falls back to the global default directory when the DeepChat agent has none', async () => {
+      configPresenter.resolveDeepChatAgentConfig.mockResolvedValue({})
+      configPresenter.getDefaultProjectPath.mockReturnValue('/workspaces/global-default')
+
+      await presenter.createSession({ agentId: 'deepchat', message: 'Hi' }, 1)
+
+      expect(deepChatAgent.initSession).toHaveBeenCalledWith(
+        expect.any(String),
+        expect.objectContaining({
+          projectDir: '/workspaces/global-default'
+        })
+      )
+      expect(sqlitePresenter.newSessionsTable.create).toHaveBeenCalledWith(
+        'mock-session-id',
+        'deepchat',
+        'Hi',
+        '/workspaces/global-default',
+        expect.any(Object)
+      )
+    })
+
     it('uses input provider/model when specified', async () => {
       await presenter.createSession(
         { agentId: 'deepchat', message: 'Hi', providerId: 'anthropic', modelId: 'claude-3' },
@@ -1361,8 +1416,9 @@ describe('NewAgentPresenter', () => {
     })
 
     it('includes ACP agents from config', async () => {
-      configPresenter.getAcpAgents.mockResolvedValue([
-        { id: 'acp-coder', name: 'ACP Coder', command: 'acp-coder' }
+      configPresenter.listAgents.mockResolvedValue([
+        { id: 'deepchat', name: 'DeepChat', type: 'deepchat', enabled: true },
+        { id: 'acp-coder', name: 'ACP Coder', type: 'acp', enabled: true }
       ])
 
       const agents = await presenter.getAgents()
diff --git a/test/main/presenter/windowPresenter.test.ts b/test/main/presenter/windowPresenter.test.ts
new file mode 100644
index 000000000..b9a2f3c21
--- /dev/null
+++ b/test/main/presenter/windowPresenter.test.ts
@@ -0,0 +1,88 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { ipcMain } from 'electron'
+import { SETTINGS_EVENTS } from '@/events'
+
+vi.mock('electron-window-state', () => ({
+  default: vi.fn(() => ({
+    x: 0,
+    y: 0,
+    width: 900,
+    height: 600,
+    manage: vi.fn(),
+    unmanage: vi.fn()
+  }))
+}))
+
+vi.mock('@/presenter', () => ({
+  presenter: {
+    tabPresenter: {
+      getWindowTabsData: vi.fn().mockResolvedValue([])
+    },
+    devicePresenter: {
+      restartApp: vi.fn()
+    }
+  }
+}))
+
+describe('WindowPresenter settings navigation queue', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('queues settings events until the settings renderer reports ready', async () => {
+    const { WindowPresenter } = await import('@/presenter/windowPresenter')
+    const presenter = new WindowPresenter({
+      getContentProtectionEnabled: vi.fn(() => false)
+    } as any)
+
+    const send = vi.fn()
+    ;(presenter as any).settingsWindow = {
+      id: 9,
+      isDestroyed: vi.fn(() => false),
+      webContents: {
+        id: 99,
+        isDestroyed: vi.fn(() => false),
+        send
+      }
+    }
+
+    expect(
+      presenter.sendToWindow(9, SETTINGS_EVENTS.NAVIGATE, {
+        routeName: 'settings-deepchat-agents'
+      })
+    ).toBe(true)
+    expect(presenter.sendToWindow(9, SETTINGS_EVENTS.CHECK_FOR_UPDATES)).toBe(true)
+    expect(send).not.toHaveBeenCalled()
+    expect((presenter as any).pendingSettingsMessages).toHaveLength(2)
+
+    const readyHandler = vi
+      .mocked(ipcMain.on)
+      .mock.calls.find(([eventName]) => eventName === SETTINGS_EVENTS.READY)?.[1]
+
+    expect(readyHandler).toBeTypeOf('function')
+
+    readyHandler?.({ sender: { id: 99 } } as any)
+
+    expect(send).toHaveBeenNthCalledWith(1, SETTINGS_EVENTS.NAVIGATE, {
+      routeName: 'settings-deepchat-agents'
+    })
+    expect(send).toHaveBeenNthCalledWith(2, SETTINGS_EVENTS.CHECK_FOR_UPDATES)
+    expect((presenter as any).pendingSettingsMessages).toHaveLength(0)
+  })
+
+  it('clears queued settings messages when the settings window state resets', async () => {
+    const { WindowPresenter } = await import('@/presenter/windowPresenter')
+    const presenter = new WindowPresenter({
+      getContentProtectionEnabled: vi.fn(() => false)
+    } as any)
+
+    ;(presenter as any).pendingSettingsMessages = [
+      { channel: SETTINGS_EVENTS.NAVIGATE, args: [{ routeName: 'settings-about' }] }
+    ]
+    ;(presenter as any).settingsWindowReady = true
+    ;(presenter as any).resetSettingsWindowState(true)
+
+    expect((presenter as any).settingsWindowReady).toBe(false)
+    expect((presenter as any).pendingSettingsMessages).toHaveLength(0)
+  })
+})
diff --git a/test/renderer/components/AgentWelcomePage.test.ts b/test/renderer/components/AgentWelcomePage.test.ts
new file mode 100644
index 000000000..bba95af4c
--- /dev/null
+++ b/test/renderer/components/AgentWelcomePage.test.ts
@@ -0,0 +1,104 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { SETTINGS_EVENTS } from '@/events'
+
+afterEach(() => {
+  vi.clearAllTimers()
+  vi.useRealTimers()
+})
+
+describe('AgentWelcomePage', () => {
+  it('renders up to nine agents and navigates to DeepChat agent settings', async () => {
+    vi.resetModules()
+    vi.useFakeTimers()
+
+    const windowPresenter = {
+      createSettingsWindow: vi.fn().mockResolvedValue(9),
+      sendToWindow: vi.fn(() => true)
+    }
+    const agentStore = {
+      enabledAgents: Array.from({ length: 12 }, (_, index) => ({
+        id: `agent-${index + 1}`,
+        name: `Agent ${index + 1}`,
+        type: index === 0 ? 'deepchat' : 'acp',
+        enabled: true
+      })),
+      setSelectedAgent: vi.fn()
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'windowPresenter') return windowPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/ui/agent', () => ({
+      useAgentStore: () => agentStore
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) =>
+          (
+            ({
+              'welcome.agentPage.title': '选择 Agent 开始创作',
+              'welcome.agentPage.manageAgents': '管理 DeepChat Agent',
+              'welcome.agentPage.deepchatType': 'DeepChat Agent',
+              'welcome.agentPage.acpType': 'ACP Agent Localized'
+            }) as Record<string, string>
+          )[key] ?? key
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/components/icons/AgentAvatar.vue', () => ({
+      default: {
+        name: 'AgentAvatar',
+        template: '<span />'
+      }
+    }))
+
+    const AgentWelcomePage = (await import('@/pages/AgentWelcomePage.vue')).default
+    const wrapper = mount(AgentWelcomePage, {
+      global: {
+        stubs: {
+          Icon: true,
+          AgentAvatar: true
+        }
+      }
+    })
+
+    expect(wrapper.text()).toContain('选择 Agent 开始创作')
+    expect(wrapper.text()).not.toContain('welcome.agentPage.description')
+    expect(wrapper.find('.grid').classes()).toContain('grid-cols-3')
+
+    const agentButtons = wrapper
+      .findAll('button')
+      .filter((button) => button.text().includes('Agent '))
+
+    expect(agentButtons).toHaveLength(9)
+    expect(wrapper.text()).not.toContain('Agent 10')
+    expect(wrapper.text()).toContain('ACP Agent Localized')
+
+    await agentButtons[0].trigger('click')
+    expect(agentStore.setSelectedAgent).toHaveBeenCalledWith('agent-1')
+
+    const manageButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('管理 DeepChat Agent'))
+
+    expect(manageButton).toBeDefined()
+
+    await manageButton!.trigger('click')
+    await vi.runAllTimersAsync()
+
+    expect(windowPresenter.createSettingsWindow).toHaveBeenCalledTimes(1)
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledWith(9, SETTINGS_EVENTS.NAVIGATE, {
+      routeName: 'settings-deepchat-agents'
+    })
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(1)
+  })
+})
diff --git a/test/renderer/components/DeepChatAgentsSettings.test.ts b/test/renderer/components/DeepChatAgentsSettings.test.ts
new file mode 100644
index 000000000..4bb88dda7
--- /dev/null
+++ b/test/renderer/components/DeepChatAgentsSettings.test.ts
@@ -0,0 +1,666 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { defineComponent } from 'vue'
+import { flushPromises, mount } from '@vue/test-utils'
+
+const passthrough = (name: string) =>
+  defineComponent({
+    name,
+    props: {
+      open: { type: Boolean, default: false }
+    },
+    template: '<div><slot /></div>'
+  })
+
+const DialogStub = defineComponent({
+  name: 'Dialog',
+  props: {
+    open: { type: Boolean, default: false }
+  },
+  emits: ['update:open'],
+  template: '<div v-if="open"><slot /></div>'
+})
+
+const ButtonStub = defineComponent({
+  name: 'Button',
+  props: {
+    disabled: { type: Boolean, default: false }
+  },
+  emits: ['click'],
+  template:
+    '<button v-bind="$attrs" :disabled="disabled" @click="$emit(\'click\', $event)"><slot /></button>'
+})
+
+const InputStub = defineComponent({
+  name: 'Input',
+  props: {
+    modelValue: { type: [String, Number], default: '' }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<input v-bind="$attrs" :value="modelValue ?? \'\'" @input="$emit(\'update:modelValue\', $event.target.value)" />'
+})
+
+const TextareaStub = defineComponent({
+  name: 'Textarea',
+  props: {
+    modelValue: { type: String, default: '' }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<textarea v-bind="$attrs" :value="modelValue" @input="$emit(\'update:modelValue\', $event.target.value)" />'
+})
+
+const SwitchStub = defineComponent({
+  name: 'Switch',
+  props: {
+    modelValue: { type: Boolean, default: false }
+  },
+  emits: ['update:modelValue'],
+  template:
+    '<button v-bind="$attrs" type="button" :data-model-value="String(modelValue)" @click="$emit(\'update:modelValue\', !modelValue)" />'
+})
+
+const DropdownMenuItemStub = defineComponent({
+  name: 'DropdownMenuItem',
+  emits: ['select'],
+  template:
+    '<button v-bind="$attrs" type="button" @click="$emit(\'select\', $event)"><slot /></button>'
+})
+
+describe('DeepChatAgentsSettings', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('mounts and saves DeepChat agents without advanced model overrides', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {
+        defaultModelPreset: {
+          providerId: 'openai',
+          modelId: 'gpt-4.1',
+          temperature: 1.2,
+          contextLength: 64000,
+          maxTokens: 8192,
+          thinkingBudget: 2048,
+          reasoningEffort: 'high',
+          verbosity: 'high',
+          forceInterleavedThinkingCompat: true
+        },
+        assistantModel: null,
+        visionModel: null,
+        systemPrompt: 'system prompt',
+        permissionMode: 'default',
+        disabledAgentTools: ['tool_beta'],
+        autoCompactionEnabled: false,
+        autoCompactionTriggerThreshold: 72,
+        autoCompactionRetainRecentPairs: 4
+      }
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([
+        {
+          source: 'agent',
+          function: { name: 'tool_alpha', description: 'Alpha tool' },
+          server: { name: 'alpha-server' }
+        },
+        {
+          source: 'agent',
+          function: { name: 'tool_beta', description: 'Beta tool' },
+          server: { name: 'beta-server' }
+        }
+      ])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue(null)
+    }
+    const modelStore = {
+      allProviderModels: [
+        {
+          providerId: 'openai',
+          models: [{ id: 'gpt-4.1', name: 'GPT-4.1' }]
+        }
+      ],
+      findModelByIdOrName: vi.fn(() => ({
+        providerId: 'openai',
+        model: { id: 'gpt-4.1', name: 'GPT-4.1' }
+      }))
+    }
+
+    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.temperature')
+    expect(wrapper.text()).not.toContain('settings.deepchatAgents.reasoningEffort')
+    expect(wrapper.text()).not.toContain('settings.deepchatAgents.verbosity')
+    expect(wrapper.text()).not.toContain('settings.deepchatAgents.interleaved')
+    expect(wrapper.text()).toContain('GPT-4.1')
+    expect(wrapper.text()).not.toContain('openai/gpt-4.1')
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.updateDeepChatAgent).toHaveBeenCalledTimes(1)
+
+    const [, payload] = configPresenter.updateDeepChatAgent.mock.calls[0]
+    expect(payload).toMatchObject({
+      name: 'DeepChat',
+      enabled: true,
+      description: 'Writer agent',
+      config: {
+        defaultModelPreset: {
+          providerId: 'openai',
+          modelId: 'gpt-4.1'
+        },
+        assistantModel: null,
+        visionModel: null,
+        defaultProjectPath: null,
+        systemPrompt: 'system prompt',
+        permissionMode: 'default',
+        disabledAgentTools: ['tool_beta'],
+        autoCompactionEnabled: false,
+        autoCompactionTriggerThreshold: 72,
+        autoCompactionRetainRecentPairs: 4
+      }
+    })
+    expect(payload.config.defaultModelPreset).toEqual({
+      providerId: 'openai',
+      modelId: 'gpt-4.1'
+    })
+  })
+
+  it('fills the system prompt field from a prompt template dialog', async () => {
+    vi.resetModules()
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([]),
+      getSystemPrompts: vi.fn().mockResolvedValue([
+        {
+          id: 'writer',
+          name: 'Writer',
+          content: 'You are a writing assistant.'
+        },
+        {
+          id: 'coder',
+          name: 'Coder',
+          content: 'You write concise code.'
+        }
+      ]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue(null)
+    }
+    const modelStore = {
+      allProviderModels: [],
+      findModelByIdOrName: vi.fn(() => null)
+    }
+
+    vi.doMock('@/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'configPresenter') return configPresenter
+        if (name === 'projectPresenter') return projectPresenter
+        if (name === 'toolPresenter') return toolPresenter
+        return {}
+      }
+    }))
+    vi.doMock('@/stores/modelStore', () => ({
+      useModelStore: () => modelStore
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+
+    const DeepChatAgentsSettings = (
+      await import('../../../src/renderer/settings/components/DeepChatAgentsSettings.vue')
+    ).default
+
+    const wrapper = mount(DeepChatAgentsSettings, {
+      global: {
+        stubs: {
+          Button: ButtonStub,
+          Badge: passthrough('Badge'),
+          Input: InputStub,
+          Textarea: TextareaStub,
+          Switch: SwitchStub,
+          Dialog: DialogStub,
+          DialogContent: passthrough('DialogContent'),
+          DialogHeader: passthrough('DialogHeader'),
+          DialogTitle: passthrough('DialogTitle'),
+          DropdownMenu: passthrough('DropdownMenu'),
+          DropdownMenuContent: passthrough('DropdownMenuContent'),
+          DropdownMenuItem: DropdownMenuItemStub,
+          DropdownMenuSeparator: passthrough('DropdownMenuSeparator'),
+          DropdownMenuTrigger: passthrough('DropdownMenuTrigger'),
+          Popover: passthrough('Popover'),
+          PopoverContent: passthrough('PopoverContent'),
+          PopoverTrigger: passthrough('PopoverTrigger'),
+          Select: passthrough('Select'),
+          SelectContent: passthrough('SelectContent'),
+          SelectItem: passthrough('SelectItem'),
+          SelectTrigger: passthrough('SelectTrigger'),
+          SelectValue: passthrough('SelectValue'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    const pickerButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('promptSetting.selectSystemPrompt'))
+
+    expect(pickerButton).toBeDefined()
+
+    await pickerButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.getSystemPrompts).toHaveBeenCalledTimes(1)
+    expect(wrapper.text()).toContain('Writer')
+    expect(wrapper.text()).toContain('Coder')
+
+    const templateButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('You write concise code.'))
+
+    expect(templateButton).toBeDefined()
+
+    await templateButton!.trigger('click')
+    await flushPromises()
+
+    const systemPromptTextarea = wrapper
+      .findAll('textarea')
+      .find((textarea) =>
+        textarea
+          .attributes('placeholder')
+          ?.includes('settings.deepchatAgents.systemPromptPlaceholder')
+      )
+
+    expect(systemPromptTextarea).toBeDefined()
+    expect(systemPromptTextarea!.element.value).toBe('You write concise code.')
+  })
+
+  it('shows an unsaved draft agent in the sidebar before persisting', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: 'Writer agent',
+      avatar: null,
+      config: {}
+    }
+    const createdAgent = {
+      id: 'deepchat-new',
+      type: 'deepchat',
+      name: 'Draft Writer',
+      enabled: true,
+      protected: false,
+      description: '',
+      avatar: null,
+      config: {}
+    }
+
+    const configPresenter = {
+      listAgents: vi
+        .fn()
+        .mockResolvedValueOnce([existingAgent])
+        .mockResolvedValueOnce([existingAgent, createdAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue(createdAgent),
+      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'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    const addButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.add'))
+    expect(addButton).toBeDefined()
+
+    await addButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.createDeepChatAgent).not.toHaveBeenCalled()
+    expect(
+      wrapper
+        .findAll('aside button')
+        .some((button) => button.text().includes('settings.deepchatAgents.unnamed'))
+    ).toBe(true)
+
+    const nameInput = wrapper
+      .findAll('input')
+      .find((input) =>
+        input.attributes('placeholder')?.includes('settings.deepchatAgents.namePlaceholder')
+      )
+
+    expect(nameInput).toBeDefined()
+
+    await nameInput!.setValue('Draft Writer')
+    await flushPromises()
+
+    expect(
+      wrapper.findAll('aside button').some((button) => button.text().includes('Draft Writer'))
+    ).toBe(true)
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.createDeepChatAgent).toHaveBeenCalledTimes(1)
+    expect(configPresenter.createDeepChatAgent).toHaveBeenCalledWith(
+      expect.objectContaining({
+        name: 'Draft Writer'
+      })
+    )
+  })
+
+  it('stores an optional default directory on the agent config', async () => {
+    vi.resetModules()
+
+    const existingAgent = {
+      id: 'deepchat',
+      type: 'deepchat',
+      name: 'DeepChat',
+      enabled: true,
+      protected: true,
+      description: '',
+      avatar: null,
+      config: {
+        defaultProjectPath: '/workspaces/writer'
+      }
+    }
+
+    const configPresenter = {
+      listAgents: vi.fn().mockResolvedValue([existingAgent]),
+      getSystemPrompts: vi.fn().mockResolvedValue([]),
+      updateDeepChatAgent: vi.fn().mockResolvedValue(existingAgent),
+      createDeepChatAgent: vi.fn().mockResolvedValue({ id: 'deepchat-new' }),
+      deleteDeepChatAgent: vi.fn().mockResolvedValue(undefined)
+    }
+    const toolPresenter = {
+      getAllToolDefinitions: vi.fn().mockResolvedValue([])
+    }
+    const projectPresenter = {
+      getRecentProjects: vi.fn().mockResolvedValue([]),
+      selectDirectory: vi.fn().mockResolvedValue('/workspaces/selected')
+    }
+    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'),
+          ModelSelect: passthrough('ModelSelect'),
+          AgentAvatar: passthrough('AgentAvatar'),
+          ModelIcon: passthrough('ModelIcon'),
+          Icon: true
+        }
+      }
+    })
+
+    await flushPromises()
+
+    const directoryTrigger = wrapper
+      .findAll('button')
+      .find((button) => button.attributes('title') === '/workspaces/writer')
+
+    expect(directoryTrigger).toBeDefined()
+    expect(directoryTrigger!.text()).toContain('writer')
+
+    const pickButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.project.openFolder'))
+
+    expect(pickButton).toBeDefined()
+
+    await pickButton!.trigger('click')
+    await flushPromises()
+
+    expect(projectPresenter.selectDirectory).toHaveBeenCalledTimes(1)
+    expect(
+      wrapper
+        .findAll('button')
+        .some((button) => button.attributes('title') === '/workspaces/selected')
+    ).toBe(true)
+
+    const saveButton = wrapper
+      .findAll('button')
+      .find((button) => button.text().includes('common.save'))
+
+    expect(saveButton).toBeDefined()
+
+    await saveButton!.trigger('click')
+    await flushPromises()
+
+    expect(configPresenter.updateDeepChatAgent).toHaveBeenCalledWith(
+      'deepchat',
+      expect.objectContaining({
+        config: expect.objectContaining({
+          defaultProjectPath: '/workspaces/selected'
+        })
+      })
+    )
+  })
+})
diff --git a/test/renderer/components/NewThreadPage.test.ts b/test/renderer/components/NewThreadPage.test.ts
index ace6c1b26..60e6d8cf6 100644
--- a/test/renderer/components/NewThreadPage.test.ts
+++ b/test/renderer/components/NewThreadPage.test.ts
@@ -48,18 +48,31 @@ const setup = async (options?: {
     path: string
     name: string
   }
+  defaultProjectPath?: string | null
   defaultModel?: { providerId: string; modelId: string }
   preferredModel?: { providerId: string; modelId: string }
+  resolvedAgentConfig?: Record<string, unknown>
 }) => {
   vi.resetModules()
   chatInputTriggerAttachMock.mockReset()
   chatInputPendingSkillsSnapshotRef.value = []
 
   const projectStore = reactive({
-    selectedProject: options?.selectedProject ?? { path: '/tmp/workspace', name: 'workspace' },
+    selectedProject: (options?.selectedProject ?? {
+      path: '/tmp/workspace',
+      name: 'workspace'
+    }) as { path: string; name: string } | null,
     selectedProjectName: options?.selectedProject?.name ?? 'workspace',
+    defaultProjectPath: options?.defaultProjectPath ?? null,
     projects: [],
-    selectProject: vi.fn(),
+    selectProject: vi.fn((path: string | null) => {
+      projectStore.selectedProject = path
+        ? {
+            path,
+            name: path.split(/[/\\]/).pop() ?? path
+          }
+        : null
+    }),
     openFolderPicker: vi.fn()
   })
 
@@ -79,6 +92,7 @@ const setup = async (options?: {
   })
 
   const draftStore = reactive({
+    projectDir: projectStore.selectedProject?.path ?? undefined,
     providerId: undefined as string | undefined,
     modelId: undefined as string | undefined,
     permissionMode: 'full_access' as const,
@@ -103,7 +117,13 @@ const setup = async (options?: {
         return Promise.resolve(options?.preferredModel)
       }
       return Promise.resolve(undefined)
-    })
+    }),
+    resolveDeepChatAgentConfig: vi.fn().mockResolvedValue(
+      options?.resolvedAgentConfig ?? {
+        disabledAgentTools: [],
+        permissionMode: 'full_access'
+      }
+    )
   }
 
   const newAgentPresenter = {
@@ -273,6 +293,27 @@ describe('NewThreadPage ACP draft session bootstrap', () => {
     )
   })
 
+  it('prefers the agent default directory over the current selection', async () => {
+    const { projectStore, agentStore, draftStore } = await setup({
+      defaultProjectPath: '/workspaces/global',
+      resolvedAgentConfig: {
+        defaultProjectPath: '/workspaces/agent-writer',
+        disabledAgentTools: [],
+        permissionMode: 'full_access'
+      }
+    })
+
+    agentStore.selectedAgentId = 'deepchat'
+    await flushPromises()
+
+    expect(projectStore.selectProject).toHaveBeenCalledWith('/workspaces/agent-writer', 'manual')
+    expect(projectStore.selectedProject).toEqual({
+      path: '/workspaces/agent-writer',
+      name: 'agent-writer'
+    })
+    expect(draftStore.projectDir).toBe('/workspaces/agent-writer')
+  })
+
   it('prefers preferredModel over defaultModel when creating a deepchat session', async () => {
     const { wrapper, sessionStore, agentStore, modelStore } = await setup({
       defaultModel: { providerId: 'openai', modelId: 'gpt-4' },
diff --git a/test/renderer/components/SettingsApp.test.ts b/test/renderer/components/SettingsApp.test.ts
new file mode 100644
index 000000000..27d86a18b
--- /dev/null
+++ b/test/renderer/components/SettingsApp.test.ts
@@ -0,0 +1,384 @@
+import { afterEach, describe, expect, it, vi } from 'vitest'
+import { mount } from '@vue/test-utils'
+import { defineComponent, ref } from 'vue'
+import { SETTINGS_EVENTS } from '@/events'
+
+afterEach(() => {
+  vi.restoreAllMocks()
+})
+
+describe('Settings App', () => {
+  it('notifies main when the settings router is ready', async () => {
+    vi.resetModules()
+
+    const push = vi.fn().mockResolvedValue(undefined)
+    const isReady = vi.fn().mockResolvedValue(undefined)
+    const ipcOn = vi.fn()
+    const ipcRemoveListener = vi.fn()
+    const ipcRemoveAllListeners = vi.fn()
+    const ipcSend = vi.fn()
+
+    ;(window as any).electron = {
+      ipcRenderer: {
+        on: ipcOn,
+        removeListener: ipcRemoveListener,
+        removeAllListeners: ipcRemoveAllListeners,
+        send: ipcSend
+      }
+    }
+
+    vi.doMock('vue-router', () => {
+      const currentRoute = ref({ name: 'settings-common', query: {}, params: {}, path: '/common' })
+      const router = {
+        hasRoute: vi.fn(() => true),
+        isReady,
+        push,
+        replace: vi.fn().mockResolvedValue(undefined),
+        getRoutes: vi.fn(() => [
+          {
+            path: '/common',
+            name: 'settings-common',
+            meta: { titleKey: 'routes.settings-common', icon: 'lucide:bolt', position: 1 }
+          }
+        ]),
+        currentRoute
+      }
+
+      return {
+        useRouter: () => router,
+        useRoute: () => currentRoute.value,
+        RouterView: {
+          name: 'RouterView',
+          template: '<div />'
+        }
+      }
+    })
+
+    vi.doMock('../../../src/renderer/src/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'devicePresenter') {
+          return {
+            getDeviceInfo: vi.fn().mockResolvedValue({ platform: 'darwin' })
+          }
+        }
+        if (name === 'windowPresenter') {
+          return {
+            closeSettingsWindow: vi.fn()
+          }
+        }
+        if (name === 'configPresenter') {
+          return {
+            getLanguage: vi.fn().mockResolvedValue('zh-CN')
+          }
+        }
+        return {}
+      }
+    }))
+    vi.doMock('../../../src/renderer/src/stores/uiSettingsStore', () => ({
+      useUiSettingsStore: () => ({
+        fontSizeClass: 'text-base',
+        loadSettings: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/language', () => ({
+      useLanguageStore: () => ({
+        language: 'zh-CN',
+        dir: 'ltr'
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/modelCheck', () => ({
+      useModelCheckStore: () => ({
+        isDialogOpen: false,
+        currentProviderId: null,
+        closeDialog: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/theme', () => ({
+      useThemeStore: () => ({
+        themeMode: 'light',
+        isDark: false
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/providerStore', () => ({
+      useProviderStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/modelStore', () => ({
+      useModelStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/ollamaStore', () => ({
+      useOllamaStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/mcp', () => ({
+      useMcpStore: () => ({
+        mcpEnabled: false,
+        setMcpEnabled: vi.fn().mockResolvedValue(undefined),
+        setMcpInstallCache: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/lib/storeInitializer', () => ({
+      useMcpInstallDeeplinkHandler: () => ({
+        setup: vi.fn(),
+        cleanup: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/composables/useFontManager', () => ({
+      useFontManager: () => ({
+        setupFontListener: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/composables/useDeviceVersion', () => ({
+      useDeviceVersion: () => ({
+        isMacOS: ref(false),
+        isWinMacOS: true
+      })
+    }))
+    vi.doMock('@vueuse/core', () => ({
+      useTitle: () => ref('')
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key,
+        locale: ref('zh-CN')
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/components/use-toast', () => ({
+      useToast: () => ({
+        toast: vi.fn(() => ({ dismiss: vi.fn() }))
+      })
+    }))
+
+    const SettingsApp = (await import('../../../src/renderer/settings/App.vue')).default
+    mount(SettingsApp, {
+      global: {
+        stubs: {
+          Button: true,
+          RouterView: true,
+          CloseIcon: true,
+          ModelCheckDialog: defineComponent({
+            name: 'ModelCheckDialog',
+            props: {
+              open: { type: Boolean, default: false },
+              providerId: { type: null, default: null }
+            },
+            template: '<div />'
+          }),
+          Toaster: true,
+          Icon: true
+        }
+      }
+    })
+
+    await Promise.resolve()
+    await Promise.resolve()
+
+    expect(isReady).toHaveBeenCalledTimes(1)
+    expect(ipcSend).toHaveBeenCalledWith(SETTINGS_EVENTS.READY)
+  })
+
+  it('navigates to the requested settings route when a navigate event arrives', async () => {
+    vi.resetModules()
+
+    const push = vi.fn().mockResolvedValue(undefined)
+    const isReady = vi.fn().mockResolvedValue(undefined)
+    const ipcOn = vi.fn()
+    const ipcRemoveListener = vi.fn()
+    const ipcRemoveAllListeners = vi.fn()
+    const ipcSend = vi.fn()
+
+    ;(window as any).electron = {
+      ipcRenderer: {
+        on: ipcOn,
+        removeListener: ipcRemoveListener,
+        removeAllListeners: ipcRemoveAllListeners,
+        send: ipcSend
+      }
+    }
+
+    vi.doMock('vue-router', () => {
+      const currentRoute = ref({ name: 'settings-common', query: {}, params: {}, path: '/common' })
+      const router = {
+        hasRoute: vi.fn((routeName: string) => routeName === 'settings-deepchat-agents'),
+        isReady,
+        push,
+        replace: vi.fn().mockResolvedValue(undefined),
+        getRoutes: vi.fn(() => [
+          {
+            path: '/common',
+            name: 'settings-common',
+            meta: { titleKey: 'routes.settings-common', icon: 'lucide:bolt', position: 1 }
+          },
+          {
+            path: '/deepchat-agents',
+            name: 'settings-deepchat-agents',
+            meta: {
+              titleKey: 'routes.settings-deepchat-agents',
+              icon: 'lucide:bot',
+              position: 3.5
+            }
+          }
+        ]),
+        currentRoute
+      }
+
+      return {
+        useRouter: () => router,
+        useRoute: () => currentRoute.value,
+        RouterView: {
+          name: 'RouterView',
+          template: '<div />'
+        }
+      }
+    })
+
+    vi.doMock('../../../src/renderer/src/composables/usePresenter', () => ({
+      usePresenter: (name: string) => {
+        if (name === 'devicePresenter') {
+          return {
+            getDeviceInfo: vi.fn().mockResolvedValue({ platform: 'darwin' })
+          }
+        }
+        if (name === 'windowPresenter') {
+          return {
+            closeSettingsWindow: vi.fn()
+          }
+        }
+        if (name === 'configPresenter') {
+          return {
+            getLanguage: vi.fn().mockResolvedValue('zh-CN')
+          }
+        }
+        return {}
+      }
+    }))
+    vi.doMock('../../../src/renderer/src/stores/uiSettingsStore', () => ({
+      useUiSettingsStore: () => ({
+        fontSizeClass: 'text-base',
+        loadSettings: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/language', () => ({
+      useLanguageStore: () => ({
+        language: 'zh-CN',
+        dir: 'ltr'
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/modelCheck', () => ({
+      useModelCheckStore: () => ({
+        isDialogOpen: false,
+        currentProviderId: null,
+        closeDialog: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/theme', () => ({
+      useThemeStore: () => ({
+        themeMode: 'light',
+        isDark: false
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/providerStore', () => ({
+      useProviderStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/modelStore', () => ({
+      useModelStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/ollamaStore', () => ({
+      useOllamaStore: () => ({
+        initialize: vi.fn().mockResolvedValue(undefined)
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/stores/mcp', () => ({
+      useMcpStore: () => ({
+        mcpEnabled: false,
+        setMcpEnabled: vi.fn().mockResolvedValue(undefined),
+        setMcpInstallCache: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/lib/storeInitializer', () => ({
+      useMcpInstallDeeplinkHandler: () => ({
+        setup: vi.fn(),
+        cleanup: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/composables/useFontManager', () => ({
+      useFontManager: () => ({
+        setupFontListener: vi.fn()
+      })
+    }))
+    vi.doMock('../../../src/renderer/src/composables/useDeviceVersion', () => ({
+      useDeviceVersion: () => ({
+        isMacOS: ref(false),
+        isWinMacOS: true
+      })
+    }))
+    vi.doMock('@vueuse/core', () => ({
+      useTitle: () => ref('')
+    }))
+    vi.doMock('vue-i18n', () => ({
+      useI18n: () => ({
+        t: (key: string) => key,
+        locale: ref('zh-CN')
+      })
+    }))
+    vi.doMock('@iconify/vue', () => ({
+      Icon: {
+        name: 'Icon',
+        template: '<span />'
+      }
+    }))
+    vi.doMock('@/components/use-toast', () => ({
+      useToast: () => ({
+        toast: vi.fn(() => ({ dismiss: vi.fn() }))
+      })
+    }))
+
+    const SettingsApp = (await import('../../../src/renderer/settings/App.vue')).default
+    mount(SettingsApp, {
+      global: {
+        stubs: {
+          Button: true,
+          RouterView: true,
+          CloseIcon: true,
+          ModelCheckDialog: defineComponent({
+            name: 'ModelCheckDialog',
+            props: {
+              open: { type: Boolean, default: false },
+              providerId: { type: null, default: null }
+            },
+            template: '<div />'
+          }),
+          Toaster: true,
+          Icon: true
+        }
+      }
+    })
+
+    await Promise.resolve()
+    await Promise.resolve()
+
+    const navigateHandler = ipcOn.mock.calls.find(
+      ([eventName]: [string]) => eventName === SETTINGS_EVENTS.NAVIGATE
+    )?.[1]
+
+    expect(navigateHandler).toBeTypeOf('function')
+
+    await navigateHandler?.({}, { routeName: 'settings-deepchat-agents' })
+
+    expect(push).toHaveBeenCalledWith({ name: 'settings-deepchat-agents' })
+  })
+})
diff --git a/test/renderer/components/WelcomePage.test.ts b/test/renderer/components/WelcomePage.test.ts
index ef2131509..e81e4ad3c 100644
--- a/test/renderer/components/WelcomePage.test.ts
+++ b/test/renderer/components/WelcomePage.test.ts
@@ -23,7 +23,6 @@ describe('WelcomePage', () => {
     }
     const windowPresenter = {
       createSettingsWindow: vi.fn().mockResolvedValue(9),
-      getSettingsWindowId: vi.fn(() => 9),
       sendToWindow: vi.fn(() => true)
     }
 
@@ -100,7 +99,7 @@ describe('WelcomePage', () => {
     expect(windowPresenter.sendToWindow).toHaveBeenCalledWith(9, SETTINGS_EVENTS.NAVIGATE, {
       routeName: 'settings-provider'
     })
-    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(2)
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(1)
   })
 
   it('navigates the ACP entry to ACP settings', async () => {
@@ -118,7 +117,6 @@ describe('WelcomePage', () => {
     }
     const windowPresenter = {
       createSettingsWindow: vi.fn().mockResolvedValue(9),
-      getSettingsWindowId: vi.fn(() => 9),
       sendToWindow: vi.fn(() => true)
     }
 
@@ -195,7 +193,7 @@ describe('WelcomePage', () => {
     expect(windowPresenter.sendToWindow).toHaveBeenCalledWith(9, SETTINGS_EVENTS.NAVIGATE, {
       routeName: 'settings-acp'
     })
-    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(2)
+    expect(windowPresenter.sendToWindow).toHaveBeenCalledTimes(1)
   })
 
   it('does nothing when no window id is available', async () => {
@@ -212,7 +210,6 @@ describe('WelcomePage', () => {
     }
     const windowPresenter = {
       createSettingsWindow: vi.fn().mockResolvedValue(9),
-      getSettingsWindowId: vi.fn(() => 9),
       sendToWindow: vi.fn(() => true)
     }