coding-tool-x 3.4.6 → 3.4.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "coding-tool-x",
-  "version": "3.4.6",
+  "version": "3.4.7",
   "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/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 原生设置写入 ──
@@ -105,6 +109,10 @@ 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');
 }
@@ -133,6 +141,10 @@ 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');
 }

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);