coding-tool-x 3.4.10 → 3.4.11

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

@@ -34,6 +34,43 @@ function getChannelsFilePath() {
   return PATHS.channels.gemini;
 }
 
+function readExistingGeminiEnv() {
+  const envPath = path.join(getGeminiDir(), '.env');
+  if (!fs.existsSync(envPath)) {
+    return {};
+  }
+
+  const env = {};
+  try {
+    const content = fs.readFileSync(envPath, 'utf8');
+    content.split('\n').forEach((line) => {
+      const trimmed = line.trim();
+      if (!trimmed || trimmed.startsWith('#')) return;
+
+      const match = trimmed.match(/^([^=]+)=(.*)$/);
+      if (match) {
+        env[match[1].trim()] = match[2].trim();
+      }
+    });
+  } catch (err) {
+    return {};
+  }
+
+  return env;
+}
+
+function writeGeminiEnv(env = {}) {
+  const envPath = path.join(getGeminiDir(), '.env');
+  const content = Object.entries(env)
+    .map(([key, value]) => `${key}=${value}`)
+    .join('\n');
+
+  fs.writeFileSync(envPath, content ? `${content}\n` : '', 'utf8');
+  if (process.platform !== 'win32') {
+    fs.chmodSync(envPath, 0o600);
+  }
+}
+
 // 检查是否在代理模式
 function isProxyConfig() {
   const envPath = path.join(getGeminiDir(), '.env');
@@ -295,21 +332,12 @@ function applyChannelToSettings(channelId, channels = null) {
     fs.mkdirSync(geminiDir, { recursive: true });
   }
 
-  const envPath = path.join(geminiDir, '.env');
-
-  // 构建 .env 内容
+  const env = readExistingGeminiEnv();
   const effectiveApiKey = getEffectiveApiKey(channel) || '';
-  const envContent = `GOOGLE_GEMINI_BASE_URL=${channel.baseUrl}
-GEMINI_API_KEY=${effectiveApiKey}
-GEMINI_MODEL=${channel.model}
-`;
-
-  fs.writeFileSync(envPath, envContent, 'utf8');
-
-  // 设置 .env 文件权限为 600 (仅所有者可读写)
-  if (process.platform !== 'win32') {
-    fs.chmodSync(envPath, 0o600);
-  }
+  env.GOOGLE_GEMINI_BASE_URL = channel.baseUrl;
+  env.GEMINI_API_KEY = effectiveApiKey;
+  env.GEMINI_MODEL = channel.model;
+  writeGeminiEnv(env);
 
   // 确保 settings.json 存在并配置正确的认证模式
   const settingsPath = path.join(geminiDir, 'settings.json');
@@ -364,32 +392,25 @@ function writeGeminiConfigForMultiChannel(allChannels) {
     fs.mkdirSync(geminiDir, { recursive: true });
   }
 
-  const envPath = path.join(geminiDir, '.env');
-
   // 获取第一个启用的渠道作为默认配置
   const enabledChannels = allChannels.filter(c => c.enabled !== false);
   const defaultChannel = enabledChannels[0] || allChannels[0];
 
+  const env = readExistingGeminiEnv();
+
   if (!defaultChannel) {
-    // 没有渠道，写入空配置
-    const envContent = `# Gemini Configuration\n# No channels configured\n`;
-    fs.writeFileSync(envPath, envContent, 'utf8');
+    delete env.GOOGLE_GEMINI_BASE_URL;
+    delete env.GEMINI_API_KEY;
+    delete env.GEMINI_MODEL;
+    writeGeminiEnv(env);
     return;
   }
 
-  // 构建 .env 内容
   const effectiveApiKey = getEffectiveApiKey(defaultChannel) || '';
-  const envContent = `GOOGLE_GEMINI_BASE_URL=${defaultChannel.baseUrl}
-GEMINI_API_KEY=${effectiveApiKey}
-GEMINI_MODEL=${defaultChannel.model}
-`;
-
-  fs.writeFileSync(envPath, envContent, 'utf8');
-
-  // 设置 .env 文件权限为 600 (仅所有者可读写)
-  if (process.platform !== 'win32') {
-    fs.chmodSync(envPath, 0o600);
-  }
+  env.GOOGLE_GEMINI_BASE_URL = defaultChannel.baseUrl;
+  env.GEMINI_API_KEY = effectiveApiKey;
+  env.GEMINI_MODEL = defaultChannel.model;
+  writeGeminiEnv(env);
 
   // 确保 settings.json 存在并配置正确的认证模式
   const settingsPath = path.join(geminiDir, 'settings.json');

package/src/server/services/native-oauth-adapters.js

@@ -723,18 +723,21 @@ function clearOpenCodeOAuth() {
     return;
   }
 
+  const removedProviderIds = [];
   Object.keys(payload).forEach((providerId) => {
     if (payload[providerId]?.type === 'oauth') {
+      removedProviderIds.push(providerId);
       delete payload[providerId];
     }
   });
 
   if (Object.keys(payload).length === 0) {
     removeFileIfExists(NATIVE_PATHS.opencode.auth);
-    return;
+  } else {
+    writeJsonFile(NATIVE_PATHS.opencode.auth, payload);
   }
 
-  writeJsonFile(NATIVE_PATHS.opencode.auth, payload);
+  syncOpenCodeConfigAfterOAuthRemoval(removedProviderIds);
 }
 
 function disableOpenCodeOAuthCredential(credential = {}) {
@@ -745,6 +748,7 @@ function disableOpenCodeOAuthCredential(credential = {}) {
     return;
   }
 
+  const removedProviderIds = [];
   Object.keys(payload).forEach((key) => {
     const target = payload[key];
     if (!target || target.type !== 'oauth') {
@@ -754,16 +758,18 @@ function disableOpenCodeOAuthCredential(credential = {}) {
     const providerMatched = providerId && key === providerId;
     const tokenMatched = accessToken && String(target.access || '').trim() === accessToken;
     if (providerMatched || tokenMatched) {
+      removedProviderIds.push(key);
       delete payload[key];
     }
   });
 
   if (Object.keys(payload).length === 0) {
     removeFileIfExists(NATIVE_PATHS.opencode.auth);
-    return;
+  } else {
+    writeJsonFile(NATIVE_PATHS.opencode.auth, payload);
   }
 
-  writeJsonFile(NATIVE_PATHS.opencode.auth, payload);
+  syncOpenCodeConfigAfterOAuthRemoval(removedProviderIds);
 }
 
 function isManagedOpenCodeProvider(provider) {
@@ -780,6 +786,44 @@ function isManagedOpenCodeProvider(provider) {
   return apiKey === 'PROXY_KEY' && (baseUrl.includes('127.0.0.1') || baseUrl.includes('localhost'));
 }
 
+function isProxyBackedOpenCodeProvider(provider) {
+  if (!provider || typeof provider !== 'object') {
+    return false;
+  }
+
+  const apiKey = String(provider?.options?.apiKey || '').trim();
+  const baseUrl = String(provider?.options?.baseURL || '').trim();
+  return apiKey === 'PROXY_KEY' && (baseUrl.includes('127.0.0.1') || baseUrl.includes('localhost'));
+}
+
+function isMeaningfulOpenCodeProvider(provider) {
+  if (!provider || typeof provider !== 'object') {
+    return false;
+  }
+
+  if (provider.__ctx_managed__ === true) {
+    return true;
+  }
+
+  if (typeof provider.npm === 'string' && provider.npm.trim()) {
+    return true;
+  }
+
+  if (typeof provider.name === 'string' && provider.name.trim()) {
+    return true;
+  }
+
+  if (provider.options && typeof provider.options === 'object' && Object.keys(provider.options).length > 0) {
+    return true;
+  }
+
+  if (provider.models && typeof provider.models === 'object' && Object.keys(provider.models).length > 0) {
+    return true;
+  }
+
+  return false;
+}
+
 function clearOpenCodeManagedModelSelection(config) {
   const modelRef = String(config?.model || '').trim();
   if (!modelRef || !modelRef.includes('/')) {
@@ -797,6 +841,107 @@ function clearOpenCodeManagedModelSelection(config) {
   }
 }
 
+function getConfiguredOpenCodeProviderId(config) {
+  const modelRef = String(config?.model || '').trim();
+  if (modelRef.includes('/')) {
+    return modelRef.split('/')[0].trim();
+  }
+
+  const providerIds = config?.provider && typeof config.provider === 'object'
+    ? Object.keys(config.provider).filter(Boolean)
+    : [];
+  return providerIds.length === 1 ? providerIds[0] : '';
+}
+
+function buildOpenCodeModelRef(providerId, provider) {
+  if (!providerId || !provider || typeof provider !== 'object') {
+    return '';
+  }
+
+  const modelIds = provider.models && typeof provider.models === 'object'
+    ? Object.keys(provider.models).filter(Boolean)
+    : [];
+
+  if (modelIds.length === 0) {
+    return '';
+  }
+
+  return `${providerId}/${modelIds[0]}`;
+}
+
+function pickFallbackOpenCodeModel(config, excludedProviderIds = new Set()) {
+  const providers = config?.provider && typeof config.provider === 'object'
+    ? Object.entries(config.provider)
+    : [];
+
+  for (const [providerId, provider] of providers) {
+    if (excludedProviderIds.has(providerId)) {
+      continue;
+    }
+
+    const modelRef = buildOpenCodeModelRef(providerId, provider);
+    if (modelRef) {
+      return modelRef;
+    }
+  }
+
+  return '';
+}
+
+function syncOpenCodeConfigAfterOAuthRemoval(removedProviderIds = []) {
+  const removedIds = new Set((removedProviderIds || []).filter(Boolean));
+  if (removedIds.size === 0) {
+    return;
+  }
+
+  const configPath = opencodeSettingsManager.selectConfigPath();
+  if (!configPath || !fs.existsSync(configPath)) {
+    return;
+  }
+
+  let config = {};
+  try {
+    config = opencodeSettingsManager.readConfig(configPath);
+  } catch {
+    return;
+  }
+
+  config = config && typeof config === 'object' ? config : {};
+  config.provider = config.provider && typeof config.provider === 'object' ? config.provider : {};
+
+  let changed = false;
+  for (const providerId of removedIds) {
+    const provider = config.provider[providerId];
+    if (provider && !isMeaningfulOpenCodeProvider(provider)) {
+      delete config.provider[providerId];
+      changed = true;
+    }
+  }
+
+  const activeProviderId = getConfiguredOpenCodeProviderId(config);
+  if (activeProviderId && removedIds.has(activeProviderId)) {
+    const activeProvider = config.provider[activeProviderId];
+    if (!isMeaningfulOpenCodeProvider(activeProvider)) {
+      const fallbackModel = pickFallbackOpenCodeModel(config, removedIds);
+      if (fallbackModel) {
+        config.model = fallbackModel;
+      } else {
+        delete config.model;
+      }
+      changed = true;
+    }
+  }
+
+  if (Object.keys(config.provider).length === 0) {
+    delete config.provider;
+    changed = true;
+  }
+
+  if (changed) {
+    opencodeSettingsManager.writeConfig(configPath, config);
+  }
+}
+
 function applyOpenCodeOAuth(credential) {
   const providerId = String(credential.providerId || 'openai').trim() || 'openai';
   const payload = readJsonFile(NATIVE_PATHS.opencode.auth, {});
@@ -840,7 +985,9 @@ function inspectOpenCodeState() {
     const providers = config?.provider && typeof config.provider === 'object'
       ? Object.values(config.provider)
       : [];
-    channelConfigured = providers.some(provider => provider?.__ctx_managed__ === true);
+    channelConfigured = providers.some(provider => (
+      isMeaningfulOpenCodeProvider(provider) && !isProxyBackedOpenCodeProvider(provider)
+    ));
   } catch {
     channelConfigured = false;
   }

package/src/server/services/notification-hooks.js

@@ -238,7 +238,41 @@ function escapeForXml(value) {
 }
 
 function buildWindowsPopupCommand(title, message) {
-  return `powershell -NoProfile -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('${escapeForPowerShellSingleQuote(message)}', 5, '${escapeForPowerShellSingleQuote(title)}', 0x40)"`;
+  const script = [
+    'Add-Type -AssemblyName System.Windows.Forms',
+    'Add-Type -AssemblyName System.Drawing',
+    '$form = New-Object System.Windows.Forms.Form',
+    `$form.Text = '${escapeForPowerShellSingleQuote(title)}'`,
+    '$form.Width = 360',
+    '$form.Height = 120',
+    '$form.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual',
+    '$form.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow',
+    '$form.ShowInTaskbar = $false',
+    '$form.TopMost = $true',
+    '$form.MaximizeBox = $false',
+    '$form.MinimizeBox = $false',
+    '$workingArea = [System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea',
+    '$form.Location = New-Object System.Drawing.Point(($workingArea.Right - $form.Width - 16), ($workingArea.Top + 16))',
+    '$titleLabel = New-Object System.Windows.Forms.Label',
+    `$titleLabel.Text = '${escapeForPowerShellSingleQuote(title)}'`,
+    "$titleLabel.Font = New-Object System.Drawing.Font('Segoe UI', 10, [System.Drawing.FontStyle]::Bold)",
+    '$titleLabel.AutoSize = $true',
+    '$titleLabel.Location = New-Object System.Drawing.Point(14, 12)',
+    '$messageLabel = New-Object System.Windows.Forms.Label',
+    `$messageLabel.Text = '${escapeForPowerShellSingleQuote(message)}'`,
+    "$messageLabel.Font = New-Object System.Drawing.Font('Segoe UI', 9)",
+    '$messageLabel.MaximumSize = New-Object System.Drawing.Size(332, 0)',
+    '$messageLabel.AutoSize = $true',
+    '$messageLabel.Location = New-Object System.Drawing.Point(14, 40)',
+    '$form.Controls.Add($titleLabel)',
+    '$form.Controls.Add($messageLabel)',
+    '$timer = New-Object System.Windows.Forms.Timer',
+    '$timer.Interval = 5000',
+    '$timer.Add_Tick({ $timer.Stop(); $form.Close() })',
+    '$timer.Start()',
+    '[void]$form.ShowDialog()'
+  ].join('; ');
+  return `powershell -NoProfile -Command ${JSON.stringify(script)}`;
 }
 
 function generateNotifyScript(feishu = {}) {
@@ -464,7 +498,41 @@ function escapeForXml(value) {
 }
 
 function buildWindowsPopupCommand(title, message) {
-  return \`powershell -NoProfile -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('\${escapeForPowerShellSingleQuote(message)}', 5, '\${escapeForPowerShellSingleQuote(title)}', 0x40)"\`
+  const script = [
+    'Add-Type -AssemblyName System.Windows.Forms',
+    'Add-Type -AssemblyName System.Drawing',
+    '$form = New-Object System.Windows.Forms.Form',
+    \`$form.Text = '\${escapeForPowerShellSingleQuote(title)}'\`,
+    '$form.Width = 360',
+    '$form.Height = 120',
+    '$form.StartPosition = [System.Windows.Forms.FormStartPosition]::Manual',
+    '$form.FormBorderStyle = [System.Windows.Forms.FormBorderStyle]::FixedToolWindow',
+    '$form.ShowInTaskbar = $false',
+    '$form.TopMost = $true',
+    '$form.MaximizeBox = $false',
+    '$form.MinimizeBox = $false',
+    '$workingArea = [System.Windows.Forms.Screen]::PrimaryScreen.WorkingArea',
+    '$form.Location = New-Object System.Drawing.Point(($workingArea.Right - $form.Width - 16), ($workingArea.Top + 16))',
+    '$titleLabel = New-Object System.Windows.Forms.Label',
+    \`$titleLabel.Text = '\${escapeForPowerShellSingleQuote(title)}'\`,
+    " $titleLabel.Font = New-Object System.Drawing.Font('Segoe UI', 10, [System.Drawing.FontStyle]::Bold)".trim(),
+    '$titleLabel.AutoSize = $true',
+    '$titleLabel.Location = New-Object System.Drawing.Point(14, 12)',
+    '$messageLabel = New-Object System.Windows.Forms.Label',
+    \`$messageLabel.Text = '\${escapeForPowerShellSingleQuote(message)}'\`,
+    " $messageLabel.Font = New-Object System.Drawing.Font('Segoe UI', 9)".trim(),
+    '$messageLabel.MaximumSize = New-Object System.Drawing.Size(332, 0)',
+    '$messageLabel.AutoSize = $true',
+    '$messageLabel.Location = New-Object System.Drawing.Point(14, 40)',
+    '$form.Controls.Add($titleLabel)',
+    '$form.Controls.Add($messageLabel)',
+    '$timer = New-Object System.Windows.Forms.Timer',
+    '$timer.Interval = 5000',
+    '$timer.Add_Tick({ $timer.Stop(); $form.Close() })',
+    '$timer.Start()',
+    '[void]$form.ShowDialog()'
+  ].join('; ')
+  return 'powershell -NoProfile -Command ' + JSON.stringify(script)
 }
 `;
 }

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

@@ -117,7 +117,7 @@ function syncManagedChannelConfig(channels = [], preferredChannel = null) {
     : resolveCurrentManagedChannel(channels);
 
   if (targetChannel) {
-    setChannelConfig(targetChannel);
+    setChannelConfig(buildNativeConfigChannel(targetChannel));
     return targetChannel;
   }
 
@@ -305,11 +305,20 @@ function applyChannelToSettings(channelId) {
   });
   saveChannels(data);
 
-  setChannelConfig(channel);
+  setChannelConfig(buildNativeConfigChannel(channel));
 
   return channel;
 }
 
+function buildNativeConfigChannel(channel = {}) {
+  const candidates = getEffectiveApiKeyCandidates(channel);
+  const effectiveApiKey = candidates[0] || normalizeApiKey(channel.apiKey || channel.key || '');
+  return {
+    ...channel,
+    apiKey: effectiveApiKey
+  };
+}
+
 function loadCodexChannels() {
   const filePath = getCodexChannelsFilePath();
   if (!fs.existsSync(filePath)) {