@oh-my-pi/pi-coding-agent 16.2.9 → 16.2.12

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "16.2.9",
+	"version": "16.2.12",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://omp.sh",
 	"author": "Can Boluk",
@@ -32,7 +32,8 @@
 	},
 	"scripts": {
 		"build": "bun scripts/build-binary.ts",
-		"check": "biome check . && bun run check:types",
+		"check": "biome check . && bun run check:docs && bun run check:types",
+		"check:docs": "bun scripts/generate-docs-index.ts --check",
 		"check:types": "tsgo -p tsconfig.json --noEmit",
 		"lint": "biome lint .",
 		"test": "bun ../../scripts/ci-test-ts.ts coding-agent-heavy --full",
@@ -55,17 +56,17 @@
 		"@agentclientprotocol/sdk": "0.25.0",
 		"@babel/parser": "^7.29.7",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/hashline": "16.2.9",
-		"@oh-my-pi/omp-stats": "16.2.9",
-		"@oh-my-pi/pi-agent-core": "16.2.9",
-		"@oh-my-pi/pi-ai": "16.2.9",
-		"@oh-my-pi/pi-catalog": "16.2.9",
-		"@oh-my-pi/pi-mnemopi": "16.2.9",
-		"@oh-my-pi/pi-natives": "16.2.9",
-		"@oh-my-pi/pi-tui": "16.2.9",
-		"@oh-my-pi/pi-utils": "16.2.9",
-		"@oh-my-pi/pi-wire": "16.2.9",
-		"@oh-my-pi/snapcompact": "16.2.9",
+		"@oh-my-pi/hashline": "16.2.12",
+		"@oh-my-pi/omp-stats": "16.2.12",
+		"@oh-my-pi/pi-agent-core": "16.2.12",
+		"@oh-my-pi/pi-ai": "16.2.12",
+		"@oh-my-pi/pi-catalog": "16.2.12",
+		"@oh-my-pi/pi-mnemopi": "16.2.12",
+		"@oh-my-pi/pi-natives": "16.2.12",
+		"@oh-my-pi/pi-tui": "16.2.12",
+		"@oh-my-pi/pi-utils": "16.2.12",
+		"@oh-my-pi/pi-wire": "16.2.12",
+		"@oh-my-pi/snapcompact": "16.2.12",
 		"@opentelemetry/api": "^1.9.1",
 		"@opentelemetry/context-async-hooks": "^2.7.1",
 		"@opentelemetry/exporter-trace-otlp-proto": "^0.218.0",

package/scripts/bundle-dist.ts

@@ -3,6 +3,7 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import { isEnoent } from "@oh-my-pi/pi-utils";
+import { assertDocsIndexFresh, buildDocsIndexPayload } from "./generate-docs-index";
 
 const packageDir = path.join(import.meta.dir, "..");
 const outDir = path.join(packageDir, "dist");
@@ -72,13 +73,31 @@ async function cleanBundleOutputs(): Promise<void> {
 	);
 }
 
+async function assertDocsEmbedPopulated(): Promise<void> {
+	// bundle-dist runs from prepack (which calls `gen:docs` first) or directly.
+	// Direct invocations must fail — the tarball ships src/, and an empty embed
+	// would make src/internal-urls/docs-index.ts fall through to the missing
+	// repo `docs/` tree at runtime in published packages (codex review, PR #3941).
+	const embedPath = path.join(packageDir, "src/internal-urls/docs-index.generated.txt");
+	const embed = await Bun.file(embedPath).text();
+	if (embed.length === 0) {
+		throw new Error(
+			"docs-index embed is empty. Run `bun run gen:docs` before `bun run gen:bundle`, or use `bun pm pack` which runs the prepack chain.",
+		);
+	}
+	const expected = await buildDocsIndexPayload();
+	assertDocsIndexFresh(embed, expected);
+}
+
 async function main(): Promise<void> {
 	const start = Bun.nanoseconds();
 	await cleanBundleOutputs();
-	// The npm bundle ships no stats dashboard sources or prebuilt dist/client,
-	// so embed the dashboard archive the same way compiled binaries do
-	// (scripts/build-binary.ts). Reset afterwards to keep the checked-in
-	// placeholder empty.
+	await assertDocsEmbedPopulated();
+	// The npm bundle ships no stats dashboard sources, so embed the dashboard
+	// archive the same way compiled binaries do (scripts/build-binary.ts). Reset
+	// afterwards to keep the checked-in placeholder empty. The docs embed stays
+	// populated on disk — postpack owns its reset so `bun pm pack` can pack a
+	// tarball whose src copy is still valid for subpath imports.
 	await runCommand(["bun", "--cwd=../stats", "run", "gen:stats"]);
 	try {
 		await runCommand([

package/scripts/generate-docs-index.ts

@@ -1,56 +1,148 @@
 #!/usr/bin/env bun
 
 /**
- * Populate (or reset) the embedded harness documentation index for `omp://`.
+ * Populate, check, or reset the embedded harness documentation index for `omp://`.
  *
  * `--generate` writes `src/internal-urls/docs-index.generated.txt` as two lines:
  * a plain JSON array of the sorted `docs/**\/*.md` file names, then a base64
- * gzip blob of the index-aligned doc bodies (`string[]`). Keeping the filename
- * list out of the blob lets the loader list docs without inflating it.
- * Compiled binaries and the prepacked npm bundle inline this (~0.5MB) instead of
- * the ~1.6MB raw map; `--reset` restores the checked-in empty placeholder so the
+ * gzip blob of the index-aligned doc bodies (`string[]`). `--check` rebuilds
+ * that payload from the real docs corpus and compares it to the embed when
+ * present; the checked-in empty placeholder is accepted after verifying that a
+ * fresh generated payload round-trips. `--reset` restores the placeholder so the
  * dev tree reads `docs/` from disk. Mirrors the stats / model-catalog embeds.
  */
 
 import * as path from "node:path";
-import { gzipSync } from "node:zlib";
+import { gunzipSync, gzipSync } from "node:zlib";
 import { Glob } from "bun";
 
 const docsDir = path.resolve(import.meta.dir, "../../../docs");
 const outputPath = path.resolve(import.meta.dir, "../src/internal-urls/docs-index.generated.txt");
 const GENERATE_FLAG = "--generate";
 const RESET_FLAG = "--reset";
+const CHECK_FLAG = "--check";
+
+export interface DocsIndexPayload {
+	/** Sorted `docs/**\/*.md` file names plus index-aligned bodies and embed text. */
+	readonly files: readonly string[];
+	readonly bodies: readonly string[];
+	readonly payload: string;
+}
+
+export interface DecodedDocsIndexPayload {
+	/** Sorted `docs/**\/*.md` file names decoded from an embed payload. */
+	readonly files: readonly string[];
+	/** Index-aligned Markdown bodies decoded from an embed payload. */
+	readonly bodies: readonly string[];
+}
+
+function isStringArray(value: unknown): value is string[] {
+	return Array.isArray(value) && value.every(item => typeof item === "string");
+}
+
+/** Build the exact two-line `omp://` docs embed from the source `docs/**\/*.md` corpus. */
+export async function buildDocsIndexPayload(): Promise<DocsIndexPayload> {
+	const glob = new Glob("**/*.md");
+	const files: string[] = [];
+	for await (const relativePath of glob.scan(docsDir)) {
+		files.push(relativePath.split(path.sep).join("/"));
+	}
+	files.sort();
+
+	const bodies = await Promise.all(files.map(file => Bun.file(path.join(docsDir, file)).text()));
+	const bodiesB64 = Buffer.from(gzipSync(Buffer.from(JSON.stringify(bodies)), { level: 9 })).toString("base64");
+	return {
+		files,
+		bodies,
+		payload: `${JSON.stringify(files)}\n${bodiesB64}`,
+	};
+}
+
+/** Decode a populated docs embed payload into filenames and index-aligned Markdown bodies. */
+export function decodeDocsIndexPayload(embed: string): DecodedDocsIndexPayload | null {
+	const newline = embed.indexOf("\n");
+	if (newline === -1) return null;
+
+	const filenames: unknown = JSON.parse(embed.slice(0, newline));
+	if (!isStringArray(filenames)) {
+		throw new Error("Embedded docs index filename line is not a JSON string array.");
+	}
+
+	const inflated = gunzipSync(Buffer.from(embed.slice(newline + 1), "base64"));
+	const bodies: unknown = JSON.parse(inflated.toString("utf8"));
+	if (!isStringArray(bodies)) {
+		throw new Error("Embedded docs index body blob is not a JSON string array.");
+	}
+
+	return { files: filenames, bodies };
+}
+
+/**
+ * Assert that an embed payload is fresh against the current source docs payload.
+ * An empty placeholder is accepted by round-tripping the expected payload (the
+ * dev tree and post-build reset state both checked-in placeholders).
+ */
+export function assertDocsIndexFresh(embed: string, expected: DecodedDocsIndexPayload): void {
+	const source =
+		embed.length > 0
+			? embed
+			: `${JSON.stringify(expected.files)}\n${Buffer.from(gzipSync(Buffer.from(JSON.stringify(expected.bodies)), { level: 9 })).toString("base64")}`;
+	const decoded = decodeDocsIndexPayload(source);
+	if (decoded === null) {
+		throw new Error("Embedded docs index is malformed: missing newline separator.");
+	}
+	if (decoded.files.length !== expected.files.length) {
+		throw new Error(
+			`Embedded docs index has ${decoded.files.length} docs; source corpus has ${expected.files.length}.`,
+		);
+	}
+	if (decoded.bodies.length !== expected.bodies.length) {
+		throw new Error(
+			`Embedded docs index has ${decoded.bodies.length} bodies; source corpus has ${expected.bodies.length}.`,
+		);
+	}
+	for (let i = 0; i < expected.files.length; i++) {
+		if (decoded.files[i] !== expected.files[i]) {
+			throw new Error(
+				`Embedded docs index filename mismatch at ${i}: ${decoded.files[i] ?? "<missing>"} !== ${expected.files[i]}.`,
+			);
+		}
+		if (decoded.bodies[i] !== expected.bodies[i]) {
+			throw new Error(`Embedded docs index body mismatch for ${expected.files[i]}. Run \`bun run gen:docs\`.`);
+		}
+	}
+}
 
 async function main(): Promise<void> {
 	const rel = path.relative(process.cwd(), outputPath);
 
 	if (process.argv.includes(RESET_FLAG)) {
 		await Bun.write(outputPath, "");
-		console.log(`Reset ${rel}`);
+		process.stdout.write(`Reset ${rel}\n`);
 		return;
 	}
 
-	if (!process.argv.includes(GENERATE_FLAG)) {
-		console.log(`Skipping ${rel}; pass ${GENERATE_FLAG} to embed docs (the dev tree reads docs/ from disk)`);
+	if (process.argv.includes(CHECK_FLAG)) {
+		const current = await buildDocsIndexPayload();
+		const embed = await Bun.file(outputPath).text();
+		assertDocsIndexFresh(embed, current);
+		process.stdout.write(`Docs index fresh for ${current.files.length} docs (${rel})\n`);
 		return;
 	}
 
-	const glob = new Glob("**/*.md");
-	const files: string[] = [];
-	for await (const relativePath of glob.scan(docsDir)) {
-		files.push(relativePath.split(path.sep).join("/"));
+	if (!process.argv.includes(GENERATE_FLAG)) {
+		process.stdout.write(
+			`Skipping ${rel}; pass ${GENERATE_FLAG} to embed docs (the dev tree reads docs/ from disk)\n`,
+		);
+		return;
 	}
-	files.sort();
-
-	// Index-aligned bodies (Promise.all preserves order), kept separate from the
-	// filename list so the loader can list docs without inflating the blob.
-	const bodies = await Promise.all(files.map(file => Bun.file(path.join(docsDir, file)).text()));
 
-	const bodiesB64 = Buffer.from(gzipSync(Buffer.from(JSON.stringify(bodies)), { level: 9 })).toString("base64");
-	// Two lines: plain filename array, then the base64 gzip blob.
-	const payload = `${JSON.stringify(files)}\n${bodiesB64}`;
-	await Bun.write(outputPath, payload);
-	console.log(`Generated ${rel} (${files.length} docs, ${payload.length} bytes)`);
+	const current = await buildDocsIndexPayload();
+	assertDocsIndexFresh(current.payload, current);
+	await Bun.write(outputPath, current.payload);
+	process.stdout.write(`Generated ${rel} (${current.files.length} docs, ${current.payload.length} bytes)\n`);
 }
 
-await main();
+if (import.meta.main) {
+	await main();
+}

package/src/advisor/__tests__/advisor.test.ts

@@ -1579,7 +1579,7 @@ describe("advisor", () => {
 
 	describe("AdvisorConfigOverlayComponent", () => {
 		const deps = {
-			modelRegistry: { getCanonicalModelSelections: () => [] } as unknown as ModelRegistry,
+			modelRegistry: {} as unknown as ModelRegistry,
 			settings: {} as unknown as Settings,
 			scopedModels: [],
 			availableToolNames: ["read", "grep", "glob", "lsp", "web_search"],

package/src/async/job-manager.ts

@@ -397,6 +397,27 @@ export class AsyncJobManager {
 		await Promise.all(Array.from(this.#jobs.values()).map(job => job.promise));
 	}
 
+	async #waitForAllUntil(deadline: number): Promise<boolean> {
+		const promises = Array.from(this.#jobs.values()).map(job => job.promise);
+		if (promises.length === 0) return true;
+		if (deadline === Number.POSITIVE_INFINITY) {
+			await Promise.all(promises);
+			return true;
+		}
+		const remainingMs = deadline - Date.now();
+		if (remainingMs <= 0) return false;
+
+		const timeout = Promise.withResolvers<"timeout">();
+		const timer = setTimeout(() => timeout.resolve("timeout"), remainingMs);
+		timer.unref();
+		try {
+			const result = await Promise.race([Promise.all(promises).then(() => "settled" as const), timeout.promise]);
+			return result === "settled";
+		} finally {
+			clearTimeout(timer);
+		}
+	}
+
 	async drainDeliveries(options?: { timeoutMs?: number; filter?: AsyncJobFilter }): Promise<boolean> {
 		const timeoutMs = options?.timeoutMs;
 		const filter = options?.filter;
@@ -445,8 +466,10 @@ export class AsyncJobManager {
 		this.#disposed = true;
 		this.#clearEvictionTimers();
 		this.cancelAll();
-		await this.waitForAll();
-		const drained = await this.drainDeliveries({ timeoutMs: options?.timeoutMs ?? 3_000 });
+		const timeoutMs = Math.max(options?.timeoutMs ?? 3_000, 0);
+		const deadline = Date.now() + timeoutMs;
+		const jobsSettled = await this.#waitForAllUntil(deadline);
+		const drained = await this.drainDeliveries({ timeoutMs: Math.max(deadline - Date.now(), 0) });
 		this.#clearEvictionTimers();
 		this.#jobs.clear();
 		this.#deliveries.length = 0;
@@ -454,7 +477,7 @@ export class AsyncJobManager {
 		this.#suppressedDeliveries.clear();
 		this.#watchedJobs.clear();
 		this.#pollEscalation.clear();
-		return drained;
+		return jobsSettled && drained;
 	}
 
 	#resolveJobId(preferredId?: string): string {
@@ -483,6 +506,7 @@ export class AsyncJobManager {
 	}
 
 	#scheduleEviction(jobId: string): void {
+		if (this.#disposed) return;
 		if (this.#retentionMs <= 0) {
 			this.#jobs.delete(jobId);
 			this.#suppressedDeliveries.delete(jobId);

package/src/auto-thinking/classifier.ts

@@ -74,7 +74,7 @@ export async function classifyDifficulty(
 }
 
 async function classifyOnline(input: string, deps: ClassifyDifficultyDeps): Promise<Effort> {
-	const resolved = resolveRoleSelection(["tiny", "smol"], deps.settings, deps.registry.getAvailable(), deps.registry);
+	const resolved = resolveRoleSelection(["tiny", "smol"], deps.settings, deps.registry.getAvailable());
 	const model = resolved?.model;
 	if (!model) {
 		throw new Error("auto-thinking: no tiny/smol model available for classification");

package/src/cli/bench-cli.ts

@@ -14,12 +14,12 @@ import type {
 	SimpleStreamOptions,
 } from "@oh-my-pi/pi-ai";
 import { resolveModelServiceTier, streamSimple } from "@oh-my-pi/pi-ai";
-import { buildModelProviderPriorityRank, type CanonicalModelVariant } from "@oh-my-pi/pi-catalog/identity";
+import { buildModelProviderPriorityRank } from "@oh-my-pi/pi-catalog/identity";
 import { replaceTabs, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { formatDuration, getProjectDir } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import type { ApiKeyResolverModel } from "../config/api-key-resolver";
-import { type CanonicalModelQueryOptions, ModelRegistry } from "../config/model-registry";
+import { ModelRegistry } from "../config/model-registry";
 import {
 	formatModelSelectorValue,
 	formatModelString,
@@ -55,9 +55,6 @@ export interface BenchModelRegistry {
 	getAll(): Model<Api>[];
 	getApiKey(model: Model<Api>, sessionId?: string): Promise<string | undefined>;
 	resolver(model: ApiKeyResolverModel, sessionId?: string): ApiKeyResolver;
-	resolveCanonicalModel?(canonicalId: string, options?: CanonicalModelQueryOptions): Model<Api> | undefined;
-	getCanonicalVariants?(canonicalId: string, options?: CanonicalModelQueryOptions): CanonicalModelVariant[];
-	getCanonicalId?(model: Model<Api>): string | undefined;
 	hasConfiguredAuth?(model: Model<Api>): boolean;
 }
 
@@ -440,13 +437,7 @@ function resolveAuthenticatedAlternative(
 		seen.add(key);
 		if (modelRegistry.hasConfiguredAuth?.(candidate)) authenticated.push(candidate);
 	};
-	// Canonical variants link the same logical model across providers even when
-	// ids differ (e.g. fireworks `gpt-oss-20b` <-> openrouter `openai/gpt-oss-20b`).
-	const canonicalId = modelRegistry.getCanonicalId?.(model);
-	if (canonicalId) {
-		for (const variant of modelRegistry.getCanonicalVariants?.(canonicalId) ?? []) consider(variant.model);
-	}
-	// Same-id fallback for entries outside the canonical index.
+	// Same-id fallback for equivalent entries under providers with configured auth.
 	for (const candidate of modelRegistry.getAll()) {
 		if (candidate.id === model.id) consider(candidate);
 	}

package/src/cli/dry-balance-cli.ts

@@ -12,11 +12,10 @@ import type {
 	SimpleStreamOptions,
 } from "@oh-my-pi/pi-ai";
 import { streamSimple } from "@oh-my-pi/pi-ai";
-import type { CanonicalModelVariant } from "@oh-my-pi/pi-catalog/identity";
 import { replaceTabs, truncateToWidth } from "@oh-my-pi/pi-tui";
 import { formatDuration, getProjectDir } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import { type CanonicalModelQueryOptions, ModelRegistry } from "../config/model-registry";
+import { ModelRegistry } from "../config/model-registry";
 import {
 	formatModelString,
 	getModelMatchPreferences,
@@ -74,9 +73,6 @@ export interface DryBalanceModelRegistry {
 	getAll(): Model<Api>[];
 	getAvailable(): Model<Api>[];
 	getApiKey(model: Model<Api>, sessionId?: string): Promise<string | undefined>;
-	getCanonicalVariants(canonicalId: string, options?: CanonicalModelQueryOptions): CanonicalModelVariant[];
-	resolveCanonicalModel?(canonicalId: string, options?: CanonicalModelQueryOptions): Model<Api> | undefined;
-	getCanonicalId?(model: Model<Api>): string | undefined;
 }
 
 export interface DryBalanceRuntime {
@@ -566,7 +562,6 @@ async function resolveDryBalanceModel(
 	const defaultRoleSpec = resolveModelRoleValue(settings?.getModelRole("default"), allowedModels, {
 		settings,
 		matchPreferences: preferences,
-		modelRegistry,
 	});
 	if (defaultRoleSpec.model) {
 		return { model: defaultRoleSpec.model, warning: defaultRoleSpec.warning };

package/src/cli/grep-cli.ts

@@ -150,7 +150,7 @@ ${chalk.bold("Options:")}
   --no-gitignore        Include files excluded by .gitignore
 
 ${chalk.bold("Environment:")}
-  PI_GREP_WORKERS=N    Set filesystem walker workers (default 4, 0 = auto)
+  PI_WALK_WORKERS=N    Set filesystem walker workers (default 4, 0 = auto)
 
 ${chalk.bold("Examples:")}
   ${APP_NAME} grep "import" src/

package/src/cli/models-cli.ts

@@ -2,7 +2,7 @@
  * `omp models` — list, search, and refresh available models.
  *
  * Subcommands:
- * - `ls` (default): list every available model with a canonical + provider view.
+ * - `ls` (default): list every available model grouped by provider.
  * - `find <substring>`: list models whose provider, id, or name contains the substring.
  * - `refresh`: force an online catalog re-fetch (ignoring the model cache TTL),
  *   then list. This is the supported replacement for `rm -rf ~/.omp/models.db`
@@ -21,7 +21,7 @@ import { discoverAndLoadExtensions, loadExtensions } from "../extensibility/exte
 import { discoverAuthStorage } from "../sdk";
 import { EventBus } from "../utils/event-bus";
 
-export type ModelsAction = "ls" | "find" | "refresh" | "canonical";
+export type ModelsAction = "ls" | "find" | "refresh";
 
 export interface ModelsCommandArgs {
 	action: ModelsAction;
@@ -48,7 +48,6 @@ const KNOWN_ACTIONS: Record<string, ModelsAction> = {
 	list: "ls",
 	find: "find",
 	refresh: "refresh",
-	canonical: "canonical",
 };
 
 /** Resolve the two positional args into an action + filter (provider names fall through to `ls`). */
@@ -77,22 +76,10 @@ interface ModelJson {
 	cost: Model<Api>["cost"];
 }
 
-interface CanonicalJson {
-	id: string;
-	selected: string;
-	variants: number;
-	contextWindow: number | null;
-	maxTokens: number | null;
-}
-
 interface ModelsJson {
 	models: ModelJson[];
 }
 
-interface CanonicalModelsJson {
-	canonical: CanonicalJson[];
-}
-
 function writeLine(line = ""): void {
 	process.stdout.write(`${line}\n`);
 }
@@ -253,67 +240,6 @@ function renderProviderModels(
 	}
 }
 
-/** `omp models canonical`: the coalesced canonical view (one row per canonical id). */
-function renderCanonicalModels(modelRegistry: ModelRegistry, pattern: string | undefined, json: boolean): void {
-	const selections = modelRegistry.getCanonicalModelSelections({ availableOnly: true });
-	const needle = pattern?.toLowerCase();
-	const filtered = needle
-		? selections.filter(
-				({ record, model }) =>
-					record.id.toLowerCase().includes(needle) ||
-					`${model.provider}/${model.id}`.toLowerCase().includes(needle),
-			)
-		: selections;
-
-	if (json) {
-		const output: CanonicalModelsJson = {
-			canonical: filtered
-				.map(({ record, model }) => ({
-					id: record.id,
-					selected: `${model.provider}/${model.id}`,
-					variants: record.variants.length,
-					contextWindow: model.contextWindow,
-					maxTokens: model.maxTokens,
-				}))
-				.sort((left, right) => left.id.localeCompare(right.id)),
-		};
-		writeLine(JSON.stringify(output));
-		return;
-	}
-
-	if (selections.length === 0) {
-		writeLine("No models available. Set API keys in environment variables.");
-		return;
-	}
-	if (filtered.length === 0) {
-		writeLine(`No canonical models matching "${pattern}"`);
-		return;
-	}
-
-	const rows = filtered
-		.slice()
-		.sort((left, right) => left.record.id.localeCompare(right.record.id))
-		.map(({ record, model }) => [
-			record.id,
-			`${model.provider}/${model.id}`,
-			String(record.variants.length),
-			formatLimit(model.contextWindow),
-			formatLimit(model.maxTokens),
-		]);
-	for (const line of boxTable(
-		[
-			{ header: "canonical" },
-			{ header: "selected" },
-			{ header: "variants", align: "right" },
-			{ header: "context", align: "right" },
-			{ header: "max-out", align: "right" },
-		],
-		rows,
-	)) {
-		writeLine(line);
-	}
-}
-
 /**
  * Options for {@link runModelsListing}: render the catalog from a caller-supplied
  * registry. Loads extensions (CLI `-e` paths and configured `settings.extensions`)
@@ -376,11 +302,7 @@ export async function runModelsListing(options: RunModelsListingOptions): Promis
 	// Discover runtime (extension) provider catalogs now that they are registered.
 	await modelRegistry.refreshRuntimeProviders(action === "refresh" ? "online" : "online-if-uncached");
 
-	if (action === "canonical") {
-		renderCanonicalModels(modelRegistry, pattern, json);
-	} else {
-		renderProviderModels(modelRegistry, action, pattern, json);
-	}
+	renderProviderModels(modelRegistry, action, pattern, json);
 }
 
 /**

package/src/commands/models.ts

@@ -10,7 +10,7 @@ export default class Models extends Command {
 
 	static args = {
 		action: Args.string({
-			description: "ls (default) | find | refresh | canonical | <provider>",
+			description: "ls (default) | find | refresh | <provider>",
 			required: false,
 		}),
 		pattern: Args.string({
@@ -40,7 +40,6 @@ export default class Models extends Command {
 		`# List one provider's models (any provider name works)\n  ${APP_NAME} models openai-codex`,
 		`# Find models by substring\n  ${APP_NAME} models find minimax`,
 		`# Force a fresh catalog fetch (replaces rm -rf ~/.omp/models.db)\n  ${APP_NAME} models refresh`,
-		`# Show the coalesced canonical model view\n  ${APP_NAME} models canonical`,
 		`# Machine-readable output\n  ${APP_NAME} models --json`,
 	];
 

package/src/commit/model-selection.ts

@@ -36,8 +36,8 @@ export async function resolvePrimaryModel(
 	const available = modelRegistry.getAvailable();
 	const matchPreferences = getModelMatchPreferences(settings);
 	const resolved = override
-		? resolveModelRoleValue(override, available, { settings, matchPreferences, modelRegistry })
-		: resolveRoleSelection(["commit", "smol", ...MODEL_ROLE_IDS], settings, available, modelRegistry);
+		? resolveModelRoleValue(override, available, { settings, matchPreferences })
+		: resolveRoleSelection(["commit", "smol", ...MODEL_ROLE_IDS], settings, available);
 	const model = resolved?.model;
 	if (!model) {
 		throw new Error("No model available for commit generation");
@@ -60,7 +60,7 @@ export async function resolveSmolModel(
 	fallbackApiKey: ApiKey,
 ): Promise<ResolvedCommitModel> {
 	const available = modelRegistry.getAvailable();
-	const resolvedSmol = resolveRoleSelection(["smol"], settings, available, modelRegistry);
+	const resolvedSmol = resolveRoleSelection(["smol"], settings, available);
 	if (resolvedSmol?.model) {
 		const apiKey = await modelRegistry.getApiKey(resolvedSmol.model);
 		if (apiKey) {
@@ -74,7 +74,7 @@ export async function resolveSmolModel(
 
 	const matchPreferences = getModelMatchPreferences(settings);
 	for (const pattern of MODEL_PRIO.smol) {
-		const candidate = parseModelPattern(pattern, available, matchPreferences, { modelRegistry }).model;
+		const candidate = parseModelPattern(pattern, available, matchPreferences).model;
 		if (!candidate) continue;
 		const apiKey = await modelRegistry.getApiKey(candidate);
 		if (apiKey) {

package/src/config/inline-tool-descriptors-mode.ts

@@ -9,8 +9,7 @@ import { modelFamilyToken } from "@oh-my-pi/pi-catalog/identity";
  * Gemini benefits from descriptors in-prompt; other providers keep them in the
  * tool schemas. `on`/`off` are explicit user overrides.
  *
- * @param modelId Canonical model id (e.g. `gemini-3-pro`); resolve aliases via
- *   `ModelRegistry.getCanonicalId` before calling so `auto` classifies correctly.
+ * @param modelId Model id (e.g. `gemini-3-pro`) used to classify `auto`.
  */
 export function shouldInlineToolDescriptors(
 	setting: "auto" | "on" | "off" | undefined,