fix(microsoft-foundry): use shared filter for picker and persisted catalog

ottodeng · ottodeng · commit dfa3a053dab8 · 2026-05-02T11:15:50.000+08:00
Address PR review feedback: `selectFoundryDeployment` derived a local
`supported` list to drive the picker but the persistence path in
auth.ts still mapped the raw `resourceDeployments` into
`discoveredDeployments`, so mixed GPT+Claude resources hid Claude in
the picker yet still wrote it into the saved provider catalog as a
`microsoft-foundry/&lt;deployment&gt;` model that routes through /openai/v1.

- Add `partitionFoundryDeployments` in shared.ts as the single source
  of truth for filtering.
- `selectFoundryDeployment` now returns `{ selected, supported }` so
  callers can persist the same supported list the picker showed.
- `auth.ts` uses the supported list when building
  `discoveredDeployments`, keeping the picker and catalog in sync.
diff --git a/extensions/microsoft-foundry/auth.ts b/extensions/microsoft-foundry/auth.ts
@@ -121,12 +121,13 @@ export const entraIdAuthMethod: ProviderAuthMethod = {
       if (useDiscoveredResource) {
         const selectedResource = await selectFoundryResource(ctx, selectedSub);
         const resourceDeployments = listResourceDeployments(selectedResource, selectedSub.id);
-        const selectedDeployment = await selectFoundryDeployment(
-          ctx,
-          selectedResource,
-          resourceDeployments,
-        );
-        discoveredDeployments = resourceDeployments.map((deployment) =>
+        const { selected: selectedDeployment, supported: supportedDeployments } =
+          await selectFoundryDeployment(ctx, selectedResource, resourceDeployments);
+        // Persist only supported (non-Anthropic) deployments so the saved
+        // provider catalog matches what the picker offered.  Mixed
+        // resources previously leaked Claude deployments into the catalog
+        // even though they were filtered from the picker.  See #60546.
+        discoveredDeployments = supportedDeployments.map((deployment) =>
           Object.assign(
             { name: deployment.name },
             deployment.modelName ? { modelName: deployment.modelName } : {},
diff --git a/extensions/microsoft-foundry/onboard.ts b/extensions/microsoft-foundry/onboard.ts
@@ -25,7 +25,7 @@ import {
   requiresFoundryMaxCompletionTokens,
   DEFAULT_API,
   DEFAULT_GPT5_API,
-  isAnthropicFoundryDeployment,
+  partitionFoundryDeployments,
   usesFoundryResponsesByDefault,
 } from "./shared.js";
 
@@ -167,15 +167,15 @@ export async function selectFoundryDeployment(
   ctx: ProviderAuthContext,
   resource: FoundryResourceOption,
   deployments: AzDeploymentSummary[],
-): Promise<AzDeploymentSummary> {
+): Promise<{ selected: AzDeploymentSummary; supported: AzDeploymentSummary[] }> {
   // Filter out Anthropic (Claude) deployments — they require a different API
   // shape (/anthropic/v1/messages) that the built-in provider does not support
   // yet.  Use a custom provider pointed at the Anthropic Foundry endpoint
-  // instead.  See #60546.
-  const anthropicNames = deployments
-    .filter((d) => isAnthropicFoundryDeployment(d.modelName))
-    .map((d) => d.name);
-  const supported = deployments.filter((d) => !isAnthropicFoundryDeployment(d.modelName));
+  // instead.  See #60546.  The same `supported` list is reused by the caller
+  // when persisting the deployment catalog so unsupported entries never leak
+  // through into the saved provider config.
+  const { supported, anthropic } = partitionFoundryDeployments(deployments);
+  const anthropicNames = anthropic.map((d) => d.name);
   if (anthropicNames.length > 0) {
     await ctx.prompter.note(
       [
@@ -205,7 +205,7 @@ export async function selectFoundryDeployment(
   if (supported.length === 1) {
     const only = supported[0];
     await ctx.prompter.note(`Using deployment: ${only.name}`, "Model Deployment");
-    return only;
+    return { selected: only, supported };
   }
   const selectedDeploymentName = await ctx.prompter.select({
     message: "Select model deployment",
@@ -217,7 +217,9 @@ export async function selectFoundryDeployment(
         .join(" | "),
     })),
   });
-  return supported.find((deployment) => deployment.name === selectedDeploymentName) ?? supported[0];
+  const selected =
+    supported.find((deployment) => deployment.name === selectedDeploymentName) ?? supported[0];
+  return { selected, supported };
 }
 
 async function promptFoundryApi(
diff --git a/extensions/microsoft-foundry/shared.ts b/extensions/microsoft-foundry/shared.ts
@@ -134,6 +134,26 @@ export function isAnthropicFoundryDeployment(modelName?: string | null): boolean
   return normalized.startsWith("claude");
 }
 
+/**
+ * Split a list of Foundry deployments into ones supported by the built-in
+ * provider and Anthropic (Claude) deployments that require a custom provider.
+ * Single source of truth so the picker and the persisted catalog stay in sync.
+ */
+export function partitionFoundryDeployments<T extends { modelName?: string }>(
+  deployments: readonly T[],
+): { supported: T[]; anthropic: T[] } {
+  const supported: T[] = [];
+  const anthropic: T[] = [];
+  for (const deployment of deployments) {
+    if (isAnthropicFoundryDeployment(deployment.modelName)) {
+      anthropic.push(deployment);
+    } else {
+      supported.push(deployment);
+    }
+  }
+  return { supported, anthropic };
+}
+
 export function usesFoundryResponsesByDefault(value?: string | null): boolean {
   const normalized = normalizeFoundryModelName(value);
   if (!normalized) {
