chore: udpate libsql and embedjs-libsql to a temp version to test

2025-11-20 16:55:35 +08:00
44 changed files with 349 additions and 1344 deletions
--- a/package.json
+++ b/package.json
@@ -81,18 +81,17 @@
  },
  "dependencies": {
    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.30#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.30-b50a299674.patch",
-    "@libsql/client": "0.14.0",
-    "@libsql/win32-x64-msvc": "^0.4.7",
+    "@libsql/client": "0.15.15",
+    "@libsql/win32-x64-msvc": "^0.5.22",
    "@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",
    "gray-matter": "^4.0.3",
    "js-yaml": "^4.1.0",
    "jsdom": "26.1.0",
+    "libsql": "^0.5.22",
    "node-stream-zip": "^1.15.0",
    "officeparser": "^4.2.0",
    "os-proxy-config": "^1.1.2",
@@ -128,7 +127,6 @@
    "@biomejs/biome": "2.2.4",
    "@cherrystudio/ai-core": "workspace:^1.0.9",
    "@cherrystudio/embedjs": "^0.1.31",
-    "@cherrystudio/embedjs-libsql": "^0.1.31",
    "@cherrystudio/embedjs-loader-csv": "^0.1.31",
    "@cherrystudio/embedjs-loader-image": "^0.1.31",
    "@cherrystudio/embedjs-loader-markdown": "^0.1.31",
@@ -141,6 +139,7 @@
    "@cherrystudio/embedjs-openai": "^0.1.31",
    "@cherrystudio/extension-table-plus": "workspace:^",
    "@cherrystudio/openai": "^6.9.0",
+    "@defi-failure/embedjs-libsql": "0.1.33",
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/modifiers": "^9.0.0",
    "@dnd-kit/sortable": "^10.0.0",
@@ -390,7 +389,6 @@
    "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
    "esbuild": "^0.25.0",
    "file-stream-rotator@npm:^0.6.1": "patch:file-stream-rotator@npm%3A0.6.1#~/.yarn/patches/file-stream-rotator-npm-0.6.1-eab45fb13d.patch",
-    "libsql@npm:^0.4.4": "patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch",
    "node-abi": "4.24.0",
    "openai@npm:^4.77.0": "npm:@cherrystudio/openai@6.5.0",
    "openai@npm:^4.87.3": "npm:@cherrystudio/openai@6.5.0",
--- a/resources/database/drizzle/0003_smooth_talkback.sql
+++ b/resources/database/drizzle/0003_smooth_talkback.sql
@@ -1,2 +0,0 @@
-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
@@ -1,360 +0,0 @@
-{
-  "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,13 +22,6 @@
      "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,6 +104,12 @@ 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/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(`Failed to access directory: ${resolvedPath}`, error as Error)
+      logger.error(`[IPC - Error] Failed to access directory: ${resolvedPath}`, error as Error)
      throw error
    })

--- a/src/main/services/KnowledgeService.ts
+++ b/src/main/services/KnowledgeService.ts
@@ -18,9 +18,9 @@ import path from 'node:path'

 import type { RAGApplication } from '@cherrystudio/embedjs'
 import { RAGApplicationBuilder } from '@cherrystudio/embedjs'
-import { LibSqlDb } from '@cherrystudio/embedjs-libsql'
 import { SitemapLoader } from '@cherrystudio/embedjs-loader-sitemap'
 import { WebLoader } from '@cherrystudio/embedjs-loader-web'
+import { LibSqlDb } from '@defi-failure/embedjs-libsql'
 import { loggerService } from '@logger'
 import Embeddings from '@main/knowledge/embedjs/embeddings/Embeddings'
 import { addFileLoader } from '@main/knowledge/embedjs/loader'
--- a/src/main/services/agents/BaseService.ts
+++ b/src/main/services/agents/BaseService.ts
@@ -42,7 +42,6 @@ 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,7 +19,6 @@ 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,7 +22,6 @@ 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,19 +117,6 @@ 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,7 +130,6 @@ 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
@@ -170,22 +169,6 @@ 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,11 +21,6 @@ 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', () => {
@@ -193,111 +188,6 @@ 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][] = []
@@ -410,87 +300,4 @@ 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,20 +153,6 @@ 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
@@ -231,10 +217,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, toolName: string, input: unknown, providerMetadata?: ProviderMetadata): void {
+  completeToolBlock(toolCallId: string, input: unknown, providerMetadata?: ProviderMetadata): void {
    const block = this.getToolBlockByRawId(toolCallId)
    this.registerToolCall(toolCallId, {
-      toolName,
+      toolName: block?.toolName ?? 'unknown',
      input,
      providerMetadata
    })
--- a/src/main/services/agents/services/claudecode/index.ts
+++ b/src/main/services/agents/services/claudecode/index.ts
@@ -2,13 +2,7 @@
 import { EventEmitter } from 'node:events'
 import { createRequire } from 'node:module'

-import type {
-  AgentDefinition,
-  CanUseTool,
-  McpHttpServerConfig,
-  Options,
-  SDKMessage
-} from '@anthropic-ai/claude-agent-sdk'
+import type { 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'
@@ -16,7 +10,7 @@ import { validateModelId } from '@main/apiServer/utils'
 import getLoginShellEnvironment from '@main/utils/shell-env'
 import { app } from 'electron'

-import { agentService, type GetAgentSessionResponse } from '../..'
+import type { GetAgentSessionResponse } from '../..'
 import type { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface'
 import { sessionService } from '../SessionService'
 import { buildNamespacedToolCallId } from './claude-stream-state'
@@ -163,32 +157,6 @@ 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,
@@ -446,6 +414,23 @@ 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: JSON.stringify(sdkMessage) })
+  logger.silly('Transforming SDKMessage', { message: sdkMessage })
  switch (sdkMessage.type) {
    case 'assistant':
      return handleAssistantMessage(sdkMessage, state)
@@ -186,13 +186,14 @@ function handleAssistantMessage(

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

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

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

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

    case 'message_stop': {
-      if (!state.hasActiveStep()) {
-        break
-      }
      const pending = state.getPendingUsage()
      chunks.push({
        type: 'finish-step',
--- a/src/renderer/src/components/EmojiPicker/index.tsx
+++ b/src/renderer/src/components/EmojiPicker/index.tsx
@@ -1,120 +1,35 @@
-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 { i18n } = useTranslation()
-  const ref = useRef<Picker>(null)
-  const currentLocale = i18n.language as LanguageVarious
+  const ref = useRef<HTMLDivElement>(null)

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

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

-  useEffect(() => {
-    const picker = ref.current
-
-    if (picker) {
-      const handleEmojiClick = (event: EmojiClickEvent) => {
+    if (refValue) {
+      const handleEmojiClick = (event: any) => {
        event.stopPropagation()
-        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)
+        onEmojiClick(event.detail.unicode || event.detail.emoji.unicode)
      }
      // 添加事件监听器
-      picker.addEventListener('emoji-click', handleEmojiClick)
+      refValue.addEventListener('emoji-click', handleEmojiClick)

      // 清理事件监听器
      return () => {
-        picker.removeEventListener('emoji-click', handleEmojiClick)
+        refValue.removeEventListener('emoji-click', handleEmojiClick)
      }
    }
    return
--- a/src/renderer/src/i18n/locales/en-us.json
+++ b/src/renderer/src/i18n/locales/en-us.json
@@ -156,12 +156,6 @@
        "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.",
@@ -647,7 +641,6 @@
          "description": "No files available in accessible directories",
          "label": "No File Found"
        },
-        "sub_agent": "Sub-Agent",
        "title": "Activity Directory"
      },
      "auto_resize": "Auto resize height",
--- a/src/renderer/src/i18n/locales/zh-cn.json
+++ b/src/renderer/src/i18n/locales/zh-cn.json
@@ -156,12 +156,6 @@
        "uninstalling": "卸载中..."
      },
      "prompt": "提示词设置",
-      "sub_agents": {
-        "placeholder": "选择子智能体",
-        "tab": "子智能体",
-        "title": "子智能体",
-        "tooltip": "选择可以被此智能体委派任务的其他智能体"
-      },
      "tooling": {
        "mcp": {
          "description": "连接 MCP 服务器即可解锁更多可在上方预先授权的工具。",
@@ -647,7 +641,6 @@
          "description": "可访问目录中没有可用文件",
          "label": "未找到文件"
        },
-        "sub_agent": "子代理",
        "title": "活动目录"
      },
      "auto_resize": "自动调整高度",
--- a/src/renderer/src/i18n/locales/zh-tw.json
+++ b/src/renderer/src/i18n/locales/zh-tw.json
@@ -156,12 +156,6 @@
        "uninstalling": "解除安裝中..."
      },
      "prompt": "提示設定",
-      "sub_agents": {
-        "placeholder": "選擇子助手",
-        "tab": "子助手",
-        "title": "子助手",
-        "tooltip": "選擇可以被此助手委派任務的其他助手"
-      },
      "tooling": {
        "mcp": {
          "description": "連線 MCP 伺服器即可解鎖更多可在上方預先授權的工具。",
@@ -647,7 +641,6 @@
          "description": "可存取的目錄中沒有檔案",
          "label": "找不到檔案"
        },
-        "sub_agent": "子代理",
        "title": "活動目錄"
      },
      "auto_resize": "自動調整高度",
--- a/src/renderer/src/i18n/translate/de-de.json
+++ b/src/renderer/src/i18n/translate/de-de.json
@@ -156,12 +156,6 @@
        "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.",
--- a/src/renderer/src/i18n/translate/el-gr.json
+++ b/src/renderer/src/i18n/translate/el-gr.json
@@ -156,12 +156,6 @@
        "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 για να ξεκλειδώσετε πρόσθετα εργαλεία που μπορείτε να εγκρίνετε παραπάνω.",
--- a/src/renderer/src/i18n/translate/es-es.json
+++ b/src/renderer/src/i18n/translate/es-es.json
@@ -156,12 +156,6 @@
        "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.",
--- a/src/renderer/src/i18n/translate/fr-fr.json
+++ b/src/renderer/src/i18n/translate/fr-fr.json
@@ -156,12 +156,6 @@
        "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.",
--- a/src/renderer/src/i18n/translate/ja-jp.json
+++ b/src/renderer/src/i18n/translate/ja-jp.json
@@ -156,12 +156,6 @@
        "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サーバーを接続して、上で承認できる追加ツールを解放します。",
--- a/src/renderer/src/i18n/translate/pt-pt.json
+++ b/src/renderer/src/i18n/translate/pt-pt.json
@@ -156,12 +156,6 @@
        "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.",
--- a/src/renderer/src/i18n/translate/ru-ru.json
+++ b/src/renderer/src/i18n/translate/ru-ru.json
@@ -156,12 +156,6 @@
        "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, чтобы разблокировать дополнительные инструменты, которые вы можете одобрить выше.",
--- a/src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx
+++ b/src/renderer/src/pages/home/Inputbar/AgentSessionInputbar.tsx
@@ -103,23 +103,12 @@ 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 ?? [],
-      subAgents: agentPlugins
+      accessiblePaths: session.accessible_paths ?? []
    }
  }, [session, agentId, sessionId])

@@ -169,8 +158,6 @@ 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,12 +25,11 @@ const activityDirectoryTool = defineTool({
    const { quickPanel, quickPanelController, actions, session } = context
    const { onTextChange } = actions

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

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

@@ -39,7 +38,6 @@ 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,17 +13,10 @@ 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,
-  subAgents,
-  setText
-}) => {
+const ActivityDirectoryButton: FC<Props> = ({ quickPanel, quickPanelController, accessiblePaths, setText }) => {
  const { t } = useTranslation()

  const { handleOpenQuickPanel } = useActivityDirectoryPanel(
@@ -31,7 +24,6 @@ const ActivityDirectoryButton: FC<Props> = ({
      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,9 +15,8 @@ const ActivityDirectoryQuickPanelManager = ({ context }: ManagerProps) => {
    session
  } = context

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

  // Always call hooks unconditionally (React rules)
  useActivityDirectoryPanel(
@@ -25,7 +24,6 @@ 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 { Bot, File, Folder } from 'lucide-react'
+import { File, Folder } from 'lucide-react'
 import type React from 'react'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
@@ -25,22 +25,15 @@ 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, subAgents = [], setText } = params
+  const { quickPanel, quickPanelController, accessiblePaths, setText } = params
  const { registerTrigger, registerRootMenu } = quickPanel
  const { open, close, updateList, isVisible, symbol } = quickPanelController
  const { t } = useTranslation()
@@ -245,68 +238,6 @@ 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
   */
@@ -360,18 +291,12 @@ export const useActivityDirectoryPanel = (params: Params, role: 'button' | 'mana
  )

  /**
-   * Create combined list items for QuickPanel (sub-agents + files)
+   * Create file list items for QuickPanel (for current state)
   */
-  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
+  const fileItems = useMemo<QuickPanelListItem[]>(
+    () => createFileItems(fileList, isLoading),
+    [createFileItems, fileList, isLoading]
+  )

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

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

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

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

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

  /**
--- a/src/renderer/src/pages/home/Inputbar/types.ts
+++ b/src/renderer/src/pages/home/Inputbar/types.ts
@@ -68,7 +68,6 @@ 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,6 +1,7 @@
 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'
@@ -15,63 +16,6 @@ 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
@@ -79,8 +23,73 @@ export function BashOutputTool({
  input: BashOutputToolInput
  output?: BashOutputToolOutput
 }): NonNullable<CollapseProps['items']>[number] {
-  const parsedOutput = parseBashOutput(output)
-  const statusConfig = getStatusConfig(parsedOutput)
+  // 解析 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 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,47 +1,12 @@
 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
@@ -49,8 +14,50 @@ export function ReadTool({
  input: ReadToolInputType
  output?: ReadToolOutputType
 }): NonNullable<CollapseProps['items']>[number] {
-  const outputString = normalizeOutputString(output)
-  const stats = getOutputStats(outputString)
+  // 移除 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])

  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,24 +11,11 @@ interface UnknownToolProps {
  output?: unknown
 }

-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 }) => {
+export function UnknownToolRenderer({
+  toolName = '',
+  input,
+  output
+}: UnknownToolProps): NonNullable<CollapseProps['items']>[number] {
  const { highlightCode } = useCodeStyle()
  const [inputHtml, setInputHtml] = useState<string>('')
  const [outputHtml, setOutputHtml] = useState<string>('')
@@ -47,49 +34,58 @@ const UnknownToolContent = ({ input, output }: { input?: unknown; output?: unkno
    }
  }, [output, highlightCode])

-  if (input === undefined && output === undefined) {
-    return <div className="text-foreground-500 text-xs">No data available for this tool</div>
+  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
  }

-  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>
-      )}
+  const getToolDescription = () => {
+    if (toolName.startsWith('mcp__')) {
+      return 'MCP Server Tool'
+    }
+    return 'Tool'
+  }

-      {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(toolName)}
+        params={getToolDescription()}
      />
    ),
-    children: <UnknownToolContent input={input} output={output} />
+    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>
+    )
  }
 }
--- a/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/index.tsx
+++ b/src/renderer/src/pages/home/Messages/Tools/MessageAgentTools/index.tsx
@@ -6,6 +6,8 @@ import { Collapse } from 'antd'
 // 导出所有类型
 export * from './types'

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

-// 统一的渲染组件
-function ToolContent({ toolName, input, output }: { toolName: AgentToolsType; input: ToolInput; output?: ToolOutput }) {
+// 统一的渲染函数
+function renderToolContent(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 })

-  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'
-    }
-  }
+  // 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])

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

-  return (
-    <ToolContent toolName={tool.name as AgentToolsType} input={args as ToolInput} output={response as ToolOutput} />
-  )
+  return renderToolContent(tool.name as AgentToolsType, args as ToolInput, response as ToolOutput)
 }
--- a/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
+++ b/src/renderer/src/pages/settings/AgentSettings/AgentSettingsPopup.tsx
@@ -11,7 +11,6 @@ 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 {
@@ -23,7 +22,7 @@ interface AgentSettingPopupParams extends AgentSettingPopupShowParams {
  resolve: () => void
 }

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

 const AgentSettingPopupContainer: React.FC<AgentSettingPopupParams> = ({ tab, agentId, resolve }) => {
  const [open, setOpen] = useState(true)
@@ -63,10 +62,6 @@ 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')
@@ -112,7 +107,6 @@ 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
@@ -1,57 +0,0 @@
-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,3 +1,5 @@
+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/store/thunk/messageThunk.ts
+++ b/src/renderer/src/store/thunk/messageThunk.ts
@@ -585,11 +585,9 @@ 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,7 +82,6 @@ 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
@@ -133,7 +132,7 @@ export const AgentSessionEntitySchema = AgentBaseSchema.extend({
  id: z.string(),
  agent_id: z.string(), // Primary agent ID for the session
  agent_type: AgentTypeSchema,
-  sub_agents: z.array(z.string()).optional(), // Array of sub-agent IDs involved in the session
+  // sub_agent_ids?: string[] // Array of sub-agent IDs involved in the session

  created_at: z.iso.datetime(),
  updated_at: z.iso.datetime()
@@ -206,7 +205,6 @@ export type BaseAgentForm = {
  model: string
  accessible_paths: string[]
  allowed_tools: string[]
-  sub_agents?: string[]
  mcps?: string[]
  configuration?: AgentConfiguration
 }
@@ -288,7 +286,6 @@ 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/yarn.lock
+++ b/yarn.lock
@@ -1931,18 +1931,6 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@cherrystudio/embedjs-interfaces@npm:0.1.30":
-  version: 0.1.30
-  resolution: "@cherrystudio/embedjs-interfaces@npm:0.1.30"
-  dependencies:
-    "@langchain/core": "npm:^0.3.26"
-    debug: "npm:^4.4.0"
-    md5: "npm:^2.3.0"
-    uuid: "npm:^11.0.3"
-  checksum: 10c0/1d0eca816d89df25adfa15eb0b6ce67e8b3446966886c4e5e84f4c657daf3b5cad728c953479e8f317136a3c86ca512ebf13ceb070462da733eaab02937bc460
-  languageName: node
-  linkType: hard
-
 "@cherrystudio/embedjs-interfaces@npm:0.1.31":
  version: 0.1.31
  resolution: "@cherrystudio/embedjs-interfaces@npm:0.1.31"
@@ -1955,15 +1943,15 @@ __metadata:
  languageName: node
  linkType: hard

-"@cherrystudio/embedjs-libsql@npm:^0.1.31":
-  version: 0.1.31
-  resolution: "@cherrystudio/embedjs-libsql@npm:0.1.31"
+"@cherrystudio/embedjs-interfaces@npm:0.1.33":
+  version: 0.1.33
+  resolution: "@cherrystudio/embedjs-interfaces@npm:0.1.33"
  dependencies:
-    "@cherrystudio/embedjs-interfaces": "npm:0.1.30"
-    "@cherrystudio/embedjs-utils": "npm:0.1.30"
-    "@libsql/client": "npm:^0.14.0"
+    "@langchain/core": "npm:^0.3.26"
    debug: "npm:^4.4.0"
-  checksum: 10c0/248453e07b7ff1661f18213f69d74a0ab2e5d722d3ae5409240fd38cf3c263da5c8a224635f6ec4cf823cdaa91846ba0f4890d64872133950810afcfd8512498
+    md5: "npm:^2.3.0"
+    uuid: "npm:^11.0.3"
+  checksum: 10c0/b5e8a9ca589056aa608f82e661b3185e417bcc4c0b27262d7c78c3cb99b8c3d2e64d69a645a95d94a7a7f5d6546b2ca3a8a6e11b0922a07f78ebcecc6e56630a
  languageName: node
  linkType: hard

@@ -2100,15 +2088,6 @@ __metadata:
  languageName: node
  linkType: hard

-"@cherrystudio/embedjs-utils@npm:0.1.30":
-  version: 0.1.30
-  resolution: "@cherrystudio/embedjs-utils@npm:0.1.30"
-  dependencies:
-    "@cherrystudio/embedjs-interfaces": "npm:0.1.30"
-  checksum: 10c0/1bd6151a69b6e4db6c93528622ff4f7834f80834681f28758d19f9780e8da36f29c21737d49809021ba5b6b1127dd7d2891e26864e2d696f83f577966d1cbf2c
-  languageName: node
-  linkType: hard
-
 "@cherrystudio/embedjs-utils@npm:0.1.31":
  version: 0.1.31
  resolution: "@cherrystudio/embedjs-utils@npm:0.1.31"
@@ -2118,6 +2097,15 @@ __metadata:
  languageName: node
  linkType: hard

+"@cherrystudio/embedjs-utils@npm:0.1.33":
+  version: 0.1.33
+  resolution: "@cherrystudio/embedjs-utils@npm:0.1.33"
+  dependencies:
+    "@cherrystudio/embedjs-interfaces": "npm:0.1.33"
+  checksum: 10c0/5e5cbf4a3cb7af4f3c5b48ed0a0c20090abea39d80fe57c2aa6e2d6d304248c5b3cc4229d2733968b6f28a724aedeae96848d9b3a8138d27eda292c481200b8a
+  languageName: node
+  linkType: hard
+
 "@cherrystudio/embedjs@npm:^0.1.31":
  version: 0.1.31
  resolution: "@cherrystudio/embedjs@npm:0.1.31"
@@ -2671,6 +2659,18 @@ __metadata:
  languageName: node
  linkType: hard

+"@defi-failure/embedjs-libsql@npm:0.1.33":
+  version: 0.1.33
+  resolution: "@defi-failure/embedjs-libsql@npm:0.1.33"
+  dependencies:
+    "@cherrystudio/embedjs-interfaces": "npm:0.1.33"
+    "@cherrystudio/embedjs-utils": "npm:0.1.33"
+    "@libsql/client": "npm:^0.15.15"
+    debug: "npm:^4.4.0"
+  checksum: 10c0/28b8b5f31f78ca2c6576ba357a1d807938e41e85637cfb898724b732fc71cc759dfe2a1777fd1f855ec63029ebbb8ccefa66902bc891a62f3ee91a2603061a17
+  languageName: node
+  linkType: hard
+
 "@develar/schema-utils@npm:~2.6.5":
  version: 2.6.5
  resolution: "@develar/schema-utils@npm:2.6.5"
@@ -4558,38 +4558,38 @@ __metadata:
  languageName: node
  linkType: hard

-"@libsql/client@npm:0.14.0, @libsql/client@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@libsql/client@npm:0.14.0"
+"@libsql/client@npm:0.15.15, @libsql/client@npm:^0.15.15":
+  version: 0.15.15
+  resolution: "@libsql/client@npm:0.15.15"
  dependencies:
-    "@libsql/core": "npm:^0.14.0"
+    "@libsql/core": "npm:^0.15.14"
    "@libsql/hrana-client": "npm:^0.7.0"
    js-base64: "npm:^3.7.5"
-    libsql: "npm:^0.4.4"
+    libsql: "npm:^0.5.22"
    promise-limit: "npm:^2.7.0"
-  checksum: 10c0/9c6bab468453df765f647422c772af3578f1e108b663a80b99063f47ed3542db26ae0fcdba2e153d72e6d5089c5caeba947a167a6c065b0191a0832621539335
+  checksum: 10c0/1ae67280ebe27903ff142b07e2a256c22ef5ada65185286a72823e8eae8d9d2602e0d72e423d3bd64ae57494791bfffff946aa0fc7c2378b55a227ff63f8df69
  languageName: node
  linkType: hard

-"@libsql/core@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@libsql/core@npm:0.14.0"
+"@libsql/core@npm:^0.15.14":
+  version: 0.15.15
+  resolution: "@libsql/core@npm:0.15.15"
  dependencies:
    js-base64: "npm:^3.7.5"
-  checksum: 10c0/327bb991cf191d5a9a9fc0cc1a17123f7ca88f222187a3bde845fbad8ceaeaa1f139882080e4b2969da57b83e576c52702572e2838d1743c6bff75f95e6f774a
+  checksum: 10c0/0a619689c9504f4239d9745882a128b81e2f6c0547352bbb0d36932261c053bbcbea4435a17f91abe61556bb791f2f1203b36c36b2d4b4f369953d7949bdc40e
  languageName: node
  linkType: hard

-"@libsql/darwin-arm64@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/darwin-arm64@npm:0.4.7"
+"@libsql/darwin-arm64@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/darwin-arm64@npm:0.5.22"
  conditions: os=darwin & cpu=arm64
  languageName: node
  linkType: hard

-"@libsql/darwin-x64@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/darwin-x64@npm:0.4.7"
+"@libsql/darwin-x64@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/darwin-x64@npm:0.5.22"
  conditions: os=darwin & cpu=x64
  languageName: node
  linkType: hard
@@ -4623,38 +4623,52 @@ __metadata:
  languageName: node
  linkType: hard

-"@libsql/linux-arm64-gnu@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/linux-arm64-gnu@npm:0.4.7"
+"@libsql/linux-arm-gnueabihf@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-arm-gnueabihf@npm:0.5.22"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@libsql/linux-arm-musleabihf@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-arm-musleabihf@npm:0.5.22"
+  conditions: os=linux & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@libsql/linux-arm64-gnu@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-arm64-gnu@npm:0.5.22"
  conditions: os=linux & cpu=arm64
  languageName: node
  linkType: hard

-"@libsql/linux-arm64-musl@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/linux-arm64-musl@npm:0.4.7"
+"@libsql/linux-arm64-musl@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-arm64-musl@npm:0.5.22"
  conditions: os=linux & cpu=arm64
  languageName: node
  linkType: hard

-"@libsql/linux-x64-gnu@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/linux-x64-gnu@npm:0.4.7"
+"@libsql/linux-x64-gnu@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-x64-gnu@npm:0.5.22"
  conditions: os=linux & cpu=x64
  languageName: node
  linkType: hard

-"@libsql/linux-x64-musl@npm:0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/linux-x64-musl@npm:0.4.7"
+"@libsql/linux-x64-musl@npm:0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/linux-x64-musl@npm:0.5.22"
  conditions: os=linux & cpu=x64
  languageName: node
  linkType: hard

-"@libsql/win32-x64-msvc@npm:0.4.7, @libsql/win32-x64-msvc@npm:^0.4.7":
-  version: 0.4.7
-  resolution: "@libsql/win32-x64-msvc@npm:0.4.7"
-  checksum: 10c0/2fcb8715b6f0571dec145eaaf3fd53c7c5aa5bf408fe1be9d84b10adc8a909bb6ee60b45e0d7052b0c1722c30ac212356a3f1adcdf7f57d5a59b48f36ca5bdf5
+"@libsql/win32-x64-msvc@npm:0.5.22, @libsql/win32-x64-msvc@npm:^0.5.22":
+  version: 0.5.22
+  resolution: "@libsql/win32-x64-msvc@npm:0.5.22"
+  checksum: 10c0/1bb2730563c603c03a229faa352897685648659d85ba0872dda60cc02abc469fbd55539ffd8b86c81d00230d76292e5a4d2a763fe44c05694612ce6db6e929aa
  conditions: os=win32 & cpu=x64
  languageName: node
  linkType: hard
@@ -7128,14 +7142,6 @@ __metadata:
  languageName: node
  linkType: hard

-"@strongtz/win32-arm64-msvc@npm:^0.4.7":
-  version: 0.4.7
-  resolution: "@strongtz/win32-arm64-msvc@npm:0.4.7"
-  checksum: 10c0/21946f2ed43ff0b2381f945e22cf7f5ef6de412347c36523ed1d72f33591b2b85bf4cc9dd493f0eab95ed5e152d3944a2329791c3d8ed88c7ad450ccd9078015
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@svta/common-media-library@npm:^0.12.4":
  version: 0.12.4
  resolution: "@svta/common-media-library@npm:0.12.4"
@@ -9922,7 +9928,6 @@ __metadata:
    "@biomejs/biome": "npm:2.2.4"
    "@cherrystudio/ai-core": "workspace:^1.0.9"
    "@cherrystudio/embedjs": "npm:^0.1.31"
-    "@cherrystudio/embedjs-libsql": "npm:^0.1.31"
    "@cherrystudio/embedjs-loader-csv": "npm:^0.1.31"
    "@cherrystudio/embedjs-loader-image": "npm:^0.1.31"
    "@cherrystudio/embedjs-loader-markdown": "npm:^0.1.31"
@@ -9935,6 +9940,7 @@ __metadata:
    "@cherrystudio/embedjs-openai": "npm:^0.1.31"
    "@cherrystudio/extension-table-plus": "workspace:^"
    "@cherrystudio/openai": "npm:^6.9.0"
+    "@defi-failure/embedjs-libsql": "npm:0.1.33"
    "@dnd-kit/core": "npm:^6.3.1"
    "@dnd-kit/modifiers": "npm:^9.0.0"
    "@dnd-kit/sortable": "npm:^10.0.0"
@@ -9953,8 +9959,8 @@ __metadata:
    "@langchain/community": "npm:^1.0.0"
    "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch"
    "@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch"
-    "@libsql/client": "npm:0.14.0"
-    "@libsql/win32-x64-msvc": "npm:^0.4.7"
+    "@libsql/client": "npm:0.15.15"
+    "@libsql/win32-x64-msvc": "npm:^0.5.22"
    "@mistralai/mistralai": "npm:^1.7.5"
    "@modelcontextprotocol/sdk": "npm:^1.17.5"
    "@mozilla/readability": "npm:^0.6.0"
@@ -9973,7 +9979,6 @@ __metadata:
    "@radix-ui/react-context-menu": "npm:^2.2.16"
    "@reduxjs/toolkit": "npm:^2.2.5"
    "@shikijs/markdown-it": "npm:^3.12.0"
-    "@strongtz/win32-arm64-msvc": "npm:^0.4.7"
    "@swc/plugin-styled-components": "npm:^8.0.4"
    "@tailwindcss/vite": "npm:^4.1.13"
    "@tanstack/react-query": "npm:^5.85.5"
@@ -10074,7 +10079,6 @@ __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"
@@ -10108,6 +10112,7 @@ __metadata:
    jest-styled-components: "npm:^7.2.0"
    js-yaml: "npm:^4.1.0"
    jsdom: "npm:26.1.0"
+    libsql: "npm:^0.5.22"
    linguist-languages: "npm:^8.1.0"
    lint-staged: "npm:^15.5.0"
    lodash: "npm:^4.17.21"
@@ -13656,13 +13661,6 @@ __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"
@@ -17275,17 +17273,19 @@ __metadata:
  languageName: node
  linkType: hard

-"libsql@npm:0.4.7":
-  version: 0.4.7
-  resolution: "libsql@npm:0.4.7"
+"libsql@npm:^0.5.22":
+  version: 0.5.22
+  resolution: "libsql@npm:0.5.22"
  dependencies:
-    "@libsql/darwin-arm64": "npm:0.4.7"
-    "@libsql/darwin-x64": "npm:0.4.7"
-    "@libsql/linux-arm64-gnu": "npm:0.4.7"
-    "@libsql/linux-arm64-musl": "npm:0.4.7"
-    "@libsql/linux-x64-gnu": "npm:0.4.7"
-    "@libsql/linux-x64-musl": "npm:0.4.7"
-    "@libsql/win32-x64-msvc": "npm:0.4.7"
+    "@libsql/darwin-arm64": "npm:0.5.22"
+    "@libsql/darwin-x64": "npm:0.5.22"
+    "@libsql/linux-arm-gnueabihf": "npm:0.5.22"
+    "@libsql/linux-arm-musleabihf": "npm:0.5.22"
+    "@libsql/linux-arm64-gnu": "npm:0.5.22"
+    "@libsql/linux-arm64-musl": "npm:0.5.22"
+    "@libsql/linux-x64-gnu": "npm:0.5.22"
+    "@libsql/linux-x64-musl": "npm:0.5.22"
+    "@libsql/win32-x64-msvc": "npm:0.5.22"
    "@neon-rs/load": "npm:^0.0.4"
    detect-libc: "npm:2.0.2"
  dependenciesMeta:
@@ -17293,6 +17293,10 @@ __metadata:
      optional: true
    "@libsql/darwin-x64":
      optional: true
+    "@libsql/linux-arm-gnueabihf":
+      optional: true
+    "@libsql/linux-arm-musleabihf":
+      optional: true
    "@libsql/linux-arm64-gnu":
      optional: true
    "@libsql/linux-arm64-musl":
@@ -17303,41 +17307,8 @@ __metadata:
      optional: true
    "@libsql/win32-x64-msvc":
      optional: true
-  checksum: 10c0/351952440e6bad3477e5f1bb1b9d6570d16e403b894f4a13c5c7e183a1307b2fb04a2fa902728cb8594a259e1726c51c61b822d545bbc88319b126ad15468a87
-  conditions: (os=darwin | os=linux | os=win32) & (cpu=x64 | cpu=arm64 | cpu=wasm32)
-  languageName: node
-  linkType: hard
-
-"libsql@patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch":
-  version: 0.4.7
-  resolution: "libsql@patch:libsql@npm%3A0.4.7#~/.yarn/patches/libsql-npm-0.4.7-444e260fb1.patch::version=0.4.7&hash=972e11"
-  dependencies:
-    "@libsql/darwin-arm64": "npm:0.4.7"
-    "@libsql/darwin-x64": "npm:0.4.7"
-    "@libsql/linux-arm64-gnu": "npm:0.4.7"
-    "@libsql/linux-arm64-musl": "npm:0.4.7"
-    "@libsql/linux-x64-gnu": "npm:0.4.7"
-    "@libsql/linux-x64-musl": "npm:0.4.7"
-    "@libsql/win32-x64-msvc": "npm:0.4.7"
-    "@neon-rs/load": "npm:^0.0.4"
-    detect-libc: "npm:2.0.2"
-  dependenciesMeta:
-    "@libsql/darwin-arm64":
-      optional: true
-    "@libsql/darwin-x64":
-      optional: true
-    "@libsql/linux-arm64-gnu":
-      optional: true
-    "@libsql/linux-arm64-musl":
-      optional: true
-    "@libsql/linux-x64-gnu":
-      optional: true
-    "@libsql/linux-x64-musl":
-      optional: true
-    "@libsql/win32-x64-msvc":
-      optional: true
-  checksum: 10c0/6098770dc6c31ae0dbfe0821719d184d9bb353ac92553923096f6e3420d3786f240f0b3858f519af0aeada93beb4aa83cb9a9a1a6aa18d625511b484dcb53d07
-  conditions: (os=darwin | os=linux | os=win32) & (cpu=x64 | cpu=arm64 | cpu=wasm32)
+  checksum: 10c0/6c34f08fc7408ebee16708ba12e5def9d1b2a4fa166070c956a120133ba9be68ec532e2d0b76bdc7005ef9ef69bf70d2ba7208ed824c4288c2a3d881edd5eaf6
+  conditions: (os=darwin | os=linux | os=win32) & (cpu=x64 | cpu=arm64 | cpu=wasm32 | cpu=arm)
  languageName: node
  linkType: hard