From 0a6140acfa9a0ded0cb3b24a56d212825cb0650d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Tue, 17 Mar 2026 04:04:12 +0000
Subject: [PATCH] refactor(providers): share catalog template matcher

---
 extensions/openai/shared.ts              | 17 ++---------------
 src/plugins/provider-catalog-metadata.ts | 17 +----------------
 src/plugins/provider-catalog.test.ts     | 15 ++++++++++++++-
 src/plugins/provider-catalog.ts          | 16 ++++++++++++++++
 4 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/extensions/openai/shared.ts b/extensions/openai/shared.ts
index 4e4c8c2d850..ad469a2f136 100644
--- a/extensions/openai/shared.ts
+++ b/extensions/openai/shared.ts
@@ -1,4 +1,5 @@
 import { normalizeModelCompat } from "../../src/agents/model-compat.js";
+import { findCatalogTemplate } from "../../src/plugins/provider-catalog.js";
 import type {
   ProviderResolveDynamicModelContext,
   ProviderRuntimeModel,
@@ -48,18 +49,4 @@ export function cloneFirstTemplateModel(params: {
   return undefined;
 }
 
-export function findCatalogTemplate(params: {
-  entries: ReadonlyArray<{ provider: string; id: string }>;
-  providerId: string;
-  templateIds: readonly string[];
-}) {
-  return params.templateIds
-    .map((templateId) =>
-      params.entries.find(
-        (entry) =>
-          entry.provider.toLowerCase() === params.providerId.toLowerCase() &&
-          entry.id.toLowerCase() === templateId.toLowerCase(),
-      ),
-    )
-    .find((entry) => entry !== undefined);
-}
+export { findCatalogTemplate };
diff --git a/src/plugins/provider-catalog-metadata.ts b/src/plugins/provider-catalog-metadata.ts
index 123fef24289..5714861b219 100644
--- a/src/plugins/provider-catalog-metadata.ts
+++ b/src/plugins/provider-catalog-metadata.ts
@@ -1,4 +1,5 @@
 import { normalizeProviderId } from "../agents/provider-id.js";
+import { findCatalogTemplate } from "./provider-catalog.js";
 import type {
   ProviderAugmentModelCatalogContext,
   ProviderBuiltInModelSuppressionContext,
@@ -9,22 +10,6 @@ const OPENAI_CODEX_PROVIDER_ID = "openai-codex";
 const OPENAI_DIRECT_SPARK_MODEL_ID = "gpt-5.3-codex-spark";
 const SUPPRESSED_SPARK_PROVIDERS = new Set(["openai", "azure-openai-responses"]);
 
-function findCatalogTemplate(params: {
-  entries: ReadonlyArray<{ provider: string; id: string }>;
-  providerId: string;
-  templateIds: readonly string[];
-}) {
-  return params.templateIds
-    .map((templateId) =>
-      params.entries.find(
-        (entry) =>
-          entry.provider.toLowerCase() === params.providerId.toLowerCase() &&
-          entry.id.toLowerCase() === templateId.toLowerCase(),
-      ),
-    )
-    .find((entry) => entry !== undefined);
-}
-
 export function resolveBundledProviderBuiltInModelSuppression(
   context: ProviderBuiltInModelSuppressionContext,
 ) {
diff --git a/src/plugins/provider-catalog.test.ts b/src/plugins/provider-catalog.test.ts
index 3183f5ee016..c435e1d88b2 100644
--- a/src/plugins/provider-catalog.test.ts
+++ b/src/plugins/provider-catalog.test.ts
@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import type { OpenClawConfig } from "../config/config.js";
-import { buildSingleProviderApiKeyCatalog } from "./provider-catalog.js";
+import { buildSingleProviderApiKeyCatalog, findCatalogTemplate } from "./provider-catalog.js";
 import type { ProviderCatalogContext } from "./types.js";
 
 function createCatalogContext(params: {
@@ -17,6 +17,19 @@ function createCatalogContext(params: {
 }
 
 describe("buildSingleProviderApiKeyCatalog", () => {
+  it("matches provider templates case-insensitively", () => {
+    const result = findCatalogTemplate({
+      entries: [
+        { provider: "OpenAI", id: "gpt-5.2" },
+        { provider: "other", id: "fallback" },
+      ],
+      providerId: "openai",
+      templateIds: ["missing", "GPT-5.2"],
+    });
+
+    expect(result).toEqual({ provider: "OpenAI", id: "gpt-5.2" });
+  });
+
   it("returns null when api key is missing", async () => {
     const result = await buildSingleProviderApiKeyCatalog({
       ctx: createCatalogContext({}),
diff --git a/src/plugins/provider-catalog.ts b/src/plugins/provider-catalog.ts
index 0974a9df59e..3fcf2f39bcc 100644
--- a/src/plugins/provider-catalog.ts
+++ b/src/plugins/provider-catalog.ts
@@ -1,6 +1,22 @@
 import type { ModelProviderConfig } from "../config/types.js";
 import type { ProviderCatalogContext, ProviderCatalogResult } from "./types.js";
 
+export function findCatalogTemplate(params: {
+  entries: ReadonlyArray<{ provider: string; id: string }>;
+  providerId: string;
+  templateIds: readonly string[];
+}) {
+  return params.templateIds
+    .map((templateId) =>
+      params.entries.find(
+        (entry) =>
+          entry.provider.toLowerCase() === params.providerId.toLowerCase() &&
+          entry.id.toLowerCase() === templateId.toLowerCase(),
+      ),
+    )
+    .find((entry) => entry !== undefined);
+}
+
 export async function buildSingleProviderApiKeyCatalog(params: {
   ctx: ProviderCatalogContext;
   providerId: string;