@d5render/cli 0.1.28 → 0.1.31

package/bin/copilot.js

@@ -18916,6 +18916,7 @@ const tools = [
 	"--deny-tool",
 	"github-mcp-server"
 ];
+tools.push("--model", "claude-sonnet-4.5");
 function toEnv(key, defaultValue) {
 	return envJson[key] || process.env[key] || defaultValue;
 }
@@ -18934,11 +18935,27 @@ const getCommits = () => {
 	if (url) return fetch(`${url}/commits`, { headers: buildHeaders() }).then((res) => {
 		if (!res.ok) throw new Error("");
 		return res.json();
-	}).then((commits$1) => ({ content: [{
-		type: "text",
-		description: "commits from `merge pipeline`",
-		text: `${commits$1.map((commit) => commit.id).join(",")}, the above review is from \`merge pipeline\` commits.`
-	}] })).catch((error) => ({
+	}).then((commits$1) => {
+		console.log(`[调试] 从 GitLab API 获取了 ${commits$1.length} 个提交记录`);
+		commits$1.forEach((commit, index) => {
+			console.log(`[调试] 提交记录 ${index + 1}:`, {
+				提交ID: commit.id,
+				短ID: commit.short_id,
+				标题: commit.title,
+				消息: commit.message?.substring(0, 50),
+				作者姓名: commit.author_name,
+				作者邮箱: commit.author_email,
+				提交日期: commit.authored_date,
+				提交者姓名: commit.committer_name,
+				提交者邮箱: commit.committer_email
+			});
+		});
+		return { content: [{
+			type: "text",
+			description: "commits from `merge pipeline`",
+			text: `${commits$1.map((commit) => commit.id).join(",")}, the above review is from \`merge pipeline\` commits.`
+		}] };
+	}).catch((error) => ({
 		content: [{
 			type: "text",
 			text: "error" + error.message ? ", reason: " + error.message || "请求GitLab API失败" : ""
@@ -19140,12 +19157,13 @@ function distReports(input) {
 		}
 	}
 	for (const issue$1 of issues) {
-		const { file: file$1 = "NON", commitSha = "", severity: severity$1 = "NON", commitSha: NCommitSha = "NON" } = issue$1;
+		const { file: file$1 = "NON", commitSha = "", severity: severity$1 = "NON", commitSha: NCommitSha = "NON", commitAuthor = "" } = issue$1;
 		const fileList = fileMap.get(file$1) || [], issueList = severityMap.get(severity$1) || [];
 		fileList.push(issue$1);
 		fileMap.set(file$1, fileList);
 		issueList.push(issue$1);
 		severityMap.set(severity$1, issueList);
+		if (commitSha || commitAuthor) console.log(`[调试] 问题提交信息 - 提交SHA: ${commitSha}, 作者: ${commitAuthor}, 文件: ${file$1}`);
 		if (commitSha) commitsSet.add(commitSha);
 		commitsMap.set(NCommitSha, issue$1);
 		distCommitComments(issue$1);
@@ -19210,6 +19228,7 @@ function distReports(input) {
 					break;
 				}
 				const { title: issueTitle = "NON", commitSha = "", file: file$1 = "NON", line = "NON", commitAuthor = "" } = issue$1;
+				console.log(`[调试] 在钉钉报告中使用作者信息 - 提交SHA: ${commitSha}, 作者: ${commitAuthor}, 标题: ${issueTitle}`);
 				const shortSha = (commitSha || "").slice(0, 8);
 				const commitLink = linkBase && commitSha ? `${linkBase}/${commitSha}` : void 0;
 				dingdingReportMessage += `\n- ${issueTitle}\n\n   - hash: ${commitLink ? `[${shortSha}](${commitLink}) ` : shortSha}\n\n   - author: ${commitAuthor}\n\n   - file: ${file$1}\n\n   - line: ${line}`;

package/bin/d5cli

@@ -2,12 +2,12 @@
 import { execSync, spawn } from "node:child_process";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
-import { argv, env, exit, platform } from "node:process";
+import { arch, argv, env, exit, platform, stdout } from "node:process";
 import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name$1 = "@d5render/cli";
-var version = "0.1.28";
+var version = "0.1.31";
 
 //#endregion
 //#region packages/gitlab/url.ts
@@ -178,6 +178,7 @@ const tools = [
 	"--deny-tool",
 	"github-mcp-server"
 ];
+tools.push("--model", "claude-sonnet-4.5");
 function toEnv(key, defaultValue) {
 	return envJson[key] || process.env[key] || defaultValue;
 }
@@ -238,8 +239,12 @@ function installCopilot() {
 
 //#endregion
 //#region copilot/bin/index.ts
+function logImmediate(message) {
+	const text = typeof message === "string" ? message : String(message);
+	stdout.write(text + "\n");
+	if (!stdout.isTTY && stdout._flush) stdout._flush();
+}
 try {
-	console.log("开始代码审查-1");
 	codereview();
 } catch (error) {
 	sendding("CRITICAL", "CRITICAL CI ERROR: 未知错误，请自行检查日志");
@@ -248,11 +253,10 @@ try {
 function codereview() {
 	deploy();
 	if (!need()) {
-		console.log("重复提交，进程跳过");
+		logImmediate("重复提交，进程跳过");
 		return;
 	}
 	install();
-	console.log("开始代码审查-2");
 	const prompt = `Load skills, then call the mcp tool '${name}-${getHash}' to load code-review commits, if the task encounters an error, throw that.
 Otherwise, use chinese as default language to call the mcp tool '${name}-${report}'`;
 	const copilot = spawn("node", [
@@ -276,59 +280,91 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 		},
 		...platform === "win32" && { windowsHide: true }
 	});
+	console.log(`node ${findCopilopt()} ${tools.join(" ")} --stream off -p ${prompt}`);
 	copilot.stdout.setEncoding("utf8");
 	copilot.stderr.setEncoding("utf8");
-	let str = "";
-	function write(chunk) {
-		console.log("这个是写：" + String(chunk));
-	}
 	copilot.stdout.on("data", (chunk) => {
-		str += chunk;
 		process.stdout.write(chunk);
-		write(chunk);
 	});
 	copilot.stderr.on("data", (chunk) => {
-		str += chunk;
 		process.stderr.write(chunk);
-		write(chunk);
 	});
 	copilot.on("close", (code) => {
 		sendding("CRITICAL", "CRITICAL CI ERROR: 代码审查任务失败，请自行检查日志");
 		exit(code);
 	});
 }
+/**
+* 根据平台和架构获取对应的 @github/copilot 包名
+* @returns 包名，如 @github/copilot-win32-x64 或 @github/copilot
+*/
+function getCopilotPackageName() {
+	const platformMap = {
+		win32: "win32",
+		linux: "linux",
+		darwin: "darwin"
+	};
+	const archMap = {
+		x64: "x64",
+		arm64: "arm64"
+	};
+	const platformName = platformMap[platform];
+	const archName = archMap[arch];
+	if (platformName && archName) {
+		const specificPackage = `@github/copilot-${platformName}-${archName}`;
+		try {
+			if (execSync(`npm list ${specificPackage} -g -p`, {
+				encoding: "utf8",
+				stdio: "pipe"
+			}).trim()) {
+				logImmediate(`[调试] 使用平台特定包: ${specificPackage}`);
+				return specificPackage;
+			}
+		} catch {}
+	}
+	logImmediate(`[调试] 使用通用包: @github/copilot`);
+	return "@github/copilot";
+}
 function findCopilopt() {
-	let copilot = execSync("npm list @github/copilot -g -p").toString().trim();
+	const packageName = getCopilotPackageName();
+	let copilot = "";
+	try {
+		copilot = execSync(`npm list ${packageName} -g -p`, {
+			encoding: "utf8",
+			stdio: "pipe"
+		}).trim();
+	} catch {}
 	if (!copilot) {
 		const first = platform === "win32" ? win : linux;
 		const second = platform === "win32" ? linux : win;
-		copilot = first();
-		if (!copilot) copilot = second();
-		if (!copilot) throw new Error("没找到安装的包");
+		copilot = first(packageName);
+		if (!copilot) copilot = second(packageName);
+		if (!copilot) throw new Error(`没找到安装的包: ${packageName}，请运行: npm install -g ${packageName}`);
 	}
 	const pkg = join(copilot, "package.json");
 	if (!existsSync(pkg)) throw new Error("安装的包找不到正确版本 " + pkg);
 	const copilotPackage = JSON.parse(readFileSync(pkg, "utf8"));
-	const binPath = typeof copilotPackage.bin === "string" ? copilotPackage.bin : copilotPackage.bin?.copilot || copilotPackage.bin?.["@github/copilot"];
+	const binPath = typeof copilotPackage.bin === "string" ? copilotPackage.bin : copilotPackage.bin?.copilot || copilotPackage.bin?.["@github/copilot"] || copilotPackage.bin?.[packageName];
 	if (!binPath) throw new Error("non copilot executable found");
 	const copilotVersion = copilotPackage.version || "unknown";
 	const copilotPath = join(copilot, binPath);
-	console.log(`${NAME} server:
+	logImmediate(`${NAME} server:
  version: ${VERSION}
  path: ${serveFile}
 copilot:
+ package: ${packageName}
  version: ${copilotVersion}
  path: ${copilotPath}`);
 	return copilotPath;
 }
-function win() {
+function win(packageName = "@github/copilot") {
 	const pathEnv = env.PATH || env.Path || "";
 	const pathSeparator = platform === "win32" ? ";" : ":";
 	const npm = pathEnv.split(pathSeparator).find((p) => p.includes("npm"));
-	if (npm) return join(npm, "node_modules", "@github", "copilot");
+	if (npm) return join(npm, "node_modules", packageName.replace("/", pathSeparator === ";" ? "\\" : "/"));
 	return "";
 }
-function linux() {
+function linux(packageName = "@github/copilot") {
 	let cached = env.NVM_BIN;
 	if (!cached) {
 		const pathEnv = env.PATH || env.Path || "";
@@ -336,7 +372,10 @@ function linux() {
 		const npm = pathEnv.split(pathSeparator).find((p) => p.includes(".nvm"));
 		if (npm) cached = npm;
 	}
-	if (cached) return join(cached, "..", "lib", "node_modules", "@github", "copilot");
+	if (cached) {
+		const packageDir = packageName.replace("/", "/");
+		return join(cached, "..", "lib", "node_modules", packageDir);
+	}
 	return "";
 }
 

package/package.json

@@ -4,7 +4,7 @@
   "license": "MIT",
   "author": "jasirou",
   "main": "./bin/d5cli",
-  "version": "0.1.28",
+  "version": "0.1.31",
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",
     "@types/node": "^25.0.3",