Fix Discord typing test hook merge drift

zhuisDEV · zhuisDEV · commit 8ef178db08f1 · 2026-05-19T08:07:45.000+10:00
diff --git a/extensions/discord/src/monitor/message-handler.queue.test.ts b/extensions/discord/src/monitor/message-handler.queue.test.ts
@@ -212,7 +212,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-typing", "dm-1") as never, {} as never),
@@ -248,7 +248,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-typing-fails", "dm-1") as never, {} as never),
@@ -271,7 +271,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-rejected", "dm-1") as never, {} as never),
@@ -303,7 +303,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-never-mode", "dm-1") as never, {} as never),
@@ -338,7 +338,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
       const handler = createDiscordMessageHandler({
         ...createDiscordHandlerParams(),
-        __testing: { createReplyTypingFeedback },
+        testing: { createReplyTypingFeedback },
       });
       await expect(
         handler(createMessageData(`m-${typingMode}-mode`, "dm-1") as never, {} as never),
@@ -373,7 +373,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-guild", "guild-channel") as never, {} as never),
@@ -422,7 +422,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(
       handler(createMessageData("m-guild-instant", "guild-channel") as never, {} as never),
@@ -465,7 +465,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
     });
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
 
     await expect(handler(createMessageData("m-1") as never, {} as never)).resolves.toBeUndefined();
@@ -793,7 +793,7 @@ describe("createDiscordMessageHandler queue behavior", () => {
 
     const handler = createDiscordMessageHandler({
       ...createDiscordHandlerParams(),
-      __testing: { createReplyTypingFeedback },
+      testing: { createReplyTypingFeedback },
     });
     await expect(handler(createMessageData("m-1") as never, {} as never)).resolves.toBeUndefined();
     await flushQueueWork();
diff --git a/extensions/discord/src/monitor/message-handler.ts b/extensions/discord/src/monitor/message-handler.ts
@@ -210,7 +210,7 @@ export function createDiscordMessageHandler(
           }
           startAcceptedTypingFeedback({
             ctx,
-            createFeedback: params.__testing?.createReplyTypingFeedback,
+            createFeedback: params.testing?.createReplyTypingFeedback,
           });
           applyImplicitReplyBatchGate(ctx, params.replyToMode, false);
           messageRunQueue.enqueue(buildDiscordInboundJob(ctx, { replayKeys }));
@@ -263,7 +263,7 @@ export function createDiscordMessageHandler(
         }
         startAcceptedTypingFeedback({
           ctx,
-          createFeedback: params.__testing?.createReplyTypingFeedback,
+          createFeedback: params.testing?.createReplyTypingFeedback,
         });
         applyImplicitReplyBatchGate(ctx, params.replyToMode, true);
         if (entries.length > 1) {
diff --git a/extensions/discord/src/monitor/message-run-queue.ts b/extensions/discord/src/monitor/message-run-queue.ts
@@ -102,14 +102,22 @@ export function createDiscordMessageRunQueue(
 
   return {
     enqueue(job) {
-      runQueue.enqueue(job.queueKey, async ({ lifecycleSignal }) => {
-        await processDiscordQueuedMessage({
-          job,
-          lifecycleSignal,
-          replayGuard,
-          testing: params.testing,
-        });
-      });
+      runQueue.enqueue(
+        job.queueKey,
+        async ({ lifecycleSignal }) => {
+          await processDiscordQueuedMessage({
+            job,
+            lifecycleSignal,
+            replayGuard,
+            testing: params.testing,
+          });
+        },
+        {
+          onSkip: () => {
+            cleanupSkippedDiscordQueuedMessage({ job, replayGuard });
+          },
+        },
+      );
     },
     deactivate: runQueue.deactivate,
   };
