@andares/pi-toolkits 0.3.1 → 0.4.1

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

@@ -34,13 +34,15 @@ import {
 import {
 	createReviewRunner,
 	pickReviewModel,
-	resolveConfiguredModel,
 } from "./index.js";
+import {
+	modelKey,
+	resolveConfiguredModel,
+} from "../../lib/model-config.js";
 import { REVIEW_PROMPT } from "./prompt.js";
 import {
 	ReviewStore,
 	getReviewStore,
-	modelKey,
 	setSharedReviewStore,
 } from "./store.js";
 
@@ -283,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",
+		);
 	});
 });
 
@@ -312,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(
@@ -325,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({
@@ -356,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 () => {
@@ -371,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();

package/src/features/review/store.ts

@@ -22,11 +22,6 @@ import { dirname, join } from "node:path";
 import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import { REVIEW_FILE } from "./constants.js";
 
-/** Model identity used as the review-model key: "provider/id". */
-export function modelKey(model: { provider: string; id: string }): string {
-	return `${model.provider}/${model.id}`;
-}
-
 export class ReviewStore {
 	private model: string | undefined;
 	private readonly file: string;

package/src/index.ts

@@ -9,15 +9,18 @@
  *  - favorites — model favorites (ctrl+F/ctrl+J in /model, favorites-only cycling)
  *  - stash — prompt stash (ctrl+alt+y swap / double-press stash-and-clear)
  *  - review — third-party code review with a configured review model (third-review)
+ *  - compact — dedicated compact model for /compact + auto-compact summaries
  */
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { registerAsk } from "./features/ask/index.js";
+import { registerCompact } from "./features/compact/index.js";
 import { registerFavorites } from "./features/favorites/index.js";
 import { registerReview } from "./features/review/index.js";
 import { registerStash } from "./features/stash/index.js";
 
 export default function piToolkits(pi: ExtensionAPI): void {
 	registerAsk(pi);
+	registerCompact(pi);
 	registerFavorites(pi);
 	registerReview(pi);
 	registerStash(pi);

package/src/lib/model-config.ts

@@ -0,0 +1,44 @@
+/**
+ * Shared model-config helpers for features that persist a "provider/id"
+ * model key and resolve it against the currently available model list
+ * (review, compact-model — favorites keeps its own store-local key logic).
+ *
+ * Types are derived from pi-coding-agent's own exports (ModelRegistry)
+ * rather than imported from @earendil-works/pi-ai: pi-ai 0.87's index.d.ts
+ * re-exports `Model`/`Api` via extensioned `./types.ts` specifiers, which
+ * tsc 5.9 bundler resolution substitutes to `.d.ts` but some tsserver
+ * builds do not. Deriving from ModelRegistry keeps every resolver in
+ * agreement with the exact type `ctx.modelRegistry.getAvailable()` returns.
+ */
+import type {
+	ExtensionContext,
+	ModelRegistry,
+} from "@earendil-works/pi-coding-agent";
+
+/** The model type pi's ModelRegistry exposes (`Model<Api>`). */
+export type AvailableModel = ReturnType<ModelRegistry["getAvailable"]>[number];
+
+/** Model identity used as a persisted config key: "provider/id". */
+export function modelKey(model: { provider: string; id: string }): string {
+	return `${model.provider}/${model.id}`;
+}
+
+/**
+ * Resolve a persisted "provider/id" key against the available model list.
+ * Ids may themselves contain slashes (e.g. openrouter/openai/gpt-5), so only
+ * the first slash splits provider from id. Returns undefined for missing,
+ * malformed, or currently-unavailable keys.
+ */
+export function resolveConfiguredModel(
+	ctx: ExtensionContext,
+	key: string | undefined,
+): AvailableModel | undefined {
+	if (!key) return undefined;
+	const slash = key.indexOf("/");
+	if (slash <= 0 || slash === key.length - 1) return undefined;
+	const provider = key.slice(0, slash);
+	const id = key.slice(slash + 1);
+	return ctx.modelRegistry
+		.getAvailable()
+		.find((m) => m.provider === provider && m.id === id);
+}