AI-added Matrix thread/reply context fetching skipped sender allowlists, letting blocked senders’ content appear in openclaw.

@@ -431,16 +432,65 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam         isThreadRoot: false, // @vector-im/matrix-bot-sdk doesn't have this info readily available       }); -      const route = core.channel.routing.resolveAgentRoute({+      const baseRoute = core.channel.routing.resolveAgentRoute({         cfg,         channel: "matrix",         peer: {           kind: isDirectMessage ? "direct" : "channel",           id: isDirectMessage ? senderId : roomId,         },       });++      const route = {+        ...baseRoute,+        sessionKey: threadRootId+          ? `${baseRoute.sessionKey}:thread:${threadRootId}`+          : baseRoute.sessionKey,+      };++      let threadStarterBody: string | undefined;+      let threadLabel: string | undefined;+      let parentSessionKey: string | undefined;++      if (threadRootId) {+        const existingSession = core.channel.session.readSessionUpdatedAt({+          storePath: core.channel.session.resolveStorePath(cfg.session?.store, {+            agentId: baseRoute.agentId,+          }),+          sessionKey: route.sessionKey,+        });++        if (existingSession === undefined) {+          try {+            const rootEvent = await fetchEventSummary(client, roomId, threadRootId);+            if (rootEvent?.body) {+              const rootSenderName = rootEvent.sender+                ? await getMemberDisplayName(roomId, rootEvent.sender)+                : undefined;++              threadStarterBody = core.channel.reply.formatAgentEnvelope({+                channel: "Matrix",+                from: rootSenderName ?? rootEvent.sender ?? "Unknown",+                timestamp: rootEvent.timestamp,+                envelope: core.channel.reply.resolveEnvelopeFormatOptions(cfg),+                body: rootEvent.body,+              });++              threadLabel = `Matrix thread in ${roomName ?? roomId}`;+              parentSessionKey = baseRoute.sessionKey;+            }+          } catch (err) {+            logVerboseMessage(+              `matrix: failed to fetch thread root ${threadRootId}: ${String(err)}`,+            );+          }+        }+      }+       const envelopeFrom = isDirectMessage ? senderName : (roomName ?? roomId);-      const textWithId = `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;+      const textWithId = threadRootId+        ? `${bodyText}\n[matrix event id: ${messageId} room: ${roomId} thread: ${threadRootId}]`+        : `${bodyText}\n[matrix event id: ${messageId} room: ${roomId}]`;       const storePath = core.channel.session.resolveStorePath(cfg.session?.store, {         agentId: route.agentId,       });@@ -467,7 +517,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam         To: `room:${roomId}`,         SessionKey: route.sessionKey,         AccountId: route.accountId,-        ChatType: isDirectMessage ? "direct" : "channel",+        ChatType: threadRootId ? "thread" : isDirectMessage ? "direct" : "channel",         ConversationLabel: envelopeFrom,         SenderName: senderName,         SenderId: senderId,@@ -490,6 +540,9 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam         CommandSource: "text" as const,         OriginatingChannel: "matrix" as const,         OriginatingTo: `room:${roomId}`,+        ThreadStarterBody: threadStarterBody,

+        getEvent: async () =>+          createMatrixTextMessageEvent({+            eventId: "$thread-root",+            sender: "@mallory:example.org",+            body: "Malicious root topic",+          }),+      },+      isDirectMessage: false,+      groupPolicy: "allowlist",+      groupAllowFrom: ["@alice:example.org"],+      roomsConfig: { "*": {} },+      getMemberDisplayName: async (_roomId, userId) =>+        userId === "@alice:example.org" ? "Alice" : "Mallory",+    });++    await handler(+      "!room:example.org",+      createMatrixTextMessageEvent({+        eventId: "$reply1",+        sender: "@alice:example.org",+        body: "@room follow up",+        relatesTo: {+          rel_type: "m.thread",+          event_id: "$thread-root",+          "m.in_reply_to": { event_id: "$thread-root" },+        },+        mentions: { room: true },+      }),+    );++    const finalized = vi.mocked(finalizeInboundContext).mock.calls.at(-1)?.[0] as {+      ReplyToBody?: string;+      ReplyToSender?: string;+      ThreadStarterBody?: string;+    };+    expect(finalized.ThreadStarterBody).toBeUndefined();+    expect(finalized.ReplyToBody).toBeUndefined();+    expect(finalized.ReplyToSender).toBeUndefined();+  });++  it("drops quoted reply context fetched from non-allowlisted room senders", async () => {+    const { handler, finalizeInboundContext } = createMatrixHandlerTestHarness({+      client: {+        getEvent: async () =>+          createMatrixTextMessageEvent({+            eventId: "$quoted",+            sender: "@mallory:example.org",+            body: "Quoted payload",+          }),+      },+      isDirectMessage: false,+      groupPolicy: "allowlist",+      groupAllowFrom: ["@alice:example.org"],+      roomsConfig: { "*": {} },+      replyToMode: "all",+      getMemberDisplayName: async (_roomId, userId) =>+        userId === "@alice:example.org" ? "Alice" : "Mallory",+    });++    await handler(+      "!room:example.org",+      createMatrixTextMessageEvent({+        eventId: "$reply1",+        sender: "@alice:example.org",+        body: "@room follow up",+        relatesTo: {+          "m.in_reply_to": { event_id: "$quoted" },+        },+        mentions: { room: true },+      }),+    );++    const finalized = vi.mocked(finalizeInboundContext).mock.calls.at(-1)?.[0] as {+      ReplyToBody?: string;+      ReplyToSender?: string;+    };+    expect(finalized.ReplyToBody).toBeUndefined();+    expect(finalized.ReplyToSender).toBeUndefined();+  }); });

@@ -471,6 +472,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam           isRoom,         });         const {+          effectiveGroupAllowFrom,           effectiveRoomUsers,           groupAllowConfigured,           directAllowMatch,@@ -860,6 +862,8 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam           triggerSnapshot,           threadRootId: _threadRootId,           thread,+          effectiveGroupAllowFrom,+          effectiveRoomUsers,         };       };       const ingressResult =@@ -910,24 +914,62 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam         triggerSnapshot,         threadRootId: _threadRootId,         thread,+        effectiveGroupAllowFrom,+        effectiveRoomUsers,       } = resolvedIngressResult;        // Keep the per-room ingress gate focused on ordering-sensitive state updates.       // Prompt/session enrichment below can run concurrently after the history snapshot is fixed.       const replyToEventId = resolveMatrixReplyToEventId(event.content as RoomMessageEventContent);       const threadTarget = thread.threadId;-      const threadContext = _threadRootId+      const shouldIncludeRoomContextSender = (contextSenderId?: string): boolean => {+        if (!isRoom || !contextSenderId) {+          return true;+        }+        if (effectiveRoomUsers.length > 0) {+          return resolveMatrixAllowListMatch({+            allowList: effectiveRoomUsers,+            userId: contextSenderId,+          }).allowed;+        }+        if (groupPolicy === "allowlist" && effectiveGroupAllowFrom.length > 0) {+          return resolveMatrixAllowListMatch({+            allowList: effectiveGroupAllowFrom,+            userId: contextSenderId,+          }).allowed;+        }+        return true;+      };+      let threadContext = _threadRootId         ? await resolveThreadContext({ roomId, threadRootId: _threadRootId })         : undefined;-      const replyContext =-        replyToEventId && replyToEventId === _threadRootId && threadContext?.summary-          ? {-              replyToBody: threadContext.summary,-              replyToSender: threadContext.senderLabel,-            }-          : replyToEventId-            ? await resolveReplyContext({ roomId, eventId: replyToEventId })-            : undefined;+      let threadContextBlockedByAllowlist = false;+      if (threadContext?.senderId && !shouldIncludeRoomContextSender(threadContext.senderId)) {+        logVerboseMessage("matrix: drop thread root context (sender allowlist)");+        threadContextBlockedByAllowlist = true;+        threadContext = undefined;+      }+      let replyContext: Awaited<ReturnType<typeof resolveReplyContext>> | undefined;+      if (replyToEventId && replyToEventId === _threadRootId && threadContextBlockedByAllowlist) {+        replyContext = undefined;+      } else if (replyToEventId && replyToEventId === _threadRootId && threadContext?.summary) {+        replyContext = {+          replyToBody: threadContext.summary,+          replyToSender: threadContext.senderLabel,+          replyToSenderId: threadContext.senderId,+        };+      } else {+        replyContext = replyToEventId+          ? await resolveReplyContext({ roomId, eventId: replyToEventId })+          : undefined;+      }+      if (+        replyContext?.replyToSenderId &&

@@ -115,6 +116,7 @@ describe("matrix thread context", () => {       }),     ).resolves.toEqual({       threadStarterBody: "Matrix thread root $root from Alice:\nRecovered topic",+      senderId: "@alice:example.org",       senderLabel: "Alice",       summary: "Recovered topic",     });