@unifan/pi-commit-zh 1.0.10 → 1.0.11

package/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-commit-zh",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "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;
@@ -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") ||