fix: Include notes directory in backup when configured outside Data folder

- Parse notes path from backup data during backup process
- If notes are outside {userData}/Data, backup them separately to Notes folder
- On restore, restore Notes folder to configured location
- Handles both default and custom notes paths correctly

This ensures users don't lose their notes when using custom paths.

Co-authored-by: DeJeune <67425183+DeJeune@users.noreply.github.com>

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,4 +1,4 @@
-name: 🐛 Bug Report (English)
+name: 🐛 Bug Report
 description: Create a report to help us improve
 title: '[Bug]: '
 labels: ['BUG']

.github/ISSUE_TEMPLATE/1_feature_request.yml

@@ -1,4 +1,4 @@
-name: 💡 Feature Request (English)
+name: 💡 Feature Request
 description: Suggest an idea for this project
 title: '[Feature]: '
 labels: ['feature']

.github/ISSUE_TEMPLATE/3_others.yml

@@ -1,4 +1,4 @@
-name: 🤔 Other Questions (English)
+name: 🤔 Other Questions
 description: Submit questions that don't fit into bug reports or feature requests
 title: '[Other]: '
 body:

.github/workflows/auto-i18n.yml

@@ -1,4 +1,4 @@
-name: Auto I18N
+name: Auto I18N Weekly
 
 env:
   TRANSLATION_API_KEY: ${{ secrets.TRANSLATE_API_KEY }}
@@ -7,14 +7,15 @@ env:
   TRANSLATION_BASE_LOCALE: ${{ vars.AUTO_I18N_BASE_LOCALE || 'en-us'}}
 
 on:
-  pull_request:
-    types: [opened, synchronize, reopened]
+  schedule:
+    # Runs at 00:00 UTC every Sunday.
+    # This corresponds to 08:00 AM UTC+8 (Beijing time) every Sunday.
+    - cron: "0 0 * * 0"
   workflow_dispatch:
 
 jobs:
   auto-i18n:
     runs-on: ubuntu-latest
-    if: github.event_name == 'workflow_dispatch' || github.event.pull_request.head.repo.full_name == 'CherryHQ/cherry-studio'
     name: Auto I18N
     permissions:
       contents: write
@@ -24,45 +25,69 @@ jobs:
       - name: 🐈‍⬛ Checkout
         uses: actions/checkout@v5
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
 
       - name: 📦 Setting Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
-          package-manager-cache: false
+          node-version: 22
 
-      - name: 📦 Install dependencies in isolated directory
+      - name: 📦 Install corepack
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
+
+      - name: 📂 Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "dir=$(yarn config get cacheFolder)" >> $GITHUB_OUTPUT
+
+      - name: 💾 Cache yarn dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+            node_modules
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - name: 📦 Install dependencies
         run: |
-          # 在临时目录安装依赖
-          mkdir -p /tmp/translation-deps
-          cd /tmp/translation-deps
-          echo '{"dependencies": {"@cherrystudio/openai": "^6.5.0", "cli-progress": "^3.12.0", "tsx": "^4.20.3", "@biomejs/biome": "2.2.4"}}' > package.json
-          npm install --no-package-lock
-
-          # 设置 NODE_PATH 让项目能找到这些依赖
-          echo "NODE_PATH=/tmp/translation-deps/node_modules" >> $GITHUB_ENV
+          yarn install
 
       - name: 🏃‍♀️ Translate
-        run: npx tsx scripts/sync-i18n.ts && npx tsx scripts/auto-translate-i18n.ts
+        run: yarn sync:i18n && yarn auto:i18n
 
       - name: 🔍 Format
-        run: cd /tmp/translation-deps && npx biome format --config-path /home/runner/work/cherry-studio/cherry-studio/biome.jsonc --write /home/runner/work/cherry-studio/cherry-studio/src/renderer/src/i18n/
+        run: yarn format
 
-      - name: 🔄 Commit changes
+      - name: 🔍 Check for changes
+        id: git_status
         run: |
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-          git add .
+          # Check if there are any uncommitted changes
           git reset -- package.json yarn.lock  # 不提交 package.json 和 yarn.lock 的更改
-          if git diff --cached --quiet; then
-            echo "No changes to commit"
-          else
-            git commit -m "fix(i18n): Auto update translations for PR #${{ github.event.pull_request.number }}"
-          fi
+          git diff --exit-code --quiet || echo "::set-output name=has_changes::true"
+          git status --porcelain
 
-      - name: 🚀 Push changes
-        uses: ad-m/github-push-action@master
+      - name: 📅 Set current date for PR title
+        id: set_date
+        run: echo "CURRENT_DATE=$(date +'%b %d, %Y')" >> $GITHUB_ENV # e.g., "Jun 06, 2024"
+
+      - name: 🚀 Create Pull Request if changes exist
+        if: steps.git_status.outputs.has_changes == 'true'
+        uses: peter-evans/create-pull-request@v6
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.event.pull_request.head.ref }}
+          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 }}"
+          body: |
+            This PR includes changes generated by the weekly auto i18n.
+            Review the changes before merging.
+
+            ---
+            _Generated by the automated weekly workflow_
+          branch: "auto-i18n-weekly-${{ github.run_id }}" # Unique branch name
+          base: "main" # Or 'develop', set your base branch
+          delete-branch: true # Delete the branch after merging or closing the PR
+
+      - name: 📢 Notify if no changes
+        if: steps.git_status.outputs.has_changes != 'true'
+        run: echo "Bot script ran, but no changes were detected. No PR created."

.github/workflows/github-issue-tracker.yml

@@ -5,7 +5,7 @@ on:
     types: [opened]
   schedule:
     # Run every day at 8:30 Beijing Time (00:30 UTC)
-    - cron: '30 0 * * *'
+    - cron: "30 0 * * *"
   workflow_dispatch:
 
 jobs:
@@ -54,9 +54,9 @@ jobs:
 
       - name: Setup Node.js
         if: steps.check_time.outputs.should_delay == 'false'
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: 22
 
       - name: Process issue with Claude
         if: steps.check_time.outputs.should_delay == 'false'
@@ -121,9 +121,9 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v6
         with:
-          node-version: '20'
+          node-version: 22
 
       - name: Process pending issues with Claude
         uses: anthropics/claude-code-action@main

.github/workflows/issue-management.yml

@@ -21,7 +21,7 @@ jobs:
       contents: none
     steps:
       - name: Close needs-more-info issues
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           only-labels: 'needs-more-info'
@@ -29,8 +29,10 @@ jobs:
           days-before-close: 0 # Close immediately after stale
           stale-issue-label: 'inactive'
           close-issue-label: 'closed:no-response'
+          exempt-all-milestones: true
+          exempt-all-assignees: true
           stale-issue-message: |
-            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days. 
+            This issue has been labeled as needing more information and has been inactive for ${{ env.daysBeforeStale }} days.
             It will be closed now due to lack of additional information.
 
             该问题被标记为"需要更多信息"且已经 ${{ env.daysBeforeStale }} 天没有任何活动，将立即关闭。
@@ -40,12 +42,14 @@ jobs:
           days-before-pr-close: -1
 
       - name: Close inactive issues
-        uses: actions/stale@v9
+        uses: actions/stale@v10
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: ${{ env.daysBeforeStale }}
           days-before-close: ${{ env.daysBeforeClose }}
           stale-issue-label: 'inactive'
+          exempt-all-milestones: true
+          exempt-all-assignees: true
           stale-issue-message: |
             This issue has been inactive for a prolonged period and will be closed automatically in ${{ env.daysBeforeClose }} days.
             该问题已长时间处于闲置状态，${{ env.daysBeforeClose }} 天后将自动关闭。

.github/workflows/nightly-build.yml

@@ -3,7 +3,7 @@ name: Nightly Build
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 17 * * *' # 1:00 BJ Time
+    - cron: "0 17 * * *" # 1:00 BJ Time
 
 permissions:
   contents: write
@@ -56,9 +56,9 @@ jobs:
           ref: main
 
       - name: Install Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: macos-latest dependencies fix
         if: matrix.os == 'macos-latest'
@@ -66,7 +66,7 @@ jobs:
           brew install python-setuptools
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -208,7 +208,7 @@ jobs:
           echo "总计: $(find renamed-artifacts -type f | wc -l) 个文件"
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: cherry-studio-nightly-${{ steps.date.outputs.date }}-${{ matrix.os }}
           path: renamed-artifacts/*

.github/workflows/pr-ci.yml

@@ -24,12 +24,12 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Install Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/release.yml

@@ -4,9 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Release tag (e.g. v1.0.0)'
+        description: "Release tag (e.g. v1.0.0)"
         required: true
-        default: 'v1.0.0'
+        default: "v1.0.0"
   push:
     tags:
       - v*.*.*
@@ -47,9 +47,9 @@ jobs:
           npm version "$VERSION" --no-git-tag-version --allow-same-version
 
       - name: Install Node.js
-        uses: actions/setup-node@v5
+        uses: actions/setup-node@v6
         with:
-          node-version: 20
+          node-version: 22
 
       - name: macos-latest dependencies fix
         if: matrix.os == 'macos-latest'
@@ -57,7 +57,7 @@ jobs:
           brew install python-setuptools
 
       - name: Install corepack
-        run: corepack enable && corepack prepare yarn@4.6.0 --activate
+        run: corepack enable && corepack prepare yarn@4.9.1 --activate
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
@@ -127,5 +127,5 @@ jobs:
           allowUpdates: true
           makeLatest: false
           tag: ${{ steps.get-tag.outputs.tag }}
-          artifacts: 'dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap'
+          artifacts: "dist/*.exe,dist/*.zip,dist/*.dmg,dist/*.AppImage,dist/*.snap,dist/*.deb,dist/*.rpm,dist/*.tar.gz,dist/latest*.yml,dist/rc*.yml,dist/beta*.yml,dist/*.blockmap"
           token: ${{ secrets.GITHUB_TOKEN }}

.oxlintrc.json

@@ -22,7 +22,6 @@
     "eslint.config.mjs"
   ],
   "overrides": [
-    // set different env
     {
       "env": {
         "node": true
@@ -36,8 +35,7 @@
       "files": [
         "src/renderer/**/*.{ts,tsx}",
         "packages/aiCore/**",
-        "packages/extension-table-plus/**",
-        "resources/js/**"
+        "packages/extension-table-plus/**"
       ]
     },
     {
@@ -55,74 +53,16 @@
       "files": ["src/preload/**"]
     }
   ],
-  // We don't use the React plugin here because its behavior differs slightly from that of ESLint's React plugin.
   "plugins": ["unicorn", "typescript", "oxc", "import"],
   "rules": {
-    "constructor-super": "error",
-    "for-direction": "error",
-    "getter-return": "error",
     "no-array-constructor": "off",
-    // "import/no-cycle": "error", // tons of error, bro
-    "no-async-promise-executor": "error",
     "no-caller": "warn",
-    "no-case-declarations": "error",
-    "no-class-assign": "error",
-    "no-compare-neg-zero": "error",
-    "no-cond-assign": "error",
-    "no-const-assign": "error",
-    "no-constant-binary-expression": "error",
-    "no-constant-condition": "error",
-    "no-control-regex": "error",
-    "no-debugger": "error",
-    "no-delete-var": "error",
-    "no-dupe-args": "error",
-    "no-dupe-class-members": "error",
-    "no-dupe-else-if": "error",
-    "no-dupe-keys": "error",
-    "no-duplicate-case": "error",
-    "no-empty": "error",
-    "no-empty-character-class": "error",
-    "no-empty-pattern": "error",
-    "no-empty-static-block": "error",
     "no-eval": "warn",
-    "no-ex-assign": "error",
-    "no-extra-boolean-cast": "error",
     "no-fallthrough": "warn",
-    "no-func-assign": "error",
-    "no-global-assign": "error",
-    "no-import-assign": "error",
-    "no-invalid-regexp": "error",
-    "no-irregular-whitespace": "error",
-    "no-loss-of-precision": "error",
-    "no-misleading-character-class": "error",
-    "no-new-native-nonconstructor": "error",
-    "no-nonoctal-decimal-escape": "error",
-    "no-obj-calls": "error",
-    "no-octal": "error",
-    "no-prototype-builtins": "error",
-    "no-redeclare": "error",
-    "no-regex-spaces": "error",
-    "no-self-assign": "error",
-    "no-setter-return": "error",
-    "no-shadow-restricted-names": "error",
-    "no-sparse-arrays": "error",
-    "no-this-before-super": "error",
     "no-unassigned-vars": "warn",
-    "no-undef": "error",
-    "no-unexpected-multiline": "error",
-    "no-unreachable": "error",
-    "no-unsafe-finally": "error",
-    "no-unsafe-negation": "error",
-    "no-unsafe-optional-chaining": "error",
-    "no-unused-expressions": "off", // this rule disallow us to use expression to call function, like `condition && fn()`
-    "no-unused-labels": "error",
-    "no-unused-private-class-members": "error",
+    "no-unused-expressions": "off",
     "no-unused-vars": ["warn", { "caughtErrors": "none" }],
-    "no-useless-backreference": "error",
-    "no-useless-catch": "error",
-    "no-useless-escape": "error",
     "no-useless-rename": "warn",
-    "no-with": "error",
     "oxc/bad-array-method-on-arguments": "warn",
     "oxc/bad-char-at-comparison": "warn",
     "oxc/bad-comparison-sequence": "warn",
@@ -134,19 +74,17 @@
     "oxc/erasing-op": "warn",
     "oxc/missing-throw": "warn",
     "oxc/number-arg-out-of-range": "warn",
-    "oxc/only-used-in-recursion": "off", // manually off bacause of existing warning. may turn it on in the future
+    "oxc/only-used-in-recursion": "off",
     "oxc/uninvoked-array-callback": "warn",
-    "require-yield": "error",
     "typescript/await-thenable": "warn",
-    // "typescript/ban-ts-comment": "error",
+    "typescript/consistent-type-imports": "error",
     "typescript/no-array-constructor": "error",
-    // "typescript/consistent-type-imports": "error",
     "typescript/no-array-delete": "warn",
     "typescript/no-base-to-string": "warn",
     "typescript/no-duplicate-enum-values": "error",
     "typescript/no-duplicate-type-constituents": "warn",
     "typescript/no-empty-object-type": "off",
-    "typescript/no-explicit-any": "off", // not safe but too many errors
+    "typescript/no-explicit-any": "off",
     "typescript/no-extra-non-null-assertion": "error",
     "typescript/no-floating-promises": "warn",
     "typescript/no-for-in-array": "warn",
@@ -155,7 +93,7 @@
     "typescript/no-misused-new": "error",
     "typescript/no-misused-spread": "warn",
     "typescript/no-namespace": "error",
-    "typescript/no-non-null-asserted-optional-chain": "off", // it's off now. but may turn it on.
+    "typescript/no-non-null-asserted-optional-chain": "off",
     "typescript/no-redundant-type-constituents": "warn",
     "typescript/no-require-imports": "off",
     "typescript/no-this-alias": "error",
@@ -173,20 +111,18 @@
     "typescript/triple-slash-reference": "error",
     "typescript/unbound-method": "warn",
     "unicorn/no-await-in-promise-methods": "warn",
-    "unicorn/no-empty-file": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-empty-file": "off",
     "unicorn/no-invalid-fetch-options": "warn",
     "unicorn/no-invalid-remove-event-listener": "warn",
-    "unicorn/no-new-array": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-new-array": "off",
     "unicorn/no-single-promise-in-promise-methods": "warn",
-    "unicorn/no-thenable": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-thenable": "off",
     "unicorn/no-unnecessary-await": "warn",
     "unicorn/no-useless-fallback-in-spread": "warn",
     "unicorn/no-useless-length-check": "warn",
-    "unicorn/no-useless-spread": "off", // manually off bacause of existing warning. may turn it on in the future
+    "unicorn/no-useless-spread": "off",
     "unicorn/prefer-set-size": "warn",
-    "unicorn/prefer-string-starts-ends-with": "warn",
-    "use-isnan": "error",
-    "valid-typeof": "error"
+    "unicorn/prefer-string-starts-ends-with": "warn"
   },
   "settings": {
     "jsdoc": {

.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch

@@ -1,13 +0,0 @@
-diff --git a/dist/index.mjs b/dist/index.mjs
-index 69ab1599c76801dc1167551b6fa283dded123466..f0af43bba7ad1196fe05338817e65b4ebda40955 100644
---- a/dist/index.mjs
-+++ b/dist/index.mjs
-@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
- 
- // src/get-model-path.ts
- function getModelPath(modelId) {
--  return modelId.includes("/") ? modelId : `models/${modelId}`;
-+  return modelId?.includes("models/") ? modelId : `models/${modelId}`;
- }
- 
- // src/google-generative-ai-options.ts

.yarn/patches/@ai-sdk-google-npm-2.0.30-3b31632362.patch

@@ -0,0 +1,26 @@
+diff --git a/dist/index.js b/dist/index.js
+index cac044aab0255fa72f68b36ecd2c5b12d424c379..ad6ee8ecfc5cbc3ec43ba59a44eda21e8e4d353f 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -471,7 +471,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+ 
+ // src/get-model-path.ts
+ function getModelPath(modelId) {
+-  return modelId.includes("/") ? modelId : `models/${modelId}`;
++  return modelId.includes("models/") ? modelId : `models/${modelId}`;
+ }
+ 
+ // src/google-generative-ai-options.ts
+diff --git a/dist/index.mjs b/dist/index.mjs
+index 0793085005d7968638d355f2f1e127939d965165..1c8bf852baf025d56dc35a0691eb95967de7e5c8 100644
+--- a/dist/index.mjs
++++ b/dist/index.mjs
+@@ -477,7 +477,7 @@ function convertToGoogleGenerativeAIMessages(prompt, options) {
+ 
+ // src/get-model-path.ts
+ function getModelPath(modelId) {
+-  return modelId.includes("/") ? modelId : `models/${modelId}`;
++  return modelId.includes("models/") ? modelId : `models/${modelId}`;
+ }
+ 
+ // src/google-generative-ai-options.ts

.yarn/patches/@ai-sdk-openai-npm-2.0.64-48f99f5bf3.patch

@@ -0,0 +1,74 @@
+diff --git a/dist/index.js b/dist/index.js
+index 992c85ac6656e51c3471af741583533c5a7bf79f..83c05952a07aebb95fc6c62f9ddb8aa96b52ac0d 100644
+--- a/dist/index.js
++++ b/dist/index.js
+@@ -274,6 +274,7 @@ var openaiChatResponseSchema = (0, import_provider_utils3.lazyValidator)(
+           message: import_v42.z.object({
+             role: import_v42.z.literal("assistant").nullish(),
+             content: import_v42.z.string().nullish(),
++            reasoning_content: import_v42.z.string().nullish(),
+             tool_calls: import_v42.z.array(
+               import_v42.z.object({
+                 id: import_v42.z.string().nullish(),
+@@ -340,6 +341,7 @@ var openaiChatChunkSchema = (0, import_provider_utils3.lazyValidator)(
+             delta: import_v42.z.object({
+               role: import_v42.z.enum(["assistant"]).nullish(),
+               content: import_v42.z.string().nullish(),
++              reasoning_content: import_v42.z.string().nullish(),
+               tool_calls: import_v42.z.array(
+                 import_v42.z.object({
+                   index: import_v42.z.number(),
+@@ -785,6 +787,13 @@ var OpenAIChatLanguageModel = class {
+     if (text != null && text.length > 0) {
+       content.push({ type: "text", text });
+     }
++    const reasoning = choice.message.reasoning_content;
++    if (reasoning != null && reasoning.length > 0) {
++      content.push({
++        type: 'reasoning',
++        text: reasoning
++      });
++    }
+     for (const toolCall of (_a = choice.message.tool_calls) != null ? _a : []) {
+       content.push({
+         type: "tool-call",
+@@ -866,6 +875,7 @@ var OpenAIChatLanguageModel = class {
+     };
+     let metadataExtracted = false;
+     let isActiveText = false;
++    let isActiveReasoning = false;
+     const providerMetadata = { openai: {} };
+     return {
+       stream: response.pipeThrough(
+@@ -923,6 +933,21 @@ var OpenAIChatLanguageModel = class {
+               return;
+             }
+             const delta = choice.delta;
++            const reasoningContent = delta.reasoning_content;
++            if (reasoningContent) {
++              if (!isActiveReasoning) {
++                controller.enqueue({
++                  type: 'reasoning-start',
++                  id: 'reasoning-0',
++                });
++                isActiveReasoning = true;
++              }
++              controller.enqueue({
++                type: 'reasoning-delta',
++                id: 'reasoning-0',
++                delta: reasoningContent,
++              });
++            }
+             if (delta.content != null) {
+               if (!isActiveText) {
+                 controller.enqueue({ type: "text-start", id: "0" });
+@@ -1035,6 +1060,9 @@ var OpenAIChatLanguageModel = class {
+             }
+           },
+           flush(controller) {
++            if (isActiveReasoning) {
++              controller.enqueue({ type: 'reasoning-end', id: 'reasoning-0' });
++            }
+             if (isActiveText) {
+               controller.enqueue({ type: "text-end", id: "0" });
+             }

.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.25-08bbabb5d3.patch

@@ -1,24 +1,24 @@
 diff --git a/sdk.mjs b/sdk.mjs
-index 461e9a2ba246778261108a682762ffcf26f7224e..44bd667d9f591969d36a105ba5eb8b478c738dd8 100644
+index 10162e5b1624f8ce667768943347a6e41089ad2f..32568ae08946590e382270c88d85fba81187568e 100755
 --- a/sdk.mjs
 +++ b/sdk.mjs
-@@ -6215,7 +6215,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
+@@ -6213,7 +6213,7 @@ function createAbortController(maxListeners = DEFAULT_MAX_LISTENERS) {
  }
-
+ 
  // ../src/transport/ProcessTransport.ts
 -import { spawn } from "child_process";
 +import { fork } from "child_process";
  import { createInterface } from "readline";
-
+ 
  // ../src/utils/fsOperations.ts
-@@ -6473,14 +6473,11 @@ class ProcessTransport {
+@@ -6487,14 +6487,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 ? args : [...executableArgs, pathToClaudeCodeExecutable, ...args];
--      this.logForDebugging(isNative ? `Spawning Claude Code native binary: ${pathToClaudeCodeExecutable} ${args.join(" ")}` : `Spawning Claude Code process: ${executable} ${[...executableArgs, pathToClaudeCodeExecutable, ...args].join(" ")}`);
+-      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";
 -      this.child = spawn(spawnCommand, spawnArgs, {

.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch

@@ -1,71 +0,0 @@
-diff --git a/dist/utils/tiktoken.cjs b/dist/utils/tiktoken.cjs
-index 973b0d0e75aeaf8de579419af31b879b32975413..f23c7caa8b9dc8bd404132725346a4786f6b278b 100644
---- a/dist/utils/tiktoken.cjs
-+++ b/dist/utils/tiktoken.cjs
-@@ -1,25 +1,14 @@
- "use strict";
- Object.defineProperty(exports, "__esModule", { value: true });
- exports.encodingForModel = exports.getEncoding = void 0;
--const lite_1 = require("js-tiktoken/lite");
- const async_caller_js_1 = require("./async_caller.cjs");
- const cache = {};
- const caller = /* #__PURE__ */ new async_caller_js_1.AsyncCaller({});
- async function getEncoding(encoding) {
--    if (!(encoding in cache)) {
--        cache[encoding] = caller
--            .fetch(`https://tiktoken.pages.dev/js/${encoding}.json`)
--            .then((res) => res.json())
--            .then((data) => new lite_1.Tiktoken(data))
--            .catch((e) => {
--            delete cache[encoding];
--            throw e;
--        });
--    }
--    return await cache[encoding];
-+    throw new Error("TikToken Not implemented");
- }
- exports.getEncoding = getEncoding;
- async function encodingForModel(model) {
--    return getEncoding((0, lite_1.getEncodingNameForModel)(model));
-+    throw new Error("TikToken Not implemented");
- }
- exports.encodingForModel = encodingForModel;
-diff --git a/dist/utils/tiktoken.js b/dist/utils/tiktoken.js
-index 8e41ee6f00f2f9c7fa2c59fa2b2f4297634b97aa..aa5f314a6349ad0d1c5aea8631a56aad099176e0 100644
---- a/dist/utils/tiktoken.js
-+++ b/dist/utils/tiktoken.js
-@@ -1,20 +1,9 @@
--import { Tiktoken, getEncodingNameForModel, } from "js-tiktoken/lite";
- import { AsyncCaller } from "./async_caller.js";
- const cache = {};
- const caller = /* #__PURE__ */ new AsyncCaller({});
- export async function getEncoding(encoding) {
--    if (!(encoding in cache)) {
--        cache[encoding] = caller
--            .fetch(`https://tiktoken.pages.dev/js/${encoding}.json`)
--            .then((res) => res.json())
--            .then((data) => new Tiktoken(data))
--            .catch((e) => {
--            delete cache[encoding];
--            throw e;
--        });
--    }
--    return await cache[encoding];
-+    throw new Error("TikToken Not implemented");
- }
- export async function encodingForModel(model) {
--    return getEncoding(getEncodingNameForModel(model));
-+    throw new Error("TikToken Not implemented");
- }
-diff --git a/package.json b/package.json
-index 36072aecf700fca1bc49832a19be832eca726103..90b8922fba1c3d1b26f78477c891b07816d6238a 100644
---- a/package.json
-+++ b/package.json
-@@ -37,7 +37,6 @@
-     "ansi-styles": "^5.0.0",
-     "camelcase": "6",
-     "decamelize": "1.2.0",
--    "js-tiktoken": "^1.0.12",
-     "langsmith": ">=0.2.8 <0.4.0",
-     "mustache": "^4.2.0",
-     "p-queue": "^6.6.2",

.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch

@@ -0,0 +1,68 @@
+diff --git a/dist/utils/tiktoken.cjs b/dist/utils/tiktoken.cjs
+index c5b41f121d2e3d24c3a4969e31fa1acffdcad3b9..ec724489dcae79ee6c61acf2d4d84bd19daef036 100644
+--- a/dist/utils/tiktoken.cjs
++++ b/dist/utils/tiktoken.cjs
+@@ -1,6 +1,5 @@
+ const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+ const require_utils_async_caller = require('./async_caller.cjs');
+-const js_tiktoken_lite = require_rolldown_runtime.__toESM(require("js-tiktoken/lite"));
+ 
+ //#region src/utils/tiktoken.ts
+ var tiktoken_exports = {};
+@@ -11,14 +10,10 @@ require_rolldown_runtime.__export(tiktoken_exports, {
+ const cache = {};
+ const caller = /* @__PURE__ */ new require_utils_async_caller.AsyncCaller({});
+ async function getEncoding(encoding) {
+-	if (!(encoding in cache)) cache[encoding] = caller.fetch(`https://tiktoken.pages.dev/js/${encoding}.json`).then((res) => res.json()).then((data) => new js_tiktoken_lite.Tiktoken(data)).catch((e) => {
+-		delete cache[encoding];
+-		throw e;
+-	});
+-	return await cache[encoding];
++	throw new Error("TikToken Not implemented");
+ }
+ async function encodingForModel(model) {
+-	return getEncoding((0, js_tiktoken_lite.getEncodingNameForModel)(model));
++	throw new Error("TikToken Not implemented");
+ }
+ 
+ //#endregion
+diff --git a/dist/utils/tiktoken.js b/dist/utils/tiktoken.js
+index 641acca03cb92f04a6fa5c9c31f1880ce635572e..707389970ad957aa0ff20ef37fa8dd2875be737c 100644
+--- a/dist/utils/tiktoken.js
++++ b/dist/utils/tiktoken.js
+@@ -1,6 +1,5 @@
+ import { __export } from "../_virtual/rolldown_runtime.js";
+ import { AsyncCaller } from "./async_caller.js";
+-import { Tiktoken, getEncodingNameForModel } from "js-tiktoken/lite";
+ 
+ //#region src/utils/tiktoken.ts
+ var tiktoken_exports = {};
+@@ -11,14 +10,10 @@ __export(tiktoken_exports, {
+ const cache = {};
+ const caller = /* @__PURE__ */ new AsyncCaller({});
+ async function getEncoding(encoding) {
+-	if (!(encoding in cache)) cache[encoding] = caller.fetch(`https://tiktoken.pages.dev/js/${encoding}.json`).then((res) => res.json()).then((data) => new Tiktoken(data)).catch((e) => {
+-		delete cache[encoding];
+-		throw e;
+-	});
+-	return await cache[encoding];
++	throw new Error("TikToken Not implemented");
+ }
+ async function encodingForModel(model) {
+-	return getEncoding(getEncodingNameForModel(model));
++	throw new Error("TikToken Not implemented");
+ }
+ 
+ //#endregion
+diff --git a/package.json b/package.json
+index a24f8fc61de58526051999260f2ebee5f136354b..e885359e8966e7730c51772533ce37e01edb3046 100644
+--- a/package.json
++++ b/package.json
+@@ -20,7 +20,6 @@
+     "ansi-styles": "^5.0.0",
+     "camelcase": "6",
+     "decamelize": "1.2.0",
+-    "js-tiktoken": "^1.0.12",
+     "langsmith": "^0.3.64",
+     "mustache": "^4.2.0",
+     "p-queue": "^6.6.2",

.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch

@@ -1,19 +0,0 @@
-diff --git a/dist/embeddings.js b/dist/embeddings.js
-index 1f8154be3e9c22442a915eb4b85fa6d2a21b0d0c..dc13ef4a30e6c282824a5357bcee9bd0ae222aab 100644
---- a/dist/embeddings.js
-+++ b/dist/embeddings.js
-@@ -214,10 +214,12 @@ export class OpenAIEmbeddings extends Embeddings {
-      * @returns Promise that resolves to an embedding for the document.
-      */
-     async embedQuery(text) {
-+        const isBaiduCloud = this.clientConfig.baseURL.includes('baidubce.com')
-+        const input = this.stripNewLines ? text.replace(/\n/g, ' ') : text
-         const params = {
-             model: this.model,
--            input: this.stripNewLines ? text.replace(/\n/g, " ") : text,
--        };
-+            input: isBaiduCloud ? [input] : input
-+        }
-         if (this.dimensions) {
-             params.dimensions = this.dimensions;
-         }

.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch

@@ -0,0 +1,17 @@
+diff --git a/dist/embeddings.js b/dist/embeddings.js
+index 6f4b928d3e4717309382e1b5c2e31ab5bc6c5af0..bc79429c88a6d27d4997a2740c4d8ae0707f5991 100644
+--- a/dist/embeddings.js
++++ b/dist/embeddings.js
+@@ -94,9 +94,11 @@ var OpenAIEmbeddings = class extends Embeddings {
+ 	* @returns Promise that resolves to an embedding for the document.
+ 	*/
+ 	async embedQuery(text) {
++		const isBaiduCloud = this.clientConfig.baseURL.includes('baidubce.com');
++		const input = this.stripNewLines ? text.replace(/\n/g, " ") : text
+ 		const params = {
+ 			model: this.model,
+-			input: this.stripNewLines ? text.replace(/\n/g, " ") : text
++			input: isBaiduCloud ? [input] : input
+ 		};
+ 		if (this.dimensions) params.dimensions = this.dimensions;
+ 		if (this.encodingFormat) params.encoding_format = this.encodingFormat;

CLAUDE.md

@@ -7,11 +7,10 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Keep it clear**: Write code that is easy to read, maintain, and explain.
 - **Match the house style**: Reuse existing patterns, naming, and conventions.
 - **Search smart**: Prefer `ast-grep` for semantic queries; fall back to `rg`/`grep` when needed.
-- **Build with HeroUI**: Use HeroUI for every new UI component; never add `antd` or `styled-components`.
 - **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.
-- **Seek review**: Ask a human developer to review substantial changes before merging.
-- **Commit in rhythm**: Keep commits small, conventional, and emoji-tagged.
+- **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.
+- **Write conventional commits**: Commit small, focused changes using Conventional Commit messages (e.g., `feat:`, `fix:`, `refactor:`, `docs:`).
 
 ## Development Commands
 
@@ -40,7 +39,6 @@ This file provides guidance to AI coding assistants when working with code in th
 - **Services** (`src/main/services/`): MCPService, KnowledgeService, WindowService, etc.
 - **Build System**: Electron-Vite with experimental rolldown-vite, yarn workspaces.
 - **State Management**: Redux Toolkit (`src/renderer/src/store/`) for predictable state.
-- **UI Components**: HeroUI (`@heroui/*`) for all new UI elements.
 
 ### Logging
 ```typescript

CONTRIBUTING.md

@@ -77,7 +77,7 @@ Please review the following critical information before submitting your Pull Req
 Our core team is currently focused on significant architectural updates that involve these data structures. To ensure stability and focus during this period, contributions of this nature will be temporarily managed internally.
 
 *   **PRs that require changes to Redux state shape or IndexedDB schemas will be closed.**
-*   **This restriction is temporary and will be lifted with the release of `v2.0.0`.** You can track the progress of `v2.0.0` and its related discussions on issue [#10162](https://github.com/YOUR_ORG/YOUR_REPO/issues/10162) (please replace with your actual repo link).
+*   **This restriction is temporary and will be lifted with the release of `v2.0.0`.** You can track the progress of `v2.0.0` and its related discussions on issue [#10162](https://github.com/CherryHQ/cherry-studio/pull/10162).
 
 We highly encourage contributions for:
 *   Bug fixes 🐞

README.md

@@ -82,7 +82,7 @@ Cherry Studio is a desktop client that supports multiple LLM providers, availabl
 1. **Diverse LLM Provider Support**:
 
 - ☁️ Major LLM Cloud Services: OpenAI, Gemini, Anthropic, and more
-- 🔗 AI Web Service Integration: Claude, Perplexity, Poe, and others
+- 🔗 AI Web Service Integration: Claude, Perplexity, [Poe](https://poe.com/), and others
 - 💻 Local Model Support with Ollama, LM Studio
 
 2. **AI Assistants & Conversations**:
@@ -238,10 +238,6 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 
 ## ✨ Online Demo
 
-> 🚧 **Public Beta Notice**
->
-> The Enterprise Edition is currently in its early public beta stage, and we are actively iterating and optimizing its features. We are aware that it may not be perfectly stable yet. If you encounter any issues or have valuable suggestions during your trial, we would be very grateful if you could contact us via email to provide feedback.
-
 **🔗 [Cherry Studio Enterprise](https://www.cherry-ai.com/enterprise)**
 
 ## Version Comparison
@@ -249,7 +245,7 @@ The Enterprise Edition addresses core challenges in team collaboration by centra
 | Feature           | Community Edition                          | Enterprise Edition                                                                                                                      |
 | :---------------- | :----------------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- |
 | **Open Source**   | ✅ Yes                                      | ⭕️ Partially released to customers                                                                                                       |
-| **Cost**          | Free for Personal Use / Commercial License | Buyout / Subscription Fee                                                                                                               |
+| **Cost**          | [AGPL-3.0 License](https://github.com/CherryHQ/cherry-studio?tab=AGPL-3.0-1-ov-file) | Buyout / Subscription Fee                                                                                                               |
 | **Admin Backend** | —                                          | ● Centralized **Model** Access<br>● **Employee** Management<br>● Shared **Knowledge Base**<br>● **Access** Control<br>● **Data** Backup |
 | **Server**        | —                                          | ✅ Dedicated Private Deployment                                                                                                          |
 
@@ -262,8 +258,12 @@ We believe the Enterprise Edition will become your team's AI productivity engine
 
 # 🔗 Related Projects
 
+- [new-api](https://github.com/QuantumNous/new-api): The next-generation LLM gateway and AI asset management system supports multiple languages.
+
 - [one-api](https://github.com/songquanpeng/one-api): LLM API management and distribution system supporting mainstream models like OpenAI, Azure, and Anthropic. Features a unified API interface, suitable for key management and secondary distribution.
 
+- [Poe](https://poe.com/): Poe gives you access to the best AI, all in one place. Explore GPT-5, Claude Opus 4.1, DeepSeek-R1, Veo 3, ElevenLabs, and millions of others.
+
 - [ublacklist](https://github.com/iorate/ublacklist): Blocks specific sites from appearing in Google search results
 
 # 🚀 Contributors

biome.jsonc

@@ -21,7 +21,11 @@
       "quoteStyle": "single"
     }
   },
-  "files": { "ignoreUnknown": false },
+  "files": {
+    "ignoreUnknown": false,
+    "includes": ["**", "!**/.claude/**"],
+    "maxSize": 2097152
+  },
   "formatter": {
     "attributePosition": "auto",
     "bracketSameLine": false,

components.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "aliases": {
-    "components": "@renderer/ui/third-party",
-    "hooks": "@renderer/hooks",
-    "lib": "@renderer/lib",
-    "ui": "@renderer/ui",
-    "utils": "@renderer/utils"
-  },
-  "iconLibrary": "lucide",
-  "rsc": false,
-  "style": "new-york",
-  "tailwind": {
-    "baseColor": "zinc",
-    "config": "",
-    "css": "src/renderer/src/assets/styles/tailwind.css",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "tsx": true
-}

docs/CONTRIBUTING.zh.md

@@ -81,7 +81,7 @@ git commit --signoff -m "Your commit message"
 我们的核心团队目前正专注于涉及这些数据结构的关键架构更新和基础工作。为确保在此期间的稳定性与专注，此类贡献将暂时由内部进行管理。
 
 *   **需要更改 Redux 状态结构或 IndexedDB schema 的 PR 将会被关闭。**
-*   **此限制是临时性的，并将在 `v2.0.0` 版本发布后解除。** 您可以通过 Issue [#10162](https://github.com/YOUR_ORG/YOUR_REPO/issues/10162) (请替换为您的实际仓库链接) 跟踪 `v2.0.0` 的进展及相关讨论。
+*   **此限制是临时性的，并将在 `v2.0.0` 版本发布后解除。** 您可以通过 Issue [#10162](https://github.com/CherryHQ/cherry-studio/pull/10162) 跟踪 `v2.0.0` 的进展及相关讨论。
 
 我们非常鼓励以下类型的贡献：
 *   错误修复 🐞

docs/dev.md

@@ -18,13 +18,13 @@ yarn
 
 ### Setup Node.js
 
-Download and install [Node.js v20.x.x](https://nodejs.org/en/download)
+Download and install [Node.js v22.x.x](https://nodejs.org/en/download)
 
 ### Setup Yarn
 
 ```bash
 corepack enable
-corepack prepare yarn@4.6.0 --activate
+corepack prepare yarn@4.9.1 --activate
 ```
 
 ### Install Dependencies

docs/testplan-en.md

@@ -11,6 +11,8 @@ The Test Plan is divided into the RC channel and the Beta channel, with the foll
 
 Users can enable the "Test Plan" and select the version channel in the software's `Settings` > `About`. Please note that the versions in the "Test Plan" cannot guarantee data consistency, so be sure to back up your data before using them.
 
+After enabling the RC channel or Beta channel, if a stable version is released, users will still be upgraded to the stable version.
+
 Users are welcome to submit issues or provide feedback through other channels for any bugs encountered during testing. Your feedback is very important to us.
 
 ## Developer Guide

docs/testplan-zh.md

@@ -11,6 +11,8 @@
 
 用户可以在软件的`设置`-`关于`中，开启“测试计划”并选择版本通道。请注意“测试计划”的版本无法保证数据的一致性，请使用前一定要备份数据。
 
+用户选择RC版通道或Beta版通道后，若发布了正式版，仍旧会升级到正式版。
+
 用户在测试过程中发现的BUG，欢迎提交issue或通过其他渠道反馈。用户的反馈对我们非常重要。
 
 ## 开发者指南

electron-builder.yml

@@ -21,6 +21,8 @@ files:
   - "**/*"
   - "!**/{.vscode,.yarn,.yarn-lock,.github,.cursorrules,.prettierrc}"
   - "!electron.vite.config.{js,ts,mjs,cjs}}"
+  - "!.*"
+  - "!components.json"
   - "!**/{.eslintignore,.eslintrc.js,.eslintrc.json,.eslintcache,root.eslint.config.js,eslint.config.js,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,eslint.config.mjs,dev-app-update.yml,CHANGELOG.md,README.md,biome.jsonc}"
   - "!**/{.env,.env.*,.npmrc,pnpm-lock.yaml}"
   - "!**/{tsconfig.json,tsconfig.tsbuildinfo,tsconfig.node.json,tsconfig.web.json}"
@@ -64,6 +66,12 @@ asarUnpack:
   - resources/**
   - "**/*.{metal,exp,lib}"
   - "node_modules/@img/sharp-libvips-*/**"
+
+# copy from node_modules/claude-code-plugins/plugins to resources/data/claude-code-pluginso
+extraResources:
+  - from: "./node_modules/claude-code-plugins/plugins/"
+    to: "claude-code-plugins"
+
 win:
   executableName: Cherry Studio
   artifactName: ${productName}-${version}-${arch}-setup.${ext}
@@ -127,60 +135,50 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    What's New in v1.7.0-beta.2
+    What's New in v1.7.0-beta.5
 
     New Features:
-    - Session Settings: Manage session-specific settings and model configurations independently
-    - Notes Full-Text Search: Search across all notes with match highlighting
-    - Built-in DiDi MCP Server: Integration with DiDi ride-hailing services (China only)
-    - Intel OV OCR: Hardware-accelerated OCR using Intel NPU
-    - Auto-start API Server: Automatically starts when agents exist
+    - MCPRouter Provider: Added MCPRouter provider integration with token management and server synchronization
+    - MCP Marketplace: Enhanced MCP server discovery and management with multi-provider marketplace support
+    - Agent Permission Mode Display: Visual permission mode cards in empty session states
+    - Assistant Subscription Settings: Added subscription URL management in assistant presets
 
     Improvements:
-    - Agent model selection now requires explicit user choice
-    - Added Mistral AI provider support
-    - Added NewAPI generic provider support
-    - Improved navbar layout consistency across different modes
-    - Enhanced chat component responsiveness
-    - Better code block display on small screens
-    - Updated OVMS to 2025.3 official release
-    - Added Greek language support
+    - UI Optimization: Sidebar tooltip placement improved on macOS to avoid overlapping window controls
+    - MCP Server Logos: Display server logos in Agent settings tooling section
+    - Long Command Handling: Bash command tags now auto-truncate (hover to view full command for commands over 100 chars)
+    - MCP OAuth Callback: Fixed callback page hanging and added multilingual support (10 languages)
+    - Error Display: Improved error block display order for better readability
+    - Plugin Browser: Centered tab alignment for better visual consistency
 
     Bug Fixes:
-    - Fixed GitHub Copilot gpt-5-codex streaming issues
-    - Fixed assistant creation failures
-    - Fixed translate auto-copy functionality
-    - Fixed miniapps external link opening
-    - Fixed message layout and overflow issues
-    - Fixed API key parsing to preserve spaces
-    - Fixed agent display in different navbar layouts
+    - Fixed Agent sessions not inheriting allowed_tools configuration
+    - Fixed Gemini endpoint thinking budget spelling error
+    - Fixed MCP card description text overflow
+    - Fixed unnecessary message timestamp updates on UI-only state changes
+    - Updated dependencies: Bun to 1.3.1, uv to 0.9.5
 
     <!--LANG:zh-CN-->
-    v1.7.0-beta.2 新特性
+    v1.7.0-beta.5 新特性
 
     新功能:
-    - 会话设置：独立管理会话特定的设置和模型配置
-    - 笔记全文搜索：跨所有笔记搜索并高亮匹配内容
-    - 内置滴滴 MCP 服务器：集成滴滴打车服务(仅限中国地区)
-    - Intel OV OCR：使用 Intel NPU 的硬件加速 OCR
-    - 自动启动 API 服务器：当存在 Agent 时自动启动
+    - MCPRouter 提供商：新增 MCPRouter 提供商集成，支持 token 管理和服务器同步
+    - MCP 市场：增强 MCP 服务器发现和管理功能，支持多提供商市场
+    - Agent 权限模式展示：空会话状态显示可视化权限模式卡片
+    - 助手订阅设置：在助手预设中添加订阅 URL 管理功能
 
     改进:
-    - Agent 模型选择现在需要用户显式选择
-    - 添加 Mistral AI 提供商支持
-    - 添加 NewAPI 通用提供商支持
-    - 改进不同模式下的导航栏布局一致性
-    - 增强聊天组件响应式设计
-    - 优化小屏幕代码块显示
-    - 更新 OVMS 至 2025.3 正式版
-    - 添加希腊语支持
+    - UI 优化：macOS 上侧边栏工具提示位置优化，避免与窗口控制按钮重叠
+    - MCP 服务器标志：在 Agent 设置工具部分显示服务器 logo
+    - 长命令处理：Bash 命令标签自动截断（超过 100 字符时悬停查看完整内容）
+    - MCP OAuth 回调：修复回调页面挂起问题并添加多语言支持（10 种语言）
+    - 错误信息展示：改进错误块显示顺序，提高可读性
+    - 插件浏览器：标签页居中对齐，视觉效果更统一
 
     问题修复:
-    - 修复 GitHub Copilot gpt-5-codex 流式传输问题
-    - 修复助手创建失败
-    - 修复翻译自动复制功能
-    - 修复小程序外部链接打开
-    - 修复消息布局和溢出问题
-    - 修复 API 密钥解析以保留空格
-    - 修复不同导航栏布局中的 Agent 显示
+    - 修复 Agent 会话未继承 allowed_tools 配置
+    - 修复 Gemini 端点 thinking budget 拼写错误
+    - 修复 MCP 卡片描述文本溢出问题
+    - 修复仅 UI 状态变化时消息时间戳不必要的更新
+    - 依赖更新：Bun 升级到 1.3.1，uv 升级到 0.9.5
     <!--LANG:END-->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.0-beta.2",
+  "version": "1.7.0-beta.3",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -78,20 +78,25 @@
     "release:aicore": "yarn workspace @cherrystudio/ai-core version patch --immediate && yarn workspace @cherrystudio/ai-core npm publish --access public"
   },
   "dependencies": {
-    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.1#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.1-d937b73fed.patch",
+    "@anthropic-ai/claude-agent-sdk": "patch:@anthropic-ai/claude-agent-sdk@npm%3A0.1.25#~/.yarn/patches/@anthropic-ai-claude-agent-sdk-npm-0.1.25-08bbabb5d3.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",
     "express": "^5.1.0",
     "font-list": "^2.0.0",
     "graceful-fs": "^4.2.11",
+    "gray-matter": "^4.0.3",
+    "js-yaml": "^4.1.0",
     "jsdom": "26.1.0",
     "node-stream-zip": "^1.15.0",
     "officeparser": "^4.2.0",
     "os-proxy-config": "^1.1.2",
+    "qrcode.react": "^4.2.0",
     "selection-hook": "^1.0.12",
     "sharp": "^0.34.3",
+    "socket.io": "^4.8.1",
     "swagger-jsdoc": "^6.2.8",
     "swagger-ui-express": "^5.0.1",
     "tesseract.js": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
@@ -101,17 +106,17 @@
     "@agentic/exa": "^7.3.3",
     "@agentic/searxng": "^7.3.3",
     "@agentic/tavily": "^7.3.3",
-    "@ai-sdk/amazon-bedrock": "^3.0.35",
-    "@ai-sdk/google-vertex": "^3.0.40",
-    "@ai-sdk/huggingface": "patch:@ai-sdk/huggingface@npm%3A0.0.4#~/.yarn/patches/@ai-sdk-huggingface-npm-0.0.4-8080836bc1.patch",
-    "@ai-sdk/mistral": "^2.0.19",
-    "@ai-sdk/perplexity": "^2.0.13",
+    "@ai-sdk/amazon-bedrock": "^3.0.53",
+    "@ai-sdk/google-vertex": "^3.0.61",
+    "@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",
     "@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",
-    "@aws-sdk/client-bedrock": "^3.840.0",
-    "@aws-sdk/client-bedrock-runtime": "^3.840.0",
-    "@aws-sdk/client-s3": "^3.840.0",
+    "@aws-sdk/client-bedrock": "^3.910.0",
+    "@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/embedjs": "^0.1.31",
@@ -142,9 +147,10 @@
     "@eslint/js": "^9.22.0",
     "@google/genai": "patch:@google/genai@npm%3A1.0.1#~/.yarn/patches/@google-genai-npm-1.0.1-e26f0f9af7.patch",
     "@hello-pangea/dnd": "^18.0.1",
-    "@heroui/react": "^2.8.3",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@langchain/community": "^0.3.50",
+    "@langchain/community": "^1.0.0",
+    "@langchain/core": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
+    "@langchain/openai": "patch:@langchain/openai@npm%3A1.0.0#~/.yarn/patches/@langchain-openai-npm-1.0.0-474d0ad9d4.patch",
     "@mistralai/mistralai": "^1.7.5",
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@mozilla/readability": "^0.6.0",
@@ -195,6 +201,7 @@
     "@types/fs-extra": "^11",
     "@types/he": "^1",
     "@types/html-to-text": "^9",
+    "@types/js-yaml": "^4.0.9",
     "@types/lodash": "^4.17.5",
     "@types/markdown-it": "^14",
     "@types/md5": "^2.3.5",
@@ -224,7 +231,7 @@
     "@viz-js/lang-dot": "^1.0.5",
     "@viz-js/viz": "^3.14.0",
     "@xyflow/react": "^12.4.4",
-    "ai": "^5.0.68",
+    "ai": "^5.0.90",
     "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",
@@ -234,6 +241,7 @@
     "check-disk-space": "3.4.0",
     "cheerio": "^1.1.2",
     "chokidar": "^4.0.3",
+    "claude-code-plugins": "1.0.3",
     "cli-progress": "^3.12.0",
     "clsx": "^2.1.1",
     "code-inspector-plugin": "^0.20.14",
@@ -340,6 +348,7 @@
     "striptags": "^3.2.0",
     "styled-components": "^6.1.11",
     "swr": "^2.3.6",
+    "tailwind-merge": "^3.3.1",
     "tailwindcss": "^4.1.13",
     "tar": "^7.4.3",
     "tiny-pinyin": "^1.3.2",
@@ -365,12 +374,11 @@
     "zod": "^4.1.5"
   },
   "resolutions": {
+    "@smithy/types": "4.7.1",
     "@codemirror/language": "6.11.3",
     "@codemirror/lint": "6.8.5",
     "@codemirror/view": "6.38.1",
-    "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A0.3.44#~/.yarn/patches/@langchain-core-npm-0.3.44-41d5c3cb0a.patch",
-    "@langchain/openai@npm:^0.3.16": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
-    "@langchain/openai@npm:>=0.1.0 <0.4.0": "patch:@langchain/openai@npm%3A0.3.16#~/.yarn/patches/@langchain-openai-npm-0.3.16-e525b59526.patch",
+    "@langchain/core@npm:^0.3.26": "patch:@langchain/core@npm%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
     "app-builder-lib@npm:26.0.13": "patch:app-builder-lib@npm%3A26.0.13#~/.yarn/patches/app-builder-lib-npm-26.0.13-a064c9e1d0.patch",
     "app-builder-lib@npm:26.0.15": "patch:app-builder-lib@npm%3A26.0.15#~/.yarn/patches/app-builder-lib-npm-26.0.15-360e5b0476.patch",
     "atomically@npm:^1.7.0": "patch:atomically@npm%3A1.7.0#~/.yarn/patches/atomically-npm-1.7.0-e742e5293b.patch",
@@ -386,14 +394,21 @@
     "undici": "6.21.2",
     "vite": "npm:rolldown-vite@7.1.5",
     "tesseract.js@npm:*": "patch:tesseract.js@npm%3A6.0.1#~/.yarn/patches/tesseract.js-npm-6.0.1-2562a7e46d.patch",
-    "@ai-sdk/google@npm:2.0.20": "patch:@ai-sdk/google@npm%3A2.0.20#~/.yarn/patches/@ai-sdk-google-npm-2.0.20-b9102f9d54.patch",
+    "@ai-sdk/google@npm:2.0.23": "patch:@ai-sdk/google@npm%3A2.0.23#~/.yarn/patches/@ai-sdk-google-npm-2.0.23-81682e07b0.patch",
+    "@ai-sdk/openai@npm:^2.0.52": "patch:@ai-sdk/openai@npm%3A2.0.52#~/.yarn/patches/@ai-sdk-openai-npm-2.0.52-b36d949c76.patch",
     "@img/sharp-darwin-arm64": "0.34.3",
     "@img/sharp-darwin-x64": "0.34.3",
     "@img/sharp-linux-arm": "0.34.3",
     "@img/sharp-linux-arm64": "0.34.3",
     "@img/sharp-linux-x64": "0.34.3",
     "@img/sharp-win32-x64": "0.34.3",
-    "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0"
+    "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0",
+    "@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/google@npm:2.0.30": "patch:@ai-sdk/google@npm%3A2.0.30#~/.yarn/patches/@ai-sdk-google-npm-2.0.30-3b31632362.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"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

packages/aiCore/package.json

@@ -36,14 +36,14 @@
     "ai": "^5.0.26"
   },
   "dependencies": {
-    "@ai-sdk/anthropic": "^2.0.27",
-    "@ai-sdk/azure": "^2.0.49",
-    "@ai-sdk/deepseek": "^1.0.23",
-    "@ai-sdk/openai": "^2.0.48",
-    "@ai-sdk/openai-compatible": "^1.0.22",
+    "@ai-sdk/anthropic": "^2.0.43",
+    "@ai-sdk/azure": "^2.0.66",
+    "@ai-sdk/deepseek": "^1.0.27",
+    "@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/provider": "^2.0.0",
-    "@ai-sdk/provider-utils": "^3.0.12",
-    "@ai-sdk/xai": "^2.0.26",
+    "@ai-sdk/provider-utils": "^3.0.16",
+    "@ai-sdk/xai": "^2.0.31",
     "zod": "^4.1.5"
   },
   "devDependencies": {

packages/aiCore/src/core/middleware/manager.ts

@@ -2,7 +2,7 @@
  * 中间件管理器
  * 专注于 AI SDK 中间件的管理，与插件系统分离
  */
-import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 /**
  * 创建中间件列表

packages/aiCore/src/core/middleware/types.ts

@@ -1,7 +1,7 @@
 /**
  * 中间件系统类型定义
  */
-import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 /**
  * 具名中间件接口

packages/aiCore/src/core/middleware/wrapper.ts

@@ -2,7 +2,7 @@
  * 模型包装工具函数
  * 用于将中间件应用到LanguageModel上
  */
-import { LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
 import { wrapLanguageModel } from 'ai'
 
 /**

packages/aiCore/src/core/models/ModelResolver.ts

@@ -5,7 +5,7 @@
  * 集成了来自 ModelCreator 的特殊处理逻辑
  */
 
-import { EmbeddingModelV2, ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { EmbeddingModelV2, ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 import { wrapModelWithMiddlewares } from '../middleware/wrapper'
 import { DEFAULT_SEPARATOR, globalRegistryManagement } from '../providers/RegistryManagement'

packages/aiCore/src/core/models/types.ts

@@ -1,7 +1,7 @@
 /**
  * Creation 模块类型定义
  */
-import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 import type { ProviderId, ProviderSettingsMap } from '../providers/types'
 

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

@@ -1,4 +1,4 @@
-import { ExtractProviderOptions, ProviderOptionsMap, TypedProviderOptions } from './types'
+import type { ExtractProviderOptions, ProviderOptionsMap, TypedProviderOptions } from './types'
 
 /**
  * 创建特定供应商的选项

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/promptToolUsePlugin.ts

@@ -10,7 +10,7 @@ import type { AiRequestContext } from '../../types'
 import { StreamEventManager } from './StreamEventManager'
 import { type TagConfig, TagExtractor } from './tagExtraction'
 import { ToolExecutor } from './ToolExecutor'
-import { PromptToolUseConfig, ToolUseResult } from './type'
+import type { PromptToolUseConfig, ToolUseResult } from './type'
 
 /**
  * 工具使用标签配置

packages/aiCore/src/core/plugins/built-in/toolUsePlugin/type.ts

@@ -1,6 +1,6 @@
-import { ToolSet } from 'ai'
+import type { ToolSet } from 'ai'
 
-import { AiRequestContext } from '../..'
+import type { AiRequestContext } from '../..'
 
 /**
  * 解析结果类型

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

@@ -1,10 +1,11 @@
-import { anthropic } from '@ai-sdk/anthropic'
-import { google } from '@ai-sdk/google'
-import { openai } from '@ai-sdk/openai'
-import { InferToolInput, InferToolOutput, type Tool } from 'ai'
+import type { anthropic } from '@ai-sdk/anthropic'
+import type { google } from '@ai-sdk/google'
+import type { openai } from '@ai-sdk/openai'
+import type { InferToolInput, InferToolOutput } from 'ai'
+import { type Tool } from 'ai'
 
-import { ProviderOptionsMap } from '../../../options/types'
-import { OpenRouterSearchConfig } from './openrouter'
+import type { ProviderOptionsMap } from '../../../options/types'
+import type { OpenRouterSearchConfig } from './openrouter'
 
 /**
  * 从 AI SDK 的工具函数中提取参数类型，以确保类型安全。

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

@@ -9,7 +9,8 @@ import { openai } from '@ai-sdk/openai'
 import { createOpenRouterOptions, createXaiOptions, mergeProviderOptions } from '../../../options'
 import { definePlugin } from '../../'
 import type { AiRequestContext } from '../../types'
-import { DEFAULT_WEB_SEARCH_CONFIG, WebSearchPluginConfig } from './helper'
+import type { WebSearchPluginConfig } from './helper'
+import { DEFAULT_WEB_SEARCH_CONFIG } from './helper'
 
 /**
  * 网络搜索插件

packages/aiCore/src/core/plugins/manager.ts

@@ -1,4 +1,4 @@
-import { AiPlugin, AiRequestContext } from './types'
+import type { AiPlugin, AiRequestContext } from './types'
 
 /**
  * 插件管理器

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

@@ -5,7 +5,7 @@
  * 例如: aihubmix:anthropic:claude-3.5-sonnet
  */
 
-import { ProviderV2 } from '@ai-sdk/provider'
+import type { ProviderV2 } from '@ai-sdk/provider'
 import { customProvider } from 'ai'
 
 import { globalRegistryManagement } from './RegistryManagement'

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

@@ -4,7 +4,7 @@
  * 基于 AI SDK 原生的 createProviderRegistry
  */
 
-import { EmbeddingModelV2, ImageModelV2, LanguageModelV2, ProviderV2 } from '@ai-sdk/provider'
+import type { EmbeddingModelV2, ImageModelV2, LanguageModelV2, ProviderV2 } from '@ai-sdk/provider'
 import { createProviderRegistry, type ProviderRegistryProvider } from 'ai'
 
 type PROVIDERS = Record<string, ProviderV2>

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

@@ -10,10 +10,11 @@ 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 { LanguageModelV2 } from '@ai-sdk/provider'
+import type { LanguageModelV2 } from '@ai-sdk/provider'
 import { createXai } from '@ai-sdk/xai'
 import { createOpenRouter } from '@openrouter/ai-sdk-provider'
-import { customProvider, Provider } from 'ai'
+import type { Provider } from 'ai'
+import { customProvider } from 'ai'
 import * as z from 'zod'
 
 /**

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

@@ -4,7 +4,7 @@ import { type DeepSeekProviderSettings } from '@ai-sdk/deepseek'
 import { type GoogleGenerativeAIProviderSettings } from '@ai-sdk/google'
 import { type OpenAIProviderSettings } from '@ai-sdk/openai'
 import { type OpenAICompatibleProviderSettings } from '@ai-sdk/openai-compatible'
-import {
+import type {
   EmbeddingModelV2 as EmbeddingModel,
   ImageModelV2 as ImageModel,
   LanguageModelV2 as LanguageModel,

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

@@ -1,4 +1,4 @@
-import { ImageModelV2 } from '@ai-sdk/provider'
+import type { ImageModelV2 } from '@ai-sdk/provider'
 import { experimental_generateImage as aiGenerateImage, NoImageGeneratedError } from 'ai'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 

packages/aiCore/src/core/runtime/executor.ts

@@ -2,12 +2,12 @@
  * 运行时执行器
  * 专注于插件化的AI调用处理
  */
-import { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModel } from 'ai'
 import {
   experimental_generateImage as _generateImage,
   generateObject as _generateObject,
   generateText as _generateText,
-  LanguageModel,
   streamObject as _streamObject,
   streamText as _streamText
 } from 'ai'

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

@@ -11,7 +11,7 @@ export type { RuntimeConfig } from './types'
 
 // === 便捷工厂函数 ===
 
-import { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import type { LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 import { type AiPlugin } from '../plugins'
 import { type ProviderId, type ProviderSettingsMap } from '../providers/types'

packages/aiCore/src/core/runtime/pluginEngine.ts

@@ -1,6 +1,13 @@
 /* eslint-disable @eslint-react/naming-convention/context-name */
-import { ImageModelV2 } from '@ai-sdk/provider'
-import { experimental_generateImage, generateObject, generateText, LanguageModel, streamObject, streamText } from 'ai'
+import type { ImageModelV2 } from '@ai-sdk/provider'
+import type {
+  experimental_generateImage,
+  generateObject,
+  generateText,
+  LanguageModel,
+  streamObject,
+  streamText
+} from 'ai'
 
 import { type AiPlugin, createContext, PluginManager } from '../plugins'
 import { type ProviderId } from '../providers/types'

packages/aiCore/src/core/runtime/types.ts

@@ -1,8 +1,8 @@
 /**
  * Runtime 层类型定义
  */
-import { ImageModelV2 } from '@ai-sdk/provider'
-import { experimental_generateImage, generateObject, generateText, streamObject, streamText } from 'ai'
+import type { ImageModelV2 } from '@ai-sdk/provider'
+import type { experimental_generateImage, generateObject, generateText, streamObject, streamText } from 'ai'
 
 import { type ModelConfig } from '../models/types'
 import { type AiPlugin } from '../plugins'

packages/extension-table-plus/src/kit/index.ts

@@ -1,4 +1,5 @@
-import { Extension, Node } from '@tiptap/core'
+import type { Node } from '@tiptap/core'
+import { Extension } from '@tiptap/core'
 
 import type { TableCellOptions } from '../cell/index.js'
 import { TableCell } from '../cell/index.js'

packages/mcp-trace/trace-core/core/spanConvert.ts

@@ -1,7 +1,7 @@
 import { SpanKind, SpanStatusCode } from '@opentelemetry/api'
-import { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
 
-import { SpanEntity } from '../types/config'
+import type { SpanEntity } from '../types/config'
 
 /**
  * convert ReadableSpan to SpanEntity

packages/mcp-trace/trace-core/core/traceCache.ts

@@ -1,4 +1,4 @@
-import { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
 
 export interface TraceCache {
   createSpan: (span: ReadableSpan) => void

packages/mcp-trace/trace-core/exporters/FuncSpanExporter.ts

@@ -1,5 +1,6 @@
-import { ExportResult, ExportResultCode } from '@opentelemetry/core'
-import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import type { ExportResult } from '@opentelemetry/core'
+import { ExportResultCode } from '@opentelemetry/core'
+import type { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-base'
 
 export type SaveFunction = (spans: ReadableSpan[]) => Promise<void>
 

packages/mcp-trace/trace-core/processors/CacheSpanProcessor.ts

@@ -1,7 +1,9 @@
-import { Context, trace } from '@opentelemetry/api'
-import { BatchSpanProcessor, BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import type { Context } from '@opentelemetry/api'
+import { trace } from '@opentelemetry/api'
+import type { BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
 
-import { TraceCache } from '../core/traceCache'
+import type { TraceCache } from '../core/traceCache'
 
 export class CacheBatchSpanProcessor extends BatchSpanProcessor {
   private cache: TraceCache

packages/mcp-trace/trace-core/processors/EmitterSpanProcessor.ts

@@ -1,6 +1,7 @@
-import { Context } from '@opentelemetry/api'
-import { BatchSpanProcessor, BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
-import { EventEmitter } from 'stream'
+import type { Context } from '@opentelemetry/api'
+import type { BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
+import type { EventEmitter } from 'stream'
 
 import { convertSpanToSpanEntity } from '../core/spanConvert'
 

packages/mcp-trace/trace-core/processors/FuncSpanProcessor.ts

@@ -1,5 +1,7 @@
-import { Context, trace } from '@opentelemetry/api'
-import { BatchSpanProcessor, BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import type { Context } from '@opentelemetry/api'
+import { trace } from '@opentelemetry/api'
+import type { BufferConfig, ReadableSpan, Span, SpanExporter } from '@opentelemetry/sdk-trace-base'
+import { BatchSpanProcessor } from '@opentelemetry/sdk-trace-base'
 
 export type SpanFunction = (span: ReadableSpan) => void
 

packages/mcp-trace/trace-core/types/config.ts

@@ -1,5 +1,5 @@
-import { Link } from '@opentelemetry/api'
-import { TimedEvent } from '@opentelemetry/sdk-trace-base'
+import type { Link } from '@opentelemetry/api'
+import type { TimedEvent } from '@opentelemetry/sdk-trace-base'
 
 export type AttributeValue =
   | string

packages/mcp-trace/trace-node/nodeTracer.ts

@@ -1,11 +1,14 @@
-import { trace, Tracer } from '@opentelemetry/api'
+import type { Tracer } from '@opentelemetry/api'
+import { trace } from '@opentelemetry/api'
 import { AsyncLocalStorageContextManager } from '@opentelemetry/context-async-hooks'
 import { W3CTraceContextPropagator } from '@opentelemetry/core'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
-import { BatchSpanProcessor, ConsoleSpanExporter, SpanProcessor } from '@opentelemetry/sdk-trace-base'
+import type { SpanProcessor } from '@opentelemetry/sdk-trace-base'
+import { BatchSpanProcessor, ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base'
 import { NodeTracerProvider } from '@opentelemetry/sdk-trace-node'
 
-import { defaultConfig, TraceConfig } from '../trace-core/types/config'
+import type { TraceConfig } from '../trace-core/types/config'
+import { defaultConfig } from '../trace-core/types/config'
 
 export class NodeTracer {
   private static provider: NodeTracerProvider

packages/mcp-trace/trace-web/TopicContextManager.ts

@@ -1,4 +1,5 @@
-import { Context, ContextManager, ROOT_CONTEXT } from '@opentelemetry/api'
+import type { Context, ContextManager } from '@opentelemetry/api'
+import { ROOT_CONTEXT } from '@opentelemetry/api'
 
 export class TopicContextManager implements ContextManager {
   private topicContextStack: Map<string, Context[]>

packages/mcp-trace/trace-web/traceContextPromise.ts

@@ -1,4 +1,5 @@
-import { Context, context } from '@opentelemetry/api'
+import type { Context } from '@opentelemetry/api'
+import { context } from '@opentelemetry/api'
 
 const originalPromise = globalThis.Promise
 

packages/mcp-trace/trace-web/webTracer.ts

@@ -1,9 +1,11 @@
 import { W3CTraceContextPropagator } from '@opentelemetry/core'
 import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-http'
-import { BatchSpanProcessor, ConsoleSpanExporter, SpanProcessor } from '@opentelemetry/sdk-trace-base'
+import type { SpanProcessor } from '@opentelemetry/sdk-trace-base'
+import { BatchSpanProcessor, ConsoleSpanExporter } from '@opentelemetry/sdk-trace-base'
 import { WebTracerProvider } from '@opentelemetry/sdk-trace-web'
 
-import { defaultConfig, TraceConfig } from '../trace-core/types/config'
+import type { TraceConfig } from '../trace-core/types/config'
+import { defaultConfig } from '../trace-core/types/config'
 import { TopicContextManager } from './TopicContextManager'
 
 export const contextManager = new TopicContextManager()

packages/shared/IpcChannel.ts

@@ -96,6 +96,10 @@ export enum IpcChannel {
   AgentMessage_PersistExchange = 'agent-message:persist-exchange',
   AgentMessage_GetHistory = 'agent-message:get-history',
 
+  AgentToolPermission_Request = 'agent-tool-permission:request',
+  AgentToolPermission_Response = 'agent-tool-permission:response',
+  AgentToolPermission_Result = 'agent-tool-permission:result',
+
   //copilot
   Copilot_GetAuthMessage = 'copilot:get-auth-message',
   Copilot_GetCopilotToken = 'copilot:get-copilot-token',
@@ -318,6 +322,7 @@ export enum IpcChannel {
   ApiServer_Stop = 'api-server:stop',
   ApiServer_Restart = 'api-server:restart',
   ApiServer_GetStatus = 'api-server:get-status',
+  ApiServer_Ready = 'api-server:ready',
   // NOTE: This api is not be used.
   ApiServer_GetConfig = 'api-server:get-config',
 
@@ -350,5 +355,21 @@ export enum IpcChannel {
   Ovms_StopOVMS = 'ovms:stop-ovms',
 
   // CherryAI
-  Cherryai_GetSignature = 'cherryai:get-signature'
+  Cherryai_GetSignature = 'cherryai:get-signature',
+
+  // Claude Code Plugins
+  ClaudeCodePlugin_ListAvailable = 'claudeCodePlugin:list-available',
+  ClaudeCodePlugin_Install = 'claudeCodePlugin:install',
+  ClaudeCodePlugin_Uninstall = 'claudeCodePlugin:uninstall',
+  ClaudeCodePlugin_ListInstalled = 'claudeCodePlugin:list-installed',
+  ClaudeCodePlugin_InvalidateCache = 'claudeCodePlugin:invalidate-cache',
+  ClaudeCodePlugin_ReadContent = 'claudeCodePlugin:read-content',
+  ClaudeCodePlugin_WriteContent = 'claudeCodePlugin:write-content',
+
+  // WebSocket
+  WebSocket_Start = 'webSocket:start',
+  WebSocket_Stop = 'webSocket:stop',
+  WebSocket_Status = 'webSocket:status',
+  WebSocket_SendFile = 'webSocket:send-file',
+  WebSocket_GetAllCandidates = 'webSocket:get-all-candidates'
 }

packages/shared/anthropic/index.ts

@@ -9,9 +9,9 @@
  */
 
 import Anthropic from '@anthropic-ai/sdk'
-import { TextBlockParam } from '@anthropic-ai/sdk/resources'
+import type { TextBlockParam } from '@anthropic-ai/sdk/resources'
 import { loggerService } from '@logger'
-import { Provider } from '@types'
+import type { Provider } from '@types'
 import type { ModelMessage } from 'ai'
 
 const logger = loggerService.withContext('anthropic-sdk')

packages/shared/config/constant.ts

@@ -470,3 +470,6 @@ export const MACOS_TERMINALS_WITH_COMMANDS: TerminalConfigWithCommand[] = [
     })
   }
 ]
+
+// resources/scripts should be maintained manually
+export const HOME_CHERRY_DIR = '.cherrystudio'

packages/shared/config/types.ts

@@ -1,4 +1,4 @@
-import { ProcessingStatus } from '@types'
+import type { ProcessingStatus } from '@types'
 
 export type LoaderReturn = {
   entriesAdded: number
@@ -31,3 +31,16 @@ export type WebviewKeyEvent = {
   shift: boolean
   alt: boolean
 }
+
+export interface WebSocketStatusResponse {
+  isRunning: boolean
+  port?: number
+  ip?: string
+  clientConnected: boolean
+}
+
+export interface WebSocketCandidatesResponse {
+  host: string
+  interface: string
+  priority: number
+}

resources/js/bridge.js

@@ -1,36 +0,0 @@
-;(() => {
-  let messageId = 0
-  const pendingCalls = new Map()
-
-  function api(method, ...args) {
-    const id = messageId++
-    return new Promise((resolve, reject) => {
-      pendingCalls.set(id, { resolve, reject })
-      window.parent.postMessage({ id, type: 'api-call', method, args }, '*')
-    })
-  }
-
-  window.addEventListener('message', (event) => {
-    if (event.data.type === 'api-response') {
-      const { id, result, error } = event.data
-      const pendingCall = pendingCalls.get(id)
-      if (pendingCall) {
-        if (error) {
-          pendingCall.reject(new Error(error))
-        } else {
-          pendingCall.resolve(result)
-        }
-        pendingCalls.delete(id)
-      }
-    }
-  })
-
-  window.api = new Proxy(
-    {},
-    {
-      get: (target, prop) => {
-        return (...args) => api(prop, ...args)
-      }
-    }
-  )
-})()

resources/js/utils.js

@@ -1,5 +0,0 @@
-export function getQueryParam(paramName) {
-  const url = new URL(window.location.href)
-  const params = new URLSearchParams(url.search)
-  return params.get(paramName)
-}

resources/scripts/install-bun.js

@@ -7,7 +7,7 @@ const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading bun binaries
 const BUN_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/bun/releases/download'
-const DEFAULT_BUN_VERSION = '1.2.17' // Default fallback version
+const DEFAULT_BUN_VERSION = '1.3.1' // Default fallback version
 
 // Mapping of platform+arch to binary package name
 const BUN_PACKAGES = {

resources/scripts/install-uv.js

@@ -7,28 +7,29 @@ const { downloadWithRedirects } = require('./download')
 
 // Base URL for downloading uv binaries
 const UV_RELEASE_BASE_URL = 'https://gitcode.com/CherryHQ/uv/releases/download'
-const DEFAULT_UV_VERSION = '0.7.13'
+const DEFAULT_UV_VERSION = '0.9.5'
 
 // Mapping of platform+arch to binary package name
 const UV_PACKAGES = {
-  'darwin-arm64': 'uv-aarch64-apple-darwin.zip',
-  'darwin-x64': 'uv-x86_64-apple-darwin.zip',
+  'darwin-arm64': 'uv-aarch64-apple-darwin.tar.gz',
+  'darwin-x64': 'uv-x86_64-apple-darwin.tar.gz',
   'win32-arm64': 'uv-aarch64-pc-windows-msvc.zip',
   'win32-ia32': 'uv-i686-pc-windows-msvc.zip',
   'win32-x64': 'uv-x86_64-pc-windows-msvc.zip',
-  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.zip',
-  'linux-ia32': 'uv-i686-unknown-linux-gnu.zip',
-  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.zip',
-  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.zip',
-  'linux-s390x': 'uv-s390x-unknown-linux-gnu.zip',
-  'linux-x64': 'uv-x86_64-unknown-linux-gnu.zip',
-  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.zip',
+  'linux-arm64': 'uv-aarch64-unknown-linux-gnu.tar.gz',
+  'linux-ia32': 'uv-i686-unknown-linux-gnu.tar.gz',
+  'linux-ppc64': 'uv-powerpc64-unknown-linux-gnu.tar.gz',
+  'linux-ppc64le': 'uv-powerpc64le-unknown-linux-gnu.tar.gz',
+  'linux-riscv64': 'uv-riscv64gc-unknown-linux-gnu.tar.gz',
+  'linux-s390x': 'uv-s390x-unknown-linux-gnu.tar.gz',
+  'linux-x64': 'uv-x86_64-unknown-linux-gnu.tar.gz',
+  'linux-armv7l': 'uv-armv7-unknown-linux-gnueabihf.tar.gz',
   // MUSL variants
-  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.zip',
-  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.zip',
-  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.zip',
-  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.zip',
-  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.zip'
+  'linux-musl-arm64': 'uv-aarch64-unknown-linux-musl.tar.gz',
+  'linux-musl-ia32': 'uv-i686-unknown-linux-musl.tar.gz',
+  'linux-musl-x64': 'uv-x86_64-unknown-linux-musl.tar.gz',
+  'linux-musl-armv6l': 'uv-arm-unknown-linux-musleabihf.tar.gz',
+  'linux-musl-armv7l': 'uv-armv7-unknown-linux-musleabihf.tar.gz'
 }
 
 /**
@@ -56,6 +57,7 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
   const downloadUrl = `${UV_RELEASE_BASE_URL}/${version}/${packageName}`
   const tempdir = os.tmpdir()
   const tempFilename = path.join(tempdir, packageName)
+  const isTarGz = packageName.endsWith('.tar.gz')
 
   try {
     console.log(`Downloading uv ${version} for ${platformKey}...`)
@@ -65,34 +67,58 @@ async function downloadUvBinary(platform, arch, version = DEFAULT_UV_VERSION, is
 
     console.log(`Extracting ${packageName} to ${binDir}...`)
 
-    const zip = new StreamZip.async({ file: tempFilename })
+    if (isTarGz) {
+      // Use tar command to extract tar.gz files (macOS and Linux)
+      const tempExtractDir = path.join(tempdir, `uv-extract-${Date.now()}`)
+      fs.mkdirSync(tempExtractDir, { recursive: true })
 
-    // Get all entries in the zip file
-    const entries = await zip.entries()
+      execSync(`tar -xzf "${tempFilename}" -C "${tempExtractDir}"`, { stdio: 'inherit' })
 
-    // Extract files directly to binDir, flattening the directory structure
-    for (const entry of Object.values(entries)) {
-      if (!entry.isDirectory) {
-        // Get just the filename without path
-        const filename = path.basename(entry.name)
-        const outputPath = path.join(binDir, filename)
-
-        console.log(`Extracting ${entry.name} -> ${filename}`)
-        await zip.extract(entry.name, outputPath)
-        // Make executable files executable on Unix-like systems
-        if (platform !== 'win32') {
-          try {
+      // Find all files in the extracted directory and move them to binDir
+      const findAndMoveFiles = (dir) => {
+        const entries = fs.readdirSync(dir, { withFileTypes: true })
+        for (const entry of entries) {
+          const fullPath = path.join(dir, entry.name)
+          if (entry.isDirectory()) {
+            findAndMoveFiles(fullPath)
+          } else {
+            const filename = path.basename(entry.name)
+            const outputPath = path.join(binDir, filename)
+            fs.copyFileSync(fullPath, outputPath)
+            console.log(`Extracted ${entry.name} -> ${outputPath}`)
+            // Make executable on Unix-like systems
             fs.chmodSync(outputPath, 0o755)
-          } catch (chmodError) {
-            console.error(`Warning: Failed to set executable permissions on ${filename}`)
-            return 102
           }
         }
-        console.log(`Extracted ${entry.name} -> ${outputPath}`)
       }
+
+      findAndMoveFiles(tempExtractDir)
+
+      // Clean up temporary extraction directory
+      fs.rmSync(tempExtractDir, { recursive: true })
+    } else {
+      // Use StreamZip for zip files (Windows)
+      const zip = new StreamZip.async({ file: tempFilename })
+
+      // Get all entries in the zip file
+      const entries = await zip.entries()
+
+      // Extract files directly to binDir, flattening the directory structure
+      for (const entry of Object.values(entries)) {
+        if (!entry.isDirectory) {
+          // Get just the filename without path
+          const filename = path.basename(entry.name)
+          const outputPath = path.join(binDir, filename)
+
+          console.log(`Extracting ${entry.name} -> ${filename}`)
+          await zip.extract(entry.name, outputPath)
+          console.log(`Extracted ${entry.name} -> ${outputPath}`)
+        }
+      }
+
+      await zip.close()
     }
 
-    await zip.close()
     fs.unlinkSync(tempFilename)
     console.log(`Successfully installed uv ${version} for ${platform}-${arch}`)
     return 0

resources/scripts/ipService.js

@@ -1,88 +0,0 @@
-const https = require('https')
-const { loggerService } = require('@logger')
-
-const logger = loggerService.withContext('IpService')
-
-/**
- * 获取用户的IP地址所在国家
- * @returns {Promise<string>} 返回国家代码，默认为'CN'
- */
-async function getIpCountry() {
-  return new Promise((resolve) => {
-    // 添加超时控制
-    const timeout = setTimeout(() => {
-      logger.info('IP Address Check Timeout, default to China Mirror')
-      resolve('CN')
-    }, 5000)
-
-    const options = {
-      hostname: 'ipinfo.io',
-      path: '/json',
-      method: 'GET',
-      headers: {
-        'User-Agent':
-          'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36',
-        'Accept-Language': 'en-US,en;q=0.9'
-      }
-    }
-
-    const req = https.request(options, (res) => {
-      clearTimeout(timeout)
-      let data = ''
-
-      res.on('data', (chunk) => {
-        data += chunk
-      })
-
-      res.on('end', () => {
-        try {
-          const parsed = JSON.parse(data)
-          const country = parsed.country || 'CN'
-          logger.info(`Detected user IP address country: ${country}`)
-          resolve(country)
-        } catch (error) {
-          logger.error('Failed to parse IP address information:', error.message)
-          resolve('CN')
-        }
-      })
-    })
-
-    req.on('error', (error) => {
-      clearTimeout(timeout)
-      logger.error('Failed to get IP address information:', error.message)
-      resolve('CN')
-    })
-
-    req.end()
-  })
-}
-
-/**
- * 检查用户是否在中国
- * @returns {Promise<boolean>} 如果用户在中国返回true，否则返回false
- */
-async function isUserInChina() {
-  const country = await getIpCountry()
-  return country.toLowerCase() === 'cn'
-}
-
-/**
- * 根据用户位置获取适合的npm镜像URL
- * @returns {Promise<string>} 返回npm镜像URL
- */
-async function getNpmRegistryUrl() {
-  const inChina = await isUserInChina()
-  if (inChina) {
-    logger.info('User in China, using Taobao npm mirror')
-    return 'https://registry.npmmirror.com'
-  } else {
-    logger.info('User not in China, using default npm mirror')
-    return 'https://registry.npmjs.org'
-  }
-}
-
-module.exports = {
-  getIpCountry,
-  isUserInChina,
-  getNpmRegistryUrl
-}

scripts/auto-translate-i18n.ts

@@ -18,8 +18,10 @@ import { sortedObjectByKeys } from './sort'
 // ========== SCRIPT CONFIGURATION AREA - MODIFY SETTINGS HERE ==========
 const SCRIPT_CONFIG = {
   // 🔧 Concurrency Control Configuration
-  MAX_CONCURRENT_TRANSLATIONS: 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
-  TRANSLATION_DELAY_MS: 100, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)
+  MAX_CONCURRENT_TRANSLATIONS: process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS
+    ? parseInt(process.env.TRANSLATION_MAX_CONCURRENT_REQUESTS)
+    : 5, // Max concurrent requests (Make sure the concurrency level does not exceed your provider's limits.)
+  TRANSLATION_DELAY_MS: process.env.TRANSLATION_DELAY_MS ? parseInt(process.env.TRANSLATION_DELAY_MS) : 500, // Delay between requests to avoid rate limiting (Recommended: 100-500ms, Range: 0-5000ms)
 
   // 🔑 API Configuration
   API_KEY: process.env.TRANSLATION_API_KEY || '', // API key from environment variable

src/main/apiServer/config.ts

@@ -1,4 +1,4 @@
-import { ApiServerConfig } from '@types'
+import type { ApiServerConfig } from '@types'
 import { v4 as uuidv4 } from 'uuid'
 
 import { loggerService } from '../services/LoggerService'

src/main/apiServer/middleware/auth.ts

@@ -1,5 +1,5 @@
 import crypto from 'crypto'
-import { NextFunction, Request, Response } from 'express'
+import type { NextFunction, Request, Response } from 'express'
 
 import { config } from '../config'
 

src/main/apiServer/middleware/error.ts

@@ -1,4 +1,4 @@
-import { NextFunction, Request, Response } from 'express'
+import type { NextFunction, Request, Response } from 'express'
 
 import { loggerService } from '../../services/LoggerService'
 

src/main/apiServer/middleware/openapi.ts

@@ -1,4 +1,4 @@
-import { Express } from 'express'
+import type { Express } from 'express'
 import swaggerJSDoc from 'swagger-jsdoc'
 import swaggerUi from 'swagger-ui-express'
 
@@ -171,7 +171,7 @@ const swaggerOptions: swaggerJSDoc.Options = {
       }
     ]
   },
-  apis: ['./src/main/apiServer/routes/*.ts', './src/main/apiServer/app.ts']
+  apis: ['./src/main/apiServer/routes/**/*.ts', './src/main/apiServer/app.ts']
 }
 
 export function setupOpenAPIDocumentation(app: Express) {

src/main/apiServer/routes/agents/handlers/agents.ts

@@ -1,7 +1,8 @@
 import { loggerService } from '@logger'
 import { AgentModelValidationError, agentService, sessionService } from '@main/services/agents'
-import { ListAgentsResponse, type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
-import { Request, Response } from 'express'
+import type { ListAgentsResponse } from '@types'
+import { type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
+import type { Request, Response } from 'express'
 
 import type { ValidationRequest } from '../validators/zodValidator'
 

src/main/apiServer/routes/agents/handlers/messages.ts

@@ -2,7 +2,7 @@ import { loggerService } from '@logger'
 import { MESSAGE_STREAM_TIMEOUT_MS } from '@main/apiServer/config/timeouts'
 import { createStreamAbortController, STREAM_TIMEOUT_REASON } from '@main/apiServer/utils/createStreamAbortController'
 import { agentService, sessionMessageService, sessionService } from '@main/services/agents'
-import { Request, Response } from 'express'
+import type { Request, Response } from 'express'
 
 const logger = loggerService.withContext('ApiServerMessagesHandlers')
 

src/main/apiServer/routes/agents/handlers/sessions.ts

@@ -1,7 +1,8 @@
 import { loggerService } from '@logger'
 import { AgentModelValidationError, sessionMessageService, sessionService } from '@main/services/agents'
-import { ListAgentSessionsResponse, type ReplaceSessionRequest, UpdateSessionResponse } from '@types'
-import { Request, Response } from 'express'
+import type { ListAgentSessionsResponse, UpdateSessionResponse } from '@types'
+import { type ReplaceSessionRequest } from '@types'
+import type { Request, Response } from 'express'
 
 import type { ValidationRequest } from '../validators/zodValidator'
 

src/main/apiServer/routes/agents/middleware/common.ts

@@ -1,4 +1,4 @@
-import { Request, Response } from 'express'
+import type { Request, Response } from 'express'
 
 import { agentService } from '../../../../services/agents'
 import { loggerService } from '../../../../services/LoggerService'

src/main/apiServer/routes/agents/validators/zodValidator.ts

@@ -1,5 +1,6 @@
-import { NextFunction, Request, Response } from 'express'
-import { ZodError, ZodType } from 'zod'
+import type { NextFunction, Request, Response } from 'express'
+import type { ZodType } from 'zod'
+import { ZodError } from 'zod'
 
 export interface ValidationRequest extends Request {
   validatedBody?: any

src/main/apiServer/routes/chat.ts

@@ -1,5 +1,6 @@
-import { ChatCompletionCreateParams } from '@cherrystudio/openai/resources'
-import express, { Request, Response } from 'express'
+import type { ChatCompletionCreateParams } from '@cherrystudio/openai/resources'
+import type { Request, Response } from 'express'
+import express from 'express'
 
 import { loggerService } from '../../services/LoggerService'
 import {

src/main/apiServer/routes/mcp.ts

@@ -1,4 +1,5 @@
-import express, { Request, Response } from 'express'
+import type { Request, Response } from 'express'
+import express from 'express'
 
 import { loggerService } from '../../services/LoggerService'
 import { mcpApiService } from '../services/mcp'

src/main/apiServer/routes/messages.ts

@@ -1,7 +1,8 @@
-import { MessageCreateParams } from '@anthropic-ai/sdk/resources'
+import type { MessageCreateParams } from '@anthropic-ai/sdk/resources'
 import { loggerService } from '@logger'
-import { Provider } from '@types'
-import express, { Request, Response } from 'express'
+import type { Provider } from '@types'
+import type { Request, Response } from 'express'
+import express from 'express'
 
 import { messagesService } from '../services/messages'
 import { getProviderById, validateModelId } from '../utils'

src/main/apiServer/routes/models.ts

@@ -1,5 +1,7 @@
-import { ApiModelsFilterSchema, ApiModelsResponse } from '@types'
-import express, { Request, Response } from 'express'
+import type { ApiModelsResponse } from '@types'
+import { ApiModelsFilterSchema } from '@types'
+import type { Request, Response } from 'express'
+import express from 'express'
 
 import { loggerService } from '../../services/LoggerService'
 import { modelsService } from '../services/models'

src/main/apiServer/server.ts

@@ -1,8 +1,10 @@
 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'
 
@@ -43,6 +45,13 @@ export class ApiServer {
     return new Promise((resolve, reject) => {
       this.server!.listen(port, host, () => {
         logger.info('API server started', { host, port })
+
+        // Notify renderer that API server is ready
+        const mainWindow = windowService.getMainWindow()
+        if (mainWindow && !mainWindow.isDestroyed()) {
+          mainWindow.webContents.send(IpcChannel.ApiServer_Ready)
+        }
+
         resolve()
       })
 

src/main/apiServer/services/chat-completion.ts

@@ -1,9 +1,10 @@
 import OpenAI from '@cherrystudio/openai'
-import { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from '@cherrystudio/openai/resources'
-import { Provider } from '@types'
+import type { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from '@cherrystudio/openai/resources'
+import type { Provider } from '@types'
 
 import { loggerService } from '../../services/LoggerService'
-import { ModelValidationError, validateModelId } from '../utils'
+import type { ModelValidationError } from '../utils'
+import { validateModelId } from '../utils'
 
 const logger = loggerService.withContext('ChatCompletionService')
 

src/main/apiServer/services/mcp.ts

@@ -1,16 +1,12 @@
 import mcpService from '@main/services/MCPService'
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp'
-import {
-  isJSONRPCRequest,
-  JSONRPCMessage,
-  JSONRPCMessageSchema,
-  MessageExtraInfo
-} from '@modelcontextprotocol/sdk/types'
-import { MCPServer } from '@types'
+import type { JSONRPCMessage, MessageExtraInfo } from '@modelcontextprotocol/sdk/types'
+import { isJSONRPCRequest, JSONRPCMessageSchema } from '@modelcontextprotocol/sdk/types'
+import type { MCPServer } from '@types'
 import { randomUUID } from 'crypto'
 import { EventEmitter } from 'events'
-import { Request, Response } from 'express'
-import { IncomingMessage, ServerResponse } from 'http'
+import type { Request, Response } from 'express'
+import type { IncomingMessage, ServerResponse } from 'http'
 
 import { loggerService } from '../../services/LoggerService'
 import { getMcpServerById, getMCPServersFromRedux } from '../utils/mcp'

src/main/apiServer/services/messages.ts

@@ -1,10 +1,10 @@
-import Anthropic from '@anthropic-ai/sdk'
-import { MessageCreateParams, MessageStreamEvent } from '@anthropic-ai/sdk/resources'
+import type Anthropic from '@anthropic-ai/sdk'
+import type { MessageCreateParams, MessageStreamEvent } from '@anthropic-ai/sdk/resources'
 import { loggerService } from '@logger'
 import anthropicService from '@main/services/AnthropicService'
 import { buildClaudeCodeSystemMessage, getSdkClient } from '@shared/anthropic'
-import { Provider } from '@types'
-import { Response } from 'express'
+import type { Provider } from '@types'
+import type { Response } from 'express'
 
 const logger = loggerService.withContext('MessagesService')
 const EXCLUDED_FORWARD_HEADERS: ReadonlySet<string> = new Set([

src/main/apiServer/services/models.ts

@@ -1,6 +1,6 @@
 import { isEmpty } from 'lodash'
 
-import { ApiModel, ApiModelsFilter, ApiModelsResponse } from '../../../renderer/src/types/apiModels'
+import type { ApiModel, ApiModelsFilter, ApiModelsResponse } from '../../../renderer/src/types/apiModels'
 import { loggerService } from '../../services/LoggerService'
 import {
   getAvailableProviders,

src/main/apiServer/utils/index.ts

@@ -1,7 +1,7 @@
 import { CacheService } from '@main/services/CacheService'
 import { loggerService } from '@main/services/LoggerService'
 import { reduxService } from '@main/services/ReduxService'
-import { ApiModel, Model, Provider } from '@types'
+import type { ApiModel, Model, Provider } from '@types'
 
 const logger = loggerService.withContext('ApiServerUtils')
 

src/main/apiServer/utils/mcp.ts

@@ -1,8 +1,9 @@
 import { CacheService } from '@main/services/CacheService'
 import mcpService from '@main/services/MCPService'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import { CallToolRequestSchema, ListToolsRequestSchema, ListToolsResult } from '@modelcontextprotocol/sdk/types.js'
-import { MCPServer } from '@types'
+import type { ListToolsResult } from '@modelcontextprotocol/sdk/types.js'
+import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import type { MCPServer } from '@types'
 
 import { loggerService } from '../../services/LoggerService'
 import { reduxService } from '../../services/ReduxService'

src/main/index.ts

@@ -21,6 +21,7 @@ import { appMenuService } from './services/AppMenuService'
 import { configManager } from './services/ConfigManager'
 import mcpService from './services/MCPService'
 import { nodeTraceService } from './services/NodeTraceService'
+import powerMonitorService from './services/PowerMonitorService'
 import {
   CHERRY_STUDIO_PROTOCOL,
   handleProtocolUrl,
@@ -30,6 +31,7 @@ import {
 import selectionService, { initSelectionService } from './services/SelectionService'
 import { registerShortcuts } from './services/ShortcutService'
 import { TrayService } from './services/TrayService'
+import { versionService } from './services/VersionService'
 import { windowService } from './services/WindowService'
 import { initWebviewHotkeys } from './services/WebviewService'
 
@@ -110,6 +112,10 @@ if (!app.requestSingleInstanceLock()) {
   // Some APIs can only be used after this event occurs.
 
   app.whenReady().then(async () => {
+    // Record current version for tracking
+    // A preparation for v2 data refactoring
+    versionService.recordCurrentVersion()
+
     initWebviewHotkeys()
     // Set app user model id for windows
     electronApp.setAppUserModelId(import.meta.env.VITE_MAIN_BUNDLE_ID || 'com.kangfenmao.CherryStudio')
@@ -127,6 +133,7 @@ if (!app.requestSingleInstanceLock()) {
     appMenuService?.setupApplicationMenu()
 
     nodeTraceService.init()
+    powerMonitorService.init()
 
     app.on('activate', function () {
       const mainWindow = windowService.getMainWindow()

src/main/ipc.ts

@@ -8,10 +8,12 @@ import { generateSignature } from '@main/integration/cherryai'
 import anthropicService from '@main/services/AnthropicService'
 import { getBinaryPath, isBinaryExists, runInstallScript } from '@main/utils/process'
 import { handleZoomFactor } from '@main/utils/zoom'
-import { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
-import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH, UpgradeChannel } from '@shared/config/constant'
+import type { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
+import type { UpgradeChannel } from '@shared/config/constant'
+import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
-import {
+import type { PluginError } from '@types'
+import type {
   AgentPersistedMessage,
   FileMetadata,
   Notification,
@@ -22,10 +24,12 @@ import {
   ThemeMode
 } from '@types'
 import checkDiskSpace from 'check-disk-space'
-import { BrowserWindow, dialog, ipcMain, ProxyConfig, session, shell, systemPreferences, webContents } from 'electron'
+import type { ProxyConfig } from 'electron'
+import { BrowserWindow, dialog, ipcMain, session, shell, systemPreferences, webContents } from 'electron'
 import fontList from 'font-list'
 
 import { agentMessageRepository } from './services/agents/database'
+import { PluginService } from './services/agents/plugins/PluginService'
 import { apiServerService } from './services/ApiServerService'
 import appService from './services/AppService'
 import AppUpdater from './services/AppUpdater'
@@ -46,6 +50,7 @@ import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
 import OvmsManager from './services/OvmsManager'
+import powerMonitorService from './services/PowerMonitorService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
 import { FileServiceManager } from './services/remotefile/FileServiceManager'
@@ -68,6 +73,7 @@ import {
 import storeSyncService from './services/StoreSyncService'
 import { themeService } from './services/ThemeService'
 import VertexAIService from './services/VertexAIService'
+import WebSocketService from './services/WebSocketService'
 import { setOpenLinkExternal } from './services/WebviewService'
 import { windowService } from './services/WindowService'
 import { calculateDirectorySize, getResourcePath } from './utils'
@@ -93,13 +99,34 @@ const vertexAIService = VertexAIService.getInstance()
 const memoryService = MemoryService.getInstance()
 const dxtService = new DxtService()
 const ovmsManager = new OvmsManager()
+const pluginService = PluginService.getInstance()
+
+function normalizeError(error: unknown): Error {
+  return error instanceof Error ? error : new Error(String(error))
+}
+
+function extractPluginError(error: unknown): PluginError | null {
+  if (error && typeof error === 'object' && 'type' in error && typeof (error as { type: unknown }).type === 'string') {
+    return error as PluginError
+  }
+  return null
+}
 
 export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
   const appUpdater = new AppUpdater()
   const notificationService = new NotificationService()
 
-  // Initialize Python service with main window
-  pythonService.setMainWindow(mainWindow)
+  // Register shutdown handlers
+  powerMonitorService.registerShutdownHandler(() => {
+    appUpdater.setAutoUpdate(false)
+  })
+
+  powerMonitorService.registerShutdownHandler(() => {
+    const mw = windowService.getMainWindow()
+    if (mw && !mw.isDestroyed()) {
+      mw.webContents.send(IpcChannel.App_SaveData)
+    }
+  })
 
   const checkMainWindow = () => {
     if (!mainWindow || mainWindow.isDestroyed()) {
@@ -890,4 +917,124 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
 
   // CherryAI
   ipcMain.handle(IpcChannel.Cherryai_GetSignature, (_, params) => generateSignature(params))
+
+  // Claude Code Plugins
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_ListAvailable, async () => {
+    try {
+      const data = await pluginService.listAvailable()
+      return { success: true, data }
+    } catch (error) {
+      const pluginError = extractPluginError(error)
+      if (pluginError) {
+        logger.error('Failed to list available plugins', pluginError)
+        return { success: false, error: pluginError }
+      }
+
+      const err = normalizeError(error)
+      logger.error('Failed to list available plugins', err)
+      return {
+        success: false,
+        error: {
+          type: 'TRANSACTION_FAILED',
+          operation: 'list-available',
+          reason: err.message
+        }
+      }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_Install, async (_, options) => {
+    try {
+      const data = await pluginService.install(options)
+      return { success: true, data }
+    } catch (error) {
+      logger.error('Failed to install plugin', { options, error })
+      return { success: false, error }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_Uninstall, async (_, options) => {
+    try {
+      await pluginService.uninstall(options)
+      return { success: true, data: undefined }
+    } catch (error) {
+      logger.error('Failed to uninstall plugin', { options, error })
+      return { success: false, error }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_ListInstalled, async (_, agentId: string) => {
+    try {
+      const data = await pluginService.listInstalled(agentId)
+      return { success: true, data }
+    } catch (error) {
+      const pluginError = extractPluginError(error)
+      if (pluginError) {
+        logger.error('Failed to list installed plugins', { agentId, error: pluginError })
+        return { success: false, error: pluginError }
+      }
+
+      const err = normalizeError(error)
+      logger.error('Failed to list installed plugins', { agentId, error: err })
+      return {
+        success: false,
+        error: {
+          type: 'TRANSACTION_FAILED',
+          operation: 'list-installed',
+          reason: err.message
+        }
+      }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_InvalidateCache, async () => {
+    try {
+      pluginService.invalidateCache()
+      return { success: true, data: undefined }
+    } catch (error) {
+      const pluginError = extractPluginError(error)
+      if (pluginError) {
+        logger.error('Failed to invalidate plugin cache', pluginError)
+        return { success: false, error: pluginError }
+      }
+
+      const err = normalizeError(error)
+      logger.error('Failed to invalidate plugin cache', err)
+      return {
+        success: false,
+        error: {
+          type: 'TRANSACTION_FAILED',
+          operation: 'invalidate-cache',
+          reason: err.message
+        }
+      }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_ReadContent, async (_, sourcePath: string) => {
+    try {
+      const data = await pluginService.readContent(sourcePath)
+      return { success: true, data }
+    } catch (error) {
+      logger.error('Failed to read plugin content', { sourcePath, error })
+      return { success: false, error }
+    }
+  })
+
+  ipcMain.handle(IpcChannel.ClaudeCodePlugin_WriteContent, async (_, options) => {
+    try {
+      await pluginService.writeContent(options.agentId, options.filename, options.type, options.content)
+      return { success: true, data: undefined }
+    } catch (error) {
+      logger.error('Failed to write plugin content', { options, error })
+      return { success: false, error }
+    }
+  })
+
+  // WebSocket
+  ipcMain.handle(IpcChannel.WebSocket_Start, WebSocketService.start)
+  ipcMain.handle(IpcChannel.WebSocket_Stop, WebSocketService.stop)
+  ipcMain.handle(IpcChannel.WebSocket_Status, WebSocketService.getStatus)
+  ipcMain.handle(IpcChannel.WebSocket_SendFile, WebSocketService.sendFile)
+  ipcMain.handle(IpcChannel.WebSocket_GetAllCandidates, WebSocketService.getAllCandidates)
 }

src/main/knowledge/embedjs/embeddings/Embeddings.ts

@@ -1,6 +1,6 @@
 import type { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
 import { TraceMethod } from '@mcp-trace/trace-core'
-import { ApiClient } from '@types'
+import type { ApiClient } from '@types'
 
 import EmbeddingsFactory from './EmbeddingsFactory'
 

src/main/knowledge/embedjs/embeddings/EmbeddingsFactory.ts

@@ -1,15 +1,15 @@
 import type { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
 import { OllamaEmbeddings } from '@cherrystudio/embedjs-ollama'
 import { OpenAiEmbeddings } from '@cherrystudio/embedjs-openai'
-import { AzureOpenAiEmbeddings } from '@cherrystudio/embedjs-openai/src/azure-openai-embeddings'
-import { ApiClient } from '@types'
+import type { ApiClient } from '@types'
+import { net } from 'electron'
 
 import { VoyageEmbeddings } from './VoyageEmbeddings'
 
 export default class EmbeddingsFactory {
   static create({ embedApiClient, dimensions }: { embedApiClient: ApiClient; dimensions?: number }): BaseEmbeddings {
     const batchSize = 10
-    const { model, provider, apiKey, apiVersion, baseURL } = embedApiClient
+    const { model, provider, apiKey, baseURL } = embedApiClient
     if (provider === 'voyageai') {
       return new VoyageEmbeddings({
         modelName: model,
@@ -38,22 +38,13 @@ export default class EmbeddingsFactory {
         }
       })
     }
-    if (apiVersion !== undefined) {
-      return new AzureOpenAiEmbeddings({
-        azureOpenAIApiKey: apiKey,
-        azureOpenAIApiVersion: apiVersion,
-        azureOpenAIApiDeploymentName: model,
-        azureOpenAIEndpoint: baseURL,
-        dimensions,
-        batchSize
-      })
-    }
+    // NOTE: Azure OpenAI 也走 OpenAIEmbeddings, baseURL是https://xxxx.openai.azure.com/openai/v1
     return new OpenAiEmbeddings({
       model,
       apiKey,
       dimensions,
       batchSize,
-      configuration: { baseURL }
+      configuration: { baseURL, fetch: net.fetch as typeof fetch }
     })
   }
 }

src/main/knowledge/embedjs/loader/index.ts

@@ -1,10 +1,11 @@
-import { JsonLoader, LocalPathLoader, RAGApplication, TextLoader } from '@cherrystudio/embedjs'
+import type { RAGApplication } from '@cherrystudio/embedjs'
+import { JsonLoader, LocalPathLoader, TextLoader } from '@cherrystudio/embedjs'
 import type { AddLoaderReturn } from '@cherrystudio/embedjs-interfaces'
 import { WebLoader } from '@cherrystudio/embedjs-loader-web'
 import { loggerService } from '@logger'
 import { readTextFileWithAutoEncoding } from '@main/utils/file'
-import { LoaderReturn } from '@shared/config/types'
-import { FileMetadata, KnowledgeBaseParams } from '@types'
+import type { LoaderReturn } from '@shared/config/types'
+import type { FileMetadata, KnowledgeBaseParams } from '@types'
 
 import { DraftsExportLoader } from './draftsExportLoader'
 import { EpubLoader } from './epubLoader'

src/main/knowledge/embedjs/loader/odLoader.ts

@@ -3,7 +3,8 @@ import { cleanString } from '@cherrystudio/embedjs-utils'
 import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
 import { loggerService } from '@logger'
 import md5 from 'md5'
-import { OfficeParserConfig, parseOfficeAsync } from 'officeparser'
+import type { OfficeParserConfig } from 'officeparser'
+import { parseOfficeAsync } from 'officeparser'
 
 const logger = loggerService.withContext('OdLoader')
 

src/main/knowledge/preprocess/BasePreprocessProvider.ts

@@ -4,7 +4,7 @@ import path from 'node:path'
 import { loggerService } from '@logger'
 import { windowService } from '@main/services/WindowService'
 import { getFileExt, getTempDir } from '@main/utils/file'
-import { FileMetadata, PreprocessProvider } from '@types'
+import type { FileMetadata, PreprocessProvider } from '@types'
 import { PDFDocument } from 'pdf-lib'
 
 const logger = loggerService.withContext('BasePreprocessProvider')