aicodeswitch 5.2.13 → 6.0.0

package/dist/server/fs-database.js

@@ -2323,6 +2323,8 @@ class FileSystemDatabaseManager {
                     lastRequestAt: now,
                     requestCount: 1,
                     totalTokens: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
                 };
                 this.sessions.push(session);
                 yield this.saveSessions();
@@ -2478,6 +2480,8 @@ class FileSystemDatabaseManager {
             existing.lastRequestAt = now;
             existing.requestCount++;
             existing.totalTokens += session.totalTokens || 0;
+            existing.inputTokens = (existing.inputTokens || 0) + (session.inputTokens || 0);
+            existing.outputTokens = (existing.outputTokens || 0) + (session.outputTokens || 0);
             if (session.vendorId !== undefined)
                 existing.vendorId = session.vendorId;
             if (session.vendorName !== undefined)
@@ -2510,6 +2514,8 @@ class FileSystemDatabaseManager {
                 lastRequestAt: now,
                 requestCount: 1,
                 totalTokens: session.totalTokens || 0,
+                inputTokens: session.inputTokens || 0,
+                outputTokens: session.outputTokens || 0,
                 vendorId: session.vendorId,
                 vendorName: session.vendorName,
                 serviceId: session.serviceId,

package/dist/server/main.js

@@ -32,8 +32,6 @@ 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 type_migration_1 = require("./type-migration");
 const config_metadata_1 = require("./config-metadata");
@@ -2514,19 +2512,6 @@ ${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: '获取工具状态失败' });
-        }
-    })));
     // MCP 工具管理相关路由
     app.get('/api/mcps', (_req, res) => {
         res.json(dbManager.getMCPs());
@@ -3563,26 +3548,12 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
         }
         setImmediate(() => process.exit(1));
     });
-    // 创建 WebSocket 服务器用于工具安装
-    const toolInstallWss = (0, websocket_service_1.createToolInstallationWSServer)();
     // 设置黑名单检查函数，用于在规则状态同步时检查黑名单是否已过期
     rules_status_service_1.rulesStatusBroadcaster.setBlacklistChecker((serviceId, routeId, contentType) => __awaiter(void 0, void 0, void 0, function* () {
         // 检查服务��否在黑名单中
         const isBlacklisted = yield dbManager.isServiceBlacklisted(serviceId, routeId, contentType);
         return isBlacklisted;
     }));
-    // 将 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 {
-            socket.destroy();
-        }
-    });
-    console.log(`WebSocket server for tool installation attached to ws://${clientHost}:${port}/api/tools/install`);
     let isShuttingDown = false;
     let shutdownPromise = null;
     const shutdown = (signal) => __awaiter(void 0, void 0, void 0, function* () {
@@ -3594,10 +3565,16 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
             console.log(`[Server] Received ${signal}, shutting down...`);
             // 立即停止监听以释放端口（同步关闭监听句柄，端口马上可用），
             // 避免在漫长的清理流程期间端口仍被占用，导致此时重启产生 EADDRINUSE 冲突。
-            // 现有连接会继续处理直到完成或超时；其回调与下面的清理流程并行等待。
             const serverClosedPromise = new Promise((resolve) => {
                 server.close(() => resolve());
             });
+            // 强制断开所有现存连接（含浏览器长连的 SSE：agent-map stream、rules-status
+            // 广播等）。否则这些连接永不自行关闭，server.close 的回调要等满下面 5s 超时
+            // 才触发，表现为 Ctrl+C 后「卡很久才打印 Server stopped.」。closeAllConnections
+            // 立即销毁所有 socket，让 close 回调几乎瞬时完成。
+            if (typeof server.closeAllConnections === 'function') {
+                server.closeAllConnections();
+            }
             // 服务终止前恢复配置文件（适用于 aicos stop 与 Ctrl+C）
             try {
                 const claudeRestored = yield restoreClaudeConfig();

package/dist/server/performance-tracker.js

@@ -68,8 +68,12 @@ class ServicePerformanceTracker {
             try {
                 const raw = yield promises_1.default.readFile(this.filePath, 'utf-8');
                 const parsed = JSON.parse(raw);
-                if (parsed && parsed.vendors)
+                if (parsed && parsed.vendors) {
                     this.file = parsed;
+                    // 旧数据文件可能缺新增的 token 字段（sumInputTokens/sumTotalTokens），
+                    // 直接累加会得到 undefined+N=NaN，污染派生值。这里补齐为 0。
+                    this.migrateBuckets(this.file);
+                }
             }
             catch (_a) {
                 // 首次启动或文件损坏，使用空桶
@@ -77,6 +81,42 @@ class ServicePerformanceTracker {
             }
         });
     }
+    /** 加载后补齐旧数据缺失的桶字段，避免 undefined 累加成 NaN */
+    migrateBuckets(file) {
+        for (const v of Object.values(file.vendors)) {
+            if (v.vendorRollup)
+                this.normalizeAggregate(v.vendorRollup);
+            for (const s of Object.values(v.services || {})) {
+                if (s.serviceRollup)
+                    this.normalizeAggregate(s.serviceRollup);
+                for (const agg of Object.values(s.models || {})) {
+                    this.normalizeAggregate(agg);
+                }
+            }
+        }
+    }
+    normalizeAggregate(agg) {
+        this.normalizeBucket(agg.precise);
+        this.normalizeBucket(agg.estimated);
+        for (const b of Object.values(agg.hourly || {}))
+            this.normalizeBucket(b);
+    }
+    normalizeBucket(b) {
+        if (!b)
+            return;
+        if (typeof b.count !== 'number')
+            b.count = 0;
+        if (typeof b.sumTtftMs !== 'number')
+            b.sumTtftMs = 0;
+        if (typeof b.sumTps !== 'number')
+            b.sumTps = 0;
+        if (typeof b.totalOutputTokens !== 'number')
+            b.totalOutputTokens = 0;
+        if (typeof b.sumInputTokens !== 'number')
+            b.sumInputTokens = 0;
+        if (typeof b.sumTotalTokens !== 'number')
+            b.sumTotalTokens = 0;
+    }
     /**
      * 记录一次请求的性能数据点（三级同步聚合）。
      * 纯内存操作，不阻塞调用方。
@@ -257,7 +297,7 @@ class ServicePerformanceTracker {
         };
     }
     emptyBucket() {
-        return { count: 0, sumTtftMs: 0, sumTps: 0, totalOutputTokens: 0 };
+        return { count: 0, sumTtftMs: 0, sumTps: 0, totalOutputTokens: 0, sumInputTokens: 0, sumTotalTokens: 0 };
     }
     accumulate(agg, m, hour, withExtremes) {
         var _a;
@@ -268,6 +308,7 @@ class ServicePerformanceTracker {
         const bucket = m.timingAccuracy === 'precise' ? agg.precise : agg.estimated;
         const hasTtft = m.timingAccuracy === 'precise' && typeof m.ttftMs === 'number';
         const hasTps = typeof m.tokensPerSecond === 'number';
+        // token 量与计时精度无关，precise/estimated 桶都累加
         bucket.count += 1;
         if (hasTtft)
             bucket.sumTtftMs += m.ttftMs;
@@ -275,18 +316,37 @@ class ServicePerformanceTracker {
             bucket.sumTps += m.tokensPerSecond;
         if (m.outputTokens)
             bucket.totalOutputTokens += m.outputTokens;
-        // 小时桶（仅精确样本计入走势，避免估算样本污染）
+        if (m.inputTokens)
+            bucket.sumInputTokens += m.inputTokens;
+        if (m.totalTokens)
+            bucket.sumTotalTokens += m.totalTokens;
+        // 小时走势桶：
+        //  - count/sumTtftMs/sumTps 仅精确样本计入（避免估算样本污染 TTFT/TPM 均值）
+        //  - token 三项与精度无关，所有样本都计入走势（含非流式）
+        const hb = (_a = agg.hourly[hour]) !== null && _a !== void 0 ? _a : (agg.hourly[hour] = this.emptyBucket());
+        let touchedHourly = false;
         if (m.timingAccuracy === 'precise') {
-            const hb = (_a = agg.hourly[hour]) !== null && _a !== void 0 ? _a : (agg.hourly[hour] = this.emptyBucket());
             hb.count += 1;
             if (hasTtft)
                 hb.sumTtftMs += m.ttftMs;
             if (hasTps)
                 hb.sumTps += m.tokensPerSecond;
-            if (m.outputTokens)
-                hb.totalOutputTokens += m.outputTokens;
-            this.trimHourly(agg.hourly);
+            touchedHourly = true;
+        }
+        if (m.outputTokens) {
+            hb.totalOutputTokens += m.outputTokens;
+            touchedHourly = true;
+        }
+        if (m.inputTokens) {
+            hb.sumInputTokens += m.inputTokens;
+            touchedHourly = true;
         }
+        if (m.totalTokens) {
+            hb.sumTotalTokens += m.totalTokens;
+            touchedHourly = true;
+        }
+        if (touchedHourly)
+            this.trimHourly(agg.hourly);
         // 极值（仅模型级、仅精确样本）
         if (withExtremes && m.timingAccuracy === 'precise') {
             if (hasTtft) {
@@ -315,9 +375,14 @@ class ServicePerformanceTracker {
     // ---------------- 内部：派生 ----------------
     derive(agg) {
         const p = agg.precise;
+        const e = agg.estimated;
         const count = p.count;
         const avgTtftMs = count > 0 ? p.sumTtftMs / count : 0;
         const avgTps = count > 0 ? p.sumTps / count : 0;
+        // token 量跨 precise+estimated 求和（含非流式样本）
+        const totalOutputTokens = p.totalOutputTokens + e.totalOutputTokens;
+        const totalInputTokens = p.sumInputTokens + e.sumInputTokens;
+        const totalTokens = p.sumTotalTokens + e.sumTotalTokens;
         return {
             count,
             avgTtftMs,
@@ -327,7 +392,9 @@ class ServicePerformanceTracker {
             minTps: agg.minTps,
             maxTps: agg.maxTps,
             errorCount: agg.errorCount,
-            totalOutputTokens: p.totalOutputTokens,
+            totalOutputTokens,
+            totalInputTokens,
+            totalTokens,
             successRate: count + agg.errorCount > 0 ? count / (count + agg.errorCount) : 0,
         };
     }
@@ -355,6 +422,9 @@ class ServicePerformanceTracker {
             count: b.count,
             avgTtftMs: b.count > 0 ? b.sumTtftMs / b.count : 0,
             avgTpm: b.count > 0 ? (b.sumTps / b.count) * 60 : 0,
+            inputTokens: b.sumInputTokens,
+            outputTokens: b.totalOutputTokens,
+            totalTokens: b.sumTotalTokens,
         }));
     }
     locateService(serviceId) {

package/dist/server/proxy-server.js

@@ -67,6 +67,13 @@ const coding_plan_1 = require("./coding-plan");
 const coding_plan_headers_1 = require("./coding-plan-headers");
 const auth_1 = require("./auth");
 const SUPPORTED_TARGETS = ['claude-code', 'codex'];
+/**
+ * Fallback（回退原始配置）路径的虚拟供应商归属。
+ * 该路径转发的请求不属于任何用户配置的供应商/服务，故用一组固定 ID + 名称
+ * 把它纳入服务性能统计（service-performance.json），便于在测速面板单独呈现。
+ */
+const FALLBACK_VENDOR_ID = 'fallback-vendor';
+const FALLBACK_VENDOR_NAME = '原始配置 / 直连';
 /** 默认模型列表 */
 const DEFAULT_MODELS = [
     { id: 'claude-sonnet-4-20250514', owned_by: 'anthropic' },
@@ -275,12 +282,16 @@ class ProxyServer {
      * 流式：依据 streamTiming 精确计算 TTFT 与生成阶段吞吐；非流式：端到端估算（estimated）。
      */
     emitPerformance(params) {
+        var _a;
         const tracker = this.performanceTracker;
         if (!tracker)
             return;
         const { statusCode, startTime, usage, streamTiming, service, vendorId, vendorName, model } = params;
         const isError = statusCode >= 400;
+        const inputTokens = usage === null || usage === void 0 ? void 0 : usage.inputTokens;
         const outputTokens = usage === null || usage === void 0 ? void 0 : usage.outputTokens;
+        const computedTotal = (inputTokens || 0) + (outputTokens || 0);
+        const totalTokens = (_a = usage === null || usage === void 0 ? void 0 : usage.totalTokens) !== null && _a !== void 0 ? _a : (computedTotal > 0 ? computedTotal : undefined);
         const responseMs = Date.now() - startTime;
         let ttftMs;
         let tokensPerSecond;
@@ -296,7 +307,11 @@ class ProxyServer {
         else if (outputTokens && responseMs > 0) {
             tokensPerSecond = outputTokens / (responseMs / 1000);
         }
-        tracker.recordPerformance(vendorId !== null && vendorId !== void 0 ? vendorId : service.vendorId, vendorName, service.id, service.name, model, { ttftMs, tokensPerSecond, outputTokens, timingAccuracy, isError });
+        // 解析最终归属：Fallback 临时服务没有真实 vendor，service.vendorId 兜底为虚拟供应商；
+        // 此时 vendorName 也为空，补上虚拟供应商名，确保不被 recordPerformance 的三元组校验丢弃。
+        const effectiveVendorId = vendorId !== null && vendorId !== void 0 ? vendorId : service.vendorId;
+        const effectiveVendorName = vendorName !== null && vendorName !== void 0 ? vendorName : (effectiveVendorId === FALLBACK_VENDOR_ID ? FALLBACK_VENDOR_NAME : undefined);
+        tracker.recordPerformance(effectiveVendorId, effectiveVendorName, service.id, service.name, model, { ttftMs, tokensPerSecond, outputTokens, inputTokens, totalTokens, timingAccuracy, isError });
     }
     /**
      * 从请求中提取 API Key（支持三种 Header，按优先级依次尝试）
@@ -1260,6 +1275,7 @@ class ProxyServer {
                 const tempService = {
                     id: 'fallback-service',
                     name: 'Original Config',
+                    vendorId: FALLBACK_VENDOR_ID,
                     apiUrl: originalConfig.apiUrl,
                     apiKey: originalConfig.apiKey,
                     authType: originalConfig.authType,
@@ -3347,8 +3363,28 @@ class ProxyServer {
             });
         return { converter: adapter, extractUsage };
     }
+    /**
+     * 将 SSEEventCollector 归一化后的 usage（{input_tokens, output_tokens, total_tokens, cache_read_input_tokens}）
+     * 映射为 TokenUsage。collector 已遍历全部事件并合并 Anthropic message_start/message_delta + OpenAI/Gemini 字段，
+     * 因此这里无需再区分上游格式。
+     */
+    tokenUsageFromCollected(extracted) {
+        var _a;
+        if (!extracted)
+            return undefined;
+        const inputTokens = extracted.input_tokens || 0;
+        const outputTokens = extracted.output_tokens || 0;
+        const computedTotal = inputTokens + outputTokens;
+        const totalTokens = (_a = extracted.total_tokens) !== null && _a !== void 0 ? _a : (computedTotal > 0 ? computedTotal : undefined);
+        return {
+            inputTokens,
+            outputTokens,
+            totalTokens,
+            cacheReadInputTokens: extracted.cache_read_input_tokens || 0,
+        };
+    }
     extractTokenUsageFromResponse(responseData, sourceType) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         if (!responseData)
             return undefined;
         const format = (0, source_type_mapping_1.sourceTypeToFormat)(sourceType);
@@ -3364,14 +3400,15 @@ class ProxyServer {
             };
         }
         if (format === 'completions' || format === 'responses') {
-            const usage = responseData === null || responseData === void 0 ? void 0 : responseData.usage;
+            // 标准 Responses 非流式 usage 在顶层；个别上游/中转会嵌在 response.usage 下，做兜底
+            const usage = (_a = responseData === null || responseData === void 0 ? void 0 : responseData.usage) !== null && _a !== void 0 ? _a : (_b = responseData === null || responseData === void 0 ? void 0 : responseData.response) === null || _b === void 0 ? void 0 : _b.usage;
             if (!usage)
                 return undefined;
             return {
                 inputTokens: (usage === null || usage === void 0 ? void 0 : usage.input_tokens) || (usage === null || usage === void 0 ? void 0 : usage.prompt_tokens) || 0,
                 outputTokens: (usage === null || usage === void 0 ? void 0 : usage.output_tokens) || (usage === null || usage === void 0 ? void 0 : usage.completion_tokens) || 0,
                 totalTokens: (usage === null || usage === void 0 ? void 0 : usage.total_tokens) || 0,
-                cacheReadInputTokens: (usage === null || usage === void 0 ? void 0 : usage.cached_tokens) || (usage === null || usage === void 0 ? void 0 : usage.cache_read_input_tokens) || 0,
+                cacheReadInputTokens: (usage === null || usage === void 0 ? void 0 : usage.cached_tokens) || (usage === null || usage === void 0 ? void 0 : usage.cache_read_input_tokens) || ((_c = usage === null || usage === void 0 ? void 0 : usage.input_tokens_details) === null || _c === void 0 ? void 0 : _c.cached_tokens) || 0,
             };
         }
         if (format === 'claude') {
@@ -3379,7 +3416,7 @@ class ProxyServer {
                 return {
                     inputTokens: (responseData === null || responseData === void 0 ? void 0 : responseData.input_tokens) || 0,
                     outputTokens: (responseData === null || responseData === void 0 ? void 0 : responseData.output_tokens) || 0,
-                    totalTokens: ((_a = responseData === null || responseData === void 0 ? void 0 : responseData.input_tokens) !== null && _a !== void 0 ? _a : 0) + ((_b = responseData === null || responseData === void 0 ? void 0 : responseData.output_tokens) !== null && _b !== void 0 ? _b : 0) || undefined,
+                    totalTokens: ((_d = responseData === null || responseData === void 0 ? void 0 : responseData.input_tokens) !== null && _d !== void 0 ? _d : 0) + ((_e = responseData === null || responseData === void 0 ? void 0 : responseData.output_tokens) !== null && _e !== void 0 ? _e : 0) || undefined,
                     cacheReadInputTokens: (responseData === null || responseData === void 0 ? void 0 : responseData.cache_read_input_tokens) || 0,
                 };
             }
@@ -3389,7 +3426,7 @@ class ProxyServer {
             return {
                 inputTokens: (usage === null || usage === void 0 ? void 0 : usage.input_tokens) || 0,
                 outputTokens: (usage === null || usage === void 0 ? void 0 : usage.output_tokens) || 0,
-                totalTokens: ((_c = usage === null || usage === void 0 ? void 0 : usage.input_tokens) !== null && _c !== void 0 ? _c : 0) + ((_d = usage === null || usage === void 0 ? void 0 : usage.output_tokens) !== null && _d !== void 0 ? _d : 0) || undefined,
+                totalTokens: ((_f = usage === null || usage === void 0 ? void 0 : usage.input_tokens) !== null && _f !== void 0 ? _f : 0) + ((_g = usage === null || usage === void 0 ? void 0 : usage.output_tokens) !== null && _g !== void 0 ? _g : 0) || undefined,
                 cacheReadInputTokens: (usage === null || usage === void 0 ? void 0 : usage.cache_read_input_tokens) || 0,
             };
         }
@@ -3409,7 +3446,7 @@ class ProxyServer {
             return {
                 inputTokens: (usage === null || usage === void 0 ? void 0 : usage.input_tokens) || 0,
                 outputTokens: (usage === null || usage === void 0 ? void 0 : usage.output_tokens) || 0,
-                totalTokens: ((_e = usage === null || usage === void 0 ? void 0 : usage.input_tokens) !== null && _e !== void 0 ? _e : 0) + ((_f = usage === null || usage === void 0 ? void 0 : usage.output_tokens) !== null && _f !== void 0 ? _f : 0) || undefined,
+                totalTokens: ((_h = usage === null || usage === void 0 ? void 0 : usage.input_tokens) !== null && _h !== void 0 ? _h : 0) + ((_j = usage === null || usage === void 0 ? void 0 : usage.output_tokens) !== null && _j !== void 0 ? _j : 0) || undefined,
                 cacheReadInputTokens: (usage === null || usage === void 0 ? void 0 : usage.cache_read_input_tokens) || 0,
             };
         }
@@ -3427,10 +3464,37 @@ class ProxyServer {
             const sessionId = this.defaultExtractSessionId(req, targetType) || '-';
             // Agent Map：在途请求注册（active 状态判定依据）
             const _accessKeyCtxAtStart = req._accessKeyCtx;
+            // 后台类请求（count_tokens / compact / background 规则）不重置「本轮通知标记」，避免主任务结束后的
+            // 续发请求重复触发结束通知
+            const _isBgRequest = rule.contentType === 'background'
+                || rule.contentType === 'compact'
+                || this.isCountTokensPath(req.path)
+                || this.isCountTokensPath(req.originalUrl);
+            // 思考类请求：复用路由同款识别（rule.contentType==='thinking' 或请求体带 thinking/reasoning 信号）。
+            // 思考期间用更宽的静默上限，避免思考静默被误判为「上游停滞」而弹通知。
+            const _isThinking = rule.contentType === 'thinking' || this.hasThinkingSignal(req.body);
+            res.locals._agentMapThinking = _isThinking;
             agent_map_1.agentMapService.startRequest(sessionId, targetType, {
                 source: _accessKeyCtxAtStart ? 'access-key' : 'global',
                 keyId: (_a = _accessKeyCtxAtStart === null || _accessKeyCtxAtStart === void 0 ? void 0 : _accessKeyCtxAtStart.accessKey) === null || _a === void 0 ? void 0 : _a.id,
                 keyName: (_b = _accessKeyCtxAtStart === null || _accessKeyCtxAtStart === void 0 ? void 0 : _accessKeyCtxAtStart.accessKey) === null || _b === void 0 ? void 0 : _b.name,
+                background: _isBgRequest,
+                thinking: _isThinking,
+            });
+            // 安全网：无论走哪条分支（含编程套餐拒绝、配额拦截、异常等早退，导致 finalizeLog 未被调用），
+            // 都在响应关闭时确保 endRequest 配对执行一次，杜绝在途计数泄漏（「永远卡在进行中」）。
+            res.on('close', () => {
+                // 仅保证 endRequest 配对执行一次（防在途计数泄漏）。用独立标记 _agentMapEnded，
+                // 不再与 finalizeLog 的 onFinalized 共用标记 —— 否则 res 'close' 先于 finalizeLog 触发时
+                // 会把标记置位，导致 finalizeLog 跳过 onFinalized（requestCount / model / token 永不更新）。
+                if (res.locals._agentMapEnded)
+                    return;
+                res.locals._agentMapEnded = true;
+                agent_map_1.agentMapService.endRequest(sessionId, {
+                    isStream: !!res.locals._agentMapStream,
+                    thinking: !!res.locals._agentMapThinking,
+                });
+                agent_map_1.agentMapService.reevaluate(sessionId);
             });
             const vendor = this.dbManager.getVendorByServiceId(service.id);
             console.log(`\x1b[32m[Request Start]\x1b[0m client=${targetType}, session=${sessionId}, rule=${rule.id}(${rule.contentType}), vendor=${(vendor === null || vendor === void 0 ? void 0 : vendor.name) || '-'}, service=${service.name}, model=${rule.targetModel || ((_c = req.body) === null || _c === void 0 ? void 0 : _c.model) || '-'}`);
@@ -3611,10 +3675,19 @@ class ProxyServer {
                     service, vendorId: vendor === null || vendor === void 0 ? void 0 : vendor.id, vendorName: vendor === null || vendor === void 0 ? void 0 : vendor.name,
                     model: (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || ((_a = req.body) === null || _a === void 0 ? void 0 : _a.model),
                 });
-                // Agent Map：在途请求注销 + 活动/状态采集广播（独立于 enableLogging，仅执行一次）
-                if (!res.locals._agentMapRecorded) {
-                    res.locals._agentMapRecorded = true;
-                    agent_map_1.agentMapService.endRequest(sessionId);
+                // Agent Map：在途请求注销 + 活动/状态采集广播（独立于 enableLogging）
+                // 注意：endRequest 与 onFinalized 用各自独立的标记，二者解耦。
+                // 这样即便 res 'close' 安全网已先执行 endRequest（_agentMapEnded=true），onFinalized 仍会在此执行 ——
+                // 修复「requestCount / model / token 不更新」：旧实现二者共用 _agentMapRecorded，'close' 抢先置位会让此处整块跳过。
+                if (!res.locals._agentMapEnded) {
+                    res.locals._agentMapEnded = true;
+                    agent_map_1.agentMapService.endRequest(sessionId, {
+                        isStream: !!res.locals._agentMapStream,
+                        thinking: !!res.locals._agentMapThinking,
+                    });
+                }
+                if (!res.locals._agentMapFinalized) {
+                    res.locals._agentMapFinalized = true;
                     const _akCtx = req._accessKeyCtx;
                     const _tokensDelta = (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.totalTokens) ||
                         (((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0) + ((usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0));
@@ -3631,6 +3704,9 @@ class ProxyServer {
                         // 避免规则未配置 targetModel 时回退成编程工具提交的 req.body.model
                         model: (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || ((_d = req.body) === null || _d === void 0 ? void 0 : _d.model),
                         tokensDelta: _tokensDelta,
+                        // 输入/输出拆分（3D 连线两段用）；usageForLog 已规范化为驼峰字段
+                        inputTokensDelta: (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0,
+                        outputTokensDelta: (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0,
                         body: req.body,
                         downstreamResponseBody: downstreamResponseBodyForLog !== null && downstreamResponseBodyForLog !== void 0 ? downstreamResponseBodyForLog : responseBodyForLog,
                         responseBody: responseBodyForLog,
@@ -3806,6 +3882,9 @@ class ProxyServer {
                         serviceName: service.name,
                         model: (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model) || ((_o = req.body) === null || _o === void 0 ? void 0 : _o.model),
                         totalTokens,
+                        // 输入/输出拆分持久化（与 totalTokens 同口径），供 Agent Map 重启后恢复
+                        inputTokens: (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.inputTokens) || 0,
+                        outputTokens: (usageForLog === null || usageForLog === void 0 ? void 0 : usageForLog.outputTokens) || 0,
                         highIqMode: rule.contentType === 'high-iq' ? true : existingSession === null || existingSession === void 0 ? void 0 : existingSession.highIqMode,
                         highIqRuleId: rule.contentType === 'high-iq' ? rule.id : existingSession === null || existingSession === void 0 ? void 0 : existingSession.highIqRuleId,
                         highIqEnabledAt: rule.contentType === 'high-iq'
@@ -4149,9 +4228,19 @@ class ProxyServer {
                     const serializer = new streaming_1.SSESerializerTransform();
                     const downstreamChunkCollector = new chunk_collector_1.ChunkCollectorTransform(() => {
                         rules_status_service_1.rulesStatusBroadcaster.refreshRuleInUse(route.id, rule.id);
+                        // Agent Map 心跳：每个流经的下游 chunk 都视为「会话仍活跃」，刷新活动时钟（节流由 ChunkCollector 内部 5s 上限控制）
+                        // 同时把当前流式请求的实时累计 usage（input/output）一并推送，使前端节点在流式过程中随 token 增长实时上移
+                        const u = eventCollector.extractUsage();
+                        agent_map_1.agentMapService.heartbeat(sessionId, u ? {
+                            inputTokens: u.input_tokens || 0,
+                            outputTokens: u.output_tokens || 0,
+                        } : undefined);
                     });
                     // 服务性能打点：记录首/末 SSE 事件时间，用于 TTFT 与生成阶段吞吐
                     streamTiming = new stream_timing_transform_1.StreamTimingTransform(startTime);
+                    // Agent Map：SSE 流已建立 —— 记一个在途流，状态机据此区分「同步/流式」活跃判定
+                    res.locals._agentMapStream = true;
+                    agent_map_1.agentMapService.markStreaming(sessionId);
                     const compactResponseSanitizer = rule.contentType === 'compact' && targetType === 'claude-code'
                         ? new ClaudeCompactResponseSanitizer()
                         : null;
@@ -4160,7 +4249,7 @@ class ProxyServer {
                     const modelRewriter = originalModel ? new model_rewrite_transform_1.ModelRewriteTransform(originalModel) : null;
                     responseHeadersForLog = this.normalizeResponseHeaders(responseHeaders);
                     // 使用 transformSSEToTool 方法选择转换器
-                    const { converter, extractUsage } = this.transformSSEToTool(targetType, sourceType);
+                    const { converter } = this.transformSSEToTool(targetType, sourceType);
                     this.copyResponseHeaders(responseHeaders, res);
                     // 收集日志：responseBody/streamChunks 记录上游原始响应；downstreamResponseBody 记录实际下发内容
                     const finalizeChunks = () => {
@@ -4177,13 +4266,7 @@ class ProxyServer {
                                 extractedUsage = converterUsage || extractedUsage;
                             }
                         }
-                        // 如果有自定义的 extractUsage 函数，使用它
-                        if (extractUsage && extractedUsage) {
-                            usageForLog = extractUsage(extractedUsage);
-                        }
-                        else if (extractedUsage) {
-                            usageForLog = this.extractTokenUsageFromResponse(extractedUsage, sourceType);
-                        }
+                        usageForLog = this.tokenUsageFromCollected(extractedUsage);
                     };
                     // 监听 res 的错误事件
                     res.on('error', (err) => {
@@ -4984,7 +5067,7 @@ class ProxyServer {
                     // 流式 model 回写：将上游返回的 model 改写为客户端请求时的原始模型名
                     const originalModel = (_d = req.body) === null || _d === void 0 ? void 0 : _d.model;
                     const modelRewriter = originalModel ? new model_rewrite_transform_1.ModelRewriteTransform(originalModel) : null;
-                    const { converter, extractUsage } = this.transformSSEByFormat(clientFormat, sourceType);
+                    const { converter } = this.transformSSEByFormat(clientFormat, sourceType);
                     this.copyResponseHeaders(responseHeaders, res);
                     res.status(response.status);
                     const finalizeStreamChunks = () => {
@@ -4997,12 +5080,7 @@ class ProxyServer {
                             if (converterUsage)
                                 extractedUsage = converterUsage;
                         }
-                        if (extractUsage && extractedUsage) {
-                            usageForLog = extractUsage(extractedUsage);
-                        }
-                        else if (extractedUsage) {
-                            usageForLog = this.extractTokenUsageFromResponse(extractedUsage, sourceType);
-                        }
+                        usageForLog = this.tokenUsageFromCollected(extractedUsage);
                     };
                     try {
                         yield new Promise((resolve, reject) => {