@oh-my-pi/pi-coding-agent 15.12.2 → 15.12.4

package/src/tools/read.ts

@@ -9,7 +9,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { getRemoteDir, logger, prompt, readImageMetadata, untilAborted } from "@oh-my-pi/pi-utils";
 import { LRUCache } from "lru-cache/raw";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import {
 	canonicalSnapshotKey,
 	getFileSnapshotStore,
@@ -38,7 +38,12 @@ import { fileHyperlink, renderCodeCell, renderMarkdownCell, renderStatusLine, tr
 import { CachedOutputBlock, markFramedBlockComponent } from "../tui/output-block";
 import { buildLineEntriesWithBlockContext, type LineEntry, lineEntriesToPlainText } from "../utils/block-context";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
-import { ImageInputTooLargeError, loadImageInput, MAX_IMAGE_INPUT_BYTES } from "../utils/image-loading";
+import {
+	ImageInputTooLargeError,
+	loadImageInput,
+	MAX_IMAGE_INPUT_BYTES,
+	webpExclusionForModel,
+} from "../utils/image-loading";
 import { convertFileWithMarkit } from "../utils/markit";
 import { buildDirectoryTree, type DirectoryTree } from "../workspace-tree";
 import { type ArchiveReader, formatArchiveEntryLines, openArchive, parseArchivePathCandidates } from "./archive-reader";
@@ -1974,6 +1979,7 @@ export class ReadTool implements AgentTool<typeof readSchema, ReadToolDetails> {
 						maxBytes: MAX_IMAGE_SIZE,
 						resolvedPath: absolutePath,
 						detectedMimeType: mimeType,
+						excludeWebP: webpExclusionForModel(this.session.getActiveModel?.()),
 					});
 					if (!imageInput) {
 						throw new ToolError(`Read image file [${mimeType}] failed: unsupported image format.`);

package/src/tools/render-mermaid.ts

@@ -1,6 +1,6 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { type MermaidAsciiRenderOptions, prompt, renderMermaidAscii } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import renderMermaidDescription from "../prompts/tools/render-mermaid.md" with { type: "text" };
 import type { ToolSession } from "./index";
 

package/src/tools/report-tool-issue.ts

@@ -24,7 +24,7 @@ import path from "node:path";
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { FetchImpl } from "@oh-my-pi/pi-ai";
 import { $env, $flag, getAgentDir, getInstallId, logger, VERSION } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { Settings } from "..";
 import type { ToolSession } from "./index";
 
@@ -206,10 +206,11 @@ export function openAutoQaDb(): Database | null {
 	if (cachedDb) return cachedDb;
 	try {
 		const db = new Database(getAutoQaDbPath());
+		// Install the busy handler BEFORE any lock-taking statement. See #2421.
+		db.run("PRAGMA busy_timeout = 5000");
 		db.run(`
 			PRAGMA journal_mode=WAL;
 			PRAGMA synchronous=NORMAL;
-			PRAGMA busy_timeout=5000;
 			CREATE TABLE IF NOT EXISTS grievances (
 				id INTEGER PRIMARY KEY AUTOINCREMENT,
 				model TEXT NOT NULL,

package/src/tools/resolve.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import resolveDescription from "../prompts/tools/resolve.md" with { type: "text" };

package/src/tools/review.ts

@@ -12,7 +12,7 @@ import type { AgentTool } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Container, Text } from "@oh-my-pi/pi-tui";
 import { isRecord } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { Theme, ThemeColor } from "../modes/theme/theme";
 import { subprocessToolRegistry } from "../task/subprocess-tool-registry";
 import type { ReviewFinding } from "../task/types";

package/src/tools/search-tool-bm25.ts

@@ -2,7 +2,7 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import searchToolBm25Description from "../prompts/tools/search-tool-bm25.md" with { type: "text" };

package/src/tools/search.ts

@@ -7,7 +7,7 @@ import { type GrepMatch, GrepOutputMode, type GrepResult, grep } from "@oh-my-pi
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import { recordFileSnapshot } from "../edit/file-snapshot-store";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { LocalProtocolOptions } from "../internal-urls/local-protocol";

package/src/tools/ssh.ts

@@ -1,7 +1,7 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { SSHHost } from "../capability/ssh";
 import { sshCapability } from "../capability/ssh";
 import { loadCapability } from "../discovery";

package/src/tools/todo.ts

@@ -3,7 +3,7 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import todoDescription from "../prompts/tools/todo.md" with { type: "text" };

package/src/tools/tts.ts

@@ -2,7 +2,7 @@
 
 import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import { type ApiKey, ProviderHttpError, withAuth } from "@oh-my-pi/pi-ai";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { CustomTool, CustomToolContext } from "../extensibility/custom-tools/types";
 import { ohMyPiXAIUserAgent, resolveXAIHttpCredentials } from "../lib/xai-http";
 import { formatPathRelativeToCwd, resolveToCwd } from "./path-utils";

package/src/tools/write.ts

@@ -6,7 +6,7 @@ import { formatHashlineHeader, stripHashlinePrefixes } from "@oh-my-pi/hashline"
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { isEnoent, isRecord, prompt, untilAborted } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 
 import { canonicalSnapshotKey, getFileSnapshotStore } from "../edit/file-snapshot-store";
 import { normalizeToLF } from "../edit/normalize";

package/src/utils/clipboard.ts

@@ -66,9 +66,10 @@ export async function copyToClipboard(text: string): Promise<void> {
 	}
 }
 
-// PowerShell one-liner that emits the clipboard image as base64-encoded PNG on
-// stdout, or nothing when the clipboard does not hold image data. Used as the
-// WSL bridge — arboard cannot read the Windows clipboard through WSLg.
+// PowerShell one-liner that emits the Windows clipboard image as base64-encoded
+// PNG on stdout, or nothing when the clipboard does not hold image data. Used
+// for native Windows fallback and WSL interop because arboard can miss host
+// clipboard image payloads in those terminal paths.
 const POWERSHELL_IMAGE_SCRIPT = `
 $ErrorActionPreference = 'Stop'
 Add-Type -AssemblyName System.Windows.Forms
@@ -84,31 +85,36 @@ if ($img -ne $null) {
 const POWERSHELL_TIMEOUT_MS = 8000;
 
 /**
- * Read a clipboard image through the Windows host's PowerShell.
+ * Read an image through the Windows host's PowerShell.
  *
- * WSLg exposes a Wayland socket but no native clipboard image transport, so
- * `arboard` returns `ContentNotAvailable`. PowerShell, reached via WSL interop,
- * can read the Windows clipboard directly and round-trip the bitmap as PNG.
+ * Native Windows uses this as a fallback when arboard reports no image or
+ * cannot access the clipboard. WSLg exposes a Wayland socket but no native
+ * clipboard image transport, so arboard returns `ContentNotAvailable` there;
+ * PowerShell, reached via WSL interop, can read the Windows clipboard directly
+ * and round-trip the bitmap as PNG.
  *
  * Returns null when no image is on the clipboard, the host PowerShell is
  * missing, or the bridge times out.
  */
 async function readImageViaPowerShell(): Promise<ClipboardImage | null> {
 	try {
-		const proc = Bun.spawn(["powershell.exe", "-NoProfile", "-NonInteractive", "-Command", POWERSHELL_IMAGE_SCRIPT], {
-			stdout: "pipe",
-			stderr: "ignore",
-			stdin: "ignore",
-		});
+		const proc = Bun.spawn(
+			["powershell.exe", "-NoProfile", "-NonInteractive", "-Sta", "-Command", POWERSHELL_IMAGE_SCRIPT],
+			{
+				stdout: "pipe",
+				stderr: "ignore",
+				stdin: "ignore",
+			},
+		);
 		const timer = setTimeout(() => proc.kill(), POWERSHELL_TIMEOUT_MS);
 		let stdout = "";
 		try {
 			stdout = await new Response(proc.stdout).text();
 			await proc.exited;
 		} catch (err) {
-			// powershell.exe is a Windows process reached over WSL interop; if it
-			// doesn't reap cleanly, swallow the error so the dispatcher can fall
-			// through to the native bridge instead of throwing.
+			// powershell.exe can be a Windows process reached either natively or
+			// over WSL interop; if it doesn't reap cleanly, report no image instead
+			// of surfacing an opaque bridge failure to the prompt.
 			logger.warn("clipboard: powershell read failed", { error: String(err) });
 			return null;
 		} finally {
@@ -179,9 +185,10 @@ async function readTextViaPowerShell(): Promise<string | null> {
  * Read an image from the system clipboard.
  *
  * Returns null on Termux (no image clipboard support) or when no display
- * server is available (headless/SSH without forwarding). Under WSL the
- * Windows clipboard is reached through `powershell.exe`, since WSLg's
- * Wayland clipboard does not carry image payloads through to `arboard`.
+ * server is available (headless/SSH without forwarding). Under native Windows
+ * and WSL, the Windows clipboard is also reached through `powershell.exe`
+ * because terminal clipboard paths can leave image payloads invisible to the
+ * native bridge.
  *
  * @returns PNG payload or null when no image is available.
  */
@@ -198,6 +205,16 @@ export async function readImageFromClipboard(): Promise<ClipboardImage | null> {
 		// no display, so arboard would reject anyway.
 	}
 
+	if (process.platform === "win32") {
+		try {
+			const image = await native.readImageFromClipboard();
+			if (image) return image;
+		} catch (err) {
+			logger.warn("clipboard: native Windows image read failed", { error: String(err) });
+		}
+		return await readImageViaPowerShell();
+	}
+
 	if (!hasDisplay()) {
 		return null;
 	}

package/src/utils/image-loading.ts

@@ -1,5 +1,5 @@
 import * as fs from "node:fs/promises";
-import type { ImageContent } from "@oh-my-pi/pi-ai";
+import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
 import { formatBytes, readImageMetadata, SUPPORTED_IMAGE_MIME_TYPES } from "@oh-my-pi/pi-utils";
 import { resolveReadPath } from "../tools/path-utils";
 import { formatDimensionNote, type ImageResizeOptions, resizeImage } from "./image-resize";
@@ -7,6 +7,26 @@ import { formatDimensionNote, type ImageResizeOptions, resizeImage } from "./ima
 export const MAX_IMAGE_INPUT_BYTES = 20 * 1024 * 1024;
 export const SUPPORTED_INPUT_IMAGE_MIME_TYPES = SUPPORTED_IMAGE_MIME_TYPES;
 
+/**
+ * Ollama and its local-backend family decode image input through llama.cpp /
+ * `stb_image`, which is compiled without WebP support, so a WebP upload fails
+ * with an opaque HTTP 400. Detect those models so the resize pipeline encodes
+ * to PNG/JPEG instead — the automatic equivalent of `OMP_NO_WEBP=1`.
+ */
+export function modelLacksWebpSupport(model: Pick<Model, "provider" | "api"> | undefined): boolean {
+	if (!model) return false;
+	return model.provider === "ollama" || model.provider === "ollama-cloud" || model.api === "ollama-chat";
+}
+
+/**
+ * `true` when `model` cannot decode WebP, otherwise `undefined` so the
+ * `OMP_NO_WEBP` env fallback in {@link resizeImage} still applies. Feed straight
+ * into {@link ImageResizeOptions.excludeWebP}.
+ */
+export function webpExclusionForModel(model: Pick<Model, "provider" | "api"> | undefined): true | undefined {
+	return modelLacksWebpSupport(model) ? true : undefined;
+}
+
 export interface LoadImageInputOptions {
 	path: string;
 	cwd: string;
@@ -14,6 +34,8 @@ export interface LoadImageInputOptions {
 	maxBytes?: number;
 	resolvedPath?: string;
 	detectedMimeType?: string;
+	/** Force non-WebP output (e.g. for Ollama). Leave unset to honor `OMP_NO_WEBP`. */
+	excludeWebP?: boolean;
 }
 
 export interface LoadedImageInput {
@@ -51,6 +73,8 @@ export async function ensureSupportedImageInput(image: ImageContent): Promise<Im
 }
 
 export interface NormalizeModelContextImagesOptions {
+	/** Model the images are bound for; used to derive encoder constraints (WebP exclusion for Ollama). */
+	model?: Model;
 	resize?: ImageResizeOptions;
 }
 
@@ -66,10 +90,13 @@ export async function normalizeModelContextImages(
 	options?: NormalizeModelContextImagesOptions,
 ): Promise<ImageContent[] | undefined> {
 	if (!images || images.length === 0) return undefined;
+	const resize: ImageResizeOptions | undefined = modelLacksWebpSupport(options?.model)
+		? { ...options?.resize, excludeWebP: true }
+		: options?.resize;
 	const normalized: ImageContent[] = [];
 	for (const image of images) {
 		try {
-			const resized = await resizeImage(image, options?.resize);
+			const resized = await resizeImage(image, resize);
 			normalized.push({ type: "image", data: resized.data, mimeType: resized.mimeType });
 		} catch {
 			// Preserve existing caller behavior for decode/resize failures: keep the
@@ -104,9 +131,13 @@ export async function loadImageInput(options: LoadImageInputOptions): Promise<Lo
 	let outputBytes = inputBuffer.byteLength;
 	let dimensionNote: string | undefined;
 
-	if (options.autoResize) {
+	const shouldReencodeWebP = options.excludeWebP === true && mimeType === "image/webp";
+	if (options.autoResize || shouldReencodeWebP) {
 		try {
-			const resized = await resizeImage({ type: "image", data: outputData, mimeType });
+			const resized = await resizeImage(
+				{ type: "image", data: outputData, mimeType },
+				{ excludeWebP: options.excludeWebP },
+			);
 			outputData = resized.data;
 			outputMimeType = resized.mimeType;
 			outputBytes = resized.buffer.byteLength;

package/src/utils/thinking-display.ts

@@ -0,0 +1,37 @@
+import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+
+type AssistantContentBlock = AssistantMessage["content"][number];
+type ThinkingBlock = Extract<AssistantContentBlock, { type: "thinking" }>;
+
+function isDotOnlyThinking(text: string): boolean {
+	let sawDot = false;
+	for (let i = 0; i < text.length; i++) {
+		const code = text.charCodeAt(i);
+		if (code === 0x2e || code === 0x2026) {
+			sawDot = true;
+			continue;
+		}
+		if (code === 0x20 || code === 0x09 || code === 0x0a || code === 0x0d) continue;
+		return false;
+	}
+	return sawDot;
+}
+
+/**
+ * Returns the operator-visible thinking text for a block.
+ *
+ * Some OpenAI-compatible reasoning gateways require a non-empty
+ * `reasoning_content` field on historical assistant tool-call turns even when
+ * the model did not emit any reasoning. The provider adapter uses a single dot
+ * as the wire-only placeholder those gateways accept; if that value is later
+ * replayed or echoed as a thinking block, it should not render as model thought.
+ */
+export function getVisibleThinkingText(block: ThinkingBlock): string {
+	const text = block.thinking.trim();
+	if (text.length === 0) return "";
+	return isDotOnlyThinking(text) ? "" : text;
+}
+
+export function hasVisibleThinking(block: ThinkingBlock): boolean {
+	return getVisibleThinkingText(block).length > 0;
+}

package/src/web/search/index.ts

@@ -7,7 +7,7 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { AuthStorage } from "@oh-my-pi/pi-ai";
 import { prompt } from "@oh-my-pi/pi-utils";
-import * as z from "zod/v4";
+import { z } from "zod/v4";
 import type { CustomTool, CustomToolContext, RenderResultOptions } from "../../extensibility/custom-tools/types";
 import type { Theme } from "../../modes/theme/theme";
 import webSearchSystemPrompt from "../../prompts/system/web-search.md" with { type: "text" };

package/dist/types/cli/list-models.d.ts

@@ -1,30 +0,0 @@
-import type { ModelRegistry } from "../config/model-registry";
-/**
- * List available models, optionally filtered by search pattern
- */
-export declare function listModels(modelRegistry: ModelRegistry, searchPattern?: string): Promise<void>;
-/**
- * Options for the `--list-models` command entry point.
- */
-export interface RunListModelsOptions {
-    modelRegistry: ModelRegistry;
-    cwd: string;
-    /** CLI-supplied extension paths (e.g. from `-e <path>`). */
-    additionalExtensionPaths?: string[];
-    /** Extension paths configured under `extensions:` in user settings. */
-    settingsExtensions?: string[];
-    /** Disabled extension ids from settings (`disabledExtensions`). */
-    disabledExtensionIds?: string[];
-    /** When true, skip discovery and only load `additionalExtensionPaths`. */
-    disableExtensionDiscovery?: boolean;
-    searchPattern?: string;
-}
-/**
- * Loads extensions (CLI `-e` paths and `settings.extensions`) and surfaces
- * any provider/model registrations on the supplied `modelRegistry` before
- * delegating to {@link listModels}. This is the single entry point used by
- * `--list-models` and exists to ensure extension-contributed providers are
- * visible in the listing (issue #905). The load is intentionally narrow:
- * no agent loop, no MCP servers, no custom-tool registration.
- */
-export declare function runListModelsCommand(options: RunListModelsOptions): Promise<void>;

package/src/cli/list-models.ts

@@ -1,194 +0,0 @@
-/**
- * List available models with optional fuzzy search
- */
-import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { getSupportedEfforts } from "@oh-my-pi/pi-catalog/model-thinking";
-import { fuzzyFilter } from "@oh-my-pi/pi-tui";
-import { formatNumber } from "@oh-my-pi/pi-utils";
-import type { ModelRegistry } from "../config/model-registry";
-import { discoverAndLoadExtensions, loadExtensions } from "../extensibility/extensions";
-import { EventBus } from "../utils/event-bus";
-
-interface ProviderRow {
-	provider: string;
-	model: string;
-	context: string;
-	maxOut: string;
-	thinking: string;
-	images: string;
-}
-
-interface CanonicalRow {
-	canonical: string;
-	selected: string;
-	variants: string;
-	context: string;
-	maxOut: string;
-}
-
-function writeLine(line = ""): void {
-	process.stdout.write(`${line}\n`);
-}
-
-function renderTable<T extends Record<string, string>>(rows: T[], headers: T): void {
-	const widths = Object.fromEntries(
-		Object.keys(headers).map(key => [key, Math.max(headers[key]!.length, ...rows.map(row => row[key]!.length))]),
-	) as Record<keyof T, number>;
-
-	const headerLine = Object.keys(headers)
-		.map(key => headers[key as keyof T]!.padEnd(widths[key as keyof T]))
-		.join("  ");
-	writeLine(headerLine);
-
-	for (const row of rows) {
-		const line = Object.keys(headers)
-			.map(key => row[key as keyof T]!.padEnd(widths[key as keyof T]))
-			.join("  ");
-		writeLine(line);
-	}
-}
-
-/**
- * List available models, optionally filtered by search pattern
- */
-export async function listModels(modelRegistry: ModelRegistry, searchPattern?: string): Promise<void> {
-	const models = modelRegistry.getAvailable();
-
-	if (models.length === 0) {
-		writeLine("No models available. Set API keys in environment variables.");
-		return;
-	}
-
-	let filteredModels: Model<Api>[] = models;
-	if (searchPattern) {
-		filteredModels = fuzzyFilter(models, searchPattern, model => `${model.provider} ${model.id}`);
-	}
-
-	const filteredCanonical = modelRegistry
-		.getCanonicalModelSelections({ availableOnly: true, candidates: filteredModels })
-		.map(
-			({ record, model: selected }): CanonicalRow => ({
-				canonical: record.id,
-				selected: `${selected.provider}/${selected.id}`,
-				variants: String(record.variants.length),
-				context: formatNumber(selected.contextWindow),
-				maxOut: formatNumber(selected.maxTokens),
-			}),
-		)
-		.sort((left, right) => left.canonical.localeCompare(right.canonical));
-
-	if (filteredModels.length === 0 && filteredCanonical.length === 0) {
-		writeLine(`No models matching "${searchPattern}"`);
-		return;
-	}
-
-	filteredModels.sort((left, right) => {
-		const providerCmp = left.provider.localeCompare(right.provider);
-		if (providerCmp !== 0) return providerCmp;
-		return left.id.localeCompare(right.id);
-	});
-
-	const providerRows = filteredModels.map(model => ({
-		provider: model.provider,
-		model: model.id,
-		context: formatNumber(model.contextWindow),
-		maxOut: formatNumber(model.maxTokens),
-		thinking: model.thinking ? getSupportedEfforts(model).join(",") : model.reasoning ? "yes" : "-",
-		images: model.input.includes("image") ? "yes" : "no",
-	})) satisfies ProviderRow[];
-
-	if (filteredCanonical.length > 0) {
-		writeLine("Canonical models");
-		renderTable(filteredCanonical, {
-			canonical: "canonical",
-			selected: "selected",
-			variants: "variants",
-			context: "context",
-			maxOut: "max-out",
-		});
-		if (providerRows.length > 0) {
-			writeLine();
-		}
-	}
-
-	if (providerRows.length > 0) {
-		writeLine("Provider models");
-		renderTable(providerRows, {
-			provider: "provider",
-			model: "model",
-			context: "context",
-			maxOut: "max-out",
-			thinking: "thinking",
-			images: "images",
-		});
-	}
-}
-
-/**
- * Options for the `--list-models` command entry point.
- */
-export interface RunListModelsOptions {
-	modelRegistry: ModelRegistry;
-	cwd: string;
-	/** CLI-supplied extension paths (e.g. from `-e <path>`). */
-	additionalExtensionPaths?: string[];
-	/** Extension paths configured under `extensions:` in user settings. */
-	settingsExtensions?: string[];
-	/** Disabled extension ids from settings (`disabledExtensions`). */
-	disabledExtensionIds?: string[];
-	/** When true, skip discovery and only load `additionalExtensionPaths`. */
-	disableExtensionDiscovery?: boolean;
-	searchPattern?: string;
-}
-
-/**
- * Loads extensions (CLI `-e` paths and `settings.extensions`) and surfaces
- * any provider/model registrations on the supplied `modelRegistry` before
- * delegating to {@link listModels}. This is the single entry point used by
- * `--list-models` and exists to ensure extension-contributed providers are
- * visible in the listing (issue #905). The load is intentionally narrow:
- * no agent loop, no MCP servers, no custom-tool registration.
- */
-export async function runListModelsCommand(options: RunListModelsOptions): Promise<void> {
-	const {
-		modelRegistry,
-		cwd,
-		additionalExtensionPaths = [],
-		settingsExtensions = [],
-		disabledExtensionIds = [],
-		disableExtensionDiscovery = false,
-		searchPattern,
-	} = options;
-
-	const eventBus = new EventBus();
-	const extensionsResult = disableExtensionDiscovery
-		? await loadExtensions(additionalExtensionPaths, cwd, eventBus)
-		: await discoverAndLoadExtensions(
-				[...additionalExtensionPaths, ...settingsExtensions],
-				cwd,
-				eventBus,
-				disabledExtensionIds,
-			);
-
-	for (const { path: extPath, error } of extensionsResult.errors) {
-		process.stderr.write(`Failed to load extension: ${extPath}: ${error}\n`);
-	}
-
-	// Mirror sdk.ts: drain pending provider registrations into the registry.
-	const activeSources = extensionsResult.extensions.map(extension => extension.path);
-	modelRegistry.syncExtensionSources(activeSources);
-	for (const sourceId of new Set(activeSources)) {
-		modelRegistry.clearSourceRegistrations(sourceId);
-	}
-	for (const { name, config, sourceId } of extensionsResult.runtime.pendingProviderRegistrations) {
-		modelRegistry.registerProvider(name, config, sourceId);
-	}
-	extensionsResult.runtime.pendingProviderRegistrations = [];
-	// Discover runtime (extension) provider catalogs now that they are registered.
-	// The full refresh in main.ts ran before extensions loaded, so this is the only
-	// point where extension-contributed dynamic providers get discovered. Cache-aware
-	// so it reuses the shared 24 h model cache instead of refetching every invocation.
-	await modelRegistry.refreshRuntimeProviders("online-if-uncached");
-
-	await listModels(modelRegistry, searchPattern);
-}