diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d76591cb..adb990f01 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,7 +34,7 @@
 - Gateway/CLI: add daemon runtime selection (Node recommended; Bun optional) and document WhatsApp/Baileys Bun WebSocket instability on reconnect.
 - CLI: add `clawdbot docs` live docs search with pretty output.
 - CLI: add `clawdbot agents` (list/add/delete) with wizarded workspace/setup, provider login, and full prune on delete.
-- Discord/Slack: fork thread sessions and inject thread starters for context. Thanks @thewilloftheshadow for PR #400.
+- Discord/Slack: fork thread sessions (agent-scoped) and inject thread starters for context. Thanks @thewilloftheshadow for PR #400.
 - Agent: treat compaction retry AbortError as a fallback trigger without swallowing non-abort errors. Thanks @erikpr1994 for PR #341.
 - Agent: add opt-in session pruning for tool results to reduce context bloat. Thanks @maxsumrall for PR #381.
 - Agent: protect bootstrap prefix from context pruning. Thanks @maxsumrall for PR #381.
diff --git a/src/discord/monitor.ts b/src/discord/monitor.ts
index f3c2544f8..11482199d 100644
--- a/src/discord/monitor.ts
+++ b/src/discord/monitor.ts
@@ -11,11 +11,6 @@ import {
   MessageReactionRemoveListener,
   MessageType,
   type RequestClient,
-  type PartialMessage,
-  type PartialMessageReaction,
-  Partials,
-  type ThreadChannel,
-  type PartialUser,
   type User,
 } from "@buape/carbon";
 import { GatewayIntents, GatewayPlugin } from "@buape/carbon/gateway";
@@ -907,7 +902,6 @@ export function createDiscordMessageHandler(params: {
           : `group:${message.channelId}`,
         To: discordTo,
         SessionKey: threadKeys.sessionKey,
-        SessionKey: threadKeys.sessionKey,
         AccountId: route.accountId,
         ChatType: isDirectMessage ? "direct" : "group",
         SenderName:
diff --git a/src/slack/monitor.ts b/src/slack/monitor.ts
index d5ede54d1..042849126 100644
--- a/src/slack/monitor.ts
+++ b/src/slack/monitor.ts
@@ -37,7 +37,6 @@ import {
   resolveStorePath,
   updateLastRoute,
 } from "../config/sessions.js";
-import { resolveThreadSessionKeys } from "../routing/session-key.js";
 import { danger, logVerbose, shouldLogVerbose } from "../globals.js";
 import { enqueueSystemEvent } from "../infra/system-events.js";
 import { getChildLogger } from "../logging.js";
@@ -48,6 +47,7 @@ import {
   upsertProviderPairingRequest,
 } from "../pairing/pairing-store.js";
 import { resolveAgentRoute } from "../routing/resolve-route.js";
+import { resolveThreadSessionKeys } from "../routing/session-key.js";
 import type { RuntimeEnv } from "../runtime.js";
 import { reactSlackMessage } from "./actions.js";
 import { sendMessageSlack } from "./send.js";