fix(slack): keep outbound mirrors on thread session

harjothkhara · harjothkhara · commit c02103a8bcfe · 2026-06-24T20:15:00.000-07:00
diff --git a/extensions/slack/src/channel.test.ts b/extensions/slack/src/channel.test.ts
@@ -475,6 +475,49 @@ describe("slackPlugin status", () => {
     });
   });
 
+  it("uses the current Slack thread session before inherited child reply ids", async () => {
+    const resolveRoute = slackPlugin.messaging?.resolveOutboundSessionRoute;
+    if (!resolveRoute) {
+      throw new Error("slack messaging.resolveOutboundSessionRoute unavailable");
+    }
+
+    const route = await resolveRoute({
+      cfg: {} as OpenClawConfig,
+      agentId: "main",
+      target: "channel:C1",
+      currentSessionKey: "agent:main:slack:channel:C1:thread:1712345678.123456",
+      replyToId: "1712345688.654321",
+    });
+
+    expectRecordFields(route, "Slack route", {
+      sessionKey: "agent:main:slack:channel:c1:thread:1712345678.123456",
+      baseSessionKey: "agent:main:slack:channel:c1",
+      threadId: "1712345678.123456",
+    });
+  });
+
+  it("keeps explicit Slack reply ids ahead of the current thread session", async () => {
+    const resolveRoute = slackPlugin.messaging?.resolveOutboundSessionRoute;
+    if (!resolveRoute) {
+      throw new Error("slack messaging.resolveOutboundSessionRoute unavailable");
+    }
+
+    const route = await resolveRoute({
+      cfg: {} as OpenClawConfig,
+      agentId: "main",
+      target: "channel:C1",
+      currentSessionKey: "agent:main:slack:channel:C1:thread:1712345678.123456",
+      replyToId: "1712345688.654321",
+      replyToIsExplicit: true,
+    });
+
+    expectRecordFields(route, "Slack route", {
+      sessionKey: "agent:main:slack:channel:c1:thread:1712345688.654321",
+      baseSessionKey: "agent:main:slack:channel:c1",
+      threadId: "1712345688.654321",
+    });
+  });
+
   it("canonicalizes bare Slack IM channel targets to direct user session routes", async () => {
     const resolveRoute = slackPlugin.messaging?.resolveOutboundSessionRoute;
     if (!resolveRoute) {
diff --git a/extensions/slack/src/channel.ts b/extensions/slack/src/channel.ts
@@ -312,6 +312,7 @@ async function resolveSlackOutboundSessionRoute(params: {
   accountId?: string | null;
   target: string;
   replyToId?: string | null;
+  replyToIsExplicit?: boolean;
   threadId?: string | number | null;
   currentSessionKey?: string | null;
 }) {
@@ -373,6 +374,9 @@ async function resolveSlackOutboundSessionRoute(params: {
     replyToId: params.replyToId,
     threadId: params.threadId,
     currentSessionKey: params.currentSessionKey,
+    precedence: params.replyToIsExplicit
+      ? ["replyToId", "threadId", "currentSession"]
+      : ["currentSession", "threadId", "replyToId"],
     canRecoverCurrentThread: () =>
       shouldRecoverSlackThreadFromCurrentSession({
         cfg: params.cfg,
@@ -661,8 +665,7 @@ export const slackPlugin: ChannelPlugin<ResolvedSlackAccount, SlackProbe> = crea
         }
         return resolveTargetsWithOptionalToken({
           token:
-            normalizeOptionalString(account.userToken) ??
-            normalizeOptionalString(account.botToken),
+            normalizeOptionalString(account.userToken) ?? normalizeOptionalString(account.botToken),
           inputs,
           missingTokenNote: "missing Slack token",
           resolveWithToken: async ({ token, inputs: inputsLocal }) =>
diff --git a/src/channels/plugins/types.core.ts b/src/channels/plugins/types.core.ts
@@ -647,6 +647,8 @@ export type ChannelMessagingAdapter = {
       source: "normalized" | "directory";
     };
     replyToId?: string | null;
+    /** True when replyToId came from an explicit payload target or reply tag. */
+    replyToIsExplicit?: boolean;
     threadId?: string | number | null;
   }) => ChannelOutboundSessionRoute | Promise<ChannelOutboundSessionRoute | null> | null;
 };
diff --git a/src/infra/outbound/message-action-runner.threading.test.ts b/src/infra/outbound/message-action-runner.threading.test.ts
@@ -122,13 +122,15 @@ describe("message action threading helpers", () => {
         replyToId: threadId == null ? threadId : String(threadId),
         threadId: threadId ?? null,
       }),
+      replyToIsExplicit: false,
       resolveOutboundSessionRoute,
       ensureOutboundSessionEntry,
     });
 
     expect(resolveOutboundSessionRoute).toHaveBeenCalledOnce();
     expect(firstMockArg(resolveOutboundSessionRoute)).toMatchObject({
       replyToId: "root-42",
+      replyToIsExplicit: false,
       threadId: "root-42",
     });
   });
diff --git a/src/infra/outbound/message-action-threading.ts b/src/infra/outbound/message-action-threading.ts
@@ -211,6 +211,7 @@ export async function prepareOutboundMirrorRoute(params: {
           currentSessionKey: params.currentSessionKey,
           resolvedTarget: params.resolvedTarget,
           replyToId,
+          replyToIsExplicit: params.replyToIsExplicit,
           threadId: resolvedThreadId,
         })
       : null;
diff --git a/src/infra/outbound/outbound-session.ts b/src/infra/outbound/outbound-session.ts
@@ -39,6 +39,7 @@ export type ResolveOutboundSessionRouteParams = {
   currentSessionKey?: string;
   resolvedTarget?: ResolvedMessagingTarget;
   replyToId?: string | null;
+  replyToIsExplicit?: boolean;
   threadId?: string | number | null;
 };
 
