@unifan/pi-commit-zh 1.0.11 → 1.0.13

package/index.ts

@@ -131,7 +131,16 @@ export default function (pi: ExtensionAPI) {
 							display: true,
 						});
 					} else {
-						notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
+						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;
 				}
@@ -172,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}`;
 			}
 		}
 

package/package.json

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

package/src/git.ts

@@ -79,7 +79,7 @@ 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 }> {
+): 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 || "推送成功" };
@@ -111,9 +111,36 @@ 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${conflictFiles.map((f) => `- \`${f}\``).join("\n")}\n`
+			: "\n";
+
+		const conflictOutput = `⚠️ **远端变基拉取存在代码冲突**：${filesListText}
+- **解决原则**：严禁直接使用 theirs 或 ours 覆盖，必须根据双方修改对比与代码上下文解决冲突。
+- **后续步骤**：解决冲突 ➔ \`git add <文件>\` ➔ \`git rebase --continue\` ➔ 再次执行 \`/commit-push\`（放弃可 \`git rebase --abort\`）。\n\nGit 输出：\n${rebaseErr}`;
+
 		return {
 			ok: false,
-			output: `远端有新提交，尝试自动变基 (git pull --rebase) 时产生代码冲突。\n${rebaseErr}\n请手动解决冲突后执行 git rebase --continue，或执行 git rebase --abort 撤销变基。`,
+			output: conflictOutput,
+			hasConflict: true,
+			conflictFiles,
 		};
 	}