@bangdao-ai/zentao-mcp 1.1.2 → 1.1.4

package/index.js

@@ -4,22 +4,70 @@
  * 通过 npm/npx 调用 Python MCP 服务器
  */
 
-const { spawn } = require('child_process');
+const { spawn, execSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
+const os = require('os');
 
-// 获取 Python 可执行文件路径
+// 检测操作系统平台
+const isWindows = process.platform === 'win32';
+
+// 获取 Python 可执行文件路径（跨平台）
 function findPython() {
   const pythonCommands = ['python3', 'python'];
   
+  // 优先检查环境变量
+  const pythonEnv = process.env.PYTHON || process.env.PYTHON3;
+  if (pythonEnv && fs.existsSync(pythonEnv)) {
+    return pythonEnv;
+  }
+  
+  // 尝试直接执行命令来查找 Python
   for (const cmd of pythonCommands) {
     try {
-      const result = require('child_process').execSync(`which ${cmd}`, { encoding: 'utf-8' }).trim();
+      let result;
+      if (isWindows) {
+        // Windows 使用 where 命令
+        try {
+          result = execSync(`where ${cmd}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+          // where 可能返回多行，取第一行
+          if (result) {
+            const lines = result.split('\n').filter(line => line.trim());
+            if (lines.length > 0) {
+              result = lines[0].trim();
+            }
+          }
+        } catch (e) {
+          // where 命令失败，尝试直接执行
+          try {
+            execSync(`${cmd} --version`, { encoding: 'utf-8', stdio: ['ignore', 'ignore', 'ignore'] });
+            // 如果能执行，返回命令名（spawn 会自动查找）
+            return cmd;
+          } catch (e2) {
+            continue;
+          }
+        }
+      } else {
+        // Unix/Linux/Mac 使用 which 命令
+        result = execSync(`which ${cmd}`, { encoding: 'utf-8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
+      }
+      
       if (result) {
         return result;
       }
     } catch (e) {
-      // 继续尝试下一个
+      // 继续尝试下一个命令
+      continue;
+    }
+  }
+  
+  // 如果都失败了，尝试直接使用命令名（让系统 PATH 处理）
+  for (const cmd of pythonCommands) {
+    try {
+      execSync(`${cmd} --version`, { encoding: 'utf-8', stdio: ['ignore', 'ignore', 'ignore'] });
+      return cmd;
+    } catch (e) {
+      continue;
     }
   }
   
@@ -66,10 +114,17 @@ function main() {
     // 启动 Python MCP 服务器
     // 注意：MCP 服务器通过 stdio 通信，不会输出到控制台
     // 这是正常行为，服务器会等待 MCP 协议消息
-    const child = spawn(python, [scriptPath], {
+    const spawnOptions = {
       stdio: 'inherit',
       env: process.env
-    });
+    };
+    
+    // Windows 兼容性：如果 Python 路径包含空格或特殊字符，可能需要 shell
+    if (isWindows && (python.includes(' ') || python.includes('(') || python.includes(')'))) {
+      spawnOptions.shell = true;
+    }
+    
+    const child = spawn(python, [scriptPath], spawnOptions);
     
     // 处理退出
     child.on('exit', (code) => {
@@ -91,27 +146,51 @@ function main() {
       process.exit(1);
     });
     
-    // 处理信号
-    process.on('SIGINT', () => {
-      if (child && !child.killed) {
-        child.kill('SIGINT');
-      }
-      process.exit(0);
-    });
-    
-    process.on('SIGTERM', () => {
-      if (child && !child.killed) {
-        child.kill('SIGTERM');
-      }
-      process.exit(0);
-    });
+    // 处理信号（Windows 兼容性）
+    if (!isWindows) {
+      process.on('SIGINT', () => {
+        if (child && !child.killed) {
+          child.kill('SIGINT');
+        }
+        process.exit(0);
+      });
+      
+      process.on('SIGTERM', () => {
+        if (child && !child.killed) {
+          child.kill('SIGTERM');
+        }
+        process.exit(0);
+      });
+    } else {
+      // Windows 使用不同的信号处理
+      process.on('SIGINT', () => {
+        if (child && !child.killed) {
+          child.kill();
+        }
+        process.exit(0);
+      });
+      
+      process.on('SIGTERM', () => {
+        if (child && !child.killed) {
+          child.kill();
+        }
+        process.exit(0);
+      });
+    }
     
   } catch (error) {
     console.error('错误:', error.message);
     console.error('\n故障排查：');
-    console.error('1. 检查 Python 是否安装: python3 --version');
-    console.error('2. 检查脚本是否存在: ls -la src/mcp_server.py');
-    console.error('3. 检查依赖是否安装: pip3 list | grep mcp');
+    if (isWindows) {
+      console.error('1. 检查 Python 是否安装: python --version 或 python3 --version');
+      console.error('2. 检查脚本是否存在: dir src\\mcp_server.py');
+      console.error('3. 检查依赖是否安装: pip list | findstr mcp');
+      console.error('4. 确保 Python 已添加到系统 PATH 环境变量');
+    } else {
+      console.error('1. 检查 Python 是否安装: python3 --version');
+      console.error('2. 检查脚本是否存在: ls -la src/mcp_server.py');
+      console.error('3. 检查依赖是否安装: pip3 list | grep mcp');
+    }
     process.exit(1);
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bangdao-ai/zentao-mcp",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "禅道Bug管理系统MCP工具",
   "main": "index.js",
   "bin": {
@@ -19,7 +19,8 @@
   "license": "MIT",
   "files": [
     "index.js",
-    "src/",
+    "src/mcp_server.py",
+    "src/zentao_nexus.py",
     "requirements.txt",
     "README.md",
     "package.json"

package/src/mcp_server.py

@@ -203,22 +203,10 @@ class ZenTaoMCPServer:
                                 "enum": ["fixed", "bydesign", "reqchange", "duplicate", "external", "notrepro", "postponed", "willnotfix", "tostory", "history", "configchange"]
                             },
                             "resolved_by": {"type": "string", "description": "解决人（姓名或工号）"},
-                            "resolved_build": {"type": "string", "description": "解决版本ID（可选，如果未提供则默认使用trunk）"}
+                            "resolved_build": {"type": "string", "description": "解决版本ID（如果解决方案是fixed时，解决版本必传）"}
                         },
                         "required": ["product_id", "bug_ids", "resolution", "resolved_by"]
                     }
-                ),
-                Tool(
-                    name="close_bug",
-                    description="关闭BUG",
-                    inputSchema={
-                        "type": "object",
-                        "properties": {
-                            "bug_id": {"type": "string", "description": "BUG ID"},
-                            "comment": {"type": "string", "description": "关闭备注（可选，默认AI关闭）"}
-                        },
-                        "required": ["bug_id"]
-                    }
                 )
             ]
         
@@ -448,13 +436,6 @@ class ZenTaoMCPServer:
                     result = self.nexus.resolve_bug(product_id, bug_ids, resolution, resolved_by, resolved_build)
                     return [TextContent(type="text", text=json.dumps(result, ensure_ascii=False, indent=2))]
                 
-                elif name == "close_bug":
-                    bug_id = arguments["bug_id"]
-                    comment = arguments.get("comment", "AI关闭")
-                    
-                    result = self.nexus.close_bug(bug_id, comment)
-                    return [TextContent(type="text", text=json.dumps(result, ensure_ascii=False, indent=2))]
-                
                 else:
                     raise ValueError(f"未知的工具: {name}")
             

package/src/zentao_nexus.py

@@ -133,7 +133,7 @@ class ZenTaoAPIClient:
         md5_hash.update(token_string.encode('utf-8'))
         return md5_hash.hexdigest().lower()
     
-    def _call_new_api(self, function_name, params=None, form_data=None, files=None, m_param='allneedlist'):
+    def _call_new_api(self, function_name, params=None, form_data=None, files=None):
         """
         调用新的API接口（使用code、time、token认证）
         
@@ -142,7 +142,6 @@ class ZenTaoAPIClient:
             params: URL参数（字典）
             form_data: POST form-data数据（字典或列表，列表格式用于数组参数）
             files: 文件上传（字典，用于文件上传接口）
-            m_param: m参数值（默认allneedlist，某些接口可能需要其他值如bug）
         
         Returns:
             dict: API响应结果
@@ -155,7 +154,7 @@ class ZenTaoAPIClient:
             'code': self.code,
             'time': current_timestamp,
             'token': token,
-            'm': m_param,
+            'm': 'allneedlist',
             'f': function_name
         }
         
@@ -167,68 +166,67 @@ class ZenTaoAPIClient:
             'User-Agent': 'Python-ZenTao-Client/1.0'
         }
         
-        # 打印请求信息（仅在非静默模式下）
-        if not self.silent:
-            print("\n" + "=" * 80)
-            print("【禅道API请求信息】")
-            print("=" * 80)
-            print(f"API URL: {api_url}")
-            print(f"\n【Headers】")
-            for key, value in headers.items():
-                print(f"  {key}: {value}")
-            
-            print(f"\n【Token生成信息】")
-            print(f"  code: {self.code}")
-            print(f"  key: {self.key[:10]}...{self.key[-10:] if len(self.key) > 20 else self.key}")  # 只显示部分key，保护隐私
-            print(f"  time: {current_timestamp}")
-            print(f"  token生成公式: md5(code + key + time)")
-            print(f"  token生成字符串: {self.code}{self.key}{current_timestamp}")
-            print(f"  token: {token}")
-            
-            print(f"\n【URL参数】")
-            for key, value in url_params.items():
-                print(f"  {key}: {value}")
-            
-            # 处理form_data用于显示
-            display_form_data = form_data
-            if isinstance(form_data, dict):
-                # 检查是否有数组类型的值
-                processed_data = []
-                for key, value in form_data.items():
-                    if isinstance(value, (list, tuple)):
-                        for item in value:
-                            processed_data.append((key, str(item)))
-                    else:
-                        processed_data.append((key, str(value)))
-                display_form_data = processed_data
-            
-            if display_form_data:
-                print(f"\n【Body (form-data)】")
-                if isinstance(display_form_data, list):
-                    for item in display_form_data:
-                        if isinstance(item, tuple):
-                            key, value = item
-                            # 如果是文件，只显示文件名
-                            if hasattr(value, 'read'):
-                                print(f"  {key}: <文件对象>")
-                            else:
-                                print(f"  {key}: {value}")
+        # 打印请求信息
+        print("\n" + "=" * 80)
+        print("【禅道API请求信息】")
+        print("=" * 80)
+        print(f"API URL: {api_url}")
+        print(f"\n【Headers】")
+        for key, value in headers.items():
+            print(f"  {key}: {value}")
+        
+        print(f"\n【Token生成信息】")
+        print(f"  code: {self.code}")
+        print(f"  key: {self.key[:10]}...{self.key[-10:] if len(self.key) > 20 else self.key}")  # 只显示部分key，保护隐私
+        print(f"  time: {current_timestamp}")
+        print(f"  token生成公式: md5(code + key + time)")
+        print(f"  token生成字符串: {self.code}{self.key}{current_timestamp}")
+        print(f"  token: {token}")
+        
+        print(f"\n【URL参数】")
+        for key, value in url_params.items():
+            print(f"  {key}: {value}")
+        
+        # 处理form_data用于显示
+        display_form_data = form_data
+        if isinstance(form_data, dict):
+            # 检查是否有数组类型的值
+            processed_data = []
+            for key, value in form_data.items():
+                if isinstance(value, (list, tuple)):
+                    for item in value:
+                        processed_data.append((key, str(item)))
+                else:
+                    processed_data.append((key, str(value)))
+            display_form_data = processed_data
+        
+        if display_form_data:
+            print(f"\n【Body (form-data)】")
+            if isinstance(display_form_data, list):
+                for item in display_form_data:
+                    if isinstance(item, tuple):
+                        key, value = item
+                        # 如果是文件，只显示文件名
+                        if hasattr(value, 'read'):
+                            print(f"  {key}: <文件对象>")
                         else:
-                            print(f"  {item}")
-                elif isinstance(display_form_data, dict):
-                    for key, value in display_form_data.items():
-                        print(f"  {key}: {value}")
-            
-            if files:
-                print(f"\n【Files】")
-                for key, file_info in files.items():
-                    if isinstance(file_info, tuple):
-                        filename = file_info[0] if len(file_info) > 0 else "unknown"
-                        print(f"  {key}: {filename}")
+                            print(f"  {key}: {value}")
                     else:
-                        print(f"  {key}: {file_info}")
-            
-            print("=" * 80)
+                        print(f"  {item}")
+            elif isinstance(display_form_data, dict):
+                for key, value in display_form_data.items():
+                    print(f"  {key}: {value}")
+        
+        if files:
+            print(f"\n【Files】")
+            for key, file_info in files.items():
+                if isinstance(file_info, tuple):
+                    filename = file_info[0] if len(file_info) > 0 else "unknown"
+                    print(f"  {key}: {filename}")
+                else:
+                    print(f"  {key}: {file_info}")
+        
+        print("=" * 80)
         
         try:
             if files:
@@ -253,33 +251,24 @@ class ZenTaoAPIClient:
             else:
                 response = requests.post(api_url, params=url_params, headers=headers, timeout=30)
             
-            # 处理响应
+            # 打印响应信息
+            print("\n【禅道API响应信息】")
+            print("=" * 80)
+            print(f"状态码: {response.status_code}")
+            print(f"响应Headers:")
+            for key, value in response.headers.items():
+                print(f"  {key}: {value}")
+            
             try:
                 response_json = response.json()
-                # 打印响应信息（仅在非静默模式下）
-                if not self.silent:
-                    print("\n【禅道API响应信息】")
-                    print("=" * 80)
-                    print(f"状态码: {response.status_code}")
-                    print(f"响应Headers:")
-                    for key, value in response.headers.items():
-                        print(f"  {key}: {value}")
-                    print(f"\n响应Body (JSON):")
-                    print(json.dumps(response_json, ensure_ascii=False, indent=2))
-                    print("=" * 80 + "\n")
+                print(f"\n响应Body (JSON):")
+                print(json.dumps(response_json, ensure_ascii=False, indent=2))
+                print("=" * 80 + "\n")
                 return response_json
             except json.JSONDecodeError:
-                # 打印响应信息（仅在非静默模式下）
-                if not self.silent:
-                    print("\n【禅道API响应信息】")
-                    print("=" * 80)
-                    print(f"状态码: {response.status_code}")
-                    print(f"响应Headers:")
-                    for key, value in response.headers.items():
-                        print(f"  {key}: {value}")
-                    print(f"\n响应Body (非JSON):")
-                    print(response.text[:1000])  # 只显示前1000个字符
-                    print("=" * 80 + "\n")
+                print(f"\n响应Body (非JSON):")
+                print(response.text[:1000])  # 只显示前1000个字符
+                print("=" * 80 + "\n")
                 return {
                     "status": 0,
                     "message": "fail",
@@ -288,11 +277,9 @@ class ZenTaoAPIClient:
                     "raw_response": response.text
                 }
         except requests.exceptions.RequestException as e:
-            # 打印异常信息（仅在非静默模式下）
-            if not self.silent:
-                print(f"\n【请求异常】")
-                print(f"错误信息: {str(e)}")
-                print("=" * 80 + "\n")
+            print(f"\n【请求异常】")
+            print(f"错误信息: {str(e)}")
+            print("=" * 80 + "\n")
             return {
                 "status": 0,
                 "message": "fail",
@@ -401,13 +388,13 @@ class ZenTaoAPIClient:
                 history: 历史遗留
                 configchange: 调整配置
             resolved_by: 解决人（必传，姓名或工号）
-            resolved_build: 解决版本ID（可选，如果未提供则默认使用"trunk"）
+            resolved_build: 解决版本ID（如果解决方案是fixed时，默认使用"trunk"）
         
         Returns:
             dict: 解决结果
         """
-        # 如果没有提供 resolved_build，使用默认值 "trunk"
-        if not resolved_build:
+        # 如果 resolution 是 "fixed" 且没有提供 resolved_build，使用默认值 "trunk"
+        if resolution == 'fixed' and not resolved_build:
             resolved_build = "trunk"
         
         params = {'productID': product_id}
@@ -427,31 +414,6 @@ class ZenTaoAPIClient:
         
         return self._call_new_api('resolveBug', params=params, form_data=form_data)
     
-    def close_bug(self, bug_id, comment="AI关闭"):
-        """
-        关闭BUG
-        
-        Args:
-            bug_id: BUG ID（必传）
-            comment: 关闭备注（可选，默认"AI关闭"）
-        
-        Returns:
-            dict: 关闭结果
-        """
-        params = {'bugID': bug_id}
-        form_data = {'comment': comment}
-        result = self._call_new_api('close', params=params, form_data=form_data, m_param='bug')
-        
-        # 如果返回的是"Array"字符串，表示操作成功（禅道某些接口的特殊返回格式）
-        if isinstance(result, dict) and result.get("raw_response") == "Array":
-            return {
-                "status": 1,
-                "message": "success",
-                "info": "success"
-            }
-        
-        return result
-    
     def create_bug_by_api(self, bug_data, use_form_data=True):
         """通过API创建bug"""
         return self._call_new_api('createbugbyapi', form_data=bug_data)
@@ -921,10 +883,6 @@ class ZenTaoNexus:
     def resolve_bug(self, product_id, bug_ids, resolution="fixed", resolved_by=None, resolved_build=None):
         """批量解决BUG"""
         return self.client.resolve_bug(product_id, bug_ids, resolution, resolved_by, resolved_build)
-    
-    def close_bug(self, bug_id, comment="AI关闭"):
-        """关闭BUG"""
-        return self.client.close_bug(bug_id, comment)
 
 
 # 便捷函数