aicodeswitch 5.2.13 → 6.0.1

package/dist/server/original-config-reader.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readOriginalConfig = exports.readCodexOriginalConfig = exports.readClaudeOriginalConfig = void 0;
+exports.readOriginalConfig = exports.readOpencodeOriginalConfig = exports.readCodexOriginalConfig = exports.readClaudeOriginalConfig = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
@@ -232,6 +232,73 @@ const readCodexOriginalConfig = () => {
     }
 };
 exports.readCodexOriginalConfig = readCodexOriginalConfig;
+/**
+ * 读取 OpenCode 原始配置
+ * fallback 场景下仅从备份文件（~/.config/opencode/opencode.json.aicodeswitch_backup）读取
+ *
+ * OpenCode 的模型形如 "<providerId>/<modelId>"，真实上游由用户原始 opencode.json 中的
+ * provider 段（options.baseURL + options.apiKey）决定。此处解析备份中的真实 provider。
+ */
+const readOpencodeOriginalConfig = () => {
+    var _a, _b;
+    try {
+        const homeDir = os_1.default.homedir();
+        const configBakPath = path_1.default.join(homeDir, '.config', 'opencode', 'opencode.json.aicodeswitch_backup');
+        if (!fs_1.default.existsSync(configBakPath)) {
+            console.log('No OpenCode backup config file found');
+            return null;
+        }
+        const content = fs_1.default.readFileSync(configBakPath, 'utf-8');
+        const config = JSON.parse(content);
+        // 解析 model："providerId/modelId"
+        const modelField = typeof config.model === 'string' ? config.model : '';
+        const [providerId, modelId] = modelField.split('/');
+        const providers = (config.provider && typeof config.provider === 'object') ? config.provider : {};
+        // 选定真实 provider：优先 model 中声明的 providerId，否则取第一个非 aicodeswitch 的 provider
+        let providerConfig;
+        let resolvedProviderId = '';
+        if (providerId && providers[providerId]) {
+            providerConfig = providers[providerId];
+            resolvedProviderId = providerId;
+        }
+        else {
+            for (const [pid, pc] of Object.entries(providers)) {
+                if (pid !== 'aicodeswitch' && pc && typeof pc === 'object') {
+                    providerConfig = pc;
+                    resolvedProviderId = pid;
+                    break;
+                }
+            }
+        }
+        const baseUrlRaw = ((_a = providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.options) === null || _a === void 0 ? void 0 : _a.baseURL) || '';
+        const baseUrl = normalizeApiUrl(baseUrlRaw);
+        // apiKey 可能内联在 options.apiKey，也可能经 {env:XXX}/{file:xxx} 引用（fallback 无法解析，置空）
+        let apiKey = '';
+        if (typeof ((_b = providerConfig === null || providerConfig === void 0 ? void 0 : providerConfig.options) === null || _b === void 0 ? void 0 : _b.apiKey) === 'string') {
+            const raw = providerConfig.options.apiKey.trim();
+            if (raw && !raw.startsWith('{env:') && !raw.startsWith('{file:')) {
+                apiKey = raw;
+            }
+        }
+        if (!baseUrl) {
+            console.log('No baseURL found in OpenCode backup config provider:', resolvedProviderId);
+            return null;
+        }
+        const sourceType = inferSourceTypeFromBaseUrlAndWireApi(baseUrl, undefined);
+        return {
+            apiUrl: baseUrl,
+            apiKey,
+            authType: inferAuthTypeFromSource(sourceType),
+            sourceType,
+            model: modelId || modelField || undefined,
+        };
+    }
+    catch (error) {
+        console.error('Failed to read OpenCode original config:', error);
+        return null;
+    }
+};
+exports.readOpencodeOriginalConfig = readOpencodeOriginalConfig;
 /**
  * 根据目标类型读取原始配置
  */
@@ -242,6 +309,9 @@ const readOriginalConfig = (targetType) => {
     else if (targetType === 'codex') {
         return (0, exports.readCodexOriginalConfig)();
     }
+    else if (targetType === 'opencode') {
+        return (0, exports.readOpencodeOriginalConfig)();
+    }
     return null;
 };
 exports.readOriginalConfig = readOriginalConfig;

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