@sentry/junior 0.222.0 → 0.224.0

package/dist/{agent-hooks-DkriF84n.js → agent-hooks-DNLBwmsh.js}

@@ -1,21 +1,21 @@
 import { t as __exportAll } from "./rolldown-runtime-B4FMCO8f.js";
-import { a as embedTexts, r as completeObject } from "./client-CcSboWx_.js";
-import { C as withSpan, P as normalizeIdentityEmail, _ as setSpanAttributes, d as logInfo, f as logWarn, u as logException, v as setSpanStatus } from "./logging-qmsMdU0y.js";
+import { a as embedTexts, r as completeObject } from "./client-B27ufhzl.js";
+import { C as withSpan, F as isRecord$2, P as normalizeIdentityEmail, _ as setSpanAttributes, d as logInfo, f as logWarn, u as logException, v as setSpanStatus } from "./logging-iY0ssa2q.js";
 import { a as getClient$1 } from "./sentry-CgWZM_kV.js";
-import { t as canExposeConversationPayload } from "./conversation-privacy-BGjdDVWD.js";
-import { a as getChatConfig, n as botConfig, s as getSlackBotToken } from "./config-CGYv-YPE.js";
+import { t as canExposeConversationPayload } from "./conversation-privacy-C-4JQzKD.js";
+import { a as getChatConfig, n as botConfig, s as getSlackBotToken } from "./config-BAhl7-RC.js";
 import { n as defaultModelId } from "./model-profile-CZmVoGdX.js";
 import { _ as parseSlackMessageTs, c as isActorUserId, h as parseSlackTeamId, m as parseSlackChannelReferenceId, u as parseActorUserId } from "./context-Bplcgypl.js";
 import { n as juniorDestinations } from "./destinations-BeBiJeEM.js";
-import { C as juniorCodeRepositories, D as juniorIdentities, E as juniorConversations, O as juniorUsers, S as juniorCodeChanges, T as conversationReadColumns, _ as CONVERSATION_METRICS, g as juniorConversationBriefs, h as juniorConversationBindings, i as juniorWorkspaces, m as juniorConversationParticipants, n as juniorSnapshots, r as juniorWorkspaceRepos, t as createJuniorSqlExecutor, v as juniorConversationMetrics, x as juniorConversationAnnotations, y as juniorConversationEvents } from "./executor-BLBZ-UB8.js";
-import { A as readMessageCards, C as conversationReportEventSchema, F as conversationBriefSchema, H as decodeStoredConversationEvent, I as parseBriefInput, U as historyReplacementSchema, W as newConversationEventSchema, Y as usageSchema, z as conversationEventDataSchema } from "./conversation-BBDt88di.js";
-import { A as sleep$1, P as SANDBOX_WORKSPACE_ROOT, l as isSandboxMissingError, n as hash, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand } from "./profile-DbG8AlNd.js";
-import { n as briefEntriesFromReportEvents, s as generateBrief, t as BRIEF_PROMPT } from "./prompt-B8rCQI7K.js";
+import { C as juniorCodeRepositories, D as juniorIdentities, E as juniorConversations, O as juniorUsers, S as juniorCodeChanges, T as conversationReadColumns, _ as CONVERSATION_METRICS, g as juniorConversationBriefs, h as juniorConversationBindings, i as juniorWorkspaces, m as juniorConversationParticipants, n as juniorSnapshots, r as juniorWorkspaceRepos, t as createJuniorSqlExecutor, v as juniorConversationMetrics, x as juniorConversationAnnotations, y as juniorConversationEvents } from "./executor-BG2Armby.js";
+import { C as conversationReportEventSchema, G as historyReplacementSchema, K as newConversationEventSchema, L as conversationBriefSchema, N as readMessageCards, R as parseBriefInput, V as conversationEventDataSchema, W as decodeStoredConversationEvent, Z as usageSchema } from "./conversation-1HUoZr2l.js";
+import { N as SANDBOX_WORKSPACE_ROOT, k as sleep$1, l as isSandboxMissingError, n as hash, v as getVercelSandboxCredentials, w as getStateAdapter, x as runNonInteractiveCommand } from "./profile-6KWhg_-U.js";
+import { n as briefEntriesFromReportEvents, s as generateBrief, t as BRIEF_PROMPT } from "./prompt-90miy8VV.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { z } from "zod";
 import { createHash, createHmac, randomUUID, timingSafeEqual } from "node:crypto";
 import { and, arrayContains, asc, desc, eq, exists, getTableColumns, gt, gte, inArray, isNotNull, isNull, lt, lte, max, ne, notExists, or, sql } from "drizzle-orm";
-import { codeChangeInputSchema, conversationAnnotationInputSchema, conversationEventPresentationSchema, defineConversationEvent, destinationSchema, eventInputSchema, eventMatchSchema, eventMatches, eventTypeSchema, identitySchema, locationSchema, missingToolAnnotationKeys, normalizeEventIdentifier, pluginEventsSchema, promptContextSchema, promptMessageSchema, sourceSchema, stableEventMatchKey, userSchema } from "@sentry/junior-plugin-api";
+import { codeChangeInputSchema, conversationAnnotationInputSchema, conversationEventPresentationSchema, defineConversationEvent, destinationSchema, eventInputSchema, eventMatchSchema, eventMatches, eventTypeSchema, identitySchema, locationSchema, missingToolAnnotationKeys, normalizeEventIdentifier, objectAnnotationSchema, pluginEventsSchema, promptContextSchema, promptMessageSchema, sourceSchema, stableEventMatchKey, userSchema } from "@sentry/junior-plugin-api";
 import { alias } from "drizzle-orm/pg-core";
 import { WebClient } from "@slack/web-api";
 import { Sandbox } from "@vercel/sandbox";
@@ -1707,6 +1707,43 @@ async function listConversationAnnotationsById(db, conversationIds) {
 	return byConversation;
 }
 //#endregion
+//#region src/chat/conversations/annotation-results.ts
+/** Save object annotations and return their Message card snapshots. */
+async function saveObjectAnnotations(conversationId, plugin, value) {
+	const annotations = objectAnnotationSchema.array().parse(value);
+	await getDb().transaction(async (db) => {
+		const store = createPluginAnnotations({
+			conversationId,
+			plugin,
+			db
+		});
+		for (const annotation of annotations) {
+			await store.upsert(annotation);
+			await store.remove("resource_link", annotation.key);
+		}
+	});
+	return annotations.map((annotation) => ({
+		...annotation,
+		plugin
+	}));
+}
+/** Save annotations from a successful plugin tool result and attach their cards. */
+async function annotateToolResult(conversationId, plugin, result) {
+	if (!isRecord$2(result) || result.isError === true) return result;
+	const details = isRecord$2(result.details) ? result.details : result;
+	if (details.timed_out === true || details.isError === true || !Array.isArray(details.objectAnnotations)) return result;
+	const cards = await saveObjectAnnotations(conversationId, plugin, details.objectAnnotations);
+	const annotated = {
+		...details,
+		objectCards: cards
+	};
+	if (isRecord$2(result.details)) return {
+		...result,
+		details: annotated
+	};
+	return annotated;
+}
+//#endregion
 //#region src/chat/conversations/sql/privacy.ts
 const privacyRoot = alias(juniorConversations, "privacy_root");
 /** Accept only a structurally valid persisted root as privacy authority. */
@@ -2018,7 +2055,7 @@ function reportEventData(args) {
 				...typeof data.meta?.eventType === "string" ? { eventType: data.meta.eventType } : void 0,
 				...typeof data.meta?.explicitMention === "boolean" ? { explicitMention: data.meta.explicitMention } : void 0,
 				...args.canExposePayload && typeof data.meta?.trustedSummary === "string" ? { trustedSummary: data.meta.trustedSummary } : void 0,
-				...args.canExposePayload && data.meta?.cards ? { cards: readMessageCards(data.meta.cards) } : void 0,
+				...args.canExposePayload && (data.meta?.cards || data.meta?.objectCards) ? { cards: readMessageCards(data.meta) } : void 0,
 				...args.canExposePayload ? { text: data.text } : { redacted: true }
 			};
 		}
@@ -4467,7 +4504,7 @@ var PluginHookDeniedError = class extends Error {
 };
 let registeredPlugins = [];
 const PLUGIN_NAME_RE = /^[a-z][a-z0-9-]*$/;
-const PLUGIN_TOOL_NAME_RE = /^[a-z][A-Za-z0-9]*$/;
+const PLUGIN_TASK_NAME_RE = /^[a-z][A-Za-z0-9]*$/;
 const OPERATIONAL_REPORT_MAX_METRICS = 8;
 const OPERATIONAL_REPORT_MAX_WIDGETS = 12;
 const OPERATIONAL_REPORT_MAX_CHART_SERIES = 8;
@@ -4646,7 +4683,7 @@ function validatePlugins(plugins) {
 		if (seen.has(name)) throw new Error(`Duplicate plugin name "${name}"`);
 		if (plugin.events !== void 0 && !pluginEventsSchema.safeParse(plugin.events).success) throw new Error(`Plugin "${name}" events is invalid`);
 		for (const [taskName, task] of Object.entries(plugin.tasks ?? {})) {
-			if (!PLUGIN_TOOL_NAME_RE.test(taskName)) throw new Error(`Plugin task "${taskName}" from plugin "${name}" must be a camelCase identifier`);
+			if (!PLUGIN_TASK_NAME_RE.test(taskName)) throw new Error(`Plugin task "${taskName}" from plugin "${name}" must be a camelCase identifier`);
 			if (typeof task.run !== "function") throw new Error(`Plugin task "${taskName}" from plugin "${name}" must define a run function`);
 		}
 		seen.add(name);
@@ -4885,7 +4922,6 @@ function getPluginTools(context, sandbox = createSandboxCapability(context.works
 		const pluginTools = hook(pluginContext);
 		const namespace = pluginToolNamespace(pluginName);
 		for (const [localName, tool] of Object.entries(pluginTools)) {
-			if (!PLUGIN_TOOL_NAME_RE.test(localName)) throw new Error(`Plugin tool "${localName}" from plugin "${pluginName}" must be a camelCase identifier`);
 			const name = `${namespace}_${localName}`;
 			if (tools[name]) throw new Error(`Duplicate plugin tool "${name}" from plugin "${pluginName}"`);
 			const definition = tool;
@@ -4906,7 +4942,12 @@ function getPluginTools(context, sandbox = createSandboxCapability(context.works
 				description: plugin.manifest.description
 			};
 			definition.exposure ??= "deferred";
-			tools[name] = definition;
+			const execute = definition.execute;
+			if (execute) {
+				const wrapped = Object.create(definition);
+				wrapped.execute = async (input, options) => annotateToolResult(context.conversationId, pluginName, await execute.call(definition, input, options));
+				tools[name] = wrapped;
+			} else tools[name] = definition;
 		}
 	}
 	return tools;
@@ -5264,6 +5305,7 @@ function createPluginHookRunner(input = {}) {
 	const loaded = getPlugins();
 	return {
 		async afterMcpTool(tool) {
+			const cards = [];
 			for (const plugin of loaded) {
 				if (plugin.manifest.name !== tool.provider) continue;
 				const hook = plugin.hooks?.afterMcpTool;
@@ -5274,7 +5316,7 @@ function createPluginHookRunner(input = {}) {
 					plugin: plugin.manifest.name
 				}) : void 0;
 				try {
-					await hook({
+					const result = await hook({
 						...basePluginContext(plugin),
 						...tool.conversationId ? { conversationId: tool.conversationId } : void 0,
 						...annotations ? { annotations } : void 0,
@@ -5284,6 +5326,7 @@ function createPluginHookRunner(input = {}) {
 							name: tool.toolName
 						}
 					});
+					if (result && tool.conversationId) cards.push(...await saveObjectAnnotations(tool.conversationId, plugin.manifest.name, result.objectAnnotations));
 				} catch (error) {
 					logWarn("agent.plugin.after_mcp_tool.failed", {
 						"app.plugin.name": plugin.manifest.name,
@@ -5292,6 +5335,7 @@ function createPluginHookRunner(input = {}) {
 					});
 				}
 			}
+			return cards;
 		},
 		async prepareWorkspace(sandbox, repos, signal) {
 			const preparers = new Set(loaded.filter((plugin) => plugin.hooks?.workspacePrepare).map((plugin) => plugin.manifest.name));
@@ -5393,4 +5437,4 @@ function createPluginHookRunner(input = {}) {
 	};
 }
 //#endregion
-export { resolveViewerUser as $, parseSessionSource as $t, tryWorkspaceRepoCheckoutPath as A, createPluginConversationEvents as At, downloadPrivateSlackFile as B, authenticationUnlinkedEvent as Bt, invalidateReadySnapshot as C, conversationArchivedForEmail as Ct, SANDBOX_RUNTIME as D, conversationNotArchivedForEmail as Dt, setWorkspaceSnapshotBuild as E, conversationHasParticipantUser as Et, bindSlackDirectCredentialSubject as F, listConversationAnnotations as Ft, isDmChannel as G, getDb as Gt, getHeaderString as H, getConversationEventStore as Ht, verifyEventAutomationCredentialSubject as I, listConversationAnnotationsById as It, withSlackRetries as J, withConversationEventLock as Jt, normalizeSlackConversationId as K, getSqlExecutor as Kt, verifyScheduledAutomationCredentialSubject as L, JUNIOR_NATIVE_EVENT_NAMESPACE as Lt, resolveChannelCapabilities as M, readConversationEventPage as Mt, bindEventAutomationCredentialSubject as N, buildSentryConversationUrl as Nt, deleteWorkspaceSnapshotBuilders as O, conversationNotArchivedForUser as Ot, bindScheduledAutomationCredentialSubject as P, resolveRootVisibility as Pt, readActorIdentity as Q, bindProviderConversation as Qt, verifySlackDirectCredentialSubject as R, agentsInstructionsUpdatedEvent as Rt, WorkspaceValidationError as S, conversationArchiveTimes as St, setWorkspaceSnapshot as T, conversationHasParticipantEmail as Tt, getSlackClient as U, getConversationMessageSearchStore as Ut, getFilePermalink as V, db_exports as Vt, isConversationScopedChannel as W, getConversationStore as Wt, runWithWorkspaceTeamId as X, withConversationMutationLock as Xt, getWorkspaceTeamId as Y, sanitizePostgresJson as Yt, findUserByEmail as Z, locationFromRow as Zt, deleteWorkspace as _, createPluginState as _t, getPluginRoutes as a, resolveRootConversationId as an, STOP_WATCHING_TOOL_NAME as at, listWorkspaces as b, createPluginLogger as bt, getPluginTools as c, upsertLinkedIdentity as cn, collectEventMatchKeys as ct, setPlugins as d, requireSlackDestination as dn, findMatchingWatches as dt, addAgentTurnUsage as en, updateViewerDisplayName as et, validatePlugins as f, sameDestination as fn, listWatches as ft, createWorkspace as g, setDashboardConversationLinkOptions as gt, setBriefsConfig as h, getDashboardTaskLink as ht, getPluginApiRoutes as i, hasAgentTurnUsage as in, RESOURCE_WATCH_TOOL_SOURCE as it, workspaceRepoCheckoutPath as j, readLatestConversationBrief as jt, getWorkspaceSnapshotBuilder as k, viewerConversationMembership as kt, getPluginUserPromptContributions as l, createSlackDestination as ln, createWatch as lt, registration_exports as m, getDashboardConversationLink as mt, applyPluginFormatMarkdown as n, agentTurnTotalTokens as nn, RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS as nt, getPluginSlackConversationLink as o, deleteProviderIdentityForSlackUser as on, cancelSubscriptions as ot, coreTaskRegistrations as p, JUNIOR_THREAD_STATE_TTL_MS as pt, runWithSlackInstallationToken as q, createSqlConversationEventStore as qt, createPluginHookRunner as r, agentTurnUsageSchema as rn, RESOURCE_SUBSCRIPTION_MAX_TTL_MS as rt, getPluginSystemPromptContributions as s, upsertIdentity as sn, cancelWatch as st, agent_hooks_exports as t, agentTurnCostUsd as tn, getSlackToolContext as tt, getPlugins as u, parseDestination as un, deliverWatch as ut, getWorkspace as v, createPluginEmbedder as vt, loadSnapshotsForProfile as w, conversationArchivedForUser as wt, updateWorkspace as x, readConversationAccessFromSql as xt, getWorkspaceByName as y, createPluginModel as yt, SlackActionError as z, authenticationLinkedEvent as zt };
+export { resolveViewerUser as $, locationFromRow as $t, tryWorkspaceRepoCheckoutPath as A, createPluginConversationEvents as At, downloadPrivateSlackFile as B, agentsInstructionsUpdatedEvent as Bt, invalidateReadySnapshot as C, conversationArchivedForEmail as Ct, SANDBOX_RUNTIME as D, conversationNotArchivedForEmail as Dt, setWorkspaceSnapshotBuild as E, conversationHasParticipantUser as Et, bindSlackDirectCredentialSubject as F, saveObjectAnnotations as Ft, isDmChannel as G, getConversationMessageSearchStore as Gt, getHeaderString as H, authenticationUnlinkedEvent as Ht, verifyEventAutomationCredentialSubject as I, createPluginAnnotations as It, withSlackRetries as J, getSqlExecutor as Jt, normalizeSlackConversationId as K, getConversationStore as Kt, verifyScheduledAutomationCredentialSubject as L, listConversationAnnotations as Lt, resolveChannelCapabilities as M, readConversationEventPage as Mt, bindEventAutomationCredentialSubject as N, buildSentryConversationUrl as Nt, deleteWorkspaceSnapshotBuilders as O, conversationNotArchivedForUser as Ot, bindScheduledAutomationCredentialSubject as P, resolveRootVisibility as Pt, readActorIdentity as Q, withConversationMutationLock as Qt, verifySlackDirectCredentialSubject as R, listConversationAnnotationsById as Rt, WorkspaceValidationError as S, conversationArchiveTimes as St, setWorkspaceSnapshot as T, conversationHasParticipantEmail as Tt, getSlackClient as U, db_exports as Ut, getFilePermalink as V, authenticationLinkedEvent as Vt, isConversationScopedChannel as W, getConversationEventStore as Wt, runWithWorkspaceTeamId as X, withConversationEventLock as Xt, getWorkspaceTeamId as Y, createSqlConversationEventStore as Yt, findUserByEmail as Z, sanitizePostgresJson as Zt, deleteWorkspace as _, createPluginState as _t, getPluginRoutes as a, agentTurnUsageSchema as an, STOP_WATCHING_TOOL_NAME as at, listWorkspaces as b, createPluginLogger as bt, getPluginTools as c, deleteProviderIdentityForSlackUser as cn, collectEventMatchKeys as ct, setPlugins as d, createSlackDestination as dn, findMatchingWatches as dt, bindProviderConversation as en, updateViewerDisplayName as et, validatePlugins as f, parseDestination as fn, listWatches as ft, createWorkspace as g, setDashboardConversationLinkOptions as gt, setBriefsConfig as h, getDashboardTaskLink as ht, getPluginApiRoutes as i, agentTurnTotalTokens as in, RESOURCE_WATCH_TOOL_SOURCE as it, workspaceRepoCheckoutPath as j, readLatestConversationBrief as jt, getWorkspaceSnapshotBuilder as k, viewerConversationMembership as kt, getPluginUserPromptContributions as l, upsertIdentity as ln, createWatch as lt, registration_exports as m, sameDestination as mn, getDashboardConversationLink as mt, applyPluginFormatMarkdown as n, addAgentTurnUsage as nn, RESOURCE_SUBSCRIPTION_DEFAULT_TTL_MS as nt, getPluginSlackConversationLink as o, hasAgentTurnUsage as on, cancelSubscriptions as ot, coreTaskRegistrations as p, requireSlackDestination as pn, JUNIOR_THREAD_STATE_TTL_MS as pt, runWithSlackInstallationToken as q, getDb as qt, createPluginHookRunner as r, agentTurnCostUsd as rn, RESOURCE_SUBSCRIPTION_MAX_TTL_MS as rt, getPluginSystemPromptContributions as s, resolveRootConversationId as sn, cancelWatch as st, agent_hooks_exports as t, parseSessionSource as tn, getSlackToolContext as tt, getPlugins as u, upsertLinkedIdentity as un, deliverWatch as ut, getWorkspace as v, createPluginEmbedder as vt, loadSnapshotsForProfile as w, conversationArchivedForUser as wt, updateWorkspace as x, readConversationAccessFromSql as xt, getWorkspaceByName as y, createPluginModel as yt, SlackActionError as z, JUNIOR_NATIVE_EVENT_NAMESPACE as zt };