@d5render/cli 0.1.30 → 0.1.31

package/bin/copilot.js

@@ -18916,7 +18916,6 @@ const tools = [
 	"--deny-tool",
 	"github-mcp-server"
 ];
-console.log("production");
 tools.push("--model", "claude-sonnet-4.5");
 function toEnv(key, defaultValue) {
 	return envJson[key] || process.env[key] || defaultValue;

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, stdout } 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.30";
+var version = "0.1.31";
 
 //#endregion
 //#region packages/gitlab/url.ts
@@ -178,7 +178,6 @@ const tools = [
 	"--deny-tool",
 	"github-mcp-server"
 ];
-console.log("production");
 tools.push("--model", "claude-sonnet-4.5");
 function toEnv(key, defaultValue) {
 	return envJson[key] || process.env[key] || defaultValue;
@@ -281,6 +280,7 @@ 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) => {
@@ -294,19 +294,57 @@ Otherwise, use chinese as default language to call the mcp tool '${name}-${repor
 		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);
@@ -314,18 +352,19 @@ function findCopilopt() {
  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 || "";
@@ -333,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.30",
+  "version": "0.1.31",
   "devDependencies": {
     "@modelcontextprotocol/sdk": "^1.25.1",
     "@types/node": "^25.0.3",