@sentry/junior 0.146.0 → 0.147.0

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

@@ -7,7 +7,7 @@ import {
   PluginCredentialFailureError,
   agentNameSchema,
   createPluginAuthOrchestration
-} from "./chunk-FEKQHPVA.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-47OSH2ZO.js";
+} from "./chunk-Q4R73I43.js";
 import {
   RetryableDeliveryError,
   actorFromRouting,
@@ -44,12 +48,12 @@ import {
   getSlackMessagePermalink,
   resolveBaseUrl,
   uploadFilesToConversation
-} from "./chunk-ZDGHGY74.js";
+} from "./chunk-7UQIVT6G.js";
 import {
   estimateTextTokens,
   getAgentContextCompactionTriggerTokens,
   getAgentContextInputLimitTokens
-} from "./chunk-T5GXFFLA.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-GDQEU4I7.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-FXDDDSPL.js";
+} from "./chunk-AVZDSUFB.js";
 import {
   SCHEDULED_TASK_SYSTEM_ACTOR,
   compactEventTask,
@@ -175,15 +178,15 @@ import {
   saveEventTask,
   scheduledTaskAttributes,
   writableEventTask
-} from "./chunk-X22KCSCO.js";
+} from "./chunk-EFLJ2WJH.js";
 import {
   parseSlackThreadId
-} from "./chunk-PH4Q3A6W.js";
+} from "./chunk-CSZINQJ2.js";
 import {
   SHORT_TITLE_MAX_LENGTH,
   generateShortTitle,
   resolveTaskTitle
-} from "./chunk-W65V465O.js";
+} from "./chunk-Z4YU7Z4L.js";
 import {
   ToolInputError,
   addAgentTurnUsage,
@@ -201,7 +204,7 @@ import {
   getSlackToolContext,
   readActorIdentity,
   resolveChannelCapabilities
-} from "./chunk-SCGVWUZX.js";
+} from "./chunk-YHDERDRO.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -210,7 +213,7 @@ import {
   isConversationScopedChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-V6SRLKUB.js";
+} from "./chunk-SGZO7UWH.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
@@ -221,12 +224,11 @@ import {
   getSqlExecutor,
   instructionActors,
   instructionProvenanceFor,
-  sameActorIdentity,
-  upsertIdentity
-} from "./chunk-37EVZP66.js";
+  sameActorIdentity
+} from "./chunk-YSB2N563.js";
 import {
   juniorIdentities
-} from "./chunk-MCFIXAV5.js";
+} from "./chunk-DU74WPIC.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -238,7 +240,7 @@ import {
 } from "./chunk-EM225ITJ.js";
 import {
   getStateAdapter
-} from "./chunk-GYEKOX7N.js";
+} from "./chunk-ORO3PWKQ.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -271,7 +273,7 @@ import {
   resolveGatewayCredential,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-MKRIZ4VG.js";
+} from "./chunk-7NVJVJID.js";
 import {
   canExposeConversationPayload,
   resolveConversationPrivacy,
@@ -281,16 +283,16 @@ import {
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes
-} from "./chunk-QG7OOKIN.js";
+} from "./chunk-RXBVB2JM.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-FGHADGIC.js";
+} from "./chunk-YBVXBNSV.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-PB222GIA.js";
+} from "./chunk-JUUKWRBE.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -298,7 +300,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-37JJDS4H.js";
+} from "./chunk-GGB4WL5A.js";
 import {
   credentialUserSubjectId
 } from "./chunk-RUIXF3YQ.js";
@@ -328,7 +330,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-B63BF443.js";
+} from "./chunk-4LJO56OJ.js";
 import {
   startInactiveSpan,
   withActiveSpan
@@ -810,7 +812,6 @@ import { isRetryableAssistantError } from "@earendil-works/pi-ai";
 function buildTurnResult(input) {
   const {
     newMessages,
-    artifactStatePatch,
     toolCalls,
     sandboxRef,
     durationMs,
@@ -906,7 +907,6 @@ function buildTurnResult(input) {
   };
   return {
     text: primaryText,
-    artifactStatePatch: Object.keys(artifactStatePatch).length > 0 ? artifactStatePatch : void 0,
     sandboxRef,
     piMessages: input.piMessages,
     diagnostics: resolvedDiagnostics
@@ -986,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
   };
 }
 
@@ -1227,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}`,
@@ -1242,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,
@@ -1764,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)
@@ -1842,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.",
@@ -2004,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(
@@ -2112,7 +2078,6 @@ function buildTurnContextPrompt(params) {
     pluginPromptContributions,
     includeSessionContext ? buildContextSection({
       actor: params.actor,
-      artifactState: params.artifactState,
       configuration: params.configuration,
       dispatch: params.dispatch
     }) : null,
@@ -2410,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 }] : [];
@@ -2496,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,
@@ -2544,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;
   }
@@ -6039,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) {
@@ -6924,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", {
@@ -10564,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) {
@@ -10648,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,
@@ -10671,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) {
@@ -10738,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
@@ -10862,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,
@@ -10950,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"
@@ -11021,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
       )
     });
@@ -11063,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."
@@ -11072,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
@@ -11095,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
       };
@@ -11141,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,
@@ -11159,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,
@@ -11169,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 }))
       };
     }
@@ -11195,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.")
@@ -11213,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
@@ -11235,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
@@ -11643,183 +11553,70 @@ function createSlackThreadReadTool(context, deps = {}) {
   });
 }
 
-// src/chat/slack/tools/user-lookup.ts
-import { and, eq } from "drizzle-orm";
+// 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";
-
-// 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
+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 slackMention(userId) {
   return `<@${userId}>`;
 }
-async function storeProfile(teamId, profile) {
-  await upsertIdentity(getSqlExecutor(), {
-    kind: profile.is_bot ? "service" : "user",
-    provider: "slack",
-    providerTenantId: teamId,
-    providerSubjectId: profile.id,
-    ...profile.real_name || profile.display_name ? { displayName: profile.real_name || profile.display_name } : {},
-    ...profile.name ? { handle: profile.name } : {},
-    ...profile.email ? { email: profile.email, emailVerified: true } : {}
-  });
+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
+  };
 }
-async function storedUserByEmail(teamId, email) {
+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(
@@ -11836,21 +11633,72 @@ async function storedUserByEmail(teamId, email) {
       `Multiple Slack users share verified email ${emailNormalized} in workspace ${teamId}`
     );
   }
-  const identity = identities[0];
-  if (!identity) return void 0;
-  return {
-    id: identity.providerSubjectId,
-    ...identity.handle ? { name: identity.handle } : {},
-    ...identity.displayName ? { real_name: identity.displayName } : {},
-    ...identity.displayName ? { display_name: identity.displayName } : {},
-    ...identity.email ? { email: identity.email } : {},
-    is_bot: false,
-    is_deleted: false
-  };
+  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
+    }
+  });
 }
-function createSlackUserLookupTool(teamId) {
+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. Returns Slack `mention` values (`<@U\u2026>`). Use a mention only when one person clearly matches; otherwise ask which person the user means.",
+    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,
@@ -11858,72 +11706,13 @@ function createSlackUserLookupTool(teamId) {
       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);
-          }
-          const user = await lookupSlackUserProfile(parsedUserId.value);
-          await storeProfile(teamId, user);
-          return {
-            mode: "user_id",
-            mention: slackMention(user.id),
-            user
-          };
-        }
-        if (mode === "email") {
-          const stored = await storedUserByEmail(teamId, value);
-          if (stored) {
-            return {
-              mode: "email",
-              mention: slackMention(stored.id),
-              user: stored
-            };
-          }
-          const profile = await lookupSlackUserByEmail(value);
-          if (!profile) {
-            throw new ToolInputError(
-              `No Slack user found with email address ${value}.`
-            );
-          }
-          await storeProfile(teamId, profile);
-          return {
-            mode: "email",
-            mention: slackMention(profile.id),
-            user: profile
-          };
-        }
-        const result = await searchSlackUsers({
-          query: value,
-          limit: 10,
-          maxPages: 3,
-          includeBots: false
-        });
-        if (result.users.length === 1) {
-          await storeProfile(teamId, result.users[0]);
-        }
-        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.map((user) => ({
-            ...user,
-            mention: slackMention(user.id)
-          }))
-        };
+        return provider === "slack" ? await resolveSlack(teamId, query) : await resolveStoredProvider(teamId, provider, query);
       } catch (error) {
         if (error instanceof SlackActionError) {
           const message = explicitUserLookupError(error);
@@ -12956,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);
@@ -12985,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(
@@ -13070,10 +12840,17 @@ function createTools(availableSkills, hooks = {}, context, options = {}) {
         context.slackActionToken
       );
     }
-    tools.slackUserLookup = createSlackUserLookupTool(slackContext.teamId);
+    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;
@@ -14327,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);
@@ -14365,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 = {
@@ -15346,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,
@@ -15578,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,
@@ -15600,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,
@@ -15617,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,
@@ -15654,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,
@@ -15742,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(
@@ -16329,6 +16090,7 @@ async function summarizeContext(args, deps) {
     messageAttributeMode: "metadata",
     temperature: 0,
     signal: args.signal,
+    promptName: "junior.context_compaction",
     messages: [
       {
         role: "user",
@@ -16851,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 ?? {},
@@ -16946,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"
@@ -16954,7 +16717,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     activeModelProfile = routedModelProfile;
     activeModelId = routedModelId;
     const generatedFiles = [];
-    const artifactStatePatch = {};
     const toolCalls = [];
     let agent;
     let pendingPiHookError;
@@ -17060,7 +16822,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
       currentAgentMessages,
       currentTurnMessages,
       currentUserIntent,
-      artifactStatePatch,
       availableSkills,
       configurationValues,
       connectedMcpProviders,
@@ -17149,7 +16910,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     } = await assemblePrompt({
       activeMcpCatalogs: wiring.activeMcpCatalogs,
       currentActor: actor,
-      artifactState: state.artifactState,
       availableSkills,
       configurationValues,
       contextContentParts: [
@@ -17359,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 {
@@ -17735,7 +17495,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy, run
     const result = buildTurnResult({
       newMessages,
       userInput,
-      artifactStatePatch,
       toolCalls,
       sandboxRef: wiring.getSandboxRef(),
       piMessages: [...agent.state.messages],