fix(agents): preserve non-null schema unions

vincentkoc · vincentkoc · commit 8aeaadf963a3 · 2026-06-01T07:24:27.000+02:00
diff --git a/src/agents/tool-schema-projection.test.ts b/src/agents/tool-schema-projection.test.ts
@@ -135,10 +135,10 @@ describe("runtime tool input schema projection", () => {
           enum: ["last"],
         },
         flexibleId: {
-          type: "string",
+          anyOf: [{ type: "string", const: "last" }, { type: "string" }],
         },
         threadId: {
-          type: "string",
+          anyOf: [{ type: "string" }, { type: "number" }],
           description: "Thread/topic id",
         },
       },
@@ -158,6 +158,7 @@ describe("runtime tool input schema projection", () => {
     expect(projectRuntimeToolInputSchema(hiddenByProjection.parameters)).toEqual({
       schema: {
         type: "object",
+        anyOf: [{ $dynamicRef: "#target" }, { type: "string" }],
         properties: {},
       },
       violations: ["parameters.anyOf[0].$dynamicRef"],
diff --git a/src/agents/tool-schema-projection.ts b/src/agents/tool-schema-projection.ts
@@ -190,11 +190,14 @@ function normalizeSchemaComposition(
   if (hasNullVariant && nonNullVariants.length === 1 && isJsonObject(nonNullVariants[0])) {
     return mergeCompositionWrapper(schema, nonNullVariants[0], keyword);
   }
-  const stringVariant = nonNullVariants.find(
-    (variant) => isJsonObject(variant) && variant.type === "string" && !("const" in variant),
-  );
-  if (stringVariant !== undefined && isJsonObject(stringVariant)) {
-    return mergeCompositionWrapper(schema, stringVariant, keyword);
+  if (hasNullVariant) {
+    return mergeCompositionWrapper(
+      schema,
+      {
+        [keyword]: nonNullVariants,
+      },
+      keyword,
+    );
   }
   return undefined;
 }
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.discord-group.json b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.discord-group.json
@@ -232,8 +232,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target",
@@ -454,8 +461,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target, or null to clear",
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.heartbeat-turn.json b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.heartbeat-turn.json
@@ -232,8 +232,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target",
@@ -454,8 +461,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target, or null to clear",
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.telegram-direct.json b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/codex-dynamic-tools.telegram-direct.json
@@ -232,8 +232,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target",
@@ -454,8 +461,15 @@
                   "type": "string"
                 },
                 "threadId": {
-                  "description": "Thread/topic id",
-                  "type": "string"
+                  "anyOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "number"
+                    }
+                  ],
+                  "description": "Thread/topic id"
                 },
                 "to": {
                   "description": "Delivery target, or null to clear",
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/discord-group-codex-message-tool.md b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/discord-group-codex-message-tool.md
@@ -223,8 +223,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 0
   },
   "dynamicToolsJson": {
-    "chars": 40904,
-    "roughTokens": 10226
+    "chars": 41266,
+    "roughTokens": 10317
   },
   "openClawDeveloperInstructions": {
     "chars": 2988,
@@ -235,8 +235,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 6925
   },
   "totalWithDynamicToolsJson": {
-    "chars": 68606,
-    "roughTokens": 17152
+    "chars": 68968,
+    "roughTokens": 17242
   },
   "userInputText": {
     "chars": 1629,
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/telegram-direct-codex-message-tool.md b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/telegram-direct-codex-message-tool.md
@@ -223,8 +223,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 0
   },
   "dynamicToolsJson": {
-    "chars": 40625,
-    "roughTokens": 10157
+    "chars": 40987,
+    "roughTokens": 10247
   },
   "openClawDeveloperInstructions": {
     "chars": 1964,
@@ -235,8 +235,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 6544
   },
   "totalWithDynamicToolsJson": {
-    "chars": 66803,
-    "roughTokens": 16701
+    "chars": 67165,
+    "roughTokens": 16792
   },
   "userInputText": {
     "chars": 1129,
diff --git a/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/telegram-heartbeat-codex-tool.md b/test/fixtures/agents/prompt-snapshots/codex-runtime-happy-path/telegram-heartbeat-codex-tool.md
@@ -224,8 +224,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 0
   },
   "dynamicToolsJson": {
-    "chars": 41720,
-    "roughTokens": 10430
+    "chars": 42082,
+    "roughTokens": 10521
   },
   "openClawDeveloperInstructions": {
     "chars": 1983,
@@ -236,8 +236,8 @@ This is the deterministic model-bound layer stack OpenClaw can snapshot for the
     "roughTokens": 6780
   },
   "totalWithDynamicToolsJson": {
-    "chars": 68841,
-    "roughTokens": 17211
+    "chars": 69203,
+    "roughTokens": 17301
   },
   "userInputText": {
     "chars": 1367,
