@desplega.ai/agent-swarm 1.152.0 → 1.152.2

package/README.md

@@ -14,6 +14,7 @@ agent-swarm.dev is an open-source operating system for AI work. A lead agent del
 - A lead agent that receives work from Slack, repositories, issue trackers, email, or the API
 - [Schema-validated task results](./MCP.md#send-task) for callers that need structured JSON output
 - [Deferred tasks](./MCP.md#defer-task) that wake when all or any watched tasks reach an outcome, or a deadline arrives
+- [Inline tool-result images](https://docs.agent-swarm.dev/docs/ui#tool-result-images) in task logs, with previews that open at full size
 - [Dashboard file attachments](https://docs.agent-swarm.dev/docs/ui#file-attachments) by paste, drag-and-drop, or file picker
 - Workers in isolated Docker containers with development environments
 - Memory and identity that persist across sessions
@@ -100,6 +101,8 @@ Kubernetes: [install the OCI Helm chart](./charts/agent-swarm/README.md).
 
 Slack · GitHub · GitLab · Linear · Jira · AgentMail · WhatsApp (Kapso) · Composio · Sentry · Devin · [Serply search](https://docs.agent-swarm.dev/docs/integrations/serply). [Integration guides](https://docs.agent-swarm.dev/docs/integrations).
 
+AgentMail archives verified inbound deliveries before acknowledging them and retains the archive for 30 days, including mail excluded from task routing. See the [contact inbox triage runbook](runbooks/contact-inbox-triage.md) for retention, coverage limits, and rollout instructions.
+
 ## Learn more
 
 - [Getting started](https://docs.agent-swarm.dev/docs/getting-started) · [Architecture](https://docs.agent-swarm.dev/docs/architecture/overview) · [Playbooks](https://docs.agent-swarm.dev/docs/playbooks) · [CLI](https://docs.agent-swarm.dev/docs/reference/cli) · [API reference](https://docs.agent-swarm.dev/docs/api-reference)

package/dist/{acp-adapter-d05sg0q4.js → acp-adapter-pfeje2v5.js}

@@ -29,7 +29,7 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-jh9txj4n.js";
+} from "./cli-zvkq5csn.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{actions-4sc0v342.js → actions-0sttc7f5.js}

@@ -1,26 +1,26 @@
 import {
   resolveSlackUserId
-} from "./cli-awb59f08.js";
+} from "./cli-3bpzj8me.js";
 import {
   createTaskWithSiblingAwareness
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import"./cli-0z2v4nhw.js";
 import"./cli-4wppfkcm.js";
 import"./cli-e7d20cty.js";
 import"./cli-re8z5p8p.js";
 import"./cli-3dpj7atn.js";
-import"./cli-5bqt4gwa.js";
-import"./cli-t6axtdcg.js";
+import"./cli-b9dd0h3k.js";
+import"./cli-r84ctdxn.js";
 import"./cli-zfzznn7c.js";
-import"./cli-p2hx1pxm.js";
+import"./cli-fmy65jdn.js";
 import"./cli-epan13p1.js";
 import"./cli-y89t4nca.js";
 import"./cli-f14fvzag.js";
 import"./cli-fad8m16k.js";
-import"./cli-cs9z1hw3.js";
-import"./cli-zdcdh02m.js";
+import"./cli-56h18ng2.js";
+import"./cli-2nnd56zt.js";
 import"./cli-bsakbbkm.js";
-import"./cli-nd5s3m4y.js";
+import"./cli-gpqcs935.js";
 import"./cli-51tf7ac3.js";
 import {
   buildCancelledBlocks,
@@ -29,10 +29,10 @@ import {
   getAgentEmoji,
   getTaskLink,
   isSlackRenderV2Enabled
-} from "./cli-cwvey7n1.js";
+} from "./cli-qn042eh7.js";
 import"./cli-q51yprfq.js";
 import"./cli-yatxqynm.js";
-import"./cli-evgy5w3y.js";
+import"./cli-jew3jda5.js";
 import"./cli-fm4ytsdk.js";
 import"./cli-aehm1rbq.js";
 import"./cli-2658f6at.js";
@@ -45,7 +45,7 @@ import {
   init_context_key,
   init_db,
   slackContextKey
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import"./cli-z61ykvam.js";
 import"./cli-dv6cdjs2.js";
@@ -53,7 +53,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-pzxba7gw.js";
 import"./cli-f7kvq46p.js";

package/dist/{app-2d0v6kt6.js → app-p8teva95.js}

@@ -3,11 +3,11 @@ import {
   initSlackApp,
   startSlackApp,
   stopSlackApp
-} from "./cli-cwvey7n1.js";
+} from "./cli-qn042eh7.js";
 import"./cli-q51yprfq.js";
 import"./cli-yatxqynm.js";
 import"./cli-2658f6at.js";
-import"./cli-gacq5hg8.js";
+import"./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import"./cli-z61ykvam.js";
 import"./cli-dv6cdjs2.js";
@@ -15,7 +15,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-pzxba7gw.js";
 import"./cli-zf8jjwex.js";

package/dist/{assistant-zs6wdnrf.js → assistant-r45jnsrt.js}

@@ -2,45 +2,45 @@ import {
   bufferThreadMessage,
   getBufferMessageCount,
   wasEventSeen
-} from "./cli-4fqn2vpg.js";
+} from "./cli-jvy9qgjs.js";
 import {
   resolveSlackUserId,
   rewriteSlackMentions
-} from "./cli-awb59f08.js";
+} from "./cli-3bpzj8me.js";
 import {
   buildEffectiveText,
   createSlackTaskWithFiles,
   fetchSlackFiles,
   hasOtherUserMention,
   notifySlackFileFailures
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import"./cli-0z2v4nhw.js";
 import"./cli-4wppfkcm.js";
 import"./cli-e7d20cty.js";
 import"./cli-re8z5p8p.js";
 import"./cli-3dpj7atn.js";
-import"./cli-5bqt4gwa.js";
-import"./cli-t6axtdcg.js";
+import"./cli-b9dd0h3k.js";
+import"./cli-r84ctdxn.js";
 import"./cli-zfzznn7c.js";
-import"./cli-p2hx1pxm.js";
+import"./cli-fmy65jdn.js";
 import"./cli-epan13p1.js";
 import"./cli-y89t4nca.js";
 import"./cli-f14fvzag.js";
 import"./cli-fad8m16k.js";
-import"./cli-cs9z1hw3.js";
-import"./cli-zdcdh02m.js";
+import"./cli-56h18ng2.js";
+import"./cli-2nnd56zt.js";
 import"./cli-bsakbbkm.js";
-import"./cli-nd5s3m4y.js";
+import"./cli-gpqcs935.js";
 import"./cli-51tf7ac3.js";
 import {
   ackSlackMessage,
   ensureSlackThreadTree,
   isSlackRenderV2Enabled,
   require_dist
-} from "./cli-cwvey7n1.js";
+} from "./cli-qn042eh7.js";
 import"./cli-q51yprfq.js";
 import"./cli-yatxqynm.js";
-import"./cli-evgy5w3y.js";
+import"./cli-jew3jda5.js";
 import"./cli-fm4ytsdk.js";
 import"./cli-aehm1rbq.js";
 import"./cli-2658f6at.js";
@@ -53,7 +53,7 @@ import {
   init_db,
   reactionName,
   slackContextKey
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import {
   init_resolver,
@@ -67,7 +67,7 @@ import {
 } from "./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-pzxba7gw.js";
 import"./cli-f7kvq46p.js";
@@ -166,7 +166,7 @@ function createAssistant() {
           }) : undefined;
           const workingAgent = await getAgentWorkingOnThread(channelId, threadTs);
           if (workingAgent && workingAgent.status !== "offline" && isAdditiveSlack()) {
-            bufferThreadMessage(channelId, threadTs, messageText, userId, message.ts, files);
+            bufferThreadMessage(channelId, threadTs, messageText, userId, message.ts, files, cachedBotUserId ?? undefined);
             const count = getBufferMessageCount(`${channelId}:${threadTs}`);
             const event = count === 1 ? "accepted" : "buffered";
             await ackSlackMessage(client, channelId, message.ts, reactionName(event), event);
@@ -176,7 +176,7 @@ function createAssistant() {
           if (files?.length)
             await safeSetStatus("Downloading attachments...");
           const inbound = __using(__stack, await fetchSlackFiles(client, files), 1);
-          const renderedMessageText = await rewriteSlackMentions(buildEffectiveText(messageText, inbound.files, inbound.failed));
+          const renderedMessageText = await rewriteSlackMentions(buildEffectiveText(messageText, inbound.files, inbound.failed), cachedBotUserId ?? undefined);
           if (workingAgent && workingAgent.status !== "offline") {
             const latestTask = await getMostRecentTaskInThread(channelId, threadTs);
             const { task: task2, unattached: unattached2 } = await createSlackTaskWithFiles(renderedMessageText, {

package/dist/{boot-reembed-vhh33520.js → boot-reembed-1qmybsd4.js}

@@ -1,15 +1,15 @@
 import {
   embedScript,
   embeddingProvider
-} from "./cli-nd5s3m4y.js";
-import"./cli-evgy5w3y.js";
+} from "./cli-gpqcs935.js";
+import"./cli-jew3jda5.js";
 import"./cli-fm4ytsdk.js";
 import"./cli-aehm1rbq.js";
 import"./cli-2658f6at.js";
 import {
   getDbClient,
   init_db
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import"./cli-z61ykvam.js";
 import"./cli-dv6cdjs2.js";
@@ -17,7 +17,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-zf8jjwex.js";
 import"./cli-bc05qbss.js";

package/dist/{boot-reembed-3dwdnnsr.js → boot-reembed-je26h5y7.js}

@@ -3,14 +3,14 @@ import {
   getEmbeddingProvider,
   getMemoryStore,
   init_constants
-} from "./cli-evgy5w3y.js";
+} from "./cli-jew3jda5.js";
 import"./cli-fm4ytsdk.js";
 import"./cli-aehm1rbq.js";
 import"./cli-2658f6at.js";
 import {
   getDbClient,
   init_db
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import"./cli-z61ykvam.js";
 import"./cli-dv6cdjs2.js";
@@ -18,7 +18,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-zf8jjwex.js";
 import"./cli-bc05qbss.js";

package/dist/{boot-scrub-logs-e1fnabcg.js → boot-scrub-logs-gte3h1mm.js}

@@ -1,7 +1,7 @@
 import {
   getDbClient,
   init_db
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import"./cli-ht5rs63n.js";
 import"./cli-z61ykvam.js";
 import"./cli-dv6cdjs2.js";
@@ -9,7 +9,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{claude-adapter-h58xqzzd.js → claude-adapter-csc1mzka.js}

@@ -17,8 +17,8 @@ import {
   resolveClaudeBridgeEnabled,
   resolveClaudeQueueSteeringOverride,
   runClaudeSessionSummary
-} from "./cli-8fy9dmpv.js";
-import"./cli-f1f9n77e.js";
+} from "./cli-xw7vak96.js";
+import"./cli-4ahpr4sw.js";
 import"./cli-wbyk465z.js";
 import"./cli-tng3131n.js";
 import"./cli-b5b30yzk.js";
@@ -44,7 +44,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import"./cli-r2ap2czm.js";
 import"./cli-knd276ed.js";
 import"./cli-c4eeb5q2.js";

package/dist/{claude-sdk-session-pbaczbgt.js → claude-sdk-session-fcd6f078.js}

@@ -3,8 +3,8 @@ import {
   cleanupTaskFile,
   normalizeClaudeMessage,
   runClaudeSessionSummary
-} from "./cli-8fy9dmpv.js";
-import"./cli-f1f9n77e.js";
+} from "./cli-xw7vak96.js";
+import"./cli-4ahpr4sw.js";
 import"./cli-wbyk465z.js";
 import"./cli-tng3131n.js";
 import {
@@ -41,7 +41,7 @@ import"./cli-c2mk1kgf.js";
 import"./cli-ej6gbxfb.js";
 import"./cli-sd0mxa3c.js";
 import"./cli-w5e1d1vv.js";
-import"./cli-jh9txj4n.js";
+import"./cli-zvkq5csn.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{cli-zdcdh02m.js → cli-2nnd56zt.js}

@@ -1,7 +1,7 @@
 import {
   getDb,
   init_db
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 
 // src/be/seed-pricing.ts
 init_db();

package/dist/{cli-awb59f08.js → cli-3bpzj8me.js}

@@ -4,12 +4,12 @@ import {
   linkIdentity,
   recordUnmappedIdentity,
   resolveIdentity
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import {
   getKv,
   init_db,
   upsertKv
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 
 // src/slack/enrich.ts
 init_db();

package/dist/{cli-f1f9n77e.js → cli-4ahpr4sw.js}

@@ -35,7 +35,7 @@ import {
 import {
   init_package,
   package_default
-} from "./cli-jh9txj4n.js";
+} from "./cli-zvkq5csn.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{cli-cs9z1hw3.js → cli-56h18ng2.js}

@@ -7,7 +7,7 @@ import {
   init_date_utils,
   init_db,
   normalizeDateRequired
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_secret_scrubber,
   registerVolatileSecret,

package/dist/{cli-5bqt4gwa.js → cli-b9dd0h3k.js}

@@ -1,14 +1,14 @@
 import {
   buildModelsDevSeedRows,
   loadModelsDevCache
-} from "./cli-zdcdh02m.js";
+} from "./cli-2nnd56zt.js";
 import {
   createLogEntry,
   getActivePricingRow,
   getDbClient,
   init_db,
   insertPricingRow
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{cli-5p007m2q.js → cli-ckz5t2hb.js}

@@ -5,12 +5,12 @@ import {
   instantFlush,
   requestSlackThreadSteering,
   wasEventSeen
-} from "./cli-4fqn2vpg.js";
+} from "./cli-jvy9qgjs.js";
 import {
   enrichSlackUserEmail,
   resolveSlackUserId,
   rewriteSlackMentions
-} from "./cli-awb59f08.js";
+} from "./cli-3bpzj8me.js";
 import {
   TaskCreationBlockedError,
   broadcastMatches,
@@ -23,14 +23,14 @@ import {
   hasOtherUserMention,
   notifySlackFileFailures,
   routeMessage
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import {
   ackSlackMessage,
   buildTreeBlocks,
   ensureSlackThreadTree,
   isSlackRenderV2Enabled,
   registerTreeMessage
-} from "./cli-cwvey7n1.js";
+} from "./cli-qn042eh7.js";
 import {
   getAgentById,
   getAgentWorkingOnThread,
@@ -42,7 +42,7 @@ import {
   init_db,
   reactionName,
   slackContextKey
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_resolver,
   resolveTemplate
@@ -322,7 +322,7 @@ function registerMessageHandler(app) {
           const threadKey = `${msg.channel}:${msg.thread_ts}`;
           console.log(`[Slack] !now command detected in thread ${threadKey}${nowMessage ? ` with message: "${nowMessage}"` : ""}`);
           if (nowMessage || msg.files?.length) {
-            bufferThreadMessage(msg.channel, msg.thread_ts, nowMessage, msg.user, msg.ts, msg.files);
+            bufferThreadMessage(msg.channel, msg.thread_ts, nowMessage, msg.user, msg.ts, msg.files, botUserId);
           }
           await instantFlush(threadKey);
           await ackSlackMessage(client, msg.channel, msg.ts, reactionName("now"), "now");
@@ -337,7 +337,7 @@ function registerMessageHandler(app) {
         const hasSwarmActivity = await hasSwarmThreadActivity(client, msg.channel, msg.thread_ts);
         if (hasSwarmActivity) {
           const threadKey = `${msg.channel}:${msg.thread_ts}`;
-          bufferThreadMessage(msg.channel, msg.thread_ts, msg.text ?? "", msg.user, msg.ts, msg.files);
+          bufferThreadMessage(msg.channel, msg.thread_ts, msg.text ?? "", msg.user, msg.ts, msg.files, botUserId);
           const count = getBufferMessageCount(threadKey);
           const event2 = count === 1 ? "accepted" : "buffered";
           const name = reactionName(event2);

package/dist/{cli-p2hx1pxm.js → cli-fmy65jdn.js}

@@ -20,10 +20,10 @@ import {
   oauthAppRowToProviderConfig,
   updateAuthorizationTokens,
   upsertAuthorization
-} from "./cli-cs9z1hw3.js";
+} from "./cli-56h18ng2.js";
 import {
   embedScript
-} from "./cli-nd5s3m4y.js";
+} from "./cli-gpqcs935.js";
 import {
   CredentialBroker,
   DEFAULT_CREDENTIAL_BINDINGS,
@@ -45,7 +45,7 @@ import {
   normalizeDateRequired,
   placeholderForConfigKey,
   upsertSwarmConfig
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_env_flag,
   isEnvFlagEnabled

package/dist/{cli-fhdssm2v.js → cli-gphgnvpf.js}

@@ -15,7 +15,7 @@ import {
   recoverIncompleteRuns,
   repointTrackerSyncBySwarmId,
   resolveLeadOnlyRecoveryAssignment
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import {
   isMultiRuntimeEnabled
 } from "./cli-re8z5p8p.js";
@@ -61,7 +61,7 @@ import {
   releaseStaleReviewingTasks,
   supersedeTask,
   updateAgentStatus
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_registry,
   init_resolver,

package/dist/{cli-nd5s3m4y.js → cli-gpqcs935.js}

@@ -4,11 +4,11 @@ import {
   getEmbeddingProvider,
   init_embedding,
   serializeEmbedding
-} from "./cli-evgy5w3y.js";
+} from "./cli-jew3jda5.js";
 import {
   getDbClient,
   init_db
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_secret_scrubber,
   scrubSecrets

package/dist/{cli-wp7cejrg.js → cli-jbmc0r7r.js}

@@ -1,7 +1,7 @@
 import {
   init_package,
   package_default
-} from "./cli-jh9txj4n.js";
+} from "./cli-zvkq5csn.js";
 
 // src/commands/shared/client-config.ts
 init_package();

package/dist/{cli-evgy5w3y.js → cli-jew3jda5.js}

@@ -11,7 +11,7 @@ import {
   getDbClient,
   init_db,
   isSqliteVecAvailable
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   __esm,
   __export,

package/dist/{cli-4fqn2vpg.js → cli-jvy9qgjs.js}

@@ -1,6 +1,6 @@
 import {
   rewriteSlackMentions
-} from "./cli-awb59f08.js";
+} from "./cli-3bpzj8me.js";
 import {
   bufferedFileFailures,
   buildEffectiveText,
@@ -9,7 +9,7 @@ import {
   extractSlackMessageText,
   fetchSlackFiles,
   notifySlackFileFailures
-} from "./cli-72vksk1n.js";
+} from "./cli-z3wkng35.js";
 import {
   buildBufferFlushBlocks,
   ensureSlackThreadTree,
@@ -18,7 +18,7 @@ import {
   getSlackApp,
   isSlackRenderV2Enabled,
   registerTreeMessage
-} from "./cli-cwvey7n1.js";
+} from "./cli-qn042eh7.js";
 import {
   createLogEntry,
   getAgentById,
@@ -31,7 +31,7 @@ import {
   init_steering,
   requestSteering,
   slackContextKey
-} from "./cli-gacq5hg8.js";
+} from "./cli-zvgj5zg8.js";
 import {
   init_steering_enabled,
   isSteeringEnabled
@@ -154,14 +154,15 @@ var slackBuffer = createAdditiveBuffer({
     await slackFlush(items, key, reason === "manual");
   }
 });
-function bufferThreadMessage(channelId, threadTs, text, userId, ts, files) {
+function bufferThreadMessage(channelId, threadTs, text, userId, ts, files, botUserId) {
   slackBuffer.enqueue(makeKey(channelId, threadTs), {
     text,
     userId,
     ts,
     channelId,
     threadTs,
-    files
+    files,
+    botUserId
   });
 }
 function getBufferMessageCount(key) {
@@ -170,7 +171,7 @@ function getBufferMessageCount(key) {
 async function instantFlush(key) {
   await slackBuffer.instantFlush(key);
 }
-async function getThreadContextForBuffer(channelId, threadTs) {
+async function getThreadContextForBuffer(channelId, threadTs, botUserId) {
   const app = getSlackApp();
   if (!app)
     return "";
@@ -194,7 +195,7 @@ async function getThreadContextForBuffer(channelId, threadTs) {
       return `<@${m.user}>: ${text}`;
     }).join(`
 `);
-    return await rewriteSlackMentions(formatted);
+    return await rewriteSlackMentions(formatted, botUserId);
   } catch (error) {
     console.error("[Slack] Failed to fetch thread context for buffer:", error);
     return "";
@@ -212,6 +213,7 @@ async function slackFlush(items, key, immediate) {
     }
     const { channelId, threadTs } = split;
     const originalRequesterId = items[0].userId;
+    const botUserId = items.find((item) => item.botUserId)?.botUserId;
     console.log(`[Slack] Flushing buffer: ${key} (${items.length} messages, immediate=${immediate})`);
     const app = getSlackApp();
     const files = items.flatMap((item) => item.files ?? []);
@@ -224,7 +226,7 @@ async function slackFlush(items, key, immediate) {
     const resolvedFiles = new Map(inbound.files.map((file) => [file.id, file]));
     const combinedText = await rewriteSlackMentions(items.map((item) => buildEffectiveText(item.text, item.files?.map((file) => resolvedFiles.get(file.id) ?? file), inbound.failed)).join(`
 ---
-`));
+`), botUserId);
     const description = `[Thread follow-up — ${items.length} message(s) buffered]
 
 ${combinedText}`;
@@ -260,7 +262,7 @@ ${combinedText}`;
       return;
     }
     const lead = await getLeadAgent();
-    const threadContext = await getThreadContextForBuffer(channelId, threadTs);
+    const threadContext = await getThreadContextForBuffer(channelId, threadTs, botUserId);
     const fullDescription = threadContext ? `<thread_context>
 ${threadContext}
 </thread_context>