fix(config): accept matrix queue overrides

Benjamin Badejo · Benjamin Badejo · commit 56c4fe07d5bf · 2026-05-09T18:33:05.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ Docs: https://docs.openclaw.ai
 
 ### Fixes
 
+- Matrix/config: accept `messages.queue.byChannel.matrix` queue overrides and keep queue provider schema/type keys aligned for Matrix, Google Chat, and Mattermost. Thanks @bdjben.
 - Feishu: auto-thread `message(action="send")` replies inside the topic when the active session is group_topic or group_topic_sender, and propagate `replyInThread` through text, card, and media outbound adapters so topic-scoped sessions no longer post at the group root. Fixes #74903. (#77151) Thanks @ai-hpc.
 
 ## 2026.5.9
diff --git a/src/config/config.schema-regressions.test.ts b/src/config/config.schema-regressions.test.ts
@@ -171,6 +171,65 @@ describe("config schema regressions", () => {
 
     expect(res.ok).toBe(true);
   });
+
+  it("accepts Matrix queue byChannel overrides", () => {
+    const res = validateConfigObject({
+      messages: {
+        queue: {
+          byChannel: {
+            matrix: "steer",
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("accepts Matrix interrupt queue byChannel overrides", () => {
+    const res = validateConfigObject({
+      messages: {
+        queue: {
+          byChannel: {
+            matrix: "interrupt",
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("keeps queue byChannel schema and config type providers aligned", () => {
+    const res = validateConfigObject({
+      messages: {
+        queue: {
+          byChannel: {
+            googlechat: "queue",
+            mattermost: "queue",
+            matrix: "queue",
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("rejects unknown queue byChannel providers", () => {
+    const res = validateConfigObject({
+      messages: {
+        queue: {
+          byChannel: {
+            unknown: "queue",
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(false);
+  });
+
   it("accepts string values for agents defaults model inputs", () => {
     const res = validateConfigObject({
       agents: {
diff --git a/src/config/schema.test.ts b/src/config/schema.test.ts
@@ -500,6 +500,13 @@ describe("config schema", () => {
     expect(schema?.properties).toBeUndefined();
   });
 
+  it("lists Matrix in messages.queue.byChannel schema lookup", () => {
+    const lookup = lookupConfigSchema(baseSchema, "messages.queue.byChannel");
+    expect(lookup?.path).toBe("messages.queue.byChannel");
+    expect(lookup?.children.map((child) => child.key)).toEqual(expect.arrayContaining(["matrix"]));
+    expect(lookup?.schema).toMatchObject({ additionalProperties: false });
+  });
+
   it("returns a shallow lookup schema without nested composition keywords", () => {
     const lookup = lookupConfigSchema(baseSchema, "agents.list.0.runtime");
     expect(lookup?.path).toBe("agents.list.0.runtime");
diff --git a/src/config/types.queue.ts b/src/config/types.queue.ts
@@ -15,8 +15,10 @@ export type QueueModeByProvider = {
   irc?: QueueMode;
   googlechat?: QueueMode;
   slack?: QueueMode;
+  mattermost?: QueueMode;
   signal?: QueueMode;
   imessage?: QueueMode;
   msteams?: QueueMode;
   webchat?: QueueMode;
+  matrix?: QueueMode;
 };
diff --git a/src/config/zod-schema.core.ts b/src/config/zod-schema.core.ts
@@ -727,12 +727,14 @@ const QueueModeBySurfaceSchema = z
     telegram: QueueModeSchema.optional(),
     discord: QueueModeSchema.optional(),
     irc: QueueModeSchema.optional(),
+    googlechat: QueueModeSchema.optional(),
     slack: QueueModeSchema.optional(),
     mattermost: QueueModeSchema.optional(),
     signal: QueueModeSchema.optional(),
     imessage: QueueModeSchema.optional(),
     msteams: QueueModeSchema.optional(),
     webchat: QueueModeSchema.optional(),
+    matrix: QueueModeSchema.optional(),
   })
   .strict()
   .optional();
