@sentry/junior 0.39.0 → 0.41.0

package/dist/app.js

@@ -3,7 +3,7 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-7QMPV6YJ.js";
+} from "./chunk-7QYONRLH.js";
 import {
   GEN_AI_PROVIDER_NAME,
   MISSING_GATEWAY_CREDENTIALS_ERROR,
@@ -30,7 +30,7 @@ import {
   runNonInteractiveCommand,
   sandboxSkillDir,
   sandboxSkillFile
-} from "./chunk-DVMGFG4W.js";
+} from "./chunk-Y3UO7NR6.js";
 import {
   CredentialUnavailableError,
   buildOAuthTokenRequest,
@@ -66,7 +66,7 @@ import {
   toOptionalString,
   withContext,
   withSpan
-} from "./chunk-EQPY4742.js";
+} from "./chunk-SCE5C645.js";
 import {
   sentry_exports
 } from "./chunk-Z3YD6NHK.js";
@@ -2111,17 +2111,6 @@ function getTurnUserReplyAttachmentContext(message) {
   };
 }
 
-// src/chat/slack/message.ts
-function getSlackMessageTs(message) {
-  if (message.id.endsWith(":message_changed_mention") && message.raw && typeof message.raw === "object") {
-    const ts = message.raw.ts;
-    if (typeof ts === "string" && ts.length > 0) {
-      return ts;
-    }
-  }
-  return message.id;
-}
-
 // src/chat/services/conversation-memory.ts
 var CONTEXT_COMPACTION_TRIGGER_TOKENS = 9e3;
 var CONTEXT_COMPACTION_TARGET_TOKENS = 7e3;
@@ -2129,7 +2118,6 @@ var CONTEXT_MIN_LIVE_MESSAGES = 12;
 var CONTEXT_COMPACTION_BATCH_SIZE = 24;
 var CONTEXT_MAX_COMPACTIONS = 16;
 var CONTEXT_MAX_MESSAGE_CHARS = 3200;
-var BACKFILL_MESSAGE_LIMIT = 80;
 function generateConversationId(prefix) {
   return `${prefix}_${Date.now()}_${Math.random().toString(36).slice(2, 10)}`;
 }
@@ -2308,7 +2296,7 @@ async function summarizeConversationChunk(messages, conversation, context, deps)
         modelId: botConfig.fastModelId
       },
       {
-        "error.message": error instanceof Error ? error.message : String(error),
+        "exception.message": error instanceof Error ? error.message : String(error),
         "app.compaction_messages_covered": messages.length
       },
       "Compaction summarization failed; using fallback summary"
@@ -2406,95 +2394,6 @@ function createConversationMemoryService(deps) {
     generateThreadTitle: async (sourceText) => await generateThreadTitleWithDeps(sourceText, deps)
   };
 }
-var defaultConversationMemoryService = createConversationMemoryService({
-  completeText
-});
-var compactConversationIfNeeded = defaultConversationMemoryService.compactConversationIfNeeded;
-var generateThreadTitle = defaultConversationMemoryService.generateThreadTitle;
-function createConversationMessageFromSdkMessage(entry) {
-  const rawText = normalizeConversationText(entry.text);
-  if (!rawText) {
-    return null;
-  }
-  return {
-    id: entry.id,
-    role: entry.author.isMe ? "assistant" : "user",
-    text: rawText,
-    createdAtMs: entry.metadata.dateSent.getTime(),
-    author: {
-      userId: entry.author.userId,
-      userName: entry.author.userName,
-      fullName: entry.author.fullName,
-      isBot: typeof entry.author.isBot === "boolean" ? entry.author.isBot : void 0
-    },
-    meta: {
-      slackTs: getSlackMessageTs(entry)
-    }
-  };
-}
-async function seedConversationBackfill(thread, conversation, currentTurn) {
-  if (conversation.backfill.completedAtMs) {
-    return;
-  }
-  if (conversation.messages.length > 0 || conversation.compactions.length > 0) {
-    conversation.backfill = {
-      completedAtMs: Date.now(),
-      source: "recent_messages"
-    };
-    updateConversationStats(conversation);
-    return;
-  }
-  const seeded = [];
-  let source = "recent_messages";
-  try {
-    const fetchedNewestFirst = [];
-    for await (const entry of thread.messages) {
-      fetchedNewestFirst.push(entry);
-      if (fetchedNewestFirst.length >= BACKFILL_MESSAGE_LIMIT) {
-        break;
-      }
-    }
-    fetchedNewestFirst.reverse();
-    for (const entry of fetchedNewestFirst) {
-      const message = createConversationMessageFromSdkMessage(entry);
-      if (message) {
-        seeded.push(message);
-      }
-    }
-    if (seeded.length > 0) {
-      source = "thread_fetch";
-    }
-  } catch {
-  }
-  if (seeded.length === 0) {
-    try {
-      await thread.refresh();
-    } catch {
-    }
-    const fromRecent = thread.recentMessages.slice(-BACKFILL_MESSAGE_LIMIT);
-    for (const entry of fromRecent) {
-      const message = createConversationMessageFromSdkMessage(entry);
-      if (message) {
-        seeded.push(message);
-      }
-    }
-    source = "recent_messages";
-  }
-  for (const message of seeded) {
-    if (message.id !== currentTurn.messageId && message.createdAtMs > currentTurn.messageCreatedAtMs) {
-      continue;
-    }
-    if (message.id !== currentTurn.messageId && message.createdAtMs === currentTurn.messageCreatedAtMs && message.id > currentTurn.messageId) {
-      continue;
-    }
-    upsertConversationMessage(conversation, message);
-  }
-  conversation.backfill = {
-    completedAtMs: Date.now(),
-    source
-  };
-  updateConversationStats(conversation);
-}
 function isHumanConversationMessage(message) {
   return message.role === "user" && message.author?.isBot !== true;
 }
@@ -2509,20 +2408,17 @@ import { Agent as Agent2 } from "@mariozechner/pi-agent-core";
 import fs from "fs";
 import path2 from "path";
 
-// src/chat/runtime/status-format.ts
+// src/chat/slack/status-format.ts
 var SLACK_STATUS_MAX_LENGTH = 50;
-function truncateWithEllipsis(text, maxLength) {
-  if (text.length <= maxLength) {
-    return text;
-  }
-  return `${text.slice(0, Math.max(1, maxLength - 3)).trimEnd()}...`;
-}
 function truncateStatusText(text) {
   const trimmed = text.trim();
   if (!trimmed) {
     return "";
   }
-  return truncateWithEllipsis(trimmed, SLACK_STATUS_MAX_LENGTH);
+  if (trimmed.length <= SLACK_STATUS_MAX_LENGTH) {
+    return trimmed;
+  }
+  return `${trimmed.slice(0, SLACK_STATUS_MAX_LENGTH - 3).trimEnd()}...`;
 }
 
 // src/chat/slack/mrkdwn.ts
@@ -2830,7 +2726,7 @@ function loadSoul() {
     "soul_load_fallback",
     {},
     {
-      "file.candidates": soulPathCandidates()
+      "app.file.candidates": soulPathCandidates()
     },
     "SOUL.md not found; using built-in default personality"
   );
@@ -2847,7 +2743,7 @@ var JUNIOR_PERSONALITY = (() => {
       "soul_load_failed",
       {},
       {
-        "error.message": error instanceof Error ? error.message : String(error)
+        "exception.message": error instanceof Error ? error.message : String(error)
       },
       "Failed to load SOUL.md; using built-in default personality"
     );
@@ -2862,7 +2758,7 @@ var JUNIOR_WORLD = (() => {
       "world_load_failed",
       {},
       {
-        "error.message": error instanceof Error ? error.message : String(error)
+        "exception.message": error instanceof Error ? error.message : String(error)
       },
       "Failed to load WORLD.md; omitting world prompt context"
     );
@@ -3424,7 +3320,7 @@ var SkillCapabilityRuntime = class {
         {
           "app.skill.name": input.activeSkill?.name,
           "app.credential.provider": provider,
-          "error.message": error instanceof Error ? error.message : String(error)
+          "exception.message": error instanceof Error ? error.message : String(error)
         },
         "Provider credential resolution failed"
       );
@@ -3494,7 +3390,10 @@ var TestCredentialBroker = class {
   async issue(input) {
     const token = process.env.EVAL_TEST_CREDENTIAL_TOKEN?.trim() || "eval-test-token";
     const expiresAt = new Date(Date.now() + 5 * 60 * 1e3).toISOString();
-    const env = this.config.envKey && this.config.placeholder ? { [this.config.envKey]: this.config.placeholder } : {};
+    const env = {
+      ...this.config.env ?? {},
+      ...this.config.envKey && this.config.placeholder ? { [this.config.envKey]: this.config.placeholder } : {}
+    };
     const tokenTransforms = this.config.domains?.map((domain) => ({
       domain,
       headers: {
@@ -3551,7 +3450,8 @@ function createSkillCapabilityRuntime(options = {}) {
     if (!credentials) {
       brokersByProvider[name] = useTestBroker ? new TestCredentialBroker({
         provider: name,
-        headerTransforms: () => resolveTestApiHeaderTransforms(plugin.manifest)
+        headerTransforms: () => resolveTestApiHeaderTransforms(plugin.manifest),
+        ...plugin.manifest.commandEnv ? { env: plugin.manifest.commandEnv } : {}
       }) : createPluginBroker(name, { userTokenStore });
       continue;
     }
@@ -3563,6 +3463,7 @@ function createSkillCapabilityRuntime(options = {}) {
       ...apiHeaders ? {
         headerTransforms: () => resolveTestApiHeaderTransforms(plugin.manifest)
       } : {},
+      ...plugin.manifest.commandEnv ? { env: plugin.manifest.commandEnv } : {},
       envKey: credentials.authTokenEnv,
       placeholder
     }) : createPluginBroker(name, { userTokenStore });
@@ -4523,7 +4424,7 @@ var McpToolManager = class {
           const errorAttributes = {
             ...baseAttributes,
             "error.type": getMcpAwareErrorType(error, "mcp_tool_error"),
-            "error.message": getMcpAwareErrorMessage(error)
+            "exception.message": getMcpAwareErrorMessage(error)
           };
           setSpanAttributes(errorAttributes);
           if (error instanceof McpToolError) {
@@ -5511,7 +5412,7 @@ async function enrichImagePrompt(rawPrompt) {
     logWarn(
       "image_prompt_enrichment_failed",
       {},
-      { "error.message": String(error) },
+      { "exception.message": String(error) },
       "Image prompt enrichment failed, using raw prompt"
     );
     return rawPrompt;
@@ -6111,6 +6012,7 @@ async function listThreadReplies(input) {
       (value) => typeof value === "string" && value.length > 0
     )
   );
+  const hasTargetMessages = pendingTargets.size > 0;
   const replies = [];
   let cursor;
   let pages = 0;
@@ -6135,7 +6037,7 @@ async function listThreadReplies(input) {
       }
     }
     cursor = response.response_metadata?.next_cursor || void 0;
-    if (!cursor || pendingTargets.size === 0) {
+    if (!cursor || hasTargetMessages && pendingTargets.size === 0) {
       break;
     }
   }
@@ -7151,13 +7053,236 @@ function createSlackListUpdateItemTool(state) {
   });
 }
 
-// src/chat/tools/system-time.ts
+// src/chat/tools/slack/thread-read.ts
 import { Type as Type18 } from "@sinclair/typebox";
+
+// src/chat/tools/slack/slack-message-url.ts
+var SLACK_HOST_PATTERN = /^[a-z0-9-]+\.slack(?:-gov)?\.com$/;
+var ARCHIVE_PATH_PATTERN = /^\/archives\/([CDG][A-Z0-9]+)\/p(\d{10})(\d{6})$/;
+var SLACK_TS_PATTERN = /^\d{10}\.\d{6}$/;
+function pTimestampToTs(seconds, micros) {
+  return `${seconds}.${micros}`;
+}
+function unwrapMrkdwn(input) {
+  const trimmed = input.trim();
+  if (trimmed.startsWith("<") && trimmed.endsWith(">")) {
+    const inner = trimmed.slice(1, -1);
+    const pipeIndex = inner.indexOf("|");
+    return pipeIndex >= 0 ? inner.slice(0, pipeIndex) : inner;
+  }
+  return trimmed;
+}
+function parseSlackMessageReference(input) {
+  const raw = unwrapMrkdwn(input);
+  let parsed;
+  try {
+    parsed = new URL(raw);
+  } catch {
+    return { ok: false, error: "Input is not a valid URL" };
+  }
+  if (parsed.protocol !== "https:") {
+    return { ok: false, error: "Slack archive URL must use HTTPS" };
+  }
+  if (!SLACK_HOST_PATTERN.test(parsed.hostname)) {
+    return { ok: false, error: "Not a Slack archive URL" };
+  }
+  const pathMatch = ARCHIVE_PATH_PATTERN.exec(parsed.pathname);
+  if (!pathMatch) {
+    return { ok: false, error: "URL path does not match Slack archive format" };
+  }
+  const channelId = pathMatch[1];
+  const messageTs = pTimestampToTs(pathMatch[2], pathMatch[3]);
+  const params = new URLSearchParams(parsed.search.replace(/&amp;/g, "&"));
+  const threadTs = params.get("thread_ts") || void 0;
+  if (threadTs && !SLACK_TS_PATTERN.test(threadTs)) {
+    return { ok: false, error: "Invalid thread timestamp in URL" };
+  }
+  return {
+    ok: true,
+    reference: { channelId, messageTs, threadTs }
+  };
+}
+
+// src/chat/tools/slack/thread-read.ts
+var MAX_THREAD_READ_CHARS = 4e4;
+function sanitizeMessage(msg) {
+  return {
+    ts: msg.ts,
+    user: msg.user,
+    text: msg.text,
+    thread_ts: msg.thread_ts,
+    subtype: msg.subtype,
+    bot_id: msg.bot_id,
+    type: msg.type,
+    ...msg.files?.length ? {
+      files: msg.files.map((f) => ({
+        id: f.id,
+        name: f.name,
+        mimetype: f.mimetype,
+        size: f.size
+      }))
+    } : {}
+  };
+}
+function truncateMessages(messages, maxChars) {
+  let chars = 0;
+  const kept = [];
+  for (const msg of messages) {
+    const textLen = msg.text?.length ?? 0;
+    if (kept.length > 0 && chars + textLen > maxChars) {
+      break;
+    }
+    kept.push(msg);
+    chars += textLen;
+  }
+  return { messages: kept, omitted: messages.length - kept.length };
+}
+function checkChannelAccess(targetChannelId, currentChannelId) {
+  const target = normalizeSlackConversationId(targetChannelId);
+  const current = normalizeSlackConversationId(currentChannelId);
+  if (!target) {
+    return { allowed: false, error: "Invalid Slack channel ID." };
+  }
+  if (target.startsWith("C")) {
+    return { allowed: true };
+  }
+  if (target === current) {
+    return { allowed: true };
+  }
+  return {
+    allowed: false,
+    error: "Cannot read private channels or DMs unless the link is from the current conversation."
+  };
+}
+function createSlackThreadReadTool(context) {
+  return tool({
+    description: "Read a Slack thread from a shared Slack message archive URL or explicit channel + timestamp. Use when the user shares a Slack message link (https://*.slack.com/archives/...) and you need the referenced message and its thread context. Public channel links can be read if the bot has access; private channels and DMs are only readable when they are the current conversation.",
+    annotations: { readOnlyHint: true, destructiveHint: false },
+    inputSchema: Type18.Object({
+      url: Type18.Optional(
+        Type18.String({
+          minLength: 1,
+          description: "Slack message archive URL, e.g. https://workspace.slack.com/archives/C123/p1700000000123456"
+        })
+      ),
+      channel_id: Type18.Optional(
+        Type18.String({
+          minLength: 1,
+          description: "Slack channel/conversation ID (e.g. C123). Use with `ts` as an alternative to `url`."
+        })
+      ),
+      ts: Type18.Optional(
+        Type18.String({
+          minLength: 1,
+          description: "Slack message timestamp (e.g. 1700000000.123456). May be the thread root or any message in the thread."
+        })
+      ),
+      limit: Type18.Optional(
+        Type18.Integer({
+          minimum: 1,
+          maximum: 1e3,
+          description: "Maximum number of thread messages to fetch."
+        })
+      ),
+      max_pages: Type18.Optional(
+        Type18.Integer({
+          minimum: 1,
+          maximum: 10,
+          description: "Maximum number of Slack API pages to traverse."
+        })
+      )
+    }),
+    execute: async ({ url, channel_id, ts, limit, max_pages }) => {
+      let channelId;
+      let messageTs;
+      let threadTs;
+      if (url) {
+        const parsed = parseSlackMessageReference(url);
+        if (!parsed.ok) {
+          return { ok: false, error: parsed.error };
+        }
+        channelId = parsed.reference.channelId;
+        messageTs = parsed.reference.messageTs;
+        threadTs = parsed.reference.threadTs;
+      } else if (channel_id && ts) {
+        if (!SLACK_TS_PATTERN.test(ts)) {
+          return { ok: false, error: "Invalid Slack message timestamp." };
+        }
+        channelId = channel_id;
+        messageTs = ts;
+      } else {
+        return {
+          ok: false,
+          error: "Provide either a Slack message `url` or both `channel_id` and `ts`."
+        };
+      }
+      const access = checkChannelAccess(channelId, context.channelId);
+      if (!access.allowed) {
+        return {
+          ok: false,
+          channel_id: channelId,
+          target_message_ts: messageTs,
+          error: access.error
+        };
+      }
+      const lookupTs = threadTs ?? messageTs;
+      let replies;
+      try {
+        replies = await listThreadReplies({
+          channelId,
+          threadTs: lookupTs,
+          limit: limit ?? 1e3,
+          maxPages: max_pages
+        });
+      } catch (error) {
+        if (error instanceof SlackActionError) {
+          return {
+            ok: false,
+            channel_id: channelId,
+            target_message_ts: messageTs,
+            error: "Could not read this Slack thread. The bot may not be in the channel or may lack history scopes.",
+            slack_error: error.apiError
+          };
+        }
+        throw error;
+      }
+      if (replies.length === 0) {
+        return {
+          ok: false,
+          channel_id: channelId,
+          target_message_ts: messageTs,
+          error: "No messages found for this thread."
+        };
+      }
+      const root = replies[0];
+      const resolvedThreadTs = threadTs ?? root?.thread_ts ?? root?.ts ?? lookupTs;
+      const sanitized = replies.map(sanitizeMessage);
+      const { messages, omitted } = truncateMessages(
+        sanitized,
+        MAX_THREAD_READ_CHARS
+      );
+      return {
+        ok: true,
+        channel_id: channelId,
+        target_message_ts: messageTs,
+        thread_ts: resolvedThreadTs,
+        count: messages.length,
+        fetched_count: replies.length,
+        truncated: omitted > 0,
+        ...omitted > 0 ? { omitted_message_count: omitted } : {},
+        messages
+      };
+    }
+  });
+}
+
+// src/chat/tools/system-time.ts
+import { Type as Type19 } from "@sinclair/typebox";
 function createSystemTimeTool() {
   return tool({
     description: "Return current system time in UTC and local ISO formats. Use when the user asks for current time/date context. Do not use as a substitute for historical or timezone-conversion research.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: Type18.Object({}),
+    inputSchema: Type19.Object({}),
     execute: async () => {
       const now = /* @__PURE__ */ new Date();
       return {
@@ -7175,7 +7300,7 @@ function createSystemTimeTool() {
 import {
   Agent
 } from "@mariozechner/pi-agent-core";
-import { Type as Type19 } from "@sinclair/typebox";
+import { Type as Type20 } from "@sinclair/typebox";
 
 // src/chat/respond-helpers.ts
 var MAX_INLINE_ATTACHMENT_BASE64_CHARS = 12e4;
@@ -7463,12 +7588,12 @@ function createAdvisorTool(context) {
   const spanContext = context.logContext ?? {};
   return tool({
     description: ADVISOR_TOOL_DESCRIPTION,
-    inputSchema: Type19.Object({
-      question: Type19.String({
+    inputSchema: Type20.Object({
+      question: Type20.String({
         minLength: 1,
         description: "Focused advisor question or decision point."
       }),
-      context: Type19.String({
+      context: Type20.String({
         minLength: 1,
         description: "Curated evidence packet: relevant requirements, constraints, current plan, alternatives, code snippets, diffs, command output, and open questions."
       })
@@ -7580,7 +7705,7 @@ function createAdvisorTool(context) {
 }
 
 // src/chat/tools/web/fetch-tool.ts
-import { Type as Type20 } from "@sinclair/typebox";
+import { Type as Type21 } from "@sinclair/typebox";
 
 // src/chat/tools/web/constants.ts
 var USER_AGENT = "junior-bot/0.1";
@@ -7933,13 +8058,13 @@ function createWebFetchTool(hooks) {
       destructiveHint: false,
       openWorldHint: true
     },
-    inputSchema: Type20.Object({
-      url: Type20.String({
+    inputSchema: Type21.Object({
+      url: Type21.String({
         minLength: 1,
         description: "HTTP(S) URL to fetch."
       }),
-      max_chars: Type20.Optional(
-        Type20.Integer({
+      max_chars: Type21.Optional(
+        Type21.Integer({
           minimum: 500,
           maximum: MAX_FETCH_CHARS,
           description: "Optional maximum number of extracted characters to return."
@@ -7999,7 +8124,7 @@ function createWebFetchTool(hooks) {
 // src/chat/tools/web/search.ts
 import { generateText } from "ai";
 import { createGatewayProvider } from "@ai-sdk/gateway";
-import { Type as Type21 } from "@sinclair/typebox";
+import { Type as Type22 } from "@sinclair/typebox";
 var SEARCH_TIMEOUT_MS = 6e4;
 var MAX_RESULTS2 = 5;
 var DEFAULT_SEARCH_MODEL = "xai/grok-4-fast-reasoning";
@@ -8047,14 +8172,14 @@ function createWebSearchTool() {
       destructiveHint: false,
       openWorldHint: true
     },
-    inputSchema: Type21.Object({
-      query: Type21.String({
+    inputSchema: Type22.Object({
+      query: Type22.String({
         minLength: 1,
         maxLength: 500,
         description: "Search query."
       }),
-      max_results: Type21.Optional(
-        Type21.Integer({
+      max_results: Type22.Optional(
+        Type22.Integer({
           minimum: 1,
           maximum: MAX_RESULTS2,
           description: "Max results to return."
@@ -8123,20 +8248,20 @@ function createWebSearchTool() {
 }
 
 // src/chat/tools/sandbox/write-file.ts
-import { Type as Type22 } from "@sinclair/typebox";
+import { Type as Type23 } from "@sinclair/typebox";
 function createWriteFileTool() {
   return tool({
     description: "Write UTF-8 content to a file in the sandbox workspace. Use for intentional file creation or replacement after validation. Do not use for exploratory analysis-only turns.",
     promptSnippet: "new file or deliberate full-file replacement",
     promptGuidelines: ["targeted existing-file changes: editFile"],
     executionMode: "sequential",
-    inputSchema: Type22.Object(
+    inputSchema: Type23.Object(
       {
-        path: Type22.String({
+        path: Type23.String({
           minLength: 1,
           description: "Path to write in the sandbox workspace."
         }),
-        content: Type22.String({
+        content: Type23.String({
           description: "UTF-8 file content to write."
         })
       },
@@ -8209,6 +8334,7 @@ function createTools(availableSkills, hooks = {}, context) {
     ),
     slackCanvasRead: createSlackCanvasReadTool(),
     slackCanvasUpdate: createSlackCanvasUpdateTool(state, context),
+    slackThreadRead: createSlackThreadReadTool(context),
     slackListCreate: createSlackListCreateTool(state),
     slackListAddItems: createSlackListAddItemsTool(state),
     slackListGetItems: createSlackListGetItemsTool(state),
@@ -8278,7 +8404,7 @@ function extractHttpErrorDetails(error, options = {}) {
   const err = error ?? {};
   const attributes = {
     "error.type": normalizedError.name || "Error",
-    "error.message": toTrimmedString(normalizedError.message, previewLimit) ?? "HTTP error"
+    "exception.message": toTrimmedString(normalizedError.message, previewLimit) ?? "HTTP error"
   };
   const response = err.response;
   const statusCode = typeof response?.status === "number" ? response.status : void 0;
@@ -9145,7 +9271,7 @@ function createSandboxSessionManager(options) {
       "sandbox_network_policy_restore_failed",
       traceContext,
       {
-        "error.message": reason instanceof Error ? reason.message : String(reason)
+        "exception.message": reason instanceof Error ? reason.message : String(reason)
       },
       "Sandbox network policy restore failed; discarding sandbox instance"
     );
@@ -10139,7 +10265,7 @@ function handleToolExecutionError(error, toolName, toolCallId, shouldTrace, trac
         "gen_ai.tool.name": toolName,
         ...toolCallId ? { "gen_ai.tool.call.id": toolCallId } : {},
         "error.type": errorType,
-        "error.message": errorMessage
+        "exception.message": errorMessage
       },
       "Agent tool call failed"
     );
@@ -11385,8 +11511,6 @@ async function generateAssistantReply(messageText, context = {}) {
     const shouldTrace = shouldEmitDevAgentTrace();
     const spanContext = {
       conversationId: context.correlation?.conversationId ?? context.correlation?.threadId ?? context.correlation?.runId,
-      turnId: context.correlation?.turnId,
-      agentId: context.correlation?.turnId,
       slackThreadId: context.correlation?.threadId,
       slackUserId: context.correlation?.requesterId,
       slackChannelId: context.correlation?.channelId,
@@ -11409,7 +11533,7 @@ async function generateAssistantReply(messageText, context = {}) {
         {
           "app.skill.count": availableSkills.length,
           "app.skill.names": availableSkills.map((skill) => skill.name).sort(),
-          "file.directories": roots,
+          "app.file.directories": roots,
           "app.plugin.count": plugins.length,
           "app.plugin.names": plugins.map((plugin) => plugin.manifest.name).sort()
         },
@@ -11649,8 +11773,6 @@ async function generateAssistantReply(messageText, context = {}) {
     };
     setTags({
       conversationId: spanContext.conversationId,
-      turnId: spanContext.turnId,
-      agentId: spanContext.agentId,
       slackThreadId: context.correlation?.threadId,
       slackUserId: context.correlation?.requesterId,
       slackChannelId: context.correlation?.channelId,
@@ -11795,7 +11917,7 @@ async function generateAssistantReply(messageText, context = {}) {
           spanContext,
           {
             "gen_ai.tool.name": toolName,
-            "error.message": error instanceof Error ? error.message : String(error)
+            "exception.message": error instanceof Error ? error.message : String(error)
           },
           "Tool invocation observer failed"
         );
@@ -11839,7 +11961,7 @@ async function generateAssistantReply(messageText, context = {}) {
             "streaming_message_start_error",
             {},
             {
-              "error.message": error instanceof Error ? error.message : String(error)
+              "exception.message": error instanceof Error ? error.message : String(error)
             },
             "Failed to deliver assistant message start to stream coordinator"
           );
@@ -11861,7 +11983,7 @@ async function generateAssistantReply(messageText, context = {}) {
           "streaming_text_delta_error",
           {},
           {
-            "error.message": error instanceof Error ? error.message : String(error)
+            "exception.message": error instanceof Error ? error.message : String(error)
           },
           "Failed to deliver text delta to stream"
         );
@@ -11947,8 +12069,7 @@ async function generateAssistantReply(messageText, context = {}) {
           ) ? usageSummary : void 0;
           setSpanAttributes({
             ...outputMessagesAttribute ? { "gen_ai.output.messages": outputMessagesAttribute } : {},
-            ...usageSummary.inputTokens !== void 0 ? { "gen_ai.usage.input_tokens": usageSummary.inputTokens } : {},
-            ...usageSummary.outputTokens !== void 0 ? { "gen_ai.usage.output_tokens": usageSummary.outputTokens } : {}
+            ...extractGenAiUsageAttributes(usageSummary)
           });
           if (getPendingAuthPause()) {
             timeoutResumeMessages = [...agent.state.messages];
@@ -12113,7 +12234,7 @@ async function generateAssistantReply(messageText, context = {}) {
         "mcp_tool_manager_close_failed",
         {},
         {
-          "error.message": closeError instanceof Error ? closeError.message : String(closeError)
+          "exception.message": closeError instanceof Error ? closeError.message : String(closeError)
         },
         "Failed to close MCP tool manager"
       );
@@ -12178,7 +12299,7 @@ function getAgentTurnDiagnosticsAttributes(reply) {
     ...reply.diagnostics.stopReason ? {
       "gen_ai.response.finish_reasons": [reply.diagnostics.stopReason]
     } : {},
-    ...reply.diagnostics.errorMessage ? { "error.message": reply.diagnostics.errorMessage } : {}
+    ...reply.diagnostics.errorMessage ? { "exception.message": reply.diagnostics.errorMessage } : {}
   };
 }
 function finalizeFailedTurnReply(args) {
@@ -12534,7 +12655,7 @@ function logAssistantStatusFailure(args) {
       "app.slack.channel_id_raw": args.channelId,
       "app.slack.channel_id": args.normalizedChannelId,
       "app.slack.thread_ts": args.threadTs,
-      "error.message": args.error instanceof Error ? args.error.message : String(args.error)
+      "exception.message": args.error instanceof Error ? args.error.message : String(args.error)
     },
     `Failed to update assistant status channel=${args.normalizedChannelId} raw=${args.channelId} thread=${args.threadTs}`
   );
@@ -12572,24 +12693,18 @@ function createSlackWebApiAssistantStatusSession(args) {
 
 // src/chat/slack/footer.ts
 var SENTRY_CONVERSATION_SEARCH_STATS_PERIOD = "14d";
-var ORG_ID_HOST_RE = /^o(\d+)\./;
 function escapeSlackMrkdwn(text) {
   return text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;");
 }
 function escapeSlackLinkUrl(url) {
   return url.replaceAll("&", "&amp;").replaceAll("<", "%3C").replaceAll(">", "%3E");
 }
-function toOptionalString2(value) {
-  if (typeof value === "number" && Number.isFinite(value)) {
-    return String(value);
-  }
-  return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
 function quoteSentrySearchValue(value) {
   return `"${value.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
 }
-function getDsnOrgId(host) {
-  return host?.match(ORG_ID_HOST_RE)?.[1];
+function getSentryOrgSlug() {
+  const slug = process.env.SENTRY_ORG_SLUG?.trim();
+  return slug || void 0;
 }
 function isSentrySaasDsnHost(host) {
   return host === "sentry.io" || host.endsWith(".sentry.io");
@@ -12608,8 +12723,8 @@ function getSentryConversationSearchUrl(conversationId) {
   if (!dsn?.host || !dsn.projectId) {
     return void 0;
   }
-  const orgId = toOptionalString2(client2?.getOptions().orgId) ?? getDsnOrgId(dsn.host);
-  if (!orgId) {
+  const orgSlug = getSentryOrgSlug();
+  if (!orgSlug) {
     return void 0;
   }
   const params = new URLSearchParams();
@@ -12619,7 +12734,11 @@ function getSentryConversationSearchUrl(conversationId) {
   );
   params.set("project", dsn.projectId);
   params.set("statsPeriod", SENTRY_CONVERSATION_SEARCH_STATS_PERIOD);
-  return `${buildSentryWebBaseUrl(dsn)}/organizations/${orgId}/explore/traces/?${params.toString()}`;
+  const search = `explore/traces/?${params.toString()}`;
+  if (isSentrySaasDsnHost(dsn.host)) {
+    return `https://${orgSlug}.sentry.io/${search}`;
+  }
+  return `${buildSentryWebBaseUrl(dsn)}/organizations/${orgSlug}/${search}`;
 }
 function formatSlackTokenCount(value) {
   if (value >= 1e6) {
@@ -12870,7 +12989,7 @@ async function postSlackApiReplyPosts(args) {
   return lastPostedMessageTs;
 }
 
-// src/chat/slack/resume.ts
+// src/chat/runtime/slack-resume.ts
 function resolveReplyTimeoutMs(explicitTimeoutMs) {
   if (typeof explicitTimeoutMs === "number" && explicitTimeoutMs > 0) {
     return explicitTimeoutMs;
@@ -12970,20 +13089,12 @@ async function handleResumeFailure(args) {
   );
   await args.resumeArgs.onFailure?.(args.error);
   const eventId = requireTurnFailureEventId(capturedEventId, args.eventName);
-  let postError;
-  try {
-    await postResumeFailureReply({
-      channelId: args.resumeArgs.channelId,
-      threadTs: args.resumeArgs.threadTs,
-      eventId,
-      logContext
-    });
-  } catch (error) {
-    postError = error;
-  }
-  if (postError) {
-    throw postError;
-  }
+  await postResumeFailureReply({
+    channelId: args.resumeArgs.channelId,
+    threadTs: args.resumeArgs.threadTs,
+    eventId,
+    logContext
+  });
 }
 function createResumeReplyContext(args, statusSession) {
   const replyContext = args.replyContext ?? {};
@@ -13017,8 +13128,7 @@ function createResumeReplyContext(args, statusSession) {
   };
 }
 async function resumeSlackTurn(args) {
-  const requesterUserId = args.replyContext?.requester?.userId;
-  if (!requesterUserId) {
+  if (!args.replyContext?.requester?.userId) {
     throw new Error("Resumed turn requires replyContext.requester.userId");
   }
   const stateAdapter = getStateAdapter();
@@ -13048,9 +13158,7 @@ async function resumeSlackTurn(args) {
     status.start();
     const generateReply = args.generateReply ?? generateAssistantReply;
     const replyContext = createResumeReplyContext(args, status);
-    const replyPromise = generateReply(args.messageText, {
-      ...replyContext
-    });
+    const replyPromise = generateReply(args.messageText, replyContext);
     const replyTimeoutMs = resolveReplyTimeoutMs(args.replyTimeoutMs);
     let reply = typeof replyTimeoutMs === "number" ? await Promise.race([
       replyPromise,
@@ -13087,13 +13195,15 @@ async function resumeSlackTurn(args) {
     await args.onSuccess?.(reply);
   } catch (error) {
     await status.stop();
-    if ((isRetryableTurnError(error, "mcp_auth_resume") || isRetryableTurnError(error, "plugin_auth_resume")) && args.onAuthPause) {
+    const onAuthPause = args.onAuthPause;
+    const onTimeoutPause = args.onTimeoutPause;
+    if ((isRetryableTurnError(error, "mcp_auth_resume") || isRetryableTurnError(error, "plugin_auth_resume")) && onAuthPause) {
       deferredPauseHandler = async () => {
-        await args.onAuthPause?.(error);
+        await onAuthPause(error);
       };
-    } else if (isRetryableTurnError(error, "turn_timeout_resume") && args.onTimeoutPause) {
+    } else if (isRetryableTurnError(error, "turn_timeout_resume") && onTimeoutPause) {
       deferredPauseHandler = async () => {
-        await args.onTimeoutPause?.(error);
+        await onTimeoutPause(error);
       };
     } else {
       deferredFailureHandler = async () => {
@@ -13519,7 +13629,7 @@ async function resumeAuthorizedMcpTurn(args) {
         {},
         {
           "app.credential.provider": provider,
-          ...isRetryableTurnError(error) ? { "app.turn.retryable_reason": error.reason } : {}
+          ...isRetryableTurnError(error) ? { "app.ai.retryable_reason": error.reason } : {}
         },
         "Resumed MCP turn requested another authorization flow"
       );
@@ -14785,73 +14895,7 @@ async function decideSubscribedThreadReply(args) {
   }
 }
 
-// src/chat/runtime/thread-context.ts
-function escapeRegExp3(value) {
-  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function stripLeadingBotMention(text, options = {}) {
-  if (!text.trim()) return text;
-  let next = text;
-  if (options.stripLeadingSlackMentionToken) {
-    next = next.replace(/^\s*<@[^>]+>[\s,:-]*/, "").trim();
-  }
-  const mentionByNameRe = new RegExp(
-    `^\\s*@${escapeRegExp3(botConfig.userName)}\\b[\\s,:-]*`,
-    "i"
-  );
-  next = next.replace(mentionByNameRe, "").trim();
-  const mentionByLabeledEntityRe = new RegExp(
-    `^\\s*<@[^>|]+\\|${escapeRegExp3(botConfig.userName)}>[\\s,:-]*`,
-    "i"
-  );
-  next = next.replace(mentionByLabeledEntityRe, "").trim();
-  return next;
-}
-function getThreadId(thread, _message) {
-  return toOptionalString(thread.id);
-}
-function getRunId(thread, message) {
-  return toOptionalString(thread.runId) ?? toOptionalString(message.runId);
-}
-function getChannelId(thread, message) {
-  return resolveSlackChannelIdFromThreadId(toOptionalString(thread.id)) ?? normalizeSlackConversationId(toOptionalString(thread.channelId)) ?? resolveSlackChannelIdFromMessage(message);
-}
-function getThreadTs(threadId) {
-  return parseSlackThreadId(threadId)?.threadTs;
-}
-function getAssistantThreadContext(message) {
-  const raw = message.raw;
-  const rawRecord = raw && typeof raw === "object" ? raw : void 0;
-  const channelId = toOptionalString(rawRecord?.channel);
-  if (channelId) {
-    const rawThreadTs = toOptionalString(rawRecord?.thread_ts);
-    const threadTs = isDmChannel(channelId) ? rawThreadTs : rawThreadTs ?? toOptionalString(rawRecord?.ts);
-    if (threadTs) {
-      return { channelId, threadTs };
-    }
-  }
-  const parsedThreadId = parseSlackThreadId(
-    toOptionalString(message.threadId)
-  );
-  if (!parsedThreadId || isDmChannel(parsedThreadId.channelId)) {
-    return void 0;
-  }
-  return parsedThreadId;
-}
-function getMessageTs(message) {
-  const directTs = toOptionalString(
-    message.ts
-  );
-  if (directTs) {
-    return directTs;
-  }
-  const raw = message.raw;
-  if (!raw || typeof raw !== "object") {
-    return void 0;
-  }
-  const rawRecord = raw;
-  return toOptionalString(rawRecord.ts) ?? toOptionalString(rawRecord.event_ts) ?? toOptionalString(rawRecord.message?.ts);
-}
+// src/chat/slack/errors.ts
 function getSlackApiErrorCode(error) {
   if (!error || typeof error !== "object") {
     return void 0;
@@ -15000,7 +15044,7 @@ function createSlackTurnRuntime(deps) {
             error,
             "mention_handler_auth_pause",
             errorContext,
-            { "app.turn.retryable_reason": error.reason },
+            { "app.ai.retryable_reason": error.reason },
             "onNewMention parked turn for auth resume"
           );
           return;
@@ -15135,7 +15179,7 @@ function createSlackTurnRuntime(deps) {
             error,
             "subscribed_message_handler_auth_pause",
             errorContext,
-            { "app.turn.retryable_reason": error.reason },
+            { "app.ai.retryable_reason": error.reason },
             "onSubscribedMessage parked turn for auth resume"
           );
           return;
@@ -15282,7 +15326,7 @@ async function lookupSlackUser(userId) {
       {},
       {
         "enduser.id": userId,
-        "error.message": error instanceof Error ? error.message : String(error)
+        "exception.message": error instanceof Error ? error.message : String(error)
       },
       "Slack user lookup failed with exception"
     );
@@ -15310,7 +15354,7 @@ function createSubscribedReplyPolicy(deps) {
             modelId: botConfig.fastModelId
           },
           {
-            "error.message": error instanceof Error ? error.message : String(error)
+            "exception.message": error instanceof Error ? error.message : String(error)
           },
           "Subscribed-message classifier failed; skipping reply"
         );
@@ -15522,7 +15566,7 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
           },
           {
             "file.size": data.byteLength,
-            "file.mime_type": mediaType
+            "app.file.mime_type": mediaType
           },
           "Skipping user attachment that exceeds size limit"
         );
@@ -15546,8 +15590,8 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
             modelId: botConfig.visionModelId ?? botConfig.modelId
           },
           {
-            "error.message": error instanceof Error ? error.message : String(error),
-            "file.mime_type": mediaType,
+            "exception.message": error instanceof Error ? error.message : String(error),
+            "app.file.mime_type": mediaType,
             ...attachment.name ? { "file.name": attachment.name } : {}
           },
           "Image attachment processing failed"
@@ -15565,8 +15609,8 @@ async function resolveUserAttachmentsWithDeps(attachments, context, deps) {
           modelId: botConfig.modelId
         },
         {
-          "error.message": error instanceof Error ? error.message : String(error),
-          "file.mime_type": mediaType
+          "exception.message": error instanceof Error ? error.message : String(error),
+          "app.file.mime_type": mediaType
         },
         "Failed to resolve user attachment"
       );
@@ -15615,9 +15659,9 @@ async function summarizeConversationImage(args, deps) {
         modelId: visionModelId
       },
       {
-        "error.message": error instanceof Error ? error.message : String(error),
-        "file.id": args.fileId,
-        "file.mime_type": args.mimeType
+        "exception.message": error instanceof Error ? error.message : String(error),
+        "app.file.id": args.fileId,
+        "app.file.mime_type": args.mimeType
       },
       "Image analysis failed while hydrating conversation context"
     );
@@ -15663,7 +15707,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
         modelId: botConfig.modelId
       },
       {
-        "error.message": error instanceof Error ? error.message : String(error)
+        "exception.message": error instanceof Error ? error.message : String(error)
       },
       "Failed to fetch thread replies for image context hydration"
     );
@@ -15730,9 +15774,9 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
             modelId: botConfig.modelId
           },
           {
-            "file.id": fileId,
+            "app.file.id": fileId,
             "file.size": fileSize,
-            "file.mime_type": mimeType
+            "app.file.mime_type": mimeType
           },
           "Skipping thread image that exceeds size limit"
         );
@@ -15744,7 +15788,7 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
       }
       let imageData;
       try {
-        imageData = await deps.downloadPrivateSlackFile(downloadUrl);
+        imageData = await deps.downloadFile(downloadUrl);
       } catch (error) {
         logWarn(
           "conversation_image_download_failed",
@@ -15757,9 +15801,9 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
             modelId: botConfig.modelId
           },
           {
-            "error.message": error instanceof Error ? error.message : String(error),
-            "file.id": fileId,
-            "file.mime_type": mimeType
+            "exception.message": error instanceof Error ? error.message : String(error),
+            "app.file.id": fileId,
+            "app.file.mime_type": mimeType
           },
           "Failed to download thread image for context hydration"
         );
@@ -15777,9 +15821,9 @@ async function hydrateConversationVisionContextWithDeps(conversation, context, d
             modelId: botConfig.modelId
           },
           {
-            "file.id": fileId,
+            "app.file.id": fileId,
             "file.size": imageData.byteLength,
-            "file.mime_type": mimeType
+            "app.file.mime_type": mimeType
           },
           "Skipping downloaded thread image that exceeds size limit"
         );
@@ -15842,12 +15886,6 @@ function createVisionContextService(deps) {
     )
   };
 }
-var defaultVisionContextService = createVisionContextService({
-  completeText,
-  downloadPrivateSlackFile,
-  listThreadReplies
-});
-var hydrateConversationVisionContext = defaultVisionContextService.hydrateConversationVisionContext;
 
 // src/chat/app/services.ts
 function createJuniorRuntimeServices(overrides = {}) {
@@ -15857,7 +15895,7 @@ function createJuniorRuntimeServices(overrides = {}) {
   const visionContext = createVisionContextService({
     completeText: overrides.visionContext?.completeText ?? completeText,
     listThreadReplies: overrides.visionContext?.listThreadReplies ?? listThreadReplies,
-    downloadPrivateSlackFile: overrides.visionContext?.downloadPrivateSlackFile ?? downloadPrivateSlackFile
+    downloadFile: overrides.visionContext?.downloadFile ?? downloadPrivateSlackFile
   });
   return {
     conversationMemory,
@@ -15874,6 +15912,85 @@ function createJuniorRuntimeServices(overrides = {}) {
   };
 }
 
+// src/chat/slack/message.ts
+function getSlackMessageTs(message) {
+  if (message.id.endsWith(":message_changed_mention") && message.raw && typeof message.raw === "object") {
+    const ts = message.raw.ts;
+    if (typeof ts === "string" && ts.length > 0) {
+      return ts;
+    }
+  }
+  return message.id;
+}
+
+// src/chat/runtime/thread-context.ts
+function escapeRegExp3(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function stripLeadingBotMention(text, options = {}) {
+  if (!text.trim()) return text;
+  let next = text;
+  if (options.stripLeadingSlackMentionToken) {
+    next = next.replace(/^\s*<@[^>]+>[\s,:-]*/, "").trim();
+  }
+  const mentionByNameRe = new RegExp(
+    `^\\s*@${escapeRegExp3(botConfig.userName)}\\b[\\s,:-]*`,
+    "i"
+  );
+  next = next.replace(mentionByNameRe, "").trim();
+  const mentionByLabeledEntityRe = new RegExp(
+    `^\\s*<@[^>|]+\\|${escapeRegExp3(botConfig.userName)}>[\\s,:-]*`,
+    "i"
+  );
+  next = next.replace(mentionByLabeledEntityRe, "").trim();
+  return next;
+}
+function getThreadId(thread, _message) {
+  return toOptionalString(thread.id);
+}
+function getRunId(thread, message) {
+  return toOptionalString(thread.runId) ?? toOptionalString(message.runId);
+}
+function getChannelId(thread, message) {
+  return resolveSlackChannelIdFromThreadId(toOptionalString(thread.id)) ?? normalizeSlackConversationId(toOptionalString(thread.channelId)) ?? resolveSlackChannelIdFromMessage(message);
+}
+function getThreadTs(threadId) {
+  return parseSlackThreadId(threadId)?.threadTs;
+}
+function getAssistantThreadContext(message) {
+  const raw = message.raw;
+  const rawRecord = raw && typeof raw === "object" ? raw : void 0;
+  const channelId = toOptionalString(rawRecord?.channel);
+  if (channelId) {
+    const rawThreadTs = toOptionalString(rawRecord?.thread_ts);
+    const threadTs = isDmChannel(channelId) ? rawThreadTs : rawThreadTs ?? toOptionalString(rawRecord?.ts);
+    if (threadTs) {
+      return { channelId, threadTs };
+    }
+  }
+  const parsedThreadId = parseSlackThreadId(
+    toOptionalString(message.threadId)
+  );
+  if (!parsedThreadId || isDmChannel(parsedThreadId.channelId)) {
+    return void 0;
+  }
+  return parsedThreadId;
+}
+function getMessageTs(message) {
+  const directTs = toOptionalString(
+    message.ts
+  );
+  if (directTs) {
+    return directTs;
+  }
+  const raw = message.raw;
+  if (!raw || typeof raw !== "object") {
+    return void 0;
+  }
+  const rawRecord = raw;
+  return toOptionalString(rawRecord.ts) ?? toOptionalString(rawRecord.event_ts) ?? toOptionalString(rawRecord.message?.ts);
+}
+
 // src/chat/slack/assistant-thread/title.ts
 function maybeUpdateAssistantTitle(args) {
   const assistantThreadContext = args.assistantThreadContext;
@@ -15932,7 +16049,7 @@ function maybeUpdateAssistantTitle(args) {
           modelId: args.modelId
         },
         {
-          "error.message": error instanceof Error ? error.message : String(error)
+          "exception.message": error instanceof Error ? error.message : String(error)
         },
         "Thread title generation failed"
       );
@@ -15991,11 +16108,8 @@ function createReplyToThread(deps) {
           nextTurnId: turnId,
           updateConversationStats
         });
-        const turnStartedAtMs = Date.now();
         const turnTraceContext = {
           conversationId,
-          turnId,
-          agentId: turnId,
           slackThreadId: threadId,
           slackUserId: message.author.userId,
           slackChannelId: channelId,
@@ -16004,9 +16118,7 @@ function createReplyToThread(deps) {
           modelId: botConfig.modelId
         };
         setTags({
-          conversationId,
-          turnId,
-          agentId: turnId
+          conversationId
         });
         if (shouldEmitDevAgentTrace()) {
           logInfo(
@@ -16274,7 +16386,6 @@ function createReplyToThread(deps) {
               "agent_turn_completed",
               turnTraceContext,
               {
-                "app.turn.duration_ms": Date.now() - turnStartedAtMs,
                 "app.ai.outcome": reply.diagnostics.outcome,
                 "app.ai.tool_call_count": reply.diagnostics.toolCalls.length,
                 "app.ai.tool_error_results": reply.diagnostics.toolErrorCount
@@ -16360,9 +16471,7 @@ function createReplyToThread(deps) {
               logWarn(
                 "agent_turn_failed",
                 turnTraceContext,
-                {
-                  "app.turn.duration_ms": Date.now() - turnStartedAtMs
-                },
+                {},
                 "Agent turn failed"
               );
             }
@@ -16375,7 +16484,6 @@ function createReplyToThread(deps) {
 }
 
 // src/chat/slack/assistant-thread/lifecycle.ts
-import { ThreadImpl } from "chat";
 async function syncAssistantThreadContext(event, options) {
   const channelId = normalizeSlackConversationId(event.channelId);
   if (!channelId) {
@@ -16400,20 +16508,7 @@ async function syncAssistantThreadContext(event, options) {
   if (!sourceChannelId) {
     return;
   }
-  const thread = ThreadImpl.fromJSON({
-    _type: "chat:Thread",
-    adapterName: "slack",
-    channelId,
-    id: event.threadId,
-    isDM: channelId.startsWith("D")
-  });
-  const currentArtifacts = coerceThreadArtifactsState(await thread.state);
-  const nextArtifacts = mergeArtifactsState(currentArtifacts, {
-    assistantContextChannelId: sourceChannelId
-  });
-  await persistThreadState(thread, {
-    artifacts: nextArtifacts
-  });
+  await event.onContextChannelResolved(sourceChannelId);
 }
 async function initializeAssistantThread(event) {
   await syncAssistantThreadContext(event, { setInitialTitle: true });
@@ -16423,11 +16518,96 @@ async function refreshAssistantThreadContext(event) {
 }
 
 // src/chat/runtime/turn-preparation.ts
+var BACKFILL_MESSAGE_LIMIT = 80;
 function hasPendingImageHydration(conversation) {
   return conversation.messages.some(
     (message) => isHumanConversationMessage(message) && !message.meta?.imagesHydrated
   );
 }
+function createConversationMessageFromSdkMessage(entry) {
+  const rawText = normalizeConversationText(entry.text);
+  if (!rawText) {
+    return null;
+  }
+  return {
+    id: entry.id,
+    role: entry.author.isMe ? "assistant" : "user",
+    text: rawText,
+    createdAtMs: entry.metadata.dateSent.getTime(),
+    author: {
+      userId: entry.author.userId,
+      userName: entry.author.userName,
+      fullName: entry.author.fullName,
+      isBot: typeof entry.author.isBot === "boolean" ? entry.author.isBot : void 0
+    },
+    meta: {
+      slackTs: getSlackMessageTs(entry)
+    }
+  };
+}
+async function seedConversationBackfill(thread, conversation, currentTurn) {
+  if (conversation.backfill.completedAtMs) {
+    return;
+  }
+  if (conversation.messages.length > 0 || conversation.compactions.length > 0) {
+    conversation.backfill = {
+      completedAtMs: Date.now(),
+      source: "recent_messages"
+    };
+    updateConversationStats(conversation);
+    return;
+  }
+  const seeded = [];
+  let source = "recent_messages";
+  try {
+    const fetchedNewestFirst = [];
+    for await (const entry of thread.messages) {
+      fetchedNewestFirst.push(entry);
+      if (fetchedNewestFirst.length >= BACKFILL_MESSAGE_LIMIT) {
+        break;
+      }
+    }
+    fetchedNewestFirst.reverse();
+    for (const entry of fetchedNewestFirst) {
+      const message = createConversationMessageFromSdkMessage(entry);
+      if (message) {
+        seeded.push(message);
+      }
+    }
+    if (seeded.length > 0) {
+      source = "thread_fetch";
+    }
+  } catch {
+  }
+  if (seeded.length === 0) {
+    try {
+      await thread.refresh();
+    } catch {
+    }
+    const fromRecent = thread.recentMessages.slice(-BACKFILL_MESSAGE_LIMIT);
+    for (const entry of fromRecent) {
+      const message = createConversationMessageFromSdkMessage(entry);
+      if (message) {
+        seeded.push(message);
+      }
+    }
+    source = "recent_messages";
+  }
+  for (const message of seeded) {
+    if (message.id !== currentTurn.messageId && message.createdAtMs > currentTurn.messageCreatedAtMs) {
+      continue;
+    }
+    if (message.id !== currentTurn.messageId && message.createdAtMs === currentTurn.messageCreatedAtMs && message.id > currentTurn.messageId) {
+      continue;
+    }
+    upsertConversationMessage(conversation, message);
+  }
+  conversation.backfill = {
+    completedAtMs: Date.now(),
+    source
+  };
+  updateConversationStats(conversation);
+}
 function createPrepareTurnState(deps) {
   return async function prepareTurnState(args) {
     const existingState = await args.thread.state;
@@ -16513,6 +16693,17 @@ function createPrepareTurnState(deps) {
 }
 
 // src/chat/app/factory.ts
+async function persistAssistantContextChannelId(args) {
+  const currentArtifacts = coerceThreadArtifactsState(
+    await getPersistedThreadState(args.threadId)
+  );
+  const nextArtifacts = mergeArtifactsState(currentArtifacts, {
+    assistantContextChannelId: args.sourceChannelId
+  });
+  await persistThreadStateById(args.threadId, {
+    artifacts: nextArtifacts
+  });
+}
 function createSlackRuntime(options) {
   const services = createJuniorRuntimeServices(options.services);
   const prepareTurnState = createPrepareTurnState({
@@ -16612,11 +16803,14 @@ function createSlackRuntime(options) {
       sourceChannelId
     }) => {
       await initializeAssistantThread({
-        threadId,
         channelId,
         threadTs,
         sourceChannelId,
-        getSlackAdapter: options.getSlackAdapter
+        getSlackAdapter: options.getSlackAdapter,
+        onContextChannelResolved: (resolvedSourceChannelId) => persistAssistantContextChannelId({
+          sourceChannelId: resolvedSourceChannelId,
+          threadId
+        })
       });
     },
     refreshAssistantThreadContext: async ({
@@ -16626,11 +16820,14 @@ function createSlackRuntime(options) {
       sourceChannelId
     }) => {
       await refreshAssistantThreadContext({
-        threadId,
         channelId,
         threadTs,
         sourceChannelId,
-        getSlackAdapter: options.getSlackAdapter
+        getSlackAdapter: options.getSlackAdapter,
+        onContextChannelResolved: (resolvedSourceChannelId) => persistAssistantContextChannelId({
+          sourceChannelId: resolvedSourceChannelId,
+          threadId
+        })
       });
     }
   });