coding-tool-x 3.4.9 → 3.4.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.4.9",
+  "version": "3.4.10",
   "description": "Vibe Coding 增强工作助手 - 智能会话管理、动态渠道切换、全局搜索、实时监控",
   "main": "src/index.js",
   "bin": {

package/src/server/api/claude-hooks.js

@@ -101,7 +101,7 @@ function generateSystemNotificationCommand(type, platformOverride = platform) {
   } else if (platformOverride === 'win32') {
     // Windows
     if (type === 'dialog') {
-      return `powershell -NoProfile -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('Claude Code 任务已完成 | 等待交互', 'Coding Tool', 'OK', 'Information')" || ${buildWindowsPopupCommand()}`;
+      return `powershell -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('Claude Code 任务已完成 | 等待交互', 'Coding Tool', 'OK', 'Information')" || ${buildWindowsPopupCommand()}`;
     } else {
       return buildWindowsPopupCommand();
     }

package/src/server/api/proxy.js

@@ -11,7 +11,7 @@ const {
   hasBackup,
   readSettings
 } = require('../services/settings-manager');
-const { getAllChannels } = require('../services/channels');
+const { getAllChannels, extractApiKeyFromHelper } = require('../services/channels');
 const { clearNativeOAuth } = require('../services/native-oauth-adapters');
 const { clearAllLogs } = require('../websocket-server');
 const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('../../config/paths');
@@ -101,10 +101,7 @@ function findActiveChannelFromSettings() {
 
     // 如果 apiKey 仍为空，尝试从 apiKeyHelper 提取
     if (!apiKey && settings?.apiKeyHelper) {
-      const match = settings.apiKeyHelper.match(/['\"]([^'\"]+)['\"]/)
-      if (match && match[1]) {
-        apiKey = match[1];
-      }
+      apiKey = extractApiKeyFromHelper(settings.apiKeyHelper);
     }
 
     const channels = getAllChannels();

package/src/server/services/channels.js

@@ -44,18 +44,22 @@ function extractApiKeyFromHelper(apiKeyHelper) {
     return '';
   }
   const helper = apiKeyHelper.trim();
-  let match = helper.match(/^echo\s+["']([^"']+)["']$/);
+  let match = helper.match(/^echo\s+["']([^"']+)["']$/i);
   if (match && match[1]) return match[1];
-  match = helper.match(/^printf\s+["'][^"']*["']\s+["']([^"']+)["']$/);
+  match = helper.match(/^echo\s+([^\s].*)$/i);
+  if (match && match[1]) return match[1].trim();
+  match = helper.match(/^cmd(?:\.exe)?\s*\/c\s+echo\s+([^\s].*)$/i);
+  if (match && match[1]) return match[1].trim();
+  match = helper.match(/^printf\s+["'][^"']*["']\s+["']([^"']+)["']$/i);
   if (match && match[1]) return match[1];
   return '';
 }
 
-function buildApiKeyHelperCommand() {
+function buildApiKeyHelperCommand(value) {
   if (isWindowsLikePlatform(process.platform, process.env)) {
-    return 'cmd /c echo ctx-managed';
+    return `cmd /c echo ${value}`;
   }
-  return "echo 'ctx-managed'";
+  return `echo '${value}'`;
 }
 
 // ── Claude 原生设置写入 ──
@@ -114,7 +118,7 @@ function updateClaudeSettingsWithModelConfig(channel) {
     delete settings.env;
   }
 
-  settings.apiKeyHelper = buildApiKeyHelperCommand();
+  settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
@@ -147,7 +151,7 @@ function updateClaudeSettings(baseUrl, apiKey) {
     delete settings.env;
   }
 
-  settings.apiKeyHelper = buildApiKeyHelperCommand();
+  settings.apiKeyHelper = buildApiKeyHelperCommand(apiKey);
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
@@ -326,4 +330,5 @@ module.exports = {
   updateClaudeSettingsWithModelConfig,
   getEffectiveApiKey,
   disableAllChannels,
+  extractApiKeyFromHelper,
 };

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

@@ -5,6 +5,9 @@ const { PATHS, HOME_DIR } = require('../../config/paths');
 
 const PROFILE_MARKER_START = '# >>> coding-tool codex env >>>';
 const PROFILE_MARKER_END = '# <<< coding-tool codex env <<<';
+const WINDOWS_ENV_COMMAND_TIMEOUT_MS = 15000;
+const WINDOWS_SETTING_CHANGE_TIMEOUT_MS = 1000;
+const WINDOWS_SETTING_CHANGE_COMMAND_TIMEOUT_MS = 7000;
 
 function defaultEnvFilePath(configDir) {
   return path.join(configDir, 'codex-env.sh');
@@ -32,7 +35,7 @@ function powershellQuote(value) {
   return `'${String(value).replace(/'/g, "''")}'`;
 }
 
-function buildWindowsSettingChangeScript() {
+function buildWindowsSettingChangeScript(timeoutMs = WINDOWS_SETTING_CHANGE_TIMEOUT_MS) {
   return [
     'Add-Type -Namespace Win32 -Name NativeMethods -MemberDefinition @"',
     '[DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Auto)]',
@@ -45,11 +48,11 @@ function buildWindowsSettingChangeScript() {
     '$SMTO_ABORTIFHUNG = 0x0002',
     '$result = [UIntPtr]::Zero',
     '[Win32.NativeMethods]::SendMessageTimeout($HWND_BROADCAST, $WM_SETTINGCHANGE,',
-    '    [UIntPtr]::Zero, "Environment", $SMTO_ABORTIFHUNG, 5000, [ref]$result) | Out-Null'
+    `    [UIntPtr]::Zero, "Environment", $SMTO_ABORTIFHUNG, ${timeoutMs}, [ref]$result) | Out-Null`
   ].join('\n');
 }
 
-function buildWindowsEnvBatchScript(operations = [], { includeSettingChangeBroadcast = false } = {}) {
+function buildWindowsEnvBatchScript(operations = [], { includeSettingChangeBroadcast = true } = {}) {
   const normalizedOperations = Array.isArray(operations) ? operations.filter(Boolean) : [];
   const lines = normalizedOperations.map((operation) => {
     const key = powershellQuote(operation.key || '');
@@ -375,7 +378,12 @@ function runLaunchctlCommand(args, execSync) {
 }
 
 function broadcastWindowsSettingChange(execSync) {
-  runWindowsEnvCommand(buildWindowsSettingChangeScript(), execSync);
+  // WM_SETTINGCHANGE 只是帮助已运行的 GUI/终端尽快感知环境变化。
+  // 用户级环境变量已经写入注册表，即使这里超时，新开进程仍然能读到。
+  runWindowsEnvCommand(buildWindowsSettingChangeScript(), execSync, {
+    timeout: WINDOWS_SETTING_CHANGE_COMMAND_TIMEOUT_MS,
+    ignoreErrors: true
+  });
 }
 
 function syncWindowsEnvironment(nextValues, previousState, options) {
@@ -398,14 +406,10 @@ function syncWindowsEnvironment(nextValues, previousState, options) {
   if (changed) {
     runWindowsEnvCommand(
       buildWindowsEnvBatchScript(operations, { includeSettingChangeBroadcast: false }),
-      execSync
+      execSync,
+      { timeout: WINDOWS_ENV_COMMAND_TIMEOUT_MS }
     );
-    try {
-      // WM_SETTINGCHANGE 只是帮助已打开的应用刷新环境变量，失败不应让主流程报错。
-      broadcastWindowsSettingChange(execSync);
-    } catch {
-      // ignore broadcast failures; registry writes are already durable
-    }
+    broadcastWindowsSettingChange(execSync);
   }
 
   if (nextKeys.length > 0) {
@@ -430,21 +434,28 @@ function syncWindowsEnvironment(nextValues, previousState, options) {
   };
 }
 
-function runWindowsEnvCommand(script, execSync) {
+function runWindowsEnvCommand(script, execSync, options = {}) {
+  const timeout = Number(options.timeout) > 0
+    ? Number(options.timeout)
+    : WINDOWS_ENV_COMMAND_TIMEOUT_MS;
+  const ignoreErrors = options.ignoreErrors === true;
   const candidates = ['powershell', 'pwsh'];
   let lastError = null;
   for (const command of candidates) {
     try {
       execSync(command, ['-NoProfile', '-NonInteractive', '-Command', script], {
         stdio: ['ignore', 'ignore', 'ignore'],
-        timeout: 5000,
+        timeout,
         windowsHide: true
       });
-      return;
+      return true;
     } catch (error) {
       lastError = error;
     }
   }
+  if (ignoreErrors) {
+    return false;
+  }
   throw lastError || new Error('No PowerShell executable available');
 }