aicodeswitch 6.0.1 → 6.0.2

package/README.md

@@ -39,7 +39,10 @@ AI Code Switch 是帮助你在本地管理 AI 编程工具接入大模型的工
 
 ## 桌面客户端
 
-[进入下载](https://github.com/tangshuang/aicodeswitch/releases)
+桌面版基于 Electron，内置了 Node 运行时，**无需另外安装 Node.js**。
+
+- 下载安装包：[进入下载](https://github.com/tangshuang/aicodeswitch/releases)（提供 Windows `.exe`/`.msi`、macOS `.dmg`（arm64 与 x64）、Linux `.AppImage`/`.deb`）
+- 本地构建：`npm install` 后执行 `npm run electron:build`，产物输出到 `release/` 目录
 
 ## 命令行工具
 

package/dist/server/conversions/index.js

@@ -100,8 +100,8 @@ const effort_js_1 = require("./thinking/effort.js");
  * Transform a request body from one format to another.
  */
 function transformRequest(options) {
-    const { fromFormat, toFormat, body, sanitizeBody, providerConfig } = options;
-    const targetBody = buildTargetBody({ fromFormat, toFormat, body, sanitizeBody, providerConfig });
+    const { fromFormat, toFormat, body, sanitizeBody, providerConfig, serverToolConfig } = options;
+    const targetBody = buildTargetBody({ fromFormat, toFormat, body, sanitizeBody, providerConfig, serverToolConfig });
     return { body: targetBody, headers: {} };
 }
 // ============================================================
@@ -205,11 +205,13 @@ function createStreamConverter(options) {
  */
 function buildTargetBody(options) {
     const { fromFormat, toFormat, sanitizeBody, providerConfig, serverToolConfig } = options;
-    // Pre-processing: convert server_tool_use → tool_use when upstream doesn't support it.
+    // Pre-processing: strip Anthropic server-tool artifacts (server_tool_use,
+    // web_search_tool_result, server_tool_result, advisor_tool_result, and server-tool
+    // definitions in `tools`) when the upstream doesn't support them.
     // Must happen before format conversion so all pair transformers handle the blocks correctly.
     let processedBody = options.body;
     if (fromFormat === 'claude' && !(serverToolConfig === null || serverToolConfig === void 0 ? void 0 : serverToolConfig.supportsServerToolUse)) {
-        processedBody = (0, mapper_js_1.convertServerToolUseToToolUse)(processedBody);
+        processedBody = (0, mapper_js_1.sanitizeServerToolArtifacts)(processedBody);
     }
     // Dispatch to the correct conversion pair
     const key = `${fromFormat}->${toFormat}`;

package/dist/server/conversions/server-tool/mapper.js

@@ -2,48 +2,161 @@
 /**
  * Server tool use content block transformation.
  *
- * Converts server_tool_use blocks to regular tool_use blocks so that upstream
- * providers which do not recognise the server_tool_use type can still process
- * the conversation history correctly.
+ * Anthropic 提供一类"服务端工具"（Web Search / Web Fetch / Computer Use / Code Execution 等），
+ * 其交互在内容块层面会用到 Anthropic 专有的类型：
+ *   - `server_tool_use`          （assistant 消息：模型发起的服务端工具调用）
+ *   - `web_search_tool_result`   （user 消息：Web Search 结果）
+ *   - `server_tool_result`       （user 消息：通用服务端工具结果）
+ *   - `advisor_tool_result`      （user 消息：advisor 工具结果）
+ * 此外 `tools` 数组里会带上服务端工具定义（如 `{ type: 'web_search_20250305' }`）。
  *
- * Conversion is simple: only the `type` field changes from 'server_tool_use'
- * to 'tool_use'. The `id`, `name`, and `input` fields are preserved, and
- * matching `tool_result` blocks (which reference by `tool_use_id`) remain valid.
+ * 多数第三方 Claude 兼容端点（GLM、MiniMax 等）只实现了客户端 `tool_use`/`tool_result`，
+ * 遇到上述任意一种都会以 `Unsupported content type: server_tool_use` 之类报错拒绝。
+ *
+ * 本模块在转发到"不支持服务端工具"的上游前，彻底清理这些痕迹：
+ *   1. assistant 的 `server_tool_use` → 改名 `tool_use`（保留 id/name/input）；
+ *   2. user 的 `web_search_tool_result` / `server_tool_result` / `advisor_tool_result`
+ *      → 降级为标准 `tool_result`（引用同一 tool_use_id，内容拍平为文本），
+ *      以便与上一步改名的 `tool_use` 维持合法配对；
+ *   3. 顶层 `tools` 数组中删除所有服务端工具定义，仅保留客户端自定义工具。
+ *
+ * 返回浅拷贝，不修改传入 body。
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sanitizeServerToolArtifacts = sanitizeServerToolArtifacts;
 exports.convertServerToolUseToToolUse = convertServerToolUseToToolUse;
+/** user 消息里需要降级为 tool_result 的服务端结果块类型 */
+const SERVER_RESULT_TYPES = new Set([
+    'web_search_tool_result',
+    'server_tool_result',
+    'advisor_tool_result',
+]);
 /**
- * Convert all server_tool_use content blocks in the request body to tool_use.
+ * 判断 `tools` 数组中的某项是否为 Anthropic 服务端工具定义。
+ * 客户端自定义工具的 `type` 为 'custom' 或缺省，且通常带 `input_schema`；
+ * 服务端工具 `type` 形如 'web_search_20250305' / 'computer_20250124' / 'bash_20250124'
+ * / 'text_editor_20250124' / 'code_execution_20250522' 等，且无 `input_schema`。
+ */
+function isServerToolDefinition(tool) {
+    if (!tool || typeof tool !== 'object')
+        return false;
+    const type = tool.type;
+    // 自定义工具：type 缺省或 'custom'
+    if (type === undefined || type === null || type === 'custom')
+        return false;
+    if (typeof type !== 'string')
+        return true;
+    // 已知服务端工具类型前缀
+    const SERVER_TOOL_PREFIXES = [
+        'web_search',
+        'computer',
+        'bash',
+        'text_editor',
+        'code_execution',
+    ];
+    if (SERVER_TOOL_PREFIXES.some((p) => type.startsWith(p)))
+        return true;
+    // 兜底：带非 custom 的 type 且没有 input_schema，视为服务端/私有工具
+    if (!tool.input_schema)
+        return true;
+    return false;
+}
+/** 把任意值压平为纯文本字符串（用于降级服务端结果块内容） */
+function flattenToText(value) {
+    if (value == null)
+        return '';
+    if (typeof value === 'string')
+        return value;
+    if (Array.isArray(value)) {
+        return value
+            .map((item) => {
+            if (!item || typeof item !== 'object')
+                return String(item);
+            // 常见形态：{ type: 'text', text } / { type: 'web_search_tool_result', content: [...] }
+            if (typeof item.text === 'string')
+                return item.text;
+            if (typeof item.title === 'string')
+                return item.title;
+            if (Array.isArray(item.content))
+                return flattenToText(item.content);
+            if (item.url)
+                return `${item.url}`;
+            return JSON.stringify(item);
+        })
+            .filter(Boolean)
+            .join('\n');
+    }
+    if (typeof value === 'object') {
+        if (typeof value.text === 'string')
+            return value.text;
+        if (Array.isArray(value.content))
+            return flattenToText(value.content);
+        return JSON.stringify(value);
+    }
+    return String(value);
+}
+/**
+ * 清理请求体中所有"服务端工具"痕迹（内容块 + tools 定义）。
  *
- * Scans assistant messages in body.messages and replaces the block type.
- * Returns a shallow-cloned body with modified messages; original body is not mutated.
+ * 扫描 body.messages 中所有 role 的内容块，以及顶层 body.tools。
+ * 返回浅拷贝；无改动时原样返回原 body。
  */
-function convertServerToolUseToToolUse(body) {
-    if (!(body === null || body === void 0 ? void 0 : body.messages) || !Array.isArray(body.messages)) {
+function sanitizeServerToolArtifacts(body) {
+    if (!body || typeof body !== 'object')
         return body;
-    }
     let modified = false;
-    const newMessages = body.messages.map((msg) => {
-        // server_tool_use only appears in assistant messages
-        if (msg.role !== 'assistant' || !Array.isArray(msg.content)) {
-            return msg;
-        }
-        let msgModified = false;
-        const newContent = msg.content.map((block) => {
-            if ((block === null || block === void 0 ? void 0 : block.type) === 'server_tool_use') {
-                msgModified = true;
-                return Object.assign(Object.assign({}, block), { type: 'tool_use' });
+    let newBody = body;
+    // --- 1 & 2：处理 messages 内容块 ---
+    if (Array.isArray(body.messages)) {
+        const newMessages = body.messages.map((msg) => {
+            if (!msg || typeof msg !== 'object' || !Array.isArray(msg.content)) {
+                return msg;
+            }
+            let msgModified = false;
+            const newContent = msg.content.map((block) => {
+                if (!block || typeof block !== 'object')
+                    return block;
+                // assistant: server_tool_use → tool_use
+                if (block.type === 'server_tool_use') {
+                    msgModified = true;
+                    return Object.assign(Object.assign({}, block), { type: 'tool_use' });
+                }
+                // user: 服务端结果块 → 标准 tool_result（保持与上面改名的 tool_use 配对）
+                if (SERVER_RESULT_TYPES.has(block.type)) {
+                    msgModified = true;
+                    const text = flattenToText(block.content);
+                    return {
+                        type: 'tool_result',
+                        tool_use_id: block.tool_use_id,
+                        content: text || '[server tool result omitted]',
+                    };
+                }
+                return block;
+            });
+            if (msgModified) {
+                modified = true;
+                return Object.assign(Object.assign({}, msg), { content: newContent });
             }
-            return block;
+            return msg;
         });
-        if (msgModified) {
+        if (modified) {
+            newBody = Object.assign(Object.assign({}, newBody), { messages: newMessages });
+        }
+    }
+    // --- 3：清理 tools 数组中的服务端工具定义 ---
+    if (Array.isArray(newBody.tools) && newBody.tools.length > 0) {
+        const filteredTools = newBody.tools.filter((tool) => !isServerToolDefinition(tool));
+        if (filteredTools.length !== newBody.tools.length) {
             modified = true;
-            return Object.assign(Object.assign({}, msg), { content: newContent });
+            newBody = Object.assign(Object.assign({}, newBody), { tools: filteredTools });
         }
-        return msg;
-    });
-    if (!modified) {
-        return body;
     }
-    return Object.assign(Object.assign({}, body), { messages: newMessages });
+    return modified ? newBody : body;
+}
+/**
+ * @deprecated 别名，等价于 {@link sanitizeServerToolArtifacts}。
+ * 保留旧名以兼容既有导入；新代码请使用 sanitizeServerToolArtifacts。
+ */
+function convertServerToolUseToToolUse(body) {
+    return sanitizeServerToolArtifacts(body);
 }

package/dist/server/fs-database.js

@@ -55,6 +55,10 @@ const isClaudePermissionDefaultMode = (value) => {
 const isValidAutocompactPct = (v) => {
     return typeof v === 'number' && Number.isInteger(v) && v >= 1 && v <= 100;
 };
+// 最大重试次数校验：正整数（1-20），非法值返回 undefined（由 write 函数兜底默认 5）
+const isValidMaxRetries = (v) => {
+    return typeof v === 'number' && Number.isInteger(v) && v >= 1 && v <= 20;
+};
 const normalizeFailoverRecoverySeconds = (value) => {
     const parsed = typeof value === 'number' ? value : Number(value);
     if (!Number.isFinite(parsed) || parsed <= 0) {
@@ -836,6 +840,15 @@ class FileSystemDatabaseManager {
             if (typeof this.config.autocompactPctOverride !== 'undefined' && !isValidAutocompactPct(this.config.autocompactPctOverride)) {
                 this.config.autocompactPctOverride = undefined;
             }
+            if (typeof this.config.claudeMaxRetries !== 'undefined' && !isValidMaxRetries(this.config.claudeMaxRetries)) {
+                this.config.claudeMaxRetries = undefined;
+            }
+            if (typeof this.config.codexMaxRetries !== 'undefined' && !isValidMaxRetries(this.config.codexMaxRetries)) {
+                this.config.codexMaxRetries = undefined;
+            }
+            if (typeof this.config.opencodeMaxRetries !== 'undefined' && !isValidMaxRetries(this.config.opencodeMaxRetries)) {
+                this.config.opencodeMaxRetries = undefined;
+            }
             this.config.failoverRecoverySeconds = normalizeFailoverRecoverySeconds(this.config.failoverRecoverySeconds);
             if (typeof this.config.ruleGlobalTimeout !== 'number' || this.config.ruleGlobalTimeout <= 0) {
                 this.config.ruleGlobalTimeout = undefined;
@@ -1752,6 +1765,15 @@ class FileSystemDatabaseManager {
             if (typeof merged.autocompactPctOverride !== 'undefined' && !isValidAutocompactPct(merged.autocompactPctOverride)) {
                 merged.autocompactPctOverride = undefined;
             }
+            if (typeof merged.claudeMaxRetries !== 'undefined' && !isValidMaxRetries(merged.claudeMaxRetries)) {
+                merged.claudeMaxRetries = undefined;
+            }
+            if (typeof merged.codexMaxRetries !== 'undefined' && !isValidMaxRetries(merged.codexMaxRetries)) {
+                merged.codexMaxRetries = undefined;
+            }
+            if (typeof merged.opencodeMaxRetries !== 'undefined' && !isValidMaxRetries(merged.opencodeMaxRetries)) {
+                merged.opencodeMaxRetries = undefined;
+            }
             merged.failoverRecoverySeconds = normalizeFailoverRecoverySeconds(merged.failoverRecoverySeconds);
             if (typeof merged.ruleGlobalTimeout !== 'number' || merged.ruleGlobalTimeout <= 0) {
                 merged.ruleGlobalTimeout = undefined;

package/dist/server/main.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.start = exports.gracefulShutdown = void 0;
 const express_1 = __importDefault(require("express"));
 const cors_1 = __importDefault(require("cors"));
 const dotenv_1 = __importDefault(require("dotenv"));
@@ -263,7 +264,7 @@ const isClaudePermissionDefaultMode = (value) => {
 const isValidAutocompactPct = (v) => {
     return typeof v === 'number' && Number.isInteger(v) && v >= 1 && v <= 100;
 };
-const writeClaudeConfig = (_dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, permissionsDefaultMode_1, effortLevel_1, defaultModel_1, autocompactPctOverride_1, ...args_1) => __awaiter(void 0, [_dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, permissionsDefaultMode_1, effortLevel_1, defaultModel_1, autocompactPctOverride_1, ...args_1], void 0, function* (_dbManager, enableAgentTeams, enableBypassPermissionsSupport, permissionsDefaultMode, effortLevel, defaultModel, autocompactPctOverride, options = {}) {
+const writeClaudeConfig = (_dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, permissionsDefaultMode_1, effortLevel_1, defaultModel_1, autocompactPctOverride_1, maxRetries_1, ...args_1) => __awaiter(void 0, [_dbManager_1, enableAgentTeams_1, enableBypassPermissionsSupport_1, permissionsDefaultMode_1, effortLevel_1, defaultModel_1, autocompactPctOverride_1, maxRetries_1, ...args_1], void 0, function* (_dbManager, enableAgentTeams, enableBypassPermissionsSupport, permissionsDefaultMode, effortLevel, defaultModel, autocompactPctOverride, maxRetries, options = {}) {
     var _a;
     try {
         const homeDir = os_1.default.homedir();
@@ -318,7 +319,7 @@ const writeClaudeConfig = (_dbManager_1, enableAgentTeams_1, enableBypassPermiss
             ANTHROPIC_BASE_URL: `http://${clientHost}:${port}/claude-code`,
             API_TIMEOUT_MS: "3000000",
             CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: 1,
-            CLAUDE_CODE_MAX_RETRIES: 3
+            CLAUDE_CODE_MAX_RETRIES: maxRetries !== null && maxRetries !== void 0 ? maxRetries : 5
         };
         // 如果启用Agent Teams功能，添加对应的环境变量
         if (enableAgentTeams) {
@@ -416,7 +417,7 @@ const DEFAULT_CODEX_REASONING_EFFORT = 'high';
 const isCodexReasoningEffort = (value) => {
     return typeof value === 'string' && VALID_CODEX_REASONING_EFFORTS.includes(value);
 };
-const writeCodexConfig = (_dbManager_1, ...args_1) => __awaiter(void 0, [_dbManager_1, ...args_1], void 0, function* (_dbManager, modelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT, codexDefaultModel, enableMemories, options = {}) {
+const writeCodexConfig = (_dbManager_1, ...args_1) => __awaiter(void 0, [_dbManager_1, ...args_1], void 0, function* (_dbManager, modelReasoningEffort = DEFAULT_CODEX_REASONING_EFFORT, codexDefaultModel, enableMemories, maxRetries, options = {}) {
     var _a;
     try {
         const homeDir = os_1.default.homedir();
@@ -478,7 +479,7 @@ const writeCodexConfig = (_dbManager_1, ...args_1) => __awaiter(void 0, [_dbMana
                     name: "aicodeswitch",
                     base_url: `http://${clientHost}:${port}/codex`,
                     wire_api: "responses",
-                    stream_max_retries: 3,
+                    stream_max_retries: maxRetries !== null && maxRetries !== void 0 ? maxRetries : 5,
                     stream_retry_backoff: "fixed"
                 }
             }
@@ -697,7 +698,7 @@ const DEFAULT_OPENCODE_MODEL = 'claude-sonnet-4-20250514';
  * 的 /opencode/v1 端点（OpenAI Chat Completions 格式）。仅托管 provider.aicodeswitch
  * 段与 model/small_model/mcp 字段，其余用户配置（其它 provider、agent、command 等）保留。
  */
-const writeOpencodeConfig = (_dbManager_1, defaultModel_1, ...args_1) => __awaiter(void 0, [_dbManager_1, defaultModel_1, ...args_1], void 0, function* (_dbManager, defaultModel, options = {}) {
+const writeOpencodeConfig = (_dbManager_1, defaultModel_1, maxRetries_1, ...args_1) => __awaiter(void 0, [_dbManager_1, defaultModel_1, maxRetries_1, ...args_1], void 0, function* (_dbManager, defaultModel, maxRetries, options = {}) {
     var _a;
     try {
         const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 4567;
@@ -748,7 +749,8 @@ const writeOpencodeConfig = (_dbManager_1, defaultModel_1, ...args_1) => __await
                     name: 'AICodeSwitch',
                     options: {
                         baseURL: `http://${clientHost}:${port}/opencode/v1`,
-                        apiKey: 'api_key'
+                        apiKey: 'api_key',
+                        maxRetries: maxRetries !== null && maxRetries !== void 0 ? maxRetries : 5
                     },
                     models: {
                         [model]: { name: model }
@@ -856,14 +858,14 @@ const syncConfigsOnServerStartup = (dbManager) => __awaiter(void 0, void 0, void
     const claudeEffortLevel = isClaudeEffortLevel(config.claudeEffortLevel)
         ? config.claudeEffortLevel
         : DEFAULT_CLAUDE_EFFORT_LEVEL;
-    const claudeWritten = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, config.claudePermissionsDefaultMode, claudeEffortLevel, config.claudeDefaultModel, config.autocompactPctOverride);
+    const claudeWritten = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, config.claudePermissionsDefaultMode, claudeEffortLevel, config.claudeDefaultModel, config.autocompactPctOverride, config.claudeMaxRetries);
     console.log(`[Startup Config Sync] Claude Code config ${claudeWritten ? 'written' : 'skipped'}`);
     const modelReasoningEffort = isCodexReasoningEffort(config.codexModelReasoningEffort)
         ? config.codexModelReasoningEffort
         : DEFAULT_CODEX_REASONING_EFFORT;
-    const codexWritten = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel, config.codexEnableMemories);
+    const codexWritten = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel, config.codexEnableMemories, config.codexMaxRetries);
     console.log(`[Startup Config Sync] Codex config ${codexWritten ? 'written' : 'skipped'}`);
-    const opencodeWritten = yield writeOpencodeConfig(dbManager, config.opencodeDefaultModel);
+    const opencodeWritten = yield writeOpencodeConfig(dbManager, config.opencodeDefaultModel, config.opencodeMaxRetries);
     console.log(`[Startup Config Sync] OpenCode config ${opencodeWritten ? 'written' : 'skipped'}`);
 });
 const syncConfigsOnGlobalConfigUpdate = (dbManager) => __awaiter(void 0, void 0, void 0, function* () {
@@ -871,14 +873,14 @@ const syncConfigsOnGlobalConfigUpdate = (dbManager) => __awaiter(void 0, void 0,
     const claudeEffortLevel = isClaudeEffortLevel(config.claudeEffortLevel)
         ? config.claudeEffortLevel
         : DEFAULT_CLAUDE_EFFORT_LEVEL;
-    const claudeUpdated = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, config.claudePermissionsDefaultMode, claudeEffortLevel, config.claudeDefaultModel, config.autocompactPctOverride, { allowOverwriteRefresh: true });
+    const claudeUpdated = yield writeClaudeConfig(dbManager, config.enableAgentTeams, config.enableBypassPermissionsSupport, config.claudePermissionsDefaultMode, claudeEffortLevel, config.claudeDefaultModel, config.autocompactPctOverride, config.claudeMaxRetries, { allowOverwriteRefresh: true });
     console.log(`[Config Update Sync] Claude Code config ${claudeUpdated ? 'written' : 'skipped'}`);
     const modelReasoningEffort = isCodexReasoningEffort(config.codexModelReasoningEffort)
         ? config.codexModelReasoningEffort
         : DEFAULT_CODEX_REASONING_EFFORT;
-    const codexUpdated = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel, config.codexEnableMemories, { allowOverwriteRefresh: true });
+    const codexUpdated = yield writeCodexConfig(dbManager, modelReasoningEffort, config.codexDefaultModel, config.codexEnableMemories, config.codexMaxRetries, { allowOverwriteRefresh: true });
     console.log(`[Config Update Sync] Codex config ${codexUpdated ? 'written' : 'skipped'}`);
-    const opencodeUpdated = yield writeOpencodeConfig(dbManager, config.opencodeDefaultModel, { allowOverwriteRefresh: true });
+    const opencodeUpdated = yield writeOpencodeConfig(dbManager, config.opencodeDefaultModel, config.opencodeMaxRetries, { allowOverwriteRefresh: true });
     console.log(`[Config Update Sync] OpenCode config ${opencodeUpdated ? 'written' : 'skipped'}`);
 });
 const getCentralSkillsDir = () => {
@@ -1317,7 +1319,7 @@ const listInstalledSkills = () => {
 const registerRoutes = (dbManager, proxyServer) => __awaiter(void 0, void 0, void 0, function* () {
     updateProxyConfig(dbManager.getConfig());
     app.get('/health', (_req, res) => res.json({ status: 'ok' }));
-    // 数据就绪验证端点（供 Tauri 启动阶段确认后端完全可用）
+    // 数据就绪验证端点（供桌面端 Electron 启动阶段确认后端完全可用）
     app.get('/api/ready', (_req, res) => {
         const vendors = dbManager.getVendors();
         const routes = dbManager.getRoutes();
@@ -2328,7 +2330,7 @@ ${instruction}
             : isClaudePermissionDefaultMode(appConfig.claudePermissionsDefaultMode)
                 ? appConfig.claudePermissionsDefaultMode
                 : DEFAULT_CLAUDE_PERMISSION_DEFAULT_MODE;
-        const result = yield writeClaudeConfig(dbManager, enableAgentTeams, enableBypassPermissionsSupport, permissionsDefaultMode, undefined, appConfig.claudeDefaultModel, appConfig.autocompactPctOverride);
+        const result = yield writeClaudeConfig(dbManager, enableAgentTeams, enableBypassPermissionsSupport, permissionsDefaultMode, undefined, appConfig.claudeDefaultModel, appConfig.autocompactPctOverride, appConfig.claudeMaxRetries);
         applyWriteLocalRecords(proxyServer);
         res.json(result);
     })));
@@ -2344,7 +2346,7 @@ ${instruction}
         const enableMemories = requestedEnableMemories !== undefined
             ? !!requestedEnableMemories
             : !!appConfig.codexEnableMemories;
-        const result = yield writeCodexConfig(dbManager, modelReasoningEffort, appConfig.codexDefaultModel, enableMemories);
+        const result = yield writeCodexConfig(dbManager, modelReasoningEffort, appConfig.codexDefaultModel, enableMemories, appConfig.codexMaxRetries);
         applyWriteLocalRecords(proxyServer);
         res.json(result);
     })));
@@ -2353,7 +2355,7 @@ ${instruction}
         const appConfig = dbManager.getConfig();
         const requestedModel = typeof ((_a = req.body) === null || _a === void 0 ? void 0 : _a.defaultModel) === 'string' ? req.body.defaultModel : undefined;
         const defaultModel = requestedModel || appConfig.opencodeDefaultModel;
-        const result = yield writeOpencodeConfig(dbManager, defaultModel);
+        const result = yield writeOpencodeConfig(dbManager, defaultModel, appConfig.opencodeMaxRetries);
         applyWriteLocalRecords(proxyServer);
         res.json(result);
     })));
@@ -3804,6 +3806,26 @@ ${instruction}
 });
 // listen 就绪标志：区分"启动阶段"与"运行阶段"，启动期致命异常应让进程退出
 let listenReady = false;
+/**
+ * 是否以「内嵌进程」模式运行（例如被 Electron 主进程直接 require 并调用 start）。
+ * 该模式下：
+ *   - shutdown 流程结束后不调用 process.exit，把退出时机交还给宿主（Electron）
+ *   - 模块被 require 时不自动执行 start()，由宿主显式调用导出的 start
+ */
+const IN_PROCESS = process.env.AIC_IN_PROCESS === '1';
+// 保存当前服务实例的优雅关闭函数，供宿主（Electron 主进程）在退出前显式调用。
+let _gracefulShutdown = null;
+/**
+ * 供宿主进程调用的优雅关闭入口。
+ * 仅在 start() 成功注册 shutdown 后可用；调用后会恢复工具配置、关闭 DB / 日志、释放端口，
+ * 内嵌模式下不会触发 process.exit。
+ */
+const gracefulShutdown = (signal = 'HOST_QUIT') => {
+    if (_gracefulShutdown)
+        return _gracefulShutdown(signal);
+    return Promise.resolve();
+};
+exports.gracefulShutdown = gracefulShutdown;
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.mkdirSync(dataDir, { recursive: true });
     // 自动检测数据库类型并执行迁移（如果需要）
@@ -4021,25 +4043,31 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
                 })
             ]);
             console.log('Server stopped.');
-            process.exit(0);
+            // 内嵌进程模式下不主动退出，交由宿主（Electron）控制进程生命周期
+            if (!IN_PROCESS) {
+                process.exit(0);
+            }
         }))();
         return shutdownPromise;
     });
+    // 注册到模块级句柄，供宿主在退出前显式触发完整关闭流程
+    _gracefulShutdown = shutdown;
     process.on('SIGINT', () => { void shutdown('SIGINT'); });
     process.on('SIGTERM', () => { void shutdown('SIGTERM'); });
-    // 优雅关闭端点（供 Tauri 等外部调用者触发服务端完整清理流程）
+    // 优雅关闭端点（供 Electron 等外部调用者触发服务端完整清理流程）
     // 放在 shutdown 定义之后注册，确保闭包可引用
     app.post('/api/shutdown', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         res.json({ success: true });
         setImmediate(() => { void shutdown('HTTP_SHUTDOWN'); });
     })));
 });
+exports.start = start;
 // 全局未捕获异常处理 - 防止服务崩溃
 process.on('uncaughtException', (error) => {
     console.error('[Uncaught Exception] 服务遇到未捕获的异常:', error);
     console.error('[Uncaught Exception] 堆栈信息:', error.stack);
     // 启动阶段（listen 之前）的异常通常是致命的（依赖加载失败、初始化崩溃等），
-    // 静默吞掉会导致"进程在但不 listen"，Tauri 只能干等超时；此时退出让上层重新探测/诊断。
+    // 静默吞掉会导致"进程在但不 listen"，桌面端只能干等超时；此时退出让上层重新探测/诊断。
     if (!listenReady) {
         console.error('[Uncaught Exception] 发生在服务监听之前，退出进程');
         process.exit(1);
@@ -4052,7 +4080,11 @@ process.on('unhandledRejection', (reason) => {
         process.exit(1);
     }
 });
-start().catch((error) => {
-    console.error('Failed to start server:', error);
-    process.exit(1);
-});
+// 仅在被直接运行时（如 aicos start → node dist/server/main.js）自动启动；
+// 被 Electron 主进程 require 时（require.main !== module 或 IN_PROCESS）由宿主显式调用 start()。
+if (!IN_PROCESS && require.main === module) {
+    (0, exports.start)().catch((error) => {
+        console.error('Failed to start server:', error);
+        process.exit(1);
+    });
+}