@sentry/junior 0.90.0 → 0.92.0

package/dist/{chunk-BKSZL4QO.js → chunk-7DVIELX3.js}

@@ -11,10 +11,10 @@ import {
   persistRunningSessionRecord,
   persistTimeoutSessionRecord,
   persistYieldSessionRecord
-} from "./chunk-ONFOWI2D.js";
+} from "./chunk-OJP53WIU.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
-} from "./chunk-KC42JAAQ.js";
+} from "./chunk-PFXC67GJ.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -23,27 +23,25 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-5GBUZI6M.js";
+} from "./chunk-H7KUZAMZ.js";
 import {
   JUNIOR_PERSONALITY,
   buildPluginSystemPromptContributions,
   buildSystemPrompt,
   buildTurnContextPrompt,
   containsNoReplyMarker,
-  extractCurrentInstructionBody,
+  formatSlackLink,
   isNoReplyMarker,
-  renderCurrentInstruction,
   stripNoReplyMarker
-} from "./chunk-PHZHJTCK.js";
+} from "./chunk-BMQ5DXHV.js";
 import {
-  escapeXml,
   loadConnectedMcpProviders,
   recordAuthorizationRequested,
   recordMcpProviderConnected,
   recordSubagentEnded,
   recordSubagentStarted,
   recordToolExecutionStarted
-} from "./chunk-GCWD2VHP.js";
+} from "./chunk-7FS3K243.js";
 import {
   SlackActionError,
   createPluginHookRunner,
@@ -60,10 +58,10 @@ import {
   normalizeSlackConversationId,
   resolveChannelCapabilities,
   withSlackRetries
-} from "./chunk-DACFZ5CI.js";
+} from "./chunk-VY7TVOIK.js";
 import {
   createPluginLogger
-} from "./chunk-NW7AXDA5.js";
+} from "./chunk-OZJXGX4U.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -74,11 +72,11 @@ import {
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-RS6ANWVT.js";
+} from "./chunk-ZATRYQLR.js";
 import {
   getConversationStore,
   getDb
-} from "./chunk-2S7M37HY.js";
+} from "./chunk-NIFONS4W.js";
 import {
   GEN_AI_PROVIDER_NAME,
   GEN_AI_SERVER_ADDRESS,
@@ -87,6 +85,7 @@ import {
   botConfig,
   completeObject,
   completeText,
+  escapeXml,
   extractAssistantText,
   getGatewayApiKey,
   getPiGatewayApiKey,
@@ -99,19 +98,22 @@ import {
   nextProviderRetry,
   normalizeSlackEmojiName,
   normalizeToolNameFromResult,
+  renderCurrentInstruction,
   resolveGatewayModel,
   stripRuntimeTurnContext
-} from "./chunk-HXL2ZV74.js";
+} from "./chunk-3F54A3YM.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
   runWithConversationPrivacy,
+  toCanonicalInputMessage,
+  toCanonicalOutputMessage,
   toGenAiMessageMetadata,
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes,
   toGenAiTextMetadata
-} from "./chunk-3MPOMK3K.js";
+} from "./chunk-YYBX2BD5.js";
 import {
   parseDestination
 } from "./chunk-GHGPTPBL.js";
@@ -120,20 +122,21 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-AN2437E3.js";
+} from "./chunk-YTNPU7I2.js";
 import {
   CredentialUnavailableError,
   credentialContextSchema,
   pluginCatalogRuntime,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-XP7F4LYB.js";
+} from "./chunk-BTH37NCU.js";
 import {
-  createRequester,
+  createActor,
   extractGenAiUsageAttributes,
   extractGenAiUsageSummary,
   getLogContextAttributes,
   getTracePropagationHeaders,
+  isUserActor,
   logError,
   logException,
   logInfo,
@@ -145,7 +148,7 @@ import {
   setTags,
   summarizeMessageText,
   withSpan
-} from "./chunk-ZUK7BL63.js";
+} from "./chunk-S6QKIGRM.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -465,7 +468,7 @@ function buildChatStartAttributes(model, context, mode, conversationPrivacy) {
     ...toGenAiMessagesTraceAttributes("app.ai.input", context.messages)
   };
   const inputMessages = serializeGenAiAttribute(
-    mode === "metadata" ? context.messages.map(toGenAiMessageMetadata) : context.messages
+    mode === "metadata" ? context.messages.map(toGenAiMessageMetadata) : context.messages.map(toCanonicalInputMessage)
   );
   if (inputMessages) {
     attributes["gen_ai.input.messages"] = inputMessages;
@@ -486,7 +489,7 @@ function buildChatEndAttributes(message, mode) {
     ...toGenAiMessagesTraceAttributes("app.ai.output", [message])
   };
   const outputMessages = serializeGenAiAttribute(
-    mode === "metadata" ? [toGenAiMessageMetadata(message)] : [message]
+    mode === "metadata" ? [toGenAiMessageMetadata(message)] : [toCanonicalOutputMessage(message)]
   );
   if (outputMessages) {
     attributes["gen_ai.output.messages"] = outputMessages;
@@ -675,8 +678,7 @@ function buildTurnResult(input) {
   );
   const canvasCreated = successfulToolNames.has("slackCanvasCreate");
   const reactionPerformed = successfulToolNames.has("addReaction");
-  const markerSideEffectSuccess = exactNoReplyMarker && toolErrorCount === 0 && reactionPerformed;
-  const sideEffectOnlySuccess = markerSideEffectSuccess;
+  const silentCompletionSuccess = exactNoReplyMarker;
   const baseDeliveryPlan = {
     mode: "thread",
     postThreadText: true
@@ -689,7 +691,7 @@ function buildTurnResult(input) {
     const markerCategory = reactionPerformed ? "reaction" : "none";
     const markerContext = {
       slackThreadId: correlation?.threadId,
-      slackUserId: correlation?.requesterId,
+      slackUserId: correlation?.actorId,
       slackChannelId: correlation?.channelId,
       runId: correlation?.runId,
       assistantUserName,
@@ -698,29 +700,22 @@ function buildTurnResult(input) {
     const markerAttributes = {
       "app.ai.no_reply_marker": true,
       "app.ai.no_reply_marker_category": markerCategory,
-      "app.ai.no_reply_marker_accepted": sideEffectOnlySuccess && !isProviderError
+      "app.ai.no_reply_marker_accepted": !isProviderError
     };
-    if (sideEffectOnlySuccess && !isProviderError) {
+    if (!isProviderError) {
       logInfo(
         "ai_no_reply_marker_accepted",
         markerContext,
         markerAttributes,
         "No-reply marker suppressed visible thread text"
       );
-    } else if (!isProviderError) {
-      logWarn(
-        "ai_no_reply_marker_rejected",
-        markerContext,
-        markerAttributes,
-        "No-reply marker requires a successful visible side effect"
-      );
     }
   } else if (mixedNoReplyMarker) {
     logWarn(
       "ai_no_reply_marker_mixed_text",
       {
         slackThreadId: correlation?.threadId,
-        slackUserId: correlation?.requesterId,
+        slackUserId: correlation?.actorId,
         slackChannelId: correlation?.channelId,
         runId: correlation?.runId,
         assistantUserName,
@@ -733,12 +728,12 @@ function buildTurnResult(input) {
       "No-reply marker appeared with visible assistant text"
     );
   }
-  if (!primaryText && !sideEffectOnlySuccess && !isProviderError && !exactNoReplyMarker) {
+  if (!primaryText && !silentCompletionSuccess && !isProviderError) {
     logWarn(
       "ai_model_response_empty",
       {
         slackThreadId: correlation?.threadId,
-        slackUserId: correlation?.requesterId,
+        slackUserId: correlation?.actorId,
         slackChannelId: correlation?.channelId,
         runId: correlation?.runId,
         assistantUserName,
@@ -756,7 +751,7 @@ function buildTurnResult(input) {
   let outcome;
   if (isProviderError) {
     outcome = "provider_error";
-  } else if (primaryText || sideEffectOnlySuccess) {
+  } else if (primaryText || silentCompletionSuccess) {
     outcome = "success";
   } else {
     outcome = "execution_failure";
@@ -766,7 +761,7 @@ function buildTurnResult(input) {
   const escapedOrRawPayload = Boolean(primaryText) && (isExecutionEscapeResponse(primaryText) || isRawToolPayloadResponse(primaryText));
   const resolvedText = escapedOrRawPayload ? "" : responseText;
   const resolvedOutcome = escapedOrRawPayload ? "execution_failure" : outcome;
-  const deliveryPlan = resolvedOutcome === "success" && !resolvedText && reactionPerformed ? {
+  const deliveryPlan = resolvedOutcome === "success" && !resolvedText ? {
     ...baseDeliveryPlan,
     postThreadText: false
   } : baseDeliveryPlan;
@@ -939,7 +934,7 @@ async function selectTurnThinkingLevel(args) {
   const logContext = {
     slackThreadId: args.context?.threadId,
     slackChannelId: args.context?.channelId,
-    slackUserId: args.context?.requesterId,
+    slackUserId: args.context?.actorId,
     runId: args.context?.runId,
     modelId: args.fastModelId
   };
@@ -962,7 +957,7 @@ async function selectTurnThinkingLevel(args) {
           modelId: args.fastModelId,
           threadId: args.context?.threadId ?? "",
           channelId: args.context?.channelId ?? "",
-          requesterId: args.context?.requesterId ?? "",
+          actorId: args.context?.actorId ?? "",
           runId: args.context?.runId ?? ""
         },
         prompt
@@ -1077,25 +1072,38 @@ function getSessionIdentifiers(routing) {
     sessionId: routing.correlation?.turnId
   };
 }
-function requesterFromRouting(routing) {
-  return createRequester(routing.requester, {
-    platform: routing.requester?.platform ?? (routing.destination.platform === "slack" ? "slack" : void 0),
-    teamId: (routing.destination.platform === "slack" ? routing.destination.teamId : void 0) ?? routing.correlation?.teamId ?? (routing.requester?.platform === "slack" ? routing.requester.teamId : void 0),
-    userId: routing.correlation?.requesterId
-  });
+function actorFromRouting(routing) {
+  if (routing.dispatch?.actor) {
+    return routing.dispatch.actor;
+  }
+  const userActor = createActor(
+    isUserActor(routing.actor) ? routing.actor : void 0,
+    {
+      platform: (isUserActor(routing.actor) ? routing.actor.platform : void 0) ?? (routing.destination.platform === "slack" ? "slack" : void 0),
+      teamId: (routing.destination.platform === "slack" ? routing.destination.teamId : void 0) ?? routing.correlation?.teamId ?? (routing.actor?.platform === "slack" ? routing.actor.teamId : void 0),
+      userId: routing.correlation?.actorId
+    }
+  );
+  if (userActor) {
+    return userActor;
+  }
+  if (routing.credentialContext && !("type" in routing.credentialContext.actor)) {
+    return routing.credentialContext.actor;
+  }
+  return void 0;
 }
-function assertRequesterDestinationMatch(routing) {
-  const { destination, requester } = routing;
-  if (!requester) {
+function assertActorDestinationMatch(routing) {
+  const { destination, actor } = routing;
+  if (!actor) {
     return;
   }
-  if (requester.platform !== destination.platform) {
+  if (actor.platform !== destination.platform) {
     throw new TypeError(
-      `Requester platform "${requester.platform}" does not match destination platform "${destination.platform}"`
+      `Actor platform "${actor.platform}" does not match destination platform "${destination.platform}"`
     );
   }
-  if (requester.platform === "slack" && destination.platform === "slack" && requester.teamId !== destination.teamId) {
-    throw new TypeError("Slack requester team does not match destination team");
+  if (actor.platform === "slack" && destination.platform === "slack" && actor.teamId !== destination.teamId) {
+    throw new TypeError("Slack actor team does not match destination team");
   }
 }
 function assertCorrelationDestinationMatch(routing) {
@@ -1347,15 +1355,12 @@ async function restoreSkillRuntime(args) {
 }
 
 // src/chat/agent/prompt.ts
-import { z as z2 } from "zod";
 var MAX_INLINE_ATTACHMENT_BASE64_CHARS = 12e4;
 var MAX_ROUTER_ATTACHMENT_PREVIEW_CHARS = 2e3;
-var legacyStoredTextPartSchema = z2.object({
-  text: z2.string(),
-  type: z2.literal("text")
-}).strict();
 function isStructuredThreadContext(context) {
-  return /^<thread-(compactions|transcript)>/.test(context);
+  return /^<(recent-thread-messages|thread-(compactions|transcript))>/.test(
+    context
+  );
 }
 function renderThreadContextForPrompt(context) {
   if (isStructuredThreadContext(context)) {
@@ -1363,9 +1368,9 @@ function renderThreadContextForPrompt(context) {
   }
   return ["<thread-background>", context, "</thread-background>"].join("\n");
 }
-function buildUserTurnText(userInput, conversationContext) {
+function buildUserTurnText(userInput, conversationContext, actor) {
   const trimmedContext = conversationContext?.trim();
-  const currentInstruction = renderCurrentInstruction(userInput);
+  const currentInstruction = renderCurrentInstruction(userInput, actor);
   if (!trimmedContext) {
     return currentInstruction;
   }
@@ -1498,10 +1503,11 @@ function buildUserTurnInput(args) {
   return { routerBlocks, userContentParts };
 }
 function buildPromptInput(input) {
-  const promptConversationContext = input.piMessages && input.piMessages.length > 0 ? void 0 : input.conversationContext;
+  const promptConversationContext = input.piMessages && input.piMessages.length > 0 && !input.includeConversationContextWithPiMessages ? void 0 : input.conversationContext;
   const userTurnText = buildUserTurnText(
     input.messageText,
-    promptConversationContext
+    promptConversationContext,
+    input.actor
   );
   return buildUserTurnInput({
     omittedImageAttachmentCount: input.omittedImageAttachmentCount ?? 0,
@@ -1511,7 +1517,7 @@ function buildPromptInput(input) {
 }
 function buildSteeringPiMessage(message) {
   const { userContentParts } = buildUserTurnInput({
-    userTurnText: buildUserTurnText(message.text),
+    userTurnText: buildUserTurnText(message.text, void 0, message.actor),
     userAttachments: message.userAttachments,
     omittedImageAttachmentCount: message.omittedImageAttachmentCount ?? 0
   });
@@ -1538,35 +1544,7 @@ function withoutTrailingUncheckpointedUserPrompt(messages, userContentParts) {
   return messages.slice(0, -1);
 }
 function userPromptContentMatches(storedContent, currentContent) {
-  if (JSON.stringify(storedContent) === JSON.stringify(currentContent)) {
-    return true;
-  }
-  if (!Array.isArray(storedContent)) {
-    return false;
-  }
-  if (storedContent.length !== currentContent.length) {
-    return false;
-  }
-  return storedContent.every((storedPart, index) => {
-    const currentPart = currentContent[index];
-    if (index === 0 && currentPart?.type === "text") {
-      const legacyTextPart = legacyStoredTextPartSchema.safeParse(storedPart);
-      if (legacyTextPart.success) {
-        return legacyTextPartMatchesCurrentText(
-          legacyTextPart.data.text,
-          currentPart.text
-        );
-      }
-    }
-    return JSON.stringify(storedPart) === JSON.stringify(currentPart);
-  });
-}
-function legacyTextPartMatchesCurrentText(storedText, currentText) {
-  const storedInstructionBody = extractCurrentInstructionBody(storedText);
-  if (storedInstructionBody !== void 0) {
-    return renderCurrentInstruction(storedInstructionBody) === currentText;
-  }
-  return renderCurrentInstruction(storedText) === currentText;
+  return JSON.stringify(storedContent) === JSON.stringify(currentContent);
 }
 async function assemblePrompt(args) {
   const source = args.routing.source;
@@ -1601,7 +1579,7 @@ async function assemblePrompt(args) {
       source
     } : void 0,
     invocation: args.invocation,
-    requester: args.actorRequester,
+    actor: isUserActor(args.currentActor) ? args.currentActor : void 0,
     artifactState: args.artifactState,
     configuration: args.configurationValues
   }) : null;
@@ -1769,7 +1747,7 @@ ${usage}
       const entry = await configuration.set({
         key,
         value,
-        updatedBy: deps.requesterId,
+        updatedBy: deps.actorId,
         source: "jr-rpc"
       });
       logInfo(
@@ -2698,30 +2676,30 @@ function serializeMcpPayload(payload, privacy) {
 }
 
 // src/chat/tools/sandbox/bash.ts
-import { z as z5 } from "zod";
+import { z as z4 } from "zod";
 
 // src/chat/tool-support/structured-result.ts
-import { z as z3 } from "zod";
-var juniorToolContinuationSchema = z3.object({
-  arguments: z3.record(z3.string(), z3.unknown()),
-  reason: z3.string().min(1).optional()
+import { z as z2 } from "zod";
+var juniorToolContinuationSchema = z2.object({
+  arguments: z2.record(z2.string(), z2.unknown()),
+  reason: z2.string().min(1).optional()
 }).strict();
 var juniorToolBoundContinuationSchema = juniorToolContinuationSchema.extend({
-  tool_name: z3.string().min(1)
+  tool_name: z2.string().min(1)
 });
-var juniorToolErrorSchema = z3.object({
-  kind: z3.string().min(1),
-  message: z3.string().min(1),
-  retryable: z3.boolean().optional()
+var juniorToolErrorSchema = z2.object({
+  kind: z2.string().min(1),
+  message: z2.string().min(1),
+  retryable: z2.boolean().optional()
 }).strict();
-var juniorToolResultSchema = z3.object({
-  ok: z3.boolean(),
-  status: z3.enum(["success", "error"]),
-  target: z3.string().min(1).optional(),
-  data: z3.unknown().optional(),
-  truncated: z3.boolean().optional(),
+var juniorToolResultSchema = z2.object({
+  ok: z2.boolean(),
+  status: z2.enum(["success", "error"]),
+  target: z2.string().min(1).optional(),
+  data: z2.unknown().optional(),
+  truncated: z2.boolean().optional(),
   continuation: juniorToolContinuationSchema.optional(),
-  error: z3.union([juniorToolErrorSchema, z3.string()]).optional()
+  error: z2.union([juniorToolErrorSchema, z2.string()]).optional()
 }).passthrough();
 var juniorToolResultWithBoundContinuationSchema = juniorToolResultSchema.extend({
   continuation: juniorToolBoundContinuationSchema.optional()
@@ -2768,7 +2746,7 @@ function makeStructuredToolResult(details, options = {}) {
 }
 
 // src/chat/tool-support/zod-tool.ts
-import { z as z4 } from "zod";
+import { z as z3 } from "zod";
 
 // src/chat/tools/execution/tool-input-error.ts
 var ToolInputError = class extends Error {
@@ -2802,7 +2780,7 @@ function zodTool(definition) {
   const { inputSchema, outputSchema, prepareArguments, execute, ...toolDef } = definition;
   let modelInputSchema;
   try {
-    modelInputSchema = z4.toJSONSchema(inputSchema);
+    modelInputSchema = z3.toJSONSchema(inputSchema);
   } catch (error) {
     throw new TypeError(
       "zodTool() inputSchema must be representable as JSON Schema.",
@@ -2812,7 +2790,7 @@ function zodTool(definition) {
   let modelOutputSchema;
   if (outputSchema) {
     try {
-      modelOutputSchema = z4.toJSONSchema(outputSchema);
+      modelOutputSchema = z3.toJSONSchema(outputSchema);
     } catch (error) {
       throw new TypeError(
         "zodTool() outputSchema must be representable as JSON Schema.",
@@ -2854,9 +2832,9 @@ function zodTool(definition) {
 function createBashTool() {
   return zodTool({
     description: "Run a bash command inside the isolated sandbox workspace. Use this for repository inspection/execution tasks that need shell access. Do not use for network-sensitive or destructive actions unless explicitly required.",
-    inputSchema: z5.object({
-      command: z5.string().min(1).describe("Bash command to run inside the sandbox."),
-      timeoutMs: z5.coerce.number().int().min(1e3).describe(
+    inputSchema: z4.object({
+      command: z4.string().min(1).describe("Bash command to run inside the sandbox."),
+      timeoutMs: z4.coerce.number().int().min(1e3).describe(
         "Optional command timeout in milliseconds. Use for commands that may hang."
       ).optional()
     }),
@@ -3230,7 +3208,7 @@ function validateAndApplyTextEdits(content, edits, targetName) {
 }
 
 // src/chat/tools/sandbox/edit-file.ts
-import { z as z6 } from "zod";
+import { z as z5 } from "zod";
 function prepareEditFileArguments(input) {
   return prepareTextReplacementArguments(input);
 }
@@ -3328,20 +3306,20 @@ async function editFile(params) {
     replacements: params.edits.length
   });
 }
-var editReplacementSchema = z6.object({
-  oldText: z6.string().min(1).describe(
+var editReplacementSchema = z5.object({
+  oldText: z5.string().min(1).describe(
     "Exact text to replace. It must be unique in the original file and must not overlap another edit."
   ),
-  newText: z6.string().describe("Replacement text for this edit.")
+  newText: z5.string().describe("Replacement text for this edit.")
 });
 function createEditFileTool() {
   return zodTool({
     description: "Edit one sandbox workspace file with exact text replacements. Use for precise changes to existing files; prefer this over writeFile for targeted changes. Each oldText must match exactly, be unique, and not overlap another edit. Returns a diff. Multiple changes to the same file: use one edits[] call.",
     prepareArguments: prepareEditFileArguments,
     executionMode: "sequential",
-    inputSchema: z6.object({
-      path: z6.string().min(1).describe("Path to edit in the sandbox workspace."),
-      edits: z6.array(editReplacementSchema).min(1).describe(
+    inputSchema: z5.object({
+      path: z5.string().min(1).describe("Path to edit in the sandbox workspace."),
+      edits: z5.array(editReplacementSchema).min(1).describe(
         "Exact replacements matched against the original file, not incrementally."
       )
     }),
@@ -3356,7 +3334,7 @@ function createEditFileTool() {
 
 // src/chat/tools/sandbox/find-files.ts
 import path3 from "path";
-import { z as z7 } from "zod";
+import { z as z6 } from "zod";
 var DEFAULT_FIND_LIMIT = 1e3;
 async function findFiles(params) {
   if (!params.pattern.trim()) {
@@ -3416,14 +3394,14 @@ function createFindFilesTool() {
   return zodTool({
     description: "Find sandbox workspace files by glob pattern. Returns bounded paths relative to the search root and skips dependency/cache directories.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z7.object({
-      pattern: z7.string().min(1).describe(
+    inputSchema: z6.object({
+      pattern: z6.string().min(1).describe(
         "Glob pattern to match, for example '*.ts', '**/*.json', or 'src/**/*.test.ts'."
       ),
-      path: z7.string().min(1).describe(
+      path: z6.string().min(1).describe(
         "Directory or file path in the sandbox workspace. Defaults to the workspace root."
       ).optional(),
-      limit: z7.coerce.number().int().min(1).describe("Maximum number of file paths to return. Defaults to 1000.").optional()
+      limit: z6.coerce.number().int().min(1).describe("Maximum number of file paths to return. Defaults to 1000.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -3436,12 +3414,12 @@ function createFindFilesTool() {
 
 // src/chat/tools/sandbox/grep.ts
 import path4 from "path";
-import { z as z8 } from "zod";
+import { z as z7 } from "zod";
 var DEFAULT_GREP_LIMIT = 100;
 var MAX_GREP_LINE_CHARS = 500;
-var booleanInput = (description) => z8.preprocess(
+var booleanInput = (description) => z7.preprocess(
   (value) => value === "true" ? true : value === "false" ? false : value,
-  z8.boolean()
+  z7.boolean()
 ).describe(description);
 function truncateGrepLine(value) {
   if (value.length <= MAX_GREP_LINE_CHARS) {
@@ -3590,20 +3568,20 @@ function createGrepTool() {
   return zodTool({
     description: "Search sandbox workspace file contents. Returns bounded matching lines with file paths and line numbers. Respects path/glob filters and includes truncation notices.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z8.object({
-      pattern: z8.string().min(1).describe("Regex pattern or literal text to search for."),
-      path: z8.string().min(1).describe(
+    inputSchema: z7.object({
+      pattern: z7.string().min(1).describe("Regex pattern or literal text to search for."),
+      path: z7.string().min(1).describe(
         "Directory or file path in the sandbox workspace. Defaults to the workspace root."
       ).optional(),
-      glob: z8.string().min(1).describe("Optional glob filter such as '*.ts' or '**/*.test.ts'.").optional(),
+      glob: z7.string().min(1).describe("Optional glob filter such as '*.ts' or '**/*.test.ts'.").optional(),
       ignoreCase: booleanInput(
         "Whether matching should ignore case."
       ).optional(),
       literal: booleanInput(
         "Treat pattern as literal text instead of regex."
       ).optional(),
-      context: z8.coerce.number().int().min(0).describe("Number of surrounding context lines to include.").optional(),
-      limit: z8.coerce.number().int().min(1).describe("Maximum matches to return. Defaults to 100.").optional()
+      context: z7.coerce.number().int().min(0).describe("Number of surrounding context lines to include.").optional(),
+      limit: z7.coerce.number().int().min(1).describe("Maximum matches to return. Defaults to 100.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -3721,7 +3699,7 @@ async function readSandboxFileUpload(sandbox, input) {
 
 // src/chat/tools/sandbox/list-dir.ts
 import path6 from "path";
-import { z as z9 } from "zod";
+import { z as z8 } from "zod";
 var DEFAULT_LIST_LIMIT = 500;
 async function listDir(params) {
   const dirPath = resolveWorkspacePath(params.path);
@@ -3802,11 +3780,11 @@ function createListDirTool() {
   return zodTool({
     description: "List a sandbox workspace directory. Returns sorted entries with '/' suffixes for directories and bounded truncation notices.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z9.object({
-      path: z9.string().min(1).describe(
+    inputSchema: z8.object({
+      path: z8.string().min(1).describe(
         "Directory path in the sandbox workspace. Defaults to the workspace root."
       ).optional(),
-      limit: z9.coerce.number().int().min(1).describe("Maximum entries to return. Defaults to 500.").optional()
+      limit: z8.coerce.number().int().min(1).describe("Maximum entries to return. Defaults to 500.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -3818,8 +3796,24 @@ function createListDirTool() {
 }
 
 // src/chat/tools/web/image-generate.ts
-import { z as z10 } from "zod";
+import { z as z9 } from "zod";
 var DEFAULT_IMAGE_MODEL = "google/gemini-3-pro-image";
+var imageGenerateOutputSchema = juniorToolResultSchema.extend({
+  model: z9.string(),
+  prompt: z9.string(),
+  enrichedPrompt: z9.string(),
+  image_count: z9.number().int().nonnegative(),
+  images: z9.array(
+    z9.object({
+      filename: z9.string(),
+      path: z9.string(),
+      attachment_path: z9.string(),
+      media_type: z9.string().optional(),
+      bytes: z9.number().int().nonnegative()
+    }).strict()
+  ),
+  delivery: z9.string()
+}).strict();
 var ENRICHMENT_SYSTEM_PROMPT = `You are an image prompt enrichment agent. Your job is to rewrite image generation requests to reflect a specific visual identity and mood.
 
 <personality>
@@ -3879,10 +3873,10 @@ function parseImageGenerationError(status, body, model) {
 function createImageGenerateTool(hooks, options = {}, deps = {}) {
   return zodTool({
     description: "Generate images from a prompt. Use when the user wants to visually show or represent something \u2014 feelings, concepts, art, humor, or any visual idea. Also use for explicit image creation requests.",
-    inputSchema: z10.object({
-      prompt: z10.string().min(1).max(4e3).describe("Image generation prompt.")
+    inputSchema: z9.object({
+      prompt: z9.string().min(1).max(4e3).describe("Image generation prompt.")
     }),
-    outputSchema: juniorToolResultSchema,
+    outputSchema: imageGenerateOutputSchema,
     execute: async ({ prompt }) => {
       const fetchImpl = deps.fetch ?? fetch;
       const apiKey = getGatewayApiKey();
@@ -3972,7 +3966,7 @@ function createImageGenerateTool(hooks, options = {}, deps = {}) {
 }
 
 // src/chat/tools/skill/call-mcp-tool.ts
-import { z as z11 } from "zod";
+import { z as z10 } from "zod";
 function resolveMcpArguments(input) {
   const extraKeys = Object.keys(input).filter(
     (key) => key !== "tool_name" && key !== "arguments"
@@ -4008,9 +4002,9 @@ function missingToolMessage(toolName, provider) {
 function createCallMcpToolTool(mcpToolManager) {
   return zodTool({
     description: "Call an active MCP tool by exact tool_name. Use searchMcpTools to discover tool names and schemas; copy required provider fields into arguments. Do not call with only tool_name unless the discovered tool has no arguments. Authorization is handled by the runtime when required.",
-    inputSchema: z11.object({
-      tool_name: z11.string().min(1).describe("Exact MCP tool_name from searchMcpTools."),
-      arguments: z11.unknown().describe(
+    inputSchema: z10.object({
+      tool_name: z10.string().min(1).describe("Exact MCP tool_name from searchMcpTools."),
+      arguments: z10.record(z10.string(), z10.unknown()).describe(
         'Arguments matching the disclosed MCP tool schema, for example { "query": "..." } when searchMcpTools shows query is required.'
       ).optional()
     }).passthrough(),
@@ -4051,7 +4045,7 @@ function createCallMcpToolTool(mcpToolManager) {
 }
 
 // src/chat/tools/skill/load-skill.ts
-import { z as z12 } from "zod";
+import { z as z11 } from "zod";
 function toLoadedSkill(result, availableSkills) {
   if (result.ok !== true || typeof result.skill_name !== "string" || typeof result.description !== "string" || typeof result.skill_dir !== "string" || typeof result.instructions !== "string") {
     return null;
@@ -4100,8 +4094,8 @@ async function loadSkillFromHost(availableSkills, skillName) {
 function createLoadSkillTool(availableSkills, options) {
   return zodTool({
     description: "Load a skill by name for this turn. The result includes working_directory; resolve skill paths there and run skill-owned bash commands from there or with absolute paths. When the result includes mcp_provider, use searchMcpTools before callMcpTool. Use when a request clearly matches a known skill.",
-    inputSchema: z12.object({
-      skill_name: z12.string().min(1).describe("Skill name to load, without the leading slash.")
+    inputSchema: z11.object({
+      skill_name: z11.string().min(1).describe("Skill name to load, without the leading slash.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ skill_name }) => {
@@ -4119,7 +4113,7 @@ function createLoadSkillTool(availableSkills, options) {
 }
 
 // src/chat/tools/skill/search-mcp-tools.ts
-import { z as z13 } from "zod";
+import { z as z12 } from "zod";
 
 // src/chat/tool-support/schema-summary.ts
 function getSchemaProperties(schema) {
@@ -4249,6 +4243,38 @@ function toActiveMcpCatalogSummaries(toolDefs) {
 // src/chat/tools/skill/search-mcp-tools.ts
 var DEFAULT_MAX_RESULTS = 5;
 var MAX_RESULTS = 20;
+var providerSummarySchema = z12.object({
+  provider: z12.string(),
+  description: z12.string(),
+  active: z12.boolean()
+}).strict();
+var mcpCallExampleSchema = z12.object({
+  tool_name: z12.string(),
+  arguments: z12.record(z12.string(), z12.string())
+}).strict();
+var exposedToolSummarySchema = z12.object({
+  tool_name: z12.string(),
+  mcp_tool_name: z12.string(),
+  provider: z12.string(),
+  title: z12.string().optional(),
+  description: z12.string(),
+  signature: z12.string(),
+  call: mcpCallExampleSchema,
+  input_schema: z12.record(z12.string(), z12.unknown()),
+  input_schema_summary: z12.string(),
+  output_schema: z12.record(z12.string(), z12.unknown()).optional(),
+  annotations: z12.record(z12.string(), z12.unknown()).optional()
+}).strict();
+var searchMcpToolsOutputSchema = juniorToolResultSchema.extend({
+  query: z12.string().nullable(),
+  provider: z12.string().nullable(),
+  total_active_tools: z12.number().int().nonnegative(),
+  returned_tools: z12.number().int().nonnegative(),
+  execution_tool: z12.literal("callMcpTool"),
+  execution_example: mcpCallExampleSchema,
+  available_providers: z12.array(providerSummarySchema),
+  tools: z12.array(exposedToolSummarySchema)
+}).strict();
 function normalize(value) {
   return value.toLowerCase().replace(/[^a-z0-9_]+/g, " ").trim();
 }
@@ -4367,16 +4393,16 @@ function searchProviderCatalog(providers, query) {
 function createSearchMcpToolsTool(mcpToolManager) {
   return zodTool({
     description: "List or search MCP providers and active MCP tools. When provider is supplied and not yet active, Junior connects to it on demand and returns tool descriptors including schemas. Without provider, returns active tools plus matching configured providers without connecting. Use when choosing a provider tool or when callMcpTool arguments are unclear.",
-    inputSchema: z13.object({
-      query: z13.string().min(1).describe(
+    inputSchema: z12.object({
+      query: z12.string().min(1).describe(
         "Optional search terms describing the MCP tool or arguments needed."
       ).optional(),
-      provider: z13.string().min(1).describe(
+      provider: z12.string().min(1).describe(
         "Optional provider name to list or search within. If configured but not yet connected, Junior activates it on demand."
       ).optional(),
-      max_results: z13.number().int().min(1).max(MAX_RESULTS).describe("Maximum matching tool descriptors to return.").optional()
+      max_results: z12.number().int().min(1).max(MAX_RESULTS).describe("Maximum matching tool descriptors to return.").optional()
     }).strict(),
-    outputSchema: juniorToolResultSchema,
+    outputSchema: searchMcpToolsOutputSchema,
     execute: async ({ query, provider, max_results }) => {
       if (provider) {
         await mcpToolManager.activateProvider(provider);
@@ -4398,6 +4424,13 @@ function createSearchMcpToolsTool(mcpToolManager) {
         provider: provider ?? null,
         total_active_tools: catalog.length,
         returned_tools: matches.length,
+        execution_tool: "callMcpTool",
+        execution_example: {
+          tool_name: "<returned tool_name>",
+          arguments: {
+            "<argument>": "<value from input_schema>"
+          }
+        },
         available_providers: providers,
         tools: matches.map(toExposedToolSummary)
       };
@@ -4412,7 +4445,7 @@ function createSearchMcpToolsTool(mcpToolManager) {
 }
 
 // src/chat/tools/sandbox/read-file.ts
-import { z as z14 } from "zod";
+import { z as z13 } from "zod";
 
 // src/chat/tool-support/text-range-result.ts
 var DEFAULT_READ_LIMIT = 1e3;
@@ -4487,10 +4520,10 @@ function createReadFileTool() {
   return zodTool({
     description: "Read a bounded line range from a file in the sandbox workspace. Use when you need exact file contents to verify facts or make edits safely. Prefer grep/findFiles/listDir for broad discovery.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z14.object({
-      path: z14.string().min(1).describe("Path to the file in the sandbox workspace."),
-      offset: z14.coerce.number().int().min(1).describe("1-indexed line number to start reading from.").optional(),
-      limit: z14.coerce.number().int().min(1).describe("Maximum number of lines to read. Defaults to 1000.").optional()
+    inputSchema: z13.object({
+      path: z13.string().min(1).describe("Path to the file in the sandbox workspace."),
+      offset: z13.coerce.number().int().min(1).describe("1-indexed line number to start reading from.").optional(),
+      limit: z13.coerce.number().int().min(1).describe("Maximum number of lines to read. Defaults to 1000.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -4502,12 +4535,12 @@ function createReadFileTool() {
 }
 
 // src/chat/tools/runtime/report-progress.ts
-import { z as z15 } from "zod";
+import { z as z14 } from "zod";
 function createReportProgressTool() {
   return zodTool({
     description: "Update the user-visible assistant loading message with a short progress phase. For every non-trivial turn, call this early with the initial major work phase, then call it again only when the major phase meaningfully changes. Messages must be written in sentence case with a present-participle verb (e.g. 'Searching docs', 'Reviewing results', 'Running checks'). Skip trivial direct answers, generic filler, and minor substeps.",
-    inputSchema: z15.object({
-      message: z15.string().min(1).describe("Short user-facing progress message.")
+    inputSchema: z14.object({
+      message: z14.string().min(1).describe("Short user-facing progress message.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => ({
@@ -4518,31 +4551,31 @@ function createReportProgressTool() {
 }
 
 // src/chat/tools/resource-events.ts
-import { z as z17 } from "zod";
+import { z as z16 } from "zod";
 
 // src/chat/resource-events/store.ts
 import { createHash } from "crypto";
 import { destinationSchema } from "@sentry/junior-plugin-api";
-import { z as z16 } from "zod";
+import { z as z15 } from "zod";
 var RESOURCE_EVENT_PREFIX = "junior:resource_event_subscription";
 var INDEX_LOCK_TTL_MS = 1e4;
 var SUBSCRIPTION_LOCK_TTL_MS = 1e4;
-var subscriptionStatusSchema = z16.enum(["active", "cancelled", "completed"]);
-var subscriptionIdIndexSchema = z16.array(z16.string().min(1));
-var subscriptionSchema = z16.object({
-  conversationId: z16.string().min(1),
-  createdAtMs: z16.number().finite(),
+var subscriptionStatusSchema = z15.enum(["active", "cancelled", "completed"]);
+var subscriptionIdIndexSchema = z15.array(z15.string().min(1));
+var subscriptionSchema = z15.object({
+  conversationId: z15.string().min(1),
+  createdAtMs: z15.number().finite(),
   destination: destinationSchema,
-  events: z16.array(z16.string().min(1)).min(1),
-  expiresAtMs: z16.number().finite(),
-  id: z16.string().min(1),
-  intent: z16.string().min(1),
-  label: z16.string().min(1),
-  provider: z16.string().min(1),
-  resourceRef: z16.string().min(1),
-  resourceType: z16.string().min(1),
+  events: z15.array(z15.string().min(1)).min(1),
+  expiresAtMs: z15.number().finite(),
+  id: z15.string().min(1),
+  intent: z15.string().min(1),
+  label: z15.string().min(1),
+  provider: z15.string().min(1),
+  resourceRef: z15.string().min(1),
+  resourceType: z15.string().min(1),
   status: subscriptionStatusSchema,
-  updatedAtMs: z16.number().finite()
+  updatedAtMs: z15.number().finite()
 }).strict();
 function digest(value) {
   return createHash("sha256").update(value).digest("hex").slice(0, 32);
@@ -4832,23 +4865,23 @@ async function deliverResourceEventSubscription(input) {
 // src/chat/tools/resource-events.ts
 var DEFAULT_TTL_MS = 14 * 24 * 60 * 60 * 1e3;
 var MAX_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
-var subscribeInputSchema = z17.object({
-  resourceRef: z17.string().describe("Opaque resource ref copied from a subscribable tool result."),
-  provider: z17.string().describe("Provider that owns the resource ref."),
-  resourceType: z17.string().describe("Provider-defined resource type from the subscribable hint."),
-  label: z17.string().describe("Human-readable resource label from the subscribable hint."),
-  events: z17.array(z17.string()).min(1).describe(
+var subscribeInputSchema = z16.object({
+  resourceRef: z16.string().describe("Opaque resource ref copied from a subscribable tool result."),
+  provider: z16.string().describe("Provider that owns the resource ref."),
+  resourceType: z16.string().describe("Provider-defined resource type from the subscribable hint."),
+  label: z16.string().describe("Human-readable resource label from the subscribable hint."),
+  events: z16.array(z16.string()).min(1).describe(
     "High-signal event names to deliver to this conversation when they occur."
   ),
-  intent: z17.string().describe(
+  intent: z16.string().describe(
     "Concise reason this conversation wants these events, used when an event arrives."
   ),
-  ttlMs: z17.coerce.number().describe(
+  ttlMs: z16.coerce.number().describe(
     "How long to keep the subscription active. Defaults to 14 days and is capped at 30 days."
   ).optional()
 });
-var cancelInputSchema = z17.object({
-  subscriptionId: z17.string().describe(
+var cancelInputSchema = z16.object({
+  subscriptionId: z16.string().describe(
     "Subscription id returned by subscribeToResourceEvents or listResourceEventSubscriptions."
   )
 });
@@ -4932,7 +4965,7 @@ function createSubscribeToResourceEventsTool(context) {
 function createListResourceEventSubscriptionsTool(context) {
   return zodTool({
     description: "List active resource event subscriptions for the current conversation.",
-    inputSchema: z17.object({}),
+    inputSchema: z16.object({}),
     outputSchema: juniorToolResultSchema,
     async execute() {
       const conversationId = requireConversationContext(context);
@@ -5067,11 +5100,11 @@ async function listThreadReplies(input) {
 }
 
 // src/chat/slack/timestamp-param.ts
-import { z as z18 } from "zod";
+import { z as z17 } from "zod";
 function slackTimestampParam(description) {
-  return z18.preprocess(
+  return z17.preprocess(
     (value) => typeof value === "number" && Number.isFinite(value) ? String(value) : value,
-    z18.string().min(1)
+    z17.string().min(1)
   ).describe(description);
 }
 function optionalSlackTimestampParam(description) {
@@ -5102,10 +5135,10 @@ function parseRequiredSlackTimestampParam(field, value) {
 }
 
 // src/chat/slack/tools/channel-list-messages.ts
-import { z as z19 } from "zod";
-var booleanInput2 = (description) => z19.preprocess(
+import { z as z18 } from "zod";
+var booleanInput2 = (description) => z18.preprocess(
   (value) => value === "true" ? true : value === "false" ? false : value,
-  z19.boolean()
+  z18.boolean()
 ).describe(description);
 function normalizeRangeTimestamp(field, value, targetChannelId) {
   if (value === void 0) {
@@ -5132,9 +5165,9 @@ function createSlackChannelListMessagesTool(context) {
   return zodTool({
     description: "List channel messages from Slack history in the active channel context. Use when the user asks for recent or historical channel context outside this thread. Do not use for live monitoring or when current thread context already answers the question.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z19.object({
-      limit: z19.coerce.number().int().min(1).max(1e3).describe("Maximum number of messages to return across pages.").optional(),
-      cursor: z19.string().min(1).describe("Optional cursor to continue from a prior call.").optional(),
+    inputSchema: z18.object({
+      limit: z18.coerce.number().int().min(1).max(1e3).describe("Maximum number of messages to return across pages.").optional(),
+      cursor: z18.string().min(1).describe("Optional cursor to continue from a prior call.").optional(),
       oldest: optionalSlackTimestampParam(
         "Optional oldest message timestamp (Slack ts) for range filtering."
       ),
@@ -5144,7 +5177,7 @@ function createSlackChannelListMessagesTool(context) {
       inclusive: booleanInput2(
         "Whether oldest/latest bounds should be inclusive."
       ).optional(),
-      max_pages: z19.coerce.number().int().min(1).max(10).describe("Maximum number of API pages to traverse in a single call.").optional()
+      max_pages: z18.coerce.number().int().min(1).max(10).describe("Maximum number of API pages to traverse in a single call.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({
@@ -5477,7 +5510,7 @@ async function removeReactionFromMessage(input) {
 }
 
 // src/chat/slack/tools/message-add-reaction.ts
-import { z as z20 } from "zod";
+import { z as z19 } from "zod";
 
 // src/chat/tools/idempotency.ts
 function stableSerialize(value) {
@@ -5499,8 +5532,8 @@ function createOperationKey(toolName, input) {
 function createSlackMessageAddReactionTool(context, state) {
   return zodTool({
     description: "Add an emoji reaction to the current inbound Slack message. Use when the user asks for a reaction on the current message without another target. Provide a Slack emoji alias name (for example `thumbsup`, `white_check_mark`, or `thumbsup::skin-tone-6`), not a unicode emoji glyph. The target message is injected by runtime context; do not use this for arbitrary historical messages.",
-    inputSchema: z20.object({
-      emoji: z20.string().min(1).max(64).describe(
+    inputSchema: z19.object({
+      emoji: z19.string().min(1).max(64).describe(
         "Slack emoji alias name to react with (for example `thumbsup`, `white_check_mark`, or `thumbsup::skin-tone-6`). Optional surrounding colons are allowed."
       )
     }),
@@ -5551,15 +5584,15 @@ function createSlackMessageAddReactionTool(context, state) {
 
 // src/chat/slack/tools/send-message.ts
 import { createHash as createHash2 } from "crypto";
-import { z as z21 } from "zod";
-var fileInputSchema = z21.object({
-  path: z21.string().min(1).describe(
+import { z as z20 } from "zod";
+var fileInputSchema = z20.object({
+  path: z20.string().min(1).describe(
     "Sandbox file path to include in the message. Absolute paths and workspace-relative paths are supported."
   ),
-  filename: z21.string().min(1).nullable().optional().describe(
+  filename: z20.string().min(1).nullable().optional().describe(
     "Optional filename override shown in Slack. Null is treated as omitted."
   ),
-  mimeType: z21.string().min(1).nullable().optional().describe("Optional MIME type override. Null is treated as omitted.")
+  mimeType: z20.string().min(1).nullable().optional().describe("Optional MIME type override. Null is treated as omitted.")
 });
 function hasText(text) {
   return typeof text === "string" && text.trim().length > 0;
@@ -5586,9 +5619,9 @@ function fileOperationInput(files) {
 function createSendMessageTool(context, state, materializeFile) {
   return zodTool({
     description: "Send a Slack message with optional files into the active Slack conversation. Use when the user asks to attach, send, or share files here, in this conversation, or in this thread. The message can contain text, files, or both; file-only messages are allowed. Do not use for top-level channel posts, other named channels, inline @mentions, or pinging mentioned users.",
-    inputSchema: z21.object({
-      text: z21.string().max(4e4).nullable().optional().describe("Slack mrkdwn text to send. Null is treated as omitted."),
-      files: z21.array(fileInputSchema).min(1).nullable().optional().describe(
+    inputSchema: z20.object({
+      text: z20.string().max(4e4).nullable().optional().describe("Slack mrkdwn text to send. Null is treated as omitted."),
+      files: z20.array(fileInputSchema).min(1).nullable().optional().describe(
         "Sandbox files to include in the message. Null is treated as omitted."
       )
     }),
@@ -5916,13 +5949,13 @@ function storedCanvasUrl(state, canvasId) {
 }
 
 // src/chat/slack/tools/canvas/create.ts
-import { z as z22 } from "zod";
+import { z as z21 } from "zod";
 function createSlackCanvasCreateTool(context, state) {
   return zodTool({
     description: "Create a Slack canvas for long-form output in the active assistant context channel. Use when the answer is better as a reusable document than a thread reply: long-form research, timelines, bios/profiles, structured notes, plans, comparisons, or anything likely to exceed one compact Slack reply. After creating it, reply with one or two short sentences plus the canvas link; do not recap the canvas contents. Do not use for short answers that fit cleanly in one normal thread reply.",
-    inputSchema: z22.object({
-      title: z22.string().min(1).max(160).describe("Canvas title."),
-      markdown: z22.string().min(1).describe("Canvas markdown body content.")
+    inputSchema: z21.object({
+      title: z21.string().min(1).max(160).describe("Canvas title."),
+      markdown: z21.string().min(1).describe("Canvas markdown body content.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ title, markdown }) => {
@@ -5985,28 +6018,39 @@ function createSlackCanvasCreateTool(context, state) {
 }
 
 // src/chat/slack/tools/canvas/edit.ts
-import { z as z23 } from "zod";
+import { z as z22 } from "zod";
 function prepareCanvasEditArguments(input) {
   return prepareTextReplacementArguments(input);
 }
-var editReplacementSchema2 = z23.object({
-  oldText: z23.string().min(1).describe(
+var editReplacementSchema2 = z22.object({
+  oldText: z22.string().min(1).describe(
     "Exact Canvas markdown to replace. It must be unique in the current Canvas body and must not overlap another edit."
   ),
-  newText: z23.string().describe("Replacement Canvas markdown for this edit.")
+  newText: z22.string().describe("Replacement Canvas markdown for this edit.")
 });
+var slackCanvasEditOutputSchema = juniorToolResultSchema.extend({
+  canvas_id: z22.string().optional(),
+  title: z22.string().optional(),
+  permalink: z22.string().optional(),
+  diff: z22.string().optional(),
+  first_changed_line: z22.number().int().positive().optional(),
+  replacements: z22.number().int().nonnegative().optional(),
+  normalized_heading_count: z22.number().int().nonnegative().optional(),
+  summary: z22.string().optional(),
+  deduplicated: z22.boolean().optional()
+}).strict();
 function createSlackCanvasEditTool(state) {
   return zodTool({
     description: "Edit one Slack canvas with exact markdown replacements. Use for precise changes to existing Canvas content; prefer this over slackCanvasWrite for targeted changes. Each oldText must match exactly, be unique, and not overlap another edit. Returns a diff. Multiple changes to the same canvas: use one edits[] call.",
     prepareArguments: prepareCanvasEditArguments,
     executionMode: "sequential",
-    inputSchema: z23.object({
-      canvas: z23.string().min(1).describe("Canvas/file ID (e.g. `F0ABCDEF`) or Slack canvas/docs URL."),
-      edits: z23.array(editReplacementSchema2).min(1).describe(
+    inputSchema: z22.object({
+      canvas: z22.string().min(1).describe("Canvas/file ID (e.g. `F0ABCDEF`) or Slack canvas/docs URL."),
+      edits: z22.array(editReplacementSchema2).min(1).describe(
         "Exact replacements matched against the current Canvas body, not incrementally."
       )
     }),
-    outputSchema: juniorToolResultSchema,
+    outputSchema: slackCanvasEditOutputSchema,
     execute: async ({ canvas, edits }) => {
       const target = resolveCanvasTarget(canvas);
       if (!target.ok) {
@@ -6080,19 +6124,31 @@ function createSlackCanvasEditTool(state) {
 }
 
 // src/chat/slack/tools/canvas/read.ts
-import { z as z24 } from "zod";
+import { z as z23 } from "zod";
+var slackCanvasReadOutputSchema = juniorToolResultSchema.extend({
+  canvas_id: z23.string().optional(),
+  title: z23.string().optional(),
+  permalink: z23.string().optional(),
+  mimetype: z23.string().optional(),
+  filetype: z23.string().optional(),
+  original_byte_length: z23.number().int().nonnegative().optional(),
+  content: z23.string().optional(),
+  start_line: z23.number().int().positive().optional(),
+  end_line: z23.number().int().nonnegative().optional(),
+  total_lines: z23.number().int().nonnegative().optional()
+}).strict();
 function createSlackCanvasReadTool() {
   return zodTool({
     description: "Read a bounded line range from a Slack canvas as markdown. Use when you need exact Canvas contents to verify facts or make edits safely. Do not use for generic web pages \u2014 use webFetch for those.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z24.object({
-      canvas: z24.string().min(1).describe(
+    inputSchema: z23.object({
+      canvas: z23.string().min(1).describe(
         "Canvas/file ID (e.g. `F0ABCDEF`) or Slack canvas/docs URL (e.g. `https://team.slack.com/docs/T.../F...`)."
       ),
-      offset: z24.coerce.number().int().min(1).describe("1-indexed line number to start reading from.").optional(),
-      limit: z24.coerce.number().int().min(1).describe("Maximum number of lines to read. Defaults to 1000.").optional()
+      offset: z23.coerce.number().int().min(1).describe("1-indexed line number to start reading from.").optional(),
+      limit: z23.coerce.number().int().min(1).describe("Maximum number of lines to read. Defaults to 1000.").optional()
     }),
-    outputSchema: juniorToolResultSchema,
+    outputSchema: slackCanvasReadOutputSchema,
     execute: async ({ canvas, offset, limit }) => {
       const target = resolveCanvasTarget(canvas);
       if (!target.ok) {
@@ -6147,14 +6203,14 @@ function createSlackCanvasReadTool() {
 }
 
 // src/chat/slack/tools/canvas/write.ts
-import { z as z25 } from "zod";
+import { z as z24 } from "zod";
 function createSlackCanvasWriteTool(state) {
   return zodTool({
     description: "Write UTF-8 markdown content to a Slack canvas. Use for deliberate full-Canvas replacement after validation; use slackCanvasEdit for targeted changes to existing canvas content.",
     executionMode: "sequential",
-    inputSchema: z25.object({
-      canvas: z25.string().min(1).describe("Canvas/file ID (e.g. `F0ABCDEF`) or Slack canvas/docs URL."),
-      content: z25.string().describe("UTF-8 markdown content to write.")
+    inputSchema: z24.object({
+      canvas: z24.string().min(1).describe("Canvas/file ID (e.g. `F0ABCDEF`) or Slack canvas/docs URL."),
+      content: z24.string().describe("UTF-8 markdown content to write.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ canvas, content }) => {
@@ -6390,12 +6446,12 @@ async function updateListItem(input) {
 }
 
 // src/chat/slack/id-param.ts
-import { z as z26 } from "zod";
+import { z as z25 } from "zod";
 function slackChannelIdParam(description) {
-  return z26.string().min(1).describe(description);
+  return z25.string().min(1).describe(description);
 }
 function slackUserIdParam(description) {
-  return z26.string().min(1).describe(description);
+  return z25.string().min(1).describe(description);
 }
 function parseRequiredSlackChannelIdParam(field, value) {
   const channelId = parseSlackChannelId(value);
@@ -6419,16 +6475,16 @@ function parseRequiredSlackUserIdParam(field, value) {
 }
 
 // src/chat/slack/tools/list/add-items.ts
-import { z as z27 } from "zod";
+import { z as z26 } from "zod";
 function createSlackListAddItemsTool(state) {
   return zodTool({
     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.",
-    inputSchema: z27.object({
-      items: z27.array(z27.string().min(1)).min(1).max(25).describe("List item titles to create."),
+    inputSchema: z26.object({
+      items: z26.array(z26.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."
       ).optional(),
-      due_date: z27.string().regex(/^\d{4}-\d{2}-\d{2}$/).describe("Optional due date in YYYY-MM-DD format.").optional()
+      due_date: z26.string().regex(/^\d{4}-\d{2}-\d{2}$/).describe("Optional due date in YYYY-MM-DD format.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ items, assignee_user_id, due_date }) => {
@@ -6482,12 +6538,12 @@ function createSlackListAddItemsTool(state) {
 }
 
 // src/chat/slack/tools/list/create.ts
-import { z as z28 } from "zod";
+import { z as z27 } from "zod";
 function createSlackListCreateTool(state) {
   return zodTool({
     description: "Create a Slack todo list for action tracking. Use when the user needs structured tasks with ownership/completion tracking. Do not use for one-off notes without task management needs.",
-    inputSchema: z28.object({
-      name: z28.string().min(1).max(160).describe("Name for the new Slack list.")
+    inputSchema: z27.object({
+      name: z27.string().min(1).max(160).describe("Name for the new Slack list.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ name }) => {
@@ -6519,13 +6575,13 @@ function createSlackListCreateTool(state) {
 }
 
 // src/chat/slack/tools/list/get-items.ts
-import { z as z29 } from "zod";
+import { z as z28 } from "zod";
 function createSlackListGetItemsTool(state) {
   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.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z29.object({
-      limit: z29.coerce.number().int().min(1).max(200).describe("Maximum number of list items to return.").optional()
+    inputSchema: z28.object({
+      limit: z28.coerce.number().int().min(1).max(200).describe("Maximum number of list items to return.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ limit }) => {
@@ -6550,21 +6606,21 @@ function createSlackListGetItemsTool(state) {
 }
 
 // src/chat/slack/tools/list/update-item.ts
-import { z as z30 } from "zod";
-var booleanInput3 = (description) => z30.preprocess(
+import { z as z29 } from "zod";
+var booleanInput3 = (description) => z29.preprocess(
   (value) => value === "true" ? true : value === "false" ? false : value,
-  z30.boolean()
+  z29.boolean()
 ).describe(description);
-var updateListItemInputSchema = z30.union([
-  z30.object({
-    item_id: z30.string().min(1).describe("ID of the Slack list item to update."),
+var updateListItemInputSchema = z29.union([
+  z29.object({
+    item_id: z29.string().min(1).describe("ID of the Slack list item to update."),
     completed: booleanInput3("Optional completion status update."),
-    title: z30.string().min(1).describe("Optional new item title.").optional()
+    title: z29.string().min(1).describe("Optional new item title.").optional()
   }),
-  z30.object({
-    item_id: z30.string().min(1).describe("ID of the Slack list item to update."),
+  z29.object({
+    item_id: z29.string().min(1).describe("ID of the Slack list item to update."),
     completed: booleanInput3("Optional completion status update.").optional(),
-    title: z30.string().min(1).describe("Optional new item title.")
+    title: z29.string().min(1).describe("Optional new item title.")
   })
 ]);
 function createSlackListUpdateItemTool(state) {
@@ -6640,7 +6696,7 @@ async function checkSlackChannelReadAccess(args) {
 }
 
 // src/chat/slack/tools/thread-read.ts
-import { z as z31 } from "zod";
+import { z as z30 } from "zod";
 
 // src/chat/slack/tools/slack-message-url.ts
 var SLACK_HOST_PATTERN = /^[a-z0-9-]+\.slack(?:-gov)?\.com$/;
@@ -6813,8 +6869,8 @@ function createSlackThreadReadTool(context, deps = {}) {
   return zodTool({
     description: "Read a Slack thread from a shared Slack message archive URL or explicit channel + timestamp. Use when the user shares a Slack message link (https://*.slack.com/archives/...) and you need the referenced message and its thread context. Only the current conversation and public channels Junior has seen in this workspace are readable.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z31.object({
-      url: z31.string().min(1).describe(
+    inputSchema: z30.object({
+      url: z30.string().min(1).describe(
         "Slack message archive URL, e.g. https://workspace.slack.com/archives/C123/p1700000000123456"
       ).optional(),
       channel_id: slackChannelIdParam(
@@ -6823,8 +6879,8 @@ function createSlackThreadReadTool(context, deps = {}) {
       ts: slackTimestampParam(
         "Slack message timestamp (e.g. 1700000000.123456). May be the thread root or any message in the thread."
       ).optional(),
-      limit: z31.coerce.number().int().min(1).max(1e3).describe("Maximum number of thread messages to fetch.").optional(),
-      max_pages: z31.coerce.number().int().min(1).max(10).describe("Maximum number of Slack API pages to traverse.").optional()
+      limit: z30.coerce.number().int().min(1).max(1e3).describe("Maximum number of thread messages to fetch.").optional(),
+      max_pages: z30.coerce.number().int().min(1).max(10).describe("Maximum number of Slack API pages to traverse.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ url, channel_id, ts, limit, max_pages }) => {
@@ -7080,29 +7136,29 @@ async function searchSlackUsers(options) {
 }
 
 // src/chat/slack/tools/user-lookup.ts
-import { z as z32 } from "zod";
-var booleanInput4 = (description) => z32.preprocess(
+import { z as z31 } from "zod";
+var booleanInput4 = (description) => z31.preprocess(
   (value) => value === "true" ? true : value === "false" ? false : value,
-  z32.boolean()
+  z31.boolean()
 ).describe(description);
 function createSlackUserLookupTool() {
   return zodTool({
     description: "Look up Slack user profiles by user ID, email, or name search. Use when you need to identify a user, resolve cross-platform identity, or look up profile details like title or status. Returns profile fields including custom fields. For user ID lookup, pass a Slack user ID (e.g. U039RR91S). For search, pass a name query.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z32.object({
+    inputSchema: z31.object({
       user_id: slackUserIdParam(
         "Slack user ID to look up (e.g. U039RR91S). Mutually exclusive with email and query."
       ).optional(),
-      email: z32.string().min(3).describe(
+      email: z31.string().min(3).describe(
         "Email address to look up. Mutually exclusive with user_id and query."
       ).optional(),
-      query: z32.string().min(2).describe(
+      query: z31.string().min(2).describe(
         "Name to search for (matches against username, display name, real name). Mutually exclusive with user_id and email."
       ).optional(),
-      limit: z32.coerce.number().int().min(1).max(20).describe(
+      limit: z31.coerce.number().int().min(1).max(20).describe(
         "Maximum number of results to return for name search. Defaults to 10."
       ).optional(),
-      max_pages: z32.coerce.number().int().min(1).max(5).describe(
+      max_pages: z31.coerce.number().int().min(1).max(5).describe(
         "Maximum number of Slack API pages to scan for name search. Defaults to 3."
       ).optional(),
       include_bots: booleanInput4(
@@ -7206,12 +7262,12 @@ function createSlackUserLookupTool() {
 }
 
 // src/chat/tools/system-time.ts
-import { z as z33 } from "zod";
+import { z as z32 } from "zod";
 function createSystemTimeTool() {
   return zodTool({
     description: "Return current system time in UTC and local ISO formats. Use when the user asks for current time/date context. Do not use as a substitute for historical or timezone-conversion research.",
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z33.object({}),
+    inputSchema: z32.object({}),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
       const now = /* @__PURE__ */ new Date();
@@ -7268,7 +7324,7 @@ function createStateAdvisorSessionStore() {
 }
 
 // src/chat/tools/advisor/tool.ts
-import { z as z34 } from "zod";
+import { z as z33 } from "zod";
 var ADVISOR_TOOL_DESCRIPTION = "Second-opinion advisor for hard technical work. Call when you reach a consequential workflow moment: after enough exploration to frame a non-obvious plan; before a non-trivial code change or broad refactor; after repeated failures or when requirements or next steps feel ambiguous or risky; and when verifying a complex change before declaring it done, opening a PR, or reporting results. Ask a focused question and pass curated context: exact evidence, constraints, relevant code snippets, command output, diffs, current plan, and alternatives considered. The advisor has its own history, does not automatically receive the parent transcript, and may use read-only tools to verify. Follow up only with new evidence or changed constraints. Do not use for greetings, simple deterministic edits, routine formatting, or when fresh output makes the next action obvious.";
 var ADVISOR_SYSTEM_PROMPT = [
   "You are a senior technical advisor for the executor.",
@@ -7321,9 +7377,9 @@ function createAdvisorTool(context) {
   const spanContext = context.logContext ?? {};
   return zodTool({
     description: ADVISOR_TOOL_DESCRIPTION,
-    inputSchema: z34.object({
-      question: z34.string().min(1).describe("Focused advisor question or decision point."),
-      context: z34.string().min(1).describe(
+    inputSchema: z33.object({
+      question: z33.string().min(1).describe("Focused advisor question or decision point."),
+      context: z33.string().min(1).describe(
         "Curated evidence packet: relevant requirements, constraints, current plan, alternatives, code snippets, diffs, command output, and open questions."
       )
     }),
@@ -7392,15 +7448,11 @@ function createAdvisorTool(context) {
       ].join("\n");
       const advisorInputMessage = {
         role: "user",
-        content: [
-          {
-            type: "text",
-            text: requestText
-          }
-        ]
+        content: [{ type: "text", text: requestText }],
+        timestamp: Date.now()
       };
       const advisorInputMessagesAttribute = serializeGenAiAttribute(
-        conversationPrivacy !== "public" ? [toGenAiMessageMetadata(advisorInputMessage)] : [advisorInputMessage]
+        conversationPrivacy !== "public" ? [toGenAiMessageMetadata(advisorInputMessage)] : [toCanonicalInputMessage(advisorInputMessage)]
       );
       return await withSpan(
         `invoke_agent ${context.config.modelId}`,
@@ -7451,7 +7503,7 @@ function createAdvisorTool(context) {
           const newAdvisorMessages = advisorAgent.state.messages.slice(beforeMessageCount);
           const outputMessages = newAdvisorMessages.filter(isAssistantMessage);
           const outputMessagesAttribute = serializeGenAiAttribute(
-            conversationPrivacy !== "public" ? outputMessages.map(toGenAiMessageMetadata) : outputMessages
+            conversationPrivacy !== "public" ? outputMessages.map(toGenAiMessageMetadata) : outputMessages.map(toCanonicalOutputMessage)
           );
           setSpanAttributes({
             ...outputMessagesAttribute ? { "gen_ai.output.messages": outputMessagesAttribute } : {},
@@ -7506,7 +7558,7 @@ function createAdvisorTool(context) {
 }
 
 // src/chat/tools/web/fetch-tool.ts
-import { z as z35 } from "zod";
+import { z as z34 } from "zod";
 
 // src/chat/tools/web/constants.ts
 var USER_AGENT = "junior-bot/0.1";
@@ -7953,9 +8005,9 @@ function createWebFetchTool(hooks, options = {}) {
       destructiveHint: false,
       openWorldHint: true
     },
-    inputSchema: z35.object({
-      url: z35.string().min(1).describe("HTTP(S) URL to fetch."),
-      max_chars: z35.coerce.number().int().min(500).max(MAX_FETCH_CHARS).describe("Optional maximum number of extracted characters to return.").optional()
+    inputSchema: z34.object({
+      url: z34.string().min(1).describe("HTTP(S) URL to fetch."),
+      max_chars: z34.coerce.number().int().min(500).max(MAX_FETCH_CHARS).describe("Optional maximum number of extracted characters to return.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ url, max_chars }) => {
@@ -8022,7 +8074,7 @@ function createWebFetchTool(hooks, options = {}) {
 }
 
 // src/chat/tools/web/search.ts
-import { z as z36 } from "zod";
+import { z as z35 } from "zod";
 import { generateText } from "ai";
 import { createGatewayProvider } from "@ai-sdk/gateway";
 import { getModel } from "@earendil-works/pi-ai";
@@ -8073,9 +8125,9 @@ function createWebSearchTool(override) {
       destructiveHint: false,
       openWorldHint: true
     },
-    inputSchema: z36.object({
-      query: z36.string().min(1).max(500).describe("Search query."),
-      max_results: z36.coerce.number().int().min(1).max(MAX_RESULTS2).describe("Max results to return.").optional()
+    inputSchema: z35.object({
+      query: z35.string().min(1).max(500).describe("Search query."),
+      max_results: z35.coerce.number().int().min(1).max(MAX_RESULTS2).describe("Max results to return.").optional()
     }),
     outputSchema: juniorToolResultSchema,
     execute: async ({ query, max_results }) => {
@@ -8145,14 +8197,14 @@ function createWebSearchTool(override) {
 }
 
 // src/chat/tools/sandbox/write-file.ts
-import { z as z37 } from "zod";
+import { z as z36 } from "zod";
 function createWriteFileTool() {
   return zodTool({
     description: "Write UTF-8 content to a file in the sandbox workspace. Use for intentional file creation or deliberate full-file replacement after validation; use editFile instead for targeted changes to existing files. Do not use for exploratory analysis-only turns.",
     executionMode: "sequential",
-    inputSchema: z37.object({
-      path: z37.string().min(1).describe("Path to write in the sandbox workspace."),
-      content: z37.string().describe("UTF-8 file content to write.")
+    inputSchema: z36.object({
+      path: z36.string().min(1).describe("Path to write in the sandbox workspace."),
+      content: z36.string().describe("UTF-8 file content to write.")
     }),
     outputSchema: juniorToolResultSchema,
     execute: async () => {
@@ -8546,7 +8598,7 @@ function upstreamPermissionDeniedText(value) {
     ...sso ? [`Provider SSO: ${sso}`] : [],
     ...command ? [`Command: ${command}`] : [],
     "",
-    "Junior had a credential lease for this grant and forwarded the request. Do not diagnose this as a missing user token or a local Junior runtime block; diagnose provider-side permissions, installation scope, SSO, or requester-provider account access.",
+    "Junior had a credential lease for this grant and forwarded the request. Do not diagnose this as a missing user token or a local Junior runtime block; diagnose provider-side permissions, installation scope, SSO, or actor-provider account access.",
     ...stderr ? ["", `stderr:
 ${stderr}`] : [],
     ...stdout ? ["", `stdout:
@@ -8891,6 +8943,13 @@ import { randomBytes } from "crypto";
 import {
   sourceSchema as sourceSchema2
 } from "@sentry/junior-plugin-api";
+
+// src/chat/oauth-authorization-message.ts
+function formatOAuthAuthorizationMessage(args) {
+  return `${formatSlackLink(args.authorizationUrl, args.label)}. ${args.completionText}`;
+}
+
+// src/chat/oauth-flow.ts
 var OAUTH_STATE_TTL_MS = 10 * 60 * 1e3;
 function optionalString(value) {
   return typeof value === "string" ? value : void 0;
@@ -9046,7 +9105,7 @@ async function startOAuthFlow(provider, input) {
   await getStateAdapter().set(
     `oauth-state:${state}`,
     {
-      userId: input.requesterId,
+      userId: input.actorId,
       provider,
       ...input.channelId ? { channelId: input.channelId } : {},
       ...input.destination ? { destination: input.destination } : {},
@@ -9083,71 +9142,76 @@ async function startOAuthFlow(provider, input) {
     },
     "Initiated OAuth authorization code flow"
   );
+  const authorizationUrl = `${providerConfig.authorizeEndpoint}?${authorizeParams.toString()}`;
   return {
     ok: true,
     delivery: await deliverPrivateMessage({
       channelId: input.channelId,
       threadTs: input.threadTs,
-      userId: input.requesterId,
-      text: `<${providerConfig.authorizeEndpoint}?${authorizeParams.toString()}|Click here to link your ${formatProviderLabel(provider)} account>. Once you've authorized, you'll see a confirmation in Slack.`
+      userId: input.actorId,
+      text: formatOAuthAuthorizationMessage({
+        authorizationUrl,
+        label: `Click here to link your ${formatProviderLabel(provider)} account`,
+        completionText: "Once you've authorized, you'll see a confirmation in Slack."
+      })
     })
   };
 }
 
 // src/chat/sandbox/egress/schemas.ts
-import { z as z38 } from "zod";
+import { z as z37 } from "zod";
 import {
   pluginAuthorizationSchema,
   pluginCredentialHeaderTransformSchema,
   pluginGrantSchema,
   pluginProviderAccountSchema
 } from "@sentry/junior-plugin-api";
-var finiteNumberSchema = z38.number().refine(Number.isFinite);
-var httpStatusSchema = z38.number().int().min(100).max(599);
-var providerNameSchema = z38.string().regex(/^[a-z][a-z0-9-]*$/);
-var credentialSignalKindSchema = z38.enum(["auth_required", "unavailable"]);
+var finiteNumberSchema = z37.number().refine(Number.isFinite);
+var httpStatusSchema = z37.number().int().min(100).max(599);
+var providerNameSchema = z37.string().regex(/^[a-z][a-z0-9-]*$/);
+var credentialSignalKindSchema = z37.enum(["auth_required", "unavailable"]);
 var sandboxEgressGrantSchema = pluginGrantSchema;
-var sandboxEgressCredentialContextSchema = z38.object({
+var sandboxEgressCredentialContextSchema = z37.object({
   credentials: credentialContextSchema,
-  egressId: z38.string().min(1),
+  egressId: z37.string().min(1),
   expiresAtMs: finiteNumberSchema,
-  contextId: z38.string().min(1)
+  contextId: z37.string().min(1)
 }).strict();
-var sandboxEgressCredentialLeaseSchema = z38.object({
+var sandboxEgressCredentialLeaseSchema = z37.object({
   account: pluginProviderAccountSchema.optional(),
   authorization: pluginAuthorizationSchema.optional(),
   grant: sandboxEgressGrantSchema,
   provider: providerNameSchema,
-  expiresAt: z38.string().min(1),
-  headerTransforms: z38.array(pluginCredentialHeaderTransformSchema).min(1)
+  expiresAt: z37.string().min(1),
+  headerTransforms: z37.array(pluginCredentialHeaderTransformSchema).min(1)
 }).strict();
-var sandboxEgressAuthRequiredSignalSchema = z38.object({
+var sandboxEgressAuthRequiredSignalSchema = z37.object({
   authorization: pluginAuthorizationSchema.optional(),
   grant: sandboxEgressGrantSchema,
   kind: credentialSignalKindSchema.default("auth_required"),
   provider: providerNameSchema,
-  message: z38.string().optional(),
+  message: z37.string().optional(),
   createdAtMs: finiteNumberSchema
 }).strict().superRefine((signal, ctx) => {
   if (signal.authorization && signal.authorization.provider !== signal.provider) {
     ctx.addIssue({
-      code: z38.ZodIssueCode.custom,
+      code: z37.ZodIssueCode.custom,
       message: "Auth signal authorization provider must match provider",
       path: ["authorization", "provider"]
     });
   }
 });
-var sandboxEgressPermissionDeniedSignalSchema = z38.object({
+var sandboxEgressPermissionDeniedSignalSchema = z37.object({
   account: pluginProviderAccountSchema.optional(),
-  acceptedPermissions: z38.string().optional(),
+  acceptedPermissions: z37.string().optional(),
   grant: sandboxEgressGrantSchema,
-  message: z38.string().min(1),
+  message: z37.string().min(1),
   provider: providerNameSchema,
-  source: z38.literal("upstream"),
-  sso: z38.string().optional(),
+  source: z37.literal("upstream"),
+  sso: z37.string().optional(),
   status: httpStatusSchema,
-  upstreamHost: z38.string().min(1),
-  upstreamPath: z38.string().min(1),
+  upstreamHost: z37.string().min(1),
+  upstreamPath: z37.string().min(1),
   createdAtMs: finiteNumberSchema
 }).strict();
 function parseSandboxEgressAuthRequiredSignal(value) {
@@ -9199,7 +9263,7 @@ function createPluginAuthOrchestration(input) {
     if (pendingPause) {
       throw pendingPause;
     }
-    if (!input.requesterId || !pluginCatalogRuntime.getOAuthConfig(provider)) {
+    if (!input.actorId || !pluginCatalogRuntime.getOAuthConfig(provider)) {
       throw new Error(`Cannot start plugin authorization for ${provider}`);
     }
     if (input.authorizationFlowMode === "disabled") {
@@ -9216,13 +9280,13 @@ function createPluginAuthOrchestration(input) {
       pendingAuth: input.pendingAuth,
       kind: "plugin",
       provider,
-      requesterId: input.requesterId,
+      actorId: input.actorId,
       sessionId: input.sessionId,
       ...options?.scope ? { scope: options.scope } : {}
     }) : false;
     if (!reusingPendingLink) {
       const oauthResult = await startOAuthFlow(provider, {
-        requesterId: input.requesterId,
+        actorId: input.actorId,
         channelId: input.channelId,
         destination: input.destination,
         source: input.source,
@@ -9242,14 +9306,14 @@ function createPluginAuthOrchestration(input) {
         );
       }
     }
-    if (options?.unlinkExistingProvider && input.requesterId && input.userTokenStore) {
-      await unlinkProvider(input.requesterId, provider, input.userTokenStore);
+    if (options?.unlinkExistingProvider && input.actorId && input.userTokenStore) {
+      await unlinkProvider(input.actorId, provider, input.userTokenStore);
     }
     if (input.sessionId && recordPendingAuth) {
       await recordPendingAuth({
         kind: "plugin",
         provider,
-        requesterId: input.requesterId,
+        actorId: input.actorId,
         ...options?.scope ? { scope: options.scope } : {},
         sessionId: input.sessionId,
         linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
@@ -9260,7 +9324,7 @@ function createPluginAuthOrchestration(input) {
         conversationId: input.conversationId,
         kind: "plugin",
         provider,
-        requesterId: input.requesterId,
+        actorId: input.actorId,
         authorizationId: authorizationId({
           kind: "plugin",
           provider,
@@ -9297,7 +9361,7 @@ function createPluginAuthOrchestration(input) {
           signal.message ?? `${formatProviderLabel(provider)} credentials are required but no OAuth flow is available for this provider.`
         );
       }
-      if (!input.requesterId || !input.userTokenStore) {
+      if (!input.actorId || !input.userTokenStore) {
         if (input.authorizationFlowMode === "disabled") {
           throw new AuthorizationFlowDisabledError("plugin", provider);
         }
@@ -9404,15 +9468,15 @@ function handleToolExecutionError(error, toolName, toolCallId, shouldTrace, trac
 }
 
 // src/chat/tools/execute-tool.ts
-import { z as z39 } from "zod";
+import { z as z38 } from "zod";
 var EXECUTE_TOOL_NAME = "executeTool";
 function createExecuteToolTool() {
   return zodTool({
     description: "Execute any catalog tool by exact tool_name from searchTools. Put tool-specific parameters inside arguments.",
     executionMode: "sequential",
-    inputSchema: z39.object({
-      tool_name: z39.string().min(1).describe("Exact catalog tool_name returned by searchTools."),
-      arguments: z39.record(z39.string(), z39.unknown()).describe(
+    inputSchema: z38.object({
+      tool_name: z38.string().min(1).describe("Exact catalog tool_name returned by searchTools."),
+      arguments: z38.record(z38.string(), z38.unknown()).describe(
         'Arguments matching the selected catalog tool schema, for example { "query": "..." }.'
       ).optional()
     }).strict(),
@@ -9452,13 +9516,54 @@ function planToolExposure(tools) {
 }
 
 // src/chat/tools/search-tools.ts
-import { z as z40 } from "zod";
+import { z as z39 } from "zod";
 var SEARCH_TOOLS_NAME = "searchTools";
 var DEFAULT_MAX_RESULTS2 = 5;
 var MAX_RESULTS3 = 20;
+var MODEL_VISIBLE_DESCRIPTION_CAP = 180;
+var searchToolsSourceSchema = z39.object({
+  id: z39.string(),
+  description: z39.string()
+}).strict();
+var toolCallExampleSchema = z39.object({
+  tool_name: z39.string(),
+  arguments: z39.record(z39.string(), z39.string())
+}).strict();
+var searchToolsToolSchema = z39.object({
+  tool_name: z39.string(),
+  description: z39.string(),
+  exposure: z39.enum(["direct", "deferred", "modelOnly", "hidden"]),
+  source: z39.string().optional(),
+  signature: z39.string(),
+  call: toolCallExampleSchema,
+  input_schema: z39.unknown(),
+  input_schema_summary: z39.string(),
+  call_notes: z39.array(z39.string()),
+  annotations: z39.record(z39.string(), z39.unknown())
+}).strict();
+var searchToolsOutputSchema = juniorToolResultSchema.extend({
+  query: z39.string().nullable(),
+  source: z39.string().nullable(),
+  sources: z39.array(searchToolsSourceSchema),
+  total_catalog_tools: z39.number().int().nonnegative(),
+  total_eligible_tools: z39.number().int().nonnegative(),
+  total_matches: z39.number().int().nonnegative(),
+  returned_tools: z39.number().int().nonnegative(),
+  execution_tool: z39.literal("executeTool"),
+  execution_example: toolCallExampleSchema,
+  tools: z39.array(searchToolsToolSchema)
+}).strict();
 function normalize2(value) {
   return value.toLowerCase().replace(/[^a-z0-9_]+/g, " ").trim();
 }
+function summarizeModelVisibleDescription(description) {
+  const paragraph = description.split(/\n\s*\n/).map((part) => part.trim()).find(Boolean) ?? "";
+  const normalized = paragraph.replace(/\s+/g, " ").trim();
+  if (normalized.length <= MODEL_VISIBLE_DESCRIPTION_CAP) {
+    return normalized;
+  }
+  return `${normalized.slice(0, MODEL_VISIBLE_DESCRIPTION_CAP - 3).trimEnd()}...`;
+}
 function schemaText(schema) {
   try {
     return JSON.stringify(schema);
@@ -9473,6 +9578,8 @@ function searchableToolText2(name, definition) {
       definition.identity?.id,
       definition.identity?.name,
       definition.identity?.plugin,
+      definition.source?.id,
+      definition.source?.description,
       definition.description,
       definition.promptSnippet,
       ...definition.promptGuidelines ?? [],
@@ -9481,15 +9588,16 @@ function searchableToolText2(name, definition) {
     ].filter(Boolean).join(" ")
   );
 }
-function searchCatalogTools(tools, query) {
+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 entries.map(([name]) => name);
+    return sourceEntries.map(([name]) => name);
   }
   const terms = normalize2(query).split(/\s+/).filter(Boolean);
-  return entries.filter(([name, definition]) => {
+  return sourceEntries.filter(([name, definition]) => {
     const text = searchableToolText2(name, definition);
     return terms.every((term) => text.includes(term));
   }).map(([name]) => name);
@@ -9500,17 +9608,128 @@ function callNotes(definition) {
     ...definition.promptGuidelines?.map((guideline) => guideline.trim()).filter(Boolean) ?? []
   ];
 }
-function toolMetadata(name, definition) {
+function getSchemaProperties3(schema) {
+  if (!schema || typeof schema !== "object" || !("properties" in schema)) {
+    return {};
+  }
+  const properties = schema.properties;
+  return properties && typeof properties === "object" && !Array.isArray(properties) ? properties : {};
+}
+function getRequiredFields3(schema) {
+  if (!schema || typeof schema !== "object" || !("required" in schema)) {
+    return /* @__PURE__ */ new Set();
+  }
+  const required = schema.required;
+  return Array.isArray(required) ? new Set(
+    required.filter((value) => typeof value === "string")
+  ) : /* @__PURE__ */ new Set();
+}
+function formatSchemaType2(schema) {
+  if (!schema || typeof schema !== "object") {
+    return "unknown";
+  }
+  const typed = schema;
+  const type = typed.type;
+  if (typeof type === "string") {
+    if (type === "array") {
+      return `${formatSchemaType2(typed.items)}[]`;
+    }
+    return type;
+  }
+  if (Array.isArray(type)) {
+    return type.filter((value) => typeof value === "string").join(" | ");
+  }
+  if (Array.isArray(typed.enum) && typed.enum.length > 0) {
+    return typed.enum.map((value) => JSON.stringify(value)).join(" | ");
+  }
+  return "unknown";
+}
+function formatArgumentPlaceholder2(name, schema) {
+  const type = formatSchemaType2(schema);
+  if (type === "string") {
+    return `<${name}>`;
+  }
+  if (type === "number" || type === "integer") {
+    return "<number>";
+  }
+  if (type === "boolean") {
+    return "<boolean>";
+  }
+  if (type.endsWith("[]")) {
+    return "<array>";
+  }
+  if (type === "object") {
+    return "<object>";
+  }
+  return `<${type}>`;
+}
+function formatToolSignature(name, schema) {
+  const properties = getSchemaProperties3(schema);
+  const required = getRequiredFields3(schema);
+  const fields = Object.entries(properties).map(([field, propertySchema]) => {
+    const marker = required.has(field) ? "" : "?";
+    return `${field}${marker}: ${formatSchemaType2(propertySchema)}`;
+  });
+  return fields.length > 0 ? `${name}({ ${fields.join(", ")} })` : `${name}()`;
+}
+function formatToolCallExample(name, schema) {
   return {
     tool_name: name,
-    description: definition.description,
+    arguments: Object.fromEntries(
+      Object.entries(getSchemaProperties3(schema)).map(
+        ([field, propertySchema]) => [
+          field,
+          formatArgumentPlaceholder2(field, propertySchema)
+        ]
+      )
+    )
+  };
+}
+function sourceSummaries(tools) {
+  const sources = /* @__PURE__ */ new Map();
+  for (const definition of Object.values(tools)) {
+    if (!definition.source) {
+      continue;
+    }
+    sources.set(definition.source.id, {
+      id: definition.source.id,
+      description: summarizeModelVisibleDescription(
+        definition.source.description
+      )
+    });
+  }
+  return [...sources.values()].sort(
+    (left, right) => left.id.localeCompare(right.id)
+  );
+}
+function selectedSourceSummaries(tools, matches, requestedSource, knownSources) {
+  if (requestedSource) {
+    return knownSources.filter((source) => source.id === requestedSource);
+  }
+  const matchedSourceIds = new Set(
+    matches.map((name) => tools[name]?.source?.id).filter((source) => Boolean(source))
+  );
+  return knownSources.filter((source) => matchedSourceIds.has(source.id));
+}
+function renderSearchToolsDescription(knownSources) {
+  const intro = "Search the executable tool catalog. Deferred tools are grouped by source; use searchTools with source to inspect one source, then executeTool with the exact returned tool_name.";
+  if (knownSources.length === 0) {
+    return intro;
+  }
+  return [
+    intro,
+    "Available sources:",
+    ...knownSources.map((source) => `- ${source.id}: ${source.description}`)
+  ].join("\n");
+}
+function toolMetadata(name, definition, includeSource) {
+  return {
+    tool_name: name,
+    description: summarizeModelVisibleDescription(definition.description),
     exposure: effectiveToolExposure(definition),
-    source: definition.identity ? {
-      type: "plugin",
-      id: definition.identity.id,
-      name: definition.identity.name,
-      plugin: definition.identity.plugin
-    } : { type: "core" },
+    ...includeSource && definition.source ? { source: definition.source.id } : {},
+    signature: formatToolSignature(name, definition.inputSchema),
+    call: formatToolCallExample(name, definition.inputSchema),
     input_schema: definition.inputSchema,
     input_schema_summary: summarizeInputSchema(
       definition.inputSchema
@@ -9520,27 +9739,55 @@ function toolMetadata(name, definition) {
   };
 }
 function createSearchToolsTool(catalogTools) {
+  const knownSources = sourceSummaries(catalogTools);
   return zodTool({
-    description: "Search the executable tool catalog. Use this to discover exact tool names, owners, schemas, and call notes before calling executeTool.",
+    description: renderSearchToolsDescription(knownSources),
     annotations: { readOnlyHint: true, destructiveHint: false },
-    inputSchema: z40.object({
-      query: z40.string().nullable().describe(
+    inputSchema: z39.object({
+      query: z39.string().nullable().describe(
         "Optional search terms describing the tool, owner, action, or arguments needed. Empty string lists catalog tools."
       ).optional(),
-      max_results: z40.number().int().min(1).max(MAX_RESULTS3).nullable().describe("Maximum matching catalog tool descriptors to return.").optional()
+      source: z39.string().nullable().describe(
+        "Optional source id to search within, such as a plugin source returned in sources."
+      ).optional(),
+      max_results: z39.number().int().min(1).max(MAX_RESULTS3).nullable().describe("Maximum matching catalog tool descriptors to return.").optional()
     }).strict(),
-    outputSchema: juniorToolResultSchema,
-    execute: async ({ query, max_results }) => {
+    outputSchema: searchToolsOutputSchema,
+    execute: async ({ query, source, max_results }) => {
       const maxResults = max_results ?? DEFAULT_MAX_RESULTS2;
-      const matches = searchCatalogTools(catalogTools, query ?? "").slice(
-        0,
-        maxResults
+      const requestedSource = source ?? null;
+      const sourceExists = requestedSource === null || knownSources.some((candidate) => candidate.id === requestedSource);
+      const allMatches = sourceExists ? searchCatalogTools(catalogTools, query ?? "", requestedSource) : [];
+      const matches = allMatches.slice(0, maxResults);
+      const sources = !sourceExists ? knownSources : (query ?? "").trim() ? selectedSourceSummaries(
+        catalogTools,
+        matches,
+        requestedSource,
+        knownSources
+      ) : requestedSource ? knownSources.filter(
+        (candidate) => candidate.id === requestedSource
+      ) : knownSources;
+      const totalEligibleTools = sourceExists ? searchCatalogTools(catalogTools, "", requestedSource).length : 0;
+      const includePerToolSource = requestedSource === null;
+      const renderedTools = matches.map(
+        (name) => toolMetadata(name, catalogTools[name], includePerToolSource)
       );
       const data = {
         query: query ?? null,
+        source: requestedSource,
+        sources,
         total_catalog_tools: Object.keys(catalogTools).length,
-        returned_tools: matches.length,
-        tools: matches.map((name) => toolMetadata(name, catalogTools[name]))
+        total_eligible_tools: totalEligibleTools,
+        total_matches: allMatches.length,
+        returned_tools: renderedTools.length,
+        execution_tool: "executeTool",
+        execution_example: {
+          tool_name: "<returned tool_name>",
+          arguments: {
+            "<argument>": "<value from input_schema>"
+          }
+        },
+        tools: renderedTools
       };
       return {
         ok: true,
@@ -9752,7 +9999,7 @@ var SANDBOX_EGRESS_LEASE_PREFIX = "sandbox-egress-lease";
 var DEFAULT_SESSION_TTL_MS = 30 * 60 * 1e3;
 function leaseKey(provider, grantName, context) {
   const actor = context.credentials.actor;
-  const actorKey = actor.type === "user" ? `user:${actor.userId}` : `system:${actor.id}`;
+  const actorKey = "type" in actor ? `user:${actor.userId}` : `system:${actor.name}`;
   return `${SANDBOX_EGRESS_LEASE_PREFIX}:${provider}:${grantName}:${actorKey}:${context.egressId}:${context.contextId}`;
 }
 function authSignalKey(egressId, access) {
@@ -11594,6 +11841,13 @@ function createClientMetadata(callbackUrl) {
     token_endpoint_auth_method: "none"
   };
 }
+function clientAllowsRedirectUri(clientInformation, callbackUrl) {
+  const redirectUris = clientInformation.redirect_uris;
+  if (!Array.isArray(redirectUris)) {
+    return true;
+  }
+  return redirectUris.includes(callbackUrl);
+}
 var StateBackedMcpOAuthClientProvider = class {
   constructor(authSessionId, callbackUrl, sessionContext) {
     this.authSessionId = authSessionId;
@@ -11617,7 +11871,14 @@ var StateBackedMcpOAuthClientProvider = class {
       session.userId,
       session.provider
     );
-    return credentials?.clientInformation;
+    const clientInformation = credentials?.clientInformation;
+    if (!clientInformation) {
+      return void 0;
+    }
+    if (clientAllowsRedirectUri(clientInformation, this.callbackUrl)) {
+      return clientInformation;
+    }
+    return void 0;
   }
   async saveClientInformation(clientInformation) {
     const session = await this.getCredentialContext();
@@ -11857,7 +12118,7 @@ function createMcpAuthOrchestration(input) {
   let pendingPause;
   const authSessionIdsByProvider = /* @__PURE__ */ new Map();
   const authProviderFactory = async (plugin) => {
-    if (!input.conversationId || !input.sessionId || !input.requesterId) {
+    if (!input.conversationId || !input.sessionId || !input.actorId) {
       return void 0;
     }
     if (!input.recordPendingAuth && input.authorizationFlowMode !== "disabled") {
@@ -11871,7 +12132,7 @@ function createMcpAuthOrchestration(input) {
       destination: input.destination,
       source: input.source,
       sessionId: input.sessionId,
-      userId: input.requesterId,
+      userId: input.actorId,
       userMessage: input.userMessage,
       ...input.channelId ? { channelId: input.channelId } : {},
       ...input.threadTs ? { threadTs: input.threadTs } : {},
@@ -11889,8 +12150,8 @@ function createMcpAuthOrchestration(input) {
     const authSessionId = authSessionIdsByProvider.get(provider);
     const conversationId = input.conversationId;
     const sessionId = input.sessionId;
-    const requesterId = input.requesterId;
-    if (!authSessionId || !conversationId || !sessionId || !requesterId) {
+    const actorId = input.actorId;
+    if (!authSessionId || !conversationId || !sessionId || !actorId) {
       throw new Error(
         `Missing MCP auth session context for plugin "${provider}"`
       );
@@ -11919,7 +12180,7 @@ function createMcpAuthOrchestration(input) {
       pendingAuth: input.pendingAuth,
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       sessionId
     });
     const providerLabel = formatProviderLabel(provider);
@@ -11928,7 +12189,11 @@ function createMcpAuthOrchestration(input) {
         channelId: authSession.channelId,
         threadTs: authSession.threadTs,
         userId: authSession.userId,
-        text: `<${authSession.authorizationUrl}|Click here to link your ${providerLabel} MCP access>. Once you've authorized, this thread will continue automatically.`
+        text: formatOAuthAuthorizationMessage({
+          authorizationUrl: authSession.authorizationUrl,
+          label: `Click here to link your ${providerLabel} MCP access`,
+          completionText: "Once you've authorized, this thread will continue automatically."
+        })
       });
       if (!delivery) {
         throw new Error(
@@ -11941,7 +12206,7 @@ function createMcpAuthOrchestration(input) {
     await recordPendingAuth({
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       sessionId,
       linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
     });
@@ -11949,7 +12214,7 @@ function createMcpAuthOrchestration(input) {
       conversationId,
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       authorizationId: authorizationId2({
         kind: "mcp",
         provider,
@@ -12111,7 +12376,7 @@ async function issuePluginCredential(input) {
   if (!plugin || !hook) {
     throw new Error(`Plugin "${input.provider}" has no issueCredential hook`);
   }
-  const currentUserId = input.actor.type === "user" ? input.actor.userId : void 0;
+  const currentUserId = "type" in input.actor ? input.actor.userId : void 0;
   const credentialSubjectUserId = input.credentialSubject?.userId;
   const result = await hook({
     ...basePluginContext(plugin),
@@ -13090,10 +13355,10 @@ async function writeSandboxGeneratedArtifacts(sandbox, files) {
 // src/chat/agent/tools.ts
 async function wireAgentTools(args) {
   const runSource = args.routing.source;
-  const authRequesterId = args.routing.credentialContext?.actor.type === "user" ? args.routing.credentialContext.actor.userId : void 0;
+  const authActorId = args.routing.credentialContext && "type" in args.routing.credentialContext.actor ? args.routing.credentialContext.actor.userId : void 0;
   const userTokenStore = createUserTokenStore();
   const pluginHooks = createPluginHookRunner({
-    requester: args.actorRequester
+    actor: args.currentActor
   });
   const sandboxExecutor = createSandboxExecutor({
     sandboxId: args.state.sandbox?.sandboxId,
@@ -13113,7 +13378,7 @@ async function wireAgentTools(args) {
       const result = await maybeExecuteJrRpcCustomCommand(command, {
         activeSkill: args.skillSandbox.getActiveSkill(),
         channelConfiguration: args.policy.channelConfiguration,
-        requesterId: args.actorRequester?.userId,
+        actorId: isUserActor(args.currentActor) ? args.currentActor.userId : void 0,
         onConfigurationValueChanged: (key, value) => {
           if (value === void 0) {
             delete args.configurationValues[key];
@@ -13137,7 +13402,7 @@ async function wireAgentTools(args) {
     abortAgent: args.abortAgent,
     conversationId: args.sessionConversationId,
     sessionId: args.sessionId,
-    requesterId: authRequesterId,
+    actorId: authActorId,
     channelId: slackChannelId,
     destination: args.routing.destination,
     source: runSource,
@@ -13158,7 +13423,7 @@ async function wireAgentTools(args) {
     abortAgent: args.abortAgent,
     conversationId: args.sessionConversationId,
     sessionId: args.sessionId,
-    requesterId: authRequesterId,
+    actorId: authActorId,
     channelId: slackChannelId,
     destination: args.routing.destination,
     source: runSource,
@@ -13228,7 +13493,7 @@ async function wireAgentTools(args) {
     toolRuntimeContext = {
       ...commonToolRuntimeContext,
       destination: toolDestination,
-      requester: args.actorRequester?.platform === "slack" ? args.actorRequester : void 0,
+      actor: args.currentActor?.platform === "slack" ? args.currentActor : void 0,
       source: runSource
     };
   } else {
@@ -13238,7 +13503,7 @@ async function wireAgentTools(args) {
     toolRuntimeContext = {
       ...commonToolRuntimeContext,
       destination: toolDestination,
-      requester: args.actorRequester?.platform === "local" ? args.actorRequester : void 0,
+      actor: args.currentActor?.platform === "local" ? args.currentActor : void 0,
       source: runSource
     };
   }
@@ -13413,7 +13678,7 @@ function createResumeState(args) {
     sessionId: args.sessionId,
     loadedSkillNames: args.getLoadedSkillNames(),
     logContext: args.logContext,
-    requester: args.requester,
+    actor: args.actor,
     ...args.surface ? { surface: args.surface } : {}
   });
   return {
@@ -13451,7 +13716,7 @@ function createResumeState(args) {
       await args.durability.onInputCommitted?.();
       inputCommitted = true;
     },
-    async persistSafeBoundary(messages) {
+    async persistSafeBoundary(messages, trailingMessageProvenance) {
       if (!canPersistSession) {
         return false;
       }
@@ -13459,6 +13724,7 @@ function createResumeState(args) {
         ...sessionRecordBase(),
         sliceId: currentSliceId,
         messages,
+        ...trailingMessageProvenance ? { trailingMessageProvenance } : {},
         ...turnStartMessageIndex !== void 0 ? { turnStartMessageIndex } : {}
       });
       if (!persisted) {
@@ -13467,8 +13733,11 @@ function createResumeState(args) {
       latestSafeBoundaryMessages = [...messages];
       return true;
     },
-    async requireDurableInputCheckpoint(messages) {
-      const persisted = await this.persistSafeBoundary(messages);
+    async requireDurableInputCheckpoint(messages, trailingMessageProvenance) {
+      const persisted = await this.persistSafeBoundary(
+        messages,
+        trailingMessageProvenance
+      );
       if (!persisted && args.durability.onInputCommitted) {
         throw new TurnInputCommitLostError(
           `Durable turn input could not be checkpointed for conversation=${args.sessionConversationId ?? "unknown"} session=${args.sessionId ?? "unknown"}`
@@ -13627,7 +13896,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
   if (!routing.destination) {
     throw new TypeError("Assistant reply generation requires a destination");
   }
-  assertRequesterDestinationMatch(routing);
+  assertActorDestinationMatch(routing);
   assertCorrelationDestinationMatch(routing);
   const replyStartedAtMs = Date.now();
   const configuredTurnDeadlineAtMs = replyStartedAtMs + botConfig.turnTimeoutMs;
@@ -13642,18 +13911,18 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
   let canRecordMcpProviders = false;
   let turnUsage;
   let thinkingSelection;
-  const requester = requesterFromRouting(routing);
+  const actor = actorFromRouting(routing);
   const surface = surfaceFromRouting(routing);
   const runSource = routing.source;
   const userInput = input.messageText;
   const credentialActor = routing.credentialContext?.actor;
   const credentialActorLogContext = credentialActor ? {
-    actorType: credentialActor.type,
-    actorId: credentialActor.type === "user" ? credentialActor.userId : credentialActor.id
+    actorType: "type" in credentialActor ? credentialActor.type : "system",
+    actorId: "type" in credentialActor ? credentialActor.userId : credentialActor.name
   } : {};
   const sessionRecordLogContext = {
     threadId: routing.correlation?.threadId,
-    requesterId: routing.correlation?.requesterId,
+    actorId: routing.correlation?.actorId,
     channelId: routing.correlation?.channelId,
     runId: routing.correlation?.runId,
     ...credentialActorLogContext,
@@ -13689,7 +13958,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     const spanContext = {
       conversationId: sessionConversationId,
       slackThreadId: routing.correlation?.threadId,
-      slackUserId: routing.correlation?.requesterId,
+      slackUserId: routing.correlation?.actorId,
       slackChannelId: routing.correlation?.channelId,
       runId: routing.correlation?.runId,
       ...credentialActorLogContext,
@@ -13743,7 +14012,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       getLoadedSkillNames: () => loadedSkillNamesForResume,
       logContext: sessionRecordLogContext,
       recordActiveMcpProviders,
-      requester,
+      actor,
       runSource,
       sessionConversationId,
       sessionId,
@@ -13804,7 +14073,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       context: {
         threadId: routing.correlation?.threadId,
         channelId: routing.correlation?.channelId,
-        requesterId: routing.correlation?.requesterId,
+        actorId: routing.correlation?.actorId,
         runId: routing.correlation?.runId
       },
       currentTurnBlocks: routerBlocks,
@@ -13813,7 +14082,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     });
     setSpanAttributes({
       "gen_ai.request.model": botConfig.modelId,
-      "app.ai.reasoning_effort": thinkingSelection.thinkingLevel,
+      "gen_ai.request.reasoning.level": thinkingSelection.thinkingLevel,
       "app.ai.thinking_level_reason": thinkingSelection.reason,
       ...thinkingSelection.confidence !== void 0 ? {
         "app.ai.thinking_level_confidence": thinkingSelection.confidence
@@ -13827,7 +14096,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     setTags({
       conversationId: spanContext.conversationId,
       slackThreadId: routing.correlation?.threadId,
-      slackUserId: routing.correlation?.requesterId,
+      slackUserId: routing.correlation?.actorId,
       slackChannelId: routing.correlation?.channelId,
       runId: routing.correlation?.runId,
       ...credentialActorLogContext,
@@ -13837,7 +14106,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     const wiring = await wireAgentTools({
       abortAgent: () => agent?.abort(),
       activeSkills,
-      actorRequester: requester,
+      currentActor: actor,
       artifactStatePatch,
       availableSkills,
       configurationValues,
@@ -13879,7 +14148,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       shouldPromptAgent
     } = await assemblePrompt({
       activeMcpCatalogs: wiring.activeMcpCatalogs,
-      actorRequester: requester,
+      currentActor: actor,
       artifactState: state.artifactState,
       availableSkills,
       configurationValues,
@@ -13908,10 +14177,10 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
           if (piMessages.length === 0) {
             return;
           }
-          await runResume.requireDurableInputCheckpoint([
-            ...agent.state.messages,
-            ...piMessages
-          ]);
+          await runResume.requireDurableInputCheckpoint(
+            [...agent.state.messages, ...piMessages],
+            messages.map((message) => message.provenance)
+          );
           for (const message of piMessages) {
             agent.steer(message);
           }
@@ -14066,7 +14335,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
                     "gen_ai.operation.name": "invoke_agent",
                     "gen_ai.request.model": botConfig.modelId,
                     ...thinkingSelection ? {
-                      "app.ai.reasoning_effort": thinkingSelection.thinkingLevel
+                      "gen_ai.request.reasoning.level": thinkingSelection.thinkingLevel
                     } : {},
                     "app.ai.turn_timeout_ms": turnTimeoutBudgetMs,
                     "app.ai.turn_deadline_remaining_ms": Math.max(
@@ -14119,7 +14388,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
             );
             const outputMessages = newMessages.filter(isAssistantMessage);
             const outputMessagesAttribute = serializeGenAiAttribute(
-              conversationPrivacy !== "public" ? outputMessages.map(toGenAiMessageMetadata) : outputMessages
+              conversationPrivacy !== "public" ? outputMessages.map(toGenAiMessageMetadata) : outputMessages.map(toCanonicalOutputMessage)
             );
             const usageSummary = extractGenAiUsageSummary(
               promptResult,
@@ -14175,7 +14444,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
           ...sessionConversationId ? { "app.ai.session.conversation_id": sessionConversationId } : {},
           ...sessionId ? { "app.ai.turn.session_id": sessionId } : {},
           ...currentSliceId ? { "app.ai.turn.slice_id": currentSliceId } : {},
-          "app.ai.reasoning_effort": thinkingSelection.thinkingLevel,
+          "gen_ai.request.reasoning.level": thinkingSelection.thinkingLevel,
           ...toGenAiMessagesTraceAttributes("app.ai.input", inputMessages),
           ...inputMessagesAttribute ? { "gen_ai.input.messages": inputMessagesAttribute } : {}
         }
@@ -14233,7 +14502,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       "assistant_reply_generation_failed",
       {
         slackThreadId: routing.correlation?.threadId,
-        slackUserId: routing.correlation?.requesterId,
+        slackUserId: routing.correlation?.actorId,
         slackChannelId: routing.correlation?.channelId,
         runId: routing.correlation?.runId,
         ...credentialActorLogContext,