coding-tool-x 3.8.8 → 3.8.10

package/src/platforms/drivers/opencode/channels-implementation.js

@@ -68,6 +68,10 @@ function normalizeChannelName(value) {
     .replace(/\s+/g, ' ');
 }
 
+function normalizeAuthMode(value) {
+  return ['api_key', 'oauth', 'none'].includes(value) ? value : 'api_key';
+}
+
 // 获取渠道存储文件路径
 function getChannelsFilePath() {
   const channelsDir = path.dirname(configuredState.channels);
@@ -98,24 +102,7 @@ function loadChannels() {
     const data = JSON.parse(content);
     // 确保渠道有必要字段（兼容旧数据）
     if (data.channels) {
-      data.channels = data.channels.map(ch => {
-        const normalized = {
-          ...ch,
-          enabled: ch.enabled !== false,
-          weight: ch.weight || 1,
-          maxConcurrency: ch.maxConcurrency || null,
-          balanceToken: ch.balanceToken || '',
-          balanceUserId: ch.balanceUserId || null,
-          modelRedirects: ch.modelRedirects || [],
-          speedTestModel: ch.speedTestModel || null,
-          wireApi: ch.wireApi || 'openai',  // OpenCode 默认使用 OpenAI 兼容格式
-          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex'),
-          allowedModels: ch.allowedModels || []
-        };
-        normalized.providerKey = ch.providerKey || deriveProviderKey(normalized);
-        normalized.websiteUrl = resolveChannelWebsiteUrl('opencode', normalized);
-        return normalized;
-      });
+      data.channels = data.channels.map(ch => normalizeOpenCodeChannel(ch));
     }
     return data;
   } catch (err) {
@@ -191,12 +178,18 @@ function getChannels() {
 function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
   const data = loadChannels();
   const isProxyRunning = getOpenCodeProxyRunning();
+  const authMode = normalizeAuthMode(extraConfig.authMode);
 
   const newChannel = {
     id: crypto.randomUUID(),
     name,
-    baseUrl,
-    apiKey,
+    baseUrl: authMode === 'oauth' || authMode === 'none' ? '' : baseUrl,
+    apiKey: authMode === 'oauth' || authMode === 'none' ? '' : apiKey,
+    authMode,
+    authRef: authMode === 'oauth' ? (extraConfig.authRef || {}) : undefined,
+    authSource: authMode === 'oauth' ? (extraConfig.authSource || 'synced-local') : undefined,
+    authStatus: authMode === 'oauth' ? (extraConfig.authStatus || 'available') : undefined,
+    oauthProviderId: authMode === 'oauth' ? (extraConfig.oauthProviderId || extraConfig.providerKey || '') : '',
     wireApi: extraConfig.wireApi || 'openai',
     enabled: extraConfig.enabled !== false,
     weight: extraConfig.weight || 1,
@@ -248,7 +241,7 @@ function updateChannel(channelId, updates) {
 
   const oldChannel = data.channels[index];
 
-  const merged = {
+  const merged = normalizeOpenCodeChannel({
     ...oldChannel,
     ...updates,
     id: channelId,
@@ -264,7 +257,7 @@ function updateChannel(channelId, updates) {
       'codex'
     ),
     updatedAt: Date.now()
-  };
+  });
   merged.providerKey = updates.providerKey || oldChannel.providerKey || deriveProviderKey(merged);
   merged.websiteUrl = resolveChannelWebsiteUrl('opencode', merged);
   data.channels[index] = merged;
@@ -289,6 +282,10 @@ function updateChannel(channelId, updates) {
   if (!isProxyRunning) {
     if (oldChannel.enabled === false && merged.enabled !== false) {
       syncManagedChannelConfig(data.channels, merged);
+    } else if (oldChannel.enabled !== false && merged.enabled === false) {
+      const activeChannel = resolveCurrentManagedChannel(data.channels);
+      if (activeChannel) syncManagedChannelConfig(data.channels, activeChannel);
+      else clearManagedChannelConfig();
     } else {
       const activeChannel = resolveCurrentManagedChannel(data.channels);
       if (merged.enabled !== false && activeChannel?.id === merged.id) {
@@ -494,9 +491,11 @@ async function getEffectiveApiKey(channel) {
 }
 
 function disableAllChannels() {
+  const proxyRunning = getOpenCodeProxyRunning();
   const data = loadChannels();
   data.channels.forEach(ch => { ch.enabled = false; });
   saveChannels(data);
+  if (!proxyRunning) clearManagedChannelConfig();
 }
 
 function getCurrentOpenCodeProviderId(config = {}) {
@@ -524,6 +523,7 @@ function findOpenCodeExistingByProvider(channels = [], providerId = '', baseUrl
 }
 
 function normalizeOpenCodeChannel(channel = {}) {
+  const authMode = normalizeAuthMode(channel.authMode);
   const normalized = {
     ...channel,
     enabled: channel.enabled !== false,
@@ -537,6 +537,15 @@ function normalizeOpenCodeChannel(channel = {}) {
     gatewaySourceType: normalizeGatewaySourceType(channel.gatewaySourceType, 'codex'),
     allowedModels: Array.isArray(channel.allowedModels) ? channel.allowedModels : []
   };
+  normalized.authMode = authMode;
+  normalized.authRef = authMode === 'oauth' ? (channel.authRef || {}) : undefined;
+  normalized.authSource = authMode === 'oauth' ? (channel.authSource || 'synced-local') : undefined;
+  normalized.authStatus = authMode === 'oauth' ? (channel.authStatus || 'available') : undefined;
+  normalized.oauthProviderId = authMode === 'oauth' ? (channel.oauthProviderId || channel.providerKey || '') : '';
+  if (authMode === 'oauth' || authMode === 'none') {
+    normalized.baseUrl = '';
+    normalized.apiKey = '';
+  }
   normalized.providerKey = normalized.providerKey || deriveProviderKey(normalized);
   normalized.websiteUrl = resolveChannelWebsiteUrl('opencode', normalized);
   return normalized;

package/src/platforms/drivers/opencode/channels.js

@@ -3,7 +3,7 @@
 const { createChannelDriver } = require('../../../shared/channel-driver');
 
 function createDriver(context = {}) {
-  return createChannelDriver({
+  const driver = createChannelDriver({
     ...context,
     platform: 'opencode',
     servicePath: './opencode/channels-implementation',
@@ -35,6 +35,11 @@ function createDriver(context = {}) {
     },
     dashboardChannelShape: 'array'
   });
+  const auth = require('../../channel-auth-service');
+  driver.getAuth = context => auth.getChannelAuth('opencode', { channelId: context?.params?.channelId || context?.query?.channelId || '' });
+  driver.syncLocalAuth = context => auth.syncLocalChannelAuth('opencode', { channelId: context?.body?.channelId || context?.params?.channelId || context?.query?.channelId || '' });
+  driver.getAuthQuota = context => auth.fetchChannelAuthQuota('opencode', context?.params?.channelId, { refresh: context?.query?.refresh === 'true' });
+  return driver;
 }
 
 module.exports = { createDriver };

package/src/platforms/drivers/opencode/native-config-implementation.js

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const path = require('path');
+const { readJsoncFile, writeJsoncFile } = require('../../../utils/native-config-patcher');
 const { NATIVE_PATHS } = require('../../../config/paths');
 const { resolveModelMetadata } = require('../../../config/model-metadata');
 const { resolveModelPricing } = require('../../../server/utils/pricing');
@@ -61,79 +62,18 @@ function selectConfigPath() {
   return CONFIG_PATHS.opencode;
 }
 
-function stripJsonComments(input) {
-  let result = '';
-  let inString = false;
-  let stringChar = '';
-  let i = 0;
-
-  while (i < input.length) {
-    const ch = input[i];
-    const next = input[i + 1];
-
-    if (inString) {
-      result += ch;
-      if (ch === '\\') {
-        if (next) {
-          result += next;
-          i += 2;
-          continue;
-        }
-      } else if (ch === stringChar) {
-        inString = false;
-      }
-      i += 1;
-      continue;
-    }
-
-    if (ch === '"' || ch === '\'') {
-      inString = true;
-      stringChar = ch;
-      result += ch;
-      i += 1;
-      continue;
-    }
-
-    if (ch === '/' && next === '/') {
-      i += 2;
-      while (i < input.length && input[i] !== '\n') i += 1;
-      continue;
-    }
-
-    if (ch === '/' && next === '*') {
-      i += 2;
-      while (i < input.length - 1 && !(input[i] === '*' && input[i + 1] === '/')) i += 1;
-      i += 2;
-      continue;
-    }
-
-    result += ch;
-    i += 1;
-  }
-
-  return result;
-}
-
 function readConfig(filePath) {
   if (!fs.existsSync(filePath)) return {};
 
-  const raw = fs.readFileSync(filePath, 'utf8');
-  if (!raw.trim()) return {};
-
   try {
-    if (filePath.endsWith('.jsonc')) {
-      return JSON.parse(stripJsonComments(raw));
-    }
-    return JSON.parse(raw);
+    return readJsoncFile(filePath);
   } catch (err) {
     throw new Error(`Failed to parse ${path.basename(filePath)}: ${err.message}`);
   }
 }
 
 function writeConfig(filePath, config) {
-  ensureConfigDir();
-  const content = JSON.stringify(config, null, 2);
-  fs.writeFileSync(filePath, content, 'utf8');
+  writeJsoncFile(filePath, config);
 }
 
 function normalizeOpenCodeModel(modelId, providerId) {
@@ -520,7 +460,6 @@ function setProxyConfig(proxyPort, options = {}) {
 
 function setChannelConfig(channel = {}) {
   const filePath = selectConfigPath();
-  backupConfig(filePath);
 
   const current = readConfig(filePath);
   const next = (current && typeof current === 'object') ? current : {};
@@ -529,9 +468,6 @@ function setChannelConfig(channel = {}) {
     next.provider = {};
   }
 
-  const removedProviderKeys = clearManagedProviders(next);
-  clearManagedModelRef(next, removedProviderKeys);
-
   const baseProviderKey = sanitizeProviderKey(channel.providerKey || channel.name || 'ctx-channel');
   let providerKey = baseProviderKey;
   let suffix = 2;

package/src/platforms/manifest-schema.js

@@ -11,6 +11,7 @@ const DRIVER_IDS = new Set([
   'generic-openai-compatible',
   'generic-mcp',
   'generic-prompt',
+  'generic-native-config',
   'legacy:claude',
   'legacy:codex',
   'legacy:gemini',
@@ -80,7 +81,7 @@ const CAPABILITY_OPERATIONS = Object.freeze({
     'updateSkill',
     'deleteSkill'
   ]),
-  channels: new Set(['applyToSettings', 'bestForRestore', 'catalogMetadata', 'create', 'current', 'enabled', 'getAuth', 'getAuthQuota', 'list', 'models', 'order', 'poolStatus', 'probeModels', 'remove', 'resetHealth', 'speedTest', 'speedTestAll', 'sync', 'syncLocalAuth', 'update']),
+  channels: new Set(['applyToSettings', 'bestForRestore', 'catalogMetadata', 'create', 'current', 'enabled', 'getAuth', 'getAuthQuota', 'list', 'models', 'order', 'poolStatus', 'probeModels', 'remove', 'resetHealth', 'speedTest', 'sync', 'syncLocalAuth', 'update']),
   health: new Set(['healthCheck']),
   hooks: new Set(['getHooks', 'saveHooks', 'testHooks']),
   projects: new Set(['createProject', 'deleteProject', 'listProjects', 'saveProjectOrder']),
@@ -198,6 +199,19 @@ const schema = {
     sessionMapping: { type: 'object', additionalProperties: { type: 'string' } },
     sessionGlob: { type: 'string', minLength: 1 },
     resourceMappings: { type: 'object', additionalProperties: { type: 'string' } },
+    nativeConfigSnapshot: {
+      type: 'object',
+      additionalProperties: {
+        type: 'object',
+        additionalProperties: false,
+        required: ['path', 'format'],
+        properties: {
+          path: { type: 'string', minLength: 1 },
+          format: { enum: ['text', 'json', 'yaml', 'directory'] },
+          mode: { type: 'integer', minimum: 0, maximum: 511 }
+        }
+      }
+    },
     projectResources: {
       type: 'object',
       additionalProperties: false,
@@ -333,6 +347,17 @@ function validateProjectResources(manifest, errors) {
   }
 }
 
+function validateNativeConfigSnapshot(manifest, errors) {
+  for (const [key, spec] of Object.entries(manifest?.nativeConfigSnapshot || {})) {
+    if (!isSafeRelativePath(spec?.path)) {
+      errors.push({
+        instancePath: `/nativeConfigSnapshot/${key}/path`,
+        message: 'must be a safe relative path or a declared native path name'
+      });
+    }
+  }
+}
+
 function validateApiRoutes(manifest, errors) {
   const api = manifest?.api;
   if (!api?.routes) return;
@@ -395,7 +420,8 @@ function validateManifest(manifest) {
     'generic-filesystem': new Set(['resourceSync']),
     'generic-openai-compatible': new Set(['channels']),
     'generic-mcp': new Set(['mcp']),
-    'generic-prompt': new Set(['prompts'])
+    'generic-prompt': new Set(['prompts']),
+    'generic-native-config': new Set(['nativeConfig'])
   };
 
   for (const [capability, driver] of Object.entries(manifest && manifest.capabilities || {})) {
@@ -424,6 +450,13 @@ function validateManifest(manifest) {
     }
   }
 
+  if (manifest?.capabilities?.nativeConfig === 'generic-native-config' && !manifest.nativeConfigSnapshot) {
+    errors.push({
+      instancePath: '/nativeConfigSnapshot',
+      message: 'generic-native-config requires nativeConfigSnapshot declarations'
+    });
+  }
+  validateNativeConfigSnapshot(manifest, errors);
   validateApiRoutes(manifest, errors);
   return { valid: errors.length === 0, errors };
 }

package/src/platforms/manifests/claude.json

@@ -356,14 +356,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",

package/src/platforms/manifests/codex.json

@@ -348,14 +348,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",

package/src/platforms/manifests/dsh.json

@@ -253,14 +253,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",
@@ -530,7 +522,7 @@
   "capabilities": {
     "projects": "dsh-projects",
     "sessions": "dsh-sessions",
-    "nativeConfig": "dsh-native-config",
+    "nativeConfig": "generic-native-config",
     "api": "dsh-api",
     "channels": "dsh-channels",
     "proxy": "dsh-proxy",
@@ -538,5 +530,10 @@
     "nativeLogs": "dsh-native-logs",
     "mcp": "dsh-api",
     "prompts": "dsh-api"
+  },
+  "nativeConfigSnapshot": {
+    "settings": { "path": "settings", "format": "text", "mode": 384 },
+    "credentials": { "path": "credentials", "format": "text", "mode": 384 },
+    "patch": { "path": "patch", "format": "text", "mode": 384 }
   }
 }

package/src/platforms/manifests/gemini.json

@@ -347,14 +347,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",

package/src/platforms/manifests/omp.json

@@ -365,14 +365,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",
@@ -491,6 +483,7 @@
     "api": "legacy:omp",
     "hooks": "legacy:omp",
     "resourceSync": "legacy:omp",
-    "mcp": "legacy:omp"
+    "mcp": "legacy:omp",
+    "prompts": "legacy:omp"
   }
 }

package/src/platforms/manifests/opencode.json

@@ -9,6 +9,10 @@
   "defaultEnabled": true,
   "sortOrder": 30,
   "modelConfig": { "catalogKey": "codex" },
+  "auth": {
+    "modes": ["api_key", "oauth", "none"],
+    "oauth": { "adapter": "opencode", "policy": "single-enabled", "quota": "codex" }
+  },
   "helpLabel": "OpenCode",
   "terminalColor": "yellow",
   "cliSelectable": true,
@@ -257,6 +261,30 @@
         "request": "default",
         "response": "default"
       },
+      {
+        "method": "GET",
+        "path": "/channels/auth",
+        "capability": "channels",
+        "operation": "getAuth",
+        "request": "default",
+        "response": "default"
+      },
+      {
+        "method": "POST",
+        "path": "/channels/auth/sync-local",
+        "capability": "channels",
+        "operation": "syncLocalAuth",
+        "request": "default",
+        "response": "default"
+      },
+      {
+        "method": "GET",
+        "path": "/channels/:channelId/auth/quota",
+        "capability": "channels",
+        "operation": "getAuthQuota",
+        "request": "default",
+        "response": "default"
+      },
       {
         "method": "POST",
         "path": "/channels/sync-current",
@@ -321,14 +349,6 @@
         "request": "default",
         "response": "default"
       },
-      {
-        "method": "POST",
-        "path": "/channels/speed-test-all",
-        "capability": "channels",
-        "operation": "speedTestAll",
-        "request": "default",
-        "response": "default"
-      },
       {
         "method": "POST",
         "path": "/channels/probe-models",