coding-tool-x 3.4.0 → 3.4.2

package/src/server/services/codex-env-manager.js

@@ -77,6 +77,22 @@ function upsertManagedBlock(content, snippet) {
   return `${stripped.trimEnd()}\n\n${snippet}\n`;
 }
 
+function buildExportCommand(envFilePath, homeDir) {
+  return `. "${buildHomeRelativeShellPath(envFilePath, homeDir)}"`;
+}
+
+function buildPosixEnvFileContent(nextValues) {
+  const keys = Object.keys(nextValues).sort();
+  if (!keys.length) {
+    return '';
+  }
+  return [
+    '# Managed by Coding-Tool',
+    ...keys.map((key) => `export ${key}=${shellQuote(nextValues[key])}`),
+    ''
+  ].join('\n');
+}
+
 function readJsonFile(filePath, fallbackValue) {
   try {
     if (!fs.existsSync(filePath)) {
@@ -181,29 +197,43 @@ function syncPosixEnvironment(nextValues, previousState, options) {
   const {
     runtime,
     homeDir,
+    envFilePath,
     stateFilePath,
     shellEnv,
     execSync
   } = options;
   const nextKeys = Object.keys(nextValues).sort();
   let changed = false;
+  const { preferred, candidates } = getPosixProfileCandidates(homeDir, shellEnv);
+  const sourceSnippet = buildSourceSnippet(envFilePath, homeDir);
+  const sourceCommand = buildExportCommand(envFilePath, homeDir);
 
   // 清理旧版本遗留的 shell profile 注入（迁移兼容）
   const previousProfiles = Array.isArray(previousState.profiles) ? previousState.profiles : [];
-  if (previousProfiles.length > 0) {
-    const { candidates } = getPosixProfileCandidates(homeDir, shellEnv);
-    const cleanupTargets = new Set([
-      ...previousProfiles,
-      ...candidates.filter(filePath => fs.existsSync(filePath))
-    ]);
-    for (const profilePath of cleanupTargets) {
-      if (!fs.existsSync(profilePath)) continue;
-      const currentContent = fs.readFileSync(profilePath, 'utf8');
-      if (!currentContent.includes(PROFILE_MARKER_START)) continue;
-      const nextContent = stripManagedBlock(currentContent);
-      const finalContent = nextContent ? `${nextContent}\n` : '';
-      changed = writeTextFileIfChanged(profilePath, finalContent) || changed;
-    }
+  const cleanupTargets = new Set([
+    ...previousProfiles,
+    ...candidates.filter((filePath) => fs.existsSync(filePath))
+  ]);
+  if (!nextKeys.length) {
+    cleanupTargets.add(preferred);
+  }
+  for (const profilePath of cleanupTargets) {
+    if (!fs.existsSync(profilePath)) continue;
+    const currentContent = fs.readFileSync(profilePath, 'utf8');
+    if (!currentContent.includes(PROFILE_MARKER_START)) continue;
+    const nextContent = stripManagedBlock(currentContent);
+    const finalContent = nextContent ? `${nextContent}\n` : '';
+    changed = writeTextFileIfChanged(profilePath, finalContent) || changed;
+  }
+
+  if (nextKeys.length > 0) {
+    changed = writeTextFileIfChanged(envFilePath, buildPosixEnvFileContent(nextValues)) || changed;
+    const currentProfileContent = fs.existsSync(preferred) ? fs.readFileSync(preferred, 'utf8') : '';
+    const nextProfileContent = upsertManagedBlock(currentProfileContent, sourceSnippet);
+    changed = writeTextFileIfChanged(preferred, nextProfileContent) || changed;
+  } else if (fs.existsSync(envFilePath)) {
+    fs.unlinkSync(envFilePath);
+    changed = true;
   }
 
   // macOS：用 launchctl 写入全局环境变量，新开终端/进程即生效
@@ -225,7 +255,7 @@ function syncPosixEnvironment(nextValues, previousState, options) {
     writeJsonFile(stateFilePath, {
       version: 1,
       values: nextValues,
-      profiles: []
+      profiles: [preferred]
     });
   } else if (fs.existsSync(stateFilePath)) {
     fs.unlinkSync(stateFilePath);
@@ -235,10 +265,10 @@ function syncPosixEnvironment(nextValues, previousState, options) {
     changed,
     reloadRequired: changed,
     isFirstTime: Object.keys(previousState.values || {}).length === 0 && nextKeys.length > 0,
-    sourceCommand: null,
-    shellConfigPath: null,
-    shellConfigPaths: [],
-    envFilePath: null,
+    sourceCommand: nextKeys.length > 0 ? sourceCommand : null,
+    shellConfigPath: nextKeys.length > 0 ? preferred : null,
+    shellConfigPaths: nextKeys.length > 0 ? [preferred] : [],
+    envFilePath: nextKeys.length > 0 ? envFilePath : null,
     managedKeys: nextKeys
   };
 }
@@ -302,13 +332,32 @@ function runLaunchctlCommand(args, execSync) {
   try {
     execSync('launchctl', args, {
       stdio: ['ignore', 'ignore', 'ignore'],
-      timeout: 3000
+      timeout: 3000,
+      windowsHide: true
     });
   } catch {
     // ignore launchctl failures; shell profile remains the durable source
   }
 }
 
+function broadcastWindowsSettingChange(execSync) {
+  const script = [
+    'Add-Type -Namespace Win32 -Name NativeMethods -MemberDefinition @"',
+    '[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]',
+    'public static extern IntPtr SendMessageTimeout(',
+    '    IntPtr hWnd, uint Msg, UIntPtr wParam, string lParam,',
+    '    uint fuFlags, uint uTimeout, out UIntPtr lpdwResult);',
+    '"@',
+    '$HWND_BROADCAST = [IntPtr]0xffff',
+    '$WM_SETTINGCHANGE = 0x1a',
+    '$SMTO_ABORTIFHUNG = 0x0002',
+    '$result = [UIntPtr]::Zero',
+    '[Win32.NativeMethods]::SendMessageTimeout($HWND_BROADCAST, $WM_SETTINGCHANGE,',
+    '    [UIntPtr]::Zero, "Environment", $SMTO_ABORTIFHUNG, 5000, [ref]$result) | Out-Null'
+  ].join('\n');
+  runWindowsEnvCommand(script, execSync);
+}
+
 function syncWindowsEnvironment(nextValues, previousState, options) {
   const { stateFilePath, execSync } = options;
   const nextKeys = Object.keys(nextValues).sort();
@@ -327,6 +376,15 @@ function syncWindowsEnvironment(nextValues, previousState, options) {
     changed = true;
   }
 
+  // 广播 WM_SETTINGCHANGE，通知已打开的应用（如 VSCode）刷新环境变量
+  if (changed) {
+    try {
+      broadcastWindowsSettingChange(execSync);
+    } catch {
+      // 广播失败不影响主流程，环境变量已写入注册表
+    }
+  }
+
   if (nextKeys.length > 0) {
     writeJsonFile(stateFilePath, {
       version: 1,
@@ -356,7 +414,8 @@ function runWindowsEnvCommand(script, execSync) {
     try {
       execSync(command, ['-NoProfile', '-NonInteractive', '-Command', script], {
         stdio: ['ignore', 'ignore', 'ignore'],
-        timeout: 5000
+        timeout: 5000,
+        windowsHide: true
       });
       return;
     } catch (error) {
@@ -413,6 +472,7 @@ function syncCodexUserEnvironment(envMap = {}, options = {}) {
 module.exports = {
   syncCodexUserEnvironment,
   _test: {
+    broadcastWindowsSettingChange,
     buildHomeRelativeShellPath,
     buildNextEnvValues,
     buildSourceSnippet,

package/src/server/services/codex-settings-manager.js

@@ -196,6 +196,9 @@ function restoreSettings() {
       removeKeys: ['CC_PROXY_KEY']
     });
 
+    // 清理 process.env 中的代理 key（与 setProxyConfig 中的设置对应）
+    delete process.env.CC_PROXY_KEY;
+
     console.log('Codex settings restored from backup');
     return { success: true };
   } catch (err) {
@@ -206,11 +209,18 @@ function restoreSettings() {
 // 设置代理配置
 function setProxyConfig(proxyPort) {
   try {
-    // 先备份
-    backupSettings();
+    // 先备份（config.toml 不存在时跳过备份）
+    if (configExists()) {
+      backupSettings();
+    }
 
-    // 读取当前配置
-    const config = readConfig();
+    // 读取当前配置（不存在时使用空配置）
+    let config;
+    try {
+      config = readConfig();
+    } catch (err) {
+      config = {};
+    }
 
     // 设置 model_provider 为 proxy
     config.model_provider = 'cc-proxy';
@@ -225,12 +235,17 @@ function setProxyConfig(proxyPort) {
       name: 'cc-proxy',
       base_url: `http://127.0.0.1:${proxyPort}/v1`,
       wire_api: 'responses',
-      env_key: 'CC_PROXY_KEY'
+      env_key: 'CC_PROXY_KEY',
+      requires_openai_auth: false
     };
 
     // 写入配置
     writeConfig(config);
 
+    // Windows: 注册表写入后当前进程和已打开的终端不会自动刷新环境变量
+    // 直接设置 process.env 确保从本进程派生的 Codex CLI 能读到 CC_PROXY_KEY
+    process.env.CC_PROXY_KEY = 'PROXY_KEY';
+
     const envResult = syncCodexUserEnvironment({
       CC_PROXY_KEY: 'PROXY_KEY'
     }, {

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

@@ -3,6 +3,7 @@ const path = require('path');
 const crypto = require('crypto');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
+const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 /**
  * Gemini 渠道管理服务（多渠道架构）
@@ -17,13 +18,7 @@ const { clearNativeOAuth } = require('./native-oauth-adapters');
  * - 使用 weight 和 maxConcurrency 控制负载均衡
  */
 
-function normalizeGatewaySourceType(value, fallback = 'gemini') {
-  const normalized = String(value || '').trim().toLowerCase();
-  if (normalized === 'claude') return 'claude';
-  if (normalized === 'codex') return 'codex';
-  if (normalized === 'gemini') return 'gemini';
-  return fallback;
-}
+// normalizeGatewaySourceType imported from base/proxy-utils
 
 // 获取 Gemini 配置目录
 function getGeminiDir() {

package/src/server/services/mcp-client.js

@@ -389,7 +389,8 @@ class McpClient extends EventEmitter {
         this._child = spawn(resolvedCommand, args, {
           env: mergedEnv,
           stdio: ['pipe', 'pipe', 'pipe'],
-          cwd: finalCwd
+          cwd: finalCwd,
+          windowsHide: true
         });
       } catch (err) {
         clearTimeout(timer);

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

@@ -200,7 +200,8 @@ function fire(eventType) {
       \`--event-type=\${eventType}\`
     ], {
       detached: true,
-      stdio: 'ignore'
+      stdio: 'ignore',
+      windowsHide: true
     })
     child.unref()
   } catch (error) {
@@ -320,7 +321,7 @@ function notify(mode, message) {
         const appleScript = 'display dialog "' + escapeForAppleScript(message) +
           '" with title "' + escapeForAppleScript(title) +
           '" buttons {"好的"} default button 1 with icon note'
-        execSync('osascript -e ' + JSON.stringify(appleScript), { stdio: 'ignore' })
+        execSync('osascript -e ' + JSON.stringify(appleScript), { stdio: 'ignore', windowsHide: true })
       } else {
         const fallbackScript = 'display notification "' + escapeForAppleScript(message) +
           '" with title "' + escapeForAppleScript(title) + '" sound name "Glass"'
@@ -329,7 +330,7 @@ function notify(mode, message) {
           ' -message ' + JSON.stringify(message) +
           ' -sound Glass -activate com.apple.Terminal; ' +
           'else osascript -e ' + JSON.stringify(fallbackScript) + '; fi'
-        execSync(command, { stdio: 'ignore' })
+        execSync(command, { stdio: 'ignore', windowsHide: true })
       }
       return
     }
@@ -339,7 +340,7 @@ function notify(mode, message) {
         const ps = "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('" +
           escapeForPowerShellSingleQuote(message) + "', '" +
           escapeForPowerShellSingleQuote(title) + "', 'OK', 'Information')"
-        execSync('powershell -NoProfile -Command ' + JSON.stringify(ps), { stdio: 'ignore' })
+        execSync('powershell -NoProfile -Command ' + JSON.stringify(ps), { stdio: 'ignore', windowsHide: true })
       } else {
         const toastXml = '<toast><visual><binding template="ToastGeneric"><text>' +
           escapeForXml(title) + '</text><text>' + escapeForXml(message) +
@@ -353,7 +354,7 @@ function notify(mode, message) {
           "[Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) " +
           "} catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('" +
           escapeForPowerShellSingleQuote(message) + "', 5, '" + escapeForPowerShellSingleQuote(title) + "', 0x40) }"
-        execSync('powershell -NoProfile -Command ' + JSON.stringify(ps), { stdio: 'ignore' })
+        execSync('powershell -NoProfile -Command ' + JSON.stringify(ps), { stdio: 'ignore', windowsHide: true })
       }
       return
     }
@@ -364,10 +365,10 @@ function notify(mode, message) {
       execSync(
         'zenity --info --title="' + escapedTitle + '" --text="' + escapedMessage +
         '" 2>/dev/null || notify-send "' + escapedTitle + '" "' + escapedMessage + '"',
-        { stdio: 'ignore' }
+        { stdio: 'ignore', windowsHide: true }
       )
     } else {
-      execSync('notify-send "' + escapedTitle + '" "' + escapedMessage + '"', { stdio: 'ignore' })
+      execSync('notify-send "' + escapedTitle + '" "' + escapedMessage + '"', { stdio: 'ignore', windowsHide: true })
     }
   } catch (error) {
     // ignore system notification failures
@@ -916,7 +917,7 @@ function testNotification({ type, testFeishu, webhookUrl } = {}) {
     return sendFeishuTest(webhookUrl);
   }
 
-  execSync(generateSystemNotificationCommand(type || 'notification', '这是一条测试通知'), { stdio: 'ignore' });
+  execSync(generateSystemNotificationCommand(type || 'notification', '这是一条测试通知'), { stdio: 'ignore', windowsHide: true });
 }
 
 module.exports = {

package/src/server/services/oauth-credentials-service.js

@@ -380,12 +380,21 @@ function stableFingerprintValue(tool, metadata) {
   return stableId;
 }
 
+function resolveFingerprintValue(tool, metadata, options = {}) {
+  if (options.fingerprintMode === 'primary-token') {
+    return metadata.primaryToken
+      || metadata.accessToken
+      || stableFingerprintValue(tool, metadata);
+  }
+  return stableFingerprintValue(tool, metadata);
+}
+
 function upsertCredential(tool, metadata, options = {}) {
   const store = readStore();
   const toolStore = getToolStore(store, tool);
   const now = Date.now();
   const primaryToken = metadata.primaryToken || metadata.accessToken || '';
-  const fingerprint = fingerprintFor(tool, stableFingerprintValue(tool, metadata));
+  const fingerprint = fingerprintFor(tool, resolveFingerprintValue(tool, metadata, options));
   const existingIndex = toolStore.credentials.findIndex((item) => item.fingerprint === fingerprint);
   const existing = existingIndex >= 0 ? toolStore.credentials[existingIndex] : null;
 
@@ -456,7 +465,8 @@ function syncLocalCredential(tool) {
   }
 
   const credentials = nativeCredentials.map((metadata) => upsertCredential(tool, metadata, {
-    source: 'synced-local'
+    source: 'synced-local',
+    fingerprintMode: 'primary-token'
   }));
 
   return {

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

@@ -4,18 +4,15 @@ const crypto = require('crypto');
 const { PATHS } = require('../../config/paths');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
 const { setChannelConfig } = require('./opencode-settings-manager');
+const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 /**
  * OpenCode 渠道管理服务
  * 存储位置: ~/.cc-tool/opencode-channels.json
  */
 
-function normalizeGatewaySourceType(value) {
-  const normalized = String(value || '').trim().toLowerCase();
-  if (normalized === 'claude') return 'claude';
-  if (normalized === 'gemini') return 'gemini';
-  return 'codex';
-}
+// normalizeGatewaySourceType imported from base/proxy-utils
+// OpenCode default fallback is 'codex'
 
 function normalizeApiKey(value) {
   if (typeof value !== 'string') return '';
@@ -80,7 +77,7 @@ function loadChannels() {
           modelRedirects: ch.modelRedirects || [],
           speedTestModel: ch.speedTestModel || null,
           wireApi: ch.wireApi || 'openai',  // OpenCode 默认使用 OpenAI 兼容格式
-          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType),
+          gatewaySourceType: normalizeGatewaySourceType(ch.gatewaySourceType, 'codex'),
           allowedModels: ch.allowedModels || []
         };
         normalized.providerKey = deriveProviderKey(normalized);
@@ -132,7 +129,7 @@ function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
     modelRedirects: extraConfig.modelRedirects || [],
     speedTestModel: extraConfig.speedTestModel || null,
     model: extraConfig.model || null,
-    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType),
+    gatewaySourceType: normalizeGatewaySourceType(extraConfig.gatewaySourceType, 'codex'),
     providerKey: extraConfig.providerKey || null,
     presetId: extraConfig.presetId || null,
     websiteUrl: extraConfig.websiteUrl || '',
@@ -169,7 +166,8 @@ function updateChannel(channelId, updates) {
     gatewaySourceType: normalizeGatewaySourceType(
       updates.gatewaySourceType !== undefined
         ? updates.gatewaySourceType
-        : oldChannel.gatewaySourceType
+        : oldChannel.gatewaySourceType,
+      'codex'
     ),
     updatedAt: Date.now()
   };

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

@@ -168,7 +168,8 @@ function runSqliteQuery(sql) {
     const output = execFileSync('sqlite3', ['-json', OPENCODE_DB_PATH, sql], {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
-      maxBuffer: 10 * 1024 * 1024
+      maxBuffer: 10 * 1024 * 1024,
+      windowsHide: true
     }).trim();
 
     if (!output) {
@@ -191,7 +192,8 @@ function runSqliteExec(sql) {
   execFileSync('sqlite3', [OPENCODE_DB_PATH, sql], {
     encoding: 'utf8',
     stdio: ['ignore', 'pipe', 'pipe'],
-    maxBuffer: 10 * 1024 * 1024
+    maxBuffer: 10 * 1024 * 1024,
+    windowsHide: true
   });
 }
 

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

@@ -1055,7 +1055,8 @@ class PluginsService {
         execSync(`claude plugin marketplace add ${repo.url}`, {
           encoding: 'utf8',
           timeout: 30000,
-          stdio: 'pipe'
+          stdio: 'pipe',
+          windowsHide: true
         });
         results.push({ repo: repo.url, success: true });
       } catch (err) {

package/src/server/services/repo-scanner-base.js

@@ -7,6 +7,7 @@
 
 const fs = require('fs');
 const path = require('path');
+const os = require('os');
 const https = require('https');
 const http = require('http');
 const { createWriteStream } = require('fs');

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

@@ -849,7 +849,8 @@ class SkillService {
       const output = execFileSync(command, args, {
         encoding: 'utf-8',
         timeout: 3000,
-        stdio: ['ignore', 'pipe', 'ignore']
+        stdio: ['ignore', 'pipe', 'ignore'],
+        windowsHide: true
       }).trim();
       return output || null;
     } catch {
@@ -866,7 +867,8 @@ class SkillService {
         input: `protocol=https\nhost=${hostname}\n\n`,
         encoding: 'utf-8',
         timeout: 3000,
-        stdio: ['pipe', 'pipe', 'ignore']
+        stdio: ['pipe', 'pipe', 'ignore'],
+        windowsHide: true
       });
       const passwordLine = output
         .split(/\r?\n/)

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

@@ -30,6 +30,7 @@ function runGitCommand(args, options = {}) {
   const execOptions = {
     encoding: 'utf8',
     stdio: ['ignore', 'pipe', 'pipe'],
+    windowsHide: true,
     ...options
   };
   return execFileSync('git', args, execOptions);

package/src/utils/port-helper.js

@@ -138,7 +138,7 @@ function findProcessByPort(port) {
   if (isWindows) {
     try {
       // Windows: 直接解析 netstat 输出，避免依赖 findstr/lsof
-      const result = execSync('netstat -ano', { encoding: 'utf-8' });
+      const result = execSync('netstat -ano', { encoding: 'utf-8', windowsHide: true });
       return parsePidsFromNetstatOutput(result, port);
     } catch (e) {
       if (isMissingCommandError(e)) {
@@ -151,13 +151,13 @@ function findProcessByPort(port) {
   let lsofMissing = false;
   try {
     // macOS/Linux 使用 lsof
-    const result = execSync(`lsof -ti :${port}`, { encoding: 'utf-8' }).trim();
+    const result = execSync(`lsof -ti :${port}`, { encoding: 'utf-8', windowsHide: true }).trim();
     return result.split('\n').filter(pid => pid);
   } catch (err) {
     lsofMissing = isMissingCommandError(err);
     // 如果 lsof 失败，尝试使用 fuser（某些 Linux 系统）
     try {
-      const result = execSync(`fuser ${port}/tcp 2>/dev/null`, { encoding: 'utf-8' }).trim();
+      const result = execSync(`fuser ${port}/tcp 2>/dev/null`, { encoding: 'utf-8', windowsHide: true }).trim();
       return result.split(/\s+/).filter(pid => pid);
     } catch (e) {
       if (lsofMissing && isMissingCommandError(e)) {
@@ -183,9 +183,9 @@ function killProcessByPort(port) {
     pids.forEach(pid => {
       try {
         if (isWindows) {
-          execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' });
+          execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore', windowsHide: true });
         } else {
-          execSync(`kill -9 ${pid}`, { stdio: 'ignore' });
+          execSync(`kill -9 ${pid}`, { stdio: 'ignore', windowsHide: true });
         }
         killedAny = true;
       } catch (err) {