@sentry/junior 0.119.0 → 0.120.0

package/dist/{chunk-BLQZACHV.js → chunk-24B5R6OU.js}

@@ -1,21 +1,23 @@
 import {
   getDb
-} from "./chunk-D3N4BPSL.js";
+} from "./chunk-M243JMZH.js";
 import {
-  juniorConversationAnnotations
+  juniorConversationAnnotations,
+  juniorIdentities,
+  juniorUsers
 } from "./chunk-GCGJGSQL.js";
 import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   sleep
-} from "./chunk-VJTWKJWQ.js";
+} from "./chunk-ALAKN7LR.js";
 import {
   botConfig,
   completeObject,
   embedTexts,
   getSlackBotToken,
   standardModelId
-} from "./chunk-VLTWQQKH.js";
+} from "./chunk-VURFJVFH.js";
 import {
   isActorUserId,
   parseActorUserId
@@ -24,10 +26,11 @@ import {
   logException,
   logInfo,
   logWarn,
+  normalizeIdentityEmail,
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-ZJ6IVZVO.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   parseSlackChannelReferenceId,
   parseSlackMessageTs,
@@ -321,6 +324,55 @@ function getSlackToolContext(context) {
   };
 }
 
+// src/chat/plugins/viewer-actors.ts
+import { and as and2, eq as eq2 } from "drizzle-orm";
+import {
+  actorSchema
+} from "@sentry/junior-plugin-api";
+async function readViewerActorsFromSql(db, email) {
+  const normalizedEmail = normalizeIdentityEmail(email);
+  if (!normalizedEmail) return [];
+  const rows = await db.select({
+    displayName: juniorIdentities.displayName,
+    email: juniorUsers.primaryEmail,
+    handle: juniorIdentities.handle,
+    provider: juniorIdentities.provider,
+    providerSubjectId: juniorIdentities.providerSubjectId,
+    providerTenantId: juniorIdentities.providerTenantId
+  }).from(juniorIdentities).innerJoin(juniorUsers, eq2(juniorUsers.id, juniorIdentities.userId)).where(
+    and2(
+      eq2(juniorUsers.primaryEmailNormalized, normalizedEmail),
+      eq2(juniorIdentities.kind, "user")
+    )
+  );
+  const actors = [];
+  for (const row of rows) {
+    const candidate = row.provider === "slack" ? {
+      platform: "slack",
+      teamId: row.providerTenantId,
+      userId: row.providerSubjectId,
+      email: row.email,
+      ...row.displayName ? { fullName: row.displayName } : {},
+      ...row.handle ? { userName: row.handle } : {}
+    } : row.provider === "local" ? {
+      platform: "local",
+      userId: row.providerSubjectId,
+      email: row.email,
+      ...row.displayName ? { fullName: row.displayName } : {},
+      ...row.handle ? { userName: row.handle } : {}
+    } : void 0;
+    if (!candidate) continue;
+    const parsed = actorSchema.safeParse(candidate);
+    if (parsed.success && parsed.data.platform !== "system") {
+      actors.push(parsed.data);
+    }
+  }
+  return actors;
+}
+async function readViewerActors(email) {
+  return await readViewerActorsFromSql(getDb(), email);
+}
+
 // src/chat/credentials/subject.ts
 import { createHmac, timingSafeEqual } from "crypto";
 
@@ -941,6 +993,7 @@ function invocationPluginContext(plugin, context) {
     ...base,
     conversationId: context.conversationId,
     embedder: createPluginEmbedder(plugin.manifest.name),
+    model: createPluginModel(plugin.manifest.name, plugin.model),
     source: context.source,
     text: context.userText ?? "",
     state: createPluginState(plugin.manifest.name)
@@ -968,6 +1021,32 @@ function invocationPluginContext(plugin, context) {
     actor: context.actor?.platform === "local" ? context.actor : void 0
   };
 }
+function pluginMcpContext(plugin, context) {
+  const manager = context.mcpToolManager;
+  const wrappedTools = new Set(plugin.manifest.mcp?.wrappedTools ?? []);
+  if (!manager || wrappedTools.size === 0) {
+    return void 0;
+  }
+  const provider = plugin.manifest.name;
+  const prepare = async () => {
+    await manager.activateProvider(provider);
+    return manager.getActiveProviders().includes(provider) ? "ready" : "authorization_pending";
+  };
+  return {
+    prepare,
+    async callTool(input) {
+      if (await prepare() === "authorization_pending") {
+        return { status: "authorization_pending" };
+      }
+      return await manager.callWrappedTool(
+        provider,
+        input.name,
+        input.arguments ?? {},
+        input.toolCallId ? { toolCallId: input.toolCallId } : void 0
+      );
+    }
+  };
+}
 function safeErrorMessage(error) {
   return error instanceof Error ? error.message : String(error);
 }
@@ -1239,6 +1318,7 @@ function getPluginTools(context) {
       db: getDb(),
       plugin: pluginName
     }) : void 0;
+    const mcp = pluginMcpContext(plugin, context);
     let pluginContext;
     if (context.source.platform === "slack") {
       if (context.destination.platform !== "slack") {
@@ -1257,6 +1337,7 @@ function getPluginTools(context) {
         userText: context.userText,
         embedder: createPluginEmbedder(pluginName),
         egress: context.egress,
+        ...mcp ? { mcp } : {},
         model: createPluginModel(pluginName, plugin.model),
         state: createPluginState(pluginName)
       };
@@ -1276,6 +1357,7 @@ function getPluginTools(context) {
         userText: context.userText,
         embedder: createPluginEmbedder(pluginName),
         egress: context.egress,
+        ...mcp ? { mcp } : {},
         model: createPluginModel(pluginName, plugin.model),
         state: createPluginState(pluginName)
       };
@@ -1416,7 +1498,10 @@ function getPluginApiRoutes() {
       continue;
     }
     const app = hook({
-      ...basePluginContext(plugin)
+      ...basePluginContext(plugin),
+      viewer: {
+        actors: readViewerActors
+      }
     });
     if (app === void 0) {
       continue;
@@ -1853,6 +1938,7 @@ export {
   setDashboardConversationLinkOptions,
   getDashboardConversationLink,
   getSlackToolContext,
+  readViewerActors,
   runWithWorkspaceTeamId,
   getWorkspaceTeamId,
   SlackActionError,

package/dist/{chunk-JXRAOOXQ.js → chunk-6WX5SPI3.js}

@@ -1,6 +1,6 @@
 import {
   getDb
-} from "./chunk-D3N4BPSL.js";
+} from "./chunk-M243JMZH.js";
 import {
   juniorStats
 } from "./chunk-GCGJGSQL.js";

package/dist/{chunk-VJTWKJWQ.js → chunk-ALAKN7LR.js}

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

package/dist/{chunk-ZJ6IVZVO.js → chunk-ALYQOZG7.js}

@@ -13,7 +13,7 @@ import {
 } from "./chunk-6GWA276C.js";
 import {
   getDeploymentTelemetryAttributes
-} from "./chunk-NUENIPQL.js";
+} from "./chunk-DWOH57FW.js";
 
 // src/chat/logging.ts
 import path from "path";

package/dist/{chunk-ZFX4M743.js → chunk-BHXW734F.js}

@@ -22,28 +22,28 @@ import {
   persistThreadStateById,
   stripRuntimeTurnContext,
   updateConversationStats
-} from "./chunk-BNJEPYTC.js";
+} from "./chunk-JQWP6V22.js";
 import {
   createPluginEmbedder,
   createPluginLogger,
   createPluginModel,
   createPluginState,
   getPlugins
-} from "./chunk-BLQZACHV.js";
+} from "./chunk-24B5R6OU.js";
 import {
   getDb
-} from "./chunk-D3N4BPSL.js";
+} from "./chunk-M243JMZH.js";
 import {
   getStateAdapter
-} from "./chunk-VJTWKJWQ.js";
+} from "./chunk-ALAKN7LR.js";
 import {
   ProviderError,
   getProviderErrorAttributes,
   getProviderErrorUserMessage
-} from "./chunk-VLTWQQKH.js";
+} from "./chunk-VURFJVFH.js";
 import {
   buildTurnFailureResponse
-} from "./chunk-ZJ6IVZVO.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   parseSlackMessageTs
 } from "./chunk-F3B2YJ76.js";

package/dist/{chunk-GKFDU3ZI.js → chunk-DJDGDJDF.js}

@@ -2,18 +2,18 @@ import {
   SANDBOX_WORKSPACE_ROOT,
   getStateAdapter,
   sleep
-} from "./chunk-VJTWKJWQ.js";
+} from "./chunk-ALAKN7LR.js";
 import {
   toOptionalTrimmed
-} from "./chunk-VLTWQQKH.js";
+} from "./chunk-VURFJVFH.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-JSTGI7TX.js";
+} from "./chunk-GNNV3UTY.js";
 import {
   setSpanAttributes,
   setSpanStatus,
   withSpan
-} from "./chunk-ZJ6IVZVO.js";
+} from "./chunk-ALYQOZG7.js";
 
 // src/chat/sandbox/snapshot/profile.ts
 import { createHash } from "crypto";

package/dist/{chunk-JLJLZS2N.js → chunk-DMKHRBI6.js}

@@ -1,7 +1,7 @@
 // package.json
 var package_default = {
   name: "@sentry/junior",
-  version: "0.119.0",
+  version: "0.120.0",
   private: false,
   publishConfig: {
     access: "public"
@@ -49,7 +49,8 @@ var package_default = {
   files: [
     "dist",
     "bin",
-    "migrations"
+    "migrations",
+    "skills"
   ],
   scripts: {
     prepare: "pnpm run build",
@@ -61,7 +62,7 @@ var package_default = {
     test: "vitest run --maxWorkers=4",
     "test:watch": "vitest",
     typecheck: "tsc --noEmit",
-    "skills:check": "node scripts/check-skills.mjs",
+    "skills:check": "node --test scripts/check-skills.test.mjs && node scripts/check-skills.mjs",
     "test:coverage": "vitest run --maxWorkers=4 --coverage --reporter=default --reporter=junit --outputFile.junit=coverage/results.junit.xml"
   },
   dependencies: {

package/dist/{chunk-NUENIPQL.js → chunk-DWOH57FW.js}

@@ -1,6 +1,6 @@
 import {
   JUNIOR_VERSION
-} from "./chunk-JLJLZS2N.js";
+} from "./chunk-DMKHRBI6.js";
 
 // src/deployment.ts
 var JUNIOR_HEARTBEAT_ROUTE = "/api/internal/heartbeat";

package/dist/{chunk-QZ7XRJDB.js → chunk-EIVE6GL4.js}

@@ -1,12 +1,12 @@
 import {
   pluginCatalogRuntime
-} from "./chunk-JSTGI7TX.js";
+} from "./chunk-GNNV3UTY.js";
 import {
   logWarn
-} from "./chunk-ZJ6IVZVO.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   skillRoots
-} from "./chunk-3V7OFJZC.js";
+} from "./chunk-H4HBKISO.js";
 
 // src/chat/skills.ts
 import fs from "fs/promises";

package/dist/{chunk-TGIQN7QW.js → chunk-ERYVNWNE.js}

@@ -30,7 +30,7 @@ import {
   toMcpProviderError,
   toolInvocationDestination,
   uploadFilesToConversation
-} from "./chunk-4UIUDOOV.js";
+} from "./chunk-TKUCRFNX.js";
 import {
   CooperativeTurnYieldError,
   JUNIOR_THREAD_STATE_TTL_MS,
@@ -72,7 +72,7 @@ import {
   stripRuntimeTurnContext,
   trimTrailingAssistantMessages,
   updateConversationStats
-} from "./chunk-BNJEPYTC.js";
+} from "./chunk-JQWP6V22.js";
 import {
   parseSandboxEgressAuthRequiredSignal,
   parseSandboxEgressPermissionDeniedSignal,
@@ -96,10 +96,10 @@ import {
   runNonInteractiveCommand,
   throwSandboxOperationError,
   wrapSandboxSetupError
-} from "./chunk-GKFDU3ZI.js";
+} from "./chunk-DJDGDJDF.js";
 import {
   incrementStat
-} from "./chunk-JXRAOOXQ.js";
+} from "./chunk-6WX5SPI3.js";
 import {
   addAgentTurnUsage,
   hasAgentTurnUsage
@@ -121,7 +121,7 @@ import {
   normalizeSlackConversationId,
   resolveChannelCapabilities,
   withSlackRetries
-} from "./chunk-BLQZACHV.js";
+} from "./chunk-24B5R6OU.js";
 import {
   KNOWN_CONVERSATION_EVENT_TYPES,
   contextProvenance,
@@ -130,7 +130,7 @@ import {
   getConversationStore,
   instructionActors,
   instructionProvenanceFor
-} from "./chunk-D3N4BPSL.js";
+} from "./chunk-M243JMZH.js";
 import {
   SANDBOX_DATA_ROOT,
   SANDBOX_SKILLS_ROOT,
@@ -140,7 +140,7 @@ import {
   sandboxSkillFile,
   sandboxSkillPathResolution,
   sleep
-} from "./chunk-VJTWKJWQ.js";
+} from "./chunk-ALAKN7LR.js";
 import {
   ACTIVE_TURN_COMPACTION_SUMMARY_PREFIX,
   COMPACTION_SUMMARY_PREFIX,
@@ -171,7 +171,7 @@ import {
   renderCurrentInstruction,
   resolveGatewayModel,
   unwrapCurrentInstruction
-} from "./chunk-VLTWQQKH.js";
+} from "./chunk-VURFJVFH.js";
 import {
   canExposeConversationPayload,
   parseSlackThreadId,
@@ -188,10 +188,10 @@ import {
   findSkillByName,
   loadSkillsByName,
   parseSkillInvocation
-} from "./chunk-QZ7XRJDB.js";
+} from "./chunk-EIVE6GL4.js";
 import {
   pluginCatalogRuntime
-} from "./chunk-JSTGI7TX.js";
+} from "./chunk-GNNV3UTY.js";
 import {
   CredentialUnavailableError,
   OAuthProviderError,
@@ -199,7 +199,7 @@ import {
   getOAuthProviderErrorAttributes,
   resolveAuthTokenPlaceholder,
   resolvePluginCommandEnv
-} from "./chunk-R53UT2OI.js";
+} from "./chunk-XAI2HNAY.js";
 import {
   credentialUserSubjectId
 } from "./chunk-W3U3YQYI.js";
@@ -223,7 +223,7 @@ import {
   summarizeMessageText,
   withLogContext,
   withSpan
-} from "./chunk-ZJ6IVZVO.js";
+} from "./chunk-ALYQOZG7.js";
 import {
   parseSlackChannelId,
   parseSlackMessageTs,
@@ -237,7 +237,7 @@ import {
   listReferenceFiles,
   soulPathCandidates,
   worldPathCandidates
-} from "./chunk-3V7OFJZC.js";
+} from "./chunk-H4HBKISO.js";
 
 // src/chat/configuration/defaults.ts
 var installDefaults = {};
@@ -6490,6 +6490,7 @@ var McpToolManager = class {
     try {
       const client = await this.getClient(plugin);
       const tools = this.filterListedTools(plugin, await client.listTools());
+      this.assertWrappedToolsAvailable(plugin, tools);
       this.toolsByProvider.set(
         provider,
         tools.map((tool) => this.toManagedTool(plugin, client, tool))
@@ -6540,8 +6541,26 @@ var McpToolManager = class {
         `Plugin ${plugin.manifest.name} MCP discovery missing allowlisted tools: ${missingTools.join(", ")}`
       );
     }
-    const allowedToolSet = new Set(allowedTools);
-    return tools.filter((tool) => allowedToolSet.has(tool.name));
+    const loadedToolSet = /* @__PURE__ */ new Set([
+      ...allowedTools,
+      ...plugin.manifest.mcp?.wrappedTools ?? []
+    ]);
+    return tools.filter((tool) => loadedToolSet.has(tool.name));
+  }
+  assertWrappedToolsAvailable(plugin, tools) {
+    const wrappedTools = plugin.manifest.mcp?.wrappedTools ?? [];
+    if (wrappedTools.length === 0) {
+      return;
+    }
+    const availableToolNames = new Set(tools.map((tool) => tool.name));
+    const missingTools = wrappedTools.filter(
+      (toolName) => !availableToolNames.has(toolName)
+    );
+    if (missingTools.length > 0) {
+      throw new Error(
+        `Plugin ${plugin.manifest.name} MCP discovery missing wrapped tools: ${missingTools.join(", ")}`
+      );
+    }
   }
   async getClient(plugin) {
     const existing = this.clientsByProvider.get(plugin.manifest.name);
@@ -6627,8 +6646,13 @@ var McpToolManager = class {
                   "gen_ai.tool.call.result": resultAttribute
                 });
               }
+              const providerContent = boundMcpContent(
+                toAgentToolContent(result)
+              );
               return {
-                content: toModelVisibleMcpContent(result)
+                content: toModelVisibleMcpContent(result),
+                providerContent,
+                ...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {}
               };
             } catch (error) {
               if (error instanceof McpAuthorizationRequiredError && await this.handleAuthorizationRequired(
@@ -6639,7 +6663,9 @@ var McpToolManager = class {
                   { type: "text", text: "Authorization pending." }
                 ];
                 return {
-                  content: parkedContent
+                  authorizationPending: true,
+                  content: parkedContent,
+                  providerContent: parkedContent
                 };
               }
               const errorAttributes = {
@@ -6692,10 +6718,59 @@ var McpToolManager = class {
       if (options.provider && provider !== options.provider) {
         continue;
       }
-      resolved.push(...this.toolsByProvider.get(provider) ?? []);
+      const wrappedTools = new Set(
+        this.pluginsByProvider.get(provider)?.manifest.mcp?.wrappedTools ?? []
+      );
+      resolved.push(
+        ...(this.toolsByProvider.get(provider) ?? []).filter(
+          (tool) => !wrappedTools.has(tool.rawName)
+        )
+      );
     }
     return resolved;
   }
+  /** Call one active provider tool declared for plugin-owned wrapping. */
+  async callWrappedTool(provider, rawName, args, options) {
+    if (!this.activeProviders.has(provider)) {
+      throw new McpToolError(`MCP provider is not active: ${provider}`);
+    }
+    const wrappedTools = new Set(
+      this.pluginsByProvider.get(provider)?.manifest.mcp?.wrappedTools ?? []
+    );
+    if (!wrappedTools.has(rawName)) {
+      throw new McpToolError(
+        `Plugin ${provider} cannot call unwrapped MCP tool ${rawName}`
+      );
+    }
+    const tool = (this.toolsByProvider.get(provider) ?? []).find(
+      (candidate) => candidate.rawName === rawName
+    );
+    if (!tool) {
+      throw new McpToolError(
+        `MCP provider ${provider} does not expose tool ${rawName}`
+      );
+    }
+    let result;
+    try {
+      result = await tool.execute(args, {
+        conversationPrivacy: "private",
+        ...options?.toolCallId ? { toolCallId: options.toolCallId } : {}
+      });
+    } catch (error) {
+      if (error instanceof McpToolError) {
+        return { status: "error", message: error.message };
+      }
+      throw error;
+    }
+    if (result.authorizationPending) {
+      return { status: "authorization_pending" };
+    }
+    return {
+      status: "success",
+      content: result.providerContent ?? result.content,
+      ...result.structuredContent !== void 0 ? { structuredContent: result.structuredContent } : {}
+    };
+  }
   toToolDescriptor(tool) {
     return {
       name: tool.name,

package/dist/{chunk-JSTGI7TX.js → chunk-GNNV3UTY.js}

@@ -1,6 +1,6 @@
 import {
   createPluginCatalogRuntime
-} from "./chunk-R53UT2OI.js";
+} from "./chunk-XAI2HNAY.js";
 
 // src/chat/plugins/catalog-runtime.ts
 var pluginCatalogRuntime = createPluginCatalogRuntime();