refactor: consolidate discord thread context handling

src/discord/monitor.tool-result.test.ts

@@ -193,6 +193,95 @@ describe("discord tool result dispatch", () => {
     expect(fetchChannel).toHaveBeenCalledTimes(1);
   });
 
+  it("uses channel id allowlists for non-thread channels with categories", async () => {
+    const { createDiscordMessageHandler } = await import("./monitor.js");
+    let capturedCtx: { SessionKey?: string } | undefined;
+    dispatchMock.mockImplementationOnce(async ({ ctx, dispatcher }) => {
+      capturedCtx = ctx;
+      dispatcher.sendFinalReply({ text: "hi" });
+      return { queuedFinal: true, counts: { final: 1 } };
+    });
+
+    const cfg = {
+      agents: {
+        defaults: {
+          model: "anthropic/claude-opus-4-5",
+          workspace: "/tmp/clawd",
+        },
+      },
+      session: { store: "/tmp/clawdbot-sessions.json" },
+      discord: {
+        dm: { enabled: true, policy: "open" },
+        guilds: {
+          "*": {
+            requireMention: false,
+            channels: { c1: { allow: true } },
+          },
+        },
+      },
+      routing: { allowFrom: [] },
+    } as ReturnType<typeof import("../config/config.js").loadConfig>;
+
+    const handler = createDiscordMessageHandler({
+      cfg,
+      discordConfig: cfg.discord,
+      accountId: "default",
+      token: "token",
+      runtime: {
+        log: vi.fn(),
+        error: vi.fn(),
+        exit: (code: number): never => {
+          throw new Error(`exit ${code}`);
+        },
+      },
+      botUserId: "bot-id",
+      guildHistories: new Map(),
+      historyLimit: 0,
+      mediaMaxBytes: 10_000,
+      textLimit: 2000,
+      replyToMode: "off",
+      dmEnabled: true,
+      groupDmEnabled: false,
+      guildEntries: {
+        "*": { requireMention: false, channels: { c1: { allow: true } } },
+      },
+    });
+
+    const client = {
+      fetchChannel: vi.fn().mockResolvedValue({
+        type: ChannelType.GuildText,
+        name: "general",
+        parentId: "category-1",
+      }),
+      rest: { get: vi.fn() },
+    } as unknown as Client;
+
+    await handler(
+      {
+        message: {
+          id: "m-category",
+          content: "hello",
+          channelId: "c1",
+          timestamp: new Date().toISOString(),
+          type: MessageType.Default,
+          attachments: [],
+          embeds: [],
+          mentionedEveryone: false,
+          mentionedUsers: [],
+          mentionedRoles: [],
+          author: { id: "u1", bot: false, username: "Ada", tag: "Ada#1" },
+        },
+        author: { id: "u1", bot: false, username: "Ada", tag: "Ada#1" },
+        member: { displayName: "Ada" },
+        guild: { id: "g1", name: "Guild" },
+        guild_id: "g1",
+      },
+      client,
+    );
+
+    expect(capturedCtx?.SessionKey).toBe("agent:main:discord:channel:c1");
+  });
+
   it("replies with pairing code and sender id when dmPolicy is pairing", async () => {
     const { createDiscordMessageHandler } = await import("./monitor.js");
     const cfg = {