fix(models): honor replace mode in list output

steipete · Monkey-wusky · steipete · commit c45ceb843c0c · 2026-07-09T17:18:21.000-04:00
Replace the stale fork PR with the reviewed fix on current main. Refs: #94735 Co-authored-by: 毛宇豪0668001457 <mao.yuhao@xydigit.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- **Model list replace mode:** keep authenticated catalog rows out of default `models list` output when `models.mode: "replace"` while preserving explicit `--all` and `--provider` browsing. (#94705) Thanks @Monkey-wusky.
 - **Codex computer control:** publish fixed-length coordinate pairs as homogeneous array schemas so Codex app-server can start threads with the `computer` tool instead of rejecting tuple-valued `items`.
 - **Google Chat request deadlines:** bound control calls to 30 seconds while giving media transfers size-aware total budgets and a separate 30-second stalled-body guard, preventing hung Chat API requests without breaking large attachment uploads. (#102227) Thanks @hugenshen.
 - **Google Gemini prefixed model IDs:** recognize `google/gemini-*` and `models/gemini-*` when selecting multimodal function-response behavior, preserving the Gemini 2 image fallback without regressing Gemini 3 inline image responses. (#102382) Thanks @LiLan0125.
diff --git a/src/commands/models/list.list-command.forward-compat.test.ts b/src/commands/models/list.list-command.forward-compat.test.ts
@@ -620,13 +620,15 @@ describe("modelsListCommand forward-compat", () => {
       });
     });
 
-    it("includes configured provider and auth-backed catalog rows in configured-mode lists", async () => {
+    function configureAuthenticatedCatalogScenario(mode: "merge" | "replace") {
       const config = {
         agents: { defaults: { model: { primary: "xiaomi/mimo-v2.5-pro" } } },
         models: {
+          mode,
           providers: {
             xiaomi: {
-              api: "openai-completions",
+              // Replace-mode configured models can rely on runtime transport inference.
+              ...(mode === "merge" ? { api: "openai-completions" as const } : {}),
               apiKey: "tp-fixture",
               baseUrl: "https://api.xiaomi.example/v1",
               models: [
@@ -637,12 +639,12 @@ describe("modelsListCommand forward-compat", () => {
           },
         },
       };
-      mocks.loadModelsConfigWithSource.mockResolvedValueOnce({
+      mocks.loadModelsConfigWithSource.mockResolvedValue({
         sourceConfig: config,
         resolvedConfig: config,
         diagnostics: [],
       });
-      mocks.ensureAuthProfileStore.mockReturnValueOnce({
+      mocks.ensureAuthProfileStore.mockReturnValue({
         version: 1,
         profiles: {
           "google:default": {
@@ -653,7 +655,7 @@ describe("modelsListCommand forward-compat", () => {
         },
         order: {},
       });
-      mocks.resolveConfiguredEntries.mockReturnValueOnce({
+      mocks.resolveConfiguredEntries.mockReturnValue({
         entries: [
           {
             key: "xiaomi/mimo-v2.5-pro",
@@ -663,7 +665,7 @@ describe("modelsListCommand forward-compat", () => {
           },
         ],
       });
-      mocks.loadModelCatalog.mockResolvedValueOnce([
+      mocks.loadModelCatalog.mockResolvedValue([
         {
           provider: "google",
           id: "gemini-3.1-flash-lite",
@@ -672,23 +674,92 @@ describe("modelsListCommand forward-compat", () => {
           contextWindow: 1_000_000,
         },
       ]);
-      const runtime = createRuntime();
+    }
 
-      await modelsListCommand({ json: true }, runtime as never);
+    it.each([
+      {
+        mode: "merge",
+        expectedKeys: [
+          "xiaomi/mimo-v2.5-pro",
+          "xiaomi/mimo-v2.5",
+          "google/gemini-3.1-flash-lite",
+        ],
+      },
+      {
+        mode: "replace",
+        expectedKeys: ["xiaomi/mimo-v2.5-pro", "xiaomi/mimo-v2.5"],
+      },
+    ] as const)(
+      "uses $mode catalog semantics for the default list",
+      async ({ mode, expectedKeys }) => {
+        configureAuthenticatedCatalogScenario(mode);
+        const runtime = createRuntime();
 
-      expect(mocks.loadModelRegistry).not.toHaveBeenCalled();
-      const rows = lastPrintedRows<{ key: string; name: string; available: boolean }>();
-      expectRowKeys(rows, [
-        "xiaomi/mimo-v2.5-pro",
-        "xiaomi/mimo-v2.5",
-        "google/gemini-3.1-flash-lite",
-      ]);
-      expectRowFields(rows, "xiaomi/mimo-v2.5-pro", { name: "MiMo V2.5 Pro" });
-      expectRowFields(rows, "xiaomi/mimo-v2.5", { name: "MiMo V2.5" });
-      expectRowFields(rows, "google/gemini-3.1-flash-lite", {
+        await modelsListCommand({ json: true }, runtime as never);
+
+        expect(mocks.loadModelRegistry).not.toHaveBeenCalled();
+        const rows = lastPrintedRows<{ key: string; name: string; available: boolean }>();
+        expectRowKeys(rows, [...expectedKeys]);
+        expectRowFields(rows, "xiaomi/mimo-v2.5-pro", { name: "MiMo V2.5 Pro" });
+        expectRowFields(rows, "xiaomi/mimo-v2.5", { name: "MiMo V2.5" });
+        if (mode === "merge") {
+          expectRowFields(rows, "google/gemini-3.1-flash-lite", {
+            name: "Gemini 3.1 Flash Lite",
+            available: true,
+          });
+          expect(mocks.loadModelCatalog).toHaveBeenCalledOnce();
+        } else {
+          expect(mocks.loadModelCatalog).not.toHaveBeenCalled();
+        }
+      },
+    );
+
+    it("preserves explicit all and provider browsing in replace mode", async () => {
+      configureAuthenticatedCatalogScenario("replace");
+      const googleModelKey = "google/gemini-3.1-flash-lite";
+      const googleModel = {
+        provider: "google",
+        id: "gemini-3.1-flash-lite",
         name: "Gemini 3.1 Flash Lite",
-        available: true,
+        api: "google-generative-ai",
+        baseUrl: "https://generativelanguage.googleapis.com/v1beta",
+        input: ["text"],
+        contextWindow: 1_000_000,
+        maxTokens: 65_536,
+        cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
+      };
+      mocks.loadModelRegistry.mockResolvedValueOnce({
+        models: [googleModel],
+        availableKeys: new Set([googleModelKey]),
+        registry: { getAll: () => [googleModel] },
       });
+      const runtime = createRuntime();
+
+      await modelsListCommand({ all: true, json: true }, runtime as never);
+
+      expectRowFields(
+        lastPrintedRows<{ key: string; available: boolean }>(),
+        googleModelKey,
+        { available: true },
+      );
+      expect(mocks.loadModelRegistry).toHaveBeenCalledOnce();
+
+      mocks.loadStaticManifestCatalogRowsForList.mockReturnValueOnce([
+        {
+          ...googleModel,
+          ref: googleModelKey,
+          mergeKey: "google::gemini-3.1-flash-lite",
+          source: "manifest",
+          reasoning: false,
+          status: "available",
+        },
+      ]);
+
+      await modelsListCommand({ provider: "google", json: true }, runtime as never);
+
+      expectRowKeys(lastPrintedRows<{ key: string }>(), [googleModelKey]);
+      expect(mocks.loadModelRegistry).toHaveBeenCalledOnce();
+      expect(mocks.loadModelCatalog).not.toHaveBeenCalled();
     });
 
     it("does not mark configured codex model as missing when forward-compat can build a fallback", async () => {
diff --git a/src/commands/models/list.rows.ts b/src/commands/models/list.rows.ts
@@ -360,7 +360,11 @@ export async function appendConfiguredProviderRows(params: {
     params.context.cfg.models?.providers ?? {},
   )) {
     for (const configuredModel of providerConfig.models ?? []) {
-      if (!shouldListConfiguredProviderModel({ providerConfig, model: configuredModel })) {
+      // Replace-mode rows are canonical even when runtime infers their transport.
+      if (
+        params.context.cfg.models?.mode !== "replace" &&
+        !shouldListConfiguredProviderModel({ providerConfig, model: configuredModel })
+      ) {
         continue;
       }
       const key = modelKey(provider, configuredModel.id);
@@ -388,6 +392,10 @@ export async function appendAuthenticatedCatalogRows(params: {
   context: RowBuilderContext;
   seenKeys: Set<string>;
 }): Promise<void> {
+  // Replace narrows default configured lists; explicit browse paths skip this helper.
+  if (params.context.cfg.models?.mode === "replace") {
+    return;
+  }
   const { loadModelCatalog } = await loadModelCatalogModule();
   const catalog = await loadModelCatalog({
     config: params.context.cfg,
