Merge remote-tracking branch 'origin/main' into feat/sub_agents

refactor: replace renderToolContent function with ToolContent component for improved readability (#11300 )
* refactor: replace renderToolContent function with ToolContent component for improved readability * fix * fix test
2025-11-21 14:57:03 +08:00 · 2025-11-21 09:55:46 +08:00 · 2025-11-20 19:23:27 +08:00 · 2025-11-19 15:58:15 +08:00
63 changed files with 2686 additions and 2214 deletions
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
    "@napi-rs/system-ocr": "patch:@napi-rs/system-ocr@npm%3A1.0.2#~/.yarn/patches/@napi-rs-system-ocr-npm-1.0.2-59e7a78e8b.patch",
    "@paymoapp/electron-shutdown-handler": "^1.1.2",
    "@strongtz/win32-arm64-msvc": "^0.4.7",
+    "emoji-picker-element-data": "^1",
    "express": "^5.1.0",
    "font-list": "^2.0.0",
    "graceful-fs": "^4.2.11",
@@ -215,8 +216,8 @@
    "@types/mime-types": "^3",
    "@types/node": "^22.17.1",
    "@types/pako": "^1.0.2",
-    "@types/react": "^19.2.6",
-    "@types/react-dom": "^19.2.3",
+    "@types/react": "^19.0.12",
+    "@types/react-dom": "^19.0.4",
    "@types/react-infinite-scroll-component": "^5.0.0",
    "@types/react-transition-group": "^4.4.12",
    "@types/react-window": "^1",
--- a/packages/shared/IpcChannel.ts
+++ b/packages/shared/IpcChannel.ts
@@ -196,9 +196,6 @@ export enum IpcChannel {
  File_ValidateNotesDirectory = 'file:validateNotesDirectory',
  File_StartWatcher = 'file:startWatcher',
  File_StopWatcher = 'file:stopWatcher',
-  File_PauseWatcher = 'file:pauseWatcher',
-  File_ResumeWatcher = 'file:resumeWatcher',
-  File_BatchUploadMarkdown = 'file:batchUploadMarkdown',
  File_ShowInFolder = 'file:showInFolder',

  // file service
--- a/packages/shared/config/types.ts
+++ b/packages/shared/config/types.ts
@@ -10,7 +10,7 @@ export type LoaderReturn = {
  messageSource?: 'preprocess' | 'embedding' | 'validation'
 }

-export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir' | 'refresh'
+export type FileChangeEventType = 'add' | 'change' | 'unlink' | 'addDir' | 'unlinkDir'

 export type FileChangeEvent = {
  eventType: FileChangeEventType
--- a/resources/database/drizzle/0003_smooth_talkback.sql
+++ b/resources/database/drizzle/0003_smooth_talkback.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `agents` ADD `sub_agents` text;--> statement-breakpoint
+ALTER TABLE `sessions` ADD `sub_agents` text;
--- a/resources/database/drizzle/meta/0003_snapshot.json
+++ b/resources/database/drizzle/meta/0003_snapshot.json
@@ -0,0 +1,360 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "9aeb5f21-fed7-4dbf-973d-c344681b71c2",
+  "prevId": "0cf3d79e-69bf-4dba-8df4-996b9b67d2e8",
+  "tables": {
+    "agents": {
+      "name": "agents",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "accessible_paths": {
+          "name": "accessible_paths",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "instructions": {
+          "name": "instructions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "plan_model": {
+          "name": "plan_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "small_model": {
+          "name": "small_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mcps": {
+          "name": "mcps",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "allowed_tools": {
+          "name": "allowed_tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sub_agents": {
+          "name": "sub_agents",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configuration": {
+          "name": "configuration",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "session_messages": {
+      "name": "session_messages",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": true
+        },
+        "session_id": {
+          "name": "session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "role": {
+          "name": "role",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "content": {
+          "name": "content",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_session_id": {
+          "name": "agent_session_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "''"
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "migrations": {
+      "name": "migrations",
+      "columns": {
+        "version": {
+          "name": "version",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "tag": {
+          "name": "tag",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "executed_at": {
+          "name": "executed_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
+    "sessions": {
+      "name": "sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_type": {
+          "name": "agent_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "agent_id": {
+          "name": "agent_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "accessible_paths": {
+          "name": "accessible_paths",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "instructions": {
+          "name": "instructions",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "model": {
+          "name": "model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "plan_model": {
+          "name": "plan_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "small_model": {
+          "name": "small_model",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "mcps": {
+          "name": "mcps",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "allowed_tools": {
+          "name": "allowed_tools",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "sub_agents": {
+          "name": "sub_agents",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "slash_commands": {
+          "name": "slash_commands",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "configuration": {
+          "name": "configuration",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    }
+  },
+  "views": {},
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
--- a/resources/database/drizzle/meta/_journal.json
+++ b/resources/database/drizzle/meta/_journal.json
@@ -22,6 +22,13 @@
      "when": 1762526423527,
      "tag": "0002_wealthy_naoko",
      "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1763500397620,
+      "tag": "0003_smooth_talkback",
+      "breakpoints": true
    }
  ]
 }
--- a/src/main/apiServer/routes/models.ts
+++ b/src/main/apiServer/routes/models.ts
@@ -104,12 +104,6 @@ const router = express
        logger.warn('No models available from providers', { filter })
      }

-      logger.info('Models response ready', {
-        filter,
-        total: response.total,
-        modelIds: response.data.map((m) => m.id)
-      })
-
      return res.json(response satisfies ApiModelsResponse)
    } catch (error: any) {
      logger.error('Error fetching models', { error })
--- a/src/main/apiServer/services/models.ts
+++ b/src/main/apiServer/services/models.ts
@@ -32,7 +32,7 @@ export class ModelsService {

      for (const model of models) {
        const provider = providers.find((p) => p.id === model.provider)
-        logger.debug(`Processing model ${model.id}`)
+        // logger.debug(`Processing model ${model.id}`)
        if (!provider) {
          logger.debug(`Skipping model ${model.id} . Reason: Provider not found.`)
          continue
--- a/src/main/ipc.ts
+++ b/src/main/ipc.ts
@@ -557,9 +557,6 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
  ipcMain.handle(IpcChannel.File_ValidateNotesDirectory, fileManager.validateNotesDirectory.bind(fileManager))
  ipcMain.handle(IpcChannel.File_StartWatcher, fileManager.startFileWatcher.bind(fileManager))
  ipcMain.handle(IpcChannel.File_StopWatcher, fileManager.stopFileWatcher.bind(fileManager))
-  ipcMain.handle(IpcChannel.File_PauseWatcher, fileManager.pauseFileWatcher.bind(fileManager))
-  ipcMain.handle(IpcChannel.File_ResumeWatcher, fileManager.resumeFileWatcher.bind(fileManager))
-  ipcMain.handle(IpcChannel.File_BatchUploadMarkdown, fileManager.batchUploadMarkdownFiles.bind(fileManager))
  ipcMain.handle(IpcChannel.File_ShowInFolder, fileManager.showInFolder.bind(fileManager))

  // file service
--- a/src/main/services/FileStorage.ts
+++ b/src/main/services/FileStorage.ts
@@ -849,7 +849,7 @@ class FileStorage {
    const resolvedPath = path.resolve(dirPath)

    const stat = await fs.promises.stat(resolvedPath).catch((error) => {
-      logger.error(`[IPC - Error] Failed to access directory: ${resolvedPath}`, error as Error)
+      logger.error(`Failed to access directory: ${resolvedPath}`, error as Error)
      throw error
    })

@@ -1605,164 +1605,6 @@ class FileStorage {
      logger.error('Failed to show item in folder:', error as Error)
    }
  }
-
-  /**
-   * Batch upload markdown files from native File objects
-   * This handles all I/O operations in the Main process to avoid blocking Renderer
-   */
-  public batchUploadMarkdownFiles = async (
-    _: Electron.IpcMainInvokeEvent,
-    filePaths: string[],
-    targetPath: string
-  ): Promise<{
-    fileCount: number
-    folderCount: number
-    skippedFiles: number
-  }> => {
-    try {
-      logger.info('Starting batch upload', { fileCount: filePaths.length, targetPath })
-
-      const basePath = path.resolve(targetPath)
-      const MARKDOWN_EXTS = ['.md', '.markdown']
-
-      // Filter markdown files
-      const markdownFiles = filePaths.filter((filePath) => {
-        const ext = path.extname(filePath).toLowerCase()
-        return MARKDOWN_EXTS.includes(ext)
-      })
-
-      const skippedFiles = filePaths.length - markdownFiles.length
-
-      if (markdownFiles.length === 0) {
-        return { fileCount: 0, folderCount: 0, skippedFiles }
-      }
-
-      // Collect unique folders needed
-      const foldersSet = new Set<string>()
-      const fileOperations: Array<{ sourcePath: string; targetPath: string }> = []
-
-      for (const filePath of markdownFiles) {
-        try {
-          // Get relative path if file is from a directory upload
-          const fileName = path.basename(filePath)
-          const relativePath = path.dirname(filePath)
-
-          // Determine target directory structure
-          let targetDir = basePath
-          const folderParts: string[] = []
-
-          // Extract folder structure from file path for nested uploads
-          // This is a simplified version - in real scenario we'd need the original directory structure
-          if (relativePath && relativePath !== '.') {
-            const parts = relativePath.split(path.sep)
-            // Get the last few parts that represent the folder structure within upload
-            const relevantParts = parts.slice(Math.max(0, parts.length - 3))
-            folderParts.push(...relevantParts)
-          }
-
-          // Build target directory path
-          for (const part of folderParts) {
-            targetDir = path.join(targetDir, part)
-            foldersSet.add(targetDir)
-          }
-
-          // Determine final file name
-          const nameWithoutExt = fileName.endsWith('.md')
-            ? fileName.slice(0, -3)
-            : fileName.endsWith('.markdown')
-              ? fileName.slice(0, -9)
-              : fileName
-
-          const { safeName } = await this.fileNameGuard(_, targetDir, nameWithoutExt, true)
-          const finalPath = path.join(targetDir, safeName + '.md')
-
-          fileOperations.push({ sourcePath: filePath, targetPath: finalPath })
-        } catch (error) {
-          logger.error('Failed to prepare file operation:', error as Error, { filePath })
-        }
-      }
-
-      // Create folders in order (shallow to deep)
-      const sortedFolders = Array.from(foldersSet).sort((a, b) => a.length - b.length)
-      for (const folder of sortedFolders) {
-        try {
-          if (!fs.existsSync(folder)) {
-            await fs.promises.mkdir(folder, { recursive: true })
-          }
-        } catch (error) {
-          logger.debug('Folder already exists or creation failed', { folder, error: (error as Error).message })
-        }
-      }
-
-      // Process files in batches
-      const BATCH_SIZE = 10 // Higher batch size since we're in Main process
-      let successCount = 0
-
-      for (let i = 0; i < fileOperations.length; i += BATCH_SIZE) {
-        const batch = fileOperations.slice(i, i + BATCH_SIZE)
-
-        const results = await Promise.allSettled(
-          batch.map(async (op) => {
-            // Read from source and write to target in Main process
-            const content = await fs.promises.readFile(op.sourcePath, 'utf-8')
-            await fs.promises.writeFile(op.targetPath, content, 'utf-8')
-            return true
-          })
-        )
-
-        results.forEach((result, index) => {
-          if (result.status === 'fulfilled') {
-            successCount++
-          } else {
-            logger.error('Failed to upload file:', result.reason, {
-              file: batch[index].sourcePath
-            })
-          }
-        })
-      }
-
-      logger.info('Batch upload completed', {
-        successCount,
-        folderCount: foldersSet.size,
-        skippedFiles
-      })
-
-      return {
-        fileCount: successCount,
-        folderCount: foldersSet.size,
-        skippedFiles
-      }
-    } catch (error) {
-      logger.error('Batch upload failed:', error as Error)
-      throw error
-    }
-  }
-
-  /**
-   * Pause file watcher to prevent events during batch operations
-   */
-  public pauseFileWatcher = async (): Promise<void> => {
-    if (this.watcher) {
-      logger.debug('Pausing file watcher')
-      // Chokidar doesn't have pause, so we temporarily set a flag
-      // We'll handle this by clearing the debounce timer
-      if (this.debounceTimer) {
-        clearTimeout(this.debounceTimer)
-        this.debounceTimer = undefined
-      }
-    }
-  }
-
-  /**
-   * Resume file watcher and trigger a refresh
-   */
-  public resumeFileWatcher = async (): Promise<void> => {
-    if (this.watcher && this.currentWatchPath) {
-      logger.debug('Resuming file watcher')
-      // Send a synthetic refresh event to trigger tree reload
-      this.notifyChange('refresh', this.currentWatchPath)
-    }
-  }
 }

 export const fileStorage = new FileStorage()
--- a/src/main/services/agents/BaseService.ts
+++ b/src/main/services/agents/BaseService.ts
@@ -42,6 +42,7 @@ export abstract class BaseService {
    'configuration',
    'accessible_paths',
    'allowed_tools',
+    'sub_agents',
    'slash_commands'
  ]

--- a/src/main/services/agents/database/schema/agents.schema.ts
+++ b/src/main/services/agents/database/schema/agents.schema.ts
@@ -19,6 +19,7 @@ export const agentsTable = sqliteTable('agents', {

  mcps: text('mcps'), // JSON array of MCP tool IDs
  allowed_tools: text('allowed_tools'), // JSON array of allowed tool IDs (whitelist)
+  sub_agents: text('sub_agents'), // JSON array of sub-agent IDs

  configuration: text('configuration'), // JSON, extensible settings

--- a/src/main/services/agents/database/schema/sessions.schema.ts
+++ b/src/main/services/agents/database/schema/sessions.schema.ts
@@ -22,6 +22,7 @@ export const sessionsTable = sqliteTable('sessions', {

  mcps: text('mcps'), // JSON array of MCP tool IDs
  allowed_tools: text('allowed_tools'), // JSON array of allowed tool IDs (whitelist)
+  sub_agents: text('sub_agents'), // JSON array of sub-agent IDs
  slash_commands: text('slash_commands'), // JSON array of slash command objects from SDK init

  configuration: text('configuration'), // JSON, extensible settings
--- a/src/main/services/agents/services/AgentService.ts
+++ b/src/main/services/agents/services/AgentService.ts
@@ -117,6 +117,19 @@ export class AgentService extends BaseService {
    return agent
  }

+  async getAgentConfigForSDK(id: string): Promise<AgentEntity | null> {
+    this.ensureInitialized()
+
+    const result = await this.database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
+
+    if (!result[0]) {
+      return null
+    }
+
+    const agent = this.deserializeJsonFields(result[0]) as AgentEntity
+    return agent
+  }
+
  async listAgents(options: ListOptions = {}): Promise<{ agents: AgentEntity[]; total: number }> {
    this.ensureInitialized() // Build query with pagination

--- a/src/main/services/agents/services/SessionService.ts
+++ b/src/main/services/agents/services/SessionService.ts
@@ -130,6 +130,7 @@ export class SessionService extends BaseService {
      small_model: serializedData.small_model || null,
      mcps: serializedData.mcps || null,
      allowed_tools: serializedData.allowed_tools || null,
+      sub_agents: serializedData.sub_agents || null,
      configuration: serializedData.configuration || null,
      created_at: now,
      updated_at: now
@@ -169,6 +170,22 @@ export class SessionService extends BaseService {
      session.slash_commands = await this.listSlashCommands(session.agent_type, agentId)
    }

+    // Load installed plugins from cache file
+    const workdir = session.accessible_paths?.[0]
+    if (workdir) {
+      try {
+        session.plugins = await pluginService.listInstalledFromCache(workdir)
+      } catch (error) {
+        logger.warn(`Failed to load installed plugins for session ${id}`, {
+          workdir,
+          error: error instanceof Error ? error.message : String(error)
+        })
+        session.plugins = []
+      }
+    } else {
+      session.plugins = []
+    }
+
    return session
  }

--- a/src/main/services/agents/services/claudecode/tests/transform.test.ts
+++ b/src/main/services/agents/services/claudecode/tests/transform.test.ts
@@ -21,6 +21,11 @@ describe('stripLocalCommandTags', () => {
      '<local-command-stdout>line1</local-command-stdout>\nkeep\n<local-command-stderr>Error</local-command-stderr>'
    expect(stripLocalCommandTags(input)).toBe('line1\nkeep\nError')
  })
+
+  it('if no tags present, returns original string', () => {
+    const input = 'just some normal text'
+    expect(stripLocalCommandTags(input)).toBe(input)
+  })
 })

 describe('Claude → AiSDK transform', () => {
@@ -188,6 +193,111 @@ describe('Claude → AiSDK transform', () => {
    expect(toolResult.output).toBe('ok')
  })

+  it('handles tool calls without streaming events (no content_block_start/stop)', () => {
+    const state = new ClaudeStreamState({ agentSessionId: '12344' })
+    const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
+
+    const messages: SDKMessage[] = [
+      {
+        ...baseStreamMetadata,
+        type: 'assistant',
+        uuid: uuid(20),
+        message: {
+          id: 'msg-tool-no-stream',
+          type: 'message',
+          role: 'assistant',
+          model: 'claude-test',
+          content: [
+            {
+              type: 'tool_use',
+              id: 'tool-read',
+              name: 'Read',
+              input: { file_path: '/test.txt' }
+            },
+            {
+              type: 'tool_use',
+              id: 'tool-bash',
+              name: 'Bash',
+              input: { command: 'ls -la' }
+            }
+          ],
+          stop_reason: 'tool_use',
+          stop_sequence: null,
+          usage: {
+            input_tokens: 10,
+            output_tokens: 20
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'user',
+        uuid: uuid(21),
+        message: {
+          role: 'user',
+          content: [
+            {
+              type: 'tool_result',
+              tool_use_id: 'tool-read',
+              content: 'file contents',
+              is_error: false
+            }
+          ]
+        }
+      } as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'user',
+        uuid: uuid(22),
+        message: {
+          role: 'user',
+          content: [
+            {
+              type: 'tool_result',
+              tool_use_id: 'tool-bash',
+              content: 'total 42\n...',
+              is_error: false
+            }
+          ]
+        }
+      } as SDKMessage
+    ]
+
+    for (const message of messages) {
+      const transformed = transformSDKMessageToStreamParts(message, state)
+      parts.push(...transformed)
+    }
+
+    const types = parts.map((part) => part.type)
+    expect(types).toEqual(['tool-call', 'tool-call', 'tool-result', 'tool-result'])
+
+    const toolCalls = parts.filter((part) => part.type === 'tool-call') as Extract<
+      (typeof parts)[number],
+      { type: 'tool-call' }
+    >[]
+    expect(toolCalls).toHaveLength(2)
+    expect(toolCalls[0].toolName).toBe('Read')
+    expect(toolCalls[0].toolCallId).toBe('12344:tool-read')
+    expect(toolCalls[1].toolName).toBe('Bash')
+    expect(toolCalls[1].toolCallId).toBe('12344:tool-bash')
+
+    const toolResults = parts.filter((part) => part.type === 'tool-result') as Extract<
+      (typeof parts)[number],
+      { type: 'tool-result' }
+    >[]
+    expect(toolResults).toHaveLength(2)
+    // This is the key assertion - toolName should NOT be 'unknown'
+    expect(toolResults[0].toolName).toBe('Read')
+    expect(toolResults[0].toolCallId).toBe('12344:tool-read')
+    expect(toolResults[0].input).toEqual({ file_path: '/test.txt' })
+    expect(toolResults[0].output).toBe('file contents')
+
+    expect(toolResults[1].toolName).toBe('Bash')
+    expect(toolResults[1].toolCallId).toBe('12344:tool-bash')
+    expect(toolResults[1].input).toEqual({ command: 'ls -la' })
+    expect(toolResults[1].output).toBe('total 42\n...')
+  })
+
  it('handles streaming text completion', () => {
    const state = new ClaudeStreamState({ agentSessionId: baseStreamMetadata.session_id })
    const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
@@ -300,4 +410,87 @@ describe('Claude → AiSDK transform', () => {
    expect(finishStep.finishReason).toBe('stop')
    expect(finishStep.usage).toEqual({ inputTokens: 2, outputTokens: 4, totalTokens: 6 })
  })
+
+  it('emits fallback text when Claude sends a snapshot instead of deltas', () => {
+    const state = new ClaudeStreamState({ agentSessionId: '12344' })
+    const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
+
+    const messages: SDKMessage[] = [
+      {
+        ...baseStreamMetadata,
+        type: 'stream_event',
+        uuid: uuid(30),
+        event: {
+          type: 'message_start',
+          message: {
+            id: 'msg-fallback',
+            type: 'message',
+            role: 'assistant',
+            model: 'claude-test',
+            content: [],
+            stop_reason: null,
+            stop_sequence: null,
+            usage: {}
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'stream_event',
+        uuid: uuid(31),
+        event: {
+          type: 'content_block_start',
+          index: 0,
+          content_block: {
+            type: 'text',
+            text: ''
+          }
+        }
+      } as unknown as SDKMessage,
+      {
+        ...baseStreamMetadata,
+        type: 'assistant',
+        uuid: uuid(32),
+        message: {
+          id: 'msg-fallback-content',
+          type: 'message',
+          role: 'assistant',
+          model: 'claude-test',
+          content: [
+            {
+              type: 'text',
+              text: 'Final answer without streaming deltas.'
+            }
+          ],
+          stop_reason: 'end_turn',
+          stop_sequence: null,
+          usage: {
+            input_tokens: 3,
+            output_tokens: 7
+          }
+        }
+      } as unknown as SDKMessage
+    ]
+
+    for (const message of messages) {
+      const transformed = transformSDKMessageToStreamParts(message, state)
+      parts.push(...transformed)
+    }
+
+    const types = parts.map((part) => part.type)
+    expect(types).toEqual(['start-step', 'text-start', 'text-delta', 'text-end', 'finish-step'])
+
+    const delta = parts.find((part) => part.type === 'text-delta') as Extract<
+      (typeof parts)[number],
+      { type: 'text-delta' }
+    >
+    expect(delta.text).toBe('Final answer without streaming deltas.')
+
+    const finish = parts.find((part) => part.type === 'finish-step') as Extract<
+      (typeof parts)[number],
+      { type: 'finish-step' }
+    >
+    expect(finish.usage).toEqual({ inputTokens: 3, outputTokens: 7, totalTokens: 10 })
+    expect(finish.finishReason).toBe('stop')
+  })
 })
--- a/src/main/services/agents/services/claudecode/claude-stream-state.ts
+++ b/src/main/services/agents/services/claudecode/claude-stream-state.ts
@@ -153,6 +153,20 @@ export class ClaudeStreamState {
    return this.blocksByIndex.get(index)
  }

+  getFirstOpenTextBlock(): TextBlockState | undefined {
+    const candidates: TextBlockState[] = []
+    for (const block of this.blocksByIndex.values()) {
+      if (block.kind === 'text') {
+        candidates.push(block)
+      }
+    }
+    if (candidates.length === 0) {
+      return undefined
+    }
+    candidates.sort((a, b) => a.index - b.index)
+    return candidates[0]
+  }
+
  getToolBlockById(toolCallId: string): ToolBlockState | undefined {
    const index = this.toolIndexByNamespacedId.get(toolCallId)
    if (index === undefined) return undefined
@@ -217,10 +231,10 @@ export class ClaudeStreamState {
   * Persists the final input payload for a tool block once the provider signals
   * completion so that downstream tool results can reference the original call.
   */
-  completeToolBlock(toolCallId: string, input: unknown, providerMetadata?: ProviderMetadata): void {
+  completeToolBlock(toolCallId: string, toolName: string, input: unknown, providerMetadata?: ProviderMetadata): void {
    const block = this.getToolBlockByRawId(toolCallId)
    this.registerToolCall(toolCallId, {
-      toolName: block?.toolName ?? 'unknown',
+      toolName,
      input,
      providerMetadata
    })
--- a/src/main/services/agents/services/claudecode/index.ts
+++ b/src/main/services/agents/services/claudecode/index.ts
@@ -2,7 +2,13 @@
 import { EventEmitter } from 'node:events'
 import { createRequire } from 'node:module'

-import type { CanUseTool, McpHttpServerConfig, Options, SDKMessage } from '@anthropic-ai/claude-agent-sdk'
+import type {
+  AgentDefinition,
+  CanUseTool,
+  McpHttpServerConfig,
+  Options,
+  SDKMessage
+} from '@anthropic-ai/claude-agent-sdk'
 import { query } from '@anthropic-ai/claude-agent-sdk'
 import { loggerService } from '@logger'
 import { config as apiConfigService } from '@main/apiServer/config'
@@ -10,7 +16,7 @@ import { validateModelId } from '@main/apiServer/utils'
 import getLoginShellEnvironment from '@main/utils/shell-env'
 import { app } from 'electron'

-import type { GetAgentSessionResponse } from '../..'
+import { agentService, type GetAgentSessionResponse } from '../..'
 import type { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface'
 import { sessionService } from '../SessionService'
 import { buildNamespacedToolCallId } from './claude-stream-state'
@@ -157,6 +163,32 @@ class ClaudeCodeService implements AgentServiceInterface {
      })
    }

+    const subAgents: Record<string, AgentDefinition> = {}
+    if (session.sub_agents && session.sub_agents.length > 0) {
+      for (const subAgentId of session.sub_agents) {
+        try {
+          const agentConfig = await agentService.getAgentConfigForSDK(subAgentId)
+          if (agentConfig) {
+            subAgents[subAgentId] = {
+              // TODO: support custom model for sub-agents
+              model: 'inherit',
+              description: agentConfig.description ?? '',
+              prompt: agentConfig.instructions ?? '',
+              tools: agentConfig.allowed_tools
+            }
+            logger.info('Loaded sub-agent', { subAgentId })
+          } else {
+            logger.warn('Sub-agent not found', { subAgentId })
+          }
+        } catch (error) {
+          logger.error('Failed to load sub-agent config', {
+            subAgentId,
+            error: error instanceof Error ? error.message : String(error)
+          })
+        }
+      }
+    }
+
    // Build SDK options from parameters
    const options: Options = {
      abortController,
@@ -414,23 +446,6 @@ class ClaudeCodeService implements AgentServiceInterface {
          }
        }

-        if (message.type === 'assistant' || message.type === 'user') {
-          logger.silly('claude response', {
-            message,
-            content: JSON.stringify(message.message.content)
-          })
-        } else if (message.type === 'stream_event') {
-          // logger.silly('Claude stream event', {
-          //   message,
-          //   event: JSON.stringify(message.event)
-          // })
-        } else {
-          logger.silly('Claude response', {
-            message,
-            event: JSON.stringify(message)
-          })
-        }
-
        const chunks = transformSDKMessageToStreamParts(message, streamState)
        for (const chunk of chunks) {
          stream.emit('data', {
--- a/src/main/services/agents/services/claudecode/transform.ts
+++ b/src/main/services/agents/services/claudecode/transform.ts
@@ -110,7 +110,7 @@ const sdkMessageToProviderMetadata = (message: SDKMessage): ProviderMetadata =>
 * blocks across calls so that incremental deltas can be correlated correctly.
 */
 export function transformSDKMessageToStreamParts(sdkMessage: SDKMessage, state: ClaudeStreamState): AgentStreamPart[] {
-  logger.silly('Transforming SDKMessage', { message: sdkMessage })
+  logger.silly('Transforming SDKMessage', { message: JSON.stringify(sdkMessage) })
  switch (sdkMessage.type) {
    case 'assistant':
      return handleAssistantMessage(sdkMessage, state)
@@ -186,14 +186,13 @@ function handleAssistantMessage(

  for (const block of content) {
    switch (block.type) {
-      case 'text':
-        if (!isStreamingActive) {
-          const sanitizedText = stripLocalCommandTags(block.text)
-          if (sanitizedText) {
-            textBlocks.push(sanitizedText)
-          }
+      case 'text': {
+        const sanitizedText = stripLocalCommandTags(block.text)
+        if (sanitizedText) {
+          textBlocks.push(sanitizedText)
        }
        break
+      }
      case 'tool_use':
        handleAssistantToolUse(block as ToolUseContent, providerMetadata, state, chunks)
        break
@@ -203,7 +202,16 @@ function handleAssistantMessage(
    }
  }

-  if (!isStreamingActive && textBlocks.length > 0) {
+  if (textBlocks.length === 0) {
+    return chunks
+  }
+
+  const combinedText = textBlocks.join('')
+  if (!combinedText) {
+    return chunks
+  }
+
+  if (!isStreamingActive) {
    const id = message.uuid?.toString() || generateMessageId()
    state.beginStep()
    chunks.push({
@@ -219,7 +227,7 @@ function handleAssistantMessage(
    chunks.push({
      type: 'text-delta',
      id,
-      text: textBlocks.join(''),
+      text: combinedText,
      providerMetadata
    })
    chunks.push({
@@ -230,7 +238,27 @@ function handleAssistantMessage(
    return finalizeNonStreamingStep(message, state, chunks)
  }

-  return chunks
+  const existingTextBlock = state.getFirstOpenTextBlock()
+  const fallbackId = existingTextBlock?.id || message.uuid?.toString() || generateMessageId()
+  if (!existingTextBlock) {
+    chunks.push({
+      type: 'text-start',
+      id: fallbackId,
+      providerMetadata
+    })
+  }
+  chunks.push({
+    type: 'text-delta',
+    id: fallbackId,
+    text: combinedText,
+    providerMetadata
+  })
+  chunks.push({
+    type: 'text-end',
+    id: fallbackId,
+    providerMetadata
+  })
+  return finalizeNonStreamingStep(message, state, chunks)
 }

 /**
@@ -252,7 +280,7 @@ function handleAssistantToolUse(
    providerExecuted: true,
    providerMetadata
  })
-  state.completeToolBlock(block.id, block.input, providerMetadata)
+  state.completeToolBlock(block.id, block.name, block.input, providerMetadata)
 }

 /**
@@ -459,6 +487,9 @@ function handleStreamEvent(
    }

    case 'message_stop': {
+      if (!state.hasActiveStep()) {
+        break
+      }
      const pending = state.getPendingUsage()
      chunks.push({
        type: 'finish-step',
--- a/src/preload/index.ts
+++ b/src/preload/index.ts
@@ -220,10 +220,6 @@ const api = {
    startFileWatcher: (dirPath: string, config?: any) =>
      ipcRenderer.invoke(IpcChannel.File_StartWatcher, dirPath, config),
    stopFileWatcher: () => ipcRenderer.invoke(IpcChannel.File_StopWatcher),
-    pauseFileWatcher: () => ipcRenderer.invoke(IpcChannel.File_PauseWatcher),
-    resumeFileWatcher: () => ipcRenderer.invoke(IpcChannel.File_ResumeWatcher),
-    batchUploadMarkdown: (filePaths: string[], targetPath: string) =>
-      ipcRenderer.invoke(IpcChannel.File_BatchUploadMarkdown, filePaths, targetPath),
    onFileChange: (callback: (data: FileChangeEvent) => void) => {
      const listener = (_event: Electron.IpcRendererEvent, data: any) => {
        if (data && typeof data === 'object') {
--- a/src/renderer/src/components/EmojiPicker/index.tsx
+++ b/src/renderer/src/components/EmojiPicker/index.tsx
@@ -1,35 +1,120 @@
+import 'emoji-picker-element'
+
 import TwemojiCountryFlagsWoff2 from '@renderer/assets/fonts/country-flag-fonts/TwemojiCountryFlags.woff2?url'
 import { useTheme } from '@renderer/context/ThemeProvider'
+import type { LanguageVarious } from '@renderer/types'
 import { polyfillCountryFlagEmojis } from 'country-flag-emoji-polyfill'
+// i18n translations from emoji-picker-element
+import de from 'emoji-picker-element/i18n/de'
+import en from 'emoji-picker-element/i18n/en'
+import es from 'emoji-picker-element/i18n/es'
+import fr from 'emoji-picker-element/i18n/fr'
+import ja from 'emoji-picker-element/i18n/ja'
+import pt_PT from 'emoji-picker-element/i18n/pt_PT'
+import ru_RU from 'emoji-picker-element/i18n/ru_RU'
+import zh_CN from 'emoji-picker-element/i18n/zh_CN'
+import type Picker from 'emoji-picker-element/picker'
+import type { EmojiClickEvent, NativeEmoji } from 'emoji-picker-element/shared'
+// Emoji data from emoji-picker-element-data (local, no CDN)
+// Using CLDR format for full multi-language search support (28 languages)
+import dataDE from 'emoji-picker-element-data/de/cldr/data.json?url'
+import dataEN from 'emoji-picker-element-data/en/cldr/data.json?url'
+import dataES from 'emoji-picker-element-data/es/cldr/data.json?url'
+import dataFR from 'emoji-picker-element-data/fr/cldr/data.json?url'
+import dataJA from 'emoji-picker-element-data/ja/cldr/data.json?url'
+import dataPT from 'emoji-picker-element-data/pt/cldr/data.json?url'
+import dataRU from 'emoji-picker-element-data/ru/cldr/data.json?url'
+import dataZH from 'emoji-picker-element-data/zh/cldr/data.json?url'
+import dataZH_HANT from 'emoji-picker-element-data/zh-hant/cldr/data.json?url'
 import type { FC } from 'react'
 import { useEffect, useRef } from 'react'
+import { useTranslation } from 'react-i18next'

 interface Props {
  onEmojiClick: (emoji: string) => void
 }

+// Mapping from app locale to emoji-picker-element i18n
+const i18nMap: Record<LanguageVarious, typeof en> = {
+  'en-US': en,
+  'zh-CN': zh_CN,
+  'zh-TW': zh_CN, // Closest available
+  'de-DE': de,
+  'el-GR': en, // No Greek available, fallback to English
+  'es-ES': es,
+  'fr-FR': fr,
+  'ja-JP': ja,
+  'pt-PT': pt_PT,
+  'ru-RU': ru_RU
+}
+
+// Mapping from app locale to emoji data URL
+// Using CLDR format provides native language search support for all locales
+const dataSourceMap: Record<LanguageVarious, string> = {
+  'en-US': dataEN,
+  'zh-CN': dataZH,
+  'zh-TW': dataZH_HANT,
+  'de-DE': dataDE,
+  'el-GR': dataEN, // No Greek CLDR available, fallback to English
+  'es-ES': dataES,
+  'fr-FR': dataFR,
+  'ja-JP': dataJA,
+  'pt-PT': dataPT,
+  'ru-RU': dataRU
+}
+
+// Mapping from app locale to emoji-picker-element locale string
+// Must match the data source locale for proper IndexedDB caching
+const localeMap: Record<LanguageVarious, string> = {
+  'en-US': 'en',
+  'zh-CN': 'zh',
+  'zh-TW': 'zh-hant',
+  'de-DE': 'de',
+  'el-GR': 'en',
+  'es-ES': 'es',
+  'fr-FR': 'fr',
+  'ja-JP': 'ja',
+  'pt-PT': 'pt',
+  'ru-RU': 'ru'
+}
+
 const EmojiPicker: FC<Props> = ({ onEmojiClick }) => {
  const { theme } = useTheme()
-  const ref = useRef<HTMLDivElement>(null)
+  const { i18n } = useTranslation()
+  const ref = useRef<Picker>(null)
+  const currentLocale = i18n.language as LanguageVarious

  useEffect(() => {
    polyfillCountryFlagEmojis('Twemoji Mozilla', TwemojiCountryFlagsWoff2)
  }, [])

+  // Configure picker with i18n and dataSource
  useEffect(() => {
-    const refValue = ref.current
+    const picker = ref.current
+    if (picker) {
+      picker.i18n = i18nMap[currentLocale] || en
+      picker.dataSource = dataSourceMap[currentLocale] || dataEN
+      picker.locale = localeMap[currentLocale] || 'en'
+    }
+  }, [currentLocale])

-    if (refValue) {
-      const handleEmojiClick = (event: any) => {
+  useEffect(() => {
+    const picker = ref.current
+
+    if (picker) {
+      const handleEmojiClick = (event: EmojiClickEvent) => {
        event.stopPropagation()
-        onEmojiClick(event.detail.unicode || event.detail.emoji.unicode)
+        const { detail } = event
+        // Use detail.unicode (processed with skin tone) or fallback to emoji's unicode for native emoji
+        const unicode = detail.unicode || ('unicode' in detail.emoji ? (detail.emoji as NativeEmoji).unicode : '')
+        onEmojiClick(unicode)
      }
      // 添加事件监听器
-      refValue.addEventListener('emoji-click', handleEmojiClick)
+      picker.addEventListener('emoji-click', handleEmojiClick)

      // 清理事件监听器
      return () => {
-        refValue.removeEventListener('emoji-click', handleEmojiClick)
+        picker.removeEventListener('emoji-click', handleEmojiClick)
      }
    }
    return
--- a/src/renderer/src/components/VirtualList/tests/DynamicVirtualList.test.tsx
+++ b/src/renderer/src/components/VirtualList/tests/DynamicVirtualList.test.tsx
@@ -140,11 +140,11 @@ describe('DynamicVirtualList', () => {
      // Should call isSticky function during rendering
      expect(isSticky).toHaveBeenCalled()

-      // Sticky items within visible range should have proper z-index but may be absolute until scrolled
+      // Should apply sticky styles to sticky items
      const stickyItem = document.querySelector('[data-index="0"]') as HTMLElement
      expect(stickyItem).toBeInTheDocument()
-      // When sticky item is in visible range, it gets z-index but may not be sticky yet
-      expect(stickyItem).toHaveStyle('z-index: 999')
+      expect(stickyItem).toHaveStyle('position: sticky')
+      expect(stickyItem).toHaveStyle('z-index: 1')
    })

    it('should apply absolute positioning to non-sticky items', () => {
--- a/src/renderer/src/components/VirtualList/tests/snapshots/DynamicVirtualList.test.tsx.snap
+++ b/src/renderer/src/components/VirtualList/tests/snapshots/DynamicVirtualList.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`DynamicVirtualList > basic rendering > snapshot test 1`] = `
    >
      <div
        data-index="0"
-        style="position: absolute; top: 0px; left: 0px; z-index: 0; pointer-events: auto; transform: translateY(0px); width: 100%;"
+        style="position: absolute; top: 0px; left: 0px; transform: translateY(0px); width: 100%;"
      >
        <div
          data-testid="item-0"
@@ -34,7 +34,7 @@ exports[`DynamicVirtualList > basic rendering > snapshot test 1`] = `
      </div>
      <div
        data-index="1"
-        style="position: absolute; top: 0px; left: 0px; z-index: 0; pointer-events: auto; transform: translateY(50px); width: 100%;"
+        style="position: absolute; top: 0px; left: 0px; transform: translateY(50px); width: 100%;"
      >
        <div
          data-testid="item-1"
@@ -44,7 +44,7 @@ exports[`DynamicVirtualList > basic rendering > snapshot test 1`] = `
      </div>
      <div
        data-index="2"
-        style="position: absolute; top: 0px; left: 0px; z-index: 0; pointer-events: auto; transform: translateY(100px); width: 100%;"
+        style="position: absolute; top: 0px; left: 0px; transform: translateY(100px); width: 100%;"
      >
        <div
          data-testid="item-2"
--- a/src/renderer/src/components/VirtualList/dynamic.tsx
+++ b/src/renderer/src/components/VirtualList/dynamic.tsx
@@ -62,12 +62,6 @@ export interface DynamicVirtualListProps<T> extends InheritedVirtualizerOptions
   */
  isSticky?: (index: number) => boolean

-  /**
-   * Get the depth/level of an item for hierarchical sticky positioning
-   * Used with isSticky to determine ancestor relationships
-   */
-  getItemDepth?: (index: number) => number
-
  /**
   * Range extractor function, cannot be used with isSticky
   */
@@ -107,7 +101,6 @@ function DynamicVirtualList<T>(props: DynamicVirtualListProps<T>) {
    size,
    estimateSize,
    isSticky,
-    getItemDepth,
    rangeExtractor: customRangeExtractor,
    itemContainerStyle,
    scrollerStyle,
@@ -122,7 +115,7 @@ function DynamicVirtualList<T>(props: DynamicVirtualListProps<T>) {
  const internalScrollerRef = useRef<HTMLDivElement>(null)
  const scrollerRef = internalScrollerRef

-  const activeStickyIndexesRef = useRef<number[]>([])
+  const activeStickyIndexRef = useRef(0)

  const stickyIndexes = useMemo(() => {
    if (!isSticky) return []
@@ -131,54 +124,21 @@ function DynamicVirtualList<T>(props: DynamicVirtualListProps<T>) {

  const internalStickyRangeExtractor = useCallback(
    (range: Range) => {
-      const activeStickies: number[] = []
+      // The active sticky index is the last one that is before or at the start of the visible range
+      const newActiveStickyIndex =
+        [...stickyIndexes].reverse().find((index) => range.startIndex >= index) ?? stickyIndexes[0] ?? 0

-      if (getItemDepth) {
-        // With depth information, we can build a proper ancestor chain
-        // Find all sticky items before the visible range
-        const stickiesBeforeRange = stickyIndexes.filter((index) => index < range.startIndex)
-
-        if (stickiesBeforeRange.length > 0) {
-          // Find the depth of the first visible item (or last sticky before it)
-          const firstVisibleIndex = range.startIndex
-          const referenceDepth = getItemDepth(firstVisibleIndex)
-
-          // Build ancestor chain: include all sticky parents
-          const ancestorChain: number[] = []
-          let minDepth = referenceDepth
-
-          // Walk backwards from the last sticky before visible range
-          for (let i = stickiesBeforeRange.length - 1; i >= 0; i--) {
-            const stickyIndex = stickiesBeforeRange[i]
-            const stickyDepth = getItemDepth(stickyIndex)
-
-            // Include this sticky if it's a parent (smaller depth) of our reference
-            if (stickyDepth < minDepth) {
-              ancestorChain.unshift(stickyIndex)
-              minDepth = stickyDepth
-            }
-          }
-
-          activeStickies.push(...ancestorChain)
-        }
-      } else {
-        // Fallback: without depth info, just use the last sticky before range
-        const lastStickyBeforeRange = [...stickyIndexes].reverse().find((index) => index < range.startIndex)
-        if (lastStickyBeforeRange !== undefined) {
-          activeStickies.push(lastStickyBeforeRange)
-        }
+      if (newActiveStickyIndex !== activeStickyIndexRef.current) {
+        activeStickyIndexRef.current = newActiveStickyIndex
      }

-      // Update the ref with current active stickies
-      activeStickyIndexesRef.current = activeStickies
-
-      // Merge the active sticky indexes and the default range extractor
-      const next = new Set([...activeStickyIndexesRef.current, ...defaultRangeExtractor(range)])
+      // Merge the active sticky index and the default range extractor
+      const next = new Set([activeStickyIndexRef.current, ...defaultRangeExtractor(range)])

      // Sort the set to maintain proper order
      return [...next].sort((a, b) => a - b)
    },
-    [stickyIndexes, getItemDepth]
+    [stickyIndexes]
  )

  const rangeExtractor = customRangeExtractor ?? (isSticky ? internalStickyRangeExtractor : undefined)
@@ -261,47 +221,14 @@ function DynamicVirtualList<T>(props: DynamicVirtualListProps<T>) {
        }}>
        {virtualItems.map((virtualItem) => {
          const isItemSticky = stickyIndexes.includes(virtualItem.index)
-          const isItemActiveSticky = isItemSticky && activeStickyIndexesRef.current.includes(virtualItem.index)
-
-          // Calculate the sticky offset for multi-level sticky headers
-          const activeStickyIndex = isItemActiveSticky ? activeStickyIndexesRef.current.indexOf(virtualItem.index) : -1
-
-          // Calculate cumulative offset based on actual sizes of previous sticky items
-          let stickyOffset = 0
-          if (activeStickyIndex >= 0) {
-            for (let i = 0; i < activeStickyIndex; i++) {
-              const prevStickyIndex = activeStickyIndexesRef.current[i]
-              stickyOffset += estimateSize(prevStickyIndex)
-            }
-          }
-
-          // Check if this item is visually covered by sticky items
-          // If covered, disable pointer events to prevent hover/click bleeding through
-          const isCoveredBySticky = (() => {
-            if (!activeStickyIndexesRef.current.length) return false
-            if (isItemActiveSticky) return false // Sticky items themselves are not covered
-
-            // Calculate if this item's visual position is under any sticky header
-            const itemVisualTop = virtualItem.start
-            let totalStickyHeight = 0
-            for (const stickyIdx of activeStickyIndexesRef.current) {
-              totalStickyHeight += estimateSize(stickyIdx)
-            }
-
-            // If item starts within the sticky area, it's covered
-            return itemVisualTop < totalStickyHeight
-          })()
+          const isItemActiveSticky = isItemSticky && activeStickyIndexRef.current === virtualItem.index

          const style: React.CSSProperties = {
            ...itemContainerStyle,
            position: isItemActiveSticky ? 'sticky' : 'absolute',
-            top: isItemActiveSticky ? stickyOffset : 0,
+            top: 0,
            left: 0,
-            zIndex: isItemActiveSticky ? 1000 + (100 - activeStickyIndex) : isItemSticky ? 999 : 0,
-            pointerEvents: isCoveredBySticky ? 'none' : 'auto',
-            ...(isItemActiveSticky && {
-              backgroundColor: 'var(--color-background)'
-            }),
+            zIndex: isItemSticky ? 1 : undefined,
            ...(horizontal
              ? {
                  transform: isItemActiveSticky ? undefined : `translateX(${virtualItem.start}px)`,
--- a/src/renderer/src/hooks/useInPlaceEdit.ts
+++ b/src/renderer/src/hooks/useInPlaceEdit.ts
@@ -1,7 +1,7 @@
-import { loggerService } from '@logger'
-import { useCallback, useLayoutEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState } from 'react'
+
+import { useTimer } from './useTimer'

-const logger = loggerService.withContext('useInPlaceEdit')
 export interface UseInPlaceEditOptions {
  onSave: ((value: string) => void) | ((value: string) => Promise<void>)
  onCancel?: () => void
@@ -12,10 +12,14 @@ export interface UseInPlaceEditOptions {
 export interface UseInPlaceEditReturn {
  isEditing: boolean
  isSaving: boolean
+  editValue: string
+  inputRef: React.RefObject<HTMLInputElement | null>
  startEdit: (initialValue: string) => void
  saveEdit: () => void
  cancelEdit: () => void
-  inputProps: React.InputHTMLAttributes<HTMLInputElement> & { ref: React.RefObject<HTMLInputElement | null> }
+  handleKeyDown: (e: React.KeyboardEvent) => void
+  handleInputChange: (e: React.ChangeEvent<HTMLInputElement>) => void
+  handleValueChange: (value: string) => void
 }

 /**
@@ -33,55 +37,58 @@ export function useInPlaceEdit(options: UseInPlaceEditOptions): UseInPlaceEditRe
  const [isSaving, setIsSaving] = useState(false)
  const [isEditing, setIsEditing] = useState(false)
  const [editValue, setEditValue] = useState('')
-  const originalValueRef = useRef('')
+  const [originalValue, setOriginalValue] = useState('')
  const inputRef = useRef<HTMLInputElement>(null)
+  const { setTimeoutTimer } = useTimer()

-  const startEdit = useCallback((initialValue: string) => {
-    setIsEditing(true)
-    setEditValue(initialValue)
-    originalValueRef.current = initialValue
-  }, [])
+  const startEdit = useCallback(
+    (initialValue: string) => {
+      setIsEditing(true)
+      setEditValue(initialValue)
+      setOriginalValue(initialValue)

-  useLayoutEffect(() => {
-    if (isEditing) {
-      inputRef.current?.focus()
-      if (autoSelectOnStart) {
-        inputRef.current?.select()
-      }
-    }
-  }, [autoSelectOnStart, isEditing])
+      setTimeoutTimer(
+        'startEdit',
+        () => {
+          inputRef.current?.focus()
+          if (autoSelectOnStart) {
+            inputRef.current?.select()
+          }
+        },
+        0
+      )
+    },
+    [autoSelectOnStart, setTimeoutTimer]
+  )

  const saveEdit = useCallback(async () => {
    if (isSaving) return

-    const finalValue = trimOnSave ? editValue.trim() : editValue
-    if (finalValue === originalValueRef.current) {
-      setIsEditing(false)
-      return
-    }
-
    setIsSaving(true)

    try {
-      await onSave(finalValue)
+      const finalValue = trimOnSave ? editValue.trim() : editValue
+      if (finalValue !== originalValue) {
+        await onSave(finalValue)
+      }
      setIsEditing(false)
      setEditValue('')
-    } catch (error) {
-      logger.error('Error saving in-place edit', { error })
+      setOriginalValue('')
+    } finally {
      setIsSaving(false)
    }
-  }, [isSaving, trimOnSave, editValue, onSave])
+  }, [isSaving, trimOnSave, editValue, originalValue, onSave])

  const cancelEdit = useCallback(() => {
    setIsEditing(false)
    setEditValue('')
+    setOriginalValue('')
    onCancel?.()
  }, [onCancel])

  const handleKeyDown = useCallback(
    (e: React.KeyboardEvent) => {
-      if (e.nativeEvent.isComposing) return
-      if (e.key === 'Enter') {
+      if (e.key === 'Enter' && !e.nativeEvent.isComposing) {
        e.preventDefault()
        saveEdit()
      } else if (e.key === 'Escape') {
@@ -97,29 +104,37 @@ export function useInPlaceEdit(options: UseInPlaceEditOptions): UseInPlaceEditRe
    setEditValue(e.target.value)
  }, [])

-  const handleBlur = useCallback(() => {
-    // 这里的逻辑需要注意：
-    // 如果点击了“取消”按钮，可能会先触发 Blur 保存。
-    // 通常 InPlaceEdit 的逻辑是 Blur 即 Save。
-    // 如果不想 Blur 保存，可以去掉这一行，或者判断 relatedTarget。
-    if (!isSaving) {
-      saveEdit()
+  const handleValueChange = useCallback((value: string) => {
+    setEditValue(value)
+  }, [])
+
+  // Handle clicks outside the input to save
+  useEffect(() => {
+    const handleClickOutside = (event: MouseEvent) => {
+      if (isEditing && inputRef.current && !inputRef.current.contains(event.target as Node)) {
+        saveEdit()
+      }
    }
-  }, [saveEdit, isSaving])
+
+    if (isEditing) {
+      document.addEventListener('mousedown', handleClickOutside)
+      return () => {
+        document.removeEventListener('mousedown', handleClickOutside)
+      }
+    }
+    return
+  }, [isEditing, saveEdit])

  return {
    isEditing,
    isSaving,
+    editValue,
+    inputRef,
    startEdit,
    saveEdit,
    cancelEdit,
-    inputProps: {
-      ref: inputRef,
-      value: editValue,
-      onChange: handleInputChange,
-      onKeyDown: handleKeyDown,
-      onBlur: handleBlur,
-      disabled: isSaving // 保存时禁用输入
-    }
+    handleKeyDown,
+    handleInputChange,
+    handleValueChange
  }
 }
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -156,6 +156,12 @@
        "uninstalling": "Uninstalling..."
      },
      "prompt": "Prompt Settings",
+      "sub_agents": {
+        "placeholder": "Select sub agents",
+        "tab": "Sub Agents",
+        "title": "Sub Agents",
+        "tooltip": "Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Connect MCP servers to unlock additional tools you can approve above.",
@@ -641,6 +647,7 @@
          "description": "No files available in accessible directories",
          "label": "No File Found"
        },
+        "sub_agent": "Sub-Agent",
        "title": "Activity Directory"
      },
      "auto_resize": "Auto resize height",
@@ -2175,10 +2182,7 @@
    "untitled_folder": "New Folder",
    "untitled_note": "Untitled Note",
    "upload_failed": "Note upload failed",
-    "upload_files": "Upload Files",
-    "upload_folder": "Upload Folder",
-    "upload_success": "Note uploaded success",
-    "uploading_files": "Uploading {{count}} files..."
+    "upload_success": "Note uploaded success"
  },
  "notification": {
    "assistant": "Assistant Response",
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -156,6 +156,12 @@
        "uninstalling": "卸载中..."
      },
      "prompt": "提示词设置",
+      "sub_agents": {
+        "placeholder": "选择子智能体",
+        "tab": "子智能体",
+        "title": "子智能体",
+        "tooltip": "选择可以被此智能体委派任务的其他智能体"
+      },
      "tooling": {
        "mcp": {
          "description": "连接 MCP 服务器即可解锁更多可在上方预先授权的工具。",
@@ -641,6 +647,7 @@
          "description": "可访问目录中没有可用文件",
          "label": "未找到文件"
        },
+        "sub_agent": "子代理",
        "title": "活动目录"
      },
      "auto_resize": "自动调整高度",
@@ -2175,10 +2182,7 @@
    "untitled_folder": "新文件夹",
    "untitled_note": "无标题笔记",
    "upload_failed": "笔记上传失败",
-    "upload_files": "上传文件",
-    "upload_folder": "上传文件夹",
-    "upload_success": "笔记上传成功",
-    "uploading_files": "正在上传 {{count}} 个文件..."
+    "upload_success": "笔记上传成功"
  },
  "notification": {
    "assistant": "助手响应",
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -156,6 +156,12 @@
        "uninstalling": "解除安裝中..."
      },
      "prompt": "提示設定",
+      "sub_agents": {
+        "placeholder": "選擇子助手",
+        "tab": "子助手",
+        "title": "子助手",
+        "tooltip": "選擇可以被此助手委派任務的其他助手"
+      },
      "tooling": {
        "mcp": {
          "description": "連線 MCP 伺服器即可解鎖更多可在上方預先授權的工具。",
@@ -641,6 +647,7 @@
          "description": "可存取的目錄中沒有檔案",
          "label": "找不到檔案"
        },
+        "sub_agent": "子代理",
        "title": "活動目錄"
      },
      "auto_resize": "自動調整高度",
@@ -2175,10 +2182,7 @@
    "untitled_folder": "新資料夾",
    "untitled_note": "無標題筆記",
    "upload_failed": "筆記上傳失敗",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "筆記上傳成功",
-    "uploading_files": "正在上傳 {{count}} 個檔案..."
+    "upload_success": "筆記上傳成功"
  },
  "notification": {
    "assistant": "助手回應",
--- a/src/renderer/src/i18n/translate/de-de.json
+++ b/src/renderer/src/i18n/translate/de-de.json
@@ -156,6 +156,12 @@
        "uninstalling": "Deinstallation läuft..."
      },
      "prompt": "Prompt-Einstellungen",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Verbinden Sie MCP-Server, um weitere Tools freizuschalten, die oben vorab autorisiert werden können.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "Neuer Ordner",
    "untitled_note": "Unbenannte Notiz",
    "upload_failed": "Notizen-Upload fehlgeschlagen",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Notizen erfolgreich hochgeladen",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Notizen erfolgreich hochgeladen"
  },
  "notification": {
    "assistant": "Assistenten-Antwort",
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@@ -156,6 +156,12 @@
        "uninstalling": "Απεγκατάσταση..."
      },
      "prompt": "Ρυθμίσεις Προτροπής",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Συνδέστε διακομιστές MCP για να ξεκλειδώσετε πρόσθετα εργαλεία που μπορείτε να εγκρίνετε παραπάνω.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "Νέος φάκελος",
    "untitled_note": "σημείωση χωρίς τίτλο",
    "upload_failed": "Η σημείωση δεν ανέβηκε",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Οι σημειώσεις μεταφορτώθηκαν με επιτυχία",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Οι σημειώσεις μεταφορτώθηκαν με επιτυχία"
  },
  "notification": {
    "assistant": "Απάντηση Βοηθού",
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@@ -156,6 +156,12 @@
        "uninstalling": "Desinstalando..."
      },
      "prompt": "Configuración de indicaciones",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Conecta servidores MCP para desbloquear herramientas adicionales que puedes aprobar arriba.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "Nueva carpeta",
    "untitled_note": "Nota sin título",
    "upload_failed": "Error al cargar la nota",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Nota cargada con éxito",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Nota cargada con éxito"
  },
  "notification": {
    "assistant": "Respuesta del asistente",
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@@ -156,6 +156,12 @@
        "uninstalling": "Désinstallation en cours..."
      },
      "prompt": "Paramètres de l'invite",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Connectez des serveurs MCP pour débloquer des outils supplémentaires que vous pouvez approuver ci-dessus.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "nouveau dossier",
    "untitled_note": "Note sans titre",
    "upload_failed": "Échec du téléchargement de la note",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Note téléchargée avec succès",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Note téléchargée avec succès"
  },
  "notification": {
    "assistant": "Réponse de l'assistant",
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@@ -156,6 +156,12 @@
        "uninstalling": "アンインストール中..."
      },
      "prompt": "プロンプト設定",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "MCPサーバーを接続して、上で承認できる追加ツールを解放します。",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "新ファイル夹",
    "untitled_note": "無題のメモ",
    "upload_failed": "ノートのアップロードに失敗しました",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "ノートのアップロードが成功しました",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "ノートのアップロードが成功しました"
  },
  "notification": {
    "assistant": "助手回應",
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@@ -156,6 +156,12 @@
        "uninstalling": "Desinstalando..."
      },
      "prompt": "Configurações de Prompt",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Conecte servidores MCP para desbloquear ferramentas adicionais que você pode aprovar acima.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "Nova pasta",
    "untitled_note": "Nota sem título",
    "upload_failed": "Falha ao carregar a nota",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Nota carregada com sucesso",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Nota carregada com sucesso"
  },
  "notification": {
    "assistant": "Resposta do assistente",
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@@ -156,6 +156,12 @@
        "uninstalling": "Удаление..."
      },
      "prompt": "Настройки подсказки",
+      "sub_agents": {
+        "placeholder": "[to be translated]:Select sub agents",
+        "tab": "[to be translated]:Sub Agents",
+        "title": "[to be translated]:Sub Agents",
+        "tooltip": "[to be translated]:Select other agents that can be delegated tasks by this agent"
+      },
      "tooling": {
        "mcp": {
          "description": "Подключите серверы MCP, чтобы разблокировать дополнительные инструменты, которые вы можете одобрить выше.",
@@ -2175,10 +2181,7 @@
    "untitled_folder": "Новая папка",
    "untitled_note": "Незаглавленная заметка",
    "upload_failed": "Не удалось загрузить заметку",
-    "upload_files": "[to be translated]:Upload Files",
-    "upload_folder": "[to be translated]:Upload Folder",
-    "upload_success": "Заметка успешно загружена",
-    "uploading_files": "[to be translated]:Uploading {{count}} files..."
+    "upload_success": "Заметка успешно загружена"
  },
  "notification": {
    "assistant": "Ответ ассистента",
--- a/src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx
@@ -103,12 +103,23 @@ const AgentSessionInputbar: FC<Props> = ({ agentId, sessionId }) => {
  // Prepare session data for tools
  const sessionData = useMemo(() => {
    if (!session) return undefined
+
+    // Get installed agent plugins from session.plugins
+    const agentPlugins = (session.plugins ?? [])
+      .filter((plugin) => plugin.type === 'agent')
+      .map((plugin) => ({
+        id: plugin.filename,
+        name: plugin.metadata.name ?? plugin.filename.replace(/\.md$/i, ''),
+        description: plugin.metadata.description
+      }))
+
    return {
      agentId,
      sessionId,
      slashCommands: session.slash_commands,
      tools: session.tools,
-      accessiblePaths: session.accessible_paths ?? []
+      accessiblePaths: session.accessible_paths ?? [],
+      subAgents: agentPlugins
    }
  }, [session, agentId, sessionId])

@@ -158,6 +169,8 @@ interface InnerProps {
    sessionId?: string
    slashCommands?: Array<{ command: string; description?: string }>
    tools?: Array<{ id: string; name: string; type: string; description?: string }>
+    accessiblePaths?: string[]
+    subAgents?: Array<{ id: string; name: string; description?: string }>
  }
  actionsRef: React.MutableRefObject<{
    resizeTextArea: () => void
--- a/src/renderer/src/pages/home/Inputbar/tools/activityDirectoryTool.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/activityDirectoryTool.tsx
@@ -25,11 +25,12 @@ const activityDirectoryTool = defineTool({
    const { quickPanel, quickPanelController, actions, session } = context
    const { onTextChange } = actions

-    // Get accessible paths from session data
+    // Get accessible paths and sub-agents from session data
    const accessiblePaths = session?.accessiblePaths ?? []
+    const subAgents = session?.subAgents ?? []

-    // Only render if we have accessible paths
-    if (accessiblePaths.length === 0) {
+    // Only render if we have accessible paths or sub-agents
+    if (accessiblePaths.length === 0 && subAgents.length === 0) {
      return null
    }

@@ -38,6 +39,7 @@ const activityDirectoryTool = defineTool({
        quickPanel={quickPanel}
        quickPanelController={quickPanelController}
        accessiblePaths={accessiblePaths}
+        subAgents={subAgents}
        setText={onTextChange as React.Dispatch<React.SetStateAction<string>>}
      />
    )
--- a/src/renderer/src/pages/home/Inputbar/tools/components/ActivityDirectoryButton.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/ActivityDirectoryButton.tsx
@@ -13,10 +13,17 @@ interface Props {
  quickPanel: ToolQuickPanelApi
  quickPanelController: ToolQuickPanelController
  accessiblePaths: string[]
+  subAgents?: Array<{ id: string; name: string; description?: string }>
  setText: React.Dispatch<React.SetStateAction<string>>
 }

-const ActivityDirectoryButton: FC<Props> = ({ quickPanel, quickPanelController, accessiblePaths, setText }) => {
+const ActivityDirectoryButton: FC<Props> = ({
+  quickPanel,
+  quickPanelController,
+  accessiblePaths,
+  subAgents,
+  setText
+}) => {
  const { t } = useTranslation()

  const { handleOpenQuickPanel } = useActivityDirectoryPanel(
@@ -24,6 +31,7 @@ const ActivityDirectoryButton: FC<Props> = ({ quickPanel, quickPanelController,
      quickPanel,
      quickPanelController,
      accessiblePaths,
+      subAgents,
      setText
    },
    'button'
--- a/src/renderer/src/pages/home/Inputbar/tools/components/ActivityDirectoryQuickPanelManager.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/ActivityDirectoryQuickPanelManager.tsx
@@ -15,8 +15,9 @@ const ActivityDirectoryQuickPanelManager = ({ context }: ManagerProps) => {
    session
  } = context

-  // Get accessible paths from session data
+  // Get accessible paths and sub-agents from session data
  const accessiblePaths = session?.accessiblePaths ?? []
+  const subAgents = session?.subAgents ?? []

  // Always call hooks unconditionally (React rules)
  useActivityDirectoryPanel(
@@ -24,6 +25,7 @@ const ActivityDirectoryQuickPanelManager = ({ context }: ManagerProps) => {
      quickPanel,
      quickPanelController,
      accessiblePaths,
+      subAgents,
      setText: onTextChange as React.Dispatch<React.SetStateAction<string>>
    },
    'manager'
--- a/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx
+++ b/src/renderer/src/pages/home/Inputbar/tools/components/useActivityDirectoryPanel.tsx
@@ -2,7 +2,7 @@ import { loggerService } from '@logger'
 import type { QuickPanelListItem } from '@renderer/components/QuickPanel'
 import { QuickPanelReservedSymbol } from '@renderer/components/QuickPanel'
 import type { ToolQuickPanelApi, ToolQuickPanelController } from '@renderer/pages/home/Inputbar/types'
-import { File, Folder } from 'lucide-react'
+import { Bot, File, Folder } from 'lucide-react'
 import type React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -25,15 +25,22 @@ export type ActivityDirectoryTriggerInfo = {
  symbol?: QuickPanelReservedSymbol
 }

+interface SubAgentInfo {
+  id: string
+  name: string
+  description?: string
+}
+
 interface Params {
  quickPanel: ToolQuickPanelApi
  quickPanelController: ToolQuickPanelController
  accessiblePaths: string[]
+  subAgents?: SubAgentInfo[]
  setText: React.Dispatch<React.SetStateAction<string>>
 }

 export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'manager' = 'button') => {
-  const { quickPanel, quickPanelController, accessiblePaths, setText } = params
+  const { quickPanel, quickPanelController, accessiblePaths, subAgents = [], setText } = params
  const { registerTrigger, registerRootMenu } = quickPanel
  const { open, close, updateList, isVisible, symbol } = quickPanelController
  const { t } = useTranslation()
@@ -238,6 +245,68 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
    [close, insertFilePath]
  )

+  /**
+   * Insert sub-agent name at @ position
+   */
+  const insertSubAgentName = useCallback(
+    (agentName: string, triggerInfo?: ActivityDirectoryTriggerInfo) => {
+      setText((currentText) => {
+        const symbol = triggerInfo?.symbol ?? QuickPanelReservedSymbol.MentionModels
+        const triggerIndex =
+          triggerInfo?.position !== undefined
+            ? triggerInfo.position
+            : symbol === QuickPanelReservedSymbol.Root
+              ? currentText.lastIndexOf('/')
+              : currentText.lastIndexOf('@')
+
+        if (triggerIndex !== -1) {
+          let endPos = triggerIndex + 1
+          while (endPos < currentText.length && !/\s/.test(currentText[endPos])) {
+            endPos++
+          }
+          return currentText.slice(0, triggerIndex) + agentName + ' ' + currentText.slice(endPos)
+        }
+
+        // If no trigger found, append at end
+        return currentText + ' ' + agentName + ' '
+      })
+    },
+    [setText]
+  )
+
+  /**
+   * Handle sub-agent selection
+   */
+  const onSelectSubAgent = useCallback(
+    (agentName: string) => {
+      const trigger = triggerInfoRef.current
+      insertSubAgentName(agentName, trigger)
+      close()
+    },
+    [close, insertSubAgentName]
+  )
+
+  /**
+   * Create sub-agent list items for QuickPanel
+   */
+  const createSubAgentItems = useCallback(
+    (agents: SubAgentInfo[]): QuickPanelListItem[] => {
+      if (agents.length === 0) {
+        return []
+      }
+
+      return agents.map((agent) => ({
+        label: agent.name,
+        description: agent.description || t('chat.input.activity_directory.sub_agent'),
+        icon: <Bot size={16} />,
+        filterText: `${agent.name} ${agent.description || ''} ${agent.id}`,
+        action: () => onSelectSubAgent(agent.name),
+        isSelected: false
+      }))
+    },
+    [onSelectSubAgent, t]
+  )
+
  /**
   * Create file list items for QuickPanel from a file list
   */
@@ -291,12 +360,18 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
  )

  /**
-   * Create file list items for QuickPanel (for current state)
+   * Create combined list items for QuickPanel (sub-agents + files)
   */
-  const fileItems = useMemo<QuickPanelListItem[]>(
-    () => createFileItems(fileList, isLoading),
-    [createFileItems, fileList, isLoading]
-  )
+  const combinedItems = useMemo<QuickPanelListItem[]>(() => {
+    const agentItems = createSubAgentItems(subAgents)
+    const files = createFileItems(fileList, isLoading)
+
+    // Combine: sub-agents first, then files
+    return [...agentItems, ...files]
+  }, [createSubAgentItems, subAgents, createFileItems, fileList, isLoading])
+
+  // Keep fileItems for backward compatibility
+  const fileItems = combinedItems

  /**
   * Handle search text change - load files and update list
@@ -311,11 +386,13 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana

      const hasChanged = updateFileListState(newFiles)
      if (hasChanged) {
-        const newItems = createFileItems(newFiles, false)
-        updateList(newItems)
+        // Combine sub-agents and files
+        const agentItems = createSubAgentItems(subAgents)
+        const fileItems = createFileItems(newFiles, false)
+        updateList([...agentItems, ...fileItems])
      }
    },
-    [loadFiles, createFileItems, updateList, updateFileListState]
+    [loadFiles, createFileItems, createSubAgentItems, subAgents, updateList, updateFileListState]
  )

  /**
@@ -336,8 +413,10 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
      const files = await loadFiles()
      updateFileListState(files)

-      // Create items from the loaded files immediately
-      const items = createFileItems(files, false)
+      // Create items from sub-agents and loaded files immediately
+      const agentItems = createSubAgentItems(subAgents)
+      const fileItems = createFileItems(files, false)
+      const items = [...agentItems, ...fileItems]

      open({
        title: t('chat.input.activity_directory.description'),
@@ -377,7 +456,18 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
        onSearchChange: handleSearchChange
      })
    },
-    [loadFiles, open, removeTriggerSymbolAndText, setText, t, handleSearchChange, createFileItems, updateFileListState]
+    [
+      loadFiles,
+      open,
+      removeTriggerSymbolAndText,
+      setText,
+      t,
+      handleSearchChange,
+      createFileItems,
+      createSubAgentItems,
+      subAgents,
+      updateFileListState
+    ]
  )

  /**
--- a/src/renderer/src/pages/home/Inputbar/types.ts
+++ b/src/renderer/src/pages/home/Inputbar/types.ts
@@ -68,6 +68,7 @@ export interface ToolContext {
    slashCommands?: Array<{ command: string; description?: string }>
    tools?: Array<{ id: string; name: string; type: string; description?: string }>
    accessiblePaths?: string[]
+    subAgents?: Array<{ id: string; name: string; description?: string }>
  }
 }

--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashOutputTool.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/BashOutputTool.tsx
@@ -1,7 +1,6 @@
 import type { CollapseProps } from 'antd'
 import { Tag } from 'antd'
 import { CheckCircle, Terminal, XCircle } from 'lucide-react'
-import { useMemo } from 'react'

 import { ToolTitle } from './GenericTools'
 import type { BashOutputToolInput, BashOutputToolOutput } from './types'
@@ -16,6 +15,63 @@ interface ParsedBashOutput {
  tool_use_error?: string
 }

+const parseBashOutput = (output?: BashOutputToolOutput): ParsedBashOutput | null => {
+  if (!output) return null
+
+  try {
+    const parser = new DOMParser()
+    const hasToolError = output.includes('<tool_use_error>')
+    const xmlStr = output.includes('<status>') || hasToolError ? `<root>${output}</root>` : output
+    const xmlDoc = parser.parseFromString(xmlStr, 'application/xml')
+    const parserError = xmlDoc.querySelector('parsererror')
+    if (parserError) return null
+
+    const getElementText = (tagName: string): string | undefined => {
+      const element = xmlDoc.getElementsByTagName(tagName)[0]
+      return element?.textContent?.trim()
+    }
+
+    return {
+      status: getElementText('status'),
+      exit_code: getElementText('exit_code') ? parseInt(getElementText('exit_code')!) : undefined,
+      stdout: getElementText('stdout'),
+      stderr: getElementText('stderr'),
+      timestamp: getElementText('timestamp'),
+      tool_use_error: getElementText('tool_use_error')
+    }
+  } catch {
+    return null
+  }
+}
+
+const getStatusConfig = (parsedOutput: ParsedBashOutput | null) => {
+  if (!parsedOutput) return null
+
+  if (parsedOutput.tool_use_error) {
+    return {
+      color: 'danger',
+      icon: <XCircle className="h-3.5 w-3.5" />,
+      text: 'Error'
+    } as const
+  }
+
+  const isCompleted = parsedOutput.status === 'completed'
+  const isSuccess = parsedOutput.exit_code === 0
+
+  return {
+    color: isCompleted && isSuccess ? 'success' : isCompleted && !isSuccess ? 'danger' : 'warning',
+    icon:
+      isCompleted && isSuccess ? (
+        <CheckCircle className="h-3.5 w-3.5" />
+      ) : isCompleted && !isSuccess ? (
+        <XCircle className="h-3.5 w-3.5" />
+      ) : (
+        <Terminal className="h-3.5 w-3.5" />
+      ),
+    text: isCompleted ? (isSuccess ? 'Success' : 'Failed') : 'Running'
+  } as const
+}
+
 export function BashOutputTool({
  input,
  output
@@ -23,73 +79,8 @@ export function BashOutputTool({
  input: BashOutputToolInput
  output?: BashOutputToolOutput
 }): NonNullable<CollapseProps['items']>[number] {
-  // 解析 XML 输出
-  const parsedOutput = useMemo(() => {
-    if (!output) return null
-
-    try {
-      const parser = new DOMParser()
-      // 检查是否包含 tool_use_error 标签
-      const hasToolError = output.includes('<tool_use_error>')
-      // 包装成有效的 XML（如果还没有根元素）
-      const xmlStr = output.includes('<status>') || hasToolError ? `<root>${output}</root>` : output
-      const xmlDoc = parser.parseFromString(xmlStr, 'application/xml')
-
-      // 检查是否有解析错误
-      const parserError = xmlDoc.querySelector('parsererror')
-      if (parserError) {
-        return null
-      }
-
-      const getElementText = (tagName: string): string | undefined => {
-        const element = xmlDoc.getElementsByTagName(tagName)[0]
-        return element?.textContent?.trim()
-      }
-
-      const result: ParsedBashOutput = {
-        status: getElementText('status'),
-        exit_code: getElementText('exit_code') ? parseInt(getElementText('exit_code')!) : undefined,
-        stdout: getElementText('stdout'),
-        stderr: getElementText('stderr'),
-        timestamp: getElementText('timestamp'),
-        tool_use_error: getElementText('tool_use_error')
-      }
-
-      return result
-    } catch {
-      return null
-    }
-  }, [output])
-
-  // 获取状态配置
-  const statusConfig = useMemo(() => {
-    if (!parsedOutput) return null
-
-    // 如果有 tool_use_error，直接显示错误状态
-    if (parsedOutput.tool_use_error) {
-      return {
-        color: 'danger',
-        icon: <XCircle className="h-3.5 w-3.5" />,
-        text: 'Error'
-      } as const
-    }
-
-    const isCompleted = parsedOutput.status === 'completed'
-    const isSuccess = parsedOutput.exit_code === 0
-
-    return {
-      color: isCompleted && isSuccess ? 'success' : isCompleted && !isSuccess ? 'danger' : 'warning',
-      icon:
-        isCompleted && isSuccess ? (
-          <CheckCircle className="h-3.5 w-3.5" />
-        ) : isCompleted && !isSuccess ? (
-          <XCircle className="h-3.5 w-3.5" />
-        ) : (
-          <Terminal className="h-3.5 w-3.5" />
-        ),
-      text: isCompleted ? (isSuccess ? 'Success' : 'Failed') : 'Running'
-    } as const
-  }, [parsedOutput])
+  const parsedOutput = parseBashOutput(output)
+  const statusConfig = getStatusConfig(parsedOutput)

  const children = parsedOutput ? (
    <div className="flex flex-col gap-4">
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/ReadTool.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/ReadTool.tsx
@@ -1,12 +1,47 @@
 import type { CollapseProps } from 'antd'
 import { FileText } from 'lucide-react'
-import { useMemo } from 'react'
 import ReactMarkdown from 'react-markdown'

 import { ToolTitle } from './GenericTools'
 import type { ReadToolInput as ReadToolInputType, ReadToolOutput as ReadToolOutputType, TextOutput } from './types'
 import { AgentToolsType } from './types'

+const removeSystemReminderTags = (text: string): string => {
+  return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, '')
+}
+
+const normalizeOutputString = (output?: ReadToolOutputType): string | null => {
+  if (!output) return null
+
+  const toText = (item: TextOutput) => removeSystemReminderTags(item.text)
+
+  if (Array.isArray(output)) {
+    return output
+      .filter((item): item is TextOutput => item.type === 'text')
+      .map(toText)
+      .join('')
+  }
+
+  return removeSystemReminderTags(output)
+}
+
+const getOutputStats = (outputString: string | null) => {
+  if (!outputString) return null
+
+  const bytes = new Blob([outputString]).size
+  const formatSize = (size: number) => {
+    if (size < 1024) return `${size} B`
+    if (size < 1024 * 1024) return `${(size / 1024).toFixed(1)} KB`
+    return `${(size / (1024 * 1024)).toFixed(1)} MB`
+  }
+
+  return {
+    lineCount: outputString.split('\n').length,
+    fileSize: bytes,
+    formatSize
+  }
+}
+
 export function ReadTool({
  input,
  output
@@ -14,50 +49,8 @@ export function ReadTool({
  input: ReadToolInputType
  output?: ReadToolOutputType
 }): NonNullable<CollapseProps['items']>[number] {
-  // 移除 system-reminder 标签及其内容的辅助函数
-  const removeSystemReminderTags = (text: string): string => {
-    // 使用正则表达式匹配 <system-reminder> 标签及其内容，包括换行符
-    return text.replace(/<system-reminder>[\s\S]*?<\/system-reminder>/gi, '')
-  }
-
-  // 将 output 统一转换为字符串
-  const outputString = useMemo(() => {
-    if (!output) return null
-
-    let processedOutput: string
-
-    // 如果是 TextOutput[] 类型，提取所有 text 内容
-    if (Array.isArray(output)) {
-      processedOutput = output
-        .filter((item): item is TextOutput => item.type === 'text')
-        .map((item) => removeSystemReminderTags(item.text))
-        .join('')
-    } else {
-      // 如果是字符串，直接使用
-      processedOutput = output
-    }
-
-    // 移除 system-reminder 标签及其内容
-    return removeSystemReminderTags(processedOutput)
-  }, [output])
-
-  // 如果有输出，计算统计信息
-  const stats = useMemo(() => {
-    if (!outputString) return null
-
-    const bytes = new Blob([outputString]).size
-    const formatSize = (bytes: number) => {
-      if (bytes < 1024) return `${bytes} B`
-      if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`
-      return `${(bytes / (1024 * 1024)).toFixed(1)} MB`
-    }
-
-    return {
-      lineCount: outputString.split('\n').length,
-      fileSize: bytes,
-      formatSize
-    }
-  }, [outputString])
+  const outputString = normalizeOutputString(output)
+  const stats = getOutputStats(outputString)

  return {
    key: AgentToolsType.Read,
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/UnknownToolRenderer.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/UnknownToolRenderer.tsx
@@ -11,11 +11,24 @@ interface UnknownToolProps {
  output?: unknown
 }

-export function UnknownToolRenderer({
-  toolName = '',
-  input,
-  output
-}: UnknownToolProps): NonNullable<CollapseProps['items']>[number] {
+const getToolDisplayName = (name: string) => {
+  if (name.startsWith('mcp__')) {
+    const parts = name.substring(5).split('__')
+    if (parts.length >= 2) {
+      return `${parts[0]}:${parts.slice(1).join(':')}`
+    }
+  }
+  return name
+}
+
+const getToolDescription = (toolName: string) => {
+  if (toolName.startsWith('mcp__')) {
+    return 'MCP Server Tool'
+  }
+  return 'Tool'
+}
+
+const UnknownToolContent = ({ input, output }: { input?: unknown; output?: unknown }) => {
  const { highlightCode } = useCodeStyle()
  const [inputHtml, setInputHtml] = useState<string>('')
  const [outputHtml, setOutputHtml] = useState<string>('')
@@ -34,58 +47,49 @@ export function UnknownToolRenderer({
    }
  }, [output, highlightCode])

-  const getToolDisplayName = (name: string) => {
-    if (name.startsWith('mcp__')) {
-      const parts = name.substring(5).split('__')
-      if (parts.length >= 2) {
-        return `${parts[0]}:${parts.slice(1).join(':')}`
-      }
-    }
-    return name
+  if (input === undefined && output === undefined) {
+    return <div className="text-foreground-500 text-xs">No data available for this tool</div>
  }

-  const getToolDescription = () => {
-    if (toolName.startsWith('mcp__')) {
-      return 'MCP Server Tool'
-    }
-    return 'Tool'
-  }
+  return (
+    <div className="space-y-3">
+      {input !== undefined && (
+        <div>
+          <div className="mb-1 font-semibold text-foreground-600 text-xs dark:text-foreground-400">Input:</div>
+          <div
+            className="overflow-x-auto rounded bg-gray-50 dark:bg-gray-900"
+            dangerouslySetInnerHTML={{ __html: inputHtml }}
+          />
+        </div>
+      )}

+      {output !== undefined && (
+        <div>
+          <div className="mb-1 font-semibold text-foreground-600 text-xs dark:text-foreground-400">Output:</div>
+          <div
+            className="rounded bg-gray-50 dark:bg-gray-900 [&>*]:whitespace-pre-line"
+            dangerouslySetInnerHTML={{ __html: outputHtml }}
+          />
+        </div>
+      )}
+    </div>
+  )
+}
+
+export function UnknownToolRenderer({
+  toolName = '',
+  input,
+  output
+}: UnknownToolProps): NonNullable<CollapseProps['items']>[number] {
  return {
    key: 'unknown-tool',
    label: (
      <ToolTitle
        icon={<Wrench className="h-4 w-4" />}
        label={getToolDisplayName(toolName)}
-        params={getToolDescription()}
+        params={getToolDescription(toolName)}
      />
    ),
-    children: (
-      <div className="space-y-3">
-        {input !== undefined && (
-          <div>
-            <div className="mb-1 font-semibold text-foreground-600 text-xs dark:text-foreground-400">Input:</div>
-            <div
-              className="overflow-x-auto rounded bg-gray-50 dark:bg-gray-900"
-              dangerouslySetInnerHTML={{ __html: inputHtml }}
-            />
-          </div>
-        )}
-
-        {output !== undefined && (
-          <div>
-            <div className="mb-1 font-semibold text-foreground-600 text-xs dark:text-foreground-400">Output:</div>
-            <div
-              className="rounded bg-gray-50 dark:bg-gray-900 [&>*]:whitespace-pre-line"
-              dangerouslySetInnerHTML={{ __html: outputHtml }}
-            />
-          </div>
-        )}
-
-        {input === undefined && output === undefined && (
-          <div className="text-foreground-500 text-xs">No data available for this tool</div>
-        )}
-      </div>
-    )
+    children: <UnknownToolContent input={input} output={output} />
  }
 }
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/index.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/index.tsx
@@ -6,8 +6,6 @@ import { Collapse } from 'antd'
 // 导出所有类型
 export * from './types'

-import { useMemo } from 'react'
-
 // 导入所有渲染器
 import ToolPermissionRequestCard from '../ToolPermissionRequestCard'
 import { BashOutputTool } from './BashOutputTool'
@@ -57,22 +55,19 @@ export function isValidAgentToolsType(toolName: unknown): toolName is AgentTools
  return typeof toolName === 'string' && Object.values(AgentToolsType).includes(toolName as AgentToolsType)
 }

-// 统一的渲染函数
-function renderToolContent(toolName: AgentToolsType, input: ToolInput, output?: ToolOutput) {
+// 统一的渲染组件
+function ToolContent({ toolName, input, output }: { toolName: AgentToolsType; input: ToolInput; output?: ToolOutput }) {
  const Renderer = toolRenderers[toolName]
+  const renderedItem = Renderer
+    ? Renderer({ input: input as any, output: output as any })
+    : UnknownToolRenderer({ input: input as any, output: output as any, toolName })

-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const toolContentItem = useMemo(() => {
-    const rendered = Renderer
-      ? Renderer({ input: input as any, output: output as any })
-      : UnknownToolRenderer({ input: input as any, output: output as any, toolName })
-    return {
-      ...rendered,
-      classNames: {
-        body: 'bg-foreground-50 p-2 text-foreground-900 dark:bg-foreground-100 max-h-96 p-2 overflow-scroll'
-      } as NonNullable<CollapseProps['items']>[number]['classNames']
-    } as NonNullable<CollapseProps['items']>[number]
-  }, [Renderer, input, output, toolName])
+  const toolContentItem: NonNullable<CollapseProps['items']>[number] = {
+    ...renderedItem,
+    classNames: {
+      body: 'bg-foreground-50 p-2 text-foreground-900 dark:bg-foreground-100 max-h-96 p-2 overflow-scroll'
+    }
+  }

  return (
    <Collapse
@@ -98,5 +93,7 @@ export function MessageAgentTools({ toolResponse }: { toolResponse: NormalToolRe
    return <ToolPermissionRequestCard toolResponse={toolResponse} />
  }

-  return renderToolContent(tool.name as AgentToolsType, args as ToolInput, response as ToolOutput)
+  return (
+    <ToolContent toolName={tool.name as AgentToolsType} input={args as ToolInput} output={response as ToolOutput} />
+  )
 }
--- a/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/SessionItem.tsx
@@ -42,7 +42,7 @@ const SessionItem: FC<SessionItemProps> = ({ session, agentId, onDelete, onPress
  const targetSession = useDeferredValue(_targetSession)
  const dispatch = useAppDispatch()

-  const { isEditing, isSaving, startEdit, inputProps } = useInPlaceEdit({
+  const { isEditing, isSaving, editValue, inputRef, startEdit, handleKeyDown, handleValueChange } = useInPlaceEdit({
    onSave: async (value) => {
      if (value !== session.name) {
        await updateSession({ id: session.id, name: value })
@@ -179,7 +179,14 @@ const SessionItem: FC<SessionItemProps> = ({ session, agentId, onDelete, onPress
        {isFulfilled && !isActive && <FulfilledIndicator />}
        <SessionNameContainer>
          {isEditing ? (
-            <SessionEditInput {...inputProps} style={{ opacity: isSaving ? 0.5 : 1 }} />
+            <SessionEditInput
+              ref={inputRef}
+              value={editValue}
+              onChange={(e: React.ChangeEvent<HTMLInputElement>) => handleValueChange(e.target.value)}
+              onKeyDown={handleKeyDown}
+              onClick={(e: React.MouseEvent) => e.stopPropagation()}
+              style={{ opacity: isSaving ? 0.5 : 1 }}
+            />
          ) : (
            <>
              <SessionName>
--- a/src/renderer/src/pages/home/Tabs/components/Topics.tsx
+++ b/src/renderer/src/pages/home/Tabs/components/Topics.tsx
@@ -79,7 +79,7 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
  const deleteTimerRef = useRef<NodeJS.Timeout>(null)
  const [editingTopicId, setEditingTopicId] = useState<string | null>(null)

-  const { startEdit, isEditing, inputProps } = useInPlaceEdit({
+  const topicEdit = useInPlaceEdit({
    onSave: (name: string) => {
      const topic = assistant.topics.find((t) => t.id === editingTopicId)
      if (topic && name !== topic.name) {
@@ -520,23 +520,29 @@ export const Topics: React.FC<Props> = ({ assistant: _assistant, activeTopic, se
            <TopicListItem
              onContextMenu={() => setTargetTopic(topic)}
              className={classNames(isActive ? 'active' : '', singlealone ? 'singlealone' : '')}
-              onClick={editingTopicId === topic.id && isEditing ? undefined : () => onSwitchTopic(topic)}
+              onClick={editingTopicId === topic.id && topicEdit.isEditing ? undefined : () => onSwitchTopic(topic)}
              style={{
                borderRadius,
-                cursor: editingTopicId === topic.id && isEditing ? 'default' : 'pointer'
+                cursor: editingTopicId === topic.id && topicEdit.isEditing ? 'default' : 'pointer'
              }}>
              {isPending(topic.id) && !isActive && <PendingIndicator />}
              {isFulfilled(topic.id) && !isActive && <FulfilledIndicator />}
              <TopicNameContainer>
-                {editingTopicId === topic.id && isEditing ? (
-                  <TopicEditInput {...inputProps} onClick={(e) => e.stopPropagation()} />
+                {editingTopicId === topic.id && topicEdit.isEditing ? (
+                  <TopicEditInput
+                    ref={topicEdit.inputRef}
+                    value={topicEdit.editValue}
+                    onChange={topicEdit.handleInputChange}
+                    onKeyDown={topicEdit.handleKeyDown}
+                    onClick={(e) => e.stopPropagation()}
+                  />
                ) : (
                  <TopicName
                    className={getTopicNameClassName()}
                    title={topicName}
                    onDoubleClick={() => {
                      setEditingTopicId(topic.id)
-                      startEdit(topic.name)
+                      topicEdit.startEdit(topic.name)
                    }}>
                    {topicName}
                  </TopicName>
--- a/src/renderer/src/pages/notes/NotesPage.tsx
+++ b/src/renderer/src/pages/notes/NotesPage.tsx
@@ -295,16 +295,6 @@ const NotesPage: FC = () => {
              break
            }

-            case 'refresh': {
-              // 批量操作完成后的单次刷新
-              logger.debug('Received refresh event, triggering tree refresh')
-              const refresh = refreshTreeRef.current
-              if (refresh) {
-                await refresh()
-              }
-              break
-            }
-
            case 'add':
            case 'addDir':
            case 'unlink':
@@ -631,27 +621,7 @@ const NotesPage: FC = () => {
          throw new Error('No folder path selected')
        }

-        // Validate uploadNotes function is available
-        if (typeof uploadNotes !== 'function') {
-          logger.error('uploadNotes function is not available', { uploadNotes })
-          window.toast.error(t('notes.upload_failed'))
-          return
-        }
-
-        let result: Awaited<ReturnType<typeof uploadNotes>>
-        try {
-          result = await uploadNotes(files, targetFolderPath)
-        } catch (uploadError) {
-          logger.error('Upload operation failed:', uploadError as Error)
-          throw uploadError
-        }
-
-        // Validate result object
-        if (!result || typeof result !== 'object') {
-          logger.error('Invalid upload result:', { result })
-          window.toast.error(t('notes.upload_failed'))
-          return
-        }
+        const result = await uploadNotes(files, targetFolderPath)

        // 检查上传结果
        if (result.fileCount === 0) {
--- a/src/renderer/src/pages/notes/NotesSidebar.tsx
+++ b/src/renderer/src/pages/notes/NotesSidebar.tsx
--- a/src/renderer/src/pages/notes/components/TreeNode.tsx
+++ b/src/renderer/src/pages/notes/components/TreeNode.tsx
@@ -1,498 +0,0 @@
-import HighlightText from '@renderer/components/HighlightText'
-import {
-  useNotesActions,
-  useNotesDrag,
-  useNotesEditing,
-  useNotesSearch,
-  useNotesSelection,
-  useNotesUI
-} from '@renderer/pages/notes/context/NotesContexts'
-import { EVENT_NAMES, EventEmitter } from '@renderer/services/EventService'
-import type { SearchMatch, SearchResult } from '@renderer/services/NotesSearchService'
-import type { NotesTreeNode } from '@renderer/types/note'
-import { Dropdown } from 'antd'
-import { ChevronDown, ChevronRight, File, FilePlus, Folder, FolderOpen } from 'lucide-react'
-import { memo, useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import styled from 'styled-components'
-
-interface TreeNodeProps {
-  node: NotesTreeNode | SearchResult
-  depth: number
-  renderChildren?: boolean
-  onHintClick?: () => void
-}
-
-const TreeNode = memo<TreeNodeProps>(({ node, depth, renderChildren = true, onHintClick }) => {
-  const { t } = useTranslation()
-
-  // Use split contexts - only subscribe to what this node needs
-  const { selectedFolderId, activeNodeId } = useNotesSelection()
-  const { editingNodeId, renamingNodeIds, newlyRenamedNodeIds, inPlaceEdit } = useNotesEditing()
-  const { draggedNodeId, dragOverNodeId, dragPosition, onDragStart, onDragOver, onDragLeave, onDrop, onDragEnd } =
-    useNotesDrag()
-  const { searchKeyword, showMatches } = useNotesSearch()
-  const { openDropdownKey } = useNotesUI()
-  const { getMenuItems, onSelectNode, onToggleExpanded, onDropdownOpenChange } = useNotesActions()
-
-  const [showAllMatches, setShowAllMatches] = useState(false)
-  const { isEditing: isInputEditing, inputProps } = inPlaceEdit
-
-  // 检查是否是 hint 节点
-  const isHintNode = node.type === 'hint'
-
-  // 检查是否是搜索结果
-  const searchResult = 'matchType' in node ? (node as SearchResult) : null
-  const hasMatches = searchResult && searchResult.matches && searchResult.matches.length > 0
-
-  // 处理匹配项点击
-  const handleMatchClick = useCallback(
-    (match: SearchMatch) => {
-      // 发送定位事件
-      EventEmitter.emit(EVENT_NAMES.LOCATE_NOTE_LINE, {
-        noteId: node.id,
-        lineNumber: match.lineNumber,
-        lineContent: match.lineContent
-      })
-    },
-    [node]
-  )
-
-  const isActive = selectedFolderId ? node.type === 'folder' && node.id === selectedFolderId : node.id === activeNodeId
-  const isEditing = editingNodeId === node.id && isInputEditing
-  const isRenaming = renamingNodeIds.has(node.id)
-  const isNewlyRenamed = newlyRenamedNodeIds.has(node.id)
-  const hasChildren = node.children && node.children.length > 0
-  const isDragging = draggedNodeId === node.id
-  const isDragOver = dragOverNodeId === node.id
-  const isDragBefore = isDragOver && dragPosition === 'before'
-  const isDragInside = isDragOver && dragPosition === 'inside'
-  const isDragAfter = isDragOver && dragPosition === 'after'
-
-  const getNodeNameClassName = () => {
-    if (isRenaming) return 'shimmer'
-    if (isNewlyRenamed) return 'typing'
-    return ''
-  }
-
-  const displayName = useMemo(() => {
-    if (!searchKeyword) {
-      return node.name
-    }
-
-    const name = node.name ?? ''
-    if (!name) {
-      return name
-    }
-
-    const keyword = searchKeyword
-    const nameLower = name.toLowerCase()
-    const keywordLower = keyword.toLowerCase()
-    const matchStart = nameLower.indexOf(keywordLower)
-
-    if (matchStart === -1) {
-      return name
-    }
-
-    const matchEnd = matchStart + keyword.length
-    const beforeMatch = Math.min(2, matchStart)
-    const contextStart = matchStart - beforeMatch
-    const contextLength = 50
-    const contextEnd = Math.min(name.length, matchEnd + contextLength)
-
-    const prefix = contextStart > 0 ? '...' : ''
-    const suffix = contextEnd < name.length ? '...' : ''
-
-    return prefix + name.substring(contextStart, contextEnd) + suffix
-  }, [node.name, searchKeyword])
-
-  // Special render for hint nodes
-  if (isHintNode) {
-    return (
-      <div key={node.id}>
-        <TreeNodeContainer active={false} depth={depth}>
-          <TreeNodeContent>
-            <NodeIcon>
-              <FilePlus size={16} />
-            </NodeIcon>
-            <DropHintText onClick={onHintClick}>{t('notes.drop_markdown_hint')}</DropHintText>
-          </TreeNodeContent>
-        </TreeNodeContainer>
-      </div>
-    )
-  }
-
-  return (
-    <div key={node.id}>
-      <Dropdown
-        menu={{ items: getMenuItems(node as NotesTreeNode) }}
-        trigger={['contextMenu']}
-        open={openDropdownKey === node.id}
-        onOpenChange={(open) => onDropdownOpenChange(open ? node.id : null)}>
-        <div onContextMenu={(e) => e.stopPropagation()}>
-          <TreeNodeContainer
-            active={isActive}
-            depth={depth}
-            isDragging={isDragging}
-            isDragOver={isDragOver}
-            isDragBefore={isDragBefore}
-            isDragInside={isDragInside}
-            isDragAfter={isDragAfter}
-            draggable={!isEditing}
-            data-node-id={node.id}
-            onDragStart={(e) => onDragStart(e, node as NotesTreeNode)}
-            onDragOver={(e) => onDragOver(e, node as NotesTreeNode)}
-            onDragLeave={onDragLeave}
-            onDrop={(e) => onDrop(e, node as NotesTreeNode)}
-            onDragEnd={onDragEnd}>
-            <TreeNodeContent onClick={() => onSelectNode(node as NotesTreeNode)}>
-              <NodeIndent depth={depth} />
-
-              {node.type === 'folder' && (
-                <ExpandIcon
-                  onClick={(e) => {
-                    e.stopPropagation()
-                    onToggleExpanded(node.id)
-                  }}
-                  title={node.expanded ? t('notes.collapse') : t('notes.expand')}>
-                  {node.expanded ? <ChevronDown size={14} /> : <ChevronRight size={14} />}
-                </ExpandIcon>
-              )}
-
-              <NodeIcon>
-                {node.type === 'folder' ? (
-                  node.expanded ? (
-                    <FolderOpen size={16} />
-                  ) : (
-                    <Folder size={16} />
-                  )
-                ) : (
-                  <File size={16} />
-                )}
-              </NodeIcon>
-
-              {isEditing ? (
-                <EditInput {...inputProps} onClick={(e) => e.stopPropagation()} autoFocus />
-              ) : (
-                <NodeNameContainer>
-                  <NodeName className={getNodeNameClassName()}>
-                    {searchKeyword ? <HighlightText text={displayName} keyword={searchKeyword} /> : node.name}
-                  </NodeName>
-                  {searchResult && searchResult.matchType && searchResult.matchType !== 'filename' && (
-                    <MatchBadge matchType={searchResult.matchType}>
-                      {searchResult.matchType === 'both' ? t('notes.search.both') : t('notes.search.content')}
-                    </MatchBadge>
-                  )}
-                </NodeNameContainer>
-              )}
-            </TreeNodeContent>
-          </TreeNodeContainer>
-        </div>
-      </Dropdown>
-
-      {showMatches && hasMatches && (
-        <SearchMatchesContainer depth={depth}>
-          {(showAllMatches ? searchResult!.matches! : searchResult!.matches!.slice(0, 3)).map((match, idx) => (
-            <MatchItem key={idx} onClick={() => handleMatchClick(match)}>
-              <MatchLineNumber>{match.lineNumber}</MatchLineNumber>
-              <MatchContext>
-                <HighlightText text={match.context} keyword={searchKeyword} />
-              </MatchContext>
-            </MatchItem>
-          ))}
-          {searchResult!.matches!.length > 3 && (
-            <MoreMatches
-              depth={depth}
-              onClick={(e) => {
-                e.stopPropagation()
-                setShowAllMatches(!showAllMatches)
-              }}>
-              {showAllMatches ? (
-                <>
-                  <ChevronDown size={12} style={{ marginRight: 4 }} />
-                  {t('notes.search.show_less')}
-                </>
-              ) : (
-                <>
-                  <ChevronRight size={12} style={{ marginRight: 4 }} />+{searchResult!.matches!.length - 3}{' '}
-                  {t('notes.search.more_matches')}
-                </>
-              )}
-            </MoreMatches>
-          )}
-        </SearchMatchesContainer>
-      )}
-
-      {renderChildren && node.type === 'folder' && node.expanded && hasChildren && (
-        <div>
-          {node.children!.map((child) => (
-            <TreeNode key={child.id} node={child} depth={depth + 1} renderChildren={renderChildren} />
-          ))}
-        </div>
-      )}
-    </div>
-  )
-})
-
-export const TreeNodeContainer = styled.div<{
-  active: boolean
-  depth: number
-  isDragging?: boolean
-  isDragOver?: boolean
-  isDragBefore?: boolean
-  isDragInside?: boolean
-  isDragAfter?: boolean
-}>`
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 4px 6px;
-  border-radius: 4px;
-  cursor: pointer;
-  margin-bottom: 2px;
-  /* CRITICAL: Must have fully opaque background for sticky to work properly */
-  /* Transparent/semi-transparent backgrounds will show content bleeding through when sticky */
-  background-color: ${(props) => {
-    if (props.isDragInside) return 'var(--color-primary-background)'
-    // Use hover color for active state - it's guaranteed to be opaque
-    if (props.active) return 'var(--color-hover, var(--color-background-mute))'
-    return 'var(--color-background)'
-  }};
-  border: 0.5px solid
-    ${(props) => {
-      if (props.isDragInside) return 'var(--color-primary)'
-      if (props.active) return 'var(--color-border)'
-      return 'transparent'
-    }};
-  opacity: ${(props) => (props.isDragging ? 0.5 : 1)};
-  transition: all 0.2s ease;
-  position: relative;
-
-  &:hover {
-    background-color: var(--color-background-soft);
-
-    .node-actions {
-      opacity: 1;
-    }
-  }
-
-  /* 添加拖拽指示线 */
-  ${(props) =>
-    props.isDragBefore &&
-    `
-    &::before {
-      content: '';
-      position: absolute;
-      top: -2px;
-      left: 0;
-      right: 0;
-      height: 2px;
-      background-color: var(--color-primary);
-      border-radius: 1px;
-    }
-  `}
-
-  ${(props) =>
-    props.isDragAfter &&
-    `
-    &::after {
-      content: '';
-      position: absolute;
-      bottom: -2px;
-      left: 0;
-      right: 0;
-      height: 2px;
-      background-color: var(--color-primary);
-      border-radius: 1px;
-    }
-  `}
-`
-
-export const TreeNodeContent = styled.div`
-  display: flex;
-  align-items: center;
-  flex: 1;
-  min-width: 0;
-`
-
-export const NodeIndent = styled.div<{ depth: number }>`
-  width: ${(props) => props.depth * 16}px;
-  flex-shrink: 0;
-`
-
-export const ExpandIcon = styled.div`
-  width: 16px;
-  height: 16px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  color: var(--color-text-2);
-  margin-right: 4px;
-
-  &:hover {
-    color: var(--color-text);
-  }
-`
-
-export const NodeIcon = styled.div`
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-right: 8px;
-  color: var(--color-text-2);
-  flex-shrink: 0;
-`
-
-export const NodeName = styled.div`
-  flex: 1;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 13px;
-  color: var(--color-text);
-  position: relative;
-  will-change: background-position, width;
-
-  --color-shimmer-mid: var(--color-text-1);
-  --color-shimmer-end: color-mix(in srgb, var(--color-text-1) 25%, transparent);
-
-  &.shimmer {
-    background: linear-gradient(to left, var(--color-shimmer-end), var(--color-shimmer-mid), var(--color-shimmer-end));
-    background-size: 200% 100%;
-    background-clip: text;
-    color: transparent;
-    animation: shimmer 3s linear infinite;
-  }
-
-  &.typing {
-    display: block;
-    white-space: nowrap;
-    overflow: hidden;
-    animation: typewriter 0.5s steps(40, end);
-  }
-
-  @keyframes shimmer {
-    0% {
-      background-position: 200% 0;
-    }
-    100% {
-      background-position: -200% 0;
-    }
-  }
-
-  @keyframes typewriter {
-    from {
-      width: 0;
-    }
-    to {
-      width: 100%;
-    }
-  }
-`
-
-export const SearchMatchesContainer = styled.div<{ depth: number }>`
-  margin-left: ${(props) => props.depth * 16 + 40}px;
-  margin-top: 4px;
-  margin-bottom: 8px;
-  padding: 6px 8px;
-  background-color: var(--color-background-mute);
-  border-radius: 4px;
-  border-left: 2px solid var(--color-primary-soft);
-`
-
-export const NodeNameContainer = styled.div`
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  flex: 1;
-  min-width: 0;
-`
-
-export const MatchBadge = styled.span<{ matchType: string }>`
-  display: inline-flex;
-  align-items: center;
-  padding: 0 4px;
-  height: 16px;
-  font-size: 10px;
-  line-height: 1;
-  border-radius: 2px;
-  background-color: ${(props) =>
-    props.matchType === 'both' ? 'var(--color-primary-soft)' : 'var(--color-background-mute)'};
-  color: ${(props) => (props.matchType === 'both' ? 'var(--color-primary)' : 'var(--color-text-3)')};
-  font-weight: 500;
-  flex-shrink: 0;
-`
-
-export const MatchItem = styled.div`
-  display: flex;
-  gap: 8px;
-  margin-bottom: 4px;
-  font-size: 12px;
-  padding: 4px 6px;
-  margin-left: -6px;
-  margin-right: -6px;
-  border-radius: 3px;
-  cursor: pointer;
-  transition: all 0.15s ease;
-
-  &:hover {
-    background-color: var(--color-background-soft);
-    transform: translateX(2px);
-  }
-
-  &:active {
-    background-color: var(--color-active);
-  }
-
-  &:last-child {
-    margin-bottom: 0;
-  }
-`
-
-export const MatchLineNumber = styled.span`
-  color: var(--color-text-3);
-  font-family: monospace;
-  flex-shrink: 0;
-  width: 30px;
-`
-
-export const MatchContext = styled.div`
-  color: var(--color-text-2);
-  flex: 1;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  font-family: monospace;
-`
-
-export const MoreMatches = styled.div<{ depth: number }>`
-  margin-top: 4px;
-  padding: 4px 6px;
-  margin-left: -6px;
-  margin-right: -6px;
-  font-size: 11px;
-  color: var(--color-text-3);
-  border-radius: 3px;
-  cursor: pointer;
-  display: flex;
-  align-items: center;
-  transition: all 0.15s ease;
-
-  &:hover {
-    color: var(--color-text-2);
-    background-color: var(--color-background-soft);
-  }
-`
-
-const EditInput = styled.input`
-  flex: 1;
-  font-size: 13px;
-`
-
-const DropHintText = styled.div`
-  color: var(--color-text-3);
-  font-size: 12px;
-  font-style: italic;
-`
-
-export default TreeNode
--- a/src/renderer/src/pages/notes/context/NotesContexts.tsx
+++ b/src/renderer/src/pages/notes/context/NotesContexts.tsx
@@ -1,109 +0,0 @@
-import type { UseInPlaceEditReturn } from '@renderer/hooks/useInPlaceEdit'
-import type { NotesTreeNode } from '@renderer/types/note'
-import type { MenuProps } from 'antd'
-import { createContext, use } from 'react'
-
-// ==================== 1. Actions Context (Static, rarely changes) ====================
-export interface NotesActionsContextType {
-  getMenuItems: (node: NotesTreeNode) => MenuProps['items']
-  onSelectNode: (node: NotesTreeNode) => void
-  onToggleExpanded: (nodeId: string) => void
-  onDropdownOpenChange: (key: string | null) => void
-}
-
-export const NotesActionsContext = createContext<NotesActionsContextType | null>(null)
-
-export const useNotesActions = () => {
-  const context = use(NotesActionsContext)
-  if (!context) {
-    throw new Error('useNotesActions must be used within NotesActionsContext.Provider')
-  }
-  return context
-}
-
-// ==================== 2. Selection Context (Low frequency updates) ====================
-export interface NotesSelectionContextType {
-  selectedFolderId?: string | null
-  activeNodeId?: string
-}
-
-export const NotesSelectionContext = createContext<NotesSelectionContextType | null>(null)
-
-export const useNotesSelection = () => {
-  const context = use(NotesSelectionContext)
-  if (!context) {
-    throw new Error('useNotesSelection must be used within NotesSelectionContext.Provider')
-  }
-  return context
-}
-
-// ==================== 3. Editing Context (Medium frequency updates) ====================
-export interface NotesEditingContextType {
-  editingNodeId: string | null
-  renamingNodeIds: Set<string>
-  newlyRenamedNodeIds: Set<string>
-  inPlaceEdit: UseInPlaceEditReturn
-}
-
-export const NotesEditingContext = createContext<NotesEditingContextType | null>(null)
-
-export const useNotesEditing = () => {
-  const context = use(NotesEditingContext)
-  if (!context) {
-    throw new Error('useNotesEditing must be used within NotesEditingContext.Provider')
-  }
-  return context
-}
-
-// ==================== 4. Drag Context (High frequency updates) ====================
-export interface NotesDragContextType {
-  draggedNodeId: string | null
-  dragOverNodeId: string | null
-  dragPosition: 'before' | 'inside' | 'after'
-  onDragStart: (e: React.DragEvent, node: NotesTreeNode) => void
-  onDragOver: (e: React.DragEvent, node: NotesTreeNode) => void
-  onDragLeave: () => void
-  onDrop: (e: React.DragEvent, node: NotesTreeNode) => void
-  onDragEnd: () => void
-}
-
-export const NotesDragContext = createContext<NotesDragContextType | null>(null)
-
-export const useNotesDrag = () => {
-  const context = use(NotesDragContext)
-  if (!context) {
-    throw new Error('useNotesDrag must be used within NotesDragContext.Provider')
-  }
-  return context
-}
-
-// ==================== 5. Search Context (Medium frequency updates) ====================
-export interface NotesSearchContextType {
-  searchKeyword: string
-  showMatches: boolean
-}
-
-export const NotesSearchContext = createContext<NotesSearchContextType | null>(null)
-
-export const useNotesSearch = () => {
-  const context = use(NotesSearchContext)
-  if (!context) {
-    throw new Error('useNotesSearch must be used within NotesSearchContext.Provider')
-  }
-  return context
-}
-
-// ==================== 6. UI Context (Medium frequency updates) ====================
-export interface NotesUIContextType {
-  openDropdownKey: string | null
-}
-
-export const NotesUIContext = createContext<NotesUIContextType | null>(null)
-
-export const useNotesUI = () => {
-  const context = use(NotesUIContext)
-  if (!context) {
-    throw new Error('useNotesUI must be used within NotesUIContext.Provider')
-  }
-  return context
-}
--- a/src/renderer/src/pages/notes/hooks/useNotesDragAndDrop.ts
+++ b/src/renderer/src/pages/notes/hooks/useNotesDragAndDrop.ts
@@ -1,101 +0,0 @@
-import type { NotesTreeNode } from '@renderer/types/note'
-import { useCallback, useRef, useState } from 'react'
-
-interface UseNotesDragAndDropProps {
-  onMoveNode: (sourceNodeId: string, targetNodeId: string, position: 'before' | 'after' | 'inside') => void
-}
-
-export const useNotesDragAndDrop = ({ onMoveNode }: UseNotesDragAndDropProps) => {
-  const [draggedNodeId, setDraggedNodeId] = useState<string | null>(null)
-  const [dragOverNodeId, setDragOverNodeId] = useState<string | null>(null)
-  const [dragPosition, setDragPosition] = useState<'before' | 'inside' | 'after'>('inside')
-  const dragNodeRef = useRef<HTMLDivElement | null>(null)
-
-  const handleDragStart = useCallback((e: React.DragEvent, node: NotesTreeNode) => {
-    setDraggedNodeId(node.id)
-    e.dataTransfer.effectAllowed = 'move'
-    e.dataTransfer.setData('text/plain', node.id)
-
-    dragNodeRef.current = e.currentTarget as HTMLDivElement
-
-    // Create ghost element
-    if (e.currentTarget.parentElement) {
-      const rect = e.currentTarget.getBoundingClientRect()
-      const ghostElement = e.currentTarget.cloneNode(true) as HTMLElement
-      ghostElement.style.width = `${rect.width}px`
-      ghostElement.style.opacity = '0.7'
-      ghostElement.style.position = 'absolute'
-      ghostElement.style.top = '-1000px'
-      document.body.appendChild(ghostElement)
-      e.dataTransfer.setDragImage(ghostElement, 10, 10)
-      setTimeout(() => {
-        document.body.removeChild(ghostElement)
-      }, 0)
-    }
-  }, [])
-
-  const handleDragOver = useCallback(
-    (e: React.DragEvent, node: NotesTreeNode) => {
-      e.preventDefault()
-      e.dataTransfer.dropEffect = 'move'
-
-      if (draggedNodeId === node.id) {
-        return
-      }
-
-      setDragOverNodeId(node.id)
-
-      const rect = (e.currentTarget as HTMLElement).getBoundingClientRect()
-      const mouseY = e.clientY
-      const thresholdTop = rect.top + rect.height * 0.3
-      const thresholdBottom = rect.bottom - rect.height * 0.3
-
-      if (mouseY < thresholdTop) {
-        setDragPosition('before')
-      } else if (mouseY > thresholdBottom) {
-        setDragPosition('after')
-      } else {
-        setDragPosition(node.type === 'folder' ? 'inside' : 'after')
-      }
-    },
-    [draggedNodeId]
-  )
-
-  const handleDragLeave = useCallback(() => {
-    setDragOverNodeId(null)
-    setDragPosition('inside')
-  }, [])
-
-  const handleDrop = useCallback(
-    (e: React.DragEvent, targetNode: NotesTreeNode) => {
-      e.preventDefault()
-      const draggedId = e.dataTransfer.getData('text/plain')
-
-      if (draggedId && draggedId !== targetNode.id) {
-        onMoveNode(draggedId, targetNode.id, dragPosition)
-      }
-
-      setDraggedNodeId(null)
-      setDragOverNodeId(null)
-      setDragPosition('inside')
-    },
-    [onMoveNode, dragPosition]
-  )
-
-  const handleDragEnd = useCallback(() => {
-    setDraggedNodeId(null)
-    setDragOverNodeId(null)
-    setDragPosition('inside')
-  }, [])
-
-  return {
-    draggedNodeId,
-    dragOverNodeId,
-    dragPosition,
-    handleDragStart,
-    handleDragOver,
-    handleDragLeave,
-    handleDrop,
-    handleDragEnd
-  }
-}
--- a/src/renderer/src/pages/notes/hooks/useNotesEditing.ts
+++ b/src/renderer/src/pages/notes/hooks/useNotesEditing.ts
@@ -1,94 +0,0 @@
-import { loggerService } from '@logger'
-import { useInPlaceEdit } from '@renderer/hooks/useInPlaceEdit'
-import { fetchNoteSummary } from '@renderer/services/ApiService'
-import type { NotesTreeNode } from '@renderer/types/note'
-import { useCallback, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-
-const logger = loggerService.withContext('UseNotesEditing')
-
-interface UseNotesEditingProps {
-  onRenameNode: (nodeId: string, newName: string) => void
-}
-
-export const useNotesEditing = ({ onRenameNode }: UseNotesEditingProps) => {
-  const { t } = useTranslation()
-  const [editingNodeId, setEditingNodeId] = useState<string | null>(null)
-  const [renamingNodeIds, setRenamingNodeIds] = useState<Set<string>>(new Set())
-  const [newlyRenamedNodeIds, setNewlyRenamedNodeIds] = useState<Set<string>>(new Set())
-
-  const inPlaceEdit = useInPlaceEdit({
-    onSave: (newName: string) => {
-      if (editingNodeId && newName) {
-        onRenameNode(editingNodeId, newName)
-        window.toast.success(t('common.saved'))
-        logger.debug(`Renamed node ${editingNodeId} to "${newName}"`)
-      }
-      setEditingNodeId(null)
-    },
-    onCancel: () => {
-      setEditingNodeId(null)
-    }
-  })
-
-  const handleStartEdit = useCallback(
-    (node: NotesTreeNode) => {
-      setEditingNodeId(node.id)
-      inPlaceEdit.startEdit(node.name)
-    },
-    [inPlaceEdit]
-  )
-
-  const handleAutoRename = useCallback(
-    async (note: NotesTreeNode) => {
-      if (note.type !== 'file') return
-
-      setRenamingNodeIds((prev) => new Set(prev).add(note.id))
-      try {
-        const content = await window.api.file.readExternal(note.externalPath)
-        if (!content || content.trim().length === 0) {
-          window.toast.warning(t('notes.auto_rename.empty_note'))
-          return
-        }
-
-        const summaryText = await fetchNoteSummary({ content })
-        if (summaryText) {
-          onRenameNode(note.id, summaryText)
-          window.toast.success(t('notes.auto_rename.success'))
-        } else {
-          window.toast.error(t('notes.auto_rename.failed'))
-        }
-      } catch (error) {
-        window.toast.error(t('notes.auto_rename.failed'))
-        logger.error(`Failed to auto-rename note: ${error}`)
-      } finally {
-        setRenamingNodeIds((prev) => {
-          const next = new Set(prev)
-          next.delete(note.id)
-          return next
-        })
-
-        setNewlyRenamedNodeIds((prev) => new Set(prev).add(note.id))
-
-        setTimeout(() => {
-          setNewlyRenamedNodeIds((prev) => {
-            const next = new Set(prev)
-            next.delete(note.id)
-            return next
-          })
-        }, 700)
-      }
-    },
-    [onRenameNode, t]
-  )
-
-  return {
-    editingNodeId,
-    renamingNodeIds,
-    newlyRenamedNodeIds,
-    inPlaceEdit,
-    handleStartEdit,
-    handleAutoRename,
-    setEditingNodeId
-  }
-}
--- a/src/renderer/src/pages/notes/hooks/useNotesFileUpload.ts
+++ b/src/renderer/src/pages/notes/hooks/useNotesFileUpload.ts
@@ -1,112 +0,0 @@
-import { useCallback } from 'react'
-
-interface UseNotesFileUploadProps {
-  onUploadFiles: (files: File[]) => void
-  setIsDragOverSidebar: (isDragOver: boolean) => void
-}
-
-export const useNotesFileUpload = ({ onUploadFiles, setIsDragOverSidebar }: UseNotesFileUploadProps) => {
-  const handleDropFiles = useCallback(
-    async (e: React.DragEvent) => {
-      e.preventDefault()
-      setIsDragOverSidebar(false)
-
-      // 处理文件夹拖拽：从 dataTransfer.items 获取完整文件路径信息
-      const items = Array.from(e.dataTransfer.items)
-      const files: File[] = []
-
-      const processEntry = async (entry: FileSystemEntry, path: string = '') => {
-        if (entry.isFile) {
-          const fileEntry = entry as FileSystemFileEntry
-          return new Promise<void>((resolve) => {
-            fileEntry.file((file) => {
-              // 手动设置 webkitRelativePath 以保持文件夹结构
-              Object.defineProperty(file, 'webkitRelativePath', {
-                value: path + file.name,
-                writable: false
-              })
-              files.push(file)
-              resolve()
-            })
-          })
-        } else if (entry.isDirectory) {
-          const dirEntry = entry as FileSystemDirectoryEntry
-          const reader = dirEntry.createReader()
-          return new Promise<void>((resolve) => {
-            reader.readEntries(async (entries) => {
-              const promises = entries.map((subEntry) => processEntry(subEntry, path + entry.name + '/'))
-              await Promise.all(promises)
-              resolve()
-            })
-          })
-        }
-      }
-
-      // 如果支持 DataTransferItem API（文件夹拖拽）
-      if (items.length > 0 && items[0].webkitGetAsEntry()) {
-        const promises = items.map((item) => {
-          const entry = item.webkitGetAsEntry()
-          return entry ? processEntry(entry) : Promise.resolve()
-        })
-
-        await Promise.all(promises)
-
-        if (files.length > 0) {
-          onUploadFiles(files)
-        }
-      } else {
-        const regularFiles = Array.from(e.dataTransfer.files)
-        if (regularFiles.length > 0) {
-          onUploadFiles(regularFiles)
-        }
-      }
-    },
-    [onUploadFiles, setIsDragOverSidebar]
-  )
-
-  const handleSelectFiles = useCallback(() => {
-    const fileInput = document.createElement('input')
-    fileInput.type = 'file'
-    fileInput.multiple = true
-    fileInput.accept = '.md,.markdown'
-    fileInput.webkitdirectory = false
-
-    fileInput.onchange = (e) => {
-      const target = e.target as HTMLInputElement
-      if (target.files && target.files.length > 0) {
-        const selectedFiles = Array.from(target.files)
-        onUploadFiles(selectedFiles)
-      }
-      fileInput.remove()
-    }
-
-    fileInput.click()
-  }, [onUploadFiles])
-
-  const handleSelectFolder = useCallback(() => {
-    const folderInput = document.createElement('input')
-    folderInput.type = 'file'
-    // @ts-ignore - webkitdirectory is a non-standard attribute
-    folderInput.webkitdirectory = true
-    // @ts-ignore - directory is a non-standard attribute
-    folderInput.directory = true
-    folderInput.multiple = true
-
-    folderInput.onchange = (e) => {
-      const target = e.target as HTMLInputElement
-      if (target.files && target.files.length > 0) {
-        const selectedFiles = Array.from(target.files)
-        onUploadFiles(selectedFiles)
-      }
-      folderInput.remove()
-    }
-
-    folderInput.click()
-  }, [onUploadFiles])
-
-  return {
-    handleDropFiles,
-    handleSelectFiles,
-    handleSelectFolder
-  }
-}
--- a/src/renderer/src/pages/notes/hooks/useNotesMenu.tsx
+++ b/src/renderer/src/pages/notes/hooks/useNotesMenu.tsx
@@ -1,263 +0,0 @@
-import { loggerService } from '@logger'
-import { DeleteIcon } from '@renderer/components/Icons'
-import SaveToKnowledgePopup from '@renderer/components/Popups/SaveToKnowledgePopup'
-import { useKnowledgeBases } from '@renderer/hooks/useKnowledge'
-import type { RootState } from '@renderer/store'
-import type { NotesTreeNode } from '@renderer/types/note'
-import { exportNote } from '@renderer/utils/export'
-import type { MenuProps } from 'antd'
-import type { ItemType, MenuItemType } from 'antd/es/menu/interface'
-import { Edit3, FilePlus, FileSearch, Folder, FolderOpen, Sparkles, Star, StarOff, UploadIcon } from 'lucide-react'
-import { useCallback } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useSelector } from 'react-redux'
-
-const logger = loggerService.withContext('UseNotesMenu')
-
-interface UseNotesMenuProps {
-  renamingNodeIds: Set<string>
-  onCreateNote: (name: string, targetFolderId?: string) => void
-  onCreateFolder: (name: string, targetFolderId?: string) => void
-  onRenameNode: (nodeId: string, newName: string) => void
-  onToggleStar: (nodeId: string) => void
-  onDeleteNode: (nodeId: string) => void
-  onSelectNode: (node: NotesTreeNode) => void
-  handleStartEdit: (node: NotesTreeNode) => void
-  handleAutoRename: (node: NotesTreeNode) => void
-  activeNode?: NotesTreeNode | null
-}
-
-export const useNotesMenu = ({
-  renamingNodeIds,
-  onCreateNote,
-  onCreateFolder,
-  onToggleStar,
-  onDeleteNode,
-  onSelectNode,
-  handleStartEdit,
-  handleAutoRename,
-  activeNode
-}: UseNotesMenuProps) => {
-  const { t } = useTranslation()
-  const { bases } = useKnowledgeBases()
-  const exportMenuOptions = useSelector((state: RootState) => state.settings.exportMenuOptions)
-
-  const handleExportKnowledge = useCallback(
-    async (note: NotesTreeNode) => {
-      try {
-        if (bases.length === 0) {
-          window.toast.warning(t('chat.save.knowledge.empty.no_knowledge_base'))
-          return
-        }
-
-        const result = await SaveToKnowledgePopup.showForNote(note)
-
-        if (result?.success) {
-          window.toast.success(t('notes.export_success', { count: result.savedCount }))
-        }
-      } catch (error) {
-        window.toast.error(t('notes.export_failed'))
-        logger.error(`Failed to export note to knowledge base: ${error}`)
-      }
-    },
-    [bases.length, t]
-  )
-
-  const handleImageAction = useCallback(
-    async (node: NotesTreeNode, platform: 'copyImage' | 'exportImage') => {
-      try {
-        if (activeNode?.id !== node.id) {
-          onSelectNode(node)
-          await new Promise((resolve) => setTimeout(resolve, 500))
-        }
-
-        await exportNote({ node, platform })
-      } catch (error) {
-        logger.error(`Failed to ${platform === 'copyImage' ? 'copy' : 'export'} as image:`, error as Error)
-        window.toast.error(t('common.copy_failed'))
-      }
-    },
-    [activeNode, onSelectNode, t]
-  )
-
-  const handleDeleteNodeWrapper = useCallback(
-    (node: NotesTreeNode) => {
-      const confirmText =
-        node.type === 'folder'
-          ? t('notes.delete_folder_confirm', { name: node.name })
-          : t('notes.delete_note_confirm', { name: node.name })
-
-      window.modal.confirm({
-        title: t('notes.delete'),
-        content: confirmText,
-        centered: true,
-        okButtonProps: { danger: true },
-        onOk: () => {
-          onDeleteNode(node.id)
-        }
-      })
-    },
-    [onDeleteNode, t]
-  )
-
-  const getMenuItems = useCallback(
-    (node: NotesTreeNode) => {
-      const baseMenuItems: MenuProps['items'] = []
-
-      // only show auto rename for file for now
-      if (node.type !== 'folder') {
-        baseMenuItems.push({
-          label: t('notes.auto_rename.label'),
-          key: 'auto-rename',
-          icon: <Sparkles size={14} />,
-          disabled: renamingNodeIds.has(node.id),
-          onClick: () => {
-            handleAutoRename(node)
-          }
-        })
-      }
-
-      if (node.type === 'folder') {
-        baseMenuItems.push(
-          {
-            label: t('notes.new_note'),
-            key: 'new_note',
-            icon: <FilePlus size={14} />,
-            onClick: () => {
-              onCreateNote(t('notes.untitled_note'), node.id)
-            }
-          },
-          {
-            label: t('notes.new_folder'),
-            key: 'new_folder',
-            icon: <Folder size={14} />,
-            onClick: () => {
-              onCreateFolder(t('notes.untitled_folder'), node.id)
-            }
-          },
-          { type: 'divider' }
-        )
-      }
-
-      baseMenuItems.push(
-        {
-          label: t('notes.rename'),
-          key: 'rename',
-          icon: <Edit3 size={14} />,
-          onClick: () => {
-            handleStartEdit(node)
-          }
-        },
-        {
-          label: t('notes.open_outside'),
-          key: 'open_outside',
-          icon: <FolderOpen size={14} />,
-          onClick: () => {
-            window.api.openPath(node.externalPath)
-          }
-        }
-      )
-      if (node.type !== 'folder') {
-        baseMenuItems.push(
-          {
-            label: node.isStarred ? t('notes.unstar') : t('notes.star'),
-            key: 'star',
-            icon: node.isStarred ? <StarOff size={14} /> : <Star size={14} />,
-            onClick: () => {
-              onToggleStar(node.id)
-            }
-          },
-          {
-            label: t('notes.export_knowledge'),
-            key: 'export_knowledge',
-            icon: <FileSearch size={14} />,
-            onClick: () => {
-              handleExportKnowledge(node)
-            }
-          },
-          {
-            label: t('chat.topics.export.title'),
-            key: 'export',
-            icon: <UploadIcon size={14} />,
-            children: [
-              exportMenuOptions.image && {
-                label: t('chat.topics.copy.image'),
-                key: 'copy-image',
-                onClick: () => handleImageAction(node, 'copyImage')
-              },
-              exportMenuOptions.image && {
-                label: t('chat.topics.export.image'),
-                key: 'export-image',
-                onClick: () => handleImageAction(node, 'exportImage')
-              },
-              exportMenuOptions.markdown && {
-                label: t('chat.topics.export.md.label'),
-                key: 'markdown',
-                onClick: () => exportNote({ node, platform: 'markdown' })
-              },
-              exportMenuOptions.docx && {
-                label: t('chat.topics.export.word'),
-                key: 'word',
-                onClick: () => exportNote({ node, platform: 'docx' })
-              },
-              exportMenuOptions.notion && {
-                label: t('chat.topics.export.notion'),
-                key: 'notion',
-                onClick: () => exportNote({ node, platform: 'notion' })
-              },
-              exportMenuOptions.yuque && {
-                label: t('chat.topics.export.yuque'),
-                key: 'yuque',
-                onClick: () => exportNote({ node, platform: 'yuque' })
-              },
-              exportMenuOptions.obsidian && {
-                label: t('chat.topics.export.obsidian'),
-                key: 'obsidian',
-                onClick: () => exportNote({ node, platform: 'obsidian' })
-              },
-              exportMenuOptions.joplin && {
-                label: t('chat.topics.export.joplin'),
-                key: 'joplin',
-                onClick: () => exportNote({ node, platform: 'joplin' })
-              },
-              exportMenuOptions.siyuan && {
-                label: t('chat.topics.export.siyuan'),
-                key: 'siyuan',
-                onClick: () => exportNote({ node, platform: 'siyuan' })
-              }
-            ].filter(Boolean) as ItemType<MenuItemType>[]
-          }
-        )
-      }
-      baseMenuItems.push(
-        { type: 'divider' },
-        {
-          label: t('notes.delete'),
-          danger: true,
-          key: 'delete',
-          icon: <DeleteIcon size={14} className="lucide-custom" />,
-          onClick: () => {
-            handleDeleteNodeWrapper(node)
-          }
-        }
-      )
-
-      return baseMenuItems
-    },
-    [
-      t,
-      handleStartEdit,
-      onToggleStar,
-      handleExportKnowledge,
-      handleImageAction,
-      handleDeleteNodeWrapper,
-      renamingNodeIds,
-      handleAutoRename,
-      exportMenuOptions,
-      onCreateNote,
-      onCreateFolder
-    ]
-  )
-
-  return { getMenuItems }
-}
--- a/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
@@ -11,6 +11,7 @@ import EssentialSettings from './EssentialSettings'
 import PluginSettings from './PluginSettings'
 import PromptSettings from './PromptSettings'
 import { AgentLabel, LeftMenu, Settings, StyledMenu, StyledModal } from './shared'
+import SubAgentsSettings from './SubAgentsSettings'
 import ToolingSettings from './ToolingSettings'

 interface AgentSettingPopupShowParams {
@@ -22,7 +23,7 @@ interface AgentSettingPopupParams extends AgentSettingPopupShowParams {
  resolve: () => void
 }

-type AgentSettingPopupTab = 'essential' | 'prompt' | 'tooling' | 'advanced' | 'plugins' | 'session-mcps'
+type AgentSettingPopupTab = 'essential' | 'prompt' | 'tooling' | 'advanced' | 'plugins' | 'sub-agents' | 'session-mcps'

 const AgentSettingPopupContainer: React.FC<AgentSettingPopupParams> = ({ tab, agentId, resolve }) => {
  const [open, setOpen] = useState(true)
@@ -62,6 +63,10 @@ const AgentSettingPopupContainer: React.FC<AgentSettingPopupParams> = ({ tab, ag
        key: 'plugins',
        label: t('agent.settings.plugins.tab', 'Plugins')
      },
+      {
+        key: 'sub-agents',
+        label: t('agent.settings.sub_agents.tab', 'Sub-agents')
+      },
      {
        key: 'advanced',
        label: t('agent.settings.advance.title', 'Advanced Settings')
@@ -107,6 +112,7 @@ const AgentSettingPopupContainer: React.FC<AgentSettingPopupParams> = ({ tab, ag
          {menu === 'prompt' && <PromptSettings agentBase={agent} update={updateAgent} />}
          {menu === 'tooling' && <ToolingSettings agentBase={agent} update={updateAgent} />}
          {menu === 'plugins' && <PluginSettings agentBase={agent} update={updateAgent} />}
+          {menu === 'sub-agents' && <SubAgentsSettings agentBase={agent} update={updateAgent} />}
          {menu === 'advanced' && <AdvancedSettings agentBase={agent} update={updateAgent} />}
        </Settings>
      </div>
--- a/src/renderer/src/pages/settings/AgentSettings/SubAgentsSettings.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/SubAgentsSettings.tsx
@@ -0,0 +1,57 @@
+import { useAgents } from '@renderer/hooks/agents/useAgents'
+import type { GetAgentResponse, GetAgentSessionResponse, UpdateAgentFunctionUnion } from '@renderer/types'
+import { Form, Select, Spin } from 'antd'
+import { useTranslation } from 'react-i18next'
+
+interface SubAgentsSettingsProps {
+  agentBase: GetAgentResponse | GetAgentSessionResponse | undefined | null
+  update: UpdateAgentFunctionUnion
+}
+
+const SubAgentsSettings: React.FC<SubAgentsSettingsProps> = ({ agentBase, update }) => {
+  const { t } = useTranslation()
+  const [form] = Form.useForm()
+  const { agents, isLoading } = useAgents()
+
+  if (!agentBase) return
+
+  const handleValuesChange = (changedValues: { sub_agents: string[] }) => {
+    update({
+      id: agentBase.id,
+      ...changedValues
+    })
+  }
+
+  if (isLoading) {
+    return <Spin />
+  }
+
+  const availableAgents = agents?.filter((agent) => agent.id !== agentBase.id) || []
+
+  return (
+    <Form
+      form={form}
+      layout="vertical"
+      initialValues={{ sub_agents: agentBase.sub_agents || [] }}
+      onValuesChange={handleValuesChange}
+      style={{ maxWidth: 600 }}>
+      <Form.Item
+        name="sub_agents"
+        label={t('agent.settings.sub_agents.title')}
+        tooltip={t('agent.settings.sub_agents.tooltip')}>
+        <Select
+          mode="multiple"
+          placeholder={t('agent.settings.sub_agents.placeholder')}
+          loading={isLoading}
+          options={availableAgents.map((agent) => ({
+            label: agent.name,
+            value: agent.id
+          }))}
+          filterOption={(input, option) => (option?.label ?? '').toLowerCase().includes(input.toLowerCase())}
+        />
+      </Form.Item>
+    </Form>
+  )
+}
+
+export default SubAgentsSettings
--- a/src/renderer/src/pages/store/assistants/presets/components/AddAssistantPresetPopup.tsx
+++ b/src/renderer/src/pages/store/assistants/presets/components/AddAssistantPresetPopup.tsx
@@ -1,5 +1,3 @@
-import 'emoji-picker-element'
-
 import { CheckOutlined, LoadingOutlined, RollbackOutlined, ThunderboltOutlined } from '@ant-design/icons'
 import { loggerService } from '@logger'
 import EmojiPicker from '@renderer/components/EmojiPicker'
--- a/src/renderer/src/services/NotesService.ts
+++ b/src/renderer/src/services/NotesService.ts
@@ -83,68 +83,6 @@ export async function renameNode(node: NotesTreeNode, newName: string): Promise<
 }

 export async function uploadNotes(files: File[], targetPath: string): Promise<UploadResult> {
-  const basePath = normalizePath(targetPath)
-  const totalFiles = files.length
-
-  if (files.length === 0) {
-    return {
-      uploadedNodes: [],
-      totalFiles: 0,
-      skippedFiles: 0,
-      fileCount: 0,
-      folderCount: 0
-    }
-  }
-
-  try {
-    // Get file paths from File objects
-    // For browser File objects from drag-and-drop, we need to use FileReader to save temporarily
-    // However, for directory uploads, the files already have paths
-    const filePaths: string[] = []
-
-    for (const file of files) {
-      // @ts-ignore - webkitRelativePath exists on File objects from directory uploads
-      if (file.path) {
-        // @ts-ignore - Electron File objects have .path property
-        filePaths.push(file.path)
-      } else {
-        // For browser File API, we'd need to use FileReader and create temp files
-        // For now, fall back to the old method for these cases
-        logger.warn('File without path detected, using fallback method')
-        return uploadNotesLegacy(files, targetPath)
-      }
-    }
-
-    // Pause file watcher to prevent N refresh events
-    await window.api.file.pauseFileWatcher()
-
-    try {
-      // Use the new optimized batch upload API that runs in Main process
-      const result = await window.api.file.batchUploadMarkdown(filePaths, basePath)
-
-      return {
-        uploadedNodes: [],
-        totalFiles,
-        skippedFiles: result.skippedFiles,
-        fileCount: result.fileCount,
-        folderCount: result.folderCount
-      }
-    } finally {
-      // Resume watcher and trigger single refresh
-      await window.api.file.resumeFileWatcher()
-    }
-  } catch (error) {
-    logger.error('Batch upload failed, falling back to legacy method:', error as Error)
-    // Fall back to old method if new method fails
-    return uploadNotesLegacy(files, targetPath)
-  }
-}
-
-/**
- * Legacy upload method using Renderer process
- * Kept as fallback for browser File API files without paths
- */
-async function uploadNotesLegacy(files: File[], targetPath: string): Promise<UploadResult> {
  const basePath = normalizePath(targetPath)
  const markdownFiles = filterMarkdown(files)
  const skippedFiles = files.length - markdownFiles.length
@@ -163,37 +101,18 @@ async function uploadNotesLegacy(files: File[], targetPath: string): Promise<Upl
  await createFolders(folders)

  let fileCount = 0
-  const BATCH_SIZE = 5 // Process 5 files concurrently to balance performance and responsiveness

-  // Process files in batches to avoid blocking the UI thread
-  for (let i = 0; i < markdownFiles.length; i += BATCH_SIZE) {
-    const batch = markdownFiles.slice(i, i + BATCH_SIZE)
+  for (const file of markdownFiles) {
+    const { dir, name } = resolveFileTarget(file, basePath)
+    const { safeName } = await window.api.file.checkFileName(dir, name, true)
+    const finalPath = `${dir}/${safeName}${MARKDOWN_EXT}`

-    // Process current batch in parallel
-    const results = await Promise.allSettled(
-      batch.map(async (file) => {
-        const { dir, name } = resolveFileTarget(file, basePath)
-        const { safeName } = await window.api.file.checkFileName(dir, name, true)
-        const finalPath = `${dir}/${safeName}${MARKDOWN_EXT}`
-
-        const content = await file.text()
-        await window.api.file.write(finalPath, content)
-        return true
-      })
-    )
-
-    // Count successful uploads
-    results.forEach((result) => {
-      if (result.status === 'fulfilled') {
-        fileCount += 1
-      } else {
-        logger.error('Failed to write uploaded file:', result.reason)
-      }
-    })
-
-    // Yield to the event loop between batches to keep UI responsive
-    if (i + BATCH_SIZE < markdownFiles.length) {
-      await new Promise((resolve) => setTimeout(resolve, 0))
+    try {
+      const content = await file.text()
+      await window.api.file.write(finalPath, content)
+      fileCount += 1
+    } catch (error) {
+      logger.error('Failed to write uploaded file:', error as Error)
    }
  }

--- a/src/renderer/src/store/thunk/messageThunk.ts
+++ b/src/renderer/src/store/thunk/messageThunk.ts
@@ -585,9 +585,11 @@ const fetchAndProcessAgentResponseImpl = async (
        return
      }

+      // Only mark as cleared if there was a previous session ID (not initial assignment)
+      sessionWasCleared = !!latestAgentSessionId
+
      latestAgentSessionId = sessionId
      agentSession.agentSessionId = sessionId
-      sessionWasCleared = true

      logger.debug(`Agent session ID updated`, {
        topicId,
--- a/src/renderer/src/types/agent.ts
+++ b/src/renderer/src/types/agent.ts
@@ -82,6 +82,7 @@ export const AgentBaseSchema = z.object({
  // Tools
  mcps: z.array(z.string()).optional(), // Array of MCP tool IDs
  allowed_tools: z.array(z.string()).optional(), // Array of allowed tool IDs (whitelist)
+  sub_agents: z.array(z.string()).optional(), // Array of sub-agent IDs
  slash_commands: z.array(SlashCommandSchema).optional(), // Array of slash commands merged from builtin and SDK

  // Configuration
@@ -132,7 +133,7 @@ export const AgentSessionEntitySchema = AgentBaseSchema.extend({
  id: z.string(),
  agent_id: z.string(), // Primary agent ID for the session
  agent_type: AgentTypeSchema,
-  // sub_agent_ids?: string[] // Array of sub-agent IDs involved in the session
+  sub_agents: z.array(z.string()).optional(), // Array of sub-agent IDs involved in the session

  created_at: z.iso.datetime(),
  updated_at: z.iso.datetime()
@@ -205,6 +206,7 @@ export type BaseAgentForm = {
  model: string
  accessible_paths: string[]
  allowed_tools: string[]
+  sub_agents?: string[]
  mcps?: string[]
  configuration?: AgentConfiguration
 }
@@ -286,6 +288,7 @@ export interface UpdateSessionRequest extends Partial<AgentBase> {}

 export const GetAgentSessionResponseSchema = AgentSessionEntitySchema.extend({
  tools: z.array(ToolSchema).optional(), // All tools available to the session (including built-in and custom)
+  sub_agents: z.array(z.string()).optional(), // Array of sub-agent IDs
  messages: z.array(AgentSessionMessageEntitySchema).optional(), // Messages in the session
  plugins: z
    .array(
--- a/src/renderer/src/types/note.ts
+++ b/src/renderer/src/types/note.ts
@@ -13,7 +13,7 @@ export type NotesSortType =
 export interface NotesTreeNode {
  id: string
  name: string // 不包含扩展名
-  type: 'folder' | 'file' | 'hint'
+  type: 'folder' | 'file'
  treePath: string // 相对路径
  externalPath: string // 绝对路径
  children?: NotesTreeNode[]
--- a/yarn.lock
+++ b/yarn.lock
@@ -8744,12 +8744,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/react-dom@npm:^19.2.3":
-  version: 19.2.3
-  resolution: "@types/react-dom@npm:19.2.3"
+"@types/react-dom@npm:^19.0.4":
+  version: 19.1.2
+  resolution: "@types/react-dom@npm:19.1.2"
  peerDependencies:
-    "@types/react": ^19.2.0
-  checksum: 10c0/b486ebe0f4e2fb35e2e108df1d8fc0927ca5d6002d5771e8a739de11239fe62d0e207c50886185253c99eb9dedfeeb956ea7429e5ba17f6693c7acb4c02f8cd1
+    "@types/react": ^19.0.0
+  checksum: 10c0/100c341cacba9ec8ae1d47ee051072a3450e9573bf8eeb7262490e341cb246ea0f95a07a1f2077e61cf92648f812a0324c602fcd811bd87b7ce41db2811510cd
  languageName: node
  linkType: hard

@@ -8789,12 +8789,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@types/react@npm:^19.2.6":
-  version: 19.2.6
-  resolution: "@types/react@npm:19.2.6"
+"@types/react@npm:^19.0.12":
+  version: 19.1.2
+  resolution: "@types/react@npm:19.1.2"
  dependencies:
-    csstype: "npm:^3.2.2"
-  checksum: 10c0/23b1100f88662ce9f9e4fcca3a2b4ef9fff1ecde24ede2b2dcbd07731e48d6946fd7fd156cd133f5b25321694b0569cd9b8dd30b22c4e076d1cf4c8cdd9a75cb
+    csstype: "npm:^3.0.2"
+  checksum: 10c0/76ffe71395c713d4adc3c759465012d3c956db00af35ab7c6d0d91bd07b274b7ce69caa0478c0760311587bd1e38c78ffc9688ebc629f2b266682a19d8750947
  languageName: node
  linkType: hard

@@ -10015,8 +10015,8 @@ __metadata:
    "@types/mime-types": "npm:^3"
    "@types/node": "npm:^22.17.1"
    "@types/pako": "npm:^1.0.2"
-    "@types/react": "npm:^19.2.6"
-    "@types/react-dom": "npm:^19.2.3"
+    "@types/react": "npm:^19.0.12"
+    "@types/react-dom": "npm:^19.0.4"
    "@types/react-infinite-scroll-component": "npm:^5.0.0"
    "@types/react-transition-group": "npm:^4.4.12"
    "@types/react-window": "npm:^1"
@@ -10074,6 +10074,7 @@ __metadata:
    electron-window-state: "npm:^5.0.3"
    emittery: "npm:^1.0.3"
    emoji-picker-element: "npm:^1.22.1"
+    emoji-picker-element-data: "npm:^1"
    epub: "patch:epub@npm%3A1.3.0#~/.yarn/patches/epub-npm-1.3.0-8325494ffe.patch"
    eslint: "npm:^9.22.0"
    eslint-plugin-import-zod: "npm:^1.2.0"
@@ -12283,13 +12284,6 @@ __metadata:
  languageName: node
  linkType: hard

-"csstype@npm:^3.2.2":
-  version: 3.2.3
-  resolution: "csstype@npm:3.2.3"
-  checksum: 10c0/cd29c51e70fa822f1cecd8641a1445bed7063697469d35633b516e60fe8c1bde04b08f6c5b6022136bb669b64c63d4173af54864510fbb4ee23281801841a3ce
-  languageName: node
-  linkType: hard
-
 "csv-parse@npm:^5.6.0":
  version: 5.6.0
  resolution: "csv-parse@npm:5.6.0"
@@ -13662,6 +13656,13 @@ __metadata:
  languageName: node
  linkType: hard

+"emoji-picker-element-data@npm:^1":
+  version: 1.8.0
+  resolution: "emoji-picker-element-data@npm:1.8.0"
+  checksum: 10c0/c8976b636205a0cc90d2690859a1193add71a948dadf743962b47c338a4c3715768404d0ccbc02156608b44abf41f3e1d51756e06f1bbed9d164dd4cb1752103
+  languageName: node
+  linkType: hard
+
 "emoji-picker-element@npm:^1.22.1":
  version: 1.26.3
  resolution: "emoji-picker-element@npm:1.26.3"
Author	SHA1	Message	Date
suyao	3da8b63673	Merge remote-tracking branch 'origin/main' into feat/sub_agents	2025-11-21 14:57:03 +08:00
SuYao	dcdd1bf852	refactor: replace renderToolContent function with ToolContent component for improved readability (#11300 ) * refactor: replace renderToolContent function with ToolContent component for improved readability * fix * fix test	2025-11-21 09:55:46 +08:00
beyondkmp	a12b6bfeca	feat: enable native language emoji search with CLDR data format (#11381 ) * feat: add i18n support and local data to emoji picker - Add emoji-picker-element-data package for offline-first emoji data - Implement i18n translations for emoji picker UI (de, en, es, fr, ja, pt, ru, zh) - Switch from CDN to local emoji data to improve performance and reliability - Add locale mapping to match app language with emoji picker data - Move emoji-picker-element import to EmojiPicker component for better encapsulation - Use proper TypeScript types instead of 'any' for type safety This improves user experience by providing localized emoji picker interface and eliminating dependency on external CDN, ensuring the picker works offline. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> * feat: enable native language emoji search with CLDR data format Switch from emojibase to CLDR format for emoji-picker-element data to support full multi-language search functionality. Users can now search for emojis in their native language (e.g., German users can search "Herz" for ❤️, Spanish users can search "corazón"). Also improves type safety by using the LanguageVarious type for locale mappings. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>	2025-11-20 19:23:27 +08:00
suyao	1175823ab8	feat: add support for sub-agents in agent and session management - Added 'sub_agents' field to the BaseService, agents schema, and sessions schema. - Implemented methods in AgentService and SessionService to handle sub-agent configurations. - Updated ClaudeCodeService to load and manage sub-agents. - Enhanced UI components to display and select sub-agents in the agent settings and activity directory. - Added translations for sub-agent related UI elements in multiple languages. - Created SubAgentsSettings component for managing sub-agent associations in agent settings.	2025-11-19 15:58:15 +08:00