aicodeswitch 5.2.12 → 6.0.0

package/dist/server/log-store/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/server/main.js

@@ -25,12 +25,13 @@ const index_1 = require("./access-keys/index");
 const manager_1 = require("./access-keys/manager");
 const policy_manager_1 = require("./access-keys/policy-manager");
 const performance_tracker_1 = require("./performance-tracker");
+const log_store_1 = require("./log-store");
+const agent_map_1 = require("./agent-map");
+const notifier_1 = require("./notifier");
 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");
@@ -47,8 +48,15 @@ const upgradeHashFilePath = path_1.default.join(appDir, 'upgrade-hash');
 if (fs_1.default.existsSync(dotenvPath)) {
     dotenv_1.default.config({ path: dotenvPath });
 }
-const host = process.env.HOST || '0.0.0.0';
+// 服务监听地址由 AUTH 模式强制决定（忽略 process.env.HOST）：
+// - AUTH 开启：监听 0.0.0.0，允许远端 AccessKey 客户端连接
+// - AUTH 关闭：监听 127.0.0.1，仅本机访问（默认最安全）
+const host = (0, auth_1.isAuthEnabled)() ? '0.0.0.0' : '127.0.0.1';
 const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 4567;
+// 写入本地编程工具配置（Codex config.toml / Claude settings.json）+ UI/CLI 展示用的地址恒为回环地址。
+// 即便 AUTH 开启监听 0.0.0.0，本机工具与 dashboard 仍走 127.0.0.1，
+// 避免 0.0.0.0（监听语义）被当成连接目标，导致 Windows 客户端 stream disconnected。
+const clientHost = '127.0.0.1';
 let globalProxyConfig = null;
 function updateProxyConfig(config) {
     if (config.proxyEnabled && config.proxyUrl) {
@@ -283,7 +291,7 @@ const writeClaudeConfig = (_dbManager_1, enableAgentTeams_1, enableBypassPermiss
         // 构建代理配置
         const claudeSettingsEnv = {
             ANTHROPIC_AUTH_TOKEN: "api_key",
-            ANTHROPIC_BASE_URL: `http://${host}:${port}/claude-code`,
+            ANTHROPIC_BASE_URL: `http://${clientHost}:${port}/claude-code`,
             API_TIMEOUT_MS: "3000000",
             CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: 1,
             CLAUDE_CODE_MAX_RETRIES: 3
@@ -444,7 +452,7 @@ const writeCodexConfig = (_dbManager_1, ...args_1) => __awaiter(void 0, [_dbMana
             model_providers: {
                 aicodeswitch: {
                     name: "aicodeswitch",
-                    base_url: `http://${host}:${process.env.PORT ? parseInt(process.env.PORT, 10) : 4567}/codex`,
+                    base_url: `http://${clientHost}:${port}/codex`,
                     wire_api: "responses",
                     stream_max_retries: 3,
                     stream_retry_backoff: "fixed"
@@ -1341,6 +1349,8 @@ const registerRoutes = (dbManager, proxyServer) => __awaiter(void 0, void 0, voi
             clearInterval(heartbeat);
         });
     })));
+    // Agent Map（任务可视化节点地图）路由：SSE 实时流 + REST 快照/事件
+    (0, agent_map_1.registerAgentMapRoutes)(app, agent_map_1.agentMapService);
     // 清除规则的错误状态（广播 idle 状态给所有客户端）
     app.post('/api/rules/:id/clear-status', asyncHandler((req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const { id } = req.params;
@@ -1388,8 +1398,28 @@ const registerRoutes = (dbManager, proxyServer) => __awaiter(void 0, void 0, voi
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;
         const limit = Number.isFinite(rawLimit) ? rawLimit : 100;
         const offset = Number.isFinite(rawOffset) ? rawOffset : 0;
-        const logs = yield dbManager.getLogs(limit, offset);
-        res.json(logs);
+        const str = (v) => (typeof v === 'string' ? v.trim() : '');
+        const keyword = str(req.query.keyword) || str(req.query.query);
+        const filters = {
+            targetType: str(req.query.targetType) || undefined,
+            vendorId: str(req.query.vendorId) || undefined,
+            targetServiceId: str(req.query.serviceId) || str(req.query.targetServiceId) || undefined,
+            targetModel: str(req.query.model) || str(req.query.targetModel) || undefined,
+            routeId: str(req.query.routeId) || undefined,
+        };
+        const hasAnyFilter = keyword || filters.targetType || filters.vendorId || filters.targetServiceId || filters.targetModel || filters.routeId;
+        if (hasAnyFilter) {
+            const result = yield dbManager.queryLogs({ filters, keyword, limit, offset });
+            res.json({ logs: result.data, total: result.total });
+        }
+        else {
+            // 无筛选：仍返回 total，避免前端额外请求 count
+            const [logs, total] = yield Promise.all([
+                dbManager.getLogs(limit, offset),
+                dbManager.getLogsCount(),
+            ]);
+            res.json({ logs, total });
+        }
     })));
     app.delete('/api/logs', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         yield dbManager.clearLogs();
@@ -1400,8 +1430,27 @@ const registerRoutes = (dbManager, proxyServer) => __awaiter(void 0, void 0, voi
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;
         const limit = Number.isFinite(rawLimit) ? rawLimit : 100;
         const offset = Number.isFinite(rawOffset) ? rawOffset : 0;
-        const logs = yield dbManager.getErrorLogs(limit, offset);
-        res.json(logs);
+        const str = (v) => (typeof v === 'string' ? v.trim() : '');
+        const filters = {
+            targetType: str(req.query.targetType) || undefined,
+            vendorId: str(req.query.vendorId) || undefined,
+            serviceId: str(req.query.serviceId) || str(req.query.targetServiceId) || undefined,
+            model: str(req.query.model) || str(req.query.targetModel) || undefined,
+            routeId: str(req.query.routeId) || undefined,
+        };
+        const keyword = str(req.query.keyword) || str(req.query.query);
+        const hasAnyFilter = keyword || filters.targetType || filters.vendorId || filters.serviceId || filters.model || filters.routeId;
+        if (hasAnyFilter) {
+            const result = yield dbManager.queryErrorLogs({ filters, keyword, limit, offset });
+            res.json({ logs: result.data, total: result.total });
+        }
+        else {
+            const [logs, total] = yield Promise.all([
+                dbManager.getErrorLogs(limit, offset),
+                dbManager.getErrorLogsCount(),
+            ]);
+            res.json({ logs, total });
+        }
     })));
     app.delete('/api/error-logs', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         yield dbManager.clearErrorLogs();
@@ -2189,8 +2238,21 @@ ${instruction}
         const rawOffset = typeof req.query.offset === 'string' ? parseInt(req.query.offset, 10) : NaN;
         const limit = Number.isFinite(rawLimit) ? rawLimit : 100;
         const offset = Number.isFinite(rawOffset) ? rawOffset : 0;
-        const sessions = yield dbManager.getSessions(undefined, limit, offset);
-        res.json(sessions);
+        const str = (v) => (typeof v === 'string' ? v.trim() : '');
+        const opts = {
+            targetType: str(req.query.targetType) || undefined,
+            keyword: str(req.query.keyword) || str(req.query.query) || undefined,
+            vendorId: str(req.query.vendorId) || undefined,
+            serviceId: str(req.query.serviceId) || undefined,
+            model: str(req.query.model) || undefined,
+            routeId: str(req.query.routeId) || undefined,
+        };
+        const hasFilter = opts.targetType || opts.keyword || opts.vendorId || opts.serviceId || opts.model || opts.routeId;
+        const [sessions, total] = yield Promise.all([
+            dbManager.getSessions(hasFilter ? opts : undefined, limit, offset),
+            dbManager.getSessionsCount(hasFilter ? opts : undefined),
+        ]);
+        res.json({ sessions, total });
     })));
     app.get('/api/sessions/count', asyncHandler((_req, res) => __awaiter(void 0, void 0, void 0, function* () {
         const count = yield dbManager.getSessionsCount();
@@ -2450,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());
@@ -3369,6 +3418,20 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     // 自动检测数据库类型并执行迁移（如果需要）
     console.time('[Server] step "database-init"');
     const dbManager = yield database_factory_1.DatabaseFactory.createAuto(dataDir, legacyDataDir);
+    // 创建并初始化共享 LogStore（追加写 NDJSON），注入 dbManager
+    const logStore = (0, log_store_1.createLogStore)(dataDir);
+    yield logStore.init();
+    // 在服务对外提供流量前完成旧 JSON → NDJSON 迁移（含自愈：标记缺失时清空重迁，避免重复）。
+    // 必须在 listen 之前，防止迁移的「清空重迁」与实时写入竞争。
+    try {
+        yield logStore.migrateLegacy(dataDir);
+    }
+    catch (err) {
+        console.error('[Server] LogStore legacy migration failed:', err);
+    }
+    dbManager.setLogStore(logStore);
+    // Agent Map 服务接入 dbManager（种子化已有 Session + 启动状态清扫定时器）
+    agent_map_1.agentMapService.attach(dbManager);
     console.timeEnd('[Server] step "database-init"');
     // 服务启动时自动同步配置文件（适用于 CLI 和 dev:server）
     console.time('[Server] step "sync-configs"');
@@ -3386,7 +3449,7 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     catch ( /* ignore */_a) { /* ignore */ }
     const proxyServer = new proxy_server_1.ProxyServer(dbManager, app);
     // Initialize AccessKey module
-    const accessKeyModule = new index_1.AccessKeyModule(dataDir);
+    const accessKeyModule = new index_1.AccessKeyModule(dataDir, logStore);
     try {
         yield accessKeyModule.initialize();
         proxyServer.setAccessKeyModule(accessKeyModule);
@@ -3394,6 +3457,15 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
     catch (error) {
         console.error('[Server] AccessKey module initialization failed:', error);
     }
+    // 日志保留期定时清理（主库 global + 所有 AccessKey key:*），每 6h 一次
+    const logRetentionTimer = setInterval(() => {
+        Promise.all([
+            logStore.retain('global', 30).catch(() => { }),
+            accessKeyModule.keyLogger.cleanupOldLogs().catch(() => { }),
+        ]).catch(() => { });
+    }, 6 * 60 * 60 * 1000);
+    if (typeof logRetentionTimer.unref === 'function')
+        logRetentionTimer.unref();
     // Initialize Service Performance Tracker (全局统计，与 AUTH 无关)
     const performanceTracker = new performance_tracker_1.ServicePerformanceTracker(dataDir);
     try {
@@ -3430,15 +3502,34 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
         res.setHeader('Content-Type', 'application/json');
         res.status(500).json({ error: err.message || 'Internal server error' });
     });
-    const isPortUsable = yield (0, utils_1.checkPortUsable)(port);
+    // 端口检测：若被占用，可能是上一个进程仍在退出过程中（Ctrl+C 后 shutdown 尚未完全释放端口），
+    // 此处轮询等待其释放后再继续启动，避免与正在退出的旧进程发生端口冲突。
+    // 超时仍未释放才判定为真正的占用并报错退出。
+    const PORT_POLL_INTERVAL = 300;
+    const PORT_WAIT_TIMEOUT = 10000;
+    let isPortUsable = yield (0, utils_1.checkPortUsable)(port);
     if (!isPortUsable) {
-        console.error(`端口 ${port} 已被占用，无法启动服务。请执行 aicos stop 后重启。`);
-        process.exit(1);
+        console.warn(`端口 ${port} 当前被占用，可能是上一个服务进程仍在退出中，等待其释放...`);
+        const portDeadline = Date.now() + PORT_WAIT_TIMEOUT;
+        while (!isPortUsable && Date.now() < portDeadline) {
+            yield new Promise(resolve => setTimeout(resolve, PORT_POLL_INTERVAL));
+            isPortUsable = yield (0, utils_1.checkPortUsable)(port);
+        }
+        if (!isPortUsable) {
+            console.error(`端口 ${port} 在 ${PORT_WAIT_TIMEOUT / 1000}s 后仍被占用，无法启动服务。请执行 aicos stop 后重启。`);
+            process.exit(1);
+        }
+        console.log(`端口 ${port} 已释放，继续启动...`);
     }
     console.time('[Server] step "listen"');
     const server = app.listen(port, host, () => {
         listenReady = true;
-        console.log(`Admin server running on http://${host}:${port}`);
+        const listenInfo = host === '0.0.0.0'
+            ? ` (listening on all interfaces, port ${port})`
+            : '';
+        console.log(`Admin server running on http://${clientHost}:${port}${listenInfo}`);
+        // 点击 OS 通知时打开任务地图页（仅 terminal-notifier 路径生效；osascript 无法控制点击）
+        (0, notifier_1.setNotifierAppUrl)(`http://${clientHost}:${port}/#/agent-map`);
         console.timeEnd('[Server] step "listen"');
         // 启动后异步执行延迟维护任务（分片校验/修复、日志清理、会话索引构建）
         // 不阻塞服务启动，后台静默执行
@@ -3457,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://${host}:${port}/api/tools/install`);
     let isShuttingDown = false;
     let shutdownPromise = null;
     const shutdown = (signal) => __awaiter(void 0, void 0, void 0, function* () {
@@ -3486,6 +3563,18 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
         isShuttingDown = true;
         shutdownPromise = (() => __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();
@@ -3517,12 +3606,18 @@ const start = () => __awaiter(void 0, void 0, void 0, function* () {
                 console.error('[Shutdown ...] Performance tracker flush failed:', error);
             }
             dbManager.close();
+            // 落盘 LogStore 所有 namespace 的索引
+            try {
+                yield logStore.close();
+            }
+            catch (error) {
+                console.error('[Shutdown ...] LogStore close failed:', error);
+            }
             // 清理规则状态广播器（关闭 SSE 连接）
             rules_status_service_1.rulesStatusBroadcaster.destroy();
+            // 等待监听句柄与现有连接关闭完成（最多 5s），确保端口彻底释放后再退出。
             yield Promise.race([
-                new Promise((resolve) => {
-                    server.close(() => resolve());
-                }),
+                serverClosedPromise,
                 new Promise((resolve) => {
                     setTimeout(resolve, 5000);
                 })

package/dist/server/notifier.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setNotifierAppUrl = setNotifierAppUrl;
+exports.notify = notify;
+/**
+ * 跨平台 OS 原生通知（零 npm 依赖，shell-out）。
+ *
+ * macOS：直接用 `osascript display notification`。它以 Terminal/Script Editor 的身份发起，
+ * 这些身份在本机已有通知权限，因此**始终能可靠弹出**。代价：通知图标位是系统默认占位
+ * （无自定义 Logo）——尝试用「带 Logo 的 AppleScript applet」方案在较新 macOS 上会被系统
+ * 静默拦截（ad-hoc applet 无通知权限），故回退到这条最稳的路径。
+ *
+ * - linux：notify-send（libnotify；未安装则静默）
+ * - win32：PowerShell + WinForms NotifyIcon balloon（best-effort）
+ *
+ * 任何环节失败均静默，绝不影响代理主流程。
+ */
+const child_process_1 = require("child_process");
+/** 转义 AppleScript 字符串里的反斜杠与双引号 */
+function escApple(s) {
+    return String(s !== null && s !== void 0 ? s : '').replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+}
+// terminal-notifier 存在性（带缓存）。它是 macOS 上唯一能「点击通知可控」的可靠手段：
+// osascript 的 display notification 点击必激活脚本宿主（Script Editor/文本阅读器），无法关闭；
+// terminal-notifier 点击可经 -open 打开我们指定的 URL（默认无 URL 则点击=仅消失、无动作）。
+let hasTN;
+function hasTerminalNotifier() {
+    if (hasTN !== undefined)
+        return hasTN;
+    try {
+        (0, child_process_1.execFileSync)('which', ['terminal-notifier'], { stdio: 'ignore', windowsHide: true });
+        hasTN = true;
+    }
+    catch (_a) {
+        hasTN = false;
+    }
+    return hasTN;
+}
+// 点击通知要打开的 URL（由 main.ts 在服务启动后设置，指向 AICodeSwitch 任务地图页）。
+// 仅 terminal-notifier 路径生效；osascript 无法控制点击行为。
+let appOpenUrl = null;
+function setNotifierAppUrl(url) { appOpenUrl = url; }
+function notifyDarwin(opts) {
+    // 优先 terminal-notifier：可控制点击行为。设了 appOpenUrl 则点击打开该 URL（我们的页面），
+    // 否则点击仅消失、无动作。
+    if (hasTerminalNotifier()) {
+        const args = ['-title', opts.title, '-message', opts.body, '-ignoreDn'];
+        if (opts.subtitle)
+            args.push('-subtitle', opts.subtitle);
+        if (appOpenUrl)
+            args.push('-open', appOpenUrl);
+        (0, child_process_1.execFile)('terminal-notifier', args, { windowsHide: true }, () => { });
+        return;
+    }
+    // 回退：osascript（稳定弹通知，但点击会打开脚本宿主，无法避免）
+    let script = `display notification "${escApple(opts.body)}" with title "${escApple(opts.title)}"`;
+    if (opts.subtitle)
+        script += ` subtitle "${escApple(opts.subtitle)}"`;
+    (0, child_process_1.execFile)('osascript', ['-e', script], { windowsHide: true }, () => { });
+}
+function notifyLinux(opts) {
+    (0, child_process_1.execFile)('notify-send', ['-a', 'AICodeSwitch', opts.title, opts.body], { windowsHide: true }, () => { });
+}
+function notifyWindows(opts) {
+    var _a, _b;
+    // WinForms NotifyIcon balloon（Win10/11 上显示为 toast）
+    const title = String((_a = opts.title) !== null && _a !== void 0 ? _a : '').replace(/'/g, "''");
+    const body = String((_b = opts.body) !== null && _b !== void 0 ? _b : '').replace(/'/g, "''");
+    const script = [
+        'Add-Type -AssemblyName System.Windows.Forms',
+        '$n = New-Object System.Windows.Forms.NotifyIcon',
+        '$n.Icon = [System.Drawing.SystemIcons]::Information',
+        '$n.Visible = $true',
+        `$n.ShowBalloonTip(5000, '${title}', '${body}', [System.Windows.Forms.ToolTipIcon]::Info)`,
+        'Start-Sleep -Seconds 6',
+        '$n.Dispose()',
+    ].join('; ');
+    const child = (0, child_process_1.spawn)('powershell', ['-NoProfile', '-Command', script], {
+        stdio: 'ignore',
+        windowsHide: true,
+        detached: true,
+    });
+    child.on('error', () => { });
+    child.unref();
+}
+/** 发送一条 OS 原生通知。失败静默。title 请自带「AICodeSwitch」标识来源。 */
+function notify(opts) {
+    try {
+        if (process.platform === 'darwin')
+            return notifyDarwin(opts);
+        if (process.platform === 'linux')
+            return notifyLinux(opts);
+        if (process.platform === 'win32')
+            return notifyWindows(opts);
+        // 其它平台：no-op
+    }
+    catch (_a) {
+        /* ignore */
+    }
+}

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) {