From 975629ca0ad3a53f6c3e1643e3116e97fac27d10 Mon Sep 17 00:00:00 2001
From: Alex Zaytsev <alexvzay@gmail.com>
Date: Thu, 26 Feb 2026 00:01:06 -0500
Subject: [PATCH] fix(signal): add groups schema support for Signal channel

---
 src/config/types.signal.ts                  |  9 +++
 src/config/zod-schema.providers-core.ts     | 11 ++++
 src/config/zod-schema.signal-groups.test.ts | 65 +++++++++++++++++++++
 3 files changed, 85 insertions(+)
 create mode 100644 src/config/zod-schema.signal-groups.test.ts

diff --git a/src/config/types.signal.ts b/src/config/types.signal.ts
index 1f3d5180b92..bd33a64cf51 100644
--- a/src/config/types.signal.ts
+++ b/src/config/types.signal.ts
@@ -1,8 +1,15 @@
 import type { CommonChannelMessagingConfig } from "./types.channel-messaging-common.js";
+import type { GroupToolPolicyBySenderConfig, GroupToolPolicyConfig } from "./types.tools.js";
 
 export type SignalReactionNotificationMode = "off" | "own" | "all" | "allowlist";
 export type SignalReactionLevel = "off" | "ack" | "minimal" | "extensive";
 
+export type SignalGroupConfig = {
+  requireMention?: boolean;
+  tools?: GroupToolPolicyConfig;
+  toolsBySender?: GroupToolPolicyBySenderConfig;
+};
+
 export type SignalAccountConfig = CommonChannelMessagingConfig & {
   /** Optional explicit E.164 account for signal-cli. */
   account?: string;
@@ -24,6 +31,8 @@ export type SignalAccountConfig = CommonChannelMessagingConfig & {
   ignoreAttachments?: boolean;
   ignoreStories?: boolean;
   sendReadReceipts?: boolean;
+  /** Per-group overrides keyed by Signal group id (or "*"). */
+  groups?: Record<string, SignalGroupConfig>;
   /** Outbound text chunk size (chars). Default: 4000. */
   textChunkLimit?: number;
   /** Reaction notification mode (off|own|all|allowlist). Default: own. */
diff --git a/src/config/zod-schema.providers-core.ts b/src/config/zod-schema.providers-core.ts
index 2b2fccee310..47f76614dd8 100644
--- a/src/config/zod-schema.providers-core.ts
+++ b/src/config/zod-schema.providers-core.ts
@@ -971,6 +971,16 @@ export const SlackConfigSchema = SlackAccountSchema.safeExtend({
   validateSlackSigningSecretRequirements(value, ctx);
 });
 
+const SignalGroupEntrySchema = z
+  .object({
+    requireMention: z.boolean().optional(),
+    tools: ToolPolicySchema,
+    toolsBySender: ToolPolicyBySenderSchema,
+  })
+  .strict();
+
+const SignalGroupsSchema = z.record(z.string(), SignalGroupEntrySchema.optional()).optional();
+
 export const SignalAccountSchemaBase = z
   .object({
     name: z.string().optional(),
@@ -995,6 +1005,7 @@ export const SignalAccountSchemaBase = z
     defaultTo: z.string().optional(),
     groupAllowFrom: z.array(z.union([z.string(), z.number()])).optional(),
     groupPolicy: GroupPolicySchema.optional().default("allowlist"),
+    groups: SignalGroupsSchema,
     historyLimit: z.number().int().min(0).optional(),
     dmHistoryLimit: z.number().int().min(0).optional(),
     dms: z.record(z.string(), DmConfigSchema.optional()).optional(),
diff --git a/src/config/zod-schema.signal-groups.test.ts b/src/config/zod-schema.signal-groups.test.ts
new file mode 100644
index 00000000000..2dcd1ac0676
--- /dev/null
+++ b/src/config/zod-schema.signal-groups.test.ts
@@ -0,0 +1,65 @@
+import { describe, expect, it } from "vitest";
+import { validateConfigObject } from "./config.js";
+
+describe("signal groups schema", () => {
+  it("accepts top-level Signal groups overrides", () => {
+    const res = validateConfigObject({
+      channels: {
+        signal: {
+          groups: {
+            "*": {
+              requireMention: false,
+            },
+            "+1234567890": {
+              requireMention: true,
+            },
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("accepts per-account Signal groups overrides", () => {
+    const res = validateConfigObject({
+      channels: {
+        signal: {
+          accounts: {
+            primary: {
+              groups: {
+                "*": {
+                  requireMention: false,
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(true);
+  });
+
+  it("rejects unknown keys in Signal groups entries", () => {
+    const res = validateConfigObject({
+      channels: {
+        signal: {
+          groups: {
+            "*": {
+              requireMention: false,
+              nope: true,
+            },
+          },
+        },
+      },
+    });
+
+    expect(res.ok).toBe(false);
+    if (!res.ok) {
+      expect(res.issues.some((issue) => issue.path.startsWith("channels.signal.groups"))).toBe(
+        true,
+      );
+    }
+  });
+});