npm - coding-tool-x - Versions diffs - 3.3.5 → 3.3.6 - Mend

coding-tool-x 3.3.5 → 3.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/dist/web/index.html CHANGED Viewed

@@ -5,14 +5,14 @@
     <link rel="icon" href="/favicon.ico">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>CC-TOOL - ClaudeCode增强工作助手</title>
-    <script type="module" crossorigin src="/assets/index-CSBDZxYn.js"></script>
+    <script type="module" crossorigin src="/assets/index-By3mDEvx.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/markdown-C9MYpaSi.js">
     <link rel="modulepreload" crossorigin href="/assets/vue-vendor-DET08QYg.js">
     <link rel="modulepreload" crossorigin href="/assets/vendors-DMjSfzlv.js">
     <link rel="modulepreload" crossorigin href="/assets/naive-ui-CxpuzdjU.js">
     <link rel="modulepreload" crossorigin href="/assets/icons-B29onFfZ.js">
     <link rel="stylesheet" crossorigin href="/assets/markdown-BfC0goYb.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-DxRneGyu.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-CsWInMQV.css">
   </head>
   <body>
     <div id="app"></div>

package/package.json CHANGED Viewed

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

package/src/commands/update.js CHANGED Viewed

@@ -1,14 +1,22 @@
-const { spawn } = require('child_process');
+const { spawn, execFile } = require('child_process');
 const { promisify } = require('util');
-const { exec } = require('child_process');
 const semver = require('semver');
 const chalk = require('chalk');
 const packageInfo = require('../../package.json');
-const execAsync = promisify(exec);
+const execFileAsync = promisify(execFile);
+function resolveNpmCommand() {
+  return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
 async function getLatestVersion(packageName) {
-  const { stdout } = await execAsync(`npm view ${packageName} version --json`, { timeout: 15000 });
+  const npmCommand = resolveNpmCommand();
+  const { stdout } = await execFileAsync(
+    npmCommand,
+    ['view', packageName, 'version', '--json'],
+    { timeout: 15000 }
+  );
   const parsed = JSON.parse(stdout.trim());
   if (typeof parsed === 'string') return parsed;
   throw new Error('无法解析 npm 返回的版本号');
@@ -16,11 +24,18 @@ async function getLatestVersion(packageName) {
 function runNpmInstall(packageName, version) {
   return new Promise((resolve, reject) => {
-    const child = spawn('npm', ['install', '-g', `${packageName}@${version}`], {
+    const npmCommand = resolveNpmCommand();
+    const child = spawn(npmCommand, ['install', '-g', `${packageName}@${version}`], {
       stdio: 'inherit'
     });
-    child.on('error', reject);
+    child.on('error', (err) => {
+      if (err && err.code === 'ENOENT') {
+        reject(new Error(`命令 "${npmCommand}" 未找到，请确认 Node.js/npm 已安装并在 PATH 中`));
+        return;
+      }
+      reject(err);
+    });
     child.on('exit', (code) => {
       if (code === 0) {
         resolve();

package/src/server/api/config-export.js CHANGED Viewed

@@ -18,13 +18,32 @@ function parseConfigZip(buffer) {
   return JSON.parse(content);
 }
+function resolveChannelsByType(exportData) {
+  const raw = exportData?.data || {};
+  const typed = raw.channelsByType && typeof raw.channelsByType === 'object' ? raw.channelsByType : {};
+  return {
+    claude: Array.isArray(typed.claude) ? typed.claude : (Array.isArray(raw.channels) ? raw.channels : []),
+    codex: Array.isArray(typed.codex) ? typed.codex : [],
+    gemini: Array.isArray(typed.gemini) ? typed.gemini : [],
+    opencode: Array.isArray(typed.opencode) ? typed.opencode : []
+  };
+}
 function buildPreviewSummary(data) {
+  const channelsByType = resolveChannelsByType(data);
+  const allChannels = [
+    ...channelsByType.claude.map(c => ({ ...c, type: c.type || 'claude' })),
+    ...channelsByType.codex.map(c => ({ ...c, type: c.type || 'codex' })),
+    ...channelsByType.gemini.map(c => ({ ...c, type: c.type || 'gemini' })),
+    ...channelsByType.opencode.map(c => ({ ...c, type: c.type || 'opencode' }))
+  ];
   return {
     version: data.version,
     exportedAt: data.exportedAt,
     counts: {
       configTemplates: (data.data.configTemplates || []).length,
-      channels: (data.data.channels || []).length,
+      channels: allChannels.length,
       plugins: (data.data.plugins || []).length
     },
     items: {
@@ -33,7 +52,7 @@ function buildPreviewSummary(data) {
         name: t.name,
         description: t.description
       })),
-      channels: (data.data.channels || []).map(c => ({
+      channels: allChannels.map(c => ({
         id: c.id,
         name: c.name,
         type: c.type

package/src/server/services/config-export-service.js CHANGED Viewed

@@ -8,6 +8,9 @@ const path = require('path');
 const AdmZip = require('adm-zip');
 const configTemplatesService = require('./config-templates-service');
 const channelsService = require('./channels');
+const codexChannelsService = require('./codex-channels');
+const geminiChannelsService = require('./gemini-channels');
+const opencodeChannelsService = require('./opencode-channels');
 const { AgentsService } = require('./agents-service');
 const { CommandsService } = require('./commands-service');
 const { SkillService } = require('./skill-service');
@@ -414,6 +417,14 @@ function writeTextFile(baseDir, relativePath, content, overwrite) {
   return 'success';
 }
+function getAllChannelsByType() {
+  const claude = channelsService.getAllChannels() || [];
+  const codex = codexChannelsService.getChannels()?.channels || [];
+  const gemini = geminiChannelsService.getChannels()?.channels || [];
+  const opencode = opencodeChannelsService.getChannels()?.channels || [];
+  return { claude, codex, gemini, opencode };
+}
 /**
  * 导出所有配置为JSON
  * @returns {Object} 配置导出对象
@@ -424,8 +435,9 @@ function exportAllConfigs() {
     const allConfigTemplates = configTemplatesService.getAllTemplates();
     const customConfigTemplates = allConfigTemplates.filter(t => !t.isBuiltin);
-    // 获取所有频道配置
-    const channels = channelsService.getAllChannels() || [];
+    // 获取所有频道配置（向后兼容：channels 仍保留 Claude 渠道）
+    const channelsByType = getAllChannelsByType();
+    const channels = channelsByType.claude || [];
     // 获取工作区配置
     const workspaceService = require('./workspace-service');
@@ -514,6 +526,7 @@ function exportAllConfigs() {
       data: {
         configTemplates: customConfigTemplates,
         channels: channels || [],
+        channelsByType,
         workspaces: workspaces || { workspaces: [] },
         favorites: favorites || { favorites: [] },
         agents: agents || [],
@@ -602,6 +615,7 @@ async function importConfigs(importData, options = {}) {
     const {
       configTemplates = [],
       channels = [],
+      channelsByType = null,
       workspaces = null,
       favorites = null,
       agents = [],
@@ -616,6 +630,16 @@ async function importConfigs(importData, options = {}) {
       claudeHooks = null
     } = importData.data;
+    const hasTypedChannels = channelsByType && typeof channelsByType === 'object';
+    const importChannelsByType = {
+      claude: hasTypedChannels && Array.isArray(channelsByType.claude)
+        ? channelsByType.claude
+        : (Array.isArray(channels) ? channels : []),
+      codex: hasTypedChannels && Array.isArray(channelsByType.codex) ? channelsByType.codex : [],
+      gemini: hasTypedChannels && Array.isArray(channelsByType.gemini) ? channelsByType.gemini : [],
+      opencode: hasTypedChannels && Array.isArray(channelsByType.opencode) ? channelsByType.opencode : []
+    };
     // 导入配置模板
     for (const template of configTemplates) {
       try {
@@ -643,29 +667,72 @@ async function importConfigs(importData, options = {}) {
       }
     }
-    // 导入频道配置
-    for (const channel of channels) {
-      try {
-        const existingChannels = channelsService.getAllChannels() || [];
-        const existing = existingChannels.find(c => c.id === channel.id);
-        if (existing && !overwrite) {
-          results.channels.skipped++;
-          continue;
-        }
+    // 导入频道配置（兼容旧结构 channels 和新结构 channelsByType）
+    const importTypedChannels = (type, service, createChannel, findExisting = null) => {
+      const sourceChannels = importChannelsByType[type];
+      for (const channel of sourceChannels) {
+        try {
+          const existingChannels = service.getChannels
+            ? (service.getChannels()?.channels || [])
+            : (service.getAllChannels?.() || []);
+          const existing = typeof findExisting === 'function'
+            ? findExisting(existingChannels, channel)
+            : existingChannels.find(c => c.id === channel.id);
+          if (existing && !overwrite) {
+            results.channels.skipped++;
+            continue;
+          }
-        if (existing && overwrite) {
-          channelsService.updateChannel(channel.id, channel);
-        } else {
-          const { name, baseUrl, apiKey, websiteUrl, ...extraConfig } = channel;
-          channelsService.createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig);
+          if (existing && overwrite) {
+            service.updateChannel(existing.id, { ...channel, id: existing.id });
+          } else {
+            createChannel(channel);
+          }
+          results.channels.success++;
+        } catch (err) {
+          console.error(`[ConfigImport] 导入${type}频道失败: ${channel.name}`, err);
+          results.channels.failed++;
         }
-        results.channels.success++;
-      } catch (err) {
-        console.error(`[ConfigImport] 导入频道失败: ${channel.name}`, err);
-        results.channels.failed++;
       }
-    }
+    };
+    importTypedChannels('claude', channelsService, channel => {
+      const { name, baseUrl, apiKey, websiteUrl, ...extraConfig } = channel;
+      channelsService.createChannel(name, baseUrl, apiKey, websiteUrl, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c => c.id === channel.id));
+    importTypedChannels('codex', codexChannelsService, channel => {
+      const {
+        name,
+        providerKey,
+        baseUrl,
+        apiKey,
+        wireApi,
+        ...extraConfig
+      } = channel;
+      codexChannelsService.createChannel(name, providerKey, baseUrl, apiKey, wireApi, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.providerKey && c.providerKey === channel.providerKey)
+    ));
+    importTypedChannels('gemini', geminiChannelsService, channel => {
+      const { name, baseUrl, apiKey, model, ...extraConfig } = channel;
+      geminiChannelsService.createChannel(name, baseUrl, apiKey, model, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.name && c.name === channel.name)
+    ));
+    importTypedChannels('opencode', opencodeChannelsService, channel => {
+      const { name, baseUrl, apiKey, ...extraConfig } = channel;
+      opencodeChannelsService.createChannel(name, baseUrl, apiKey, extraConfig);
+    }, (existingChannels, channel) => existingChannels.find(c =>
+      (channel.id && c.id === channel.id) ||
+      (channel.providerKey && c.providerKey === channel.providerKey) ||
+      (channel.name && channel.baseUrl && c.name === channel.name && c.baseUrl === channel.baseUrl)
+    ));
     // 导入工作区配置
     if (workspaces && overwrite) {

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

@@ -14,6 +14,8 @@
  */
 const { spawn } = require('child_process');
+const fs = require('fs');
+const path = require('path');
 const http = require('http');
 const https = require('https');
 const { EventEmitter } = require('events');
@@ -22,6 +24,89 @@ const DEFAULT_TIMEOUT = 10000; // 10 seconds
 const JSONRPC_VERSION = '2.0';
 const MCP_PROTOCOL_VERSION = '2024-11-05';
+function getPathEnvKey(envObj = {}) {
+  return Object.keys(envObj).find(key => key.toLowerCase() === 'path') || 'PATH';
+}
+function stripWrappingQuotes(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  if (
+    (text.startsWith('"') && text.endsWith('"')) ||
+    (text.startsWith("'") && text.endsWith("'"))
+  ) {
+    return text.slice(1, -1);
+  }
+  return text;
+}
+function mergeSpawnEnv(extraEnv = {}) {
+  const mergedEnv = { ...process.env, ...extraEnv };
+  const processPathKey = getPathEnvKey(process.env);
+  const extraPathKey = getPathEnvKey(extraEnv);
+  const mergedPathKey = getPathEnvKey(mergedEnv);
+  const extraPath = extraEnv && typeof extraEnv[extraPathKey] === 'string'
+    ? extraEnv[extraPathKey]
+    : '';
+  const processPath = process.env && typeof process.env[processPathKey] === 'string'
+    ? process.env[processPathKey]
+    : '';
+  if (extraPath && processPath) {
+    mergedEnv[mergedPathKey] = `${extraPath}${path.delimiter}${processPath}`;
+  }
+  return mergedEnv;
+}
+function resolveWindowsSpawnCommand(command, env, cwd) {
+  if (process.platform !== 'win32') {
+    return stripWrappingQuotes(command);
+  }
+  const normalizedCommand = stripWrappingQuotes(command);
+  if (!normalizedCommand) {
+    return normalizedCommand;
+  }
+  const hasPathSegment = /[\\/]/.test(normalizedCommand) || /^[a-zA-Z]:/.test(normalizedCommand);
+  const hasExtension = path.extname(normalizedCommand).length > 0;
+  const extensions = hasExtension ? [''] : ['.cmd', '.exe', '.bat', '.com'];
+  const resolveCandidate = (basePath) => {
+    for (const ext of extensions) {
+      const candidate = ext ? `${basePath}${ext}` : basePath;
+      if (fs.existsSync(candidate)) {
+        return candidate;
+      }
+    }
+    return null;
+  };
+  if (hasPathSegment) {
+    const absoluteBasePath = path.isAbsolute(normalizedCommand)
+      ? normalizedCommand
+      : path.resolve(cwd || process.cwd(), normalizedCommand);
+    return resolveCandidate(absoluteBasePath) || normalizedCommand;
+  }
+  const pathKey = getPathEnvKey(env || process.env);
+  const pathValue = env && typeof env[pathKey] === 'string' ? env[pathKey] : '';
+  if (!pathValue) {
+    return normalizedCommand;
+  }
+  const searchPaths = pathValue.split(path.delimiter).filter(Boolean);
+  for (const searchPath of searchPaths) {
+    const found = resolveCandidate(path.join(searchPath.trim(), normalizedCommand));
+    if (found) {
+      return found;
+    }
+  }
+  return normalizedCommand;
+}
 // ============================================================================
 // McpClient
 // ============================================================================
@@ -237,22 +322,19 @@ class McpClient extends EventEmitter {
         reject(new McpClientError(`Connection timeout after ${this._timeout}ms`));
       }, this._timeout);
-      try {
-        // 确保 PATH 不被覆盖，优先使用用户提供的 env，但保留 PATH
-        const mergedEnv = { ...process.env, ...env };
-        // 如果用户提供的 env 中有 PATH，将其追加到系统 PATH 前面
-        if (env && env.PATH && process.env.PATH) {
-          mergedEnv.PATH = `${env.PATH}:${process.env.PATH}`;
-        }
+      const finalCwd = cwd || process.cwd();
+      const mergedEnv = mergeSpawnEnv(env || {});
+      const resolvedCommand = resolveWindowsSpawnCommand(command, mergedEnv, finalCwd);
-        this._child = spawn(command, args, {
+      try {
+        this._child = spawn(resolvedCommand, args, {
           env: mergedEnv,
           stdio: ['pipe', 'pipe', 'pipe'],
-          cwd: cwd || process.cwd()
+          cwd: finalCwd
         });
       } catch (err) {
         clearTimeout(timer);
-        throw new McpClientError(`Failed to spawn "${command}": ${err.message}`);
+        throw new McpClientError(`Failed to spawn "${resolvedCommand}": ${err.message}`);
       }
       // Once we get the spawn event (or first stdout), consider connected
@@ -274,13 +356,18 @@ class McpClient extends EventEmitter {
       this._child.on('error', (err) => {
         if (err.code === 'ENOENT') {
-          const pathHint = mergedEnv.PATH
-            ? `\n  Current PATH: ${mergedEnv.PATH.split(':').slice(0, 5).join(':')}\n  (showing first 5 entries)`
+          const pathKey = getPathEnvKey(mergedEnv);
+          const pathValue = typeof mergedEnv[pathKey] === 'string' ? mergedEnv[pathKey] : '';
+          const pathHint = pathValue
+            ? `\n  Current PATH: ${pathValue.split(path.delimiter).slice(0, 5).join(path.delimiter)}\n  (showing first 5 entries)`
             : '\n  PATH is not set!';
+          const commandHint = resolvedCommand === command
+            ? command
+            : `${command} (resolved: ${resolvedCommand})`;
           settle(new McpClientError(
-            `Command "${command}" not found. Please check:\n` +
+            `Command "${commandHint}" not found. Please check:\n` +
             `  1. Is "${command}" installed?\n` +
-            `  2. Try using absolute path (e.g., /usr/bin/node or $(which ${command}))\n` +
+            `  2. Try using absolute path${process.platform === 'win32' ? ' (e.g., C:\\\\Program Files\\\\nodejs\\\\npx.cmd)' : ` (e.g., /usr/bin/node or $(which ${command}))`}\n` +
             `  3. Check your PATH environment variable${pathHint}`
           ));
         } else {

package/src/server/services/mcp-service.js CHANGED Viewed

@@ -418,6 +418,89 @@ function writeOpenCodeConfig(filePath, data) {
   fs.renameSync(tempPath, filePath);
 }
+function getPathEnvKey(envObj = {}) {
+  return Object.keys(envObj).find(key => key.toLowerCase() === 'path') || 'PATH';
+}
+function stripWrappingQuotes(value) {
+  const text = String(value || '').trim();
+  if (!text) return '';
+  if (
+    (text.startsWith('"') && text.endsWith('"')) ||
+    (text.startsWith("'") && text.endsWith("'"))
+  ) {
+    return text.slice(1, -1);
+  }
+  return text;
+}
+function mergeSpawnEnv(extraEnv = {}) {
+  const mergedEnv = { ...process.env, ...extraEnv };
+  const processPathKey = getPathEnvKey(process.env);
+  const extraPathKey = getPathEnvKey(extraEnv);
+  const mergedPathKey = getPathEnvKey(mergedEnv);
+  const extraPath = extraEnv && typeof extraEnv[extraPathKey] === 'string'
+    ? extraEnv[extraPathKey]
+    : '';
+  const processPath = process.env && typeof process.env[processPathKey] === 'string'
+    ? process.env[processPathKey]
+    : '';
+  if (extraPath && processPath) {
+    mergedEnv[mergedPathKey] = `${extraPath}${path.delimiter}${processPath}`;
+  }
+  return mergedEnv;
+}
+function resolveWindowsSpawnCommand(command, env, cwd) {
+  if (process.platform !== 'win32') {
+    return stripWrappingQuotes(command);
+  }
+  const normalizedCommand = stripWrappingQuotes(command);
+  if (!normalizedCommand) {
+    return normalizedCommand;
+  }
+  const hasPathSegment = /[\\/]/.test(normalizedCommand) || /^[a-zA-Z]:/.test(normalizedCommand);
+  const hasExtension = path.extname(normalizedCommand).length > 0;
+  const extensions = hasExtension ? [''] : ['.cmd', '.exe', '.bat', '.com'];
+  const resolveCandidate = (basePath) => {
+    for (const ext of extensions) {
+      const candidate = ext ? `${basePath}${ext}` : basePath;
+      if (fs.existsSync(candidate)) {
+        return candidate;
+      }
+    }
+    return null;
+  };
+  if (hasPathSegment) {
+    const absoluteBasePath = path.isAbsolute(normalizedCommand)
+      ? normalizedCommand
+      : path.resolve(cwd || process.cwd(), normalizedCommand);
+    return resolveCandidate(absoluteBasePath) || normalizedCommand;
+  }
+  const pathKey = getPathEnvKey(env || process.env);
+  const pathValue = env && typeof env[pathKey] === 'string' ? env[pathKey] : '';
+  if (!pathValue) {
+    return normalizedCommand;
+  }
+  const searchPaths = pathValue.split(path.delimiter).filter(Boolean);
+  for (const searchPath of searchPaths) {
+    const found = resolveCandidate(path.join(searchPath.trim(), normalizedCommand));
+    if (found) {
+      return found;
+    }
+  }
+  return normalizedCommand;
+}
 // ============================================================================
 // MCP 数据管理
 // ============================================================================
@@ -1237,6 +1320,9 @@ async function testStdioServer(spec) {
     // 检查命令是否存在
     const command = spec.command;
     const args = spec.args || [];
+    const cwd = spec.cwd || process.cwd();
+    const mergedEnv = mergeSpawnEnv(spec.env || {});
+    const resolvedCommand = resolveWindowsSpawnCommand(command, mergedEnv, cwd);
     let child;
     let resolved = false;
@@ -1260,10 +1346,10 @@ async function testStdioServer(spec) {
     };
     try {
-      child = spawn(command, args, {
-        env: { ...process.env, ...spec.env },
+      child = spawn(resolvedCommand, args, {
+        env: mergedEnv,
         stdio: ['pipe', 'pipe', 'pipe'],
-        cwd: spec.cwd || process.cwd()
+        cwd
       });
       child.stdout.on('data', (data) => {
@@ -1284,9 +1370,10 @@ async function testStdioServer(spec) {
       child.on('error', (err) => {
         if (err.code === 'ENOENT') {
+          const commandLabel = resolvedCommand === command ? command : `${command} (resolved: ${resolvedCommand})`;
           done({
             success: false,
-            message: `命令 "${command}" 未找到，请确保已安装`,
+            message: `命令 "${commandLabel}" 未找到，请确保已安装（Windows 可尝试 npx.cmd 或绝对路径）`,
             duration: Date.now() - startTime
           });
         } else {