@sentry/junior 0.91.0 → 0.92.1

package/dist/{chunk-ZGDTBSQ7.js → chunk-56SIBIVF.js}

@@ -11,10 +11,10 @@ import {
   persistRunningSessionRecord,
   persistTimeoutSessionRecord,
   persistYieldSessionRecord
-} from "./chunk-ONFOWI2D.js";
+} from "./chunk-Z4FOYQXW.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
-} from "./chunk-KC42JAAQ.js";
+} from "./chunk-PFXC67GJ.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -23,7 +23,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-5GBUZI6M.js";
+} from "./chunk-H7KUZAMZ.js";
 import {
   JUNIOR_PERSONALITY,
   buildPluginSystemPromptContributions,
@@ -32,18 +32,18 @@ import {
   containsNoReplyMarker,
   formatSlackLink,
   isNoReplyMarker,
-  renderCurrentInstruction,
   stripNoReplyMarker
-} from "./chunk-PIB4EOW6.js";
+} from "./chunk-IWKVXO3F.js";
 import {
-  escapeXml,
+  instructionActors,
+  instructionProvenanceFor,
   loadConnectedMcpProviders,
   recordAuthorizationRequested,
   recordMcpProviderConnected,
   recordSubagentEnded,
   recordSubagentStarted,
   recordToolExecutionStarted
-} from "./chunk-GCWD2VHP.js";
+} from "./chunk-OQQU3SD6.js";
 import {
   SlackActionError,
   createPluginHookRunner,
@@ -60,10 +60,10 @@ import {
   normalizeSlackConversationId,
   resolveChannelCapabilities,
   withSlackRetries
-} from "./chunk-DACFZ5CI.js";
+} from "./chunk-7K3JALTQ.js";
 import {
   createPluginLogger
-} from "./chunk-NW7AXDA5.js";
+} from "./chunk-OZJXGX4U.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -74,11 +74,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 +87,7 @@ import {
   botConfig,
   completeObject,
   completeText,
+  escapeXml,
   extractAssistantText,
   getGatewayApiKey,
   getPiGatewayApiKey,
@@ -99,19 +100,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 +124,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 +150,7 @@ import {
   setTags,
   summarizeMessageText,
   withSpan
-} from "./chunk-ZUK7BL63.js";
+} from "./chunk-S6QKIGRM.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -465,7 +470,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 +491,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 +680,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 +693,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 +702,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 +730,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 +753,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 +763,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 +936,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 +959,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 +1074,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) {
@@ -1571,7 +1581,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;
@@ -1739,7 +1749,7 @@ ${usage}
       const entry = await configuration.set({
         key,
         value,
-        updatedBy: deps.requesterId,
+        updatedBy: deps.actorId,
         source: "jr-rpc"
       });
       logInfo(
@@ -3790,6 +3800,22 @@ function createListDirTool() {
 // src/chat/tools/web/image-generate.ts
 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>
@@ -3852,7 +3878,7 @@ function createImageGenerateTool(hooks, options = {}, deps = {}) {
     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();
@@ -3980,7 +4006,7 @@ function createCallMcpToolTool(mcpToolManager) {
     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: z10.object({
       tool_name: z10.string().min(1).describe("Exact MCP tool_name from searchMcpTools."),
-      arguments: z10.unknown().describe(
+      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(),
@@ -4219,6 +4245,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();
 }
@@ -4346,7 +4404,7 @@ function createSearchMcpToolsTool(mcpToolManager) {
       ).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);
@@ -4368,6 +4426,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)
       };
@@ -5965,6 +6030,17 @@ var editReplacementSchema2 = z22.object({
   ),
   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.",
@@ -5976,7 +6052,7 @@ function createSlackCanvasEditTool(state) {
         "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) {
@@ -6051,6 +6127,18 @@ function createSlackCanvasEditTool(state) {
 
 // src/chat/slack/tools/canvas/read.ts
 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.",
@@ -6062,7 +6150,7 @@ function createSlackCanvasReadTool() {
       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) {
@@ -7362,15 +7450,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}`,
@@ -7421,7 +7505,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 } : {},
@@ -8516,7 +8600,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:
@@ -8586,421 +8670,151 @@ import { PluginToolInputError } from "@sentry/junior-plugin-api";
 // src/chat/services/plugin-auth-orchestration.ts
 import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS2 } from "chat";
 
-// src/chat/mcp/auth-store.ts
+// src/chat/oauth-flow.ts
+import { randomBytes } from "crypto";
 import {
   sourceSchema
 } from "@sentry/junior-plugin-api";
-var MCP_AUTH_SESSION_PREFIX = "junior:mcp_auth_session";
-var MCP_AUTH_CREDENTIALS_PREFIX = "junior:mcp_auth_credentials";
-var MCP_AUTH_SESSION_INDEX_PREFIX = "junior:mcp_auth_session_index";
-var MCP_SERVER_SESSION_PREFIX = "junior:mcp_server_session";
-var MCP_AUTH_SESSION_TTL_MS = 24 * 60 * 60 * 1e3;
-var MCP_AUTH_CREDENTIALS_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
-var MCP_SERVER_SESSION_TTL_MS = 24 * 60 * 60 * 1e3;
-function sessionKey(authSessionId) {
-  return `${MCP_AUTH_SESSION_PREFIX}:${authSessionId}`;
-}
-function credentialsKey(userId, provider) {
-  return `${MCP_AUTH_CREDENTIALS_PREFIX}:${userId}:${provider}`;
-}
-function sessionIndexKey(userId, provider) {
-  return `${MCP_AUTH_SESSION_INDEX_PREFIX}:${userId}:${provider}`;
+
+// src/chat/oauth-authorization-message.ts
+function formatOAuthAuthorizationMessage(args) {
+  return `${formatSlackLink(args.authorizationUrl, args.label)}. ${args.completionText}`;
 }
-function serverSessionKey(userId, provider) {
-  return `${MCP_SERVER_SESSION_PREFIX}:${userId}:${provider}`;
+
+// src/chat/oauth-flow.ts
+var OAUTH_STATE_TTL_MS = 10 * 60 * 1e3;
+function optionalString(value) {
+  return typeof value === "string" ? value : void 0;
 }
-function parseSessionIndex(value) {
-  if (typeof value !== "string") {
-    return [];
+function parseOAuthStatePayload(value) {
+  if (!isRecord(value)) {
+    return void 0;
   }
-  try {
-    const parsed = JSON.parse(value);
-    if (!Array.isArray(parsed)) {
-      return [];
-    }
-    return [
-      ...new Set(parsed.filter((id) => typeof id === "string"))
-    ];
-  } catch {
-    return [];
+  if (typeof value.userId !== "string" || typeof value.provider !== "string") {
+    return void 0;
   }
-}
-function parseMcpAuthSession(value) {
-  if (typeof value !== "string") {
+  const destination = parseDestination(value.destination);
+  if (value.destination !== void 0 && !destination) {
     return void 0;
   }
-  try {
-    const parsed = JSON.parse(value);
-    if (!isRecord(parsed)) {
-      return void 0;
-    }
-    if (typeof parsed.authSessionId !== "string" || typeof parsed.provider !== "string" || typeof parsed.userId !== "string" || typeof parsed.conversationId !== "string" || typeof parsed.sessionId !== "string" || typeof parsed.userMessage !== "string" || typeof parsed.createdAtMs !== "number" || typeof parsed.updatedAtMs !== "number") {
-      return void 0;
-    }
-    const destination = parsed.destination === void 0 ? void 0 : parseDestination(parsed.destination);
-    if (parsed.destination !== void 0 && !destination) {
-      return void 0;
-    }
-    const source = parsed.source === void 0 ? void 0 : sourceSchema.safeParse(parsed.source);
-    if (parsed.source !== void 0 && (!source || !source.success)) {
-      return void 0;
-    }
-    return {
-      authSessionId: parsed.authSessionId,
-      provider: parsed.provider,
-      userId: parsed.userId,
-      conversationId: parsed.conversationId,
-      ...destination ? { destination } : {},
-      ...source?.success ? { source: source.data } : {},
-      sessionId: parsed.sessionId,
-      userMessage: parsed.userMessage,
-      createdAtMs: parsed.createdAtMs,
-      updatedAtMs: parsed.updatedAtMs,
-      ...typeof parsed.channelId === "string" ? { channelId: parsed.channelId } : {},
-      ...typeof parsed.threadTs === "string" ? { threadTs: parsed.threadTs } : {},
-      ...typeof parsed.toolChannelId === "string" ? { toolChannelId: parsed.toolChannelId } : {},
-      ...isRecord(parsed.configuration) ? { configuration: parsed.configuration } : {},
-      ...isRecord(parsed.artifactState) ? { artifactState: parsed.artifactState } : {},
-      ...typeof parsed.authorizationUrl === "string" ? { authorizationUrl: parsed.authorizationUrl } : {},
-      ...typeof parsed.codeVerifier === "string" ? { codeVerifier: parsed.codeVerifier } : {}
-    };
-  } catch {
+  const source = value.source === void 0 ? void 0 : sourceSchema.safeParse(value.source);
+  if (value.source !== void 0 && (!source || !source.success)) {
     return void 0;
   }
-}
-function parseServerSession(value) {
-  if (typeof value !== "string") {
+  const pendingMessage = optionalString(value.pendingMessage);
+  if (pendingMessage && !source?.success) {
     return void 0;
   }
+  return {
+    userId: value.userId,
+    provider: value.provider,
+    ...optionalString(value.channelId) ? { channelId: optionalString(value.channelId) } : {},
+    ...destination ? { destination } : {},
+    ...source?.success ? { source: source.data } : {},
+    ...optionalString(value.threadTs) ? { threadTs: optionalString(value.threadTs) } : {},
+    ...pendingMessage ? { pendingMessage } : {},
+    ...isRecord(value.configuration) ? { configuration: value.configuration } : {},
+    ...optionalString(value.resumeConversationId) ? { resumeConversationId: optionalString(value.resumeConversationId) } : {},
+    ...optionalString(value.resumeSessionId) ? { resumeSessionId: optionalString(value.resumeSessionId) } : {},
+    ...optionalString(value.scope) ? { scope: optionalString(value.scope) } : {}
+  };
+}
+function formatProviderLabel(provider) {
+  const displayName = pluginCatalogRuntime.getDisplayName(provider);
+  if (!displayName) {
+    throw new Error(`Unknown plugin provider display name: "${provider}"`);
+  }
+  return displayName;
+}
+function resolveBaseUrl() {
+  const explicit = process.env.JUNIOR_BASE_URL?.trim();
+  if (explicit) return explicit;
+  const vercelProd = process.env.VERCEL_PROJECT_PRODUCTION_URL?.trim();
+  if (vercelProd) return `https://${vercelProd}`;
+  const vercelUrl = process.env.VERCEL_URL?.trim();
+  if (vercelUrl) return `https://${vercelUrl}`;
+  return void 0;
+}
+async function deliverPrivateMessage(input) {
+  let client;
   try {
-    const parsed = JSON.parse(value);
-    if (!isRecord(parsed) || typeof parsed.sessionId !== "string" || typeof parsed.updatedAtMs !== "number") {
-      return void 0;
-    }
-    return {
-      sessionId: parsed.sessionId,
-      updatedAtMs: parsed.updatedAtMs
-    };
+    client = getSlackClient();
   } catch {
-    return void 0;
+    logWarn(
+      "oauth_private_delivery_skip",
+      {},
+      { "app.reason": "missing_bot_token" },
+      "Skipped private message delivery \u2014 no SLACK_BOT_TOKEN"
+    );
+    return false;
   }
-}
-function parseStoredCredentials(value) {
-  if (typeof value !== "string") {
-    return void 0;
+  if (input.channelId) {
+    try {
+      if (isDmChannel(input.channelId)) {
+        await postSlackMessage({
+          channelId: input.channelId,
+          text: input.text,
+          threadTs: input.threadTs
+        });
+      } else {
+        await postSlackEphemeralMessage({
+          channelId: input.channelId,
+          userId: input.userId,
+          text: input.text,
+          threadTs: input.threadTs
+        });
+      }
+      return "in_context";
+    } catch (error) {
+      logWarn(
+        "oauth_private_delivery_failed",
+        {},
+        {
+          "app.slack.error": error instanceof Error ? error.message : String(error),
+          "app.slack.channel": input.channelId
+        },
+        "Private message delivery failed, falling back to DM"
+      );
+    }
   }
   try {
-    const parsed = JSON.parse(value);
-    if (!isRecord(parsed)) {
-      return void 0;
+    const dmChannelId = (await withSlackRetries(
+      () => client.conversations.open({ users: input.userId }),
+      3,
+      {
+        action: "conversations.open",
+        spanAttributes: { "app.slack.user_id": input.userId }
+      }
+    )).channel?.id;
+    if (!dmChannelId) {
+      logWarn(
+        "oauth_dm_fallback_failed",
+        {},
+        { "app.reason": "no_dm_channel_id" },
+        "conversations.open returned no channel ID"
+      );
+      return false;
     }
+    await postSlackMessage({ channelId: dmChannelId, text: input.text });
+    return "fallback_dm";
+  } catch (error) {
+    logWarn(
+      "oauth_dm_fallback_failed",
+      {},
+      {
+        "app.slack.error": error instanceof Error ? error.message : String(error)
+      },
+      "DM fallback delivery failed"
+    );
+    return false;
+  }
+}
+async function startOAuthFlow(provider, input) {
+  const providerConfig = pluginCatalogRuntime.getOAuthConfig(provider);
+  if (!providerConfig) {
     return {
-      ...isRecord(parsed.clientInformation) ? {
-        clientInformation: parsed.clientInformation
-      } : {},
-      ...isRecord(parsed.discoveryState) ? {
-        discoveryState: parsed.discoveryState
-      } : {},
-      ...isRecord(parsed.tokens) ? { tokens: parsed.tokens } : {}
-    };
-  } catch {
-    return void 0;
-  }
-}
-async function getConnectedStateAdapter() {
-  const stateAdapter = getStateAdapter();
-  await stateAdapter.connect();
-  return stateAdapter;
-}
-async function getMcpAuthSession(authSessionId) {
-  const stateAdapter = await getConnectedStateAdapter();
-  return parseMcpAuthSession(await stateAdapter.get(sessionKey(authSessionId)));
-}
-async function putMcpAuthSession(session, ttlMs2 = MCP_AUTH_SESSION_TTL_MS) {
-  const stateAdapter = await getConnectedStateAdapter();
-  await stateAdapter.set(
-    sessionKey(session.authSessionId),
-    JSON.stringify(session),
-    ttlMs2
-  );
-  const nextIndex = parseSessionIndex(
-    await stateAdapter.get(sessionIndexKey(session.userId, session.provider))
-  );
-  if (!nextIndex.includes(session.authSessionId)) {
-    nextIndex.push(session.authSessionId);
-  }
-  await stateAdapter.set(
-    sessionIndexKey(session.userId, session.provider),
-    JSON.stringify(nextIndex),
-    ttlMs2
-  );
-}
-async function patchMcpAuthSession(authSessionId, patch) {
-  const current = await getMcpAuthSession(authSessionId);
-  if (!current) {
-    throw new Error(`Unknown MCP auth session: ${authSessionId}`);
-  }
-  const next = {
-    ...current,
-    ...patch,
-    authSessionId: current.authSessionId,
-    provider: current.provider,
-    userId: current.userId,
-    conversationId: current.conversationId,
-    ...current.destination ? { destination: current.destination } : {},
-    sessionId: current.sessionId,
-    userMessage: current.userMessage,
-    createdAtMs: current.createdAtMs,
-    updatedAtMs: Date.now()
-  };
-  await putMcpAuthSession(next);
-  return next;
-}
-async function deleteMcpAuthSession(authSessionId) {
-  const stateAdapter = await getConnectedStateAdapter();
-  const current = parseMcpAuthSession(
-    await stateAdapter.get(sessionKey(authSessionId))
-  );
-  await stateAdapter.delete(sessionKey(authSessionId));
-  if (!current) {
-    return;
-  }
-  const nextIndex = parseSessionIndex(
-    await stateAdapter.get(sessionIndexKey(current.userId, current.provider))
-  ).filter((id) => id !== authSessionId);
-  if (nextIndex.length > 0) {
-    await stateAdapter.set(
-      sessionIndexKey(current.userId, current.provider),
-      JSON.stringify(nextIndex),
-      MCP_AUTH_SESSION_TTL_MS
-    );
-    return;
-  }
-  await stateAdapter.delete(sessionIndexKey(current.userId, current.provider));
-}
-async function deleteMcpAuthSessionsForUserProvider(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  const indexKey = sessionIndexKey(userId, provider);
-  const authSessionIds = parseSessionIndex(await stateAdapter.get(indexKey));
-  for (const authSessionId of authSessionIds) {
-    await stateAdapter.delete(sessionKey(authSessionId));
-  }
-  await stateAdapter.delete(indexKey);
-}
-async function getLatestMcpAuthSessionForUserProvider(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  const authSessionIds = parseSessionIndex(
-    await stateAdapter.get(sessionIndexKey(userId, provider))
-  );
-  let latestSession;
-  for (const authSessionId of authSessionIds) {
-    const session = parseMcpAuthSession(
-      await stateAdapter.get(sessionKey(authSessionId))
-    );
-    if (!session) {
-      continue;
-    }
-    if (!latestSession || session.updatedAtMs > latestSession.updatedAtMs) {
-      latestSession = session;
-    }
-  }
-  return latestSession;
-}
-async function getMcpStoredOAuthCredentials(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  return parseStoredCredentials(
-    await stateAdapter.get(credentialsKey(userId, provider))
-  );
-}
-async function putMcpStoredOAuthCredentials(userId, provider, value, ttlMs2 = MCP_AUTH_CREDENTIALS_TTL_MS) {
-  const stateAdapter = await getConnectedStateAdapter();
-  await stateAdapter.set(
-    credentialsKey(userId, provider),
-    JSON.stringify(value),
-    ttlMs2
-  );
-}
-async function deleteMcpStoredOAuthCredentials(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  await stateAdapter.delete(credentialsKey(userId, provider));
-}
-async function getMcpServerSessionId(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  return parseServerSession(
-    await stateAdapter.get(serverSessionKey(userId, provider))
-  )?.sessionId;
-}
-async function putMcpServerSessionId(userId, provider, sessionId, ttlMs2 = MCP_SERVER_SESSION_TTL_MS) {
-  const stateAdapter = await getConnectedStateAdapter();
-  await stateAdapter.set(
-    serverSessionKey(userId, provider),
-    JSON.stringify({
-      sessionId,
-      updatedAtMs: Date.now()
-    }),
-    ttlMs2
-  );
-}
-async function deleteMcpServerSessionId(userId, provider) {
-  const stateAdapter = await getConnectedStateAdapter();
-  await stateAdapter.delete(serverSessionKey(userId, provider));
-}
-
-// src/chat/credentials/unlink-provider.ts
-async function unlinkProvider(userId, provider, userTokenStore) {
-  await Promise.all([
-    userTokenStore.delete(userId, provider),
-    deleteMcpStoredOAuthCredentials(userId, provider),
-    deleteMcpServerSessionId(userId, provider),
-    deleteMcpAuthSessionsForUserProvider(userId, provider)
-  ]);
-}
-
-// src/chat/oauth-flow.ts
-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;
-}
-function parseOAuthStatePayload(value) {
-  if (!isRecord(value)) {
-    return void 0;
-  }
-  if (typeof value.userId !== "string" || typeof value.provider !== "string") {
-    return void 0;
-  }
-  const destination = parseDestination(value.destination);
-  if (value.destination !== void 0 && !destination) {
-    return void 0;
-  }
-  const source = value.source === void 0 ? void 0 : sourceSchema2.safeParse(value.source);
-  if (value.source !== void 0 && (!source || !source.success)) {
-    return void 0;
-  }
-  const pendingMessage = optionalString(value.pendingMessage);
-  if (pendingMessage && !source?.success) {
-    return void 0;
-  }
-  return {
-    userId: value.userId,
-    provider: value.provider,
-    ...optionalString(value.channelId) ? { channelId: optionalString(value.channelId) } : {},
-    ...destination ? { destination } : {},
-    ...source?.success ? { source: source.data } : {},
-    ...optionalString(value.threadTs) ? { threadTs: optionalString(value.threadTs) } : {},
-    ...pendingMessage ? { pendingMessage } : {},
-    ...isRecord(value.configuration) ? { configuration: value.configuration } : {},
-    ...optionalString(value.resumeConversationId) ? { resumeConversationId: optionalString(value.resumeConversationId) } : {},
-    ...optionalString(value.resumeSessionId) ? { resumeSessionId: optionalString(value.resumeSessionId) } : {},
-    ...optionalString(value.scope) ? { scope: optionalString(value.scope) } : {}
-  };
-}
-function formatProviderLabel(provider) {
-  const displayName = pluginCatalogRuntime.getDisplayName(provider);
-  if (!displayName) {
-    throw new Error(`Unknown plugin provider display name: "${provider}"`);
-  }
-  return displayName;
-}
-function resolveBaseUrl() {
-  const explicit = process.env.JUNIOR_BASE_URL?.trim();
-  if (explicit) return explicit;
-  const vercelProd = process.env.VERCEL_PROJECT_PRODUCTION_URL?.trim();
-  if (vercelProd) return `https://${vercelProd}`;
-  const vercelUrl = process.env.VERCEL_URL?.trim();
-  if (vercelUrl) return `https://${vercelUrl}`;
-  return void 0;
-}
-async function deliverPrivateMessage(input) {
-  let client;
-  try {
-    client = getSlackClient();
-  } catch {
-    logWarn(
-      "oauth_private_delivery_skip",
-      {},
-      { "app.reason": "missing_bot_token" },
-      "Skipped private message delivery \u2014 no SLACK_BOT_TOKEN"
-    );
-    return false;
-  }
-  if (input.channelId) {
-    try {
-      if (isDmChannel(input.channelId)) {
-        await postSlackMessage({
-          channelId: input.channelId,
-          text: input.text,
-          threadTs: input.threadTs
-        });
-      } else {
-        await postSlackEphemeralMessage({
-          channelId: input.channelId,
-          userId: input.userId,
-          text: input.text,
-          threadTs: input.threadTs
-        });
-      }
-      return "in_context";
-    } catch (error) {
-      logWarn(
-        "oauth_private_delivery_failed",
-        {},
-        {
-          "app.slack.error": error instanceof Error ? error.message : String(error),
-          "app.slack.channel": input.channelId
-        },
-        "Private message delivery failed, falling back to DM"
-      );
-    }
-  }
-  try {
-    const dmChannelId = (await withSlackRetries(
-      () => client.conversations.open({ users: input.userId }),
-      3,
-      {
-        action: "conversations.open",
-        spanAttributes: { "app.slack.user_id": input.userId }
-      }
-    )).channel?.id;
-    if (!dmChannelId) {
-      logWarn(
-        "oauth_dm_fallback_failed",
-        {},
-        { "app.reason": "no_dm_channel_id" },
-        "conversations.open returned no channel ID"
-      );
-      return false;
-    }
-    await postSlackMessage({ channelId: dmChannelId, text: input.text });
-    return "fallback_dm";
-  } catch (error) {
-    logWarn(
-      "oauth_dm_fallback_failed",
-      {},
-      {
-        "app.slack.error": error instanceof Error ? error.message : String(error)
-      },
-      "DM fallback delivery failed"
-    );
-    return false;
-  }
-}
-async function startOAuthFlow(provider, input) {
-  const providerConfig = pluginCatalogRuntime.getOAuthConfig(provider);
-  if (!providerConfig) {
-    return {
-      ok: false,
-      error: `Provider "${provider}" does not support OAuth authorization`
+      ok: false,
+      error: `Provider "${provider}" does not support OAuth authorization`
     };
   }
   const clientId = process.env[providerConfig.clientIdEnv]?.trim();
@@ -9023,7 +8837,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 } : {},
@@ -9066,7 +8880,7 @@ async function startOAuthFlow(provider, input) {
     delivery: await deliverPrivateMessage({
       channelId: input.channelId,
       threadTs: input.threadTs,
-      userId: input.requesterId,
+      userId: input.actorId,
       text: formatOAuthAuthorizationMessage({
         authorizationUrl,
         label: `Click here to link your ${formatProviderLabel(provider)} account`,
@@ -9181,7 +8995,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") {
@@ -9198,13 +9012,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,
@@ -9224,14 +9038,11 @@ function createPluginAuthOrchestration(input) {
         );
       }
     }
-    if (options?.unlinkExistingProvider && input.requesterId && input.userTokenStore) {
-      await unlinkProvider(input.requesterId, 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()
@@ -9242,7 +9053,7 @@ function createPluginAuthOrchestration(input) {
         conversationId: input.conversationId,
         kind: "plugin",
         provider,
-        requesterId: input.requesterId,
+        actorId: input.actorId,
         authorizationId: authorizationId({
           kind: "plugin",
           provider,
@@ -9279,7 +9090,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);
         }
@@ -9294,10 +9105,10 @@ function createPluginAuthOrchestration(input) {
           signal.message ?? `${formatProviderLabel(provider)} credentials are required but the provider is not configured for OAuth.`
         );
       }
-      await startAuthorizationPause(authorization.provider, {
-        ...authorization.scope ? { scope: authorization.scope } : {},
-        unlinkExistingProvider: true
-      });
+      await startAuthorizationPause(
+        authorization.provider,
+        authorization.scope ? { scope: authorization.scope } : void 0
+      );
     },
     getPendingPause: () => pendingPause
   };
@@ -9438,9 +9249,50 @@ 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);
@@ -9455,6 +9307,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 ?? [],
@@ -9463,15 +9317,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);
@@ -9482,17 +9337,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,
+    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: definition.description,
+    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
@@ -9502,27 +9468,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: z39.object({
       query: z39.string().nullable().describe(
         "Optional search terms describing the tool, owner, action, or arguments needed. Empty string lists catalog tools."
       ).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,
@@ -9734,7 +9728,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) {
@@ -11439,132 +11433,392 @@ function createSandboxExecutor(options) {
     );
     return { result };
   };
-  const executeFindFilesTool = async (rawInput) => {
-    const pattern = String(rawInput.pattern ?? "");
-    if (!pattern) {
-      throw new ToolInputError("pattern is required");
-    }
-    logSandboxBootRequest("tool.findFiles");
-    const limit = positiveInteger(rawInput.limit);
-    const executors = await sessionManager.ensureToolExecutors();
-    const result = await withSandboxToolSpan(
-      "sandbox.findFiles",
-      "sandbox.fs.find",
-      {
-        "app.sandbox.pattern.length": pattern.length
-      },
-      async () => {
-        const response = await findFiles({
-          fs: executors.fs,
-          pattern,
-          ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
-          ...limit ? { limit } : {}
-        });
-        setSpanStatus("ok");
-        return response;
-      }
+  const executeFindFilesTool = async (rawInput) => {
+    const pattern = String(rawInput.pattern ?? "");
+    if (!pattern) {
+      throw new ToolInputError("pattern is required");
+    }
+    logSandboxBootRequest("tool.findFiles");
+    const limit = positiveInteger(rawInput.limit);
+    const executors = await sessionManager.ensureToolExecutors();
+    const result = await withSandboxToolSpan(
+      "sandbox.findFiles",
+      "sandbox.fs.find",
+      {
+        "app.sandbox.pattern.length": pattern.length
+      },
+      async () => {
+        const response = await findFiles({
+          fs: executors.fs,
+          pattern,
+          ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
+          ...limit ? { limit } : {}
+        });
+        setSpanStatus("ok");
+        return response;
+      }
+    );
+    return { result };
+  };
+  const executeListDirTool = async (rawInput) => {
+    logSandboxBootRequest("tool.listDir");
+    const limit = positiveInteger(rawInput.limit);
+    const executors = await sessionManager.ensureToolExecutors();
+    const result = await withSandboxToolSpan(
+      "sandbox.listDir",
+      "sandbox.fs.list",
+      {},
+      async () => {
+        const response = await listDir({
+          fs: executors.fs,
+          ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
+          ...limit ? { limit } : {}
+        });
+        setSpanStatus("ok");
+        return response;
+      }
+    );
+    return { result };
+  };
+  const execute = async (params) => {
+    const rawInput = params.input ?? {};
+    const bashCommand = params.toolName === "bash" ? String(rawInput.command ?? "").trim() : void 0;
+    if (params.toolName === "bash") {
+      if (!bashCommand) {
+        throw new ToolInputError("command is required");
+      }
+      if (options?.runBashCustomCommand) {
+        const custom = await options.runBashCustomCommand(bashCommand);
+        if (custom.handled) {
+          if (!custom.result) {
+            throw new Error("Custom bash command handler returned no result.");
+          }
+          return { result: bashToolResult(custom.result) };
+        }
+      }
+      return await executeBashTool(rawInput, bashCommand, params.signal);
+    }
+    try {
+      if (params.toolName === "readFile") {
+        return await executeReadFileTool(rawInput);
+      }
+      if (params.toolName === "editFile") {
+        return await executeEditFileTool(rawInput);
+      }
+      if (params.toolName === "grep") {
+        return await executeGrepTool(rawInput);
+      }
+      if (params.toolName === "findFiles") {
+        return await executeFindFilesTool(rawInput);
+      }
+      if (params.toolName === "listDir") {
+        return await executeListDirTool(rawInput);
+      }
+      if (params.toolName === "writeFile") {
+        return await executeWriteFileTool(rawInput);
+      }
+    } catch (error) {
+      if (!isSandboxCommandStreamInterruptedError(error)) {
+        throw error;
+      }
+      return { result: sandboxStreamInterruptedResult(params.toolName) };
+    }
+    throw new Error(`unsupported sandbox tool: ${params.toolName}`);
+  };
+  return {
+    configureSkills(skills) {
+      availableSkills = [...skills];
+      sessionManager.configureSkills(skills);
+    },
+    configureReferenceFiles(files) {
+      referenceFiles = [...files];
+      sessionManager.configureReferenceFiles(files);
+    },
+    getSandboxId() {
+      return sessionManager.getSandboxId();
+    },
+    getDependencyProfileHash() {
+      return sessionManager.getDependencyProfileHash();
+    },
+    canExecute(toolName) {
+      return SANDBOX_TOOL_NAMES.has(toolName);
+    },
+    async createSandbox() {
+      return await sessionManager.createSandbox();
+    },
+    execute,
+    async dispose() {
+      await sessionManager.dispose();
+    }
+  };
+}
+
+// src/chat/services/mcp-auth-orchestration.ts
+import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS3 } from "chat";
+
+// src/chat/mcp/oauth.ts
+import { randomUUID as randomUUID3 } from "crypto";
+import { StreamableHTTPClientTransport as StreamableHTTPClientTransport2 } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+
+// src/chat/mcp/auth-store.ts
+import {
+  sourceSchema as sourceSchema2
+} from "@sentry/junior-plugin-api";
+var MCP_AUTH_SESSION_PREFIX = "junior:mcp_auth_session";
+var MCP_AUTH_CREDENTIALS_PREFIX = "junior:mcp_auth_credentials";
+var MCP_AUTH_SESSION_INDEX_PREFIX = "junior:mcp_auth_session_index";
+var MCP_SERVER_SESSION_PREFIX = "junior:mcp_server_session";
+var MCP_AUTH_SESSION_TTL_MS = 24 * 60 * 60 * 1e3;
+var MCP_AUTH_CREDENTIALS_TTL_MS = 30 * 24 * 60 * 60 * 1e3;
+var MCP_SERVER_SESSION_TTL_MS = 24 * 60 * 60 * 1e3;
+function sessionKey(authSessionId) {
+  return `${MCP_AUTH_SESSION_PREFIX}:${authSessionId}`;
+}
+function credentialsKey(userId, provider) {
+  return `${MCP_AUTH_CREDENTIALS_PREFIX}:${userId}:${provider}`;
+}
+function sessionIndexKey(userId, provider) {
+  return `${MCP_AUTH_SESSION_INDEX_PREFIX}:${userId}:${provider}`;
+}
+function serverSessionKey(userId, provider) {
+  return `${MCP_SERVER_SESSION_PREFIX}:${userId}:${provider}`;
+}
+function parseSessionIndex(value) {
+  if (typeof value !== "string") {
+    return [];
+  }
+  try {
+    const parsed = JSON.parse(value);
+    if (!Array.isArray(parsed)) {
+      return [];
+    }
+    return [
+      ...new Set(parsed.filter((id) => typeof id === "string"))
+    ];
+  } catch {
+    return [];
+  }
+}
+function parseMcpAuthSession(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(value);
+    if (!isRecord(parsed)) {
+      return void 0;
+    }
+    if (typeof parsed.authSessionId !== "string" || typeof parsed.provider !== "string" || typeof parsed.userId !== "string" || typeof parsed.conversationId !== "string" || typeof parsed.sessionId !== "string" || typeof parsed.userMessage !== "string" || typeof parsed.createdAtMs !== "number" || typeof parsed.updatedAtMs !== "number") {
+      return void 0;
+    }
+    const destination = parsed.destination === void 0 ? void 0 : parseDestination(parsed.destination);
+    if (parsed.destination !== void 0 && !destination) {
+      return void 0;
+    }
+    const source = parsed.source === void 0 ? void 0 : sourceSchema2.safeParse(parsed.source);
+    if (parsed.source !== void 0 && (!source || !source.success)) {
+      return void 0;
+    }
+    return {
+      authSessionId: parsed.authSessionId,
+      provider: parsed.provider,
+      userId: parsed.userId,
+      conversationId: parsed.conversationId,
+      ...destination ? { destination } : {},
+      ...source?.success ? { source: source.data } : {},
+      sessionId: parsed.sessionId,
+      userMessage: parsed.userMessage,
+      createdAtMs: parsed.createdAtMs,
+      updatedAtMs: parsed.updatedAtMs,
+      ...typeof parsed.channelId === "string" ? { channelId: parsed.channelId } : {},
+      ...typeof parsed.threadTs === "string" ? { threadTs: parsed.threadTs } : {},
+      ...typeof parsed.toolChannelId === "string" ? { toolChannelId: parsed.toolChannelId } : {},
+      ...isRecord(parsed.configuration) ? { configuration: parsed.configuration } : {},
+      ...isRecord(parsed.artifactState) ? { artifactState: parsed.artifactState } : {},
+      ...typeof parsed.authorizationUrl === "string" ? { authorizationUrl: parsed.authorizationUrl } : {},
+      ...typeof parsed.codeVerifier === "string" ? { codeVerifier: parsed.codeVerifier } : {}
+    };
+  } catch {
+    return void 0;
+  }
+}
+function parseServerSession(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(value);
+    if (!isRecord(parsed) || typeof parsed.sessionId !== "string" || typeof parsed.updatedAtMs !== "number") {
+      return void 0;
+    }
+    return {
+      sessionId: parsed.sessionId,
+      updatedAtMs: parsed.updatedAtMs
+    };
+  } catch {
+    return void 0;
+  }
+}
+function parseStoredCredentials(value) {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  try {
+    const parsed = JSON.parse(value);
+    if (!isRecord(parsed)) {
+      return void 0;
+    }
+    return {
+      ...isRecord(parsed.clientInformation) ? {
+        clientInformation: parsed.clientInformation
+      } : {},
+      ...isRecord(parsed.discoveryState) ? {
+        discoveryState: parsed.discoveryState
+      } : {},
+      ...isRecord(parsed.tokens) ? { tokens: parsed.tokens } : {}
+    };
+  } catch {
+    return void 0;
+  }
+}
+async function getConnectedStateAdapter() {
+  const stateAdapter = getStateAdapter();
+  await stateAdapter.connect();
+  return stateAdapter;
+}
+async function getMcpAuthSession(authSessionId) {
+  const stateAdapter = await getConnectedStateAdapter();
+  return parseMcpAuthSession(await stateAdapter.get(sessionKey(authSessionId)));
+}
+async function putMcpAuthSession(session, ttlMs2 = MCP_AUTH_SESSION_TTL_MS) {
+  const stateAdapter = await getConnectedStateAdapter();
+  await stateAdapter.set(
+    sessionKey(session.authSessionId),
+    JSON.stringify(session),
+    ttlMs2
+  );
+  const nextIndex = parseSessionIndex(
+    await stateAdapter.get(sessionIndexKey(session.userId, session.provider))
+  );
+  if (!nextIndex.includes(session.authSessionId)) {
+    nextIndex.push(session.authSessionId);
+  }
+  await stateAdapter.set(
+    sessionIndexKey(session.userId, session.provider),
+    JSON.stringify(nextIndex),
+    ttlMs2
+  );
+}
+async function patchMcpAuthSession(authSessionId, patch) {
+  const current = await getMcpAuthSession(authSessionId);
+  if (!current) {
+    throw new Error(`Unknown MCP auth session: ${authSessionId}`);
+  }
+  const next = {
+    ...current,
+    ...patch,
+    authSessionId: current.authSessionId,
+    provider: current.provider,
+    userId: current.userId,
+    conversationId: current.conversationId,
+    ...current.destination ? { destination: current.destination } : {},
+    sessionId: current.sessionId,
+    userMessage: current.userMessage,
+    createdAtMs: current.createdAtMs,
+    updatedAtMs: Date.now()
+  };
+  await putMcpAuthSession(next);
+  return next;
+}
+async function deleteMcpAuthSession(authSessionId) {
+  const stateAdapter = await getConnectedStateAdapter();
+  const current = parseMcpAuthSession(
+    await stateAdapter.get(sessionKey(authSessionId))
+  );
+  await stateAdapter.delete(sessionKey(authSessionId));
+  if (!current) {
+    return;
+  }
+  const nextIndex = parseSessionIndex(
+    await stateAdapter.get(sessionIndexKey(current.userId, current.provider))
+  ).filter((id) => id !== authSessionId);
+  if (nextIndex.length > 0) {
+    await stateAdapter.set(
+      sessionIndexKey(current.userId, current.provider),
+      JSON.stringify(nextIndex),
+      MCP_AUTH_SESSION_TTL_MS
     );
-    return { result };
-  };
-  const executeListDirTool = async (rawInput) => {
-    logSandboxBootRequest("tool.listDir");
-    const limit = positiveInteger(rawInput.limit);
-    const executors = await sessionManager.ensureToolExecutors();
-    const result = await withSandboxToolSpan(
-      "sandbox.listDir",
-      "sandbox.fs.list",
-      {},
-      async () => {
-        const response = await listDir({
-          fs: executors.fs,
-          ...typeof rawInput.path === "string" ? { path: rawInput.path } : {},
-          ...limit ? { limit } : {}
-        });
-        setSpanStatus("ok");
-        return response;
-      }
+    return;
+  }
+  await stateAdapter.delete(sessionIndexKey(current.userId, current.provider));
+}
+async function deleteMcpAuthSessionsForUserProvider(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  const indexKey = sessionIndexKey(userId, provider);
+  const authSessionIds = parseSessionIndex(await stateAdapter.get(indexKey));
+  for (const authSessionId of authSessionIds) {
+    await stateAdapter.delete(sessionKey(authSessionId));
+  }
+  await stateAdapter.delete(indexKey);
+}
+async function getLatestMcpAuthSessionForUserProvider(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  const authSessionIds = parseSessionIndex(
+    await stateAdapter.get(sessionIndexKey(userId, provider))
+  );
+  let latestSession;
+  for (const authSessionId of authSessionIds) {
+    const session = parseMcpAuthSession(
+      await stateAdapter.get(sessionKey(authSessionId))
     );
-    return { result };
-  };
-  const execute = async (params) => {
-    const rawInput = params.input ?? {};
-    const bashCommand = params.toolName === "bash" ? String(rawInput.command ?? "").trim() : void 0;
-    if (params.toolName === "bash") {
-      if (!bashCommand) {
-        throw new ToolInputError("command is required");
-      }
-      if (options?.runBashCustomCommand) {
-        const custom = await options.runBashCustomCommand(bashCommand);
-        if (custom.handled) {
-          if (!custom.result) {
-            throw new Error("Custom bash command handler returned no result.");
-          }
-          return { result: bashToolResult(custom.result) };
-        }
-      }
-      return await executeBashTool(rawInput, bashCommand, params.signal);
-    }
-    try {
-      if (params.toolName === "readFile") {
-        return await executeReadFileTool(rawInput);
-      }
-      if (params.toolName === "editFile") {
-        return await executeEditFileTool(rawInput);
-      }
-      if (params.toolName === "grep") {
-        return await executeGrepTool(rawInput);
-      }
-      if (params.toolName === "findFiles") {
-        return await executeFindFilesTool(rawInput);
-      }
-      if (params.toolName === "listDir") {
-        return await executeListDirTool(rawInput);
-      }
-      if (params.toolName === "writeFile") {
-        return await executeWriteFileTool(rawInput);
-      }
-    } catch (error) {
-      if (!isSandboxCommandStreamInterruptedError(error)) {
-        throw error;
-      }
-      return { result: sandboxStreamInterruptedResult(params.toolName) };
+    if (!session) {
+      continue;
     }
-    throw new Error(`unsupported sandbox tool: ${params.toolName}`);
-  };
-  return {
-    configureSkills(skills) {
-      availableSkills = [...skills];
-      sessionManager.configureSkills(skills);
-    },
-    configureReferenceFiles(files) {
-      referenceFiles = [...files];
-      sessionManager.configureReferenceFiles(files);
-    },
-    getSandboxId() {
-      return sessionManager.getSandboxId();
-    },
-    getDependencyProfileHash() {
-      return sessionManager.getDependencyProfileHash();
-    },
-    canExecute(toolName) {
-      return SANDBOX_TOOL_NAMES.has(toolName);
-    },
-    async createSandbox() {
-      return await sessionManager.createSandbox();
-    },
-    execute,
-    async dispose() {
-      await sessionManager.dispose();
+    if (!latestSession || session.updatedAtMs > latestSession.updatedAtMs) {
+      latestSession = session;
     }
-  };
+  }
+  return latestSession;
+}
+async function getMcpStoredOAuthCredentials(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  return parseStoredCredentials(
+    await stateAdapter.get(credentialsKey(userId, provider))
+  );
+}
+async function putMcpStoredOAuthCredentials(userId, provider, value, ttlMs2 = MCP_AUTH_CREDENTIALS_TTL_MS) {
+  const stateAdapter = await getConnectedStateAdapter();
+  await stateAdapter.set(
+    credentialsKey(userId, provider),
+    JSON.stringify(value),
+    ttlMs2
+  );
+}
+async function deleteMcpStoredOAuthCredentials(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  await stateAdapter.delete(credentialsKey(userId, provider));
+}
+async function getMcpServerSessionId(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  return parseServerSession(
+    await stateAdapter.get(serverSessionKey(userId, provider))
+  )?.sessionId;
+}
+async function putMcpServerSessionId(userId, provider, sessionId, ttlMs2 = MCP_SERVER_SESSION_TTL_MS) {
+  const stateAdapter = await getConnectedStateAdapter();
+  await stateAdapter.set(
+    serverSessionKey(userId, provider),
+    JSON.stringify({
+      sessionId,
+      updatedAtMs: Date.now()
+    }),
+    ttlMs2
+  );
+}
+async function deleteMcpServerSessionId(userId, provider) {
+  const stateAdapter = await getConnectedStateAdapter();
+  await stateAdapter.delete(serverSessionKey(userId, provider));
 }
-
-// src/chat/services/mcp-auth-orchestration.ts
-import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS3 } from "chat";
-
-// src/chat/mcp/oauth.ts
-import { randomUUID as randomUUID3 } from "crypto";
-import { StreamableHTTPClientTransport as StreamableHTTPClientTransport2 } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 
 // src/chat/mcp/oauth-provider.ts
 function createClientMetadata(callbackUrl) {
@@ -11853,7 +12107,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") {
@@ -11867,7 +12121,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 } : {},
@@ -11885,8 +12139,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}"`
       );
@@ -11915,7 +12169,7 @@ function createMcpAuthOrchestration(input) {
       pendingAuth: input.pendingAuth,
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       sessionId
     });
     const providerLabel = formatProviderLabel(provider);
@@ -11941,7 +12195,7 @@ function createMcpAuthOrchestration(input) {
     await recordPendingAuth({
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       sessionId,
       linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
     });
@@ -11949,7 +12203,7 @@ function createMcpAuthOrchestration(input) {
       conversationId,
       kind: "mcp",
       provider,
-      requesterId,
+      actorId,
       authorizationId: authorizationId2({
         kind: "mcp",
         provider,
@@ -12111,7 +12365,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 +13344,11 @@ 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,
+    actors: args.currentActors
   });
   const sandboxExecutor = createSandboxExecutor({
     sandboxId: args.state.sandbox?.sandboxId,
@@ -13113,7 +13368,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 +13392,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 +13413,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 +13483,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 +13493,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 +13668,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 +13706,7 @@ function createResumeState(args) {
       await args.durability.onInputCommitted?.();
       inputCommitted = true;
     },
-    async persistSafeBoundary(messages) {
+    async persistSafeBoundary(messages, trailingMessageProvenance) {
       if (!canPersistSession) {
         return false;
       }
@@ -13459,6 +13714,7 @@ function createResumeState(args) {
         ...sessionRecordBase(),
         sliceId: currentSliceId,
         messages,
+        ...trailingMessageProvenance ? { trailingMessageProvenance } : {},
         ...turnStartMessageIndex !== void 0 ? { turnStartMessageIndex } : {}
       });
       if (!persisted) {
@@ -13467,8 +13723,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 +13886,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 +13901,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 +13948,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,
@@ -13733,6 +13992,11 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       currentSliceId,
       existingSessionRecord
     } = await restoreSessionRecord(routing);
+    const committedInstructionProvenance = existingSessionRecord?.piMessageProvenance ? [
+      ...existingSessionRecord.piMessageProvenance,
+      ...resumedFromSessionRecord ? [] : [instructionProvenanceFor(actor)]
+    ] : [instructionProvenanceFor(actor)];
+    const runActors = () => instructionActors(committedInstructionProvenance);
     canRecordMcpProviders = Boolean(
       sessionRecordState.canUseTurnSession && sessionConversationId && sessionId
     );
@@ -13743,7 +14007,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       getLoadedSkillNames: () => loadedSkillNamesForResume,
       logContext: sessionRecordLogContext,
       recordActiveMcpProviders,
-      requester,
+      actor,
       runSource,
       sessionConversationId,
       sessionId,
@@ -13804,7 +14068,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 +14077,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 +14091,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 +14101,8 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
     const wiring = await wireAgentTools({
       abortAgent: () => agent?.abort(),
       activeSkills,
-      actorRequester: requester,
+      currentActor: actor,
+      currentActors: runActors,
       artifactStatePatch,
       availableSkills,
       configurationValues,
@@ -13879,7 +14144,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       shouldPromptAgent
     } = await assemblePrompt({
       activeMcpCatalogs: wiring.activeMcpCatalogs,
-      actorRequester: requester,
+      currentActor: actor,
       artifactState: state.artifactState,
       availableSkills,
       configurationValues,
@@ -13908,10 +14173,13 @@ 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)
+          );
+          committedInstructionProvenance.push(
+            ...messages.map((message) => message.provenance)
+          );
           for (const message of piMessages) {
             agent.steer(message);
           }
@@ -14066,7 +14334,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 +14387,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 +14443,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 +14501,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,
@@ -14314,9 +14582,6 @@ export {
   removeReactionFromMessage,
   renderSlackLegacyAttachmentText,
   appendSlackLegacyAttachmentText,
-  deleteMcpAuthSession,
-  getMcpStoredOAuthCredentials,
-  unlinkProvider,
   parseOAuthStatePayload,
   formatProviderLabel,
   resolveBaseUrl,
@@ -14327,6 +14592,11 @@ export {
   normalizeSandboxEgressTracePropagationDomains,
   shouldPropagateSandboxEgressTrace,
   resolveSandboxEgressProviderForHost,
+  deleteMcpAuthSession,
+  deleteMcpAuthSessionsForUserProvider,
+  getMcpStoredOAuthCredentials,
+  deleteMcpStoredOAuthCredentials,
+  deleteMcpServerSessionId,
   finalizeMcpAuthorization,
   resolvePluginOAuthAccount,
   executeCredentialedEgressRequest,