@xynogen/pix-models 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@xynogen/pix-models",
-	"version": "0.1.7",
+	"version": "0.1.9",
 	"description": "Pi extension — enhanced /models picker with BenchLM ranks",
 	"type": "module",
 	"main": "src/index.ts",
@@ -38,7 +38,8 @@
 		"access": "public"
 	},
 	"dependencies": {
-		"@xynogen/pix-data": "*"
+		"@xynogen/pix-data": "*",
+		"@xynogen/pix-pretty": "*"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-coding-agent": "*",

package/src/models.test.ts

@@ -92,4 +92,36 @@ describe("sortModels", () => {
 		sortModels(models);
 		expect(models).toEqual(original);
 	});
+
+	it("puts null score models after all scored models regardless of source order", () => {
+		const shuffled = [
+			{ provider: "a", id: "m1", name: "Zeta", score: null },
+			{ provider: "a", id: "m2", name: "Beta", score: 80 },
+			{ provider: "a", id: "m3", name: "Alpha", score: 95 },
+			{ provider: "a", id: "m4", name: "Gamma", score: null },
+			{ provider: "a", id: "m5", name: "Delta", score: 60 },
+		];
+		const sorted = sortModels(shuffled);
+		const lastTwo = sorted.slice(-2).map((m) => m.name);
+		expect(lastTwo).toEqual(["Gamma", "Zeta"]); // nulls last, stable within
+	});
+
+	it("sinks tier 2 (off-catalog) below tier 1 (benched-but-unscored)", () => {
+		// Mirrors the openrouter/owl-alpha bug: a model with no bench entry at
+		// all must not interleave with benched models that happen to have a
+		// null score.
+		const mixed = [
+			{ provider: "a", id: "m1", name: "Alpha", score: 95, tier: 0 },
+			{ provider: "a", id: "m2", name: "Beta", score: null, tier: 1 },
+			{ provider: "a", id: "m3", name: "Gamma", score: undefined, tier: 2 },
+			{ provider: "a", id: "m4", name: "Delta", score: 60, tier: 0 },
+		];
+		const sorted = sortModels(mixed);
+		expect(sorted.map((m) => m.name)).toEqual([
+			"Alpha",
+			"Delta",
+			"Beta",
+			"Gamma",
+		]);
+	});
 });

package/src/models.ts

@@ -12,15 +12,12 @@ import type {
 	ExtensionAPI,
 	ExtensionContext,
 } from "@earendil-works/pi-coding-agent";
-import { DynamicBorder } from "@earendil-works/pi-coding-agent";
 import {
-	Container,
 	fuzzyFilter,
 	Input,
 	matchesKey,
 	type SelectItem,
 	SelectList,
-	Text,
 	visibleWidth,
 } from "@earendil-works/pi-tui";
 import {
@@ -28,6 +25,7 @@ import {
 	lookupBenchmark,
 	lookupModelsDev,
 } from "@xynogen/pix-data";
+import { frameLines, modalWidth } from "@xynogen/pix-pretty/modal-frame";
 import { patchOutBuiltinModelCommand } from "./patch-builtin";
 
 // ─── Pure logic (exported for tests) ─────────────────────────────────────────
@@ -71,13 +69,28 @@ export type SortableModel = {
 	id: string;
 	name?: string;
 	score?: number | null;
+	/**
+	 * Sort tier. Lower = earlier. Default 0.
+	 *  0 = scored (sort by `score` desc)
+	 *  1 = benched but unscored (sort by name, between scored and off-catalog)
+	 *  2 = off-catalog (no bench entry at all → always last)
+	 * The off-catalog tier exists for models like `openrouter/owl-alpha` that
+	 * are present in the router but missing from every benchmark source —
+	 * they should never interleave with the benched-but-unscored tail.
+	 */
+	tier?: number;
 };
 
 export function sortModels<T extends SortableModel>(models: T[]): T[] {
 	return [...models].sort((a, b) => {
-		const sa = a.score ?? -1;
-		const sb = b.score ?? -1;
-		if (sa !== sb) return sb - sa;
+		const ta = a.tier ?? 0;
+		const tb = b.tier ?? 0;
+		if (ta !== tb) return ta - tb;
+		if (ta === 0) {
+			const sa = a.score ?? -1;
+			const sb = b.score ?? -1;
+			if (sa !== sb) return sb - sa;
+		}
 		return (a.name ?? a.id).localeCompare(b.name ?? b.id);
 	});
 }
@@ -121,19 +134,35 @@ async function showEnhancedPicker(
 		bench: ReturnType<typeof lookupBenchmark>;
 		// Rank among the user's *available* models, not the global catalog.
 		localRank: number | null;
+		// Sort tier: 0 scored, 1 benched-but-unscored, 2 off-catalog.
+		tier: 0 | 1 | 2;
 	};
-	const rows: Row[] = available.map((m) => ({
-		m,
-		dev: lookupModelsDev(m.provider, m.id),
-		bench: lookupBenchmark(m.id),
-		localRank: null,
-	}));
-
-	// Sort: by score desc (highest first), unscored last alphabetical
+	const rows: Row[] = available.map((m) => {
+		const bench = lookupBenchmark(m.id);
+		const tier = !bench
+			? 2 // off-catalog → absolute bottom (no rank)
+			: bench.overallScore == null
+				? 1 // benched, unscored → middle
+				: 0; // scored → top
+		return {
+			m,
+			dev: lookupModelsDev(m.provider, m.id),
+			bench,
+			localRank: null,
+			tier,
+		};
+	});
+
+	// Mirror sortModels() — score-desc within tier 0, name-asc otherwise.
 	rows.sort((a, b) => {
-		const sa = a.bench?.overallScore ?? -1;
-		const sb = b.bench?.overallScore ?? -1;
-		if (sa !== sb) return sb - sa;
+		const ta = a.tier;
+		const tb = b.tier;
+		if (ta !== tb) return ta - tb;
+		if (ta === 0) {
+			const sa = a.bench?.overallScore ?? -1;
+			const sb = b.bench?.overallScore ?? -1;
+			if (sa !== sb) return sb - sa;
+		}
 		return (a.m.name ?? a.m.id).localeCompare(b.m.name ?? b.m.id);
 	});
 
@@ -148,7 +177,6 @@ async function showEnhancedPicker(
 
 	const result = await ctx.ui.custom<string | null>(
 		(_tui, theme, _kb, done) => {
-			const container = new Container();
 			const accent = "accent";
 
 			// Find max rank width across all benchmarked rows for # padding
@@ -174,7 +202,10 @@ async function showEnhancedPicker(
 					const isCurrent =
 						current && m.provider === current.provider && m.id === current.id;
 
-					// Label: marker + muted '#' + bright rank + accent-colored model name
+					// Label: marker + rank cell + accent-colored model name.
+					// Ranked models show muted '#' + colored rank. Unranked (no
+					// modelgrep entry) show a muted em-dash sized to the rank
+					// column, so the model name aligns across rows.
 					const marker = isCurrent ? theme.fg(accent, "▶") : " ";
 					let rankPrefix: string;
 					if (localRank) {
@@ -184,7 +215,9 @@ async function showEnhancedPicker(
 						const rankColor = benchScoreColor(bench?.overallScore);
 						rankPrefix = mute("#") + theme.fg(rankColor, rankStr);
 					} else {
-						rankPrefix = " ".repeat(maxRankWidth + 1);
+						// Width = "#" + maxRankWidth chars (e.g. "#   " or "#——" for 2-digit ranks).
+						const dash = "—".padEnd(maxRankWidth, " ");
+						rankPrefix = mute("#") + mute(dash);
 					}
 					// Display model id only; m.provider is routing provider, not part of id.
 					const idColored = theme.fg(accent, m.id);
@@ -236,19 +269,6 @@ async function showEnhancedPicker(
 					)
 				: 0;
 
-			container.addChild(new DynamicBorder((s) => theme.fg(accent, s)));
-			container.addChild(
-				new Text(theme.fg(accent, theme.bold("󰚩  Select model"))),
-			);
-			container.addChild(
-				new Text(
-					theme.fg(
-						"dim",
-						"context · pricing · coding rank & score from modelgrep.com",
-					),
-				),
-			);
-
 			// Widest label (visible width, ANSI-stripped) so the model name
 			// column never truncates to "…". Add gap headroom.
 			const widestLabel = items.reduce(
@@ -317,25 +337,34 @@ async function showEnhancedPicker(
 				internal.invalidate();
 			};
 
-			container.addChild(new Text(theme.fg("muted", "Search:")));
-			container.addChild(search);
-			container.addChild(list);
-			container.addChild(
-				new Text(
-					theme.fg(
-						"dim",
-						"fuzzy search · ↑↓ navigate · enter select · esc cancel",
-					),
-				),
-			);
-			container.addChild(new DynamicBorder((s) => theme.fg(accent, s)));
-
 			return {
 				render(w: number) {
-					return container.render(w);
+					const mw = modalWidth(w);
+					const inner = mw - 4; // CHROME = 2 border + 2 padding
+					const lines: string[] = [
+						theme.fg(accent, theme.bold("󰈩  Select model")),
+						theme.fg(
+							"dim",
+							"context · pricing · coding rank & score from modelgrep.com",
+						),
+						theme.fg("muted", "Search:"),
+						...search.render(inner),
+						...list.render(inner),
+						theme.fg(
+							"dim",
+							"fuzzy search · ↑↓ navigate · enter select · esc cancel",
+						),
+					];
+					return frameLines({
+						width: mw,
+						lines,
+						color: (s) => theme.fg(accent, s),
+						bg: (s) => theme.bg("customMessageBg", s),
+					});
 				},
 				invalidate() {
-					container.invalidate();
+					list.invalidate();
+					search.invalidate();
 				},
 				handleInput(data: string) {
 					// Detect keys via pi-tui's own parser — the same recognition
@@ -350,10 +379,11 @@ async function showEnhancedPicker(
 						search.handleInput?.(data);
 						applyFuzzy(search.getValue?.() ?? "");
 					}
-					container.invalidate();
+					list.invalidate();
 				},
 			};
 		},
+		{ overlay: true },
 	);
 
 	if (!result) return;