@unifan/pi-commit-zh 1.0.8 → 1.0.9

package/index.ts

@@ -174,13 +174,16 @@ export default function (pi: ExtensionAPI) {
 		let pushText = "";
 		if (andPush) {
 			notify("正在推送到远端仓库 (git push)...", "info");
-			const pushRes = await pushCurrentBranch(ctx.cwd);
+			const pushRes = await pushCurrentBranch(ctx.cwd, (msg) => notify(msg, "info"));
 			if (pushRes.ok) {
-				notify("🚀 成功推送到远端仓库！", "info");
-				pushText = "\n\n🚀 **已自动推送到远端分支**";
+				const successMsg = pushRes.autoRebased
+					? "🚀 远端有新提交，已自动完成变基 (pull --rebase) 并成功推送！"
+					: "🚀 成功推送到远端仓库！";
+				notify(successMsg, "info");
+				pushText = `\n\n${successMsg}`;
 			} else {
-				notify(`⚠️ 推送失败: ${pushRes.output}`, "warning");
-				pushText = `\n\n⚠️ **推送到远端失败**: ${pushRes.output}`;
+				notify(`⚠️ 推送失败: ${pushRes.output}`, "error");
+				pushText = `\n\n⚠️ **推送到远端失败**:\n${pushRes.output}`;
 			}
 		}
 

package/package.json

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

package/src/git.ts

@@ -55,7 +55,46 @@ export async function commitWithMsg(cwd: string, message: string): Promise<{ ok:
 	return { ok: res.ok, output: res.ok ? res.stdout : res.stderr };
 }
 
-export async function pushCurrentBranch(cwd: string): Promise<{ ok: boolean; output: string }> {
-	const res = await runGit(cwd, ["push"]);
-	return { ok: res.ok, output: res.ok ? res.stdout : res.stderr };
+export async function pushCurrentBranch(
+	cwd: string,
+	onLog?: (msg: string) => void,
+): Promise<{ ok: boolean; output: string; autoRebased?: boolean }> {
+	const initialPush = await runGit(cwd, ["push"]);
+	if (initialPush.ok) {
+		return { ok: true, output: initialPush.stdout || "推送成功" };
+	}
+
+	const pushError = `${initialPush.stderr} ${initialPush.stdout}`.toLowerCase();
+	const needsPull =
+		pushError.includes("fetch first") ||
+		pushError.includes("non-fast-forward") ||
+		pushError.includes("rejected") ||
+		pushError.includes("behind");
+
+	if (!needsPull) {
+		return { ok: false, output: initialPush.stderr || initialPush.stdout };
+	}
+
+	if (onLog) onLog("检测到远端有新提交，正在自动执行变基拉取 (git pull --rebase)...");
+
+	const pullRebase = await runGit(cwd, ["pull", "--rebase"]);
+	if (!pullRebase.ok) {
+		const rebaseErr = `${pullRebase.stderr} ${pullRebase.stdout}`;
+		return {
+			ok: false,
+			output: `远端有新提交，尝试自动变基 (git pull --rebase) 时产生代码冲突。\n${rebaseErr}\n请手动解决冲突后执行 git rebase --continue，或执行 git rebase --abort 撤销变基。`,
+		};
+	}
+
+	if (onLog) onLog("变基拉取成功（无代码冲突），正在重新推送到远端...");
+	const retryPush = await runGit(cwd, ["push"]);
+	if (retryPush.ok) {
+		return {
+			ok: true,
+			output: "远端有新提交，已自动完成 git pull --rebase 变基并成功推送到远端！",
+			autoRebased: true,
+		};
+	}
+
+	return { ok: false, output: retryPush.stderr || retryPush.stdout };
 }