@d5render/cli 0.1.85 → 0.1.87

package/README.md

@@ -1,35 +1,35 @@
-> 参考 [.skills/devops](.skills/devops) 对项目进行初始化
-
-> .github/\* 是相关技能的自定义的部分，建议自行放在项目文件夹内，review脚本会自动部署在~/.claude/skills（.claude适配的CLI比较多）内
-
-# CHANGELOG
-
-### 2026-3-18
-
-🚩 cli
-
-- 功能更新
-- 报告添加回流功能
-
-🚩 skills
-
-- 多agent审查
-- 启动LSP等辅助工具
-
-### 2026-1-31
-
-code-review skill 补充LSP相关语句
-
-### 2026-1-16
-
-补充安全相关检查
-
-### 2026-1-7
-
-代码评审 skills 更新
-
-使用内置 skills
-
-### 2025-12-31
-
-基础评审能力上云
+> 参考 [.skills/devops](.skills/devops) 对项目进行初始化
+
+> .github/\* 是相关技能的自定义的部分，建议自行放在项目文件夹内，review脚本会自动部署在~/.claude/skills（.claude适配的CLI比较多）内
+
+# CHANGELOG
+
+### 2026-3-18
+
+🚩 cli
+
+- 功能更新
+- 报告添加回流功能
+
+🚩 skills
+
+- 多agent审查
+- 启动LSP等辅助工具
+
+### 2026-1-31
+
+code-review skill 补充LSP相关语句
+
+### 2026-1-16
+
+补充安全相关检查
+
+### 2026-1-7
+
+代码评审 skills 更新
+
+使用内置 skills
+
+### 2025-12-31
+
+基础评审能力上云

package/bin/d5cli

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { argv, env, platform } from "node:process";
-import { execSync, spawn, spawnSync } from "node:child_process";
+import { execSync, spawn } from "node:child_process";
 import { createHash } from "node:crypto";
 import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
@@ -8,7 +8,7 @@ import { fileURLToPath } from "node:url";
 
 //#region package.json
 var name$1 = "@d5render/cli";
-var version = "0.1.85";
+var version = "0.1.87";
 
 //#endregion
 //#region packages/env.ts
@@ -140,14 +140,14 @@ async function changelog() {
 	const matcheds = matched.split("\n");
 	matcheds.shift();
 	matched = matcheds.join("\n").trim();
-	if (matched) await dingding("NOTICE", `skills 更新\n\n\n${matched}\n\n\n历史请参考 [线上文档内容.skills文件夹](https://www.npmjs.com/package/@d5render/cli)`);
+	if (matched) await dingding("NOTICE CLI更新", `skills 更新\n\n\n${matched}\n\n\n历史请参考 [线上文档内容.skills文件夹](https://www.npmjs.com/package/@d5render/cli)`);
 }
 function deploySkills(SKILLS_DIR = ".copilot/skills") {
 	const HOME = env.USERPROFILE ?? env.HOME ?? env.HOMEPATH;
 	if (!HOME) throw new Error("cannot find `USERPROFILE` directory");
 	const dir = join(HOME, `${SKILLS_DIR}/code-review`);
 	mkdirSync(dir, { recursive: true });
-	console.log("deploy code-review skills..." + VERSION);
+	console.log("deploy code-review skills...");
 	const skillRoot = join(RUNTIME_CWD, ".skills/code-review");
 	readdirSync(skillRoot).forEach((file) => copyFileSync(join(skillRoot, file), join(dir, file)));
 	const instructionsRoot = join(RUNTIME_CWD, ".github/instructions");
@@ -208,9 +208,10 @@ const COPILOT_HEADERS = {
 	"Editor-Plugin-Version": "copilot-chat/0.35.0",
 	"Copilot-Integration-Id": "vscode-chat"
 };
-function getOAuthToken() {
+function getOAuthToken(setKey) {
 	const token = env.GITHUB_COPILOT_TOKEN || env.COPILOT_TOKEN || env.GITHUB_TOKEN || env.GH_TOKEN;
 	if (!token) throw new Error("未找到 GitHub Token，请设置 GITHUB_COPILOT_TOKEN / GITHUB_TOKEN / GH_TOKEN 环境变量");
+	if (setKey) env[setKey] = token;
 	return token;
 }
 /**
@@ -230,8 +231,8 @@ async function exchangeForCopilotToken(oauthToken) {
 		return;
 	}
 }
-async function fetchInternalUsage() {
-	const oauthToken = getOAuthToken();
+async function fetchInternalUsage(options = {}) {
+	const oauthToken = getOAuthToken(options.token);
 	const directRes = await fetch(`${GITHUB_API}/copilot_internal/user`, { headers: {
 		Accept: "application/json",
 		Authorization: `token ${oauthToken}`,
@@ -269,7 +270,7 @@ function formatInternalResult(data) {
 */
 async function getCopilotUsage(options = {}) {
 	try {
-		return formatInternalResult(await fetchInternalUsage());
+		return formatInternalResult(await fetchInternalUsage(options));
 	} catch {
 		return null;
 	}
@@ -278,7 +279,6 @@ async function getCopilotUsage(options = {}) {
 //#endregion
 //#region review/copilot/deploy.ts
 const config = join(dirname(fileURLToPath(import.meta.url)), "copilot-mcp.json");
-console.log("config:", config);
 const tools = [
 	"--additional-mcp-config",
 	platform === "win32" ? `"@${config}"` : `@${config}`,
@@ -295,9 +295,9 @@ const tools = [
 async function deploy() {
 	if (!env.CI) return;
 	await changelog();
-	execSync("npm i -g @github/copilot@latest --registry=https://registry.npmmirror.com", { stdio: "inherit" });
 	deploySkills();
-	const token = await getCopilotUsage();
+	execSync("npm i -g @github/copilot@latest --registry=https://registry.npmmirror.com", { stdio: "inherit" });
+	const token = await getCopilotUsage({ token: "GH_TOKEN" });
 	env["TOKEN_USAGE"] = String(token);
 	console.log("deploy customized config...");
 	writeFileSync(config, JSON.stringify({ mcpServers: { [name]: {
@@ -310,84 +310,47 @@ async function deploy() {
 
 //#endregion
 //#region review/copilot/index.ts
-const bind = "copilot";
-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() ?? ""
-	};
-}
+const bin = "copilot";
 async function cli() {
 	await deploy();
+	console.log(NAME, "version:", VERSION);
 	const httpProxy = env.HTTP_PROXY || env.http_proxy || "";
 	const httpsProxy = env.HTTPS_PROXY || env.https_proxy || "";
 	if (httpProxy) env.HTTP_PROXY = httpProxy;
 	if (httpsProxy) env.HTTPS_PROXY = httpsProxy;
-	console.log("@d5render/cli version:", VERSION);
-	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 = {
+	let child;
+	if (platform === "win32") child = spawn(bin, args, {
 		cwd: env.CI_PROJECT_DIR,
 		stdio: [
 			"inherit",
 			"pipe",
 			"pipe"
-		]
-	};
-	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
-		});
-	}
+	else child = spawn("sh", ["-c", `export GH_TOKEN=${shellEscape(env.GH_TOKEN)}; exec ${bin} ${args.map((a) => shellEscape(a)).join(" ")}`], {
+		cwd: env.CI_PROJECT_DIR,
+		stdio: [
+			"inherit",
+			"pipe",
+			"pipe"
+		]
+	});
 	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((r) => console.log("本次Token积累使用量：", r)).catch(() => {}).finally(() => {
+	return new Promise((res, rej) => child.on("close", (code) => getCopilotUsage().then((res) => console.log("本次Token积累使用量：", res)).catch(() => {}).finally(() => {
 		if (code === 0) res();
-		else rej(/* @__PURE__ */ new Error(`${bind} exited with code ${code}`));
+		else rej(/* @__PURE__ */ new Error(`${bin} exited with code ${code}`));
 	})));
 }
+function shellEscape(val) {
+	return `'${(val || "").replace(/'/g, "'\\''")}'`;
+}
 
 //#endregion
 //#region review/index.ts
@@ -402,7 +365,7 @@ async function codereview() {
 		}
 		await cli();
 	} catch (error) {
-		await dingding("CRITICAL", "CI ERROR: 未知错误，请自行检查日志");
+		await dingding("CRITICAL CI ERROR", "CI ERROR: 未知错误，请自行检查日志");
 		throw error;
 	}
 }