@notionhq/apps 0.0.33 → 0.0.35

package/src/notion-as-code/custom-agent.ts

@@ -3,67 +3,21 @@ import type { CustomAgentIntent, NotionAsCodeIcon, ResourceId } from "./intents.
 import { recordIntent } from "./recorder.js";
 import { assertUserResourceId } from "./resource.js";
 
-type RecurrenceWeekday = "MO" | "TU" | "WE" | "TH" | "FR" | "SA" | "SU";
-
-/** A nonempty selection of weekdays for a weekly recurrence. */
-export type RecurrenceWeekdays = {
-	[Day in RecurrenceWeekday]?: true;
-} & {
-	[Day in RecurrenceWeekday]: Required<Pick<Record<RecurrenceWeekday, true>, Day>>;
-}[RecurrenceWeekday];
-
-export type MonthlyWeekdayOccurrence = "1st" | "2nd" | "3rd" | "4th" | "last";
-
-export type MonthlyRecurrenceRestriction =
-	| { type: "day_of_month"; day: number }
-	| {
-			type: "weekday_of_month";
-			weekday: RecurrenceWeekday;
-			occurrence: MonthlyWeekdayOccurrence;
-	  };
-
-export type RecurrenceScheduleEnd =
-	| { type: "date"; endsAt: string }
-	| { type: "occurrences"; count: number };
-
-type RecurrenceScheduleBase = {
-	interval: number;
-	start: string;
-	timeZone: string;
-	end?: RecurrenceScheduleEnd;
-};
-
-export type HourlyRecurrenceSchedule = RecurrenceScheduleBase & {
-	frequency: "hour";
-};
-
-export type DailyRecurrenceSchedule = RecurrenceScheduleBase & {
-	frequency: "day";
-};
-
-export type WeeklyRecurrenceSchedule = RecurrenceScheduleBase & {
-	frequency: "week";
-	weekdays: RecurrenceWeekdays;
-};
-
-export type MonthlyRecurrenceSchedule = RecurrenceScheduleBase & {
-	frequency: "month";
-	monthlyRestriction: MonthlyRecurrenceRestriction;
-};
-
-export type YearlyRecurrenceSchedule = RecurrenceScheduleBase & {
-	frequency: "year";
-};
-
-export type CustomAgentRecurrenceSchedule = (
-	| HourlyRecurrenceSchedule
-	| DailyRecurrenceSchedule
-	| WeeklyRecurrenceSchedule
-	| MonthlyRecurrenceSchedule
-	| YearlyRecurrenceSchedule
-) & {
-	type: "recurrence";
-};
+import type { RecurrenceSchedule } from "./recurrence.js";
+export type {
+	RecurrenceWeekdays,
+	MonthlyWeekdayOccurrence,
+	MonthlyRecurrenceRestriction,
+	RecurrenceScheduleEnd,
+	HourlyRecurrenceSchedule,
+	DailyRecurrenceSchedule,
+	WeeklyRecurrenceSchedule,
+	MonthlyRecurrenceSchedule,
+	YearlyRecurrenceSchedule,
+	RecurrenceSchedule,
+} from "./recurrence.js";
+
+export type CustomAgentRecurrenceSchedule = RecurrenceSchedule & { type: "recurrence" };
 
 export type CustomAgentTriggerBase = {
 	resourceId: ResourceId;
@@ -79,6 +33,8 @@ export type PropertyTriggerCondition = {
 export type CustomAgentPageAddedTrigger = CustomAgentTriggerBase & {
 	type: "page_added";
 	dataSourceResourceId: ResourceId;
+	/** Wait for follow-up edits before running the agent. Defaults to false in Apps. */
+	waitForEditsToFinish?: boolean;
 };
 
 type PropertyUpdatedTriggerTarget =
@@ -95,6 +51,8 @@ export type CustomAgentPropertyUpdatedTrigger = CustomAgentTriggerBase &
 	PropertyUpdatedTriggerTarget & {
 		type: "property_updated";
 		dataSourceResourceId: ResourceId;
+		/** Wait for follow-up edits before running the agent. Defaults to false in Apps. */
+		waitForEditsToFinish?: boolean;
 	};
 
 export type CustomAgentTrigger =
@@ -114,15 +72,8 @@ export type CustomAgentAccess = Extract<
 	{ readonly resource: { readonly resourceType: "page" | "database" } }
 >;
 
-/**
- * URL trust settings for a custom agent.
- *
- * URL trust is independent from web access: an agent can trust URLs without
- * being granted web search access.
- */
-export type CustomAgentTrustedUrls = {
-	type: "all";
-};
+/** Trust every URL, trust no URLs, or trust a nonempty list of up to 20 URL globs. */
+export type CustomAgentTrustedUrls = "all" | "none" | [string, ...string[]];
 
 export type CustomAgentArgs = {
 	resourceId: ResourceId;
@@ -130,6 +81,8 @@ export type CustomAgentArgs = {
 	icon?: Exclude<NotionAsCodeIcon, { type: "file" }>;
 	instructions?: string;
 	model?: "ambrosia-tart-high" | "opal-quince-medium" | "almond-croissant-low";
+	/** Whether the agent can use the Web Browser. Omission preserves the existing setting. */
+	browserUse?: boolean;
 	/**
 	 * Whether the agent can use web search. Defaults to `false` when omitted for
 	 * a new agent. When updating an existing agent, omitting this field preserves
@@ -137,9 +90,10 @@ export type CustomAgentArgs = {
 	 */
 	webAccess?: boolean;
 	/**
-	 * URL trust policy for this agent. `{ type: "all" }` allows every HTTP and
-	 * HTTPS URL. For a new agent, omitting this field leaves URL trust disabled;
-	 * for an existing agent, omission preserves the current URL trust policy.
+	 * Set `"all"` to trust every HTTP and HTTPS URL, `"none"` to disable URL
+	 * trust, or provide a nonempty list of up to 20 URL globs. Omission leaves
+	 * trust disabled for a new agent and preserves it for an existing agent.
+	 * URL trust is independent from web search.
 	 */
 	trustedUrls?: CustomAgentTrustedUrls;
 	/**
@@ -181,13 +135,31 @@ export function customAgent(args: CustomAgentArgs): CustomAgentHandle {
 			}
 		}
 	}
-	const { access: _access, ...intent } = args;
+	const { access: _access, trustedUrls, triggers, ...intent } = args;
 	recordIntent({
 		type: "custom_agent",
 		...intent,
+		...(trustedUrls === undefined ? {} : { trustedUrls: toTrustedUrlsIntent(trustedUrls) }),
+		...(triggers === undefined ? {} : { triggers: triggers.map(toTriggerIntent) }),
 		...(grants === undefined ? {} : { access: grants }),
 	} satisfies {
 		type: "custom_agent";
 	} & CustomAgentIntent);
 	return { resourceType: "customAgent", resourceId: args.resourceId };
 }
+
+function toTriggerIntent(trigger: CustomAgentTrigger): CustomAgentTrigger {
+	if (trigger.type === "recurrence") {
+		return trigger;
+	}
+	return { ...trigger, waitForEditsToFinish: trigger.waitForEditsToFinish ?? false };
+}
+
+function toTrustedUrlsIntent(
+	trustedUrls: CustomAgentTrustedUrls,
+): NonNullable<CustomAgentIntent["trustedUrls"]> {
+	if (trustedUrls === "all") {
+		return { type: "all" };
+	}
+	return { type: "list", urls: trustedUrls === "none" ? [] : [...trustedUrls] };
+}

package/src/notion-as-code/database.ts

@@ -118,6 +118,20 @@ export type ChildDatabaseArgs<
 	| ChildMultiSourceDatabaseArgs<DataSources>
 	| Omit<ViewOnlyDatabaseArgs, "parent">;
 
+export type PropertyHandle<
+	Property extends NotionAsCodeSchema[string] = NotionAsCodeSchema[string],
+> = {
+	readonly resourceType: "property";
+	readonly resourceId: Property["resourceId"];
+	readonly dataSourceResourceId: string;
+	readonly name: string;
+	readonly propertyType: Property["type"];
+};
+
+export type DataSourceProperties<Schema extends NotionAsCodeSchema> = {
+	readonly [Name in keyof Schema]: PropertyHandle<Schema[Name]>;
+};
+
 /** A source handle retains its keyed authoring schema for sync inference. */
 export type DataSourceHandle<Schema extends NotionAsCodeSchema = NotionAsCodeSchema> = {
 	readonly resourceType: "dataSource";
@@ -125,6 +139,7 @@ export type DataSourceHandle<Schema extends NotionAsCodeSchema = NotionAsCodeSch
 	readonly name: string;
 	readonly description?: string;
 	readonly schema: Schema;
+	readonly properties: DataSourceProperties<Schema>;
 	readonly database: Database<AppsSchemaForSchema<Schema>>;
 	addPage: (args: ChildPageArgs) => PageHandle;
 };
@@ -501,6 +516,7 @@ function createDataSourceHandle(
 	schema: NotionAsCodeSchema,
 	databaseDescription: string | undefined,
 ): DataSourceHandle {
+	const propertyEntries: Array<[string, PropertyHandle]> = [];
 	const propertyResourceIds = new Set<string>();
 	const propertyNames = new Set<string>();
 	for (const property of dataSource.properties) {
@@ -517,6 +533,16 @@ function createDataSourceHandle(
 		}
 		propertyResourceIds.add(property.resourceId);
 		propertyNames.add(property.name);
+		propertyEntries.push([
+			property.name,
+			{
+				resourceType: "property",
+				resourceId: property.resourceId,
+				dataSourceResourceId: dataSource.resourceId,
+				name: property.name,
+				propertyType: property.type,
+			},
+		]);
 	}
 	const description = dataSource.description ?? databaseDescription;
 
@@ -526,6 +552,7 @@ function createDataSourceHandle(
 		name: dataSource.name,
 		...(description === undefined ? {} : { description }),
 		schema,
+		properties: Object.fromEntries(propertyEntries),
 		database: createAppsDatabase(dataSource.resourceId, dataSource),
 		addPage(pageArgs) {
 			return createPage(pageArgs, { type: "resourceId", resourceId: dataSource.resourceId });

package/src/notion-as-code/index.ts

@@ -62,6 +62,8 @@ export type {
 	ChildSingleSourceDatabaseArgs,
 	DataSourceArgs,
 	DataSourceHandle,
+	DataSourceProperties,
+	PropertyHandle,
 	DataSourceMap,
 	DatabaseArgs,
 	DatabaseHandle,

package/src/notion-as-code/intents.ts

@@ -347,7 +347,8 @@ export type DatabaseIntent = {
 };
 
 export type PageIntent = PageArgs & { parent: Parent };
-export type CustomAgentIntent = Omit<CustomAgentArgs, "access"> & {
+export type CustomAgentIntent = Omit<CustomAgentArgs, "access" | "trustedUrls"> & {
+	trustedUrls?: { type: "all" } | { type: "list"; urls: string[] };
 	access?: readonly { resourceId: ResourceId; level: ResourceAccessLevel }[];
 };
 

package/src/notion-as-code/notion-as-code-types.test.ts

@@ -37,8 +37,11 @@ it("types custom agent resource access and URL trust", () => {
 	expectTypeOf(
 		access.call(customAgent({ resourceId: "agent", name: "Agent" })),
 	).not.toExtend<CustomAgentAccess>();
-	expectTypeOf<{ type: "all" }>().toEqualTypeOf<CustomAgentTrustedUrls>();
+	expectTypeOf<CustomAgentTrustedUrls>().toEqualTypeOf<"all" | "none" | [string, ...string[]]>();
+	expectTypeOf<[]>().not.toExtend<CustomAgentTrustedUrls>();
+	expectTypeOf<{ type: "all" }>().not.toExtend<CustomAgentTrustedUrls>();
 	expectTypeOf<CustomAgentArgs["webAccess"]>().toEqualTypeOf<boolean | undefined>();
+	expectTypeOf<CustomAgentArgs["browserUse"]>().toEqualTypeOf<boolean | undefined>();
 	expectTypeOf<CustomAgentArgs["trustedUrls"]>().toEqualTypeOf<
 		CustomAgentTrustedUrls | undefined
 	>();

package/src/notion-as-code/recurrence.ts

@@ -0,0 +1,58 @@
+type RecurrenceWeekday = "MO" | "TU" | "WE" | "TH" | "FR" | "SA" | "SU";
+
+/** A nonempty selection of weekdays for a weekly recurrence. */
+export type RecurrenceWeekdays = {
+	[Day in RecurrenceWeekday]?: true;
+} & {
+	[Day in RecurrenceWeekday]: Required<Pick<Record<RecurrenceWeekday, true>, Day>>;
+}[RecurrenceWeekday];
+
+export type MonthlyWeekdayOccurrence = "1st" | "2nd" | "3rd" | "4th" | "last";
+
+export type MonthlyRecurrenceRestriction =
+	| { type: "day_of_month"; day: number }
+	| {
+			type: "weekday_of_month";
+			weekday: RecurrenceWeekday;
+			occurrence: MonthlyWeekdayOccurrence;
+	  };
+
+export type RecurrenceScheduleEnd =
+	| { type: "date"; endsAt: string }
+	| { type: "occurrences"; count: number };
+
+type RecurrenceScheduleBase = {
+	interval: number;
+	start: string;
+	timeZone: string;
+	end?: RecurrenceScheduleEnd;
+};
+
+export type HourlyRecurrenceSchedule = RecurrenceScheduleBase & {
+	frequency: "hour";
+};
+
+export type DailyRecurrenceSchedule = RecurrenceScheduleBase & {
+	frequency: "day";
+};
+
+export type WeeklyRecurrenceSchedule = RecurrenceScheduleBase & {
+	frequency: "week";
+	weekdays: RecurrenceWeekdays;
+};
+
+export type MonthlyRecurrenceSchedule = RecurrenceScheduleBase & {
+	frequency: "month";
+	monthlyRestriction: MonthlyRecurrenceRestriction;
+};
+
+export type YearlyRecurrenceSchedule = RecurrenceScheduleBase & {
+	frequency: "year";
+};
+
+export type RecurrenceSchedule =
+	| HourlyRecurrenceSchedule
+	| DailyRecurrenceSchedule
+	| WeeklyRecurrenceSchedule
+	| MonthlyRecurrenceSchedule
+	| YearlyRecurrenceSchedule;

package/src/workflow-access-types.test.ts

@@ -3,7 +3,7 @@ import { expectTypeOf, it } from "vitest";
 import { customAgent } from "./notion-as-code/custom-agent.js";
 import { database } from "./notion-as-code/database.js";
 import { page } from "./notion-as-code/page.js";
-import { triggers } from "./triggers.generated.js";
+import { events } from "./events.generated.js";
 import { access, workflow } from "./workflow.js";
 
 it("infers access aliases and rejects resource-specific levels", () => {
@@ -26,7 +26,7 @@ it("infers access aliases and rejects resource-specific levels", () => {
 	workflow({
 		name: "Access types",
 		description: "Checks access types",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		access: {
 			home: access.view(home),
 			singleDatabase: access.edit(singleDatabase),
@@ -54,7 +54,7 @@ it("infers access aliases and rejects resource-specific levels", () => {
 		workflow({
 			name: "Agent access types",
 			description: "Checks custom agent access types",
-			triggers: [triggers.notionPageCreated()],
+			triggers: [events.notionPageCreated()],
 			// @ts-expect-error Custom agents only support the call level.
 			access: { agent: { resource: agent, level: "view" } },
 			handler: () => {},
@@ -63,7 +63,7 @@ it("infers access aliases and rejects resource-specific levels", () => {
 		workflow({
 			name: "Page access types",
 			description: "Checks page access types",
-			triggers: [triggers.notionPageCreated()],
+			triggers: [events.notionPageCreated()],
 			// @ts-expect-error Pages do not support the custom-agent call level.
 			access: { home: { resource: home, level: "call" } },
 			handler: () => {},

package/src/workflow-connections-types.test.ts

@@ -1,5 +1,5 @@
 import { expectTypeOf, it } from "vitest";
-import { triggers } from "./triggers.generated.js";
+import { events } from "./events.generated.js";
 import { connections, workflow, type WorkflowConnectionDeclarations } from "./workflow.js";
 
 it("infers only the declared provider clients", () => {
@@ -7,7 +7,7 @@ it("infers only the declared provider clients", () => {
 		name: "Mail",
 		description: "Read the configured mailbox",
 		connections: { inbox: connections.mail() },
-		triggers: ({ triggers }) => [triggers.mailEmailReceived({ connectionKey: "inbox" })],
+		triggers: ({ events }) => [events.mailEmailReceived({ connectionKey: "inbox" })],
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<"inbox">();
 			expectTypeOf(context.connections.inbox.searchEmails).toBeFunction();
@@ -19,7 +19,7 @@ it("infers only the declared provider clients", () => {
 	workflow({
 		name: "Calendar",
 		description: "Calendar only",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		connections: { work: connections.calendar() },
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<"work">();
@@ -37,7 +37,7 @@ it("infers only the declared provider clients", () => {
 	workflow({
 		name: "Multiple providers",
 		description: "Preserves clients in a separately declared object",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		connections: requirements,
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<
@@ -51,7 +51,7 @@ it("exposes no providers for omitted or empty connections", () => {
 	workflow({
 		name: "No connections",
 		description: "Omitted",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<never>();
 		},
@@ -59,7 +59,7 @@ it("exposes no providers for omitted or empty connections", () => {
 	workflow({
 		name: "No connections",
 		description: "Empty",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		connections: {},
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<never>();
@@ -72,7 +72,7 @@ it("preserves literal declarations checked with satisfies", () => {
 	workflow({
 		name: "Slack",
 		description: "Slack only",
-		triggers: [triggers.notionPageCreated()],
+		triggers: [events.notionPageCreated()],
 		connections: requirements,
 		handler(_event, context) {
 			expectTypeOf<keyof typeof context.connections>().toEqualTypeOf<"support">();

package/src/workflow-types.test.ts

@@ -9,19 +9,19 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			valid: true,
 			connections: "{ support: connections.slack(), calendar: connections.calendar() }",
 			trigger:
-				'triggers.slackMessage({ connectionKey: "support" }), triggers.calendarEventCreated({ connectionKey: "calendar" })',
+				'events.slackMessage({ connectionKey: "support" }), events.calendarEventCreated({ connectionKey: "calendar" })',
 		},
 		{
 			name: "default",
 			valid: true,
 			connections: "{ slack: connections.slack() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "slack" })',
+			trigger: 'events.slackMessage({ connectionKey: "slack" })',
 		},
 		{
 			name: "unbound",
 			valid: true,
 			connections: "{}",
-			trigger: "triggers.slackMessage(), triggers.notionPageCreated()",
+			trigger: "events.slackMessage(), events.notionPageCreated()",
 		},
 		{
 			name: "global_valid",
@@ -33,25 +33,25 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			name: "undeclared",
 			valid: false,
 			connections: "{ support: connections.slack() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "typo" })',
+			trigger: 'events.slackMessage({ connectionKey: "typo" })',
 		},
 		{
 			name: "wrong_provider",
 			valid: false,
 			connections: "{ support: connections.calendar() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "support" })',
+			trigger: 'events.slackMessage({ connectionKey: "support" })',
 		},
 		{
 			name: "custom_not_default",
 			valid: false,
 			connections: "{ support: connections.slack() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "slack" })',
+			trigger: 'events.slackMessage({ connectionKey: "slack" })',
 		},
 		{
 			name: "missing",
 			valid: false,
 			connections: undefined,
-			trigger: 'triggers.slackMessage({ connectionKey: "slack" })',
+			trigger: 'events.slackMessage({ connectionKey: "slack" })',
 		},
 		{
 			name: "global_invalid",
@@ -69,37 +69,37 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			name: "old_key_option",
 			valid: false,
 			connections: '{ support: connections.slack({ key: "support" }) }',
-			trigger: 'triggers.slackMessage({ connectionKey: "support" })',
+			trigger: 'events.slackMessage({ connectionKey: "support" })',
 		},
 		{
 			name: "literal_default",
 			valid: true,
 			connections: '{ slack: { type: "slack" } }',
-			trigger: 'triggers.slackMessage({ connectionKey: "slack" })',
+			trigger: 'events.slackMessage({ connectionKey: "slack" })',
 		},
 		{
 			name: "saved",
 			valid: true,
 			connections: "{ support }",
-			trigger: 'triggers.slackMessage({ connectionKey: "support" })',
+			trigger: 'events.slackMessage({ connectionKey: "support" })',
 		},
 		{
 			name: "saved_invalid",
 			valid: false,
 			connections: "{ support }",
-			trigger: 'triggers.slackMessage({ connectionKey: "slack" })',
+			trigger: 'events.slackMessage({ connectionKey: "slack" })',
 		},
 		{
 			name: "old_array",
 			valid: false,
 			connections: "[connections.slack()]",
-			trigger: "triggers.slackMessage()",
+			trigger: "events.slackMessage()",
 		},
 		{
 			name: "two_slack",
 			valid: true,
 			connections: "{ support: connections.slack(), team: connections.slack() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "team" })',
+			trigger: 'events.slackMessage({ connectionKey: "team" })',
 		},
 
 		{
@@ -107,7 +107,7 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			valid: true,
 			connections:
 				"{ support: connections.slack(), team: connections.slack(), work: connections.calendar() }",
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 			handler:
 				'(_event, ctx) => { ctx.connections.support.findUserByEmail({ email: "a@example.com" }); ctx.connections.team.findUserByEmail({ email: "b@example.com" }); ctx.connections.work.listCalendars({}); }',
 		},
@@ -115,14 +115,14 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			name: "wrong_client_method",
 			valid: false,
 			connections: "{ support: connections.slack() }",
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 			handler: "(_event, ctx) => { ctx.connections.support.listCalendars({}); }",
 		},
 		{
 			name: "undeclared_client",
 			valid: false,
 			connections: "{ support: connections.slack() }",
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 			handler:
 				'(_event, ctx) => { ctx.connections.slack.findUserByEmail({ email: "a@example.com" }); }',
 		},
@@ -130,14 +130,14 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			name: "old_provider_call",
 			valid: false,
 			connections: "{ support: connections.slack() }",
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 			handler: '(_event, ctx) => { ctx.connections.support("support"); }',
 		},
 		{
 			name: "oauth_keyed_client",
 			valid: true,
 			connections: "{ github: connections.oauth(oauthConfig), support: connections.slack() }",
-			trigger: 'triggers.slackMessage({ connectionKey: "support" })',
+			trigger: 'events.slackMessage({ connectionKey: "support" })',
 			handler:
 				"async (_event, ctx) => { const token: string = await ctx.connections.github.accessToken(); void token; }",
 		},
@@ -145,19 +145,19 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 			name: "oauth_wrong_trigger",
 			valid: false,
 			connections: "{ github: connections.oauth(oauthConfig) }",
-			trigger: 'triggers.slackMessage({ connectionKey: "github" })',
+			trigger: 'events.slackMessage({ connectionKey: "github" })',
 		},
 		{
 			name: "oauth_old_key_option",
 			valid: false,
 			connections: '{ github: connections.oauth({ ...oauthConfig, key: "github" }) }',
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 		},
 		{
 			name: "oauth_old_provider_call",
 			valid: false,
 			connections: "{ github: connections.oauth(oauthConfig) }",
-			trigger: "triggers.notionPageCreated()",
+			trigger: "events.notionPageCreated()",
 			handler: '(_event, ctx) => { ctx.connections.oauth("github"); }',
 		},
 	];
@@ -165,13 +165,13 @@ it("checks provider keys on callback arguments and returned triggers", () => {
 		cases.map((testCase) => [
 			resolve("src", `__workflow_types_${testCase.name}.ts`),
 			`import { connections, workflow } from "./workflow.js";
-		import { triggers as globalTriggers } from "./triggers.generated.js";
+		import { events as globalTriggers } from "./events.generated.js";
 		const support = connections.slack();
 		const oauthConfig = { authorizationEndpoint: "https://example.com/authorize", tokenEndpoint: "https://example.com/token", clientId: "client", clientSecretEnv: "CLIENT_SECRET", scope: "read" };
 		workflow({
 			name: "Type check", description: "Type check",
 			${testCase.connections === undefined ? "" : `connections: ${testCase.connections},`}
-			triggers: ({ triggers }) => [${testCase.trigger}],
+			triggers: ({ events }) => [${testCase.trigger}],
 			handler: ${testCase.handler ?? "() => {}"},
 		});`,
 		]),