@sentry/junior-plugin-api 0.266.0 → 0.268.0

package/dist/index.d.ts

@@ -1072,6 +1072,10 @@ export declare const eventMatchFieldSchema: z.ZodObject<{
   description: z.ZodString;
   enum: z.ZodOptional<z.ZodArray<z.ZodString>>;
   list: z.ZodOptional<z.ZodLiteral<true>>;
+  case: z.ZodOptional<z.ZodEnum<{
+    lower: "lower";
+    upper: "upper";
+  }>>;
   events: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strict>;
 export declare const eventMatchFieldsSchema: z.ZodRecord<z.ZodString, z.ZodObject<{
@@ -1083,6 +1087,10 @@ export declare const eventMatchFieldsSchema: z.ZodRecord<z.ZodString, z.ZodObjec
   description: z.ZodString;
   enum: z.ZodOptional<z.ZodArray<z.ZodString>>;
   list: z.ZodOptional<z.ZodLiteral<true>>;
+  case: z.ZodOptional<z.ZodEnum<{
+    lower: "lower";
+    upper: "upper";
+  }>>;
   events: z.ZodOptional<z.ZodArray<z.ZodString>>;
 }, z.core.$strict>>;
 /** Exact trusted values required before a watch or event automation runs. */
@@ -1098,6 +1106,15 @@ export type EventMatchFields = z.output<typeof eventMatchFieldsSchema>;
  * different values.
  */
 export declare function mergeEventMatchFields(...maps: readonly EventMatchFields[]): EventMatchFields;
+/**
+ * Merge the match fields of every resource type of one source, for a trigger
+ * with no identifier. Such a trigger can get the events of every resource
+ * type. A field with no `events` list is set on every event of its own
+ * resource type, so it gets that list before the merge. This throws like
+ * `mergeEventMatchFields` when two resource types describe one field
+ * differently.
+ */
+export declare function anyResourceMatchFields(resourceTypes: readonly Pick<PluginEventType, "matchFields" | "supportedEvents">[]): EventMatchFields;
 /** Stable JSON for one match object. List order does not matter. */
 export declare function stableEventMatchKey(match: EventMatch | undefined): string;
 /**
@@ -1107,6 +1124,12 @@ export declare function stableEventMatchKey(match: EventMatch | undefined): stri
  * match value.
  */
 export declare function eventMatches(match: EventMatch | undefined, data: EventData | undefined): boolean;
+/**
+ * Return a match with each text value in the case that its field declares,
+ * so a saved filter has the same case as event data. Values of other fields
+ * do not change.
+ */
+export declare function normalizeEventMatch(fields: EventMatchFields, match: EventMatch | undefined): EventMatch | undefined;
 /** The identifier shape of one resource type. Plain JSON, so API responses can carry it. */
 export declare const eventIdentifierSchema: z.ZodObject<{
   format: z.ZodString;
@@ -1129,10 +1152,38 @@ export declare const pluginEventTypeSchema: z.ZodObject<{
     description: z.ZodString;
     enum: z.ZodOptional<z.ZodArray<z.ZodString>>;
     list: z.ZodOptional<z.ZodLiteral<true>>;
+    case: z.ZodOptional<z.ZodEnum<{
+      lower: "lower";
+      upper: "upper";
+    }>>;
     events: z.ZodOptional<z.ZodArray<z.ZodString>>;
   }, z.core.$strict>>>;
-  guidance: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
 }, z.core.$strict>;
+/**
+ * The event reach of one event type: which event automation triggers can
+ * select it.
+ *
+ * - `"all"`: a trigger can run for every resource of the source, with no
+ *   identifier and no filter. Use it only for events that carry status facts
+ *   and cause no side effects.
+ * - `{ anyOf }`: a trigger with no identifier must set at least one of these
+ *   filters. Use it when an event carries private text, such as titles or
+ *   comments, or makes Junior act, such as add a reaction.
+ * - `"resource"`: only a trigger for one resource, with an identifier, can
+ *   select the event.
+ */
+export declare const eventReachSchema: z.ZodUnion<readonly [z.ZodLiteral<"all">, z.ZodLiteral<"resource">, z.ZodObject<{
+  anyOf: z.ZodArray<z.ZodString>;
+}, z.core.$strict>]>;
+export type EventReach = z.output<typeof eventReachSchema>;
+/** What a source declares once for one of its event types. */
+export declare const pluginEventDeclarationSchema: z.ZodObject<{
+  reach: z.ZodUnion<readonly [z.ZodLiteral<"all">, z.ZodLiteral<"resource">, z.ZodObject<{
+    anyOf: z.ZodArray<z.ZodString>;
+  }, z.core.$strict>]>;
+  guidance: z.ZodOptional<z.ZodString>;
+}, z.core.$strict>;
+export type PluginEventDeclaration = z.output<typeof pluginEventDeclarationSchema>;
 export declare const pluginEventsSchema: z.ZodObject<{
   resourceTypes: z.ZodArray<z.ZodObject<{
     type: z.ZodString;
@@ -1151,9 +1202,18 @@ export declare const pluginEventsSchema: z.ZodObject<{
       description: z.ZodString;
       enum: z.ZodOptional<z.ZodArray<z.ZodString>>;
       list: z.ZodOptional<z.ZodLiteral<true>>;
+      case: z.ZodOptional<z.ZodEnum<{
+        lower: "lower";
+        upper: "upper";
+      }>>;
       events: z.ZodOptional<z.ZodArray<z.ZodString>>;
     }, z.core.$strict>>>;
-    guidance: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
+  }, z.core.$strict>>;
+  events: z.ZodRecord<z.ZodString, z.ZodObject<{
+    reach: z.ZodUnion<readonly [z.ZodLiteral<"all">, z.ZodLiteral<"resource">, z.ZodObject<{
+      anyOf: z.ZodArray<z.ZodString>;
+    }, z.core.$strict>]>;
+    guidance: z.ZodOptional<z.ZodString>;
   }, z.core.$strict>>;
   isEnabled: z.ZodOptional<z.ZodFunction<z.ZodTuple<readonly [], null>, z.ZodBoolean>>;
   normalizeIdentifier: z.ZodOptional<z.ZodFunction<z.ZodTuple<readonly [z.ZodString], null>, z.ZodString>>;
@@ -1259,10 +1319,17 @@ export interface EventPublisher {
   publish(event: EventInput): Promise<void>;
   /**
    * Return match keys used by active watches or event automations for these
-   * identifiers and event types. Plugins use this to load optional trusted
-   * data only when a filter needs it.
+   * identifiers and event types, and by event automations with no
+   * identifier. Plugins use this to load optional trusted data only when a
+   * filter needs it.
+   *
+   * Pass `data` with values that every copy of the events sets and that the
+   * plugin already has, such as `repo`. An event automation with no
+   * identifier whose filters on those keys fail adds no keys, so a trigger
+   * for one repository does not load data for events of other repositories.
    */
   neededMatchKeys?(input: {
+    data?: EventData;
     eventTypes: string[];
     identifiers: string[];
   }): Promise<string[]>;
@@ -1273,34 +1340,70 @@ export interface EventTriggerProblem {
   /**
    * - `unknown_resource_type`: the source has no such enabled resource type.
    * - `unknown_event`: the resource type has no such event.
+   * - `identifier_required`: a trigger with no identifier selects an event
+   *   that cannot run for every resource.
+   * - `filter_required`: a trigger with no identifier selects an event whose
+   *   reach names filters, and the trigger sets none of them.
    * - `unknown_field`: the resource type has no such filter. Saved triggers
    *   get this after a plugin renames or removes a filter.
    * - `field_not_set`: a selected event never sets the filter, so the filter
    *   never matches that event.
    * - `invalid_value`: the filter value has the wrong type or is not allowed.
    */
-  reason: "unknown_resource_type" | "unknown_event" | "unknown_field" | "field_not_set" | "invalid_value";
+  reason: "unknown_resource_type" | "unknown_event" | "identifier_required" | "filter_required" | "unknown_field" | "field_not_set" | "invalid_value";
   /** The filter with the problem. Missing for a resource type or event problem. */
   field?: string;
   /** Plain words for the person or agent who changes the selection. */
   message: string;
 }
-/** The selection to check: one resource type, its events, and its filters. */
+/**
+ * The selection to check: one resource type, its events, and its filters.
+ * Leave out the resource type for a trigger with no identifier. It runs for
+ * every resource of the source that its filters match.
+ */
 export interface EventTriggerSelection {
-  resourceType: string;
+  resourceType?: string;
   events: readonly string[];
   match?: EventMatch;
 }
+/** The enabled resource types of one source, and the reach of each of its events. */
+export interface EventTriggerSource {
+  resourceTypes: readonly Pick<PluginEventType, "type" | "matchFields" | "supportedEvents">[];
+  events: Readonly<Record<string, {
+    reach: EventReach;
+  }>>;
+  /**
+   * The filters of every resource type, for a trigger with no identifier.
+   * Merge them once with `anyResourceMatchFields` when the catalog is built,
+   * not for each check.
+   */
+  anyResourceFields: EventMatchFields;
+}
+/** The events of a source that a trigger with no identifier can select. */
+export declare function anyResourceEvents(source: EventTriggerSource): string[];
 /** Return the selected events that never set one filter field. */
 export declare function eventsWithoutMatchField(field: Pick<EventMatchField, "events">, events: readonly string[]): string[];
+/**
+ * Return the events and filters that a selection can use: those of its
+ * resource type, or with no resource type, the events whose reach is not
+ * `"resource"`, with the filters of every resource type. Return nothing when the source
+ * has no such resource type or cannot run for every resource.
+ */
+export declare function eventTriggerChoices(source: EventTriggerSource, selection: Pick<EventTriggerSelection, "resourceType">): {
+  events: readonly string[];
+  fields: EventMatchFields;
+} | undefined;
 /**
  * List why a selection cannot work with the resource types of one source. An
  * empty list means the resource type exists, every selected event is
  * supported, and every selected event can match every filter. A filter on a
  * list field (`list: true`) matches when the event list includes the value.
+ * A selection with no resource type can use only events whose reach is not
+ * `"resource"`, with the filters of every resource type, and must set one of
+ * the filters that the reach of each selected event names.
  * Set `inputKeys` for the agent, so messages name the `match.<key>` input.
  */
-export declare function eventTriggerProblems(resourceTypes: readonly Pick<PluginEventType, "type" | "matchFields" | "supportedEvents">[], selection: EventTriggerSelection, options?: {
+export declare function eventTriggerProblems(source: EventTriggerSource, selection: EventTriggerSelection, options?: {
   inputKeys?: boolean;
 }): EventTriggerProblem[];
 /** How people see one Event trigger. Each entry is one line of plain text. */
@@ -1321,10 +1424,10 @@ export declare function eventTypeText(eventType: string): string;
 export declare function eventMatchFilterText(key: string, field: EventMatchField | undefined, value: EventMatch[string]): string;
 /**
  * Describe a selection for the dashboard and Slack, so both show the same
- * words. Pass the resource types of the selection's source, as for
- * `eventTriggerProblems`. Its problems are the messages of that check.
+ * words. Pass the selection's source, as for `eventTriggerProblems`. Its
+ * problems are the messages of that check.
  */
-export declare function describeEventTrigger(resourceTypes: readonly Pick<PluginEventType, "type" | "matchFields" | "supportedEvents">[], selection: EventTriggerSelection): EventTriggerDescription;
+export declare function describeEventTrigger(source: EventTriggerSource, selection: EventTriggerSelection): EventTriggerDescription;
 /** Join filters into one line. Every filter must match, so join with "and". */
 export declare function eventTriggerFiltersText(filters: readonly string[]): string;
 /**
@@ -2065,6 +2168,8 @@ export interface SandboxPrepareHookContext extends PluginContext {
 export interface BeforeToolExecuteHookContext extends PluginContext {
   decision: PluginDecision;
   env: PluginEnv;
+  /** Same directory as `PluginSandbox.juniorRoot` from `sandboxPrepare`. */
+  juniorRoot: string;
   actor?: Actor;
   /** All actors who contributed instructions to the run so far; see `multi-actor-runs.md`. */
   actors?: Actor[];
@@ -2423,6 +2528,11 @@ export interface PluginHooks {
    */
   conversationTitleContext?(ctx: ConversationTitleContextHookContext): Promise<string[] | undefined> | string[] | undefined;
   conversationSidebar?(ctx: ConversationSidebarHookContext): Promise<ConversationSidebarResult> | ConversationSidebarResult;
+  /**
+   * Return static guidance for the system prompt. Return the same text for one
+   * deployment and platform, so the system prompt stays cacheable. Put text
+   * that changes per request in `userPrompt`. See `policies/system-prompt.md`.
+   */
   systemPrompt?(ctx: SystemPromptContext): Promise<PromptMessage[]> | PromptMessage[];
   userPrompt?(ctx: UserPromptContext): Promise<UserPromptContribution[] | undefined> | UserPromptContribution[] | undefined;
   beforeToolExecute?(ctx: BeforeToolExecuteHookContext): Promise<void> | void;

package/dist/index.js

@@ -684,6 +684,11 @@ const eventMatchFieldSchema = z.object({
 	*/
 	list: z.literal(true).optional(),
 	/**
+	* The case of the text in event data. Core changes a saved filter value
+	* to this case, so `getsentry/Junior` still matches `getsentry/junior`.
+	*/
+	case: z.enum(["lower", "upper"]).optional(),
+	/**
 	* The events that set this field. Leave it out when every event of the
 	* resource type sets it. A filter on this field never matches other
 	* events, so a trigger that selects them is rejected.
@@ -695,6 +700,11 @@ const eventMatchFieldSchema = z.object({
 		message: "Event match field enum requires kind \"string\".",
 		path: ["enum"]
 	});
+	if (field.case && field.kind !== "string") context.addIssue({
+		code: "custom",
+		message: "Event match field case requires kind \"string\".",
+		path: ["case"]
+	});
 	if (field.list && field.kind === "boolean") context.addIssue({
 		code: "custom",
 		message: "Event match field list cannot use kind \"boolean\".",
@@ -746,7 +756,7 @@ function mergeEventMatchFields(...maps) {
 			merged[key] = field;
 			continue;
 		}
-		if (current.kind !== field.kind || current.list !== field.list || !sameValues(current.enum, field.enum)) throw new Error(`Match field "${key}" has a different kind, enum, or list in two maps.`);
+		if (current.kind !== field.kind || current.list !== field.list || current.case !== field.case || !sameValues(current.enum, field.enum)) throw new Error(`Match field "${key}" has a different kind, case, enum, or list in two maps.`);
 		if (!current.events || !field.events) throw new Error(`Match field "${key}" is in two maps, so each copy must list its events.`);
 		merged[key] = {
 			...current,
@@ -755,6 +765,20 @@ function mergeEventMatchFields(...maps) {
 	}
 	return eventMatchFieldsSchema.parse(merged);
 }
+/**
+* Merge the match fields of every resource type of one source, for a trigger
+* with no identifier. Such a trigger can get the events of every resource
+* type. A field with no `events` list is set on every event of its own
+* resource type, so it gets that list before the merge. This throws like
+* `mergeEventMatchFields` when two resource types describe one field
+* differently.
+*/
+function anyResourceMatchFields(resourceTypes) {
+	return mergeEventMatchFields(...resourceTypes.map((resourceType) => Object.fromEntries(Object.entries(resourceType.matchFields ?? {}).map(([key, field]) => [key, field.events ? field : {
+		...field,
+		events: [...resourceType.supportedEvents]
+	}]))));
+}
 function stableMatchValue(value) {
 	if (!Array.isArray(value)) return value;
 	return [...value].sort((left, right) => {
@@ -784,6 +808,20 @@ function eventMatches(match, data) {
 	}
 	return true;
 }
+/**
+* Return a match with each text value in the case that its field declares,
+* so a saved filter has the same case as event data. Values of other fields
+* do not change.
+*/
+function normalizeEventMatch(fields, match) {
+	if (!match) return void 0;
+	const toCase = (key, value) => {
+		const fieldCase = fields[key]?.case;
+		if (typeof value !== "string" || !fieldCase) return value;
+		return fieldCase === "lower" ? value.toLowerCase() : value.toUpperCase();
+	};
+	return Object.fromEntries(Object.entries(match).map(([key, value]) => [key, Array.isArray(value) ? value.map((entry) => toCase(key, entry)) : typeof value === "boolean" ? value : toCase(key, value)]));
+}
 function isRegExpSource(value) {
 	try {
 		new RegExp(value);
@@ -804,8 +842,7 @@ const pluginEventTypeSchema = z.object({
 	identifier: eventIdentifierSchema.optional(),
 	supportedEvents: z.array(eventTypeSchema).min(1),
 	suggestedEvents: z.array(eventTypeSchema).optional(),
-	matchFields: eventMatchFieldsSchema.optional(),
-	guidance: z.record(eventTypeSchema, z.string().trim().min(1).max(EVENT_GUIDANCE_MAX_LENGTH)).optional()
+	matchFields: eventMatchFieldsSchema.optional()
 }).strict().superRefine((resourceType, context) => {
 	const supported = /* @__PURE__ */ new Set();
 	resourceType.supportedEvents.forEach((eventType, index) => {
@@ -816,11 +853,6 @@ const pluginEventTypeSchema = z.object({
 		});
 		supported.add(eventType);
 	});
-	for (const eventType of Object.keys(resourceType.guidance ?? {})) if (!supported.has(eventType)) context.addIssue({
-		code: "custom",
-		message: `Guidance event type "${eventType}" is not supported.`,
-		path: ["guidance", eventType]
-	});
 	const suggested = /* @__PURE__ */ new Set();
 	resourceType.suggestedEvents?.forEach((eventType, index) => {
 		if (suggested.has(eventType)) context.addIssue({
@@ -848,8 +880,41 @@ const pluginEventTypeSchema = z.object({
 		});
 	});
 });
+/**
+* The event reach of one event type: which event automation triggers can
+* select it.
+*
+* - `"all"`: a trigger can run for every resource of the source, with no
+*   identifier and no filter. Use it only for events that carry status facts
+*   and cause no side effects.
+* - `{ anyOf }`: a trigger with no identifier must set at least one of these
+*   filters. Use it when an event carries private text, such as titles or
+*   comments, or makes Junior act, such as add a reaction.
+* - `"resource"`: only a trigger for one resource, with an identifier, can
+*   select the event.
+*/
+const eventReachSchema = z.union([
+	z.literal("all"),
+	z.literal("resource"),
+	z.object({ anyOf: z.array(z.string().regex(EVENT_MATCH_FIELD_NAME)).min(1) }).strict()
+]);
+/** What a source declares once for one of its event types. */
+const pluginEventDeclarationSchema = z.object({
+	reach: eventReachSchema,
+	/**
+	* App guidance that the agent gets with each Event of this type, for every
+	* Watch and event automation.
+	*/
+	guidance: z.string().trim().min(1).max(EVENT_GUIDANCE_MAX_LENGTH).optional()
+}).strict();
 const pluginEventsSchema = z.object({
 	resourceTypes: z.array(pluginEventTypeSchema).min(1),
+	/**
+	* One declaration for each event type that a resource type supports. An
+	* event that two resource types share has one declaration, so its reach
+	* and guidance are the same for both.
+	*/
+	events: z.record(eventTypeSchema, pluginEventDeclarationSchema),
 	isEnabled: z.function({
 		input: [],
 		output: z.boolean()
@@ -872,6 +937,41 @@ const pluginEventsSchema = z.object({
 		});
 		seen.add(resourceType.type);
 	});
+	const supported = new Set(registration.resourceTypes.flatMap((resourceType) => resourceType.supportedEvents));
+	for (const eventType of supported) if (!registration.events[eventType]) context.addIssue({
+		code: "custom",
+		message: `Event type "${eventType}" has no declaration in events.`,
+		path: ["events"]
+	});
+	let fields;
+	try {
+		fields = anyResourceMatchFields(registration.resourceTypes);
+	} catch (error) {
+		context.addIssue({
+			code: "custom",
+			message: error.message,
+			path: ["resourceTypes"]
+		});
+		return;
+	}
+	for (const [eventType, declaration] of Object.entries(registration.events)) {
+		if (!supported.has(eventType)) context.addIssue({
+			code: "custom",
+			message: `Declared event type "${eventType}" is not supported.`,
+			path: ["events", eventType]
+		});
+		if (typeof declaration.reach === "string") continue;
+		for (const filter of declaration.reach.anyOf) if (!fields[filter]?.events?.includes(eventType)) context.addIssue({
+			code: "custom",
+			message: `Reach filter "${filter}" is not set on "${eventType}".`,
+			path: [
+				"events",
+				eventType,
+				"reach",
+				"anyOf"
+			]
+		});
+	}
 });
 /** Apply a plugin's identifier convention at event boundaries. */
 function normalizeEventIdentifier(registration, identifier) {
@@ -928,6 +1028,10 @@ const eventInputSchema = z.object({
 }).strict();
 const eventSchema = eventInputSchema.extend({ namespace: z.string().min(1) });
 // src/event-triggers.ts
+/** The events of a source that a trigger with no identifier can select. */
+function anyResourceEvents(source) {
+	return Object.entries(source.events).filter(([, declaration]) => declaration.reach !== "resource").map(([eventType]) => eventType).sort();
+}
 function quoted(values) {
 	return values.map((value) => `"${value}"`).join(", ");
 }
@@ -950,38 +1054,85 @@ function valueProblem(filter, field, value) {
 	const notAllowed = allowed ? values.find((entry) => !allowed.includes(String(entry))) : void 0;
 	if (allowed && notAllowed !== void 0) return `${filter} cannot be "${notAllowed}". Use one of: ${quoted(allowed)}.`;
 }
+/** The events and filters that one selection can use. */
+function selectionScope(source, selection) {
+	if (selection.resourceType === void 0) {
+		const events = anyResourceEvents(source);
+		if (events.length === 0) return {
+			reason: "identifier_required",
+			message: "This source cannot run for every resource. Set a resource type and an identifier."
+		};
+		return {
+			events,
+			fields: source.anyResourceFields,
+			owner: "source"
+		};
+	}
+	const resourceType = source.resourceTypes.find((candidate) => candidate.type === selection.resourceType);
+	if (!resourceType) return {
+		reason: "unknown_resource_type",
+		message: `"${selection.resourceType}" is not an enabled resource type. Use one of: ${quoted(source.resourceTypes.map((candidate) => candidate.type))}.`
+	};
+	return {
+		events: resourceType.supportedEvents,
+		fields: resourceType.matchFields ?? {},
+		owner: "resource type"
+	};
+}
+/**
+* Return the events and filters that a selection can use: those of its
+* resource type, or with no resource type, the events whose reach is not
+* `"resource"`, with the filters of every resource type. Return nothing when the source
+* has no such resource type or cannot run for every resource.
+*/
+function eventTriggerChoices(source, selection) {
+	if (source.resourceTypes.length === 0) return void 0;
+	const scope = selectionScope(source, selection);
+	return "reason" in scope ? void 0 : {
+		events: scope.events,
+		fields: scope.fields
+	};
+}
 /**
 * List why a selection cannot work with the resource types of one source. An
 * empty list means the resource type exists, every selected event is
 * supported, and every selected event can match every filter. A filter on a
 * list field (`list: true`) matches when the event list includes the value.
+* A selection with no resource type can use only events whose reach is not
+* `"resource"`, with the filters of every resource type, and must set one of
+* the filters that the reach of each selected event names.
 * Set `inputKeys` for the agent, so messages name the `match.<key>` input.
 */
-function eventTriggerProblems(resourceTypes, selection, options = {}) {
-	const resourceType = resourceTypes.find((candidate) => candidate.type === selection.resourceType);
-	if (!resourceType) return [{
+function eventTriggerProblems(source, selection, options = {}) {
+	if (source.resourceTypes.length === 0) return [{
 		reason: "unknown_resource_type",
-		message: resourceTypes.length === 0 ? "The plugin for this source is not enabled." : `"${selection.resourceType}" is not an enabled resource type. Use one of: ${quoted(resourceTypes.map((candidate) => candidate.type))}.`
+		message: "The plugin for this source is not enabled."
 	}];
+	const scope = selectionScope(source, selection);
+	if ("reason" in scope) return [scope];
+	const filterName = (key) => options.inputKeys ? `Filter "${key}" (match.${key})` : `Filter "${key}"`;
 	const problems = [];
-	const events = selection.events.filter((eventType) => resourceType.supportedEvents.includes(eventType));
+	const events = selection.events.filter((eventType) => scope.events.includes(eventType));
 	for (const eventType of selection.events) {
 		if (events.includes(eventType)) continue;
-		problems.push({
+		const anySupports = source.resourceTypes.some((resourceType) => resourceType.supportedEvents.includes(eventType));
+		problems.push(selection.resourceType === void 0 && anySupports ? {
+			reason: "identifier_required",
+			message: `"${eventType}" cannot run for every resource. Set a resource type and an identifier, or use one of: ${quoted(scope.events)}.`
+		} : {
 			reason: "unknown_event",
-			message: `"${eventType}" is not an event for this resource type. Use one of: ${quoted(resourceType.supportedEvents)}.`
+			message: `"${eventType}" is not an event for this ${scope.owner}. Use one of: ${quoted(scope.events)}.`
 		});
 	}
-	const fields = resourceType.matchFields ?? {};
-	const fieldNames = Object.keys(fields);
+	const fieldNames = Object.keys(scope.fields);
 	for (const [key, value] of Object.entries(selection.match ?? {})) {
-		const filter = options.inputKeys ? `Filter "${key}" (match.${key})` : `Filter "${key}"`;
-		const field = fields[key];
+		const filter = filterName(key);
+		const field = scope.fields[key];
 		if (!field) {
 			problems.push({
 				reason: "unknown_field",
 				field: key,
-				message: fieldNames.length === 0 ? `${filter} does not exist. This resource type has no filters, so remove it.` : `${filter} does not exist for this resource type. Remove it, or use one of: ${quoted(fieldNames)}.`
+				message: fieldNames.length === 0 ? `${filter} does not exist. This ${scope.owner} has no filters, so remove it.` : `${filter} does not exist for this ${scope.owner}. Remove it, or use one of: ${quoted(fieldNames)}.`
 			});
 			continue;
 		}
@@ -998,8 +1149,31 @@ function eventTriggerProblems(resourceTypes, selection, options = {}) {
 			message: invalid
 		});
 	}
+	if (selection.resourceType === void 0) problems.push(...requiredFilterProblems(source, events, selection, options));
 	return problems;
 }
+/** Name the filters that the selected events need and the trigger does not set. */
+function requiredFilterProblems(source, events, selection, options) {
+	const missing = /* @__PURE__ */ new Map();
+	for (const eventType of events) {
+		const reach = source.events[eventType]?.reach;
+		if (typeof reach !== "object") continue;
+		if (reach.anyOf.some((filter) => selection.match?.[filter] !== void 0)) continue;
+		const key = [...reach.anyOf].sort().join(",");
+		const entry = missing.get(key) ?? {
+			anyOf: reach.anyOf,
+			events: []
+		};
+		entry.events.push(eventType);
+		missing.set(key, entry);
+	}
+	const inputKey = (filter) => options.inputKeys ? ` (match.${filter})` : "";
+	return [...missing.values()].map(({ anyOf, events: requiredBy }) => ({
+		reason: "filter_required",
+		field: anyOf[0],
+		message: anyOf.length === 1 ? `This trigger needs a "${anyOf[0]}" filter${inputKey(anyOf[0])}, because ${quoted(requiredBy)} cannot run for every resource.` : `This trigger needs one of these filters: ${anyOf.map((filter) => `"${filter}"${inputKey(filter)}`).join(", ")}, because ${quoted(requiredBy)} cannot run for every resource.`
+	}));
+}
 /** Write one event type in plain words: `pull_request.opened` is "pull request opened". */
 function eventTypeText(eventType) {
 	return eventType.replaceAll(/[._]/g, " ");
@@ -1014,15 +1188,15 @@ function eventMatchFilterText(key, field, value) {
 }
 /**
 * Describe a selection for the dashboard and Slack, so both show the same
-* words. Pass the resource types of the selection's source, as for
-* `eventTriggerProblems`. Its problems are the messages of that check.
+* words. Pass the selection's source, as for `eventTriggerProblems`. Its
+* problems are the messages of that check.
 */
-function describeEventTrigger(resourceTypes, selection) {
-	const fields = resourceTypes.find((candidate) => candidate.type === selection.resourceType)?.matchFields ?? {};
+function describeEventTrigger(source, selection) {
+	const fields = eventTriggerChoices(source, selection)?.fields ?? {};
 	return {
 		events: selection.events.map(eventTypeText),
 		filters: Object.entries(selection.match ?? {}).map(([key, value]) => eventMatchFilterText(key, fields[key], value)),
-		problems: eventTriggerProblems(resourceTypes, selection).map((problem) => problem.message)
+		problems: eventTriggerProblems(source, selection).map((problem) => problem.message)
 	};
 }
 /** Join filters into one line. Every filter must match, so join with "and". */
@@ -1552,4 +1726,4 @@ const pluginUserPageInputSchema = z.object({
 	limit: z.number().int().min(1).max(50),
 	query: pluginUserPageQuerySchema
 }).strict();
-export { EVENT_DATA_MAX_JSON_BYTES, EVENT_DATA_MAX_KEYS, EVENT_GUIDANCE_MAX_LENGTH, EVENT_SUMMARY_MAX_LENGTH, EVENT_TEXT_MAX_LENGTH, EgressAuthRequired, EgressPolicyDenied, PluginToolInputError, REQUIRED_TOOL_ANNOTATION_KEYS, actorSchema, actorUserIdSchema, agentInvocationSourceSchema, codeChangeInputSchema, codeChangeStateSchema, conversationAnnotationInputSchema, conversationEventIconSchema, conversationEventPresentationSchema, conversationSidebarAnnotationSchema, conversationSidebarIconSchema, createEventSource, createLocalSource, createSlackSource, createWebSource, defineConversationEvent, defineJuniorPlugin, definePluginTool, definePromptContext, describeEventTrigger, destinationSchema, destinationVisibilitySchema, dispatchOptionsSchema, enforceEgressPolicy, eventAutomationSourceSchema, eventDataSchema, eventIdentifierSchema, eventInputSchema, eventMatchFieldSchema, eventMatchFieldsSchema, eventMatchFilterText, eventMatchSchema, eventMatches, eventPersonSchema, eventSchema, eventSourceSchema, eventTriggerFiltersText, eventTriggerProblems, eventTriggerText, eventTypeSchema, eventTypeText, eventsWithoutMatchField, getSourceKey, identitySchema, isPrivateSource, isSlackDestination, localActorSchema, localDestinationSchema, localSourceSchema, locationSchema, mergeEventMatchFields, missingToolAnnotationKeys, nonBlankStringSchema, normalizeEventIdentifier, objectAnnotationSchema, objectFactFields, objectFactsSchema, objectIconPath, objectIconPaths, objectPresentation, objectTypeSchema, ownedObjectAnnotationSchema, parseShellCommands, platformSchema, pluginApiRouteRequestContextSchema, pluginAuthorizationSchema, pluginCredentialHeaderTransformSchema, pluginCredentialLeaseSchema, pluginCredentialResultSchema, pluginCredentialSubjectSchema, pluginDispatchSourceSchema, pluginEventTypeSchema, pluginEventsSchema, pluginGrantSchema, pluginProviderAccountSchema, pluginRunContextSchema, pluginRunTranscriptEntrySchema, pluginRunTranscriptProvenanceSchema, pluginStoredTokensSchema, pluginToolContentSchema, pluginToolContinuationSchema, pluginToolOutputSchema, pluginUserPageContentSchema, pluginUserPageCursorSchema, pluginUserPageFilterSchema, pluginUserPageInputSchema, pluginUserPageLinkSchema, pluginUserPageLinksSchema, pluginUserPageQuerySchema, promptContextSchema, promptMessageSchema, replyAttributionSchema, resourceLinkAnnotationSchema, resourceTypeSchema, scheduledAutomationSourceSchema, slackActorSchema, slackDestinationSchema, slackLocationSchema, slackSourceSchema, sourceSchema, sourceVisibilitySchema, stableEventMatchKey, subscribableResourceSchema, systemActorSchema, taskOutcomeSchema, toolApprovalModeSchema, userSchema, watchResultSchema, webActorSchema, webSourceSchema, zodTool };
+export { EVENT_DATA_MAX_JSON_BYTES, EVENT_DATA_MAX_KEYS, EVENT_GUIDANCE_MAX_LENGTH, EVENT_SUMMARY_MAX_LENGTH, EVENT_TEXT_MAX_LENGTH, EgressAuthRequired, EgressPolicyDenied, PluginToolInputError, REQUIRED_TOOL_ANNOTATION_KEYS, actorSchema, actorUserIdSchema, agentInvocationSourceSchema, anyResourceEvents, anyResourceMatchFields, codeChangeInputSchema, codeChangeStateSchema, conversationAnnotationInputSchema, conversationEventIconSchema, conversationEventPresentationSchema, conversationSidebarAnnotationSchema, conversationSidebarIconSchema, createEventSource, createLocalSource, createSlackSource, createWebSource, defineConversationEvent, defineJuniorPlugin, definePluginTool, definePromptContext, describeEventTrigger, destinationSchema, destinationVisibilitySchema, dispatchOptionsSchema, enforceEgressPolicy, eventAutomationSourceSchema, eventDataSchema, eventIdentifierSchema, eventInputSchema, eventMatchFieldSchema, eventMatchFieldsSchema, eventMatchFilterText, eventMatchSchema, eventMatches, eventPersonSchema, eventReachSchema, eventSchema, eventSourceSchema, eventTriggerChoices, eventTriggerFiltersText, eventTriggerProblems, eventTriggerText, eventTypeSchema, eventTypeText, eventsWithoutMatchField, getSourceKey, identitySchema, isPrivateSource, isSlackDestination, localActorSchema, localDestinationSchema, localSourceSchema, locationSchema, mergeEventMatchFields, missingToolAnnotationKeys, nonBlankStringSchema, normalizeEventIdentifier, normalizeEventMatch, objectAnnotationSchema, objectFactFields, objectFactsSchema, objectIconPath, objectIconPaths, objectPresentation, objectTypeSchema, ownedObjectAnnotationSchema, parseShellCommands, platformSchema, pluginApiRouteRequestContextSchema, pluginAuthorizationSchema, pluginCredentialHeaderTransformSchema, pluginCredentialLeaseSchema, pluginCredentialResultSchema, pluginCredentialSubjectSchema, pluginDispatchSourceSchema, pluginEventDeclarationSchema, pluginEventTypeSchema, pluginEventsSchema, pluginGrantSchema, pluginProviderAccountSchema, pluginRunContextSchema, pluginRunTranscriptEntrySchema, pluginRunTranscriptProvenanceSchema, pluginStoredTokensSchema, pluginToolContentSchema, pluginToolContinuationSchema, pluginToolOutputSchema, pluginUserPageContentSchema, pluginUserPageCursorSchema, pluginUserPageFilterSchema, pluginUserPageInputSchema, pluginUserPageLinkSchema, pluginUserPageLinksSchema, pluginUserPageQuerySchema, promptContextSchema, promptMessageSchema, replyAttributionSchema, resourceLinkAnnotationSchema, resourceTypeSchema, scheduledAutomationSourceSchema, slackActorSchema, slackDestinationSchema, slackLocationSchema, slackSourceSchema, sourceSchema, sourceVisibilitySchema, stableEventMatchKey, subscribableResourceSchema, systemActorSchema, taskOutcomeSchema, toolApprovalModeSchema, userSchema, watchResultSchema, webActorSchema, webSourceSchema, zodTool };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sentry/junior-plugin-api",
-  "version": "0.266.0",
+  "version": "0.268.0",
   "private": false,
   "publishConfig": {
     "access": "public"