@adversity/coding-tool-x 3.1.1 → 3.1.3

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);
@@ -347,13 +289,6 @@ module.exports = (config) => {
 
       const { exec } = require('child_process');
       const { projectName, sessionId } = req.params;
-      const { targetTool } = req.body || {};
-
-      if (targetTool && targetTool !== 'opencode') {
-        return res.status(400).json({
-          error: 'OpenCode 会话暂不支持直接切换到其他 CLI，请使用 OpenCode 启动'
-        });
-      }
 
       const session = getSessionById(sessionId);
       if (!session) {

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,6 +2,13 @@ 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,
+  METADATA_LAST_UPDATED,
+  getDefaultSpeedTestModels,
+  saveDefaultSpeedTestModels
+} = require('../../config/model-metadata');
+const { loadConfig, saveConfig } = require('../../config/loader');
 
 // GET /api/settings/terminals - 获取可用终端列表
 router.get('/terminals', (req, res) => {
@@ -58,4 +65,135 @@ router.post('/terminal-config', (req, res) => {
   }
 });
 
+function handleGetModelSettings(req, res) {
+  try {
+    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 || {}) }
+        }
+        : 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,
+      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);
+
+function handleSaveModelSettings(req, res) {
+  try {
+    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
+    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 !== 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 && typeof overrides === 'object'
+        ? overrides
+        : (config.modelMetadataOverrides || {})
+    };
+    saveConfig(newConfig);
+    const persistedDefaultSpeedTestModels = saveDefaultSpeedTestModels(defaultSpeedTestModels);
+
+    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 - 删除单个模型覆盖项（恢复内置默认值）
+function handleDeleteModelOverride(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 });
+  }
+}
+
+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;