cloudcc-cli 2.2.6 → 2.2.7

package/src/mcp/tools/Approval/handler.js

@@ -1,151 +1,5 @@
-/**
- * Approval 工具处理器
- * 提供审批相关的功能：拉取待审批记录、审批通过、拒绝审批
- */
-
 const { z } = require('zod');
-const axios = require('axios');
-
-const service = axios.create({
-    timeout: 60000,
-    headers: {
-        'Content-Type': 'application/json; charset=utf-8',
-    },
-});
-
-const postClass = (url, data = {}, accessToken) => {
-    if (accessToken) {
-        return service({
-            url,
-            method: 'post',
-            headers: { accessToken },
-            data
-        });
-    }
-    console.error();
-    console.error('Failed: \nOpenAPI Token is null. \nPlease provide token via参数.');
-    console.error();
-};
-
-// 统一校验 token 与 apiSvc，完全依赖入参便于迁移
-async function loadConfig(token, apiSvcOverride) {
-    const apiSvc = apiSvcOverride;
-    const accessToken = token;
-    if (!apiSvc) {
-        throw new Error('缺少 apiSvc，请通过参数传入接口域名');
-    }
-    if (!accessToken) {
-        throw new Error('缺少访问 token，请通过参数传入');
-    }
-    return { accessToken, apiSvc };
-}
-
-async function requestPendingApprovals(queryParams, token, apiSvcOverride) {
-    const { accessToken, apiSvc } = await loadConfig(token, apiSvcOverride);
-    const requestBody = {
-        approvalProjectType: queryParams.approvalProjectType || "0",
-        approvalProcessStatus: queryParams.approvalProcessStatus || "",
-        startTime: queryParams.startTime || "",
-        endTime: queryParams.endTime || "",
-        actor: queryParams.actor || "",
-        related: queryParams.related || "",
-        type: queryParams.type || "",
-        pageNum: queryParams.pageNum || 1,
-        pageSize: queryParams.pageSize || 10
-    };
-
-    const url = `${apiSvc}/api/approval/getAllApprovalHistoryPendingList`;
-    const response = await postClass(url, requestBody, accessToken);
-
-    if (response.result) {
-        const { list = [], zylist = [], allpage } = response.data;
-        const zhaiyaoMap = {};
-        zylist.forEach(item => {
-            zhaiyaoMap[item.id] = item.zhaiyao;
-        });
-
-        const enrichedList = list.map(record => ({
-            ...record,
-            zhaiyao: zhaiyaoMap[record.workItemid] || null
-        }));
-
-        return {
-            list: enrichedList,
-            allpage,
-            total: list.length
-        };
-    }
-
-    throw new Error('获取待审批记录失败: ' + (response.returnInfo || response.message || '未知错误'));
-}
-
-async function approveRequest(approvalParams, token, apiSvcOverride) {
-    const { accessToken, apiSvc } = await loadConfig(token, apiSvcOverride);
-    const { relatedId, workItemId } = approvalParams;
-
-    const getPermissionById = await postClass(
-        `${apiSvc}/api/objectdetail/getPermissionById`,
-        { id: relatedId },
-        accessToken
-    );
-    const { objectApi } = getPermissionById.data;
-
-    const requestBody = {
-        data: JSON.stringify([{ id: relatedId }]),
-        relatedId,
-        comments: '',
-        workItemId,
-        actionType: 'Approved',
-        objectApiName: objectApi,
-    };
-
-    const url = `${apiSvc}/api/approval/updateApprovalProcessOperation`;
-    const response = await postClass(url, requestBody, accessToken);
-
-    if (response.result) {
-        return {
-            success: true,
-            message: response.returnInfo || '审批通过成功',
-            data: response.data
-        };
-    }
-
-    throw new Error('审批通过失败: ' + (response.returnInfo || response.message || '未知错误'));
-}
-
-async function rejectRequest(approvalParams, token, apiSvcOverride) {
-    const { accessToken, apiSvc } = await loadConfig(token, apiSvcOverride);
-    const { relatedId, workItemId, comments } = approvalParams;
-
-    const getPermissionById = await postClass(
-        `${apiSvc}/api/objectdetail/getPermissionById`,
-        { id: relatedId },
-        accessToken
-    );
-    const { objectApi } = getPermissionById.data;
-
-    const requestBody = {
-        data: JSON.stringify([{ id: relatedId }]),
-        relatedId,
-        comments,
-        workItemId,
-        actionType: 'Rejected',
-        objectApiName: objectApi,
-    };
-
-    const url = `${apiSvc}/api/approval/updateApprovalProcessOperation`;
-    const response = await postClass(url, requestBody, accessToken);
-
-    if (response.result) {
-        return {
-            success: true,
-            message: response.returnInfo || '审批拒绝成功',
-            data: response.data
-        };
-    }
-
-    throw new Error('审批拒绝失败: ' + (response.returnInfo || response.message || '未知错误'));
-}
+const { runCcJsonCommand } = require('../../cliRunner');
 
 /**
  * 拉取所有的待审批的记录
@@ -186,11 +40,19 @@ async function getPendingApprovals({
             pageNum,
             pageSize
         };
-        const result = await requestPendingApprovals(queryParams, token, apiSvc);
+        const encoded = encodeURI(JSON.stringify(queryParams));
+        const run = runCcJsonCommand(['get', 'approval', process.cwd(), encoded]);
+        if (!run.success) {
+            return {
+                content: [{ type: 'text', text: `✗ 拉取待审批记录失败: ${run.detail || 'cc 命令执行失败'}` }]
+            };
+        }
+        const result = run.data || {};
+        const warn = (token || apiSvc) ? '\n\n提示: 当前已切换为 CLI 调用，token/apiSvc 参数不会覆盖本地配置。' : '';
 
         return {
             content: [
-                { type: 'text', text: "将以下结果转换为markdown表格的模式展示：" + JSON.stringify(result, null, 2) }
+                { type: 'text', text: "将以下结果转换为markdown表格的模式展示：" + JSON.stringify(result, null, 2) + warn }
             ]
         };
     } catch (error) {
@@ -211,6 +73,7 @@ async function approveRecord({
     confirm,
     objid,
     workItemId,
+    token = '',
     apiSvc = ''
 }) {
     try {
@@ -233,7 +96,17 @@ async function approveRecord({
             relatedId: objid,
             workItemId,
         };
-        const result = await approveRequest(approvalParams, token, apiSvc);
+        const encoded = encodeURI(JSON.stringify(approvalParams));
+        const run = runCcJsonCommand(['approve', 'approval', process.cwd(), encoded]);
+        if (!run.success) {
+            return {
+                content: [{ type: 'text', text: `✗ 审批通过失败: ${run.detail || 'cc 命令执行失败'}` }]
+            };
+        }
+        const result = run.data || { success: true };
+        if (token || apiSvc) {
+            result.warning = '当前已切换为 CLI 调用，token/apiSvc 参数不会覆盖本地配置。';
+        }
 
         return {
             content: [{ type: 'text', text: JSON.stringify(result, null, 2) }]
@@ -276,7 +149,17 @@ async function rejectRecord({ confirm, objid, comment = '', workItemId, token =
             workItemId,
             comments: comment
         };
-        const result = await rejectRequest(approvalParams, token, apiSvc);
+        const encoded = encodeURI(JSON.stringify(approvalParams));
+        const run = runCcJsonCommand(['reject', 'approval', process.cwd(), encoded]);
+        if (!run.success) {
+            return {
+                content: [{ type: 'text', text: `✗ 拒绝审批失败: ${run.detail || 'cc 命令执行失败'}` }]
+            };
+        }
+        const result = run.data || { success: true };
+        if (token || apiSvc) {
+            result.warning = '当前已切换为 CLI 调用，token/apiSvc 参数不会覆盖本地配置。';
+        }
 
         return {
             content: [{ type: 'text', text: JSON.stringify(result, null, 2) }]

package/src/mcp/tools/Class Creator/handler.js

@@ -4,29 +4,32 @@
  */
 
 const path = require('path');
-const createClassModule = require('../../../classes/create');
+const { runCcCommand } = require('../../cliRunner');
 
 /**
  * 创建自定义类
  */
 async function createClass({ className, projectPath = process.cwd() }) {
     try {
-        // 临时改变工作目录以兼容原有模块
-        const originalCwd = process.cwd();
-        process.chdir(projectPath);
+        if (!className || !className.trim()) {
+            return { content: [{ type: 'text', text: '✗ 参数缺失: className 必须提供' }] };
+        }
+
+        const resolvedPath = path.resolve(projectPath);
+        const runResult = runCcCommand(['create', 'classes', className], { cwd: resolvedPath });
 
-        try {
-            await createClassModule(className);
-            const classPath = path.join(projectPath, `classes/${className}`);
-            return {
-                content: [{
-                    type: 'text',
-                    text: `✓ 创建成功！\n\n类路径: ${classPath}\n生成的文件:\n  - ${className}.java (主类文件)\n  - ${className}Test.java (测试类文件)\n  - config.json (配置文件)`
-                }]
-            };
-        } finally {
-            process.chdir(originalCwd);
+        if (!runResult.success) {
+            const detail = [runResult.error, runResult.stderr, runResult.stdout].filter(Boolean).join('\n');
+            return { content: [{ type: 'text', text: `✗ 创建失败: ${detail || 'cc 命令执行失败'}` }] };
         }
+
+        const classPath = path.join(resolvedPath, `classes/${className}`);
+        return {
+            content: [{
+                type: 'text',
+                text: `✓ 创建成功！\n\n调用命令: cc create classes ${className}\n执行目录: ${resolvedPath}\n类路径: ${classPath}\n生成的文件:\n  - ${className}.java (主类文件)\n  - ${className}Test.java (测试类文件)\n  - config.json (配置文件)`
+            }]
+        };
     } catch (error) {
         return { content: [{ type: 'text', text: `✗ 创建失败: ${error.message}` }] };
     }

package/src/mcp/tools/Class Detail Retriever/handler.js

@@ -3,7 +3,8 @@
  * 获取自定义类的详细信息
  */
 
-const detailModule = require('../../../classes/detail');
+const path = require('path');
+const { runCcJsonCommand } = require('../../cliRunner');
 
 /**
  * 获取类详细信息
@@ -14,15 +15,13 @@ const detailModule = require('../../../classes/detail');
  */
 async function getClassDetail({ className, classId, projectPath = process.cwd() }) {
     try {
-        const originalCwd = process.cwd();
-        process.chdir(projectPath);
-
-        try {
-            const detail = await detailModule(className, classId);
-            return { content: [{ type: 'text', text: JSON.stringify(detail, null, 2) }] };
-        } finally {
-            process.chdir(originalCwd);
+        const resolvedPath = path.resolve(projectPath);
+        const args = ['detail', 'classes', className || '', classId || ''];
+        const run = runCcJsonCommand(args, { cwd: resolvedPath });
+        if (!run.success) {
+            return { content: [{ type: 'text', text: `✗ 获取失败: ${run.detail || 'cc 命令执行失败'}` }] };
         }
+        return { content: [{ type: 'text', text: JSON.stringify(run.data, null, 2) }] };
     } catch (error) {
         return { content: [{ type: 'text', text: `✗ 获取失败: ${error.message}` }] };
     }

package/src/mcp/tools/Class Editor Guide/handler.js

@@ -7,7 +7,7 @@
  * 2. 需要详细信息时再查询具体API类
  */
 
-const prompt = require('./prompt');
+const { runCcCommand, buildRunDetail } = require('../../cliRunner');
 
 /**
  * 获取编辑指南
@@ -27,34 +27,20 @@ const prompt = require('./prompt');
  */
 async function editClass({ topic = 'overview' } = {}) {
     try {
-        // 验证 topic 参数
-        const validTopics = [
-            'overview',      // 规范 + 最佳实践 + API概要
-            'ccservice',     // CCService 详细文档
-            'object',        // CCObject 详细文档
-            'email',         // SendEmail 详细文档
-            'time',          // TimeUtil 详细文档
-            'user',          // UserInfo 详细文档
-            'logger',        // DevLogger 详细文档
-            'scenarios'      // 常见场景
-        ];
-
-        if (topic && !validTopics.includes(topic)) {
+        const run = runCcCommand(['doc', 'classes', topic]);
+        if (!run.success) {
             return {
                 content: [{
                     type: 'text',
-                    text: `✗ 无效的主题: "${topic}"\n\n支持的主题:\n${validTopics.map(t => `- ${t}`).join('\n')}`
+                    text: `✗ 获取编辑指南失败: ${buildRunDetail(run) || 'cc 命令执行失败'}`
                 }]
             };
         }
 
-        // 获取指定主题的编辑指南
-        const result = prompt.getEditGuide(topic);
-
         return {
             content: [{
                 type: 'text',
-                text: result
+                text: run.stdout || ''
             }]
         };
     } catch (error) {

package/src/mcp/tools/Class List Retriever/handler.js

@@ -3,15 +3,20 @@
  * 提供自定义类的查询功能
  */
 
-const getClassModule = require('../../../classes/get');
+const path = require('path');
+const { runCcJsonCommand } = require('../../cliRunner');
 
 /**
  * 获取类列表
  */
 async function listClasses({ projectPath = process.cwd() }) {
     try {
-
-        let classList = await getClassModule('', projectPath, true);
+        const resolvedPath = path.resolve(projectPath);
+        const run = runCcJsonCommand(['get', 'classes'], { cwd: resolvedPath });
+        if (!run.success) {
+            return { content: [{ type: 'text', text: `✗ 查询失败: ${run.detail || 'cc 命令执行失败'}` }] };
+        }
+        const classList = run.data || [];
 
         if (!classList || classList.length === 0) {
             return { content: [{ type: 'text', text: '未找到任何类' }] };

package/src/mcp/tools/Class Publisher/handler.js

@@ -3,22 +3,20 @@
  * 发布自定义类到服务器
  */
 
-const publishClassModule = require('../../../classes/publish');
+const path = require('path');
+const { runCcCommand, buildRunDetail } = require('../../cliRunner');
 
 /**
  * 发布类到服务器
  */
 async function publishClass({ className, projectPath = process.cwd() }) {
     try {
-        const originalCwd = process.cwd();
-        process.chdir(projectPath);
-
-        try {
-            await publishClassModule(className);
-            return { content: [{ type: 'text', text: `✓ 发布成功！类 ${className} 已发布到服务器` }] };
-        } finally {
-            process.chdir(originalCwd);
+        const resolvedPath = path.resolve(projectPath);
+        const run = runCcCommand(['publish', 'classes', className], { cwd: resolvedPath });
+        if (!run.success) {
+            return { content: [{ type: 'text', text: `✗ 发布失败: ${buildRunDetail(run) || 'cc 命令执行失败'}` }] };
         }
+        return { content: [{ type: 'text', text: `✓ 发布成功！类 ${className} 已发布到服务器` }] };
     } catch (error) {
         return { content: [{ type: 'text', text: `✗ 发布失败: ${error.message}` }] };
     }

package/src/mcp/tools/Class Puller/handler.js

@@ -3,79 +3,20 @@
  * 从服务器拉取自定义类
  */
 
-const fs = require('fs');
 const path = require('path');
-const getClassModule = require('../../../classes/get');
-const pullClassModule = require('../../../classes/pull');
-const pullListModule = require('../../../classes/pullList');
+const { runCcCommand, buildRunDetail } = require('../../cliRunner');
 
 /**
  * 从服务器拉取类
  */
 async function pullClass({ className, projectPath = process.cwd() }) {
     try {
-        const classPath = path.join(projectPath, `classes/${className}`);
-        const configPath = path.join(classPath, 'config.json');
-
-        // 检查本地是否存在该类
-        if (!fs.existsSync(configPath)) {
-            // 本地不存在，查询服务器
-            try {
-                const queryString = encodeURI(JSON.stringify({
-                    name: className
-                }));
-                const classList = await getClassModule(queryString, projectPath, true);
-
-                if (!classList || classList.length === 0) {
-                    return {
-                        content: [{
-                            type: 'text',
-                            text: `✗ 拉取失败: 服务器上不存在类 ${className}`
-                        }]
-                    };
-                }
-
-                // 找到匹配的类
-                const targetClass = classList.find(item => item.name === className || item.apiname === className);
-                if (!targetClass) {
-                    return {
-                        content: [{
-                            type: 'text',
-                            text: `✗ 拉取失败: 服务器上未找到类 ${className}`
-                        }]
-                    };
-                }
-
-                // 使用 ID 从服务器拉取并在本地创建
-                const originalCwd = process.cwd();
-                process.chdir(projectPath);
-
-                try {
-                    await pullListModule(targetClass.id, projectPath, true);
-                    return {
-                        content: [{
-                            type: 'text',
-                            text: `✓ 拉取成功！已从服务器拉取类 ${className} 并在本地创建\n\n本地路径: classes/${className}/`
-                        }]
-                    };
-                } finally {
-                    process.chdir(originalCwd);
-                }
-            } catch (error) {
-                return { content: [{ type: 'text', text: `✗ 拉取失败: ${error.message}` }] };
-            }
-        }
-
-        // 本地存在，直接更新
-        const originalCwd = process.cwd();
-        process.chdir(projectPath);
-
-        try {
-            await pullClassModule(className);
-            return { content: [{ type: 'text', text: `✓ 拉取成功！本地文件已更新: classes/${className}/${className}.java` }] };
-        } finally {
-            process.chdir(originalCwd);
+        const resolvedPath = path.resolve(projectPath);
+        const run = runCcCommand(['pull', 'classes', className], { cwd: resolvedPath });
+        if (!run.success) {
+            return { content: [{ type: 'text', text: `✗ 拉取失败: ${buildRunDetail(run) || 'cc 命令执行失败'}` }] };
         }
+        return { content: [{ type: 'text', text: `✓ 拉取成功！本地文件已更新: classes/${className}/${className}.java` }] };
     } catch (error) {
         return { content: [{ type: 'text', text: `✗ 拉取失败: ${error.message}` }] };
     }

package/src/mcp/tools/Client Script Detail Retriever/handler.js

@@ -3,7 +3,8 @@
  * 获取客户端脚本的详细信息
  */
 
-const detailScriptModule = require('../../../script/detail');
+const path = require('path');
+const { runCcJsonCommand } = require('../../cliRunner');
 
 /**
  * 获取客户端脚本详细信息
@@ -14,29 +15,22 @@ const detailScriptModule = require('../../../script/detail');
  */
 async function getClientScriptDetail({ scriptPath, scriptId, projectPath = process.cwd() }) {
     try {
-        const originalCwd = process.cwd();
-        process.chdir(projectPath);
-
-        try {
-            // 调用 detail.js 模块
-            const detail = await detailScriptModule(['detail', 'script', scriptPath, scriptId, projectPath]);
-
-            return {
-                content: [{
-                    type: 'text',
-                    text: JSON.stringify(detail, null, 2)
-                }]
-            };
-        } catch (error) {
+        const resolvedPath = path.resolve(projectPath);
+        const run = runCcJsonCommand(['detail', 'script', scriptPath || '', scriptId || '', resolvedPath], { cwd: resolvedPath });
+        if (!run.success) {
             return {
                 content: [{
                     type: 'text',
-                    text: `✗ 获取失败: ${error.message}`
+                    text: `✗ 获取失败: ${run.detail || 'cc 命令执行失败'}`
                 }]
             };
-        } finally {
-            process.chdir(originalCwd);
         }
+        return {
+            content: [{
+                type: 'text',
+                text: JSON.stringify(run.data, null, 2)
+            }]
+        };
     } catch (error) {
         return {
             content: [{