@adversity/coding-tool-x 3.1.0 → 3.1.2

package/src/server/api/skills.js

@@ -6,7 +6,24 @@ const express = require('express');
 const { SkillService } = require('../services/skill-service');
 
 const router = express.Router();
-const skillService = new SkillService();
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
+const skillServices = new Map();
+
+function resolvePlatform(rawPlatform) {
+  return SUPPORTED_PLATFORMS.includes(rawPlatform) ? rawPlatform : 'claude';
+}
+
+function getPlatform(req) {
+  return resolvePlatform(req.query?.platform || req.body?.platform);
+}
+
+function getSkillService(req) {
+  const platform = getPlatform(req);
+  if (!skillServices.has(platform)) {
+    skillServices.set(platform, new SkillService(platform));
+  }
+  return { platform, service: skillServices.get(platform) };
+}
 
 /**
  * 获取技能列表
@@ -15,10 +32,12 @@ const skillService = new SkillService();
  */
 router.get('/', async (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const forceRefresh = req.query.refresh === '1';
-    const skills = await skillService.listSkills(forceRefresh);
+    const skills = await service.listSkills(forceRefresh);
     res.json({
       success: true,
+      platform,
       skills,
       total: skills.length,
       installed: skills.filter(s => s.installed).length
@@ -38,6 +57,7 @@ router.get('/', async (req, res) => {
  */
 router.get('/detail/*', async (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const directory = req.params[0]; // 获取通配符匹配的路径
     if (!directory) {
       return res.status(400).json({
@@ -46,9 +66,10 @@ router.get('/detail/*', async (req, res) => {
       });
     }
 
-    const result = await skillService.getSkillDetail(directory);
+    const result = await service.getSkillDetail(directory);
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -66,9 +87,11 @@ router.get('/detail/*', async (req, res) => {
  */
 router.get('/installed', (req, res) => {
   try {
-    const skills = skillService.getInstalledSkills();
+    const { platform, service } = getSkillService(req);
+    const skills = service.getInstalledSkills();
     res.json({
       success: true,
+      platform,
       skills
     });
   } catch (err) {
@@ -89,6 +112,7 @@ router.get('/installed', (req, res) => {
  */
 router.post('/install', async (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory, fullDirectory, repo } = req.body;
 
     if (!directory) {
@@ -105,7 +129,7 @@ router.post('/install', async (req, res) => {
       });
     }
 
-    const result = await skillService.installSkill(
+    const result = await service.installSkill(
       directory,
       {
         owner: repo.owner,
@@ -117,6 +141,7 @@ router.post('/install', async (req, res) => {
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -135,6 +160,7 @@ router.post('/install', async (req, res) => {
  */
 router.post('/create', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { name, directory, description, content } = req.body;
 
     if (!directory) {
@@ -159,7 +185,7 @@ router.post('/create', (req, res) => {
       });
     }
 
-    const result = skillService.createCustomSkill({
+    const result = service.createCustomSkill({
       name: name || directory,
       directory,
       description: description || '',
@@ -168,6 +194,7 @@ router.post('/create', (req, res) => {
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -186,6 +213,7 @@ router.post('/create', (req, res) => {
  */
 router.post('/uninstall', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.body;
 
     if (!directory) {
@@ -195,10 +223,11 @@ router.post('/uninstall', (req, res) => {
       });
     }
 
-    const result = skillService.uninstallSkill(directory);
+    const result = service.uninstallSkill(directory);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -216,9 +245,11 @@ router.post('/uninstall', (req, res) => {
  */
 router.get('/repos', (req, res) => {
   try {
-    const repos = skillService.loadRepos();
+    const { platform, service } = getSkillService(req);
+    const repos = service.loadRepos();
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -238,6 +269,7 @@ router.get('/repos', (req, res) => {
  */
 router.post('/repos', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { owner, name, branch = 'main', directory = '', enabled = true } = req.body;
 
     if (!owner || !name) {
@@ -247,10 +279,11 @@ router.post('/repos', (req, res) => {
       });
     }
 
-    const repos = skillService.addRepo({ owner, name, branch, directory, enabled });
+    const repos = service.addRepo({ owner, name, branch, directory, enabled });
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -269,12 +302,14 @@ router.post('/repos', (req, res) => {
  */
 router.delete('/repos/:owner/:name', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { owner, name } = req.params;
     const { directory = '' } = req.query;
-    const repos = skillService.removeRepo(owner, name, directory);
+    const repos = service.removeRepo(owner, name, directory);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -294,13 +329,15 @@ router.delete('/repos/:owner/:name', (req, res) => {
  */
 router.put('/repos/:owner/:name/toggle', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { owner, name } = req.params;
     const { enabled, directory = '' } = req.body;
 
-    const repos = skillService.toggleRepo(owner, name, directory, enabled);
+    const repos = service.toggleRepo(owner, name, directory, enabled);
 
     res.json({
       success: true,
+      platform,
       repos
     });
   } catch (err) {
@@ -321,6 +358,7 @@ router.put('/repos/:owner/:name/toggle', (req, res) => {
  */
 router.post('/create-with-files', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory, files } = req.body;
 
     if (!directory) {
@@ -345,10 +383,11 @@ router.post('/create-with-files', (req, res) => {
       });
     }
 
-    const result = skillService.createSkillWithFiles({ directory, files });
+    const result = service.createSkillWithFiles({ directory, files });
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -366,11 +405,13 @@ router.post('/create-with-files', (req, res) => {
  */
 router.get('/:directory/files', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.params;
-    const files = skillService.getSkillFiles(directory);
+    const files = service.getSkillFiles(directory);
 
     res.json({
       success: true,
+      platform,
       directory,
       files
     });
@@ -390,6 +431,7 @@ router.get('/:directory/files', (req, res) => {
  */
 router.get('/:directory/file/*', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.params;
     const filePath = req.params[0];
 
@@ -400,10 +442,11 @@ router.get('/:directory/file/*', (req, res) => {
       });
     }
 
-    const result = skillService.getSkillFileContent(directory, filePath);
+    const result = service.getSkillFileContent(directory, filePath);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -422,6 +465,7 @@ router.get('/:directory/file/*', (req, res) => {
  */
 router.post('/:directory/files', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.params;
     const { files } = req.body;
 
@@ -432,10 +476,11 @@ router.post('/:directory/files', (req, res) => {
       });
     }
 
-    const result = skillService.addSkillFiles(directory, files);
+    const result = service.addSkillFiles(directory, files);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -453,6 +498,7 @@ router.post('/:directory/files', (req, res) => {
  */
 router.delete('/:directory/file/*', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.params;
     const filePath = req.params[0];
 
@@ -463,10 +509,11 @@ router.delete('/:directory/file/*', (req, res) => {
       });
     }
 
-    const result = skillService.deleteSkillFile(directory, filePath);
+    const result = service.deleteSkillFile(directory, filePath);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -485,6 +532,7 @@ router.delete('/:directory/file/*', (req, res) => {
  */
 router.put('/:directory/file/*', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { directory } = req.params;
     const filePath = req.params[0];
     const { content, isBase64 = false } = req.body;
@@ -503,10 +551,11 @@ router.put('/:directory/file/*', (req, res) => {
       });
     }
 
-    const result = skillService.updateSkillFile(directory, filePath, content, isBase64);
+    const result = service.updateSkillFile(directory, filePath, content, isBase64);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {
@@ -529,6 +578,7 @@ router.put('/:directory/file/*', (req, res) => {
  */
 router.post('/convert', (req, res) => {
   try {
+    const { platform, service } = getSkillService(req);
     const { content, targetFormat } = req.body;
 
     if (!content) {
@@ -545,10 +595,11 @@ router.post('/convert', (req, res) => {
       });
     }
 
-    const result = skillService.convertSkillFormat(content, targetFormat);
+    const result = service.convertSkillFormat(content, targetFormat);
 
     res.json({
       success: true,
+      platform,
       ...result
     });
   } catch (err) {

package/src/server/api/workspaces.js

@@ -3,8 +3,35 @@ const express = require('express');
 const router = express.Router();
 const fs = require('fs');
 const path = require('path');
+const { execFileSync } = require('child_process');
 const workspaceService = require('../services/workspace-service');
 
+function normalizeBranchName(branchName) {
+  if (typeof branchName !== 'string') {
+    return '';
+  }
+  return branchName.trim();
+}
+
+function validateBranchName(branchName) {
+  const normalized = normalizeBranchName(branchName);
+  if (!normalized) {
+    return { valid: false, normalized, message: '分支名不能为空' };
+  }
+  if (normalized.length > 255) {
+    return { valid: false, normalized, message: '分支名长度不能超过 255 个字符' };
+  }
+
+  try {
+    execFileSync('git', ['check-ref-format', '--branch', normalized], {
+      stdio: 'ignore'
+    });
+    return { valid: true, normalized };
+  } catch (error) {
+    return { valid: false, normalized, message: `非法分支名: ${normalized}` };
+  }
+}
+
 /**
  * GET /api/workspaces
  * 获取所有工作区列表
@@ -173,7 +200,7 @@ router.get('/:id', (req, res, next) => {
  */
 router.post('/', (req, res) => {
   try {
-    const { name, description, baseDir, projects, configTemplateId, permissionTemplate } = req.body;
+    const { name, description, baseDir, projects, configTemplateId } = req.body;
 
     if (!name || !name.trim()) {
       return res.status(400).json({
@@ -204,6 +231,30 @@ router.post('/', (req, res) => {
           message: '创建 worktree 时必须指定分支名'
         });
       }
+
+      const normalizedBranch = normalizeBranchName(proj.branch);
+      if (normalizedBranch) {
+        const branchValidation = validateBranchName(normalizedBranch);
+        if (!branchValidation.valid) {
+          return res.status(400).json({
+            success: false,
+            message: branchValidation.message
+          });
+        }
+        proj.branch = branchValidation.normalized;
+      }
+
+      const normalizedBaseBranch = normalizeBranchName(proj.baseBranch);
+      if (normalizedBaseBranch) {
+        const baseBranchValidation = validateBranchName(normalizedBaseBranch);
+        if (!baseBranchValidation.valid) {
+          return res.status(400).json({
+            success: false,
+            message: `基础分支不合法: ${baseBranchValidation.normalized}`
+          });
+        }
+        proj.baseBranch = baseBranchValidation.normalized;
+      }
     }
 
     const workspace = workspaceService.createWorkspace({
@@ -211,8 +262,7 @@ router.post('/', (req, res) => {
       description,
       baseDir,
       projects,
-      configTemplateId,
-      permissionTemplate
+      configTemplateId
     });
 
     res.json({
@@ -286,6 +336,8 @@ router.post('/:id/projects', (req, res) => {
   try {
     const { id } = req.params;
     const { sourcePath, name, createWorktree, branch, baseBranch } = req.body;
+    const normalizedBranch = normalizeBranchName(branch);
+    const normalizedBaseBranch = normalizeBranchName(baseBranch);
 
     if (!sourcePath || !sourcePath.trim()) {
       return res.status(400).json({
@@ -294,19 +346,39 @@ router.post('/:id/projects', (req, res) => {
       });
     }
 
-    if (createWorktree && (!branch || !branch.trim())) {
+    if (createWorktree && !normalizedBranch) {
       return res.status(400).json({
         success: false,
         message: '创建 worktree 时必须指定分支名'
       });
     }
 
+    if (normalizedBranch) {
+      const branchValidation = validateBranchName(normalizedBranch);
+      if (!branchValidation.valid) {
+        return res.status(400).json({
+          success: false,
+          message: branchValidation.message
+        });
+      }
+    }
+
+    if (normalizedBaseBranch) {
+      const baseBranchValidation = validateBranchName(normalizedBaseBranch);
+      if (!baseBranchValidation.valid) {
+        return res.status(400).json({
+          success: false,
+          message: `基础分支不合法: ${baseBranchValidation.normalized}`
+        });
+      }
+    }
+
     const workspace = workspaceService.addProjectToWorkspace(id, {
       sourcePath,
       name,
       createWorktree,
-      branch,
-      baseBranch
+      branch: normalizedBranch || branch,
+      baseBranch: normalizedBaseBranch || baseBranch
     });
 
     res.json({

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');
 
@@ -230,7 +231,7 @@ async function startCodexProxyServer(options = {}) {
 
   try {
     const config = loadConfig();
-    const port = config.ports?.codexProxy || 10089;
+    const port = config.ports?.codexProxy || 20089;
     currentPort = port;
 
     proxyApp = express();
@@ -257,7 +258,7 @@ async function startCodexProxyServer(options = {}) {
       });
 
       proxyReq.removeHeader('authorization');
-      const effectiveKey = getEffectiveApiKey(activeChannel);
+      const effectiveKey = req.effectiveApiKey;
       proxyReq.setHeader('authorization', `Bearer ${effectiveKey}`);
       proxyReq.setHeader('openai-beta', 'responses=experimental');
       if (!proxyReq.getHeader('content-type')) {
@@ -279,6 +280,33 @@ async function startCodexProxyServer(options = {}) {
         const channel = await allocateChannel({ source: 'codex', enableSessionBinding: false });
         req.selectedChannel = channel;
 
+        const release = (() => {
+          let released = false;
+          return () => {
+            if (released) return;
+            released = true;
+            releaseChannel(channel.id, 'codex');
+            broadcastSchedulerState('codex', getSchedulerState('codex'));
+          };
+        })();
+
+        res.on('close', release);
+        res.on('error', release);
+
+        broadcastSchedulerState('codex', getSchedulerState('codex'));
+
+        const effectiveKey = getEffectiveApiKey(channel);
+        if (!effectiveKey) {
+          release();
+          return res.status(401).json({
+            error: {
+              message: 'API key not configured or expired. Please update your channel key.',
+              type: 'authentication_error'
+            }
+          });
+        }
+        req.effectiveApiKey = effectiveKey;
+
         // 应用模型重定向（当 proxy 开启时）
         if (req.body && req.body.model) {
           const originalModel = req.body.model;
@@ -299,21 +327,6 @@ async function startCodexProxyServer(options = {}) {
           }
         }
 
-        const release = (() => {
-          let released = false;
-          return () => {
-            if (released) return;
-            released = true;
-            releaseChannel(channel.id, 'codex');
-            broadcastSchedulerState('codex', getSchedulerState('codex'));
-          };
-        })();
-
-        res.on('close', release);
-        res.on('error', release);
-
-        broadcastSchedulerState('codex', getSchedulerState('codex'));
-
         const target = resolveCodexTarget(channel.baseUrl, req.url);
 
         proxy.web(req, res, {
@@ -390,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')) {
@@ -463,7 +477,7 @@ async function startCodexProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -546,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);
@@ -654,7 +668,7 @@ function getCodexProxyStatus() {
   return {
     running: !!proxyServer,
     port: currentPort,
-    defaultPort: config.ports?.codexProxy || 10089,
+    defaultPort: config.ports?.codexProxy || 20089,
     startTime,
     runtime
   };

package/src/server/dev-server.js

@@ -11,7 +11,7 @@ const { loadConfig } = require('../config/loader');
 const chalk = require('chalk');
 
 const config = loadConfig();
-const port = config.ports?.webUI || 10099;
+const port = config.ports?.webUI || 19999;
 
 console.log(chalk.cyan('\n🔧 开发模式：启动后端 API 服务器...\n'));
 

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;
@@ -126,7 +127,7 @@ async function startGeminiProxyServer(options = {}) {
 
   try {
     const config = loadConfig();
-    const port = config.ports?.geminiProxy || 10090;
+    const port = config.ports?.geminiProxy || 20090;
     currentPort = port;
 
     proxyApp = express();
@@ -153,7 +154,7 @@ async function startGeminiProxyServer(options = {}) {
 
       proxyReq.removeHeader('authorization');
       proxyReq.removeHeader('x-goog-api-key');
-      const effectiveKey = getEffectiveApiKey(activeChannel);
+      const effectiveKey = req.effectiveApiKey;
       proxyReq.setHeader('authorization', `Bearer ${effectiveKey}`);
       if (!proxyReq.getHeader('content-type')) {
         proxyReq.setHeader('content-type', 'application/json');
@@ -180,6 +181,18 @@ async function startGeminiProxyServer(options = {}) {
 
         broadcastSchedulerState('gemini', getSchedulerState('gemini'));
 
+        const effectiveKey = getEffectiveApiKey(channel);
+        if (!effectiveKey) {
+          release();
+          return res.status(401).json({
+            error: {
+              message: 'API key not configured or expired. Please update your channel key.',
+              type: 'authentication_error'
+            }
+          });
+        }
+        req.effectiveApiKey = effectiveKey;
+
         // 从 URL 中提取模型名称并应用重定向
         // URL 格式: /models/gemini-2.5-pro:generateContent 或 /v1/models/gemini-2.5-pro:generateContent
         const urlMatch = req.url.match(/\/models\/([\w.-]+)(:[^?]*)?/);
@@ -277,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')) {
@@ -348,7 +362,7 @@ async function startGeminiProxyServer(options = {}) {
         }
       });
 
-      proxyRes.on('end', () => {
+      parsedStream.on('end', () => {
         // 如果不是流式响应，尝试从完整响应中解析
         if (!proxyRes.headers['content-type']?.includes('text/event-stream')) {
           try {
@@ -455,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);
@@ -553,7 +567,7 @@ function getGeminiProxyStatus() {
   return {
     running: !!proxyServer,
     port: currentPort,
-    defaultPort: config.ports?.geminiProxy || 10090,
+    defaultPort: config.ports?.geminiProxy || 20090,
     startTime,
     runtime
   };