From 8a14328c69e6d81115ab2d023e902809c7fea200 Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Sat, 25 Apr 2026 03:57:04 +0100
Subject: [PATCH] fix: normalize manifest catalog provider ids

---
 src/model-catalog/normalize.test.ts | 12 +++++------
 src/model-catalog/normalize.ts      | 32 ++++++++++++++++++++---------
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/model-catalog/normalize.test.ts b/src/model-catalog/normalize.test.ts
index 674be01f29d..766421fd9df 100644
--- a/src/model-catalog/normalize.test.ts
+++ b/src/model-catalog/normalize.test.ts
@@ -11,7 +11,7 @@ describe("model catalog normalization", () => {
     const catalog = normalizeModelCatalog(
       {
         providers: {
-          openai: {
+          OpenAI: {
             baseUrl: "https://api.openai.com/v1",
             api: "openai-responses",
             headers: {
@@ -71,8 +71,8 @@ describe("model catalog normalization", () => {
           },
         },
         aliases: {
-          "azure-openai-responses": {
-            provider: "openai",
+          "Azure-OpenAI-Responses": {
+            provider: "OpenAI",
             api: "azure-openai-responses",
           },
           "anthropic-alias": {
@@ -81,18 +81,18 @@ describe("model catalog normalization", () => {
         },
         suppressions: [
           {
-            provider: "azure-openai-responses",
+            provider: "Azure-OpenAI-Responses",
             model: "gpt-5.3-codex-spark",
             reason: "not available",
           },
         ],
         discovery: {
-          openai: "static",
+          OpenAI: "static",
           anthropic: "static",
           bad: "unknown",
         },
       },
-      { ownedProviders: new Set(["openai"]) },
+      { ownedProviders: new Set(["OpenAI"]) },
     );
 
     expect(catalog).toEqual({
diff --git a/src/model-catalog/normalize.ts b/src/model-catalog/normalize.ts
index 283c7508b92..325156de436 100644
--- a/src/model-catalog/normalize.ts
+++ b/src/model-catalog/normalize.ts
@@ -30,13 +30,22 @@ const MODEL_CATALOG_APIS = new Set<string>(MODEL_APIS);
 const DEFAULT_MODEL_INPUT: ModelCatalogInput[] = ["text"];
 const DEFAULT_MODEL_STATUS: ModelCatalogStatus = "available";
 
-export type { NormalizedModelCatalogRow } from "./types.js";
-
 function normalizeSafeRecordKey(value: unknown): string {
   const key = normalizeOptionalString(value) ?? "";
   return key && !isBlockedObjectKey(key) ? key : "";
 }
 
+function normalizeOwnedProviderSet(providers: ReadonlySet<string>): ReadonlySet<string> {
+  const normalized = new Set<string>();
+  for (const provider of providers) {
+    const providerId = normalizeModelCatalogProviderId(provider);
+    if (providerId) {
+      normalized.add(providerId);
+    }
+  }
+  return normalized;
+}
+
 function normalizeStringMap(value: unknown): Record<string, string> | undefined {
   if (!isRecord(value)) {
     return undefined;
@@ -295,7 +304,7 @@ function normalizeModelCatalogProviders(
   }
   const providers: Record<string, ModelCatalogProvider> = {};
   for (const [rawProviderId, rawProvider] of Object.entries(value)) {
-    const providerId = normalizeSafeRecordKey(rawProviderId);
+    const providerId = normalizeModelCatalogProviderId(rawProviderId);
     if (!providerId || !ownedProviders.has(providerId)) {
       continue;
     }
@@ -316,11 +325,13 @@ function normalizeModelCatalogAliases(
   }
   const aliases: Record<string, ModelCatalogAlias> = {};
   for (const [rawAlias, rawTarget] of Object.entries(value)) {
-    const alias = normalizeSafeRecordKey(rawAlias);
+    const alias = normalizeModelCatalogProviderId(rawAlias);
     if (!alias || !isRecord(rawTarget)) {
       continue;
     }
-    const provider = normalizeOptionalString(rawTarget.provider) ?? "";
+    const provider = normalizeModelCatalogProviderId(
+      normalizeOptionalString(rawTarget.provider) ?? "",
+    );
     if (!provider || !ownedProviders.has(provider)) {
       continue;
     }
@@ -344,7 +355,7 @@ function normalizeModelCatalogSuppressions(value: unknown): ModelCatalogSuppress
     if (!isRecord(entry)) {
       continue;
     }
-    const provider = normalizeOptionalString(entry.provider) ?? "";
+    const provider = normalizeModelCatalogProviderId(normalizeOptionalString(entry.provider) ?? "");
     const model = normalizeOptionalString(entry.model) ?? "";
     if (!provider || !model) {
       continue;
@@ -368,7 +379,7 @@ function normalizeModelCatalogDiscovery(
   }
   const discovery: Record<string, ModelCatalogDiscovery> = {};
   for (const [rawProviderId, rawMode] of Object.entries(value)) {
-    const providerId = normalizeSafeRecordKey(rawProviderId);
+    const providerId = normalizeModelCatalogProviderId(rawProviderId);
     const mode = normalizeOptionalString(rawMode) ?? "";
     if (providerId && ownedProviders.has(providerId) && MODEL_CATALOG_DISCOVERY_MODES.has(mode)) {
       discovery[providerId] = mode as ModelCatalogDiscovery;
@@ -384,10 +395,11 @@ export function normalizeModelCatalog(
   if (!isRecord(value)) {
     return undefined;
   }
-  const providers = normalizeModelCatalogProviders(value.providers, params.ownedProviders);
-  const aliases = normalizeModelCatalogAliases(value.aliases, params.ownedProviders);
+  const ownedProviders = normalizeOwnedProviderSet(params.ownedProviders);
+  const providers = normalizeModelCatalogProviders(value.providers, ownedProviders);
+  const aliases = normalizeModelCatalogAliases(value.aliases, ownedProviders);
   const suppressions = normalizeModelCatalogSuppressions(value.suppressions);
-  const discovery = normalizeModelCatalogDiscovery(value.discovery, params.ownedProviders);
+  const discovery = normalizeModelCatalogDiscovery(value.discovery, ownedProviders);
   const catalog = {
     ...(providers ? { providers } : {}),
     ...(aliases ? { aliases } : {}),