@d5render/cli 0.0.90 → 0.0.91

package/bin/copilot.js

@@ -14797,10 +14797,10 @@ var require_core$1 = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Ajv$2.ValidationError = validation_error_1$1.default;
 	Ajv$2.MissingRefError = ref_error_1$3.default;
 	exports.default = Ajv$2;
-	function checkOptions(checkOpts, options, msg, log$1 = "error") {
+	function checkOptions(checkOpts, options, msg, log = "error") {
 		for (const key in checkOpts) {
 			const opt = key;
-			if (opt in options) this.logger[log$1](`${msg}: option ${key}. ${checkOpts[opt]}`);
+			if (opt in options) this.logger[log](`${msg}: option ${key}. ${checkOpts[opt]}`);
 		}
 	}
 	function getSchEnv(keyRef) {
@@ -18510,53 +18510,6 @@ const config = JSON.stringify({ mcpServers: { [name]: {
 	tools: ["*"]
 } } });
 
-//#endregion
-//#region packages/builtin/config.ts
-function log(message) {
-	process.stderr.write(`[LOG] ${message}\n`);
-}
-const reportSchema = {
-	title: string().optional().describe("The title of the report"),
-	summary: string().optional().describe("Overall summary of the changes"),
-	relatedJIRAs: array(object({
-		key: string().describe("JIRA issue key, e.g., 'FUS-123'"),
-		summary: string().describe("Summary of the JIRA issue")
-	}).describe("Related JIRA issues")).optional().describe("List of related JIRA issues"),
-	severityIssues: array(object({
-		severity: string().optional().describe("Bug severity levels, such as CRITICAL, HIGH, MEDIUM, LOW."),
-		commitSha: string().optional().describe("The commit SHA associated with the issue"),
-		commitTitle: string().optional().describe("The commit title associated with the issue"),
-		file: string().optional().describe("The file path where the issue is found"),
-		line: string().optional().describe("Line number, e.g., '1-345' pr '205' or '17,35', **must** provide the line of final file"),
-		title: string().optional().describe("A short title for the issue"),
-		details: array(string()).optional().describe("Details about the issue"),
-		suggestions: array(string()).optional().describe("Improvement suggestion"),
-		codeExample: string().optional().describe(`Code modification suggestions, recommended to use code in diff format, like: \`\`\`
-    while (condition) {
-      unchanged line;
--     remove this;
-+     replace it with this;
-+     and this;
-      but keep this the same;
-    }\`\`\`.`)
-	})).optional().describe("List all bugs, Please order by 'severity' sort them from heaviest to lightest."),
-	mainRisks: array(string().describe("Main risk item")).optional().describe("List of main risks"),
-	nextActions: array(string().describe("Description of the action item")).optional().describe("List suggestions for improvement")
-};
-function commonURL() {
-	const { CI_SERVER_URL, CI_PROJECT_PATH, CI_MERGE_REQUEST_IID, CI_COMMIT_SHA } = envUsed;
-	if (!CI_SERVER_URL || !CI_PROJECT_PATH) return {};
-	if (CI_MERGE_REQUEST_IID) return {
-		url: `${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/merge_requests/${CI_MERGE_REQUEST_IID}`,
-		type: "merge_request"
-	};
-	if (CI_COMMIT_SHA) return {
-		url: `${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/commit/${CI_COMMIT_SHA}`,
-		type: "commit"
-	};
-	return {};
-}
-
 //#endregion
 //#region packages/gitlab/config.ts
 const canireview = "can-i-review";
@@ -18591,13 +18544,10 @@ const lastComment = { value: {} };
 const postComments = (report$1) => {
 	const url = commonMergeURL();
 	const { title = "代码审查报告", summary, severityIssues = [], mainRisks = [], nextActions = [] } = report$1;
-	if (severityIssues.length === 0) {
-		log("GitLab: 无问题，跳过提交");
-		return Promise.resolve({ content: [{
-			type: "text",
-			text: "✅ GitLab MCP Report 执行完成，无问题"
-		}] });
-	}
+	if (severityIssues.length === 0) return Promise.resolve({ content: [{
+		type: "text",
+		text: "✅ GitLab MCP Report 执行完成，无问题"
+	}] });
 	let message = `## 📖 ${title}\n`;
 	if (summary) message += `> ${summary}\n\n`;
 	const commitTasks = [];
@@ -18649,40 +18599,27 @@ const postComments = (report$1) => {
 		}
 	}
 	if (nextActions.length > 0) message += "\n\n### 📈 其他建议\n\n-----\n - " + nextActions.join("\n - ");
-	if (!url) {
-		log("GitLab: 跳过提交 - push 事件，无合并请求");
-		return Promise.resolve({ content: [{
-			type: "text",
-			text: "⚠️ 当前为 push 事件，无合并请求，无法在 GitLab 中发布报告。报告内容已生成但未发布。"
-		}] });
-	}
-	log(`GitLab: 开始提交 - 行内评论: ${commitTasks.length} 条, 总结报告: 1 条`);
-	return Promise.allSettled(commitTasks.map((task) => task())).then((results) => {
-		const successCount = results.filter((r) => r.status === "fulfilled").length;
-		const failCount = results.filter((r) => r.status === "rejected").length;
-		if (commitTasks.length > 0) log(`GitLab: 行内评论完成 - 成功: ${successCount}, 失败: ${failCount}`);
-		return fetch(url + `/notes`, {
-			method: "POST",
-			headers: commonHeaders$1(),
-			body: JSON.stringify({ body: message })
-		});
-	}).then((res) => res.json()).then((res) => {
+	if (!url) return Promise.resolve({ content: [{
+		type: "text",
+		text: "⚠️ 当前为 push 事件，无合并请求，无法在 GitLab 中发布报告。报告内容已生成但未发布。"
+	}] });
+	return Promise.allSettled(commitTasks.map((task) => task())).then(() => fetch(url + `/notes`, {
+		method: "POST",
+		headers: commonHeaders$1(),
+		body: JSON.stringify({ body: message })
+	})).then((res) => res.json()).then((res) => {
 		lastComment.value = res;
-		log(`GitLab: 总结报告已发布`);
 		return { content: [{
 			type: "text",
 			text: "✅ GitLab 代码审查报告已发布。"
 		}] };
-	}).catch((error$1) => {
-		log(`GitLab: 提交失败 - ${error$1.message || error$1.reason || "未知错误"}`);
-		return {
-			content: [{
-				type: "text",
-				text: errorMessage + `-report, reason: ${error$1.message || error$1.reason || "未知错误"}`
-			}],
-			isError: true
-		};
-	});
+	}).catch((error$1) => ({
+		content: [{
+			type: "text",
+			text: errorMessage + `-report, reason: ${error$1.message || error$1.reason || "未知错误"}`
+		}],
+		isError: true
+	}));
 };
 function toCode(code) {
 	const ct = code.trim();
@@ -18751,25 +18688,63 @@ function installGitlab(server$1) {
 	}, getMergeInfomation);
 }
 
+//#endregion
+//#region packages/builtin/config.ts
+const reportSchema = {
+	title: string().optional().describe("The title of the report"),
+	summary: string().optional().describe("Overall summary of the changes"),
+	relatedJIRAs: array(object({
+		key: string().describe("JIRA issue key, e.g., 'FUS-123'"),
+		summary: string().describe("Summary of the JIRA issue")
+	}).describe("Related JIRA issues")).optional().describe("List of related JIRA issues"),
+	severityIssues: array(object({
+		severity: string().optional().describe("Bug severity levels, such as CRITICAL, HIGH, MEDIUM, LOW."),
+		commitSha: string().optional().describe("The commit SHA associated with the issue"),
+		commitTitle: string().optional().describe("The commit title associated with the issue"),
+		file: string().optional().describe("The file path where the issue is found"),
+		line: string().optional().describe("Line number, e.g., '1-345' pr '205' or '17,35', **must** provide the line of final file"),
+		title: string().optional().describe("A short title for the issue"),
+		details: array(string()).optional().describe("Details about the issue"),
+		suggestions: array(string()).optional().describe("Improvement suggestion"),
+		codeExample: string().optional().describe(`Code modification suggestions, recommended to use code in diff format, like: \`\`\`
+    while (condition) {
+      unchanged line;
+-     remove this;
++     replace it with this;
++     and this;
+      but keep this the same;
+    }\`\`\`.`)
+	})).optional().describe("List all bugs, Please order by 'severity' sort them from heaviest to lightest."),
+	mainRisks: array(string().describe("Main risk item")).optional().describe("List of main risks"),
+	nextActions: array(string().describe("Description of the action item")).optional().describe("List suggestions for improvement")
+};
+function commonURL() {
+	const { CI_SERVER_URL, CI_PROJECT_PATH, CI_MERGE_REQUEST_IID, CI_COMMIT_SHA } = envUsed;
+	if (!CI_SERVER_URL || !CI_PROJECT_PATH) return {};
+	if (CI_MERGE_REQUEST_IID) return {
+		url: `${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/merge_requests/${CI_MERGE_REQUEST_IID}`,
+		type: "merge_request"
+	};
+	if (CI_COMMIT_SHA) return {
+		url: `${CI_SERVER_URL}/${CI_PROJECT_PATH}/-/commit/${CI_COMMIT_SHA}`,
+		type: "commit"
+	};
+	return {};
+}
+
 //#endregion
 //#region packages/builtin/dingding.ts
 const postComments$1 = (report$1) => {
 	const { CI_PROJECT_NAME = "", CI_COMMIT_SHA = "", CI_COMMIT_AUTHOR = "", CI_COMMIT_AUTHOR_EMAIL = "", JIRA_BASE_URL, CI_MERGE_REQUEST_IID, DINGTALK_WEBHOOK } = envUsed;
-	if (!DINGTALK_WEBHOOK) {
-		log("钉钉: 跳过推送 - 无 Webhook 配置");
-		return { content: [{
-			type: "text",
-			text: "✅ 无 DingDing Webhook 配置，跳过推送。"
-		}] };
-	}
+	if (!DINGTALK_WEBHOOK) return { content: [{
+		type: "text",
+		text: "✅ 无 DingDing Webhook 配置，跳过推送。"
+	}] };
 	const { title = "代码审查报告", mainRisks = [], relatedJIRAs = [], severityIssues = [] } = report$1;
-	if (severityIssues.length === 0) {
-		log("钉钉: 跳过推送 - 无问题");
-		return { content: [{
-			type: "text",
-			text: "✅ 无问题，跳过DingDing推送。"
-		}] };
-	}
+	if (severityIssues.length === 0) return { content: [{
+		type: "text",
+		text: "✅ 无问题，跳过DingDing推送。"
+	}] };
 	let { url, type } = commonURL();
 	let message = `### 📖 ${title}\n\n**共计**：${severityIssues.length}个问题\n\n${mainRisks.length >= 0 ? "**主要风险**：\n\n" + mainRisks.join("\n\n") + "\n\n" : "\n\n"}-----\n\n**项目名**：${CI_PROJECT_NAME}\n\n**作者**：${CI_COMMIT_AUTHOR}${CI_COMMIT_AUTHOR_EMAIL ? ` <${CI_COMMIT_AUTHOR_EMAIL}>` : ""}`;
 	if (type) {
@@ -18823,7 +18798,6 @@ const postComments$1 = (report$1) => {
 		hashLength++;
 	}
 	if (relatedJIRAs.length > 0) message += `\n\n\n\n#### 🔗 关联 JIRA\n ${relatedJIRAs.map((v) => `[${v.key}](${JIRA_BASE_URL}/browse/${v.key}): ${v.summary}`).join("\n\n")}`;
-	log(`钉钉: 开始推送 - 问题数: ${severityIssues.length}, 项目: ${CI_PROJECT_NAME}`);
 	return fetch(DINGTALK_WEBHOOK, {
 		method: "POST",
 		headers: { "Content-Type": "application/json" },
@@ -18842,31 +18816,22 @@ const postComments$1 = (report$1) => {
 		if (!response.ok) throw new Error("");
 		return response.json();
 	}).then((res) => {
-		if (res.errcode === 0) {
-			log("钉钉: 推送成功");
-			return { content: [{
-				type: "text",
-				text: "✅ DingDing 代码审查报告已推送。"
-			}] };
-		}
-		if (res.errcode === 31e4) {
-			log("钉钉: 推送成功，但被关键词拦截");
-			return { content: [{
-				type: "text",
-				text: "✅ DingDing 代码审查报告已推送，但被屏蔽关键词拦截。"
-			}] };
-		}
+		if (res.errcode === 0) return { content: [{
+			type: "text",
+			text: "✅ DingDing 代码审查报告已推送。"
+		}] };
+		if (res.errcode === 31e4) return { content: [{
+			type: "text",
+			text: "✅ DingDing 代码审查报告已推送，但被屏蔽关键词拦截。"
+		}] };
 		throw new Error("Post comments to DingTalk with error code:" + res.errcode + ", message: " + res.errmsg);
-	}).catch((error$1) => {
-		log(`钉钉: 推送失败 - ${error$1.message || "Post comments to DingTalk failed"}`);
-		return {
-			content: [{
-				type: "text",
-				text: errorMessage + "-dingding, reason: " + (error$1.message || "Post comments to DingTalk failed")
-			}],
-			isError: true
-		};
-	});
+	}).catch((error$1) => ({
+		content: [{
+			type: "text",
+			text: errorMessage + "-dingding, reason: " + (error$1.message || "Post comments to DingTalk failed")
+		}],
+		isError: true
+	}));
 };
 
 //#endregion
@@ -18921,20 +18886,15 @@ function install(server$1) {
 		description: noMandatory,
 		inputSchema: reportSchema
 	}, async (...args) => {
-		log(`报告提交开始 - 问题数: ${args[0]?.severityIssues?.length || 0}`);
 		const git = await postComments(...args);
 		const ding = await postComments$1(...args);
-		if (git.isError || ding.isError) {
-			log(`报告提交失败 - GitLab: ${git.isError ? "失败" : "成功"}, 钉钉: ${ding.isError ? "失败" : "成功"}`);
-			return {
-				content: [{
-					type: "text",
-					text: [...git.isError ? git.content : [], ...ding.isError ? ding.content : []].map((c) => c.text).join(", ")
-				}],
-				isError: true
-			};
-		}
-		log(`报告提交成功 - GitLab: 已发布, 钉钉: 已推送`);
+		if (git.isError || ding.isError) return {
+			content: [{
+				type: "text",
+				text: [...git.isError ? git.content : [], ...ding.isError ? ding.content : []].map((c) => c.text).join(", ")
+			}],
+			isError: true
+		};
 		return { content: [{
 			type: "text",
 			text: args[0]?.summary || ""

package/bin/d5cli

@@ -2,10 +2,13 @@
 
 import { execSync, spawn } from "node:child_process";
 import { existsSync, readFileSync } from "node:fs";
-import { join } from "node:path";
+import { dirname, join } from "node:path";
 import { env, exit, platform } from "node:process";
+import { fileURLToPath } from "node:url";
 import { errorMessage, getHash, name, report, tools } from "../copilot.config.js";
 
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
 const prompt = `call the mcp tool '${name}-${getHash}' to load review commits, if the task encounters an error, throw that, otherwise, you can decide for yourself which tools to use to enrich context and determine whether a specific commit needs to be reviewed.
 Then, use chinese as default language to organize the report into JSON format and call the mcp tool '${name}-${report}', please ignore error encountered when calling this and report title should not contain words such as MCP or "中文".`;
 
@@ -76,6 +79,21 @@ function findCopilopt() {
       ? copilotPackage.bin
       : copilotPackage.bin?.copilot || copilotPackage.bin?.["@github/copilot"];
   if (!binPath) throw new Error("找不到 copilot 可执行文件路径");
-  console.log(join(copilot, binPath), "copilot 已经被发现");
+  const copilotVersion = copilotPackage.version || "未知版本";
+
+  // 读取 d5cli 的版本
+  const d5cliPkg = join(__dirname, "..", "package.json");
+  let d5cliVersion = "未知版本";
+  if (existsSync(d5cliPkg)) {
+    try {
+      const d5cliPackage = JSON.parse(readFileSync(d5cliPkg, "utf8"));
+      d5cliVersion = d5cliPackage.version || "未知版本";
+    } catch {}
+  }
+
+  console.log(
+    join(copilot, binPath),
+    `copilot 已经被发现，copilot 版本: ${copilotVersion}, d5cli 版本: ${d5cliVersion}`
+  );
   return join(copilot, binPath);
 }

package/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "author": "jasirou",
   "main": "./bin/d5cli",
-  "version": "0.0.90",
+  "version": "0.0.91",
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.24.3",
     "@types/node": "22.18.1",