aicodeswitch 2.0.9 → 2.0.11

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### 2.0.11 (2026-02-03)
+
+### 2.0.10 (2026-02-03)
+
 ### 2.0.9 (2026-02-02)
 
 ### 2.0.8 (2026-02-02)

package/CLAUDE.md

@@ -139,7 +139,7 @@ aicos version            # Show current version information
   - `image-understanding`: Requests with image content
   - `thinking`: Requests with reasoning/thinking signals
   - `long-context`: Requests with large context (≥12000 chars or ≥8000 max tokens)
-  - `background`: Background/priority requests
+  - `background`: Background/priority requests, including `/count_tokens` endpoint requests and token counting requests with `{"role": "user", "content": "count"}`
   - `default`: All other requests
 
 ### Request Transformation
@@ -163,7 +163,18 @@ aicos version            # Show current version information
 ### Logging
 - Request logs: Detailed API call records with token usage
 - Access logs: System access records
-- Error logs: Error and exception records
+- Error logs: Error and exception records (includes upstream request information when available)
+- **Data Sanitization**:
+  - Sensitive authentication fields (api_key, authorization, password, secret, etc.) are automatically masked in the UI
+  - Technical fields like `max_tokens`, `input_tokens`, `output_tokens` are NOT masked - they are legitimate API parameters
+- **Session Management**:
+  - Tracks user sessions based on session ID (Claude Code: `metadata.user_id`, Codex: `headers.session_id`)
+  - Auto-generates session title from first user message content:
+    - Extracts text from first user message
+    - Cleans up whitespace and newlines
+    - Intelligently truncates at word boundaries (max 100 chars)
+    - Adds "..." for truncated titles
+  - Records first request time, last request time, request count, and total tokens per session
 
 ### Usage Limits Auto-Sync
 - **Service-Level Limits**: API services can have token and request count limits configured
@@ -203,3 +214,4 @@ aicos version            # Show current version information
 * 所有对话请使用中文。生成代码中的文案及相关注释根据代码原本的语言生成。
 * 在服务端，直接使用 __dirname 来获取当前目录，不要使用 process.cwd()
 * 每次有新的变化时，你需要更新 CLAUDE.md 来让文档保持最新。
+* 禁止在项目中使用依赖GPU的css样式处理。

package/dist/server/database.js

@@ -264,6 +264,13 @@ class DatabaseManager {
                 this.db.exec('ALTER TABLE api_services ADD COLUMN auth_type TEXT DEFAULT NULL;');
                 console.log('[DB] Migration completed: auth_type column added');
             }
+            // 检查rules表是否有is_disabled字段（临时屏蔽功能）
+            const hasIsDisabled = rulesColumns.some((col) => col.name === 'is_disabled');
+            if (!hasIsDisabled) {
+                console.log('[DB] Running migration: Adding is_disabled column to rules table');
+                this.db.exec('ALTER TABLE rules ADD COLUMN is_disabled INTEGER DEFAULT 0;');
+                console.log('[DB] Migration completed: is_disabled column added');
+            }
         });
     }
     migrateMaxOutputTokensToModelLimits() {
@@ -378,10 +385,13 @@ class DatabaseManager {
         total_tokens_used INTEGER DEFAULT 0,
         reset_interval INTEGER,
         last_reset_at INTEGER,
+        token_reset_base_time INTEGER,
         request_count_limit INTEGER,
         total_requests_used INTEGER DEFAULT 0,
         request_reset_interval INTEGER,
         request_last_reset_at INTEGER,
+        request_reset_base_time INTEGER,
+        is_disabled INTEGER DEFAULT 0,
         created_at INTEGER NOT NULL,
         updated_at INTEGER NOT NULL,
         FOREIGN KEY (route_id) REFERENCES routes(id) ON DELETE CASCADE,
@@ -631,6 +641,7 @@ class DatabaseManager {
             requestResetInterval: row.request_reset_interval,
             requestLastResetAt: row.request_last_reset_at,
             requestResetBaseTime: row.request_reset_base_time,
+            isDisabled: row.is_disabled === 1,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         }));
@@ -658,6 +669,7 @@ class DatabaseManager {
             requestResetInterval: row.request_reset_interval,
             requestLastResetAt: row.request_last_reset_at,
             requestResetBaseTime: row.request_reset_base_time,
+            isDisabled: row.is_disabled === 1,
             createdAt: row.created_at,
             updatedAt: row.updated_at,
         };
@@ -666,21 +678,41 @@ class DatabaseManager {
         const id = crypto_1.default.randomUUID();
         const now = Date.now();
         this.db
-            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, token_reset_base_time, request_count_limit, total_requests_used, request_reset_interval, request_last_reset_at, request_reset_base_time, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout || null, route.tokenLimit || null, route.totalTokensUsed || 0, route.resetInterval || null, route.lastResetAt || null, route.tokenResetBaseTime || null, route.requestCountLimit || null, route.totalRequestsUsed || 0, route.requestResetInterval || null, route.requestLastResetAt || null, route.requestResetBaseTime || null, now, now);
+            .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, token_reset_base_time, request_count_limit, total_requests_used, request_reset_interval, request_last_reset_at, request_reset_base_time, is_disabled, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+            .run(id, route.routeId, route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout || null, route.tokenLimit || null, route.totalTokensUsed || 0, route.resetInterval || null, route.lastResetAt || null, route.tokenResetBaseTime || null, route.requestCountLimit || null, route.totalRequestsUsed || 0, route.requestResetInterval || null, route.requestLastResetAt || null, route.requestResetBaseTime || null, route.isDisabled ? 1 : 0, now, now);
         return Object.assign(Object.assign({}, route), { id, createdAt: now, updatedAt: now });
     }
     updateRule(id, route) {
         const now = Date.now();
         const result = this.db
-            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, timeout = ?, token_limit = ?, reset_interval = ?, token_reset_base_time = ?, request_count_limit = ?, request_reset_interval = ?, request_reset_base_time = ?, updated_at = ? WHERE id = ?')
-            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout !== undefined ? route.timeout : null, route.tokenLimit !== undefined ? route.tokenLimit : null, route.resetInterval !== undefined ? route.resetInterval : null, route.tokenResetBaseTime !== undefined ? route.tokenResetBaseTime : null, route.requestCountLimit !== undefined ? route.requestCountLimit : null, route.requestResetInterval !== undefined ? route.requestResetInterval : null, route.requestResetBaseTime !== undefined ? route.requestResetBaseTime : null, now, id);
+            .prepare('UPDATE rules SET content_type = ?, target_service_id = ?, target_model = ?, replaced_model = ?, sort_order = ?, timeout = ?, token_limit = ?, reset_interval = ?, token_reset_base_time = ?, request_count_limit = ?, request_reset_interval = ?, request_reset_base_time = ?, is_disabled = ?, updated_at = ? WHERE id = ?')
+            .run(route.contentType, route.targetServiceId, route.targetModel || null, route.replacedModel || null, route.sortOrder || 0, route.timeout !== undefined ? route.timeout : null, route.tokenLimit !== undefined ? route.tokenLimit : null, route.resetInterval !== undefined ? route.resetInterval : null, route.tokenResetBaseTime !== undefined ? route.tokenResetBaseTime : null, route.requestCountLimit !== undefined ? route.requestCountLimit : null, route.requestResetInterval !== undefined ? route.requestResetInterval : null, route.requestResetBaseTime !== undefined ? route.requestResetBaseTime : null, route.isDisabled !== undefined ? (route.isDisabled ? 1 : 0) : null, now, id);
         return result.changes > 0;
     }
     deleteRule(id) {
         const result = this.db.prepare('DELETE FROM rules WHERE id = ?').run(id);
         return result.changes > 0;
     }
+    /**
+     * 切换规则的临时屏蔽状态
+     * @param ruleId 规则ID
+     * @returns 是否成功
+     */
+    toggleRuleDisabled(ruleId) {
+        const rule = this.getRule(ruleId);
+        if (!rule) {
+            return { success: false, isDisabled: false };
+        }
+        const now = Date.now();
+        const newDisabledState = !rule.isDisabled;
+        const result = this.db
+            .prepare('UPDATE rules SET is_disabled = ?, updated_at = ? WHERE id = ?')
+            .run(newDisabledState ? 1 : 0, now, ruleId);
+        return {
+            success: result.changes > 0,
+            isDisabled: newDisabledState
+        };
+    }
     /**
      * 增加规则的token使用量
      * @param ruleId 规则ID
@@ -1134,8 +1166,8 @@ class DatabaseManager {
                 // Import rules
                 for (const rule of importData.rules) {
                     this.db
-                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, token_reset_base_time, request_count_limit, total_requests_used, request_reset_interval, request_last_reset_at, request_reset_base_time, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
-                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.timeout || null, rule.tokenLimit || null, rule.totalTokensUsed || 0, rule.resetInterval || null, rule.lastResetAt || null, rule.tokenResetBaseTime || null, rule.requestCountLimit || null, rule.totalRequestsUsed || 0, rule.requestResetInterval || null, rule.requestLastResetAt || null, rule.requestResetBaseTime || null, rule.createdAt, rule.updatedAt);
+                        .prepare('INSERT INTO rules (id, route_id, content_type, target_service_id, target_model, replaced_model, sort_order, timeout, token_limit, total_tokens_used, reset_interval, last_reset_at, token_reset_base_time, request_count_limit, total_requests_used, request_reset_interval, request_last_reset_at, request_reset_base_time, is_disabled, created_at, updated_at) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)')
+                        .run(rule.id, rule.routeId, rule.contentType || 'default', rule.targetServiceId, rule.targetModel || null, rule.replacedModel || null, rule.sortOrder || 0, rule.timeout || null, rule.tokenLimit || null, rule.totalTokensUsed || 0, rule.resetInterval || null, rule.lastResetAt || null, rule.tokenResetBaseTime || null, rule.requestCountLimit || null, rule.totalRequestsUsed || 0, rule.requestResetInterval || null, rule.requestLastResetAt || null, rule.requestResetBaseTime || null, rule.isDisabled ? 1 : 0, rule.createdAt, rule.updatedAt);
                 }
                 // Update config
                 this.updateConfig(importData.config);

package/dist/server/main.js

@@ -25,6 +25,9 @@ const os_1 = __importDefault(require("os"));
 const auth_1 = require("./auth");
 const version_check_1 = require("./version-check");
 const utils_1 = require("./utils");
+const tools_service_1 = require("./tools-service");
+const websocket_service_1 = require("./websocket-service");
+const rules_status_service_1 = require("./rules-status-service");
 const config_metadata_1 = require("./config-metadata");
 const config_1 = require("./config");
 const appDir = path_1.default.join(os_1.default.homedir(), '.aicodeswitch');
@@ -760,6 +763,7 @@ const registerRoutes = (dbManager, proxyServer) => {
     app.delete('/api/rules/:id', (req, res) => res.json(dbManager.deleteRule(req.params.id)));
     app.put('/api/rules/:id/reset-tokens', (req, res) => res.json(dbManager.resetRuleTokenUsage(req.params.id)));
     app.put('/api/rules/:id/reset-requests', (req, res) => res.json(dbManager.resetRuleRequestCount(req.params.id)));
+    app.put('/api/rules/:id/toggle-disable', (req, res) => res.json(dbManager.toggleRuleDisabled(req.params.id)));
     // 解除规则的黑名单状态
     app.put('/api/rules/:id/clear-blacklist', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { id } = req.params;
@@ -1355,6 +1359,19 @@ ${instruction}
             res.json({ success: false });
         }
     })));
+    // 工具安装检测相关路由
+    app.get('/api/tools/status', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
+        console.log('[API] GET /api/tools/status - 获取工具安装状态');
+        try {
+            const status = yield (0, tools_service_1.getToolsInstallationStatus)();
+            console.log('[API] 工具安装状态:', status);
+            res.json(status);
+        }
+        catch (error) {
+            console.error('[API] 获取工具状态失败:', error);
+            res.status(500).json({ error: '获取工具状态失败' });
+        }
+    })));
 };
 const start = () => __awaiter(void 0, void 0, void 0, function* () {
     fs_1.default.mkdirSync(dataDir, { recursive: true });
@@ -1376,6 +1393,28 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     const server = app.listen(port, host, () => {
         console.log(`Admin server running on http://${host}:${port}`);
     });
+    // 创建 WebSocket 服务器用于工具安装
+    const toolInstallWss = (0, websocket_service_1.createToolInstallationWSServer)();
+    // 创建 WebSocket 服务器用于规则状态
+    const rulesStatusWss = (0, rules_status_service_1.createRulesStatusWSServer)();
+    // 将 WebSocket 服务器附加到 HTTP 服务器
+    server.on('upgrade', (request, socket, head) => {
+        if (request.url === '/api/tools/install') {
+            toolInstallWss.handleUpgrade(request, socket, head, (ws) => {
+                toolInstallWss.emit('connection', ws, request);
+            });
+        }
+        else if (request.url === '/api/rules/status') {
+            rulesStatusWss.handleUpgrade(request, socket, head, (ws) => {
+                rulesStatusWss.emit('connection', ws, request);
+            });
+        }
+        else {
+            socket.destroy();
+        }
+    });
+    console.log(`WebSocket server for tool installation attached to ws://${host}:${port}/api/tools/install`);
+    console.log(`WebSocket server for rules status attached to ws://${host}:${port}/api/rules/status`);
     const shutdown = () => __awaiter(void 0, void 0, void 0, function* () {
         console.log('Shutting down server...');
         dbManager.close();

package/dist/server/proxy-server.js

@@ -51,6 +51,7 @@ const stream_1 = require("stream");
 const crypto_1 = __importDefault(require("crypto"));
 const streaming_1 = require("./transformers/streaming");
 const chunk_collector_1 = require("./transformers/chunk-collector");
+const rules_status_service_1 = require("./rules-status-service");
 const claude_openai_1 = require("./transformers/claude-openai");
 const SUPPORTED_TARGETS = ['claude-code', 'codex'];
 class ProxyServer {
@@ -627,6 +628,10 @@ class ProxyServer {
             const rules = this.getRulesByRouteId(routeId);
             if (!rules || rules.length === 0)
                 return undefined;
+            // 过滤掉被屏蔽的规则
+            const enabledRules = rules.filter(rule => !rule.isDisabled);
+            if (enabledRules.length === 0)
+                return undefined;
             const body = req.body;
             const requestModel = body === null || body === void 0 ? void 0 : body.model;
             // 1. 首先查找 model-mapping 类型的规则，按 sortOrder 降序匹配
@@ -704,22 +709,26 @@ class ProxyServer {
         const rules = this.getRulesByRouteId(routeId);
         if (!rules || rules.length === 0)
             return [];
+        // 过滤掉被屏蔽的规则
+        const enabledRules = rules.filter(rule => !rule.isDisabled);
+        if (enabledRules.length === 0)
+            return [];
         const body = req.body;
         const requestModel = body === null || body === void 0 ? void 0 : body.model;
         const candidates = [];
         // 1. Model mapping rules
         if (requestModel) {
-            const modelMappingRules = rules.filter(rule => rule.contentType === 'model-mapping' &&
+            const modelMappingRules = enabledRules.filter(rule => rule.contentType === 'model-mapping' &&
                 rule.replacedModel &&
                 requestModel.includes(rule.replacedModel));
             candidates.push(...modelMappingRules);
         }
         // 2. Content type specific rules
         const contentType = this.determineContentType(req);
-        const contentTypeRules = rules.filter(rule => rule.contentType === contentType);
+        const contentTypeRules = enabledRules.filter(rule => rule.contentType === contentType);
         candidates.push(...contentTypeRules);
         // 3. Default rules
-        const defaultRules = rules.filter(rule => rule.contentType === 'default');
+        const defaultRules = enabledRules.filter(rule => rule.contentType === 'default');
         candidates.push(...defaultRules);
         // 4. 检查并重置到期的规则
         candidates.forEach(rule => {
@@ -754,6 +763,10 @@ class ProxyServer {
         const body = req.body;
         if (!body)
             return 'default';
+        // 检查是否为 count_tokens 请求（后台类型）
+        if (req.path.includes('/count_tokens')) {
+            return 'background';
+        }
         const explicitType = this.getExplicitContentType(req, body);
         if (explicitType) {
             return explicitType;
@@ -882,6 +895,17 @@ class ProxyServer {
     }
     hasBackgroundSignal(body) {
         var _a, _b, _c;
+        // 检测 count tokens 请求：messages 只有一条，role 为 "user"，content 为 "count"
+        const messages = body === null || body === void 0 ? void 0 : body.messages;
+        if (Array.isArray(messages) && messages.length === 1) {
+            const firstMessage = messages[0];
+            if ((firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.role) === 'user' &&
+                ((firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.content) === 'count' ||
+                    (typeof (firstMessage === null || firstMessage === void 0 ? void 0 : firstMessage.content) === 'string' && firstMessage.content.trim() === 'count'))) {
+                return true;
+            }
+        }
+        // 检测其他后台信号
         const candidates = [
             body === null || body === void 0 ? void 0 : body.background,
             (_a = body === null || body === void 0 ? void 0 : body.metadata) === null || _a === void 0 ? void 0 : _a.background,
@@ -1239,6 +1263,7 @@ class ProxyServer {
     /**
      * 提取会话标题（默认方法）
      * 对于新会话，尝试从第一条消息的内容中提取标题
+     * 优化：使用第一条用户消息的完整内容，并智能截取
      */
     defaultExtractSessionTitle(request, sessionId) {
         var _a;
@@ -1254,21 +1279,51 @@ class ProxyServer {
             const firstUserMessage = messages.find((msg) => msg.role === 'user');
             if (firstUserMessage) {
                 const content = firstUserMessage.content;
+                let rawText = '';
                 if (typeof content === 'string') {
-                    // 截取前50个字符作为标题
-                    return content.slice(0, 50).trim();
+                    rawText = content;
                 }
                 else if (Array.isArray(content)) {
                     // 处理结构化内容（如图片+文本）
                     const textBlock = content.find((block) => (block === null || block === void 0 ? void 0 : block.type) === 'text');
                     if (textBlock === null || textBlock === void 0 ? void 0 : textBlock.text) {
-                        return textBlock.text.slice(0, 50).trim();
+                        rawText = textBlock.text;
                     }
                 }
+                if (rawText) {
+                    return this.formatSessionTitle(rawText);
+                }
             }
         }
         return undefined;
     }
+    /**
+     * 格式化会话标题
+     * - 去除多余空白和换行符
+     * - 智能截取，在单词边界处截断
+     * - 限制最大长度为100个字符
+     */
+    formatSessionTitle(text) {
+        // 去除多余空白和换行符，替换为单个空格
+        let formatted = text
+            .replace(/\s+/g, ' ') // 多个空白字符替换为单个空格
+            .replace(/[\r\n]+/g, ' ') // 换行符替换为空格
+            .trim();
+        // 限制最大长度
+        const maxLength = 100;
+        if (formatted.length <= maxLength) {
+            return formatted;
+        }
+        // 在单词边界处截断
+        let truncated = formatted.slice(0, maxLength);
+        const lastSpaceIndex = truncated.lastIndexOf(' ');
+        if (lastSpaceIndex > maxLength * 0.7) {
+            // 如果最后一个空格位置在长度的70%之后，在空格处截断
+            truncated = truncated.slice(0, lastSpaceIndex);
+        }
+        // 添加省略号
+        return truncated.trim() + '...';
+    }
     /**
      * 根据源工具类型和目标API类型,映射请求路径
      * @param sourceTool 源工具类型 (claude-code 或 codex)
@@ -1320,6 +1375,8 @@ class ProxyServer {
             let streamChunksForLog;
             let upstreamRequestForLog;
             let actuallyUsedProxy = false; // 标记是否实际使用了代理
+            // 标记规则正在使用
+            rules_status_service_1.rulesStatusBroadcaster.markRuleInUse(route.id, rule.id);
             const finalizeLog = (statusCode, error) => __awaiter(this, void 0, void 0, function* () {
                 var _a, _b;
                 if (logged)
@@ -1389,6 +1446,11 @@ class ProxyServer {
                     const totalTokens = (usageForLog.inputTokens || 0) + (usageForLog.outputTokens || 0);
                     if (totalTokens > 0) {
                         this.dbManager.incrementRuleTokenUsage(rule.id, totalTokens);
+                        // 获取更新后的规则数据并广播
+                        const updatedRule = this.dbManager.getRule(rule.id);
+                        if (updatedRule) {
+                            rules_status_service_1.rulesStatusBroadcaster.broadcastUsageUpdate(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
+                        }
                     }
                 }
                 // 更新规则的请求次数（只在成功请求时更新）
@@ -1398,6 +1460,11 @@ class ProxyServer {
                     // 检查是否是重复请求（如网络重试）
                     if (!this.isRequestProcessed(requestHash)) {
                         this.dbManager.incrementRuleRequestCount(rule.id, 1);
+                        // 获取更新后的规则数据并广播
+                        const updatedRule = this.dbManager.getRule(rule.id);
+                        if (updatedRule) {
+                            rules_status_service_1.rulesStatusBroadcaster.broadcastUsageUpdate(rule.id, updatedRule.totalTokensUsed || 0, updatedRule.totalRequestsUsed || 0);
+                        }
                     }
                     // 定期清理过期缓存
                     if (Math.random() < 0.01) { // 1%概率清理，避免每次都清理
@@ -1533,6 +1600,7 @@ class ProxyServer {
                             }
                             // 收集stream chunks（每个chunk是一个完整的SSE事件）
                             streamChunksForLog = eventCollector.getChunks();
+                            console.log('[Proxy] Stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
                             void finalizeLog(res.statusCode);
                         });
                         // 监听 res 的错误事件
@@ -1553,6 +1621,7 @@ class ProxyServer {
                                         errorStack: error.stack,
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                                        upstreamRequest: upstreamRequestForLog,
                                     });
                                 }
                                 catch (logError) {
@@ -1602,6 +1671,7 @@ class ProxyServer {
                                 }
                             }
                             streamChunksForLog = eventCollector.getChunks();
+                            console.log('[Proxy] Codex stream request finished, collected chunks:', (streamChunksForLog === null || streamChunksForLog === void 0 ? void 0 : streamChunksForLog.length) || 0);
                             void finalizeLog(res.statusCode);
                         });
                         // 监听 res 的错误事件
@@ -1622,6 +1692,7 @@ class ProxyServer {
                                         errorStack: error.stack,
                                         requestHeaders: this.normalizeHeaders(req.headers),
                                         requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                                        upstreamRequest: upstreamRequestForLog,
                                     });
                                 }
                                 catch (logError) {
@@ -1676,6 +1747,7 @@ class ProxyServer {
                                     errorStack: error.stack,
                                     requestHeaders: this.normalizeHeaders(req.headers),
                                     requestBody: req.body ? JSON.stringify(req.body) : undefined,
+                                    upstreamRequest: upstreamRequestForLog,
                                 });
                             }
                             catch (logError) {
@@ -1751,6 +1823,7 @@ class ProxyServer {
                     usageForLog = this.extractTokenUsage(responseData === null || responseData === void 0 ? void 0 : responseData.usage);
                     // 记录原始响应体
                     responseBodyForLog = typeof responseData === 'string' ? responseData : JSON.stringify(responseData);
+                    console.log('[Proxy] Non-stream response logged, body length:', (responseBodyForLog === null || responseBodyForLog === void 0 ? void 0 : responseBodyForLog.length) || 0);
                     this.copyResponseHeaders(responseHeaders, res);
                     if (contentType.includes('application/json')) {
                         res.status(response.status).json(responseData);

package/dist/server/rules-status-service.js

@@ -0,0 +1,197 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RulesStatusWS = exports.rulesStatusBroadcaster = exports.RulesStatusBroadcaster = void 0;
+exports.createRulesStatusWSServer = createRulesStatusWSServer;
+// @ts-ignore - ws 类型声明可能需要手动安装 @types/ws
+const ws_1 = require("ws");
+/**
+ * 规则状态 WebSocket 连接管理
+ */
+class RulesStatusWS {
+    constructor(ws, req) {
+        Object.defineProperty(this, "ws", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.ws = ws;
+        console.log(`[RulesStatusWS] 新的 WebSocket 连接: ${req.socket.remoteAddress}`);
+        this.ws.on('close', () => {
+            console.log(`[RulesStatusWS] WebSocket 连接关闭`);
+        });
+        this.ws.on('error', (err) => {
+            console.error(`[RulesStatusWS] WebSocket 错误:`, err);
+        });
+    }
+    /**
+     * 发送规则状态消息到客户端
+     */
+    sendStatus(message) {
+        if (this.ws.readyState === ws_1.WebSocket.OPEN) {
+            this.ws.send(JSON.stringify(message));
+        }
+    }
+}
+exports.RulesStatusWS = RulesStatusWS;
+/**
+ * 规则状态广播服务
+ * 管理所有连接的客户端，负责广播规则使用状态
+ */
+class RulesStatusBroadcaster {
+    constructor() {
+        Object.defineProperty(this, "clients", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Set()
+        });
+        Object.defineProperty(this, "activeRules", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        }); // routeId -> Set of ruleIds
+        Object.defineProperty(this, "ruleTimeouts", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new Map()
+        });
+        Object.defineProperty(this, "INACTIVITY_TIMEOUT", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 30000
+        }); // 30秒无活动后标记为空闲
+    }
+    /**
+     * 添加客户端
+     */
+    addClient(client) {
+        this.clients.add(client);
+        console.log(`[RulesStatusBroadcaster] 客户端已连接，当前客户端数: ${this.clients.size}`);
+    }
+    /**
+     * 移除客户端
+     */
+    removeClient(client) {
+        this.clients.delete(client);
+        console.log(`[RulesStatusBroadcaster] 客户端已断开，当前客户端数: ${this.clients.size}`);
+    }
+    /**
+     * 标记规则正在使用
+     */
+    markRuleInUse(routeId, ruleId) {
+        // 添加到活动规则集合
+        if (!this.activeRules.has(routeId)) {
+            this.activeRules.set(routeId, new Set());
+        }
+        this.activeRules.get(routeId).add(ruleId);
+        // 清除之前的超时定时器
+        const timeoutKey = `${routeId}:${ruleId}`;
+        const existingTimeout = this.ruleTimeouts.get(timeoutKey);
+        if (existingTimeout) {
+            clearTimeout(existingTimeout);
+        }
+        // 广播状态
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'in_use',
+                timestamp: Date.now(),
+            },
+        });
+        // 设置超时定时器，如果30秒内没有新活动则标记为空闲
+        const timeout = setTimeout(() => {
+            this.markRuleIdle(routeId, ruleId);
+        }, this.INACTIVITY_TIMEOUT);
+        this.ruleTimeouts.set(timeoutKey, timeout);
+    }
+    /**
+     * 标记规则空闲
+     */
+    markRuleIdle(routeId, ruleId) {
+        const timeoutKey = `${routeId}:${ruleId}`;
+        // 清除超时定时器
+        const existingTimeout = this.ruleTimeouts.get(timeoutKey);
+        if (existingTimeout) {
+            clearTimeout(existingTimeout);
+            this.ruleTimeouts.delete(timeoutKey);
+        }
+        // 从活动规则集合中移除
+        if (this.activeRules.has(routeId)) {
+            this.activeRules.get(routeId).delete(ruleId);
+            if (this.activeRules.get(routeId).size === 0) {
+                this.activeRules.delete(routeId);
+            }
+        }
+        // 广播空闲状态
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'idle',
+                timestamp: Date.now(),
+            },
+        });
+    }
+    /**
+     * 广播规则使用量更新
+     */
+    broadcastUsageUpdate(ruleId, totalTokensUsed, totalRequestsUsed) {
+        this.broadcastStatus({
+            type: 'rule_status',
+            data: {
+                ruleId,
+                status: 'in_use',
+                totalTokensUsed,
+                totalRequestsUsed,
+                timestamp: Date.now(),
+            },
+        });
+    }
+    /**
+     * 广播消息到所有客户端
+     */
+    broadcastStatus(message) {
+        const deadClients = [];
+        this.clients.forEach((client) => {
+            try {
+                client.sendStatus(message);
+            }
+            catch (error) {
+                console.error('[RulesStatusBroadcaster] 发送消息失败:', error);
+                deadClients.push(client);
+            }
+        });
+        // 清理断开的客户端
+        deadClients.forEach((client) => {
+            this.removeClient(client);
+        });
+    }
+    /**
+     * 获取当前活动的规则列表
+     */
+    getActiveRules() {
+        return new Map(this.activeRules);
+    }
+}
+exports.RulesStatusBroadcaster = RulesStatusBroadcaster;
+// 全局单例
+exports.rulesStatusBroadcaster = new RulesStatusBroadcaster();
+/**
+ * 创建 WebSocket 服务器用于规则状态
+ */
+function createRulesStatusWSServer() {
+    const wss = new ws_1.WebSocketServer({ noServer: true });
+    wss.on('connection', (ws, req) => {
+        const wsHandler = new RulesStatusWS(ws, req);
+        exports.rulesStatusBroadcaster.addClient(wsHandler);
+        ws.on('close', () => {
+            exports.rulesStatusBroadcaster.removeClient(wsHandler);
+        });
+    });
+    return wss;
+}