coding-tool-x 3.8.8 → 3.8.10

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

@@ -3,8 +3,9 @@ const path = require('path');
 const BaseChannelService = require('../../../shared/base-channel-service');
 const { isProxyConfig } = require('./native-config-implementation');
 const { PATHS, NATIVE_PATHS } = require('../../../config/paths');
-const { clearNativeOAuth, readNativeOAuth, clearClaudeChannelConfig } = require('../../native-oauth-adapters');
+const { readNativeOAuth, clearClaudeChannelConfig } = require('../../native-oauth-adapters');
 const { isWindowsLikePlatform } = require('../../../utils/home-dir');
+const { updateJsoncFile } = require('../../../utils/native-config-patcher');
 const { normalizeGatewaySourceType } = require('../../../shared/proxy-utils');
 const {
   createSkippedResult,
@@ -96,62 +97,46 @@ function buildApiKeyHelperCommand(value) {
 
 // ── Claude 原生设置写入 ──
 
-function updateClaudeSettingsWithModelConfig(channel) {
-  clearNativeOAuth('claude');
+function updateClaudeSettingsWithModelConfig(channel, managedChannels = []) {
   const settingsPath = getClaudeSettingsPath();
-  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
-
-  let settings = {};
-  if (fs.existsSync(settingsPath)) {
-    settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-  }
-
-  if (!settings.env) {
-    settings.env = {};
-  }
-
   const { baseUrl, apiKey, modelConfig, presetId, proxyUrl } = channel;
-
-  settings.env.ANTHROPIC_BASE_URL = baseUrl;
-  settings.env.ANTHROPIC_API_KEY = apiKey;
-  delete settings.env.ANTHROPIC_AUTH_TOKEN;
-  delete settings.env.CLAUDE_CODE_OAUTH_TOKEN;
-
-  if (presetId && presetId !== 'official' && modelConfig) {
-    if (modelConfig.model) {
-      settings.env.ANTHROPIC_MODEL = modelConfig.model;
-    }
-    if (modelConfig.haikuModel) {
-      settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL = modelConfig.haikuModel;
-    }
-    if (modelConfig.sonnetModel) {
-      settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL = modelConfig.sonnetModel;
-    }
-    if (modelConfig.opusModel) {
-      settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL = modelConfig.opusModel;
+  const managedProxyUrls = new Set([
+    ...managedChannels.map(item => item?.proxyUrl),
+    ...service.loadChannels().channels.map(item => item?.proxyUrl)
+  ].map(value => String(value || '').trim()).filter(Boolean));
+  updateJsoncFile(settingsPath, (settings) => {
+    if (!settings.env || typeof settings.env !== 'object' || Array.isArray(settings.env)) settings.env = {};
+    settings.env.ANTHROPIC_BASE_URL = baseUrl;
+    settings.env.ANTHROPIC_API_KEY = apiKey;
+    delete settings.env.ANTHROPIC_AUTH_TOKEN;
+    delete settings.env.CLAUDE_CODE_OAUTH_TOKEN;
+
+    const modelKeys = {
+      ANTHROPIC_MODEL: modelConfig?.model,
+      ANTHROPIC_DEFAULT_HAIKU_MODEL: modelConfig?.haikuModel,
+      ANTHROPIC_DEFAULT_SONNET_MODEL: modelConfig?.sonnetModel,
+      ANTHROPIC_DEFAULT_OPUS_MODEL: modelConfig?.opusModel
+    };
+    if (presetId && presetId !== 'official' && modelConfig) {
+      Object.entries(modelKeys).forEach(([key, value]) => {
+        if (value) settings.env[key] = value;
+        else delete settings.env[key];
+      });
+    } else {
+      Object.keys(modelKeys).forEach(key => delete settings.env[key]);
     }
-  } else {
-    delete settings.env.ANTHROPIC_MODEL;
-    delete settings.env.ANTHROPIC_DEFAULT_HAIKU_MODEL;
-    delete settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL;
-    delete settings.env.ANTHROPIC_DEFAULT_OPUS_MODEL;
-  }
-
-  if (proxyUrl) {
-    settings.env.HTTPS_PROXY = proxyUrl;
-    settings.env.HTTP_PROXY = proxyUrl;
-  } else {
-    delete settings.env.HTTPS_PROXY;
-    delete settings.env.HTTP_PROXY;
-    delete settings.env.NO_PROXY;
-  }
 
-  if (settings.env && Object.keys(settings.env).length === 0) {
-    delete settings.env;
-  }
-
-  settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
-  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
+    if (proxyUrl) {
+      settings.env.HTTPS_PROXY = proxyUrl;
+      settings.env.HTTP_PROXY = proxyUrl;
+    } else {
+      ['HTTPS_PROXY', 'HTTP_PROXY'].forEach((key) => {
+        if (managedProxyUrls.has(String(settings.env[key] || '').trim())) delete settings.env[key];
+      });
+    }
+    if (Object.keys(settings.env).length === 0) delete settings.env;
+    settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
+  });
 }
 
 function createClaudeOAuthError(message, code, statusCode) {
@@ -213,35 +198,20 @@ function validateClaudeOAuthMutation(channel, operation) {
 
 function updateClaudeSettings(baseUrl, apiKey) {
   const settingsPath = getClaudeSettingsPath();
-  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
-
-  let settings = {};
-  if (fs.existsSync(settingsPath)) {
-    settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
-  }
-
-  if (!settings.env) {
-    settings.env = {};
-  }
-
-  const useAuthToken = settings.env.ANTHROPIC_AUTH_TOKEN !== undefined;
-  const useApiKey = settings.env.ANTHROPIC_API_KEY !== undefined;
-
-  settings.env.ANTHROPIC_BASE_URL = baseUrl;
-
-  if (useAuthToken || (!useAuthToken && !useApiKey)) {
-    settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
-    delete settings.env.ANTHROPIC_API_KEY;
-  } else {
-    settings.env.ANTHROPIC_API_KEY = apiKey;
-  }
-
-  if (settings.env && Object.keys(settings.env).length === 0) {
-    delete settings.env;
-  }
-
-  settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
-  fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
+  updateJsoncFile(settingsPath, (settings) => {
+    if (!settings.env || typeof settings.env !== 'object' || Array.isArray(settings.env)) settings.env = {};
+    const useAuthToken = settings.env.ANTHROPIC_AUTH_TOKEN !== undefined;
+    const useApiKey = settings.env.ANTHROPIC_API_KEY !== undefined;
+    settings.env.ANTHROPIC_BASE_URL = baseUrl;
+    if (useAuthToken || (!useAuthToken && !useApiKey)) {
+      settings.env.ANTHROPIC_AUTH_TOKEN = apiKey;
+      delete settings.env.ANTHROPIC_API_KEY;
+    } else {
+      settings.env.ANTHROPIC_API_KEY = apiKey;
+    }
+    if (Object.keys(settings.env).length === 0) delete settings.env;
+    settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
+  });
 }
 
 function resolveCurrentManagedChannel(channels = []) {
@@ -334,9 +304,9 @@ class ClaudeChannelService extends BaseChannelService {
     this._cacheInitialized = true;
   }
 
-  _onAfterCreate(channel, _allChannels) {
+  _onAfterCreate(channel, allChannels) {
     if (!isClaudeProxyRunning() && channel.enabled !== false && !isOpenAiCompatibleGateway(channel)) {
-      this._applyToNativeSettings(channel);
+      this._applyToNativeSettings(channel, allChannels);
     }
   }
 
@@ -347,7 +317,7 @@ class ClaudeChannelService extends BaseChannelService {
 
     if (oldChannel.enabled === false && nextChannel.enabled !== false) {
       if (!isOpenAiCompatibleGateway(nextChannel)) {
-        this._applyToNativeSettings(nextChannel);
+        this._applyToNativeSettings(nextChannel, [...allChannels, oldChannel]);
       }
       return;
     }
@@ -358,19 +328,38 @@ class ClaudeChannelService extends BaseChannelService {
       && activeChannel?.id === nextChannel.id
       && !isOpenAiCompatibleGateway(nextChannel)
     ) {
-      this._applyToNativeSettings(nextChannel);
+      this._applyToNativeSettings(nextChannel, [...allChannels, oldChannel]);
+      return;
+    }
+    if (oldChannel.enabled !== false && nextChannel.enabled === false) {
+      if (activeChannel && !isOpenAiCompatibleGateway(activeChannel)) {
+        this._applyToNativeSettings(activeChannel, [...allChannels, oldChannel]);
+      } else if (!activeChannel) {
+        clearClaudeChannelConfig([...allChannels, oldChannel].map(item => item?.proxyUrl));
+      }
     }
   }
 
-  _onAfterDelete(_channel, allChannels) {
+  _onAfterDelete(channel, allChannels) {
     if (isClaudeProxyRunning()) {
       return;
     }
 
     const activeChannel = resolveCurrentManagedChannel(allChannels);
     if (activeChannel && !isOpenAiCompatibleGateway(activeChannel)) {
-      this._applyToNativeSettings(activeChannel);
+      this._applyToNativeSettings(activeChannel, [...allChannels, channel]);
+    } else if (!activeChannel) {
+      clearClaudeChannelConfig([...allChannels, channel].map(item => item?.proxyUrl));
+    }
+  }
+
+  disableAllChannels() {
+    const channels = this.loadChannels().channels;
+    const result = super.disableAllChannels();
+    if (!isClaudeProxyRunning()) {
+      clearClaudeChannelConfig(channels.map(item => item?.proxyUrl));
     }
+    return result;
   }
 
   applyChannelToSettings(channelId) {
@@ -388,12 +377,12 @@ class ClaudeChannelService extends BaseChannelService {
     return super.applyChannelToSettings(channelId);
   }
 
-  _applyToNativeSettings(channel) {
+  _applyToNativeSettings(channel, managedChannels = []) {
     if (channel.authMode === 'oauth') {
       applyNativeClaudeOAuth(channel);
       return;
     }
-    updateClaudeSettingsWithModelConfig(channel);
+    updateClaudeSettingsWithModelConfig(channel, managedChannels);
   }
 
   getEffectiveApiKey(channel) {

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

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const { NATIVE_PATHS } = require('../../../config/paths');
 const { isWindowsLikePlatform } = require('../../../utils/home-dir');
+const { readJsoncFile, writeJsoncFile } = require('../../../utils/native-config-patcher');
 const DEFAULT_NATIVE_PATHS = NATIVE_PATHS.claude;
 let nativePaths = DEFAULT_NATIVE_PATHS;
 
@@ -40,8 +41,7 @@ function hasBackup() {
 // 读取配置文件
 function readSettings() {
   try {
-    const content = fs.readFileSync(getSettingsPath(), 'utf8');
-    return JSON.parse(content);
+    return readJsoncFile(getSettingsPath());
   } catch (err) {
     throw new Error('Failed to read settings.json: ' + err.message);
   }
@@ -50,8 +50,7 @@ function readSettings() {
 // 写入配置文件
 function writeSettings(settings) {
   try {
-    const content = JSON.stringify(settings, null, 2);
-    fs.writeFileSync(getSettingsPath(), content, 'utf8');
+    writeJsoncFile(getSettingsPath(), settings);
   } catch (err) {
     throw new Error('Failed to write settings.json: ' + err.message);
   }

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

@@ -2,8 +2,8 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const toml = require('toml');
-const tomlStringify = require('@iarna/toml').stringify;
 const { PATHS } = require('../../../config/paths');
+const { writeTomlFile } = require('../../../utils/native-config-patcher');
 const { getCodexDir } = require('./config');
 const { isProxyConfig, readConfig } = require('./native-config-implementation');
 const { syncCodexUserEnvironment } = require('./env-manager');
@@ -175,21 +175,24 @@ function syncAllChannelEnvVars() {
   }
 }
 
-function writeAnnotatedCodexConfig(configPath, config, comments = []) {
-  let tomlContent = tomlStringify(config);
-  if (comments.length > 0) {
-    tomlContent = comments.join('\n') + '\n\n' + tomlContent;
-  }
-  fs.writeFileSync(configPath, tomlContent, 'utf8');
+function writeAnnotatedCodexConfig(configPath, config) {
+  writeTomlFile(configPath, config, { atomic: true });
 }
 
-function pruneManagedProviders(existingProviders, currentProviderKey, allChannels) {
-  const knownKeys = new Set(allChannels.map(ch => ch.providerKey).filter(Boolean));
-  for (const key of Object.keys(existingProviders)) {
-    if (key === 'cc-proxy' || (key !== currentProviderKey && knownKeys.has(key))) {
-      delete existingProviders[key];
-    }
+function mergeCodexProviderConfig(existing = {}, channel = {}) {
+  const provider = {
+    ...existing,
+    name: channel.name,
+    base_url: channel.baseUrl,
+    wire_api: channel.wireApi || 'responses',
+    env_key: CODEX_MANAGED_ENV_KEY,
+    requires_openai_auth: channelRequiresOpenaiAuth(channel)
+  };
+  delete provider.query_params;
+  if (channel.queryParams && Object.keys(channel.queryParams).length > 0) {
+    provider.query_params = channel.queryParams;
   }
+  return provider;
 }
 
 function writeCodexConfigForMultiChannel(channels) {
@@ -201,8 +204,7 @@ function writeCodexConfigForMultiChannel(channels) {
     try {
       config = toml.parse(fs.readFileSync(configPath, 'utf8'));
     } catch (err) {
-      console.warn('[Codex Channels] Failed to parse existing config.toml:', err.message);
-      config = {};
+      throw new Error(`Failed to parse existing config.toml: ${err.message}`);
     }
   }
 
@@ -229,26 +231,17 @@ function writeCodexConfigForMultiChannel(channels) {
     config.model_provider = primary.providerKey;
 
     for (const ch of enabledChannels) {
-      config.model_providers[ch.providerKey] = {
-        name: ch.name,
-        base_url: ch.baseUrl,
-        wire_api: ch.wireApi || 'responses',
-        env_key: CODEX_MANAGED_ENV_KEY,
-        requires_openai_auth: channelRequiresOpenaiAuth(ch)
-      };
-      if (ch.queryParams && Object.keys(ch.queryParams).length > 0) {
-        config.model_providers[ch.providerKey].query_params = ch.queryParams;
-      }
+      config.model_providers[ch.providerKey] = mergeCodexProviderConfig(
+        config.model_providers[ch.providerKey],
+        ch
+      );
     }
   } else {
     clearManagedCodexConfig();
     return;
   }
 
-  writeAnnotatedCodexConfig(configPath, config, [
-    '# Codex Configuration',
-    '# Managed by Coding-Tool (multi-channel)'
-  ]);
+  writeAnnotatedCodexConfig(configPath, config);
 }
 
 // ── CodexChannelService ──
@@ -315,6 +308,12 @@ class CodexChannelService extends BaseChannelService {
         this._applyToNativeSettings(_next);
         return;
       }
+      if (_old.enabled !== false && _next.enabled === false) {
+        const activeChannel = resolveCurrentManagedChannel(allChannels);
+        if (activeChannel) this._applyToNativeSettings(activeChannel);
+        else clearManagedCodexConfig();
+        return;
+      }
       const activeChannel = resolveCurrentManagedChannel(allChannels);
       if (_next.enabled !== false && activeChannel?.id === _next.id) {
         this._applyToNativeSettings(_next);
@@ -347,7 +346,7 @@ class CodexChannelService extends BaseChannelService {
       try {
         config = toml.parse(fs.readFileSync(configPath, 'utf8'));
       } catch (err) {
-        config = {};
+        throw new Error(`Failed to parse existing config.toml: ${err.message}`);
       }
     }
 
@@ -356,26 +355,12 @@ class CodexChannelService extends BaseChannelService {
     if (!config.model_providers || typeof config.model_providers !== 'object') {
       config.model_providers = {};
     }
-    const data = this.loadChannels();
-    pruneManagedProviders(config.model_providers, channel.providerKey, data.channels);
-
-    config.model_providers[channel.providerKey] = {
-      name: channel.name,
-      base_url: channel.baseUrl,
-      wire_api: channel.wireApi || 'responses',
-      env_key: CODEX_MANAGED_ENV_KEY,
-      requires_openai_auth: channelRequiresOpenaiAuth(channel)
-    };
-
-    if (channel.queryParams && Object.keys(channel.queryParams).length > 0) {
-      config.model_providers[channel.providerKey].query_params = channel.queryParams;
-    }
+    config.model_providers[channel.providerKey] = mergeCodexProviderConfig(
+      config.model_providers[channel.providerKey],
+      channel
+    );
 
-    writeAnnotatedCodexConfig(configPath, config, [
-      '# Codex Configuration',
-      '# Managed by Coding-Tool',
-      `# Current provider: ${channel.name}`
-    ]);
+    writeAnnotatedCodexConfig(configPath, config);
     console.log(`[Codex Channels] Applied channel ${channel.name} to config.toml`);
     syncAllChannelEnvVars();
   }

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

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const toml = require('toml');
-const tomlStringify = require('@iarna/toml').stringify;
+const { writeTomlFile } = require('../../../utils/native-config-patcher');
 const { NATIVE_PATHS } = require('../../../config/paths');
 const { syncCodexUserEnvironment } = require('./env-manager');
 const DEFAULT_NATIVE_PATHS = NATIVE_PATHS.codex;
@@ -83,53 +83,10 @@ function readConfig() {
   }
 }
 
-// 将配置对象转换为 TOML 字符串
-function configToToml(config) {
-  let content = `# Codex Configuration
-# Managed by Coding-Tool (Proxy Mode)
-
-`;
-
-  // 写入顶级字段
-  for (const [key, value] of Object.entries(config)) {
-    if (key === 'model_providers') continue; // 稍后处理
-    if (typeof value === 'string') {
-      content += `${key} = "${value}"\n`;
-    } else if (typeof value === 'boolean') {
-      content += `${key} = ${value}\n`;
-    } else if (typeof value === 'number') {
-      content += `${key} = ${value}\n`;
-    }
-  }
-
-  content += '\n';
-
-  // 写入 model_providers
-  if (config.model_providers) {
-    for (const [providerKey, providerConfig] of Object.entries(config.model_providers)) {
-      content += `[model_providers.${providerKey}]\n`;
-      for (const [key, value] of Object.entries(providerConfig)) {
-        if (typeof value === 'string') {
-          content += `${key} = "${value}"\n`;
-        } else if (typeof value === 'boolean') {
-          content += `${key} = ${value}\n`;
-        } else if (typeof value === 'number') {
-          content += `${key} = ${value}\n`;
-        }
-      }
-      content += '\n';
-    }
-  }
-
-  return content;
-}
-
 // 写入 config.toml
 function writeConfig(config) {
   try {
-    const safeConfig = JSON.parse(JSON.stringify(config || {}));
-    const content = tomlStringify(safeConfig);
-    fs.writeFileSync(getConfigPath(), content, 'utf8');
+    writeTomlFile(getConfigPath(), config || {}, { atomic: true });
   } catch (err) {
     throw new Error('Failed to write config.toml: ' + err.message);
   }
@@ -254,12 +211,7 @@ function setProxyConfig(proxyPort) {
     }
 
     // 读取当前配置（不存在时使用空配置）
-    let config;
-    try {
-      config = readConfig();
-    } catch (err) {
-      config = {};
-    }
+    const config = configExists() ? readConfig() : {};
 
     // 设置 model_provider 为 proxy
     config.model_provider = 'cc-proxy';

package/src/platforms/drivers/dsh/api-operations.js

@@ -186,7 +186,7 @@ function createDriver(context = {}) {
 
   // Keep the aggregate DSH API driver compatible with the manifest consistency
   // contract. Actual descriptor requests are still dispatched by capability.
-  for (const operation of ['list', 'current', 'enabled', 'create', 'update', 'remove', 'applyToSettings', 'sync', 'order', 'models', 'probeModels', 'speedTest', 'speedTestAll']) {
+  for (const operation of ['list', 'current', 'enabled', 'create', 'update', 'remove', 'applyToSettings', 'sync', 'order', 'models', 'probeModels', 'speedTest']) {
     driver[operation] = (...args) => channels[operation](...args);
   }
   for (const operation of ['status', 'start', 'stop']) {

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

@@ -4,11 +4,12 @@ const fs = require('fs');
 const path = require('path');
 const { getPlatformStatePath: resolveStatePath } = require('../../../config/paths');
 const BaseChannelService = require('../../../shared/base-channel-service');
+const { writeYamlFile } = require('../../../utils/native-config-patcher');
 const {
   resolvePaths,
   readYamlFile,
   writeAtomic,
-  dumpYaml,
+  DSH_YAML_SOURCE_TAGS,
   isObject
 } = require('./common');
 
@@ -202,7 +203,7 @@ class DshChannelService extends BaseChannelService {
   }
 
   _activeChannel(channels = []) {
-    return channels.find(channel => channel.enabled !== false) || channels[0] || null;
+    return channels.find(channel => channel.enabled !== false) || null;
   }
 
   _onAfterCreate(channel) {
@@ -217,9 +218,8 @@ class DshChannelService extends BaseChannelService {
       this._removeNativeProvider(oldChannel.providerKey);
     }
     const active = this._activeChannel(allChannels);
-    if (active?.id === nextChannel.id || (oldChannel.enabled !== false && nextChannel.enabled === false)) {
-      if (active) this._applyToNativeSettings(active);
-    }
+    if (active) this._applyToNativeSettings(active);
+    else this._removeNativeProvider(nextChannel.providerKey);
   }
 
   _onAfterDelete(channel, allChannels) {
@@ -234,7 +234,11 @@ class DshChannelService extends BaseChannelService {
   }
 
   _writeNativeSettings(settings) {
-    writeAtomic(this.nativePaths.settings, dumpYaml(settings), 0o600);
+    writeYamlFile(this.nativePaths.settings, settings, {
+      atomic: true,
+      mode: 0o600,
+      customTags: DSH_YAML_SOURCE_TAGS
+    });
   }
 
   _removeNativeProvider(providerKey) {
@@ -246,6 +250,15 @@ class DshChannelService extends BaseChannelService {
     if (!Object.prototype.hasOwnProperty.call(providers, key)) return;
     delete providers[key];
     settings['llm-pi-ai'] = { ...llm, providers };
+    const selected = isObject(settings['agent-default-model'])
+      ? { ...settings['agent-default-model'] }
+      : null;
+    if (selected?.provider === key) {
+      delete selected.provider;
+      delete selected.model;
+      if (Object.keys(selected).length > 0) settings['agent-default-model'] = selected;
+      else delete settings['agent-default-model'];
+    }
     this._writeNativeSettings(settings);
   }
 
@@ -255,7 +268,11 @@ class DshChannelService extends BaseChannelService {
     if (!isObject(credentials.refs)) credentials.refs = {};
     credentials.refs[channel.apiKeyEnv] = channel.apiKey || '';
     if (!isObject(credentials.records)) credentials.records = {};
-    writeAtomic(this.nativePaths.credentials, dumpYaml(credentials), 0o600);
+    writeYamlFile(this.nativePaths.credentials, credentials, {
+      atomic: true,
+      mode: 0o600,
+      customTags: DSH_YAML_SOURCE_TAGS
+    });
   }
 
   _providerEntry(channel, baseUrl = channel.baseUrl, models = channel.models) {
@@ -273,7 +290,10 @@ class DshChannelService extends BaseChannelService {
     const settings = this._nativeSettings();
     const llm = isObject(settings['llm-pi-ai']) ? { ...settings['llm-pi-ai'] } : {};
     const providers = isObject(llm.providers) ? { ...llm.providers } : {};
-    providers[channel.providerKey] = this._providerEntry(channel);
+    providers[channel.providerKey] = {
+      ...(isObject(providers[channel.providerKey]) ? providers[channel.providerKey] : {}),
+      ...this._providerEntry(channel)
+    };
     settings['llm-pi-ai'] = { ...llm, providers };
     settings['agent-default-model'] = {
       ...(isObject(settings['agent-default-model']) ? settings['agent-default-model'] : {}),

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

@@ -149,24 +149,6 @@ function createDriver(context = {}) {
         { authSourceType: 'dsh' }
       );
     }),
-    speedTestAll: request => withAsyncResult(request, 'speedTestAll', async () => {
-      const { testMultipleChannels } = require('../../../server/services/speed-test');
-      const body = bodyOf(request);
-      const channels = implementation.getServiceInstance().getEnabledChannels();
-      const groups = new Map();
-      for (const channel of channels) {
-        const type = channelTypeForSpeed(channel);
-        const group = groups.get(type) || [];
-        group.push(channel);
-        groups.set(type, group);
-      }
-      const groupedResults = await Promise.all([...groups.entries()].map(([type, group]) => (
-        testMultipleChannels(group, body.timeout, type, body.concurrency)
-      )));
-      const resultById = new Map(groupedResults.flat().map(result => [result.channelId, result]));
-      const results = channels.map(channel => resultById.get(channel.id)).filter(Boolean);
-      return { results };
-    }),
     saveOrder: request => withResult(request, 'order', () => {
       const body = bodyOf(request);
       implementation.getServiceInstance().saveChannelOrder(body.order || body.ids || []);

package/src/platforms/drivers/dsh/common.js

@@ -23,6 +23,12 @@ const DSH_YAML_SCHEMA = yaml.DEFAULT_SCHEMA.extend([
   })
 ]);
 
+const DSH_YAML_SOURCE_TAGS = [{
+  tag: 'tag:yaml.org,2002:js',
+  resolve: value => `!!js ${value}`,
+  stringify: item => String(item.value).replace(/^!!js\s*/, '')
+}];
+
 function clone(value) {
   if (value === undefined) return undefined;
   return JSON.parse(JSON.stringify(value));
@@ -548,6 +554,7 @@ module.exports = {
   resolvePaths,
   isObject,
   readYamlFile,
+  DSH_YAML_SOURCE_TAGS,
   readJsonFile,
   fileRevision,
   writeAtomic,

package/src/platforms/drivers/dsh/native-config.js

@@ -1,7 +1,8 @@
 'use strict';
 
 const fs = require('fs');
-const { resolvePaths, readYamlFile, writeAtomic, dumpYaml, mergeSettings, fileRevision, credentialMetadata, redactSecrets, listProfiles, listProfilePlugins, listProfileMcp, listProfilePrompts } = require('./common');
+const { writeYamlFile } = require('../../../utils/native-config-patcher');
+const { resolvePaths, readYamlFile, mergeSettings, fileRevision, credentialMetadata, redactSecrets, listProfiles, listProfilePlugins, listProfileMcp, listProfilePrompts, DSH_YAML_SOURCE_TAGS } = require('./common');
 const { resolveSkillRoots } = require('./resources');
 
 function createDriver(context = {}) {
@@ -35,7 +36,11 @@ function createDriver(context = {}) {
       }
       const current = readYamlFile(paths.settings, {});
       const next = mergeSettings(current, body.namespace, body.patch, body.replace === true);
-      writeAtomic(paths.settings, dumpYaml(next), 0o600);
+      writeYamlFile(paths.settings, next, {
+        atomic: true,
+        mode: 0o600,
+        customTags: DSH_YAML_SOURCE_TAGS
+      });
       return this.getConfig();
     },
     getConfigCapabilities() {