@sentry/junior 0.100.0 → 0.102.0

package/dist/{chunk-45DMFMY2.js → chunk-ZIX4PNBI.js}

@@ -1,6 +1,7 @@
 import {
   CooperativeTurnYieldError,
   TurnInputCommitLostError,
+  abandonReplacedPendingAuth,
   canReusePendingAuthLink,
   getInterruptionMarker,
   isTurnInputCommitLostError,
@@ -10,14 +11,14 @@ import {
   persistRunningSessionRecord,
   persistTimeoutSessionRecord,
   persistYieldSessionRecord
-} from "./chunk-NSOCZGOH.js";
+} from "./chunk-5K4N73TP.js";
 import {
   JUNIOR_THREAD_STATE_TTL_MS
-} from "./chunk-6DTVCPLO.js";
+} from "./chunk-XIMUQ4IU.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
-} from "./chunk-IVXL57YF.js";
+} from "./chunk-EOB77KME.js";
 import {
   loadConnectedMcpProviders,
   loadConversationProjection,
@@ -25,12 +26,12 @@ import {
   recordAuthorizationRequested,
   recordMcpProviderConnected,
   recordToolExecutionStarted
-} from "./chunk-IQIBZXGB.js";
+} from "./chunk-B5QS4AVO.js";
 import {
   estimateTextTokens,
   getAgentContextCompactionTriggerTokens,
   updateConversationStats
-} from "./chunk-JPQISMMJ.js";
+} from "./chunk-VSAFV2GI.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -40,10 +41,10 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-XJA7BPHS.js";
+} from "./chunk-3OABPOHR.js";
 import {
   privateTraceResultAttributes
-} from "./chunk-CM5EZD5F.js";
+} from "./chunk-UIE3R5XU.js";
 import {
   createPluginHookRunner,
   getPluginSystemPromptContributions,
@@ -52,7 +53,7 @@ import {
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-TPTJEHUE.js";
+} from "./chunk-X2IPNCB5.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -62,10 +63,10 @@ import {
   isDmChannel,
   normalizeSlackConversationId,
   withSlackRetries
-} from "./chunk-FP5N5OWZ.js";
+} from "./chunk-IQ36I3DF.js";
 import {
   createPluginLogger
-} from "./chunk-PWC24W5F.js";
+} from "./chunk-ZSHL44IQ.js";
 import {
   contextProvenance,
   getAgentStepStore,
@@ -74,7 +75,7 @@ import {
   getDb,
   instructionActors,
   instructionProvenanceFor
-} from "./chunk-VHRM6GNH.js";
+} from "./chunk-QZGVPPIJ.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -86,11 +87,13 @@ import {
   sleep
 } from "./chunk-4ZNGQH7C.js";
 import {
+  COMPACTION_SUMMARY_PREFIX,
   DEFAULT_HANDOFF_MODEL_PROFILE,
   GEN_AI_PROVIDER_NAME,
   GEN_AI_SERVER_ADDRESS,
   GEN_AI_SERVER_PORT,
   MISSING_GATEWAY_CREDENTIALS_ERROR,
+  MODEL_HANDOFF_SUMMARY_PREFIX,
   ModelProfileNotConfiguredError,
   STANDARD_MODEL_PROFILE,
   TURN_CONTEXT_TAG,
@@ -105,8 +108,10 @@ import {
   getPiGatewayApiKey,
   getStateAdapter,
   getTerminalAssistantMessages,
+  hasCompactedConversationContext,
   hasRuntimeTurnContext,
   isAssistantMessage,
+  isCompactionSummaryText,
   isProviderRetryError,
   isToolResultError,
   isToolResultMessage,
@@ -120,19 +125,17 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   unwrapCurrentInstruction
-} from "./chunk-A7X2FDUO.js";
+} from "./chunk-SHBPSE7A.js";
 import {
   parseSlackThreadId,
   resolveConversationPrivacy,
   runWithConversationPrivacy,
   toCanonicalInputMessage,
   toCanonicalOutputMessage,
-  toGenAiMessageMetadata,
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
-  toGenAiPayloadTraceAttributes,
-  toGenAiTextMetadata
-} from "./chunk-LVA4I4H7.js";
+  toGenAiPayloadTraceAttributes
+} from "./chunk-RT5BUHR5.js";
 import {
   parseDestination
 } from "./chunk-B7PUBQQM.js";
@@ -141,19 +144,19 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-3ECW2K2O.js";
+} from "./chunk-WR7H7VLJ.js";
 import {
   CredentialUnavailableError,
   credentialContextSchema,
   pluginCatalogRuntime,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-LMJPRYHP.js";
+} from "./chunk-77LHNQK4.js";
 import {
   createActor,
   extractGenAiUsageAttributes,
   extractGenAiUsageSummary,
-  getLogContextAttributes,
+  getLogContextAttributesForSpan,
   getTracePropagationHeaders,
   isUserActor,
   logError,
@@ -167,7 +170,7 @@ import {
   setTags,
   summarizeMessageText,
   withSpan
-} from "./chunk-I35CTGPO.js";
+} from "./chunk-AEWZ7F65.js";
 import {
   isRecord
 } from "./chunk-OB42YVAE.js";
@@ -475,7 +478,7 @@ import {
 function attributeModeForPrivacy(conversationPrivacy) {
   return conversationPrivacy === "public" ? "content" : "metadata";
 }
-function buildChatStartAttributes(model, context, mode, conversationPrivacy) {
+function buildChatStartAttributes(model, context, options, mode, conversationPrivacy) {
   const attributes = {
     "gen_ai.operation.name": "chat",
     "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
@@ -484,35 +487,45 @@ function buildChatStartAttributes(model, context, mode, conversationPrivacy) {
     "gen_ai.output.type": "text",
     "server.address": GEN_AI_SERVER_ADDRESS,
     "server.port": GEN_AI_SERVER_PORT,
+    ...options?.temperature !== void 0 ? { "gen_ai.request.temperature": options.temperature } : {},
+    ...options?.maxTokens !== void 0 ? { "gen_ai.request.max_tokens": options.maxTokens } : {},
+    ...options?.reasoning ? { "gen_ai.request.reasoning.level": options.reasoning } : {},
+    ...hasCompactedConversationContext(context.messages) ? { "gen_ai.conversation.compacted": true } : {},
     ...conversationPrivacy ? { "app.conversation.privacy": conversationPrivacy } : {},
-    ...toGenAiMessagesTraceAttributes("app.ai.input", context.messages)
+    ...toGenAiMessagesTraceAttributes("gen_ai.input", context.messages)
   };
-  const inputMessages = serializeGenAiAttribute(
-    mode === "metadata" ? context.messages.map(toGenAiMessageMetadata) : context.messages.map(toCanonicalInputMessage)
-  );
-  if (inputMessages) {
-    attributes["gen_ai.input.messages"] = inputMessages;
+  if (mode === "content") {
+    const inputMessages = serializeGenAiAttribute(
+      context.messages.map(toCanonicalInputMessage)
+    );
+    if (inputMessages) {
+      attributes["gen_ai.input.messages"] = inputMessages;
+    }
   }
   if (context.systemPrompt) {
-    const systemInstructions = serializeGenAiAttribute([
-      mode === "metadata" ? toGenAiTextMetadata(context.systemPrompt) : { type: "text", content: context.systemPrompt }
-    ]);
-    if (systemInstructions) {
-      attributes["gen_ai.system_instructions"] = systemInstructions;
+    if (mode === "content") {
+      const systemInstructions = serializeGenAiAttribute([
+        { type: "text", content: context.systemPrompt }
+      ]);
+      if (systemInstructions) {
+        attributes["gen_ai.system_instructions"] = systemInstructions;
+      }
     }
-    attributes["app.ai.system_instructions.content_chars"] = context.systemPrompt.length;
+    attributes["gen_ai.system_instructions.content_chars"] = context.systemPrompt.length;
   }
   return attributes;
 }
 function buildChatEndAttributes(message, mode) {
   const attributes = {
-    ...toGenAiMessagesTraceAttributes("app.ai.output", [message])
+    ...toGenAiMessagesTraceAttributes("gen_ai.output", [message])
   };
-  const outputMessages = serializeGenAiAttribute(
-    mode === "metadata" ? [toGenAiMessageMetadata(message)] : [toCanonicalOutputMessage(message)]
-  );
-  if (outputMessages) {
-    attributes["gen_ai.output.messages"] = outputMessages;
+  if (mode === "content") {
+    const outputMessages = serializeGenAiAttribute([
+      toCanonicalOutputMessage(message)
+    ]);
+    if (outputMessages) {
+      attributes["gen_ai.output.messages"] = outputMessages;
+    }
   }
   Object.assign(attributes, extractGenAiUsageAttributes(message));
   if (message.stopReason) {
@@ -537,8 +550,14 @@ function createTracedStreamFn(baseOrOptions = streamSimple) {
       name: `chat ${model.id}`,
       op: "gen_ai.chat",
       attributes: {
-        ...getLogContextAttributes(),
-        ...buildChatStartAttributes(model, context, mode, effectivePrivacy)
+        ...getLogContextAttributesForSpan("gen_ai.chat"),
+        ...buildChatStartAttributes(
+          model,
+          context,
+          options,
+          mode,
+          effectivePrivacy
+        )
       }
     });
     try {
@@ -554,11 +573,19 @@ function createTracedStreamFn(baseOrOptions = streamSimple) {
             )) {
               span.setAttribute(key, value);
             }
+            if (finalMessage.stopReason === "error") {
+              span.setAttribute("error.type", "provider_error");
+              span.setStatus({ code: 2, message: "LLM stream failed" });
+            }
           } finally {
             span.end();
           }
         },
-        () => {
+        (error) => {
+          span.setAttribute(
+            "error.type",
+            error instanceof Error ? error.name : typeof error
+          );
           span.setStatus({ code: 2, message: "LLM stream failed" });
           span.end();
         }
@@ -566,6 +593,10 @@ function createTracedStreamFn(baseOrOptions = streamSimple) {
       });
       return stream;
     } catch (error) {
+      span.setAttribute(
+        "error.type",
+        error instanceof Error ? error.name : typeof error
+      );
       span.setStatus({ code: 2, message: "LLM call failed" });
       span.end();
       throw error;
@@ -998,10 +1029,10 @@ async function selectTurnReasoningLevel(args) {
         minimum: trimmedContext || turnBlockCount > 0 ? "medium" : void 0
       });
       setSpanAttributes({
-        "app.ai.reasoning_level": normalizedSelection.reasoningLevel,
-        "app.ai.reasoning_level_reason": normalizedSelection.reason,
+        "gen_ai.request.reasoning.level": normalizedSelection.reasoningLevel,
+        "gen_ai.request.reasoning.level_reason": normalizedSelection.reason,
         ...normalizedSelection.confidence !== void 0 ? {
-          "app.ai.reasoning_level_confidence": normalizedSelection.confidence
+          "gen_ai.request.reasoning.level_confidence": normalizedSelection.confidence
         } : {}
       });
       return normalizedSelection;
@@ -2621,7 +2652,18 @@ async function assemblePrompt(args) {
     }
   ];
   const inputMessagesAttribute = serializeGenAiAttribute(
-    args.conversationPrivacy !== "public" ? inputMessages.map(toGenAiMessageMetadata) : inputMessages
+    args.conversationPrivacy === "public" ? [
+      {
+        role: "system",
+        parts: [{ type: "text", content: baseInstructions }]
+      },
+      {
+        role: "user",
+        parts: promptContentParts.flatMap(
+          (part) => part.type === "text" ? [{ type: "text", content: part.text }] : []
+        )
+      }
+    ] : void 0
   );
   return {
     baseInstructions,
@@ -3151,6 +3193,7 @@ var PluginMcpClient = class {
   plugin;
   options;
   client;
+  clientPromise;
   lastAttemptedTransportSessionId;
   transport;
   listedTools;
@@ -3227,6 +3270,20 @@ var PluginMcpClient = class {
     if (this.client) {
       return this.client;
     }
+    if (this.clientPromise) {
+      return await this.clientPromise;
+    }
+    const clientPromise = this.connectClient();
+    this.clientPromise = clientPromise;
+    try {
+      return await clientPromise;
+    } finally {
+      if (this.clientPromise === clientPromise) {
+        this.clientPromise = void 0;
+      }
+    }
+  }
+  async connectClient() {
     const mcp = this.plugin.manifest.mcp;
     if (!mcp) {
       throw new Error(
@@ -3289,6 +3346,7 @@ var PluginMcpClient = class {
     this.listedTools = void 0;
     this.transport = void 0;
     this.client = void 0;
+    this.clientPromise = void 0;
     if (transport) {
       await transport.close();
     }
@@ -3337,6 +3395,9 @@ function getMcpAwareTelemetryMessage(error, privacy) {
 }
 
 // src/chat/mcp/tool-manager.ts
+var MAX_TOOL_RESULT_TOKENS = 1e4;
+var MAX_TOOL_RESULT_BYTES = 32 * 1024;
+var CHARS_PER_ESTIMATED_TOKEN = 4;
 function normalizeMcpToolName(provider, toolName) {
   return `mcp__${provider}__${toolName}`;
 }
@@ -3407,16 +3468,80 @@ function toAgentToolContent(result) {
   }
   return [{ type: "text", text: "ok" }];
 }
+function utf8Bytes(value) {
+  return Buffer.byteLength(value, "utf8");
+}
+function prefixWithin(value, maxChars, maxBytes) {
+  let low = 0;
+  let high = Math.min(value.length, maxChars);
+  while (low < high) {
+    const middle = Math.ceil((low + high) / 2);
+    if (utf8Bytes(value.slice(0, middle)) <= maxBytes) {
+      low = middle;
+    } else {
+      high = middle - 1;
+    }
+  }
+  if (low > 0 && /[\uD800-\uDBFF]/.test(value[low - 1])) {
+    low -= 1;
+  }
+  return value.slice(0, low);
+}
+function suffixWithin(value, maxChars, maxBytes) {
+  let low = Math.max(0, value.length - maxChars);
+  let high = value.length;
+  while (low < high) {
+    const middle = Math.floor((low + high) / 2);
+    if (utf8Bytes(value.slice(middle)) <= maxBytes) {
+      high = middle;
+    } else {
+      low = middle + 1;
+    }
+  }
+  if (low < value.length && /[\uDC00-\uDFFF]/.test(value[low])) {
+    low += 1;
+  }
+  return value.slice(low);
+}
+function boundMcpContent(content) {
+  const text = content.filter((part) => part.type === "text").map((part) => part.text).join("\n\n");
+  const originalBytes = utf8Bytes(text);
+  const originalTokens = Math.ceil(text.length / CHARS_PER_ESTIMATED_TOKEN);
+  if (originalTokens <= MAX_TOOL_RESULT_TOKENS && originalBytes <= MAX_TOOL_RESULT_BYTES) {
+    return content;
+  }
+  const warning = `
+
+Warning: truncated output (original token count: ${originalTokens}; original bytes: ${originalBytes})
+
+`;
+  const remainingChars = MAX_TOOL_RESULT_TOKENS * CHARS_PER_ESTIMATED_TOKEN - warning.length;
+  const remainingBytes = MAX_TOOL_RESULT_BYTES - utf8Bytes(warning);
+  const head = prefixWithin(
+    text,
+    Math.ceil(remainingChars / 2),
+    Math.ceil(remainingBytes / 2)
+  );
+  const tail = suffixWithin(
+    text.slice(head.length),
+    remainingChars - head.length,
+    remainingBytes - utf8Bytes(head)
+  );
+  return [
+    { type: "text", text: `${head}${warning}${tail}` },
+    ...content.filter((part) => part.type === "image")
+  ];
+}
 function toModelVisibleMcpContent(result) {
   const content = toAgentToolContent(result);
   if (content.some((part) => part.type === "image")) {
-    return content;
+    return boundMcpContent(content);
   }
   const structured = summarizeStructuredContent(result.structuredContent);
   if (structured) {
-    return [{ type: "text", text: structured }];
+    return boundMcpContent([{ type: "text", text: structured }]);
   }
-  return content;
+  return boundMcpContent(content);
 }
 function describeMcpTool(provider, tool) {
   const prefix = `[${provider}]`;
@@ -3453,6 +3578,7 @@ var McpToolManager = class {
   activeProviders = /* @__PURE__ */ new Set();
   authorizationPendingProviders = /* @__PURE__ */ new Set();
   clientsByProvider = /* @__PURE__ */ new Map();
+  clientPromisesByProvider = /* @__PURE__ */ new Map();
   toolsByProvider = /* @__PURE__ */ new Map();
   getActiveProviders() {
     return [...this.activeProviders].sort(
@@ -3545,6 +3671,21 @@ var McpToolManager = class {
     if (existing) {
       return existing;
     }
+    const pending = this.clientPromisesByProvider.get(plugin.manifest.name);
+    if (pending) {
+      return await pending;
+    }
+    const clientPromise = this.createClient(plugin);
+    this.clientPromisesByProvider.set(plugin.manifest.name, clientPromise);
+    try {
+      return await clientPromise;
+    } finally {
+      if (this.clientPromisesByProvider.get(plugin.manifest.name) === clientPromise) {
+        this.clientPromisesByProvider.delete(plugin.manifest.name);
+      }
+    }
+  }
+  async createClient(plugin) {
     const authProvider = this.options.authProviderFactory ? await this.options.authProviderFactory(plugin) : void 0;
     const client = new PluginMcpClient(plugin, {
       ...authProvider ? { authProvider } : {},
@@ -3580,13 +3721,14 @@ var McpToolManager = class {
             plugin.manifest.name,
             tool
           ),
-          "gen_ai.tool.type": "extension",
+          "gen_ai.tool.type": "function",
           "app.plugin.name": plugin.manifest.name,
           ...options?.toolCallId ? { "gen_ai.tool.call.id": options.toolCallId } : {}
         };
         const argumentAttribute = serializeMcpPayload(
           resolvedArgs,
-          conversationPrivacy
+          conversationPrivacy,
+          { privateMetadata: true }
         );
         return await withSpan(
           `execute_tool ${managedToolName}`,
@@ -3600,7 +3742,8 @@ var McpToolManager = class {
               }
               const resultAttribute = serializeMcpPayload(
                 result,
-                conversationPrivacy
+                conversationPrivacy,
+                { privateMetadata: true }
               );
               if (resultAttribute) {
                 setSpanAttributes({
@@ -3691,10 +3834,11 @@ var McpToolManager = class {
 function toOptionalRecord(value) {
   return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
 }
-function serializeMcpPayload(payload, privacy) {
-  return serializeGenAiAttribute(
-    privacy === "private" ? toGenAiPayloadMetadata(payload) : payload
-  );
+function serializeMcpPayload(payload, privacy, options = {}) {
+  if (privacy !== "private") {
+    return serializeGenAiAttribute(payload);
+  }
+  return options.privateMetadata ? serializeGenAiAttribute(toGenAiPayloadMetadata(payload)) : void 0;
 }
 
 // src/chat/tools/sandbox/bash.ts
@@ -10006,13 +10150,19 @@ function createPluginAuthOrchestration(input) {
       }
     }
     if (input.sessionId && recordPendingAuth) {
-      await recordPendingAuth({
+      const nextPendingAuth = {
         kind: "plugin",
         provider,
         actorId: input.actorId,
         ...options?.scope ? { scope: options.scope } : {},
         sessionId: input.sessionId,
         linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
+      };
+      await recordPendingAuth(nextPendingAuth);
+      await abandonReplacedPendingAuth({
+        conversationId: input.conversationId,
+        previousPendingAuth: input.pendingAuth,
+        nextPendingAuth
       });
     }
     if (input.conversationId && input.sessionId) {
@@ -10122,7 +10272,6 @@ function handleToolExecutionError(error, toolName, toolCallId, shouldTrace, trac
         traceContext,
         {
           "app.credential.provider": error.provider,
-          "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
           "gen_ai.operation.name": "execute_tool",
           "gen_ai.tool.name": toolName,
           ...toolCallId ? { "gen_ai.tool.call.id": toolCallId } : {},
@@ -10138,7 +10287,6 @@ function handleToolExecutionError(error, toolName, toolCallId, shouldTrace, trac
       "agent_tool_call_failed",
       traceContext,
       {
-        "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
         "gen_ai.operation.name": "execute_tool",
         "gen_ai.tool.name": toolName,
         ...toolCallId ? { "gen_ai.tool.call.id": toolCallId } : {},
@@ -10155,7 +10303,6 @@ function handleToolExecutionError(error, toolName, toolCallId, shouldTrace, trac
       "agent_tool_call_failed",
       {},
       {
-        "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
         "gen_ai.operation.name": "execute_tool",
         "gen_ai.tool.name": toolName,
         ...toolCallId ? { "gen_ai.tool.call.id": toolCallId } : {},
@@ -10523,9 +10670,7 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxExecut
   visibleTools[EXECUTE_TOOL_NAME] = createExecuteToolTool();
   const shouldTrace = shouldEmitDevAgentTrace();
   const effectiveConversationPrivacy = conversationPrivacy ?? "private";
-  const serializeToolPayload = (payload, options = {}) => serializeGenAiAttribute(
-    effectiveConversationPrivacy === "private" && !options.exposePrivate ? toGenAiPayloadMetadata(payload) : payload
-  );
+  const serializeToolPayload = (payload, options = {}) => effectiveConversationPrivacy === "private" && !options.exposePrivate ? options.privateMetadata ? serializeGenAiAttribute(toGenAiPayloadMetadata(payload)) : void 0 : serializeGenAiAttribute(payload);
   const notifyToolResult = async (report) => {
     try {
       await onToolResult?.(report);
@@ -10616,14 +10761,17 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxExecut
     }
     const toolResultAttribute = effectiveConversationPrivacy === "private" && toolDef.privateTraceResult && !hasProjectedPrivateResult ? void 0 : serializeToolPayload(
       hasProjectedPrivateResult ? projectedPrivateResult : resultAttributeValue,
-      { exposePrivate: hasProjectedPrivateResult }
+      {
+        exposePrivate: hasProjectedPrivateResult,
+        privateMetadata: true
+      }
     );
     if (toolResultAttribute) {
       setSpanAttributes2({
         "gen_ai.tool.call.result": toolResultAttribute,
         ...hasProjectedPrivateResult ? privateTraceResultAttributes() : {},
         ...toGenAiPayloadTraceAttributes(
-          "app.ai.tool.call.result",
+          "gen_ai.tool.call.result",
           resultAttributeValue
         )
       });
@@ -10654,9 +10802,11 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxExecut
     executionMode: toolDef.executionMode,
     execute: async (toolCallId, params, signal) => {
       const normalizedToolCallId = typeof toolCallId === "string" && toolCallId.length > 0 ? toolCallId : void 0;
-      const toolArgumentsAttribute = serializeToolPayload(params);
+      const toolArgumentsAttribute = serializeToolPayload(params, {
+        privateMetadata: true
+      });
       const toolArgumentsMetadata = toGenAiPayloadTraceAttributes(
-        "app.ai.tool.call.arguments",
+        "gen_ai.tool.call.arguments",
         params
       );
       return withSpan(
@@ -10676,7 +10826,7 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxExecut
               executionToolName = resolvedCatalogCall.toolName;
               executionParams = resolvedCatalogCall.arguments;
               setSpanAttributes2({
-                "app.ai.tool.dispatcher.name": EXECUTE_TOOL_NAME,
+                "gen_ai.tool.dispatcher.name": EXECUTE_TOOL_NAME,
                 "gen_ai.tool.description": resolvedCatalogCall.definition.description,
                 "gen_ai.tool.name": resolvedCatalogCall.toolName
               });
@@ -10723,11 +10873,10 @@ function createPiAgentTools(tools, sandbox, spanContext, onStatus, sandboxExecut
           }
         },
         {
-          "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
           "gen_ai.operation.name": "execute_tool",
           "gen_ai.tool.name": toolName,
           "gen_ai.tool.description": toolDef.description,
-          "gen_ai.tool.type": "extension",
+          "gen_ai.tool.type": "function",
           ...toolArgumentsMetadata,
           ...normalizedToolCallId ? { "gen_ai.tool.call.id": normalizedToolCallId } : {},
           ...toolArgumentsAttribute ? { "gen_ai.tool.call.arguments": toolArgumentsAttribute } : {}
@@ -12580,9 +12729,9 @@ import { StreamableHTTPClientTransport as StreamableHTTPClientTransport2 } from
 import {
   sourceSchema as sourceSchema2
 } from "@sentry/junior-plugin-api";
-var MCP_AUTH_SESSION_PREFIX = "junior:mcp_auth_session";
+var MCP_AUTH_SESSION_PREFIX = "junior:mcp_oauth_attempt:v2";
 var MCP_AUTH_CREDENTIALS_PREFIX = "junior:mcp_auth_credentials";
-var MCP_AUTH_SESSION_INDEX_PREFIX = "junior:mcp_auth_session_index";
+var MCP_AUTH_SESSION_INDEX_PREFIX = "junior:mcp_oauth_attempt_index:v2";
 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;
@@ -12624,7 +12773,7 @@ function parseMcpAuthSession(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") {
+    if (parsed.schemaVersion !== 2 || 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);
@@ -12636,6 +12785,7 @@ function parseMcpAuthSession(value) {
       return void 0;
     }
     return {
+      schemaVersion: 2,
       authSessionId: parsed.authSessionId,
       provider: parsed.provider,
       userId: parsed.userId,
@@ -12733,6 +12883,7 @@ async function patchMcpAuthSession(authSessionId, patch) {
   const next = {
     ...current,
     ...patch,
+    schemaVersion: 2,
     authSessionId: current.authSessionId,
     provider: current.provider,
     userId: current.userId,
@@ -12777,25 +12928,6 @@ async function deleteMcpAuthSessionsForUserProvider(userId, provider) {
   }
   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(
@@ -12854,15 +12986,17 @@ function clientAllowsRedirectUri(clientInformation, callbackUrl) {
   return redirectUris.includes(callbackUrl);
 }
 var StateBackedMcpOAuthClientProvider = class {
-  constructor(authSessionId, callbackUrl, sessionContext) {
+  constructor(authSessionId, callbackUrl, sessionContext, runCredentialMutation) {
     this.authSessionId = authSessionId;
     this.callbackUrl = callbackUrl;
     this.sessionContext = sessionContext;
+    this.runCredentialMutation = runCredentialMutation;
     this.clientMetadata = createClientMetadata(callbackUrl);
   }
   authSessionId;
   callbackUrl;
   sessionContext;
+  runCredentialMutation;
   clientMetadata;
   get redirectUrl() {
     return this.callbackUrl;
@@ -12886,11 +13020,16 @@ var StateBackedMcpOAuthClientProvider = class {
     return void 0;
   }
   async saveClientInformation(clientInformation) {
-    const session = await this.getCredentialContext();
-    const credentials = await getMcpStoredOAuthCredentials(session.userId, session.provider) ?? {};
-    await putMcpStoredOAuthCredentials(session.userId, session.provider, {
-      ...credentials,
-      clientInformation
+    await this.mutateCredentials(async () => {
+      const session = await this.getCredentialContext();
+      const credentials = await getMcpStoredOAuthCredentials(
+        session.userId,
+        session.provider
+      ) ?? {};
+      await putMcpStoredOAuthCredentials(session.userId, session.provider, {
+        ...credentials,
+        clientInformation
+      });
     });
   }
   async tokens() {
@@ -12902,19 +13041,32 @@ var StateBackedMcpOAuthClientProvider = class {
     return credentials?.tokens;
   }
   async saveTokens(tokens) {
-    const session = await this.getCredentialContext();
-    const credentials = await getMcpStoredOAuthCredentials(session.userId, session.provider) ?? {};
-    await putMcpStoredOAuthCredentials(session.userId, session.provider, {
-      ...credentials,
-      tokens
+    await this.mutateCredentials(async () => {
+      const session = await this.getCredentialContext();
+      const credentials = await getMcpStoredOAuthCredentials(
+        session.userId,
+        session.provider
+      ) ?? {};
+      await putMcpStoredOAuthCredentials(session.userId, session.provider, {
+        ...credentials,
+        tokens
+      });
     });
   }
   async redirectToAuthorization(authorizationUrl) {
+    const existing = await getMcpAuthSession(this.authSessionId);
+    if (existing?.authorizationUrl && existing.authorizationUrl !== authorizationUrl.toString()) {
+      throw new Error("MCP OAuth authorization attempt is already initialized");
+    }
     await this.ensureSession({
       authorizationUrl: authorizationUrl.toString()
     });
   }
   async saveCodeVerifier(codeVerifier) {
+    const existing = await getMcpAuthSession(this.authSessionId);
+    if (existing?.codeVerifier && existing.codeVerifier !== codeVerifier) {
+      throw new Error("MCP OAuth authorization attempt is already initialized");
+    }
     await this.ensureSession({ codeVerifier });
   }
   async codeVerifier() {
@@ -12925,11 +13077,16 @@ var StateBackedMcpOAuthClientProvider = class {
     return session.codeVerifier;
   }
   async saveDiscoveryState(state) {
-    const session = await this.getCredentialContext();
-    const credentials = await getMcpStoredOAuthCredentials(session.userId, session.provider) ?? {};
-    await putMcpStoredOAuthCredentials(session.userId, session.provider, {
-      ...credentials,
-      discoveryState: state
+    await this.mutateCredentials(async () => {
+      const session = await this.getCredentialContext();
+      const credentials = await getMcpStoredOAuthCredentials(
+        session.userId,
+        session.provider
+      ) ?? {};
+      await putMcpStoredOAuthCredentials(session.userId, session.provider, {
+        ...credentials,
+        discoveryState: state
+      });
     });
   }
   async discoveryState() {
@@ -12941,34 +13098,36 @@ var StateBackedMcpOAuthClientProvider = class {
     return credentials?.discoveryState;
   }
   async invalidateCredentials(scope) {
-    const session = await this.getCredentialContext();
-    const credentials = await getMcpStoredOAuthCredentials(session.userId, session.provider) ?? {};
-    await putMcpStoredOAuthCredentials(session.userId, session.provider, {
-      ...scope === "tokens" || scope === "all" ? {} : credentials.tokens ? { tokens: credentials.tokens } : {},
-      ...scope === "client" || scope === "all" ? {} : credentials.clientInformation ? { clientInformation: credentials.clientInformation } : {},
-      ...scope === "discovery" || scope === "all" ? {} : credentials.discoveryState ? { discoveryState: credentials.discoveryState } : {}
+    await this.mutateCredentials(async () => {
+      const session = await this.getCredentialContext();
+      const credentials = await getMcpStoredOAuthCredentials(
+        session.userId,
+        session.provider
+      ) ?? {};
+      await putMcpStoredOAuthCredentials(session.userId, session.provider, {
+        ...scope === "tokens" || scope === "all" ? {} : credentials.tokens ? { tokens: credentials.tokens } : {},
+        ...scope === "client" || scope === "all" ? {} : credentials.clientInformation ? { clientInformation: credentials.clientInformation } : {},
+        ...scope === "discovery" || scope === "all" ? {} : credentials.discoveryState ? { discoveryState: credentials.discoveryState } : {}
+      });
     });
-    if (scope === "verifier" || scope === "all") {
-      const authSession = await getMcpAuthSession(this.authSessionId);
-      if (authSession) {
-        await patchMcpAuthSession(this.authSessionId, {
-          codeVerifier: void 0,
-          ...scope === "all" ? { authorizationUrl: void 0 } : {}
-        });
-      }
-    }
   }
   async getMcpServerSessionId() {
     const session = await this.getCredentialContext();
     return await getMcpServerSessionId(session.userId, session.provider);
   }
   async saveMcpServerSessionId(sessionId) {
-    const session = await this.getCredentialContext();
-    if (!sessionId) {
-      await deleteMcpServerSessionId(session.userId, session.provider);
-      return;
-    }
-    await putMcpServerSessionId(session.userId, session.provider, sessionId);
+    await this.mutateCredentials(async () => {
+      const session = await this.getCredentialContext();
+      if (!sessionId) {
+        await deleteMcpServerSessionId(session.userId, session.provider);
+        return;
+      }
+      await putMcpServerSessionId(session.userId, session.provider, sessionId);
+    });
+  }
+  /** Route shared credential writes through callback-owned freshness control. */
+  async mutateCredentials(mutation) {
+    return this.runCredentialMutation ? await this.runCredentialMutation(mutation) : await mutation();
   }
   async getCredentialContext() {
     return this.sessionContext ?? await this.requireSession();
@@ -12983,6 +13142,7 @@ var StateBackedMcpOAuthClientProvider = class {
     }
     const now = Date.now();
     const nextSession = {
+      schemaVersion: 2,
       authSessionId: this.authSessionId,
       ...this.sessionContext,
       ...patch,
@@ -13020,32 +13180,7 @@ async function createMcpOAuthClientProvider(input) {
       "Cannot determine base URL (set JUNIOR_BASE_URL or deploy to Vercel)"
     );
   }
-  const existingSession = await getLatestMcpAuthSessionForUserProvider(
-    input.userId,
-    input.provider
-  );
-  const reusableSession = existingSession && existingSession.conversationId === input.conversationId && existingSession.sessionId === input.sessionId ? existingSession : void 0;
-  const now = Date.now();
-  const authSessionId = reusableSession?.authSessionId ?? randomUUID3();
-  await putMcpAuthSession({
-    authSessionId,
-    provider: input.provider,
-    userId: input.userId,
-    conversationId: input.conversationId,
-    ...input.destination ? { destination: input.destination } : {},
-    ...input.source ? { source: input.source } : {},
-    sessionId: input.sessionId,
-    userMessage: input.userMessage,
-    ...input.channelId ? { channelId: input.channelId } : {},
-    ...input.threadTs ? { threadTs: input.threadTs } : {},
-    ...input.toolChannelId ? { toolChannelId: input.toolChannelId } : {},
-    ...input.configuration ? { configuration: input.configuration } : {},
-    ...input.artifactState ? { artifactState: input.artifactState } : {},
-    ...reusableSession?.authorizationUrl ? { authorizationUrl: reusableSession.authorizationUrl } : {},
-    ...reusableSession?.codeVerifier ? { codeVerifier: reusableSession.codeVerifier } : {},
-    createdAtMs: reusableSession?.createdAtMs ?? now,
-    updatedAtMs: now
-  });
+  const authSessionId = randomUUID3();
   return new StateBackedMcpOAuthClientProvider(
     authSessionId,
     `${baseUrl}${getMcpOAuthCallbackPath(input.provider)}`,
@@ -13054,6 +13189,7 @@ async function createMcpOAuthClientProvider(input) {
       userId: input.userId,
       conversationId: input.conversationId,
       ...input.destination ? { destination: input.destination } : {},
+      ...input.source ? { source: input.source } : {},
       sessionId: input.sessionId,
       userMessage: input.userMessage,
       ...input.channelId ? { channelId: input.channelId } : {},
@@ -13064,7 +13200,7 @@ async function createMcpOAuthClientProvider(input) {
     }
   );
 }
-async function finalizeMcpAuthorization(provider, authSessionId, authorizationCode) {
+async function finalizeMcpAuthorization(provider, authSessionId, authorizationCode, runCredentialMutation) {
   const plugin = requirePluginWithMcp(provider);
   const mcp = plugin.manifest.mcp;
   if (!mcp) {
@@ -13088,7 +13224,9 @@ async function finalizeMcpAuthorization(provider, authSessionId, authorizationCo
   const callbackUrl = `${baseUrl}${getMcpOAuthCallbackPath(provider)}`;
   const authProvider = new StateBackedMcpOAuthClientProvider(
     authSessionId,
-    callbackUrl
+    callbackUrl,
+    void 0,
+    runCredentialMutation
   );
   const requestInit = {};
   if (mcp.headers && Object.keys(mcp.headers).length > 0) {
@@ -13171,16 +13309,6 @@ function createMcpAuthOrchestration(input) {
         `Missing pending auth recorder for MCP authorization pause "${provider}"`
       );
     }
-    const latestArtifactState = input.getMergedArtifactState();
-    await patchMcpAuthSession(authSessionId, {
-      configuration: { ...input.getConfiguration() },
-      artifactState: latestArtifactState,
-      toolChannelId: input.toolChannelId ?? latestArtifactState.assistantContextChannelId ?? input.channelId
-    });
-    const authSession = await getMcpAuthSession(authSessionId);
-    if (!authSession?.authorizationUrl) {
-      throw new Error(`Missing MCP authorization URL for plugin "${provider}"`);
-    }
     const reusingPendingLink = canReusePendingAuthLink({
       pendingAuth: input.pendingAuth,
       kind: "mcp",
@@ -13188,8 +13316,31 @@ function createMcpAuthOrchestration(input) {
       actorId,
       sessionId
     });
+    const reusedAuthSessionId = reusingPendingLink && input.pendingAuth?.kind === "mcp" ? input.pendingAuth.authSessionId : void 0;
+    const activeAuthSessionId = reusedAuthSessionId ?? authSessionId;
+    const latestArtifactState = input.getMergedArtifactState();
+    await patchMcpAuthSession(activeAuthSessionId, {
+      configuration: { ...input.getConfiguration() },
+      artifactState: latestArtifactState,
+      toolChannelId: input.toolChannelId ?? latestArtifactState.assistantContextChannelId ?? input.channelId
+    });
     const providerLabel = formatProviderLabel(provider);
+    const nextPendingAuth = {
+      authSessionId: activeAuthSessionId,
+      kind: "mcp",
+      provider,
+      actorId,
+      sessionId,
+      linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
+    };
     if (!reusingPendingLink) {
+      const authSession = await getMcpAuthSession(authSessionId);
+      if (!authSession?.authorizationUrl) {
+        throw new Error(
+          `Missing MCP authorization URL for plugin "${provider}"`
+        );
+      }
+      await recordPendingAuth(nextPendingAuth);
       const delivery = await deliverPrivateMessage({
         channelId: authSession.channelId,
         threadTs: authSession.threadTs,
@@ -13201,20 +13352,21 @@ function createMcpAuthOrchestration(input) {
         })
       });
       if (!delivery) {
+        await deleteMcpAuthSession(authSessionId);
+        await recordPendingAuth(input.pendingAuth);
         throw new Error(
           `Unable to deliver MCP authorization link for plugin "${provider}"`
         );
       }
+      await abandonReplacedPendingAuth({
+        conversationId,
+        previousPendingAuth: input.pendingAuth,
+        nextPendingAuth
+      });
     } else {
       await deleteMcpAuthSession(authSessionId);
+      await recordPendingAuth(nextPendingAuth);
     }
-    await recordPendingAuth({
-      kind: "mcp",
-      provider,
-      actorId,
-      sessionId,
-      linkSentAtMs: reusingPendingLink ? input.pendingAuth.linkSentAtMs : Date.now()
-    });
     await recordAuthorizationRequested({
       conversationId,
       kind: "mcp",
@@ -14843,9 +14995,6 @@ var MAX_SUMMARY_INPUT_CHARS = 8e4;
 var MAX_VISIBLE_CONTEXT_CHARS = 2e4;
 var MAX_SUMMARY_CHARS = 6e3;
 var MAX_RENDERED_MESSAGE_CHARS = 4e3;
-var COMPACTION_SUMMARY_PREFIX = "Context compaction summary for future Junior turns:";
-var LEGACY_COMPACTION_SUMMARY_PREFIX = "Context handoff summary for future Junior turns:";
-var MODEL_HANDOFF_SUMMARY_PREFIX = "Model handoff checkpoint. Continue the outstanding request now using this summary as the complete prior context:";
 var OMITTED_OLDER_CONTEXT_NOTICE = "[older context omitted]";
 function textPart(value) {
   if (value && typeof value === "object" && value.type === "text" && typeof value.text === "string") {
@@ -14879,8 +15028,7 @@ function truncateToTokenBudget(text, maxTokens) {
   return `${text.slice(0, Math.max(0, maxChars - 3)).trimEnd()}...`;
 }
 function isCompactionSummary(text) {
-  const normalized = text.trimStart();
-  return normalized.startsWith(COMPACTION_SUMMARY_PREFIX) || normalized.startsWith(LEGACY_COMPACTION_SUMMARY_PREFIX) || normalized.startsWith(MODEL_HANDOFF_SUMMARY_PREFIX);
+  return isCompactionSummaryText(text);
 }
 function isPayloadHeavy(text) {
   return /<data_base64>[\s\S]*?<\/data_base64>|data:image\/[a-z0-9.+-]+;base64,/i.test(
@@ -15413,14 +15561,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
       fastModelId: botConfig.fastModelId,
       messageText: userInput
     });
-    setSpanAttributes({
-      "gen_ai.request.model": activeModelId,
-      "gen_ai.request.reasoning.level": reasoningSelection.reasoningLevel,
-      "app.ai.reasoning_level_reason": reasoningSelection.reason,
-      ...reasoningSelection.confidence !== void 0 ? {
-        "app.ai.reasoning_level_confidence": reasoningSelection.confidence
-      } : {}
-    });
     const generatedFiles = [];
     const artifactStatePatch = {};
     const toolCalls = [];
@@ -15678,9 +15818,9 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
           runResume.setTurnStartMessageIndex(0);
           runResume.adoptCommittedBoundary(replacement);
           setSpanAttributes({
-            "gen_ai.request.model": activeModelId,
-            "gen_ai.request.reasoning.level": reasoningSelection.reasoningLevel,
-            "app.ai.model_profile": activeModelProfile
+            "gen_ai.agent.model": activeModelId,
+            "gen_ai.agent.model_profile": activeModelProfile,
+            "gen_ai.agent.reasoning.level": reasoningSelection.reasoningLevel
           });
           update = {
             context: {
@@ -15764,7 +15904,7 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
         runResume.setTurnStartMessageIndex(agent.state.messages.length);
       }
       await withSpan(
-        `invoke_agent ${activeModelId}`,
+        `invoke_agent ${botConfig.userName}`,
         "gen_ai.invoke_agent",
         spanContext,
         async () => {
@@ -15885,8 +16025,9 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
             );
             const outputMessages = newMessages.filter(isAssistantMessage);
             const outputMessagesAttribute = serializeGenAiAttribute(
-              conversationPrivacy !== "public" ? outputMessages.map(toGenAiMessageMetadata) : outputMessages.map(toCanonicalOutputMessage)
+              conversationPrivacy === "public" ? outputMessages.map(toCanonicalOutputMessage) : void 0
             );
+            const lastAssistant = outputMessages.at(-1);
             const usageSummary = extractGenAiUsageSummary(...outputMessages);
             const currentUsage = hasAgentTurnUsage(usageSummary) ? usageSummary : void 0;
             const currentPhaseUsage = addAgentTurnUsage(
@@ -15897,9 +16038,14 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
             setSpanAttributes({
               ...outputMessagesAttribute ? { "gen_ai.output.messages": outputMessagesAttribute } : {},
               ...toGenAiMessagesTraceAttributes(
-                "app.ai.output",
+                "gen_ai.output",
                 outputMessages
               ),
+              ...lastAssistant ? {
+                "gen_ai.response.finish_reasons": [
+                  normalizeGenAiFinishReason(lastAssistant.stopReason)
+                ]
+              } : {},
               ...extractGenAiUsageAttributes(usageSummary)
             });
             if (getPendingAuthPause()) {
@@ -15908,7 +16054,6 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
               );
               throw getPendingAuthPause();
             }
-            const lastAssistant = outputMessages.at(-1);
             const providerRetry = nextProviderRetry({
               attempt,
               lastAssistant,
@@ -15932,18 +16077,20 @@ async function executeAgentRunInPrivacyContext(request, conversationPrivacy) {
           }
         },
         {
-          "gen_ai.provider.name": GEN_AI_PROVIDER_NAME,
           "gen_ai.operation.name": "invoke_agent",
-          "gen_ai.request.model": activeModelId,
+          "gen_ai.agent.model": activeModelId,
+          "gen_ai.agent.model_profile": activeModelProfile,
+          "gen_ai.agent.reasoning.level": reasoningSelection.reasoningLevel,
+          "gen_ai.agent.reasoning.level_reason": reasoningSelection.reason,
+          ...reasoningSelection.confidence !== void 0 ? {
+            "gen_ai.agent.reasoning.level_confidence": reasoningSelection.confidence
+          } : {},
           "gen_ai.output.type": "text",
-          "server.address": GEN_AI_SERVER_ADDRESS,
-          "server.port": GEN_AI_SERVER_PORT,
           ...conversationPrivacy ? { "app.conversation.privacy": conversationPrivacy } : {},
           ...sessionConversationId ? { "app.ai.session.conversation_id": sessionConversationId } : {},
           ...sessionId ? { "app.ai.turn.session_id": sessionId } : {},
           ...currentSliceId ? { "app.ai.turn.slice_id": currentSliceId } : {},
-          "gen_ai.request.reasoning.level": reasoningSelection.reasoningLevel,
-          ...toGenAiMessagesTraceAttributes("app.ai.input", inputMessages),
+          ...toGenAiMessagesTraceAttributes("gen_ai.input", inputMessages),
           ...inputMessagesAttribute ? { "gen_ai.input.messages": inputMessagesAttribute } : {}
         }
       );
@@ -16102,6 +16249,7 @@ export {
   normalizeSandboxEgressTracePropagationDomains,
   shouldPropagateSandboxEgressTrace,
   resolveSandboxEgressProviderForHost,
+  getMcpAuthSession,
   deleteMcpAuthSession,
   deleteMcpAuthSessionsForUserProvider,
   getMcpStoredOAuthCredentials,