@unifan/pi-unifan-zh 1.0.32 → 1.0.33

package/README_zh.md

@@ -122,7 +122,7 @@ pi install npm:@unifan/pi-commit-zh
 
 ### 3. 📦 `commit`（智能 Git 提交助手·中文版）
 - **命令**：
-  - **`/commit`**：自动分析暂存区/工作区代码变动（`git diff`），生成标准的 Conventional Commits 纯中文提交信息并 1 秒完成提交。
+  - **`/commit`**：自动分析暂存区/工作区代码变动（`git diff`），使用当前会话模型，根据实际暂存内容生成标准的 Conventional Commits 纯中文提交信息后提交。模型认证、请求、空结果或输出校验失败时会显示原因并停止提交与推送，保留暂存内容，不再使用固定兜底文案。
   - **`/commit-push`** 🚀：自动生成中文 Commit 提交，并**自动执行 `git push` 推送**到远端分支。
 - **常用参数与用法**：
   - `/commit`：智能提交（有暂存只提暂存，无暂存自动暂存全量）。

package/extensions/commit/index.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI, ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import {
 	commitWithMsg,
-	getChangedFiles,
+	getStagedFiles,
 	getStagedDiff,
 	getUnpushedCommits,
 	getUnstagedDiff,
@@ -35,7 +35,7 @@ function parseArgs(raw: string): ParsedCommitArgs {
 	};
 }
 
-async function generateCommitMessage(
+export async function generateCommitMessage(
 	ctx: ExtensionCommandContext,
 	diff: string,
 	changedFiles: string[],
@@ -55,50 +55,26 @@ async function generateCommitMessage(
 		.filter(Boolean)
 		.join("\n");
 
-	if (ctx.model && ctx.modelRegistry) {
-		try {
-			const provider = ctx.modelRegistry.getProvider(ctx.model.provider);
-			if (provider) {
-				const auth = await ctx.modelRegistry.getApiKeyAndHeaders(ctx.model);
-				if (!auth.ok) {
-					console.error("pi-commit getApiKeyAndHeaders error:", auth.error);
-				} else {
-					const response = await provider
-						.streamSimple(
-							ctx.model,
-							{
-								systemPrompt: COMMIT_SYSTEM_PROMPT,
-								messages: [
-									{
-										role: "user",
-										content: [{ type: "text", text: userPrompt }],
-										timestamp: Date.now(),
-									},
-								],
-							},
-							{ apiKey: auth.apiKey, headers: auth.headers, maxTokens: 800 },
-						)
-						.result();
-
-					const text = response.content
-						?.map((c) => (c.type === "text" ? c.text : ""))
-						.join("")
-						.trim();
-
-					if (text) {
-						return text.replace(/^```[a-zA-Z]*\n?/, "").replace(/\n?```$/, "").trim();
-					}
-				}
-			}
-		} catch (err) {
-			console.error("pi-commit streamSimple error:", err);
-		}
-	}
-
-	// 智能保底推断
-	const firstFile = changedFiles[0] ?? "core";
-	const scope = firstFile.split(/[/\\]/)[0] || "core";
-	return `chore(${scope}): 更新代码与相关配置\n\n- 更新了 ${changedFiles.length} 个文件`;
+	if (!ctx.model) throw new Error("当前未选择模型，请先使用 /model 选择模型。");
+	if (typeof ctx.modelRegistry?.complete !== "function")
+		throw new Error("当前 Pi 不支持统一模型调用接口，请更新 Pi 后重试。");
+
+	// 由宿主统一解析认证、代理地址及提供方环境，避免手动调用遗漏配置。
+	const response = await ctx.modelRegistry.complete(ctx.model, {
+		systemPrompt: COMMIT_SYSTEM_PROMPT,
+		messages: [{ role: "user", content: [{ type: "text", text: userPrompt }], timestamp: Date.now() }],
+	}, { maxTokens: 4096, signal: ctx.signal });
+	if (response.stopReason !== "stop")
+		throw new Error(`模型未正常完成生成（${response.stopReason}）：${response.errorMessage || "请检查模型状态后重试。"}`);
+
+	const text = response.content.map((c) => c.type === "text" ? c.text : "").join("").trim()
+		.replace(/^```[a-zA-Z]*\r?\n?/, "").replace(/\r?\n?```$/, "").trim();
+	if (!text) throw new Error("模型返回了空的提交信息。");
+	if (!/^(feat|fix|perf|refactor|ci|build|chore|docs|test|style|revert)(\([^()\r\n]+\))?: [^\r\n]+$/.test(text.split(/\r?\n/)[0]))
+		throw new Error("模型返回的提交标题不符合约定格式，请重试或补充修改说明。");
+	if (text.includes("更新代码与相关配置"))
+		throw new Error("模型返回了无具体业务含义的通用提交信息，请补充修改说明后重试。");
+	return text;
 }
 
 export default function (pi: ExtensionAPI) {
@@ -116,7 +92,7 @@ export default function (pi: ExtensionAPI) {
 		const parsed = parseArgs(args);
 		let stagedDiff = await getStagedDiff(ctx.cwd);
 		const unstagedDiff = await getUnstagedDiff(ctx.cwd);
-		const changedFiles = await getChangedFiles(ctx.cwd);
+
 
 		if (!stagedDiff && !unstagedDiff) {
 			if (andPush) {
@@ -163,7 +139,18 @@ export default function (pi: ExtensionAPI) {
 		}
 
 		notify("正在深度分析代码改动并生成中文 Commit Message...", "info");
-		const commitMessage = await generateCommitMessage(ctx, stagedDiff || unstagedDiff, changedFiles, parsed.hint);
+		let commitMessage: string;
+		try {
+			if (!stagedDiff.trim()) throw new Error("暂存区没有可用于生成提交信息的差异。");
+			const changedFiles = await getStagedFiles(ctx.cwd);
+			commitMessage = await generateCommitMessage(ctx, stagedDiff, changedFiles, parsed.hint);
+		} catch (error) {
+			// 生成失败必须停止，禁止用固定文案继续提交或推送。
+			const reason = error instanceof Error ? error.message : String(error);
+			notify(`提交信息生成失败，未执行提交或推送：${reason}`, "error");
+			pi.sendMessage({ customType: "pi-commit-error", content: `提交信息生成失败，未执行提交或推送。\n\n${reason}\n\n当前暂存内容保留，可修复模型配置后重新执行。`, display: true });
+			return;
+		}
 
 		const commitRes = await commitWithMsg(ctx.cwd, commitMessage);
 		if (!commitRes.ok) {

package/extensions/commit/package.json

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

package/extensions/commit/src/git.ts

@@ -36,6 +36,13 @@ export async function getUnstagedDiff(cwd: string): Promise<string> {
 	return res.ok ? res.stdout : "";
 }
 
+// 使用空字符分隔，保留中文、空格和特殊字符文件名；只描述本次真正提交的文件。
+export async function getStagedFiles(cwd: string): Promise<string[]> {
+	const res = await runGit(cwd, ["diff", "--cached", "--name-only", "-z"]);
+	if (!res.ok) throw new Error(`读取暂存文件失败：${res.stderr}`);
+	return res.stdout.split("\0").filter(Boolean);
+}
+
 export async function getChangedFiles(cwd: string): Promise<string[]> {
 	const res = await runGit(cwd, ["status", "--porcelain"]);
 	if (!res.ok || !res.stdout.trim()) return [];

package/extensions/commit/tests/commit.test.mjs

@@ -0,0 +1,74 @@
+import assert from 'node:assert/strict';
+import { test, after } from 'node:test';
+import { mkdtemp, mkdir, readFile, writeFile, rm } from 'node:fs/promises';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { pathToFileURL } from 'node:url';
+import { execFileSync } from 'node:child_process';
+import ts from 'typescript';
+
+// 在临时目录编译并运行真实命令，不访问开发仓库的提交记录。
+const root = await mkdtemp(join(tmpdir(), 'pi-commit-test-'));
+after(() => rm(root, { recursive: true, force: true }));
+await mkdir(join(root, 'src'));
+await writeFile(join(root, 'package.json'), '{"type":"module"}');
+for (const name of ['index', 'src/git', 'src/prompt']) {
+  const source = await readFile(new URL(`../${name}.ts`, import.meta.url), 'utf8');
+  const output = ts.transpileModule(source, { compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext } }).outputText;
+  await writeFile(join(root, `${name}.js`), output);
+}
+const { default: register, generateCommitMessage } = await import(pathToFileURL(join(root, 'index.js')));
+const { getStagedFiles } = await import(pathToFileURL(join(root, 'src/git.js')));
+const model = { id: '当前模型', provider: '当前提供方' };
+function context(complete) { return { model, modelRegistry: { complete } }; }
+function response(text, stopReason = 'stop') { return { content: [{ type: 'text', text }], stopReason }; }
+
+test('通过宿主统一接口继承当前模型并返回业务日志', async () => {
+  const ctx = context(async (actualModel, prompt, options) => {
+    assert.equal(actualModel, model);
+    assert.match(prompt.messages[0].content[0].text, /修复冲线残留/);
+    assert.equal(options.maxTokens, 4096);
+    return response('```text\nfix(racing): 清理冲线特效残留\n```');
+  });
+  assert.equal(await generateCommitMessage(ctx, '+ 清理特效', ['角色.cs'], '修复冲线残留'), 'fix(racing): 清理冲线特效残留');
+});
+
+test('拒绝空结果、异常完成、截断、非法格式和通用文案', async () => {
+  for (const result of [response(''), response('fix: 修复残留', 'error'), response('fix: 修复残留', 'length'), response('说明文字'), response('chore(GameClient): 更新代码与相关配置')]) {
+    await assert.rejects(generateCommitMessage(context(async () => result), 'diff', ['角色.cs']));
+  }
+  await assert.rejects(generateCommitMessage(context(async () => { throw new Error('认证失败'); }), 'diff', []), /认证失败/);
+  await assert.rejects(generateCommitMessage({ modelRegistry: {} }, 'diff', []), /未选择模型/);
+});
+
+test('生成失败不提交或推送，文件清单仅包含暂存区', async () => {
+  const repo = join(root, 'repo');
+  await mkdir(repo);
+  const git = (...args) => execFileSync('git', args, { cwd: repo, encoding: 'utf8' }).trim();
+  git('init', '-q');
+  git('config', 'user.name', '测试');
+  git('config', 'user.email', 'test@example.invalid');
+  await writeFile(join(repo, '角色 文件.cs'), '初始内容');
+  await writeFile(join(repo, '未暂存.cs'), '初始内容');
+  git('add', '.');
+  git('commit', '-qm', 'test: 初始化');
+  const head = git('rev-parse', 'HEAD');
+  await writeFile(join(repo, '角色 文件.cs'), '修改内容');
+  await writeFile(join(repo, '未暂存.cs'), '不应包含在提交中');
+  git('add', '--', '角色 文件.cs');
+  assert.deepEqual(await getStagedFiles(repo), ['角色 文件.cs']);
+  const commands = new Map();
+  const messages = [];
+  register({ registerCommand: (name, command) => commands.set(name, command), sendMessage: message => messages.push(message) });
+  const ctx = { ...context(async () => { throw new Error('认证失败'); }), cwd: repo, hasUI: true, ui: { notify() {} } };
+  await commands.get('commit-push').handler('', ctx);
+  assert.equal(git('rev-parse', 'HEAD'), head);
+  assert.match(messages.at(-1).content, /未执行提交或推送/);
+  assert.match(messages.at(-1).content, /认证失败/);
+  assert.deepEqual(await getStagedFiles(repo), ['角色 文件.cs']);
+  ctx.modelRegistry.complete = async () => response('fix: 修复角色表现');
+  await commands.get('commit').handler('', ctx);
+  assert.equal(git('log', '-1', '--format=%B'), 'fix: 修复角色表现');
+  assert.notEqual(git('rev-parse', 'HEAD'), head);
+  assert.ok(git('diff', '--name-only', '-z').includes('未暂存.cs'));
+});

package/extensions/review/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-review-zh",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "description": "Pi 交互式 AI 代码审查扩展（支持单模型与多 Subagent 并发 2~6 专家自由切换，Codex 经典架构）",
   "type": "module",
   "license": "MIT",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-unifan-zh",
-  "version": "1.0.32",
+  "version": "1.0.33",
   "description": "Pi Coding Agent 中文扩展全家桶与独立插件集",
   "type": "module",
   "main": "extensions/sessions/index.ts",
@@ -9,7 +9,8 @@
     "url": "https://github.com/821869798/pi-unifan-zh.git"
   },
   "scripts": {
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test:commit": "node --test extensions/commit/tests/commit.test.mjs"
   },
   "pi": {
     "extensions": [