@adversity/coding-tool-x 3.0.6 → 3.1.1

package/src/server/proxy-server.js

@@ -13,6 +13,7 @@ const { recordRequest } = require('./services/statistics-service');
 const { saveProxyStartTime, clearProxyStartTime, getProxyStartTime, getProxyRuntime } = require('./services/proxy-runtime');
 const eventBus = require('../plugins/event-bus');
 const { CLAUDE_MODEL_PRICING } = require('../config/model-pricing');
+const { getEffectiveApiKey } = require('./services/channels');
 
 let proxyServer = null;
 let proxyApp = null;
@@ -159,7 +160,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();
@@ -185,9 +186,10 @@ async function startProxyServer(options = {}) {
         });
 
         proxyReq.removeHeader('x-api-key');
-        proxyReq.setHeader('x-api-key', selectedChannel.apiKey);
+        const effectiveKey = req.effectiveApiKey;
+        proxyReq.setHeader('x-api-key', effectiveKey);
         proxyReq.removeHeader('authorization');
-        proxyReq.setHeader('authorization', `Bearer ${selectedChannel.apiKey}`);
+        proxyReq.setHeader('authorization', `Bearer ${effectiveKey}`);
 
         if (!proxyReq.getHeader('anthropic-version')) {
           proxyReq.setHeader('anthropic-version', '2023-06-01');
@@ -219,6 +221,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) {
@@ -240,21 +266,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,
@@ -531,7 +542,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) {
@@ -75,6 +107,8 @@ function applyChannelDefaults(channel) {
     normalized.maxConcurrency = normalizeNumber(normalized.maxConcurrency, 1, 100);
   }
 
+  normalized.gatewaySourceType = normalizeGatewaySourceType(normalized.gatewaySourceType, 'claude');
+
   return normalized;
 }
 
@@ -139,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) {
@@ -173,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({
@@ -189,7 +237,8 @@ function createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig = {}) {
     modelConfig: extraConfig.modelConfig || null,
     modelRedirects: extraConfig.modelRedirects || [],
     proxyUrl: extraConfig.proxyUrl || '',
-    speedTestModel: extraConfig.speedTestModel || null
+    speedTestModel: extraConfig.speedTestModel || null,
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'claude')
   });
 
   data.channels.push(newChannel);
@@ -209,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,
@@ -219,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');
@@ -264,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);
 
@@ -274,6 +325,7 @@ function deleteChannel(id) {
 
   data.channels.splice(index, 1);
   saveChannels(data);
+
   return { success: true };
 }
 
@@ -347,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');
 }
@@ -376,13 +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');
 }
 
+function getEffectiveApiKey(channel) {
+  return channel.apiKey || null;
+}
+
 module.exports = {
   getAllChannels,
+  getCurrentChannel,
   getCurrentSettings,
   createChannel,
   updateChannel,
@@ -390,5 +447,6 @@ module.exports = {
   applyChannelToSettings,
   getBestChannelForRestore,
   updateClaudeSettings,
-  updateClaudeSettingsWithModelConfig
+  updateClaudeSettingsWithModelConfig,
+  getEffectiveApiKey
 };

package/src/server/services/codex-channels.js

@@ -20,9 +20,17 @@ const { injectEnvToShell, removeEnvFromShell, isProxyConfig } = require('./codex
  * - 使用 weight 和 maxConcurrency 控制负载均衡
  */
 
+function normalizeGatewaySourceType(value, fallback = 'codex') {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'claude') return 'claude';
+  if (normalized === 'codex') return 'codex';
+  if (normalized === 'gemini') return 'gemini';
+  return fallback;
+}
+
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
-  const ccToolDir = path.join(os.homedir(), '.claude', 'cc-tool');
+  const ccToolDir = path.join(os.homedir(), '.cc-tool');
   if (!fs.existsSync(ccToolDir)) {
     fs.mkdirSync(ccToolDir, { recursive: true });
   }
@@ -43,14 +51,17 @@ function loadChannels() {
     const data = JSON.parse(content);
     // 确保渠道有 enabled 字段（兼容旧数据）
     if (data.channels) {
-      data.channels = data.channels.map(ch => ({
-        ...ch,
-        enabled: ch.enabled !== false, // 默认启用
-        weight: ch.weight || 1,
-        maxConcurrency: ch.maxConcurrency || null,
-        modelRedirects: ch.modelRedirects || [],
-        speedTestModel: ch.speedTestModel || null
-      }));
+      data.channels = data.channels.map(ch => {
+        return {
+          ...ch,
+          enabled: ch.enabled !== false, // 默认启用
+          weight: ch.weight || 1,
+          maxConcurrency: ch.maxConcurrency || null,
+          modelRedirects: ch.modelRedirects || [],
+          speedTestModel: ch.speedTestModel || null,
+          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex')
+        };
+      });
     }
     return data;
   } catch (err) {
@@ -110,6 +121,7 @@ function initializeFromConfig() {
           enabled: config.model_provider === providerKey, // 当前激活的渠道启用
           weight: 1,
           maxConcurrency: null,
+          gatewaySourceType: 'codex',
           createdAt: Date.now(),
           updatedAt: Date.now()
         });
@@ -179,6 +191,7 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
     maxConcurrency: extraConfig.maxConcurrency || null,
     modelRedirects: extraConfig.modelRedirects || [],
     speedTestModel: extraConfig.speedTestModel || null,
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'codex'),
     createdAt: Date.now(),
     updatedAt: Date.now()
   };
@@ -187,8 +200,8 @@ function createChannel(name, providerKey, baseUrl, apiKey, wireApi = 'responses'
   saveChannels(data);
 
   // 注入该渠道的环境变量（用于直接使用 codex 命令）
-  if (apiKey && envKey) {
-    const injectResult = injectEnvToShell(envKey, apiKey);
+  if (newChannel.enabled !== false && newChannel.apiKey && envKey) {
+    const injectResult = injectEnvToShell(envKey, newChannel.apiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${envKey} injected for new channel`);
     } else {
@@ -228,6 +241,7 @@ function updateChannel(channelId, updates) {
     createdAt: oldChannel.createdAt, // 保持创建时间
     modelRedirects: merged.modelRedirects || [],
     speedTestModel: merged.speedTestModel !== undefined ? merged.speedTestModel : (oldChannel.speedTestModel || null),
+    gatewaySourceType: normalizeGatewaySourceType(merged.gatewaySourceType, 'codex'),
     updatedAt: Date.now()
   };
 
@@ -269,19 +283,23 @@ function updateChannel(channelId, updates) {
   // 如果 envKey 或 apiKey 变化，需要更新环境变量
   const oldEnvKey = oldChannel.envKey;
   const newEnvKey = newChannel.envKey;
-  const oldApiKey = oldChannel.apiKey;
   const newApiKey = newChannel.apiKey;
-
-  // 如果 envKey 改变，删除旧的，注入新的
-  if (oldEnvKey !== newEnvKey && oldEnvKey) {
+  const shouldRemoveOldEnv =
+    !!oldEnvKey && (
+      oldEnvKey !== newEnvKey ||
+      !newApiKey ||
+      newChannel.enabled === false
+    );
+
+  // 禁用或 key 变化时都要清理旧环境变量，避免残留
+  if (shouldRemoveOldEnv) {
     const removeResult = removeEnvFromShell(oldEnvKey);
     if (removeResult.success) {
       console.log(`[Codex Channels] Old environment variable ${oldEnvKey} removed`);
     }
   }
 
-  // 如果有新的 API Key，注入到环境变量
-  if (newApiKey && newEnvKey) {
+  if (newChannel.enabled !== false && newApiKey && newEnvKey) {
     const injectResult = injectEnvToShell(newEnvKey, newApiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${newEnvKey} updated`);
@@ -295,7 +313,7 @@ function updateChannel(channelId, updates) {
 }
 
 // 删除渠道
-function deleteChannel(channelId) {
+async function deleteChannel(channelId) {
   const data = loadChannels();
 
   const index = data.channels.findIndex(c => c.id === channelId);
@@ -397,7 +415,7 @@ function writeCodexConfigForMultiChannel(allChannels) {
       // 回退默认的代理配置（使用默认端口），确保 provider 存在
       config.model_providers['cc-proxy'] = {
         name: 'cc-proxy',
-        base_url: 'http://127.0.0.1:10089/v1',
+        base_url: 'http://127.0.0.1:20089/v1',
         wire_api: 'responses',
         env_key: 'CC_PROXY_KEY'
       };
@@ -448,6 +466,12 @@ ${tomlContent}`;
   }
 
   // 更新所有渠道的 API Key
+  for (const channel of allChannels) {
+    if (channel.envKey && !channel.apiKey) {
+      delete auth[channel.envKey];
+    }
+  }
+
   for (const channel of allChannels) {
     if (channel.apiKey) {
       auth[channel.envKey] = channel.apiKey;
@@ -508,7 +532,10 @@ function syncAllChannelEnvVars() {
     const results = [];
 
     for (const channel of channels) {
-      if (channel.apiKey && channel.envKey) {
+      if (!channel.envKey) continue;
+
+      const shouldInject = channel.enabled !== false && !!channel.apiKey;
+      if (shouldInject) {
         const injectResult = injectEnvToShell(channel.envKey, channel.apiKey);
         if (injectResult.success) {
           syncedCount++;
@@ -516,7 +543,11 @@ function syncAllChannelEnvVars() {
         } else {
           results.push({ envKey: channel.envKey, success: false, error: injectResult.error });
         }
+        continue;
       }
+
+      // 清理已停用或缺失 key 的渠道环境变量，避免残留
+      removeEnvFromShell(channel.envKey);
     }
 
     console.log(`[Codex Channels] Synced ${syncedCount} environment variables`);
@@ -620,19 +651,21 @@ ${tomlContent}`;
     }
   }
 
-  // 添加当前渠道的 API Key
   if (channel.apiKey && channel.envKey) {
     auth[channel.envKey] = channel.apiKey;
+  } else if (channel.envKey) {
+    delete auth[channel.envKey];
   }
 
   fs.writeFileSync(authPath, JSON.stringify(auth, null, 2), 'utf8');
 
-  // 注入环境变量到 shell 配置文件
   if (channel.apiKey && channel.envKey) {
     const injectResult = injectEnvToShell(channel.envKey, channel.apiKey);
     if (injectResult.success) {
       console.log(`[Codex Channels] Environment variable ${channel.envKey} injected`);
     }
+  } else if (channel.envKey) {
+    removeEnvFromShell(channel.envKey);
   }
 
   return channel;
@@ -649,6 +682,10 @@ try {
   console.warn('[Codex Channels] Auto sync env vars failed:', err.message);
 }
 
+function getEffectiveApiKey(channel) {
+  return channel.apiKey || null;
+}
+
 module.exports = {
   getChannels,
   createChannel,
@@ -658,5 +695,6 @@ module.exports = {
   saveChannelOrder,
   syncAllChannelEnvVars,
   writeCodexConfigForMultiChannel,
-  applyChannelToSettings
+  applyChannelToSettings,
+  getEffectiveApiKey
 };