@andares/pi-toolkits 0.11.2 → 0.11.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@andares/pi-toolkits",
-  "version": "0.11.2",
+  "version": "0.11.3",
   "description": "Integrated toolkit extension for pi — ask mode (read-only Q&A), session-scoped permission checks, model favorites, prompt stash, third-party code review, session autostart, a dedicated compaction model, and an agent memory framework (/ask-init)",
   "type": "module",
   "license": "MIT",

package/src/features/compact/compact.test.ts

@@ -525,6 +525,61 @@ describe("session_before_compact handler", () => {
 		expect(compaction.usage?.input).toBe(107);
 	});
 
+	it("keeps the cost provider-reported only when both split-turn parts report it", async () => {
+		// 1.5.0's combineUsage rule end-to-end: the merged compaction usage, not
+		// just the helper. A part that reports no provider cost is enough to make
+		// the sum "not provider-reported"; only both parts reporting it flips it
+		// to true (asserted below on a second run). The flag is cost provenance,
+		// not the token sum.
+		getCompactStore().setModel("google/gemini-2.5-flash");
+		const { handler } = registeredHandler();
+		const withFlag = (flag: boolean | undefined) => {
+			const usage = fakeUsage();
+			if (flag !== undefined) usage.cost.totalFromProvider = flag;
+			return usage;
+		};
+		const { ctx } = fakeCtx({
+			complete: vi.fn(async (_model, context) => {
+				const text = (context.messages[0]?.content as Array<{ text?: string }>)[0]
+					?.text;
+				return text?.includes("# Instructions")
+					? fakeResponse("TURN PREFIX", { usage: withFlag(true) })
+					: fakeResponse("HISTORY", { usage: withFlag(undefined) });
+			}),
+		});
+		const event = fakeEvent({
+			turnPrefixMessages: [userMessage("prefix msg")],
+			isSplitTurn: true,
+		});
+		const result = (await handler(
+			event as never,
+			ctx,
+		)) as SessionBeforeCompactResult | undefined;
+		// Read through the structural view, not the host's `CompleteUsage`:
+		// `cost.totalFromProvider` only exists on pi ≥ 1.5.0's types, so reading
+		// it directly from the host type breaks typecheck on the 1.2–1.4 window
+		// even though the runtime field we write is the same.
+		const mergedUsage = result!.compaction!.usage as unknown as UsageLike;
+		expect(mergedUsage.cost.totalFromProvider).toBe(false);
+
+		// Same split turn, but both summaries report the cost themselves → true.
+		const both = fakeCtx({
+			complete: vi.fn(async (_model, context) => {
+				const text = (context.messages[0]?.content as Array<{ text?: string }>)[0]
+					?.text;
+				return text?.includes("# Instructions")
+					? fakeResponse("TURN PREFIX", { usage: withFlag(true) })
+					: fakeResponse("HISTORY", { usage: withFlag(true) });
+			}),
+		});
+		const bothResult = (await handler(
+			event as never,
+			both.ctx,
+		)) as SessionBeforeCompactResult | undefined;
+		const bothUsage = bothResult!.compaction!.usage as unknown as UsageLike;
+		expect(bothUsage.cost.totalFromProvider).toBe(true);
+	});
+
 	it("keeps the previous summary as history text on split turns with no messages", async () => {
 		getCompactStore().setModel("google/gemini-2.5-flash");
 		const { handler } = registeredHandler();

package/src/features/favorites/constants.ts

@@ -29,7 +29,8 @@ export const FAVORITES_FILE = "pi-toolkits-favorites.json";
  * (0.87–0.99 defaulted to `regular`, where the binding is inert). On
  * Windows/WSL `tui.altScreen.search` resolves to ctrl+f, and
  * `TuiAltScreen.handleViewportInput()` checks it before
- * `shouldDeferViewportInputToOverlay()`, so the keystroke opens transcript
+ * `shouldDeferViewportInput()` (named `shouldDeferViewportInputToOverlay()`
+ * through 1.4.0), so the keystroke opens transcript
  * search and the selector never sees it (verified in pi-tui 1.5.0
  * `dist/tui-alt-screen.js`: the search check is still the first key branch
  * and still returns `{ consume: true }` unconditionally; the 1.5.0 changes to

package/src/features/favorites/favorites.test.ts

@@ -39,6 +39,7 @@ import {
 	setSharedFavoritesStore,
 } from "./store.js";
 import { applyCyclePatch } from "./patch-cycle.js";
+import { styleFavorite } from "./constants.js";
 import {
 	applyModelSelectorPatches,
 	setSelectorThemeProvider,
@@ -505,5 +506,40 @@ describe("selector patches", () => {
 		expect(renamedLine).toContain(
 			"(MiniMax M3 [rasmus@openrouter, parasail])",
 		);
+		// The full line pins the 1.5.0 column order (id → name → provider badge)
+		// and the favorite highlight not leaking ANSI codes into the name. The
+		// two spaces after → are the (empty) current-marker column; the fake
+		// selector has no currentModel, so no ✓ is drawn.
+		expect(redundantLine).toBe("→   claude-sonnet-4 [anthropic]");
+		expect(renamedLine).toBe(
+			"    minimax/minimax-m3 (MiniMax M3 [rasmus@openrouter, parasail]) [openrouter]",
+		);
+	});
+
+	it("keeps the favorite highlight while appending the disambiguating name", () => {
+		// Regression guard: the 1.5.0 name text must land AFTER the styled id
+		// (and outside its ANSI reset), or favorited ids would lose their color.
+		const favoriteModel = {
+			provider: "anthropic",
+			id: "claude-opus-4",
+			name: "Claude Opus 4 (max)",
+		};
+		getFavoritesStore().toggle(favoriteModel);
+		const lines: string[] = [];
+		const selector = fakeSelector({
+			activeModels: [],
+			filteredModels: [
+				{ provider: favoriteModel.provider, id: favoriteModel.id, model: favoriteModel },
+			] as unknown as FakeSelector["filteredModels"],
+			listContainer: {
+				clear() {},
+				addChild: (child: unknown) =>
+					lines.push((child as { text?: string }).text ?? ""),
+			},
+		});
+		selector.updateList();
+		expect(lines[0]).toBe(
+			`→   ${styleFavorite("claude-opus-4")} (Claude Opus 4 (max)) [anthropic]`,
+		);
 	});
 });

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

@@ -59,7 +59,7 @@ interface CycleSessionInternals {
 		setDefaultModelAndProvider(provider: string, id: string): void;
 	};
 	/**
-	 * pi 1.0–1.3: keeps a persisted default usable when cycling inside a
+	 * pi 1.0–1.5: keeps a persisted default usable when cycling inside a
 	 * non-empty --models scope.
 	 */
 	_addPersistedDefaultToNonEmptyScope(model: unknown): void;
@@ -142,7 +142,7 @@ export function applyCyclePatch(): boolean {
 			return original.call(this, direction, options);
 		}
 
-		// Same source and availability filtering as pi's stock cycling (1.0–1.3).
+		// Same source and availability filtering as pi's stock cycling (1.0–1.5).
 		const scoped = this._scopedModels.length > 0;
 		let candidates: CycleCandidate[];
 		if (scoped) {
@@ -187,7 +187,7 @@ export function applyCyclePatch(): boolean {
 				: this._getThinkingLevelForModelSwitch();
 		this.agent.state.model = next.model;
 		this.sessionManager.appendModelChange(next.model.provider, next.model.id);
-		// pi 1.0–1.3: only persist the default model when the caller asked for it.
+		// pi 1.0–1.5: only persist the default model when the caller asked for it.
 		if (options.persist) {
 			this.settingsManager.setDefaultModelAndProvider(
 				next.model.provider,

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

@@ -149,7 +149,7 @@ let patched = false;
 export function applyModelSelectorPatches(): boolean {
 	if (patched) return true;
 	// SAFETY: ModelSelectorComponent's members are TS-private (compile-time
-	// only); the structural view matches pi 1.0–1.3's prototype shape
+	// only); the structural view matches pi 1.0–1.5's prototype shape
 	// (byte-identical across that span) and every touched method is
 	// existence-checked below before any patching happens.
 	const proto =

package/src/lib/model-picker.ts

@@ -43,9 +43,10 @@ function modelRuntimeFacade(ctx: ExtensionContext): ModelRuntime {
 		refresh: (options?: { signal?: AbortSignal }) =>
 			ctx.modelRegistry.refresh(options),
 	};
-	// SAFETY: the selector only touches the four members above (pi 1.0–1.3
-	// model-selector.js); everything else on ModelRuntime is never reached
-	// from this component.
+	// SAFETY: the selector only touches the four members above (pi 1.0–1.5
+	// model-selector.js; the 1.5.0 rendering/page-key changes add no runtime
+	// call); everything else on ModelRuntime is never reached from this
+	// component.
 	return facade as unknown as ModelRuntime;
 }