coding-tool-x 3.5.2 → 3.5.4

package/src/index.js

@@ -6,30 +6,24 @@
  */
 
 const { loadConfig } = require('./config/loader');
-const { showMainMenu } = require('./ui/menu');
-const { handleList } = require('./commands/list');
-const { handleSearch } = require('./commands/search');
-const { switchProject } = require('./commands/switch');
 const { resetConfig } = require('./reset-config');
-const { handleChannelManagement, handleAddChannel, handleChannelStatus } = require('./commands/channels');
-const { handleToggleProxy } = require('./commands/toggle-proxy');
-const { handlePortConfig } = require('./commands/port-config');
-const { handleSwitchCliType } = require('./commands/cli-type');
 const { handleStart, handleStop, handleRestart, handleStatus } = require('./commands/daemon');
 const { handleProxyStart: proxyStart, handleProxyStop: proxyStop, handleProxyRestart, handleProxyStatus: proxyStatus } = require('./commands/proxy-control');
 const { handleLogs } = require('./commands/logs');
 const { handleStats, handleStatsExport } = require('./commands/stats');
 const { handleDoctor } = require('./commands/doctor');
 const { handleUpdate } = require('./commands/update');
-const { workspaceMenu } = require('./commands/workspace');
 const { ensureStorageDirMigrated } = require('./config/paths');
 const PluginManager = require('./plugins/plugin-manager');
 const eventBus = require('./plugins/event-bus');
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const path = require('path');
 const fs = require('fs');
 
+function getInquirer() {
+  return require('inquirer');
+}
+
 // 读取版本号
 function getVersion() {
   const packagePath = path.join(__dirname, '../package.json');
@@ -338,6 +332,7 @@ async function main() {
 
   // port 命令 - 配置端口
   if (args[0] === 'port') {
+    const { handlePortConfig } = require('./commands/port-config');
     await handlePortConfig();
     return;
   }
@@ -400,6 +395,7 @@ async function main() {
 
   while (true) {
     // 显示主菜单
+    const { showMainMenu } = require('./ui/menu');
     const action = await showMainMenu(config);
 
     // 发送命令开始事件
@@ -409,7 +405,9 @@ async function main() {
 
     switch (action) {
       case 'list':
+        const { handleList } = require('./commands/list');
         await handleList(config, async () => {
+          const { switchProject } = require('./commands/switch');
           const switched = await switchProject(config);
           if (switched) {
             // 重新加载配置以获取最新的项目设置
@@ -420,7 +418,9 @@ async function main() {
         break;
 
       case 'search':
+        const { handleSearch } = require('./commands/search');
         await handleSearch(config, async () => {
+          const { switchProject } = require('./commands/switch');
           const switched = await switchProject(config);
           if (switched) {
             config = loadConfig();
@@ -430,11 +430,14 @@ async function main() {
         break;
 
       case 'switch':
+        const { switchProject } = require('./commands/switch');
         const switched = await switchProject(config);
         if (switched) {
           config = loadConfig();
           // 切换成功后自动进入会话列表
+          const { handleList } = require('./commands/list');
           await handleList(config, async () => {
+            const { switchProject } = require('./commands/switch');
             const switched = await switchProject(config);
             if (switched) {
               config = loadConfig();
@@ -445,26 +448,32 @@ async function main() {
         break;
 
       case 'workspace':
+        const { workspaceMenu } = require('./commands/workspace');
         await workspaceMenu();
         break;
 
       case 'switch-cli-type':
+        const { handleSwitchCliType } = require('./commands/cli-type');
         await handleSwitchCliType();
         config = loadConfig(); // 重新加载配置以获取新的类型
         break;
 
       case 'switch-channel':
+        const { handleChannelManagement } = require('./commands/channels');
         await handleChannelManagement();
         break;
       case 'channel-status':
+        const { handleChannelStatus } = require('./commands/channels');
         await handleChannelStatus();
         break;
 
       case 'toggle-proxy':
+        const { handleToggleProxy } = require('./commands/toggle-proxy');
         await handleToggleProxy();
         break;
 
       case 'add-channel':
+        const { handleAddChannel } = require('./commands/channels');
         await handleAddChannel();
         break;
 
@@ -475,6 +484,7 @@ async function main() {
       }
 
       case 'port-config':
+        const { handlePortConfig } = require('./commands/port-config');
         await handlePortConfig();
         break;
 
@@ -484,6 +494,7 @@ async function main() {
 
       case 'plugin-menu': {
         const { handlePluginCommand } = require('./commands/plugin');
+        const inquirer = getInquirer();
 
         // Show plugin management submenu
         const pluginAction = await inquirer.prompt([{

package/src/server/index.js

@@ -1,7 +1,6 @@
 const express = require('express');
 const path = require('path');
 const chalk = require('chalk');
-const inquirer = require('inquirer');
 const { loadConfig } = require('../config/loader');
 const { PATHS, ensureStorageDirMigrated } = require('../config/paths');
 const { startWebSocketServer: attachWebSocketServer } = require('./websocket-server');
@@ -25,6 +24,10 @@ const { startOpenCodeProxyServer, collectProxyModelList } = require('./opencode-
 const { createRemoteMutationGuard } = require('./services/network-access');
 const { createApiRequestLogger } = require('./services/request-logger');
 
+function getInquirer() {
+  return require('inquirer');
+}
+
 function isInteractivePortConflictMode(options = {}) {
   if (options.interactive === false) {
     return false;
@@ -73,6 +76,7 @@ async function startServer(port, host = '127.0.0.1', options = {}) {
       shouldKill = true;
     } else if (interactiveMode) {
       // 询问用户是否关闭占用端口的进程
+      const inquirer = getInquirer();
       const answer = await inquirer.prompt([
         {
           type: 'list',

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

@@ -204,6 +204,8 @@ class McpClient extends EventEmitter {
     // HTTP/SSE transport state
     this._sseAbortController = null;
     this._httpSessionUrl = null;
+    this._httpSessionId = null;
+    this._negotiatedProtocolVersion = MCP_PROTOCOL_VERSION;
   }
 
   // --------------------------------------------------------------------------
@@ -249,11 +251,12 @@ class McpClient extends EventEmitter {
       }
     });
 
+    this._negotiatedProtocolVersion = result.protocolVersion || MCP_PROTOCOL_VERSION;
     this._serverCapabilities = result.capabilities || {};
     this._serverInfo = result.serverInfo || {};
 
     // Send initialized notification (no response expected)
-    this._notify('notifications/initialized', {});
+    await this._notify('notifications/initialized', {});
 
     this._initialized = true;
     this.emit('initialized', result);
@@ -654,11 +657,18 @@ class McpClient extends EventEmitter {
             'Content-Type': 'application/json',
             'Content-Length': Buffer.byteLength(body),
             'Accept': 'application/json, text/event-stream',
+            ...(msg.method !== 'initialize'
+              ? {
+                'MCP-Protocol-Version': this._negotiatedProtocolVersion || MCP_PROTOCOL_VERSION,
+                ...(this._httpSessionId ? { 'Mcp-Session-Id': this._httpSessionId } : {})
+              }
+              : {}),
             ...this._spec.headers
           }
         };
 
         const req = client.request(options, (res) => {
+          this._captureHttpResponseMetadata(res);
           let data = '';
           res.on('data', (chunk) => { data += chunk.toString(); });
           res.on('end', () => {
@@ -669,7 +679,19 @@ class McpClient extends EventEmitter {
               return;
             }
 
+            const isNotification = msg.id === undefined || msg.id === null;
             const contentType = res.headers['content-type'] || '';
+            const trimmedData = data.trim();
+
+            if (!trimmedData) {
+              if (isNotification || res.statusCode === 202 || res.statusCode === 204) {
+                resolve();
+                return;
+              }
+
+              reject(new McpClientError('Empty HTTP response for request'));
+              return;
+            }
 
             // JSON response (direct response to JSON-RPC)
             if (contentType.includes('application/json')) {
@@ -690,12 +712,6 @@ class McpClient extends EventEmitter {
               return;
             }
 
-            // Accepted with no body (202, notifications)
-            if (res.statusCode === 202 || !data.trim()) {
-              resolve();
-              return;
-            }
-
             // Try parsing as JSON anyway
             try {
               const parsed = JSON.parse(data);
@@ -761,6 +777,8 @@ class McpClient extends EventEmitter {
   /** @private */
   _disconnectHttp() {
     this._httpSessionUrl = null;
+    this._httpSessionId = null;
+    this._negotiatedProtocolVersion = MCP_PROTOCOL_VERSION;
   }
 
   // --------------------------------------------------------------------------
@@ -807,7 +825,7 @@ class McpClient extends EventEmitter {
   }
 
   /** @private */
-  _notify(method, params) {
+  async _notify(method, params) {
     const msg = {
       jsonrpc: JSONRPC_VERSION,
       method,
@@ -817,14 +835,20 @@ class McpClient extends EventEmitter {
     try {
       if (this._type === 'stdio') {
         this._sendStdio(msg);
+        return;
       } else {
-        // Fire-and-forget for HTTP notifications
-        this._sendHttp(msg).catch((err) => {
-          this.emit('error', new McpClientError(`Notification send failed: ${err.message}`));
-        });
+        await this._sendHttp(msg);
       }
     } catch (err) {
-      this.emit('error', new McpClientError(`Notification send failed: ${err.message}`));
+      throw new McpClientError(`Notification send failed: ${err.message}`);
+    }
+  }
+
+  /** @private */
+  _captureHttpResponseMetadata(res) {
+    const sessionId = res && res.headers ? res.headers['mcp-session-id'] : null;
+    if (typeof sessionId === 'string' && sessionId.trim()) {
+      this._httpSessionId = sessionId.trim();
     }
   }