@zzp123/mcp-zentao 1.3.2 → 1.4.1

package/dist/api/zentaoApi.d.ts

@@ -1,4 +1,4 @@
-import { AssignFeedbackRequest, Bug, BugStatus, Build, CloseFeedbackRequest, CreateBuildRequest, CreateBugRequest, CreateExecutionRequest, CreateFeedbackRequest, CreatePlanRequest, CreateProductRequest, CreateProgramRequest, CreateProjectRequest, CreateStoryRequest, CreateTaskRequest, CreateTestCaseRequest, CreateTicketRequest, CreateUserRequest, Execution, Feedback, FileUploadResponse, Module, ModuleType, Plan, Product, Program, Project, Release, Story, Task, TaskStatus, TaskUpdate, TestCase, Ticket, UpdateBuildRequest, UpdateBugRequest, UpdateExecutionRequest, UpdateFeedbackRequest, UpdatePlanRequest, UpdateProductRequest, UpdateProgramRequest, UpdateProjectRequest, UpdateStoryRequest, UpdateTestCaseRequest, UpdateTicketRequest, UpdateUserRequest, UploadFileRequest, UserDetail, ZentaoConfig } from '../types/zentao';
+import { AssignFeedbackRequest, Bug, BugStatus, Build, CloseFeedbackRequest, CreateBuildRequest, CreateBugRequest, CreateExecutionRequest, CreateFeedbackRequest, CreatePlanRequest, CreateProductRequest, CreateProgramRequest, CreateProjectRequest, CreateStoryRequest, CreateTaskRequest, CreateTestCaseRequest, CreateTicketRequest, CreateUserRequest, Execution, Feedback, FileUploadResponse, Module, ModuleType, Plan, Product, Program, Project, Release, ResolveBugRequest, Story, Task, TaskStatus, TaskUpdate, TestCase, Ticket, UpdateBuildRequest, UpdateBugRequest, UpdateExecutionRequest, UpdateFeedbackRequest, UpdatePlanRequest, UpdateProductRequest, UpdateProgramRequest, UpdateProjectRequest, UpdateStoryRequest, UpdateTestCaseRequest, UpdateTicketRequest, UpdateUserRequest, UploadFileRequest, UserDetail, ZentaoConfig } from '../types/zentao';
 export declare class ZentaoAPI {
     private config;
     private client;
@@ -11,6 +11,7 @@ export declare class ZentaoAPI {
     getProducts(): Promise<Product[]>;
     getMyBugs(status?: BugStatus, productId?: number): Promise<Bug[]>;
     getBugDetail(bugId: number): Promise<Bug>;
+    resolveBug(bugId: number, resolution: ResolveBugRequest): Promise<Bug>;
     updateTask(taskId: number, update: TaskUpdate): Promise<Task>;
     finishTask(taskId: number, update?: TaskUpdate): Promise<Task>;
     createTask(task: CreateTaskRequest): Promise<Task>;

package/dist/api/zentaoApi.js

@@ -158,6 +158,25 @@ export class ZentaoAPI {
             throw error;
         }
     }
+    async resolveBug(bugId, resolution) {
+        try {
+            console.log(`正在解决Bug ${bugId}...`);
+            // 验证必填字段
+            if (resolution.resolution === 'fixed' && !resolution.resolvedBuild) {
+                throw new Error('当解决方案为"已解决(fixed)"时，必须提供解决版本(resolvedBuild)');
+            }
+            if (resolution.resolution === 'duplicate' && !resolution.duplicateBug) {
+                throw new Error('当解决方案为"重复Bug(duplicate)"时，必须提供重复Bug的ID(duplicateBug)');
+            }
+            const response = await this.request('POST', `/bugs/${bugId}/resolve`, undefined, resolution);
+            console.log('Bug解决响应:', response);
+            return response;
+        }
+        catch (error) {
+            console.error('解决Bug失败:', error);
+            throw error;
+        }
+    }
     async updateTask(taskId, update) {
         try {
             console.log(`正在更新任务 ${taskId}...`);

package/dist/index.js

@@ -109,6 +109,29 @@ server.tool("getBugDetail", {
         content: [{ type: "text", text: JSON.stringify(bug, null, 2) }]
     };
 });
+// Add resolveBug tool
+server.tool("resolveBug", {
+    bugId: z.number(),
+    resolution: z.enum(['fixed', 'bydesign', 'duplicate', 'external', 'notrepro', 'postponed', 'willnotfix']),
+    resolvedBuild: z.string().optional(),
+    assignedTo: z.string().optional(),
+    comment: z.string().optional(),
+    duplicateBug: z.number().optional()
+}, async ({ bugId, resolution, resolvedBuild, assignedTo, comment, duplicateBug }) => {
+    if (!zentaoApi)
+        throw new Error("Please initialize Zentao API first");
+    const resolveBugRequest = {
+        resolution,
+        resolvedBuild,
+        assignedTo,
+        comment,
+        duplicateBug
+    };
+    const bug = await zentaoApi.resolveBug(bugId, resolveBugRequest);
+    return {
+        content: [{ type: "text", text: JSON.stringify(bug, null, 2) }]
+    };
+});
 // Add updateTask tool
 server.tool("updateTask", {
     taskId: z.number(),
@@ -976,18 +999,26 @@ server.tool("uploadImageFromClipboard", {
     filename: z.string().optional(),
     uid: z.string().optional()
 }, async ({ filename, uid }) => {
-    if (!zentaoApi)
-        throw new Error("Please initialize Zentao API first");
+    if (!zentaoApi) {
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify({ error: "请先初始化禅道API配置" }, null, 2)
+                }],
+            isError: true
+        };
+    }
     const fs = await import('fs');
     const path = await import('path');
     const { execSync } = await import('child_process');
     try {
+        console.log('[uploadImageFromClipboard] 开始执行...');
         // 读取系统剪贴板图片
-        let base64Data;
         let fileBuffer;
         let finalFilename;
         // Windows: 使用 PowerShell 读取剪贴板
         if (process.platform === 'win32') {
+            console.log('[uploadImageFromClipboard] Windows平台，使用PowerShell读取剪贴板...');
             const psScript = `
                 Add-Type -AssemblyName System.Windows.Forms
                 $img = [System.Windows.Forms.Clipboard]::GetImage()
@@ -1005,64 +1036,118 @@ server.tool("uploadImageFromClipboard", {
                 stdio: ['pipe', 'pipe', 'pipe']
             }).trim();
             if (!result || result.includes('NoImage') || result.includes('Error')) {
-                throw new Error('剪贴板中没有图片。请先复制图片，不要粘贴到输入框，直接告诉我"上传"。');
+                console.error('[uploadImageFromClipboard] 剪贴板中没有图片');
+                return {
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                error: "剪贴板中没有图片",
+                                tip: "请先复制图片，不要粘贴到输入框，直接告诉我'上传'"
+                            }, null, 2)
+                        }],
+                    isError: true
+                };
             }
-            base64Data = result;
-            fileBuffer = Buffer.from(base64Data, 'base64');
+            fileBuffer = Buffer.from(result, 'base64');
             finalFilename = filename || `clipboard_${Date.now()}.png`;
+            console.log(`[uploadImageFromClipboard] 已读取剪贴板图片，大小: ${fileBuffer.length} bytes`);
         }
         // macOS: 使用 pngpaste
         else if (process.platform === 'darwin') {
+            console.log('[uploadImageFromClipboard] macOS平台，使用pngpaste读取剪贴板...');
             const tempFile = path.join(process.cwd(), '.temp_clipboard.png');
             try {
                 execSync(`pngpaste "${tempFile}"`);
                 fileBuffer = fs.readFileSync(tempFile);
                 fs.unlinkSync(tempFile);
                 finalFilename = filename || `clipboard_${Date.now()}.png`;
+                console.log(`[uploadImageFromClipboard] 已读取剪贴板图片，大小: ${fileBuffer.length} bytes`);
             }
-            catch {
-                throw new Error('剪贴板中没有图片。请先安装 pngpaste: brew install pngpaste');
+            catch (err) {
+                console.error('[uploadImageFromClipboard] macOS读取剪贴板失败:', err);
+                return {
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                error: "剪贴板中没有图片或pngpaste未安装",
+                                tip: "请先安装 pngpaste: brew install pngpaste"
+                            }, null, 2)
+                        }],
+                    isError: true
+                };
             }
         }
         // Linux: 使用 xclip
         else {
+            console.log('[uploadImageFromClipboard] Linux平台，使用xclip读取剪贴板...');
             try {
                 const buffer = execSync('xclip -selection clipboard -t image/png -o', {
                     maxBuffer: 10 * 1024 * 1024
                 });
                 fileBuffer = buffer;
                 finalFilename = filename || `clipboard_${Date.now()}.png`;
+                console.log(`[uploadImageFromClipboard] 已读取剪贴板图片，大小: ${fileBuffer.length} bytes`);
             }
-            catch {
-                throw new Error('剪贴板中没有图片。请先安装 xclip: sudo apt-get install xclip');
+            catch (err) {
+                console.error('[uploadImageFromClipboard] Linux读取剪贴板失败:', err);
+                return {
+                    content: [{
+                            type: "text",
+                            text: JSON.stringify({
+                                error: "剪贴板中没有图片或xclip未安装",
+                                tip: "请先安装 xclip: sudo apt-get install xclip"
+                            }, null, 2)
+                        }],
+                    isError: true
+                };
             }
         }
         // 创建 img 文件夹
         const imgDir = path.join(process.cwd(), 'img');
         if (!fs.existsSync(imgDir)) {
+            console.log(`[uploadImageFromClipboard] 创建目录: ${imgDir}`);
             fs.mkdirSync(imgDir, { recursive: true });
         }
         // 保存到 img 文件夹
         const savedPath = path.join(imgDir, finalFilename);
         fs.writeFileSync(savedPath, fileBuffer);
+        console.log(`[uploadImageFromClipboard] 图片已保存到: ${savedPath}`);
         // 上传到禅道
-        const result = await zentaoApi.uploadFile({
+        console.log('[uploadImageFromClipboard] 开始上传到禅道...');
+        const uploadResult = await zentaoApi.uploadFile({
             file: fileBuffer,
             filename: finalFilename,
             uid
         });
+        console.log('[uploadImageFromClipboard] 上传成功，结果:', uploadResult);
         const response = {
-            upload: result,
+            success: true,
+            upload: uploadResult,
             savedPath: savedPath,
+            filename: finalFilename,
+            fileSize: fileBuffer.length,
             message: `图片已保存到本地并上传到禅道`
         };
-        return { content: [{ type: "text", text: JSON.stringify(response, null, 2) }] };
+        console.log('[uploadImageFromClipboard] 返回结果:', response);
+        return {
+            content: [{
+                    type: "text",
+                    text: JSON.stringify(response, null, 2)
+                }]
+        };
     }
     catch (error) {
+        console.error('[uploadImageFromClipboard] 发生错误:', error);
+        const errorResponse = {
+            success: false,
+            error: error.message || String(error),
+            stack: error.stack,
+            tip: "请检查：\n1. 确保已复制图片到剪贴板\n2. 不要粘贴到输入框，直接说'上传剪贴板图片'\n3. 或使用命令行: upload.bat"
+        };
         return {
             content: [{
                     type: "text",
-                    text: `错误: ${error.message}\n\n提示：\n1. 确保已复制图片到剪贴板\n2. 不要粘贴到输入框，直接说"上传剪贴板图片"\n3. 或使用命令行: upload.bat`
+                    text: JSON.stringify(errorResponse, null, 2)
                 }],
             isError: true
         };

package/dist/types/zentao.d.ts

@@ -50,6 +50,14 @@ export interface TaskUpdate {
 }
 export type TaskStatus = 'wait' | 'doing' | 'done' | 'all';
 export type BugStatus = 'active' | 'resolved' | 'closed' | 'all';
+export type ResolutionType = 'fixed' | 'bydesign' | 'duplicate' | 'external' | 'notrepro' | 'postponed' | 'willnotfix';
+export interface ResolveBugRequest {
+    resolution: ResolutionType;
+    resolvedBuild?: string;
+    assignedTo?: string;
+    comment?: string;
+    duplicateBug?: number;
+}
 export interface User {
     id: number;
     account: string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zzp123/mcp-zentao",
-    "version": "1.3.2",
+    "version": "1.4.1",
     "description": "禅道项目管理系统的高级API集成包，提供任务管理、Bug跟踪等功能的完整封装，专为Cursor IDE设计的MCP扩展",
     "main": "dist/index.js",
     "type": "module",