fix(sessions): derive channel from direct-chat session keys in send-policy (#92022)

hansraj316 · web-flow · commit a4a4c766170a · 2026-06-11T08:28:21.000+09:00
deriveChannelFromKey returned undefined for direct/dm keys, so channel-scoped
send rules never fired for direct chats. Treat parts[0] as the channel for
direct/dm keys too, matching deriveChatTypeFromKey.
diff --git a/src/sessions/send-policy.test.ts b/src/sessions/send-policy.test.ts
@@ -67,6 +67,12 @@ describe("resolveSendPolicy", () => {
       sessionKey: "agent:main:other-channel:group:dev",
       expected: "allow",
     },
+    {
+      name: "channel-scoped deny fires for direct session key without explicit channel field",
+      cfg: cfgWithRules([{ action: "deny", match: { channel: "demo-channel" } }]),
+      sessionKey: "demo-channel:direct:user-1",
+      expected: "deny",
+    },
   ])("$name", ({ cfg, entry, sessionKey, expected }) => {
     expect(resolveSendPolicy({ cfg, entry, sessionKey })).toBe(expected);
   });
diff --git a/src/sessions/send-policy.ts b/src/sessions/send-policy.ts
@@ -46,7 +46,12 @@ function deriveChannelFromKey(key?: string) {
     return undefined;
   }
   const parts = normalizedKey.split(":").filter(Boolean);
-  if (parts.length >= 3 && (parts[1] === "group" || parts[1] === "channel")) {
+  // Canonical key layout is <channel>:<peerKind>:<peerId>; parts[0] is the channel
+  // for direct/dm peers too, so channel-scoped rules also fire for direct chats.
+  if (
+    parts.length >= 3 &&
+    (parts[1] === "group" || parts[1] === "channel" || parts[1] === "direct" || parts[1] === "dm")
+  ) {
     return normalizeMatchValue(parts[0]);
   }
   return undefined;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,12 @@ function deriveChannelFromKey(key?: string) {`
`46`	`46`	`return undefined;`
`47`	`47`	`}`
`48`	`48`	`const parts = normalizedKey.split(":").filter(Boolean);`
`49`		`- if (parts.length >= 3 && (parts[1] === "group" \|\| parts[1] === "channel")) {`
	`49`	`+ // Canonical key layout is <channel>:<peerKind>:<peerId>; parts[0] is the channel`
	`50`	`+ // for direct/dm peers too, so channel-scoped rules also fire for direct chats.`
	`51`	`+ if (`
	`52`	`+ parts.length >= 3 &&`
	`53`	`+ (parts[1] === "group" \|\| parts[1] === "channel" \|\| parts[1] === "direct" \|\| parts[1] === "dm")`
	`54`	`+ ) {`
`50`	`55`	`return normalizeMatchValue(parts[0]);`
`51`	`56`	`}`
`52`	`57`	`return undefined;`