@d5render/cli 0.1.31 → 0.1.33

package/README.md

@@ -1,3 +1,3 @@
-for devops, [please refer](.skills/devops)
+for devops, please refer [.skills/devops](.skills/devops)
 
-for codereview, [please refer](.skills/review/SKILL.md)
+for codereview, please refer[.skills/review/SKILL.md](.skills/review/SKILL.md)

package/bin/copilot.js

@@ -18872,7 +18872,7 @@ const NAME = name$1.replaceAll("/", "_");
 const RUNTIME_CWD = join(dirname(fileURLToPath(import.meta.url)), "../");
 const HOME = env.USERPROFILE ?? env.HOME ?? env.HOMEPATH;
 if (!HOME) throw new Error("cannot find `USERPROFILE` directory");
-const TEMP = env.CI_PROJECT_DIR + NAME;
+const TEMP = env.CI_PROJECT_DIR + "." + NAME;
 
 //#endregion
 //#region copilot/server/config.ts

package/bin/d5cli

@@ -7,7 +7,59 @@ import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name$1 = "@d5render/cli";
-var version = "0.1.31";
+var version = "0.1.33";
+
+//#endregion
+//#region copilot/server/config.ts
+const name = "d5_mcp_review_builtin";
+const report = "report";
+const getHash = "hash";
+const file = "bin/copilot.js";
+const serveFile = join(RUNTIME_CWD, file);
+const envJson = buildEnv();
+const envUsed = {
+	CI_SERVER_URL: toEnv("CI_SERVER_URL"),
+	CI_PROJECT_PATH: toEnv("CI_PROJECT_PATH"),
+	CI_PROJECT_ID: toEnv("CI_PROJECT_ID"),
+	CI_PROJECT_NAME: toEnv("CI_PROJECT_NAME"),
+	CI_COMMIT_SHA: toEnv("CI_COMMIT_SHA"),
+	CI_COMMIT_BEFORE_SHA: toEnv("CI_COMMIT_BEFORE_SHA"),
+	CI_MERGE_REQUEST_IID: toEnv("CI_MERGE_REQUEST_IID"),
+	CI_MERGE_REQUEST_TITLE: toEnv("CI_MERGE_REQUEST_TITLE"),
+	CI_MERGE_REQUEST_DESCRIPTION: toEnv("CI_MERGE_REQUEST_DESCRIPTION"),
+	JIRA_BASE_URL: toEnv("JIRA_BASE_URL", "http://jira.d5techs.com.cn"),
+	DINGTALK_WEBHOOK: toEnv("DINGTALK_WEBHOOK"),
+	GITLAB_TOKEN: toEnv("GITLAB_TOKEN"),
+	JIRA_PAT: toEnv("JIRA_PAT"),
+	JIRA_COOKIE: toEnv("JIRA_COOKIE"),
+	JIRA_USERNAME: toEnv("JIRA_USERNAME"),
+	JIRA_PASSWORD: toEnv("JIRA_PASSWORD")
+};
+const tools = [
+	"--additional-mcp-config",
+	JSON.stringify({ mcpServers: { [name]: {
+		type: "local",
+		command: "node",
+		args: [serveFile, `--customizenv=${JSON.stringify(envUsed)}`],
+		tools: ["*"]
+	} } }),
+	"--allow-all-paths",
+	"--allow-all-tools",
+	"--deny-tool",
+	"write",
+	"--deny-tool",
+	"github-mcp-server"
+];
+tools.push("--model", "claude-sonnet-4.5");
+function toEnv(key, defaultValue) {
+	return envJson[key] || process.env[key] || defaultValue;
+}
+function buildEnv() {
+	const envArg = argv.find((arg) => arg.startsWith("--customizenv="));
+	let envJson$1 = {};
+	if (envArg) envJson$1 = JSON.parse(envArg.replace("--customizenv=", ""));
+	return envJson$1;
+}
 
 //#endregion
 //#region packages/gitlab/url.ts
@@ -71,8 +123,16 @@ const VERSION = version;
 const RUNTIME_CWD = join(dirname(fileURLToPath(import.meta.url)), "../");
 const HOME = env.USERPROFILE ?? env.HOME ?? env.HOMEPATH;
 if (!HOME) throw new Error("cannot find `USERPROFILE` directory");
-const TEMP = env.CI_PROJECT_DIR + NAME;
-function deploy() {
+const TEMP = env.CI_PROJECT_DIR + "." + NAME;
+const dingding = async (...args) => {
+	try {
+		const msg = await (await sendding(...args)).text();
+		console.log(msg);
+	} catch (error) {
+		console.error(error);
+	}
+};
+async function deploy() {
 	if (!env.CI) return;
 	const config = join(HOME, ".copilot/config.json"), dir = join(HOME, ".copilot/skills/codereview");
 	console.log("deploy...");
@@ -82,6 +142,14 @@ function deploy() {
 	}
 	if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
 	const versiono = readFileSync(join(RUNTIME_CWD, ".skills/review/version"), "utf8");
+	const changelog = readFileSync(join(RUNTIME_CWD, "CHANGELOG.md"), "utf8");
+	const cachepath = join(TEMP, "CHANGELOG");
+	if (changelog !== (existsSync(cachepath) ? readFileSync(cachepath, "utf8") : "")) {
+		if (!existsSync(TEMP)) mkdirSync(TEMP, { recursive: true });
+		writeFileSync(cachepath, changelog, "utf8");
+		console.log("updated CHANGELOG cache.");
+		await dingding("NOTICE", `codereview skills has been updated to version ${versiono}\n\nfor more details, please refer to [ONLINE](https://www.npmjs.com/package/@d5render/cli?activeTab=readme)`);
+	}
 	const versionnPath = join(dir, "version");
 	if ((existsSync(versionnPath) ? readFileSync(versionnPath, "utf8") : "") === versiono) return;
 	const skillRoot = join(RUNTIME_CWD, ".skills/review");
@@ -89,25 +157,16 @@ function deploy() {
 	const instructionsRoot = join(RUNTIME_CWD, ".github/instructions");
 	readdirSync(instructionsRoot).forEach((instruction) => copyFileSync(join(instructionsRoot, instruction), join(dir, instruction)));
 	console.log("to new skill.");
-	const changelog = readFileSync(join(RUNTIME_CWD, "CHANGELOG.md"), "utf8");
-	const cachepath = join(TEMP, "CHANGELOG");
-	if (!existsSync(TEMP)) mkdirSync(TEMP, { recursive: true });
-	if (changelog !== (existsSync(cachepath) ? readFileSync(cachepath, "utf8") : "")) {
-		if (!existsSync(cachepath)) mkdirSync(cachepath, { recursive: true });
-		writeFileSync(cachepath, changelog, "utf8");
-		console.log("updated CHANGELOG cache.");
-		sendding("NOTICE", `NOTICE: codereview skills has been updated to version ${versiono}\n\nfor more details, please refer to [ONLINE](https://www.npmjs.com/package/@d5render/cli?activeTab=readme)`);
-	}
 }
-function need() {
+async function need() {
 	if (!env.CI) return;
-	if (!existsSync(TEMP)) mkdirSync(TEMP, { recursive: true });
 	const { CI_MERGE_REQUEST_IID, CI_COMMIT_SHA } = env;
 	const file$1 = join(TEMP, "CODEREVIEW");
 	if (CI_MERGE_REQUEST_IID) {
 		let appended = `${existsSync(file$1) ? readFileSync(file$1, "utf8") : ""}\n${CI_MERGE_REQUEST_IID}`.split("\n");
 		const max = 1e4;
 		if (appended.length > max) appended = appended.slice(-max);
+		if (!existsSync(TEMP)) mkdirSync(TEMP, { recursive: true });
 		writeFileSync(file$1, appended.join("\n"), "utf8");
 		console.log("merge pipeline, recorded IID:", CI_MERGE_REQUEST_IID, "to:", file$1);
 		return true;
@@ -125,70 +184,18 @@ function need() {
 		console.warn(`Merge Request !${iid} has been AI reviewed before.`);
 		const mergeURL = visitPipeline(iid).url;
 		const url = `${commits()}/${CI_COMMIT_SHA}/comments`;
-		fetch(url, {
+		await fetch(url, {
 			method: "POST",
 			headers: buildHeaders(),
 			body: JSON.stringify({
 				note: `请查看管道评论：${mergeURL}#note`,
 				line_type: "new"
 			})
-		}).then((res) => res.text());
+		}).then((res) => res.text()).then((v) => console.log(v)).catch((e) => console.error(e));
 	}
 	return !yes;
 }
 
-//#endregion
-//#region copilot/server/config.ts
-const name = "d5_mcp_review_builtin";
-const report = "report";
-const getHash = "hash";
-const file = "bin/copilot.js";
-const serveFile = join(RUNTIME_CWD, file);
-const envJson = buildEnv();
-const envUsed = {
-	CI_SERVER_URL: toEnv("CI_SERVER_URL"),
-	CI_PROJECT_PATH: toEnv("CI_PROJECT_PATH"),
-	CI_PROJECT_ID: toEnv("CI_PROJECT_ID"),
-	CI_PROJECT_NAME: toEnv("CI_PROJECT_NAME"),
-	CI_COMMIT_SHA: toEnv("CI_COMMIT_SHA"),
-	CI_COMMIT_BEFORE_SHA: toEnv("CI_COMMIT_BEFORE_SHA"),
-	CI_MERGE_REQUEST_IID: toEnv("CI_MERGE_REQUEST_IID"),
-	CI_MERGE_REQUEST_TITLE: toEnv("CI_MERGE_REQUEST_TITLE"),
-	CI_MERGE_REQUEST_DESCRIPTION: toEnv("CI_MERGE_REQUEST_DESCRIPTION"),
-	JIRA_BASE_URL: toEnv("JIRA_BASE_URL", "http://jira.d5techs.com.cn"),
-	DINGTALK_WEBHOOK: toEnv("DINGTALK_WEBHOOK"),
-	GITLAB_TOKEN: toEnv("GITLAB_TOKEN"),
-	JIRA_PAT: toEnv("JIRA_PAT"),
-	JIRA_COOKIE: toEnv("JIRA_COOKIE"),
-	JIRA_USERNAME: toEnv("JIRA_USERNAME"),
-	JIRA_PASSWORD: toEnv("JIRA_PASSWORD")
-};
-const tools = [
-	"--additional-mcp-config",
-	JSON.stringify({ mcpServers: { [name]: {
-		type: "local",
-		command: "node",
-		args: [serveFile, `--customizenv=${JSON.stringify(envUsed)}`],
-		tools: ["*"]
-	} } }),
-	"--allow-all-paths",
-	"--allow-all-tools",
-	"--deny-tool",
-	"write",
-	"--deny-tool",
-	"github-mcp-server"
-];
-tools.push("--model", "claude-sonnet-4.5");
-function toEnv(key, defaultValue) {
-	return envJson[key] || process.env[key] || defaultValue;
-}
-function buildEnv() {
-	const envArg = argv.find((arg) => arg.startsWith("--customizenv="));
-	let envJson$1 = {};
-	if (envArg) envJson$1 = JSON.parse(envArg.replace("--customizenv=", ""));
-	return envJson$1;
-}
-
 //#endregion
 //#region copilot/bin/install.ts
 function install() {
@@ -247,13 +254,13 @@ function logImmediate(message) {
 try {
 	codereview();
 } catch (error) {
-	sendding("CRITICAL", "CRITICAL CI ERROR: 未知错误，请自行检查日志");
+	dingding("CRITICAL", "CI ERROR: 未知错误，请自行检查日志");
 	throw error;
 }
-function codereview() {
-	deploy();
-	if (!need()) {
-		logImmediate("重复提交，进程跳过");
+async function codereview() {
+	await deploy();
+	if (!await need()) {
+		console.log("重复提交，进程跳过");
 		return;
 	}
 	install();
@@ -280,7 +287,6 @@ 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");
 	copilot.stdout.on("data", (chunk) => {
@@ -290,61 +296,41 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 		process.stderr.write(chunk);
 	});
 	copilot.on("close", (code) => {
-		sendding("CRITICAL", "CRITICAL CI ERROR: 代码审查任务失败，请自行检查日志");
+		if (!code) dingding("CRITICAL", "CI ERROR: 代码审查任务失败，请自行检查日志");
 		exit(code);
 	});
 }
 /**
-* 根据平台和架构获取对应的 @github/copilot 包名
-* @returns 包名，如 @github/copilot-win32-x64 或 @github/copilot
+* 根据操作系统和架构获取对应的 copilot 包名
+* @returns 平台特定的包名数组，按优先级排序
 */
-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 getCopilotPackageNames() {
+	const packages = [];
+	if (platform === "win32" && arch === "x64") packages.push("@github/copilot-win32-x64");
+	else if (platform === "linux" && arch === "x64") packages.push("@github/copilot-linux-x64");
+	else if (platform === "linux" && arch === "arm64") packages.push("@github/copilot-linux-arm64");
+	else if (platform === "darwin" && arch === "arm64") packages.push("@github/copilot-darwin-arm64");
+	packages.push("@github/copilot");
+	return packages;
 }
 function findCopilopt() {
-	const packageName = getCopilotPackageName();
+	const packageNames = getCopilotPackageNames();
 	let copilot = "";
-	try {
-		copilot = execSync(`npm list ${packageName} -g -p`, {
-			encoding: "utf8",
-			stdio: "pipe"
-		}).trim();
+	for (const packageName of packageNames) try {
+		copilot = execSync(`npm list ${packageName} -g -p`).toString().trim();
+		if (copilot) break;
 	} catch {}
 	if (!copilot) {
 		const first = platform === "win32" ? win : linux;
 		const second = platform === "win32" ? linux : win;
-		copilot = first(packageName);
-		if (!copilot) copilot = second(packageName);
-		if (!copilot) throw new Error(`没找到安装的包: ${packageName}，请运行: npm install -g ${packageName}`);
+		copilot = first();
+		if (!copilot) copilot = second();
+		if (!copilot) throw new Error("没找到安装的包");
 	}
 	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"] || copilotPackage.bin?.[packageName];
+	const binPath = typeof copilotPackage.bin === "string" ? copilotPackage.bin : copilotPackage.bin?.copilot || copilotPackage.bin?.["@github/copilot"];
 	if (!binPath) throw new Error("non copilot executable found");
 	const copilotVersion = copilotPackage.version || "unknown";
 	const copilotPath = join(copilot, binPath);
@@ -352,19 +338,23 @@ function findCopilopt() {
  version: ${VERSION}
  path: ${serveFile}
 copilot:
- package: ${packageName}
  version: ${copilotVersion}
  path: ${copilotPath}`);
 	return copilotPath;
 }
-function win(packageName = "@github/copilot") {
+function win() {
 	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", packageName.replace("/", pathSeparator === ";" ? "\\" : "/"));
+	if (!npm) return "";
+	const packageNames = getCopilotPackageNames();
+	for (const packageName of packageNames) {
+		const packagePath = join(npm, "node_modules", ...packageName.split("/"));
+		if (existsSync(join(packagePath, "package.json"))) return packagePath;
+	}
 	return "";
 }
-function linux(packageName = "@github/copilot") {
+function linux() {
 	let cached = env.NVM_BIN;
 	if (!cached) {
 		const pathEnv = env.PATH || env.Path || "";
@@ -372,9 +362,11 @@ function linux(packageName = "@github/copilot") {
 		const npm = pathEnv.split(pathSeparator).find((p) => p.includes(".nvm"));
 		if (npm) cached = npm;
 	}
-	if (cached) {
-		const packageDir = packageName.replace("/", "/");
-		return join(cached, "..", "lib", "node_modules", packageDir);
+	if (!cached) return "";
+	const packageNames = getCopilotPackageNames();
+	for (const packageName of packageNames) {
+		const packagePath = join(cached, "..", "lib", "node_modules", ...packageName.split("/"));
+		if (existsSync(join(packagePath, "package.json"))) return packagePath;
 	}
 	return "";
 }

package/package.json

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