@d5render/cli 0.1.38 → 0.1.40

package/bin/d5cli

@@ -2,16 +2,11 @@
 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 { arch, argv, env, exit, platform, stdout } from "node:process";
+import { argv, env, exit, platform } from "node:process";
 import { fileURLToPath } from "node:url";
 
-//#region package.json
-var name$1 = "@d5render/cli";
-var version = "0.1.38";
-
-//#endregion
 //#region copilot/server/config.ts
-const name = "d5_mcp_review_builtin";
+const name$1 = "d5_mcp_review_builtin";
 const report = "report";
 const getHash = "hash";
 const file = "bin/copilot.js";
@@ -39,7 +34,7 @@ const envUsed = {
 };
 const tools = [
 	"--additional-mcp-config",
-	JSON.stringify({ mcpServers: { [name]: {
+	JSON.stringify({ mcpServers: { [name$1]: {
 		type: "local",
 		command: "node",
 		args: [serveFile, `--customizenv=${JSON.stringify(envUsed)}`],
@@ -63,6 +58,59 @@ function buildEnv() {
 	return envJson$1;
 }
 
+//#endregion
+//#region copilot/bin/install.ts
+function install() {
+	if (!env.CI) return;
+	console.log("install copilot...");
+	let success = false;
+	let local = "";
+	try {
+		local = execSync("npm list @github/copilot -g --depth=0 --json").toString();
+	} catch {
+		local = "{}";
+	}
+	try {
+		const localInfo = JSON.parse(local);
+		const localVersion = localInfo.dependencies ? localInfo.dependencies?.["@github/copilot"]?.version : void 0;
+		if (!localVersion) {
+			installCopilot();
+			success = true;
+			console.log("install copilot success");
+			return;
+		}
+		if (localVersion !== execSync("npm view @github/copilot version --registry=https://registry.npmmirror.com").toString().trim()) {
+			execSync("npm uninstall -g @github/copilot --force");
+			installCopilot();
+			success = true;
+			console.log("update copilot success");
+		} else {
+			success = true;
+			console.log("copilot exists and is up-to-date");
+		}
+	} catch (error) {
+		console.error(error);
+	}
+	if (!success) try {
+		console.warn("try to reinstall copilot...");
+		installCopilot();
+		success = true;
+	} catch (error) {
+		console.error(error);
+	}
+	if (success) return;
+	console.warn("try to reinstall copilot...");
+	installCopilot();
+}
+function installCopilot() {
+	execSync("npm install -g @github/copilot --registry=https://registry.npmmirror.com", { stdio: "inherit" });
+}
+
+//#endregion
+//#region package.json
+var name = "@d5render/cli";
+var version = "0.1.40";
+
 //#endregion
 //#region packages/gitlab/url.ts
 function buildHeaders() {
@@ -120,7 +168,7 @@ async function sendding(title, text) {
 
 //#endregion
 //#region copilot/bin/utils.ts
-const NAME = name$1.replaceAll("/", "_");
+const NAME = name.replaceAll("/", "_");
 const VERSION = version;
 const HOME = env.USERPROFILE ?? env.HOME ?? env.HOMEPATH;
 if (!HOME) throw new Error("cannot find `USERPROFILE` directory");
@@ -197,61 +245,8 @@ async function need() {
 	return !yes;
 }
 
-//#endregion
-//#region copilot/bin/install.ts
-function install() {
-	if (!env.CI) return;
-	console.log("install copilot...");
-	let success = false;
-	let local = "";
-	try {
-		local = execSync("npm list @github/copilot -g --depth=0 --json").toString();
-	} catch {
-		local = "{}";
-	}
-	try {
-		const localInfo = JSON.parse(local);
-		const localVersion = localInfo.dependencies ? localInfo.dependencies?.["@github/copilot"]?.version : void 0;
-		if (!localVersion) {
-			installCopilot();
-			success = true;
-			console.log("install copilot success");
-			return;
-		}
-		if (localVersion !== execSync("npm view @github/copilot version --registry=https://registry.npmmirror.com").toString().trim()) {
-			execSync("npm uninstall -g @github/copilot --force");
-			installCopilot();
-			success = true;
-			console.log("update copilot success");
-		} else {
-			success = true;
-			console.log("copilot exists and is up-to-date");
-		}
-	} catch (error) {
-		console.error(error);
-	}
-	if (!success) try {
-		console.warn("try to reinstall copilot...");
-		installCopilot();
-		success = true;
-	} catch (error) {
-		console.error(error);
-	}
-	if (success) return;
-	console.warn("try to reinstall copilot...");
-	installCopilot();
-}
-function installCopilot() {
-	execSync("npm install -g @github/copilot --registry=https://registry.npmmirror.com", { stdio: "inherit" });
-}
-
 //#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 {
 	codereview();
 } catch (error) {
@@ -265,8 +260,8 @@ async function codereview() {
 		return;
 	}
 	install();
-	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 prompt = `Load skills, then call the mcp tool '${name$1}-${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$1}-${report}'`;
 	const copilot = spawn("node", [
 		findCopilopt(),
 		...tools,
@@ -281,23 +276,10 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 			"pipe",
 			"pipe"
 		],
-		env: {
-			...env,
-			NODE_NO_WARNINGS: "1",
-			PYTHONUNBUFFERED: "1"
-		},
 		...platform === "win32" && { windowsHide: true }
 	});
-	console.log("执行命令：");
-	console.log(`node ${findCopilopt()} ${tools.join(" ")} --stream off -p ${prompt}`);
-	copilot.stdout.setEncoding("utf8");
-	copilot.stderr.setEncoding("utf8");
-	copilot.stdout.on("data", (chunk) => {
-		process.stdout.write(chunk);
-	});
-	copilot.stderr.on("data", (chunk) => {
-		process.stderr.write(chunk);
-	});
+	copilot.stdout.on("data", (chunk) => console.log("Stdout:" + String(chunk)));
+	copilot.stderr.on("data", (chunk) => console.error("Stderr:" + String(chunk)));
 	copilot.on("close", (code) => {
 		if (!code) dingding("CRITICAL", "CI ERROR: 代码审查任务失败，请自行检查日志");
 		exit(code);
@@ -305,74 +287,37 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 }
 /**
 * 根据操作系统和架构获取对应的 copilot 包名
-* @returns 平台特定的包名数组，按优先级排序
 */
-function getCopilotPackageNames() {
-	const packages = [];
-	console.log("platform:", platform);
-	console.log("arch:", arch);
-	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");
-	console.log("packages:", packages);
-	return packages;
+function getCopilotPackageName() {
+	return "@github/copilot";
 }
 function findCopilopt() {
-	const packageNames = getCopilotPackageNames();
+	const platformPackage = getCopilotPackageName();
 	let copilot = "";
-	let foundPackageName = "";
-	for (const packageName of packageNames) try {
-		copilot = execSync(`npm list ${packageName} -g -p`).toString().trim();
-		if (copilot) {
-			foundPackageName = packageName;
-			break;
-		}
-	} catch {}
+	try {
+		copilot = execSync(`npm list ${platformPackage} -g -p`).toString().trim();
+	} catch {
+		try {
+			copilot = execSync("npm list @github/copilot -g -p").toString().trim();
+		} catch {}
+	}
 	if (!copilot) {
 		const first = platform === "win32" ? win : linux;
 		const second = platform === "win32" ? linux : win;
-		const result = first();
-		if (result) {
-			copilot = result;
-			const pathParts = copilot.split(/[/\\]/);
-			const nodeModulesIndex = pathParts.indexOf("node_modules");
-			if (nodeModulesIndex !== -1 && pathParts[nodeModulesIndex + 1]) foundPackageName = pathParts[nodeModulesIndex + 1] === "@github" ? `${pathParts[nodeModulesIndex + 1]}/${pathParts[nodeModulesIndex + 2]}` : pathParts[nodeModulesIndex + 1];
-		} else {
-			copilot = second();
-			if (copilot) {
-				const pathParts = copilot.split(/[/\\]/);
-				const nodeModulesIndex = pathParts.indexOf("node_modules");
-				if (nodeModulesIndex !== -1 && pathParts[nodeModulesIndex + 1]) foundPackageName = pathParts[nodeModulesIndex + 1] === "@github" ? `${pathParts[nodeModulesIndex + 1]}/${pathParts[nodeModulesIndex + 2]}` : pathParts[nodeModulesIndex + 1];
-			}
-		}
+		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"));
-	let binPath;
-	if (typeof copilotPackage.bin === "string") binPath = copilotPackage.bin;
-	else if (copilotPackage.bin) {
-		const possibleKeys = foundPackageName ? [
-			foundPackageName,
-			"copilot",
-			"@github/copilot"
-		] : [
-			"copilot",
-			"@github/copilot",
-			...packageNames
-		];
-		for (const key of possibleKeys) if (copilotPackage.bin[key]) {
-			binPath = copilotPackage.bin[key];
-			break;
-		}
-	}
+	const binPath = typeof copilotPackage.bin === "string" ? copilotPackage.bin : copilotPackage.bin?.copilot || copilotPackage.bin?.[platformPackage] || copilotPackage.bin?.["@github/copilot"];
+	console.log("binPath:", binPath);
+	console.log("copilotPackage:", copilotPackage);
 	if (!binPath) throw new Error("non copilot executable found");
 	const copilotVersion = copilotPackage.version || "unknown";
 	const copilotPath = join(copilot, binPath);
-	logImmediate(`${NAME} server:
+	console.log(`${NAME} server:
  version: ${VERSION}
  path: ${serveFile}
 copilot:
@@ -385,11 +330,10 @@ function win() {
 	const pathSeparator = platform === "win32" ? ";" : ":";
 	const npm = pathEnv.split(pathSeparator).find((p) => p.includes("npm"));
 	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;
-	}
+	const packagePath = join(npm, "node_modules", ...getCopilotPackageName().split("/"));
+	if (existsSync(join(packagePath, "package.json"))) return packagePath;
+	const fallbackPath = join(npm, "node_modules", "@github", "copilot");
+	if (existsSync(join(fallbackPath, "package.json"))) return fallbackPath;
 	return "";
 }
 function linux() {
@@ -401,11 +345,11 @@ function linux() {
 		if (npm) cached = npm;
 	}
 	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;
-	}
+	const platformPackage = getCopilotPackageName();
+	const packagePath = join(cached, "..", "lib", "node_modules", ...platformPackage.split("/"));
+	if (existsSync(join(packagePath, "package.json"))) return packagePath;
+	const fallbackPath = join(cached, "..", "lib", "node_modules", "@github", "copilot");
+	if (existsSync(join(fallbackPath, "package.json"))) return fallbackPath;
 	return "";
 }
 

package/package.json

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