coding-tool-x 3.4.6 → 3.4.8

package/package.json

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

package/src/reset-config.js

@@ -1,5 +1,13 @@
 const fs = require('fs');
 const { PATHS, NATIVE_PATHS, ensureStorageDirMigrated } = require('./config/paths');
+const { isWindowsLikePlatform } = require('./utils/home-dir');
+
+function buildEchoCommand(value) {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    return `cmd /c echo ${value}`;
+  }
+  return `echo '${value}'`;
+}
 
 // 恢复配置到默认状态
 async function resetConfig() {
@@ -56,7 +64,7 @@ async function resetConfig() {
               if (!settings.env) settings.env = {};
               settings.env.ANTHROPIC_BASE_URL = activeChannel.baseUrl;
               settings.env.ANTHROPIC_API_KEY = activeChannel.apiKey;
-              settings.apiKeyHelper = `echo '${activeChannel.apiKey}'`;
+              settings.apiKeyHelper = buildEchoCommand(activeChannel.apiKey);
 
               fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
               console.log(`[OK] 已恢复到渠道: ${activeChannel.name}`);

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

@@ -26,6 +26,10 @@ const UI_CONFIG_PATH = PATHS.uiConfig;
 // 通知脚本路径（用于飞书通知）
 const NOTIFY_SCRIPT_PATH = PATHS.notifyHook;
 
+function buildWindowsPopupCommand() {
+  return `powershell -NoProfile -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('任务已完成 | 等待交互', 5, 'Coding Tool', 0x40)"`;
+}
+
 // 读取 Claude settings.json
 function readClaudeSettings() {
   try {
@@ -84,8 +88,8 @@ function writeUIConfig(config) {
 }
 
 // 生成系统通知命令（跨平台）
-function generateSystemNotificationCommand(type) {
-  if (platform === 'darwin') {
+function generateSystemNotificationCommand(type, platformOverride = platform) {
+  if (platformOverride === 'darwin') {
     // macOS
     if (type === 'dialog') {
       return `osascript -e 'display dialog "Claude Code 任务已完成 | 等待交互" with title "Coding Tool" buttons {"好的"} default button 1 with icon note'`;
@@ -94,12 +98,12 @@ function generateSystemNotificationCommand(type) {
       // terminal-notifier 需要 brew install terminal-notifier
       return `if command -v terminal-notifier &>/dev/null; then terminal-notifier -title "Coding Tool" -message "任务已完成 | 等待交互" -sound Glass -activate com.apple.Terminal; else osascript -e 'display notification "任务已完成 | 等待交互" with title "Coding Tool" sound name "Glass"'; fi`;
     }
-  } else if (platform === 'win32') {
+  } else if (platformOverride === 'win32') {
     // Windows
     if (type === 'dialog') {
-      return `powershell -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('Claude Code 任务已完成 | 等待交互', 'Coding Tool', 'OK', 'Information')"`;
+      return `powershell -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('Claude Code 任务已完成 | 等待交互', 'Coding Tool', 'OK', 'Information')" || ${buildWindowsPopupCommand()}`;
     } else {
-      return `powershell -NoProfile -Command "try { [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null; [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null; $xml = New-Object Windows.Data.Xml.Dom.XmlDocument; $xml.LoadXml('<toast><visual><binding template=\\"ToastGeneric\\"><text>Coding Tool</text><text>任务已完成 | 等待交互</text></binding></visual><audio src=\\"ms-winsoundevent:Notification.Default\\"/></toast>'); $toast = [Windows.UI.Notifications.ToastNotification]::new($xml); [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) } catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('任务已完成 | 等待交互', 5, 'Coding Tool', 0x40) }"`;
+      return `powershell -NoProfile -Command "try { [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null; [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null; $xml = New-Object Windows.Data.Xml.Dom.XmlDocument; $xml.LoadXml('<toast><visual><binding template=\\"ToastGeneric\\"><text>Coding Tool</text><text>任务已完成 | 等待交互</text></binding></visual><audio src=\\"ms-winsoundevent:Notification.Default\\"/></toast>'); $toast = [Windows.UI.Notifications.ToastNotification]::new($xml); [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) } catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('任务已完成 | 等待交互', 5, 'Coding Tool', 0x40) }" || ${buildWindowsPopupCommand()}`;
     }
   } else {
     // Linux

package/src/server/api/proxy.js

@@ -107,34 +107,32 @@ function findActiveChannelFromSettings() {
       }
     }
 
-    if (!baseUrl || !apiKey || baseUrl.includes('127.0.0.1')) {
-      console.log('[Proxy] Invalid settings: empty baseUrl/apiKey or localhost detected');
-      return null;
-    }
-
     const channels = getAllChannels();
 
     // Level 1: Exact match (baseUrl + apiKey)
-    let matchingChannel = channels.find(ch =>
-      ch.baseUrl === baseUrl && ch.apiKey === apiKey
-    );
-
-    if (matchingChannel) {
-      console.log(`[Proxy] Level 1 - Exact match: ${matchingChannel.name}`);
-      return matchingChannel;
-    }
+    if (baseUrl && apiKey && !baseUrl.includes('127.0.0.1')) {
+      let matchingChannel = channels.find(ch =>
+        ch.baseUrl === baseUrl && ch.apiKey === apiKey
+      );
+      if (matchingChannel) {
+        console.log(`[Proxy] Level 1 - Exact match: ${matchingChannel.name}`);
+        return matchingChannel;
+      }
 
-    // Level 2: Match by baseUrl only (when apiKey differs)
-    matchingChannel = channels.find(ch => ch.baseUrl === baseUrl);
-    if (matchingChannel) {
-      console.log(`[Proxy] Level 2 - Matched by baseUrl only: ${matchingChannel.name}`);
-      return matchingChannel;
+      // Level 2: Match by baseUrl only (when apiKey differs)
+      matchingChannel = channels.find(ch => ch.baseUrl === baseUrl);
+      if (matchingChannel) {
+        console.log(`[Proxy] Level 2 - Matched by baseUrl only: ${matchingChannel.name}`);
+        return matchingChannel;
+      }
+    } else {
+      console.log('[Proxy] settings.json has no valid baseUrl/apiKey, falling back to channel list');
     }
 
     // Level 3: Use active-channel.json for last known active channel
     const activeChannelId = loadActiveChannelId();
     if (activeChannelId) {
-      matchingChannel = channels.find(ch => ch.id === activeChannelId);
+      const matchingChannel = channels.find(ch => ch.id === activeChannelId);
       if (matchingChannel) {
         console.log(`[Proxy] Level 3 - Using last active channel: ${matchingChannel.name}`);
         return matchingChannel;
@@ -142,10 +140,10 @@ function findActiveChannelFromSettings() {
     }
 
     // Level 4: Return first enabled channel as last resort
-    matchingChannel = channels.find(ch => ch.enabled !== false);
-    if (matchingChannel) {
-      console.log(`[Proxy] Level 4 - Using first enabled channel: ${matchingChannel.name}`);
-      return matchingChannel;
+    const fallbackChannel = channels.find(ch => ch.enabled !== false);
+    if (fallbackChannel) {
+      console.log(`[Proxy] Level 4 - Using first enabled channel: ${fallbackChannel.name}`);
+      return fallbackChannel;
     }
 
     console.log('[Proxy] No matching channel found after all fallback levels');

package/src/server/services/channels.js

@@ -4,6 +4,7 @@ const BaseChannelService = require('./base/base-channel-service');
 const { isProxyConfig } = require('./settings-manager');
 const { PATHS, NATIVE_PATHS } = require('../../config/paths');
 const { clearNativeOAuth } = require('./native-oauth-adapters');
+const { isWindowsLikePlatform } = require('../../utils/home-dir');
 
 // ── Claude 特有工具函数 ──
 
@@ -51,7 +52,10 @@ function extractApiKeyFromHelper(apiKeyHelper) {
 }
 
 function buildApiKeyHelperCommand() {
-  return 'echo \'ctx-managed\'';
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    return 'cmd /c echo ctx-managed';
+  }
+  return "echo 'ctx-managed'";
 }
 
 // ── Claude 原生设置写入 ──
@@ -59,6 +63,7 @@ function buildApiKeyHelperCommand() {
 function updateClaudeSettingsWithModelConfig(channel) {
   clearNativeOAuth('claude');
   const settingsPath = getClaudeSettingsPath();
+  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
 
   let settings = {};
   if (fs.existsSync(settingsPath)) {
@@ -105,12 +110,17 @@ function updateClaudeSettingsWithModelConfig(channel) {
     delete settings.env.NO_PROXY;
   }
 
+  if (settings.env && Object.keys(settings.env).length === 0) {
+    delete settings.env;
+  }
+
   settings.apiKeyHelper = buildApiKeyHelperCommand();
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
 function updateClaudeSettings(baseUrl, apiKey) {
   const settingsPath = getClaudeSettingsPath();
+  fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
 
   let settings = {};
   if (fs.existsSync(settingsPath)) {
@@ -133,10 +143,19 @@ function updateClaudeSettings(baseUrl, apiKey) {
     settings.env.ANTHROPIC_API_KEY = apiKey;
   }
 
+  if (settings.env && Object.keys(settings.env).length === 0) {
+    delete settings.env;
+  }
+
   settings.apiKeyHelper = buildApiKeyHelperCommand();
   fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
 }
 
+function resolveCurrentManagedChannel(channels = []) {
+  const allChannels = Array.isArray(channels) ? channels : [];
+  return allChannels.find(ch => ch.enabled !== false) || null;
+}
+
 // ── ClaudeChannelService ──
 
 class ClaudeChannelService extends BaseChannelService {
@@ -185,6 +204,39 @@ class ClaudeChannelService extends BaseChannelService {
     this._cacheInitialized = true;
   }
 
+  _onAfterCreate(channel, _allChannels) {
+    if (!isProxyConfig() && channel.enabled !== false) {
+      this._applyToNativeSettings(channel);
+    }
+  }
+
+  _onAfterUpdate(oldChannel, nextChannel, allChannels) {
+    if (isProxyConfig()) {
+      return;
+    }
+
+    if (oldChannel.enabled === false && nextChannel.enabled !== false) {
+      this._applyToNativeSettings(nextChannel);
+      return;
+    }
+
+    const activeChannel = resolveCurrentManagedChannel(allChannels);
+    if (nextChannel.enabled !== false && activeChannel?.id === nextChannel.id) {
+      this._applyToNativeSettings(nextChannel);
+    }
+  }
+
+  _onAfterDelete(_channel, allChannels) {
+    if (isProxyConfig()) {
+      return;
+    }
+
+    const activeChannel = resolveCurrentManagedChannel(allChannels);
+    if (activeChannel) {
+      this._applyToNativeSettings(activeChannel);
+    }
+  }
+
   _applyToNativeSettings(channel) {
     updateClaudeSettingsWithModelConfig(channel);
   }

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

@@ -237,6 +237,10 @@ function escapeForXml(value) {
     .replace(/'/g, ''');
 }
 
+function buildWindowsPopupCommand(title, message) {
+  return `powershell -NoProfile -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('${escapeForPowerShellSingleQuote(message)}', 5, '${escapeForPowerShellSingleQuote(title)}', 0x40)"`;
+}
+
 function generateNotifyScript(feishu = {}) {
   const feishuEnabled = feishu.enabled === true && !!feishu.webhookUrl;
 
@@ -336,11 +340,13 @@ function notify(mode, message) {
     }
 
     if (platform === 'win32') {
+      const popupCommand = buildWindowsPopupCommand(title, message)
       if (mode === 'dialog') {
         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', windowsHide: true })
+        const command = 'powershell -NoProfile -Command ' + JSON.stringify(ps) + ' || ' + popupCommand
+        execSync(command, { stdio: 'ignore', windowsHide: true })
       } else {
         const toastXml = '<toast><visual><binding template="ToastGeneric"><text>' +
           escapeForXml(title) + '</text><text>' + escapeForXml(message) +
@@ -354,7 +360,8 @@ 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', windowsHide: true })
+        const command = 'powershell -NoProfile -Command ' + JSON.stringify(ps) + ' || ' + popupCommand
+        execSync(command, { stdio: 'ignore', windowsHide: true })
       }
       return
     }
@@ -468,6 +475,10 @@ function escapeForXml(value) {
     .replace(/"/g, '&quot;')
     .replace(/'/g, '&apos;')
 }
+
+function buildWindowsPopupCommand(title, message) {
+  return \`powershell -NoProfile -Command "$wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('\${escapeForPowerShellSingleQuote(message)}', 5, '\${escapeForPowerShellSingleQuote(title)}', 0x40)"\`
+}
 `;
 }
 
@@ -884,10 +895,10 @@ function sendFeishuTest(webhookUrl) {
   });
 }
 
-function generateSystemNotificationCommand(type, message) {
+function generateSystemNotificationCommand(type, message, platformOverride = os.platform()) {
   const normalizedType = normalizeType(type);
   const title = 'Coding Tool';
-  const platform = os.platform();
+  const platform = platformOverride;
 
   if (platform === 'darwin') {
     if (normalizedType === 'dialog') {
@@ -897,12 +908,13 @@ function generateSystemNotificationCommand(type, message) {
   }
 
   if (platform === 'win32') {
+    const popupCommand = buildWindowsPopupCommand(title, message);
     if (normalizedType === 'dialog') {
-      return `powershell -NoProfile -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('${escapeForPowerShellSingleQuote(message)}', '${escapeForPowerShellSingleQuote(title)}', 'OK', 'Information')"`;
+      return `powershell -NoProfile -Command "Add-Type -AssemblyName PresentationFramework; [System.Windows.MessageBox]::Show('${escapeForPowerShellSingleQuote(message)}', '${escapeForPowerShellSingleQuote(title)}', 'OK', 'Information')" || ${popupCommand}`;
     }
 
     const toastXml = `<toast><visual><binding template="ToastGeneric"><text>${escapeForXml(title)}</text><text>${escapeForXml(message)}</text></binding></visual><audio src="ms-winsoundevent:Notification.Default"/></toast>`;
-    return `powershell -NoProfile -Command "try { [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null; [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null; $xml = New-Object Windows.Data.Xml.Dom.XmlDocument; $xml.LoadXml('${toastXml.replace(/'/g, "''")}'); $toast = [Windows.UI.Notifications.ToastNotification]::new($xml); [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) } catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('${escapeForPowerShellSingleQuote(message)}', 5, '${escapeForPowerShellSingleQuote(title)}', 0x40) }"`;
+    return `powershell -NoProfile -Command "try { [Windows.UI.Notifications.ToastNotificationManager, Windows.UI.Notifications, ContentType = WindowsRuntime] > $null; [Windows.Data.Xml.Dom.XmlDocument, Windows.Data.Xml.Dom.XmlDocument, ContentType = WindowsRuntime] > $null; $xml = New-Object Windows.Data.Xml.Dom.XmlDocument; $xml.LoadXml('${toastXml.replace(/'/g, "''")}'); $toast = [Windows.UI.Notifications.ToastNotification]::new($xml); [Windows.UI.Notifications.ToastNotificationManager]::CreateToastNotifier('Coding Tool').Show($toast) } catch { $wshell = New-Object -ComObject Wscript.Shell; $wshell.Popup('${escapeForPowerShellSingleQuote(message)}', 5, '${escapeForPowerShellSingleQuote(title)}', 0x40) }" || ${popupCommand}`;
   }
 
   if (normalizedType === 'dialog') {
@@ -947,6 +959,7 @@ module.exports = {
     buildClaudeCommand,
     buildOpenCodePluginContent,
     getOpenCodeManagedPluginPath,
-    generateNotifyScript
+    generateNotifyScript,
+    generateSystemNotificationCommand
   }
 };

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

@@ -2,7 +2,10 @@ const fs = require('fs');
 const path = require('path');
 const crypto = require('crypto');
 const { PATHS } = require('../../config/paths');
-const { setChannelConfig } = require('./opencode-settings-manager');
+const {
+  setChannelConfig,
+  clearManagedChannelConfig
+} = require('./opencode-settings-manager');
 const { normalizeGatewaySourceType } = require('./base/proxy-utils');
 
 /**
@@ -98,6 +101,30 @@ function deriveProviderKey(channel) {
   return `opencode_${base}`;
 }
 
+function getOpenCodeProxyRunning() {
+  const { getOpenCodeProxyStatus } = require('../opencode-proxy-server');
+  return Boolean(getOpenCodeProxyStatus()?.running);
+}
+
+function resolveCurrentManagedChannel(channels = []) {
+  const allChannels = Array.isArray(channels) ? channels : [];
+  return allChannels.find(channel => channel.enabled !== false) || null;
+}
+
+function syncManagedChannelConfig(channels = [], preferredChannel = null) {
+  const targetChannel = preferredChannel && preferredChannel.enabled !== false
+    ? preferredChannel
+    : resolveCurrentManagedChannel(channels);
+
+  if (targetChannel) {
+    setChannelConfig(targetChannel);
+    return targetChannel;
+  }
+
+  clearManagedChannelConfig();
+  return null;
+}
+
 // 保存渠道数据
 function saveChannels(data) {
   const filePath = getChannelsFilePath();
@@ -115,6 +142,7 @@ function getChannels() {
 // 添加渠道
 function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
   const data = loadChannels();
+  const isProxyRunning = getOpenCodeProxyRunning();
 
   const newChannel = {
     id: crypto.randomUUID(),
@@ -139,8 +167,22 @@ function createChannel(name, baseUrl, apiKey, extraConfig = {}) {
   newChannel.providerKey = extraConfig.providerKey || deriveProviderKey(newChannel);
 
   data.channels.push(newChannel);
+
+  if (!isProxyRunning && newChannel.enabled !== false) {
+    data.channels.forEach((channel, index) => {
+      if (index !== data.channels.length - 1 && channel.enabled) {
+        channel.enabled = false;
+      }
+    });
+    console.log(`[OpenCode Single-channel mode] Enabled "${newChannel.name}", disabled all others`);
+  }
+
   saveChannels(data);
 
+  if (!isProxyRunning && newChannel.enabled !== false) {
+    syncManagedChannelConfig(data.channels, newChannel);
+  }
+
   return newChannel;
 }
 
@@ -173,10 +215,7 @@ function updateChannel(channelId, updates) {
   merged.providerKey = updates.providerKey || deriveProviderKey(merged);
   data.channels[index] = merged;
 
-  // Get proxy status
-  const { getOpenCodeProxyStatus } = require('../opencode-proxy-server');
-  const proxyStatus = getOpenCodeProxyStatus();
-  const isProxyRunning = proxyStatus.running;
+  const isProxyRunning = getOpenCodeProxyRunning();
 
   // Single-channel enforcement when proxy is OFF: enabling a channel disables all others
   if (!isProxyRunning && merged.enabled && !oldChannel.enabled) {
@@ -189,6 +228,18 @@ function updateChannel(channelId, updates) {
   }
 
   saveChannels(data);
+
+  if (!isProxyRunning) {
+    if (oldChannel.enabled === false && merged.enabled !== false) {
+      syncManagedChannelConfig(data.channels, merged);
+    } else {
+      const activeChannel = resolveCurrentManagedChannel(data.channels);
+      if (merged.enabled !== false && activeChannel?.id === merged.id) {
+        syncManagedChannelConfig(data.channels, merged);
+      }
+    }
+  }
+
   return data.channels[index];
 }
 
@@ -204,6 +255,10 @@ async function deleteChannel(channelId) {
   data.channels.splice(index, 1);
   saveChannels(data);
 
+  if (!getOpenCodeProxyRunning()) {
+    syncManagedChannelConfig(data.channels);
+  }
+
   return { success: true };
 }
 

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

@@ -1,5 +1,13 @@
 const fs = require('fs');
 const { NATIVE_PATHS } = require('../../config/paths');
+const { isWindowsLikePlatform } = require('../../utils/home-dir');
+
+function buildEchoCommand(value) {
+  if (isWindowsLikePlatform(process.platform, process.env)) {
+    return `cmd /c echo ${value}`;
+  }
+  return `echo '${value}'`;
+}
 
 // Claude Code 配置文件路径
 function getSettingsPath() {
@@ -113,7 +121,7 @@ function setProxyConfig(proxyPort) {
     // 修改为代理配置（使用 Claude Code 的标准格式）
     settings.env.ANTHROPIC_BASE_URL = `http://127.0.0.1:${proxyPort}`;
     settings.env.ANTHROPIC_API_KEY = 'PROXY_KEY';
-    settings.apiKeyHelper = `echo 'PROXY_KEY'`;
+    settings.apiKeyHelper = buildEchoCommand('PROXY_KEY');
 
     // 写入
     writeSettings(settings);