🐛 fix: agent OAuth support and fast model settings

- Fix agent OAuth authentication by routing through proxy API server
- Update model environment variables to use ANTHROPIC_DEFAULT_*_MODEL
- Allow forwarding of sentry-trace, baggage, content-length, connection headers

Fixes #10785, #11014

.github/ISSUE_TEMPLATE/0_bug_report.yml

@@ -1,4 +1,4 @@
-name: 🐛 Bug Report
+name: 🐛 Bug Report (English)
 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
+name: 💡 Feature Request (English)
 description: Suggest an idea for this project
 title: '[Feature]: '
 labels: ['feature']

.github/ISSUE_TEMPLATE/3_others.yml

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

.oxlintrc.json

@@ -140,7 +140,7 @@
     "typescript/await-thenable": "warn",
     // "typescript/ban-ts-comment": "error",
     "typescript/no-array-constructor": "error",
-    "typescript/consistent-type-imports": "error",
+    // "typescript/consistent-type-imports": "error",
     "typescript/no-array-delete": "warn",
     "typescript/no-base-to-string": "warn",
     "typescript/no-duplicate-enum-values": "error",

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

@@ -0,0 +1,71 @@
+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

@@ -1,68 +0,0 @@
-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

@@ -0,0 +1,19 @@
+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

@@ -1,17 +0,0 @@
-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;

biome.jsonc

@@ -23,7 +23,7 @@
   },
   "files": {
     "ignoreUnknown": false,
-    "includes": ["**", "!**/.claude/**"],
+    "includes": ["**"],
     "maxSize": 2097152
   },
   "formatter": {

electron-builder.yml

@@ -133,116 +133,60 @@ artifactBuildCompleted: scripts/artifact-build-completed.js
 releaseInfo:
   releaseNotes: |
     <!--LANG:en-->
-    What's New in v1.7.0-beta.3
+    What's New in v1.7.0-beta.2
 
     New Features:
-    - Enhanced Tool Permission System: Real-time tool approval interface with improved UX
-    - Plugin Management System: Support for Claude Agent plugins (agents, commands, skills)
-    - Skill Tool: Add skill execution capabilities for agents
-    - Mobile App Data Restore: Support restoring data to mobile applications
-    - OpenMinerU Preprocessor: Knowledge base now supports open-source MinerU for document processing
-    - HuggingFace Provider: Added HuggingFace as AI provider
-    - Claude Haiku 4.5: Support for the latest Claude Haiku 4.5 model
-    - Ling Series Models: Added support for Ling-1T and related models
-    - Intel OVMS Painting: New painting provider using Intel OpenVINO Model Server
-    - Automatic Update Checks: Implement periodic update checking with configurable intervals
-    - HuggingChat Mini App: New mini app for HuggingChat integration
+    - 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
 
     Improvements:
-    - Agent Creation: New agents are now automatically activated upon creation
-    - Lazy Loading: Optimize page load performance with route lazy loading
-    - UI Enhancements: Improved agent item styling and layout consistency
-    - Navigation: Better navbar layout for fullscreen mode on macOS
-    - Settings Tab: Enhanced context slider consistency
-    - Backup Manager: Unified footer layout for local and S3 backup managers
-    - Menu System: Enhanced application menu with improved help section
-    - Proxy Rules: Comprehensive proxy bypass rule matching
-    - German Language: Added German language support
-    - MCP Confirmation: Added confirmation modal when activating protocol-installed MCP servers
-    - Translation: Enhanced translation script with concurrency and validation
-    - Electron & Vite: Updated to Electron 38 and Vite 4.0.1
-
-    Claude Code Tool Improvements:
-    - GlobTool: Now counts lines instead of files in output for better clarity
-    - ReadTool: Automatically removes system reminder tags from output
-    - TodoWriteTool: Improved rendering behavior
-    - Environment Variables: Updated model-related environment variable names
+    - 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
 
     Bug Fixes:
-    - Fixed session model not being used when sending messages
-    - Fixed tool approval UI and shared workspace plugin inconsistencies
-    - Fixed API server readiness notification to renderer
-    - Fixed grouped items not respecting saved tag order
-    - Fixed assistant/agent activation when creating new ones
-    - Fixed Dashscope Anthropic API host and migrated old configs
-    - Fixed Qwen3 thinking mode control for Ollama
-    - Fixed disappeared MCP button
-    - Fixed create assistant causing blank screen
-    - Fixed up-down button visibility in some cases
-    - Fixed hooks preventing save on composing enter key
-    - Fixed Azure GPT-image-1 and OpenRouter Gemini-image
-    - Fixed Silicon reasoning issues
-    - Fixed topic branch incomplete copy with two-pass ID mapping
-    - Fixed deep research model search context restrictions
-    - Fixed model capability checking logic
-    - Fixed reranker API error response capture
-    - Fixed right-click paste file content into inputbar
-    - Fixed minimax-m2 support in aiCore
+    - 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
 
     <!--LANG:zh-CN-->
-    v1.7.0-beta.3 新特性
+    v1.7.0-beta.2 新特性
 
     新功能:
-    - 增强工具权限系统：实时工具审批界面，改进用户体验
-    - 插件管理系统：支持 Claude Agent 插件（agents、commands、skills）
-    - 技能工具：为 Agent 添加技能执行能力
-    - 移动应用数据恢复：支持将数据恢复到移动应用程序
-    - OpenMinerU 预处理器：知识库现支持使用开源 MinerU 处理文档
-    - HuggingFace 提供商：添加 HuggingFace 作为 AI 提供商
-    - Claude Haiku 4.5：支持最新的 Claude Haiku 4.5 模型
-    - Ling 系列模型：添加 Ling-1T 及相关模型支持
-    - Intel OVMS 绘图：使用 Intel OpenVINO 模型服务器的新绘图提供商
-    - 自动更新检查：实现可配置间隔的定期更新检查
-    - HuggingChat 小程序：新增 HuggingChat 集成小程序
+    - 会话设置：独立管理会话特定的设置和模型配置
+    - 笔记全文搜索：跨所有笔记搜索并高亮匹配内容
+    - 内置滴滴 MCP 服务器：集成滴滴打车服务(仅限中国地区)
+    - Intel OV OCR：使用 Intel NPU 的硬件加速 OCR
+    - 自动启动 API 服务器：当存在 Agent 时自动启动
 
     改进:
-    - Agent 创建：新创建的 Agent 现在会自动激活
-    - 懒加载：通过路由懒加载优化页面加载性能
-    - UI 增强：改进 Agent 项目样式和布局一致性
-    - 导航：改进 macOS 全屏模式下的导航栏布局
-    - 设置选项卡：增强上下文滑块一致性
-    - 备份管理器：统一本地和 S3 备份管理器的页脚布局
-    - 菜单系统：增强应用菜单，改进帮助部分
-    - 代理规则：全面的代理绕过规则匹配
-    - 德语支持：添加德语语言支持
-    - MCP 确认：添加激活协议安装的 MCP 服务器时的确认模态框
-    - 翻译：增强翻译脚本的并发和验证功能
-    - Electron & Vite：更新至 Electron 38 和 Vite 4.0.1
-
-    Claude Code 工具改进:
-    - GlobTool：现在计算行数而不是文件数，提供更清晰的输出
-    - ReadTool：自动从输出中移除系统提醒标签
-    - TodoWriteTool：改进渲染行为
-    - 环境变量：更新模型相关的环境变量名称
+    - Agent 模型选择现在需要用户显式选择
+    - 添加 Mistral AI 提供商支持
+    - 添加 NewAPI 通用提供商支持
+    - 改进不同模式下的导航栏布局一致性
+    - 增强聊天组件响应式设计
+    - 优化小屏幕代码块显示
+    - 更新 OVMS 至 2025.3 正式版
+    - 添加希腊语支持
 
     问题修复:
-    - 修复发送消息时未使用会话模型
-    - 修复工具审批 UI 和共享工作区插件不一致
-    - 修复 API 服务器就绪通知到渲染器
-    - 修复分组项目不遵守已保存标签顺序
-    - 修复创建新的助手/Agent 时的激活问题
-    - 修复 Dashscope Anthropic API 主机并迁移旧配置
-    - 修复 Ollama 的 Qwen3 思考模式控制
-    - 修复 MCP 按钮消失
-    - 修复创建助手导致空白屏幕
-    - 修复某些情况下上下按钮可见性
-    - 修复钩子在输入法输入时阻止保存
-    - 修复 Azure GPT-image-1 和 OpenRouter Gemini-image
-    - 修复 Silicon 推理问题
-    - 修复主题分支不完整复制，采用两阶段 ID 映射
-    - 修复深度研究模型搜索上下文限制
-    - 修复模型能力检查逻辑
-    - 修复 reranker API 错误响应捕获
-    - 修复右键粘贴文件内容到输入栏
-    - 修复 aiCore 中的 minimax-m2 支持
+    - 修复 GitHub Copilot gpt-5-codex 流式传输问题
+    - 修复助手创建失败
+    - 修复翻译自动复制功能
+    - 修复小程序外部链接打开
+    - 修复消息布局和溢出问题
+    - 修复 API 密钥解析以保留空格
+    - 修复不同导航栏布局中的 Agent 显示
     <!--LANG:END-->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "CherryStudio",
-  "version": "1.7.0-beta.3",
+  "version": "1.7.0-beta.2",
   "private": true,
   "description": "A powerful AI assistant for producer.",
   "main": "./out/main/index.js",
@@ -92,10 +92,8 @@
     "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",
@@ -148,9 +146,7 @@
     "@hello-pangea/dnd": "^18.0.1",
     "@heroui/react": "^2.8.3",
     "@kangfenmao/keyv-storage": "^0.1.0",
-    "@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",
+    "@langchain/community": "^0.3.50",
     "@mistralai/mistralai": "^1.7.5",
     "@modelcontextprotocol/sdk": "^1.17.5",
     "@mozilla/readability": "^0.6.0",
@@ -376,7 +372,9 @@
     "@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%3A1.0.2#~/.yarn/patches/@langchain-core-npm-1.0.2-183ef83fe4.patch",
+    "@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",
     "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",
@@ -400,10 +398,7 @@
     "@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",
-    "@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"
+    "openai@npm:5.12.2": "npm:@cherrystudio/openai@6.5.0"
   },
   "packageManager": "yarn@4.9.1",
   "lint-staged": {

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

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

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

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

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

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

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

@@ -5,7 +5,7 @@
  * 集成了来自 ModelCreator 的特殊处理逻辑
  */
 
-import type { EmbeddingModelV2, ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
+import { 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 type { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import { LanguageModelV2Middleware } from '@ai-sdk/provider'
 
 import type { ProviderId, ProviderSettingsMap } from '../providers/types'
 

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

@@ -1,4 +1,4 @@
-import type { ExtractProviderOptions, ProviderOptionsMap, TypedProviderOptions } from './types'
+import { 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 type { PromptToolUseConfig, ToolUseResult } from './type'
+import { PromptToolUseConfig, ToolUseResult } from './type'
 
 /**
  * 工具使用标签配置

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

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

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

@@ -1,11 +1,10 @@
-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 { 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 { ProviderOptionsMap } from '../../../options/types'
-import type { OpenRouterSearchConfig } from './openrouter'
+import { ProviderOptionsMap } from '../../../options/types'
+import { OpenRouterSearchConfig } from './openrouter'
 
 /**
  * 从 AI SDK 的工具函数中提取参数类型，以确保类型安全。

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

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

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

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

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

@@ -5,7 +5,7 @@
  * 例如: aihubmix:anthropic:claude-3.5-sonnet
  */
 
-import type { ProviderV2 } from '@ai-sdk/provider'
+import { 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 type { EmbeddingModelV2, ImageModelV2, LanguageModelV2, ProviderV2 } from '@ai-sdk/provider'
+import { 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,11 +10,10 @@ import { createGoogleGenerativeAI } from '@ai-sdk/google'
 import { createHuggingFace } from '@ai-sdk/huggingface'
 import { createOpenAI, type OpenAIProviderSettings } from '@ai-sdk/openai'
 import { createOpenAICompatible } from '@ai-sdk/openai-compatible'
-import type { LanguageModelV2 } from '@ai-sdk/provider'
+import { LanguageModelV2 } from '@ai-sdk/provider'
 import { createXai } from '@ai-sdk/xai'
 import { createOpenRouter } from '@openrouter/ai-sdk-provider'
-import type { Provider } from 'ai'
-import { customProvider } from 'ai'
+import { customProvider, Provider } 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 type {
+import {
   EmbeddingModelV2 as EmbeddingModel,
   ImageModelV2 as ImageModel,
   LanguageModelV2 as LanguageModel,

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

@@ -1,4 +1,4 @@
-import type { ImageModelV2 } from '@ai-sdk/provider'
+import { 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 type { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
-import type { LanguageModel } from 'ai'
+import { ImageModelV2, LanguageModelV2, LanguageModelV2Middleware } from '@ai-sdk/provider'
 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 type { LanguageModelV2Middleware } from '@ai-sdk/provider'
+import { 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,13 +1,6 @@
 /* eslint-disable @eslint-react/naming-convention/context-name */
-import type { ImageModelV2 } from '@ai-sdk/provider'
-import type {
-  experimental_generateImage,
-  generateObject,
-  generateText,
-  LanguageModel,
-  streamObject,
-  streamText
-} from 'ai'
+import { ImageModelV2 } from '@ai-sdk/provider'
+import { 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 type { ImageModelV2 } from '@ai-sdk/provider'
-import type { experimental_generateImage, generateObject, generateText, streamObject, streamText } from 'ai'
+import { ImageModelV2 } from '@ai-sdk/provider'
+import { 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,5 +1,4 @@
-import type { Node } from '@tiptap/core'
-import { Extension } from '@tiptap/core'
+import { Extension, Node } 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 type { ReadableSpan } from '@opentelemetry/sdk-trace-base'
+import { ReadableSpan } from '@opentelemetry/sdk-trace-base'
 
-import type { SpanEntity } from '../types/config'
+import { SpanEntity } from '../types/config'
 
 /**
  * convert ReadableSpan to SpanEntity

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/shared/IpcChannel.ts

@@ -322,7 +322,6 @@ 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',
 
@@ -364,12 +363,5 @@ export enum IpcChannel {
   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'
+  ClaudeCodePlugin_WriteContent = 'claudeCodePlugin:write-content'
 }

packages/shared/anthropic/index.ts

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

packages/shared/config/types.ts

@@ -1,4 +1,4 @@
-import type { ProcessingStatus } from '@types'
+import { ProcessingStatus } from '@types'
 
 export type LoaderReturn = {
   entriesAdded: number
@@ -31,16 +31,3 @@ 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
-}

src/main/apiServer/config.ts

@@ -1,4 +1,4 @@
-import type { ApiServerConfig } from '@types'
+import { 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 type { NextFunction, Request, Response } from 'express'
+import { NextFunction, Request, Response } from 'express'
 
 import { config } from '../config'
 

src/main/apiServer/middleware/error.ts

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

src/main/apiServer/middleware/openapi.ts

@@ -1,4 +1,4 @@
-import type { Express } from 'express'
+import { Express } from 'express'
 import swaggerJSDoc from 'swagger-jsdoc'
 import swaggerUi from 'swagger-ui-express'
 

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

@@ -1,8 +1,7 @@
 import { loggerService } from '@logger'
 import { AgentModelValidationError, agentService, sessionService } from '@main/services/agents'
-import type { ListAgentsResponse } from '@types'
-import { type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
-import type { Request, Response } from 'express'
+import { ListAgentsResponse, type ReplaceAgentRequest, type UpdateAgentRequest } from '@types'
+import { 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 type { Request, Response } from 'express'
+import { Request, Response } from 'express'
 
 const logger = loggerService.withContext('ApiServerMessagesHandlers')
 

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

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

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

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

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

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

src/main/apiServer/routes/chat.ts

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

src/main/apiServer/routes/mcp.ts

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

src/main/apiServer/routes/messages.ts

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

src/main/apiServer/routes/models.ts

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

src/main/apiServer/server.ts

@@ -1,10 +1,8 @@
 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'
 
@@ -45,13 +43,6 @@ 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,10 +1,9 @@
 import OpenAI from '@cherrystudio/openai'
-import type { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from '@cherrystudio/openai/resources'
-import type { Provider } from '@types'
+import { ChatCompletionCreateParams, ChatCompletionCreateParamsStreaming } from '@cherrystudio/openai/resources'
+import { Provider } from '@types'
 
 import { loggerService } from '../../services/LoggerService'
-import type { ModelValidationError } from '../utils'
-import { validateModelId } from '../utils'
+import { ModelValidationError, validateModelId } from '../utils'
 
 const logger = loggerService.withContext('ChatCompletionService')
 

src/main/apiServer/services/mcp.ts

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

src/main/apiServer/services/messages.ts

@@ -1,21 +1,13 @@
-import type Anthropic from '@anthropic-ai/sdk'
-import type { MessageCreateParams, MessageStreamEvent } from '@anthropic-ai/sdk/resources'
+import Anthropic from '@anthropic-ai/sdk'
+import { MessageCreateParams, MessageStreamEvent } from '@anthropic-ai/sdk/resources'
 import { loggerService } from '@logger'
 import anthropicService from '@main/services/AnthropicService'
 import { buildClaudeCodeSystemMessage, getSdkClient } from '@shared/anthropic'
-import type { Provider } from '@types'
-import type { Response } from 'express'
+import { Provider } from '@types'
+import { Response } from 'express'
 
 const logger = loggerService.withContext('MessagesService')
-const EXCLUDED_FORWARD_HEADERS: ReadonlySet<string> = new Set([
-  'host',
-  'x-api-key',
-  'authorization',
-  'sentry-trace',
-  'baggage',
-  'content-length',
-  'connection'
-])
+const EXCLUDED_FORWARD_HEADERS: ReadonlySet<string> = new Set(['host', 'x-api-key', 'authorization'])
 
 export interface ValidationResult {
   isValid: boolean

src/main/apiServer/services/models.ts

@@ -1,6 +1,6 @@
 import { isEmpty } from 'lodash'
 
-import type { ApiModel, ApiModelsFilter, ApiModelsResponse } from '../../../renderer/src/types/apiModels'
+import { 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 type { ApiModel, Model, Provider } from '@types'
+import { ApiModel, Model, Provider } from '@types'
 
 const logger = loggerService.withContext('ApiServerUtils')
 

src/main/apiServer/utils/mcp.ts

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

src/main/ipc.ts

@@ -8,12 +8,11 @@ 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 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 { SpanEntity, TokenUsage } from '@mcp-trace/trace-core'
+import { MIN_WINDOW_HEIGHT, MIN_WINDOW_WIDTH, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
 import type { PluginError } from '@types'
-import type {
+import {
   AgentPersistedMessage,
   FileMetadata,
   Notification,
@@ -24,12 +23,10 @@ import type {
   ThemeMode
 } from '@types'
 import checkDiskSpace from 'check-disk-space'
-import type { ProxyConfig } from 'electron'
-import { BrowserWindow, dialog, ipcMain, session, shell, systemPreferences, webContents } from 'electron'
+import { BrowserWindow, dialog, ipcMain, ProxyConfig, 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'
@@ -50,6 +47,7 @@ import * as NutstoreService from './services/NutstoreService'
 import ObsidianVaultService from './services/ObsidianVaultService'
 import { ocrService } from './services/ocr/OcrService'
 import OvmsManager from './services/OvmsManager'
+import { PluginService } from './services/PluginService'
 import { proxyManager } from './services/ProxyManager'
 import { pythonService } from './services/PythonService'
 import { FileServiceManager } from './services/remotefile/FileServiceManager'
@@ -72,7 +70,6 @@ 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'
@@ -1020,11 +1017,4 @@ export function registerIpc(mainWindow: BrowserWindow, app: Electron.App) {
       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 type { ApiClient } from '@types'
+import { ApiClient } from '@types'
 
 import EmbeddingsFactory from './EmbeddingsFactory'
 

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

@@ -1,8 +1,7 @@
 import type { BaseEmbeddings } from '@cherrystudio/embedjs-interfaces'
 import { OllamaEmbeddings } from '@cherrystudio/embedjs-ollama'
 import { OpenAiEmbeddings } from '@cherrystudio/embedjs-openai'
-import type { ApiClient } from '@types'
-import { net } from 'electron'
+import { ApiClient } from '@types'
 
 import { VoyageEmbeddings } from './VoyageEmbeddings'
 
@@ -44,7 +43,7 @@ export default class EmbeddingsFactory {
       apiKey,
       dimensions,
       batchSize,
-      configuration: { baseURL, fetch: net.fetch as typeof fetch }
+      configuration: { baseURL }
     })
   }
 }

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

@@ -1,11 +1,10 @@
-import type { RAGApplication } from '@cherrystudio/embedjs'
-import { JsonLoader, LocalPathLoader, TextLoader } from '@cherrystudio/embedjs'
+import { JsonLoader, LocalPathLoader, RAGApplication, 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 type { LoaderReturn } from '@shared/config/types'
-import type { FileMetadata, KnowledgeBaseParams } from '@types'
+import { LoaderReturn } from '@shared/config/types'
+import { FileMetadata, KnowledgeBaseParams } from '@types'
 
 import { DraftsExportLoader } from './draftsExportLoader'
 import { EpubLoader } from './epubLoader'

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

@@ -3,8 +3,7 @@ import { cleanString } from '@cherrystudio/embedjs-utils'
 import { RecursiveCharacterTextSplitter } from '@langchain/textsplitters'
 import { loggerService } from '@logger'
 import md5 from 'md5'
-import type { OfficeParserConfig } from 'officeparser'
-import { parseOfficeAsync } from 'officeparser'
+import { OfficeParserConfig, 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 type { FileMetadata, PreprocessProvider } from '@types'
+import { FileMetadata, PreprocessProvider } from '@types'
 import { PDFDocument } from 'pdf-lib'
 
 const logger = loggerService.withContext('BasePreprocessProvider')

src/main/knowledge/preprocess/DefaultPreprocessProvider.ts

@@ -1,4 +1,4 @@
-import type { FileMetadata, PreprocessProvider } from '@types'
+import { FileMetadata, PreprocessProvider } from '@types'
 
 import BasePreprocessProvider from './BasePreprocessProvider'
 

src/main/knowledge/preprocess/Doc2xPreprocessProvider.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
-import type { FileMetadata, PreprocessProvider } from '@types'
+import { FileMetadata, PreprocessProvider } from '@types'
 import AdmZip from 'adm-zip'
 import { net } from 'electron'
 

src/main/knowledge/preprocess/MineruPreprocessProvider.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
-import type { FileMetadata, PreprocessProvider } from '@types'
+import { FileMetadata, PreprocessProvider } from '@types'
 import AdmZip from 'adm-zip'
 import { net } from 'electron'
 

src/main/knowledge/preprocess/MistralPreprocessProvider.ts

@@ -4,12 +4,11 @@ import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
 import { MistralClientManager } from '@main/services/MistralClientManager'
 import { MistralService } from '@main/services/remotefile/MistralService'
-import type { Mistral } from '@mistralai/mistralai'
-import type { DocumentURLChunk } from '@mistralai/mistralai/models/components/documenturlchunk'
-import type { ImageURLChunk } from '@mistralai/mistralai/models/components/imageurlchunk'
-import type { OCRResponse } from '@mistralai/mistralai/models/components/ocrresponse'
-import type { FileMetadata, PreprocessProvider, Provider } from '@types'
-import { FileTypes } from '@types'
+import { Mistral } from '@mistralai/mistralai'
+import { DocumentURLChunk } from '@mistralai/mistralai/models/components/documenturlchunk'
+import { ImageURLChunk } from '@mistralai/mistralai/models/components/imageurlchunk'
+import { OCRResponse } from '@mistralai/mistralai/models/components/ocrresponse'
+import { FileMetadata, FileTypes, PreprocessProvider, Provider } from '@types'
 import path from 'path'
 
 import BasePreprocessProvider from './BasePreprocessProvider'

src/main/knowledge/preprocess/OpenMineruPreprocessProvider.ts

@@ -3,7 +3,7 @@ import path from 'node:path'
 
 import { loggerService } from '@logger'
 import { fileStorage } from '@main/services/FileStorage'
-import type { FileMetadata, PreprocessProvider } from '@types'
+import { FileMetadata, PreprocessProvider } from '@types'
 import AdmZip from 'adm-zip'
 import { net } from 'electron'
 import FormData from 'form-data'

src/main/knowledge/preprocess/PreprocessProvider.ts

@@ -1,6 +1,6 @@
-import type { FileMetadata, PreprocessProvider as Provider } from '@types'
+import { FileMetadata, PreprocessProvider as Provider } from '@types'
 
-import type BasePreprocessProvider from './BasePreprocessProvider'
+import BasePreprocessProvider from './BasePreprocessProvider'
 import PreprocessProviderFactory from './PreprocessProviderFactory'
 
 export default class PreprocessProvider {

src/main/knowledge/preprocess/PreprocessProviderFactory.ts

@@ -1,6 +1,6 @@
-import type { PreprocessProvider } from '@types'
+import { PreprocessProvider } from '@types'
 
-import type BasePreprocessProvider from './BasePreprocessProvider'
+import BasePreprocessProvider from './BasePreprocessProvider'
 import DefaultPreprocessProvider from './DefaultPreprocessProvider'
 import Doc2xPreprocessProvider from './Doc2xPreprocessProvider'
 import MineruPreprocessProvider from './MineruPreprocessProvider'

src/main/knowledge/reranker/BaseReranker.ts

@@ -1,7 +1,7 @@
 import { DEFAULT_DOCUMENT_COUNT, DEFAULT_RELEVANT_SCORE } from '@main/utils/knowledge'
-import type { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
+import { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
 
-import type { MultiModalDocument, RerankStrategy } from './strategies/RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './strategies/RerankStrategy'
 import { StrategyFactory } from './strategies/StrategyFactory'
 
 export default abstract class BaseReranker {

src/main/knowledge/reranker/GeneralReranker.ts

@@ -1,4 +1,4 @@
-import type { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
+import { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
 import { net } from 'electron'
 
 import BaseReranker from './BaseReranker'

src/main/knowledge/reranker/Reranker.ts

@@ -1,4 +1,4 @@
-import type { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
+import { KnowledgeBaseParams, KnowledgeSearchResult } from '@types'
 
 import GeneralReranker from './GeneralReranker'
 

src/main/knowledge/reranker/strategies/BailianStrategy.ts

@@ -1,4 +1,4 @@
-import type { MultiModalDocument, RerankStrategy } from './RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './RerankStrategy'
 export class BailianStrategy implements RerankStrategy {
   buildUrl(): string {
     return 'https://dashscope.aliyuncs.com/api/v1/services/rerank/text-rerank/text-rerank'

src/main/knowledge/reranker/strategies/DefaultStrategy.ts

@@ -1,4 +1,4 @@
-import type { MultiModalDocument, RerankStrategy } from './RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './RerankStrategy'
 export class DefaultStrategy implements RerankStrategy {
   buildUrl(baseURL?: string): string {
     if (baseURL && baseURL.endsWith('/')) {

src/main/knowledge/reranker/strategies/JinaStrategy.ts

@@ -1,4 +1,4 @@
-import type { MultiModalDocument, RerankStrategy } from './RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './RerankStrategy'
 export class JinaStrategy implements RerankStrategy {
   buildUrl(baseURL?: string): string {
     if (baseURL && baseURL.endsWith('/')) {

src/main/knowledge/reranker/strategies/StrategyFactory.ts

@@ -1,7 +1,7 @@
 import { BailianStrategy } from './BailianStrategy'
 import { DefaultStrategy } from './DefaultStrategy'
 import { JinaStrategy } from './JinaStrategy'
-import type { RerankStrategy } from './RerankStrategy'
+import { RerankStrategy } from './RerankStrategy'
 import { TEIStrategy } from './TeiStrategy'
 import { isTEIProvider, RERANKER_PROVIDERS } from './types'
 import { VoyageAIStrategy } from './VoyageStrategy'

src/main/knowledge/reranker/strategies/TeiStrategy.ts

@@ -1,4 +1,4 @@
-import type { MultiModalDocument, RerankStrategy } from './RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './RerankStrategy'
 export class TEIStrategy implements RerankStrategy {
   buildUrl(baseURL?: string): string {
     if (baseURL && baseURL.endsWith('/')) {

src/main/knowledge/reranker/strategies/VoyageStrategy.ts

@@ -1,4 +1,4 @@
-import type { MultiModalDocument, RerankStrategy } from './RerankStrategy'
+import { MultiModalDocument, RerankStrategy } from './RerankStrategy'
 export class VoyageAIStrategy implements RerankStrategy {
   buildUrl(baseURL?: string): string {
     if (baseURL && baseURL.endsWith('/')) {

src/main/mcpServers/brave-search.ts

@@ -2,8 +2,7 @@
 // port https://github.com/modelcontextprotocol/servers/blob/main/src/brave-search/index.ts
 
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import type { Tool } from '@modelcontextprotocol/sdk/types.js'
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { CallToolRequestSchema, ListToolsRequestSchema, Tool } from '@modelcontextprotocol/sdk/types.js'
 import { net } from 'electron'
 
 const WEB_SEARCH_TOOL: Tool = {

src/main/mcpServers/factory.ts

@@ -1,7 +1,6 @@
 import { loggerService } from '@logger'
-import type { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import type { BuiltinMCPServerName } from '@types'
-import { BuiltinMCPServerNames } from '@types'
+import { Server } from '@modelcontextprotocol/sdk/server/index.js'
+import { BuiltinMCPServerName, BuiltinMCPServerNames } from '@types'
 
 import BraveSearchServer from './brave-search'
 import DiDiMcpServer from './didi-mcp'

src/main/mcpServers/sequentialthinking.ts

@@ -3,8 +3,7 @@
 
 import { loggerService } from '@logger'
 import { Server } from '@modelcontextprotocol/sdk/server/index.js'
-import type { Tool } from '@modelcontextprotocol/sdk/types.js'
-import { CallToolRequestSchema, ListToolsRequestSchema } from '@modelcontextprotocol/sdk/types.js'
+import { CallToolRequestSchema, ListToolsRequestSchema, Tool } from '@modelcontextprotocol/sdk/types.js'
 // Fixed chalk import for ESM
 import chalk from 'chalk'
 

src/main/services/ApiServerService.ts

@@ -1,5 +1,5 @@
 import { IpcChannel } from '@shared/IpcChannel'
-import type {
+import {
   ApiServerConfig,
   GetApiServerStatusResult,
   RestartApiServerStatusResult,

src/main/services/AppMenuService.ts

@@ -2,8 +2,7 @@ import { isMac } from '@main/constant'
 import { windowService } from '@main/services/WindowService'
 import { locales } from '@main/utils/locales'
 import { IpcChannel } from '@shared/IpcChannel'
-import type { MenuItemConstructorOptions } from 'electron'
-import { app, Menu, shell } from 'electron'
+import { app, Menu, MenuItemConstructorOptions, shell } from 'electron'
 
 import { configManager } from './ConfigManager'
 export class AppMenuService {

src/main/services/AppUpdater.ts

@@ -4,11 +4,9 @@ import { getIpCountry } from '@main/utils/ipService'
 import { generateUserAgent } from '@main/utils/systemInfo'
 import { FeedUrl, UpgradeChannel } from '@shared/config/constant'
 import { IpcChannel } from '@shared/IpcChannel'
-import type { UpdateInfo } from 'builder-util-runtime'
-import { CancellationToken } from 'builder-util-runtime'
+import { CancellationToken, UpdateInfo } from 'builder-util-runtime'
 import { app, net } from 'electron'
-import type { AppUpdater as _AppUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater'
-import { autoUpdater } from 'electron-updater'
+import { AppUpdater as _AppUpdater, autoUpdater, Logger, NsisUpdater, UpdateCheckResult } from 'electron-updater'
 import path from 'path'
 import semver from 'semver'
 

src/main/services/BackupManager.ts

@@ -1,14 +1,14 @@
 import { loggerService } from '@logger'
 import { IpcChannel } from '@shared/IpcChannel'
-import type { WebDavConfig } from '@types'
-import type { S3Config } from '@types'
+import { WebDavConfig } from '@types'
+import { S3Config } from '@types'
 import archiver from 'archiver'
 import { exec } from 'child_process'
 import { app } from 'electron'
 import * as fs from 'fs-extra'
 import StreamZip from 'node-stream-zip'
 import * as path from 'path'
-import type { CreateDirectoryOptions, FileStat } from 'webdav'
+import { CreateDirectoryOptions, FileStat } from 'webdav'
 
 import { getDataPath } from '../utils'
 import S3Storage from './S3Storage'

src/main/services/CodeToolsService.ts

@@ -7,12 +7,13 @@ import { isMac, isWin } from '@main/constant'
 import { removeEnvProxy } from '@main/utils'
 import { isUserInChina } from '@main/utils/ipService'
 import { getBinaryName } from '@main/utils/process'
-import type { TerminalConfig, TerminalConfigWithCommand } from '@shared/config/constant'
 import {
   codeTools,
   MACOS_TERMINALS,
   MACOS_TERMINALS_WITH_COMMANDS,
   terminalApps,
+  TerminalConfig,
+  TerminalConfigWithCommand,
   WINDOWS_TERMINALS,
   WINDOWS_TERMINALS_WITH_COMMANDS
 } from '@shared/config/constant'

src/main/services/ConfigManager.ts

@@ -1,7 +1,5 @@
-import type { UpgradeChannel } from '@shared/config/constant'
-import { defaultLanguage, ZOOM_SHORTCUTS } from '@shared/config/constant'
-import type { LanguageVarious, Shortcut } from '@types'
-import { ThemeMode } from '@types'
+import { defaultLanguage, UpgradeChannel, ZOOM_SHORTCUTS } from '@shared/config/constant'
+import { LanguageVarious, Shortcut, ThemeMode } from '@types'
 import { app } from 'electron'
 import Store from 'electron-store'
 import { v4 as uuidv4 } from 'uuid'

src/main/services/ContextMenu.ts

@@ -1,5 +1,4 @@
-import type { MenuItemConstructorOptions } from 'electron'
-import { Menu } from 'electron'
+import { Menu, MenuItemConstructorOptions } from 'electron'
 
 import { locales } from '../utils/locales'
 import { configManager } from './ConfigManager'

src/main/services/FileStorage.ts

@@ -10,13 +10,19 @@ import {
   scanDir
 } from '@main/utils/file'
 import { documentExts, imageExts, KB, MB } from '@shared/config/constant'
-import type { FileMetadata, NotesTreeNode } from '@types'
+import { FileMetadata, NotesTreeNode } from '@types'
 import chardet from 'chardet'
-import type { FSWatcher } from 'chokidar'
-import chokidar from 'chokidar'
+import chokidar, { FSWatcher } from 'chokidar'
 import * as crypto from 'crypto'
-import type { OpenDialogOptions, OpenDialogReturnValue, SaveDialogOptions, SaveDialogReturnValue } from 'electron'
-import { dialog, net, shell } from 'electron'
+import {
+  dialog,
+  net,
+  OpenDialogOptions,
+  OpenDialogReturnValue,
+  SaveDialogOptions,
+  SaveDialogReturnValue,
+  shell
+} from 'electron'
 import * as fs from 'fs'
 import { writeFileSync } from 'fs'
 import { readFile } from 'fs/promises'

src/main/services/KnowledgeService.ts

@@ -16,8 +16,7 @@
 import * as fs from 'node:fs'
 import path from 'node:path'
 
-import type { RAGApplication } from '@cherrystudio/embedjs'
-import { RAGApplicationBuilder } from '@cherrystudio/embedjs'
+import { RAGApplication, RAGApplicationBuilder } from '@cherrystudio/embedjs'
 import { LibSqlDb } from '@cherrystudio/embedjs-libsql'
 import { SitemapLoader } from '@cherrystudio/embedjs-loader-sitemap'
 import { WebLoader } from '@cherrystudio/embedjs-loader-web'
@@ -35,7 +34,7 @@ import { TraceMethod } from '@mcp-trace/trace-core'
 import { MB } from '@shared/config/constant'
 import type { LoaderReturn } from '@shared/config/types'
 import { IpcChannel } from '@shared/IpcChannel'
-import type { FileMetadata, KnowledgeBaseParams, KnowledgeItem, KnowledgeSearchResult } from '@types'
+import { FileMetadata, KnowledgeBaseParams, KnowledgeItem, KnowledgeSearchResult } from '@types'
 import { v4 as uuidv4 } from 'uuid'
 
 const logger = loggerService.withContext('MainKnowledgeService')