aicodeswitch 5.1.2 → 5.2.0

package/dist/server/conversions/utils/tool-result.js

@@ -0,0 +1,35 @@
+"use strict";
+/**
+ * Tool result content block utilities.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureToolResultIds = ensureToolResultIds;
+/**
+ * 为所有缺少 id 的 tool_result 块补上 id。
+ *
+ * 部分 Claude 兼容端点（如 GLM）要求 tool_result 内容块必须包含 id 字段，
+ * 但标准 Claude API 的 tool_result 块仅有 tool_use_id 而不带 id。
+ *
+ * id 取值策略：优先使用 tool_use_id（与对应的 tool_use.id 保持一致），
+ * 若 tool_use_id 也不存在则生成唯一 id。
+ */
+function ensureToolResultIds(messages) {
+    let totalPatched = 0;
+    const result = messages.map(msg => {
+        if (msg.role !== 'user' || !Array.isArray(msg.content))
+            return msg;
+        let patched = false;
+        const newContent = msg.content.map((b) => {
+            if (b.type === 'tool_result' && !b.id) {
+                patched = true;
+                totalPatched++;
+                // 使用 tool_use_id 作为 id，保持与对应 tool_use 块的 id 一致
+                const id = b.tool_use_id || `toolu_${crypto.randomUUID().replace(/-/g, '').slice(0, 24)}`;
+                return Object.assign(Object.assign({}, b), { id });
+            }
+            return b;
+        });
+        return patched ? Object.assign(Object.assign({}, msg), { content: newContent }) : msg;
+    });
+    return { messages: result, patchedCount: totalPatched };
+}

package/dist/server/fs-database.js

@@ -1203,7 +1203,6 @@ class FileSystemDatabaseManager {
                 enableLogging: true,
                 logRetentionDays: 30,
                 maxLogSize: 100000,
-                apiKey: '',
                 enableFailover: true,
                 failoverRecoverySeconds: DEFAULT_FAILOVER_RECOVERY_SECONDS,
                 ruleGlobalTimeout: undefined,
@@ -1218,6 +1217,7 @@ class FileSystemDatabaseManager {
                 proxyUrl: '',
                 proxyUsername: '',
                 proxyPassword: '',
+                enableLanDiscovery: false,
             };
             // spread: current 覆盖 defaults，未来新增字段自动保留
             this.config = Object.assign(Object.assign({}, defaults), current);
@@ -1597,6 +1597,18 @@ class FileSystemDatabaseManager {
             yield this.saveRules();
             this.routes.splice(index, 1);
             yield this.saveRoutes();
+            // 级联清理：清除绑定到该路由的会话的绑定关系
+            let sessionChanged = false;
+            for (const session of this.sessions) {
+                if (session.routeId === id) {
+                    session.routeId = undefined;
+                    session.routeName = undefined;
+                    sessionChanged = true;
+                }
+            }
+            if (sessionChanged) {
+                yield this.saveSessions();
+            }
             return true;
         });
     }
@@ -2364,6 +2376,9 @@ class FileSystemDatabaseManager {
             if (service.inheritVendorApiBaseUrl !== undefined && typeof service.inheritVendorApiBaseUrl !== 'boolean') {
                 return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] inheritVendorApiBaseUrl 必须是布尔值` };
             }
+            if (service.inheritVendorAuthType !== undefined && typeof service.inheritVendorAuthType !== 'boolean') {
+                return { valid: false, error: `供应商[${index}](${vendor.id}) 的服务[${i}] inheritVendorAuthType 必须是布尔值` };
+            }
         }
         return { valid: true };
     }
@@ -2678,6 +2693,16 @@ class FileSystemDatabaseManager {
         });
     }
     // Statistics operations
+    /**
+     * 从 AccessKey 请求同步全局统计数据（不写入日志，仅更新统计）
+     */
+    syncStatisticsFromAccessKey(logData) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 构造一个带有 id 的 RequestLog 以复用 updateStatistics
+            const log = Object.assign(Object.assign({}, logData), { id: `ak-sync-${Date.now()}` });
+            yield this.updateStatistics(log);
+        });
+    }
     /**
      * 更新统计数据 - 在每次添加日志时调用
      */
@@ -3052,6 +3077,11 @@ class FileSystemDatabaseManager {
                 existing.highIqRuleId = session.highIqRuleId;
             if (Object.prototype.hasOwnProperty.call(session, 'highIqEnabledAt'))
                 existing.highIqEnabledAt = session.highIqEnabledAt;
+            // 保留已有的路由绑定（不传入时不覆盖）
+            if (session.routeId !== undefined)
+                existing.routeId = session.routeId;
+            if (session.routeName !== undefined)
+                existing.routeName = session.routeName;
         }
         else {
             // 创建新 session
@@ -3071,11 +3101,52 @@ class FileSystemDatabaseManager {
                 highIqMode: session.highIqMode,
                 highIqRuleId: session.highIqRuleId,
                 highIqEnabledAt: session.highIqEnabledAt,
+                routeId: session.routeId,
+                routeName: session.routeName,
             });
         }
         // 异步保存（不阻塞）
         this.saveSessions().catch(console.error);
     }
+    /**
+     * 绑定会话到路由
+     */
+    bindSessionRoute(sessionId, routeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const session = this.sessions.find(s => s.id === sessionId);
+            if (!session)
+                return null;
+            const route = this.routes.find(r => r.id === routeId);
+            if (!route)
+                return null;
+            session.routeId = routeId;
+            session.routeName = route.name;
+            yield this.saveSessions();
+            return session;
+        });
+    }
+    /**
+     * 解绑会话路由
+     */
+    unbindSessionRoute(sessionId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const session = this.sessions.find(s => s.id === sessionId);
+            if (!session)
+                return false;
+            session.routeId = undefined;
+            session.routeName = undefined;
+            yield this.saveSessions();
+            return true;
+        });
+    }
+    /**
+     * 获取绑定到指定路由的所有会话
+     */
+    getBoundSessions(routeId) {
+        return this.sessions
+            .filter(s => s.routeId === routeId)
+            .sort((a, b) => b.lastRequestAt - a.lastRequestAt);
+    }
     // 新增方法：获取规则黑名单状态
     getRuleBlacklistStatus(serviceId, routeId, contentType) {
         return __awaiter(this, void 0, void 0, function* () {