@unifan/pi-unifan-zh 1.0.28 → 1.0.30

package/AGENTS.md

@@ -87,6 +87,9 @@ pi-unifan-zh/
 * **网络抖动重试**：`runs.all` 并发调用必须包裹 `try-catch` 并在发生网络断连时自动延迟 800ms 重试一次。
 * **门禁熔断保护**：门禁裁判长（Gate）发生异常时必须兜底捕获，**绝对不能抛出未捕获异常导致已完成的 Reviewer 成果丢失**。
 
+### 6. 冲突解决原则
+拉取或变基冲突时，严禁直接使用 ours/theirs 覆盖，必须根据双方修改对比与上下文解决冲突。
+
 ---
 
 ## 🚀 三、发版与发布指南（Release & Publish Workflow）

package/README.md

@@ -128,6 +128,7 @@ pi install npm:@unifan/pi-commit-zh
   - **Strict ASCII Punctuation**: Parentheses `()` and colon `: ` strictly use ASCII half-width characters for CI / Commitlint compliance.
   - **No Emoji**: Clean, professional plain text commit style.
   - **Smart Auto-Rebase on Push**: In `/commit-push`, if remote contains unpulled commits, it automatically runs `git pull --rebase` and retries push, keeping a clean linear git history.
+  - **Smart Conflict Guidance**: If rebase conflicts occur, lists conflict files and enforces resolving by diff and context (never blindly using ours/theirs).
   - **Unpushed Commits Sync**: Automatically pushes unpushed local commits even if the working tree is clean.
 
 ---

package/README_zh.md

@@ -133,6 +133,7 @@ pi install npm:@unifan/pi-commit-zh
   - **严格半角英文标点**：括号 `()` 与冒号空格 `: ` 严格使用英文半角字符，确保 CI / Commitlint 正则解析合规。
   - **严禁 Emoji**：保持严谨、专业的纯文本工程风格。
   - **智能自动变基（Auto Rebase）**：在 `/commit-push` 时，若远端有别人先提交的代码被拒绝，**自动在后台执行 `git pull --rebase` 变基并自动重试推送**，Git 历史保持一条干净直线！
+  - **智能冲突引导**：变基遇冲突时列出冲突文件，提示严禁直接用 ours/theirs 覆盖，需按修改对比与上下文解决。
   - **未推送提交自动同步**：即使当前工作区干净，若检测到本地有尚未 push 的历史 Commit，`/commit-push` 也会自动将其推送至远端！
 
 ---

package/extensions/commit/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/extensions/commit/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/extensions/commit/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,
 		};
 	}
 

package/package.json

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