@adversity/coding-tool-x 3.1.2 → 3.1.4

package/src/server/api/sessions.js

@@ -391,7 +391,6 @@ module.exports = (config) => {
   router.post('/:projectName/:sessionId/launch', async (req, res) => {
     try {
       const { projectName, sessionId } = req.params;
-      const { targetTool } = req.body; // 'claude', 'codex', 或 'gemini'
       const { exec } = require('child_process');
       const path = require('path');
       const fs = require('fs');
@@ -440,66 +439,10 @@ module.exports = (config) => {
         });
       }
 
-      // 判断会话来源类型
-      let sourceType = 'claude'; // 默认
-      if (sessionFile.includes('/.codex/') || sessionFile.includes('\\.codex\\')) {
-        sourceType = 'codex';
-      } else if (sessionFile.includes('/.gemini/') || sessionFile.includes('\\.gemini\\')) {
-        sourceType = 'gemini';
-      }
-
-      // 如果指定了 targetTool 且与 sourceType 不同，则需要转换
-      let finalSessionFile = sessionFile;
-      let finalSessionId = sessionId;
-
-      if (targetTool && targetTool !== sourceType) {
-        console.log(`跨工具启动：${sourceType} -> ${targetTool}，会话 ${sessionId}`);
-
-        try {
-          const { convertSession } = require('../services/session-converter');
-
-          // 执行转换
-          const convertResult = await convertSession(
-            sourceType,
-            targetTool,
-            sessionId,
-            {
-              sourcePath: sessionFile,
-              preserveTimestamps: true,
-              targetProjectPath: fullPath
-            }
-          );
-
-          if (convertResult.success) {
-            finalSessionFile = convertResult.targetPath;
-            finalSessionId = convertResult.targetSessionId;
-            console.log(`转换成功：${finalSessionFile}`);
-
-            // 广播转换日志
-            broadcastLog({
-              type: 'action',
-              action: 'auto_convert_session',
-              message: `自动转换会话：${sourceType} -> ${targetTool}`,
-              sessionId: finalSessionId,
-              timestamp: Date.now()
-            });
-          } else {
-            return res.status(500).json({
-              error: '会话转换失败：' + (convertResult.error || '未知错误')
-            });
-          }
-        } catch (convertError) {
-          console.error('会话转换出错：', convertError);
-          return res.status(500).json({
-            error: '会话转换出错：' + convertError.message
-          });
-        }
-      }
-
       // Extract working directory from session file
       let cwd = fullPath; // Default to project directory
       try {
-        const content = fs.readFileSync(finalSessionFile, 'utf8');
+        const content = fs.readFileSync(sessionFile, 'utf8');
         const firstLine = content.split('\n')[0];
         if (firstLine) {
           const json = JSON.parse(firstLine);
@@ -514,15 +457,15 @@ module.exports = (config) => {
       // 确保会话文件在 cwd 的 .claude/sessions/ 目录下
       // 这样 claude -r 才能找到文件
       const cwdSessionsDir = path.join(cwd, '.claude', 'sessions');
-      const cwdSessionFile = path.join(cwdSessionsDir, finalSessionId + '.jsonl');
+      const cwdSessionFile = path.join(cwdSessionsDir, sessionId + '.jsonl');
 
       // 如果会话文件不在 cwd 的 sessions 目录，复制过去
-      if (finalSessionFile !== cwdSessionFile && !fs.existsSync(cwdSessionFile)) {
+      if (sessionFile !== cwdSessionFile && !fs.existsSync(cwdSessionFile)) {
         try {
           if (!fs.existsSync(cwdSessionsDir)) {
             fs.mkdirSync(cwdSessionsDir, { recursive: true });
           }
-          fs.copyFileSync(finalSessionFile, cwdSessionFile);
+          fs.copyFileSync(sessionFile, cwdSessionFile);
           console.log(`[Launch] Copied session to cwd: ${cwdSessionFile}`);
         } catch (copyError) {
           console.warn('[Launch] Failed to copy session file to cwd:', copyError.message);
@@ -536,16 +479,16 @@ module.exports = (config) => {
 
       // Get alias
       const aliases = loadAliases();
-      const alias = aliases[finalSessionId];
+      const alias = aliases[sessionId];
 
       // 广播行为日志
       broadcastLog({
         type: 'action',
         action: 'launch_session',
-        message: `启动会话 ${alias || finalSessionId.substring(0, 8)} (${targetTool || sourceType})`,
-        sessionId: finalSessionId,
+        message: `启动会话 ${alias || sessionId.substring(0, 8)} (claude)`,
+        sessionId,
         alias: alias || null,
-        tool: targetTool || sourceType,
+        tool: 'claude',
         timestamp: Date.now()
       });
 
@@ -556,11 +499,11 @@ module.exports = (config) => {
         // Windows 路径需要转换为反斜杠格式
         const normalizedCwd = process.platform === 'win32' ? cwd.replace(/\//g, '\\') : cwd;
 
-        // 获取启动命令（需要传入 targetTool）
+        // 获取 Claude 会话启动命令
         const { command, terminalId, terminalName } = getTerminalLaunchCommand(
           normalizedCwd,
-          finalSessionId,
-          targetTool || sourceType
+          sessionId,
+          'claude'
         );
 
         console.log(`Launching terminal: ${terminalName} (${terminalId})`);

package/src/server/api/settings.js

@@ -2,7 +2,12 @@ const express = require('express');
 const router = express.Router();
 const { detectAvailableTerminals } = require('../services/terminal-detector');
 const { loadTerminalConfig, saveTerminalConfig, getSelectedTerminal } = require('../services/terminal-config');
-const { MODEL_METADATA, resolveModelMetadata, METADATA_LAST_UPDATED } = require('../../config/model-metadata');
+const {
+  MODEL_METADATA,
+  METADATA_LAST_UPDATED,
+  getDefaultSpeedTestModels,
+  saveDefaultSpeedTestModels
+} = require('../../config/model-metadata');
 const { loadConfig, saveConfig } = require('../../config/loader');
 
 // GET /api/settings/terminals - 获取可用终端列表
@@ -60,23 +65,23 @@ router.post('/terminal-config', (req, res) => {
   }
 });
 
-// GET /api/settings/model-metadata - 获取内置模型元数据表（limit + pricing）
-router.get('/model-metadata', (req, res) => {
+function handleGetModelSettings(req, res) {
   try {
-    // Return built-in defaults merged with any user overrides
     const config = loadConfig();
     const overrides = config.modelMetadataOverrides || {};
+    const defaultSpeedTestModels = getDefaultSpeedTestModels();
 
     // Build merged table: built-in + user overrides
     const merged = {};
     for (const [id, meta] of Object.entries(MODEL_METADATA)) {
       merged[id] = overrides[id]
         ? {
-            limit: { ...meta.limit, ...(overrides[id].limit || {}) },
-            pricing: { ...meta.pricing, ...(overrides[id].pricing || {}) }
-          }
+          limit: { ...meta.limit, ...(overrides[id].limit || {}) },
+          pricing: { ...meta.pricing, ...(overrides[id].pricing || {}) }
+        }
         : meta;
     }
+
     // Also include any user-added custom models from overrides
     for (const [id, meta] of Object.entries(overrides)) {
       if (!merged[id]) {
@@ -87,46 +92,53 @@ router.get('/model-metadata', (req, res) => {
     res.json({
       models: merged,
       overrides,
-      lastUpdated: METADATA_LAST_UPDATED
+      builtinModelIds: Object.keys(MODEL_METADATA),
+      lastUpdated: METADATA_LAST_UPDATED,
+      defaultSpeedTestModels
     });
   } catch (error) {
     console.error('Error getting model metadata:', error);
     res.status(500).json({ error: error.message });
   }
-});
+}
+
+// GET /api/settings/model-settings - 获取模型设置（元数据 + 默认测速模型）
+router.get('/model-settings', handleGetModelSettings);
+// backward compatibility
+router.get('/model-metadata', handleGetModelSettings);
 
-// POST /api/settings/model-metadata - 保存模型元数据覆盖项
-// Body: { overrides: { [modelId]: { limit?: {...}, pricing?: {...} } } }
-router.post('/model-metadata', (req, res) => {
+function handleSaveModelSettings(req, res) {
   try {
-    const { overrides } = req.body;
-    if (!overrides || typeof overrides !== 'object') {
+    const { overrides, defaultSpeedTestModels } = req.body || {};
+    if (overrides !== undefined && (typeof overrides !== 'object' || overrides === null || Array.isArray(overrides))) {
       return res.status(400).json({ error: 'overrides must be an object' });
     }
 
     // Validate each override entry
-    for (const [modelId, meta] of Object.entries(overrides)) {
-      if (typeof modelId !== 'string' || !modelId.trim()) {
-        return res.status(400).json({ error: `Invalid model ID: "${modelId}"` });
-      }
-      if (meta.limit !== undefined) {
-        if (typeof meta.limit !== 'object') {
-          return res.status(400).json({ error: `${modelId}: limit must be an object` });
+    if (overrides && typeof overrides === 'object') {
+      for (const [modelId, meta] of Object.entries(overrides)) {
+        if (typeof modelId !== 'string' || !modelId.trim()) {
+          return res.status(400).json({ error: `Invalid model ID: "${modelId}"` });
         }
-        if (meta.limit.context !== undefined && (typeof meta.limit.context !== 'number' || meta.limit.context <= 0)) {
-          return res.status(400).json({ error: `${modelId}: limit.context must be a positive number` });
-        }
-        if (meta.limit.output !== undefined && (typeof meta.limit.output !== 'number' || meta.limit.output <= 0)) {
-          return res.status(400).json({ error: `${modelId}: limit.output must be a positive number` });
-        }
-      }
-      if (meta.pricing !== undefined) {
-        if (typeof meta.pricing !== 'object') {
-          return res.status(400).json({ error: `${modelId}: pricing must be an object` });
+        if (meta.limit !== undefined) {
+          if (typeof meta.limit !== 'object') {
+            return res.status(400).json({ error: `${modelId}: limit must be an object` });
+          }
+          if (meta.limit.context !== undefined && (typeof meta.limit.context !== 'number' || meta.limit.context <= 0)) {
+            return res.status(400).json({ error: `${modelId}: limit.context must be a positive number` });
+          }
+          if (meta.limit.output !== undefined && (typeof meta.limit.output !== 'number' || meta.limit.output <= 0)) {
+            return res.status(400).json({ error: `${modelId}: limit.output must be a positive number` });
+          }
         }
-        for (const field of ['input', 'output']) {
-          if (meta.pricing[field] !== undefined && (typeof meta.pricing[field] !== 'number' || meta.pricing[field] < 0)) {
-            return res.status(400).json({ error: `${modelId}: pricing.${field} must be a non-negative number` });
+        if (meta.pricing !== undefined) {
+          if (typeof meta.pricing !== 'object') {
+            return res.status(400).json({ error: `${modelId}: pricing must be an object` });
+          }
+          for (const field of ['input', 'output']) {
+            if (meta.pricing[field] !== undefined && (typeof meta.pricing[field] !== 'number' || meta.pricing[field] < 0)) {
+              return res.status(400).json({ error: `${modelId}: pricing.${field} must be a non-negative number` });
+            }
           }
         }
       }
@@ -136,19 +148,31 @@ router.post('/model-metadata', (req, res) => {
     const newConfig = {
       ...config,
       projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
-      modelMetadataOverrides: overrides
+      modelMetadataOverrides: overrides && typeof overrides === 'object'
+        ? overrides
+        : (config.modelMetadataOverrides || {})
     };
     saveConfig(newConfig);
+    const persistedDefaultSpeedTestModels = saveDefaultSpeedTestModels(defaultSpeedTestModels);
 
-    res.json({ success: true, overrides });
+    res.json({
+      success: true,
+      overrides: newConfig.modelMetadataOverrides,
+      defaultSpeedTestModels: persistedDefaultSpeedTestModels
+    });
   } catch (error) {
     console.error('Error saving model metadata:', error);
     res.status(500).json({ error: error.message });
   }
-});
+}
+
+// POST /api/settings/model-settings - 保存模型设置
+router.post('/model-settings', handleSaveModelSettings);
+// backward compatibility
+router.post('/model-metadata', handleSaveModelSettings);
 
 // DELETE /api/settings/model-metadata/:modelId - 删除单个模型覆盖项（恢复内置默认值）
-router.delete('/model-metadata/:modelId', (req, res) => {
+function handleDeleteModelOverride(req, res) {
   try {
     const modelId = decodeURIComponent(req.params.modelId);
     const config = loadConfig();
@@ -167,6 +191,9 @@ router.delete('/model-metadata/:modelId', (req, res) => {
     console.error('Error deleting model metadata override:', error);
     res.status(500).json({ error: error.message });
   }
-});
+}
+
+router.delete('/model-settings/:modelId', handleDeleteModelOverride);
+router.delete('/model-metadata/:modelId', handleDeleteModelOverride);
 
 module.exports = router;

package/src/server/api/skills.js

@@ -567,48 +567,4 @@ router.put('/:directory/file/*', (req, res) => {
   }
 });
 
-// ==================== 格式转换 API ====================
-
-/**
- * 转换技能格式
- * POST /api/skills/convert
- * Body: { content, targetFormat }
- * - content: 技能内容
- * - targetFormat: 目标格式 ('claude' | 'codex')
- */
-router.post('/convert', (req, res) => {
-  try {
-    const { platform, service } = getSkillService(req);
-    const { content, targetFormat } = req.body;
-
-    if (!content) {
-      return res.status(400).json({
-        success: false,
-        message: '请提供技能内容'
-      });
-    }
-
-    if (!['claude', 'codex'].includes(targetFormat)) {
-      return res.status(400).json({
-        success: false,
-        message: '目标格式必须是 claude 或 codex'
-      });
-    }
-
-    const result = service.convertSkillFormat(content, targetFormat);
-
-    res.json({
-      success: true,
-      platform,
-      ...result
-    });
-  } catch (err) {
-    console.error('[Skills API] Convert skill error:', err);
-    res.status(500).json({
-      success: false,
-      message: err.message
-    });
-  }
-});
-
 module.exports = router;

package/src/server/api/statistics.js

@@ -1,6 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { getStatistics, getDailyStatistics, getTodayStatistics } = require('../services/statistics-service');
+const { getStatistics, getDailyStatistics, getTodayStatistics, getTrendStatistics } = require('../services/statistics-service');
 
 /**
  * 获取总体统计数据
@@ -88,4 +88,118 @@ router.get('/recent', (req, res) => {
   }
 });
 
+/**
+ * 获取趋势统计数据
+ * GET /api/statistics/trend
+ *
+ * @query {string} startDate - YYYY-MM-DD (required)
+ * @query {string} endDate - YYYY-MM-DD (required)
+ * @query {string} granularity - 'day' | 'hour' (default: 'day')
+ * @query {string} groupBy - 'model' | 'channel' | 'toolType' (default: 'model')
+ * @query {string} metric - 'tokens' | 'cost' | 'requests' (default: 'tokens')
+ */
+router.get('/trend', async (req, res) => {
+  try {
+    const { startDate, endDate, granularity = 'day', step = 1, groupBy = 'model', metric = 'tokens' } = req.query;
+
+    if (!startDate || !endDate) {
+      return res.status(400).json({ error: 'startDate and endDate are required' });
+    }
+
+    const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+    if (!dateRegex.test(startDate) || !dateRegex.test(endDate)) {
+      return res.status(400).json({ error: 'Invalid date format. Expected YYYY-MM-DD' });
+    }
+
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    const diffDays = Math.round((end - start) / (1000 * 60 * 60 * 24)) + 1;
+
+    if (diffDays < 1) {
+      return res.status(400).json({ error: 'endDate must be >= startDate' });
+    }
+
+    if (granularity === 'hour' && diffDays > 7) {
+      return res.status(400).json({ error: 'Hour granularity is limited to 7 days' });
+    }
+
+    if (diffDays > 90) {
+      return res.status(400).json({ error: 'Date range cannot exceed 90 days' });
+    }
+
+    const result = await getTrendStatistics({ startDate, endDate, granularity, step, groupBy, metric });
+    res.json({ success: true, ...result });
+  } catch (error) {
+    console.error('Failed to get trend statistics:', error);
+    res.status(500).json({ error: 'Failed to get trend statistics' });
+  }
+});
+
+/**
+ * 导出趋势统计数据
+ * GET /api/statistics/trend/export
+ *
+ * @query {string} startDate - YYYY-MM-DD (required)
+ * @query {string} endDate - YYYY-MM-DD (required)
+ * @query {string} granularity - 'day' | 'hour' (default: 'day')
+ * @query {string} groupBy - 'model' | 'channel' | 'toolType' (default: 'model')
+ * @query {string} metric - 'tokens' | 'cost' | 'requests' (default: 'tokens')
+ * @query {string} format - 'csv' | 'json' (default: 'csv')
+ */
+router.get('/trend/export', async (req, res) => {
+  try {
+    const { startDate, endDate, granularity = 'day', step = 1, groupBy = 'model', metric = 'tokens', format = 'csv' } = req.query;
+
+    if (!startDate || !endDate) {
+      return res.status(400).json({ error: 'startDate and endDate are required' });
+    }
+
+    const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+    if (!dateRegex.test(startDate) || !dateRegex.test(endDate)) {
+      return res.status(400).json({ error: 'Invalid date format. Expected YYYY-MM-DD' });
+    }
+
+    const start = new Date(startDate);
+    const end = new Date(endDate);
+    const diffDays = Math.round((end - start) / (1000 * 60 * 60 * 24)) + 1;
+
+    if (diffDays < 1) {
+      return res.status(400).json({ error: 'endDate must be >= startDate' });
+    }
+
+    if (granularity === 'hour' && diffDays > 7) {
+      return res.status(400).json({ error: 'Hour granularity is limited to 7 days' });
+    }
+
+    if (diffDays > 90) {
+      return res.status(400).json({ error: 'Date range cannot exceed 90 days' });
+    }
+
+    const result = await getTrendStatistics({ startDate, endDate, granularity, step, groupBy, metric });
+
+    const filename = `analytics-${startDate}-${endDate}-${groupBy}-${metric}.${format}`;
+    res.setHeader('Content-Disposition', `attachment; filename="${filename}"`);
+
+    if (format === 'json') {
+      res.setHeader('Content-Type', 'application/json');
+      return res.json(result);
+    }
+
+    // CSV format
+    res.setHeader('Content-Type', 'text/csv; charset=utf-8');
+    const seriesNames = result.series.map(s => s.name);
+    const header = ['Date/Time', ...seriesNames, 'Total'].join(',');
+    const rows = result.labels.map((label, i) => {
+      const values = result.series.map(s => s.data[i] || 0);
+      const total = values.reduce((a, b) => a + b, 0);
+      return [label, ...values, total].join(',');
+    });
+
+    res.send([header, ...rows].join('\n'));
+  } catch (error) {
+    console.error('Failed to export trend statistics:', error);
+    res.status(500).json({ error: 'Failed to export trend statistics' });
+  }
+});
+
 module.exports = router;

package/src/server/codex-proxy-server.js

@@ -7,12 +7,11 @@ const { allocateChannel, releaseChannel, getSchedulerState } = require('./servic
 const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
 const { recordRequest: recordCodexRequest } = require('./services/codex-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const { createDecodedStream } = require('./services/response-decoder');
 const { getEnabledChannels, writeCodexConfigForMultiChannel, getEffectiveApiKey } = require('./services/codex-channels');
-const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -26,7 +25,7 @@ const requestMetadata = new Map();
 const printedRedirectCache = new Map();
 
 // OpenAI 模型定价（每百万 tokens 的价格，单位：美元）
-// Claude 模型使用 config/model-pricing.js 中的集中定价
+// 作为 model-metadata 未覆盖时的兜底值
 const PRICING = {
   'gpt-4o': { input: 2.5, output: 10 },
   'gpt-4o-2024-11-20': { input: 2.5, output: 10 },
@@ -143,61 +142,33 @@ function resolveCodexTarget(baseUrl = '', requestPath = '') {
  * 计算请求成本
  */
 function calculateCost(model, tokens) {
-  let pricing;
-
-  // 首先检查是否是 Claude 模型，使用集中定价
-  if (model.startsWith('claude-') || model.toLowerCase().includes('claude')) {
-    pricing = CLAUDE_MODEL_PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配 Claude 模型
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      // 查找最接近的 Claude 模型
-      for (const [key, value] of Object.entries(CLAUDE_MODEL_PRICING)) {
-        if (key.toLowerCase().includes(modelLower) || modelLower.includes(key.toLowerCase())) {
-          pricing = value;
-          break;
-        }
-      }
-    }
-
-    // 如果仍然没有找到，使用默认 Sonnet 定价
-    if (!pricing) {
-      pricing = CLAUDE_MODEL_PRICING['claude-sonnet-4-5-20250929'];
-    }
-  } else {
-    // 非 Claude 模型，使用 PRICING 对象（OpenAI 等）
-    pricing = PRICING[model];
-
-    // 如果没有精确匹配，尝试模糊匹配
-    if (!pricing) {
-      const modelLower = model.toLowerCase();
-      if (modelLower.includes('gpt-4o-mini')) {
-        pricing = PRICING['gpt-4o-mini'];
-      } else if (modelLower.includes('gpt-4o')) {
-        pricing = PRICING['gpt-4o'];
-      } else if (modelLower.includes('gpt-4')) {
-        pricing = PRICING['gpt-4'];
-      } else if (modelLower.includes('gpt-3.5')) {
-        pricing = PRICING['gpt-3.5-turbo'];
-      } else if (modelLower.includes('o1-mini')) {
-        pricing = PRICING['o1-mini'];
-      } else if (modelLower.includes('o1-pro')) {
-        pricing = PRICING['o1-pro'];
-      } else if (modelLower.includes('o1')) {
-        pricing = PRICING['o1'];
-      } else if (modelLower.includes('o3-mini')) {
-        pricing = PRICING['o3-mini'];
-      } else if (modelLower.includes('o3')) {
-        pricing = PRICING['o3'];
-      } else if (modelLower.includes('o4-mini')) {
-        pricing = PRICING['o4-mini'];
-      }
+  let fallbackPricing = PRICING[model];
+  if (!fallbackPricing) {
+    const modelLower = String(model || '').toLowerCase();
+    if (modelLower.includes('gpt-4o-mini')) {
+      fallbackPricing = PRICING['gpt-4o-mini'];
+    } else if (modelLower.includes('gpt-4o')) {
+      fallbackPricing = PRICING['gpt-4o'];
+    } else if (modelLower.includes('gpt-4')) {
+      fallbackPricing = PRICING['gpt-4'];
+    } else if (modelLower.includes('gpt-3.5')) {
+      fallbackPricing = PRICING['gpt-3.5-turbo'];
+    } else if (modelLower.includes('o1-mini')) {
+      fallbackPricing = PRICING['o1-mini'];
+    } else if (modelLower.includes('o1-pro')) {
+      fallbackPricing = PRICING['o1-pro'];
+    } else if (modelLower.includes('o1')) {
+      fallbackPricing = PRICING['o1'];
+    } else if (modelLower.includes('o3-mini')) {
+      fallbackPricing = PRICING['o3-mini'];
+    } else if (modelLower.includes('o3')) {
+      fallbackPricing = PRICING['o3'];
+    } else if (modelLower.includes('o4-mini')) {
+      fallbackPricing = PRICING['o4-mini'];
     }
   }
 
-  // 默认使用基础定价
-  pricing = resolvePricing('codex', pricing, CODEX_BASE_PRICING);
+  const pricing = resolveModelPricing('codex', model, fallbackPricing, CODEX_BASE_PRICING);
   const inputRate = typeof pricing.input === 'number' ? pricing.input : CODEX_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : CODEX_BASE_PRICING.output;
 

package/src/server/gemini-proxy-server.js

@@ -7,7 +7,7 @@ const { allocateChannel, releaseChannel, getSchedulerState } = require('./servic
 const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
-const { resolvePricing } = require('./utils/pricing');
+const { resolveModelPricing } = require('./utils/pricing');
 const { recordRequest: recordGeminiRequest } = require('./services/gemini-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const { createDecodedStream } = require('./services/response-decoder');
@@ -25,6 +25,7 @@ const requestMetadata = new Map();
 const printedGeminiRedirectCache = new Map();
 
 // Gemini 模型定价（每百万 tokens 的价格，单位：美元）
+// 作为 model-metadata 未覆盖时的兜底值
 const PRICING = {
   'gemini-2.5-pro': { input: 1.25, output: 5 },
   'gemini-2.5-flash': { input: 0.075, output: 0.3 },
@@ -79,33 +80,33 @@ function redirectModel(originalModel, channel) {
  */
 function calculateCost(model, tokens) {
   // 尝试精确匹配
-  let pricing = PRICING[model];
+  let fallbackPricing = PRICING[model];
 
   // 如果没有精确匹配，尝试模糊匹配
-  if (!pricing) {
-    const modelLower = model.toLowerCase();
+  if (!fallbackPricing) {
+    const modelLower = String(model || '').toLowerCase();
     if (modelLower.includes('gemini-2.5-pro')) {
-      pricing = PRICING['gemini-2.5-pro'];
+      fallbackPricing = PRICING['gemini-2.5-pro'];
     } else if (modelLower.includes('gemini-2.5-flash')) {
-      pricing = PRICING['gemini-2.5-flash'];
+      fallbackPricing = PRICING['gemini-2.5-flash'];
     } else if (modelLower.includes('gemini-2.0-flash-thinking')) {
-      pricing = PRICING['gemini-2.0-flash-thinking-exp-1219'];
+      fallbackPricing = PRICING['gemini-2.0-flash-thinking-exp-1219'];
     } else if (modelLower.includes('gemini-2.0-flash')) {
-      pricing = PRICING['gemini-2.0-flash-exp'];
+      fallbackPricing = PRICING['gemini-2.0-flash-exp'];
     } else if (modelLower.includes('gemini-1.5-pro')) {
-      pricing = PRICING['gemini-1.5-pro'];
+      fallbackPricing = PRICING['gemini-1.5-pro'];
     } else if (modelLower.includes('gemini-1.5-flash-8b')) {
-      pricing = PRICING['gemini-1.5-flash-8b'];
+      fallbackPricing = PRICING['gemini-1.5-flash-8b'];
     } else if (modelLower.includes('gemini-1.5-flash')) {
-      pricing = PRICING['gemini-1.5-flash'];
+      fallbackPricing = PRICING['gemini-1.5-flash'];
     } else if (modelLower.includes('gemini-1.0-pro')) {
-      pricing = PRICING['gemini-1.0-pro'];
+      fallbackPricing = PRICING['gemini-1.0-pro'];
     } else if (modelLower.includes('gemini-pro')) {
-      pricing = PRICING['gemini-pro'];
+      fallbackPricing = PRICING['gemini-pro'];
     }
   }
 
-  pricing = resolvePricing('gemini', pricing, GEMINI_BASE_PRICING);
+  const pricing = resolveModelPricing('gemini', model, fallbackPricing, GEMINI_BASE_PRICING);
   const inputRate = typeof pricing.input === 'number' ? pricing.input : GEMINI_BASE_PRICING.input;
   const outputRate = typeof pricing.output === 'number' ? pricing.output : GEMINI_BASE_PRICING.output;
 

package/src/server/index.js

@@ -158,9 +158,6 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   app.use('/api/opencode/proxy', require('./api/opencode-proxy'));
   app.use('/api/opencode/statistics', require('./api/opencode-statistics'));
 
-  // 会话格式转换 API
-  app.use('/api/convert', require('./api/convert'));
-
   app.use('/api/aliases', require('./api/aliases')());
   app.use('/api/favorites', require('./api/favorites'));
   app.use('/api/ui-config', require('./api/ui-config'));