@sentry/junior 0.78.0 → 0.80.0

package/dist/{chunk-2MSW5BZY.js → chunk-W2QGQCKG.js}

@@ -1,7 +1,7 @@
 import {
   JUNIOR_THREAD_STATE_TTL_MS,
   buildConversationStatePatch
-} from "./chunk-Z4CIQ3EB.js";
+} from "./chunk-66NX7MNW.js";
 import {
   buildNonInteractiveShellScript,
   createSandboxInstance,
@@ -10,7 +10,7 @@ import {
   isSnapshotMissingError,
   resolveRuntimeDependencySnapshot,
   runNonInteractiveCommand
-} from "./chunk-PNGAJ75P.js";
+} from "./chunk-3JKTVW4R.js";
 import {
   pluginTaskId,
   pluginTaskParamsSchema,
@@ -27,8 +27,11 @@ import {
   loadConnectedMcpProviders,
   recordAuthorizationRequested,
   recordMcpProviderConnected,
+  recordSubagentEnded,
+  recordSubagentStarted,
+  recordToolExecutionStarted,
   upsertAgentTurnSessionRecord
-} from "./chunk-QDQVOMBA.js";
+} from "./chunk-YA2JCC7G.js";
 import {
   createPluginEmbedder,
   createPluginHookRunner,
@@ -39,14 +42,14 @@ import {
   getPlugins,
   getSlackToolContext,
   resolveChannelCapabilities
-} from "./chunk-SSWBYEFH.js";
+} from "./chunk-Y3YUOEAZ.js";
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-RARSKPVT.js";
+} from "./chunk-GUO4EE7L.js";
 import {
   getDb
-} from "./chunk-237T7XAN.js";
+} from "./chunk-PQ2U2AO3.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -57,7 +60,7 @@ import {
 import {
   acquireActiveLock,
   getStateAdapter
-} from "./chunk-LXTPBU4K.js";
+} from "./chunk-X2FL5ZH5.js";
 import {
   SlackActionError,
   downloadPrivateSlackFile,
@@ -68,7 +71,7 @@ import {
   normalizeSlackConversationId,
   parseDestination,
   withSlackRetries
-} from "./chunk-Q6XFTRV5.js";
+} from "./chunk-4XHCVBXH.js";
 import {
   GEN_AI_PROVIDER_NAME,
   GEN_AI_SERVER_ADDRESS,
@@ -95,54 +98,48 @@ import {
   nextProviderRetry,
   normalizeSlackEmojiName,
   normalizeToolNameFromResult,
-  parseSlackThreadId,
-  resolveConversationPrivacy,
   resolveGatewayModel,
   stripRuntimeTurnContext,
   summarizeMessageText,
+  toObservablePromptPart,
+  trimTrailingAssistantMessages,
+  upsertActiveSkill
+} from "./chunk-ABRNFE3N.js";
+import {
+  parseSlackThreadId,
+  resolveConversationPrivacy,
+  runWithConversationPrivacy,
   toGenAiMessageMetadata,
   toGenAiMessagesTraceAttributes,
   toGenAiPayloadMetadata,
   toGenAiPayloadTraceAttributes,
-  toGenAiTextMetadata,
-  toObservablePromptPart,
-  trimTrailingAssistantMessages,
-  upsertActiveSkill
-} from "./chunk-T77LUIX3.js";
+  toGenAiTextMetadata
+} from "./chunk-DR75T7J3.js";
 import {
   discoverSkills,
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-Y3EG7S7P.js";
+} from "./chunk-WCXVEQPI.js";
 import {
-  createPluginBroker,
   credentialContextSchema,
-  getPluginCapabilityProviders,
-  getPluginCatalogSignature,
-  getPluginDefinition,
-  getPluginDisplayName,
-  getPluginMcpProviders,
-  getPluginOAuthConfig,
-  getPluginProviders,
-  isPluginConfigKey,
+  pluginCatalogRuntime,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-YLVJRYTD.js";
+} from "./chunk-TW23AT22.js";
 import {
   createRequester,
   parseActorUserId
-} from "./chunk-VALUBQ7R.js";
+} from "./chunk-ZPCGQRFJ.js";
 import {
   listReferenceFiles
-} from "./chunk-Q3XNY442.js";
+} from "./chunk-6APU57E6.js";
 import {
   extractGenAiUsageAttributes,
   extractGenAiUsageSummary,
   getActiveTraceId,
   getLogContextAttributes,
   getTracePropagationHeaders,
-  isRecord,
   logError,
   logException,
   logInfo,
@@ -152,13 +149,16 @@ import {
   setSpanAttributes,
   setSpanStatus,
   setTags,
-  toOptionalString,
   withSpan
-} from "./chunk-EJN6G5A2.js";
+} from "./chunk-KF7522P3.js";
+import {
+  isRecord,
+  toOptionalString
+} from "./chunk-FTMXFBDC.js";
 import {
   startInactiveSpan,
   withActiveSpan
-} from "./chunk-ST6YNAXG.js";
+} from "./chunk-3DA7X2U3.js";
 
 // src/chat/configuration/defaults.ts
 var installDefaults = {};
@@ -179,7 +179,7 @@ function setConfigDefaults(defaults) {
     );
   }
   for (const key of Object.keys(defaults)) {
-    if (!isPluginConfigKey(key)) {
+    if (!pluginCatalogRuntime.isConfigKey(key)) {
       throw new Error(
         `configDefaults: "${key}" is not a registered plugin config key`
       );
@@ -678,14 +678,14 @@ function markTurnFailed(args) {
 
 // src/chat/respond.ts
 import { Agent as Agent2 } from "@earendil-works/pi-agent-core";
-import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS3 } from "chat";
+import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS4 } from "chat";
 
 // src/chat/capabilities/catalog.ts
 var cachedCatalog;
 function getCapabilityCatalog() {
-  const signature = getPluginCatalogSignature();
+  const signature = pluginCatalogRuntime.getSignature();
   if (cachedCatalog?.signature === signature) return cachedCatalog;
-  const providers = getPluginCapabilityProviders();
+  const providers = pluginCatalogRuntime.getCapabilityProviders();
   const capabilityToProvider = /* @__PURE__ */ new Map();
   for (const provider of providers) {
     for (const capability of provider.capabilities) {
@@ -811,12 +811,14 @@ function createUserTokenStore() {
 function createProviderCredentialRouter(userTokenStore) {
   logCapabilityCatalogLoadedOnce();
   const brokersByProvider = {};
-  for (const plugin of getPluginProviders()) {
+  for (const plugin of pluginCatalogRuntime.getProviders()) {
     const { name } = plugin.manifest;
     if (!plugin.manifest.credentials && !plugin.manifest.apiHeaders) {
       continue;
     }
-    brokersByProvider[name] = createPluginBroker(name, { userTokenStore });
+    brokersByProvider[name] = pluginCatalogRuntime.createBroker(name, {
+      userTokenStore
+    });
   }
   return new ProviderCredentialRouter({ brokersByProvider });
 }
@@ -1071,7 +1073,7 @@ ${usage}
       exitCode: 2
     });
   }
-  const plugins = getPluginProviders().map((plugin) => ({
+  const plugins = pluginCatalogRuntime.getProviders().map((plugin) => ({
     name: plugin.manifest.name,
     displayName: plugin.manifest.displayName,
     description: plugin.manifest.description,
@@ -5796,6 +5798,7 @@ import {
   Agent
 } from "@earendil-works/pi-agent-core";
 import { Type as Type21 } from "@sinclair/typebox";
+import { THREAD_STATE_TTL_MS } from "chat";
 
 // src/chat/tools/advisor/session-store.ts
 var ADVISOR_SESSION_TTL_MS = JUNIOR_THREAD_STATE_TTL_MS;
@@ -5892,7 +5895,7 @@ function createAdvisorTool(context) {
         description: "Curated evidence packet: relevant requirements, constraints, current plan, alternatives, code snippets, diffs, command output, and open questions."
       })
     }),
-    execute: async ({ question, context: suppliedContext }) => {
+    execute: async ({ question, context: suppliedContext }, { toolCallId } = {}) => {
       if (typeof question !== "string" || !question.trim()) {
         return failure(
           "invalid_question",
@@ -5914,6 +5917,32 @@ function createAdvisorTool(context) {
         );
       }
       const conversationId = context.conversationId;
+      const advisorSessionKey = getAdvisorSessionKey(conversationId);
+      const subagentInvocationId = typeof toolCallId === "string" && toolCallId.length > 0 ? toolCallId : `advisor:${Date.now()}`;
+      const endSubagent = async (outcome, errorCode) => recordSubagentEnded({
+        conversationId,
+        sessionId: context.parentSessionId,
+        subagentInvocationId,
+        outcome,
+        ...errorCode ? { errorCode } : {},
+        ttlMs: THREAD_STATE_TTL_MS
+      });
+      await recordSubagentStarted({
+        conversationId,
+        sessionId: context.parentSessionId,
+        parentConversationId: conversationId,
+        parentSessionId: context.parentSessionId,
+        ...typeof toolCallId === "string" && toolCallId.length > 0 ? { parentToolCallId: toolCallId } : {},
+        subagentInvocationId,
+        subagentKind: "advisor",
+        transcriptRef: {
+          type: "advisor_session",
+          parentConversationId: conversationId,
+          key: advisorSessionKey
+        },
+        historyMode: "shared",
+        ttlMs: THREAD_STATE_TTL_MS
+      });
       const conversationPrivacy = context.conversationPrivacy ?? "private";
       const requestText = [
         "<advisor-task>",
@@ -5951,6 +5980,7 @@ function createAdvisorTool(context) {
             advisorMessages = await store.load(conversationId);
           } catch {
             setSpanStatus("error");
+            await endSubagent("error", "session_unavailable");
             return failure(
               "session_unavailable",
               "Advisor guidance is unavailable because advisor history could not be loaded. Continue without assuming advisor history."
@@ -5965,7 +5995,7 @@ function createAdvisorTool(context) {
               thinkingLevel: context.config.thinkingLevel,
               tools: context.getTools()
             },
-            sessionId: getAdvisorSessionKey(conversationId),
+            sessionId: advisorSessionKey,
             streamFn: context.streamFn
           });
           advisorAgent.state.messages = advisorMessages;
@@ -5974,6 +6004,7 @@ function createAdvisorTool(context) {
             await advisorAgent.prompt(requestMessage);
           } catch {
             setSpanStatus("error");
+            await endSubagent("error", "unavailable");
             return failure(
               "unavailable",
               "Advisor guidance is unavailable. Continue without advisor guidance if the next step is clear from verified evidence."
@@ -5992,6 +6023,10 @@ function createAdvisorTool(context) {
           });
           if (!assistant || assistant.stopReason === "error" || assistant.stopReason === "aborted") {
             setSpanStatus("error");
+            await endSubagent(
+              assistant?.stopReason === "aborted" ? "aborted" : "error",
+              "unavailable"
+            );
             return failure(
               "unavailable",
               "Advisor guidance is unavailable. Continue without advisor guidance if the next step is clear from verified evidence."
@@ -6002,11 +6037,13 @@ function createAdvisorTool(context) {
             await store.save(conversationId, advisorAgent.state.messages);
           } catch {
             setSpanStatus("error");
+            await endSubagent("error", "session_unavailable");
             return failure(
               "session_unavailable",
               "Advisor guidance is unavailable because advisor history could not be saved. Retry the advisor call or continue without assuming advisor history."
             );
           }
+          await endSubagent("success");
           setSpanStatus("ok");
           return success(memo);
         },
@@ -6954,7 +6991,7 @@ function parseOAuthStatePayload(value) {
   };
 }
 function formatProviderLabel(provider) {
-  const displayName = getPluginDisplayName(provider);
+  const displayName = pluginCatalogRuntime.getDisplayName(provider);
   if (!displayName) {
     throw new Error(`Unknown plugin provider display name: "${provider}"`);
   }
@@ -7037,7 +7074,7 @@ async function deliverPrivateMessage(input) {
   }
 }
 async function startOAuthFlow(provider, input) {
-  const providerConfig = getPluginOAuthConfig(provider);
+  const providerConfig = pluginCatalogRuntime.getOAuthConfig(provider);
   if (!providerConfig) {
     return {
       ok: false,
@@ -7394,7 +7431,7 @@ function manifestDomains(manifest) {
   return [...domains].sort((left, right) => left.localeCompare(right));
 }
 function providerEntries() {
-  return getPluginProviders().map((plugin) => ({
+  return pluginCatalogRuntime.getProviders().map((plugin) => ({
     provider: plugin.manifest.name,
     domains: manifestDomains(plugin.manifest)
   })).filter((entry) => entry.domains.length > 0).sort((left, right) => left.provider.localeCompare(right.provider));
@@ -7460,7 +7497,7 @@ function buildSandboxEgressNetworkPolicy(input) {
 }
 async function resolveSandboxCommandEnvironment() {
   const env = {};
-  for (const plugin of getPluginProviders().sort(
+  for (const plugin of pluginCatalogRuntime.getProviders().sort(
     (left, right) => left.manifest.name.localeCompare(right.manifest.name)
   )) {
     Object.assign(env, resolvePluginCommandEnv(plugin.manifest));
@@ -9200,7 +9237,7 @@ function normalizeToolResult(result, isSandboxResult) {
 import { PluginToolInputError } from "@sentry/junior-plugin-api";
 
 // src/chat/services/plugin-auth-orchestration.ts
-import { THREAD_STATE_TTL_MS } from "chat";
+import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS2 } from "chat";
 
 // src/chat/mcp/auth-store.ts
 import {
@@ -9562,7 +9599,7 @@ function createPluginAuthOrchestration(input) {
     if (pendingPause) {
       throw pendingPause;
     }
-    if (!input.requesterId || !getPluginOAuthConfig(provider)) {
+    if (!input.requesterId || !pluginCatalogRuntime.getOAuthConfig(provider)) {
       throw new Error(`Cannot start plugin authorization for ${provider}`);
     }
     if (input.authorizationFlowMode === "disabled") {
@@ -9630,7 +9667,7 @@ function createPluginAuthOrchestration(input) {
           sessionId: input.sessionId
         }),
         delivery: reusingPendingLink ? "private_link_reused" : "private_link_sent",
-        ttlMs: THREAD_STATE_TTL_MS
+        ttlMs: THREAD_STATE_TTL_MS2
       });
     }
     pendingPause = new PluginAuthorizationPauseError(
@@ -9669,7 +9706,7 @@ function createPluginAuthOrchestration(input) {
           signal.message ?? `${formatProviderLabel(provider)} credentials are required. Please connect your ${formatProviderLabel(provider)} account and try again.`
         );
       }
-      if (!getPluginOAuthConfig(authorization.provider)) {
+      if (!pluginCatalogRuntime.getOAuthConfig(authorization.provider)) {
         throw new PluginCredentialFailureError(
           provider,
           signal.message ?? `${formatProviderLabel(provider)} credentials are required but the provider is not configured for OAuth.`
@@ -10767,7 +10804,7 @@ async function persistYieldSessionRecord(args) {
 }
 
 // src/chat/services/mcp-auth-orchestration.ts
-import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS2 } from "chat";
+import { THREAD_STATE_TTL_MS as THREAD_STATE_TTL_MS3 } from "chat";
 
 // src/chat/mcp/oauth.ts
 import { randomUUID as randomUUID3 } from "crypto";
@@ -10929,7 +10966,7 @@ function getMcpOAuthCallbackPath(provider) {
   return `/api/oauth/callback/mcp/${provider}`;
 }
 function requirePluginWithMcp(provider) {
-  const plugin = getPluginDefinition(provider);
+  const plugin = pluginCatalogRuntime.getDefinition(provider);
   if (!plugin?.manifest.mcp) {
     throw new Error(`Plugin "${provider}" does not support MCP`);
   }
@@ -11145,7 +11182,7 @@ function createMcpAuthOrchestration(input) {
         sessionId
       }),
       delivery: reusingPendingLink ? "private_link_reused" : "private_link_sent",
-      ttlMs: THREAD_STATE_TTL_MS2
+      ttlMs: THREAD_STATE_TTL_MS3
     });
     pendingPause = new McpAuthorizationPauseError(
       provider,
@@ -11385,6 +11422,20 @@ function withoutTrailingUncheckpointedUserPrompt(messages, userContentParts) {
   return messages.slice(0, -1);
 }
 async function generateAssistantReply(messageText2, context) {
+  const conversationPrivacy = resolveConversationPrivacy({
+    channelId: context.correlation?.channelId,
+    conversationId: context.correlation?.conversationId ?? context.correlation?.threadId ?? context.correlation?.runId
+  });
+  return runWithConversationPrivacy(
+    conversationPrivacy ?? "private",
+    () => generateAssistantReplyInPrivacyContext(
+      messageText2,
+      context,
+      conversationPrivacy
+    )
+  );
+}
+async function generateAssistantReplyInPrivacyContext(messageText2, context, conversationPrivacy) {
   if (!context.destination) {
     throw new TypeError("Assistant reply generation requires a destination");
   }
@@ -11422,10 +11473,6 @@ async function generateAssistantReply(messageText2, context) {
     actorType: credentialActor.type,
     actorId: credentialActor.type === "user" ? credentialActor.userId : credentialActor.id
   } : {};
-  const conversationPrivacy = resolveConversationPrivacy({
-    channelId: context.correlation?.channelId,
-    conversationId: context.correlation?.conversationId ?? context.correlation?.threadId ?? context.correlation?.runId
-  });
   const sessionRecordLogContext = {
     threadId: context.correlation?.threadId,
     requesterId: context.correlation?.requesterId,
@@ -11442,7 +11489,7 @@ async function generateAssistantReply(messageText2, context) {
     await recordMcpProviderConnected({
       conversationId: timeoutResumeConversationId,
       provider,
-      ttlMs: THREAD_STATE_TTL_MS3
+      ttlMs: THREAD_STATE_TTL_MS4
     });
     connectedMcpProviders.add(provider);
   };
@@ -11478,7 +11525,7 @@ async function generateAssistantReply(messageText2, context) {
     });
     if (!startupDiscoveryLogged) {
       startupDiscoveryLogged = true;
-      const plugins = getPluginProviders();
+      const plugins = pluginCatalogRuntime.getProviders();
       const roots = [
         ...new Set(availableSkills.map((skill) => skill.skillPath))
       ].sort();
@@ -11536,6 +11583,19 @@ async function generateAssistantReply(messageText2, context) {
     canRecordMcpProviders = Boolean(
       turnSessionState.canUseTurnSession && sessionConversationId && sessionId
     );
+    const recordParentToolExecutionStart = async (event) => {
+      if (!turnSessionState.canUseTurnSession || !sessionConversationId || !sessionId) {
+        return;
+      }
+      await recordToolExecutionStarted({
+        conversationId: sessionConversationId,
+        sessionId,
+        toolCallId: event.toolCallId,
+        toolName: event.toolName,
+        args: event.args,
+        ttlMs: THREAD_STATE_TTL_MS4
+      });
+    };
     const persistedConfigurationValues = context.channelConfiguration ? await context.channelConfiguration.resolveValues() : {};
     configurationValues = {
       ...getConfigDefaults(),
@@ -11724,10 +11784,13 @@ async function generateAssistantReply(messageText2, context) {
       authorizationFlowMode: context.authorizationFlowMode,
       userTokenStore
     });
-    mcpToolManager = new McpToolManager(getPluginMcpProviders(), {
-      authProviderFactory: mcpAuth.authProviderFactory,
-      onAuthorizationRequired: mcpAuth.onAuthorizationRequired
-    });
+    mcpToolManager = new McpToolManager(
+      pluginCatalogRuntime.getMcpProviders(),
+      {
+        authProviderFactory: mcpAuth.authProviderFactory,
+        onAuthorizationRequired: mcpAuth.onAuthorizationRequired
+      }
+    );
     const turnMcpToolManager = mcpToolManager;
     const getPendingAuthPause = () => pluginAuth.getPendingPause() ?? mcpAuth.getPendingPause();
     setTags({
@@ -11755,6 +11818,7 @@ async function generateAssistantReply(messageText2, context) {
         config: botConfig.advisor,
         conversationId: sessionConversationId,
         conversationPrivacy,
+        parentSessionId: sessionId,
         logContext: spanContext,
         getTools: () => advisorTools,
         streamFn: createTracedStreamFn({ conversationPrivacy })
@@ -12081,6 +12145,9 @@ async function generateAssistantReply(messageText2, context) {
       }
     });
     const unsubscribe = agent.subscribe((event) => {
+      if (event.type === "tool_execution_start") {
+        return recordParentToolExecutionStart(event);
+      }
       if (event.type === "turn_end" && event.toolResults.length > 0) {
         return persistSafeBoundary([...agent.state.messages]).then(
           () => void 0

package/dist/{chunk-Y3EG7S7P.js → chunk-WCXVEQPI.js}

@@ -1,13 +1,12 @@
 import {
-  getPluginForSkillPath,
-  getPluginSkillRoots
-} from "./chunk-YLVJRYTD.js";
+  pluginCatalogRuntime
+} from "./chunk-TW23AT22.js";
 import {
   skillRoots
-} from "./chunk-Q3XNY442.js";
+} from "./chunk-6APU57E6.js";
 import {
   logWarn
-} from "./chunk-EJN6G5A2.js";
+} from "./chunk-KF7522P3.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";
@@ -162,7 +161,7 @@ function resolveSkillRoots(options) {
   const additionalRoots = options?.additionalRoots ?? [];
   const envRoots = process.env.SKILL_DIRS?.split(path.delimiter).filter(Boolean) ?? [];
   const defaults = skillRoots();
-  const pluginRoots = getPluginSkillRoots();
+  const pluginRoots = pluginCatalogRuntime.getSkillRoots();
   const seen = /* @__PURE__ */ new Set();
   const resolved = [];
   for (const root of [
@@ -181,7 +180,7 @@ function resolveSkillRoots(options) {
   return resolved;
 }
 function resolveSkillPlugin(meta) {
-  const plugin = getPluginForSkillPath(meta.skillPath);
+  const plugin = pluginCatalogRuntime.getForSkillPath(meta.skillPath);
   if (meta.pluginProvider && plugin?.manifest.name !== meta.pluginProvider) {
     throw new Error(
       `Skill "${meta.name}" metadata names plugin "${meta.pluginProvider}" but is not owned by that plugin`
@@ -233,7 +232,7 @@ async function readSkillDirectory(skillDir) {
       return null;
     }
     const { name, description, allowedTools, disableModelInvocation } = parsed.skill;
-    const plugin = getPluginForSkillPath(skillDir);
+    const plugin = pluginCatalogRuntime.getForSkillPath(skillDir);
     return {
       name,
       description,

package/dist/{chunk-LXTPBU4K.js → chunk-X2FL5ZH5.js}

@@ -1,6 +1,6 @@
 import {
   getChatConfig
-} from "./chunk-T77LUIX3.js";
+} from "./chunk-ABRNFE3N.js";
 
 // src/chat/state/adapter.ts
 import { createMemoryState } from "@chat-adapter/state-memory";

package/dist/{chunk-SSWBYEFH.js → chunk-Y3YUOEAZ.js}

@@ -1,10 +1,10 @@
 import {
   createPluginLogger,
   createPluginState
-} from "./chunk-RARSKPVT.js";
+} from "./chunk-GUO4EE7L.js";
 import {
   getDb
-} from "./chunk-237T7XAN.js";
+} from "./chunk-PQ2U2AO3.js";
 import {
   SANDBOX_WORKSPACE_ROOT
 } from "./chunk-G3E7SCME.js";
@@ -13,20 +13,20 @@ import {
   isConversationScopedChannel,
   isDmChannel,
   normalizeSlackConversationId
-} from "./chunk-Q6XFTRV5.js";
+} from "./chunk-4XHCVBXH.js";
 import {
   botConfig,
   completeObject,
   embedTexts
-} from "./chunk-T77LUIX3.js";
+} from "./chunk-ABRNFE3N.js";
 import {
   isActorUserId,
   parseActorUserId
-} from "./chunk-VALUBQ7R.js";
+} from "./chunk-ZPCGQRFJ.js";
 import {
   logInfo,
   logWarn
-} from "./chunk-EJN6G5A2.js";
+} from "./chunk-KF7522P3.js";
 
 // src/chat/plugins/agent-hooks.ts
 import { promptMessageSchema } from "@sentry/junior-plugin-api";
@@ -522,7 +522,13 @@ function getPluginTools(context) {
           `Duplicate plugin tool "${name}" from plugin "${pluginName}"`
         );
       }
-      tools[name] = tool;
+      const definition = tool;
+      definition.identity = {
+        id: `${pluginName}.${name}`,
+        name,
+        plugin: pluginName
+      };
+      tools[name] = definition;
     }
   }
   return tools;