@d5render/cli 0.1.36 → 0.1.38

package/bin/d5cli

@@ -7,7 +7,7 @@ import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name$1 = "@d5render/cli";
-var version = "0.1.36";
+var version = "0.1.38";
 
 //#endregion
 //#region copilot/server/config.ts
@@ -288,6 +288,8 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 		},
 		...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) => {
@@ -307,31 +309,66 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 */
 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 findCopilopt() {
 	const packageNames = getCopilotPackageNames();
 	let copilot = "";
+	let foundPackageName = "";
 	for (const packageName of packageNames) try {
 		copilot = execSync(`npm list ${packageName} -g -p`).toString().trim();
-		if (copilot) break;
+		if (copilot) {
+			foundPackageName = packageName;
+			break;
+		}
 	} catch {}
 	if (!copilot) {
 		const first = platform === "win32" ? win : linux;
 		const second = platform === "win32" ? linux : win;
-		copilot = first();
-		if (!copilot) copilot = second();
+		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];
+			}
+		}
 		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"];
+	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;
+		}
+	}
 	if (!binPath) throw new Error("non copilot executable found");
 	const copilotVersion = copilotPackage.version || "unknown";
 	const copilotPath = join(copilot, binPath);

package/package.json

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