@andares/pi-toolkits 0.4.0 → 0.4.1

package/README.md

@@ -161,14 +161,19 @@ pi -e ./src/index.ts
 
 **范围强约束** —— 评审仅限**当前本轮修改内容**,避免扩大范围;本轮改动范围内确认的问题才直接修复,范围外的历史遗留/无关问题只记录提示、不动手改。
 
-**评审模型配置**(`<agent-dir>/pi-toolkits-review.json`,默认 `~/.pi/agent/`):
+**评审模型选择**(每次 `/third-review` 都会弹出选择界面):
+
+- `/third-review` → 弹出模型列表(与 `/model` 同源):**第一项 = 当前配置的模型**(默认高亮),直接**回车**即用它开始评审;也可移动到其他模型
+- **换选其他模型** → 立即写回配置(**落盘 + 内存**),**下次默认使用该模型**;标题实时显示当前配置
+- **取消**(Esc)→ 不执行评审,配置不变
+- 配置持久化于 `<agent-dir>/pi-toolkits-review.json`(默认 `~/.pi/agent/`):
 
 ```json
 { "model": "anthropic/claude-sonnet-4" }
 ```
 
-- `/review-model` —— 查看/更换评审模型:弹出模型列表(标题显示当前配置),选中即写入;取消则不修改配置
-- **未配置 / 配置的模型已不可用**(如在 pi 的 models.json 里删掉了该模型)→ 提示「评审模型不存在」,弹出**可用模型选择列表**(与 `/model` 同源);选中后**写回配置并立即执行**
+- `/review-model` —— 单独的配置入口:弹出同一列表(不改会话模型,只更新默认配置)
+- **未配置 / 配置的模型已不可用**(如在 pi 的 models.json 里删掉了该模型)→ 提示后照常弹出列表(此时无默认项)
 - 任务仍在进行中(agent 未空闲)时触发 → 提示等待,不执行;同一时间只允许一个评审
 - footer 出现灰色 `review` 状态 = 已配置评审模型
 
@@ -217,45 +222,6 @@ pi 的 `/compact` 与 auto-compact 默认**用当前会话模型**做上下文
 
 ---
 
-**pnpm is the only supported toolchain** — never use `npm install` / `npm publish` in this repo.
-
-```bash
-pnpm install      # install deps
-pnpm typecheck    # tsc --noEmit
-pnpm test         # vitest (all feature unit tests)
-```
-
-### 项目结构 Project structure
-
-```text
-src/
-├── index.ts              # entry point: aggregates feature modules
-├── lib/                  # shared infrastructure (tool-set snapshot/restore)
-└── features/             # feature modules — one directory per feature
-    ├── ask/              # ask mode: command + state machine, bash sandbox,
-    │                     #           system prompt banner, tests
-    ├── favorites/        # model favorites: selector + cycle patches,
-    │                     #           persisted store, tests
-    ├── review/           # third-party review: input/command triggers,
-    │                     #           review-model config store, prompt, tests
-    └── stash/            # prompt stash: hotkey state machine + tests
-```
-
-**新增功能 · adding a feature**:create `src/features/<name>/` exporting `registerXxx(pi)` and call it from `src/index.ts`. Existing modules stay untouched. Each feature ships its own `*.test.ts` (vitest) — keep them deterministic (inject clocks/state, no real agent-dir writes).
-
-**发布 · publishing**(pnpm-only,one command):
-
-```bash
-pnpm release patch   # 0.1.2 → 0.1.3
-pnpm release minor   # 0.1.2 → 0.2.0   (patch zeroed)
-pnpm release major   # 0.1.2 → 1.0.0   (minor + patch zeroed)
-pnpm release patch --dry-run   # preview without changing anything
-```
-
-`release` 要求且仅要求 `major | minor | patch` 之一;上级递增清零下级。执行链:校验 → `typecheck + test` 门禁 → 改版本 → git commit + `vX.Y.Z` tag → `pnpm publish`(`prepublishOnly` 二次门禁)。
-
----
-
 ## 🛠️ 开发 Development
 
 <a name="development"></a>
@@ -299,7 +265,7 @@ pnpm release major   # 0.1.2 → 1.0.0   (minor + patch zeroed)
 pnpm release patch --dry-run   # preview without changing anything
 ```
 
-`release` 要求且仅要求 `major | minor | patch` 之一;上级递增清零下级。执行链:校验 → `typecheck + test` 门禁 → 改版本 → git commit + `vX.Y.Z` tag → `pnpm publish`(`prepublishOnly` 二次门禁)。
+`release` 要求且仅要求 `major | minor | patch` 之一;上级递增清零下级。执行链:**工作区必须干净(有未提交变更直接中止,保证 tag 内容 == 发布内容)** → `typecheck + test` 门禁 → 改版本 → git commit + `vX.Y.Z` tag(自检 tag==HEAD 且工作区干净) → `pnpm publish`(`prepublishOnly` 二次门禁) → 只推当前分支 + 当前 tag 并校验远端哈希一致(远端 tag 不一致则跳过 Release 创建)。
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andares/pi-toolkits",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Integrated toolkit extension for pi — ask mode (read-only Q&A), model favorites, prompt stash, third-party code review, and a dedicated compaction model",
   "type": "module",
   "license": "MIT",

package/src/features/compact/index.ts

@@ -107,11 +107,7 @@ async function completeSummary(
 		);
 	}
 	const text = response.content
-		.filter(
-			(block): block is { type: "text"; text: string } =>
-				block.type === "text",
-		)
-		.map((block) => block.text)
+		.flatMap((block) => (block.type === "text" ? [block.text] : []))
 		.join("\n");
 	return { text, usage: response.usage };
 }

package/src/features/compact/prompt.ts

@@ -161,9 +161,11 @@ export function computeFileLists(fileOps: FileOpsLike): {
 	modifiedFiles: string[];
 } {
 	const modified = new Set([...fileOps.edited, ...fileOps.written]);
+	// pi-lens-ignore: no-sort-without-comparator, — 逐字对齐 pi 0.87.1 的裸 .sort()：文件路径按码元序排序（加 locale 比较器反而会改变顺序）
 	const readOnly = [...fileOps.read]
 		.filter((f) => !modified.has(f))
 		.sort();
+	// pi-lens-ignore: no-sort-without-comparator, — 同上（pi 0.87.1 computeFileLists 原文）
 	const modifiedFiles = [...modified].sort();
 	return { readFiles: readOnly, modifiedFiles };
 }

package/src/features/favorites/patch-cycle.ts

@@ -146,14 +146,11 @@ export function applyCyclePatch(): boolean {
 					.getAvailableSnapshot()
 					.map((model) => `${model.provider}\0${model.id}`),
 			);
-			candidates = this._scopedModels
-				.filter(
-					(sm) => availableIds.has(`${sm.model.provider}\0${sm.model.id}`),
-			)
-				.map((sm) => ({
-					model: sm.model,
-					thinkingLevel: sm.thinkingLevel,
-				}));
+			candidates = this._scopedModels.flatMap((sm) =>
+				availableIds.has(`${sm.model.provider}\0${sm.model.id}`)
+					? [{ model: sm.model, thinkingLevel: sm.thinkingLevel }]
+					: [],
+			);
 		} else {
 			candidates = this._modelRuntime
 				.getAvailableSnapshot()

package/src/features/favorites/patch-selector.ts

@@ -191,11 +191,8 @@ export function applyModelSelectorPatches(): boolean {
 				: "";
 			const cursor = isSelected ? theme.fg("accent", "→ ") : "  ";
 			const currentMarker = isCurrent ? theme.fg("accent", "✓ ") : "  ";
-			const modelText = isFavorite
-				? styleFavorite(item.id)
-				: isSelected
-					? theme.fg("accent", item.id)
-					: item.id;
+			const baseText = isSelected ? theme.fg("accent", item.id) : item.id;
+			const modelText = isFavorite ? styleFavorite(item.id) : baseText;
 			const providerBadge = theme.fg("muted", `[${item.provider}]`);
 			const line = `${cursor}${currentMarker}${modelText} ${providerBadge}${defaultBadge}`;
 			list.addChild(new Text(line, 0, 0));

package/src/features/review/index.ts

@@ -11,11 +11,14 @@
  * model as ordinary text, so an accidental send can never start a review.)
  *
  * Review-model config lives in `<agent-dir>/pi-toolkits-review.json`
- * ("provider/id", see store.ts). When no model is configured, or the
- * configured model is gone/unavailable (e.g. deleted from pi's models.json),
- * the user is told the review model doesn't exist and is shown the available
- * model list (ctx.ui.select, same getAvailable() source as /model); the pick
- * is written back to the config and the review runs immediately.
+ * ("provider/id", see store.ts) and doubles as the picker default. Every
+ * /third-review run opens the model picker (ctx.ui.select, same
+ * getAvailable() source as /model) with the configured model as the FIRST
+ * row — one Enter accepts it and starts the review. Picking a different
+ * model persists it immediately (disk + in-memory) as the new default for
+ * next time; cancelling aborts the review without changing anything. When
+ * the configured model is gone/unavailable (e.g. deleted from pi's
+ * models.json) the user is warned and the picker opens on the plain list.
  *
  * Guards: never fires while the agent is streaming (the review needs the
  * just-finished work as context) and never runs two reviews concurrently.
@@ -39,8 +42,11 @@ import { getReviewStore, type ReviewStore } from "./store.js";
  * Let the user pick a review model from the available list and persist the
  * choice. Returns the picked model, or undefined when cancelled/unavailable.
  *
- * The picker title shows the current config so /review-model doubles as a
- * view-and-change entry point; cancelling leaves the config untouched.
+ * The configured model is placed FIRST: the select dialog always highlights
+ * its first row, so one Enter accepts the current default. Picking any other
+ * model persists it (disk + in-memory) as the new default. The title shows
+ * the current config, so /review-model doubles as a view-and-change entry
+ * point; cancelling leaves the config untouched.
  */
 export async function pickReviewModel(
 	ctx: ExtensionContext,
@@ -64,21 +70,45 @@ export async function pickReviewModel(
 		return undefined;
 	}
 	const configured = store.getModel();
+	const configuredModel = resolveConfiguredModel(ctx, configured);
+	// Configured model first → highlighted by default (Enter accepts it);
+	// the rest keep the registry order.
+	const ordered: AvailableModel[] = configuredModel
+		? [
+				configuredModel,
+				...available.filter(
+					(m) => modelKey(m) !== modelKey(configuredModel),
+				),
+			]
+		: available;
 	// Same display source as the /model selector: name + [provider]/id.
-	const options = available.map((m: AvailableModel) => `${m.name} (${m.provider}/${m.id})`);
-	const choice = await ctx.ui.select(
-		configured
-			? `选择评审模型 (当前: ${configured})`
-			: "选择评审模型 (third-review)",
-		options,
+	const options = ordered.map(
+		(m: AvailableModel) => `${m.name} (${m.provider}/${m.id})`,
 	);
+	// Title reflects what Enter actually accepts: the configured model when it
+	// is available, a clear "unavailable" marker otherwise.
+	let title = "选择评审模型 (third-review)";
+	if (configuredModel) {
+		title = `选择评审模型 (当前: ${configured}，回车使用)`;
+	} else if (configured) {
+		title = `选择评审模型 (当前: ${configured} 不可用)`;
+	}
+	const choice = await ctx.ui.select(title, options);
 	if (choice === undefined) {
 		ctx.ui.notify("third-review: 已取消，评审模型配置未变更。", "info");
 		return undefined;
 	}
-	const model = available[options.indexOf(choice)];
+	const model = ordered[options.indexOf(choice)];
 	if (!model) return undefined;
-	store.setModel(modelKey(model));
+	const key = modelKey(model);
+	if (key !== configured) {
+		// Persist immediately (disk + in-memory + footer) — next run defaults here.
+		store.setModel(key);
+		ctx.ui.notify(
+			`third-review: 评审模型已保存为「${model.name}」，下次默认使用。`,
+			"info",
+		);
+	}
 	return model;
 }
 
@@ -118,8 +148,20 @@ export function createReviewRunner(
 						: "third-review: 尚未配置评审模型，请选择。",
 					"warning",
 				);
+			}
+			if (ctx.hasUI) {
+				// Always show the picker: the configured model is the first row
+				// (one Enter accepts it); picking another persists it as default.
 				model = await pickReviewModel(ctx, store);
 				if (!model) return;
+			} else if (!model) {
+				// No dialogs (json/print/headless): the configured-model path keeps
+				// working; without one, point at the config file.
+				ctx.ui.notify(
+					"third-review: 当前环境不支持模型选择对话框，请编辑 <agent-dir>/pi-toolkits-review.json 手动配置。",
+					"error",
+				);
+				return;
 			}
 			const switched = await pi.setModel(model);
 			if (!switched) {

package/src/features/review/review.test.ts

@@ -285,17 +285,48 @@ describe("pickReviewModel", () => {
 		expect(store.getModel()).toBe("anthropic/claude-opus-4");
 	});
 
-	it("shows the current config in the picker title", async () => {
+	it("puts the configured model first (Enter accepts it) and keeps config on cancel", async () => {
 		const store = new ReviewStore(freshStoreFile());
-		store.setModel("anthropic/claude-sonnet-4");
+		store.setModel("anthropic/claude-opus-4");
 		const { ctx, select } = fakeCtx({ selectResult: undefined });
 		await pickReviewModel(ctx, store);
 		expect(select).toHaveBeenCalledWith(
-			"选择评审模型 (当前: anthropic/claude-sonnet-4)",
-			expect.any(Array),
+			"选择评审模型 (当前: anthropic/claude-opus-4，回车使用)",
+			[
+				"Claude Opus 4 (anthropic/claude-opus-4)",
+				"Claude Sonnet 4 (anthropic/claude-sonnet-4)",
+				"GPT-5 (openrouter/openai/gpt-5)",
+			],
 		);
 		// Cancelling a change keeps the existing config.
-		expect(store.getModel()).toBe("anthropic/claude-sonnet-4");
+		expect(store.getModel()).toBe("anthropic/claude-opus-4");
+	});
+
+	it("re-picking the configured model does not rewrite the store", async () => {
+		const store = new ReviewStore(freshStoreFile());
+		store.setModel("anthropic/claude-opus-4");
+		const spy = vi.spyOn(store, "setModel");
+		const { ctx } = fakeCtx({
+			selectResult: "Claude Opus 4 (anthropic/claude-opus-4)",
+		});
+		const picked = await pickReviewModel(ctx, store);
+		expect(picked).toBe(MODELS[1]);
+		expect(spy).not.toHaveBeenCalled();
+	});
+
+	it("persists and confirms when a different model is picked", async () => {
+		const store = new ReviewStore(freshStoreFile());
+		store.setModel("anthropic/claude-opus-4");
+		const { ctx, notify } = fakeCtx({
+			selectResult: "GPT-5 (openrouter/openai/gpt-5)",
+		});
+		const picked = await pickReviewModel(ctx, store);
+		expect(picked).toBe(MODELS[2]);
+		expect(store.getModel()).toBe("openrouter/openai/gpt-5");
+		expect(notify).toHaveBeenCalledWith(
+			expect.stringContaining("已保存为"),
+			"info",
+		);
 	});
 });
 
@@ -314,11 +345,15 @@ describe("createReviewRunner", () => {
 		expect(pi.sendUserMessage).not.toHaveBeenCalled();
 	});
 
-	it("switches to the configured model and sends the review prompt", async () => {
+	it("shows the picker and runs on the configured model when accepted", async () => {
 		getReviewStore().setModel("anthropic/claude-sonnet-4");
 		const { pi, setModel, sendUserMessage } = fakePi();
-		const { ctx, notify } = fakeCtx();
+		const { ctx, notify, select } = fakeCtx({
+			selectResult: "Claude Sonnet 4 (anthropic/claude-sonnet-4)",
+		});
 		await createReviewRunner(pi)(ctx);
+		// The picker is always shown, even with a configured model.
+		expect(select).toHaveBeenCalledTimes(1);
 		expect(setModel).toHaveBeenCalledWith(MODELS[0]);
 		expect(sendUserMessage).toHaveBeenCalledWith(REVIEW_PROMPT);
 		expect(notify).toHaveBeenCalledWith(
@@ -327,6 +362,16 @@ describe("createReviewRunner", () => {
 		);
 	});
 
+	it("runs with the configured model without dialogs when the UI cannot pick", async () => {
+		getReviewStore().setModel("anthropic/claude-sonnet-4");
+		const { pi, setModel, sendUserMessage } = fakePi();
+		const { ctx, select } = fakeCtx({ hasUI: false });
+		await createReviewRunner(pi)(ctx);
+		expect(select).not.toHaveBeenCalled();
+		expect(setModel).toHaveBeenCalledWith(MODELS[0]);
+		expect(sendUserMessage).toHaveBeenCalledWith(REVIEW_PROMPT);
+	});
+
 	it("picks, persists and runs when no model is configured", async () => {
 		const { pi, setModel, sendUserMessage } = fakePi();
 		const { ctx, notify, select } = fakeCtx({
@@ -358,6 +403,12 @@ describe("createReviewRunner", () => {
 		expect(setModel).toHaveBeenCalledWith(MODELS[0]);
 		expect(sendUserMessage).toHaveBeenCalledWith(REVIEW_PROMPT);
 		expect(select).toHaveBeenCalledTimes(1);
+		// The title marks the configured model as unavailable (Enter picks the
+		// first available row, not the configured one).
+		expect(select).toHaveBeenCalledWith(
+			"选择评审模型 (当前: anthropic/claude-opus-4-5 不可用)",
+			expect.any(Array),
+		);
 	});
 
 	it("aborts when the user cancels the model pick", async () => {
@@ -373,7 +424,9 @@ describe("createReviewRunner", () => {
 	it("reports and aborts when switching to the review model fails", async () => {
 		getReviewStore().setModel("anthropic/claude-sonnet-4");
 		const { pi, setModel, sendUserMessage } = fakePi(false); // setModel → false
-		const { ctx, notify } = fakeCtx();
+		const { ctx, notify } = fakeCtx({
+			selectResult: "Claude Sonnet 4 (anthropic/claude-sonnet-4)",
+		});
 		await createReviewRunner(pi)(ctx);
 		expect(setModel).toHaveBeenCalledWith(MODELS[0]);
 		expect(sendUserMessage).not.toHaveBeenCalled();