From 27a887524133706cf8cc15555dc3f8200e954176 Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Tue, 28 Apr 2026 01:07:56 +0100
Subject: [PATCH] fix: append filtered registry rows in broad model lists

---
 src/commands/models/list.list-command.ts | 5 +++++
 src/commands/models/list.row-sources.ts  | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/commands/models/list.list-command.ts b/src/commands/models/list.list-command.ts
index 7be2486d9c0..ecaebfbc795 100644
--- a/src/commands/models/list.list-command.ts
+++ b/src/commands/models/list.list-command.ts
@@ -1,3 +1,4 @@
+import type { Api, Model } from "@mariozechner/pi-ai";
 import type { ModelRegistry } from "@mariozechner/pi-coding-agent";
 import { parseModelRef } from "../../agents/model-selection.js";
 import type { RuntimeEnv } from "../../runtime.js";
@@ -76,6 +77,7 @@ export async function modelsListCommand(
   const agentDir = resolveOpenClawAgentDir();
 
   let modelRegistry: ModelRegistry | undefined;
+  let registryModels: Model<Api>[] = [];
   let discoveredKeys = new Set<string>();
   let availableKeys: Set<string> | undefined;
   let availabilityErrorMessage: string | undefined;
@@ -97,6 +99,7 @@ export async function modelsListCommand(
       normalizeModels: Boolean(providerFilter),
     });
     modelRegistry = loaded.registry;
+    registryModels = loaded.models;
     discoveredKeys = loaded.discoveredKeys;
     availableKeys = loaded.availableKeys;
     availabilityErrorMessage = loaded.availabilityErrorMessage;
@@ -141,6 +144,7 @@ export async function modelsListCommand(
       rows,
       context: rowContext,
       modelRegistry,
+      registryModels,
       sourcePlan,
     });
     if (initialAppend.requiresRegistryFallback) {
@@ -157,6 +161,7 @@ export async function modelsListCommand(
         rows,
         context: rowContext,
         modelRegistry,
+        registryModels,
         sourcePlan: sourcePlanModule.createRegistryModelListSourcePlan(),
       });
     }
diff --git a/src/commands/models/list.row-sources.ts b/src/commands/models/list.row-sources.ts
index 89f551f4b3f..bfa5d8aecc9 100644
--- a/src/commands/models/list.row-sources.ts
+++ b/src/commands/models/list.row-sources.ts
@@ -16,6 +16,7 @@ type AllModelRowSources = {
   rows: ModelRow[];
   context: RowBuilderContext;
   modelRegistry?: ModelRegistry;
+  registryModels?: ReturnType<ModelRegistry["getAll"]>;
   sourcePlan: ModelListSourcePlan;
 };
 
@@ -78,7 +79,7 @@ export async function appendAllModelRowSources(
 
   const seenKeys = await appendDiscoveredRows({
     rows: params.rows,
-    models: params.modelRegistry?.getAll() ?? [],
+    models: params.registryModels ?? params.modelRegistry?.getAll() ?? [],
     modelRegistry: params.modelRegistry,
     context: params.context,
     resolveWithRegistry: Boolean(params.context.filter.provider),