@d5render/cli 0.1.83 → 0.1.85

package/bin/d5cli

@@ -8,7 +8,7 @@ import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name$1 = "@d5render/cli";
-var version = "0.1.83";
+var version = "0.1.85";
 
 //#endregion
 //#region packages/env.ts
@@ -311,11 +311,40 @@ async function deploy() {
 //#endregion
 //#region review/copilot/index.ts
 const bind = "copilot";
-const TOKEN_KEYS = [
-	"COPILOT_GITHUB_TOKEN",
-	"GH_TOKEN",
-	"GITHUB_TOKEN"
-];
+const verifyPrompt = "Reply with OK only, no other text.";
+/** 单引号包裹并转义，用于 shell 内联，避免子进程 env 被改写 */
+function shellEscape(val) {
+	return `'${val.replace(/'/g, "'\\''")}'`;
+}
+/** 最简 copilot 调用（仅 -p），用于验证登录/env 是否可用 */
+function runVerifySync() {
+	const verifyArgs = ["-p", verifyPrompt];
+	const opts = {
+		cwd: env.CI_PROJECT_DIR,
+		encoding: "utf8"
+	};
+	if (platform === "win32") {
+		const r = spawnSync(bind, verifyArgs, {
+			...opts,
+			shell: true
+		});
+		return {
+			code: r.status ?? -1,
+			out: r.stdout?.toString() ?? "",
+			err: r.stderr?.toString() ?? ""
+		};
+	}
+	const token = env.COPILOT_GITHUB_TOKEN || env.GH_TOKEN || env.GITHUB_TOKEN || env.GITHUB_COPILOT_TOKEN;
+	const r = spawnSync("sh", ["-c", `${token !== void 0 && token !== "" ? `export COPILOT_GITHUB_TOKEN=${shellEscape(token)} GH_TOKEN=${shellEscape(token)} GITHUB_TOKEN=${shellEscape(token)}; ` : ""}exec ${bind} ${verifyArgs.map((a) => shellEscape(a)).join(" ")}`], {
+		...opts,
+		env
+	});
+	return {
+		code: r.status ?? -1,
+		out: r.stdout?.toString() ?? "",
+		err: r.stderr?.toString() ?? ""
+	};
+}
 async function cli() {
 	await deploy();
 	const httpProxy = env.HTTP_PROXY || env.http_proxy || "";
@@ -323,50 +352,38 @@ async function cli() {
 	if (httpProxy) env.HTTP_PROXY = httpProxy;
 	if (httpsProxy) env.HTTPS_PROXY = httpsProxy;
 	console.log("@d5render/cli version:", VERSION);
-	const childEnv = platform === "win32" ? void 0 : env;
-	if (childEnv) {
-		console.log("[env] child env keys count:", Object.keys(childEnv).length);
-		console.log("[env] child env token keys present:", TOKEN_KEYS.filter((k) => childEnv[k]).join(", ") || "(none)");
-		const check = spawnSync(process.execPath, ["-e", `
-      const ok = process.env.COPILOT_GITHUB_TOKEN ? 'OK' : 'MISSING';
-      console.log('[env] env injected:', ok);
-      const keys = ['COPILOT_GITHUB_TOKEN','GH_TOKEN','GITHUB_TOKEN'];
-      const lengths = keys.map(k => k + '=' + (process.env[k]?.length ?? 0)).join(', ');
-      console.log('[env] token lengths (7~8 may be literal [MASKED]):', lengths);
-    `.trim()], {
-			env: childEnv,
-			encoding: "utf8"
-		});
-		(check.stdout?.trim() || check.stderr?.trim() || "").split("\n").forEach((line) => console.log(line));
-		const parentLengths = TOKEN_KEYS.map((k) => `${k}=${env[k]?.length ?? 0}`).join(", ");
-		console.log("[env] parent process token lengths:", parentLengths);
-		try {
-			const whichOut = spawnSync(platform === "win32" ? "where copilot" : "which copilot", [], {
-				shell: true,
-				encoding: "utf8"
-			});
-			const pathOut = (whichOut.stdout?.trim() || whichOut.stderr?.trim() || "").split("\n")[0];
-			console.log("[env] copilot executable:", pathOut || "(not found)");
-		} catch {
-			console.log("[env] copilot executable: (resolve failed)");
-		}
-	} else console.log("[env] child env: inherits process.env (win32)");
-	const child = spawn(bind, [
+	const verify = runVerifySync();
+	console.log("copilot verify:", verify.code === 0 ? "OK" : `failed (code ${verify.code})`);
+	if (verify.out) console.log(verify.out.trim());
+	if (verify.err) console.error(verify.err.trim());
+	const args = [
 		...tools,
 		"-p",
 		`"${common_review_prompt.replace(/"/g, "\\\"")}"`
-	], {
+	];
+	const opts = {
 		cwd: env.CI_PROJECT_DIR,
 		stdio: [
 			"inherit",
 			"pipe",
 			"pipe"
-		],
-		...platform === "win32" ? { shell: true } : { env: childEnv }
+		]
+	};
+	let child;
+	if (platform === "win32") child = spawn(bind, args, {
+		...opts,
+		shell: true
 	});
+	else {
+		const token = env.COPILOT_GITHUB_TOKEN || env.GH_TOKEN || env.GITHUB_TOKEN || env.GITHUB_COPILOT_TOKEN;
+		child = spawn("sh", ["-c", `${token !== void 0 && token !== "" ? `export COPILOT_GITHUB_TOKEN=${shellEscape(token)} GH_TOKEN=${shellEscape(token)} GITHUB_TOKEN=${shellEscape(token)}; ` : ""}exec ${bind} ${args.map((a) => shellEscape(a)).join(" ")}`], {
+			...opts,
+			env
+		});
+	}
 	child.stdout.on("data", (chunk) => console.log(String(chunk)));
 	child.stderr.on("data", (chunk) => console.error(String(chunk)));
-	return new Promise((res, rej) => child.on("close", (code) => getCopilotUsage().then((res) => console.log("本次Token积累使用量：", res)).catch(() => {}).finally(() => {
+	return new Promise((res, rej) => child.on("close", (code) => getCopilotUsage().then((r) => console.log("本次Token积累使用量：", r)).catch(() => {}).finally(() => {
 		if (code === 0) res();
 		else rej(/* @__PURE__ */ new Error(`${bind} exited with code ${code}`));
 	})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d5render/cli",
-  "version": "0.1.83",
+  "version": "0.1.85",
   "license": "MIT",
   "author": "jasirou",
   "bin": {