coding-tool-x 3.6.1 → 3.6.2

package/dist/web/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>coding-tool-x · AI 编程工作台</title>
-    <script type="module" crossorigin src="/assets/index-CLra7uzu.js"></script>
+    <script type="module" crossorigin src="/assets/index-C2yKfEbU.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-BNJfEgCA.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-B5RqjEjQ.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-DM897mIP.js">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/config/default.js

@@ -46,6 +46,7 @@ const DEFAULT_CONFIG = {
       mode: 'auto',
       input: 2.5,
       output: 15,
+      cacheRead: 0.25,
       models: {
         'gpt-5-codex': { mode: 'auto' },
         'gpt-4o-mini': { mode: 'auto' }
@@ -55,6 +56,7 @@ const DEFAULT_CONFIG = {
       mode: 'auto',
       input: 1.25,
       output: 10,
+      cacheRead: 0.125,
       models: {
         'gemini-2.5-pro': { mode: 'auto' },
         'gemini-2.5-flash': { mode: 'auto' }
@@ -64,6 +66,7 @@ const DEFAULT_CONFIG = {
       mode: 'auto',
       input: 2.5,
       output: 15,
+      cacheRead: 0.25,
       models: {}
     }
   }

package/src/config/model-metadata.json

@@ -1,7 +1,8 @@
 {
-  "lastUpdated": "2026-04-19",
+  "lastUpdated": "2026-05-10",
   "defaultModels": {
     "claude": [
+      "claude-opus-4-7",
       "claude-opus-4-6",
       "claude-sonnet-4-6",
       "claude-opus-4-5-20251101",
@@ -9,8 +10,11 @@
       "claude-haiku-4-5-20251001"
     ],
     "codex": [
+      "gpt-5.5",
       "gpt-5.4",
+      "gpt-5.4-mini",
       "gpt-5.3-codex",
+      "gpt-5.3-codex-spark",
       "gpt-5.2-codex",
       "gpt-5.1-codex-max",
       "gpt-5.1-codex",
@@ -21,6 +25,8 @@
       "gpt-5"
     ],
     "gemini": [
+      "gemini-3.1-pro-preview",
+      "gemini-3.1-flash-preview",
       "gemini-3-pro-preview",
       "gemini-3-flash-preview",
       "gemini-2.5-pro",
@@ -34,17 +40,26 @@
     "gemini": "gemini-2.5-pro"
   },
   "aliases": {
+    "claude-opus-4-7": "claude-opus-4-7",
+    "claude-opus-4.7": "claude-opus-4-7",
     "claude-opus-4-6": "claude-opus-4-6",
     "claude-sonnet-4-6": "claude-sonnet-4-6",
     "claude-opus-4-5": "claude-opus-4-5-20251101",
     "claude-sonnet-4-5": "claude-sonnet-4-5-20250929",
     "claude-haiku-4-5": "claude-haiku-4-5-20251001",
-    "gemini-3.1-pro": "gemini-3-pro-preview"
+    "gemini-3.1-pro": "gemini-3.1-pro-preview",
+    "gemini-3.1-pro-high": "gemini-3.1-pro-high",
+    "gemini-3.1-pro-low": "gemini-3.1-pro-low",
+    "gemini-3.1-flash": "gemini-3.1-flash-preview"
   },
   "models": {
+    "claude-opus-4-7": {
+      "limit": { "context": 1000000, "output": 128000 },
+      "pricing": { "input": 5, "output": 25, "cacheCreation": 6.25, "cacheRead": 0.5 }
+    },
     "claude-opus-4-6": {
-      "limit": { "context": 200000, "output": 32000 },
-      "pricing": { "input": 15, "output": 75, "cacheCreation": 18.75, "cacheRead": 1.5 }
+      "limit": { "context": 1000000, "output": 128000 },
+      "pricing": { "input": 5, "output": 25, "cacheCreation": 6.25, "cacheRead": 0.5 }
     },
     "claude-sonnet-4-6": {
       "limit": { "context": 200000, "output": 64000 },
@@ -63,64 +78,92 @@
       "pricing": { "input": 1, "output": 5, "cacheCreation": 1.25, "cacheRead": 0.1 }
     },
     "gpt-5": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gpt-5.1": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gpt-5.2": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.75, "output": 14 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.75, "output": 14, "cacheRead": 0.175 }
+    },
+    "gpt-5.5": {
+      "limit": { "context": 1050000, "output": 128000 },
+      "pricing": { "input": 5, "output": 30, "cacheRead": 0.5 }
     },
     "gpt-5.4": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 2.5, "output": 15 }
+      "limit": { "context": 1050000, "output": 128000 },
+      "pricing": { "input": 2.5, "output": 15, "cacheRead": 0.25 }
+    },
+    "gpt-5.4-mini": {
+      "limit": { "context": 400000, "output": 128000 },
+      "pricing": { "input": 0.75, "output": 4.5, "cacheRead": 0.075 }
     },
     "gpt-5-codex": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gpt-5.1-codex": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gpt-5.1-codex-mini": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 0.25, "output": 2 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 0.25, "output": 2, "cacheRead": 0.025 }
     },
     "gpt-5.1-codex-max": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gpt-5.2-codex": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.75, "output": 14 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.75, "output": 14, "cacheRead": 0.175 }
     },
     "gpt-5.3-codex": {
-      "limit": { "context": 1000000, "output": 32768 },
-      "pricing": { "input": 1.75, "output": 14 }
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.75, "output": 14, "cacheRead": 0.175 }
+    },
+    "gpt-5.3-codex-spark": {
+      "limit": { "context": 272000, "output": 128000 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
+    },
+    "gemini-3.1-pro-preview": {
+      "limit": { "context": 1048576, "output": 65536 },
+      "pricing": { "input": 2, "output": 12, "cacheRead": 0.2 }
+    },
+    "gemini-3.1-pro-high": {
+      "limit": { "context": 1048576, "output": 65536 },
+      "pricing": { "input": 2, "output": 12, "cacheRead": 0.2 }
+    },
+    "gemini-3.1-pro-low": {
+      "limit": { "context": 1048576, "output": 65536 },
+      "pricing": { "input": 2, "output": 12, "cacheRead": 0.2 }
+    },
+    "gemini-3.1-flash-preview": {
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 0.5, "output": 3, "cacheRead": 0.05 }
     },
     "gemini-3-pro-preview": {
-      "limit": { "context": 2097152, "output": 65536 },
-      "pricing": { "input": 2, "output": 12 }
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 2, "output": 12, "cacheRead": 0.2 }
     },
     "gemini-3-flash-preview": {
-      "limit": { "context": 1048576, "output": 65536 },
-      "pricing": { "input": 0.5, "output": 3 }
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 0.5, "output": 3, "cacheRead": 0.05 }
     },
     "gemini-2.5-pro": {
-      "limit": { "context": 1048576, "output": 65536 },
-      "pricing": { "input": 1.25, "output": 10 }
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 1.25, "output": 10, "cacheRead": 0.125 }
     },
     "gemini-2.5-flash": {
-      "limit": { "context": 1048576, "output": 65536 },
-      "pricing": { "input": 0.3, "output": 2.5 }
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 0.3, "output": 2.5, "cacheRead": 0.03 }
     },
     "gemini-2.5-flash-lite": {
-      "limit": { "context": 1048576, "output": 65536 },
-      "pricing": { "input": 0.1, "output": 0.4 }
+      "limit": { "context": 1048576, "output": 65535 },
+      "pricing": { "input": 0.1, "output": 0.4, "cacheRead": 0.01 }
     }
   }
 }

package/src/server/codex-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 { resolveModelPricing } = require('./utils/pricing');
+const { resolveModelPricing, calculateTokenCost } = 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');
@@ -52,7 +52,6 @@ const PRICING = {
 };
 
 const CODEX_BASE_PRICING = DEFAULT_CONFIG.pricing.codex;
-const ONE_MILLION = 1000000;
 
 // detectModelTier, redirectModel, resolveTargetUrl imported from services/base/proxy-utils
 
@@ -90,13 +89,7 @@ function calculateCost(model, tokens) {
   }
 
   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;
-
-  return (
-    (tokens.input || 0) * inputRate / ONE_MILLION +
-    (tokens.output || 0) * outputRate / ONE_MILLION
-  );
+  return calculateTokenCost(pricing, tokens, CODEX_BASE_PRICING);
 }
 
 const jsonBodyParser = express.json({
@@ -598,5 +591,6 @@ module.exports = {
   startCodexProxyServer,
   stopCodexProxyServer,
   getCodexProxyStatus,
-  clearCodexRedirectCache
+  clearCodexRedirectCache,
+  calculateCost
 };

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 { resolveModelPricing } = require('./utils/pricing');
+const { resolveModelPricing, calculateTokenCost } = 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');
@@ -32,8 +32,9 @@ 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 },
+  'gemini-2.5-pro': { input: 1.25, output: 10, cacheRead: 0.125 },
+  'gemini-2.5-flash': { input: 0.3, output: 2.5, cacheRead: 0.03 },
+  'gemini-2.5-flash-lite': { input: 0.1, output: 0.4, cacheRead: 0.01 },
   'gemini-2.0-flash-exp': { input: 0, output: 0 }, // 实验性免费
   'gemini-2.0-flash-thinking-exp-1219': { input: 0, output: 0 }, // 实验性免费
   'gemini-1.5-pro': { input: 1.25, output: 5 },
@@ -46,7 +47,6 @@ const PRICING = {
 };
 
 const GEMINI_BASE_PRICING = DEFAULT_CONFIG.pricing.gemini;
-const ONE_MILLION = 1000000;
 
 // resolveGeminiTarget replaced by resolveTargetUrl from proxy-utils
 const resolveGeminiTarget = resolveTargetUrl;
@@ -68,6 +68,8 @@ function calculateCost(model, tokens) {
     const modelLower = String(model || '').toLowerCase();
     if (modelLower.includes('gemini-2.5-pro')) {
       fallbackPricing = PRICING['gemini-2.5-pro'];
+    } else if (modelLower.includes('gemini-2.5-flash-lite')) {
+      fallbackPricing = PRICING['gemini-2.5-flash-lite'];
     } else if (modelLower.includes('gemini-2.5-flash')) {
       fallbackPricing = PRICING['gemini-2.5-flash'];
     } else if (modelLower.includes('gemini-2.0-flash-thinking')) {
@@ -88,13 +90,7 @@ function calculateCost(model, tokens) {
   }
 
   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;
-
-  return (
-    (tokens.input || 0) * inputRate / ONE_MILLION +
-    (tokens.output || 0) * outputRate / ONE_MILLION
-  );
+  return calculateTokenCost(pricing, tokens, GEMINI_BASE_PRICING);
 }
 
 // 启动 Gemini 代理服务器
@@ -571,5 +567,6 @@ module.exports = {
   startGeminiProxyServer,
   stopGeminiProxyServer,
   getGeminiProxyStatus,
-  clearGeminiRedirectCache
+  clearGeminiRedirectCache,
+  calculateCost
 };

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

@@ -14,7 +14,7 @@ const { recordSuccess, recordFailure } = require('./services/channel-health');
 const { loadConfig } = require('../config/loader');
 const DEFAULT_CONFIG = require('../config/default');
 const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
-const { resolveModelPricing } = require('./utils/pricing');
+const { resolveModelPricing, calculateTokenCost } = require('./utils/pricing');
 const { recordRequest: recordOpenCodeRequest } = require('./services/opencode-statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const { getEnabledChannels, getEffectiveApiKey } = require('./services/opencode-channels');
@@ -58,7 +58,6 @@ const PRICING = {
 };
 
 const OPENCODE_BASE_PRICING = DEFAULT_CONFIG.pricing.opencode || DEFAULT_CONFIG.pricing.codex;
-const ONE_MILLION = 1000000;
 const CLAUDE_CODE_USER_AGENT = 'claude-cli/2.1.59 (external, cli)';
 const CLAUDE_MESSAGES_BETA_FLAGS = Object.freeze([
   'claude-code-20250219',
@@ -133,13 +132,7 @@ function calculateCost(model, tokens) {
   }
 
   const pricing = resolveModelPricing('opencode', model, fallbackPricing, OPENCODE_BASE_PRICING);
-  const inputRate = typeof pricing.input === 'number' ? pricing.input : OPENCODE_BASE_PRICING.input;
-  const outputRate = typeof pricing.output === 'number' ? pricing.output : OPENCODE_BASE_PRICING.output;
-
-  return (
-    (tokens.input || 0) * inputRate / ONE_MILLION +
-    (tokens.output || 0) * outputRate / ONE_MILLION
-  );
+  return calculateTokenCost(pricing, tokens, OPENCODE_BASE_PRICING);
 }
 
 const jsonBodyParser = express.json({
@@ -4741,5 +4734,6 @@ module.exports = {
   stopOpenCodeProxyServer,
   getOpenCodeProxyStatus,
   clearOpenCodeRedirectCache,
-  collectProxyModelList
+  collectProxyModelList,
+  calculateCost
 };

package/src/server/services/gemini-sessions.js

@@ -3,6 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { HOME_DIR } = require('../../config/paths');
 const { getGeminiDir } = require('./gemini-config');
+const { resolveModelPricing } = require('../utils/pricing');
 
 // 路径映射缓存
 let pathMappingCache = null;
@@ -228,8 +229,10 @@ function readSessionMeta(filePath) {
           model = msg.model;
           const inputTokens = msg.tokens.input || 0;
           const outputTokens = msg.tokens.output || 0;
-          // gemini-2.5-pro: $1.25 / 1M input, $5 / 1M output
-          totalCost += (inputTokens * 1.25 / 1000000) + (outputTokens * 5 / 1000000);
+          const pricing = resolveModelPricing('gemini', msg.model);
+          const inputRate = typeof pricing.input === 'number' ? pricing.input : 1.25;
+          const outputRate = typeof pricing.output === 'number' ? pricing.output : 10;
+          totalCost += (inputTokens * inputRate / 1000000) + (outputTokens * outputRate / 1000000);
         }
       }
     });

package/src/server/services/model-detector.js

@@ -16,6 +16,7 @@ const { PATHS } = require('../../config/paths');
 // 内置模型优先级（当配置缺失时兜底）
 const MODEL_PRIORITY = {
   claude: [
+    'claude-opus-4-7',
     'claude-opus-4-6',
     'claude-sonnet-4-6',
     'claude-opus-4-5-20251101',
@@ -23,7 +24,11 @@ const MODEL_PRIORITY = {
     'claude-haiku-4-5-20251001'
   ],
   codex: [
+    'gpt-5.5',
     'gpt-5.4',
+    'gpt-5.4-mini',
+    'gpt-5.3-codex',
+    'gpt-5.3-codex-spark',
     'gpt-5.2-codex',
     'gpt-5.1-codex-max',
     'gpt-5.1-codex',
@@ -34,6 +39,8 @@ const MODEL_PRIORITY = {
     'gpt-5'
   ],
   gemini: [
+    'gemini-3.1-pro-preview',
+    'gemini-3.1-flash-preview',
     'gemini-3-pro-preview',
     'gemini-3-flash-preview',
     'gemini-2.5-pro',

package/src/server/utils/pricing.js

@@ -67,7 +67,32 @@ function resolveModelPricing(_toolKey, model, fallbackPricing = {}, defaultPrici
   };
 }
 
+function getRate(pricing, defaultPricing, key) {
+  if (typeof pricing?.[key] === 'number') return pricing[key];
+  if (typeof defaultPricing?.[key] === 'number') return defaultPricing[key];
+  return 0;
+}
+
+function calculateTokenCost(pricing = {}, tokens = {}, defaultPricing = {}) {
+  const inputRate = getRate(pricing, defaultPricing, 'input');
+  const outputRate = getRate(pricing, defaultPricing, 'output');
+  const cacheCreationRate = getRate(pricing, defaultPricing, 'cacheCreation');
+  const cacheReadRate = getRate(pricing, defaultPricing, 'cacheRead');
+  const inputTokens = Number(tokens.input || 0);
+  const outputTokens = Number(tokens.output || 0);
+  const cacheCreationTokens = Number(tokens.cacheCreation || 0);
+  const cacheReadTokens = Number(tokens.cacheRead || tokens.cached || 0);
+
+  return (
+    inputTokens * inputRate / 1000000 +
+    outputTokens * outputRate / 1000000 +
+    cacheCreationTokens * cacheCreationRate / 1000000 +
+    cacheReadTokens * cacheReadRate / 1000000
+  );
+}
+
 module.exports = {
   resolvePricing,
-  resolveModelPricing
+  resolveModelPricing,
+  calculateTokenCost
 };