From 64ef03dcf829ff3197101f9d6f9f6da2cc484af2 Mon Sep 17 00:00:00 2001
From: Andy Ye <35905412+TurboTheTurtle@users.noreply.github.com>
Date: Tue, 19 May 2026 15:26:43 -0700
Subject: [PATCH] test(models): isolate provider catalog row tests

---
 src/commands/models/list.rows.test.ts | 65 ++++++++++++++-------------
 src/commands/models/list.rows.ts      | 21 +++++----
 2 files changed, 46 insertions(+), 40 deletions(-)

diff --git a/src/commands/models/list.rows.test.ts b/src/commands/models/list.rows.test.ts
index 991330f1aabe..5d35fe6b4a51 100644
--- a/src/commands/models/list.rows.test.ts
+++ b/src/commands/models/list.rows.test.ts
@@ -2,20 +2,11 @@ import { describe, expect, it, vi } from "vitest";
 import type { ModelRow } from "./list.types.js";
 
 const mocks = vi.hoisted(() => ({
+  normalizeProviderResolvedModelWithPlugin: vi.fn(() => undefined),
   shouldSuppressBuiltInModel: vi.fn(() => {
     throw new Error("runtime model suppression should be skipped");
   }),
   shouldSuppressBuiltInModelFromManifest: vi.fn(() => false),
-  loadProviderCatalogModelsForList: vi.fn().mockResolvedValue([
-    {
-      id: "gpt-5.5",
-      name: "gpt-5.5",
-      provider: "codex",
-      api: "openai-codex-responses",
-      baseUrl: "https://chatgpt.com/backend-api",
-      input: ["text"],
-    },
-  ]),
 }));
 
 vi.mock("../../agents/model-suppression.js", () => ({
@@ -23,8 +14,8 @@ vi.mock("../../agents/model-suppression.js", () => ({
   shouldSuppressBuiltInModelFromManifest: mocks.shouldSuppressBuiltInModelFromManifest,
 }));
 
-vi.mock("./list.provider-catalog.js", () => ({
-  loadProviderCatalogModelsForList: mocks.loadProviderCatalogModelsForList,
+vi.mock("../../plugins/provider-runtime.js", () => ({
+  normalizeProviderResolvedModelWithPlugin: mocks.normalizeProviderResolvedModelWithPlugin,
 }));
 
 import { appendProviderCatalogRows } from "./list.rows.js";
@@ -50,6 +41,16 @@ describe("appendProviderCatalogRows", () => {
     await appendProviderCatalogRows({
       rows,
       seenKeys: new Set(),
+      catalogModels: [
+        {
+          id: "gpt-5.5",
+          name: "gpt-5.5",
+          provider: "codex",
+          api: "openai-codex-responses",
+          baseUrl: "https://chatgpt.com/backend-api",
+          input: ["text"],
+        },
+      ],
       context: {
         cfg: {
           agents: { defaults: { model: { primary: "codex/gpt-5.5" } } },
@@ -80,22 +81,22 @@ describe("appendProviderCatalogRows", () => {
   });
 
   it("applies manifest suppression when runtime model-suppression hooks are skipped", async () => {
-    mocks.loadProviderCatalogModelsForList.mockResolvedValueOnce([
-      {
-        id: "gpt-5.3-codex-spark",
-        name: "GPT-5.3 Codex Spark",
-        provider: "openai",
-        api: "openai-responses",
-        baseUrl: "https://api.openai.com/v1",
-        input: ["text", "image"],
-      },
-    ]);
     mocks.shouldSuppressBuiltInModelFromManifest.mockReturnValueOnce(true);
     const rows: ModelRow[] = [];
 
     await appendProviderCatalogRows({
       rows,
       seenKeys: new Set(),
+      catalogModels: [
+        {
+          id: "gpt-5.3-codex-spark",
+          name: "GPT-5.3 Codex Spark",
+          provider: "openai",
+          api: "openai-responses",
+          baseUrl: "https://api.openai.com/v1",
+          input: ["text", "image"],
+        },
+      ],
       context: {
         cfg: {
           agents: { defaults: { model: { primary: "openai/gpt-5.5" } } },
@@ -126,21 +127,21 @@ describe("appendProviderCatalogRows", () => {
   });
 
   it("uses Codex auth availability for configured canonical OpenAI rows", async () => {
-    mocks.loadProviderCatalogModelsForList.mockResolvedValueOnce([
-      {
-        id: "gpt-5.5",
-        name: "GPT-5.5",
-        provider: "openai",
-        api: "openai-responses",
-        baseUrl: "https://api.openai.com/v1",
-        input: ["text", "image"],
-      },
-    ]);
     const rows: ModelRow[] = [];
 
     await appendProviderCatalogRows({
       rows,
       seenKeys: new Set(),
+      catalogModels: [
+        {
+          id: "gpt-5.5",
+          name: "GPT-5.5",
+          provider: "openai",
+          api: "openai-responses",
+          baseUrl: "https://api.openai.com/v1",
+          input: ["text", "image"],
+        },
+      ],
       context: {
         cfg: {
           agents: { defaults: { model: { primary: "openai/gpt-5.5" } } },
diff --git a/src/commands/models/list.rows.ts b/src/commands/models/list.rows.ts
index e76578435467..39c4ae4a29c1 100644
--- a/src/commands/models/list.rows.ts
+++ b/src/commands/models/list.rows.ts
@@ -483,16 +483,21 @@ export async function appendProviderCatalogRows(params: {
   context: RowBuilderContext;
   seenKeys: Set<string>;
   staticOnly?: boolean;
+  catalogModels?: readonly Model<Api>[];
 }): Promise<number> {
   let appended = 0;
-  const { loadProviderCatalogModelsForList } = await loadProviderCatalogModule();
-  for (const model of await loadProviderCatalogModelsForList({
-    cfg: params.context.cfg,
-    agentDir: params.context.agentDir,
-    providerFilter: params.context.filter.provider,
-    staticOnly: params.staticOnly,
-    metadataSnapshot: params.context.metadataSnapshot,
-  })) {
+  let catalogModels = params.catalogModels;
+  if (catalogModels == null) {
+    const { loadProviderCatalogModelsForList } = await loadProviderCatalogModule();
+    catalogModels = await loadProviderCatalogModelsForList({
+      cfg: params.context.cfg,
+      agentDir: params.context.agentDir,
+      providerFilter: params.context.filter.provider,
+      staticOnly: params.staticOnly,
+      metadataSnapshot: params.context.metadataSnapshot,
+    });
+  }
+  for (const model of catalogModels) {
     const key = modelKey(model.provider, model.id);
     if (
       await appendVisibleRow({