@unifan/pi-commit-zh 1.0.8 → 1.0.10

package/index.ts

@@ -8,32 +8,27 @@ import {
 	pushCurrentBranch,
 	stageAll,
 } from "./src/git.js";
-import { COMMIT_SYSTEM_PROMPT } from "./src/prompt.ts";
+import { COMMIT_SYSTEM_PROMPT } from "./src/prompt.js";
 
 interface ParsedCommitArgs {
-	yes: boolean;
 	stageAll: boolean;
 	hint?: string;
 }
 
 function parseArgs(raw: string): ParsedCommitArgs {
 	const tokens = raw.trim().split(/\s+/).filter(Boolean);
-	let yes = false;
 	let shouldStageAll = false;
 	const hintParts: string[] = [];
 
 	for (const t of tokens) {
-		if (t === "-y" || t === "--yes") {
-			yes = true;
-		} else if (t === "-a" || t === "--all") {
+		if (t === "-a" || t === "--all") {
 			shouldStageAll = true;
-		} else {
+		} else if (t !== "-y" && t !== "--yes") {
 			hintParts.push(t);
 		}
 	}
 
 	return {
-		yes,
 		stageAll: shouldStageAll,
 		hint: hintParts.join(" ").trim() || undefined,
 	};
@@ -63,6 +58,7 @@ async function generateCommitMessage(
 		try {
 			const provider = ctx.modelRegistry.getProvider(ctx.model.provider);
 			if (provider) {
+				const auth = await ctx.modelRegistry.getApiKeyAndHeaders(ctx.model);
 				const response = await provider
 					.streamSimple(
 						ctx.model,
@@ -76,7 +72,7 @@ async function generateCommitMessage(
 								},
 							],
 						},
-						{ maxTokens: 800 },
+						{ apiKey: auth?.apiKey, headers: auth?.headers, maxTokens: 800 },
 					)
 					.result();
 
@@ -86,16 +82,15 @@ async function generateCommitMessage(
 					.trim();
 
 				if (text) {
-					// Clean any unexpected code blocks
 					return text.replace(/^```[a-zA-Z]*\n?/, "").replace(/\n?```$/, "").trim();
 				}
 			}
-		} catch {
-			/* fallback below */
+		} catch (err) {
+			console.error("pi-commit streamSimple error:", err);
 		}
 	}
 
-	// Simple heuristic fallback
+	// 智能保底推断
 	const firstFile = changedFiles[0] ?? "core";
 	const scope = firstFile.split(/[/\\]/)[0] || "core";
 	return `chore(${scope}): 更新代码与相关配置\n\n- 更新了 ${changedFiles.length} 个文件`;
@@ -135,67 +130,42 @@ export default function (pi: ExtensionAPI) {
 		notify("正在深度分析代码改动并生成中文 Commit Message...", "info");
 		const commitMessage = await generateCommitMessage(ctx, stagedDiff || unstagedDiff, changedFiles, parsed.hint);
 
-		let finalMessage = commitMessage;
-
-		if (!parsed.yes && ctx.hasUI) {
-			const choice = await ctx.ui.select(
-				`✨ AI 生成的提交信息:\n\n${commitMessage}\n\n请选择操作:`,
-				[
-					{ label: "✅ 立即以此信息提交 (Commit)", value: "commit" },
-					{ label: "📝 编辑后再提交 (Edit & Commit)", value: "edit" },
-					{ label: "❌ 取消提交 (Cancel)", value: "cancel" },
-				],
-			);
-
-			if (!choice || choice === "cancel") {
-				notify("已取消本次提交。", "info");
-				return;
-			}
-
-			if (choice === "edit") {
-				const edited = await ctx.ui.editor("编辑 Commit Message", commitMessage);
-				if (!edited || !edited.trim()) {
-					notify("提交信息为空，已取消提交。", "warning");
-					return;
-				}
-				finalMessage = edited.trim();
-			}
-		}
-
-		const commitRes = await commitWithMsg(ctx.cwd, finalMessage);
+		const commitRes = await commitWithMsg(ctx.cwd, commitMessage);
 		if (!commitRes.ok) {
 			notify(`Git 提交失败: ${commitRes.output}`, "error");
 			return;
 		}
 
-		const firstLine = finalMessage.split("\n")[0];
+		const firstLine = commitMessage.split("\n")[0];
 		notify(`✅ 成功提交: ${firstLine}`, "info");
 
 		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}`;
 			}
 		}
 
 		pi.sendMessage({
 			customType: "pi-commit-result",
-			content: `### 📦 Git 提交完成\n\n\`\`\`text\n${finalMessage}\n\`\`\`${pushText}`,
+			content: `### 📦 Git 提交完成\n\n\`\`\`text\n${commitMessage}\n\`\`\`${pushText}`,
 			display: true,
 		});
 	};
 
 	pi.registerCommand("commit", {
-		description: "智能 Git 提交助手：自动分析 diff 生成标准中文 Conventional Commit 并提交 (-y 直接提交, -a 暂存全部)",
+		description: "智能 Git 提交助手：自动分析 diff 生成标准中文 Commit 并直接提交 (-a 自动暂存全部修改)",
 		getArgumentCompletions: (prefix: string) => {
 			const options = [
-				{ value: "-y", label: "-y / --yes", description: "直接提交无需二次确认" },
 				{ value: "-a", label: "-a / --all", description: "自动暂存全部修改 (git add -A)" },
 			];
 			const trimmed = prefix.trimStart();
@@ -208,7 +178,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.8",
+  "version": "1.0.10",
   "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 };
 }