@unifan/pi-unifan-zh 1.0.10 → 1.0.12

package/extensions/commit/index.ts

@@ -3,6 +3,7 @@ import {
 	commitWithMsg,
 	getChangedFiles,
 	getStagedDiff,
+	getUnpushedCommits,
 	getUnstagedDiff,
 	isGitRepo,
 	pushCurrentBranch,
@@ -114,7 +115,28 @@ export default function (pi: ExtensionAPI) {
 		const changedFiles = await getChangedFiles(ctx.cwd);
 
 		if (!stagedDiff && !unstagedDiff) {
-			notify("当前工作区没有任何修改，无需提交。", "info");
+			if (andPush) {
+				const unpushed = await getUnpushedCommits(ctx.cwd);
+				if (unpushed.length > 0) {
+					notify(`当前工作区干净，但检测到有 ${unpushed.length} 个未推送提交，正在推送到远端...`, "info");
+					const pushRes = await pushCurrentBranch(ctx.cwd, (msg) => notify(msg, "info"));
+					if (pushRes.ok) {
+						const successMsg = pushRes.autoRebased
+							? `🚀 已自动完成变基 (pull --rebase)，并成功将 ${unpushed.length} 个本地提交推送至远端！`
+							: `🚀 成功将本地未推送的 ${unpushed.length} 个提交推送至远端！`;
+						notify(successMsg, "info");
+						pi.sendMessage({
+							customType: "pi-commit-result",
+							content: `### 🚀 远端推送完成\n\n当前工作区无未提交的修改，已成功将本地 **${unpushed.length} 个历史提交** 推送至远端分支：\n\n\`\`\`text\n${unpushed.join("\n")}\n\`\`\`\n\n${successMsg}`,
+							display: true,
+						});
+					} else {
+						notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
+					}
+					return;
+				}
+			}
+			notify("当前工作区干净，且所有本地提交均已同步至远端，无需提交和推送。", "info");
 			return;
 		}
 
@@ -178,7 +200,7 @@ export default function (pi: ExtensionAPI) {
 	});
 
 	pi.registerCommand("commit-push", {
-		description: "智能 Git 提交并推流：生成标准中文 Commit 后自动提交并执行 git push (支持自动变基重试)",
+		description: "智能 Git 提交并推流：生成标准中文 Commit 后自动提交并执行 git push (支持自动变基与未推送提交自动推流)",
 		handler: async (args, ctx) => {
 			await handleCommitCommand(args, ctx, true);
 		},

package/extensions/commit/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-commit-zh",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Pi 智能 Git 提交助手（规范化 Conventional Commits 纯中文版，支持一键提审与推流）",
   "type": "module",
   "main": "index.ts",

package/extensions/commit/src/git.ts

@@ -45,6 +45,27 @@ export async function getChangedFiles(cwd: string): Promise<string[]> {
 		.filter(Boolean);
 }
 
+export async function getUnpushedCommits(cwd: string): Promise<string[]> {
+	const res = await runGit(cwd, ["log", "@{u}..HEAD", "--oneline"]);
+	if (res.ok && res.stdout.trim()) {
+		return res.stdout.trim().split("\n").filter(Boolean);
+	}
+	const statusRes = await runGit(cwd, ["status", "--porcelain=v1", "-b"]);
+	if (statusRes.ok) {
+		const match = statusRes.stdout.match(/\[ahead\s+(\d+)\]/);
+		if (match && match[1]) {
+			const count = parseInt(match[1], 10);
+			if (count > 0) {
+				const logRes = await runGit(cwd, ["log", "-n", String(count), "--oneline"]);
+				if (logRes.ok && logRes.stdout.trim()) {
+					return logRes.stdout.trim().split("\n").filter(Boolean);
+				}
+			}
+		}
+	}
+	return [];
+}
+
 export async function stageAll(cwd: string): Promise<boolean> {
 	const res = await runGit(cwd, ["add", "-A"]);
 	return res.ok;
@@ -59,12 +80,22 @@ export async function pushCurrentBranch(
 	cwd: string,
 	onLog?: (msg: string) => void,
 ): Promise<{ ok: boolean; output: string; autoRebased?: boolean }> {
-	const initialPush = await runGit(cwd, ["push"]);
+	let initialPush = await runGit(cwd, ["push"]);
 	if (initialPush.ok) {
 		return { ok: true, output: initialPush.stdout || "推送成功" };
 	}
 
-	const pushError = `${initialPush.stderr} ${initialPush.stdout}`.toLowerCase();
+	let pushError = `${initialPush.stderr} ${initialPush.stdout}`.toLowerCase();
+
+	if (pushError.includes("no upstream branch") || pushError.includes("set-upstream")) {
+		if (onLog) onLog("未关联远端分支，正在自动关联并推送 (git push -u origin HEAD)...");
+		const setUpstream = await runGit(cwd, ["push", "-u", "origin", "HEAD"]);
+		if (setUpstream.ok) {
+			return { ok: true, output: setUpstream.stdout || "推送成功" };
+		}
+		pushError = `${setUpstream.stderr} ${setUpstream.stdout}`.toLowerCase();
+	}
+
 	const needsPull =
 		pushError.includes("fetch first") ||
 		pushError.includes("non-fast-forward") ||

package/extensions/review/index.ts

@@ -25,11 +25,12 @@ export default function (pi: ExtensionAPI) {
 	registerReviewReportTool(pi);
 	registerPiReviewRenderer(pi);
 	pi.registerCommand("review", {
-		description: "启动 AI 并发代码审查 (支持多专家子代理 + 门禁总裁判系统)。--lite = 极速单专家审查，--perf = 性能与基准测试审查。",
+		description: "启动日常 AI 代码审查 (3 大核心专家 + 门禁裁判长)。--lite 极速单兵，--perf 性能审查，--full 全量会诊。",
 		getArgumentCompletions: (prefix: string) => {
 			const options = [
-				{ value: "--lite", label: "--lite", description: "极速单专家审查 (无门禁，低延迟省 Token)" },
+				{ value: "--lite", label: "--lite", description: "极速单专家审查 (无门禁，低延迟极省 Token)" },
 				{ value: "--perf", label: "--perf", description: "专项性能与基准测试审查 (GC/内存分配/CPU/Benchmark)" },
+				{ value: "--full", label: "--full", description: "全量 6 专家深度会诊 (Bugbot/安全/合规/历史/注释/性能 + 门禁)" },
 				{ value: "--gate-model", label: "--gate-model", description: "指定当前审查的门禁裁判模型" },
 			];
 			const trimmed = prefix.trimStart();
@@ -69,6 +70,7 @@ export default function (pi: ExtensionAPI) {
 					input: parsed.input,
 					lite: parsed.lite,
 					perf: parsed.perf,
+					full: parsed.full,
 					gateModel: parsed.gateModel,
 				});
 				if (!prepared) {
@@ -139,6 +141,30 @@ export default function (pi: ExtensionAPI) {
 		},
 	});
 
+	pi.registerCommand("review-full", {
+		description: "全量 6 专家深度代码审查会诊 (Bugbot/安全/合规/历史/注释/性能 + 门禁总裁判)",
+		handler: async (args, ctx) => {
+			const notify = (msg: string, level: "info" | "warning" | "error" = "info") => {
+				if (ctx.hasUI) ctx.ui.notify(msg, level);
+				else console.log(`pi-review: ${msg}`);
+			};
+			try {
+				const { config, legacyWarnings } = loadConfig();
+				for (const w of legacyWarnings) notify(`pi-review 提示: ${w}`, "warning");
+				pi.sendMessage({ customType: "pi-review", content: args ? `/review-full ${args}` : "/review-full", display: true });
+				const prepared = await prepareRun({ cwd: ctx.cwd, input: args, full: true });
+				if (!prepared) {
+					notify("没有检测到需要审查的内容 (未找到修改、PR 或非 Git 仓库)。", "info");
+					return;
+				}
+				pi.sendMessage({ customType: "pi-review-directive", content: prepared.directiveText, display: false }, { triggerTurn: true });
+			} catch (err) {
+				const message = err instanceof Error ? err.message : String(err);
+				notify(`全量代码审查启动失败: ${message}`, "error");
+			}
+		},
+	});
+
 	pi.registerCommand("review-config", {
 		description: "编辑代码审查配置 (~/.pi/agent/pi-review.json)",
 		handler: async (_args, ctx) => {

package/extensions/review/src/cli-args.ts

@@ -11,6 +11,8 @@ export interface ParsedReviewArgs {
 	lite: boolean;
 	/** Dedicated performance review mode: perf-reviewer with benchmark capabilities. */
 	perf: boolean;
+	/** Full multi-agent review mode: all 6 reviewers + gate. */
+	full: boolean;
 	/** Override the gate model for this run (otherwise config.gate.model). */
 	gateModel?: string;
 }
@@ -24,7 +26,7 @@ const LEGACY_VALUED_FLAGS = new Set([
 
 export function parseReviewArgs(raw: string): ParsedReviewArgs {
 	const tokens = tokenize(raw);
-	const result: ParsedReviewArgs = { noSpawn: false, lite: false, perf: false };
+	const result: ParsedReviewArgs = { noSpawn: false, lite: false, perf: false, full: false };
 	const inputParts: string[] = [];
 
 	for (let i = 0; i < tokens.length; i++) {
@@ -45,6 +47,10 @@ export function parseReviewArgs(raw: string): ParsedReviewArgs {
 			result.perf = true;
 			continue;
 		}
+		if (t === "--full") {
+			result.full = true;
+			continue;
+		}
 		if (t === "--gate-model") {
 			const id = tokens[++i];
 			if (id) result.gateModel = id;

package/extensions/review/src/config.ts

@@ -55,7 +55,7 @@ export const DEFAULT_CONFIG: PiReviewConfig = {
 		"history-context": {
 			id: "history-context",
 			label: "History Context",
-			enabled: true,
+			enabled: false,
 			model: "inherit",
 		},
 		"security-review": {
@@ -67,7 +67,7 @@ export const DEFAULT_CONFIG: PiReviewConfig = {
 		"code-comments": {
 			id: "code-comments",
 			label: "Code Comments",
-			enabled: true,
+			enabled: false,
 			model: "inherit",
 		},
 		conventions: {

package/extensions/review/src/directive.ts

@@ -237,9 +237,9 @@ export function buildWorkflowScript(input: {
 	const READ_ONLY_PREFIX =
 		"只读任务（READ-ONLY）——仅执行审查分析与基准测试。严禁修改源码文件。仅返回审查发现。所有分析总结、问题描述与建议必须使用纯正中文。";
 
-	const lines: string[] = [];
-	lines.push("");
-	lines.push("const reviewers = await runs.all([");
+	lines.push("let reviewers;");
+	lines.push("try {");
+	lines.push("  reviewers = await runs.all([");
 	for (const r of reviewers) {
 		const tb = LEAN_BUDGETS.defaultToolBudget;
 		const tbForId = r.id === "history-context" ? LEAN_BUDGETS.historyToolBudget : tb;
@@ -303,7 +303,44 @@ export function buildWorkflowScript(input: {
 		);
 		lines.push("    },");
 	}
-	lines.push("]);");
+	lines.push("  ]);");
+	lines.push("} catch (firstErr) {");
+	lines.push("  // 自动网络重试保护：若首次并发因网络波动超时，自动延迟800ms后重试一次");
+	lines.push("  await new Promise((resolve) => setTimeout(resolve, 800));");
+	lines.push("  reviewers = await runs.all([");
+	for (const r of reviewers) {
+		const tb = LEAN_BUDGETS.defaultToolBudget;
+		const tbForId = r.id === "history-context" ? LEAN_BUDGETS.historyToolBudget : tb;
+		const taskParts = [
+			READ_ONLY_PREFIX,
+			`读取 ${JSON.stringify(diffPath)} 作为改动内容——diff 是权威的修改记录，工作区文件仅作上下文参考。所有问题描述必须使用中文。`,
+			`你的当前工作区为目标工作区 (${JSON.stringify(workspacePath)})。在此目录下执行必要的 read/grep。`,
+			"在额度内完成分析；最终回复必须输出格式规范的 Markdown 审查报告（包含中文 Summary / Findings / Coverage 章节）并停止。所有问题描述、证据引用和总结必须使用纯正中文。",
+		];
+		const modelClause =
+			r.model && r.model !== "inherit"
+				? `\n      model: ${JSON.stringify(r.model)},`
+				: "";
+		lines.push("    {");
+		lines.push(`      key: ${JSON.stringify(r.id)},`);
+		lines.push(`      agent: ${JSON.stringify(leanAgentName(r.id))},`);
+		lines.push(`      task: [`);
+		for (const part of taskParts) {
+			lines.push(`        ${JSON.stringify(part)},`);
+		}
+		lines.push(`      ].join(" "),`);
+		lines.push(`      cwd: ${JSON.stringify(workspacePath)},`);
+		if (r.thinking) {
+			lines.push(`      thinking: ${JSON.stringify(r.thinking)},`);
+		}
+		lines.push(`      toolBudget: { soft: ${tbForId.soft}, hard: ${tbForId.hard} },`);
+		lines.push(
+			`      turnBudget: { maxTurns: ${budgets.turnBudget.maxTurns}, graceTurns: ${budgets.turnBudget.graceTurns} },${modelClause}`,
+		);
+		lines.push("    },");
+	}
+	lines.push("  ]);");
+	lines.push("}");
 	lines.push("");
 
 	// Gate

package/extensions/review/src/review-run.ts

@@ -49,6 +49,8 @@ export interface PrepareRunInput {
 	lite?: boolean;
 	/** Support `--perf` performance & benchmark mode. */
 	perf?: boolean;
+	/** Support `--full` all 6 reviewers mode. */
+	full?: boolean;
 	/** Optional per-run gate model override. */
 	gateModel?: string;
 	/** Set false for dry-runs — pruning is a side effect a dry run must not have. */
@@ -150,7 +152,16 @@ export async function prepareRun(input: PrepareRunInput): Promise<PreparedRun |
 		? [{ id: "perf-review", label: "Performance Review", enabled: true, model: "inherit" }]
 		: input.lite
 			? [{ id: "lite-review", label: "Lite Review", enabled: true, model: "inherit" }]
-			: reviewersForRouting(target, config, profile);
+			: input.full
+				? [
+						{ id: "claude-md-compliance", label: "Claude-MD Compliance", enabled: true, model: "inherit" },
+						{ id: "bugbot", label: "Bugbot", enabled: true, model: "inherit" },
+						{ id: "security-review", label: "Security Review", enabled: true, model: "inherit" },
+						{ id: "history-context", label: "History Context", enabled: true, model: "inherit" },
+						{ id: "code-comments", label: "Code Comments", enabled: true, model: "inherit" },
+						{ id: "perf-review", label: "Performance Review", enabled: true, model: "inherit" },
+				  ]
+				: reviewersForRouting(target, config, profile);
 	const skippedReasons = adaptiveSkips(profile);
 	// The report tool uses this to reject findings that did not come from this
 	// run's roster (stale-artifact contamination guard).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-unifan-zh",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Pi Coding Agent 中文扩展全家桶与独立插件集",
   "type": "module",
   "main": "extensions/sessions/index.ts",