fix(mattermost): key public channels as channel in directory listing

leonthe8th · leonthe8th · commit 7207b3f7d54b · 2026-07-06T16:14:39.000+08:00
listMattermostDirectoryGroups labeled every joined channel — public `O` and private `P` — as kind `group`. A name-resolved public channel could then be keyed as `mattermost:group:<id>` on outbound routing, forking a phantom group session and splitting the transcript from the inbound `channel:<id>` one. Derive the kind from the authoritative Mattermost channel type (`O` -> channel, `P`/`G` -> group) and add a regression test. This closes the public-channel regression path flagged in review for #95646 while keeping private channels keyed as `group`.
diff --git a/extensions/mattermost/src/mattermost/directory.test.ts b/extensions/mattermost/src/mattermost/directory.test.ts
@@ -85,6 +85,35 @@ describe("mattermost directory", () => {
     ).resolves.toEqual([{ kind: "group", id: "channel:chan-2", name: "ops", handle: "Ops" }]);
   });
 
+  it("labels public O channels as channel and private P channels as group (#95646)", async () => {
+    // A public `O` channel must NOT be keyed as `group`, otherwise a name-resolved
+    // public channel forks a phantom `group:<id>` session on outbound routing.
+    const client = {
+      token: "token-default",
+      request: vi.fn().mockResolvedValueOnce([
+        { id: "pub-1", type: "O", name: "general", display_name: "General" },
+        { id: "priv-1", type: "P", name: "secret", display_name: "Secret" },
+        { id: "dm-1", type: "D", name: "dm", display_name: "DM" },
+      ]),
+    };
+
+    listMattermostAccountIdsMock.mockReturnValue(["default"]);
+    resolveMattermostAccountMock.mockReturnValue({
+      enabled: true,
+      botToken: "token-default",
+      baseUrl: "https://chat.example.com",
+    });
+    createMattermostClientMock.mockReturnValueOnce(client);
+    fetchMattermostMeMock.mockResolvedValue({ id: "me-1" });
+
+    await expect(
+      listMattermostDirectoryGroups({ cfg: {} as never, runtime: {} as never }),
+    ).resolves.toEqual([
+      { kind: "channel", id: "channel:pub-1", name: "general", handle: "General" },
+      { kind: "group", id: "channel:priv-1", name: "secret", handle: "Secret" },
+    ]);
+  });
+
   it("uses the first healthy client for peers and filters self and blanks", async () => {
     const client = {
       token: "token-default",
diff --git a/extensions/mattermost/src/mattermost/directory.ts b/extensions/mattermost/src/mattermost/directory.ts
@@ -9,6 +9,7 @@ import {
   type MattermostClient,
   type MattermostUser,
 } from "./client.js";
+import { mapMattermostChannelTypeToChatType } from "./monitor-gating.js";
 import type { ChannelDirectoryEntry, OpenClawConfig, RuntimeEnv } from "./runtime-api.js";
 
 export type MattermostDirectoryParams = {
@@ -97,7 +98,15 @@ export async function listMattermostDirectoryGroups(
         }
         seenIds.add(ch.id);
         entries.push({
-          kind: "group" as const,
+          // Authoritative per-channel kind: a public `O` channel is a `channel`;
+          // only private `P` / group `G` map to `group`. Emitting a blanket
+          // `group` here mislabels public channels, so a name-resolved public
+          // channel would fork a phantom `group:<id>` session on outbound
+          // routing (#95646).
+          kind:
+            mapMattermostChannelTypeToChatType(ch.type) === "group"
+              ? ("group" as const)
+              : ("channel" as const),
           id: `channel:${ch.id}`,
           name: ch.name ?? undefined,
           handle: ch.display_name ?? undefined,
