fix(channels): keep contributed message-tool schema properties optional (#91137)

lundog · web-flow · commit 7404b2b5b4cb · 2026-06-13T19:39:01.000+08:00
Co-authored-by: Lundog &lt;jeremy.lundy@lifebeacon.com&gt;
diff --git a/src/channels/plugins/message-action-discovery.ts b/src/channels/plugins/message-action-discovery.ts
@@ -5,7 +5,7 @@
  */
 import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";
 import { uniqueStrings } from "@openclaw/normalization-core/string-normalization";
-import type { TSchema } from "typebox";
+import { Type, type TSchema } from "typebox";
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import { formatErrorMessage } from "../../infra/errors.js";
 import { defaultRuntime } from "../../runtime.js";
@@ -361,9 +361,14 @@ function mergeToolSchemaProperties(
     return;
   }
   for (const [name, schema] of Object.entries(source)) {
-    if (!(name in target)) {
-      target[name] = schema;
+    if (name in target) {
+      continue;
     }
+    // Message-tool params dispatch on `action`; no contributed property may be
+    // object-level required. Type.Object treats schemas missing typebox's
+    // non-enumerable `~optional` marker (plain JSON or cloned/serialized plugin
+    // schemas) as required, which fails validation for every message call.
+    target[name] = Type.IsOptional(schema) ? schema : Type.Optional(schema);
   }
 }
 
diff --git a/src/channels/plugins/message-actions.test.ts b/src/channels/plugins/message-actions.test.ts
@@ -194,6 +194,48 @@ describe("message action capability checks", () => {
     ).toHaveProperty("components");
   });
 
+  it("keeps contributed schema properties optional so only action stays required", () => {
+    const contributingPlugin: ChannelPlugin = {
+      ...createChannelTestPluginBase({
+        id: "demo-contrib",
+        label: "Demo Contrib",
+        capabilities: { chatTypes: ["direct", "group"] },
+        config: {
+          listAccountIds: () => ["default"],
+        },
+      }),
+      actions: {
+        describeMessageTool: () => ({
+          actions: ["send"],
+          schema: {
+            properties: {
+              // Non-optional TypeBox schema: plugin forgot Type.Optional.
+              components: Type.Array(Type.String()),
+              // Cloning strips typebox's non-enumerable `~optional` marker;
+              // mirrors serialized/external plugin contributions.
+              chatRef: structuredClone(Type.Optional(Type.String())),
+              media: Type.Optional(Type.String()),
+            },
+          },
+        }),
+      },
+    };
+    setActivePluginRegistry(
+      createTestRegistry([
+        { pluginId: "demo-contrib", source: "test", plugin: contributingPlugin },
+      ]),
+    );
+
+    const properties = resolveChannelMessageToolSchemaProperties({
+      cfg: {} as OpenClawConfig,
+      channel: "demo-contrib",
+    });
+    // Regression: required leakage made every message tool call fail validation
+    // with "must have required properties chatRef, media, ...".
+    const toolSchema = Type.Object({ action: Type.String(), ...properties });
+    expect(toolSchema.required).toEqual(["action"]);
+  });
+
   it("filters only actions that depend on current-channel-only schema", () => {
     const scopedSchemaPlugin: ChannelPlugin = {
       ...createChannelTestPluginBase({

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`*/`
`6`	`6`	`import { normalizeOptionalString } from "@openclaw/normalization-core/string-coerce";`
`7`	`7`	`import { uniqueStrings } from "@openclaw/normalization-core/string-normalization";`
`8`		`-import type { TSchema } from "typebox";`
	`8`	`+import { Type, type TSchema } from "typebox";`
`9`	`9`	`import type { OpenClawConfig } from "../../config/types.openclaw.js";`
`10`	`10`	`import { formatErrorMessage } from "../../infra/errors.js";`
`11`	`11`	`import { defaultRuntime } from "../../runtime.js";`
`@@ -361,9 +361,14 @@ function mergeToolSchemaProperties(`
`361`	`361`	`return;`
`362`	`362`	`}`
`363`	`363`	`for (const [name, schema] of Object.entries(source)) {`
`364`		`- if (!(name in target)) {`
`365`		`- target[name] = schema;`
	`364`	`+ if (name in target) {`
	`365`	`+ continue;`
`366`	`366`	`}`
	`367`	+ // Message-tool params dispatch on `action`; no contributed property may be
	`368`	`+ // object-level required. Type.Object treats schemas missing typebox's`
	`369`	+ // non-enumerable `~optional` marker (plain JSON or cloned/serialized plugin
	`370`	`+ // schemas) as required, which fails validation for every message call.`
	`371`	`+ target[name] = Type.IsOptional(schema) ? schema : Type.Optional(schema);`
`367`	`372`	`}`
`368`	`373`	`}`
`369`	`374`