refactor: unify threading contexts

src/auto-reply/reply/agent-runner-utils.test.ts

@@ -87,4 +87,21 @@ describe("buildThreadingToolContext", () => {
 
     expect(result.currentChannelId).toBe("chat_id:7");
   });
+
+  it("prefers MessageThreadId for Slack tool threading", () => {
+    const sessionCtx = {
+      Provider: "slack",
+      To: "channel:C1",
+      MessageThreadId: "123.456",
+    } as TemplateContext;
+
+    const result = buildThreadingToolContext({
+      sessionCtx,
+      config: { channels: { slack: { replyToMode: "all" } } } as ClawdbotConfig,
+      hasRepliedRef: undefined,
+    });
+
+    expect(result.currentChannelId).toBe("C1");
+    expect(result.currentThreadTs).toBe("123.456");
+  });
 });

src/auto-reply/reply/agent-runner-utils.ts

@@ -24,18 +24,11 @@ export function buildThreadingToolContext(params: {
   const rawProvider = sessionCtx.Provider?.trim().toLowerCase();
   if (!rawProvider) return {};
   const provider = normalizeChannelId(rawProvider);
-  // WhatsApp context isolation keys off conversation id, not the bot's own number.
-  const threadingTo =
-    rawProvider === "whatsapp"
-      ? (sessionCtx.From ?? sessionCtx.To)
-      : rawProvider === "imessage" && sessionCtx.ChatType === "direct"
-        ? (sessionCtx.From ?? sessionCtx.To)
-        : sessionCtx.To;
   // Fallback for unrecognized/plugin channels (e.g., BlueBubbles before plugin registry init)
   const dock = provider ? getChannelDock(provider) : undefined;
   if (!dock?.threading?.buildToolContext) {
     return {
-      currentChannelId: threadingTo?.trim() || undefined,
+      currentChannelId: sessionCtx.To?.trim() || undefined,
       currentChannelProvider: provider ?? (rawProvider as ChannelId),
       hasRepliedRef,
     };
@@ -46,7 +39,9 @@ export function buildThreadingToolContext(params: {
       accountId: sessionCtx.AccountId,
       context: {
         Channel: sessionCtx.Provider,
-        To: threadingTo,
+        From: sessionCtx.From,
+        To: sessionCtx.To,
+        ChatType: sessionCtx.ChatType,
         ReplyToId: sessionCtx.ReplyToId,
         ThreadLabel: sessionCtx.ThreadLabel,
         MessageThreadId: sessionCtx.MessageThreadId,