aicodeswitch 5.2.13 → 6.0.1

package/dist/server/proxy-server.js

@@ -66,7 +66,14 @@ const compact_1 = require("./conversions/compact");
 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'];
+const SUPPORTED_TARGETS = ['claude-code', 'codex', 'opencode'];
+/**
+ * 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' },
@@ -122,6 +129,19 @@ function apiPathToClientFormat(apiPath) {
         case '/v1/models': return null;
     }
 }
+/**
+ * 根据客户端工具类型推断其原生 API 格式（Format）。
+ * - claude-code → claude（Anthropic Messages）
+ * - codex → responses（OpenAI Responses）
+ * - opencode → completions（OpenAI Chat Completions，经由 @ai-sdk/openai-compatible）
+ */
+function clientFormatForTool(tool) {
+    if (tool === 'codex')
+        return 'responses';
+    if (tool === 'opencode')
+        return 'completions';
+    return 'claude';
+}
 class ClaudeCompactResponseSanitizer extends stream_1.Transform {
     constructor() {
         super({ objectMode: true });
@@ -275,12 +295,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 +320,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，按优先级依次尝试）
@@ -364,6 +392,9 @@ class ProxyServer {
         if (path === '/codex' || path.startsWith('/codex/')) {
             return 'codex';
         }
+        if (path === '/opencode' || path.startsWith('/opencode/')) {
+            return 'opencode';
+        }
         return undefined;
     }
     inferToolFromRequest(req) {
@@ -372,6 +403,8 @@ class ProxyServer {
             return 'claude-code';
         if (path.startsWith('/codex'))
             return 'codex';
+        if (path.startsWith('/opencode'))
+            return 'opencode';
         return 'claude-code';
     }
     buildRelayTags(relayed, useOriginalConfig = false) {
@@ -732,7 +765,7 @@ class ProxyServer {
                     tags: this.buildRelayTags(hasRelayAttempt),
                 });
                 // 确定目标类型
-                const targetType = req.path.startsWith('/claude-code/') ? 'claude-code' : 'codex';
+                const targetType = this.inferToolFromRequest(req);
                 // 记录错误日志 - 包含请求详情和最后失败的服务信息
                 const _lastFailedVendor = lastFailedService ? this.dbManager.getVendorByServiceId(lastFailedService.id) : undefined;
                 yield this.dbManager.addErrorLog({
@@ -798,7 +831,7 @@ class ProxyServer {
                 }
                 // Add error log - 包含请求详情
                 if (!accessKeyCtx) {
-                    const targetType = req.path.startsWith('/claude-code/') ? 'claude-code' : 'codex';
+                    const targetType = this.inferToolFromRequest(req);
                     yield this.dbManager.addErrorLog({
                         timestamp: Date.now(),
                         method: req.method,
@@ -840,6 +873,8 @@ class ProxyServer {
         this.app.use('/claude-code', this.createFixedRouteHandler('claude-code'));
         this.app.use('/codex/', this.createFixedRouteHandler('codex'));
         this.app.use('/codex', this.createFixedRouteHandler('codex'));
+        this.app.use('/opencode/', this.createFixedRouteHandler('opencode'));
+        this.app.use('/opencode', this.createFixedRouteHandler('opencode'));
     }
     createFixedRouteHandler(targetType) {
         return (req, res) => __awaiter(this, void 0, void 0, function* () {
@@ -1169,6 +1204,9 @@ class ProxyServer {
         else if (req.path.startsWith('/codex/')) {
             tool = 'codex';
         }
+        else if (req.path.startsWith('/opencode/')) {
+            tool = 'opencode';
+        }
         if (!tool)
             return undefined;
         // 优先检查会话级路由绑定
@@ -1209,6 +1247,9 @@ class ProxyServer {
             else if (req.path.startsWith('/codex/')) {
                 targetType = 'codex';
             }
+            else if (req.path.startsWith('/opencode/')) {
+                targetType = 'opencode';
+            }
             if (!targetType) {
                 return false;
             }
@@ -1260,10 +1301,11 @@ class ProxyServer {
                 const tempService = {
                     id: 'fallback-service',
                     name: 'Original Config',
+                    vendorId: FALLBACK_VENDOR_ID,
                     apiUrl: originalConfig.apiUrl,
                     apiKey: originalConfig.apiKey,
                     authType: originalConfig.authType,
-                    sourceType: originalConfig.sourceType || (targetType === 'claude-code' ? 'claude' : 'openai'),
+                    sourceType: originalConfig.sourceType || (targetType === 'claude-code' ? 'claude' : targetType === 'opencode' ? 'openai-chat' : 'openai'),
                     createdAt: Date.now(),
                     updatedAt: Date.now(),
                 };
@@ -3094,6 +3136,16 @@ class ProxyServer {
                 return sessionId[0] || null;
             }
         }
+        else if (type === 'opencode') {
+            // OpenCode 经 @ai-sdk/openai-compatible 发送 chat completions，尝试从 headers 提取 session 标识
+            const sessionId = request.headers['session-id'] || request.headers['session_id'] || request.headers['x-session-id'];
+            if (typeof sessionId === 'string') {
+                return sessionId;
+            }
+            if (Array.isArray(sessionId)) {
+                return sessionId[0] || null;
+            }
+        }
         return null;
     }
     /**
@@ -3283,6 +3335,14 @@ class ProxyServer {
         if (tool === 'codex' && this.isClaudeSource(source)) {
             return `${apiUrl}/v1/messages`;
         }
+        // opencode 请求 claude 类型接口，使用 claude messages 接口处理
+        if (tool === 'opencode' && this.isClaudeSource(source)) {
+            return `${apiUrl}/v1/messages`;
+        }
+        // opencode 请求 openai(responses) 类型接口，使用 responses 接口处理
+        if (tool === 'opencode' && this.isOpenAISource(source)) {
+            return `${apiUrl}/v1/responses`;
+        }
         // 透传路径
         return `${apiUrl}${originalPath}`;
     }
@@ -3296,7 +3356,7 @@ class ProxyServer {
      * @returns 转换后往服务商API接口的数据
      */
     transformRequestToUpstream(tool, source, payloadData, targetModel, providerConfig, serverToolConfig, sanitizeBody) {
-        const clientFormat = tool === 'codex' ? 'responses' : 'claude';
+        const clientFormat = clientFormatForTool(tool);
         const upstreamFormat = (0, source_type_mapping_1.sourceTypeToFormat)(source);
         const result = (0, index_1.transformRequest)({ fromFormat: clientFormat, toFormat: upstreamFormat, body: payloadData, providerConfig, serverToolConfig, sanitizeBody });
         const body = result.body;
@@ -3316,7 +3376,7 @@ class ProxyServer {
      * @param responseData
      */
     transformResponseToTool(tool, source, responseData) {
-        const clientFormat = tool === 'codex' ? 'responses' : 'claude';
+        const clientFormat = clientFormatForTool(tool);
         const upstreamFormat = (0, source_type_mapping_1.sourceTypeToFormat)(source);
         return (0, index_1.transformResponse)({ fromFormat: upstreamFormat, toFormat: clientFormat, response: responseData });
     }
@@ -3327,7 +3387,7 @@ class ProxyServer {
      * @returns 转换器实例和相关信息
      */
     transformSSEToTool(targetType, sourceType) {
-        const clientFormat = targetType === 'codex' ? 'responses' : 'claude';
+        const clientFormat = clientFormatForTool(targetType);
         const upstreamFormat = (0, source_type_mapping_1.sourceTypeToFormat)(sourceType);
         if (upstreamFormat === clientFormat) {
             return { converter: null };
@@ -3347,8 +3407,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 +3444,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 +3460,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 +3470,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 +3490,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 +3508,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) || '-'}`);
@@ -3450,7 +3558,7 @@ class ProxyServer {
             let logged = false;
             const extraTagsForLog = [];
             // 编程套餐限制检查
-            const clientFormat = targetType === 'codex' ? 'responses' : 'claude';
+            const clientFormat = clientFormatForTool(targetType);
             if (!this.checkCodingPlan(req, res, service, clientFormat))
                 return;
             // Compact 请求消息清理：确保 tool_use/tool_result 配对完整
@@ -3611,10 +3719,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 +3748,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 +3926,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'
@@ -3998,6 +4121,9 @@ class ProxyServer {
                 else if (targetType === 'codex' && req.path.startsWith('/codex')) {
                     pathToRequest = req.path.slice('/codex'.length);
                 }
+                else if (targetType === 'opencode' && req.path.startsWith('/opencode')) {
+                    pathToRequest = req.path.slice('/opencode'.length);
+                }
                 // 使用 mapRequestPathToUpstreamUrl 统一构建上游 URL
                 const model = rule.targetModel || (requestBody === null || requestBody === void 0 ? void 0 : requestBody.model);
                 const apiUrl = this.resolveEffectiveApiUrl(service);
@@ -4149,9 +4275,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 +4296,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 +4313,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 +5114,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 +5127,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) => {

package/dist/server/session-migration.js

@@ -276,6 +276,7 @@ function generateMigrationPrompt(content, targetTool) {
     const toolLabels = {
         'claude-code': 'Claude Code',
         'codex': 'Codex',
+        'opencode': 'OpenCode',
     };
     const sourceLabel = toolLabels[content.sourceTool];
     const targetLabel = toolLabels[targetTool];

package/dist/server/transformers/chunk-collector.js

@@ -320,41 +320,128 @@ class SSEEventCollectorTransform extends stream_1.Transform {
         this.events = [];
     }
     /**
-     * 从events中提取usage信息
+     * 从events中提取usage信息。
+     *
+     * 关键：必须遍历**全部**事件并合并，而不是命中第一个就返回——
+     * Anthropic 流式把用量拆在两个事件里：`message_start.message.usage` 带 input_tokens，
+     * `message_delta.usage` 带（累计的）output_tokens。旧实现命中 message_delta 即返回，
+     * 导致 input_tokens 永远丢失。同时统一 OpenAI(prompt_tokens/completion_tokens) 与
+     * Gemini(usageMetadata) 的字段命名，返回归一化的 {input_tokens, output_tokens, total_tokens, cache_read_input_tokens}。
      */
     extractUsage() {
+        var _a, _b, _c;
+        let input_tokens;
+        let output_tokens;
+        let total_tokens;
+        let cache_read_input_tokens;
         for (const event of this.events) {
             if (!event.data)
                 continue;
+            let data;
             try {
-                const data = JSON.parse(event.data);
-                // 尝试从不同的位置提取usage
-                // 1. message_delta事件中的usage
-                if (event.event === 'message_delta' && data.usage) {
-                    return data.usage;
-                }
-                // 2. 直接在data中的usage
-                if (data.usage) {
-                    return data.usage;
-                }
-                // 3. OpenAI格式: choices数组中最后一个元素的usage
-                if (Array.isArray(data.choices) && data.choices.length > 0) {
-                    const lastChoice = data.choices[data.choices.length - 1];
-                    if (lastChoice === null || lastChoice === void 0 ? void 0 : lastChoice.usage) {
-                        return lastChoice.usage;
-                    }
-                }
-                // 4. 直接在顶级的usage字段
-                if ((data === null || data === void 0 ? void 0 : data.input_tokens) !== undefined || (data === null || data === void 0 ? void 0 : data.output_tokens) !== undefined ||
-                    (data === null || data === void 0 ? void 0 : data.prompt_tokens) !== undefined || (data === null || data === void 0 ? void 0 : data.completion_tokens) !== undefined) {
-                    return data;
+                data = JSON.parse(event.data);
+            }
+            catch (_d) {
+                continue;
+            }
+            // Anthropic: message_start 携带 input（在 message.usage 下）
+            const msgUsage = (_a = data === null || data === void 0 ? void 0 : data.message) === null || _a === void 0 ? void 0 : _a.usage;
+            if (msgUsage) {
+                if (typeof msgUsage.input_tokens === 'number')
+                    input_tokens = msgUsage.input_tokens;
+                if (typeof msgUsage.cache_read_input_tokens === 'number')
+                    cache_read_input_tokens = msgUsage.cache_read_input_tokens;
+            }
+            // 通用 usage 对象（Anthropic message_delta.usage / OpenAI usage）
+            const usage = data === null || data === void 0 ? void 0 : data.usage;
+            if (usage) {
+                if (typeof usage.input_tokens === 'number')
+                    input_tokens = usage.input_tokens;
+                if (typeof usage.output_tokens === 'number')
+                    output_tokens = usage.output_tokens; // message_delta 累计值，取最后一次
+                if (typeof usage.cache_read_input_tokens === 'number')
+                    cache_read_input_tokens = usage.cache_read_input_tokens;
+                if (typeof usage.prompt_tokens === 'number')
+                    input_tokens = usage.prompt_tokens;
+                if (typeof usage.completion_tokens === 'number')
+                    output_tokens = usage.completion_tokens;
+                if (typeof usage.total_tokens === 'number')
+                    total_tokens = usage.total_tokens;
+                if (typeof usage.cached_tokens === 'number')
+                    cache_read_input_tokens = usage.cached_tokens;
+            }
+            // OpenAI Responses 流式：usage 在最终 response.completed / response.done 事件的 data.response.usage 下
+            // （Codex 默认走 Responses 流式，此前漏读此处导致 Codex token 恒为 0）
+            const respUsage = (_b = data === null || data === void 0 ? void 0 : data.response) === null || _b === void 0 ? void 0 : _b.usage;
+            if (respUsage) {
+                if (typeof respUsage.input_tokens === 'number')
+                    input_tokens = respUsage.input_tokens;
+                if (typeof respUsage.output_tokens === 'number')
+                    output_tokens = respUsage.output_tokens;
+                if (typeof respUsage.total_tokens === 'number')
+                    total_tokens = respUsage.total_tokens;
+                if (typeof respUsage.prompt_tokens === 'number')
+                    input_tokens = respUsage.prompt_tokens;
+                if (typeof respUsage.completion_tokens === 'number')
+                    output_tokens = respUsage.completion_tokens;
+                const cached = (_c = respUsage.input_tokens_details) === null || _c === void 0 ? void 0 : _c.cached_tokens;
+                if (typeof cached === 'number')
+                    cache_read_input_tokens = cached;
+            }
+            // OpenAI: choices[].usage（部分上游把 usage 放在最后一个 choice 上）
+            if (Array.isArray(data === null || data === void 0 ? void 0 : data.choices) && data.choices.length > 0) {
+                const lastChoice = data.choices[data.choices.length - 1];
+                const cu = lastChoice === null || lastChoice === void 0 ? void 0 : lastChoice.usage;
+                if (cu) {
+                    if (typeof cu.prompt_tokens === 'number')
+                        input_tokens = cu.prompt_tokens;
+                    if (typeof cu.completion_tokens === 'number')
+                        output_tokens = cu.completion_tokens;
+                    if (typeof cu.total_tokens === 'number')
+                        total_tokens = cu.total_tokens;
                 }
             }
-            catch (_a) {
-                // JSON解析失败,跳过
+            // Gemini: usageMetadata
+            const um = data === null || data === void 0 ? void 0 : data.usageMetadata;
+            if (um) {
+                if (typeof um.promptTokenCount === 'number')
+                    input_tokens = um.promptTokenCount;
+                if (typeof um.candidatesTokenCount === 'number')
+                    output_tokens = um.candidatesTokenCount;
+                if (typeof um.totalTokenCount === 'number')
+                    total_tokens = um.totalTokenCount;
+                if (typeof um.cachedContentTokenCount === 'number')
+                    cache_read_input_tokens = um.cachedContentTokenCount;
             }
+            // 顶级裸字段兜底
+            if (typeof (data === null || data === void 0 ? void 0 : data.input_tokens) === 'number')
+                input_tokens = data.input_tokens;
+            if (typeof (data === null || data === void 0 ? void 0 : data.output_tokens) === 'number')
+                output_tokens = data.output_tokens;
+            if (typeof (data === null || data === void 0 ? void 0 : data.prompt_tokens) === 'number')
+                input_tokens = data.prompt_tokens;
+            if (typeof (data === null || data === void 0 ? void 0 : data.completion_tokens) === 'number')
+                output_tokens = data.completion_tokens;
+            if (typeof (data === null || data === void 0 ? void 0 : data.total_tokens) === 'number')
+                total_tokens = data.total_tokens;
+        }
+        if (input_tokens === undefined && output_tokens === undefined && total_tokens === undefined) {
+            return null;
+        }
+        const result = {};
+        if (input_tokens !== undefined)
+            result.input_tokens = input_tokens;
+        if (output_tokens !== undefined)
+            result.output_tokens = output_tokens;
+        if (total_tokens !== undefined) {
+            result.total_tokens = total_tokens;
+        }
+        else if (input_tokens !== undefined && output_tokens !== undefined) {
+            result.total_tokens = input_tokens + output_tokens;
         }
-        return null;
+        if (cache_read_input_tokens !== undefined)
+            result.cache_read_input_tokens = cache_read_input_tokens;
+        return result;
     }
 }
 exports.SSEEventCollectorTransform = SSEEventCollectorTransform;