@adversity/coding-tool-x 3.1.0 → 3.1.2

package/src/server/proxy-server.js

@@ -11,6 +11,7 @@ const DEFAULT_CONFIG = require('../config/default');
 const { resolvePricing, resolveModelPricing } = require('./utils/pricing');
 const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
+const { createDecodedStream } = require('./services/response-decoder');
 const eventBus = require('../plugins/event-bus');
 const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
 const { getEffectiveApiKey } = require('./services/channels');
@@ -160,7 +161,7 @@ async function startProxyServer(options = {}) {
 
   try {
     const config = loadConfig();
-    const port = config.ports?.proxy || 10088;
+    const port = config.ports?.proxy || 20088;
     currentPort = port;
 
     proxyApp = express();
@@ -186,7 +187,7 @@ async function startProxyServer(options = {}) {
         });
 
         proxyReq.removeHeader('x-api-key');
-        const effectiveKey = getEffectiveApiKey(selectedChannel);
+        const effectiveKey = req.effectiveApiKey;
         proxyReq.setHeader('x-api-key', effectiveKey);
         proxyReq.removeHeader('authorization');
         proxyReq.setHeader('authorization', `Bearer ${effectiveKey}`);
@@ -221,6 +222,30 @@ async function startProxyServer(options = {}) {
 
         req.selectedChannel = channel;
         req.sessionId = sessionId || null;
+        let released = false;
+
+        const release = () => {
+          if (released) return;
+          released = true;
+          releaseChannel(channel.id, 'claude');
+          // 广播调度状态（请求结束）
+          broadcastSchedulerState('claude', getSchedulerState('claude'));
+        };
+
+        req.__releaseChannel = release;
+
+        res.on('close', release);
+        res.on('error', release);
+
+        const effectiveKey = getEffectiveApiKey(channel);
+        if (!effectiveKey) {
+          release();
+          return res.status(401).json({
+            error: 'API key not configured or expired. Please update your channel key.',
+            type: 'authentication_error'
+          });
+        }
+        req.effectiveApiKey = effectiveKey;
 
         // 应用模型重定向（当 proxy 开启时）
         if (req.body && req.body.model) {
@@ -242,21 +267,6 @@ async function startProxyServer(options = {}) {
           }
         }
 
-        let released = false;
-
-        const release = () => {
-          if (released) return;
-          released = true;
-          releaseChannel(channel.id, 'claude');
-          // 广播调度状态（请求结束）
-          broadcastSchedulerState('claude', getSchedulerState('claude'));
-        };
-
-        req.__releaseChannel = release;
-
-        res.on('close', release);
-        res.on('error', release);
-
         const proxyOptions = {
           target: channel.baseUrl,
           changeOrigin: true,
@@ -325,11 +335,12 @@ async function startProxyServer(options = {}) {
         cacheRead: 0,
         model: ''
       };
+      const parsedStream = createDecodedStream(proxyRes);
 
-      proxyRes.on('data', (chunk) => {
+      parsedStream.on('data', (chunk) => {
         if (isResponseClosed) return;
 
-        buffer += chunk.toString();
+        buffer += chunk.toString('utf8');
 
         const events = buffer.split('\n\n');
         buffer = events.pop() || '';
@@ -439,9 +450,9 @@ async function startProxyServer(options = {}) {
         }
       };
 
-      proxyRes.on('end', finalize);
+      parsedStream.on('end', finalize);
 
-      proxyRes.on('error', (err) => {
+      parsedStream.on('error', (err) => {
         if (err.code !== 'EPIPE' && err.code !== 'ECONNRESET') {
           console.error('Proxy response error:', err);
         }
@@ -533,7 +544,7 @@ function getProxyStatus() {
   return {
     running: !!proxyServer,
     port: currentPort,
-    defaultPort: config.ports?.proxy || 10088,
+    defaultPort: config.ports?.proxy || 20088,
     startTime,
     runtime
   };

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

@@ -1,11 +1,7 @@
 /**
  * Agents 服务
  *
- * 管理 Claude Code 自定义代理的 CRUD 操作
- * 代理目录:
- * - 用户级: ~/.claude/agents/
- * - 项目级: .claude/agents/
- *
+ * 管理 Claude/OpenCode 自定义代理的 CRUD 操作
  * 支持从 GitHub 仓库扫描和安装代理
  */
 
@@ -13,12 +9,37 @@ const fs = require('fs');
 const path = require('path');
 const os = require('os');
 const { RepoScannerBase } = require('./repo-scanner-base');
-
-// 代理目录路径
-const USER_AGENTS_DIR = path.join(os.homedir(), '.claude', 'agents');
+const { NATIVE_PATHS } = require('../../config/paths');
 
 // 默认仓库源
 const DEFAULT_REPOS = [];
+const SUPPORTED_PLATFORMS = ['claude', 'opencode'];
+const OPENCODE_CONFIG_DIR = NATIVE_PATHS.opencode.config;
+
+const PLATFORM_CONFIG = {
+  claude: {
+    userAgentsDir: path.join(os.homedir(), '.claude', 'agents'),
+    projectAgentsDir: (projectPath) => path.join(projectPath, '.claude', 'agents'),
+    repoType: 'agents'
+  },
+  opencode: {
+    userAgentsDir: path.join(OPENCODE_CONFIG_DIR, 'agents'),
+    legacyUserAgentsDir: path.join(OPENCODE_CONFIG_DIR, 'agent'),
+    projectAgentsDir: (projectPath) => {
+      const modern = path.join(projectPath, '.opencode', 'agents');
+      const legacy = path.join(projectPath, '.opencode', 'agent');
+      if (fs.existsSync(legacy) && !fs.existsSync(modern)) {
+        return legacy;
+      }
+      return modern;
+    },
+    repoType: 'opencode-agents'
+  }
+};
+
+function normalizePlatform(platform) {
+  return SUPPORTED_PLATFORMS.includes(platform) ? platform : 'claude';
+}
 
 /**
  * 确保目录存在
@@ -74,11 +95,11 @@ function parseFrontmatter(content) {
 /**
  * 生成 frontmatter 字符串
  */
-function generateFrontmatter(data) {
+function generateFrontmatter(data, platform = 'claude') {
   const lines = ['---'];
 
-  // 必需字段
-  if (data.name) {
+  // Claude 下写入 name，OpenCode 以文件名作为 agent id
+  if (platform !== 'opencode' && data.name) {
     lines.push(`name: ${data.name}`);
   }
   if (data.description) {
@@ -164,10 +185,10 @@ function scanAgentsDir(dir, basePath, scope) {
  * Agents 仓库扫描器
  */
 class AgentsRepoScanner extends RepoScannerBase {
-  constructor() {
+  constructor(platform, installDir) {
     super({
-      type: 'agents',
-      installDir: USER_AGENTS_DIR,
+      type: PLATFORM_CONFIG[platform]?.repoType || 'agents',
+      installDir,
       markerFile: null, // 直接扫描 .md 文件
       fileExtension: '.md',
       defaultRepos: DEFAULT_REPOS
@@ -248,12 +269,28 @@ class AgentsRepoScanner extends RepoScannerBase {
  * Agents 服务类
  */
 class AgentsService {
-  constructor() {
-    this.userAgentsDir = USER_AGENTS_DIR;
-    this.repoScanner = new AgentsRepoScanner();
+  constructor(platform = 'claude') {
+    this.platform = normalizePlatform(platform);
+    const config = PLATFORM_CONFIG[this.platform];
+
+    this.userAgentsDir = config.userAgentsDir;
+    if (this.platform === 'opencode') {
+      const legacyUserDir = config.legacyUserAgentsDir;
+      if (legacyUserDir && fs.existsSync(legacyUserDir) && !fs.existsSync(this.userAgentsDir)) {
+        this.userAgentsDir = legacyUserDir;
+      }
+    }
+
+    this.projectAgentsDir = config.projectAgentsDir;
+    this.repoScanner = new AgentsRepoScanner(this.platform, this.userAgentsDir);
     ensureDir(this.userAgentsDir);
   }
 
+  getProjectAgentsDir(projectPath) {
+    if (!projectPath) return null;
+    return this.projectAgentsDir(projectPath);
+  }
+
   /**
    * 获取所有代理列表
    * @param {string} projectPath - 项目路径（可选，用于获取项目级代理）
@@ -267,7 +304,7 @@ class AgentsService {
 
     // 获取项目级代理（如果提供了项目路径）
     if (projectPath) {
-      const projectAgentsDir = path.join(projectPath, '.claude', 'agents');
+      const projectAgentsDir = this.getProjectAgentsDir(projectPath);
       const projectAgents = scanAgentsDir(projectAgentsDir, projectAgentsDir, 'project');
       agents.push(...projectAgents);
     }
@@ -331,7 +368,7 @@ class AgentsService {
   getAgent(fileName, scope, projectPath = null) {
     const baseDir = scope === 'user'
       ? this.userAgentsDir
-      : path.join(projectPath, '.claude', 'agents');
+      : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
 
@@ -382,7 +419,7 @@ class AgentsService {
 
     const baseDir = scope === 'user'
       ? this.userAgentsDir
-      : path.join(projectPath, '.claude', 'agents');
+      : this.getProjectAgentsDir(projectPath);
 
     ensureDir(baseDir);
 
@@ -400,7 +437,7 @@ class AgentsService {
     if (permissionMode) frontmatterData.permissionMode = permissionMode;
     if (skills) frontmatterData.skills = skills;
 
-    const content = generateFrontmatter(frontmatterData) + '\n\n' + (systemPrompt || '');
+    const content = generateFrontmatter(frontmatterData, this.platform) + '\n\n' + (systemPrompt || '');
 
     fs.writeFileSync(filePath, content, 'utf-8');
 
@@ -413,7 +450,7 @@ class AgentsService {
   updateAgent({ fileName, scope, projectPath, name, description, tools, model, permissionMode, skills, systemPrompt }) {
     const baseDir = scope === 'user'
       ? this.userAgentsDir
-      : path.join(projectPath, '.claude', 'agents');
+      : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
 
@@ -431,7 +468,7 @@ class AgentsService {
     if (permissionMode) frontmatterData.permissionMode = permissionMode;
     if (skills) frontmatterData.skills = skills;
 
-    const content = generateFrontmatter(frontmatterData) + '\n\n' + (systemPrompt || '');
+    const content = generateFrontmatter(frontmatterData, this.platform) + '\n\n' + (systemPrompt || '');
 
     fs.writeFileSync(filePath, content, 'utf-8');
 
@@ -444,7 +481,7 @@ class AgentsService {
   deleteAgent(fileName, scope, projectPath = null) {
     const baseDir = scope === 'user'
       ? this.userAgentsDir
-      : path.join(projectPath, '.claude', 'agents');
+      : this.getProjectAgentsDir(projectPath);
 
     const filePath = path.join(baseDir, `${fileName}.md`);
 

package/src/server/services/channel-scheduler.js

@@ -1,6 +1,7 @@
 const { getAllChannels } = require('./channels');
 const { getChannels: getCodexChannels } = require('./codex-channels');
 const { getChannels: getGeminiChannels } = require('./gemini-channels');
+const { getChannels: getOpenCodeChannels } = require('./opencode-channels');
 const { isChannelAvailable, getChannelHealthStatus, setOnChannelFrozen } = require('./channel-health');
 
 const channelProviders = {
@@ -12,6 +13,10 @@ const channelProviders = {
   gemini: () => {
     const data = getGeminiChannels();
     return Array.isArray(data?.channels) ? data.channels : [];
+  },
+  opencode: () => {
+    const data = getOpenCodeChannels();
+    return Array.isArray(data?.channels) ? data.channels : [];
   }
 };
 
@@ -27,7 +32,8 @@ function createState() {
 const schedulerStates = {
   claude: createState(),
   codex: createState(),
-  gemini: createState()
+  gemini: createState(),
+  opencode: createState()
 };
 
 function getState(source = 'claude') {
@@ -69,10 +75,8 @@ function refreshChannels(source = 'claude') {
   state.channels = raw
     .filter(ch => ch.enabled !== false)
     .map(ch => ({
-      id: ch.id,
-      name: ch.name,
-      baseUrl: ch.baseUrl,
-      apiKey: ch.apiKey,
+      // 保留渠道完整字段，避免 proxy 等运行时配置在调度层丢失
+      ...ch,
       weight: Math.max(1, Number(ch.weight) || 1),
       maxConcurrency: ch.maxConcurrency ?? null,
       modelConfig: ch.modelConfig || null,

package/src/server/services/channels.js

@@ -4,7 +4,7 @@ const os = require('os');
 const { isProxyConfig } = require('./settings-manager');
 
 function getChannelsFilePath() {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const dir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -12,7 +12,7 @@ function getChannelsFilePath() {
 }
 
 function getActiveChannelIdPath() {
-  const dir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const dir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(dir)) {
     fs.mkdirSync(dir, { recursive: true });
   }
@@ -57,6 +57,38 @@ function normalizeNumber(value, defaultValue, max = null) {
   return num;
 }
 
+function normalizeGatewaySourceType(value, fallback = 'claude') {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'claude') return 'claude';
+  if (normalized === 'codex') return 'codex';
+  if (normalized === 'gemini') return 'gemini';
+  return fallback;
+}
+
+function extractApiKeyFromHelper(apiKeyHelper) {
+  if (typeof apiKeyHelper !== 'string' || !apiKeyHelper.trim()) {
+    return '';
+  }
+
+  const helper = apiKeyHelper.trim();
+  let match = helper.match(/^echo\s+["']([^"']+)["']$/);
+  if (match && match[1]) {
+    return match[1];
+  }
+
+  match = helper.match(/^printf\s+["'][^"']*["']\s+["']([^"']+)["']$/);
+  if (match && match[1]) {
+    return match[1];
+  }
+
+  return '';
+}
+
+function buildApiKeyHelperCommand() {
+  // 避免把明文 API Key 写入可执行命令，降低注入风险
+  return 'printf "%s" "${ANTHROPIC_AUTH_TOKEN:-${ANTHROPIC_API_KEY:-}}"';
+}
+
 function applyChannelDefaults(channel) {
   const normalized = { ...channel };
   if (normalized.enabled === undefined) {
@@ -65,11 +97,6 @@ function applyChannelDefaults(channel) {
     normalized.enabled = !!normalized.enabled;
   }
 
-  // OAuth 字段默认值（向后兼容）
-  if (!normalized.authType) {
-    normalized.authType = 'apiKey';
-  }
-
   normalized.weight = normalizeNumber(normalized.weight, 1, 100);
 
   if (normalized.maxConcurrency === undefined ||
@@ -80,6 +107,8 @@ function applyChannelDefaults(channel) {
     normalized.maxConcurrency = normalizeNumber(normalized.maxConcurrency, 1, 100);
   }
 
+  normalized.gatewaySourceType = normalizeGatewaySourceType(normalized.gatewaySourceType, 'claude');
+
   return normalized;
 }
 
@@ -144,10 +173,7 @@ function getCurrentSettings() {
                  '';
 
     if (!apiKey && settings.apiKeyHelper) {
-      const match = settings.apiKeyHelper.match(/['"]([^'"]+)['"]/);
-      if (match && match[1]) {
-        apiKey = match[1];
-      }
+      apiKey = extractApiKeyFromHelper(settings.apiKeyHelper);
     }
 
     if (!baseUrl && !apiKey) {
@@ -178,6 +204,23 @@ function getAllChannels() {
   return data.channels;
 }
 
+function getCurrentChannel() {
+  const channels = getAllChannels();
+  if (!Array.isArray(channels) || channels.length === 0) {
+    return null;
+  }
+
+  const activeChannelId = loadActiveChannelId();
+  if (activeChannelId) {
+    const matched = channels.find(ch => ch.id === activeChannelId);
+    if (matched) {
+      return matched;
+    }
+  }
+
+  return channels.find(ch => ch.enabled !== false) || channels[0];
+}
+
 function createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig = {}) {
   const data = loadChannels();
   const newChannel = applyChannelDefaults({
@@ -195,10 +238,7 @@ function createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig = {}) {
     modelRedirects: extraConfig.modelRedirects || [],
     proxyUrl: extraConfig.proxyUrl || '',
     speedTestModel: extraConfig.speedTestModel || null,
-    // OAuth 支持
-    authType: extraConfig.authType || 'apiKey',
-    oauthProvider: extraConfig.oauthProvider || null,
-    oauthTokenId: extraConfig.oauthTokenId || null
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'claude')
   });
 
   data.channels.push(newChannel);
@@ -218,7 +258,7 @@ function updateChannel(id, updates) {
   const oldChannel = { ...data.channels[index] };
 
   const merged = { ...data.channels[index], ...updates };
-  data.channels[index] = applyChannelDefaults({
+  const nextChannel = applyChannelDefaults({
     ...merged,
     weight: merged.weight,
     maxConcurrency: merged.maxConcurrency,
@@ -228,8 +268,10 @@ function updateChannel(id, updates) {
     modelRedirects: merged.modelRedirects || [],
     proxyUrl: merged.proxyUrl,
     speedTestModel: merged.speedTestModel,
+    gatewaySourceType: normalizeGatewaySourceType(merged.gatewaySourceType, 'claude'),
     updatedAt: Date.now()
   });
+  data.channels[index] = nextChannel;
 
   // Get proxy status
   const { getProxyStatus } = require('../proxy-server');
@@ -273,7 +315,7 @@ function updateChannel(id, updates) {
   return data.channels[index];
 }
 
-function deleteChannel(id) {
+async function deleteChannel(id) {
   const data = loadChannels();
   const index = data.channels.findIndex(ch => ch.id === id);
 
@@ -283,6 +325,7 @@ function deleteChannel(id) {
 
   data.channels.splice(index, 1);
   saveChannels(data);
+
   return { success: true };
 }
 
@@ -356,7 +399,7 @@ function updateClaudeSettingsWithModelConfig(channel) {
     delete settings.env.NO_PROXY;
   }
 
-  settings.apiKeyHelper = `echo '${apiKey}'`;
+  settings.apiKeyHelper = buildApiKeyHelperCommand();
 
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
@@ -385,34 +428,18 @@ function updateClaudeSettings(baseUrl, apiKey) {
     settings.env.ANTHROPIC_API_KEY = apiKey;
   }
 
-  settings.apiKeyHelper = `echo '${apiKey}'`;
+  settings.apiKeyHelper = buildApiKeyHelperCommand();
 
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
-/**
- * 获取渠道的有效 API Key
- * 如果渠道使用 OAuth 认证，返回有效的 OAuth 令牌；否则返回静态 API Key
- *
- * @param {Object} channel - 渠道对象
- * @returns {string|null} 有效的 API Key，OAuth 令牌无效/过期时返回 null
- */
 function getEffectiveApiKey(channel) {
-  if (channel.authType === 'oauth' && channel.oauthTokenId) {
-    const { getToken, isTokenExpired } = require('./oauth-token-storage');
-    const token = getToken(channel.oauthTokenId);
-    if (token && !isTokenExpired(token)) {
-      return token.accessToken;
-    }
-    // OAuth 令牌无效或已过期，返回 null（调用方应处理刷新或报错）
-    console.warn(`[Channels] OAuth token expired or not found for channel ${channel.name}`);
-    return null;
-  }
-  return channel.apiKey;
+  return channel.apiKey || null;
 }
 
 module.exports = {
   getAllChannels,
+  getCurrentChannel,
   getCurrentSettings,
   createChannel,
   updateChannel,