fix(config): allow thinkingLevelMap in persisted model schema

wsyjh8 · wsyjh8 · commit 60fb8c6bdc7c · 2026-06-06T19:58:29.000-04:00
The persisted zod ModelDefinitionSchema (src/config/zod-schema.core.ts) was strict and had no thinkingLevelMap key, while the rest of the contract already carried it: the TS type (ModelDefinitionConfig.thinkingLevelMap in types.models.ts), the runtime TypeBox schema (ThinkingLevelMapSchema in agents/sessions/model-registry.ts), and the foundry writer (buildFoundryThinkingLevelMap, 7 keys: off/minimal/low/medium/high/xhigh/max). On Microsoft Foundry Entra ID onboarding the writer's persisted model entry hit the strict schema, validation failed with Unrecognized key "thinkingLevelMap", and updateConfig atomically rolled the whole write back, so onboarding never completed. This is schema drift, not an illegal field. Fix: add an optional thinkingLevelMap to the zod ModelDefinitionSchema, mirroring the TypeBox key set 1:1 (string | null values) and keeping .strict(). The writer and normalizeResolvedModel are unchanged. docs/.generated/config-baseline.sha256 is a derived artifact of this schema change, regenerated via `pnpm config:docs:gen` (config:docs:check now passes); it was not hand-edited. Closes #91011
diff --git a/docs/.generated/config-baseline.sha256 b/docs/.generated/config-baseline.sha256
@@ -1,4 +1,4 @@
-60c0700719fd2fe3f7cec4c35da10227b681d87ed1a3876ef830eb6bd80d43f2  config-baseline.json
-2ed21fa4a416ac2cec55eb2b6d1b11859aa04b40bd78c6ed9f3eb45b7240261c  config-baseline.core.json
+a5a97a8b484acd13e68604037c8d8f448699700103c6ea2186f5914ad35a0623  config-baseline.json
+b0d668dbd794d2f54738152a4bcfd2a306c7954901e78d4dfbde7545a8301ce5  config-baseline.core.json
 0637c9bdcb9517f56049dd786563366877458d35df575328a6b80a890c8bc915  config-baseline.channel.json
-e6a1d6f51f0d9c04bd92d51deebfaca8c7917dd28d7998d225c0074e0a095348  config-baseline.plugin.json
+f9d1f50bfa8403891e76cd99dc1357cdece4a71e8ae18a39b190c2a14e6f97b0  config-baseline.plugin.json
diff --git a/extensions/microsoft-foundry/index.test.ts b/extensions/microsoft-foundry/index.test.ts
@@ -823,6 +823,38 @@ describe("microsoft-foundry plugin", () => {
     expect(provider?.models[0]?.compat?.maxTokensField).toBe("max_completion_tokens");
   });
 
+  it("emits only persisted-schema thinkingLevelMap level keys for Entra ID reasoning onboarding (openclaw#91011)", () => {
+    // The persisted ModelDefinitionSchema only accepts these ModelThinkingLevel keys; if the writer
+    // emits one outside the set, updateConfig rolls the Entra ID onboarding write back.
+    const allowedThinkingLevels = new Set([
+      "off",
+      "minimal",
+      "low",
+      "medium",
+      "high",
+      "xhigh",
+      "max",
+    ]);
+
+    const result = buildFoundryAuthResult({
+      profileId: "microsoft-foundry:entra",
+      apiKey: "__entra_id_dynamic__",
+      endpoint: "https://example.services.ai.azure.com",
+      modelId: "gpt-5.1-chat",
+      modelNameHint: "gpt-5.1-chat",
+      api: "openai-responses",
+      authMethod: "entra-id",
+    });
+
+    const thinkingLevelMap =
+      result.configPatch?.models?.providers?.["microsoft-foundry"]?.models[0]?.thinkingLevelMap;
+    expect(thinkingLevelMap).toBeDefined();
+    for (const [level, value] of Object.entries(thinkingLevelMap ?? {})) {
+      expect(allowedThinkingLevels.has(level)).toBe(true);
+      expect(value === null || typeof value === "string").toBe(true);
+    }
+  });
+
   it("records model-name reasoning effort limits for Foundry deployment aliases", () => {
     const result = buildFoundryAuthResult({
       profileId: "microsoft-foundry:default",
diff --git a/src/config/config.schema-regressions.test.ts b/src/config/config.schema-regressions.test.ts
@@ -488,4 +488,57 @@ describe("config schema regressions", () => {
 
     expect(res.ok).toBe(true);
   });
+
+  it("accepts a microsoft-foundry model entry carrying thinkingLevelMap (openclaw#91011)", () => {
+    // Foundry's writer (buildFoundryThinkingLevelMap) persists this during Entra ID onboarding; the
+    // strict schema used to reject thinkingLevelMap, so updateConfig rolled the whole write back.
+    const res = validateConfigObject({
+      models: {
+        providers: {
+          "microsoft-foundry": {
+            models: [
+              {
+                id: "gpt-5.1-chat",
+                name: "gpt-5.1-chat",
+                api: "openai-responses",
+                reasoning: true,
+                thinkingLevelMap: {
+                  off: "none",
+                  minimal: null,
+                  low: "low",
+                  medium: "medium",
+                  high: "high",
+                  xhigh: null,
+                  max: null,
+                },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("rejects thinkingLevelMap keys outside the model thinking levels", () => {
+    // "adaptive" is a valid agent thinkingDefault but not a ModelThinkingLevel; the map stays strict.
+    const res = validateConfigObject({
+      models: {
+        providers: {
+          "microsoft-foundry": {
+            models: [
+              {
+                id: "gpt-5.1-chat",
+                name: "gpt-5.1-chat",
+                thinkingLevelMap: { adaptive: "high" },
+              },
+            ],
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(false);
+  });
 });
diff --git a/src/config/zod-schema.core.ts b/src/config/zod-schema.core.ts
@@ -347,6 +347,21 @@ const ModelMediaInputSchema = z
   })
   .strict();
 
+// Mirrors the runtime ThinkingLevelMap contract (model-registry TypeBox schema). Persisted model
+// entries carry thinkingLevelMap, so the strict config schema must accept it or updateConfig rolls back.
+const ThinkingLevelMapValueSchema = z.string().nullable();
+const ThinkingLevelMapSchema = z
+  .object({
+    off: ThinkingLevelMapValueSchema.optional(),
+    minimal: ThinkingLevelMapValueSchema.optional(),
+    low: ThinkingLevelMapValueSchema.optional(),
+    medium: ThinkingLevelMapValueSchema.optional(),
+    high: ThinkingLevelMapValueSchema.optional(),
+    xhigh: ThinkingLevelMapValueSchema.optional(),
+    max: ThinkingLevelMapValueSchema.optional(),
+  })
+  .strict();
+
 const ModelDefinitionSchema = z
   .object({
     id: z.string().min(1),
@@ -384,6 +399,7 @@ const ModelDefinitionSchema = z
     contextWindow: z.number().positive().optional(),
     contextTokens: z.number().int().positive().optional(),
     maxTokens: z.number().positive().optional(),
+    thinkingLevelMap: ThinkingLevelMapSchema.optional(),
     params: z.record(z.string(), z.unknown()).optional(),
     agentRuntime: ModelAgentRuntimePolicySchema,
     headers: z.record(z.string(), z.string()).optional(),
