@adversity/coding-tool-x 3.1.1 → 3.1.2

package/src/server/api/opencode-channels.js

@@ -16,10 +16,16 @@ const {
   sanitizeBatchConcurrency,
   runWithConcurrencyLimit
 } = require('../services/speed-test');
-const { clearOpenCodeRedirectCache } = require('../opencode-proxy-server');
+const {
+  clearOpenCodeRedirectCache,
+  collectProxyModelList,
+  getOpenCodeProxyStatus
+} = require('../opencode-proxy-server');
+const { setProxyConfig } = require('../services/opencode-settings-manager');
 const {
   fetchModelsFromProvider,
-  probeModelAvailability
+  probeModelAvailability,
+  clearCache
 } = require('../services/model-detector');
 
 module.exports = (config) => {
@@ -79,6 +85,71 @@ module.exports = (config) => {
     return presetId === 'entry_claude' || presetId === 'entry_codex' || presetId === 'entry_gemini';
   }
 
+  function refreshEditedChannelModelCache(channelId) {
+    if (!channelId) return;
+    clearCache(channelId);
+  }
+
+  async function syncOpenCodeProxyConfigByCache() {
+    const proxyStatus = getOpenCodeProxyStatus();
+    if (!proxyStatus?.running || !Number.isFinite(proxyStatus?.port)) {
+      return;
+    }
+
+    const channels = getChannels().channels || [];
+    const enabledChannels = channels.filter(ch => ch.enabled !== false);
+
+    // Collect per-channel model lists for per-channel provider generation
+    let detectedModels = [];
+    try {
+      detectedModels = await collectProxyModelList(enabledChannels, { useCacheOnly: true }) || [];
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Failed to collect cached models while syncing proxy config:', error.message);
+    }
+
+    const channelPayloads = enabledChannels.map((ch) => {
+      let models;
+      if (Array.isArray(ch.allowedModels) && ch.allowedModels.length > 0) {
+        // User explicitly selected models for this channel
+        models = ch.allowedModels;
+      } else {
+        // Fall back to configured + detected models
+        models = uniqueModels([
+          ch.model,
+          ch.speedTestModel,
+          ...(Array.isArray(ch.modelRedirects)
+            ? ch.modelRedirects.flatMap(r => [r?.from, r?.to])
+            : []),
+          ...detectedModels
+        ]);
+      }
+      return {
+        name: ch.name,
+        providerKey: ch.providerKey || ch.name,
+        model: ch.model || null,
+        models
+      };
+    });
+
+    const currentChannel = enabledChannels[0];
+    const activeModel = currentChannel?.model || currentChannel?.speedTestModel || null;
+    setProxyConfig(proxyStatus.port, { channels: channelPayloads, model: activeModel });
+  }
+
+  async function refreshEditedChannelAndSyncProxy(channelId) {
+    try {
+      await refreshEditedChannelModelCache(channelId);
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Refresh edited channel model cache failed:', error.message);
+    }
+
+    try {
+      await syncOpenCodeProxyConfigByCache();
+    } catch (error) {
+      console.warn('[OpenCode Channels API] Sync proxy config after channel edit failed:', error.message);
+    }
+  }
+
   /**
    * GET /api/opencode/channels
    * 获取所有 OpenCode 渠道
@@ -218,7 +289,7 @@ module.exports = (config) => {
    * POST /api/opencode/channels
    * 创建新渠道
    */
-  router.post('/', (req, res) => {
+  router.post('/', async (req, res) => {
     try {
       const {
         name,
@@ -233,7 +304,8 @@ module.exports = (config) => {
         modelRedirects,
         speedTestModel,
         presetId,
-        websiteUrl
+        websiteUrl,
+        allowedModels
       } = req.body;
 
       if (!name || !baseUrl) {
@@ -254,9 +326,12 @@ module.exports = (config) => {
         modelRedirects: modelRedirects || [],
         speedTestModel: speedTestModel || null,
         presetId,
-        websiteUrl
+        websiteUrl,
+        allowedModels: allowedModels || []
       });
 
+      clearOpenCodeRedirectCache(channel.id);
+      await refreshEditedChannelAndSyncProxy(channel.id);
       res.json(channel);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {
@@ -269,13 +344,14 @@ module.exports = (config) => {
    * PUT /api/opencode/channels/:channelId
    * 更新渠道
    */
-  router.put('/:channelId', (req, res) => {
+  router.put('/:channelId', async (req, res) => {
     try {
       const { channelId } = req.params;
       const updates = req.body;
 
       const channel = updateChannel(channelId, updates);
       clearOpenCodeRedirectCache(channelId);
+      await refreshEditedChannelAndSyncProxy(channelId);
       res.json(channel);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {
@@ -292,6 +368,8 @@ module.exports = (config) => {
     try {
       const { channelId } = req.params;
       const result = await deleteChannel(channelId);
+      clearOpenCodeRedirectCache(channelId);
+      await refreshEditedChannelAndSyncProxy(channelId);
       res.json(result);
       broadcastSchedulerState('opencode', getSchedulerState('opencode'));
     } catch (err) {

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

@@ -19,16 +19,6 @@ const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 const fs = require('fs');
 const path = require('path');
 
-function pushUniqueModel(allModels, seen, modelId) {
-  if (typeof modelId !== 'string') return;
-  const trimmed = modelId.trim();
-  if (!trimmed) return;
-  const key = trimmed.toLowerCase();
-  if (seen.has(key)) return;
-  seen.add(key);
-  allModels.push(trimmed);
-}
-
 function sanitizeChannel(channel) {
   if (!channel) return null;
   return {
@@ -111,35 +101,54 @@ router.post('/start', async (req, res) => {
     }
 
     // 4. 设置代理配置（写入 OpenCode 配置文件）
-    // 收集所有启用渠道配置的模型
-    const allModels = [];
-    const seen = new Set();
-    enabledChannels.forEach((ch) => {
-      const candidates = [
-        ch.model,
-        ch.speedTestModel
-      ];
-      if (ch.modelConfig && typeof ch.modelConfig === 'object') {
-        candidates.push(ch.modelConfig.model, ch.modelConfig.opusModel, ch.modelConfig.sonnetModel, ch.modelConfig.haikuModel);
-      }
-      if (Array.isArray(ch.modelRedirects)) {
-        ch.modelRedirects.forEach(r => { candidates.push(r && r.from); candidates.push(r && r.to); });
-      }
-      candidates.forEach((m) => pushUniqueModel(allModels, seen, m));
-    });
+    // 收集每个渠道的模型列表，生成 per-channel provider 配置
 
     // 若渠道未显式填写模型，回退使用代理聚合模型（含 /v1/models 与模型探测结果）。
+    let detectedModels = [];
     try {
-      const detectedModels = await collectProxyModelList(enabledChannels, { forceRefresh: false });
-      if (Array.isArray(detectedModels)) {
-        detectedModels.forEach(modelId => pushUniqueModel(allModels, seen, modelId));
-      }
+      detectedModels = await collectProxyModelList(enabledChannels, {
+        useCacheOnly: true
+      }) || [];
     } catch (error) {
       console.warn('[OpenCode Proxy] Failed to collect proxy models before writing config:', error.message);
     }
 
-    const activeModel = currentChannel.model || currentChannel.speedTestModel || allModels[0] || null;
-    setProxyConfig(proxyResult.port, { model: activeModel, models: allModels });
+    const channelPayloads = enabledChannels.map((ch) => {
+      let models;
+      if (Array.isArray(ch.allowedModels) && ch.allowedModels.length > 0) {
+        models = ch.allowedModels;
+      } else {
+        const seen = new Set();
+        const collected = [];
+        const add = (m) => {
+          if (typeof m !== 'string') return;
+          const t = m.trim();
+          if (!t) return;
+          const k = t.toLowerCase();
+          if (seen.has(k)) return;
+          seen.add(k);
+          collected.push(t);
+        };
+        [ch.model, ch.speedTestModel].forEach(add);
+        if (ch.modelConfig && typeof ch.modelConfig === 'object') {
+          [ch.modelConfig.model, ch.modelConfig.opusModel, ch.modelConfig.sonnetModel, ch.modelConfig.haikuModel].forEach(add);
+        }
+        if (Array.isArray(ch.modelRedirects)) {
+          ch.modelRedirects.forEach(r => { add(r && r.from); add(r && r.to); });
+        }
+        detectedModels.forEach(add);
+        models = collected;
+      }
+      return {
+        name: ch.name,
+        providerKey: ch.providerKey || ch.name,
+        model: ch.model || null,
+        models
+      };
+    });
+
+    const activeModel = currentChannel.model || currentChannel.speedTestModel || null;
+    setProxyConfig(proxyResult.port, { channels: channelPayloads, model: activeModel });
 
     // 5. 广播状态更新
     const { broadcastProxyState } = require('../websocket-server');

package/src/server/api/opencode-sessions.js

@@ -4,6 +4,7 @@ const {
   getProjects,
   getSessionsByProject,
   getSessionById,
+  getSessionMessages,
   getRecentSessions,
   searchSessions,
   deleteSession,
@@ -14,8 +15,6 @@ const {
 const { loadAliases } = require('../services/alias');
 const { getTerminalLaunchCommand } = require('../services/terminal-config');
 const { broadcastLog } = require('../websocket-server');
-const fs = require('fs');
-const path = require('path');
 const os = require('os');
 
 function isNotFoundError(error) {
@@ -156,7 +155,6 @@ module.exports = (config) => {
   /**
    * GET /api/opencode/sessions/:projectName/:sessionId/messages
    * 获取会话的消息列表
-   * Note: OpenCode 的消息存储在单独的 message 目录，暂时返回基本信息
    */
   router.get('/:projectName/:sessionId/messages', (req, res) => {
     try {
@@ -167,66 +165,10 @@ module.exports = (config) => {
       const { sessionId } = req.params;
       const { page = 1, limit = 20, order = 'desc' } = req.query;
       const session = getSessionById(sessionId);
-
-      // 读取消息文件
-      const messagesDir = path.join(
-        os.homedir(), '.local', 'share', 'opencode', 'storage', 'message', sessionId
-      );
-
-      const convertedMessages = [];
-
-      if (fs.existsSync(messagesDir)) {
-        const files = fs.readdirSync(messagesDir)
-          .filter(f => f.endsWith('.json'))
-          .sort();
-
-        for (const file of files) {
-          try {
-            const content = fs.readFileSync(path.join(messagesDir, file), 'utf8');
-            const msg = JSON.parse(content);
-
-            if (msg.role === 'user') {
-              // 提取用户消息内容
-              let textContent = '';
-              if (Array.isArray(msg.content)) {
-                textContent = msg.content
-                  .filter(c => c.type === 'text')
-                  .map(c => c.text || '')
-                  .join('\n');
-              } else if (typeof msg.content === 'string') {
-                textContent = msg.content;
-              }
-
-              convertedMessages.push({
-                type: 'user',
-                content: textContent || '[空消息]',
-                timestamp: msg.time?.created ? new Date(msg.time.created).toISOString() : null,
-                model: null
-              });
-            } else if (msg.role === 'assistant') {
-              // 提取助手消息内容
-              let textContent = '';
-              if (Array.isArray(msg.content)) {
-                textContent = msg.content
-                  .filter(c => c.type === 'text')
-                  .map(c => c.text || '')
-                  .join('\n');
-              } else if (typeof msg.content === 'string') {
-                textContent = msg.content;
-              }
-
-              convertedMessages.push({
-                type: 'assistant',
-                content: textContent || '[空消息]',
-                timestamp: msg.time?.created ? new Date(msg.time.created).toISOString() : null,
-                model: msg.model || 'opencode'
-              });
-            }
-          } catch (parseErr) {
-            // 忽略解析错误
-          }
-        }
+      if (!session) {
+        return res.status(404).json({ error: 'Session not found' });
       }
+      const convertedMessages = getSessionMessages(sessionId);
 
       // 分页处理
       const pageNum = parseInt(page);

package/src/server/api/settings.js

@@ -2,6 +2,8 @@ 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 { loadConfig, saveConfig } = require('../../config/loader');
 
 // GET /api/settings/terminals - 获取可用终端列表
 router.get('/terminals', (req, res) => {
@@ -58,4 +60,113 @@ router.post('/terminal-config', (req, res) => {
   }
 });
 
+// GET /api/settings/model-metadata - 获取内置模型元数据表（limit + pricing）
+router.get('/model-metadata', (req, res) => {
+  try {
+    // Return built-in defaults merged with any user overrides
+    const config = loadConfig();
+    const overrides = config.modelMetadataOverrides || {};
+
+    // 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 || {}) }
+          }
+        : meta;
+    }
+    // Also include any user-added custom models from overrides
+    for (const [id, meta] of Object.entries(overrides)) {
+      if (!merged[id]) {
+        merged[id] = meta;
+      }
+    }
+
+    res.json({
+      models: merged,
+      overrides,
+      lastUpdated: METADATA_LAST_UPDATED
+    });
+  } catch (error) {
+    console.error('Error getting model metadata:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// POST /api/settings/model-metadata - 保存模型元数据覆盖项
+// Body: { overrides: { [modelId]: { limit?: {...}, pricing?: {...} } } }
+router.post('/model-metadata', (req, res) => {
+  try {
+    const { overrides } = req.body;
+    if (!overrides || typeof overrides !== 'object') {
+      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 (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` });
+        }
+        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` });
+          }
+        }
+      }
+    }
+
+    const config = loadConfig();
+    const newConfig = {
+      ...config,
+      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
+      modelMetadataOverrides: overrides
+    };
+    saveConfig(newConfig);
+
+    res.json({ success: true, overrides });
+  } catch (error) {
+    console.error('Error saving model metadata:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
+// DELETE /api/settings/model-metadata/:modelId - 删除单个模型覆盖项（恢复内置默认值）
+router.delete('/model-metadata/:modelId', (req, res) => {
+  try {
+    const modelId = decodeURIComponent(req.params.modelId);
+    const config = loadConfig();
+    const overrides = { ...(config.modelMetadataOverrides || {}) };
+    delete overrides[modelId];
+
+    const newConfig = {
+      ...config,
+      projectsDir: config.projectsDir.replace(require('os').homedir(), '~'),
+      modelMetadataOverrides: overrides
+    };
+    saveConfig(newConfig);
+
+    res.json({ success: true, modelId });
+  } catch (error) {
+    console.error('Error deleting model metadata override:', error);
+    res.status(500).json({ error: error.message });
+  }
+});
+
 module.exports = router;

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

@@ -10,6 +10,7 @@ const DEFAULT_CONFIG = require('../config/default');
 const { resolvePricing } = 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');
 
@@ -402,14 +403,15 @@ async function startCodexProxyServer(options = {}) {
         totalTokens: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         // 如果响应已关闭，停止处理
         if (isResponseClosed) {
           return;
         }
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         // 检查是否是 SSE 流
         if (proxyRes.headers['content-type']?.includes('text/event-stream')) {
@@ -475,7 +477,7 @@ async function startCodexProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -558,7 +560,7 @@ async function startCodexProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         // 忽略代理响应错误（可能是网络问题）
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);

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

@@ -10,6 +10,7 @@ const DEFAULT_CONFIG = require('../config/default');
 const { resolvePricing } = 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');
 const { getEffectiveApiKey } = require('./services/gemini-channels');
 
 let proxyServer = null;
@@ -289,14 +290,15 @@ async function startGeminiProxyServer(options = {}) {
         totalTokens: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         // 如果响应已关闭，停止处理
         if (isResponseClosed) {
           return;
         }
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         // 检查是否是 SSE 流
         if (proxyRes.headers['content-type']?.includes('text/event-stream')) {
@@ -360,7 +362,7 @@ async function startGeminiProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -467,7 +469,7 @@ async function startGeminiProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         // 忽略代理响应错误（可能是网络问题）
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);

package/src/server/index.js

@@ -15,7 +15,7 @@ const { setProxyConfig: setOpenCodeProxyConfig } = require('./services/opencode-
 const { startProxyServer } = require('./proxy-server');
 const { startCodexProxyServer } = require('./codex-proxy-server');
 const { startGeminiProxyServer } = require('./gemini-proxy-server');
-const { startOpenCodeProxyServer } = require('./opencode-proxy-server');
+const { startOpenCodeProxyServer, collectProxyModelList } = require('./opencode-proxy-server');
 const { createRemoteMutationGuard, createRemoteRouteGuard } = require('./services/network-access');
 
 function isInteractivePortConflictMode(options = {}) {
@@ -269,8 +269,8 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
   // 自动恢复代理状态
   autoRestoreProxies();
 
-  // 启动时执行健康检查
-  performStartupHealthCheck();
+  // 延迟执行健康检查，避免阻塞启动
+  setTimeout(() => performStartupHealthCheck(), 2000);
 
   return server;
 }
@@ -349,7 +349,7 @@ function autoRestoreProxies() {
     console.log(chalk.cyan('\n🔄 检测到 OpenCode 代理状态文件，正在自动启动...'));
     const opencodeProxyPort = config.ports?.opencodeProxy || 20091;
     startOpenCodeProxyServer(opencodeProxyPort)
-      .then((result) => {
+      .then(async (result) => {
         if (result.success) {
           console.log(chalk.green(`✅ OpenCode 代理已自动启动，端口: ${result.port}`));
           try {
@@ -365,6 +365,15 @@ function autoRestoreProxies() {
                 }
               });
             });
+            const detectedModels = await collectProxyModelList(enabledChs, { useCacheOnly: true });
+            if (Array.isArray(detectedModels)) {
+              detectedModels.forEach((m) => {
+                if (typeof m === 'string' && m.trim() && !seen.has(m.trim().toLowerCase())) {
+                  seen.add(m.trim().toLowerCase());
+                  allModels.push(m.trim());
+                }
+              });
+            }
             const firstChannel = enabledChs[0];
             const activeModel = firstChannel && (firstChannel.model || firstChannel.speedTestModel) || null;
             const cfgResult = setOpenCodeProxyConfig(result.port, { model: activeModel, models: allModels });