@unifan/pi-commit-zh 1.0.10 → 1.0.12

package/index.ts

@@ -3,6 +3,7 @@ import {
 	commitWithMsg,
 	getChangedFiles,
 	getStagedDiff,
+	getUnpushedCommits,
 	getUnstagedDiff,
 	isGitRepo,
 	pushCurrentBranch,
@@ -114,7 +115,37 @@ 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 {
+						if (pushRes.hasConflict) {
+							notify("⚠️ 远端拉取变基产生代码冲突！请对比修改和上下文解决冲突，严禁直接使用 ours/theirs。", "warning");
+						} else {
+							notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
+						}
+						pi.sendMessage({
+							customType: "pi-commit-result",
+							content: `### ⚠️ 推送到远端未完成\n\n${pushRes.output}`,
+							display: true,
+						});
+					}
+					return;
+				}
+			}
+			notify("当前工作区干净，且所有本地提交均已同步至远端，无需提交和推送。", "info");
 			return;
 		}
 
@@ -150,8 +181,12 @@ export default function (pi: ExtensionAPI) {
 				notify(successMsg, "info");
 				pushText = `\n\n${successMsg}`;
 			} else {
-				notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
-				pushText = `\n\n⚠️ **推送到远端失败**:\n${pushRes.output}`;
+				if (pushRes.hasConflict) {
+					notify("⚠️ 远端拉取变基产生代码冲突！请对比修改和上下文解决冲突，严禁直接使用 ours/theirs。", "warning");
+				} else {
+					notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
+				}
+				pushText = `\n\n${pushRes.output}`;
 			}
 		}
 
@@ -178,7 +213,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/package.json

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

package/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;
@@ -58,13 +79,23 @@ export async function commitWithMsg(cwd: string, message: string): Promise<{ ok:
 export async function pushCurrentBranch(
 	cwd: string,
 	onLog?: (msg: string) => void,
-): Promise<{ ok: boolean; output: string; autoRebased?: boolean }> {
-	const initialPush = await runGit(cwd, ["push"]);
+): Promise<{ ok: boolean; output: string; autoRebased?: boolean; hasConflict?: boolean; conflictFiles?: string[] }> {
+	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") ||
@@ -80,9 +111,47 @@ export async function pushCurrentBranch(
 	const pullRebase = await runGit(cwd, ["pull", "--rebase"]);
 	if (!pullRebase.ok) {
 		const rebaseErr = `${pullRebase.stderr} ${pullRebase.stdout}`;
+		
+		// 检索冲突文件清单
+		const conflictDiff = await runGit(cwd, ["diff", "--name-only", "--diff-filter=U"]);
+		let conflictFiles = conflictDiff.ok && conflictDiff.stdout.trim()
+			? conflictDiff.stdout.trim().split("\n").map((f) => f.trim()).filter(Boolean)
+			: [];
+
+		if (conflictFiles.length === 0) {
+			const statusRes = await runGit(cwd, ["status", "--porcelain"]);
+			if (statusRes.ok && statusRes.stdout.trim()) {
+				conflictFiles = statusRes.stdout
+					.split("\n")
+					.filter((l) => /^(UU|AA|UD|DU|DD|AU|UA)\s+/.test(l.trim()))
+					.map((l) => l.trim().slice(3).trim());
+			}
+		}
+
+		const filesListText = conflictFiles.length > 0
+			? `\n\n📌 **发生冲突的文件 (${conflictFiles.length} 个)**：\n${conflictFiles.map((f) => `- \`${f}\``).join("\n")}`
+			: "";
+
+		const conflictOutput = `⚠️ **远端有新提交，拉取变基 (git pull --rebase) 时与本地提交产生代码冲突！**${filesListText}
+
+🚨 **【代码冲突解决核心铁律（重中之重）】**：
+1. **严禁直接无脑使用 \`--theirs\` 或 \`--ours\`**：绝对不要盲目使用其中一方覆盖另一方，否则极易覆盖远端同事的代码或丢失本地修复！
+2. **必须根据对比修改和上下文解决冲突**：
+   - 逐个打开冲突文件，对照 \`<<<<<<< HEAD\`（远端基线）与 \`>>>>>>>\`（本地提交）的具体改动；
+   - 结合周围类、函数、接口调用与业务上下文，理解两边的意图后逐行融合成正确的最终代码。
+
+🛠️ **解决冲突操作步骤**：
+1. 对比并手工/智能修改上述冲突文件，消除所有冲突标记；
+2. 执行 \`git add <已解决文件>\` 标记冲突已解决；
+3. 执行 \`git rebase --continue\` 完成变基；
+4. 变基成功后重新执行 \`/commit-push\` 推送至远端；
+（若需放弃本次变基恢复原状，可执行 \`git rebase --abort\`）。\n\n底层详细输出：\n${rebaseErr}`;
+
 		return {
 			ok: false,
-			output: `远端有新提交，尝试自动变基 (git pull --rebase) 时产生代码冲突。\n${rebaseErr}\n请手动解决冲突后执行 git rebase --continue，或执行 git rebase --abort 撤销变基。`,
+			output: conflictOutput,
+			hasConflict: true,
+			conflictFiles,
 		};
 	}