@unifan/pi-unifan-zh 1.0.32 → 1.0.34

package/README.md

@@ -91,6 +91,7 @@ pi install npm:@unifan/pi-commit-zh
   - **Dual Execution Engine**:
     - ① **Single-Model Native Review (Default & Recommended)**: 0 subagent dependencies, 0 network dropouts, ultra-fast & 100% reliable.
     - ② **Multi-Subagent Concurrent Review**: Freely configure **2, 3, 4, 5, or 6** concurrent expert subagents (Bugbot, Security, Perf, Compliance, Comments, History).
+  - **Session Model & Thinking Level Inheritance**: Single-model review and final synthesis run directly in the current session. Multi-expert review launches through one asynchronous workflow and explicitly passes the current session's `provider/model:thinking-level` to every expert, preventing subagent defaults from overriding the session settings.
 - **Commands**:
   - **`/review`** 🔍: Launches interactive Chinese TUI menu with 6 review modes + settings:
     - ① `Review uncommitted changes` (staged + unstaged working tree, smart default)
@@ -117,7 +118,7 @@ pi install npm:@unifan/pi-commit-zh
 
 ### 3. 📦 `commit` (Intelligent Conventional Commits Assistant)
 - **Commands**:
-  - **`/commit`**: Analyzes `git diff`, generates standardized Conventional Commits in fluent Chinese, and commits in 1 second.
+  - **`/commit`**: Analyzes staged and working-tree changes (`git diff`), uses the current session's model and thinking level through the provider's unified parameter handling, and generates a Chinese Conventional Commit message from the actual staged changes before committing. Authentication, request, empty-response, or output-validation failures display the reason and stop the commit and push, preserving staged changes without substituting a generic fallback message.
   - **`/commit-push`** 🚀: Generates Chinese commit and automatically executes `git push` to remote.
 - **Usage & Flags**:
   - `/commit`: Smart commit (commits staged changes if staged, or auto-stages all if unstaged).

package/README_zh.md

@@ -90,6 +90,7 @@ pi install npm:@unifan/pi-commit-zh
   - **双执行引擎自由切换**：
     - ① **单模型深度审查（默认推荐）**：0 子代理依赖，0 网络断流，极速且 100% 稳定。
     - ② **多 Subagent 并发审查**：支持自由配置并发启动 **2、3、4、5、6** 个专家子代理协同会诊（Bug猎手、安全专家、性能探针、规范合规、注释质量、历史脉络）。
+  - **会话模型与思考档位继承**：单模型审查和主审汇总直接使用当前会话；多专家审查通过一个异步工作流启动，在每个专家请求中显式传入当前会话的 `提供方/模型:思考档位`，避免被子代理默认配置覆盖。
 - **核心审查命令**：
   - **`/review`** 🔍 **（交互式全功能审查）**：唤起全中文 TUI 选择弹窗，支持 6 种审查模式与配置中心：
     - ① `审查未提交改动` (工作区已暂存 + 未暂存代码，智能默认推荐)
@@ -122,7 +123,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,11 +35,12 @@ function parseArgs(raw: string): ParsedCommitArgs {
 	};
 }
 
-async function generateCommitMessage(
+export async function generateCommitMessage(
 	ctx: ExtensionCommandContext,
 	diff: string,
 	changedFiles: string[],
 	userHint?: string,
+	thinkingLevel = ctx.thinkingLevel,
 ): Promise<string> {
 	const truncatedDiff = diff.length > 30000 ? diff.slice(0, 30000) + "\n\n... (diff已截断)" : diff;
 	const userPrompt = [
@@ -55,50 +56,39 @@ 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?.getProvider !== "function" || typeof ctx.modelRegistry?.getProviderAuth !== "function")
+		throw new Error("当前 Pi 不支持统一模型调用接口，请更新 Pi 后重试。");
+	const modelLabel = `${ctx.model.provider}/${ctx.model.id}`;
+	const provider = ctx.modelRegistry.getProvider(ctx.model.provider);
+	if (!provider) throw new Error(`模型 ${modelLabel} 的提供方不可用，请重新选择模型。`);
+	const resolved = await ctx.modelRegistry.getProviderAuth(ctx.model.provider);
+	if (!resolved) throw new Error(`模型 ${modelLabel} 的认证未配置，请先完成登录或配置认证。`);
+
+	// 宿主解析认证、代理地址和环境；统一接口按模型能力转换会话思考档位，避免底层调用默认发送 none。
+	const model = resolved.auth.baseUrl ? { ...ctx.model, baseUrl: resolved.auth.baseUrl } : ctx.model;
+	const response = await provider.streamSimple(model, {
+		systemPrompt: COMMIT_SYSTEM_PROMPT,
+		messages: [{ role: "user", content: [{ type: "text", text: userPrompt }], timestamp: Date.now() }],
+	}, {
+		maxTokens: 4096,
+		signal: ctx.signal,
+		reasoning: thinkingLevel === "off" ? undefined : thinkingLevel,
+		apiKey: resolved.auth.apiKey,
+		headers: resolved.auth.headers,
+		env: resolved.env,
+	}).result();
+	if (response.stopReason !== "stop")
+		throw new Error(`模型 ${modelLabel} 未正常完成生成（${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 +106,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 +153,20 @@ 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, ctx.thinkingLevel ?? pi.getThinkingLevel(),
+			);
+		} 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,150 @@
+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';
+import { stream, streamSimple } from '@earendil-works/pi-ai/api/openai-responses';
+
+// 在临时目录编译并运行真实命令，不访问开发仓库的提交记录。
+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) {
+  const provider = { streamSimple: (...args) => ({ result: () => complete(...args) }) };
+  return {
+    model,
+    thinkingLevel: 'high',
+    modelRegistry: {
+      getProvider: () => provider,
+      getProviderAuth: async () => ({ auth: { apiKey: '测试凭据' } }),
+    },
+  };
+}
+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);
+    assert.equal(options.reasoning, 'high');
+    return response('```text\nfix(racing): 清理冲线特效残留\n```');
+  });
+  assert.equal(await generateCommitMessage(ctx, '+ 清理特效', ['角色.cs'], '修复冲线残留'), 'fix(racing): 清理冲线特效残留');
+});
+
+test('继承全部会话思考档位及宿主认证、代理与环境，不修改原模型', async () => {
+  for (const level of ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max']) {
+    const signal = new AbortController().signal;
+    const auth = { apiKey: '测试凭据', baseUrl: 'https://proxy.example.invalid/v1', headers: { 'x-test': '测试头' } };
+    const env = { TEST_PROVIDER_REGION: '测试区域' };
+    const ctx = context(async (actualModel, _prompt, options) => {
+      assert.equal(actualModel.id, model.id);
+      assert.equal(actualModel.baseUrl, auth.baseUrl);
+      assert.equal(model.baseUrl, undefined);
+      assert.equal(options.reasoning, level === 'off' ? undefined : level);
+      assert.equal(options.apiKey, auth.apiKey);
+      assert.equal(options.headers, auth.headers);
+      assert.equal(options.env, env);
+      assert.equal(options.signal, signal);
+      return response('fix: 修复思考档位继承');
+    });
+    ctx.thinkingLevel = level;
+    ctx.signal = signal;
+    ctx.modelRegistry.getProviderAuth = async () => ({ auth, env });
+    await generateCommitMessage(ctx, 'diff', ['index.ts']);
+  }
+});
+
+test('真实 OpenAI 适配器复现默认 none，并验证会话档位写入请求体', async () => {
+  const actualModel = {
+    ...model, id: 'gpt-6-astra', api: 'openai-responses', baseUrl: 'https://example.invalid/v1',
+    reasoning: true, input: ['text'], contextWindow: 128000, maxTokens: 16384,
+    cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+    thinkingLevelMap: { xhigh: 'xhigh', max: 'max' },
+  };
+  let payload;
+  const onPayload = value => { payload = value; throw new Error('已捕获请求，禁止联网'); };
+  const oldResponse = await stream(actualModel, { messages: [] }, { apiKey: '测试凭据', onPayload }).result();
+  assert.match(oldResponse.errorMessage, /已捕获请求/);
+  assert.equal(payload.reasoning.effort, 'none');
+  for (const thinking of ['low', 'medium', 'high', 'xhigh', 'max']) {
+    const ctx = context();
+    ctx.model = actualModel;
+    ctx.thinkingLevel = thinking;
+    ctx.modelRegistry.getProvider = () => ({
+      streamSimple: (requestModel, prompt, options) => streamSimple(requestModel, prompt, { ...options, onPayload }),
+    });
+    await assert.rejects(generateCommitMessage(ctx, 'diff', ['index.ts']), /已捕获请求/);
+    assert.equal(payload.reasoning.effort, thinking);
+  }
+});
+
+test('提供方或认证缺失时停止生成', async () => {
+  const ctx = context(() => { assert.fail('不应请求模型'); });
+  ctx.modelRegistry.getProviderAuth = async () => undefined;
+  await assert.rejects(generateCommitMessage(ctx, 'diff', []), /认证未配置/);
+  ctx.modelRegistry.getProvider = () => undefined;
+  await assert.rejects(generateCommitMessage(ctx, 'diff', []), /提供方不可用/);
+});
+
+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),
+    getThinkingLevel: () => 'max',
+  });
+  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.thinkingLevel 的宿主，从公开会话接口获取实际档位。
+  delete ctx.thinkingLevel;
+  ctx.modelRegistry = context(async (_model, _prompt, options) => {
+    assert.equal(options.reasoning, 'max');
+    return response('fix: 修复角色表现');
+  }).modelRegistry;
+  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/index.ts

@@ -26,6 +26,7 @@ import { Container, type SelectItem, SelectList, Text } from "@earendil-works/pi
 import path from "node:path";
 import os from "node:os";
 import { promises as fs } from "node:fs";
+import { buildSubagentOrchestrationPrompt } from "./src/orchestration.js";
 
 // 跟踪审查会话来源分支节点（保证单次仅一个活跃审查会话）
 let reviewOriginId: string | undefined = undefined;
@@ -77,89 +78,6 @@ async function saveSettings(settings: ReviewSettings): Promise<void> {
 	}
 }
 
-interface ReviewExpert {
-	id: string;
-	label: string;
-	desc: string;
-	task: string;
-}
-
-const ALL_EXPERTS: ReviewExpert[] = [
-	{
-		id: "pi-review.bugbot",
-		label: "Bug 猎手 (Bugbot)",
-		desc: "逻辑缺陷、空指针、边界溢出、死锁与运行时崩溃",
-		task: "深入排查本次代码改动中的业务逻辑缺陷、空指针、边界异常、并发竞态与未捕获的运行时异常",
-	},
-	{
-		id: "pi-review.security-review",
-		label: "安全专家 (Security)",
-		desc: "输入参数合法性校验、跨目录边界防护与权限隔离",
-		task: "深入排查本次代码改动中的防御性编码缺陷、外部输入未做类型/范围校验、边界防护不足等健壮性隐患",
-	},
-	{
-		id: "pi-review.perf-review",
-		label: "性能探针 (Perf)",
-		desc: "循环内GC内存分配、CPU热点消耗、算法复杂度与资源泄露",
-		task: "深入排查本次代码改动中的性能退化、高频循环内无谓内存分配 (GC压力) 与算法复杂度",
-	},
-	{
-		id: "pi-review.claude-md-compliance",
-		label: "契约合规 (Compliance)",
-		desc: "架构契约、设计模式、模块边界与规范遵循",
-		task: "排查本次代码改动是否违反项目既有架构契约、模块封装规范与规范指南",
-	},
-	{
-		id: "pi-review.code-comments",
-		label: "注释与可读性 (Comments)",
-		desc: "注释与代码逻辑倒挂、误导性命名与维护性隐患",
-		task: "排查本次代码改动中的可读性隐患、注释与逻辑不符、误导性命名与维护风险",
-	},
-	{
-		id: "pi-review.history-context",
-		label: "历史脉络 (History)",
-		desc: "结合 Git 历史演进判断意图，防止历史问题回归",
-		task: "结合代码演变历史，排查本次改动是否破坏既有历史契约或重现已知缺陷",
-	},
-];
-
-function buildSubagentOrchestrationPrompt(
-	concurrency: number,
-	gateEnabled: boolean,
-	targetInstruction: string,
-): string {
-	const count = Math.min(6, Math.max(2, concurrency));
-	const selected = ALL_EXPERTS.slice(0, count);
-
-	const listText = selected.map((exp, idx) => `${idx + 1}. **${exp.label}** (\`${exp.id}\`)：${exp.desc}`).join("\n");
-	const callsExample = selected
-		.map((exp) => {
-			const fullTask = `${targetInstruction}\n\n【专项排查分工】：${exp.task}`;
-			return `subagent({ agent: ${JSON.stringify(exp.id)}, task: ${JSON.stringify(fullTask)} });`;
-		})
-		.join("\n");
-
-	const maxBackticks = (callsExample.match(/`+/g) || []).reduce((max, m) => Math.max(max, m.length), 2);
-	const fence = "`".repeat(maxBackticks + 1);
-
-	return `## 🚀 执行方式：多 Subagent 并发专家审查 (当前配置并发数: ${count} 个专家)
-
-当前已配置并行启动以下 ${count} 个专家子代理进行分工审查：
-
-${listText}
-
-### 协作审查执行规范：
-1. **并发调用子代理**：请在当前回合使用 \`subagent\` 工具**同时并行唤起**上述 ${count} 个专家子代理（单回合发起 ${count} 个并发 tool_call，严禁串行逐个调用）：
-${fence}js
-${callsExample}
-${fence}
-2. **主审裁判长汇总整理**：当所有专家子代理执行完毕返回发现后，请你作为主审裁判长${gateEnabled ? "（门禁裁决）" : ""}：
-   - 全面综合各专家的审查意见，对相同问题进行去重，剔除误报和低置信度内容（注意：项目中合法的内部 GM / Debug 调试工具在确保与正式生产环境隔离的前提下免检）。
-   - 严格按照《核心代码审查准则》的 **[P0~P3]** 等级标准排布审查清单。
-   - 给出最终综合裁决与一句话中文总评。
-3. **语言强制要求**：所有任务入参、思考分析过程、综合汇报与最终报告必须 100% 为纯正中文，严禁出现任何英文段落或未翻译小标题！`;
-}
-
 function setReviewWidget(ctx: ExtensionContext, active: boolean) {
 	if (!ctx.hasUI) return;
 	if (!active) {
@@ -1062,6 +980,13 @@ export default function reviewExtension(pi: ExtensionAPI) {
 			...runtimeSettings,
 		};
 
+		const sessionModel = ctx.model;
+		const thinkingLevel = ctx.thinkingLevel ?? pi.getThinkingLevel();
+		if (settings.mode === "subagents" && !sessionModel) {
+			ctx.ui.notify("当前未选择模型，请先使用 /model 选择模型。", "error");
+			return;
+		}
+
 		let effectiveFreshSession = useFreshSession;
 
 		if (effectiveFreshSession) {
@@ -1110,8 +1035,10 @@ export default function reviewExtension(pi: ExtensionAPI) {
 
 		let fullPrompt = REVIEW_RUBRIC;
 
-		if (settings.mode === "subagents") {
-			fullPrompt += `\n\n---\n\n${buildSubagentOrchestrationPrompt(settings.concurrency, settings.gateEnabled, prompt)}`;
+		if (settings.mode === "subagents" && sessionModel) {
+			fullPrompt += `\n\n---\n\n${buildSubagentOrchestrationPrompt(
+				settings.concurrency, settings.gateEnabled, prompt, sessionModel, thinkingLevel,
+			)}`;
 		}
 
 		fullPrompt += `\n\n---\n\n## 本次审查任务指示\n\n${prompt}`;

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/extensions/review/src/orchestration.ts

@@ -0,0 +1,90 @@
+interface ReviewExpert {
+	id: string;
+	label: string;
+	desc: string;
+	task: string;
+}
+
+const ALL_EXPERTS: ReviewExpert[] = [
+	{
+		id: "pi-review.bugbot",
+		label: "Bug 猎手 (Bugbot)",
+		desc: "逻辑缺陷、空指针、边界溢出、死锁与运行时崩溃",
+		task: "深入排查本次代码改动中的业务逻辑缺陷、空指针、边界异常、并发竞态与未捕获的运行时异常",
+	},
+	{
+		id: "pi-review.security-review",
+		label: "安全专家 (Security)",
+		desc: "输入参数合法性校验、跨目录边界防护与权限隔离",
+		task: "深入排查本次代码改动中的防御性编码缺陷、外部输入未做类型/范围校验、边界防护不足等健壮性隐患",
+	},
+	{
+		id: "pi-review.perf-review",
+		label: "性能探针 (Perf)",
+		desc: "循环内GC内存分配、CPU热点消耗、算法复杂度与资源泄露",
+		task: "深入排查本次代码改动中的性能退化、高频循环内无谓内存分配 (GC压力) 与算法复杂度",
+	},
+	{
+		id: "pi-review.claude-md-compliance",
+		label: "契约合规 (Compliance)",
+		desc: "架构契约、设计模式、模块边界与规范遵循",
+		task: "排查本次代码改动是否违反项目既有架构契约、模块封装规范与规范指南",
+	},
+	{
+		id: "pi-review.code-comments",
+		label: "注释与可读性 (Comments)",
+		desc: "注释与代码逻辑倒挂、误导性命名与维护性隐患",
+		task: "排查本次代码改动中的可读性隐患、注释与逻辑不符、误导性命名与维护风险",
+	},
+	{
+		id: "pi-review.history-context",
+		label: "历史脉络 (History)",
+		desc: "结合 Git 历史演进判断意图，防止历史问题回归",
+		task: "结合代码演变历史，排查本次改动是否破坏既有历史契约或重现已知缺陷",
+	},
+];
+
+export function buildSubagentOrchestrationPrompt(
+	concurrency: number,
+	gateEnabled: boolean,
+	targetInstruction: string,
+	sessionModel: { provider: string; id: string },
+	thinkingLevel: string,
+): string {
+	const count = Math.min(6, Math.max(2, concurrency));
+	const selected = ALL_EXPERTS.slice(0, count);
+
+	const listText = selected.map((exp, idx) => `${idx + 1}. **${exp.label}** (\`${exp.id}\`)：${exp.desc}`).join("\n");
+	// 每次执行显式固定当前会话模型和档位，避免子代理默认配置覆盖会话选择。
+	const model = `${sessionModel.provider}/${sessionModel.id}:${thinkingLevel}`;
+	const tasks = selected.map((exp) => ({
+		key: exp.id,
+		agent: exp.id,
+		model,
+		task: `${targetInstruction}\n\n【专项排查分工】：${exp.task}`,
+	}));
+	const callsExample = `subagent(${JSON.stringify({
+		async: true,
+		workflowScript: `const results = await runs.all(${JSON.stringify(tasks)});\nreturn results;`,
+	}, null, 2)});`;
+
+	const maxBackticks = (callsExample.match(/`+/g) || []).reduce((max, m) => Math.max(max, m.length), 2);
+	const fence = "`".repeat(maxBackticks + 1);
+
+	return `## 🚀 执行方式：多 Subagent 并发专家审查 (当前配置并发数: ${count} 个专家)
+
+当前已配置并行启动以下 ${count} 个专家子代理进行分工审查：
+
+${listText}
+
+### 协作审查执行规范：
+1. **并发调用子代理**：先调用 \`subagent({ action: "list", capabilities: true })\`，确认上述专家均可执行且未禁用；再通过下方**一个异步工作流**并行启动全部专家。每个专家必须使用示例中的 \`model\` 参数，继承本次会话模型与思考档位（${thinkingLevel}），不得省略或改用代理默认档位。运行失败时报告具体原因并停止，不得静默更换模型或执行方式：
+${fence}js
+${callsExample}
+${fence}
+2. **主审裁判长汇总整理**：当所有专家子代理执行完毕返回发现后，请你作为主审裁判长${gateEnabled ? "（门禁裁决）" : ""}：
+   - 全面综合各专家的审查意见，对相同问题进行去重，剔除误报和低置信度内容（注意：项目中合法的内部 GM / Debug 调试工具在确保与正式生产环境隔离的前提下免检）。
+   - 严格按照《核心代码审查准则》的 **[P0~P3]** 等级标准排布审查清单。
+   - 给出最终综合裁决与一句话中文总评。
+3. **语言强制要求**：所有任务入参、思考分析过程、综合汇报与最终报告必须 100% 为纯正中文，严禁出现任何英文段落或未翻译小标题！`;
+}

package/extensions/review/tests/orchestration.test.mjs

@@ -0,0 +1,52 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { readFile } from 'node:fs/promises';
+import ts from 'typescript';
+
+const source = await readFile(new URL('../src/orchestration.ts', import.meta.url), 'utf8');
+const compiled = ts.transpileModule(source, {
+  compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.ESNext },
+}).outputText;
+const { buildSubagentOrchestrationPrompt } = await import(`data:text/javascript;base64,${Buffer.from(compiled).toString('base64')}`);
+const AsyncFunction = Object.getPrototypeOf(async function () {}).constructor;
+
+// 执行实际生成的工作流，使用假运行器捕获请求，不启动模型或子代理。
+async function runExample(prompt) {
+  const example = prompt.match(/(`{3,})js\n([\s\S]*?)\n\1/);
+  assert.ok(example, '应包含可执行的工作流示例');
+  let request;
+  new Function('subagent', example[2])(value => { request = value; });
+  assert.equal(request.async, true);
+  let tasks;
+  const results = [{ output: '审查完成' }];
+  const actual = await new AsyncFunction('runs', request.workflowScript)({
+    all: async value => { tasks = value; return results; },
+  });
+  assert.equal(actual, results);
+  return tasks;
+}
+
+test('所有专家在不同并发数下继承会话模型及全部思考档位', async () => {
+  for (const thinking of ['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max']) {
+    for (const count of [2, 3, 4, 5, 6]) {
+      const prompt = buildSubagentOrchestrationPrompt(count, true, '检查当前差异', { provider: '会话提供方', id: '会话模型' }, thinking);
+      const tasks = await runExample(prompt);
+      assert.equal(tasks.length, count);
+      assert.equal(new Set(tasks.map(task => task.key)).size, count);
+      for (const task of tasks) {
+        assert.equal(task.model, `会话提供方/会话模型:${thinking}`);
+        assert.match(task.task, /检查当前差异/);
+      }
+      assert.match(prompt, /capabilities: true/);
+    }
+  }
+});
+
+test('用户任务中的引号、换行和代码围栏不破坏工作流或模型参数', async () => {
+  const target = '检查 "路径"\n```ts\nconst value = `${input}`;\n```\n反斜线 \\';
+  const prompt = buildSubagentOrchestrationPrompt(3, false, target, { provider: '代理', id: '模型/别名' }, 'max');
+  const tasks = await runExample(prompt);
+  assert.ok(tasks.every(task => task.task.startsWith(target)));
+  assert.ok(tasks.every(task => task.model === '代理/模型/别名:max'));
+  assert.doesNotMatch(prompt, /（门禁裁决）/);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unifan/pi-unifan-zh",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Pi Coding Agent 中文扩展全家桶与独立插件集",
   "type": "module",
   "main": "extensions/sessions/index.ts",
@@ -9,7 +9,9 @@
     "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",
+    "test:review": "node --test extensions/review/tests/orchestration.test.mjs"
   },
   "pi": {
     "extensions": [