coding-tool-x 3.6.6 → 3.6.8

package/src/server/services/agents-service.js

@@ -1,7 +1,7 @@
 /**
  * Agents 服务
  *
- * 管理 Claude/OpenCode 自定义代理的 CRUD 操作
+ * 管理 Claude/Codex/Gemini/OpenCode 自定义代理的 CRUD 操作
  * 支持从 GitHub 仓库扫描和安装代理
  */
 
@@ -13,15 +13,21 @@ const tomlStringify = require('@iarna/toml').stringify;
 const { RepoScannerBase } = require('./repo-scanner-base');
 const { NATIVE_PATHS } = require('../../config/paths');
 const { resolvePreferredHomeDir } = require('../../utils/home-dir');
+const {
+  normalizeSafeFileStem,
+  normalizeSafeRelativePath,
+  resolveInsideRoot
+} = require('./config-artifact-paths');
 
 // 默认仓库源
 const DEFAULT_REPOS = [];
-const SUPPORTED_PLATFORMS = ['claude', 'codex', 'opencode'];
+const SUPPORTED_PLATFORMS = ['claude', 'codex', 'gemini', 'opencode'];
 const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
 const CODEX_CONFIG_PATH = NATIVE_PATHS.codex.config;
 const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 const CODEX_AGENTS_DIR = path.join(path.dirname(CODEX_CONFIG_PATH), 'agents');
 const CLAUDE_AGENTS_DIR = path.join(path.dirname(NATIVE_PATHS.claude.settings), 'agents');
+const GEMINI_AGENTS_DIR = path.join(NATIVE_PATHS.gemini.dir, 'agents');
 const CODEX_CONFIG_MODES = new Set(['none', 'managed', 'custom']);
 
 const PLATFORM_CONFIG = {
@@ -47,6 +53,11 @@ const PLATFORM_CONFIG = {
     userAgentsDir: CODEX_AGENTS_DIR,
     projectAgentsDir: () => null,
     repoType: 'agents'
+  },
+  gemini: {
+    userAgentsDir: GEMINI_AGENTS_DIR,
+    projectAgentsDir: (projectPath) => path.join(projectPath, '.gemini', 'agents'),
+    repoType: 'gemini-agents'
   }
 };
 
@@ -59,39 +70,29 @@ function normalizePlatform(platform) {
 }
 
 function assertSafeAgentFileName(fileName) {
-  if (typeof fileName !== 'string') {
-    throw new Error('代理文件名必须是字符串');
-  }
-
-  const normalized = fileName.trim();
-  if (!normalized) {
-    throw new Error('代理文件名不能为空');
-  }
-
-  if (!/^[a-zA-Z0-9][a-zA-Z0-9._-]*$/.test(normalized) || normalized.includes('..')) {
+  try {
+    return normalizeSafeFileStem(fileName, 'agent file name', {
+      allowDots: true,
+      pattern: /^[a-zA-Z0-9][a-zA-Z0-9._-]*$/
+    });
+  } catch {
     throw new Error('代理文件名只能包含字母、数字、点号、横杠和下划线，且不能包含连续点');
   }
 }
 
 function assertSafeRepoPath(repoPath) {
-  if (typeof repoPath !== 'string' || !repoPath.trim()) {
-    throw new Error('代理仓库路径不能为空');
-  }
-
-  const raw = repoPath.replace(/\\/g, '/').trim();
-  const normalized = path.posix.normalize(raw).replace(/^(\.\/)+/, '');
-  if (!normalized ||
-      normalized === '.' ||
-      normalized === '..' ||
-      normalized.startsWith('../') ||
-      normalized.includes('/../') ||
-      path.posix.isAbsolute(normalized)) {
+  let normalized = '';
+  try {
+    normalized = normalizeSafeRelativePath(repoPath, 'agent repo path');
+  } catch {
     throw new Error('代理仓库路径不合法');
   }
 
   if (!normalized.endsWith('.md')) {
     throw new Error('代理仓库路径必须是 .md 文件');
   }
+
+  return normalized;
 }
 
 function assertSafeProjectPath(projectPath) {
@@ -158,7 +159,8 @@ function isPlainObject(value) {
 }
 
 function getCodexManagedAgentConfigPath(fileName) {
-  return path.join(CODEX_AGENTS_DIR, `${fileName}.toml`);
+  const safeFileName = assertSafeAgentFileName(fileName);
+  return resolveInsideRoot(CODEX_AGENTS_DIR, `${safeFileName}.toml`, 'Codex agent config path');
 }
 
 function normalizeCodexConfigPath(configPath) {
@@ -495,8 +497,13 @@ class AgentsRepoScanner extends RepoScannerBase {
    * 检查代理是否已安装
    */
   isInstalled(fileName) {
-    const fullPath = path.join(this.installDir, `${fileName}.md`);
-    return fs.existsSync(fullPath);
+    try {
+      const safeFileName = assertSafeAgentFileName(fileName);
+      const fullPath = resolveInsideRoot(this.installDir, `${safeFileName}.md`, 'Agent path');
+      return fs.existsSync(fullPath);
+    } catch {
+      return false;
+    }
   }
 
   /**
@@ -510,8 +517,8 @@ class AgentsRepoScanner extends RepoScannerBase {
    * 安装代理
    */
   async installAgent(item) {
-    assertSafeAgentFileName(item?.fileName);
-    assertSafeRepoPath(item?.repoPath);
+    const safeFileName = assertSafeAgentFileName(item?.fileName);
+    const safeRepoPath = assertSafeRepoPath(item?.repoPath);
 
     const repo = {
       owner: item.repoOwner,
@@ -520,7 +527,7 @@ class AgentsRepoScanner extends RepoScannerBase {
     };
 
     // 代理安装到根目录，使用文件名
-    return this.installFromRepo(item.repoPath, repo, `${item.fileName}.md`);
+    return this.installFromRepo(safeRepoPath, repo, `${safeFileName}.md`);
   }
 }
 
@@ -551,6 +558,22 @@ class AgentsService {
     return this.projectAgentsDir(safeProjectPath);
   }
 
+  _getBaseDir(scope, projectPath = null) {
+    return scope === 'user'
+      ? this.userAgentsDir
+      : this.getProjectAgentsDir(projectPath);
+  }
+
+  _resolveAgentFilePath(baseDir, fileName) {
+    if (!baseDir) {
+      throw new Error('项目路径不能为空');
+    }
+    const safeFileName = assertSafeAgentFileName(fileName);
+    const relativePath = `${safeFileName}.md`;
+    const fullPath = resolveInsideRoot(baseDir, relativePath, 'Agent path');
+    return { safeFileName, relativePath, fullPath };
+  }
+
   /**
    * 获取所有代理列表
    * @param {string} projectPath - 项目路径（可选，用于获取项目级代理）
@@ -641,17 +664,14 @@ class AgentsService {
    * 获取单个代理详情
    */
   getAgent(fileName, scope, projectPath = null) {
-    assertSafeAgentFileName(fileName);
+    const safeFileName = assertSafeAgentFileName(fileName);
 
     if (this.platform === 'codex') {
-      return this.getCodexAgent(fileName, scope);
+      return this.getCodexAgent(safeFileName, scope);
     }
 
-    const baseDir = scope === 'user'
-      ? this.userAgentsDir
-      : this.getProjectAgentsDir(projectPath);
-
-    const filePath = path.join(baseDir, `${fileName}.md`);
+    const baseDir = this._getBaseDir(scope, projectPath);
+    const { relativePath, fullPath: filePath } = this._resolveAgentFilePath(baseDir, safeFileName);
 
     if (!fs.existsSync(filePath)) {
       return null;
@@ -661,10 +681,10 @@ class AgentsService {
     const { frontmatter, body } = parseFrontmatter(content);
 
     return {
-      name: frontmatter.name || fileName,
-      fileName,
+      name: frontmatter.name || safeFileName,
+      fileName: safeFileName,
       scope,
-      path: `${fileName}.md`,
+      path: relativePath,
       fullPath: filePath,
       description: frontmatter.description || '',
       tools: frontmatter.tools || '',
@@ -681,10 +701,10 @@ class AgentsService {
    * 创建代理
    */
   createAgent({ fileName, scope, projectPath, name, description, tools, model, permissionMode, skills, systemPrompt, configMode, configFile, configContent }) {
-    assertSafeAgentFileName(fileName);
+    const safeFileName = assertSafeAgentFileName(fileName);
 
     if (this.platform === 'codex') {
-      return this.createCodexAgent({ fileName, scope, description, model, configMode, configFile, configContent });
+      return this.createCodexAgent({ fileName: safeFileName, scope, description, model, configMode, configFile, configContent });
     }
 
     if (this.platform === 'claude' && (!name || !name.trim())) {
@@ -695,21 +715,18 @@ class AgentsService {
       throw new Error('代理描述不能为空');
     }
 
-    const baseDir = scope === 'user'
-      ? this.userAgentsDir
-      : this.getProjectAgentsDir(projectPath);
+    const baseDir = this._getBaseDir(scope, projectPath);
+    const { fullPath: filePath } = this._resolveAgentFilePath(baseDir, safeFileName);
 
     ensureDir(baseDir);
 
-    const filePath = path.join(baseDir, `${fileName}.md`);
-
     // 检查是否已存在
     if (fs.existsSync(filePath)) {
-      throw new Error(`代理 "${fileName}" 已存在`);
+      throw new Error(`代理 "${safeFileName}" 已存在`);
     }
 
     // 生成文件内容
-    const frontmatterData = { name: (name || fileName), description };
+    const frontmatterData = { name: (name || safeFileName), description };
     if (tools) frontmatterData.tools = tools;
     if (model) frontmatterData.model = model;
     if (permissionMode) frontmatterData.permissionMode = permissionMode;
@@ -719,32 +736,29 @@ class AgentsService {
 
     fs.writeFileSync(filePath, content, 'utf-8');
 
-    return this.getAgent(fileName, scope, projectPath);
+    return this.getAgent(safeFileName, scope, projectPath);
   }
 
   /**
    * 更新代理
    */
   updateAgent({ fileName, scope, projectPath, name, description, tools, model, permissionMode, skills, systemPrompt, configMode, configFile, configContent }) {
-    assertSafeAgentFileName(fileName);
+    const safeFileName = assertSafeAgentFileName(fileName);
 
     if (this.platform === 'codex') {
-      return this.updateCodexAgent({ fileName, scope, description, model, configMode, configFile, configContent });
+      return this.updateCodexAgent({ fileName: safeFileName, scope, description, model, configMode, configFile, configContent });
     }
 
-    const baseDir = scope === 'user'
-      ? this.userAgentsDir
-      : this.getProjectAgentsDir(projectPath);
-
-    const filePath = path.join(baseDir, `${fileName}.md`);
+    const baseDir = this._getBaseDir(scope, projectPath);
+    const { fullPath: filePath } = this._resolveAgentFilePath(baseDir, safeFileName);
 
     if (!fs.existsSync(filePath)) {
-      throw new Error(`代理 "${fileName}" 不存在`);
+      throw new Error(`代理 "${safeFileName}" 不存在`);
     }
 
     // 生成文件内容
     const frontmatterData = {
-      name: name || fileName,
+      name: name || safeFileName,
       description: description || ''
     };
     if (tools) frontmatterData.tools = tools;
@@ -756,24 +770,21 @@ class AgentsService {
 
     fs.writeFileSync(filePath, content, 'utf-8');
 
-    return this.getAgent(fileName, scope, projectPath);
+    return this.getAgent(safeFileName, scope, projectPath);
   }
 
   /**
    * 删除代理
    */
   deleteAgent(fileName, scope, projectPath = null) {
-    assertSafeAgentFileName(fileName);
+    const safeFileName = assertSafeAgentFileName(fileName);
 
     if (this.platform === 'codex') {
-      return this.deleteCodexAgent(fileName, scope);
+      return this.deleteCodexAgent(safeFileName, scope);
     }
 
-    const baseDir = scope === 'user'
-      ? this.userAgentsDir
-      : this.getProjectAgentsDir(projectPath);
-
-    const filePath = path.join(baseDir, `${fileName}.md`);
+    const baseDir = this._getBaseDir(scope, projectPath);
+    const { fullPath: filePath } = this._resolveAgentFilePath(baseDir, safeFileName);
 
     if (!fs.existsSync(filePath)) {
       return { success: false, message: '代理不存在' };
@@ -855,23 +866,27 @@ class AgentsService {
     if (!agent || typeof agent !== 'object') {
       throw new Error('无效的代理安装参数');
     }
-    assertSafeAgentFileName(agent.fileName);
-    assertSafeRepoPath(agent.repoPath);
-    return this.repoScanner.installAgent(agent);
+    const safeFileName = assertSafeAgentFileName(agent.fileName);
+    const safeRepoPath = assertSafeRepoPath(agent.repoPath);
+    return this.repoScanner.installAgent({
+      ...agent,
+      fileName: safeFileName,
+      repoPath: safeRepoPath
+    });
   }
 
   /**
    * 卸载代理
    */
   uninstallAgent(fileName) {
-    assertSafeAgentFileName(fileName);
-    return this.repoScanner.uninstall(`${fileName}.md`);
+    const safeFileName = assertSafeAgentFileName(fileName);
+    return this.repoScanner.uninstall(`${safeFileName}.md`);
   }
 
   listCodexAgents() {
     const config = readCodexTomlConfig();
     const agentsTable = isPlainObject(config.agents) ? config.agents : {};
-    const agents = [];
+    const agentsByName = new Map();
 
     for (const [key, value] of Object.entries(agentsTable)) {
       if (!isPlainObject(value)) {
@@ -901,7 +916,7 @@ class AgentsService {
         }
       }
 
-      agents.push({
+      agentsByName.set(key, {
         name: key,
         fileName: key,
         scope: 'user',
@@ -918,10 +933,86 @@ class AgentsService {
         configMode,
         configReadError,
         resolvedConfigFile,
-        updatedAt
+        updatedAt,
+        source: 'codex-config'
       });
     }
 
+    if (fs.existsSync(CODEX_AGENTS_DIR)) {
+      try {
+        const entries = fs.readdirSync(CODEX_AGENTS_DIR, { withFileTypes: true });
+        for (const entry of entries) {
+          if (!entry.isFile() || !entry.name.endsWith('.toml')) {
+            continue;
+          }
+
+          const fileName = entry.name.slice(0, -'.toml'.length);
+          try {
+            assertSafeAgentFileName(fileName);
+          } catch {
+            continue;
+          }
+
+          const configFilePath = path.join(CODEX_AGENTS_DIR, entry.name);
+          const parsedConfigFile = readCodexAgentConfigFile(configFilePath);
+          const existing = agentsByName.get(fileName);
+          const model = isPlainObject(parsedConfigFile.data) && typeof parsedConfigFile.data.model === 'string'
+            ? parsedConfigFile.data.model
+            : '';
+          const updatedAt = parsedConfigFile.updatedAt || fs.statSync(configFilePath).mtime.getTime();
+
+          if (existing) {
+            if (!existing.configFile) {
+              existing.configFile = configFilePath;
+              existing.configMode = inferCodexConfigMode(configFilePath);
+              existing.path = configFilePath;
+              existing.fullPath = configFilePath;
+              existing.resolvedConfigFile = configFilePath;
+            }
+            if (!existing.fullContent && parsedConfigFile.content) {
+              existing.fullContent = parsedConfigFile.content;
+            }
+            if (!existing.model && model) {
+              existing.model = model;
+            }
+            if (parsedConfigFile.error && !existing.configReadError) {
+              existing.configReadError = parsedConfigFile.error;
+            }
+            existing.updatedAt = Math.max(existing.updatedAt || 0, updatedAt);
+            existing.source = existing.source === 'codex-config'
+              ? 'codex-config+native-file'
+              : existing.source;
+            continue;
+          }
+
+          agentsByName.set(fileName, {
+            name: fileName,
+            fileName,
+            scope: 'user',
+            path: configFilePath,
+            fullPath: configFilePath,
+            description: '',
+            tools: '',
+            model,
+            permissionMode: '',
+            skills: '',
+            systemPrompt: '',
+            fullContent: parsedConfigFile.content,
+            configFile: configFilePath,
+            configMode: inferCodexConfigMode(configFilePath),
+            configReadError: parsedConfigFile.error || '',
+            resolvedConfigFile: configFilePath,
+            updatedAt,
+            source: 'native-file'
+          });
+        }
+      } catch (err) {
+        console.warn('[AgentsService] Failed to scan Codex agents dir:', err.message);
+      }
+    }
+
+    const agents = Array.from(agentsByName.values());
+
     agents.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase()));
 
     return {

package/src/server/services/base/base-channel-service.js

@@ -13,6 +13,14 @@ const crypto = require('crypto');
 const { normalizeGatewaySourceType, normalizeNumber } = require('./proxy-utils');
 const { resolveChannelWebsiteUrl } = require('../../../config/channel-preset-websites');
 
+function clearChannelBalanceCache(platform, channel) {
+  try {
+    require('../channel-balance').clearChannelBalanceCache(platform, channel);
+  } catch (_) {
+    // Balance cache invalidation is an optimization; channel updates must still succeed.
+  }
+}
+
 class BaseChannelService {
   /**
    * @param {object} config
@@ -121,6 +129,9 @@ class BaseChannelService {
     }
 
     this.saveChannels(data);
+    if (oldChannel.enabled === false && nextChannel.enabled !== false) {
+      clearChannelBalanceCache(this.platform, nextChannel);
+    }
     this._onAfterUpdate(oldChannel, nextChannel, data.channels);
     return nextChannel;
   }
@@ -154,10 +165,14 @@ class BaseChannelService {
     }
 
     // 单渠道模式：只启用目标渠道
+    const wasEnabled = channel.enabled !== false;
     data.channels.forEach(ch => {
       ch.enabled = ch.id === channelId;
     });
     this.saveChannels(data);
+    if (!wasEnabled) {
+      clearChannelBalanceCache(this.platform, channel);
+    }
     this._applyToNativeSettings(channel);
     return channel;
   }

package/src/server/services/base/proxy-utils.js

@@ -67,10 +67,10 @@ function redirectModel(originalModel, channel, options = {}) {
 }
 
 /**
- * 解析代理目标 URL，避免 /v1/v1 重复
+ * 解析代理目标 URL，避免 API 版本段重复
  *
- * 当 baseUrl 以 /v1 结尾且请求路径也以 /v1 开头时，
- * 去掉 baseUrl 的 /v1 后缀，因为 http-proxy 会自动拼接 req.url。
+ * 当 baseUrl 和请求路径都包含同一个 API 版本段时，去掉 baseUrl 的
+ * 版本后缀，因为 http-proxy 会自动拼接 req.url。
  *
  * @param {string} baseUrl - 渠道配置的 base_url
  * @param {string} requestPath - 请求路径
@@ -81,6 +81,9 @@ function resolveTargetUrl(baseUrl, requestPath) {
   if (target.endsWith('/')) {
     target = target.slice(0, -1);
   }
+  if (target.endsWith('/v1beta') && requestPath.startsWith('/v1beta')) {
+    return target.slice(0, -7);
+  }
   if (target.endsWith('/v1') && requestPath.startsWith('/v1')) {
     target = target.slice(0, -3);
   }

package/src/server/services/base/response-usage-parser.js

@@ -218,6 +218,48 @@ function parseNonStreamingUsage(parsed) {
   return parseSSEUsage(parsed, '');
 }
 
+function splitSSEEvents(buffer = '') {
+  const normalized = String(buffer || '');
+  const events = [];
+  let cursor = 0;
+  const separator = /\r?\n\r?\n/g;
+  let match;
+
+  while ((match = separator.exec(normalized)) !== null) {
+    events.push(normalized.slice(cursor, match.index));
+    cursor = separator.lastIndex;
+  }
+
+  return {
+    events,
+    remainder: normalized.slice(cursor)
+  };
+}
+
+function parseSSEEventText(eventText = '') {
+  if (!String(eventText || '').trim()) {
+    return null;
+  }
+
+  let eventType = '';
+  const dataLines = [];
+
+  String(eventText).split(/\r?\n/).forEach((line) => {
+    if (line.startsWith('event:')) {
+      eventType = line.substring(6).trim();
+    } else if (line.startsWith('data:')) {
+      dataLines.push(line.substring(5).trim());
+    }
+  });
+
+  const data = dataLines.join('\n');
+  if (!data || data === '[DONE]') {
+    return null;
+  }
+
+  return { eventType, data };
+}
+
 /**
  * 将解析结果合并到 tokenData 对象。
  *
@@ -260,6 +302,8 @@ function createTokenData() {
 module.exports = {
   parseSSEUsage,
   parseNonStreamingUsage,
+  splitSSEEvents,
+  parseSSEEventText,
   mergeUsageIntoTokenData,
   createTokenData
 };