fix(azure): preserve equals in deployment maps

steipete · steipete · commit f212176e9164 · 2026-05-29T02:03:03.000-04:00
diff --git a/src/agents/openai-transport-stream.ts b/src/agents/openai-transport-stream.ts
@@ -15,6 +15,7 @@ import type {
 import type { ModelCompatConfig } from "../config/types.models.js";
 import { getEnvApiKey } from "../llm/env-api-keys.js";
 import { calculateCost } from "../llm/model-utils.js";
+import { resolveAzureDeploymentNameFromMap } from "../llm/providers/azure-deployment-map.js";
 import { convertMessages } from "../llm/providers/openai-completions.js";
 import { clampOpenAIPromptCacheKey } from "../llm/providers/openai-prompt-cache.js";
 import type { Api, Context, Model } from "../llm/types.js";
@@ -2269,16 +2270,10 @@ function normalizeAzureBaseUrl(baseUrl: string): string {
 }
 
 function resolveAzureDeploymentName(model: Model): string {
-  const deploymentMap = process.env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP;
-  if (deploymentMap) {
-    for (const entry of deploymentMap.split(",")) {
-      const [modelId, deploymentName] = entry.split("=", 2).map((value) => value?.trim());
-      if (modelId === model.id && deploymentName) {
-        return deploymentName;
-      }
-    }
-  }
-  return model.id;
+  return resolveAzureDeploymentNameFromMap({
+    modelId: model.id,
+    deploymentMap: process.env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP,
+  });
 }
 
 function createAzureOpenAIClient(
diff --git a/src/llm/providers/azure-deployment-map.test.ts b/src/llm/providers/azure-deployment-map.test.ts
@@ -0,0 +1,29 @@
+import { describe, expect, it } from "vitest";
+import {
+  parseAzureDeploymentNameMap,
+  resolveAzureDeploymentNameFromMap,
+} from "./azure-deployment-map.js";
+
+describe("Azure deployment name map", () => {
+  it("preserves equals signs inside deployment names", () => {
+    const map = parseAzureDeploymentNameMap("gpt-5=deployment=blue, ignored, gpt-4 = prod = east ");
+
+    expect(map.get("gpt-5")).toBe("deployment=blue");
+    expect(map.get("gpt-4")).toBe("prod = east");
+    expect(
+      resolveAzureDeploymentNameFromMap({
+        modelId: "gpt-5",
+        deploymentMap: "gpt-5=deployment=blue",
+      }),
+    ).toBe("deployment=blue");
+  });
+
+  it("falls back to the model id when the map has no usable entry", () => {
+    expect(
+      resolveAzureDeploymentNameFromMap({
+        modelId: "gpt-5",
+        deploymentMap: "other=deployment,missing-value=",
+      }),
+    ).toBe("gpt-5");
+  });
+});
diff --git a/src/llm/providers/azure-deployment-map.ts b/src/llm/providers/azure-deployment-map.ts
@@ -0,0 +1,30 @@
+export function parseAzureDeploymentNameMap(value: string | undefined): Map<string, string> {
+  const map = new Map<string, string>();
+  if (!value) {
+    return map;
+  }
+  for (const entry of value.split(",")) {
+    const trimmed = entry.trim();
+    if (!trimmed) {
+      continue;
+    }
+    const separator = trimmed.indexOf("=");
+    if (separator <= 0) {
+      continue;
+    }
+    const modelId = trimmed.slice(0, separator).trim();
+    const deploymentName = trimmed.slice(separator + 1).trim();
+    if (!modelId || !deploymentName) {
+      continue;
+    }
+    map.set(modelId, deploymentName);
+  }
+  return map;
+}
+
+export function resolveAzureDeploymentNameFromMap(params: {
+  modelId: string;
+  deploymentMap?: string;
+}): string {
+  return parseAzureDeploymentNameMap(params.deploymentMap).get(params.modelId) || params.modelId;
+}
diff --git a/src/llm/providers/azure-openai-responses.ts b/src/llm/providers/azure-openai-responses.ts
@@ -13,6 +13,7 @@ import type {
 } from "../types.js";
 import { AssistantMessageEventStream } from "../utils/event-stream.js";
 import { headersToRecord } from "../utils/headers.js";
+import { resolveAzureDeploymentNameFromMap } from "./azure-deployment-map.js";
 import { clampOpenAIPromptCacheKey } from "./openai-prompt-cache.js";
 import {
   convertResponsesMessages,
@@ -29,36 +30,17 @@ const AZURE_TOOL_CALL_PROVIDERS = new Set([
   "azure-openai-responses",
 ]);
 
-function parseDeploymentNameMap(value: string | undefined): Map<string, string> {
-  const map = new Map<string, string>();
-  if (!value) {
-    return map;
-  }
-  for (const entry of value.split(",")) {
-    const trimmed = entry.trim();
-    if (!trimmed) {
-      continue;
-    }
-    const [modelId, deploymentName] = trimmed.split("=", 2);
-    if (!modelId || !deploymentName) {
-      continue;
-    }
-    map.set(modelId.trim(), deploymentName.trim());
-  }
-  return map;
-}
-
 function resolveDeploymentName(
   model: Model<"azure-openai-responses">,
   options?: AzureOpenAIResponsesOptions,
 ): string {
   if (options?.azureDeploymentName) {
     return options.azureDeploymentName;
   }
-  const mappedDeployment = parseDeploymentNameMap(process.env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP).get(
-    model.id,
-  );
-  return mappedDeployment || model.id;
+  return resolveAzureDeploymentNameFromMap({
+    modelId: model.id,
+    deploymentMap: process.env.AZURE_OPENAI_DEPLOYMENT_NAME_MAP,
+  });
 }
 
 function formatAzureOpenAIError(error: unknown): string {
