chore: update release notes for v1.7.1

docs: update CLAUDE.md with PR workflow details

Add critical section about Pull Request workflow requirements including reading the template, following all sections, never skipping, and proper formatting

.github/workflows/auto-i18n.yml

@@ -77,7 +77,7 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }} # Use the built-in GITHUB_TOKEN for bot actions
           commit-message: "feat(bot): Weekly automated script run"
-          title: "🤖 Weekly Automated Update: ${{ env.CURRENT_DATE }}"
+          title: "🤖 Weekly Auto I18N Sync: ${{ env.CURRENT_DATE }}"
           body: |
             This PR includes changes generated by the weekly auto i18n.
             Review the changes before merging.

.oxlintrc.json

@@ -11,6 +11,7 @@
     "dist/**",
     "out/**",
     "local/**",
+    "tests/**",
     ".yarn/**",
     ".gitignore",
     "scripts/cloudflare-worker.js",

.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch

@@ -1,8 +1,8 @@
 diff --git a/dist/index.js b/dist/index.js
-index ff305b112779b718f21a636a27b1196125a332d9..cf32ff5086d4d9e56f8fe90c98724559083bafc3 100644
+index 51ce7e423934fb717cb90245cdfcdb3dae6780e6..0f7f7009e2f41a79a8669d38c8a44867bbff5e1f 100644
 --- a/dist/index.js
 +++ b/dist/index.js
-@@ -471,7 +471,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -474,7 +474,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {
@@ -12,10 +12,10 @@ index ff305b112779b718f21a636a27b1196125a332d9..cf32ff5086d4d9e56f8fe90c98724559
  
  // src/google-generative-ai-options.ts
 diff --git a/dist/index.mjs b/dist/index.mjs
-index 57659290f1cec74878a385626ad75b2a4d5cd3fc..d04e5927ec3725b6ffdb80868bfa1b5a48849537 100644
+index f4b77e35c0cbfece85a3ef0d4f4e67aa6dde6271..8d2fecf8155a226006a0bde72b00b6036d4014b6 100644
 --- a/dist/index.mjs
 +++ b/dist/index.mjs
-@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+@@ -480,7 +480,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
  
  // src/get-model-path.ts
  function getModelPath(modelId) {

.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch

@@ -1,131 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index b3f018730a93639aad7c203f15fb1aeb766c73f4..ade2a43d66e9184799d072153df61ef7be4ea110 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -296,7 +296,14 @@ var HuggingFaceResponsesLanguageModel = class {
-       metadata: huggingfaceOptions == null ? void 0 : huggingfaceOptions.metadata,
-       instructions: huggingfaceOptions == null ? void 0 : huggingfaceOptions.instructions,
-       ...preparedTools && { tools: preparedTools },
--      ...preparedToolChoice && { tool_choice: preparedToolChoice }
-+      ...preparedToolChoice && { tool_choice: preparedToolChoice },
-+      ...(huggingfaceOptions?.reasoningEffort != null && {
-+        reasoning: {
-+          ...(huggingfaceOptions?.reasoningEffort != null && {
-+            effort: huggingfaceOptions.reasoningEffort,
-+          }),
-+        },
-+      }),
-     };
-     return { args: baseArgs, warnings };
-   }
-@@ -365,6 +372,20 @@ var HuggingFaceResponsesLanguageModel = class {
-           }
-           break;
-         }
-+        case 'reasoning': {
-+          for (const contentPart of part.content) {
-+            content.push({
-+              type: 'reasoning',
-+              text: contentPart.text,
-+              providerMetadata: {
-+                huggingface: {
-+                  itemId: part.id,
-+                },
-+              },
-+            });
-+          }
-+          break;
-+        }
-         case "mcp_call": {
-           content.push({
-             type: "tool-call",
-@@ -519,6 +540,11 @@ var HuggingFaceResponsesLanguageModel = class {
-                   id: value.item.call_id,
-                   toolName: value.item.name
-                 });
-+              } else if (value.item.type === 'reasoning') {
-+                controller.enqueue({
-+                  type: 'reasoning-start',
-+                  id: value.item.id,
-+                });
-               }
-               return;
-             }
-@@ -570,6 +596,22 @@ var HuggingFaceResponsesLanguageModel = class {
-               });
-               return;
-             }
-+            if (isReasoningDeltaChunk(value)) {
-+              controller.enqueue({
-+                type: 'reasoning-delta',
-+                id: value.item_id,
-+                delta: value.delta,
-+              });
-+              return;
-+            }
-+
-+            if (isReasoningEndChunk(value)) {
-+              controller.enqueue({
-+                type: 'reasoning-end',
-+                id: value.item_id,
-+              });
-+              return;
-+            }
-           },
-           flush(controller) {
-             controller.enqueue({
-@@ -593,7 +635,8 @@ var HuggingFaceResponsesLanguageModel = class {
- var huggingfaceResponsesProviderOptionsSchema = z2.object({
-   metadata: z2.record(z2.string(), z2.string()).optional(),
-   instructions: z2.string().optional(),
--  strictJsonSchema: z2.boolean().optional()
-+  strictJsonSchema: z2.boolean().optional(),
-+  reasoningEffort: z2.string().optional(),
- });
- var huggingfaceResponsesResponseSchema = z2.object({
-   id: z2.string(),
-@@ -727,12 +770,31 @@ var responseCreatedChunkSchema = z2.object({
-     model: z2.string()
-   })
- });
-+var reasoningTextDeltaChunkSchema = z2.object({
-+  type: z2.literal('response.reasoning_text.delta'),
-+  item_id: z2.string(),
-+  output_index: z2.number(),
-+  content_index: z2.number(),
-+  delta: z2.string(),
-+  sequence_number: z2.number(),
-+});
-+
-+var reasoningTextEndChunkSchema = z2.object({
-+  type: z2.literal('response.reasoning_text.done'),
-+  item_id: z2.string(),
-+  output_index: z2.number(),
-+  content_index: z2.number(),
-+  text: z2.string(),
-+  sequence_number: z2.number(),
-+});
- var huggingfaceResponsesChunkSchema = z2.union([
-   responseOutputItemAddedSchema,
-   responseOutputItemDoneSchema,
-   textDeltaChunkSchema,
-   responseCompletedChunkSchema,
-   responseCreatedChunkSchema,
-+  reasoningTextDeltaChunkSchema,
-+  reasoningTextEndChunkSchema,
-   z2.object({ type: z2.string() }).loose()
-   // fallback for unknown chunks
- ]);
-@@ -751,6 +813,12 @@ function isResponseCompletedChunk(chunk) {
- function isResponseCreatedChunk(chunk) {
-   return chunk.type === "response.created";
- }
-+function isReasoningDeltaChunk(chunk) {
-+  return chunk.type === 'response.reasoning_text.delta';
-+}
-+function isReasoningEndChunk(chunk) {
-+  return chunk.type === 'response.reasoning_text.done';
-+}
- 
- // src/huggingface-provider.ts
- function createHuggingFace(options = {}) {

.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch

@@ -0,0 +1,140 @@
+diff --git a/dist/index.js b/dist/index.js
+index 73045a7d38faafdc7f7d2cd79d7ff0e2b031056b..8d948c9ac4ea4b474db9ef3c5491961e7fcf9a07 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -421,6 +421,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -598,6 +609,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -765,6 +787,14 @@ var OpenAICompatibleChatResponseSchema = import_v43.z.object({
+               arguments: import_v43.z.string()
+             })
+           })
++        ).nullish(),
++        images: import_v43.z.array(
++          import_v43.z.object({
++            type: import_v43.z.literal('image_url'),
++            image_url: import_v43.z.object({
++              url: import_v43.z.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: import_v43.z.string().nullish()
+@@ -795,6 +825,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => import_v43.z.union(
+                 arguments: import_v43.z.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: import_v43.z.array(
++            import_v43.z.object({
++              type: import_v43.z.literal('image_url'),
++              image_url: import_v43.z.object({
++                url: import_v43.z.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: import_v43.z.string().nullish()
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 1c2b9560bbfbfe10cb01af080aeeed4ff59db29c..2c8ddc4fc9bfc5e7e06cfca105d197a08864c427 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -405,6 +405,17 @@ var OpenAICompatibleChatLanguageModel = class {
+         text: reasoning
+       });
+     }
++    if (choice.message.images) {
++      for (const image of choice.message.images) {
++        const match1 = image.image_url.url.match(/^data:([^;]+)/)
++        const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++        content.push({
++          type: 'file',
++          mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++          data: match2 ? match2[1] : image.image_url.url,
++        });
++      }
++    }
+     if (choice.message.tool_calls != null) {
+       for (const toolCall of choice.message.tool_calls) {
+         content.push({
+@@ -582,6 +593,17 @@ var OpenAICompatibleChatLanguageModel = class {
+                 delta: delta.content
+               });
+             }
++            if (delta.images) {
++              for (const image of delta.images) {
++                const match1 = image.image_url.url.match(/^data:([^;]+)/)
++                const match2 = image.image_url.url.match(/^data:[^;]*;base64,(.+)$/);
++                controller.enqueue({
++                  type: 'file',
++                  mediaType: match1 ? (match1[1] ?? 'image/jpeg') : 'image/jpeg',
++                  data: match2 ? match2[1] : image.image_url.url,
++                });
++              }
++            }
+             if (delta.tool_calls != null) {
+               for (const toolCallDelta of delta.tool_calls) {
+                 const index = toolCallDelta.index;
+@@ -749,6 +771,14 @@ var OpenAICompatibleChatResponseSchema = z3.object({
+               arguments: z3.string()
+             })
+           })
++        ).nullish(),
++        images: z3.array(
++          z3.object({
++            type: z3.literal('image_url'),
++            image_url: z3.object({
++              url: z3.string(),
++            })
++          })
+         ).nullish()
+       }),
+       finish_reason: z3.string().nullish()
+@@ -779,6 +809,14 @@ var createOpenAICompatibleChatChunkSchema = (errorSchema) => z3.union([
+                 arguments: z3.string().nullish()
+               })
+             })
++          ).nullish(),
++          images: z3.array(
++            z3.object({
++              type: z3.literal('image_url'),
++              image_url: z3.object({
++                url: z3.string(),
++              })
++            })
+           ).nullish()
+         }).nullish(),
+         finish_reason: z3.string().nullish()

.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch

@@ -1,5 +1,5 @@
 diff --git a/dist/index.js b/dist/index.js
-index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa96b52ac0d 100644
+index bf900591bf2847a3253fe441aad24c06da19c6c1..c1d9bb6fefa2df1383339324073db0a70ea2b5a2 100644
 --- a/dist/index.js
 +++ b/dist/index.js
 @@ -274,6 +274,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
@@ -18,7 +18,7 @@ index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa9
                tool_calls: import_v42.z.array(
                  import_v42.z.object({
                    index: import_v42.z.number(),
-@@ -785,6 +787,13 @@ var OpenAIChatLanguageModel = class {
+@@ -795,6 +797,13 @@ var OpenAIChatLanguageModel = class {
      if (text != null && text.length > 0) {
        content.push({ type: "text", text });
      }
@@ -32,7 +32,7 @@ index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa9
      for (const toolCall of (_a = choice.message.tool_calls) != null ? _a : []) {
        content.push({
          type: "tool-call",
-@@ -866,6 +875,7 @@ var OpenAIChatLanguageModel = class {
+@@ -876,6 +885,7 @@ var OpenAIChatLanguageModel = class {
      };
      let metadataExtracted = false;
      let isActiveText = false;
@@ -40,7 +40,7 @@ index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa9
      const providerMetadata = { openai: {} };
      return {
        stream: response.pipeThrough(
-@@ -923,6 +933,21 @@ var OpenAIChatLanguageModel = class {
+@@ -933,6 +943,21 @@ var OpenAIChatLanguageModel = class {
                return;
              }
              const delta = choice.delta;
@@ -62,7 +62,7 @@ index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa9
              if (delta.content != null) {
                if (!isActiveText) {
                  controller.enqueue({ type: "text-start", id: "0" });
-@@ -1035,6 +1060,9 @@ var OpenAIChatLanguageModel = class {
+@@ -1045,6 +1070,9 @@ var OpenAIChatLanguageModel = class {
              }
            },
            flush(controller) {

.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch

@@ -1,8 +1,8 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index 8cc6aaf0b25bcdf3c579ec95cde12d419fcb2a71..3b3b8beaea5ad2bbac26a15f792058306d0b059f 100755
+index bf429a344b7d59f70aead16b639f949b07688a81..f77d50cc5d3fb04292cb3ac7fa7085d02dcc628f 100755
 --- a/sdk.mjs
 +++ b/sdk.mjs
-@@ -6213,7 +6213,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
+@@ -6250,7 +6250,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
  }
  
  // ../src/transport/ProcessTransport.ts
@@ -11,16 +11,20 @@ index 8cc6aaf0b25bcdf3c579ec95cde12d419fcb2a71..3b3b8beaea5ad2bbac26a15f79205830
  import { createInterface } from "readline";
  
  // ../src/utils/fsOperations.ts
-@@ -6505,14 +6505,11 @@ class ProcessTransport {
+@@ -6619,18 +6619,11 @@ class ProcessTransport {
          const errorMessage = isNativeBinary(pathToClaudeCodeExecutable) ? `Claude Code native binary not found at ${pathToClaudeCodeExecutable}. Please ensure Claude Code is installed via native installer or specify a valid path with options.pathToClaudeCodeExecutable.` : `Claude Code executable not found at ${pathToClaudeCodeExecutable}. Is options.pathToClaudeCodeExecutable set?`;
          throw new ReferenceError(errorMessage);
        }
 -      const isNative = isNativeBinary(pathToClaudeCodeExecutable);
 -      const spawnCommand = isNative ? pathToClaudeCodeExecutable : executable;
 -      const spawnArgs = isNative ? [...executableArgs, ...args] : [...executableArgs, pathToClaudeCodeExecutable, ...args];
--      this.logForDebugging(isNative ? `Spawning Claude Code native binary: ${spawnCommand} ${spawnArgs.join(" ")}` : `Spawning Claude Code process: ${spawnCommand} ${spawnArgs.join(" ")}`);
-+      this.logForDebugging(`Forking Claude Code Node.js process: ${pathToClaudeCodeExecutable} ${args.join(" ")}`);
-       const stderrMode = env.DEBUG || stderr ? "pipe" : "ignore";
+-      const spawnMessage = isNative ? `Spawning Claude Code native binary: ${spawnCommand} ${spawnArgs.join(" ")}` : `Spawning Claude Code process: ${spawnCommand} ${spawnArgs.join(" ")}`;
+-      logForSdkDebugging(spawnMessage);
+-      if (stderr) {
+-        stderr(spawnMessage);
+-      }
++      logForSdkDebugging(`Forking Claude Code Node.js process: ${pathToClaudeCodeExecutable} ${args.join(" ")}`);
+       const stderrMode = env.DEBUG_CLAUDE_AGENT_SDK || stderr ? "pipe" : "ignore";
 -      this.child = spawn(spawnCommand, spawnArgs, {
 +      this.child = fork(pathToClaudeCodeExecutable, args, {
          cwd,

CLAUDE.md

@@ -10,8 +10,18 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Log centrally**: Route all logging through `loggerService` with the right context—no `console.log`.
 - **Research via subagent**: Lean on `subagent` for external docs, APIs, news, and references.
 - **Always propose before executing**: Before making any changes, clearly explain your planned approach and wait for explicit user approval to ensure alignment and prevent unwanted modifications.
+- **Lint, test, and format before completion**: Coding tasks are only complete after running `yarn lint`, `yarn test`, and `yarn format` successfully.
 - **Write conventional commits**: Commit small, focused changes using Conventional Commit messages (e.g., `feat:`, `fix:`, `refactor:`, `docs:`).
 
+## Pull Request Workflow (CRITICAL)
+
+When creating a Pull Request, you MUST:
+
+1. **Read the PR template first**: Always read `.github/pull_request_template.md` before creating the PR
+2. **Follow ALL template sections**: Structure the `--body` parameter to include every section from the template
+3. **Never skip sections**: Include all sections even if marking them as N/A or "None"
+4. **Use proper formatting**: Match the template's markdown structure exactly (headings, checkboxes, code blocks)
+
 ## Development Commands
 
 - **Install**: `yarn install` - Install all project dependencies

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-[中文](docs/CONTRIBUTING.zh.md) | [English](CONTRIBUTING.md)
+[中文](docs/zh/guides/contributing.md) | [English](CONTRIBUTING.md)
 
 # Cherry Studio Contributor Guide
 
@@ -32,7 +32,7 @@ To help you get familiar with the codebase, we recommend tackling issues tagged
 
 ### Testing
 
-Features without tests are considered non-existent. To ensure code is truly effective, relevant processes should be covered by unit tests and functional tests. Therefore, when considering contributions, please also consider testability. All tests can be run locally without dependency on CI. Please refer to the "Testing" section in the [Developer Guide](docs/dev.md).
+Features without tests are considered non-existent. To ensure code is truly effective, relevant processes should be covered by unit tests and functional tests. Therefore, when considering contributions, please also consider testability. All tests can be run locally without dependency on CI. Please refer to the "Testing" section in the [Developer Guide](docs/zh/guides/development.md).
 
 ### Automated Testing for Pull Requests
 
@@ -60,7 +60,7 @@ Maintainers are here to help you implement your use case within a reasonable tim
 
 ### Participating in the Test Plan
 
-The Test Plan aims to provide users with a more stable application experience and faster iteration speed. For details, please refer to the [Test Plan](docs/testplan-en.md).
+The Test Plan aims to provide users with a more stable application experience and faster iteration speed. For details, please refer to the [Test Plan](docs/en/guides/test-plan.md).
 
 ### Other Suggestions
 

README.md

@@ -34,7 +34,7 @@
   </a>
 </h1>
 
-<p align="center">English | <a href="./docs/README.zh.md">中文</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/dev.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
+<p align="center">English | <a href="./docs/zh/README.md">中文</a> | <a href="https://cherry-ai.com">Official Site</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/en-us">Documents</a> | <a href="./docs/en/guides/development.md">Development</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">Feedback</a><br></p>
 
 <div align="center">
 
@@ -67,7 +67,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 
 👏 Join [Telegram Group](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ Group(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
 
-❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/sponsor.md) to support the development!
+❤️ Like Cherry Studio? Give it a star 🌟 or [Sponsor](docs/zh/guides/sponsor.md) to support the development!
 
 # 🌠 Screenshot
 
@@ -175,7 +175,7 @@ We welcome contributions to Cherry Studio! Here are some ways you can contribute
 6. **Community Engagement**: Join discussions and help users.
 7. **Promote Usage**: Spread the word about Cherry Studio.
 
-Refer to the [Branching Strategy](docs/branching-strategy-en.md) for contribution guidelines
+Refer to the [Branching Strategy](docs/en/guides/branching-strategy.md) for contribution guidelines
 
 ## Getting Started
 

biome.jsonc

@@ -14,7 +14,7 @@
       }
     },
     "enabled": true,
-    "includes": ["**/*.json", "!*.json", "!**/package.json"]
+    "includes": ["**/*.json", "!*.json", "!**/package.json", "!coverage/**"]
   },
   "css": {
     "formatter": {
@@ -23,7 +23,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/.claude/**"],
+    "includes": ["**", "!**/.claude/**", "!**/.vscode/**"],
     "maxSize": 2097152
   },
   "formatter": {

docs/README.md

@@ -0,0 +1,81 @@
+# Cherry Studio Documentation / 文档
+
+This directory contains the project documentation in multiple languages.
+
+本目录包含多语言项目文档。
+
+---
+
+## Languages / 语言
+
+- **[中文文档](./zh/README.md)** - Chinese Documentation
+- **English Documentation** - See sections below
+
+---
+
+## English Documentation
+
+### Guides
+
+| Document | Description |
+|----------|-------------|
+| [Development Setup](./en/guides/development.md) | Development environment setup |
+| [Branching Strategy](./en/guides/branching-strategy.md) | Git branching workflow |
+| [i18n Guide](./en/guides/i18n.md) | Internationalization guide |
+| [Logging Guide](./en/guides/logging.md) | How to use the logger service |
+| [Test Plan](./en/guides/test-plan.md) | Test plan and release channels |
+
+### References
+
+| Document | Description |
+|----------|-------------|
+| [App Upgrade Config](./en/references/app-upgrade.md) | Application upgrade configuration |
+| [CodeBlockView Component](./en/references/components/code-block-view.md) | Code block view component |
+| [Image Preview Components](./en/references/components/image-preview.md) | Image preview components |
+
+---
+
+## 中文文档
+
+### 指南 (Guides)
+
+| 文档 | 说明 |
+|------|------|
+| [开发环境设置](./zh/guides/development.md) | 开发环境配置 |
+| [贡献指南](./zh/guides/contributing.md) | 如何贡献代码 |
+| [分支策略](./zh/guides/branching-strategy.md) | Git 分支工作流 |
+| [测试计划](./zh/guides/test-plan.md) | 测试计划和发布通道 |
+| [国际化指南](./zh/guides/i18n.md) | 国际化开发指南 |
+| [日志使用指南](./zh/guides/logging.md) | 如何使用日志服务 |
+| [中间件开发](./zh/guides/middleware.md) | 如何编写中间件 |
+| [记忆功能](./zh/guides/memory.md) | 记忆功能使用指南 |
+| [赞助信息](./zh/guides/sponsor.md) | 赞助相关信息 |
+
+### 参考 (References)
+
+| 文档 | 说明 |
+|------|------|
+| [消息系统](./zh/references/message-system.md) | 消息系统架构和 API |
+| [数据库结构](./zh/references/database.md) | 数据库表结构 |
+| [服务](./zh/references/services.md) | 服务层文档 (KnowledgeService) |
+| [代码执行](./zh/references/code-execution.md) | 代码执行功能 |
+| [应用升级配置](./zh/references/app-upgrade.md) | 应用升级配置 |
+| [CodeBlockView 组件](./zh/references/components/code-block-view.md) | 代码块视图组件 |
+| [图像预览组件](./zh/references/components/image-preview.md) | 图像预览组件 |
+
+---
+
+## Missing Translations / 缺少翻译
+
+The following documents are only available in Chinese and need English translations:
+
+以下文档仅有中文版本，需要英文翻译：
+
+- `guides/contributing.md`
+- `guides/memory.md`
+- `guides/middleware.md`
+- `guides/sponsor.md`
+- `references/message-system.md`
+- `references/database.md`
+- `references/services.md`
+- `references/code-execution.md`

docs/en/guides/branching-strategy.md

@@ -16,7 +16,7 @@ Cherry Studio implements a structured branching strategy to maintain code qualit
   - Only accepts documentation updates and bug fixes
   - Thoroughly tested before production deployment
 
-For details about the `testplan` branch used in the Test Plan, please refer to the [Test Plan](testplan-en.md).
+For details about the `testplan` branch used in the Test Plan, please refer to the [Test Plan](./test-plan.md).
 
 ## Contributing Branches
 

docs/en/guides/i18n.md

@@ -18,11 +18,11 @@ The plugin has already been configured in the project — simply install it to g
 
 ### Demo
 
-![demo-1](./.assets.how-to-i18n/demo-1.png)
+![demo-1](../../assets/images/i18n/demo-1.png)
 
-![demo-2](./.assets.how-to-i18n/demo-2.png)
+![demo-2](../../assets/images/i18n/demo-2.png)
 
-![demo-3](./.assets.how-to-i18n/demo-3.png)
+![demo-3](../../assets/images/i18n/demo-3.png)
 
 ## i18n Conventions
 

docs/en/guides/test-plan.md

@@ -19,7 +19,7 @@ Users are welcome to submit issues or provide feedback through other channels fo
 
 ### Participating in the Test Plan
 
-Developers should submit `PRs` according to the [Contributor Guide](../CONTRIBUTING.md) (and ensure the target branch is `main`). The repository maintainers will evaluate whether the `PR` should be included in the Test Plan based on factors such as the impact of the feature on the application, its importance, and whether broader testing is needed.
+Developers should submit `PRs` according to the [Contributor Guide](../../CONTRIBUTING.md) (and ensure the target branch is `main`). The repository maintainers will evaluate whether the `PR` should be included in the Test Plan based on factors such as the impact of the feature on the application, its importance, and whether broader testing is needed.
 
 If the `PR` is added to the Test Plan, the repository maintainers will:
 

docs/en/references/components/code-block-view.md

@@ -85,7 +85,7 @@ Main responsibilities:
 - **SvgPreview**: SVG image preview
 - **GraphvizPreview**: Graphviz diagram preview
 
-All special view components share a common architecture for consistent user experience and functionality. For detailed information about these components and their implementation, see [Image Preview Components Documentation](./ImagePreview-en.md).
+All special view components share a common architecture for consistent user experience and functionality. For detailed information about these components and their implementation, see [Image Preview Components Documentation](./image-preview.md).
 
 #### StatusBar
 

docs/en/references/components/image-preview.md

@@ -192,4 +192,4 @@ Image Preview Components integrate seamlessly with CodeBlockView:
 - Shared state management
 - Responsive layout adaptation
 
-For more information about the overall CodeBlockView architecture, see [CodeBlockView Documentation](./CodeBlockView-en.md).
+For more information about the overall CodeBlockView architecture, see [CodeBlockView Documentation](./code-block-view.md).

docs/technical/Message.md

@@ -1,3 +0,0 @@
-# 消息的生命周期
-
-![image](./message-lifecycle.png)

docs/technical/db.settings.md

@@ -1,11 +0,0 @@
-# 数据库设置字段
-
-此文档包含部分字段的数据类型说明。
-
-## 字段
-
-| 字段名                         | 类型                           | 说明         |
-| ------------------------------ | ------------------------------ | ------------ |
-| `translate:target:language`    | `LanguageCode`                 | 翻译目标语言 |
-| `translate:source:language`    | `LanguageCode`                 | 翻译源语言   |
-| `translate:bidirectional:pair` | `[LanguageCode, LanguageCode]` | 双向翻译对   |

docs/technical/how-to-use-messageBlock.md

@@ -1,127 +0,0 @@
-# messageBlock.ts 使用指南
-
-该文件定义了用于管理应用程序中所有 `MessageBlock` 实体的 Redux Slice。它使用 Redux Toolkit 的 `createSlice` 和 `createEntityAdapter` 来高效地处理规范化的状态，并提供了一系列 actions 和 selectors 用于与消息块数据交互。
-
-## 核心目标
-
-- **状态管理**: 集中管理所有 `MessageBlock` 的状态。`MessageBlock` 代表消息中的不同内容单元（如文本、代码、图片、引用等）。
-- **规范化**: 使用 `createEntityAdapter` 将 `MessageBlock` 数据存储在规范化的结构中（`{ ids: [], entities: {} }`），这有助于提高性能和简化更新逻辑。
-- **可预测性**: 提供明确的 actions 来修改状态，并通过 selectors 安全地访问状态。
-
-## 关键概念
-
-- **Slice (`createSlice`)**: Redux Toolkit 的核心 API，用于创建包含 reducer 逻辑、action creators 和初始状态的 Redux 模块。
-- **Entity Adapter (`createEntityAdapter`)**: Redux Toolkit 提供的工具，用于简化对规范化数据的 CRUD（创建、读取、更新、删除）操作。它会自动生成 reducer 函数和 selectors。
-- **Selectors**: 用于从 Redux store 中派生和计算数据的函数。Selectors 可以被记忆化（memoized），以提高性能。
-
-## State 结构
-
-`messageBlocks` slice 的状态结构由 `createEntityAdapter` 定义，大致如下：
-
-```typescript
-{
-  ids: string[]; // 存储所有 MessageBlock ID 的有序列表
-  entities: { [id: string]: MessageBlock }; // 按 ID 存储 MessageBlock 对象的字典
-  loadingState: 'idle' | 'loading' | 'succeeded' | 'failed'; // (可选) 其他状态，如加载状态
-  error: string | null; // (可选) 错误信息
-}
-```
-
-## Actions
-
-该 slice 导出以下 actions (由 `createSlice` 和 `createEntityAdapter` 自动生成或自定义)：
-
-- **`upsertOneBlock(payload: MessageBlock)`**:
-
-  - 添加一个新的 `MessageBlock` 或更新一个已存在的 `MessageBlock`。如果 payload 中的 `id` 已存在，则执行更新；否则执行插入。
-
-- **`upsertManyBlocks(payload: MessageBlock[])`**:
-
-  - 添加或更新多个 `MessageBlock`。常用于批量加载数据（例如，加载一个 Topic 的所有消息块）。
-
-- **`removeOneBlock(payload: string)`**:
-
-  - 根据提供的 `id` (payload) 移除单个 `MessageBlock`。
-
-- **`removeManyBlocks(payload: string[])`**:
-
-  - 根据提供的 `id` 数组 (payload) 移除多个 `MessageBlock`。常用于删除消息或清空 Topic 时清理相关的块。
-
-- **`removeAllBlocks()`**:
-
-  - 移除 state 中的所有 `MessageBlock` 实体。
-
-- **`updateOneBlock(payload: { id: string; changes: Partial<MessageBlock> })`**:
-
-  - 更新一个已存在的 `MessageBlock`。`payload` 需要包含块的 `id` 和一个包含要更改的字段的 `changes` 对象。
-
-- **`setMessageBlocksLoading(payload: 'idle' | 'loading')`**:
-
-  - (自定义) 设置 `loadingState` 属性。
-
-- **`setMessageBlocksError(payload: string)`**:
-  - (自定义) 设置 `loadingState` 为 `'failed'` 并记录错误信息。
-
-**使用示例 (在 Thunk 或其他 Dispatch 的地方):**
-
-```typescript
-import { upsertOneBlock, removeManyBlocks, updateOneBlock } from './messageBlock'
-import store from './store' // 假设这是你的 Redux store 实例
-
-// 添加或更新一个块
-const newBlock: MessageBlock = {
-  /* ... block data ... */
-}
-store.dispatch(upsertOneBlock(newBlock))
-
-// 更新一个块的内容
-store.dispatch(updateOneBlock({ id: blockId, changes: { content: 'New content' } }))
-
-// 删除多个块
-const blockIdsToRemove = ['id1', 'id2']
-store.dispatch(removeManyBlocks(blockIdsToRemove))
-```
-
-## Selectors
-
-该 slice 导出由 `createEntityAdapter` 生成的基础 selectors，并通过 `messageBlocksSelectors` 对象访问：
-
-- **`messageBlocksSelectors.selectIds(state: RootState): string[]`**: 返回包含所有块 ID 的数组。
-- **`messageBlocksSelectors.selectEntities(state: RootState): { [id: string]: MessageBlock }`**: 返回块 ID 到块对象的映射字典。
-- **`messageBlocksSelectors.selectAll(state: RootState): MessageBlock[]`**: 返回包含所有块对象的数组。
-- **`messageBlocksSelectors.selectTotal(state: RootState): number`**: 返回块的总数。
-- **`messageBlocksSelectors.selectById(state: RootState, id: string): MessageBlock | undefined`**: 根据 ID 返回单个块对象，如果找不到则返回 `undefined`。
-
-**此外，还提供了一个自定义的、记忆化的 selector：**
-
-- **`selectFormattedCitationsByBlockId(state: RootState, blockId: string | undefined): Citation[]`**:
-  - 接收一个 `blockId`。
-  - 如果该 ID 对应的块是 `CITATION` 类型，则提取并格式化其包含的引用信息（来自网页搜索、知识库等），进行去重和重新编号，最后返回一个 `Citation[]` 数组，用于在 UI 中显示。
-  - 如果块不存在或类型不匹配，返回空数组 `[]`。
-  - 这个 selector 封装了处理不同引用来源（Gemini, OpenAI, OpenRouter, Zhipu 等）的复杂逻辑。
-
-**使用示例 (在 React 组件或 `useSelector` 中):**
-
-```typescript
-import { useSelector } from 'react-redux'
-import { messageBlocksSelectors, selectFormattedCitationsByBlockId } from './messageBlock'
-import type { RootState } from './store'
-
-// 获取所有块
-const allBlocks = useSelector(messageBlocksSelectors.selectAll)
-
-// 获取特定 ID 的块
-const specificBlock = useSelector((state: RootState) => messageBlocksSelectors.selectById(state, someBlockId))
-
-// 获取特定引用块格式化后的引用列表
-const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, citationBlockId))
-
-// 在组件中使用引用数据
-// {formattedCitations.map(citation => ...)}
-```
-
-## 集成
-
-`messageBlock.ts` slice 通常与 `messageThunk.ts` 中的 Thunks 紧密协作。Thunks 负责处理异步逻辑（如 API 调用、数据库操作），并在需要时 dispatch `messageBlock` slice 的 actions 来更新状态。例如，当 `messageThunk` 接收到流式响应时，它会 dispatch `upsertOneBlock` 或 `updateOneBlock` 来实时更新对应的 `MessageBlock`。同样，删除消息的 Thunk 会 dispatch `removeManyBlocks`。
-
-理解 `messageBlock.ts` 的职责是管理**状态本身**，而 `messageThunk.ts` 负责**触发状态变更**的异步流程，这对于维护清晰的应用架构至关重要。

docs/technical/how-to-use-messageThunk.md

@@ -1,105 +0,0 @@
-# messageThunk.ts 使用指南
-
-该文件包含用于管理应用程序中消息流、处理助手交互以及同步 Redux 状态与 IndexedDB 数据库的核心 Thunk Action Creators。主要围绕 `Message` 和 `MessageBlock` 对象进行操作。
-
-## 核心功能
-
-1.  **发送/接收消息**: 处理用户消息的发送，触发助手响应，并流式处理返回的数据，将其解析为不同的 `MessageBlock`。
-2.  **状态管理**: 确保 Redux store 中的消息和消息块状态与 IndexedDB 中的持久化数据保持一致。
-3.  **消息操作**: 提供删除、重发、重新生成、编辑后重发、追加响应、克隆等消息生命周期管理功能。
-4.  **Block 处理**: 动态创建、更新和保存各种类型的 `MessageBlock`（文本、思考过程、工具调用、引用、图片、错误、翻译等）。
-
-## 主要 Thunks
-
-以下是一些关键的 Thunk 函数及其用途：
-
-1.  **`sendMessage(userMessage, userMessageBlocks, assistant, topicId)`**
-
-    - **用途**: 发送一条新的用户消息。
-    - **流程**:
-      - 保存用户消息 (`userMessage`) 及其块 (`userMessageBlocks`) 到 Redux 和 DB。
-      - 检查 `@mentions` 以确定是单模型响应还是多模型响应。
-      - 创建助手消息(们)的存根 (Stub)。
-      - 将存根添加到 Redux 和 DB。
-      - 将核心处理逻辑 `fetchAndProcessAssistantResponseImpl` 添加到该 `topicId` 的队列中以获取实际响应。
-    - **Block 相关**: 主要处理用户消息的初始 `MessageBlock` 保存。
-
-2.  **`fetchAndProcessAssistantResponseImpl(dispatch, getState, topicId, assistant, assistantMessage)`**
-
-    - **用途**: (内部函数) 获取并处理单个助手响应的核心逻辑，被 `sendMessage`, `resend...`, `regenerate...`, `append...` 等调用。
-    - **流程**:
-      - 设置 Topic 加载状态。
-      - 准备上下文消息。
-      - 调用 `fetchChatCompletion` API 服务。
-      - 使用 `createStreamProcessor` 处理流式响应。
-      - 通过各种回调 (`onTextChunk`, `onThinkingChunk`, `onToolCallComplete`, `onImageGenerated`, `onError`, `onComplete` 等) 处理不同类型的事件。
-    - **Block 相关**:
-      - 根据流事件创建初始 `UNKNOWN` 块。
-      - 实时创建和更新 `MAIN_TEXT` 和 `THINKING` 块，使用 `throttledBlockUpdate` 和 `throttledBlockDbUpdate` 进行节流更新。
-      - 创建 `TOOL`, `CITATION`, `IMAGE`, `ERROR` 等类型的块。
-      - 在事件完成时（如 `onTextComplete`, `onToolCallComplete`）将块状态标记为 `SUCCESS` 或 `ERROR`，并使用 `saveUpdatedBlockToDB` 保存最终状态。
-      - 使用 `handleBlockTransition` 管理非流式块（如 `TOOL`, `CITATION`）的添加和状态更新。
-
-3.  **`loadTopicMessagesThunk(topicId, forceReload)`**
-
-    - **用途**: 从数据库加载指定主题的所有消息及其关联的 `MessageBlock`。
-    - **流程**:
-      - 从 DB 获取 `Topic` 及其 `messages` 列表。
-      - 根据消息 ID 列表从 DB 获取所有相关的 `MessageBlock`。
-      - 使用 `upsertManyBlocks` 将块更新到 Redux。
-      - 将消息更新到 Redux。
-    - **Block 相关**: 负责将持久化的 `MessageBlock` 加载到 Redux 状态。
-
-4.  **删除 Thunks**
-
-    - `deleteSingleMessageThunk(topicId, messageId)`: 删除单个消息及其所有 `MessageBlock`。
-    - `deleteMessageGroupThunk(topicId, askId)`: 删除一个用户消息及其所有相关的助手响应消息和它们的所有 `MessageBlock`。
-    - `clearTopicMessagesThunk(topicId)`: 清空主题下的所有消息及其所有 `MessageBlock`。
-    - **Block 相关**: 从 Redux 和 DB 中移除指定的 `MessageBlock`。
-
-5.  **重发/重新生成 Thunks**
-
-    - `resendMessageThunk(topicId, userMessageToResend, assistant)`: 重发用户消息。会重置（清空 Block 并标记为 PENDING）所有与该用户消息关联的助手响应，然后重新请求生成。
-    - `resendUserMessageWithEditThunk(topicId, originalMessage, mainTextBlockId, editedContent, assistant)`: 用户编辑消息内容后重发。先更新用户消息的 `MAIN_TEXT` 块内容，然后调用 `resendMessageThunk`。
-    - `regenerateAssistantResponseThunk(topicId, assistantMessageToRegenerate, assistant)`: 重新生成单个助手响应。重置该助手消息（清空 Block 并标记为 PENDING），然后重新请求生成。
-    - **Block 相关**: 删除旧的 `MessageBlock`，并在重新生成过程中创建新的 `MessageBlock`。
-
-6.  **`appendAssistantResponseThunk(topicId, existingAssistantMessageId, newModel, assistant)`**
-
-    - **用途**: 在已有的对话上下文中，针对同一个用户问题，使用新选择的模型追加一个新的助手响应。
-    - **流程**:
-      - 找到现有助手消息以获取原始 `askId`。
-      - 创建使用 `newModel` 的新助手消息存根（使用相同的 `askId`）。
-      - 添加新存根到 Redux 和 DB。
-      - 将 `fetchAndProcessAssistantResponseImpl` 添加到队列以生成新响应。
-    - **Block 相关**: 为新的助手响应创建全新的 `MessageBlock`。
-
-7.  **`cloneMessagesToNewTopicThunk(sourceTopicId, branchPointIndex, newTopic)`**
-
-    - **用途**: 将源主题的部分消息（及其 Block）克隆到一个**已存在**的新主题中。
-    - **流程**:
-      - 复制指定索引前的消息。
-      - 为所有克隆的消息和 Block 生成新的 UUID。
-      - 正确映射克隆消息之间的 `askId` 关系。
-      - 复制 `MessageBlock` 内容，更新其 `messageId` 指向新的消息 ID。
-      - 更新文件引用计数（如果 Block 是文件或图片）。
-      - 将克隆的消息和 Block 保存到新主题的 Redux 状态和 DB 中。
-    - **Block 相关**: 创建 `MessageBlock` 的副本，并更新其 ID 和 `messageId`。
-
-8.  **`initiateTranslationThunk(messageId, topicId, targetLanguage, sourceBlockId?, sourceLanguage?)`**
-    - **用途**: 为指定消息启动翻译流程，创建一个初始的 `TRANSLATION` 类型的 `MessageBlock`。
-    - **流程**:
-      - 创建一个状态为 `STREAMING` 的 `TranslationMessageBlock`。
-      - 将其添加到 Redux 和 DB。
-      - 更新原消息的 `blocks` 列表以包含新的翻译块 ID。
-    - **Block 相关**: 创建并保存一个占位的 `TranslationMessageBlock`。实际翻译内容的获取和填充需要后续步骤。
-
-## 内部机制和注意事项
-
-- **数据库交互**: 通过 `saveMessageAndBlocksToDB`, `updateExistingMessageAndBlocksInDB`, `saveUpdatesToDB`, `saveUpdatedBlockToDB`, `throttledBlockDbUpdate` 等辅助函数与 IndexedDB (`db`) 交互，确保数据持久化。
-- **状态同步**: Thunks 负责协调 Redux Store 和 IndexedDB 之间的数据一致性。
-- **队列 (`getTopicQueue`)**: 使用 `AsyncQueue` 确保对同一主题的操作（尤其是 API 请求）按顺序执行，避免竞态条件。
-- **节流 (`throttle`)**: 对流式响应中频繁的 Block 更新（文本、思考）使用 `lodash.throttle` 优化性能，减少 Redux dispatch 和 DB 写入次数。
-- **错误处理**: `fetchAndProcessAssistantResponseImpl` 内的回调函数（特别是 `onError`）处理流处理和 API 调用中可能出现的错误，并创建 `ERROR` 类型的 `MessageBlock`。
-
-开发者在使用这些 Thunks 时，通常需要提供 `dispatch`, `getState` (由 Redux Thunk 中间件注入)，以及如 `topicId`, `assistant` 配置对象, 相关的 `Message` 或 `MessageBlock` 对象/ID 等参数。理解每个 Thunk 的职责和它如何影响消息及块的状态至关重要。

docs/technical/how-to-use-useMessageOperations.md

@@ -1,156 +0,0 @@
-# useMessageOperations.ts 使用指南
-
-该文件定义了一个名为 `useMessageOperations` 的自定义 React Hook。这个 Hook 的主要目的是为 React 组件提供一个便捷的接口，用于执行与特定主题（Topic）相关的各种消息操作。它封装了调用 Redux Thunks (`messageThunk.ts`) 和 Actions (`newMessage.ts`, `messageBlock.ts`) 的逻辑，简化了组件与消息数据交互的代码。
-
-## 核心目标
-
-- **封装**: 将复杂的消息操作逻辑（如删除、重发、重新生成、编辑、翻译等）封装在易于使用的函数中。
-- **简化**: 让组件可以直接调用这些操作函数，而无需直接与 Redux `dispatch` 或 Thunks 交互。
-- **上下文关联**: 所有操作都与传入的 `topic` 对象相关联，确保操作作用于正确的主题。
-
-## 如何使用
-
-在你的 React 函数组件中，导入并调用 `useMessageOperations` Hook，并传入当前活动的 `Topic` 对象。
-
-```typescript
-import React from 'react';
-import { useMessageOperations } from '@renderer/hooks/useMessageOperations';
-import type { Topic, Message, Assistant, Model } from '@renderer/types';
-
-interface MyComponentProps {
-  currentTopic: Topic;
-  currentAssistant: Assistant;
-}
-
-function MyComponent({ currentTopic, currentAssistant }: MyComponentProps) {
-  const {
-    deleteMessage,
-    resendMessage,
-    regenerateAssistantMessage,
-    appendAssistantResponse,
-    getTranslationUpdater,
-    createTopicBranch,
-    // ... 其他操作函数
-  } = useMessageOperations(currentTopic);
-
-  const handleDelete = (messageId: string) => {
-    deleteMessage(messageId);
-  };
-
-  const handleResend = (message: Message) => {
-    resendMessage(message, currentAssistant);
-  };
-
-  const handleAppend = (existingMsg: Message, newModel: Model) => {
-    appendAssistantResponse(existingMsg, newModel, currentAssistant);
-  }
-
-  // ... 在组件中使用其他操作函数
-
-  return (
-    <div>
-      {/* Component UI */}
-      <button onClick={() => handleDelete('some-message-id')}>Delete Message</button>
-      {/* ... */}
-    </div>
-  );
-}
-```
-
-## 返回值
-
-`useMessageOperations(topic)` Hook 返回一个包含以下函数和值的对象：
-
-- **`deleteMessage(id: string)`**:
-
-  - 删除指定 `id` 的单个消息。
-  - 内部调用 `deleteSingleMessageThunk`。
-
-- **`deleteGroupMessages(askId: string)`**:
-
-  - 删除与指定 `askId` 相关联的一组消息（通常是用户提问及其所有助手回答）。
-  - 内部调用 `deleteMessageGroupThunk`。
-
-- **`editMessage(messageId: string, updates: Partial<Message>)`**:
-
-  - 更新指定 `messageId` 的消息的部分属性。
-  - **注意**: 目前主要用于更新 Redux 状态
-  - 内部调用 `newMessagesActions.updateMessage`。
-
-- **`resendMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新发送指定的用户消息 (`message`)，这将触发其所有关联助手响应的重新生成。
-  - 内部调用 `resendMessageThunk`。
-
-- **`resendUserMessageWithEdit(message: Message, editedContent: string, assistant: Assistant)`**:
-
-  - 在用户消息的主要文本块被编辑后，重新发送该消息。
-  - 会先查找消息的 `MAIN_TEXT` 块 ID，然后调用 `resendUserMessageWithEditThunk`。
-
-- **`clearTopicMessages(_topicId?: string)`**:
-
-  - 清除当前主题（或可选的指定 `_topicId`）下的所有消息。
-  - 内部调用 `clearTopicMessagesThunk`。
-
-- **`createNewContext()`**:
-
-  - 发出一个全局事件 (`EVENT_NAMES.NEW_CONTEXT`)，通常用于通知 UI 清空显示，准备新的上下文。不直接修改 Redux 状态。
-
-- **`displayCount`**:
-
-  - (非操作函数) 从 Redux store 中获取当前的 `displayCount` 值。
-
-- **`pauseMessages()`**:
-
-  - 尝试中止当前主题中正在进行的消息生成（状态为 `processing` 或 `pending`）。
-  - 通过查找相关的 `askId` 并调用 `abortCompletion` 来实现。
-  - 同时会 dispatch `setTopicLoading` action 将加载状态设为 `false`。
-
-- **`resumeMessage(message: Message, assistant: Assistant)`**:
-
-  - 恢复/重新发送一个用户消息。目前实现为直接调用 `resendMessage`。
-
-- **`regenerateAssistantMessage(message: Message, assistant: Assistant)`**:
-
-  - 重新生成指定的**助手**消息 (`message`) 的响应。
-  - 内部调用 `regenerateAssistantResponseThunk`。
-
-- **`appendAssistantResponse(existingAssistantMessage: Message, newModel: Model, assistant: Assistant)`**:
-
-  - 针对 `existingAssistantMessage` 所回复的**同一用户提问**，使用 `newModel` 追加一个新的助手响应。
-  - 内部调用 `appendAssistantResponseThunk`。
-
-- **`getTranslationUpdater(messageId: string, targetLanguage: string, sourceBlockId?: string, sourceLanguage?: string)`**:
-
-  - **用途**: 获取一个用于逐步更新翻译块内容的函数。
-  - **流程**:
-    1.  内部调用 `initiateTranslationThunk` 来创建或获取一个 `TRANSLATION` 类型的 `MessageBlock`，并获取其 `blockId`。
-    2.  返回一个**异步更新函数**。
-  - **返回的更新函数 `(accumulatedText: string, isComplete?: boolean) => void`**:
-    - 接收累积的翻译文本和完成状态。
-    - 调用 `updateOneBlock` 更新 Redux 中的翻译块内容和状态 (`STREAMING` 或 `SUCCESS`)。
-    - 调用 `throttledBlockDbUpdate` 将更新（节流地）保存到数据库。
-  - 如果初始化失败（Thunk 返回 `undefined`），则此函数返回 `null`。
-
-- **`createTopicBranch(sourceTopicId: string, branchPointIndex: number, newTopic: Topic)`**:
-  - 创建一个主题分支，将 `sourceTopicId` 主题中 `branchPointIndex` 索引之前的消息克隆到 `newTopic` 中。
-  - **注意**: `newTopic` 对象必须是调用此函数**之前**已经创建并添加到 Redux 和数据库中的。
-  - 内部调用 `cloneMessagesToNewTopicThunk`。
-
-## 依赖
-
-- **`topic: Topic`**: 必须传入当前操作上下文的主题对象。Hook 返回的操作函数将始终作用于这个主题的 `topic.id`。
-- **Redux `dispatch`**: Hook 内部使用 `useAppDispatch` 获取 `dispatch` 函数来调用 actions 和 thunks。
-
-## 相关 Hooks
-
-在同一文件中还定义了两个辅助 Hook：
-
-- **`useTopicMessages(topic: Topic)`**:
-
-  - 使用 `selectMessagesForTopic` selector 来获取并返回指定主题的消息列表。
-
-- **`useTopicLoading(topic: Topic)`**:
-  - 使用 `selectNewTopicLoading` selector 来获取并返回指定主题的加载状态。
-
-这些 Hook 可以与 `useMessageOperations` 结合使用，方便地在组件中获取消息数据、加载状态，并执行相关操作。

docs/zh/README.md

@@ -34,7 +34,7 @@
   </a>
 </h1>
 <p align="center">
-  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="https://cherry-ai.com">官方网站</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/zh-cn">文档</a> | <a href="./dev.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
+  <a href="https://github.com/CherryHQ/cherry-studio">English</a> | 中文 | <a href="https://cherry-ai.com">官方网站</a> | <a href="https://docs.cherry-ai.com/cherry-studio-wen-dang/zh-cn">文档</a> | <a href="./guides/development.md">开发</a> | <a href="https://github.com/CherryHQ/cherry-studio/issues">反馈</a><br>
 </p>
 
 <!-- 题头徽章组合 -->
@@ -70,7 +70,7 @@ Cherry Studio 是一款支持多个大语言模型（LLM）服务商的桌面客
 
 👏 欢迎加入 [Telegram 群组](https://t.me/CherryStudioAI)｜[Discord](https://discord.gg/wez8HtpxqQ) | [QQ群(575014769)](https://qm.qq.com/q/lo0D4qVZKi)
 
-❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](sponsor.md)! ❤️
+❤️ 喜欢 Cherry Studio? 点亮小星星 🌟 或 [赞助开发者](./guides/sponsor.md)! ❤️
 
 # 📖 使用教程
 
@@ -181,7 +181,7 @@ https://docs.cherry-ai.com
 6. **社区参与**：加入讨论并帮助用户
 7. **推广使用**：宣传 Cherry Studio
 
-参考[分支策略](branching-strategy-zh.md)了解贡献指南
+参考[分支策略](./guides/branching-strategy.md)了解贡献指南
 
 ## 入门
 
@@ -190,7 +190,7 @@ https://docs.cherry-ai.com
 3. **提交更改**：提交并推送您的更改
 4. **打开 Pull Request**：描述您的更改和原因
 
-有关更详细的指南，请参阅我们的 [贡献指南](CONTRIBUTING.zh.md)
+有关更详细的指南，请参阅我们的 [贡献指南](./guides/contributing.md)
 
 感谢您的支持和贡献！
 

docs/zh/guides/branching-strategy.md

@@ -16,7 +16,7 @@ Cherry Studio 采用结构化的分支策略来维护代码质量并简化开发
   - 只接受文档更新和 bug 修复
   - 经过完整测试后可以发布到生产环境
 
-关于测试计划所使用的`testplan`分支，请查阅[测试计划](testplan-zh.md)。
+关于测试计划所使用的`testplan`分支，请查阅[测试计划](./test-plan.md)。
 
 ## 贡献分支
 

docs/zh/guides/contributing.md

@@ -1,6 +1,6 @@
 # Cherry Studio 贡献者指南
 
-[**English**](../CONTRIBUTING.md) | [**中文**](CONTRIBUTING.zh.md)
+[**English**](../../../CONTRIBUTING.md) | **中文**
 
 欢迎来到 Cherry Studio 的贡献者社区！我们致力于将 Cherry Studio 打造成一个长期提供价值的项目，并希望邀请更多的开发者加入我们的行列。无论您是经验丰富的开发者还是刚刚起步的初学者，您的贡献都将帮助我们更好地服务用户，提升软件质量。
 
@@ -24,7 +24,7 @@
 
 ## 开始之前
 
-请确保阅读了[行为准则](../CODE_OF_CONDUCT.md)和[LICENSE](../LICENSE)。
+请确保阅读了[行为准则](../../../CODE_OF_CONDUCT.md)和[LICENSE](../../../LICENSE)。
 
 ## 开始贡献
 
@@ -32,7 +32,7 @@
 
 ### 测试
 
-未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](dev.md#test)中的“Test”部分。
+未经测试的功能等同于不存在。为确保代码真正有效，应通过单元测试和功能测试覆盖相关流程。因此，在考虑贡献时，也请考虑可测试性。所有测试均可本地运行，无需依赖 CI。请参阅[开发者指南](./development.md#test)中的"Test"部分。
 
 ### 拉取请求的自动化测试
 
@@ -60,11 +60,11 @@ git commit --signoff -m "Your commit message"
 
 ### 获取代码审查/合并
 
-维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](README.zh.md#-community)联系我们
+维护者在此帮助您在合理时间内实现您的用例。他们会尽力在合理时间内审查您的代码并提供建设性反馈。但如果您在审查过程中受阻，或认为您的 Pull Request 未得到应有的关注，请通过 Issue 中的评论或者[社群](../README.md#-community)联系我们
 
 ### 参与测试计划
 
-测试计划旨在为用户提供更稳定的应用体验和更快的迭代速度，详细情况请参阅[测试计划](testplan-zh.md)。
+测试计划旨在为用户提供更稳定的应用体验和更快的迭代速度，详细情况请参阅[测试计划](./test-plan.md)。
 
 ### 其他建议
 

docs/zh/guides/development.md

@@ -0,0 +1,73 @@
+# 🖥️ Develop
+
+## IDE Setup
+
+- Editor: [Cursor](https://www.cursor.com/), etc. Any VS Code compatible editor.
+- Linter: [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- Formatter: [Biome](https://marketplace.visualstudio.com/items?itemName=biomejs.biome)
+
+## Project Setup
+
+### Install
+
+```bash
+yarn
+```
+
+### Development
+
+### Setup Node.js
+
+Download and install [Node.js v22.x.x](https://nodejs.org/en/download)
+
+### Setup Yarn
+
+```bash
+corepack enable
+corepack prepare yarn@4.9.1 --activate
+```
+
+### Install Dependencies
+
+```bash
+yarn install
+```
+
+### ENV
+
+```bash
+copy .env.example .env
+```
+
+### Start
+
+```bash
+yarn dev
+```
+
+### Debug
+
+```bash
+yarn debug
+```
+
+Then input chrome://inspect in browser
+
+### Test
+
+```bash
+yarn test
+```
+
+### Build
+
+```bash
+# For windows
+$ yarn build:win
+
+# For macOS
+$ yarn build:mac
+
+# For Linux
+$ yarn build:linux
+```

docs/zh/guides/i18n.md

@@ -15,11 +15,11 @@ i18n ally是一个强大的VSCode插件，它能在开发阶段提供实时反
 
 ### 效果展示
 
-![demo-1](./.assets.how-to-i18n/demo-1.png)
+![demo-1](../../assets/images/i18n/demo-1.png)
 
-![demo-2](./.assets.how-to-i18n/demo-2.png)
+![demo-2](../../assets/images/i18n/demo-2.png)
 
-![demo-3](./.assets.how-to-i18n/demo-3.png)
+![demo-3](../../assets/images/i18n/demo-3.png)
 
 ## i18n 约定
 

docs/zh/guides/test-plan.md

@@ -19,7 +19,7 @@
 
 ### 参与测试计划
 
-开发者按照[贡献者指南](CONTRIBUTING.zh.md)要求正常提交`PR`（并注意提交target为`main`）。仓库维护者会综合考虑（例如该功能对应用的影响程度，功能的重要性，是否需要更广泛的测试等），决定该`PR`是否应加入测试计划。
+开发者按照[贡献者指南](./contributing.md)要求正常提交`PR`（并注意提交target为`main`）。仓库维护者会综合考虑（例如该功能对应用的影响程度，功能的重要性，是否需要更广泛的测试等），决定该`PR`是否应加入测试计划。
 
 若该`PR`加入测试计划，仓库维护者会做如下操作：
 

docs/zh/references/components/code-block-view.md

@@ -85,7 +85,7 @@ graph TD
 - **SvgPreview**: SVG 图像预览
 - **GraphvizPreview**: Graphviz 图表预览
 
-所有特殊视图组件共享通用架构，以确保一致的用户体验和功能。有关这些组件及其实现的详细信息，请参阅 [图像预览组件文档](./ImagePreview-zh.md)。
+所有特殊视图组件共享通用架构，以确保一致的用户体验和功能。有关这些组件及其实现的详细信息，请参阅[图像预览组件文档](./image-preview.md)。
 
 #### StatusBar 状态栏
 

docs/zh/references/components/image-preview.md

@@ -192,4 +192,4 @@ const { containerRef, error, isLoading, triggerRender, cancelRender, clearError,
 - 共享状态管理
 - 响应式布局适应
 
-有关整体 CodeBlockView 架构的更多信息，请参阅 [CodeBlockView 文档](./CodeBlockView-zh.md)。
+有关整体 CodeBlockView 架构的更多信息，请参阅 [CodeBlockView 文档](./code-block-view.md)。

docs/zh/references/database.md

@@ -1,6 +1,24 @@
-# `translate_languages` 表技术文档
+# 数据库参考文档
 
-## 📄 概述
+本文档介绍 Cherry Studio 的数据库结构，包括设置字段和翻译语言表。
+
+---
+
+## 设置字段 (settings)
+
+此部分包含设置相关字段的数据类型说明。
+
+### 翻译相关字段
+
+| 字段名                         | 类型                           | 说明         |
+| ------------------------------ | ------------------------------ | ------------ |
+| `translate:target:language`    | `LanguageCode`                 | 翻译目标语言 |
+| `translate:source:language`    | `LanguageCode`                 | 翻译源语言   |
+| `translate:bidirectional:pair` | `[LanguageCode, LanguageCode]` | 双向翻译对   |
+
+---
+
+## 翻译语言表 (translate_languages)
 
 `translate_languages` 记录用户自定义的的语言类型（`Language`）。
 

docs/zh/references/message-system.md

@@ -0,0 +1,404 @@
+# 消息系统
+
+本文档介绍 Cherry Studio 的消息系统架构，包括消息生命周期、状态管理和操作接口。
+
+## 消息的生命周期
+
+![消息生命周期](../../assets/images/message-lifecycle.png)
+
+---
+
+# messageBlock.ts 使用指南
+
+该文件定义了用于管理应用程序中所有 `MessageBlock` 实体的 Redux Slice。它使用 Redux Toolkit 的 `createSlice` 和 `createEntityAdapter` 来高效地处理规范化的状态，并提供了一系列 actions 和 selectors 用于与消息块数据交互。
+
+## 核心目标
+
+- **状态管理**: 集中管理所有 `MessageBlock` 的状态。`MessageBlock` 代表消息中的不同内容单元（如文本、代码、图片、引用等）。
+- **规范化**: 使用 `createEntityAdapter` 将 `MessageBlock` 数据存储在规范化的结构中（`{ ids: [], entities: {} }`），这有助于提高性能和简化更新逻辑。
+- **可预测性**: 提供明确的 actions 来修改状态，并通过 selectors 安全地访问状态。
+
+## 关键概念
+
+- **Slice (`createSlice`)**: Redux Toolkit 的核心 API，用于创建包含 reducer 逻辑、action creators 和初始状态的 Redux 模块。
+- **Entity Adapter (`createEntityAdapter`)**: Redux Toolkit 提供的工具，用于简化对规范化数据的 CRUD（创建、读取、更新、删除）操作。它会自动生成 reducer 函数和 selectors。
+- **Selectors**: 用于从 Redux store 中派生和计算数据的函数。Selectors 可以被记忆化（memoized），以提高性能。
+
+## State 结构
+
+`messageBlocks` slice 的状态结构由 `createEntityAdapter` 定义，大致如下：
+
+```typescript
+{
+  ids: string[]; // 存储所有 MessageBlock ID 的有序列表
+  entities: { [id: string]: MessageBlock }; // 按 ID 存储 MessageBlock 对象的字典
+  loadingState: 'idle' | 'loading' | 'succeeded' | 'failed'; // (可选) 其他状态，如加载状态
+  error: string | null; // (可选) 错误信息
+}
+```
+
+## Actions
+
+该 slice 导出以下 actions (由 `createSlice` 和 `createEntityAdapter` 自动生成或自定义)：
+
+- **`upsertOneBlock(payload: MessageBlock)`**:
+
+  - 添加一个新的 `MessageBlock` 或更新一个已存在的 `MessageBlock`。如果 payload 中的 `id` 已存在，则执行更新；否则执行插入。
+
+- **`upsertManyBlocks(payload: MessageBlock[])`**:
+
+  - 添加或更新多个 `MessageBlock`。常用于批量加载数据（例如，加载一个 Topic 的所有消息块）。
+
+- **`removeOneBlock(payload: string)`**:
+
+  - 根据提供的 `id` (payload) 移除单个 `MessageBlock`。
+
+- **`removeManyBlocks(payload: string[])`**:
+
+  - 根据提供的 `id` 数组 (payload) 移除多个 `MessageBlock`。常用于删除消息或清空 Topic 时清理相关的块。
+
+- **`removeAllBlocks()`**:
+
+  - 移除 state 中的所有 `MessageBlock` 实体。
+
+- **`updateOneBlock(payload: { id: string; changes: Partial<MessageBlock> })`**:
+
+  - 更新一个已存在的 `MessageBlock`。`payload` 需要包含块的 `id` 和一个包含要更改的字段的 `changes` 对象。
+
+- **`setMessageBlocksLoading(payload: 'idle' | 'loading')`**:
+
+  - (自定义) 设置 `loadingState` 属性。
+
+- **`setMessageBlocksError(payload: string)`**:
+  - (自定义) 设置 `loadingState` 为 `'failed'` 并记录错误信息。
+
+**使用示例 (在 Thunk 或其他 Dispatch 的地方):**
+
+```typescript
+import { upsertOneBlock, removeManyBlocks, updateOneBlock } from './messageBlock'
+import store from './store' // 假设这是你的 Redux store 实例
+
+// 添加或更新一个块
+const newBlock: MessageBlock = {
+  /* ... block data ... */
+}
+store.dispatch(upsertOneBlock(newBlock))
+
+// 更新一个块的内容
+store.dispatch(updateOneBlock({ id: blockId, changes: { content: 'New content' } }))
+
+// 删除多个块
+const blockIdsToRemove = ['id1', 'id2']
+store.dispatch(removeManyBlocks(blockIdsToRemove))
+```
+
+## Selectors
+
+该 slice 导出由 `createEntityAdapter` 生成的基础 selectors，并通过 `messageBlocksSelectors` 对象访问：
+
+- **`messageBlocksSelectors.selectIds(state: RootState): string[]`**: 返回包含所有块 ID 的数组。
+- **`messageBlocksSelectors.selectEntities(state: RootState): { [id: string]: MessageBlock }`**: 返回块 ID 到块对象的映射字典。
+- **`messageBlocksSelectors.selectAll(state: RootState): MessageBlock[]`**: 返回包含所有块对象的数组。
+- **`messageBlocksSelectors.selectTotal(state: RootState): number`**: 返回块的总数。
+- **`messageBlocksSelectors.selectById(state: RootState, id: string): MessageBlock | undefined`**: 根据 ID 返回单个块对象，如果找不到则返回 `undefined`。
+
+**此外，还提供了一个自定义的、记忆化的 selector：**
+
+- **`selectFormattedCitationsByBlockId(state: RootState, blockId: string | undefined): Citation[]`**:
+  - 接收一个 `blockId`。
+  - 如果该 ID 对应的块是 `CITATION` 类型，则提取并格式化其包含的引用信息（来自网页搜索、知识库等），进行去重和重新编号，最后返回一个 `Citation[]` 数组，用于在 UI 中显示。
+  - 如果块不存在或类型不匹配，返回空数组 `[]`。
+  - 这个 selector 封装了处理不同引用来源（Gemini, OpenAI, OpenRouter, Zhipu 等）的复杂逻辑。
+
+**使用示例 (在 React 组件或 `useSelector` 中):**
+
+```typescript
+import { useSelector } from 'react-redux'
+import { messageBlocksSelectors, selectFormattedCitationsByBlockId } from './messageBlock'
+import type { RootState } from './store'
+
+// 获取所有块
+const allBlocks = useSelector(messageBlocksSelectors.selectAll)
+
+// 获取特定 ID 的块
+const specificBlock = useSelector((state: RootState) => messageBlocksSelectors.selectById(state, someBlockId))
+
+// 获取特定引用块格式化后的引用列表
+const formattedCitations = useSelector((state: RootState) => selectFormattedCitationsByBlockId(state, citationBlockId))
+
+// 在组件中使用引用数据
+// {formattedCitations.map(citation => ...)}
+```
+
+## 集成
+
+`messageBlock.ts` slice 通常与 `messageThunk.ts` 中的 Thunks 紧密协作。Thunks 负责处理异步逻辑（如 API 调用、数据库操作），并在需要时 dispatch `messageBlock` slice 的 actions 来更新状态。例如，当 `messageThunk` 接收到流式响应时，它会 dispatch `upsertOneBlock` 或 `updateOneBlock` 来实时更新对应的 `MessageBlock`。同样，删除消息的 Thunk 会 dispatch `removeManyBlocks`。
+
+理解 `messageBlock.ts` 的职责是管理**状态本身**，而 `messageThunk.ts` 负责**触发状态变更**的异步流程，这对于维护清晰的应用架构至关重要。
+
+---
+
+# messageThunk.ts 使用指南
+
+该文件包含用于管理应用程序中消息流、处理助手交互以及同步 Redux 状态与 IndexedDB 数据库的核心 Thunk Action Creators。主要围绕 `Message` 和 `MessageBlock` 对象进行操作。
+
+## 核心功能
+
+1.  **发送/接收消息**: 处理用户消息的发送，触发助手响应，并流式处理返回的数据，将其解析为不同的 `MessageBlock`。
+2.  **状态管理**: 确保 Redux store 中的消息和消息块状态与 IndexedDB 中的持久化数据保持一致。
+3.  **消息操作**: 提供删除、重发、重新生成、编辑后重发、追加响应、克隆等消息生命周期管理功能。
+4.  **Block 处理**: 动态创建、更新和保存各种类型的 `MessageBlock`（文本、思考过程、工具调用、引用、图片、错误、翻译等）。
+
+## 主要 Thunks
+
+以下是一些关键的 Thunk 函数及其用途：
+
+1.  **`sendMessage(userMessage, userMessageBlocks, assistant, topicId)`**
+
+    - **用途**: 发送一条新的用户消息。
+    - **流程**:
+      - 保存用户消息 (`userMessage`) 及其块 (`userMessageBlocks`) 到 Redux 和 DB。
+      - 检查 `@mentions` 以确定是单模型响应还是多模型响应。
+      - 创建助手消息(们)的存根 (Stub)。
+      - 将存根添加到 Redux 和 DB。
+      - 将核心处理逻辑 `fetchAndProcessAssistantResponseImpl` 添加到该 `topicId` 的队列中以获取实际响应。
+    - **Block 相关**: 主要处理用户消息的初始 `MessageBlock` 保存。
+
+2.  **`fetchAndProcessAssistantResponseImpl(dispatch, getState, topicId, assistant, assistantMessage)`**
+
+    - **用途**: (内部函数) 获取并处理单个助手响应的核心逻辑，被 `sendMessage`, `resend...`, `regenerate...`, `append...` 等调用。
+    - **流程**:
+      - 设置 Topic 加载状态。
+      - 准备上下文消息。
+      - 调用 `fetchChatCompletion` API 服务。
+      - 使用 `createStreamProcessor` 处理流式响应。
+      - 通过各种回调 (`onTextChunk`, `onThinkingChunk`, `onToolCallComplete`, `onImageGenerated`, `onError`, `onComplete` 等) 处理不同类型的事件。
+    - **Block 相关**:
+      - 根据流事件创建初始 `UNKNOWN` 块。
+      - 实时创建和更新 `MAIN_TEXT` 和 `THINKING` 块，使用 `throttledBlockUpdate` 和 `throttledBlockDbUpdate` 进行节流更新。
+      - 创建 `TOOL`, `CITATION`, `IMAGE`, `ERROR` 等类型的块。
+      - 在事件完成时（如 `onTextComplete`, `onToolCallComplete`）将块状态标记为 `SUCCESS` 或 `ERROR`，并使用 `saveUpdatedBlockToDB` 保存最终状态。
+      - 使用 `handleBlockTransition` 管理非流式块（如 `TOOL`, `CITATION`）的添加和状态更新。
+
+3.  **`loadTopicMessagesThunk(topicId, forceReload)`**
+
+    - **用途**: 从数据库加载指定主题的所有消息及其关联的 `MessageBlock`。
+    - **流程**:
+      - 从 DB 获取 `Topic` 及其 `messages` 列表。
+      - 根据消息 ID 列表从 DB 获取所有相关的 `MessageBlock`。
+      - 使用 `upsertManyBlocks` 将块更新到 Redux。
+      - 将消息更新到 Redux。
+    - **Block 相关**: 负责将持久化的 `MessageBlock` 加载到 Redux 状态。
+
+4.  **删除 Thunks**
+
+    - `deleteSingleMessageThunk(topicId, messageId)`: 删除单个消息及其所有 `MessageBlock`。
+    - `deleteMessageGroupThunk(topicId, askId)`: 删除一个用户消息及其所有相关的助手响应消息和它们的所有 `MessageBlock`。
+    - `clearTopicMessagesThunk(topicId)`: 清空主题下的所有消息及其所有 `MessageBlock`。
+    - **Block 相关**: 从 Redux 和 DB 中移除指定的 `MessageBlock`。
+
+5.  **重发/重新生成 Thunks**
+
+    - `resendMessageThunk(topicId, userMessageToResend, assistant)`: 重发用户消息。会重置（清空 Block 并标记为 PENDING）所有与该用户消息关联的助手响应，然后重新请求生成。
+    - `resendUserMessageWithEditThunk(topicId, originalMessage, mainTextBlockId, editedContent, assistant)`: 用户编辑消息内容后重发。先更新用户消息的 `MAIN_TEXT` 块内容，然后调用 `resendMessageThunk`。
+    - `regenerateAssistantResponseThunk(topicId, assistantMessageToRegenerate, assistant)`: 重新生成单个助手响应。重置该助手消息（清空 Block 并标记为 PENDING），然后重新请求生成。
+    - **Block 相关**: 删除旧的 `MessageBlock`，并在重新生成过程中创建新的 `MessageBlock`。
+
+6.  **`appendAssistantResponseThunk(topicId, existingAssistantMessageId, newModel, assistant)`**
+
+    - **用途**: 在已有的对话上下文中，针对同一个用户问题，使用新选择的模型追加一个新的助手响应。
+    - **流程**:
+      - 找到现有助手消息以获取原始 `askId`。
+      - 创建使用 `newModel` 的新助手消息存根（使用相同的 `askId`）。
+      - 添加新存根到 Redux 和 DB。
+      - 将 `fetchAndProcessAssistantResponseImpl` 添加到队列以生成新响应。
+    - **Block 相关**: 为新的助手响应创建全新的 `MessageBlock`。
+
+7.  **`cloneMessagesToNewTopicThunk(sourceTopicId, branchPointIndex, newTopic)`**
+
+    - **用途**: 将源主题的部分消息（及其 Block）克隆到一个**已存在**的新主题中。
+    - **流程**:
+      - 复制指定索引前的消息。
+      - 为所有克隆的消息和 Block 生成新的 UUID。
+      - 正确映射克隆消息之间的 `askId` 关系。
+      - 复制 `MessageBlock` 内容，更新其 `messageId` 指向新的消息 ID。
+      - 更新文件引用计数（如果 Block 是文件或图片）。
+      - 将克隆的消息和 Block 保存到新主题的 Redux 状态和 DB 中。
+    - **Block 相关**: 创建 `MessageBlock` 的副本，并更新其 ID 和 `messageId`。
+
+8.  **`initiateTranslationThunk(messageId, topicId, targetLanguage, sourceBlockId?, sourceLanguage?)`**
+    - **用途**: 为指定消息启动翻译流程，创建一个初始的 `TRANSLATION` 类型的 `MessageBlock`。
+    - **流程**:
+      - 创建一个状态为 `STREAMING` 的 `TranslationMessageBlock`。
+      - 将其添加到 Redux 和 DB。
+      - 更新原消息的 `blocks` 列表以包含新的翻译块 ID。
+    - **Block 相关**: 创建并保存一个占位的 `TranslationMessageBlock`。实际翻译内容的获取和填充需要后续步骤。
+
+## 内部机制和注意事项
+
+- **数据库交互**: 通过 `saveMessageAndBlocksToDB`, `updateExistingMessageAndBlocksInDB`, `saveUpdatesToDB`, `saveUpdatedBlockToDB`, `throttledBlockDbUpdate` 等辅助函数与 IndexedDB (`db`) 交互，确保数据持久化。
+- **状态同步**: Thunks 负责协调 Redux Store 和 IndexedDB 之间的数据一致性。
+- **队列 (`getTopicQueue`)**: 使用 `AsyncQueue` 确保对同一主题的操作（尤其是 API 请求）按顺序执行，避免竞态条件。
+- **节流 (`throttle`)**: 对流式响应中频繁的 Block 更新（文本、思考）使用 `lodash.throttle` 优化性能，减少 Redux dispatch 和 DB 写入次数。
+- **错误处理**: `fetchAndProcessAssistantResponseImpl` 内的回调函数（特别是 `onError`）处理流处理和 API 调用中可能出现的错误，并创建 `ERROR` 类型的 `MessageBlock`。
+
+开发者在使用这些 Thunks 时，通常需要提供 `dispatch`, `getState` (由 Redux Thunk 中间件注入)，以及如 `topicId`, `assistant` 配置对象, 相关的 `Message` 或 `MessageBlock` 对象/ID 等参数。理解每个 Thunk 的职责和它如何影响消息及块的状态至关重要。
+
+---
+
+# useMessageOperations.ts 使用指南
+
+该文件定义了一个名为 `useMessageOperations` 的自定义 React Hook。这个 Hook 的主要目的是为 React 组件提供一个便捷的接口，用于执行与特定主题（Topic）相关的各种消息操作。它封装了调用 Redux Thunks (`messageThunk.ts`) 和 Actions (`newMessage.ts`, `messageBlock.ts`) 的逻辑，简化了组件与消息数据交互的代码。
+
+## 核心目标
+
+- **封装**: 将复杂的消息操作逻辑（如删除、重发、重新生成、编辑、翻译等）封装在易于使用的函数中。
+- **简化**: 让组件可以直接调用这些操作函数，而无需直接与 Redux `dispatch` 或 Thunks 交互。
+- **上下文关联**: 所有操作都与传入的 `topic` 对象相关联，确保操作作用于正确的主题。
+
+## 如何使用
+
+在你的 React 函数组件中，导入并调用 `useMessageOperations` Hook，并传入当前活动的 `Topic` 对象。
+
+```typescript
+import React from 'react';
+import { useMessageOperations } from '@renderer/hooks/useMessageOperations';
+import type { Topic, Message, Assistant, Model } from '@renderer/types';
+
+interface MyComponentProps {
+  currentTopic: Topic;
+  currentAssistant: Assistant;
+}
+
+function MyComponent({ currentTopic, currentAssistant }: MyComponentProps) {
+  const {
+    deleteMessage,
+    resendMessage,
+    regenerateAssistantMessage,
+    appendAssistantResponse,
+    getTranslationUpdater,
+    createTopicBranch,
+    // ... 其他操作函数
+  } = useMessageOperations(currentTopic);
+
+  const handleDelete = (messageId: string) => {
+    deleteMessage(messageId);
+  };
+
+  const handleResend = (message: Message) => {
+    resendMessage(message, currentAssistant);
+  };
+
+  const handleAppend = (existingMsg: Message, newModel: Model) => {
+    appendAssistantResponse(existingMsg, newModel, currentAssistant);
+  }
+
+  // ... 在组件中使用其他操作函数
+
+  return (
+    <div>
+      {/* Component UI */}
+      <button onClick={() => handleDelete('some-message-id')}>Delete Message</button>
+      {/* ... */}
+    </div>
+  );
+}
+```
+
+## 返回值
+
+`useMessageOperations(topic)` Hook 返回一个包含以下函数和值的对象：
+
+- **`deleteMessage(id: string)`**:
+
+  - 删除指定 `id` 的单个消息。
+  - 内部调用 `deleteSingleMessageThunk`。
+
+- **`deleteGroupMessages(askId: string)`**:
+
+  - 删除与指定 `askId` 相关联的一组消息（通常是用户提问及其所有助手回答）。
+  - 内部调用 `deleteMessageGroupThunk`。
+
+- **`editMessage(messageId: string, updates: Partial<Message>)`**:
+
+  - 更新指定 `messageId` 的消息的部分属性。
+  - **注意**: 目前主要用于更新 Redux 状态
+  - 内部调用 `newMessagesActions.updateMessage`。
+
+- **`resendMessage(message: Message, assistant: Assistant)`**:
+
+  - 重新发送指定的用户消息 (`message`)，这将触发其所有关联助手响应的重新生成。
+  - 内部调用 `resendMessageThunk`。
+
+- **`resendUserMessageWithEdit(message: Message, editedContent: string, assistant: Assistant)`**:
+
+  - 在用户消息的主要文本块被编辑后，重新发送该消息。
+  - 会先查找消息的 `MAIN_TEXT` 块 ID，然后调用 `resendUserMessageWithEditThunk`。
+
+- **`clearTopicMessages(_topicId?: string)`**:
+
+  - 清除当前主题（或可选的指定 `_topicId`）下的所有消息。
+  - 内部调用 `clearTopicMessagesThunk`。
+
+- **`createNewContext()`**:
+
+  - 发出一个全局事件 (`EVENT_NAMES.NEW_CONTEXT`)，通常用于通知 UI 清空显示，准备新的上下文。不直接修改 Redux 状态。
+
+- **`displayCount`**:
+
+  - (非操作函数) 从 Redux store 中获取当前的 `displayCount` 值。
+
+- **`pauseMessages()`**:
+
+  - 尝试中止当前主题中正在进行的消息生成（状态为 `processing` 或 `pending`）。
+  - 通过查找相关的 `askId` 并调用 `abortCompletion` 来实现。
+  - 同时会 dispatch `setTopicLoading` action 将加载状态设为 `false`。
+
+- **`resumeMessage(message: Message, assistant: Assistant)`**:
+
+  - 恢复/重新发送一个用户消息。目前实现为直接调用 `resendMessage`。
+
+- **`regenerateAssistantMessage(message: Message, assistant: Assistant)`**:
+
+  - 重新生成指定的**助手**消息 (`message`) 的响应。
+  - 内部调用 `regenerateAssistantResponseThunk`。
+
+- **`appendAssistantResponse(existingAssistantMessage: Message, newModel: Model, assistant: Assistant)`**:
+
+  - 针对 `existingAssistantMessage` 所回复的**同一用户提问**，使用 `newModel` 追加一个新的助手响应。
+  - 内部调用 `appendAssistantResponseThunk`。
+
+- **`getTranslationUpdater(messageId: string, targetLanguage: string, sourceBlockId?: string, sourceLanguage?: string)`**:
+
+  - **用途**: 获取一个用于逐步更新翻译块内容的函数。
+  - **流程**:
+    1.  内部调用 `initiateTranslationThunk` 来创建或获取一个 `TRANSLATION` 类型的 `MessageBlock`，并获取其 `blockId`。
+    2.  返回一个**异步更新函数**。
+  - **返回的更新函数 `(accumulatedText: string, isComplete?: boolean) => void`**:
+    - 接收累积的翻译文本和完成状态。
+    - 调用 `updateOneBlock` 更新 Redux 中的翻译块内容和状态 (`STREAMING` 或 `SUCCESS`)。
+    - 调用 `throttledBlockDbUpdate` 将更新（节流地）保存到数据库。
+  - 如果初始化失败（Thunk 返回 `undefined`），则此函数返回 `null`。
+
+- **`createTopicBranch(sourceTopicId: string, branchPointIndex: number, newTopic: Topic)`**:
+  - 创建一个主题分支，将 `sourceTopicId` 主题中 `branchPointIndex` 索引之前的消息克隆到 `newTopic` 中。
+  - **注意**: `newTopic` 对象必须是调用此函数**之前**已经创建并添加到 Redux 和数据库中的。
+  - 内部调用 `cloneMessagesToNewTopicThunk`。
+
+## 依赖
+
+- **`topic: Topic`**: 必须传入当前操作上下文的主题对象。Hook 返回的操作函数将始终作用于这个主题的 `topic.id`。
+- **Redux `dispatch`**: Hook 内部使用 `useAppDispatch` 获取 `dispatch` 函数来调用 actions 和 thunks。
+
+## 相关 Hooks
+
+在同一文件中还定义了两个辅助 Hook：
+
+- **`useTopicMessages(topic: Topic)`**:
+
+  - 使用 `selectMessagesForTopic` selector 来获取并返回指定主题的消息列表。
+
+- **`useTopicLoading(topic: Topic)`**:
+  - 使用 `selectNewTopicLoading` selector 来获取并返回指定主题的加载状态。
+
+这些 Hook 可以与 `useMessageOperations` 结合使用，方便地在组件中获取消息数据、加载状态，并执行相关操作。

electron-builder.yml

@@ -134,58 +134,108 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    What's New in v1.7.0-rc.1
+    A New Era of Intelligence with Cherry Studio 1.7.1
 
-    🎉 MAJOR NEW FEATURE: AI Agents
-    - Create and manage custom AI agents with specialized tools and permissions
-    - Dedicated agent sessions with persistent SQLite storage, separate from regular chats
-    - Real-time tool approval system - review and approve agent actions dynamically
-    - MCP (Model Context Protocol) integration for connecting external tools
-    - Slash commands support for quick agent interactions
-    - OpenAI-compatible REST API for agent access
+    Today we're releasing Cherry Studio 1.7.1 — our most ambitious update yet, introducing Agent: autonomous AI that thinks, plans, and acts.
 
-    ✨ New Features:
-    - AI Providers: Added support for Hugging Face, Mistral, Perplexity, and SophNet
-    - Knowledge Base: OpenMinerU document preprocessor, full-text search in notes, enhanced tool selection
-    - Image & OCR: Intel OVMS painting provider and Intel OpenVINO (NPU) OCR support
-    - MCP Management: Redesigned interface with dual-column layout for easier management
-    - Languages: Added German language support
+    For years, AI assistants have been reactive — waiting for your commands, responding to your questions. With Agent, we're changing that. Now, AI can truly work alongside you: understanding complex goals, breaking them into steps, and executing them independently.
 
-    ⚡ Improvements:
-    - Upgraded to Electron 38.7.0
-    - Enhanced system shutdown handling and automatic update checks
-    - Improved proxy bypass rules
+    This is what we've been building toward. And it's just the beginning.
 
-    🐛 Important Bug Fixes:
-    - Fixed streaming response issues across multiple AI providers
-    - Fixed session list scrolling problems
-    - Fixed knowledge base deletion errors
+    🤖 Meet Agent
+    Imagine having a brilliant colleague who never sleeps. Give Agent a goal — write a report, analyze data, refactor code — and watch it work. It reasons through problems, breaks them into steps, calls the right tools, and adapts when things change.
+
+    - **Think → Plan → Act**: From goal to execution, fully autonomous
+    - **Deep Reasoning**: Multi-turn thinking that solves real problems
+    - **Tool Mastery**: File operations, web search, code execution, and more
+    - **Skill Plugins**: Extend with custom commands and capabilities
+    - **You Stay in Control**: Real-time approval for sensitive actions
+    - **Full Visibility**: Every thought, every decision, fully transparent
+
+    🌐 Expanding Ecosystem
+    - **New Providers**: HuggingFace, Mistral, CherryIN, AI Gateway, Intel OVMS, Didi MCP
+    - **New Models**: Claude 4.5 Haiku, DeepSeek v3.2, GLM-4.6, Doubao, Ling series
+    - **MCP Integration**: Alibaba Cloud, ModelScope, Higress, MCP.so, TokenFlux and more
+
+    📚 Smarter Knowledge Base
+    - **OpenMinerU**: Self-hosted document processing
+    - **Full-Text Search**: Find anything instantly across your notes
+    - **Enhanced Tool Selection**: Smarter configuration for better AI assistance
+
+    📝 Notes, Reimagined
+    - Full-text search with highlighted results
+    - AI-powered smart rename
+    - Export as image
+    - Auto-wrap for tables
+
+    🖼️ Image & OCR
+    - Intel OVMS painting capabilities
+    - Intel OpenVINO NPU-accelerated OCR
+
+    🌍 Now in 10+ Languages
+    - Added German support
+    - Enhanced internationalization
+
+    ⚡ Faster & More Polished
+    - Electron 38 upgrade
+    - New MCP management interface
+    - Dozens of UI refinements
+
+    ❤️ Fully Open Source
+    Commercial restrictions removed. Cherry Studio now follows standard AGPL v3 — free for teams of any size.
+
+    The Agent Era is here. We can't wait to see what you'll create.
 
     <!--LANG:zh-CN-->
-    v1.7.0-rc.1 新特性
+    Cherry Studio 1.7.1：开启智能新纪元
 
-    🎉 重大更新：AI Agent 智能体系统
-    - 创建和管理专属 AI Agent，配置专用工具和权限
-    - 独立的 Agent 会话，使用 SQLite 持久化存储，与普通聊天分离
-    - 实时工具审批系统 - 动态审查和批准 Agent 操作
-    - MCP（模型上下文协议）集成，连接外部工具
-    - 支持斜杠命令快速交互
-    - 兼容 OpenAI 的 REST API 访问
+    今天，我们正式发布 Cherry Studio 1.7.1 —— 迄今最具雄心的版本，带来全新的 Agent：能够自主思考、规划和行动的 AI。
 
-    ✨ 新功能:
-    - AI 提供商：新增 Hugging Face、Mistral、Perplexity 和 SophNet 支持
-    - 知识库：OpenMinerU 文档预处理器、笔记全文搜索、增强的工具选择
-    - 图像与 OCR：Intel OVMS 绘图提供商和 Intel OpenVINO (NPU) OCR 支持
-    - MCP 管理：重构管理界面，采用双列布局，更加方便管理
-    - 语言：新增德语支持
+    多年来，AI 助手一直是被动的——等待你的指令，回应你的问题。Agent 改变了这一切。现在，AI 能够真正与你并肩工作：理解复杂目标，将其拆解为步骤，并独立执行。
 
-    ⚡ 改进:
-    - 升级到 Electron 38.7.0
-    - 增强的系统关机处理和自动更新检查
-    - 改进的代理绕过规则
+    这是我们一直在构建的未来。而这，仅仅是开始。
 
-    🐛 重要修复:
-    - 修复多个 AI 提供商的流式响应问题
-    - 修复会话列表滚动问题
-    - 修复知识库删除错误
+    🤖 认识 Agent
+    想象一位永不疲倦的得力伙伴。给 Agent 一个目标——撰写报告、分析数据、重构代码——然后看它工作。它会推理问题、拆解步骤、调用工具，并在情况变化时灵活应对。
+
+    - **思考 → 规划 → 行动**：从目标到执行，全程自主
+    - **深度推理**：多轮思考，解决真实问题
+    - **工具大师**：文件操作、网络搜索、代码执行，样样精通
+    - **技能插件**：自定义命令，无限扩展
+    - **你掌控全局**：敏感操作，实时审批
+    - **完全透明**：每一步思考，每一个决策，清晰可见
+
+    🌐 生态持续壮大
+    - **新增服务商**：Hugging Face、Mistral、Perplexity、SophNet、AI Gateway、Cerebras AI
+    - **新增模型**：Gemini 3、Gemini 3 Pro（支持图像预览）、GPT-5.1、Claude Opus 4.5
+    - **MCP 集成**：百炼、魔搭、Higress、MCP.so、TokenFlux 等平台
+
+    📚 更智能的知识库
+    - **OpenMinerU**：本地自部署文档处理
+    - **全文搜索**：笔记内容一搜即达
+    - **增强工具选择**：更智能的配置，更好的 AI 协助
+
+    📝 笔记，焕然一新
+    - 全文搜索，结果高亮
+    - AI 智能重命名
+    - 导出为图片
+    - 表格自动换行
+
+    🖼️ 图像与 OCR
+    - Intel OVMS 绘图能力
+    - Intel OpenVINO NPU 加速 OCR
+
+    🌍 支持 10+ 种语言
+    - 新增德语支持
+    - 全面增强国际化
+
+    ⚡ 更快、更精致
+    - 升级 Electron 38
+    - 新的 MCP 管理界面
+    - 数十处 UI 细节打磨
+
+    ❤️ 完全开源
+    商用限制已移除。Cherry Studio 现遵循标准 AGPL v3 协议——任意规模团队均可自由使用。
+
+    Agent 纪元已至。期待你的创造。
     <!--LANG:END-->

eslint.config.mjs

@@ -58,6 +58,7 @@ export default defineConfig([
       'dist/**',
       'out/**',
       'local/**',
+      'tests/**',
       '.yarn/**',
       '.gitignore',
       'scripts/cloudflare-worker.js',

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.6.5",
+  "version": "1.7.1",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -62,6 +62,7 @@
     "test": "vitest run --silent",
     "test:main": "vitest run --project main",
     "test:renderer": "vitest run --project renderer",
+    "test:aicore": "vitest run --project aiCore",
     "test:update": "yarn test:renderer --update",
     "test:coverage": "vitest run --coverage --silent",
     "test:ui": "vitest --ui",
@@ -74,17 +75,19 @@
     "format:check": "biome format && biome lint",
     "prepare": "git config blame.ignoreRevsFile .git-blame-ignore-revs && husky",
     "claude": "dotenv -e .env -- claude",
-    "release:aicore:alpha": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag alpha --access public",
-    "release:aicore:beta": "yarn workspace @cherrystudio/ai-core version prerelease --immediate && yarn workspace @cherrystudio/ai-core npm publish --tag beta --access public",
-    "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core npm publish --access public"
+    "release:aicore:alpha": "yarn workspace @cherrystudio/ai-core version prerelease --preid alpha --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --tag alpha --access public",
+    "release:aicore:beta": "yarn workspace @cherrystudio/ai-core version prerelease --preid beta --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --tag beta --access public",
+    "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core build && yarn workspace @cherrystudio/ai-core npm publish --access public",
+    "release:ai-sdk-provider": "yarn workspace @cherrystudio/ai-sdk-provider version patch --immediate && yarn workspace @cherrystudio/ai-sdk-provider build && yarn workspace @cherrystudio/ai-sdk-provider npm publish --access public"
   },
   "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",
+    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.53#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.53-4b77f4cf29.patch",
     "@libsql/client": "0.14.0",
     "@libsql/win32-x64-msvc": "^0.4.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",
@@ -107,13 +110,17 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.53",
+    "@ai-sdk/amazon-bedrock": "^3.0.61",
+    "@ai-sdk/anthropic": "^2.0.49",
     "@ai-sdk/cerebras": "^1.0.31",
-    "@ai-sdk/gateway": "^2.0.9",
-    "@ai-sdk/google-vertex": "^3.0.62",
-    "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.8#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.8-d4d0aaac93.patch",
-    "@ai-sdk/mistral": "^2.0.23",
-    "@ai-sdk/perplexity": "^2.0.17",
+    "@ai-sdk/gateway": "^2.0.15",
+    "@ai-sdk/google": "patch:@ai-sdk/google@npm%3A2.0.43#~/.yarn/patches/@ai-sdk-google-npm-2.0.43-689ed559b3.patch",
+    "@ai-sdk/google-vertex": "^3.0.79",
+    "@ai-sdk/huggingface": "^0.0.10",
+    "@ai-sdk/mistral": "^2.0.24",
+    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch",
+    "@ai-sdk/perplexity": "^2.0.20",
+    "@ai-sdk/test-server": "^0.0.1",
     "@ant-design/v5-patch-for-react-19": "^1.0.3",
     "@anthropic-ai/sdk": "^0.41.0",
     "@anthropic-ai/vertex-sdk": "patch:@anthropic-ai/vertex-sdk@npm%3A0.11.4#~/.yarn/patches/@anthropic-ai-vertex-sdk-npm-0.11.4-c19cb41edb.patch",
@@ -121,7 +128,7 @@
     "@aws-sdk/client-bedrock-runtime": "^3.910.0",
     "@aws-sdk/client-s3": "^3.910.0",
     "@biomejs/biome": "2.2.4",
-    "@cherrystudio/ai-core": "workspace:^1.0.0-alpha.18",
+    "@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",
@@ -135,7 +142,7 @@
     "@cherrystudio/embedjs-ollama": "^0.1.31",
     "@cherrystudio/embedjs-openai": "^0.1.31",
     "@cherrystudio/extension-table-plus": "workspace:^",
-    "@cherrystudio/openai": "^6.5.0",
+    "@cherrystudio/openai": "^6.9.0",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^9.0.0",
     "@dnd-kit/sortable": "^10.0.0",
@@ -158,15 +165,15 @@
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@mozilla/readability": "^0.6.0",
     "@notionhq/client": "^2.2.15",
-    "@openrouter/ai-sdk-provider": "^1.2.0",
+    "@openrouter/ai-sdk-provider": "^1.2.8",
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/core": "2.0.0",
     "@opentelemetry/exporter-trace-otlp-http": "^0.200.0",
     "@opentelemetry/sdk-trace-base": "^2.0.0",
     "@opentelemetry/sdk-trace-node": "^2.0.0",
     "@opentelemetry/sdk-trace-web": "^2.0.0",
-    "@opeoginni/github-copilot-openai-compatible": "0.1.19",
-    "@playwright/test": "^1.52.0",
+    "@opeoginni/github-copilot-openai-compatible": "^0.1.21",
+    "@playwright/test": "^1.55.1",
     "@radix-ui/react-context-menu": "^2.2.16",
     "@reduxjs/toolkit": "^2.2.5",
     "@shikijs/markdown-it": "^3.12.0",
@@ -211,8 +218,8 @@
     "@types/mime-types": "^3",
     "@types/node": "^22.17.1",
     "@types/pako": "^1.0.2",
-    "@types/react": "^19.0.12",
-    "@types/react-dom": "^19.0.4",
+    "@types/react": "^19.2.7",
+    "@types/react-dom": "^19.2.3",
     "@types/react-infinite-scroll-component": "^5.0.0",
     "@types/react-transition-group": "^4.4.12",
     "@types/react-window": "^1",
@@ -234,7 +241,7 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.90",
+    "ai": "^5.0.98",
     "antd": "patch:antd@npm%3A5.27.0#~/.yarn/patches/antd-npm-5.27.0-aa91c36546.patch",
     "archiver": "^7.0.1",
     "async-mutex": "^0.5.0",
@@ -315,7 +322,6 @@
     "p-queue": "^8.1.0",
     "pdf-lib": "^1.17.1",
     "pdf-parse": "^1.1.1",
-    "playwright": "^1.55.1",
     "proxy-agent": "^6.5.0",
     "react": "^19.2.0",
     "react-dom": "^19.2.0",
@@ -406,9 +412,9 @@
     "@langchain/openai@npm:>=0.1.0 <0.6.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
     "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
     "@langchain/openai@npm:>=0.2.0 <0.7.0": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
-    "@ai-sdk/openai@npm:2.0.64": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
-    "@ai-sdk/openai@npm:^2.0.42": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
-    "@ai-sdk/google@npm:2.0.31": "patch:@ai-sdk/google@npm%3A2.0.31#~/.yarn/patches/@ai-sdk-google-npm-2.0.31-b0de047210.patch"
+    "@ai-sdk/openai@npm:^2.0.42": "patch:@ai-sdk/openai@npm%3A2.0.72#~/.yarn/patches/@ai-sdk-openai-npm-2.0.72-234e68da87.patch",
+    "@ai-sdk/google@npm:^2.0.40": "patch:@ai-sdk/google@npm%3A2.0.40#~/.yarn/patches/@ai-sdk-google-npm-2.0.40-47e0eeee83.patch",
+    "@ai-sdk/openai-compatible@npm:^1.0.27": "patch:@ai-sdk/openai-compatible@npm%3A1.0.27#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/ai-sdk-provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cherrystudio/ai-sdk-provider",
-  "version": "0.1.0",
+  "version": "0.1.3",
   "description": "Cherry Studio AI SDK provider bundle with CherryIN routing.",
   "keywords": [
     "ai-sdk",
@@ -42,7 +42,7 @@
   },
   "dependencies": {
     "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.12"
+    "@ai-sdk/provider-utils": "^3.0.17"
   },
   "devDependencies": {
     "tsdown": "^0.13.3",

packages/ai-sdk-provider/src/cherryin-provider.ts

@@ -67,6 +67,11 @@ export interface CherryInProviderSettings {
    * Optional static headers applied to every request.
    */
   headers?: HeadersInput
+  /**
+   * Optional endpoint type to distinguish different endpoint behaviors.
+   * "image-generation" is also openai endpoint, but specifically for image generation.
+   */
+  endpointType?: 'openai' | 'openai-response' | 'anthropic' | 'gemini' | 'image-generation' | 'jina-rerank'
 }
 
 export interface CherryInProvider extends ProviderV2 {
@@ -151,7 +156,8 @@ export const createCherryIn = (options: CherryInProviderSettings = {}): CherryIn
     baseURL = DEFAULT_CHERRYIN_BASE_URL,
     anthropicBaseURL = DEFAULT_CHERRYIN_ANTHROPIC_BASE_URL,
     geminiBaseURL = DEFAULT_CHERRYIN_GEMINI_BASE_URL,
-    fetch
+    fetch,
+    endpointType
   } = options
 
   const getJsonHeaders = createJsonHeadersGetter(options)
@@ -205,7 +211,7 @@ export const createCherryIn = (options: CherryInProviderSettings = {}): CherryIn
       fetch
     })
 
-  const createChatModel = (modelId: string, settings: OpenAIProviderSettings = {}) => {
+  const createChatModelByModelId = (modelId: string, settings: OpenAIProviderSettings = {}) => {
     if (isAnthropicModel(modelId)) {
       return createAnthropicModel(modelId)
     }
@@ -223,6 +229,29 @@ export const createCherryIn = (options: CherryInProviderSettings = {}): CherryIn
     })
   }
 
+  const createChatModel = (modelId: string, settings: OpenAIProviderSettings = {}) => {
+    if (!endpointType) return createChatModelByModelId(modelId, settings)
+    switch (endpointType) {
+      case 'anthropic':
+        return createAnthropicModel(modelId)
+      case 'gemini':
+        return createGeminiModel(modelId)
+      case 'openai':
+        return createOpenAIChatModel(modelId)
+      case 'openai-response':
+      default:
+        return new OpenAIResponsesLanguageModel(modelId, {
+          provider: `${CHERRYIN_PROVIDER_NAME}.openai`,
+          url,
+          headers: () => ({
+            ...getJsonHeaders(),
+            ...settings.headers
+          }),
+          fetch
+        })
+    }
+  }
+
   const createCompletionModel = (modelId: string, settings: OpenAIProviderSettings = {}) =>
     new OpenAICompletionLanguageModel(modelId, {
       provider: `${CHERRYIN_PROVIDER_NAME}.completion`,

packages/aiCore/README.md

@@ -71,7 +71,7 @@ Cherry Studio AI Core 是一个基于 Vercel AI SDK 的统一 AI Provider 接口
 ## 安装
 
 ```bash
-npm install @cherrystudio/ai-core ai
+npm install @cherrystudio/ai-core ai @ai-sdk/google @ai-sdk/openai
 ```
 
 ### React Native

packages/aiCore/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cherrystudio/ai-core",
-  "version": "1.0.1",
+  "version": "1.0.9",
   "description": "Cherry Studio AI Core - Unified AI Provider Interface Based on Vercel AI SDK",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -33,19 +33,19 @@
   },
   "homepage": "https://github.com/CherryHQ/cherry-studio#readme",
   "peerDependencies": {
+    "@ai-sdk/google": "^2.0.36",
+    "@ai-sdk/openai": "^2.0.64",
+    "@cherrystudio/ai-sdk-provider": "^0.1.3",
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.43",
-    "@ai-sdk/azure": "^2.0.66",
-    "@ai-sdk/deepseek": "^1.0.27",
-    "@ai-sdk/google": "patch:@ai-sdk/google@npm%3A2.0.31#~/.yarn/patches/@ai-sdk-google-npm-2.0.31-b0de047210.patch",
-    "@ai-sdk/openai": "patch:@ai-sdk/openai@npm%3A2.0.64#~/.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch",
-    "@ai-sdk/openai-compatible": "^1.0.26",
+    "@ai-sdk/anthropic": "^2.0.49",
+    "@ai-sdk/azure": "^2.0.74",
+    "@ai-sdk/deepseek": "^1.0.29",
+    "@ai-sdk/openai-compatible": "patch:@ai-sdk/openai-compatible@npm%3A1.0.27#~/.yarn/patches/@ai-sdk-openai-compatible-npm-1.0.27-06f74278cf.patch",
     "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.16",
-    "@ai-sdk/xai": "^2.0.31",
-    "@cherrystudio/ai-sdk-provider": "workspace:*",
+    "@ai-sdk/provider-utils": "^3.0.17",
+    "@ai-sdk/xai": "^2.0.36",
     "zod": "^4.1.5"
   },
   "devDependencies": {

packages/aiCore/src/__tests__/fixtures/mock-providers.ts

@@ -0,0 +1,180 @@
+/**
+ * Mock Provider Instances
+ * Provides mock implementations for all supported AI providers
+ */
+
+import type { ImageModelV2, LanguageModelV2 } from '@ai-sdk/provider'
+import { vi } from 'vitest'
+
+/**
+ * Creates a mock language model with customizable behavior
+ */
+export function createMockLanguageModel(overrides?: Partial<LanguageModelV2>): LanguageModelV2 {
+  return {
+    specificationVersion: 'v1',
+    provider: 'mock-provider',
+    modelId: 'mock-model',
+    defaultObjectGenerationMode: 'tool',
+
+    doGenerate: vi.fn().mockResolvedValue({
+      text: 'Mock response text',
+      finishReason: 'stop',
+      usage: {
+        promptTokens: 10,
+        completionTokens: 20,
+        totalTokens: 30
+      },
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    }),
+
+    doStream: vi.fn().mockReturnValue({
+      stream: (async function* () {
+        yield {
+          type: 'text-delta',
+          textDelta: 'Mock '
+        }
+        yield {
+          type: 'text-delta',
+          textDelta: 'streaming '
+        }
+        yield {
+          type: 'text-delta',
+          textDelta: 'response'
+        }
+        yield {
+          type: 'finish',
+          finishReason: 'stop',
+          usage: {
+            promptTokens: 10,
+            completionTokens: 15,
+            totalTokens: 25
+          }
+        }
+      })(),
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    }),
+
+    ...overrides
+  } as LanguageModelV2
+}
+
+/**
+ * Creates a mock image model with customizable behavior
+ */
+export function createMockImageModel(overrides?: Partial<ImageModelV2>): ImageModelV2 {
+  return {
+    specificationVersion: 'v2',
+    provider: 'mock-provider',
+    modelId: 'mock-image-model',
+
+    doGenerate: vi.fn().mockResolvedValue({
+      images: [
+        {
+          base64: 'mock-base64-image-data',
+          uint8Array: new Uint8Array([1, 2, 3, 4, 5]),
+          mimeType: 'image/png'
+        }
+      ],
+      warnings: []
+    }),
+
+    ...overrides
+  } as ImageModelV2
+}
+
+/**
+ * Mock provider configurations for testing
+ */
+export const mockProviderConfigs = {
+  openai: {
+    apiKey: 'sk-test-openai-key-123456789',
+    baseURL: 'https://api.openai.com/v1',
+    organization: 'test-org'
+  },
+
+  anthropic: {
+    apiKey: 'sk-ant-test-key-123456789',
+    baseURL: 'https://api.anthropic.com'
+  },
+
+  google: {
+    apiKey: 'test-google-api-key-123456789',
+    baseURL: 'https://generativelanguage.googleapis.com/v1'
+  },
+
+  xai: {
+    apiKey: 'xai-test-key-123456789',
+    baseURL: 'https://api.x.ai/v1'
+  },
+
+  azure: {
+    apiKey: 'test-azure-key-123456789',
+    resourceName: 'test-resource',
+    deployment: 'test-deployment'
+  },
+
+  deepseek: {
+    apiKey: 'sk-test-deepseek-key-123456789',
+    baseURL: 'https://api.deepseek.com/v1'
+  },
+
+  openrouter: {
+    apiKey: 'sk-or-test-key-123456789',
+    baseURL: 'https://openrouter.ai/api/v1'
+  },
+
+  huggingface: {
+    apiKey: 'hf_test_key_123456789',
+    baseURL: 'https://api-inference.huggingface.co'
+  },
+
+  'openai-compatible': {
+    apiKey: 'test-compatible-key-123456789',
+    baseURL: 'https://api.example.com/v1',
+    name: 'test-provider'
+  },
+
+  'openai-chat': {
+    apiKey: 'sk-test-chat-key-123456789',
+    baseURL: 'https://api.openai.com/v1'
+  }
+} as const
+
+/**
+ * Mock provider instances for testing
+ */
+export const mockProviderInstances = {
+  openai: {
+    name: 'openai-mock',
+    languageModel: createMockLanguageModel({ provider: 'openai', modelId: 'gpt-4' }),
+    imageModel: createMockImageModel({ provider: 'openai', modelId: 'dall-e-3' })
+  },
+
+  anthropic: {
+    name: 'anthropic-mock',
+    languageModel: createMockLanguageModel({ provider: 'anthropic', modelId: 'claude-3-5-sonnet-20241022' })
+  },
+
+  google: {
+    name: 'google-mock',
+    languageModel: createMockLanguageModel({ provider: 'google', modelId: 'gemini-2.0-flash-exp' }),
+    imageModel: createMockImageModel({ provider: 'google', modelId: 'imagen-3.0-generate-001' })
+  },
+
+  xai: {
+    name: 'xai-mock',
+    languageModel: createMockLanguageModel({ provider: 'xai', modelId: 'grok-2-latest' }),
+    imageModel: createMockImageModel({ provider: 'xai', modelId: 'grok-2-image-latest' })
+  },
+
+  deepseek: {
+    name: 'deepseek-mock',
+    languageModel: createMockLanguageModel({ provider: 'deepseek', modelId: 'deepseek-chat' })
+  }
+}
+
+export type ProviderId = keyof typeof mockProviderConfigs

packages/aiCore/src/__tests__/fixtures/mock-responses.ts

@@ -0,0 +1,238 @@
+/**
+ * Mock Responses
+ * Provides realistic mock responses for all provider types
+ */
+
+import type { ModelMessage, Tool } from 'ai'
+import { jsonSchema } from 'ai'
+
+/**
+ * Standard test messages for all scenarios
+ */
+export const testMessages: Record<string, ModelMessage[]> = {
+  simple: [{ role: 'user' as const, content: 'Hello, how are you?' }],
+
+  conversation: [
+    { role: 'user' as const, content: 'What is the capital of France?' },
+    { role: 'assistant' as const, content: 'The capital of France is Paris.' },
+    { role: 'user' as const, content: 'What is its population?' }
+  ],
+
+  withSystem: [
+    { role: 'system' as const, content: 'You are a helpful assistant that provides concise answers.' },
+    { role: 'user' as const, content: 'Explain quantum computing in one sentence.' }
+  ],
+
+  withImages: [
+    {
+      role: 'user' as const,
+      content: [
+        { type: 'text' as const, text: 'What is in this image?' },
+        {
+          type: 'image' as const,
+          image:
+            'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
+        }
+      ]
+    }
+  ],
+
+  toolUse: [{ role: 'user' as const, content: 'What is the weather in San Francisco?' }],
+
+  multiTurn: [
+    { role: 'user' as const, content: 'Can you help me with a math problem?' },
+    { role: 'assistant' as const, content: 'Of course! What math problem would you like help with?' },
+    { role: 'user' as const, content: 'What is 15 * 23?' },
+    { role: 'assistant' as const, content: '15 * 23 = 345' },
+    { role: 'user' as const, content: 'Now divide that by 5' }
+  ]
+}
+
+/**
+ * Standard test tools for tool calling scenarios
+ */
+export const testTools: Record<string, Tool> = {
+  getWeather: {
+    description: 'Get the current weather in a given location',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        location: {
+          type: 'string',
+          description: 'The city and state, e.g. San Francisco, CA'
+        },
+        unit: {
+          type: 'string',
+          enum: ['celsius', 'fahrenheit'],
+          description: 'The temperature unit to use'
+        }
+      },
+      required: ['location']
+    }),
+    execute: async ({ location, unit = 'fahrenheit' }) => {
+      return {
+        location,
+        temperature: unit === 'celsius' ? 22 : 72,
+        unit,
+        condition: 'sunny'
+      }
+    }
+  },
+
+  calculate: {
+    description: 'Perform a mathematical calculation',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        operation: {
+          type: 'string',
+          enum: ['add', 'subtract', 'multiply', 'divide'],
+          description: 'The operation to perform'
+        },
+        a: {
+          type: 'number',
+          description: 'The first number'
+        },
+        b: {
+          type: 'number',
+          description: 'The second number'
+        }
+      },
+      required: ['operation', 'a', 'b']
+    }),
+    execute: async ({ operation, a, b }) => {
+      const operations = {
+        add: (x: number, y: number) => x + y,
+        subtract: (x: number, y: number) => x - y,
+        multiply: (x: number, y: number) => x * y,
+        divide: (x: number, y: number) => x / y
+      }
+      return { result: operations[operation as keyof typeof operations](a, b) }
+    }
+  },
+
+  searchDatabase: {
+    description: 'Search for information in a database',
+    inputSchema: jsonSchema({
+      type: 'object',
+      properties: {
+        query: {
+          type: 'string',
+          description: 'The search query'
+        },
+        limit: {
+          type: 'number',
+          description: 'Maximum number of results to return',
+          default: 10
+        }
+      },
+      required: ['query']
+    }),
+    execute: async ({ query, limit = 10 }) => {
+      return {
+        results: [
+          { id: 1, title: `Result 1 for ${query}`, relevance: 0.95 },
+          { id: 2, title: `Result 2 for ${query}`, relevance: 0.87 }
+        ].slice(0, limit)
+      }
+    }
+  }
+}
+
+/**
+ * Mock complete responses for non-streaming scenarios
+ * Note: AI SDK v5 uses inputTokens/outputTokens instead of promptTokens/completionTokens
+ */
+export const mockCompleteResponses = {
+  simple: {
+    text: 'This is a simple response.',
+    finishReason: 'stop' as const,
+    usage: {
+      inputTokens: 15,
+      outputTokens: 8,
+      totalTokens: 23
+    }
+  },
+
+  withToolCalls: {
+    text: 'I will check the weather for you.',
+    toolCalls: [
+      {
+        toolCallId: 'call_456',
+        toolName: 'getWeather',
+        args: { location: 'New York, NY', unit: 'celsius' }
+      }
+    ],
+    finishReason: 'tool-calls' as const,
+    usage: {
+      inputTokens: 25,
+      outputTokens: 12,
+      totalTokens: 37
+    }
+  },
+
+  withWarnings: {
+    text: 'Response with warnings.',
+    finishReason: 'stop' as const,
+    usage: {
+      inputTokens: 10,
+      outputTokens: 5,
+      totalTokens: 15
+    },
+    warnings: [
+      {
+        type: 'unsupported-setting' as const,
+        setting: 'temperature',
+        details: 'Temperature parameter not supported for this model'
+      }
+    ]
+  }
+}
+
+/**
+ * Mock image generation responses
+ */
+export const mockImageResponses = {
+  single: {
+    image: {
+      base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+      uint8Array: new Uint8Array([137, 80, 78, 71, 13, 10, 26, 10, 0, 0, 0, 13, 73, 72, 68, 82]),
+      mimeType: 'image/png' as const
+    },
+    warnings: []
+  },
+
+  multiple: {
+    images: [
+      {
+        base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+        uint8Array: new Uint8Array([137, 80, 78, 71]),
+        mimeType: 'image/png' as const
+      },
+      {
+        base64: 'iVBORw0KGgoAAAANSUhEUgAAAAIAAAACCAYAAABytg0kAAAAEklEQVR42mNk+M9QzwAEjDAGACCKAgdZ9zImAAAAAElFTkSuQmCC',
+        uint8Array: new Uint8Array([137, 80, 78, 71]),
+        mimeType: 'image/png' as const
+      }
+    ],
+    warnings: []
+  },
+
+  withProviderMetadata: {
+    image: {
+      base64: 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+      uint8Array: new Uint8Array([137, 80, 78, 71]),
+      mimeType: 'image/png' as const
+    },
+    providerMetadata: {
+      openai: {
+        images: [
+          {
+            revisedPrompt: 'A detailed and enhanced version of the original prompt'
+          }
+        ]
+      }
+    },
+    warnings: []
+  }
+}

packages/aiCore/src/__tests__/helpers/provider-test-utils.ts

@@ -0,0 +1,329 @@
+/**
+ * Provider-Specific Test Utilities
+ * Helper functions for testing individual providers with all their parameters
+ */
+
+import type { Tool } from 'ai'
+import { expect } from 'vitest'
+
+/**
+ * Provider parameter configurations for comprehensive testing
+ */
+export const providerParameterMatrix = {
+  openai: {
+    models: ['gpt-4', 'gpt-4-turbo', 'gpt-3.5-turbo', 'gpt-4o'],
+    parameters: {
+      temperature: [0, 0.5, 0.7, 1.0, 1.5, 2.0],
+      maxTokens: [100, 500, 1000, 2000, 4000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      frequencyPenalty: [-2.0, -1.0, 0, 1.0, 2.0],
+      presencePenalty: [-2.0, -1.0, 0, 1.0, 2.0],
+      stop: [undefined, ['stop'], ['STOP', 'END']],
+      seed: [undefined, 12345, 67890],
+      responseFormat: [undefined, { type: 'json_object' as const }],
+      user: [undefined, 'test-user-123']
+    },
+    toolChoice: ['auto', 'required', 'none', { type: 'function' as const, name: 'getWeather' }],
+    parallelToolCalls: [true, false]
+  },
+
+  anthropic: {
+    models: ['claude-3-5-sonnet-20241022', 'claude-3-opus-20240229', 'claude-3-haiku-20240307'],
+    parameters: {
+      temperature: [0, 0.5, 1.0],
+      maxTokens: [100, 1000, 4000, 8000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      topK: [undefined, 1, 5, 10, 40],
+      stop: [undefined, ['Human:', 'Assistant:']],
+      metadata: [undefined, { userId: 'test-123' }]
+    },
+    toolChoice: ['auto', 'any', { type: 'tool' as const, name: 'getWeather' }]
+  },
+
+  google: {
+    models: ['gemini-2.0-flash-exp', 'gemini-1.5-pro', 'gemini-1.5-flash'],
+    parameters: {
+      temperature: [0, 0.5, 0.9, 1.0],
+      maxTokens: [100, 1000, 2000, 8000],
+      topP: [0.1, 0.5, 0.95, 1.0],
+      topK: [undefined, 1, 16, 40],
+      stopSequences: [undefined, ['END'], ['STOP', 'TERMINATE']]
+    },
+    safetySettings: [
+      undefined,
+      [
+        { category: 'HARM_CATEGORY_HARASSMENT', threshold: 'BLOCK_MEDIUM_AND_ABOVE' },
+        { category: 'HARM_CATEGORY_HATE_SPEECH', threshold: 'BLOCK_ONLY_HIGH' }
+      ]
+    ]
+  },
+
+  xai: {
+    models: ['grok-2-latest', 'grok-2-1212'],
+    parameters: {
+      temperature: [0, 0.5, 1.0, 1.5],
+      maxTokens: [100, 500, 2000, 4000],
+      topP: [0.1, 0.5, 0.9, 1.0],
+      stop: [undefined, ['STOP'], ['END', 'TERMINATE']],
+      seed: [undefined, 12345]
+    }
+  },
+
+  deepseek: {
+    models: ['deepseek-chat', 'deepseek-coder'],
+    parameters: {
+      temperature: [0, 0.5, 1.0],
+      maxTokens: [100, 1000, 4000],
+      topP: [0.1, 0.5, 0.95],
+      frequencyPenalty: [0, 0.5, 1.0],
+      presencePenalty: [0, 0.5, 1.0],
+      stop: [undefined, ['```'], ['END']]
+    }
+  },
+
+  azure: {
+    deployments: ['gpt-4-deployment', 'gpt-35-turbo-deployment'],
+    parameters: {
+      temperature: [0, 0.7, 1.0],
+      maxTokens: [100, 1000, 2000],
+      topP: [0.1, 0.5, 0.95],
+      frequencyPenalty: [0, 1.0],
+      presencePenalty: [0, 1.0],
+      stop: [undefined, ['STOP']]
+    }
+  }
+} as const
+
+/**
+ * Creates test cases for all parameter combinations
+ */
+export function generateParameterTestCases<T extends Record<string, any[]>>(
+  params: T,
+  maxCombinations = 50
+): Array<Partial<{ [K in keyof T]: T[K][number] }>> {
+  const keys = Object.keys(params) as Array<keyof T>
+  const testCases: Array<Partial<{ [K in keyof T]: T[K][number] }>> = []
+
+  // Generate combinations using sampling strategy for large parameter spaces
+  const totalCombinations = keys.reduce((acc, key) => acc * params[key].length, 1)
+
+  if (totalCombinations <= maxCombinations) {
+    // Generate all combinations if total is small
+    generateAllCombinations(params, keys, 0, {}, testCases)
+  } else {
+    // Sample diverse combinations if total is large
+    generateSampledCombinations(params, keys, maxCombinations, testCases)
+  }
+
+  return testCases
+}
+
+function generateAllCombinations<T extends Record<string, any[]>>(
+  params: T,
+  keys: Array<keyof T>,
+  index: number,
+  current: Partial<{ [K in keyof T]: T[K][number] }>,
+  results: Array<Partial<{ [K in keyof T]: T[K][number] }>>
+) {
+  if (index === keys.length) {
+    results.push({ ...current })
+    return
+  }
+
+  const key = keys[index]
+  for (const value of params[key]) {
+    generateAllCombinations(params, keys, index + 1, { ...current, [key]: value }, results)
+  }
+}
+
+function generateSampledCombinations<T extends Record<string, any[]>>(
+  params: T,
+  keys: Array<keyof T>,
+  count: number,
+  results: Array<Partial<{ [K in keyof T]: T[K][number] }>>
+) {
+  // Generate edge cases first (min/max values)
+  const edgeCase1: any = {}
+  const edgeCase2: any = {}
+
+  for (const key of keys) {
+    edgeCase1[key] = params[key][0]
+    edgeCase2[key] = params[key][params[key].length - 1]
+  }
+
+  results.push(edgeCase1, edgeCase2)
+
+  // Generate random combinations for the rest
+  for (let i = results.length; i < count; i++) {
+    const combination: any = {}
+    for (const key of keys) {
+      const values = params[key]
+      combination[key] = values[Math.floor(Math.random() * values.length)]
+    }
+    results.push(combination)
+  }
+}
+
+/**
+ * Validates that all provider-specific parameters are correctly passed through
+ */
+export function validateProviderParams(providerId: string, actualParams: any, expectedParams: any): void {
+  const requiredFields: Record<string, string[]> = {
+    openai: ['model', 'messages'],
+    anthropic: ['model', 'messages'],
+    google: ['model', 'contents'],
+    xai: ['model', 'messages'],
+    deepseek: ['model', 'messages'],
+    azure: ['messages']
+  }
+
+  const fields = requiredFields[providerId] || ['model', 'messages']
+
+  for (const field of fields) {
+    expect(actualParams).toHaveProperty(field)
+  }
+
+  // Validate optional parameters if they were provided
+  const optionalParams = ['temperature', 'max_tokens', 'top_p', 'stop', 'tools']
+
+  for (const param of optionalParams) {
+    if (expectedParams[param] !== undefined) {
+      expect(actualParams[param]).toEqual(expectedParams[param])
+    }
+  }
+}
+
+/**
+ * Creates a comprehensive test suite for a provider
+ */
+// oxlint-disable-next-line no-unused-vars
+export function createProviderTestSuite(_providerId: string) {
+  return {
+    testBasicCompletion: async (executor: any, model: string) => {
+      const result = await executor.generateText({
+        model,
+        messages: [{ role: 'user' as const, content: 'Hello' }]
+      })
+
+      expect(result).toBeDefined()
+      expect(result.text).toBeDefined()
+      expect(typeof result.text).toBe('string')
+    },
+
+    testStreaming: async (executor: any, model: string) => {
+      const chunks: any[] = []
+      const result = await executor.streamText({
+        model,
+        messages: [{ role: 'user' as const, content: 'Hello' }]
+      })
+
+      for await (const chunk of result.textStream) {
+        chunks.push(chunk)
+      }
+
+      expect(chunks.length).toBeGreaterThan(0)
+    },
+
+    testTemperature: async (executor: any, model: string, temperatures: number[]) => {
+      for (const temperature of temperatures) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Hello' }],
+          temperature
+        })
+
+        expect(result).toBeDefined()
+      }
+    },
+
+    testMaxTokens: async (executor: any, model: string, maxTokensValues: number[]) => {
+      for (const maxTokens of maxTokensValues) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Hello' }],
+          maxTokens
+        })
+
+        expect(result).toBeDefined()
+        if (result.usage?.completionTokens) {
+          expect(result.usage.completionTokens).toBeLessThanOrEqual(maxTokens)
+        }
+      }
+    },
+
+    testToolCalling: async (executor: any, model: string, tools: Record<string, Tool>) => {
+      const result = await executor.generateText({
+        model,
+        messages: [{ role: 'user' as const, content: 'What is the weather in SF?' }],
+        tools
+      })
+
+      expect(result).toBeDefined()
+    },
+
+    testStopSequences: async (executor: any, model: string, stopSequences: string[][]) => {
+      for (const stop of stopSequences) {
+        const result = await executor.generateText({
+          model,
+          messages: [{ role: 'user' as const, content: 'Count to 10' }],
+          stop
+        })
+
+        expect(result).toBeDefined()
+      }
+    }
+  }
+}
+
+/**
+ * Generates test data for vision/multimodal testing
+ */
+export function createVisionTestData() {
+  return {
+    imageUrl: 'https://example.com/test-image.jpg',
+    base64Image:
+      'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg==',
+    messages: [
+      {
+        role: 'user' as const,
+        content: [
+          { type: 'text' as const, text: 'What is in this image?' },
+          {
+            type: 'image' as const,
+            image:
+              'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+M9QDwADhgGAWjR9awAAAABJRU5ErkJggg=='
+          }
+        ]
+      }
+    ]
+  }
+}
+
+/**
+ * Creates mock responses for different finish reasons
+ */
+export function createFinishReasonMocks() {
+  return {
+    stop: {
+      text: 'Complete response.',
+      finishReason: 'stop' as const,
+      usage: { promptTokens: 10, completionTokens: 5, totalTokens: 15 }
+    },
+    length: {
+      text: 'Incomplete response due to',
+      finishReason: 'length' as const,
+      usage: { promptTokens: 10, completionTokens: 100, totalTokens: 110 }
+    },
+    'tool-calls': {
+      text: 'Calling tools',
+      finishReason: 'tool-calls' as const,
+      toolCalls: [{ toolCallId: 'call_1', toolName: 'getWeather', args: { location: 'SF' } }],
+      usage: { promptTokens: 10, completionTokens: 8, totalTokens: 18 }
+    },
+    'content-filter': {
+      text: '',
+      finishReason: 'content-filter' as const,
+      usage: { promptTokens: 10, completionTokens: 0, totalTokens: 10 }
+    }
+  }
+}

packages/aiCore/src/__tests__/helpers/test-utils.ts

@@ -0,0 +1,291 @@
+/**
+ * Test Utilities
+ * Helper functions for testing AI Core functionality
+ */
+
+import { expect, vi } from 'vitest'
+
+import type { ProviderId } from '../fixtures/mock-providers'
+import { createMockImageModel, createMockLanguageModel, mockProviderConfigs } from '../fixtures/mock-providers'
+
+/**
+ * Creates a test provider with streaming support
+ */
+export function createTestStreamingProvider(chunks: any[]) {
+  return createMockLanguageModel({
+    doStream: vi.fn().mockReturnValue({
+      stream: (async function* () {
+        for (const chunk of chunks) {
+          yield chunk
+        }
+      })(),
+      rawCall: { rawPrompt: null, rawSettings: {} },
+      rawResponse: { headers: {} },
+      warnings: []
+    })
+  })
+}
+
+/**
+ * Creates a test provider that throws errors
+ */
+export function createErrorProvider(error: Error) {
+  return createMockLanguageModel({
+    doGenerate: vi.fn().mockRejectedValue(error),
+    doStream: vi.fn().mockImplementation(() => {
+      throw error
+    })
+  })
+}
+
+/**
+ * Collects all chunks from a stream
+ */
+export async function collectStreamChunks<T>(stream: AsyncIterable<T>): Promise<T[]> {
+  const chunks: T[] = []
+  for await (const chunk of stream) {
+    chunks.push(chunk)
+  }
+  return chunks
+}
+
+/**
+ * Waits for a specific number of milliseconds
+ */
+export function wait(ms: number): Promise<void> {
+  return new Promise((resolve) => setTimeout(resolve, ms))
+}
+
+/**
+ * Creates a mock abort controller that aborts after a delay
+ */
+export function createDelayedAbortController(delayMs: number): AbortController {
+  const controller = new AbortController()
+  setTimeout(() => controller.abort(), delayMs)
+  return controller
+}
+
+/**
+ * Asserts that a function throws an error with a specific message
+ */
+export async function expectError(fn: () => Promise<any>, expectedMessage?: string | RegExp): Promise<Error> {
+  try {
+    await fn()
+    throw new Error('Expected function to throw an error, but it did not')
+  } catch (error) {
+    if (expectedMessage) {
+      const message = (error as Error).message
+      if (typeof expectedMessage === 'string') {
+        if (!message.includes(expectedMessage)) {
+          throw new Error(`Expected error message to include "${expectedMessage}", but got "${message}"`)
+        }
+      } else {
+        if (!expectedMessage.test(message)) {
+          throw new Error(`Expected error message to match ${expectedMessage}, but got "${message}"`)
+        }
+      }
+    }
+    return error as Error
+  }
+}
+
+/**
+ * Creates a spy function that tracks calls and arguments
+ */
+export function createSpy<T extends (...args: any[]) => any>() {
+  const calls: Array<{ args: Parameters<T>; result?: ReturnType<T>; error?: Error }> = []
+
+  const spy = vi.fn((...args: Parameters<T>) => {
+    try {
+      const result = undefined as ReturnType<T>
+      calls.push({ args, result })
+      return result
+    } catch (error) {
+      calls.push({ args, error: error as Error })
+      throw error
+    }
+  })
+
+  return {
+    fn: spy,
+    calls,
+    getCalls: () => calls,
+    getCallCount: () => calls.length,
+    getLastCall: () => calls[calls.length - 1],
+    reset: () => {
+      calls.length = 0
+      spy.mockClear()
+    }
+  }
+}
+
+/**
+ * Validates provider configuration
+ */
+export function validateProviderConfig(providerId: ProviderId) {
+  const config = mockProviderConfigs[providerId]
+  if (!config) {
+    throw new Error(`No mock configuration found for provider: ${providerId}`)
+  }
+
+  if (!config.apiKey) {
+    throw new Error(`Provider ${providerId} is missing apiKey in mock config`)
+  }
+
+  return config
+}
+
+/**
+ * Creates a test context with common setup
+ */
+export function createTestContext() {
+  const mocks = {
+    languageModel: createMockLanguageModel(),
+    imageModel: createMockImageModel(),
+    providers: new Map<string, any>()
+  }
+
+  const cleanup = () => {
+    mocks.providers.clear()
+    vi.clearAllMocks()
+  }
+
+  return {
+    mocks,
+    cleanup
+  }
+}
+
+/**
+ * Measures execution time of an async function
+ */
+export async function measureTime<T>(fn: () => Promise<T>): Promise<{ result: T; duration: number }> {
+  const start = Date.now()
+  const result = await fn()
+  const duration = Date.now() - start
+  return { result, duration }
+}
+
+/**
+ * Retries a function until it succeeds or max attempts reached
+ */
+export async function retryUntilSuccess<T>(fn: () => Promise<T>, maxAttempts = 3, delayMs = 100): Promise<T> {
+  let lastError: Error | undefined
+
+  for (let attempt = 1; attempt <= maxAttempts; attempt++) {
+    try {
+      return await fn()
+    } catch (error) {
+      lastError = error as Error
+      if (attempt < maxAttempts) {
+        await wait(delayMs)
+      }
+    }
+  }
+
+  throw lastError || new Error('All retry attempts failed')
+}
+
+/**
+ * Creates a mock streaming response that emits chunks at intervals
+ */
+export function createTimedStream<T>(chunks: T[], intervalMs = 10) {
+  return {
+    async *[Symbol.asyncIterator]() {
+      for (const chunk of chunks) {
+        await wait(intervalMs)
+        yield chunk
+      }
+    }
+  }
+}
+
+/**
+ * Asserts that two objects are deeply equal, ignoring specified keys
+ */
+export function assertDeepEqualIgnoring<T extends Record<string, any>>(
+  actual: T,
+  expected: T,
+  ignoreKeys: string[] = []
+): void {
+  const filterKeys = (obj: T): Partial<T> => {
+    const filtered = { ...obj }
+    for (const key of ignoreKeys) {
+      delete filtered[key]
+    }
+    return filtered
+  }
+
+  const filteredActual = filterKeys(actual)
+  const filteredExpected = filterKeys(expected)
+
+  expect(filteredActual).toEqual(filteredExpected)
+}
+
+/**
+ * Creates a provider mock that simulates rate limiting
+ */
+export function createRateLimitedProvider(limitPerSecond: number) {
+  const calls: number[] = []
+
+  return createMockLanguageModel({
+    doGenerate: vi.fn().mockImplementation(async () => {
+      const now = Date.now()
+      calls.push(now)
+
+      // Remove calls older than 1 second
+      const recentCalls = calls.filter((time) => now - time < 1000)
+
+      if (recentCalls.length > limitPerSecond) {
+        throw new Error('Rate limit exceeded')
+      }
+
+      return {
+        text: 'Rate limited response',
+        finishReason: 'stop' as const,
+        usage: { promptTokens: 10, completionTokens: 5, totalTokens: 15 },
+        rawCall: { rawPrompt: null, rawSettings: {} },
+        rawResponse: { headers: {} },
+        warnings: []
+      }
+    })
+  })
+}
+
+/**
+ * Validates streaming response structure
+ */
+export function validateStreamChunk(chunk: any): void {
+  expect(chunk).toBeDefined()
+  expect(chunk).toHaveProperty('type')
+
+  if (chunk.type === 'text-delta') {
+    expect(chunk).toHaveProperty('textDelta')
+    expect(typeof chunk.textDelta).toBe('string')
+  } else if (chunk.type === 'finish') {
+    expect(chunk).toHaveProperty('finishReason')
+    expect(chunk).toHaveProperty('usage')
+  } else if (chunk.type === 'tool-call') {
+    expect(chunk).toHaveProperty('toolCallId')
+    expect(chunk).toHaveProperty('toolName')
+    expect(chunk).toHaveProperty('args')
+  }
+}
+
+/**
+ * Creates a test logger that captures log messages
+ */
+export function createTestLogger() {
+  const logs: Array<{ level: string; message: string; meta?: any }> = []
+
+  return {
+    info: (message: string, meta?: any) => logs.push({ level: 'info', message, meta }),
+    warn: (message: string, meta?: any) => logs.push({ level: 'warn', message, meta }),
+    error: (message: string, meta?: any) => logs.push({ level: 'error', message, meta }),
+    debug: (message: string, meta?: any) => logs.push({ level: 'debug', message, meta }),
+    getLogs: () => logs,
+    clear: () => {
+      logs.length = 0
+    }
+  }
+}

packages/aiCore/src/__tests__/index.ts

@@ -0,0 +1,12 @@
+/**
+ * Test Infrastructure Exports
+ * Central export point for all test utilities, fixtures, and helpers
+ */
+
+// Fixtures
+export * from './fixtures/mock-providers'
+export * from './fixtures/mock-responses'
+
+// Helpers
+export * from './helpers/provider-test-utils'
+export * from './helpers/test-utils'

packages/aiCore/src/__tests__/mocks/ai-sdk-provider.ts

@@ -0,0 +1,35 @@
+/**
+ * Mock for @cherrystudio/ai-sdk-provider
+ * This mock is used in tests to avoid importing the actual package
+ */
+
+export type CherryInProviderSettings = {
+  apiKey?: string
+  baseURL?: string
+}
+
+// oxlint-disable-next-line no-unused-vars
+export const createCherryIn = (_options?: CherryInProviderSettings) => ({
+  // oxlint-disable-next-line no-unused-vars
+  languageModel: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin',
+    modelId: 'mock-model',
+    doGenerate: async () => ({ text: 'mock response' }),
+    doStream: async () => ({ stream: (async function* () {})() })
+  }),
+  // oxlint-disable-next-line no-unused-vars
+  chat: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin-chat',
+    modelId: 'mock-model',
+    doGenerate: async () => ({ text: 'mock response' }),
+    doStream: async () => ({ stream: (async function* () {})() })
+  }),
+  // oxlint-disable-next-line no-unused-vars
+  textEmbeddingModel: (_modelId: string) => ({
+    specificationVersion: 'v1',
+    provider: 'cherryin',
+    modelId: 'mock-embedding-model'
+  })
+})

packages/aiCore/src/__tests__/setup.ts

@@ -0,0 +1,9 @@
+/**
+ * Vitest Setup File
+ * Global test configuration and mocks for @cherrystudio/ai-core package
+ */
+
+// Mock Vite SSR helper to avoid Node environment errors
+;(globalThis as any).__vite_ssr_exportName__ = (_name: string, value: any) => value
+
+// Note: @cherrystudio/ai-sdk-provider is mocked via alias in vitest.config.ts

packages/aiCore/src/core/options/__tests__/factory.test.ts

@@ -0,0 +1,109 @@
+import { describe, expect, it } from 'vitest'
+
+import { createOpenAIOptions, createOpenRouterOptions, mergeProviderOptions } from '../factory'
+
+describe('mergeProviderOptions', () => {
+  it('deep merges provider options for the same provider', () => {
+    const reasoningOptions = createOpenRouterOptions({
+      reasoning: {
+        enabled: true,
+        effort: 'medium'
+      }
+    })
+    const webSearchOptions = createOpenRouterOptions({
+      plugins: [{ id: 'web', max_results: 5 }]
+    })
+
+    const merged = mergeProviderOptions(reasoningOptions, webSearchOptions)
+
+    expect(merged.openrouter).toEqual({
+      reasoning: {
+        enabled: true,
+        effort: 'medium'
+      },
+      plugins: [{ id: 'web', max_results: 5 }]
+    })
+  })
+
+  it('preserves options from other providers while merging', () => {
+    const openRouter = createOpenRouterOptions({
+      reasoning: { enabled: true }
+    })
+    const openAI = createOpenAIOptions({
+      reasoningEffort: 'low'
+    })
+    const merged = mergeProviderOptions(openRouter, openAI)
+
+    expect(merged.openrouter).toEqual({ reasoning: { enabled: true } })
+    expect(merged.openai).toEqual({ reasoningEffort: 'low' })
+  })
+
+  it('overwrites primitive values with later values', () => {
+    const first = createOpenAIOptions({
+      reasoningEffort: 'low',
+      user: 'user-123'
+    })
+    const second = createOpenAIOptions({
+      reasoningEffort: 'high',
+      maxToolCalls: 5
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    expect(merged.openai).toEqual({
+      reasoningEffort: 'high', // overwritten by second
+      user: 'user-123', // preserved from first
+      maxToolCalls: 5 // added from second
+    })
+  })
+
+  it('overwrites arrays with later values instead of merging', () => {
+    const first = createOpenRouterOptions({
+      models: ['gpt-4', 'gpt-3.5-turbo']
+    })
+    const second = createOpenRouterOptions({
+      models: ['claude-3-opus', 'claude-3-sonnet']
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    // Array is completely replaced, not merged
+    expect(merged.openrouter?.models).toEqual(['claude-3-opus', 'claude-3-sonnet'])
+  })
+
+  it('deeply merges nested objects while overwriting primitives', () => {
+    const first = createOpenRouterOptions({
+      reasoning: {
+        enabled: true,
+        effort: 'low'
+      },
+      user: 'user-123'
+    })
+    const second = createOpenRouterOptions({
+      reasoning: {
+        effort: 'high',
+        max_tokens: 500
+      },
+      user: 'user-456'
+    })
+
+    const merged = mergeProviderOptions(first, second)
+
+    expect(merged.openrouter).toEqual({
+      reasoning: {
+        enabled: true, // preserved from first
+        effort: 'high', // overwritten by second
+        max_tokens: 500 // added from second
+      },
+      user: 'user-456' // overwritten by second
+    })
+  })
+
+  it('replaces arrays instead of merging them', () => {
+    const first = createOpenRouterOptions({ plugins: [{ id: 'old' }] })
+    const second = createOpenRouterOptions({ plugins: [{ id: 'new' }] })
+    const merged = mergeProviderOptions(first, second)
+    // @ts-expect-error type-check for openrouter options is skipped. see function signature of createOpenRouterOptions
+    expect(merged.openrouter?.plugins).toEqual([{ id: 'new' }])
+  })
+})

packages/aiCore/src/core/options/factory.ts

@@ -26,13 +26,65 @@ export function createGenericProviderOptions<T extends string>(
   return { [provider]: options } as Record<T, Record<string, any>>
 }
 
+type PlainObject = Record<string, any>
+
+const isPlainObject = (value: unknown): value is PlainObject => {
+  return typeof value === 'object' && value !== null && !Array.isArray(value)
+}
+
+function deepMergeObjects<T extends PlainObject>(target: T, source: PlainObject): T {
+  const result: PlainObject = { ...target }
+  Object.entries(source).forEach(([key, value]) => {
+    if (isPlainObject(value) && isPlainObject(result[key])) {
+      result[key] = deepMergeObjects(result[key], value)
+    } else {
+      result[key] = value
+    }
+  })
+  return result as T
+}
+
 /**
- * 合并多个供应商的options
- * @param optionsMap 包含多个供应商选项的对象
- * @returns 合并后的TypedProviderOptions
+ * Deep-merge multiple provider-specific options.
+ * Nested objects are recursively merged; primitive values are overwritten.
+ *
+ * When the same key appears in multiple options:
+ * - If both values are plain objects: they are deeply merged (recursive merge)
+ * - If values are primitives/arrays: the later value overwrites the earlier one
+ *
+ * @example
+ * mergeProviderOptions(
+ *   { openrouter: { reasoning: { enabled: true, effort: 'low' }, user: 'user-123' } },
+ *   { openrouter: { reasoning: { effort: 'high', max_tokens: 500 }, models: ['gpt-4'] } }
+ * )
+ * // Result: {
+ * //   openrouter: {
+ * //     reasoning: { enabled: true, effort: 'high', max_tokens: 500 },
+ * //     user: 'user-123',
+ * //     models: ['gpt-4']
+ * //   }
+ * // }
+ *
+ * @param optionsMap Objects containing options for multiple providers
+ * @returns Fully merged TypedProviderOptions
  */
 export function mergeProviderOptions(...optionsMap: Partial<TypedProviderOptions>[]): TypedProviderOptions {
-  return Object.assign({}, ...optionsMap)
+  return optionsMap.reduce<TypedProviderOptions>((acc, options) => {
+    if (!options) {
+      return acc
+    }
+    Object.entries(options).forEach(([providerId, providerOptions]) => {
+      if (!providerOptions) {
+        return
+      }
+      if (acc[providerId]) {
+        acc[providerId] = deepMergeObjects(acc[providerId] as PlainObject, providerOptions as PlainObject)
+      } else {
+        acc[providerId] = providerOptions as any
+      }
+    })
+    return acc
+  }, {} as TypedProviderOptions)
 }
 
 /**

packages/aiCore/src/core/plugins/built-in/index.ts

@@ -4,12 +4,7 @@
  */
 export const BUILT_IN_PLUGIN_PREFIX = 'built-in:'
 
-export { googleToolsPlugin } from './googleToolsPlugin'
-export { createLoggingPlugin } from './logging'
-export { createPromptToolUsePlugin } from './toolUsePlugin/promptToolUsePlugin'
-export type {
-  PromptToolUseConfig,
-  ToolUseRequestContext,
-  ToolUseResult
-} from './toolUsePlugin/type'
-export { webSearchPlugin, type WebSearchPluginConfig } from './webSearchPlugin'
+export * from './googleToolsPlugin'
+export * from './toolUsePlugin/promptToolUsePlugin'
+export * from './toolUsePlugin/type'
+export * from './webSearchPlugin'

packages/aiCore/src/core/plugins/built-in/webSearchPlugin/index.ts

@@ -32,7 +32,7 @@ export const webSearchPlugin = (config: WebSearchPluginConfig = DEFAULT_WEB_SEAR
   })
 
 // 导出类型定义供开发者使用
-export type { WebSearchPluginConfig, WebSearchToolOutputSchema } from './helper'
+export * from './helper'
 
 // 默认导出
 export default webSearchPlugin

packages/aiCore/src/core/providers/__tests__/schemas.test.ts

@@ -19,15 +19,20 @@ describe('Provider Schemas', () => {
       expect(Array.isArray(baseProviders)).toBe(true)
       expect(baseProviders.length).toBeGreaterThan(0)
 
+      // These are the actual base providers defined in schemas.ts
       const expectedIds = [
         'openai',
-        'openai-responses',
+        'openai-chat',
         'openai-compatible',
         'anthropic',
         'google',
         'xai',
         'azure',
-        'deepseek'
+        'azure-responses',
+        'deepseek',
+        'openrouter',
+        'cherryin',
+        'cherryin-chat'
       ]
       const actualIds = baseProviders.map((p) => p.id)
       expectedIds.forEach((id) => {

packages/aiCore/src/core/providers/index.ts

@@ -44,7 +44,7 @@ export {
 // ==================== 基础数据和类型 ====================
 
 // 基础Provider数据源
-export { baseProviderIds, baseProviders } from './schemas'
+export { baseProviderIds, baseProviders, isBaseProvider } from './schemas'
 
 // 类型定义和Schema
 export type {

packages/aiCore/src/core/providers/schemas.ts

@@ -7,7 +7,6 @@ import { createAzure } from '@ai-sdk/azure'
 import { type AzureOpenAIProviderSettings } from '@ai-sdk/azure'
 import { createDeepSeek } from '@ai-sdk/deepseek'
 import { createGoogleGenerativeAI } from '@ai-sdk/google'
-import { createHuggingFace } from '@ai-sdk/huggingface'
 import { createOpenAI, type OpenAIProviderSettings } from '@ai-sdk/openai'
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible'
 import type { LanguageModelV2 } from '@ai-sdk/provider'
@@ -33,8 +32,7 @@ export const baseProviderIds = [
   'deepseek',
   'openrouter',
   'cherryin',
-  'cherryin-chat',
-  'huggingface'
+  'cherryin-chat'
 ] as const
 
 /**
@@ -158,12 +156,6 @@ export const baseProviders = [
       })
     },
     supportsImageGeneration: true
-  },
-  {
-    id: 'huggingface',
-    name: 'HuggingFace',
-    creator: createHuggingFace,
-    supportsImageGeneration: true
   }
 ] as const satisfies BaseProvider[]
 

packages/aiCore/src/core/runtime/__tests__/generateImage.test.ts

@@ -232,11 +232,13 @@ describe('RuntimeExecutor.generateImage', () => {
 
       expect(pluginCallOrder).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
 
+      // transformParams receives params without model (model is handled separately)
+      // and context with core fields + dynamic fields (requestId, startTime, etc.)
       expect(testPlugin.transformParams).toHaveBeenCalledWith(
-        { prompt: 'A test image' },
+        expect.objectContaining({ prompt: 'A test image' }),
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
 
@@ -273,11 +275,12 @@ describe('RuntimeExecutor.generateImage', () => {
 
       await executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })
 
+      // resolveModel receives model id and context with core fields
       expect(modelResolutionPlugin.resolveModel).toHaveBeenCalledWith(
         'dall-e-3',
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
 
@@ -339,12 +342,11 @@ describe('RuntimeExecutor.generateImage', () => {
         .generateImage({ model: 'invalid-model', prompt: 'A test image' })
         .catch((error) => error)
 
-      expect(thrownError).toBeInstanceOf(ImageGenerationError)
-      expect(thrownError.message).toContain('Failed to generate image:')
+      // Error is thrown from pluginEngine directly as ImageModelResolutionError
+      expect(thrownError).toBeInstanceOf(ImageModelResolutionError)
+      expect(thrownError.message).toContain('Failed to resolve image model: invalid-model')
       expect(thrownError.providerId).toBe('openai')
       expect(thrownError.modelId).toBe('invalid-model')
-      expect(thrownError.cause).toBeInstanceOf(ImageModelResolutionError)
-      expect(thrownError.cause.message).toContain('Failed to resolve image model: invalid-model')
     })
 
     it('should handle ImageModelResolutionError without provider', async () => {
@@ -362,8 +364,9 @@ describe('RuntimeExecutor.generateImage', () => {
       const apiError = new Error('API request failed')
       vi.mocked(aiGenerateImage).mockRejectedValue(apiError)
 
+      // Error propagates directly from pluginEngine without wrapping
       await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'API request failed'
       )
     })
 
@@ -376,8 +379,9 @@ describe('RuntimeExecutor.generateImage', () => {
       vi.mocked(aiGenerateImage).mockRejectedValue(noImageError)
       vi.mocked(NoImageGeneratedError.isInstance).mockReturnValue(true)
 
+      // Error propagates directly from pluginEngine
       await expect(executor.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'No image generated'
       )
     })
 
@@ -398,15 +402,17 @@ describe('RuntimeExecutor.generateImage', () => {
         [errorPlugin]
       )
 
+      // Error propagates directly from pluginEngine
       await expect(executorWithPlugin.generateImage({ model: 'dall-e-3', prompt: 'A test image' })).rejects.toThrow(
-        'Failed to generate image:'
+        'Generation failed'
       )
 
+      // onError receives the original error and context with core fields
       expect(errorPlugin.onError).toHaveBeenCalledWith(
         error,
         expect.objectContaining({
           providerId: 'openai',
-          modelId: 'dall-e-3'
+          model: 'dall-e-3'
         })
       )
     })
@@ -419,9 +425,10 @@ describe('RuntimeExecutor.generateImage', () => {
       const abortController = new AbortController()
       setTimeout(() => abortController.abort(), 10)
 
+      // Error propagates directly from pluginEngine
       await expect(
         executor.generateImage({ model: 'dall-e-3', prompt: 'A test image', abortSignal: abortController.signal })
-      ).rejects.toThrow('Failed to generate image:')
+      ).rejects.toThrow('Operation was aborted')
     })
   })
 

packages/aiCore/src/core/runtime/__tests__/generateText.test.ts

@@ -0,0 +1,504 @@
+/**
+ * RuntimeExecutor.generateText Comprehensive Tests
+ * Tests non-streaming text generation across all providers with various parameters
+ */
+
+import { generateText } from 'ai'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import {
+  createMockLanguageModel,
+  mockCompleteResponses,
+  mockProviderConfigs,
+  testMessages,
+  testTools
+} from '../../../__tests__'
+import type { AiPlugin } from '../../plugins'
+import { globalRegistryManagement } from '../../providers/RegistryManagement'
+import { RuntimeExecutor } from '../executor'
+
+// Mock AI SDK - use importOriginal to keep jsonSchema and other non-mocked exports
+vi.mock('ai', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
+    generateText: vi.fn()
+  }
+})
+
+vi.mock('../../providers/RegistryManagement', () => ({
+  globalRegistryManagement: {
+    languageModel: vi.fn()
+  },
+  DEFAULT_SEPARATOR: '|'
+}))
+
+describe('RuntimeExecutor.generateText', () => {
+  let executor: RuntimeExecutor<'openai'>
+  let mockLanguageModel: any
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    executor = RuntimeExecutor.create('openai', mockProviderConfigs.openai)
+
+    mockLanguageModel = createMockLanguageModel({
+      provider: 'openai',
+      modelId: 'gpt-4'
+    })
+
+    vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(mockLanguageModel)
+    vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.simple as any)
+  })
+
+  describe('Basic Functionality', () => {
+    it('should generate text with minimal parameters', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(generateText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.simple
+      })
+
+      expect(result.text).toBe('This is a simple response.')
+      expect(result.finishReason).toBe('stop')
+      expect(result.usage).toBeDefined()
+    })
+
+    it('should generate with system messages', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.withSystem
+      })
+
+      expect(generateText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.withSystem
+      })
+    })
+
+    it('should generate with conversation history', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.conversation
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          messages: testMessages.conversation
+        })
+      )
+    })
+  })
+
+  describe('All Parameter Combinations', () => {
+    it('should support all parameters together', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 0.7,
+        maxOutputTokens: 500,
+        topP: 0.9,
+        frequencyPenalty: 0.5,
+        presencePenalty: 0.3,
+        stopSequences: ['STOP'],
+        seed: 12345
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.7,
+          maxOutputTokens: 500,
+          topP: 0.9,
+          frequencyPenalty: 0.5,
+          presencePenalty: 0.3,
+          stopSequences: ['STOP'],
+          seed: 12345
+        })
+      )
+    })
+
+    it('should support partial parameters', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 0.5,
+        maxOutputTokens: 100
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5,
+          maxOutputTokens: 100
+        })
+      )
+    })
+  })
+
+  describe('Tool Calling', () => {
+    beforeEach(() => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.withToolCalls as any)
+    })
+
+    it('should support tool calling', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          tools: testTools
+        })
+      )
+
+      expect(result.toolCalls).toBeDefined()
+      expect(result.toolCalls).toHaveLength(1)
+    })
+
+    it('should support toolChoice auto', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: 'auto'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'auto'
+        })
+      )
+    })
+
+    it('should support toolChoice required', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: 'required'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'required'
+        })
+      )
+    })
+
+    it('should support toolChoice none', async () => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.simple as any)
+
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        tools: testTools,
+        toolChoice: 'none'
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: 'none'
+        })
+      )
+    })
+
+    it('should support specific tool selection', async () => {
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.toolUse,
+        tools: testTools,
+        toolChoice: {
+          type: 'tool',
+          toolName: 'getWeather'
+        }
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          toolChoice: {
+            type: 'tool',
+            toolName: 'getWeather'
+          }
+        })
+      )
+    })
+  })
+
+  describe('Multiple Providers', () => {
+    it('should work with Anthropic provider', async () => {
+      const anthropicExecutor = RuntimeExecutor.create('anthropic', mockProviderConfigs.anthropic)
+
+      const anthropicModel = createMockLanguageModel({
+        provider: 'anthropic',
+        modelId: 'claude-3-5-sonnet-20241022'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(anthropicModel)
+
+      await anthropicExecutor.generateText({
+        model: 'claude-3-5-sonnet-20241022',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('anthropic|claude-3-5-sonnet-20241022')
+    })
+
+    it('should work with Google provider', async () => {
+      const googleExecutor = RuntimeExecutor.create('google', mockProviderConfigs.google)
+
+      const googleModel = createMockLanguageModel({
+        provider: 'google',
+        modelId: 'gemini-2.0-flash-exp'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(googleModel)
+
+      await googleExecutor.generateText({
+        model: 'gemini-2.0-flash-exp',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('google|gemini-2.0-flash-exp')
+    })
+
+    it('should work with xAI provider', async () => {
+      const xaiExecutor = RuntimeExecutor.create('xai', mockProviderConfigs.xai)
+
+      const xaiModel = createMockLanguageModel({
+        provider: 'xai',
+        modelId: 'grok-2-latest'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(xaiModel)
+
+      await xaiExecutor.generateText({
+        model: 'grok-2-latest',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('xai|grok-2-latest')
+    })
+
+    it('should work with DeepSeek provider', async () => {
+      const deepseekExecutor = RuntimeExecutor.create('deepseek', mockProviderConfigs.deepseek)
+
+      const deepseekModel = createMockLanguageModel({
+        provider: 'deepseek',
+        modelId: 'deepseek-chat'
+      })
+
+      vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(deepseekModel)
+
+      await deepseekExecutor.generateText({
+        model: 'deepseek-chat',
+        messages: testMessages.simple
+      })
+
+      expect(globalRegistryManagement.languageModel).toHaveBeenCalledWith('deepseek|deepseek-chat')
+    })
+  })
+
+  describe('Plugin Integration', () => {
+    it('should execute all plugin hooks', async () => {
+      const pluginCalls: string[] = []
+
+      const testPlugin: AiPlugin = {
+        name: 'test-plugin',
+        onRequestStart: vi.fn(async () => {
+          pluginCalls.push('onRequestStart')
+        }),
+        transformParams: vi.fn(async (params) => {
+          pluginCalls.push('transformParams')
+          return { ...params, temperature: 0.8 }
+        }),
+        transformResult: vi.fn(async (result) => {
+          pluginCalls.push('transformResult')
+          return { ...result, text: result.text + ' [modified]' }
+        }),
+        onRequestEnd: vi.fn(async () => {
+          pluginCalls.push('onRequestEnd')
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [testPlugin])
+
+      const result = await executorWithPlugin.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(pluginCalls).toEqual(['onRequestStart', 'transformParams', 'transformResult', 'onRequestEnd'])
+
+      // Verify transformed parameters
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.8
+        })
+      )
+
+      // Verify transformed result
+      expect(result.text).toContain('[modified]')
+    })
+
+    it('should handle multiple plugins in order', async () => {
+      const pluginOrder: string[] = []
+
+      const plugin1: AiPlugin = {
+        name: 'plugin-1',
+        transformParams: vi.fn(async (params) => {
+          pluginOrder.push('plugin-1')
+          return { ...params, temperature: 0.5 }
+        })
+      }
+
+      const plugin2: AiPlugin = {
+        name: 'plugin-2',
+        transformParams: vi.fn(async (params) => {
+          pluginOrder.push('plugin-2')
+          return { ...params, maxTokens: 200 }
+        })
+      }
+
+      const executorWithPlugins = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [plugin1, plugin2])
+
+      await executorWithPlugins.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(pluginOrder).toEqual(['plugin-1', 'plugin-2'])
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5,
+          maxTokens: 200
+        })
+      )
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should handle API errors', async () => {
+      const error = new Error('API request failed')
+      vi.mocked(generateText).mockRejectedValue(error)
+
+      await expect(
+        executor.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('API request failed')
+    })
+
+    it('should execute onError plugin hook', async () => {
+      const error = new Error('Generation failed')
+      vi.mocked(generateText).mockRejectedValue(error)
+
+      const errorPlugin: AiPlugin = {
+        name: 'error-handler',
+        onError: vi.fn()
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [errorPlugin])
+
+      await expect(
+        executorWithPlugin.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Generation failed')
+
+      // onError receives the original error and context with core fields
+      expect(errorPlugin.onError).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          providerId: 'openai',
+          model: 'gpt-4'
+        })
+      )
+    })
+
+    it('should handle model not found error', async () => {
+      const error = new Error('Model not found: invalid-model')
+      vi.mocked(globalRegistryManagement.languageModel).mockImplementation(() => {
+        throw error
+      })
+
+      await expect(
+        executor.generateText({
+          model: 'invalid-model',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Model not found')
+    })
+  })
+
+  describe('Usage and Metadata', () => {
+    it('should return usage information', async () => {
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(result.usage).toBeDefined()
+      expect(result.usage.inputTokens).toBe(15)
+      expect(result.usage.outputTokens).toBe(8)
+      expect(result.usage.totalTokens).toBe(23)
+    })
+
+    it('should handle warnings', async () => {
+      vi.mocked(generateText).mockResolvedValue(mockCompleteResponses.withWarnings as any)
+
+      const result = await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature: 2.5 // Unsupported value
+      })
+
+      expect(result.warnings).toBeDefined()
+      expect(result.warnings).toHaveLength(1)
+      expect(result.warnings![0].type).toBe('unsupported-setting')
+    })
+  })
+
+  describe('Abort Signal', () => {
+    it('should support abort signal', async () => {
+      const abortController = new AbortController()
+
+      await executor.generateText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      expect(generateText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          abortSignal: abortController.signal
+        })
+      )
+    })
+
+    it('should handle aborted request', async () => {
+      const abortError = new Error('Request aborted')
+      abortError.name = 'AbortError'
+
+      vi.mocked(generateText).mockRejectedValue(abortError)
+
+      const abortController = new AbortController()
+      abortController.abort()
+
+      await expect(
+        executor.generateText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          abortSignal: abortController.signal
+        })
+      ).rejects.toThrow('Request aborted')
+    })
+  })
+})

packages/aiCore/src/core/runtime/__tests__/streamText.test.ts

@@ -0,0 +1,531 @@
+/**
+ * RuntimeExecutor.streamText Comprehensive Tests
+ * Tests streaming text generation across all providers with various parameters
+ */
+
+import { streamText } from 'ai'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { collectStreamChunks, createMockLanguageModel, mockProviderConfigs, testMessages } from '../../../__tests__'
+import type { AiPlugin } from '../../plugins'
+import { globalRegistryManagement } from '../../providers/RegistryManagement'
+import { RuntimeExecutor } from '../executor'
+
+// Mock AI SDK - use importOriginal to keep jsonSchema and other non-mocked exports
+vi.mock('ai', async (importOriginal) => {
+  const actual = (await importOriginal()) as Record<string, unknown>
+  return {
+    ...actual,
+    streamText: vi.fn()
+  }
+})
+
+vi.mock('../../providers/RegistryManagement', () => ({
+  globalRegistryManagement: {
+    languageModel: vi.fn()
+  },
+  DEFAULT_SEPARATOR: '|'
+}))
+
+describe('RuntimeExecutor.streamText', () => {
+  let executor: RuntimeExecutor<'openai'>
+  let mockLanguageModel: any
+
+  beforeEach(() => {
+    vi.clearAllMocks()
+
+    executor = RuntimeExecutor.create('openai', mockProviderConfigs.openai)
+
+    mockLanguageModel = createMockLanguageModel({
+      provider: 'openai',
+      modelId: 'gpt-4'
+    })
+
+    vi.mocked(globalRegistryManagement.languageModel).mockReturnValue(mockLanguageModel)
+  })
+
+  describe('Basic Functionality', () => {
+    it('should stream text with minimal parameters', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Hello'
+          yield ' '
+          yield 'World'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Hello' }
+          yield { type: 'text-delta', textDelta: ' ' }
+          yield { type: 'text-delta', textDelta: 'World' }
+        })(),
+        usage: Promise.resolve({ promptTokens: 5, completionTokens: 3, totalTokens: 8 })
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      expect(streamText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.simple
+      })
+
+      const chunks = await collectStreamChunks(result.textStream)
+      expect(chunks).toEqual(['Hello', ' ', 'World'])
+    })
+
+    it('should stream with system messages', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.withSystem
+      })
+
+      expect(streamText).toHaveBeenCalledWith({
+        model: mockLanguageModel,
+        messages: testMessages.withSystem
+      })
+    })
+
+    it('should stream multi-turn conversations', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Multi-turn response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Multi-turn response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.multiTurn
+      })
+
+      expect(streamText).toHaveBeenCalled()
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          messages: testMessages.multiTurn
+        })
+      )
+    })
+  })
+
+  describe('Temperature Parameter', () => {
+    const temperatures = [0, 0.3, 0.5, 0.7, 0.9, 1.0, 1.5, 2.0]
+
+    it.each(temperatures)('should support temperature=%s', async (temperature) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        temperature
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature
+        })
+      )
+    })
+  })
+
+  describe('Max Tokens Parameter', () => {
+    const maxTokensValues = [10, 50, 100, 500, 1000, 2000, 4000]
+
+    it.each(maxTokensValues)('should support maxOutputTokens=%s', async (maxOutputTokens) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        maxOutputTokens
+      })
+
+      // Parameters are passed through without transformation
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          maxOutputTokens
+        })
+      )
+    })
+  })
+
+  describe('Top P Parameter', () => {
+    const topPValues = [0.1, 0.3, 0.5, 0.7, 0.9, 0.95, 1.0]
+
+    it.each(topPValues)('should support topP=%s', async (topP) => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        topP
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          topP
+        })
+      )
+    })
+  })
+
+  describe('Frequency and Presence Penalty', () => {
+    it('should support frequency penalty', async () => {
+      const penalties = [-2.0, -1.0, 0, 0.5, 1.0, 1.5, 2.0]
+
+      for (const frequencyPenalty of penalties) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          frequencyPenalty
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            frequencyPenalty
+          })
+        )
+      }
+    })
+
+    it('should support presence penalty', async () => {
+      const penalties = [-2.0, -1.0, 0, 0.5, 1.0, 1.5, 2.0]
+
+      for (const presencePenalty of penalties) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          presencePenalty
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            presencePenalty
+          })
+        )
+      }
+    })
+
+    it('should support both penalties together', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        frequencyPenalty: 0.5,
+        presencePenalty: 0.5
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          frequencyPenalty: 0.5,
+          presencePenalty: 0.5
+        })
+      )
+    })
+  })
+
+  describe('Seed Parameter', () => {
+    it('should support seed for deterministic output', async () => {
+      const seeds = [0, 12345, 67890, 999999]
+
+      for (const seed of seeds) {
+        vi.clearAllMocks()
+
+        const mockStream = {
+          textStream: (async function* () {
+            yield 'Response'
+          })(),
+          fullStream: (async function* () {
+            yield { type: 'text-delta', textDelta: 'Response' }
+          })()
+        }
+
+        vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+        await executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple,
+          seed
+        })
+
+        expect(streamText).toHaveBeenCalledWith(
+          expect.objectContaining({
+            seed
+          })
+        )
+      }
+    })
+  })
+
+  describe('Abort Signal', () => {
+    it('should support abort signal', async () => {
+      const abortController = new AbortController()
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          abortSignal: abortController.signal
+        })
+      )
+    })
+
+    it('should handle abort during streaming', async () => {
+      const abortController = new AbortController()
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Start'
+          // Simulate abort
+          abortController.abort()
+          throw new Error('Aborted')
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Start' }
+          throw new Error('Aborted')
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple,
+        abortSignal: abortController.signal
+      })
+
+      await expect(async () => {
+        // oxlint-disable-next-line no-unused-vars
+        for await (const _chunk of result.textStream) {
+          // Stream should be interrupted
+        }
+      }).rejects.toThrow('Aborted')
+    })
+  })
+
+  describe('Plugin Integration', () => {
+    it('should execute plugins during streaming', async () => {
+      const pluginCalls: string[] = []
+
+      const testPlugin: AiPlugin = {
+        name: 'test-plugin',
+        onRequestStart: vi.fn(async () => {
+          pluginCalls.push('onRequestStart')
+        }),
+        transformParams: vi.fn(async (params) => {
+          pluginCalls.push('transformParams')
+          return { ...params, temperature: 0.5 }
+        }),
+        onRequestEnd: vi.fn(async () => {
+          pluginCalls.push('onRequestEnd')
+        })
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [testPlugin])
+
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executorWithPlugin.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      // Consume stream
+      // oxlint-disable-next-line no-unused-vars
+      for await (const _chunk of result.textStream) {
+        // Stream chunks
+      }
+
+      expect(pluginCalls).toContain('onRequestStart')
+      expect(pluginCalls).toContain('transformParams')
+
+      // Verify transformed parameters were used
+      expect(streamText).toHaveBeenCalledWith(
+        expect.objectContaining({
+          temperature: 0.5
+        })
+      )
+    })
+  })
+
+  describe('Full Stream with Finish Reason', () => {
+    it('should provide finish reason in full stream', async () => {
+      const mockStream = {
+        textStream: (async function* () {
+          yield 'Response'
+        })(),
+        fullStream: (async function* () {
+          yield { type: 'text-delta', textDelta: 'Response' }
+          yield {
+            type: 'finish',
+            finishReason: 'stop',
+            usage: { promptTokens: 5, completionTokens: 3, totalTokens: 8 }
+          }
+        })()
+      }
+
+      vi.mocked(streamText).mockResolvedValue(mockStream as any)
+
+      const result = await executor.streamText({
+        model: 'gpt-4',
+        messages: testMessages.simple
+      })
+
+      const fullChunks = await collectStreamChunks(result.fullStream)
+
+      expect(fullChunks).toHaveLength(2)
+      expect(fullChunks[0]).toEqual({ type: 'text-delta', textDelta: 'Response' })
+      expect(fullChunks[1]).toEqual({
+        type: 'finish',
+        finishReason: 'stop',
+        usage: { promptTokens: 5, completionTokens: 3, totalTokens: 8 }
+      })
+    })
+  })
+
+  describe('Error Handling', () => {
+    it('should handle streaming errors', async () => {
+      const error = new Error('Streaming failed')
+      vi.mocked(streamText).mockRejectedValue(error)
+
+      await expect(
+        executor.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Streaming failed')
+    })
+
+    it('should execute onError plugin hook on failure', async () => {
+      const error = new Error('Stream error')
+      vi.mocked(streamText).mockRejectedValue(error)
+
+      const errorPlugin: AiPlugin = {
+        name: 'error-handler',
+        onError: vi.fn()
+      }
+
+      const executorWithPlugin = RuntimeExecutor.create('openai', mockProviderConfigs.openai, [errorPlugin])
+
+      await expect(
+        executorWithPlugin.streamText({
+          model: 'gpt-4',
+          messages: testMessages.simple
+        })
+      ).rejects.toThrow('Stream error')
+
+      // onError receives the original error and context with core fields
+      expect(errorPlugin.onError).toHaveBeenCalledWith(
+        error,
+        expect.objectContaining({
+          providerId: 'openai',
+          model: 'gpt-4'
+        })
+      )
+    })
+  })
+})

packages/aiCore/vitest.config.ts

@@ -1,12 +1,20 @@
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+
 import { defineConfig } from 'vitest/config'
 
+const __dirname = path.dirname(fileURLToPath(import.meta.url))
+
 export default defineConfig({
   test: {
-    globals: true
+    globals: true,
+    setupFiles: [path.resolve(__dirname, './src/__tests__/setup.ts')]
   },
   resolve: {
     alias: {
-      '@': './src'
+      '@': path.resolve(__dirname, './src'),
+      // Mock external packages that may not be available in test environment
+      '@cherrystudio/ai-sdk-provider': path.resolve(__dirname, './src/__tests__/mocks/ai-sdk-provider.ts')
     }
   },
   esbuild: {

packages/shared/IpcChannel.ts

@@ -41,6 +41,7 @@ export enum IpcChannel {
   App_SetFullScreen = 'app:set-full-screen',
   App_IsFullScreen = 'app:is-full-screen',
   App_GetSystemFonts = 'app:get-system-fonts',
+  APP_CrashRenderProcess = 'app:crash-render-process',
 
   App_MacIsProcessTrusted = 'app:mac-is-process-trusted',
   App_MacRequestProcessTrust = 'app:mac-request-process-trust',
@@ -234,6 +235,7 @@ export enum IpcChannel {
   System_GetDeviceType = 'system:getDeviceType',
   System_GetHostname = 'system:getHostname',
   System_GetCpuName = 'system:getCpuName',
+  System_CheckGitBash = 'system:checkGitBash',
 
   // DevTools
   System_ToggleDevTools = 'system:toggleDevTools',

packages/shared/anthropic/index.ts

@@ -88,11 +88,16 @@ export function getSdkClient(
       }
     })
   }
-  const baseURL =
+  let baseURL =
     provider.type === 'anthropic'
       ? provider.apiHost
       : (provider.anthropicApiHost && provider.anthropicApiHost.trim()) || provider.apiHost
 
+  // Anthropic SDK automatically appends /v1 to all endpoints (like /v1/messages, /v1/models)
+  // We need to strip api version from baseURL to avoid duplication (e.g., /v3/v1/models)
+  // formatProviderApiHost adds /v1 for AI SDK compatibility, but Anthropic SDK needs it removed
+  baseURL = baseURL.replace(/\/v\d+(?:alpha|beta)?(?=\/|$)/i, '')
+
   logger.debug('Anthropic API baseURL', { baseURL, providerId: provider.id })
 
   if (provider.id === 'aihubmix') {

packages/shared/config/constant.ts

@@ -199,7 +199,7 @@ export enum FeedUrl {
 
 export enum UpdateConfigUrl {
   GITHUB = 'https://raw.githubusercontent.com/CherryHQ/cherry-studio/refs/heads/x-files/app-upgrade-config/app-upgrade-config.json',
-  GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/x-files/app-upgrade-config/app-upgrade-config.json'
+  GITCODE = 'https://raw.gitcode.com/CherryHQ/cherry-studio/raw/x-files%2Fapp-upgrade-config/app-upgrade-config.json'
 }
 
 export enum UpgradeChannel {

packages/shared/config/providers.ts

@@ -0,0 +1,48 @@
+/**
+ * @fileoverview Shared provider configuration for Claude Code and Anthropic API compatibility
+ *
+ * This module defines which models from specific providers support the Anthropic API endpoint.
+ * Used by both the Code Tools page and the Anthropic SDK client.
+ */
+
+/**
+ * Silicon provider models that support Anthropic API endpoint.
+ * These models can be used with Claude Code via the Anthropic-compatible API.
+ *
+ * @see https://docs.siliconflow.cn/cn/api-reference/chat-completions/messages
+ */
+export const SILICON_ANTHROPIC_COMPATIBLE_MODELS: readonly string[] = [
+  // DeepSeek V3.1 series
+  'Pro/deepseek-ai/DeepSeek-V3.1-Terminus',
+  'deepseek-ai/DeepSeek-V3.1',
+  'Pro/deepseek-ai/DeepSeek-V3.1',
+  // DeepSeek V3 series
+  'deepseek-ai/DeepSeek-V3',
+  'Pro/deepseek-ai/DeepSeek-V3',
+  // Moonshot/Kimi series
+  'moonshotai/Kimi-K2-Instruct-0905',
+  'Pro/moonshotai/Kimi-K2-Instruct-0905',
+  'moonshotai/Kimi-Dev-72B',
+  // Baidu ERNIE
+  'baidu/ERNIE-4.5-300B-A47B'
+]
+
+/**
+ * Creates a Set for efficient lookup of silicon Anthropic-compatible model IDs.
+ */
+const SILICON_ANTHROPIC_COMPATIBLE_MODEL_SET = new Set(SILICON_ANTHROPIC_COMPATIBLE_MODELS)
+
+/**
+ * Checks if a model ID is compatible with Anthropic API on Silicon provider.
+ *
+ * @param modelId - The model ID to check
+ * @returns true if the model supports Anthropic API endpoint
+ */
+export function isSiliconAnthropicCompatibleModel(modelId: string): boolean {
+  return SILICON_ANTHROPIC_COMPATIBLE_MODEL_SET.has(modelId)
+}
+
+/**
+ * Silicon provider's Anthropic API host URL.
+ */
+export const SILICON_ANTHROPIC_API_HOST = 'https://api.siliconflow.cn'

packages/shared/utils.ts

@@ -4,3 +4,34 @@ export const defaultAppHeaders = () => {
     'X-Title': 'Cherry Studio'
   }
 }
+
+// Following two function are not being used for now.
+// I may use them in the future, so just keep them commented. - by eurfelux
+
+/**
+ * Converts an `undefined` value to `null`, otherwise returns the value as-is.
+ * @param value - The value to check
+ * @returns `null` if the input is `undefined`; otherwise the input value
+ */
+
+// export function toNullIfUndefined<T>(value: T | undefined): T | null {
+//   if (value === undefined) {
+//     return null
+//   } else {
+//     return value
+//   }
+// }
+
+/**
+ * Converts a `null` value to `undefined`, otherwise returns the value as-is.
+ * @param value - The value to check
+ * @returns `undefined` if the input is `null`; otherwise the input value
+ */
+
+// export function toUndefinedIfNull<T>(value: T | null): T | undefined {
+//   if (value === null) {
+//     return undefined
+//   } else {
+//     return value
+//   }
+// }

playwright.config.ts

@@ -1,42 +1,64 @@
-import { defineConfig, devices } from '@playwright/test'
+import { defineConfig } from '@playwright/test'
 
 /**
- * See https://playwright.dev/docs/test-configuration.
+ * Playwright configuration for Electron e2e testing.
+ * See https://playwright.dev/docs/test-configuration
  */
 export default defineConfig({
-  // Look for test files, relative to this configuration file.
-  testDir: './tests/e2e',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://localhost:3000',
+  // Look for test files in the specs directory
+  testDir: './tests/e2e/specs',
 
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry'
+  // Global timeout for each test
+  timeout: 60000,
+
+  // Assertion timeout
+  expect: {
+    timeout: 10000
   },
 
-  /* Configure projects for major browsers */
+  // Electron apps should run tests sequentially to avoid conflicts
+  fullyParallel: false,
+  workers: 1,
+
+  // Fail the build on CI if you accidentally left test.only in the source code
+  forbidOnly: !!process.env.CI,
+
+  // Retry on CI only
+  retries: process.env.CI ? 2 : 0,
+
+  // Reporter configuration
+  reporter: [['html', { outputFolder: 'playwright-report' }], ['list']],
+
+  // Global setup and teardown
+  globalSetup: './tests/e2e/global-setup.ts',
+  globalTeardown: './tests/e2e/global-teardown.ts',
+
+  // Output directory for test artifacts
+  outputDir: './test-results',
+
+  // Shared settings for all tests
+  use: {
+    // Collect trace when retrying the failed test
+    trace: 'retain-on-failure',
+
+    // Take screenshot only on failure
+    screenshot: 'only-on-failure',
+
+    // Record video only on failure
+    video: 'retain-on-failure',
+
+    // Action timeout
+    actionTimeout: 15000,
+
+    // Navigation timeout
+    navigationTimeout: 30000
+  },
+
+  // Single project for Electron testing
   projects: [
     {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] }
+      name: 'electron',
+      testMatch: '**/*.spec.ts'
     }
   ]
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://localhost:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
 })

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 })

src/main/apiServer/server.ts

@@ -3,7 +3,6 @@ import { createServer } from 'node:http'
 import { loggerService } from '@logger'
 import { IpcChannel } from '@shared/IpcChannel'
 
-import { agentService } from '../services/agents'
 import { windowService } from '../services/WindowService'
 import { app } from './app'
 import { config } from './config'
@@ -32,11 +31,6 @@ export class ApiServer {
     // Load config
     const { port, host } = await config.load()
 
-    // Initialize AgentService
-    logger.info('Initializing AgentService')
-    await agentService.initialize()
-    logger.info('AgentService initialized')
-
     // Create server with Express app
     this.server = createServer(app)
     this.applyServerTimeouts(this.server)

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

src/main/apiServer/utils/index.ts

@@ -1,6 +1,7 @@
 import { CacheService } from '@main/services/CacheService'
 import { loggerService } from '@main/services/LoggerService'
 import { reduxService } from '@main/services/ReduxService'
+import { isSiliconAnthropicCompatibleModel } from '@shared/config/providers'
 import type { ApiModel, Model, Provider } from '@types'
 
 const logger = loggerService.withContext('ApiServerUtils')
@@ -287,6 +288,8 @@ export const getProviderAnthropicModelChecker = (providerId: string): ((m: Model
       return (m: Model) => m.endpoint_type === 'anthropic'
     case 'aihubmix':
       return (m: Model) => m.id.includes('claude')
+    case 'silicon':
+      return (m: Model) => isSiliconAnthropicCompatibleModel(m.id)
     default:
       // allow all models when checker not configured
       return () => true

src/main/index.ts

@@ -8,7 +8,7 @@ import '@main/config'
 import { loggerService } from '@logger'
 import { electronApp, optimizer } from '@electron-toolkit/utils'
 import { replaceDevtoolsFont } from '@main/utils/windowUtil'
-import { app } from 'electron'
+import { app, crashReporter } from 'electron'
 import installExtension, { REACT_DEVELOPER_TOOLS, REDUX_DEVTOOLS } from 'electron-devtools-installer'
 import { isDev, isLinux, isWin } from './constant'
 
@@ -34,9 +34,18 @@ import { TrayService } from './services/TrayService'
 import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'
+import { runAsyncFunction } from './utils'
 
 const logger = loggerService.withContext('MainEntry')
 
+// enable local crash reports
+crashReporter.start({
+  companyName: 'CherryHQ',
+  productName: 'CherryStudio',
+  submitURL: '',
+  uploadToServer: false
+})
+
 /**
  * Disable hardware acceleration if setting is enabled
  */
@@ -162,14 +171,7 @@ if (!app.requestSingleInstanceLock()) {
     //start selection assistant service
     initSelectionService()
 
-    // Initialize Agent Service
-    try {
-      await agentService.initialize()
-      logger.info('Agent service initialized successfully')
-    } catch (error: any) {
-      logger.error('Failed to initialize Agent service:', error)
-    }
-
+    runAsyncFunction(async () => {
       // Start API server if enabled or if agents exist
       try {
         const config = await apiServerService.getCurrentConfig()
@@ -196,6 +198,7 @@ if (!app.requestSingleInstanceLock()) {
         logger.error('Failed to check/start API server:', error)
       }
     })
+  })
 
   registerProtocolClient(app)
 

src/main/ipc.ts

@@ -493,6 +493,44 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.System_GetDeviceType, () => (isMac ? 'mac' : isWin ? 'windows' : 'linux'))
   ipcMain.handle(IpcChannel.System_GetHostname, () => require('os').hostname())
   ipcMain.handle(IpcChannel.System_GetCpuName, () => require('os').cpus()[0].model)
+  ipcMain.handle(IpcChannel.System_CheckGitBash, () => {
+    if (!isWin) {
+      return true // Non-Windows systems don't need Git Bash
+    }
+
+    try {
+      // Check common Git Bash installation paths
+      const commonPaths = [
+        path.join(process.env.ProgramFiles || 'C:\\Program Files', 'Git', 'bin', 'bash.exe'),
+        path.join(process.env['ProgramFiles(x86)'] || 'C:\\Program Files (x86)', 'Git', 'bin', 'bash.exe'),
+        path.join(process.env.LOCALAPPDATA || '', 'Programs', 'Git', 'bin', 'bash.exe')
+      ]
+
+      // Check if any of the common paths exist
+      for (const bashPath of commonPaths) {
+        if (fs.existsSync(bashPath)) {
+          logger.debug('Git Bash found', { path: bashPath })
+          return true
+        }
+      }
+
+      // Check if git is in PATH
+      const { execSync } = require('child_process')
+      try {
+        execSync('git --version', { stdio: 'ignore' })
+        logger.debug('Git found in PATH')
+        return true
+      } catch {
+        // Git not in PATH
+      }
+
+      logger.debug('Git Bash not found on Windows system')
+      return false
+    } catch (error) {
+      logger.error('Error checking Git Bash', error as Error)
+      return false
+    }
+  })
   ipcMain.handle(IpcChannel.System_ToggleDevTools, (e) => {
     const win = BrowserWindow.fromWebContents(e.sender)
     win && win.webContents.toggleDevTools()
@@ -1038,4 +1076,8 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   ipcMain.handle(IpcChannel.WebSocket_Status, WebSocketService.getStatus)
   ipcMain.handle(IpcChannel.WebSocket_SendFile, WebSocketService.sendFile)
   ipcMain.handle(IpcChannel.WebSocket_GetAllCandidates, WebSocketService.getAllCandidates)
+
+  ipcMain.handle(IpcChannel.APP_CrashRenderProcess, () => {
+    mainWindow.webContents.forcefullyCrashRenderer()
+  })
 }

src/main/knowledge/preprocess/MineruPreprocessProvider.ts

@@ -21,6 +21,7 @@ type ApiResponse<T> = {
 type BatchUploadResponse = {
   batch_id: string
   file_urls: string[]
+  headers?: Record<string, string>[]
 }
 
 type ExtractProgress = {
@@ -55,7 +56,7 @@ type QuotaResponse = {
 export default class MineruPreprocessProvider extends BasePreprocessProvider {
   constructor(provider: PreprocessProvider, userId?: string) {
     super(provider, userId)
-    // todo：免费期结束后删除
+    // TODO: remove after free period ends
     this.provider.apiKey = this.provider.apiKey || import.meta.env.MAIN_VITE_MINERU_API_KEY
   }
 
@@ -68,21 +69,21 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       logger.info(`MinerU preprocess processing started: ${filePath}`)
       await this.validateFile(filePath)
 
-      // 1. 获取上传URL并上传文件
+      // 1. Get upload URL and upload file
       const batchId = await this.uploadFile(file)
       logger.info(`MinerU file upload completed: batch_id=${batchId}`)
 
-      // 2. 等待处理完成并获取结果
+      // 2. Wait for completion and fetch results
       const extractResult = await this.waitForCompletion(sourceId, batchId, file.origin_name)
       logger.info(`MinerU processing completed for batch: ${batchId}`)
 
-      // 3. 下载并解压文件
+      // 3. Download and extract output
       const { path: outputPath } = await this.downloadAndExtractFile(extractResult.full_zip_url!, file)
 
       // 4. check quota
       const quota = await this.checkQuota()
 
-      // 5. 创建处理后的文件信息
+      // 5. Create processed file metadata
       return {
         processedFile: this.createProcessedFileInfo(file, outputPath),
         quota
@@ -115,23 +116,48 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
   }
 
   private async validateFile(filePath: string): Promise<void> {
+    // Phase 1: check file size (without loading into memory)
+    logger.info(`Validating PDF file: ${filePath}`)
+    const stats = await fs.promises.stat(filePath)
+    const fileSizeBytes = stats.size
+
+    // Ensure file size is under 200MB
+    if (fileSizeBytes >= 200 * 1024 * 1024) {
+      const fileSizeMB = Math.round(fileSizeBytes / (1024 * 1024))
+      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+    }
+
+    // Phase 2: check page count (requires reading file with error handling)
     const pdfBuffer = await fs.promises.readFile(filePath)
 
+    try {
       const doc = await this.readPdf(pdfBuffer)
 
-    // 文件页数小于600页
+      // Ensure page count is under 600 pages
       if (doc.numPages >= 600) {
         throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
       }
-    // 文件大小小于200MB
-    if (pdfBuffer.length >= 200 * 1024 * 1024) {
-      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
-      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+
+      logger.info(`PDF validation passed: ${doc.numPages} pages, ${Math.round(fileSizeBytes / (1024 * 1024))}MB`)
+    } catch (error: any) {
+      // If the page limit is exceeded, rethrow immediately
+      if (error.message.includes('exceeds the limit')) {
+        throw error
+      }
+
+      // If PDF parsing fails, log a detailed warning but continue processing
+      logger.warn(
+        `Failed to parse PDF structure (file may be corrupted or use non-standard format). ` +
+          `Skipping page count validation. Will attempt to process with MinerU API. ` +
+          `Error details: ${error.message}. ` +
+          `Suggestion: If processing fails, try repairing the PDF using tools like Adobe Acrobat or online PDF repair services.`
+      )
+      // Do not throw; continue processing
     }
   }
 
   private createProcessedFileInfo(file: FileMetadata, outputPath: string): FileMetadata {
-    // 查找解压后的主要文件
+    // Locate the main extracted file
     let finalPath = ''
     let finalName = file.origin_name.replace('.pdf', '.md')
 
@@ -143,14 +169,14 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
         const originalMdPath = path.join(outputPath, mdFile)
         const newMdPath = path.join(outputPath, finalName)
 
-        // 重命名文件为原始文件名
+        // Rename the file to match the original name
         try {
           fs.renameSync(originalMdPath, newMdPath)
           finalPath = newMdPath
           logger.info(`Renamed markdown file from ${mdFile} to ${finalName}`)
         } catch (renameError) {
           logger.warn(`Failed to rename file ${mdFile} to ${finalName}: ${renameError}`)
-          // 如果重命名失败，使用原文件
+          // If renaming fails, fall back to the original file
           finalPath = originalMdPath
           finalName = mdFile
         }
@@ -178,7 +204,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     logger.info(`Downloading MinerU result to: ${zipPath}`)
 
     try {
-      // 下载ZIP文件
+      // Download the ZIP file
       const response = await net.fetch(zipUrl, { method: 'GET' })
       if (!response.ok) {
         throw new Error(`HTTP ${response.status}: ${response.statusText}`)
@@ -187,17 +213,17 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       fs.writeFileSync(zipPath, Buffer.from(arrayBuffer))
       logger.info(`Downloaded ZIP file: ${zipPath}`)
 
-      // 确保提取目录存在
+      // Ensure the extraction directory exists
       if (!fs.existsSync(extractPath)) {
         fs.mkdirSync(extractPath, { recursive: true })
       }
 
-      // 解压文件
+      // Extract the ZIP contents
       const zip = new AdmZip(zipPath)
       zip.extractAllTo(extractPath, true)
       logger.info(`Extracted files to: ${extractPath}`)
 
-      // 删除临时ZIP文件
+      // Remove the temporary ZIP file
       fs.unlinkSync(zipPath)
 
       return { path: extractPath }
@@ -209,11 +235,11 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
 
   private async uploadFile(file: FileMetadata): Promise<string> {
     try {
-      // 步骤1: 获取上传URL
-      const { batchId, fileUrls } = await this.getBatchUploadUrls(file)
-      // 步骤2: 上传文件到获取的URL
+      // Step 1: obtain the upload URL
+      const { batchId, fileUrls, uploadHeaders } = await this.getBatchUploadUrls(file)
+      // Step 2: upload the file to the obtained URL
       const filePath = fileStorage.getFilePathById(file)
-      await this.putFileToUrl(filePath, fileUrls[0])
+      await this.putFileToUrl(filePath, fileUrls[0], file.origin_name, uploadHeaders?.[0])
       logger.info(`File uploaded successfully: ${filePath}`, { batchId, fileUrls })
 
       return batchId
@@ -223,7 +249,9 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     }
   }
 
-  private async getBatchUploadUrls(file: FileMetadata): Promise<{ batchId: string; fileUrls: string[] }> {
+  private async getBatchUploadUrls(
+    file: FileMetadata
+  ): Promise<{ batchId: string; fileUrls: string[]; uploadHeaders?: Record<string, string>[] }> {
     const endpoint = `${this.provider.apiHost}/api/v4/file-urls/batch`
 
     const payload = {
@@ -254,10 +282,11 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       if (response.ok) {
         const data: ApiResponse<BatchUploadResponse> = await response.json()
         if (data.code === 0 && data.data) {
-          const { batch_id, file_urls } = data.data
+          const { batch_id, file_urls, headers: uploadHeaders } = data.data
           return {
             batchId: batch_id,
-            fileUrls: file_urls
+            fileUrls: file_urls,
+            uploadHeaders
           }
         } else {
           throw new Error(`API returned error: ${data.msg || JSON.stringify(data)}`)
@@ -271,18 +300,28 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
     }
   }
 
-  private async putFileToUrl(filePath: string, uploadUrl: string): Promise<void> {
+  private async putFileToUrl(
+    filePath: string,
+    uploadUrl: string,
+    fileName?: string,
+    headers?: Record<string, string>
+  ): Promise<void> {
     try {
       const fileBuffer = await fs.promises.readFile(filePath)
+      const fileSize = fileBuffer.byteLength
+      const displayName = fileName ?? path.basename(filePath)
+
+      logger.info(`Uploading file to MinerU OSS: ${displayName} (${fileSize} bytes)`)
 
       // https://mineru.net/apiManage/docs
       const response = await net.fetch(uploadUrl, {
         method: 'PUT',
-        body: fileBuffer
+        headers,
+        body: new Uint8Array(fileBuffer)
       })
 
       if (!response.ok) {
-        // 克隆 response 以避免消费 body stream
+        // Clone the response to avoid consuming the body stream
         const responseClone = response.clone()
 
         try {
@@ -353,20 +392,20 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
       try {
         const result = await this.getExtractResults(batchId)
 
-        // 查找对应文件的处理结果
+        // Find the corresponding file result
         const fileResult = result.extract_result.find((item) => item.file_name === fileName)
         if (!fileResult) {
           throw new Error(`File ${fileName} not found in batch results`)
         }
 
-        // 检查处理状态
+        // Check the processing state
         if (fileResult.state === 'done' && fileResult.full_zip_url) {
           logger.info(`Processing completed for file: ${fileName}`)
           return fileResult
         } else if (fileResult.state === 'failed') {
           throw new Error(`Processing failed for file: ${fileName}, error: ${fileResult.err_msg}`)
         } else if (fileResult.state === 'running') {
-          // 发送进度更新
+          // Send progress updates
           if (fileResult.extract_progress) {
             const progress = Math.round(
               (fileResult.extract_progress.extracted_pages / fileResult.extract_progress.total_pages) * 100
@@ -374,7 +413,7 @@ export default class MineruPreprocessProvider extends BasePreprocessProvider {
             await this.sendPreprocessProgress(sourceId, progress)
             logger.info(`File ${fileName} processing progress: ${progress}%`)
           } else {
-            // 如果没有具体进度信息，发送一个通用进度
+            // If no detailed progress information is available, send a generic update
             await this.sendPreprocessProgress(sourceId, 50)
             logger.info(`File ${fileName} is still processing...`)
           }

src/main/knowledge/preprocess/OpenMineruPreprocessProvider.ts

@@ -53,18 +53,43 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
   }
 
   private async validateFile(filePath: string): Promise<void> {
+    // 第一阶段:检查文件大小(无需读取文件到内存)
+    logger.info(`Validating PDF file: ${filePath}`)
+    const stats = await fs.promises.stat(filePath)
+    const fileSizeBytes = stats.size
+
+    // File size must be less than 200MB
+    if (fileSizeBytes >= 200 * 1024 * 1024) {
+      const fileSizeMB = Math.round(fileSizeBytes / (1024 * 1024))
+      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+    }
+
+    // 第二阶段:检查页数(需要读取文件,带错误处理)
     const pdfBuffer = await fs.promises.readFile(filePath)
 
+    try {
       const doc = await this.readPdf(pdfBuffer)
 
       // File page count must be less than 600 pages
       if (doc.numPages >= 600) {
         throw new Error(`PDF page count (${doc.numPages}) exceeds the limit of 600 pages`)
       }
-    // File size must be less than 200MB
-    if (pdfBuffer.length >= 200 * 1024 * 1024) {
-      const fileSizeMB = Math.round(pdfBuffer.length / (1024 * 1024))
-      throw new Error(`PDF file size (${fileSizeMB}MB) exceeds the limit of 200MB`)
+
+      logger.info(`PDF validation passed: ${doc.numPages} pages, ${Math.round(fileSizeBytes / (1024 * 1024))}MB`)
+    } catch (error: any) {
+      // 如果是页数超限错误,直接抛出
+      if (error.message.includes('exceeds the limit')) {
+        throw error
+      }
+
+      // PDF 解析失败,记录详细警告但允许继续处理
+      logger.warn(
+        `Failed to parse PDF structure (file may be corrupted or use non-standard format). ` +
+          `Skipping page count validation. Will attempt to process with MinerU API. ` +
+          `Error details: ${error.message}. ` +
+          `Suggestion: If processing fails, try repairing the PDF using tools like Adobe Acrobat or online PDF repair services.`
+      )
+      // 不抛出错误,允许继续处理
     }
   }
 
@@ -72,8 +97,8 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
     // Find the main file after extraction
     let finalPath = ''
     let finalName = file.origin_name.replace('.pdf', '.md')
-    // Find the corresponding folder by file name
-    outputPath = path.join(outputPath, `${file.origin_name.replace('.pdf', '')}`)
+    // Find the corresponding folder by file id
+    outputPath = path.join(outputPath, file.id)
     try {
       const files = fs.readdirSync(outputPath)
 
@@ -125,7 +150,7 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
     formData.append('return_md', 'true')
     formData.append('response_format_zip', 'true')
     formData.append('files', fileBuffer, {
-      filename: file.origin_name
+      filename: file.name
     })
 
     while (retries < maxRetries) {
@@ -139,7 +164,7 @@ export default class OpenMineruPreprocessProvider extends BasePreprocessProvider
             ...(this.provider.apiKey ? { Authorization: `Bearer ${this.provider.apiKey}` } : {}),
             ...formData.getHeaders()
           },
-          body: formData.getBuffer()
+          body: new Uint8Array(formData.getBuffer())
         })
 
         if (!response.ok) {

src/main/services/CodeToolsService.ts

@@ -548,6 +548,17 @@ class CodeToolsService {
     logger.debug(`Environment variables:`, Object.keys(env))
     logger.debug(`Options:`, options)
 
+    // Validate directory exists before proceeding
+    if (!directory || !fs.existsSync(directory)) {
+      const errorMessage = `Directory does not exist: ${directory}`
+      logger.error(errorMessage)
+      return {
+        success: false,
+        message: errorMessage,
+        command: ''
+      }
+    }
+
     const packageName = await this.getPackageName(cliTool)
     const bunPath = await this.getBunPath()
     const executableName = await this.getCliExecutableName(cliTool)
@@ -709,6 +720,7 @@ class CodeToolsService {
         // Build bat file content, including debug information
         const batContent = [
           '@echo off',
+          'chcp 65001 >nul 2>&1', // Switch to UTF-8 code page for international path support
           `title ${cliTool} - Cherry Studio`, // Set window title in bat file
           'echo ================================================',
           'echo Cherry Studio CLI Tool Launcher',

src/main/services/MCPService.ts

@@ -620,7 +620,7 @@ class McpService {
       tools.map((tool: SDKTool) => {
         const serverTool: MCPTool = {
           ...tool,
-          id: buildFunctionCallToolName(server.name, tool.name),
+          id: buildFunctionCallToolName(server.name, tool.name, server.id),
           serverId: server.id,
           serverName: server.name,
           type: 'mcp'

src/main/services/agents/BaseService.ts

@@ -1,17 +1,13 @@
-import { type Client, createClient } from '@libsql/client'
 import { loggerService } from '@logger'
 import { mcpApiService } from '@main/apiServer/services/mcp'
 import type { ModelValidationError } from '@main/apiServer/utils'
 import { validateModelId } from '@main/apiServer/utils'
 import type { AgentType, MCPTool, SlashCommand, Tool } from '@types'
 import { objectKeys } from '@types'
-import { drizzle, type LibSQLDatabase } from 'drizzle-orm/libsql'
 import fs from 'fs'
 import path from 'path'
 
-import { MigrationService } from './database/MigrationService'
-import * as schema from './database/schema'
-import { dbPath } from './drizzle.config'
+import { DatabaseManager } from './database/DatabaseManager'
 import type { AgentModelField } from './errors'
 import { AgentModelValidationError } from './errors'
 import { builtinSlashCommands } from './services/claudecode/commands'
@@ -20,22 +16,16 @@ import { builtinTools } from './services/claudecode/tools'
 const logger = loggerService.withContext('BaseService')
 
 /**
- * Base service class providing shared database connection and utilities
- * for all agent-related services.
+ * Base service class providing shared utilities for all agent-related services.
  *
  * Features:
- * - Programmatic schema management (no CLI dependencies)
- * - Automatic table creation and migration
- * - Schema version tracking and compatibility checks
- * - Transaction-based operations for safety
- * - Development vs production mode handling
- * - Connection retry logic with exponential backoff
+ * - Database access through DatabaseManager singleton
+ * - JSON field serialization/deserialization
+ * - Path validation and creation
+ * - Model validation
+ * - MCP tools and slash commands listing
  */
 export abstract class BaseService {
-  protected static client: Client | null = null
-  protected static db: LibSQLDatabase<typeof schema> | null = null
-  protected static isInitialized = false
-  protected static initializationPromise: Promise<void> | null = null
   protected jsonFields: string[] = [
     'tools',
     'mcps',
@@ -45,23 +35,6 @@ export abstract class BaseService {
     'slash_commands'
   ]
 
-  /**
-   * Initialize database with retry logic and proper error handling
-   */
-  protected static async initialize(): Promise<void> {
-    // Return existing initialization if in progress
-    if (BaseService.initializationPromise) {
-      return BaseService.initializationPromise
-    }
-
-    if (BaseService.isInitialized) {
-      return
-    }
-
-    BaseService.initializationPromise = BaseService.performInitialization()
-    return BaseService.initializationPromise
-  }
-
   public async listMcpTools(agentType: AgentType, ids?: string[]): Promise<Tool[]> {
     const tools: Tool[] = []
     if (agentType === 'claude-code') {
@@ -101,78 +74,13 @@ export abstract class BaseService {
     return []
   }
 
-  private static async performInitialization(): Promise<void> {
-    const maxRetries = 3
-    let lastError: Error
-
-    for (let attempt = 1; attempt <= maxRetries; attempt++) {
-      try {
-        logger.info(`Initializing Agent database at: ${dbPath} (attempt ${attempt}/${maxRetries})`)
-
-        // Ensure the database directory exists
-        const dbDir = path.dirname(dbPath)
-        if (!fs.existsSync(dbDir)) {
-          logger.info(`Creating database directory: ${dbDir}`)
-          fs.mkdirSync(dbDir, { recursive: true })
-        }
-
-        BaseService.client = createClient({
-          url: `file:${dbPath}`
-        })
-
-        BaseService.db = drizzle(BaseService.client, { schema })
-
-        // Run database migrations
-        const migrationService = new MigrationService(BaseService.db, BaseService.client)
-        await migrationService.runMigrations()
-
-        BaseService.isInitialized = true
-        logger.info('Agent database initialized successfully')
-        return
-      } catch (error) {
-        lastError = error as Error
-        logger.warn(`Database initialization attempt ${attempt} failed:`, lastError)
-
-        // Clean up on failure
-        if (BaseService.client) {
-          try {
-            BaseService.client.close()
-          } catch (closeError) {
-            logger.warn('Failed to close client during cleanup:', closeError as Error)
-          }
-        }
-        BaseService.client = null
-        BaseService.db = null
-
-        // Wait before retrying (exponential backoff)
-        if (attempt < maxRetries) {
-          const delay = Math.pow(2, attempt) * 1000 // 2s, 4s, 8s
-          logger.info(`Retrying in ${delay}ms...`)
-          await new Promise((resolve) => setTimeout(resolve, delay))
-        }
-      }
-    }
-
-    // All retries failed
-    BaseService.initializationPromise = null
-    logger.error('Failed to initialize Agent database after all retries:', lastError!)
-    throw lastError!
-  }
-
-  protected ensureInitialized(): void {
-    if (!BaseService.isInitialized || !BaseService.db || !BaseService.client) {
-      throw new Error('Database not initialized. Call initialize() first.')
-    }
-  }
-
-  protected get database(): LibSQLDatabase<typeof schema> {
-    this.ensureInitialized()
-    return BaseService.db!
-  }
-
-  protected get rawClient(): Client {
-    this.ensureInitialized()
-    return BaseService.client!
+  /**
+   * Get database instance
+   * Automatically waits for initialization to complete
+   */
+  protected async getDatabase() {
+    const dbManager = await DatabaseManager.getInstance()
+    return dbManager.getDatabase()
   }
 
   protected serializeJsonFields(data: any): any {
@@ -284,7 +192,7 @@ export abstract class BaseService {
   }
 
   /**
-   * Force re-initialization (for development/testing)
+   * Validate agent model configuration
    */
   protected async validateAgentModels(
     agentType: AgentType,
@@ -325,22 +233,4 @@ export abstract class BaseService {
       }
     }
   }
-
-  static async reinitialize(): Promise<void> {
-    BaseService.isInitialized = false
-    BaseService.initializationPromise = null
-
-    if (BaseService.client) {
-      try {
-        BaseService.client.close()
-      } catch (error) {
-        logger.warn('Failed to close client during reinitialize:', error as Error)
-      }
-    }
-
-    BaseService.client = null
-    BaseService.db = null
-
-    await BaseService.initialize()
-  }
 }

src/main/services/agents/database/DatabaseManager.ts

@@ -0,0 +1,156 @@
+import { type Client, createClient } from '@libsql/client'
+import { loggerService } from '@logger'
+import type { LibSQLDatabase } from 'drizzle-orm/libsql'
+import { drizzle } from 'drizzle-orm/libsql'
+import fs from 'fs'
+import path from 'path'
+
+import { dbPath } from '../drizzle.config'
+import { MigrationService } from './MigrationService'
+import * as schema from './schema'
+
+const logger = loggerService.withContext('DatabaseManager')
+
+/**
+ * Database initialization state
+ */
+enum InitState {
+  INITIALIZING = 'initializing',
+  INITIALIZED = 'initialized',
+  FAILED = 'failed'
+}
+
+/**
+ * DatabaseManager - Singleton class for managing libsql database connections
+ *
+ * Responsibilities:
+ * - Single source of truth for database connection
+ * - Thread-safe initialization with state management
+ * - Automatic migration handling
+ * - Safe connection cleanup
+ * - Error recovery and retry logic
+ * - Windows platform compatibility fixes
+ */
+export class DatabaseManager {
+  private static instance: DatabaseManager | null = null
+
+  private client: Client | null = null
+  private db: LibSQLDatabase<typeof schema> | null = null
+  private state: InitState = InitState.INITIALIZING
+
+  /**
+   * Get the singleton instance (database initialization starts automatically)
+   */
+  public static async getInstance(): Promise<DatabaseManager> {
+    if (DatabaseManager.instance) {
+      return DatabaseManager.instance
+    }
+
+    const instance = new DatabaseManager()
+    await instance.initialize()
+    DatabaseManager.instance = instance
+
+    return instance
+  }
+
+  /**
+   * Perform the actual initialization
+   */
+  public async initialize(): Promise<void> {
+    if (this.state === InitState.INITIALIZED) {
+      return
+    }
+
+    try {
+      logger.info(`Initializing database at: ${dbPath}`)
+
+      // Ensure database directory exists
+      const dbDir = path.dirname(dbPath)
+      if (!fs.existsSync(dbDir)) {
+        logger.info(`Creating database directory: ${dbDir}`)
+        fs.mkdirSync(dbDir, { recursive: true })
+      }
+
+      // Check if database file is corrupted (Windows specific check)
+      if (fs.existsSync(dbPath)) {
+        const stats = fs.statSync(dbPath)
+        if (stats.size === 0) {
+          logger.warn('Database file is empty, removing corrupted file')
+          fs.unlinkSync(dbPath)
+        }
+      }
+
+      // Create client with platform-specific options
+      this.client = createClient({
+        url: `file:${dbPath}`,
+        // intMode: 'number' helps avoid some Windows compatibility issues
+        intMode: 'number'
+      })
+
+      // Create drizzle instance
+      this.db = drizzle(this.client, { schema })
+
+      // Run migrations
+      const migrationService = new MigrationService(this.db, this.client)
+      await migrationService.runMigrations()
+
+      this.state = InitState.INITIALIZED
+      logger.info('Database initialized successfully')
+    } catch (error) {
+      const err = error as Error
+      logger.error('Database initialization failed:', {
+        error: err.message,
+        stack: err.stack
+      })
+
+      // Clean up failed initialization
+      this.cleanupFailedInit()
+
+      // Set failed state
+      this.state = InitState.FAILED
+      throw new Error(`Database initialization failed: ${err.message || 'Unknown error'}`)
+    }
+  }
+
+  /**
+   * Clean up after failed initialization
+   */
+  private cleanupFailedInit(): void {
+    if (this.client) {
+      try {
+        // On Windows, closing a partially initialized client can crash
+        // Wrap in try-catch and ignore errors during cleanup
+        this.client.close()
+      } catch (error) {
+        logger.warn('Failed to close client during cleanup:', error as Error)
+      }
+    }
+    this.client = null
+    this.db = null
+  }
+
+  /**
+   * Get the database instance
+   * Automatically waits for initialization to complete
+   * @throws Error if database initialization failed
+   */
+  public getDatabase(): LibSQLDatabase<typeof schema> {
+    return this.db!
+  }
+
+  /**
+   * Get the raw client (for advanced operations)
+   * Automatically waits for initialization to complete
+   * @throws Error if database initialization failed
+   */
+  public async getClient(): Promise<Client> {
+    return this.client!
+  }
+
+  /**
+   * Check if database is initialized
+   */
+  public isInitialized(): boolean {
+    return this.state === InitState.INITIALIZED
+  }
+}

src/main/services/agents/database/index.ts

@@ -7,8 +7,14 @@
  * Schema evolution is handled by Drizzle Kit migrations.
  */
 
+// Database Manager (Singleton)
+export * from './DatabaseManager'
+
 // Drizzle ORM schemas
 export * from './schema'
 
 // Repository helpers
 export * from './sessionMessageRepository'
+
+// Migration Service
+export * from './MigrationService'

src/main/services/agents/database/sessionMessageRepository.ts

@@ -15,26 +15,16 @@ import { sessionMessagesTable } from './schema'
 
 const logger = loggerService.withContext('AgentMessageRepository')
 
-type TxClient = any
-
 export type PersistUserMessageParams = AgentMessageUserPersistPayload & {
   sessionId: string
   agentSessionId?: string
-  tx?: TxClient
 }
 
 export type PersistAssistantMessageParams = AgentMessageAssistantPersistPayload & {
   sessionId: string
   agentSessionId: string
-  tx?: TxClient
 }
 
-type PersistExchangeParams = AgentMessagePersistExchangePayload & {
-  tx?: TxClient
-}
-
-type PersistExchangeResult = AgentMessagePersistExchangeResult
-
 class AgentMessageRepository extends BaseService {
   private static instance: AgentMessageRepository | null = null
 
@@ -87,17 +77,13 @@ class AgentMessageRepository extends BaseService {
     return deserialized
   }
 
-  private getWriter(tx?: TxClient): TxClient {
-    return tx ?? this.database
-  }
-
   private async findExistingMessageRow(
-    writer: TxClient,
     sessionId: string,
     role: string,
     messageId: string
   ): Promise<SessionMessageRow | null> {
-    const candidateRows: SessionMessageRow[] = await writer
+    const database = await this.getDatabase()
+    const candidateRows: SessionMessageRow[] = await database
       .select()
       .from(sessionMessagesTable)
       .where(and(eq(sessionMessagesTable.session_id, sessionId), eq(sessionMessagesTable.role, role)))
@@ -122,10 +108,7 @@ class AgentMessageRepository extends BaseService {
   private async upsertMessage(
     params: PersistUserMessageParams | PersistAssistantMessageParams
   ): Promise<AgentSessionMessageEntity> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
-    const { sessionId, agentSessionId = '', payload, metadata, createdAt, tx } = params
+    const { sessionId, agentSessionId = '', payload, metadata, createdAt } = params
 
     if (!payload?.message?.role) {
       throw new Error('Message payload missing role')
@@ -135,18 +118,18 @@ class AgentMessageRepository extends BaseService {
       throw new Error('Message payload missing id')
     }
 
-    const writer = this.getWriter(tx)
+    const database = await this.getDatabase()
     const now = createdAt ?? payload.message.createdAt ?? new Date().toISOString()
     const serializedPayload = this.serializeMessage(payload)
     const serializedMetadata = this.serializeMetadata(metadata)
 
-    const existingRow = await this.findExistingMessageRow(writer, sessionId, payload.message.role, payload.message.id)
+    const existingRow = await this.findExistingMessageRow(sessionId, payload.message.role, payload.message.id)
 
     if (existingRow) {
       const metadataToPersist = serializedMetadata ?? existingRow.metadata ?? undefined
       const agentSessionToPersist = agentSessionId || existingRow.agent_session_id || ''
 
-      await writer
+      await database
         .update(sessionMessagesTable)
         .set({
           content: serializedPayload,
@@ -175,7 +158,7 @@ class AgentMessageRepository extends BaseService {
       updated_at: now
     }
 
-    const [saved] = await writer.insert(sessionMessagesTable).values(insertData).returning()
+    const [saved] = await database.insert(sessionMessagesTable).values(insertData).returning()
 
     return this.deserialize(saved)
   }
@@ -188,14 +171,10 @@ class AgentMessageRepository extends BaseService {
     return this.upsertMessage(params)
   }
 
-  async persistExchange(params: PersistExchangeParams): Promise<PersistExchangeResult> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
+  async persistExchange(params: AgentMessagePersistExchangePayload): Promise<AgentMessagePersistExchangeResult> {
     const { sessionId, agentSessionId, user, assistant } = params
 
-    const result = await this.database.transaction(async (tx) => {
-      const exchangeResult: PersistExchangeResult = {}
+    const exchangeResult: AgentMessagePersistExchangeResult = {}
 
     if (user?.payload) {
       exchangeResult.userMessage = await this.persistUserMessage({
@@ -203,8 +182,7 @@ class AgentMessageRepository extends BaseService {
         agentSessionId,
         payload: user.payload,
         metadata: user.metadata,
-          createdAt: user.createdAt,
-          tx
+        createdAt: user.createdAt
       })
     }
 
@@ -214,23 +192,17 @@ class AgentMessageRepository extends BaseService {
         agentSessionId,
         payload: assistant.payload,
         metadata: assistant.metadata,
-          createdAt: assistant.createdAt,
-          tx
+        createdAt: assistant.createdAt
       })
     }
 
     return exchangeResult
-    })
-
-    return result
   }
 
   async getSessionHistory(sessionId: string): Promise<AgentPersistedMessage[]> {
-    await AgentMessageRepository.initialize()
-    this.ensureInitialized()
-
     try {
-      const rows = await this.database
+      const database = await this.getDatabase()
+      const rows = await database
         .select()
         .from(sessionMessagesTable)
         .where(eq(sessionMessagesTable.session_id, sessionId))

src/main/services/agents/services/AgentService.ts

@@ -32,14 +32,8 @@ export class AgentService extends BaseService {
     return AgentService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
-  }
-
   // Agent Methods
   async createAgent(req: CreateAgentRequest): Promise<CreateAgentResponse> {
-    this.ensureInitialized()
-
     const id = `agent_${Date.now()}_${Math.random().toString(36).substring(2, 11)}`
     const now = new Date().toISOString()
 
@@ -75,8 +69,9 @@ export class AgentService extends BaseService {
       updated_at: now
     }
 
-    await this.database.insert(agentsTable).values(insertData)
-    const result = await this.database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
+    const database = await this.getDatabase()
+    await database.insert(agentsTable).values(insertData)
+    const result = await database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
     if (!result[0]) {
       throw new Error('Failed to create agent')
     }
@@ -86,9 +81,8 @@ export class AgentService extends BaseService {
   }
 
   async getAgent(id: string): Promise<GetAgentResponse | null> {
-    this.ensureInitialized()
-
-    const result = await this.database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
+    const database = await this.getDatabase()
+    const result = await database.select().from(agentsTable).where(eq(agentsTable.id, id)).limit(1)
 
     if (!result[0]) {
       return null
@@ -118,9 +112,9 @@ export class AgentService extends BaseService {
   }
 
   async listAgents(options: ListOptions = {}): Promise<{ agents: AgentEntity[]; total: number }> {
-    this.ensureInitialized() // Build query with pagination
-
-    const totalResult = await this.database.select({ count: count() }).from(agentsTable)
+    // Build query with pagination
+    const database = await this.getDatabase()
+    const totalResult = await database.select({ count: count() }).from(agentsTable)
 
     const sortBy = options.sortBy || 'created_at'
     const orderBy = options.orderBy || 'desc'
@@ -128,7 +122,7 @@ export class AgentService extends BaseService {
     const sortField = agentsTable[sortBy]
     const orderFn = orderBy === 'asc' ? asc : desc
 
-    const baseQuery = this.database.select().from(agentsTable).orderBy(orderFn(sortField))
+    const baseQuery = database.select().from(agentsTable).orderBy(orderFn(sortField))
 
     const result =
       options.limit !== undefined
@@ -151,8 +145,6 @@ export class AgentService extends BaseService {
     updates: UpdateAgentRequest,
     options: { replace?: boolean } = {}
   ): Promise<UpdateAgentResponse | null> {
-    this.ensureInitialized()
-
     // Check if agent exists
     const existing = await this.getAgent(id)
     if (!existing) {
@@ -195,22 +187,21 @@ export class AgentService extends BaseService {
       }
     }
 
-    await this.database.update(agentsTable).set(updateData).where(eq(agentsTable.id, id))
+    const database = await this.getDatabase()
+    await database.update(agentsTable).set(updateData).where(eq(agentsTable.id, id))
     return await this.getAgent(id)
   }
 
   async deleteAgent(id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database.delete(agentsTable).where(eq(agentsTable.id, id))
+    const database = await this.getDatabase()
+    const result = await database.delete(agentsTable).where(eq(agentsTable.id, id))
 
     return result.rowsAffected > 0
   }
 
   async agentExists(id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: agentsTable.id })
       .from(agentsTable)
       .where(eq(agentsTable.id, id))

src/main/services/agents/services/SessionMessageService.ts

@@ -104,14 +104,9 @@ export class SessionMessageService extends BaseService {
     return SessionMessageService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
-  }
-
   async sessionMessageExists(id: number): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: sessionMessagesTable.id })
       .from(sessionMessagesTable)
       .where(eq(sessionMessagesTable.id, id))
@@ -124,10 +119,9 @@ export class SessionMessageService extends BaseService {
     sessionId: string,
     options: ListOptions = {}
   ): Promise<{ messages: AgentSessionMessageEntity[] }> {
-    this.ensureInitialized()
-
     // Get messages with pagination
-    const baseQuery = this.database
+    const database = await this.getDatabase()
+    const baseQuery = database
       .select()
       .from(sessionMessagesTable)
       .where(eq(sessionMessagesTable.session_id, sessionId))
@@ -146,9 +140,8 @@ export class SessionMessageService extends BaseService {
   }
 
   async deleteSessionMessage(sessionId: string, messageId: number): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .delete(sessionMessagesTable)
       .where(and(eq(sessionMessagesTable.id, messageId), eq(sessionMessagesTable.session_id, sessionId)))
 
@@ -160,8 +153,6 @@ export class SessionMessageService extends BaseService {
     messageData: CreateSessionMessageRequest,
     abortController: AbortController
   ): Promise<SessionStreamResult> {
-    this.ensureInitialized()
-
     return await this.startSessionMessageStream(session, messageData, abortController)
   }
 
@@ -270,10 +261,9 @@ export class SessionMessageService extends BaseService {
   }
 
   private async getLastAgentSessionId(sessionId: string): Promise<string> {
-    this.ensureInitialized()
-
     try {
-      const result = await this.database
+      const database = await this.getDatabase()
+      const result = await database
         .select({ agent_session_id: sessionMessagesTable.agent_session_id })
         .from(sessionMessagesTable)
         .where(and(eq(sessionMessagesTable.session_id, sessionId), not(eq(sessionMessagesTable.agent_session_id, ''))))

src/main/services/agents/services/SessionService.ts

@@ -30,10 +30,6 @@ export class SessionService extends BaseService {
     return SessionService.instance
   }
 
-  async initialize(): Promise<void> {
-    await BaseService.initialize()
-  }
-
   /**
    * Override BaseService.listSlashCommands to merge builtin and plugin commands
    */
@@ -84,13 +80,12 @@ export class SessionService extends BaseService {
     agentId: string,
     req: Partial<CreateSessionRequest> = {}
   ): Promise<GetAgentSessionResponse | null> {
-    this.ensureInitialized()
-
     // Validate agent exists - we'll need to import AgentService for this check
     // For now, we'll skip this validation to avoid circular dependencies
     // The database foreign key constraint will handle this
 
-    const agents = await this.database.select().from(agentsTable).where(eq(agentsTable.id, agentId)).limit(1)
+    const database = await this.getDatabase()
+    const agents = await database.select().from(agentsTable).where(eq(agentsTable.id, agentId)).limit(1)
     if (!agents[0]) {
       throw new Error('Agent not found')
     }
@@ -135,9 +130,10 @@ export class SessionService extends BaseService {
       updated_at: now
     }
 
-    await this.database.insert(sessionsTable).values(insertData)
+    const db = await this.getDatabase()
+    await db.insert(sessionsTable).values(insertData)
 
-    const result = await this.database.select().from(sessionsTable).where(eq(sessionsTable.id, id)).limit(1)
+    const result = await db.select().from(sessionsTable).where(eq(sessionsTable.id, id)).limit(1)
 
     if (!result[0]) {
       throw new Error('Failed to create session')
@@ -148,9 +144,8 @@ export class SessionService extends BaseService {
   }
 
   async getSession(agentId: string, id: string): Promise<GetAgentSessionResponse | null> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select()
       .from(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))
@@ -176,8 +171,6 @@ export class SessionService extends BaseService {
     agentId?: string,
     options: ListOptions = {}
   ): Promise<{ sessions: AgentSessionEntity[]; total: number }> {
-    this.ensureInitialized()
-
     // Build where conditions
     const whereConditions: SQL[] = []
     if (agentId) {
@@ -192,16 +185,13 @@ export class SessionService extends BaseService {
           : undefined
 
     // Get total count
-    const totalResult = await this.database.select({ count: count() }).from(sessionsTable).where(whereClause)
+    const database = await this.getDatabase()
+    const totalResult = await database.select({ count: count() }).from(sessionsTable).where(whereClause)
 
     const total = totalResult[0].count
 
     // Build list query with pagination - sort by updated_at descending (latest first)
-    const baseQuery = this.database
-      .select()
-      .from(sessionsTable)
-      .where(whereClause)
-      .orderBy(desc(sessionsTable.updated_at))
+    const baseQuery = database.select().from(sessionsTable).where(whereClause).orderBy(desc(sessionsTable.updated_at))
 
     const result =
       options.limit !== undefined
@@ -220,8 +210,6 @@ export class SessionService extends BaseService {
     id: string,
     updates: UpdateSessionRequest
   ): Promise<UpdateSessionResponse | null> {
-    this.ensureInitialized()
-
     // Check if session exists
     const existing = await this.getSession(agentId, id)
     if (!existing) {
@@ -262,15 +250,15 @@ export class SessionService extends BaseService {
       }
     }
 
-    await this.database.update(sessionsTable).set(updateData).where(eq(sessionsTable.id, id))
+    const database = await this.getDatabase()
+    await database.update(sessionsTable).set(updateData).where(eq(sessionsTable.id, id))
 
     return await this.getSession(agentId, id)
   }
 
   async deleteSession(agentId: string, id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .delete(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))
 
@@ -278,9 +266,8 @@ export class SessionService extends BaseService {
   }
 
   async sessionExists(agentId: string, id: string): Promise<boolean> {
-    this.ensureInitialized()
-
-    const result = await this.database
+    const database = await this.getDatabase()
+    const result = await database
       .select({ id: sessionsTable.id })
       .from(sessionsTable)
       .where(and(eq(sessionsTable.id, id), eq(sessionsTable.agent_id, agentId)))

src/main/services/agents/services/claudecode/__tests__/transform.test.ts

@@ -21,11 +21,16 @@ 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', () => {
   it('handles tool call streaming lifecycle', () => {
-    const state = new ClaudeStreamState()
+    const state = new ClaudeStreamState({ agentSessionId: baseStreamMetadata.session_id })
     const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
 
     const messages: SDKMessage[] = [
@@ -182,14 +187,119 @@ describe('Claude → AiSDK transform', () => {
       (typeof parts)[number],
       { type: 'tool-result' }
     >
-    expect(toolResult.toolCallId).toBe('tool-1')
+    expect(toolResult.toolCallId).toBe('session-123:tool-1')
     expect(toolResult.toolName).toBe('Bash')
     expect(toolResult.input).toEqual({ command: 'ls' })
     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()
+    const state = new ClaudeStreamState({ agentSessionId: baseStreamMetadata.session_id })
     const parts: ReturnType<typeof transformSDKMessageToStreamParts>[number][] = []
 
     const messages: SDKMessage[] = [
@@ -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')
+  })
 })

src/main/services/agents/services/claudecode/claude-stream-state.ts

@@ -10,8 +10,21 @@
  * Every Claude turn gets its own instance. `resetStep` should be invoked once the finish event has
  * been emitted to avoid leaking state into the next turn.
  */
+import { loggerService } from '@logger'
 import type { FinishReason, LanguageModelUsage, ProviderMetadata } from 'ai'
 
+/**
+ * Builds a namespaced tool call ID by combining session ID with raw tool call ID.
+ * This ensures tool calls from different sessions don't conflict even if they have
+ * the same raw ID from the SDK.
+ *
+ * @param sessionId - The agent session ID
+ * @param rawToolCallId - The raw tool call ID from SDK (e.g., "WebFetch_0")
+ */
+export function buildNamespacedToolCallId(sessionId: string, rawToolCallId: string): string {
+  return `${sessionId}:${rawToolCallId}`
+}
+
 /**
  * Shared fields for every block that Claude can stream (text, reasoning, tool).
  */
@@ -34,6 +47,7 @@ type ReasoningBlockState = BaseBlockState & {
 type ToolBlockState = BaseBlockState & {
   kind: 'tool'
   toolCallId: string
+  rawToolCallId: string
   toolName: string
   inputBuffer: string
   providerMetadata?: ProviderMetadata
@@ -48,12 +62,17 @@ type PendingUsageState = {
 }
 
 type PendingToolCall = {
+  rawToolCallId: string
   toolCallId: string
   toolName: string
   input: unknown
   providerMetadata?: ProviderMetadata
 }
 
+type ClaudeStreamStateOptions = {
+  agentSessionId: string
+}
+
 /**
  * Tracks the lifecycle of Claude streaming blocks (text, thinking, tool calls)
  * across individual websocket events. The transformer relies on this class to
@@ -61,12 +80,20 @@ type PendingToolCall = {
  * usage/finish metadata once Anthropic closes a message.
  */
 export class ClaudeStreamState {
+  private logger
+  private readonly agentSessionId: string
   private blocksByIndex = new Map<number, BlockState>()
-  private toolIndexById = new Map<string, number>()
+  private toolIndexByNamespacedId = new Map<string, number>()
   private pendingUsage: PendingUsageState = {}
   private pendingToolCalls = new Map<string, PendingToolCall>()
   private stepActive = false
 
+  constructor(options: ClaudeStreamStateOptions) {
+    this.logger = loggerService.withContext('ClaudeStreamState')
+    this.agentSessionId = options.agentSessionId
+    this.logger.silly('ClaudeStreamState', options)
+  }
+
   /** Marks the beginning of a new AiSDK step. */
   beginStep(): void {
     this.stepActive = true
@@ -104,19 +131,21 @@ export class ClaudeStreamState {
   /** Caches tool metadata so subsequent input deltas and results can find it. */
   openToolBlock(
     index: number,
-    params: { toolCallId: string; toolName: string; providerMetadata?: ProviderMetadata }
+    params: { rawToolCallId: string; toolName: string; providerMetadata?: ProviderMetadata }
   ): ToolBlockState {
+    const toolCallId = buildNamespacedToolCallId(this.agentSessionId, params.rawToolCallId)
     const block: ToolBlockState = {
       kind: 'tool',
-      id: params.toolCallId,
+      id: toolCallId,
       index,
-      toolCallId: params.toolCallId,
+      toolCallId,
+      rawToolCallId: params.rawToolCallId,
       toolName: params.toolName,
       inputBuffer: '',
       providerMetadata: params.providerMetadata
     }
     this.blocksByIndex.set(index, block)
-    this.toolIndexById.set(params.toolCallId, index)
+    this.toolIndexByNamespacedId.set(toolCallId, index)
     return block
   }
 
@@ -124,14 +153,32 @@ 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.toolIndexById.get(toolCallId)
+    const index = this.toolIndexByNamespacedId.get(toolCallId)
     if (index === undefined) return undefined
     const block = this.blocksByIndex.get(index)
     if (!block || block.kind !== 'tool') return undefined
     return block
   }
 
+  getToolBlockByRawId(rawToolCallId: string): ToolBlockState | undefined {
+    return this.getToolBlockById(buildNamespacedToolCallId(this.agentSessionId, rawToolCallId))
+  }
+
   /** Appends streamed text to a text block, returning the updated state when present. */
   appendTextDelta(index: number, text: string): TextBlockState | undefined {
     const block = this.blocksByIndex.get(index)
@@ -158,10 +205,12 @@ export class ClaudeStreamState {
 
   /** Records a tool call to be consumed once its result arrives from the user. */
   registerToolCall(
-    toolCallId: string,
+    rawToolCallId: string,
     payload: { toolName: string; input: unknown; providerMetadata?: ProviderMetadata }
   ): void {
-    this.pendingToolCalls.set(toolCallId, {
+    const toolCallId = buildNamespacedToolCallId(this.agentSessionId, rawToolCallId)
+    this.pendingToolCalls.set(rawToolCallId, {
+      rawToolCallId,
       toolCallId,
       toolName: payload.toolName,
       input: payload.input,
@@ -170,10 +219,10 @@ export class ClaudeStreamState {
   }
 
   /** Retrieves and clears the buffered tool call metadata for the given id. */
-  consumePendingToolCall(toolCallId: string): PendingToolCall | undefined {
-    const entry = this.pendingToolCalls.get(toolCallId)
+  consumePendingToolCall(rawToolCallId: string): PendingToolCall | undefined {
+    const entry = this.pendingToolCalls.get(rawToolCallId)
     if (entry) {
-      this.pendingToolCalls.delete(toolCallId)
+      this.pendingToolCalls.delete(rawToolCallId)
     }
     return entry
   }
@@ -182,13 +231,13 @@ 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: this.getToolBlockById(toolCallId)?.toolName ?? 'unknown',
+      toolName,
       input,
       providerMetadata
     })
-    const block = this.getToolBlockById(toolCallId)
     if (block) {
       block.resolvedInput = input
     }
@@ -200,7 +249,7 @@ export class ClaudeStreamState {
     if (!block) return undefined
     this.blocksByIndex.delete(index)
     if (block.kind === 'tool') {
-      this.toolIndexById.delete(block.toolCallId)
+      this.toolIndexByNamespacedId.delete(block.toolCallId)
     }
     return block
   }
@@ -227,7 +276,7 @@ export class ClaudeStreamState {
   /** Drops cached block metadata for the currently active message. */
   resetBlocks(): void {
     this.blocksByIndex.clear()
-    this.toolIndexById.clear()
+    this.toolIndexByNamespacedId.clear()
   }
 
   /** Resets the entire step lifecycle after emitting a terminal frame. */
@@ -236,6 +285,10 @@ export class ClaudeStreamState {
     this.resetPendingUsage()
     this.stepActive = false
   }
+
+  getNamespacedToolCallId(rawToolCallId: string): string {
+    return buildNamespacedToolCallId(this.agentSessionId, rawToolCallId)
+  }
 }
 
 export type { PendingToolCall }

src/main/services/agents/services/claudecode/index.ts

@@ -1,8 +1,16 @@
 // src/main/services/agents/services/claudecode/index.ts
 import { EventEmitter } from 'node:events'
 import { createRequire } from 'node:module'
+import path from 'node:path'
 
-import type { CanUseTool, McpHttpServerConfig, Options, SDKMessage } from '@anthropic-ai/claude-agent-sdk'
+import type {
+  CanUseTool,
+  HookCallback,
+  McpHttpServerConfig,
+  Options,
+  PreToolUseHookInput,
+  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'
@@ -13,6 +21,7 @@ import { app } from 'electron'
 import type { GetAgentSessionResponse } from '../..'
 import type { AgentServiceInterface, AgentStream, AgentStreamEvent } from '../../interfaces/AgentStreamInterface'
 import { sessionService } from '../SessionService'
+import { buildNamespacedToolCallId } from './claude-stream-state'
 import { promptForToolApproval } from './tool-permissions'
 import { ClaudeStreamState, transformSDKMessageToStreamParts } from './transform'
 
@@ -113,7 +122,11 @@ class ClaudeCodeService implements AgentServiceInterface {
       // TODO: support set small model in UI
       ANTHROPIC_DEFAULT_HAIKU_MODEL: modelInfo.modelId,
       ELECTRON_RUN_AS_NODE: '1',
-      ELECTRON_NO_ATTACH_CONSOLE: '1'
+      ELECTRON_NO_ATTACH_CONSOLE: '1',
+      // Set CLAUDE_CONFIG_DIR to app's userData directory to avoid path encoding issues
+      // on Windows when the username contains non-ASCII characters (e.g., Chinese characters)
+      // This prevents the SDK from using the user's home directory which may have encoding problems
+      CLAUDE_CONFIG_DIR: path.join(app.getPath('userData'), '.claude')
     }
 
     const errorChunks: string[] = []
@@ -150,7 +163,67 @@ class ClaudeCodeService implements AgentServiceInterface {
         return { behavior: 'allow', updatedInput: input }
       }
 
-      return promptForToolApproval(toolName, input, options)
+      return promptForToolApproval(toolName, input, {
+        ...options,
+        toolCallId: buildNamespacedToolCallId(session.id, options.toolUseID)
+      })
+    }
+
+    const preToolUseHook: HookCallback = async (input, toolUseID, options) => {
+      // Type guard to ensure we're handling PreToolUse event
+      if (input.hook_event_name !== 'PreToolUse') {
+        return {}
+      }
+
+      const hookInput = input as PreToolUseHookInput
+      const toolName = hookInput.tool_name
+
+      logger.debug('PreToolUse hook triggered', {
+        session_id: hookInput.session_id,
+        tool_name: hookInput.tool_name,
+        tool_use_id: toolUseID,
+        tool_input: hookInput.tool_input,
+        cwd: hookInput.cwd,
+        permission_mode: hookInput.permission_mode,
+        autoAllowTools: autoAllowTools
+      })
+
+      if (options?.signal?.aborted) {
+        logger.debug('PreToolUse hook signal already aborted; skipping tool use', {
+          tool_name: hookInput.tool_name
+        })
+        return {}
+      }
+
+      // handle auto approved tools since it never triggers canUseTool
+      const normalizedToolName = normalizeToolName(toolName)
+      if (toolUseID) {
+        const bypassAll = input.permission_mode === 'bypassPermissions'
+        const autoAllowed = autoAllowTools.has(toolName) || autoAllowTools.has(normalizedToolName)
+        if (bypassAll || autoAllowed) {
+          const namespacedToolCallId = buildNamespacedToolCallId(session.id, toolUseID)
+          logger.debug('handling auto approved tools', {
+            toolName,
+            normalizedToolName,
+            namespacedToolCallId,
+            permission_mode: input.permission_mode,
+            autoAllowTools
+          })
+          const isRecord = (v: unknown): v is Record<string, unknown> => {
+            return !!v && typeof v === 'object' && !Array.isArray(v)
+          }
+          const toolInput = isRecord(input.tool_input) ? input.tool_input : {}
+
+          await promptForToolApproval(toolName, toolInput, {
+            ...options,
+            toolCallId: namespacedToolCallId,
+            autoApprove: true
+          })
+        }
+      }
+
+      // Return to proceed without modification
+      return {}
     }
 
     // Build SDK options from parameters
@@ -176,7 +249,14 @@ class ClaudeCodeService implements AgentServiceInterface {
       permissionMode: session.configuration?.permission_mode,
       maxTurns: session.configuration?.max_turns,
       allowedTools: session.allowed_tools,
-      canUseTool
+      canUseTool,
+      hooks: {
+        PreToolUse: [
+          {
+            hooks: [preToolUseHook]
+          }
+        ]
+      }
     }
 
     if (session.accessible_paths.length > 1) {
@@ -346,7 +426,7 @@ class ClaudeCodeService implements AgentServiceInterface {
     const jsonOutput: SDKMessage[] = []
     let hasCompleted = false
     const startTime = Date.now()
-    const streamState = new ClaudeStreamState()
+    const streamState = new ClaudeStreamState({ agentSessionId: sessionId })
 
     try {
       for await (const message of query({ prompt: promptStream, options })) {
@@ -410,23 +490,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', {

src/main/services/agents/services/claudecode/tool-permissions.ts

@@ -31,12 +31,14 @@ type PendingPermissionRequest = {
   abortListener?: () => void
   originalInput: Record<string, unknown>
   toolName: string
+  toolCallId?: string
 }
 
 type RendererPermissionRequestPayload = {
   requestId: string
   toolName: string
   toolId: string
+  toolCallId: string
   description?: string
   requiresPermissions: boolean
   input: Record<string, unknown>
@@ -44,6 +46,7 @@ type RendererPermissionRequestPayload = {
   createdAt: number
   expiresAt: number
   suggestions: PermissionUpdate[]
+  autoApprove?: boolean
 }
 
 type RendererPermissionResultPayload = {
@@ -51,6 +54,7 @@ type RendererPermissionResultPayload = {
   behavior: ToolPermissionBehavior
   message?: string
   reason: 'response' | 'timeout' | 'aborted' | 'no-window'
+  toolCallId?: string
 }
 
 const pendingRequests = new Map<string, PendingPermissionRequest>()
@@ -144,7 +148,8 @@ const finalizeRequest = (
     requestId,
     behavior: update.behavior,
     message: update.behavior === 'deny' ? update.message : undefined,
-    reason
+    reason,
+    toolCallId: pending.toolCallId
   }
 
   const dispatched = broadcastToRenderer(IpcChannel.AgentToolPermission_Result, resultPayload)
@@ -206,10 +211,20 @@ const ensureIpcHandlersRegistered = () => {
   })
 }
 
+type PromptForToolApprovalOptions = {
+  signal: AbortSignal
+  suggestions?: PermissionUpdate[]
+  autoApprove?: boolean
+
+  // NOTICE: This ID is namespaced with session ID, not the raw SDK tool call ID.
+  // Format: `${sessionId}:${rawToolCallId}`, e.g., `session_123:WebFetch_0`
+  toolCallId: string
+}
+
 export async function promptForToolApproval(
   toolName: string,
   input: Record<string, unknown>,
-  options?: { signal: AbortSignal; suggestions?: PermissionUpdate[] }
+  options: PromptForToolApprovalOptions
 ): Promise<PermissionResult> {
   if (shouldAutoApproveTools) {
     logger.debug('promptForToolApproval auto-approving tool for test', {
@@ -245,6 +260,7 @@ export async function promptForToolApproval(
   logger.info('Requesting user approval for tool usage', {
     requestId,
     toolName,
+    toolCallId: options.toolCallId,
     description: toolMetadata?.description
   })
 
@@ -252,13 +268,15 @@ export async function promptForToolApproval(
     requestId,
     toolName,
     toolId: toolMetadata?.id ?? toolName,
+    toolCallId: options.toolCallId,
     description: toolMetadata?.description,
     requiresPermissions: toolMetadata?.requirePermissions ?? false,
     input: sanitizedInput,
     inputPreview,
     createdAt,
     expiresAt,
-    suggestions: sanitizedSuggestions
+    suggestions: sanitizedSuggestions,
+    autoApprove: options.autoApprove
   }
 
   const defaultDenyUpdate: PermissionResult = { behavior: 'deny', message: 'Tool request aborted before user decision' }
@@ -266,6 +284,7 @@ export async function promptForToolApproval(
   logger.debug('Registering tool permission request', {
     requestId,
     toolName,
+    toolCallId: options.toolCallId,
     requiresPermissions: requestPayload.requiresPermissions,
     timeoutMs: TOOL_APPROVAL_TIMEOUT_MS,
     suggestionCount: sanitizedSuggestions.length
@@ -273,7 +292,11 @@ export async function promptForToolApproval(
 
   return new Promise<PermissionResult>((resolve) => {
     const timeout = setTimeout(() => {
-      logger.info('User tool permission request timed out', { requestId, toolName })
+      logger.info('User tool permission request timed out', {
+        requestId,
+        toolName,
+        toolCallId: options.toolCallId
+      })
       finalizeRequest(requestId, { behavior: 'deny', message: 'Timed out waiting for approval' }, 'timeout')
     }, TOOL_APPROVAL_TIMEOUT_MS)
 
@@ -282,12 +305,17 @@ export async function promptForToolApproval(
       timeout,
       originalInput: sanitizedInput,
       toolName,
-      signal: options?.signal
+      signal: options?.signal,
+      toolCallId: options.toolCallId
     }
 
     if (options?.signal) {
       const abortListener = () => {
-        logger.info('Tool permission request aborted before user responded', { requestId, toolName })
+        logger.info('Tool permission request aborted before user responded', {
+          requestId,
+          toolName,
+          toolCallId: options.toolCallId
+        })
         finalizeRequest(requestId, defaultDenyUpdate, 'aborted')
       }
 

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) {
+      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)
 }
 
 /**
@@ -243,15 +271,16 @@ function handleAssistantToolUse(
   state: ClaudeStreamState,
   chunks: AgentStreamPart[]
 ): void {
+  const toolCallId = state.getNamespacedToolCallId(block.id)
   chunks.push({
     type: 'tool-call',
-    toolCallId: block.id,
+    toolCallId,
     toolName: block.name,
     input: block.input,
     providerExecuted: true,
     providerMetadata
   })
-  state.completeToolBlock(block.id, block.input, providerMetadata)
+  state.completeToolBlock(block.id, block.name, block.input, providerMetadata)
 }
 
 /**
@@ -331,10 +360,11 @@ function handleUserMessage(
     if (block.type === 'tool_result') {
       const toolResult = block as ToolResultContent
       const pendingCall = state.consumePendingToolCall(toolResult.tool_use_id)
+      const toolCallId = pendingCall?.toolCallId ?? state.getNamespacedToolCallId(toolResult.tool_use_id)
       if (toolResult.is_error) {
         chunks.push({
           type: 'tool-error',
-          toolCallId: toolResult.tool_use_id,
+          toolCallId,
           toolName: pendingCall?.toolName ?? 'unknown',
           input: pendingCall?.input,
           error: toolResult.content,
@@ -343,7 +373,7 @@ function handleUserMessage(
       } else {
         chunks.push({
           type: 'tool-result',
-          toolCallId: toolResult.tool_use_id,
+          toolCallId,
           toolName: pendingCall?.toolName ?? 'unknown',
           input: pendingCall?.input,
           output: toolResult.content,
@@ -457,6 +487,9 @@ function handleStreamEvent(
     }
 
     case 'message_stop': {
+      if (!state.hasActiveStep()) {
+        break
+      }
       const pending = state.getPendingUsage()
       chunks.push({
         type: 'finish-step',
@@ -514,7 +547,7 @@ function handleContentBlockStart(
     }
     case 'tool_use': {
       const block = state.openToolBlock(index, {
-        toolCallId: contentBlock.id,
+        rawToolCallId: contentBlock.id,
         toolName: contentBlock.name,
         providerMetadata
       })

src/main/utils/__tests__/mcp.test.ts

@@ -0,0 +1,196 @@
+import { describe, expect, it } from 'vitest'
+
+import { buildFunctionCallToolName } from '../mcp'
+
+describe('buildFunctionCallToolName', () => {
+  describe('basic functionality', () => {
+    it('should combine server name and tool name', () => {
+      const result = buildFunctionCallToolName('github', 'search_issues')
+      expect(result).toContain('github')
+      expect(result).toContain('search')
+    })
+
+    it('should sanitize names by replacing dashes with underscores', () => {
+      const result = buildFunctionCallToolName('my-server', 'my-tool')
+      // Input dashes are replaced, but the separator between server and tool is a dash
+      expect(result).toBe('my_serv-my_tool')
+      expect(result).toContain('_')
+    })
+
+    it('should handle empty server names gracefully', () => {
+      const result = buildFunctionCallToolName('', 'tool')
+      expect(result).toBeTruthy()
+    })
+  })
+
+  describe('uniqueness with serverId', () => {
+    it('should generate different IDs for same server name but different serverIds', () => {
+      const serverId1 = 'server-id-123456'
+      const serverId2 = 'server-id-789012'
+      const serverName = 'github'
+      const toolName = 'search_repos'
+
+      const result1 = buildFunctionCallToolName(serverName, toolName, serverId1)
+      const result2 = buildFunctionCallToolName(serverName, toolName, serverId2)
+
+      expect(result1).not.toBe(result2)
+      expect(result1).toContain('123456')
+      expect(result2).toContain('789012')
+    })
+
+    it('should generate same ID when serverId is not provided', () => {
+      const serverName = 'github'
+      const toolName = 'search_repos'
+
+      const result1 = buildFunctionCallToolName(serverName, toolName)
+      const result2 = buildFunctionCallToolName(serverName, toolName)
+
+      expect(result1).toBe(result2)
+    })
+
+    it('should include serverId suffix when provided', () => {
+      const serverId = 'abc123def456'
+      const result = buildFunctionCallToolName('server', 'tool', serverId)
+
+      // Should include last 6 chars of serverId
+      expect(result).toContain('ef456')
+    })
+  })
+
+  describe('character sanitization', () => {
+    it('should replace invalid characters with underscores', () => {
+      const result = buildFunctionCallToolName('test@server', 'tool#name')
+      expect(result).not.toMatch(/[@#]/)
+      expect(result).toMatch(/^[a-zA-Z0-9_-]+$/)
+    })
+
+    it('should ensure name starts with a letter', () => {
+      const result = buildFunctionCallToolName('123server', '456tool')
+      expect(result).toMatch(/^[a-zA-Z]/)
+    })
+
+    it('should handle consecutive underscores/dashes', () => {
+      const result = buildFunctionCallToolName('my--server', 'my__tool')
+      expect(result).not.toMatch(/[_-]{2,}/)
+    })
+  })
+
+  describe('length constraints', () => {
+    it('should truncate names longer than 63 characters', () => {
+      const longServerName = 'a'.repeat(50)
+      const longToolName = 'b'.repeat(50)
+      const result = buildFunctionCallToolName(longServerName, longToolName, 'id123456')
+
+      expect(result.length).toBeLessThanOrEqual(63)
+    })
+
+    it('should not end with underscore or dash after truncation', () => {
+      const longServerName = 'a'.repeat(50)
+      const longToolName = 'b'.repeat(50)
+      const result = buildFunctionCallToolName(longServerName, longToolName, 'id123456')
+
+      expect(result).not.toMatch(/[_-]$/)
+    })
+
+    it('should preserve serverId suffix even with long server/tool names', () => {
+      const longServerName = 'a'.repeat(50)
+      const longToolName = 'b'.repeat(50)
+      const serverId = 'server-id-xyz789'
+
+      const result = buildFunctionCallToolName(longServerName, longToolName, serverId)
+
+      // The suffix should be preserved and not truncated
+      expect(result).toContain('xyz789')
+      expect(result.length).toBeLessThanOrEqual(63)
+    })
+
+    it('should ensure two long-named servers with different IDs produce different results', () => {
+      const longServerName = 'a'.repeat(50)
+      const longToolName = 'b'.repeat(50)
+      const serverId1 = 'server-id-abc123'
+      const serverId2 = 'server-id-def456'
+
+      const result1 = buildFunctionCallToolName(longServerName, longToolName, serverId1)
+      const result2 = buildFunctionCallToolName(longServerName, longToolName, serverId2)
+
+      // Both should be within limit
+      expect(result1.length).toBeLessThanOrEqual(63)
+      expect(result2.length).toBeLessThanOrEqual(63)
+
+      // They should be different due to preserved suffix
+      expect(result1).not.toBe(result2)
+    })
+  })
+
+  describe('edge cases with serverId', () => {
+    it('should handle serverId with only non-alphanumeric characters', () => {
+      const serverId = '------' // All dashes
+      const result = buildFunctionCallToolName('server', 'tool', serverId)
+
+      // Should still produce a valid unique suffix via fallback hash
+      expect(result).toBeTruthy()
+      expect(result.length).toBeLessThanOrEqual(63)
+      expect(result).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
+      // Should have a suffix (underscore followed by something)
+      expect(result).toMatch(/_[a-z0-9]+$/)
+    })
+
+    it('should produce different results for different non-alphanumeric serverIds', () => {
+      const serverId1 = '------'
+      const serverId2 = '!!!!!!'
+
+      const result1 = buildFunctionCallToolName('server', 'tool', serverId1)
+      const result2 = buildFunctionCallToolName('server', 'tool', serverId2)
+
+      // Should be different because the hash fallback produces different values
+      expect(result1).not.toBe(result2)
+    })
+
+    it('should handle empty string serverId differently from undefined', () => {
+      const resultWithEmpty = buildFunctionCallToolName('server', 'tool', '')
+      const resultWithUndefined = buildFunctionCallToolName('server', 'tool', undefined)
+
+      // Empty string is falsy, so both should behave the same (no suffix)
+      expect(resultWithEmpty).toBe(resultWithUndefined)
+    })
+
+    it('should handle serverId with mixed alphanumeric and special chars', () => {
+      const serverId = 'ab@#cd' // Mixed chars, last 6 chars contain some alphanumeric
+      const result = buildFunctionCallToolName('server', 'tool', serverId)
+
+      // Should extract alphanumeric chars: 'abcd' from 'ab@#cd'
+      expect(result).toContain('abcd')
+    })
+  })
+
+  describe('real-world scenarios', () => {
+    it('should handle GitHub MCP server instances correctly', () => {
+      const serverName = 'github'
+      const toolName = 'search_repositories'
+
+      const githubComId = 'server-github-com-abc123'
+      const gheId = 'server-ghe-internal-xyz789'
+
+      const tool1 = buildFunctionCallToolName(serverName, toolName, githubComId)
+      const tool2 = buildFunctionCallToolName(serverName, toolName, gheId)
+
+      // Should be different
+      expect(tool1).not.toBe(tool2)
+
+      // Both should be valid identifiers
+      expect(tool1).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
+      expect(tool2).toMatch(/^[a-zA-Z][a-zA-Z0-9_-]*$/)
+
+      // Both should be <= 63 chars
+      expect(tool1.length).toBeLessThanOrEqual(63)
+      expect(tool2.length).toBeLessThanOrEqual(63)
+    })
+
+    it('should handle tool names that already include server name prefix', () => {
+      const result = buildFunctionCallToolName('github', 'github_search_repos')
+      expect(result).toBeTruthy()
+      // Should not double the server name
+      expect(result.split('github').length - 1).toBeLessThanOrEqual(2)
+    })
+  })
+})