@sentry/junior 0.145.0 → 0.147.0

package/dist/{chunk-64SBYW2O.js → chunk-7A4M7PCV.js}

@@ -7,7 +7,7 @@ import {
   PluginCredentialFailureError,
   agentNameSchema,
   createPluginAuthOrchestration
-} from "./chunk-B46ZMVOV.js";
+} from "./chunk-X5UY34KT.js";
 import {
   authorizationId
 } from "./chunk-DIB4GX3G.js";
@@ -21,14 +21,18 @@ import {
   getMcpAwareErrorType,
   getMcpAwareTelemetryMessage,
   getMcpProviderErrorAttributes,
+  getOAuthAccountProviders,
   hasEgressCredentialHooks,
   issuePluginCredential,
   issueProviderCredentialLease,
+  lookupSlackUserByEmail,
+  lookupSlackUserProfile,
   onPluginEgressResponse,
   patchMcpAuthSession,
+  searchSlackUsers,
   selectPluginGrant,
   toMcpProviderError
-} from "./chunk-I47UGQPJ.js";
+} from "./chunk-Q4R73I43.js";
 import {
   RetryableDeliveryError,
   actorFromRouting,
@@ -44,12 +48,12 @@ import {
   getSlackMessagePermalink,
   resolveBaseUrl,
   uploadFilesToConversation
-} from "./chunk-FUBRJA5F.js";
+} from "./chunk-7UQIVT6G.js";
 import {
   estimateTextTokens,
   getAgentContextCompactionTriggerTokens,
   getAgentContextInputLimitTokens
-} from "./chunk-VTDMB7XX.js";
+} from "./chunk-K4SZAP3K.js";
 import {
   AGENTS_REMOVAL_NOTICE,
   AGENTS_REPLACEMENT_NOTICE,
@@ -89,7 +93,6 @@ import {
   loadConversationProjection,
   loadTurnCheckpoint,
   loadTurnRoute,
-  mergeArtifactsState,
   missingPathSearchResult,
   normalizeToLf,
   normalizeToolNameFromResult,
@@ -111,7 +114,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   truncateText
-} from "./chunk-ZIAMN2UW.js";
+} from "./chunk-AIOK6LAG.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
 } from "./chunk-3Y47VMHV.js";
@@ -143,7 +146,7 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-GUWLDMGF.js";
+} from "./chunk-AVZDSUFB.js";
 import {
   SCHEDULED_TASK_SYSTEM_ACTOR,
   compactEventTask,
@@ -175,15 +178,15 @@ import {
   saveEventTask,
   scheduledTaskAttributes,
   writableEventTask
-} from "./chunk-YD54Q45G.js";
+} from "./chunk-EFLJ2WJH.js";
 import {
   parseSlackThreadId
-} from "./chunk-DXEQAIUV.js";
+} from "./chunk-CSZINQJ2.js";
 import {
   SHORT_TITLE_MAX_LENGTH,
   generateShortTitle,
   resolveTaskTitle
-} from "./chunk-ZYAJMESY.js";
+} from "./chunk-Z4YU7Z4L.js";
 import {
   ToolInputError,
   addAgentTurnUsage,
@@ -201,7 +204,7 @@ import {
   getSlackToolContext,
   readActorIdentity,
   resolveChannelCapabilities
-} from "./chunk-ZIMRGFYL.js";
+} from "./chunk-YHDERDRO.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -210,18 +213,22 @@ import {
   isConversationScopedChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-TZRXYWRE.js";
+} from "./chunk-SGZO7UWH.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
   getConversationEventStore,
-  getConversationSearchStore,
+  getConversationMessageSearchStore,
   getConversationStore,
   getDb,
+  getSqlExecutor,
   instructionActors,
   instructionProvenanceFor,
   sameActorIdentity
-} from "./chunk-2UH3JI64.js";
+} from "./chunk-YSB2N563.js";
+import {
+  juniorIdentities
+} from "./chunk-DU74WPIC.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -233,7 +240,7 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-QUG4JSZK.js";
+} from "./chunk-ORO3PWKQ.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -261,13 +268,12 @@ import {
   modelIdForProfile,
   modelProfileSchema,
   normalizeSlackEmojiName,
-  parseTurnReasoningLevel,
   profileConfig,
   renderCurrentInstruction,
   resolveGatewayCredential,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-XFKIRN3Q.js";
+} from "./chunk-7NVJVJID.js";
 import {
   canExposeConversationPayload,
   resolveConversationPrivacy,
@@ -277,16 +283,16 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-JTGS3ZZE.js";
+} from "./chunk-RXBVB2JM.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-5PNPQYTO.js";
+} from "./chunk-YBVXBNSV.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-SIN3MXH6.js";
+} from "./chunk-JUUKWRBE.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -294,7 +300,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-CD2XFGYQ.js";
+} from "./chunk-GGB4WL5A.js";
 import {
   credentialUserSubjectId
 } from "./chunk-RUIXF3YQ.js";
@@ -316,6 +322,7 @@ import {
   logInfo,
   logWarn,
   normalizeGenAiFinishReason,
+  normalizeIdentityEmail,
   serializeGenAiAttribute,
   setSpanAttributes,
   setSpanStatus,
@@ -323,7 +330,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-2LWPFSB4.js";
+} from "./chunk-4LJO56OJ.js";
 import {
   startInactiveSpan,
   withActiveSpan
@@ -805,7 +812,6 @@ import { isRetryableAssistantError } from "@earendil-works/pi-ai";
 function buildTurnResult(input) {
   const {
     newMessages,
-    artifactStatePatch,
     toolCalls,
     sandboxRef,
     durationMs,
@@ -901,7 +907,6 @@ function buildTurnResult(input) {
   };
   return {
     text: primaryText,
-    artifactStatePatch: Object.keys(artifactStatePatch).length > 0 ? artifactStatePatch : void 0,
     sandboxRef,
     piMessages: input.piMessages,
     diagnostics: resolvedDiagnostics
@@ -981,27 +986,22 @@ function getDiscardedRetryUsage(messages, retryMessages) {
   return hasAgentTurnUsage(usage) ? usage : void 0;
 }
 
-// src/chat/tool-support/turn-deadline-result.ts
-var TURN_DEADLINE_INTERRUPTION = {
-  cause: "turn_deadline",
-  scope: "execution_slice",
-  task_status: "active"
-};
-function annotateTurnDeadlineToolResult(result) {
-  if (!result.details || typeof result.details !== "object" || Array.isArray(result.details) || !("aborted" in result.details) || result.details.aborted !== true) {
+// src/chat/tool-support/timed-out-tool-result.ts
+function projectTimedOutToolResult(result) {
+  const details = result.details;
+  if (!details || typeof details !== "object" || Array.isArray(details) || !("aborted" in details) || details.aborted !== true) {
     return void 0;
   }
-  const details = {
-    ...result.details,
-    interruption: TURN_DEADLINE_INTERRUPTION
-  };
-  const envelope = makeStructuredToolOutput(details, {
-    content: result.content.slice(1)
+  const record2 = details;
+  const target = typeof record2.target === "string" && record2.target.length > 0 ? record2.target : void 0;
+  const envelope = makeStructuredToolOutput({
+    ...target ? { target } : {},
+    timed_out: true
   });
   return {
     content: envelope.content,
     details: envelope.details,
-    isError: true
+    isError: false
   };
 }
 
@@ -1222,13 +1222,15 @@ async function classifyTurn(args) {
       prompt: args.prompt,
       thinkingLevel: "low",
       system: buildClassifierSystemPrompt(Object.keys(args.profiles)),
-      temperature: 0
+      temperature: 0,
+      promptName: "junior.thinking_route"
     });
     const parsed = schema.parse(result.object);
     const reason = parsed.reason.trim();
     if (parsed.confidence < CLASSIFIER_CONFIDENCE_THRESHOLD) {
       return {
         confidence: parsed.confidence,
+        ...result.costUsd !== void 0 ? { costUsd: result.costUsd } : {},
         profile: STANDARD_MODEL_PROFILE,
         reasoningLevel: CLASSIFIER_FALLBACK_REASONING_LEVEL,
         reason: `low_confidence_medium_default:${reason}`,
@@ -1237,6 +1239,7 @@ async function classifyTurn(args) {
     }
     return {
       confidence: parsed.confidence,
+      ...result.costUsd !== void 0 ? { costUsd: result.costUsd } : {},
       profile: parsed.profile,
       reasoningLevel: parsed.reasoning_level,
       reason,
@@ -1573,7 +1576,6 @@ async function restoreSkillRuntime(args) {
     const restoredSkill = await args.skillSandbox.loadSkill(skillName);
     if (restoredSkill) {
       upsertActiveSkill(args.activeSkills, restoredSkill);
-      args.syncLoadedSkillNamesForResume();
     }
   }
   if (args.invokedSkill) {
@@ -1582,7 +1584,6 @@ async function restoreSkillRuntime(args) {
     );
     if (restoredSkill) {
       upsertActiveSkill(args.activeSkills, restoredSkill);
-      args.syncLoadedSkillNamesForResume();
     }
   }
 }
@@ -1761,34 +1762,6 @@ function formatReferenceFilesLines() {
     return `- ${escapeXml(name)} (${escapeXml(`${SANDBOX_DATA_ROOT}/${name}`)})`;
   });
 }
-function formatArtifactsLines(artifactState) {
-  if (!artifactState) return null;
-  const lines = [];
-  if (artifactState.lastCanvasId) {
-    lines.push(`- last_canvas_id: ${escapeXml(artifactState.lastCanvasId)}`);
-  }
-  if (artifactState.lastCanvasUrl) {
-    lines.push(`- last_canvas_url: ${escapeXml(artifactState.lastCanvasUrl)}`);
-  }
-  if (artifactState.recentCanvases && artifactState.recentCanvases.length > 0) {
-    lines.push("- recent_canvases:");
-    for (const canvas of artifactState.recentCanvases) {
-      lines.push(`  - id: ${escapeXml(canvas.id)}`);
-      if (canvas.title) lines.push(`    title: ${escapeXml(canvas.title)}`);
-      if (canvas.url) lines.push(`    url: ${escapeXml(canvas.url)}`);
-      if (canvas.createdAt) {
-        lines.push(`    created_at: ${escapeXml(canvas.createdAt)}`);
-      }
-    }
-  }
-  if (artifactState.lastListId) {
-    lines.push(`- last_list_id: ${escapeXml(artifactState.lastListId)}`);
-  }
-  if (artifactState.lastListUrl) {
-    lines.push(`- last_list_url: ${escapeXml(artifactState.lastListUrl)}`);
-  }
-  return lines.length > 0 ? lines : null;
-}
 function formatConfigurationLines(configuration) {
   const keys = Object.keys(configuration ?? {}).sort(
     (a, b) => a.localeCompare(b)
@@ -1839,7 +1812,7 @@ var EXECUTION_CONTRACT_RULES = [
   "- Ask the user only for missing access, approval, or a decision that blocks safe progress. Ask one focused question; otherwise infer conservatively and continue.",
   "- For conflicting evidence, compare sources and state which source is authoritative for the answer.",
   "- Use `reportProgress` only for work with multiple substantive phases or a materially long wait. Skip short lookups and routine commands; after an initial update, call it again only when the major phase changes.",
-  "- When a tool outcome is unknown and may include side effects, inspect authoritative state before retrying. If state already reflects the intended result, do not repeat the mutation."
+  "- A tool result with `timed_out: true` means that attempt did not finish. Continue the active task. Before retrying work that may have side effects, inspect authoritative state and do not repeat a mutation that already applied."
 ];
 var CONVERSATION_RULES = [
   "- In thread follow-ups, answer from prior thread context; do not repeat resolved clarifying questions.",
@@ -2001,10 +1974,6 @@ function buildContextSection(params) {
   if (dispatchLines) {
     blocks.push(dispatchLines);
   }
-  const artifactLines = formatArtifactsLines(params.artifactState);
-  if (artifactLines) {
-    blocks.push(renderTag("artifacts", artifactLines));
-  }
   const configLines = formatConfigurationLines(params.configuration);
   if (configLines) {
     blocks.push(
@@ -2109,7 +2078,6 @@ function buildTurnContextPrompt(params) {
     pluginPromptContributions,
     includeSessionContext ? buildContextSection({
       actor: params.actor,
-      artifactState: params.artifactState,
       configuration: params.configuration,
       dispatch: params.dispatch
     }) : null,
@@ -2407,7 +2375,6 @@ async function assemblePrompt(args) {
       source
     } : void 0,
     actor: isUserActor(args.currentActor) ? args.currentActor : void 0,
-    artifactState: args.artifactState,
     configuration: args.configurationValues
   }) : null;
   const turnContextParts = turnContextPrompt ? [{ type: "text", text: turnContextPrompt }] : [];
@@ -2493,9 +2460,9 @@ function commandResult(input) {
     exitCode: input.exitCode
   };
 }
-function requireChannelConfiguration(deps) {
-  if (deps.channelConfiguration) {
-    return { ok: true, configuration: deps.channelConfiguration };
+function requireLocationConfiguration(deps) {
+  if (deps.locationConfiguration) {
+    return { ok: true, configuration: deps.locationConfiguration };
   }
   return {
     ok: false,
@@ -2541,7 +2508,7 @@ async function handleConfigCommand(args, deps) {
     "jr-rpc config list [--prefix <value>]"
   ].join("\n");
   const subverb = (args[0] ?? "").trim();
-  const configurationResult = requireChannelConfiguration(deps);
+  const configurationResult = requireLocationConfiguration(deps);
   if (!configurationResult.ok) {
     return configurationResult.result;
   }
@@ -6036,7 +6003,7 @@ function createAgentSandbox(options) {
         if (command) {
           const result = await maybeExecuteJrRpcCustomCommand(command, {
             activeSkill: options.getActiveSkill(),
-            channelConfiguration: options.channelConfiguration,
+            locationConfiguration: options.locationConfiguration,
             actorId: isUserActor(options.actor) ? options.actor.userId : void 0,
             onConfigurationValueChanged: (key, value) => {
               if (value === void 0) {
@@ -6921,7 +6888,8 @@ async function enrichImagePrompt(rawPrompt) {
       modelId: botConfig.fastModelId,
       system: ENRICHMENT_SYSTEM_PROMPT,
       messages: [{ role: "user", content: rawPrompt, timestamp: Date.now() }],
-      maxTokens: 1024
+      maxTokens: 1024,
+      promptName: "junior.image_prompt_enrichment"
     });
     if (text && text.trim().length > 0) {
       logInfo("image.prompt.enriched", {
@@ -8132,7 +8100,7 @@ function createSearchResourceEventTypesTool(catalog) {
     outputSchema: outputSchema2,
     async execute({ query, namespace, maxResults }) {
       const normalizedQuery = normalizeSearchText(query ?? "");
-      const terms = normalizedQuery.split(/\s+/).filter(Boolean);
+      const terms2 = normalizedQuery.split(/\s+/).filter(Boolean);
       const matches = searchableResourceTypes(catalog).filter(
         (resourceType) => {
           if (namespace && resourceType.namespace !== namespace) return false;
@@ -8144,7 +8112,7 @@ function createSearchResourceEventTypesTool(catalog) {
               ...resourceType.suggestedEvents ?? []
             ].join(" ")
           );
-          return terms.every((term) => text.includes(term));
+          return terms2.every((term) => text.includes(term));
         }
       );
       const resourceTypes = matches.slice(
@@ -9816,32 +9784,63 @@ function createSlackChannelListMessagesTool(context) {
   });
 }
 
-// src/chat/slack/tools/conversation-search.ts
+// src/chat/slack/tools/conversation-message-search.ts
 import { z as z37 } from "zod";
+
+// src/chat/conversations/tool-source.ts
+var CONVERSATIONS_TOOL_SOURCE = {
+  id: "conversations",
+  description: "Search messages and events in retained Junior conversations."
+};
+
+// src/chat/slack/tools/conversation-message-search.ts
 var DEFAULT_LIMIT = 5;
-var conversationSearchOutputSchema = juniorToolOutputSchema.extend({
-  query: z37.string(),
+var conversationMessageSearchOutputSchema = juniorToolOutputSchema.extend({
+  channel_id: z37.string().min(1).optional(),
   count: z37.number().int().nonnegative(),
-  threads: z37.array(
+  query: z37.string().optional(),
+  matches: z37.array(
     z37.object({
+      channel_id: z37.string().min(1),
+      channel_name: z37.string().min(1).optional(),
       conversation_id: z37.string().min(1),
-      thread_ts: z37.string().min(1),
+      excerpt: z37.string(),
       message_id: z37.string().min(1),
       message_role: z37.enum(["assistant", "user"]),
       message_timestamp: z37.string().datetime(),
-      excerpt: z37.string(),
-      permalink: z37.string().url().optional()
+      permalink: z37.string().url().optional(),
+      thread_ts: z37.string().min(1)
     }).strict()
   )
 });
-function createSlackConversationSearchTool(scope, currentConversationId, deps = {}) {
+function resolveSearchFilters(input) {
+  const query = input.query?.trim() || void 0;
+  let channelId;
+  if (input.channel_id != null) {
+    const parsed = parseRequiredSlackChannelIdParam(
+      "channel_id",
+      input.channel_id
+    );
+    if (!parsed.ok) {
+      throw new ToolInputError(parsed.error);
+    }
+    channelId = parsed.value;
+  }
+  if (!query && !channelId) {
+    throw new ToolInputError(
+      "Provide at least one of `query` or `channel_id`."
+    );
+  }
+  return {
+    ...channelId ? { channelId } : {},
+    ...query ? { query } : {}
+  };
+}
+function createSlackConversationMessageSearchTool(scope, currentConversationId, deps = {}) {
   return zodTool({
-    description: "Search prior public Junior conversation threads across the current Slack workspace. Use when the user refers to an earlier public discussion, decision, or answer that is not in the current thread. Searches retained visible user and assistant messages only.",
+    description: "Search retained user and assistant messages in public Junior conversations across the current Slack workspace. Excludes the current conversation.",
     exposure: "deferred",
-    source: {
-      id: "conversation-history",
-      description: "Search retained public Junior conversation threads in the current Slack workspace."
-    },
+    source: CONVERSATIONS_TOOL_SOURCE,
     annotations: {
       destructiveHint: false,
       idempotentHint: true,
@@ -9849,20 +9848,24 @@ function createSlackConversationSearchTool(scope, currentConversationId, deps =
       readOnlyHint: true
     },
     inputSchema: z37.object({
-      query: z37.string().trim().min(1).max(200).describe("Words or a short phrase to find in prior conversations."),
-      limit: z37.number().int().min(1).max(10).describe("Maximum number of prior conversation threads to return.").nullable().optional()
-    }),
-    outputSchema: conversationSearchOutputSchema,
-    execute: async ({ query, limit }) => {
-      const store = deps.store ?? getConversationSearchStore();
+      channel_id: slackChannelIdParam(
+        "Destination Slack channel ID; no active-channel default."
+      ).nullable().optional(),
+      query: z37.string().trim().min(1).max(200).nullable().describe("Words or phrase to match in message text.").optional(),
+      limit: z37.number().int().min(1).max(10).describe(`Maximum matches. Default ${DEFAULT_LIMIT}; max 10.`).nullable().optional()
+    }).strict(),
+    outputSchema: conversationMessageSearchOutputSchema,
+    execute: async (input) => {
+      const filters = resolveSearchFilters(input);
+      const store = deps.store ?? getConversationMessageSearchStore();
       const matches = await store.search({
         currentConversationId,
-        limit: limit ?? DEFAULT_LIMIT,
-        query,
+        filters,
+        limit: input.limit ?? DEFAULT_LIMIT,
         scope
       });
       const getPermalink = deps.getPermalink ?? getSlackMessagePermalink;
-      const threads = await Promise.all(
+      const matchesOutput = await Promise.all(
         matches.map(async (match) => {
           const reference = parseSlackThreadId(match.conversationId);
           if (!reference || reference.channelId !== match.providerDestinationId) {
@@ -9881,14 +9884,17 @@ function createSlackConversationSearchTool(scope, currentConversationId, deps =
             message_role: match.role,
             message_timestamp: new Date(match.messageCreatedAtMs).toISOString(),
             excerpt: match.excerpt,
+            channel_id: match.providerDestinationId,
+            ...match.channelName ? { channel_name: match.channelName } : {},
             ...permalink ? { permalink } : {}
           };
         })
       );
       return {
-        query,
-        count: threads.length,
-        threads
+        ...filters.query ? { query: filters.query } : {},
+        ...filters.channelId ? { channel_id: filters.channelId } : {},
+        count: matchesOutput.length,
+        matches: matchesOutput
       };
     }
   });
@@ -10523,45 +10529,6 @@ async function readCanvas(canvasIdOrUrl) {
   };
 }
 
-// src/chat/slack/tools/canvas/context.ts
-var MAX_RECENT_CANVASES = 5;
-function mergeRecentCanvases(existing, created) {
-  const nextEntry = {
-    id: created.id,
-    title: created.title,
-    url: created.url,
-    createdAt: (/* @__PURE__ */ new Date()).toISOString()
-  };
-  const prior = existing ?? [];
-  const deduped = prior.filter((entry) => entry.id !== created.id);
-  return [nextEntry, ...deduped].slice(0, MAX_RECENT_CANVASES);
-}
-function resolveCanvasTarget(canvas) {
-  const canvasId = extractCanvasId(canvas);
-  if (!canvasId) {
-    return {
-      ok: false,
-      error: "Could not parse a Slack canvas/file ID from input. Provide an F-prefixed ID or a Slack canvas/docs URL."
-    };
-  }
-  return { ok: true, canvasId };
-}
-function storedCanvasUrl(state, canvasId) {
-  const lastCanvasUrl = state.artifactState.lastCanvasUrl;
-  if (lastCanvasUrl && extractCanvasId(lastCanvasUrl) === canvasId) {
-    return lastCanvasUrl;
-  }
-  for (const canvas of state.artifactState.recentCanvases ?? []) {
-    if (extractCanvasId(canvas.id) === canvasId) {
-      return canvas.url;
-    }
-    if (canvas.url && extractCanvasId(canvas.url) === canvasId) {
-      return canvas.url;
-    }
-  }
-  return void 0;
-}
-
 // src/chat/slack/tools/canvas/create.ts
 import { z as z41 } from "zod";
 function createSlackCanvasCreateTool(context, state) {
@@ -10607,18 +10574,6 @@ function createSlackCanvasCreateTool(context, state) {
         markdown,
         channelId: targetChannelId
       });
-      await state.patchArtifactState({
-        lastCanvasId: created.canvasId,
-        lastCanvasUrl: created.permalink,
-        recentCanvases: mergeRecentCanvases(
-          state.artifactState.recentCanvases,
-          {
-            id: created.canvasId,
-            title,
-            url: created.permalink
-          }
-        )
-      });
       const response = {
         canvas_id: created.canvasId,
         permalink: created.permalink,
@@ -10630,6 +10585,18 @@ function createSlackCanvasCreateTool(context, state) {
   });
 }
 
+// src/chat/slack/tools/canvas/context.ts
+function resolveCanvasTarget(canvas) {
+  const canvasId = extractCanvasId(canvas);
+  if (!canvasId) {
+    return {
+      ok: false,
+      error: "Could not parse a Slack canvas/file ID from input. Provide an F-prefixed ID or a Slack canvas/docs URL."
+    };
+  }
+  return { ok: true, canvasId };
+}
+
 // src/chat/slack/tools/canvas/edit.ts
 import { z as z42 } from "zod";
 function prepareCanvasEditArguments(input) {
@@ -10697,10 +10664,6 @@ function createSlackCanvasEditTool(state) {
         canvasId: target.canvasId,
         markdown: newContent
       });
-      await state.patchArtifactState({
-        lastCanvasId: target.canvasId,
-        lastCanvasUrl: current.permalink ?? state.artifactState.lastCanvasUrl
-      });
       const diff = buildCompactDiff(
         normalizeCanvasMarkdown(baseContent).markdown,
         written.markdown
@@ -10821,10 +10784,6 @@ function createSlackCanvasWriteTool(state) {
         canvasId: target.canvasId,
         markdown: content
       });
-      await state.patchArtifactState({
-        lastCanvasId: target.canvasId,
-        lastCanvasUrl: storedCanvasUrl(state, target.canvasId)
-      });
       const response = {
         canvas_id: target.canvasId,
         normalized_heading_count: written.normalizedHeadingCount,
@@ -10909,9 +10868,19 @@ async function createTodoList(name) {
     permalink
   };
 }
+async function getListColumnMap(listId) {
+  const client = getSlackClient();
+  const response = await withSlackRetries(
+    () => client.files.info({ file: listId }),
+    3,
+    { action: "files.info", idempotent: true }
+  );
+  const file = response.file;
+  return inferListColumnMap(file?.list_metadata?.schema ?? []);
+}
 async function addListItems(input) {
   const client = getSlackClient();
-  const listColumnMap = input.listColumnMap ?? {};
+  const listColumnMap = input.listColumnMap ?? await getListColumnMap(input.listId);
   if (!listColumnMap.titleColumnId) {
     throw new Error(
       "Cannot add list items because title column could not be inferred"
@@ -10980,19 +10949,20 @@ async function listItems(listId, limit = 100) {
 }
 async function updateListItem(input) {
   const client = getSlackClient();
+  const listColumnMap = Object.keys(input.listColumnMap).length > 0 ? input.listColumnMap : await getListColumnMap(input.listId);
   const cells = [];
-  if (typeof input.completed === "boolean" && input.listColumnMap.completedColumnId) {
+  if (typeof input.completed === "boolean" && listColumnMap.completedColumnId) {
     cells.push({
       row_id: input.itemId,
-      column_id: input.listColumnMap.completedColumnId,
+      column_id: listColumnMap.completedColumnId,
       checkbox: input.completed
     });
   }
-  if (typeof input.title === "string" && input.title.trim() && input.listColumnMap.titleColumnId) {
+  if (typeof input.title === "string" && input.title.trim() && listColumnMap.titleColumnId) {
     cells.push({
       row_id: input.itemId,
       ...richTextField(
-        input.listColumnMap.titleColumnId,
+        listColumnMap.titleColumnId,
         input.title
       )
     });
@@ -11022,8 +10992,9 @@ function createSlackListAddItemsTool(state) {
       openWorldHint: true,
       readOnlyHint: false
     },
-    description: "Add tasks to the active Slack list tracked in artifact context. Use when the user wants actionable items recorded in the current thread list. Do not use when no list exists and list creation was not requested.",
+    description: "Add tasks to a Slack list. Use the list_id from the list create result or conversation history.",
     inputSchema: z45.object({
+      list_id: z45.string().min(1).describe("ID of the Slack list to update."),
       items: z45.array(z45.string().min(1)).min(1).max(25).describe("List item titles to create."),
       assignee_user_id: slackUserIdParam(
         "Optional Slack user ID assigned to all created items."
@@ -11031,17 +11002,13 @@ function createSlackListAddItemsTool(state) {
       due_date: z45.string().regex(/^\d{4}-\d{2}-\d{2}$/).describe("Optional due date in YYYY-MM-DD format.").optional()
     }),
     outputSchema: juniorToolOutputSchema,
-    execute: async ({ items, assignee_user_id, due_date }) => {
-      const targetListId = state.getCurrentListId();
-      if (!targetListId) {
-        throw new ToolInputError("No active list found in artifact context");
-      }
+    execute: async ({ list_id, items, assignee_user_id, due_date }) => {
       const parsedAssigneeUserId = assignee_user_id === void 0 ? void 0 : parseRequiredSlackUserIdParam("assignee_user_id", assignee_user_id);
       if (parsedAssigneeUserId?.ok === false) {
         throw new ToolInputError(parsedAssigneeUserId.error);
       }
       const operationKey = createOperationKey("slackListAddItems", {
-        list_id: targetListId,
+        list_id,
         items,
         assignee_user_id: parsedAssigneeUserId?.value ?? null,
         due_date: due_date ?? null
@@ -11054,18 +11021,13 @@ function createSlackListAddItemsTool(state) {
         };
       }
       const result = await addListItems({
-        listId: targetListId,
+        listId: list_id,
         titles: items,
-        listColumnMap: state.artifactState.listColumnMap,
         assigneeUserId: parsedAssigneeUserId?.value,
         dueDate: due_date
       });
-      await state.patchArtifactState({
-        lastListId: targetListId,
-        listColumnMap: result.listColumnMap
-      });
       const response = {
-        list_id: targetListId,
+        list_id,
         created_item_ids: result.createdItemIds,
         created_count: result.createdItemIds.length
       };
@@ -11100,11 +11062,6 @@ function createSlackListCreateTool(state) {
         };
       }
       const list = await createTodoList(name);
-      await state.patchArtifactState({
-        lastListId: list.listId,
-        lastListUrl: list.permalink,
-        listColumnMap: list.listColumnMap
-      });
       const response = {
         list_id: list.listId,
         permalink: list.permalink,
@@ -11118,9 +11075,9 @@ function createSlackListCreateTool(state) {
 
 // src/chat/slack/tools/list/get-items.ts
 import { z as z47 } from "zod";
-function createSlackListGetItemsTool(state) {
+function createSlackListGetItemsTool() {
   return zodTool({
-    description: "Read items from the active Slack list tracked in artifact context. Use when the user asks for task status, open items, or list contents. Do not use when list state is already known from the immediately prior result.",
+    description: "Read items from a Slack list. Use the list_id from a prior tool result or conversation history.",
     annotations: {
       destructiveHint: false,
       idempotentHint: true,
@@ -11128,18 +11085,15 @@ function createSlackListGetItemsTool(state) {
       readOnlyHint: true
     },
     inputSchema: z47.object({
+      list_id: z47.string().min(1).describe("ID of the Slack list to read."),
       limit: z47.coerce.number().int().min(1).max(200).describe("Maximum number of list items to return.").optional()
     }),
     outputSchema: juniorToolOutputSchema,
-    execute: async ({ limit }) => {
-      const targetListId = state.getCurrentListId();
+    execute: async ({ list_id, limit }) => {
       const resolvedLimit = limit ?? 100;
-      if (!targetListId) {
-        throw new ToolInputError("No active list found in artifact context");
-      }
-      const items = await listItems(targetListId, resolvedLimit);
+      const items = await listItems(list_id, resolvedLimit);
       return {
-        list_id: targetListId,
+        list_id,
         items: items.map((item) => ({ id: item.id, fields: item.fields }))
       };
     }
@@ -11154,11 +11108,13 @@ var booleanInput3 = (description) => z48.preprocess(
 ).describe(description);
 var updateListItemInputSchema = z48.union([
   z48.object({
+    list_id: z48.string().min(1).describe("ID of the Slack list to update."),
     item_id: z48.string().min(1).describe("ID of the Slack list item to update."),
     completed: booleanInput3("Optional completion status update."),
     title: z48.string().min(1).describe("Optional new item title.").optional()
   }),
   z48.object({
+    list_id: z48.string().min(1).describe("ID of the Slack list to update."),
     item_id: z48.string().min(1).describe("ID of the Slack list item to update."),
     completed: booleanInput3("Optional completion status update.").optional(),
     title: z48.string().min(1).describe("Optional new item title.")
@@ -11172,16 +11128,12 @@ function createSlackListUpdateItemTool(state) {
       openWorldHint: true,
       readOnlyHint: false
     },
-    description: "Update an item in the active Slack list tracked in artifact context (title/completion). Use when the user asks to mark progress or rename a tracked task. Do not use to add new tasks.",
+    description: "Update an item in a Slack list. Use list_id and item_id from prior tool results or conversation history.",
     inputSchema: updateListItemInputSchema,
     outputSchema: juniorToolOutputSchema,
-    execute: async ({ item_id, completed, title }) => {
-      const targetListId = state.getCurrentListId();
-      if (!targetListId) {
-        throw new ToolInputError("No active list found in artifact context");
-      }
+    execute: async ({ list_id, item_id, completed, title }) => {
       const operationKey = createOperationKey("slackListUpdateItem", {
-        list_id: targetListId,
+        list_id,
         item_id,
         completed: completed ?? null,
         title: title ?? null
@@ -11194,15 +11146,14 @@ function createSlackListUpdateItemTool(state) {
         };
       }
       await updateListItem({
-        listId: targetListId,
+        listId: list_id,
         itemId: item_id,
         completed,
         title,
-        listColumnMap: state.artifactState.listColumnMap ?? {}
+        listColumnMap: {}
       });
-      await state.patchArtifactState({ lastListId: targetListId });
       const response = {
-        list_id: targetListId,
+        list_id,
         item_id,
         completed,
         title
@@ -11294,7 +11245,100 @@ function parseSlackMessageReference(input) {
   };
 }
 
-// src/chat/slack/legacy-attachments.ts
+// src/chat/slack/message/blocks.ts
+var MAX_BLOCKS = 50;
+var MAX_CHILDREN = 50;
+var MAX_DEPTH = 16;
+var MAX_NODES = 5e3;
+var CHILD_KEYS = [
+  "blocks",
+  "elements",
+  "fields",
+  "accessory",
+  "element",
+  "rows",
+  "cells"
+];
+function toText(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
+function readText(value) {
+  if (typeof value === "string") return toText(value);
+  if (!value || typeof value !== "object") return void 0;
+  return toText(value.text);
+}
+function parseChildren(value, budget, depth) {
+  if (Array.isArray(value)) {
+    return value.slice(0, MAX_CHILDREN).flatMap((child) => parseChildren(child, budget, depth));
+  }
+  return parseElement(value, budget, depth);
+}
+function parseElement(value, budget, depth) {
+  if (!value || typeof value !== "object" || depth > MAX_DEPTH || budget.remainingNodes <= 0) {
+    return [];
+  }
+  budget.remainingNodes -= 1;
+  const element = value;
+  const type = toText(element.type);
+  const text = readText(element.text);
+  if (type === "link") {
+    const url = toText(element.url);
+    return [
+      text && url && text !== url ? `${text} (${url})` : text || url
+    ].filter((part) => Boolean(part));
+  }
+  if (type === "button") {
+    const url = toText(element.url);
+    return [text && url ? `${text} (${url})` : text].filter(
+      (part) => Boolean(part)
+    );
+  }
+  if (type === "emoji") {
+    const name = toText(element.name);
+    return name ? [`:${name}:`] : [];
+  }
+  if (type === "user") {
+    const userId = toText(element.user_id);
+    return userId ? [`<@${userId}>`] : [];
+  }
+  if (type === "channel") {
+    const channelId = toText(element.channel_id);
+    return channelId ? [`<#${channelId}>`] : [];
+  }
+  if (type === "usergroup") {
+    const usergroupId = toText(element.usergroup_id);
+    return usergroupId ? [`<!subteam^${usergroupId}>`] : [];
+  }
+  if (type === "broadcast") {
+    const range = toText(element.range);
+    return range ? [`<!${range}>`] : [];
+  }
+  const parts = [
+    text,
+    readText(element.title),
+    readText(element.description),
+    readText(element.label),
+    readText(element.hint),
+    readText(element.placeholder),
+    toText(element.alt_text),
+    toText(element.provider_name),
+    toText(element.fallback)
+  ].filter((part) => Boolean(part));
+  for (const key of CHILD_KEYS) {
+    parts.push(...parseChildren(element[key], budget, depth + 1));
+  }
+  if (type === "checkboxes" || type === "radio_buttons") {
+    parts.push(...parseChildren(element.options, budget, depth + 1));
+  }
+  return parts;
+}
+function renderBlockText(value) {
+  if (!Array.isArray(value)) return "";
+  const budget = { remainingNodes: MAX_NODES };
+  return value.slice(0, MAX_BLOCKS).flatMap((block) => parseElement(block, budget, 0)).join("\n");
+}
+
+// src/chat/slack/message/attachments.ts
 var MAX_ATTACHMENTS = 10;
 var MAX_FIELDS_PER_ATTACHMENT = 20;
 var MAX_FIELD_CHARS = 1e3;
@@ -11332,6 +11376,7 @@ function renderAttachment(raw) {
   const text = toStr(obj.text);
   const footer = toStr(obj.footer);
   const fields = Array.isArray(obj.fields) ? obj.fields : [];
+  const blockText = renderBlockText(obj.blocks);
   const add = (value) => {
     if (!value) return;
     const normalized = normalizeAttachmentText(value);
@@ -11339,7 +11384,7 @@ function renderAttachment(raw) {
     seen.add(normalized);
     parts.push(normalized);
   };
-  const hasRichContent = pretext || title || text;
+  const hasRichContent = pretext || title || text || blockText;
   if (!hasRichContent) {
     add(fallback);
   }
@@ -11355,28 +11400,19 @@ function renderAttachment(raw) {
   for (const field of fields.slice(0, MAX_FIELDS_PER_ATTACHMENT)) {
     add(renderField(field));
   }
+  add(blockText);
   add(footer);
   return parts.join("\n");
 }
-function renderSlackLegacyAttachmentText(input) {
+function renderAttachmentText(input) {
   const rendered = getAttachmentPayload(input).slice(0, MAX_ATTACHMENTS).map(renderAttachment).filter((line) => line.length > 0).map((line) => `[attachment] ${line}`).join("\n");
   return rendered.slice(0, MAX_ATTACHMENT_TEXT_CHARS);
 }
-function appendSlackLegacyAttachmentText(baseText, rawMessageOrAttachments) {
-  const base = baseText?.trim() ?? "";
-  const attachmentText = renderSlackLegacyAttachmentText(
-    rawMessageOrAttachments
-  );
-  if (!attachmentText) return base;
-  if (!base) return attachmentText;
-  return `${base}
-${attachmentText}`;
-}
 
 // src/chat/slack/tools/thread-read.ts
 var MAX_THREAD_READ_CHARS = 4e4;
 function sanitizeMessage(msg) {
-  const attachmentText = renderSlackLegacyAttachmentText(msg.attachments);
+  const attachmentText = renderAttachmentText(msg.attachments);
   return {
     ts: msg.ts,
     user: msg.user,
@@ -11517,168 +11553,152 @@ function createSlackThreadReadTool(context, deps = {}) {
   });
 }
 
-// src/chat/slack/users.ts
-function normalizeUser(raw) {
-  const rawFields = raw.profile?.fields;
-  const profileFields = [];
-  if (rawFields && typeof rawFields === "object") {
-    for (const [id, field] of Object.entries(rawFields)) {
-      if (!field) continue;
-      profileFields.push({
-        id,
-        label: field.label || void 0,
-        value: field.value || void 0,
-        alt: field.alt || void 0
-      });
-    }
-  }
-  return {
-    id: raw.id ?? "",
-    team_id: raw.team_id || void 0,
-    name: raw.name || void 0,
-    real_name: raw.real_name || raw.profile?.real_name || void 0,
-    display_name: raw.profile?.display_name || void 0,
-    title: raw.profile?.title || void 0,
-    email: raw.profile?.email || void 0,
-    status_text: raw.profile?.status_text ?? void 0,
-    status_emoji: raw.profile?.status_emoji ?? void 0,
-    is_bot: raw.is_bot ?? false,
-    is_deleted: raw.deleted ?? false,
-    timezone: raw.tz || void 0,
-    ...profileFields.length > 0 ? { profile_fields: profileFields } : {}
-  };
-}
-async function lookupSlackUserProfile(userId) {
-  const client = getSlackClient();
-  const result = await withSlackRetries(
-    () => client.users.info({ user: userId }),
-    3,
-    { action: "users.info" }
-  );
-  const user = result.user;
-  if (!user) {
-    throw new Error(`Slack users.info returned no user for ${userId}`);
-  }
-  return normalizeUser(user);
-}
-async function lookupSlackUserByEmail(email) {
-  const client = getSlackClient();
-  let result;
-  try {
-    result = await withSlackRetries(
-      () => client.users.lookupByEmail({ email }),
-      3,
-      { action: "users.lookupByEmail" }
-    );
-  } catch (error) {
-    const apiError = error.apiError;
-    if (apiError === "users_not_found") {
-      return null;
-    }
-    throw error;
-  }
-  const user = result.user;
-  if (!user) {
-    return null;
-  }
-  return normalizeUser(user);
-}
-function scoreMatch(user, queryLower) {
-  const name = (user.name ?? "").toLowerCase();
-  const realName = (user.real_name ?? user.profile?.real_name ?? "").toLowerCase();
-  const displayName = (user.profile?.display_name ?? "").toLowerCase();
-  if (name === queryLower || displayName === queryLower) return 100;
-  if (realName === queryLower) return 90;
-  if (name.startsWith(queryLower) || displayName.startsWith(queryLower))
-    return 70;
-  if (realName.startsWith(queryLower)) return 60;
-  const realNameWords = realName.split(/\s+/);
-  if (realNameWords.some((w) => w === queryLower)) return 55;
-  if (realNameWords.some((w) => w.startsWith(queryLower))) return 50;
-  if (name.includes(queryLower) || displayName.includes(queryLower)) return 30;
-  if (realName.includes(queryLower)) return 20;
-  return 0;
-}
-async function searchSlackUsers(options) {
-  const {
-    query,
-    limit = 10,
-    maxPages = 3,
-    includeDeleted = false,
-    includeBots = false
-  } = options;
-  const queryLower = query.toLowerCase().trim();
-  const client = getSlackClient();
-  const matches = [];
-  let cursor;
-  let pages = 0;
-  let totalScanned = 0;
-  let truncated = false;
-  while (pages < maxPages) {
-    pages++;
-    const result = await withSlackRetries(
-      () => client.users.list({
-        limit: 200,
-        ...cursor ? { cursor } : {}
-      }),
-      3,
-      { action: "users.list" }
-    );
-    const members = result.members ?? [];
-    totalScanned += members.length;
-    for (const member of members) {
-      if (!includeDeleted && member.deleted) continue;
-      if (!includeBots && member.is_bot) continue;
-      if (member.id === "USLACKBOT") continue;
-      const score = scoreMatch(member, queryLower);
-      if (score > 0) {
-        matches.push({ user: member, score });
-      }
-    }
-    const nextCursor = result.response_metadata?.next_cursor;
-    if (!nextCursor) {
-      break;
-    }
-    cursor = nextCursor;
-  }
-  if (pages >= maxPages && cursor) {
-    truncated = true;
-  }
-  matches.sort((a, b) => {
-    if (b.score !== a.score) return b.score - a.score;
-    return (a.user.name ?? "").localeCompare(b.user.name ?? "");
-  });
-  return {
-    users: matches.slice(0, limit).map((m) => normalizeUser(m.user)),
-    searched_pages: pages,
-    searched_user_count: totalScanned,
-    truncated
-  };
-}
-
-// src/chat/slack/tools/user-lookup.ts
+// src/chat/tools/user-lookup.ts
+import { and, eq, or, sql } from "drizzle-orm";
+import { alias } from "drizzle-orm/pg-core";
 import { z as z50 } from "zod";
+var linkedSlackIdentity = alias(juniorIdentities, "user_lookup_slack_identity");
 function explicitUserLookupError(error) {
-  if (error.apiError === "user_not_found") {
+  if (error.apiError === "user_not_found" || error.code === "not_found") {
     return "No Slack user found for the supplied user ID.";
   }
   if (error.code === "missing_scope") {
-    return error.needed ? `Slack user lookup is unavailable because this installation is missing the \`${error.needed}\` scope.` : "Slack user lookup is unavailable because this installation is missing a required Slack scope.";
-  }
-  if (error.code === "not_found") {
-    return "No Slack user found for the supplied user ID.";
+    return error.needed ? `User lookup is unavailable because this installation is missing the \`${error.needed}\` scope.` : "User lookup is unavailable because this installation is missing a required Slack scope.";
   }
   if (error.code === "invalid_arguments") {
     return `Slack rejected the user lookup arguments (${error.apiError ?? error.code}).`;
   }
   if (error.code === "feature_unavailable") {
-    return "Slack user lookup is not available for this workspace or app installation.";
+    return "User lookup is not available for this workspace or app installation.";
   }
   return void 0;
 }
-function createSlackUserLookupTool() {
+function slackMention(userId) {
+  return `<@${userId}>`;
+}
+function asMatch(user) {
+  return { ...user, mention: slackMention(user.id) };
+}
+function lookupResult(args) {
+  const users = args.users.map(asMatch);
+  if (users.length === 1) {
+    return {
+      provider: args.provider,
+      query: args.query,
+      count: 1,
+      mention: users[0].mention,
+      user: users[0],
+      ...args.search
+    };
+  }
+  return {
+    provider: args.provider,
+    query: args.query,
+    count: users.length,
+    users,
+    ...args.search
+  };
+}
+function slackProfileFromIdentity(identity) {
+  return {
+    id: identity.providerSubjectId,
+    name: identity.handle ?? void 0,
+    real_name: identity.displayName ?? void 0,
+    display_name: identity.displayName ?? void 0,
+    email: identity.email ?? void 0,
+    is_bot: false,
+    is_deleted: false
+  };
+}
+function slackMentionProfileFromIdentity(identity) {
+  return {
+    id: identity.providerSubjectId,
+    name: identity.handle ?? void 0
+  };
+}
+async function storedSlackUserByEmail(teamId, email) {
+  const emailNormalized = normalizeIdentityEmail(email);
+  if (!emailNormalized) return void 0;
+  const identities = await getSqlExecutor().db().select().from(juniorIdentities).where(
+    and(
+      eq(juniorIdentities.provider, "slack"),
+      eq(juniorIdentities.providerTenantId, teamId),
+      eq(juniorIdentities.kind, "user"),
+      eq(juniorIdentities.emailVerified, true),
+      eq(juniorIdentities.emailNormalized, emailNormalized)
+    )
+  ).limit(2);
+  if (identities.length > 1) {
+    throw new Error(
+      `Multiple Slack users share verified email ${emailNormalized} in workspace ${teamId}`
+    );
+  }
+  return identities[0] ? slackProfileFromIdentity(identities[0]) : void 0;
+}
+function looksLikeEmail(query) {
+  return /^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(query);
+}
+async function resolveSlack(teamId, query) {
+  const userId = parseSlackUserId(query);
+  if (userId) {
+    const user = await lookupSlackUserProfile(userId);
+    return lookupResult({ provider: "slack", query, users: [user] });
+  }
+  if (looksLikeEmail(query)) {
+    const stored = await storedSlackUserByEmail(teamId, query);
+    if (stored) {
+      return lookupResult({ provider: "slack", query, users: [stored] });
+    }
+    const profile = await lookupSlackUserByEmail(query);
+    if (!profile) {
+      throw new ToolInputError(
+        `No Slack user found with email address ${query}.`
+      );
+    }
+    return lookupResult({ provider: "slack", query, users: [profile] });
+  }
+  const result = await searchSlackUsers({
+    query,
+    limit: 10,
+    maxPages: 3,
+    includeBots: false
+  });
+  return lookupResult({
+    provider: "slack",
+    query,
+    users: result.users,
+    search: {
+      searched_pages: result.searched_pages,
+      searched_user_count: result.searched_user_count,
+      truncated: result.truncated
+    }
+  });
+}
+async function resolveStoredProvider(teamId, provider, query) {
+  const rows = await getSqlExecutor().db().select({ slack: linkedSlackIdentity }).from(juniorIdentities).innerJoin(
+    linkedSlackIdentity,
+    and(
+      eq(linkedSlackIdentity.userId, juniorIdentities.userId),
+      eq(linkedSlackIdentity.kind, "user"),
+      eq(linkedSlackIdentity.provider, "slack"),
+      eq(linkedSlackIdentity.providerTenantId, teamId)
+    )
+  ).where(
+    and(
+      eq(juniorIdentities.kind, "user"),
+      eq(juniorIdentities.provider, provider),
+      or(
+        eq(juniorIdentities.providerSubjectId, query),
+        sql`lower(${juniorIdentities.handle}) = lower(${query})`
+      )
+    )
+  ).limit(11);
+  const users = rows.slice(0, 10).map((row) => slackMentionProfileFromIdentity(row.slack));
+  return lookupResult({ provider, query, users });
+}
+function createUserLookupTool(teamId, providers) {
   return zodTool({
-    description: "Look up Slack user profiles by user ID, email, or name search. Set mode to match the identifier in value. Returns profile fields including title, status, and custom fields.",
+    description: "Look up people by identity provider and query. Pass an enabled `provider` and its provider subject ID or handle. The `slack` provider also accepts email and name searches. Returns Slack `mention` values (`<@U\u2026>`) for the current workspace. Use a mention only when one person clearly matches; otherwise ask which person the user means.",
     annotations: {
       destructiveHint: false,
       idempotentHint: true,
@@ -11686,53 +11706,13 @@ function createSlackUserLookupTool() {
       readOnlyHint: true
     },
     inputSchema: z50.object({
-      mode: z50.enum(["user_id", "email", "query"]).describe(
-        "Lookup method: user_id for Slack IDs, email for email addresses, or query for name searches."
-      ),
-      value: z50.string().trim().min(2).describe(
-        "The Slack user ID, email address, or name to look up, interpreted according to mode."
-      )
+      provider: z50.enum(providers).describe("Enabled identity provider to query."),
+      query: z50.string().trim().min(1).describe("Provider subject ID, handle, Slack email, or Slack name.")
     }).strict(),
     outputSchema: juniorToolOutputSchema,
-    execute: async ({ mode, value }) => {
+    execute: async ({ provider, query }) => {
       try {
-        if (mode === "user_id") {
-          const parsedUserId = parseRequiredSlackUserIdParam("value", value);
-          if (!parsedUserId.ok) {
-            throw new ToolInputError(parsedUserId.error);
-          }
-          return {
-            mode: "user_id",
-            user: await lookupSlackUserProfile(parsedUserId.value)
-          };
-        }
-        if (mode === "email") {
-          const profile = await lookupSlackUserByEmail(value);
-          if (!profile) {
-            throw new ToolInputError(
-              `No Slack user found with email address ${value}.`
-            );
-          }
-          return {
-            mode: "email",
-            user: profile
-          };
-        }
-        const result = await searchSlackUsers({
-          query: value,
-          limit: 10,
-          maxPages: 3,
-          includeBots: false
-        });
-        return {
-          mode: "query",
-          query: value,
-          count: result.users.length,
-          searched_pages: result.searched_pages,
-          searched_user_count: result.searched_user_count,
-          truncated: result.truncated,
-          users: result.users
-        };
+        return provider === "slack" ? await resolveSlack(teamId, query) : await resolveStoredProvider(teamId, provider, query);
       } catch (error) {
         if (error instanceof SlackActionError) {
           const message = explicitUserLookupError(error);
@@ -11837,7 +11817,7 @@ function getTimeZoneOffsetMinutes(timestampMs, timezone) {
   return Math.round((timestampMs - asUtcMs) / 6e4);
 }
 
-// src/chat/tools/query-conversation-events.ts
+// src/chat/tools/search-conversation-events.ts
 import { z as z52 } from "zod";
 var DEFAULT_LIMIT3 = 25;
 var MAX_LIMIT = 100;
@@ -11845,40 +11825,26 @@ var MAX_EVENT_DATA_BYTES = 4e3;
 var MAX_EVENTS_JSON_BYTES = 2e4;
 var MAX_IDENTITY_CHARS = 256;
 var textEncoder = new TextEncoder();
-var CONVERSATION_EVENTS_TOOL_SOURCE = {
-  id: "conversation-events",
-  description: "Inspect Junior's durable conversation event log for debugging runtime behavior."
-};
 var knownEventTypeSchema = z52.enum(KNOWN_CONVERSATION_EVENT_TYPES);
 var projectedEventSchema = z52.object({
-  seq: z52.number().int().nonnegative().describe("Stable event position; use it for pagination bounds."),
-  history_version: z52.number().int().nonnegative().describe(
-    "Model-history generation. It increments when handoff or compaction replaces active model context."
-  ),
+  seq: z52.number().int().nonnegative().describe("Stable event position for pagination."),
+  history_version: z52.number().int().nonnegative().describe("Agent history generation after replacement."),
   created_at: z52.iso.datetime().describe("When the event was recorded."),
-  idempotency_key: z52.string().min(1).optional().describe("Retry-stable event identity, when one was assigned."),
-  data: z52.record(z52.string(), z52.unknown()).describe(
-    "Event data. Oversized payloads are replaced by identifying fields, payload_omitted, and payload_json_bytes."
-  )
+  idempotency_key: z52.string().min(1).optional().describe("Retry-stable event identity, when assigned."),
+  data: z52.record(z52.string(), z52.unknown()).describe("Bounded event data.")
 }).strict();
-var queryConversationEventsOutputSchema = juniorToolOutputSchema.extend({
+var searchConversationEventsOutputSchema = juniorToolOutputSchema.extend({
   conversation_id: z52.string().min(1),
   events: z52.array(projectedEventSchema),
-  has_older: z52.boolean().describe(
-    "Whether matching events exist before this page; request them with before_seq set to the first returned seq."
-  ),
-  has_newer: z52.boolean().describe(
-    "Whether matching events exist after this page; request them with after_seq set to the last returned seq."
-  ),
-  omitted_event_count: z52.number().int().nonnegative().optional().describe(
-    "Fetched events omitted to keep this response bounded. Continue with the pagination cursor for the omitted direction."
-  )
+  has_older: z52.boolean().describe("Whether matching older events exist."),
+  has_newer: z52.boolean().describe("Whether matching newer events exist."),
+  omitted_event_count: z52.number().int().nonnegative().optional().describe("Events omitted by the response byte limit.")
 });
-function createQueryConversationEventsTool(context) {
+function createSearchConversationEventsTool(context) {
   return zodTool({
-    description: "Inspect Junior's stored turns, tool calls, handoffs, and compaction events when debugging its behavior. Returns events from the current conversation tree or another retained public conversation in the same Slack workspace, newest first by default.",
+    description: "Search the durable event log for one conversation, including messages, agent history, tool results, handoffs, and compactions. Defaults to the current conversation. Outside the current conversation tree, only retained public conversations in the current Slack workspace are accessible.",
     exposure: "deferred",
-    source: CONVERSATION_EVENTS_TOOL_SOURCE,
+    source: CONVERSATIONS_TOOL_SOURCE,
     annotations: {
       destructiveHint: false,
       idempotentHint: true,
@@ -11886,31 +11852,25 @@ function createQueryConversationEventsTool(context) {
       readOnlyHint: true
     },
     inputSchema: z52.object({
-      conversation_id: z52.string().trim().min(1).describe(
-        "Conversation ID to inspect, such as slack:{channelId}:{threadTs} or a child conversation id."
-      ),
-      after_seq: z52.number().int().nonnegative().nullable().describe(
-        "Exclusive lower bound on event seq. When set, returns the next newer page in ascending order."
-      ).optional(),
-      before_seq: z52.number().int().nonnegative().nullable().describe(
-        "Exclusive upper bound on event seq. Combine with defaults or after_seq to page older or bounded ranges."
+      conversation_id: z52.string().trim().min(1).nullable().describe(
+        "Conversation ID to search. Omit or null for the current conversation."
       ).optional(),
+      after_seq: z52.number().int().nonnegative().nullable().describe("Exclusive event sequence lower bound; returns ascending.").optional(),
+      before_seq: z52.number().int().nonnegative().nullable().describe("Exclusive event sequence upper bound.").optional(),
       limit: z52.number().int().min(1).max(MAX_LIMIT).nullable().describe(
-        `Maximum events to return. Defaults to ${DEFAULT_LIMIT3}; max ${MAX_LIMIT}.`
+        `Maximum events. Default ${DEFAULT_LIMIT3}; max ${MAX_LIMIT}.`
       ).optional(),
-      types: z52.array(knownEventTypeSchema).min(1).nullable().describe(
-        "Optional event-type filter. Omit to return every durable event type."
-      ).optional()
+      types: z52.array(knownEventTypeSchema).min(1).nullable().describe("Event types to include; omit for all types.").optional()
     }).strict(),
-    outputSchema: queryConversationEventsOutputSchema,
+    outputSchema: searchConversationEventsOutputSchema,
     execute: async (input) => {
       const currentConversationId = context.conversationId?.trim();
       if (!currentConversationId) {
         throw new ToolInputError(
-          "queryConversationEvents requires an active conversation"
+          "searchConversationEvents requires an active conversation"
         );
       }
-      const conversationId = input.conversation_id;
+      const conversationId = input.conversation_id?.trim() || currentConversationId;
       const afterSeq = input.after_seq ?? void 0;
       const beforeSeq = input.before_seq ?? void 0;
       const limit = input.limit ?? DEFAULT_LIMIT3;
@@ -11943,7 +11903,7 @@ function createQueryConversationEventsTool(context) {
       const targetRoot = targetRootConversationId === conversationId ? target : await conversationStore.get({
         conversationId: targetRootConversationId
       });
-      assertCanQueryConversationEvents({
+      assertCanSearchConversationEvents({
         accessScope,
         targetConversationId: conversationId,
         targetRootConversationId,
@@ -12021,7 +11981,7 @@ async function resolveRootConversationId(conversationStore, conversationId, pare
   }
   return conversationId;
 }
-function assertCanQueryConversationEvents(args) {
+function assertCanSearchConversationEvents(args) {
   const {
     accessScope,
     targetConversationId,
@@ -12785,28 +12745,9 @@ function createWriteFileTool() {
 }
 
 // src/chat/tools/index.ts
-function createToolState(hooks, context) {
+function createToolState() {
   const operationResultCache = /* @__PURE__ */ new Map();
-  const artifactState = {
-    ...context.artifactState ?? {},
-    listColumnMap: {
-      ...context.artifactState?.listColumnMap ?? {}
-    }
-  };
-  const patchArtifactState = async (patch) => {
-    Object.assign(artifactState, patch);
-    if (patch.listColumnMap) {
-      artifactState.listColumnMap = {
-        ...artifactState.listColumnMap ?? {},
-        ...patch.listColumnMap
-      };
-    }
-    await hooks.onArtifactStatePatch?.(patch);
-  };
   return {
-    artifactState,
-    patchArtifactState,
-    getCurrentListId: () => artifactState.lastListId,
     getOperationResult: (operationKey) => operationResultCache.get(operationKey),
     setOperationResult: (operationKey, result) => {
       operationResultCache.set(operationKey, result);
@@ -12814,7 +12755,7 @@ function createToolState(hooks, context) {
   };
 }
 function createTools(availableSkills, hooks = {}, context, options = {}) {
-  const state = createToolState(hooks, context);
+  const state = createToolState();
   const slackContext = getSlackToolContext(context);
   const slackSourceCapabilities = slackContext ? resolveChannelCapabilities(slackContext.sourceChannelId) : void 0;
   const canSendFilesToActiveConversation = Boolean(
@@ -12848,7 +12789,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
     ...createScheduledTaskTools(context)
   };
   if (context.conversationId) {
-    tools.queryConversationEvents = createQueryConversationEventsTool(context);
+    tools.searchConversationEvents = createSearchConversationEventsTool(context);
   }
   if (context.supportsImageInput) {
     tools.viewImage = createViewImageTool(
@@ -12885,7 +12826,7 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
     tools.slackCanvasWrite = createSlackCanvasWriteTool(state);
     tools.slackThreadRead = createSlackThreadReadTool(slackContext);
     if (context.conversationId && slackContext.source.visibility === "public") {
-      tools.searchConversationHistory = createSlackConversationSearchTool(
+      tools.searchConversationMessages = createSlackConversationMessageSearchTool(
         {
           kind: "public_provider_tenant",
           provider: "slack",
@@ -12899,10 +12840,17 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
         context.slackActionToken
       );
     }
-    tools.slackUserLookup = createSlackUserLookupTool();
+    const identityProviders = [
+      "slack",
+      ...getOAuthAccountProviders().filter((provider) => provider !== "slack")
+    ];
+    tools.userLookup = createUserLookupTool(
+      slackContext.teamId,
+      identityProviders
+    );
     tools.slackListCreate = createSlackListCreateTool(state);
     tools.slackListAddItems = createSlackListAddItemsTool(state);
-    tools.slackListGetItems = createSlackListGetItemsTool(state);
+    tools.slackListGetItems = createSlackListGetItemsTool();
     tools.slackListUpdateItem = createSlackListUpdateItemTool(state);
     const outputChannelId = slackContext.destinationChannelId;
     const outputCapabilities = outputChannelId ? resolveChannelCapabilities(outputChannelId) : void 0;
@@ -13544,6 +13492,46 @@ var SEARCH_TOOLS_NAME = "searchTools";
 var DEFAULT_MAX_RESULTS2 = 5;
 var MAX_RESULTS3 = 20;
 var MODEL_VISIBLE_DESCRIPTION_CAP = 180;
+var SEARCH_FIELD_WEIGHTS = [8, 4, 1];
+var BM25_K1 = 1.2;
+var BM25_B = 0.75;
+var SEARCH_STOP_WORDS = /* @__PURE__ */ new Set([
+  "a",
+  "an",
+  "and",
+  "are",
+  "as",
+  "at",
+  "be",
+  "by",
+  "do",
+  "for",
+  "from",
+  "how",
+  "i",
+  "in",
+  "is",
+  "it",
+  "me",
+  "my",
+  "of",
+  "on",
+  "or",
+  "please",
+  "that",
+  "the",
+  "this",
+  "to",
+  "use",
+  "we",
+  "what",
+  "when",
+  "where",
+  "which",
+  "with",
+  "you",
+  "your"
+]);
 var searchToolsSourceSchema = z58.object({
   id: z58.string(),
   description: z58.string()
@@ -13568,8 +13556,26 @@ var searchToolsOutputSchema = juniorToolOutputSchema.extend({
   execution_tool: z58.literal("executeTool"),
   tools: z58.array(searchToolsToolSchema)
 }).strict();
-function normalize2(value) {
-  return value.toLowerCase().replace(/[^a-z0-9_]+/g, " ").trim();
+function terms(value) {
+  const chunks = value.match(/[\p{L}\p{N}]+/gu) ?? [];
+  const result = [];
+  for (const chunk of chunks) {
+    result.push(chunk.toLowerCase());
+    const expanded = chunk.replace(/([a-z\d])([A-Z])/g, "$1 $2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1 $2").toLowerCase().split(/\s+/);
+    if (expanded.length > 1) {
+      result.push(...expanded);
+    }
+  }
+  return result;
+}
+function queryTerms(query) {
+  return [
+    ...new Set(
+      terms(query).filter(
+        (term) => term.length >= 2 && !SEARCH_STOP_WORDS.has(term)
+      )
+    )
+  ];
 }
 function summarizeModelVisibleDescription(description) {
   const paragraph = description.split(/\n\s*\n/).map((part) => part.trim()).find(Boolean) ?? "";
@@ -13586,36 +13592,114 @@ function schemaText(schema) {
     return "";
   }
 }
-function searchableToolText2(name, definition) {
-  return normalize2(
-    [
-      name,
-      definition.identity?.id,
-      definition.identity?.name,
-      definition.identity?.plugin,
-      definition.source?.id,
-      definition.source?.description,
-      definition.description,
-      definition.promptSnippet,
-      ...definition.promptGuidelines ?? [],
-      schemaText(definition.inputSchema),
-      JSON.stringify(definition.annotations ?? {})
-    ].filter(Boolean).join(" ")
+function searchableToolFields(name, definition) {
+  return [
+    terms(
+      [
+        name,
+        definition.identity?.id,
+        definition.identity?.name,
+        definition.identity?.plugin
+      ].filter(Boolean).join(" ")
+    ),
+    terms(
+      [
+        definition.description,
+        definition.promptSnippet,
+        ...definition.promptGuidelines ?? []
+      ].filter(Boolean).join(" ")
+    ),
+    terms(
+      [
+        definition.source?.id,
+        definition.source?.description,
+        schemaText(definition.inputSchema),
+        schemaText(definition.annotations ?? {})
+      ].filter(Boolean).join(" ")
+    )
+  ];
+}
+function prepareSearchDocuments(tools, source) {
+  return Object.entries(tools).filter(
+    ([, definition]) => source ? definition.source?.id === source : true
+  ).map(([name, definition]) => ({
+    name,
+    fields: searchableToolFields(name, definition)
+  }));
+}
+function averageFieldLengths(documents) {
+  if (documents.length === 0) {
+    return SEARCH_FIELD_WEIGHTS.map(() => 0);
+  }
+  return SEARCH_FIELD_WEIGHTS.map(
+    (_, fieldIndex) => documents.reduce(
+      (total, document) => total + document.fields[fieldIndex].length,
+      0
+    ) / documents.length
   );
 }
+function documentFrequencies(documents) {
+  const frequencies = /* @__PURE__ */ new Map();
+  for (const document of documents) {
+    const uniqueTerms = new Set(document.fields.flat());
+    for (const term of uniqueTerms) {
+      frequencies.set(term, (frequencies.get(term) ?? 0) + 1);
+    }
+  }
+  return frequencies;
+}
+function scoreSearchDocument(document, query, frequencies, documentCount, averageLengths) {
+  return query.reduce((score, term) => {
+    const documentFrequency = frequencies.get(term) ?? 0;
+    if (documentFrequency === 0) {
+      return score;
+    }
+    const weightedTermFrequency = document.fields.reduce(
+      (weighted, field, fieldIndex) => {
+        const termFrequency = field.filter(
+          (candidate) => candidate === term
+        ).length;
+        if (termFrequency === 0) {
+          return weighted;
+        }
+        const averageLength = averageLengths[fieldIndex] ?? 0;
+        const lengthRatio = averageLength === 0 ? 1 : field.length / averageLength;
+        return weighted + SEARCH_FIELD_WEIGHTS[fieldIndex] * (termFrequency / (1 - BM25_B + BM25_B * lengthRatio));
+      },
+      0
+    );
+    if (weightedTermFrequency === 0) {
+      return score;
+    }
+    const inverseDocumentFrequency = Math.log(
+      1 + (documentCount - documentFrequency + 0.5) / (documentFrequency + 0.5)
+    );
+    return score + inverseDocumentFrequency * weightedTermFrequency * (BM25_K1 + 1) / (weightedTermFrequency + BM25_K1);
+  }, 0);
+}
 function searchCatalogTools(tools, query, source) {
-  const entries = Object.entries(tools).sort(
-    ([left], [right]) => left.localeCompare(right)
-  );
-  const sourceEntries = source ? entries.filter(([, definition]) => definition.source?.id === source) : entries;
-  if (!normalize2(query)) {
-    return sourceEntries.map(([name]) => name);
+  const documents = prepareSearchDocuments(tools, source);
+  if (!query.trim()) {
+    return documents.map(({ name }) => name).sort((left, right) => left.localeCompare(right));
+  }
+  const searchTerms = queryTerms(query);
+  if (searchTerms.length === 0) {
+    return [];
   }
-  const terms = normalize2(query).split(/\s+/).filter(Boolean);
-  return sourceEntries.filter(([name, definition]) => {
-    const text = searchableToolText2(name, definition);
-    return terms.every((term) => text.includes(term));
-  }).map(([name]) => name);
+  const averageLengths = averageFieldLengths(documents);
+  const frequencies = documentFrequencies(documents);
+  return documents.map((document) => ({
+    name: document.name,
+    score: scoreSearchDocument(
+      document,
+      searchTerms,
+      frequencies,
+      documents.length,
+      averageLengths
+    )
+  })).filter(({ score }) => score > 0).sort(
+    (left, right) => right.score - left.score || left.name.localeCompare(right.name)
+  ).map(({ name }) => name);
 }
 function callNotes(definition) {
   return [
@@ -14020,7 +14104,6 @@ function createMcpAuthOrchestration(input) {
       ...input.threadTs ? { threadTs: input.threadTs } : {},
       ...input.toolChannelId ? { toolChannelId: input.toolChannelId } : {},
       configuration: input.getConfiguration(),
-      artifactState: input.getArtifactState(),
       createAuthorizationState: input.authorization?.createState
     });
     authSessionIdsByProvider.set(plugin.manifest.name, provider.authSessionId);
@@ -14058,11 +14141,9 @@ function createMcpAuthOrchestration(input) {
     });
     const reusedAuthSessionId = reusingPendingLink && input.pendingAuth?.kind === "mcp" ? input.pendingAuth.authSessionId : void 0;
     const activeAuthSessionId = reusedAuthSessionId ?? authSessionId;
-    const latestArtifactState = input.getMergedArtifactState();
     await patchMcpAuthSession(activeAuthSessionId, {
       configuration: { ...input.getConfiguration() },
-      artifactState: latestArtifactState,
-      toolChannelId: input.toolChannelId ?? latestArtifactState.assistantContextChannelId ?? input.channelId
+      toolChannelId: input.toolChannelId ?? input.channelId
     });
     const providerLabel = formatProviderLabel(provider);
     const nextPendingAuth = {
@@ -15039,6 +15120,7 @@ function createGuardianActionReviewer(options) {
         maxTokens: GUARDIAN_REVIEW_MAX_TOKENS,
         recordTelemetryPayloads: false,
         temperature: 0,
+        promptName: "junior.guardian_action_review",
         signal,
         metadata: {
           conversationId: proposal.context.conversationId,
@@ -15271,7 +15353,7 @@ async function wireAgentTools(args) {
     egressSignals: args.policy.sandboxEgressSignals,
     credentialEgress: args.routing.credentialContext,
     actor: args.currentActor,
-    channelConfiguration: args.policy.channelConfiguration,
+    locationConfiguration: args.policy.locationConfiguration,
     configurationValues: args.configurationValues,
     getActiveSkill: () => args.skillSandbox.getActiveSkill(),
     prepareSandbox: pluginHooks.prepareSandbox,
@@ -15293,11 +15375,6 @@ async function wireAgentTools(args) {
     userMessage: args.userInput,
     pendingAuth: args.state.pendingAuth,
     getConfiguration: () => args.configurationValues,
-    getArtifactState: () => args.state.artifactState,
-    getMergedArtifactState: () => mergeArtifactsState(
-      args.state.artifactState ?? {},
-      args.artifactStatePatch
-    ),
     recordPendingAuth: args.durability.recordPendingAuth,
     interactiveAuthEnabled: !isAgentRunFeatureDisabled(
       args.policy,
@@ -15310,6 +15387,7 @@ async function wireAgentTools(args) {
     conversationId: args.conversationId,
     sessionId: args.turnId,
     actorId: credentialUserId,
+    actor: args.currentActor,
     channelId: slackChannelId,
     destination: args.routing.destination,
     source: runSource,
@@ -15347,7 +15425,6 @@ async function wireAgentTools(args) {
   const commonToolRuntimeContext = {
     conversationId: args.conversationId,
     userText: args.userInput,
-    artifactState: args.state.artifactState,
     configuration: args.configurationValues,
     egress: createPluginEgress({
       credentialContext: args.routing.credentialContext,
@@ -15435,15 +15512,6 @@ async function wireAgentTools(args) {
         args.generatedFiles.push(...files);
         return refs;
       },
-      onArtifactStatePatch: async (patch) => {
-        Object.assign(args.artifactStatePatch, patch);
-        await args.durability.onArtifactStateUpdated?.(
-          mergeArtifactsState(
-            args.state.artifactState ?? {},
-            args.artifactStatePatch
-          )
-        );
-      },
       toolOverrides: args.policy.toolOverrides,
       onSkillLoaded: async (loadedSkill) => {
         const resolvedSkill = await args.skillSandbox.loadSkill(
@@ -15451,7 +15519,6 @@ async function wireAgentTools(args) {
         );
         const effective = resolvedSkill ?? loadedSkill;
         upsertActiveSkill(args.activeSkills, effective);
-        args.syncLoadedSkillNamesForResume();
         if (await mcpToolManager.activateForSkill(effective)) {
           await args.recordConnectedMcpProvider(effective.pluginProvider);
         }
@@ -15617,14 +15684,11 @@ function createResumeState(args) {
   const writeBase = () => ({
     conversationId: args.conversationId,
     turnId: args.turnId,
-    modelId: args.getModelId(),
     channelName: args.channelName,
     destination: args.destination,
     destinationVisibility: args.destinationVisibility,
     dispatchId: args.dispatchId,
     source: args.runSource,
-    loadedSkillNames: args.getLoadedSkillNames(),
-    reasoningLevel: args.getReasoningLevel(),
     actor: args.actor,
     surface: args.surface
   });
@@ -16026,6 +16090,7 @@ async function summarizeContext(args, deps) {
     messageAttributeMode: "metadata",
     temperature: 0,
     signal: args.signal,
+    promptName: "junior.context_compaction",
     messages: [
       {
         role: "user",
@@ -16491,10 +16556,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     const skillInvocation = parseSkillInvocation(userInput, availableSkills);
     const invokedSkill = skillInvocation ? findSkillByName(skillInvocation.skillName, availableSkills) : null;
     const activeSkills = [];
-    let loadedSkillNamesForResume = [];
-    const syncLoadedSkillNamesForResume = () => {
-      loadedSkillNamesForResume = activeSkills.map((skill) => skill.name);
-    };
     const skillSandbox = new SkillSandbox(availableSkills, activeSkills);
     const checkpoint = await loadTurnCheckpoint({ conversationId, turnId });
     const resumedFromSessionRecord = checkpoint.resumed;
@@ -16529,9 +16590,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       ...routing.destinationVisibility ? { destinationVisibility: routing.destinationVisibility } : {},
       ...routing.dispatch?.id ? { dispatchId: routing.dispatch.id } : {},
       durability,
-      getLoadedSkillNames: () => loadedSkillNamesForResume,
-      getReasoningLevel: () => turnRoute?.reasoningLevel,
-      getModelId: () => activeModelId,
       recordActiveMcpProviders,
       actor,
       runSource,
@@ -16555,7 +16613,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
         });
       }
     };
-    const persistedConfigurationValues = policy.channelConfiguration ? await policy.channelConfiguration.resolveValues() : {};
+    const persistedConfigurationValues = policy.locationConfiguration ? await policy.locationConfiguration.resolveValues() : {};
     const configurationValues = {
       ...getConfigDefaults(),
       ...policy.configuration ?? {},
@@ -16569,8 +16627,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       activeSkills,
       invokedSkill,
       priorPiMessages,
-      skillSandbox,
-      syncLoadedSkillNamesForResume
+      skillSandbox
     });
     const explicitSkill = invokedSkill ? activeSkills.find((skill) => skill.name === invokedSkill.name) ?? null : null;
     const { contextContentParts, routerBlocks, userContentParts } = buildPromptInput(input);
@@ -16584,10 +16641,9 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
           botConfig,
           activeModelProfile
         );
-        const resumedReasoningLevel = existingSessionRecord?.reasoningLevel ? parseTurnReasoningLevel(existingSessionRecord.reasoningLevel) : void 0;
         turnRoute = {
           profile: activeModelProfile,
-          reasoningLevel: activeProfileConfig.reasoningLevel ?? resumedReasoningLevel ?? storedTurnRoute.reasoningLevel,
+          reasoningLevel: activeProfileConfig.reasoningLevel ?? storedTurnRoute.reasoningLevel,
           reason: `resumed_handoff:${storedTurnRoute.modelProfile}:${activeModelProfile}`
         };
       } else {
@@ -16652,6 +16708,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
         turnId,
         modelProfile: routedModelProfile,
         modelId: routedModelId,
+        ...turnRoute.costUsd !== void 0 ? { costUsd: turnRoute.costUsd } : {},
         reasoningLevel: turnRoute.reasoningLevel,
         ...turnRoute.confidence !== void 0 ? { confidence: turnRoute.confidence } : {},
         source: turnRoute.source ?? "configured"
@@ -16660,7 +16717,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     activeModelProfile = routedModelProfile;
     activeModelId = routedModelId;
     const generatedFiles = [];
-    const artifactStatePatch = {};
     const toolCalls = [];
     let agent;
     let pendingPiHookError;
@@ -16766,7 +16822,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       currentAgentMessages,
       currentTurnMessages,
       currentUserIntent,
-      artifactStatePatch,
       availableSkills,
       configurationValues,
       connectedMcpProviders,
@@ -16797,7 +16852,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       state,
       supportsImageInput: () => resolveGatewayModel(activeModelId).input.includes("image"),
       surface,
-      syncLoadedSkillNamesForResume,
       toolCalls,
       userInput
     });
@@ -16856,7 +16910,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     } = await assemblePrompt({
       activeMcpCatalogs: wiring.activeMcpCatalogs,
       currentActor: actor,
-      artifactState: state.artifactState,
       availableSkills,
       configurationValues,
       contextContentParts: [
@@ -17066,13 +17119,13 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
         return void 0;
       },
       afterToolCall: async ({ result: result2, toolCall }, signal2) => {
-        const deadlineResult = runResume.timedOut && signal2?.aborted ? annotateTurnDeadlineToolResult(result2) : void 0;
-        const sourceResult = deadlineResult ?? result2;
+        const timedOutResult = runResume.timedOut && signal2?.aborted ? projectTimedOutToolResult(result2) : void 0;
+        const sourceResult = timedOutResult ?? result2;
         const projectedResult = wiring.projectActionReviewResult(
           toolCall.id,
           sourceResult
         );
-        return deadlineResult || projectedResult !== result2 ? projectedResult : void 0;
+        return timedOutResult || projectedResult !== result2 ? projectedResult : void 0;
       },
       prepareNextTurnWithContext: async (nextTurn, hookSignal) => {
         try {
@@ -17442,7 +17495,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     const result = buildTurnResult({
       newMessages,
       userInput,
-      artifactStatePatch,
       toolCalls,
       sandboxRef: wiring.getSandboxRef(),
       piMessages: [...agent.state.messages],
@@ -17577,8 +17629,8 @@ export {
   deliverResourceEventSubscription,
   sanitizeScheduledTaskPrincipal,
   listThreadReplies,
-  renderSlackLegacyAttachmentText,
-  appendSlackLegacyAttachmentText,
+  renderBlockText,
+  renderAttachmentText,
   latestReportedProgress,
   executeCredentialedEgressRequest,
   createContextCompactor,