fix(matrix): send mention finals normally

vincentkoc · vincentkoc · commit 0d565833e15e · 2026-05-27T16:48:09.000+02:00
diff --git a/extensions/matrix/src/matrix/monitor/handler.test.ts b/extensions/matrix/src/matrix/monitor/handler.test.ts
@@ -3147,6 +3147,32 @@ describe("matrix monitor handler draft streaming", () => {
     await finish();
   });
 
+  it("redacts partial previews before normal final delivery for changed Matrix mentions", async () => {
+    const { dispatch, redactEventMock } = createStreamingHarness({
+      blockStreamingEnabled: true,
+      streaming: "partial",
+    });
+    const { deliver, opts, finish } = await dispatch();
+
+    opts.onPartialReply?.({ text: "hello @alice:example.org" });
+    await vi.waitFor(() => {
+      expect(sendSingleTextMessageMatrixMock).toHaveBeenCalledTimes(1);
+    });
+
+    await deliver({ text: "hello @alice:example.org!" }, { kind: "final" });
+
+    expect(editMessageMatrixMock).not.toHaveBeenCalled();
+    expect(redactEventMock).toHaveBeenCalledWith("!room:example.org", "$draft1");
+    expect(deliverMatrixRepliesMock).toHaveBeenCalledTimes(1);
+    const deliverParams = requireRecord(
+      callArg(deliverMatrixRepliesMock, 0, 0, "deliver replies params"),
+      "deliver replies params",
+    );
+    const replies = requireArray(deliverParams.replies, "delivered replies");
+    expect(requireRecord(replies[0], "delivered reply").text).toBe("hello @alice:example.org!");
+    await finish();
+  });
+
   it("keeps the draft preview and sends media-only for TTS supplement finals", async () => {
     const { dispatch, redactEventMock } = createStreamingHarness({
       blockStreamingEnabled: true,
diff --git a/extensions/matrix/src/matrix/monitor/handler.ts b/extensions/matrix/src/matrix/monitor/handler.ts
@@ -1876,14 +1876,13 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
                 await draftStream.discardPending();
               }
               const draftEventId = draftStream.eventId();
-              const matchingDraftTextNeedsNormalMentionDelivery =
+              const draftFinalTextNeedsNormalMentionDelivery =
                 Boolean(draftEventId) &&
                 typeof payload.text === "string" &&
                 Boolean(payload.text.trim()) &&
                 !payload.isError &&
                 !payloadReplyMismatch &&
                 !mustDeliverFinalNormally &&
-                draftStream.matchesPreparedText(payload.text) &&
                 (await matrixTextWouldActivateMentions(client, payload.text));
 
               if (
@@ -1893,7 +1892,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
                 !hasMedia &&
                 !payloadReplyMismatch &&
                 !mustDeliverFinalNormally &&
-                !matchingDraftTextNeedsNormalMentionDelivery
+                !draftFinalTextNeedsNormalMentionDelivery
               ) {
                 const finalPreviewText = payload.text;
                 await deliverWithFinalizableLivePreviewAdapter<
@@ -1976,14 +1975,14 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
                   typeof payloadText === "string" &&
                   Boolean(payloadText.trim()) &&
                   payloadTextMatchesDraft;
-                const matchingMediaTextNeedsNormalMentionDelivery =
+                const mediaTextNeedsNormalMentionDelivery =
                   typeof payloadText === "string" &&
-                  reusesDraftTextUnchanged &&
+                  Boolean(payloadText.trim()) &&
                   (await matrixTextWouldActivateMentions(client, payloadText));
                 const requiresFinalTextEdit =
                   quietDraftStreaming ||
                   (typeof payloadText === "string" && !payloadTextMatchesDraft);
-                if (textEditOk && matchingMediaTextNeedsNormalMentionDelivery) {
+                if (textEditOk && mediaTextNeedsNormalMentionDelivery) {
                   textEditOk = false;
                 } else if (textEditOk && payloadText && requiresFinalTextEdit) {
                   const { editMessageMatrix } = await loadMatrixSendModule();
@@ -2038,7 +2037,7 @@ export function createMatrixRoomMessageHandler(params: MatrixMonitorHandlerParam
                   (payload.isError ||
                     payloadReplyMismatch ||
                     mustDeliverFinalNormally ||
-                    matchingDraftTextNeedsNormalMentionDelivery);
+                    draftFinalTextNeedsNormalMentionDelivery);
                 if (draftRedacted && draftEventId) {
                   await redactMatrixDraftEvent(client, roomId, draftEventId);
                 }
