@cursor/bdk 0.2.9 → 0.2.11

package/dist/channels/origin/origin-channel.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { z } from "zod";
 import { allowAll, defineChannel, localDevStrict, loopbackOnly, POST } from "../../channels.js";
 import { acknowledgeTask, isTaskDispatch, skipped, turnStarted, withPropagatingBackgroundErrors, } from "../../internal/channel-dispatch.js";
@@ -60,7 +51,7 @@ function originActor(value) {
         ["service_account", asRecord(record.serviceAccount)],
     ];
     for (const [kind, actor] of nestedActors) {
-        const id = asNonEmptyString(actor === null || actor === void 0 ? void 0 : actor.id);
+        const id = asNonEmptyString(actor?.id);
         if (id !== undefined) {
             return { id, kind };
         }
@@ -72,16 +63,14 @@ function originActor(value) {
     return kind === undefined ? { id } : { id, kind };
 }
 function originHeaders(request) {
-    var _a, _b, _c;
     return {
-        "webhook-id": (_a = request.headers.get("webhook-id")) !== null && _a !== void 0 ? _a : undefined,
-        "webhook-timestamp": (_b = request.headers.get("webhook-timestamp")) !== null && _b !== void 0 ? _b : undefined,
-        "webhook-signature": (_c = request.headers.get("webhook-signature")) !== null && _c !== void 0 ? _c : undefined,
+        "webhook-id": request.headers.get("webhook-id") ?? undefined,
+        "webhook-timestamp": request.headers.get("webhook-timestamp") ?? undefined,
+        "webhook-signature": request.headers.get("webhook-signature") ?? undefined,
     };
 }
 function skipOriginVerify() {
-    var _a;
-    return ((_a = process.env.AGENT_SERVE_ORIGIN_SKIP_VERIFY) === null || _a === void 0 ? void 0 : _a.trim()) === "1";
+    return process.env.AGENT_SERVE_ORIGIN_SKIP_VERIFY?.trim() === "1";
 }
 /**
  * Direct Origin HTTP deliveries verify v1ed. `--dev` and
@@ -99,8 +88,7 @@ function asIdList(value) {
 }
 /** `AGENT_SERVE_ORIGIN_APP_ID` fallback for {@link OriginChannelOptions.appId}. */
 export function envOriginAppId() {
-    var _a;
-    const value = (_a = process.env.AGENT_SERVE_ORIGIN_APP_ID) === null || _a === void 0 ? void 0 : _a.trim();
+    const value = process.env.AGENT_SERVE_ORIGIN_APP_ID?.trim();
     return value === undefined || value === "" ? undefined : value;
 }
 function configuredOriginAppIds(options) {
@@ -134,12 +122,11 @@ function configuredOriginRepoAllowlist(options) {
  * webhook-secret analogue). Cursor-internal documents the same gap.
  */
 function originHttpBindingError(options, envelope) {
-    var _a, _b;
     const allowedApps = configuredOriginAppIds(options);
     if (allowedApps.length === 0) {
         return "unbound_origin_app";
     }
-    const deliveredAppId = (_a = envelope.appId) === null || _a === void 0 ? void 0 : _a.trim();
+    const deliveredAppId = envelope.appId?.trim();
     if (deliveredAppId === undefined || deliveredAppId === "") {
         return "invalid_app";
     }
@@ -150,7 +137,7 @@ function originHttpBindingError(options, envelope) {
     if (allowedInstalls.length === 0) {
         return undefined;
     }
-    const deliveredInstallationId = (_b = envelope.installationId) === null || _b === void 0 ? void 0 : _b.trim();
+    const deliveredInstallationId = envelope.installationId?.trim();
     if (deliveredInstallationId === undefined ||
         deliveredInstallationId === "" ||
         !allowedInstalls.includes(deliveredInstallationId)) {
@@ -160,7 +147,7 @@ function originHttpBindingError(options, envelope) {
 }
 function resolveApiBaseUrl(options) {
     const authored = typeof options.apiBaseUrl === "function" ? options.apiBaseUrl() : options.apiBaseUrl;
-    const trimmed = authored === null || authored === void 0 ? void 0 : authored.trim();
+    const trimmed = authored?.trim();
     return trimmed === undefined || trimmed === "" ? DEFAULT_ORIGIN_API_BASE_URL : trimmed;
 }
 const originEnvelopeSchema = z.object({
@@ -185,38 +172,38 @@ export function parseOriginWebhookEnvelope(payload) {
     return parsed.success ? parsed.data : null;
 }
 function originRepoFromPayload(payload) {
-    var _a, _b;
-    var _c;
-    const repository = (_c = asRecord(payload.repository)) !== null && _c !== void 0 ? _c : asRecord((_a = asRecord(payload.pullRequest)) === null || _a === void 0 ? void 0 : _a.repository);
-    const owner = asNonEmptyString((_b = asRecord(repository === null || repository === void 0 ? void 0 : repository.owner)) === null || _b === void 0 ? void 0 : _b.slug);
-    const name = asNonEmptyString(repository === null || repository === void 0 ? void 0 : repository.name);
+    const repository = asRecord(payload.repository) ?? asRecord(asRecord(payload.pullRequest)?.repository);
+    const owner = asNonEmptyString(asRecord(repository?.owner)?.slug);
+    const name = asNonEmptyString(repository?.name);
     if (owner === undefined || name === undefined)
         return undefined;
     return { owner, name, fullName: `${owner}/${name}` };
 }
 function originPrUrl(repository, number, explicit) {
-    return (explicit !== null && explicit !== void 0 ? explicit : `https://cursor.com/codebase/${repository.owner}/${repository.name}/pull/${number}`);
+    return (explicit ?? `https://cursor.com/codebase/${repository.owner}/${repository.name}/pull/${number}`);
 }
 function originSender(envelope, payload) {
-    var _a, _b, _c;
-    var _d, _e, _f, _g, _h;
-    return ((_h = (_g = (_f = (_e = (_d = envelope.sender) !== null && _d !== void 0 ? _d : originActor(payload.actor)) !== null && _e !== void 0 ? _e : originActor(payload.pusher)) !== null && _f !== void 0 ? _f : originActor((_a = asRecord(payload.review)) === null || _a === void 0 ? void 0 : _a.author)) !== null && _g !== void 0 ? _g : originActor((_b = asRecord(payload.comment)) === null || _b === void 0 ? void 0 : _b.author)) !== null && _h !== void 0 ? _h : originActor((_c = asRecord(payload.pullRequest)) === null || _c === void 0 ? void 0 : _c.author));
+    return (envelope.sender ??
+        originActor(payload.actor) ??
+        originActor(payload.pusher) ??
+        originActor(asRecord(payload.review)?.author) ??
+        originActor(asRecord(payload.comment)?.author) ??
+        originActor(asRecord(payload.pullRequest)?.author));
 }
 export function parseOriginPullRequestEvent(input) {
-    var _a, _b, _c, _d;
-    const payload = (_a = asRecord(input.envelope.event.payload)) !== null && _a !== void 0 ? _a : {};
+    const payload = asRecord(input.envelope.event.payload) ?? {};
     const repository = originRepoFromPayload(payload);
     const pullRequest = asRecord(payload.pullRequest);
-    const number = asPositiveInt(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.number);
+    const number = asPositiveInt(pullRequest?.number);
     if (repository === undefined || number === undefined) {
         return null;
     }
     const eventType = input.envelope.event.type;
-    const url = originPrUrl(repository, number, asNonEmptyString(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.url));
-    const head = asRecord(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.head);
-    const base = asRecord(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.base);
-    const version = asRecord(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.version);
-    const author = originActor(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.author);
+    const url = originPrUrl(repository, number, asNonEmptyString(pullRequest?.url));
+    const head = asRecord(pullRequest?.head);
+    const base = asRecord(pullRequest?.base);
+    const version = asRecord(pullRequest?.version);
+    const author = originActor(pullRequest?.author);
     return {
         payload,
         ctx: {
@@ -235,17 +222,18 @@ export function parseOriginPullRequestEvent(input) {
             type: eventType,
             number,
             url,
-            title: asNonEmptyString(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.title),
-            body: (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.body) === null
+            title: asNonEmptyString(pullRequest?.title),
+            body: pullRequest?.body === null
                 ? null
-                : ((_b = asNonEmptyString(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.body)) !== null && _b !== void 0 ? _b : (typeof (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.body) === "string" ? pullRequest.body : undefined)),
-            draft: asBoolean(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.draft),
-            merged: eventType === "pull_request.merged" || asBoolean(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.merged),
-            authorId: author === null || author === void 0 ? void 0 : author.id,
-            headRef: asNonEmptyString(head === null || head === void 0 ? void 0 : head.ref),
-            headSha: (_c = asNonEmptyString(head === null || head === void 0 ? void 0 : head.sha)) !== null && _c !== void 0 ? _c : asNonEmptyString(version === null || version === void 0 ? void 0 : version.headSha),
-            baseRef: asNonEmptyString(base === null || base === void 0 ? void 0 : base.ref),
-            baseSha: (_d = asNonEmptyString(base === null || base === void 0 ? void 0 : base.sha)) !== null && _d !== void 0 ? _d : asNonEmptyString(version === null || version === void 0 ? void 0 : version.baseSha),
+                : (asNonEmptyString(pullRequest?.body) ??
+                    (typeof pullRequest?.body === "string" ? pullRequest.body : undefined)),
+            draft: asBoolean(pullRequest?.draft),
+            merged: eventType === "pull_request.merged" || asBoolean(pullRequest?.merged),
+            authorId: author?.id,
+            headRef: asNonEmptyString(head?.ref),
+            headSha: asNonEmptyString(head?.sha) ?? asNonEmptyString(version?.headSha),
+            baseRef: asNonEmptyString(base?.ref),
+            baseSha: asNonEmptyString(base?.sha) ?? asNonEmptyString(version?.baseSha),
         },
     };
 }
@@ -256,14 +244,20 @@ export function parseOriginPullRequestEvent(input) {
  * as {@link defaultGitHubAuth}).
  */
 export function defaultOriginAuth(ctx) {
-    var _a, _b;
-    const senderId = (_a = ctx.sender) === null || _a === void 0 ? void 0 : _a.id;
-    const senderKind = (_b = ctx.sender) === null || _b === void 0 ? void 0 : _b.kind;
+    const senderId = ctx.sender?.id;
+    const senderKind = ctx.sender?.kind;
     return {
         authenticator: "origin-webhook",
-        principalId: senderId !== null && senderId !== void 0 ? senderId : "origin",
+        principalId: senderId ?? "origin",
         principalType: senderKind === "app" || senderKind === "service_account" ? "service" : "user",
-        attributes: Object.assign(Object.assign(Object.assign(Object.assign({ conversation_kind: "pull_request", repository: ctx.repository.fullName }, (ctx.deliveryId === undefined ? {} : { delivery_id: ctx.deliveryId })), (senderId === undefined ? {} : { subject: senderId })), (senderKind === undefined ? {} : { user_type: senderKind })), { issuer: `origin:${ctx.repository.owner}` }),
+        attributes: {
+            conversation_kind: "pull_request",
+            repository: ctx.repository.fullName,
+            ...(ctx.deliveryId === undefined ? {} : { delivery_id: ctx.deliveryId }),
+            ...(senderId === undefined ? {} : { subject: senderId }),
+            ...(senderKind === undefined ? {} : { user_type: senderKind }),
+            issuer: `origin:${ctx.repository.owner}`,
+        },
     };
 }
 export function originContinuationKey(ctx) {
@@ -303,75 +297,79 @@ export function defaultOriginPullRequestDispatch(ctx, pullRequest) {
     return { auth: defaultOriginAuth(ctx) };
 }
 function enrichEventContext(input) {
-    return Object.assign(Object.assign({}, input.ctx), { host: input.args.host, artifacts: input.args.artifacts, send: input.args.send, origin: buildOriginBinding({
+    return {
+        ...input.ctx,
+        host: input.args.host,
+        artifacts: input.args.artifacts,
+        send: input.args.send,
+        origin: buildOriginBinding({
             repository: input.ctx.repository,
             installationId: input.ctx.installationId,
             executionId: input.ctx.deliveryId,
             cursorAccount: input.options.cursorAccount !== undefined && input.options.cursorAccount !== false,
             app: input.options.app,
-        }) });
-}
-function startTurn(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const source = continuationSource(input.options.continuation, "origin");
-        const cloud = (_a = input.dispatch.cloud) !== null && _a !== void 0 ? _a : input.cloud;
-        const state = Object.assign(Object.assign({}, input.dispatch.state), input.state);
-        const session = yield input.args.send(input.message, Object.assign(Object.assign({ auth: input.dispatch.auth }, (source === "engine" ? { continuationToken: originContinuationKey(input.ctx) } : {})), { title: (_b = input.dispatch.title) !== null && _b !== void 0 ? _b : defaultOriginTitle(input.ctx), cloud, state: state, 
-            // Resume must refresh the triggering comment / delivery identifiers so
-            // reply delivery targets the latest wake, not the session's first.
-            refreshState: state }));
-        return turnStarted(session);
-    });
+        }),
+    };
 }
-function resolveCloudOptions(cloud, ctx, pullRequest) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (cloud === undefined || cloud === false) {
-            return undefined;
-        }
-        if (cloud === true) {
-            return {
-                repos: [
-                    {
-                        url: `https://cursor.com/codebase/${ctx.repository.fullName}`,
-                        prUrl: pullRequest.url,
-                        startingRef: pullRequest.headSha,
-                    },
-                ],
-            };
-        }
-        if (typeof cloud === "function") {
-            return yield cloud(ctx, pullRequest);
-        }
-        return cloud;
+async function startTurn(input) {
+    const source = continuationSource(input.options.continuation, "origin");
+    const cloud = input.dispatch.cloud ?? input.cloud;
+    const state = { ...input.dispatch.state, ...input.state };
+    const session = await input.args.send(input.message, {
+        auth: input.dispatch.auth,
+        ...(source === "engine" ? { continuationToken: originContinuationKey(input.ctx) } : {}),
+        title: input.dispatch.title ?? defaultOriginTitle(input.ctx),
+        cloud,
+        state: state,
+        // Resume must refresh the triggering comment / delivery identifiers so
+        // reply delivery targets the latest wake, not the session's first.
+        refreshState: state,
     });
+    return turnStarted(session);
 }
-function applyDispatch(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        if (input.dispatch === null) {
-            return skipped("not_dispatched", input.extra);
-        }
-        if (isTaskDispatch(input.dispatch)) {
-            return acknowledgeTask(input.args, ORIGIN_CHANNEL_KIND, input.dispatch, input.extra);
-        }
-        const message = [(_a = input.dispatch.message) !== null && _a !== void 0 ? _a : input.message, ...((_b = input.dispatch.context) !== null && _b !== void 0 ? _b : [])].join("\n");
-        return startTurn({
-            options: input.options,
-            args: input.args,
-            ctx: input.ctx,
-            message,
-            dispatch: input.dispatch,
-            cloud: input.cloud,
-            state: originChannelStateForEvent({
-                repository: input.ctx.repository,
-                pullRequestNumber: input.ctx.pullRequestNumber,
-                installationId: input.ctx.installationId,
-                deliveryId: input.ctx.deliveryId,
-                eventType: input.ctx.eventType,
-                triggeringCommentId: input.triggeringCommentId,
-            }),
-        });
+async function resolveCloudOptions(cloud, ctx, pullRequest) {
+    if (cloud === undefined || cloud === false) {
+        return undefined;
+    }
+    if (cloud === true) {
+        return {
+            repos: [
+                {
+                    url: `https://cursor.com/codebase/${ctx.repository.fullName}`,
+                    prUrl: pullRequest.url,
+                    startingRef: pullRequest.headSha,
+                },
+            ],
+        };
+    }
+    if (typeof cloud === "function") {
+        return await cloud(ctx, pullRequest);
+    }
+    return cloud;
+}
+async function applyDispatch(input) {
+    if (input.dispatch === null) {
+        return skipped("not_dispatched", input.extra);
+    }
+    if (isTaskDispatch(input.dispatch)) {
+        return acknowledgeTask(input.args, ORIGIN_CHANNEL_KIND, input.dispatch, input.extra);
+    }
+    const message = [input.dispatch.message ?? input.message, ...(input.dispatch.context ?? [])].join("\n");
+    return startTurn({
+        options: input.options,
+        args: input.args,
+        ctx: input.ctx,
+        message,
+        dispatch: input.dispatch,
+        cloud: input.cloud,
+        state: originChannelStateForEvent({
+            repository: input.ctx.repository,
+            pullRequestNumber: input.ctx.pullRequestNumber,
+            installationId: input.ctx.installationId,
+            deliveryId: input.ctx.deliveryId,
+            eventType: input.ctx.eventType,
+            triggeringCommentId: input.triggeringCommentId,
+        }),
     });
 }
 /**
@@ -380,156 +378,151 @@ function applyDispatch(input) {
  * id; trigger fan-out and hosted admission arrive verified. The v2 mailbox
  * is stamped upstream (local CP or hosted ingress), never here.
  */
-export function dispatchOriginWebhook(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const eventType = input.envelope.event.type;
-        const parsed = parseOriginPullRequestEvent({ envelope: input.envelope });
-        if (parsed === null) {
-            return Response.json({ ok: false, error: "invalid_origin_payload" }, { status: 400 });
+export async function dispatchOriginWebhook(input) {
+    const eventType = input.envelope.event.type;
+    const parsed = parseOriginPullRequestEvent({ envelope: input.envelope });
+    if (parsed === null) {
+        return Response.json({ ok: false, error: "invalid_origin_payload" }, { status: 400 });
+    }
+    const args = input.args;
+    const ctx = enrichEventContext({
+        ctx: parsed.ctx,
+        args,
+        options: input.options,
+    });
+    const { pullRequest, payload } = parsed;
+    const repoAllowlist = configuredOriginRepoAllowlist(input.options);
+    if (repoAllowlist !== undefined && !repoAllowlist.has(ctx.repository.fullName.toLowerCase())) {
+        return skipped("repo_not_allowed", { repo: ctx.repository.fullName });
+    }
+    if (eventType.startsWith("pull_request.comment.")) {
+        if (input.options.onComment === undefined) {
+            return skipped("no_handler", { event: eventType });
         }
-        const args = input.args;
-        const ctx = enrichEventContext({
-            ctx: parsed.ctx,
-            args,
+        const commentRecord = asRecord(payload.comment);
+        const commentId = asNonEmptyString(commentRecord?.id);
+        const commentBody = typeof commentRecord?.body === "string" ? commentRecord.body : undefined;
+        if (commentId === undefined || commentBody === undefined) {
+            return Response.json({ ok: false, error: "invalid_origin_comment_payload" }, { status: 400 });
+        }
+        const comment = {
+            id: commentId,
+            body: commentBody,
+            author: originActor(commentRecord?.author),
+        };
+        const dispatch = await input.options.onComment(ctx, comment);
+        return applyDispatch({
             options: input.options,
+            args,
+            ctx,
+            dispatch,
+            extra: { event: eventType },
+            message: commentBody.trim() === ""
+                ? `Origin comment on ${ctx.repository.fullName}#${ctx.pullRequestNumber}`
+                : commentBody.trim(),
+            triggeringCommentId: commentId,
         });
-        const { pullRequest, payload } = parsed;
-        const repoAllowlist = configuredOriginRepoAllowlist(input.options);
-        if (repoAllowlist !== undefined && !repoAllowlist.has(ctx.repository.fullName.toLowerCase())) {
-            return skipped("repo_not_allowed", { repo: ctx.repository.fullName });
-        }
-        if (eventType.startsWith("pull_request.comment.")) {
-            if (input.options.onComment === undefined) {
-                return skipped("no_handler", { event: eventType });
-            }
-            const commentRecord = asRecord(payload.comment);
-            const commentId = asNonEmptyString(commentRecord === null || commentRecord === void 0 ? void 0 : commentRecord.id);
-            const commentBody = typeof (commentRecord === null || commentRecord === void 0 ? void 0 : commentRecord.body) === "string" ? commentRecord.body : undefined;
-            if (commentId === undefined || commentBody === undefined) {
-                return Response.json({ ok: false, error: "invalid_origin_comment_payload" }, { status: 400 });
-            }
-            const comment = {
-                id: commentId,
-                body: commentBody,
-                author: originActor(commentRecord === null || commentRecord === void 0 ? void 0 : commentRecord.author),
-            };
-            const dispatch = yield input.options.onComment(ctx, comment);
-            return applyDispatch({
-                options: input.options,
-                args,
-                ctx,
-                dispatch,
-                extra: { event: eventType },
-                message: commentBody.trim() === ""
-                    ? `Origin comment on ${ctx.repository.fullName}#${ctx.pullRequestNumber}`
-                    : commentBody.trim(),
-                triggeringCommentId: commentId,
-            });
-        }
-        if (eventType.startsWith("pull_request.review.")) {
-            if (input.options.onReview === undefined) {
-                return skipped("no_handler", { event: eventType });
-            }
-            const reviewRecord = (_a = asRecord(payload.review)) !== null && _a !== void 0 ? _a : {};
-            const review = {
-                id: asNonEmptyString(reviewRecord.id),
-                verdict: asNonEmptyString(reviewRecord.verdict),
-                author: originActor(reviewRecord.author),
-            };
-            const dispatch = yield input.options.onReview(ctx, review);
-            return applyDispatch({
-                options: input.options,
-                args,
-                ctx,
-                dispatch,
-                extra: { event: eventType },
-                message: `Origin review on ${ctx.repository.fullName}#${ctx.pullRequestNumber}`,
-            });
-        }
-        if (eventType.startsWith("pull_request.")) {
-            const dispatch = input.options.onPullRequest === undefined
-                ? defaultOriginPullRequestDispatch(ctx, pullRequest)
-                : yield input.options.onPullRequest(ctx, pullRequest);
-            const cloud = yield resolveCloudOptions(input.options.cloud, ctx, pullRequest);
-            return applyDispatch({
-                options: input.options,
-                args,
-                ctx,
-                dispatch,
-                extra: { event: eventType },
-                message: defaultOriginPullRequestMessage(ctx, pullRequest),
-                cloud,
-            });
-        }
-        if (input.options.onEvent !== undefined) {
-            const dispatch = yield input.options.onEvent(ctx, {
-                eventType,
-                payload,
-            });
-            return applyDispatch({
-                options: input.options,
-                args,
-                ctx,
-                dispatch,
-                extra: { event: eventType },
-                message: `Origin ${eventType} event`,
-            });
+    }
+    if (eventType.startsWith("pull_request.review.")) {
+        if (input.options.onReview === undefined) {
+            return skipped("no_handler", { event: eventType });
         }
-        return skipped("unsupported_event", { event: eventType });
-    });
+        const reviewRecord = asRecord(payload.review) ?? {};
+        const review = {
+            id: asNonEmptyString(reviewRecord.id),
+            verdict: asNonEmptyString(reviewRecord.verdict),
+            author: originActor(reviewRecord.author),
+        };
+        const dispatch = await input.options.onReview(ctx, review);
+        return applyDispatch({
+            options: input.options,
+            args,
+            ctx,
+            dispatch,
+            extra: { event: eventType },
+            message: `Origin review on ${ctx.repository.fullName}#${ctx.pullRequestNumber}`,
+        });
+    }
+    if (eventType.startsWith("pull_request.")) {
+        const dispatch = input.options.onPullRequest === undefined
+            ? defaultOriginPullRequestDispatch(ctx, pullRequest)
+            : await input.options.onPullRequest(ctx, pullRequest);
+        const cloud = await resolveCloudOptions(input.options.cloud, ctx, pullRequest);
+        return applyDispatch({
+            options: input.options,
+            args,
+            ctx,
+            dispatch,
+            extra: { event: eventType },
+            message: defaultOriginPullRequestMessage(ctx, pullRequest),
+            cloud,
+        });
+    }
+    if (input.options.onEvent !== undefined) {
+        const dispatch = await input.options.onEvent(ctx, {
+            eventType,
+            payload,
+        });
+        return applyDispatch({
+            options: input.options,
+            args,
+            ctx,
+            dispatch,
+            extra: { event: eventType },
+            message: `Origin ${eventType} event`,
+        });
+    }
+    return skipped("unsupported_event", { event: eventType });
 }
 /**
  * HTTP entry for a single agent's Origin channel: optional v1ed verify, then
  * app-id bind, then {@link dispatchOriginWebhook}.
  */
-export function handleOriginWebhookRequest(input) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const bodyText = yield input.request.text();
-        const requireHttpBinding = input.skipSignatureVerification !== true && shouldSkipOriginVerify() !== true;
-        if (requireHttpBinding) {
-            try {
-                yield verifyOriginWebhook(bodyText, originHeaders(input.request), {
-                    apiBaseUrl: resolveApiBaseUrl(input.options),
-                });
-            }
-            catch (error) {
-                // A JWKS outage means the delivery was never checked: answer 503 so
-                // Origin's delivery worker retries. Only a real signature mismatch
-                // is the terminal 401.
-                if (error instanceof OriginJwksUnavailableError) {
-                    return Response.json({ ok: false, error: "signature_verification_unavailable" }, { status: 503 });
-                }
-                return Response.json({ ok: false, error: "invalid_signature" }, { status: 401 });
-            }
-        }
-        let payload;
+export async function handleOriginWebhookRequest(input) {
+    const bodyText = await input.request.text();
+    const requireHttpBinding = input.skipSignatureVerification !== true && shouldSkipOriginVerify() !== true;
+    if (requireHttpBinding) {
         try {
-            payload = JSON.parse(bodyText);
-        }
-        catch (_a) {
-            return Response.json({ ok: false, error: "invalid_json" }, { status: 400 });
-        }
-        const envelope = parseOriginWebhookEnvelope(payload);
-        if (envelope === null) {
-            return Response.json({ ok: false, error: "invalid_origin_payload" }, { status: 400 });
+            await verifyOriginWebhook(bodyText, originHeaders(input.request), {
+                apiBaseUrl: resolveApiBaseUrl(input.options),
+            });
         }
-        if (requireHttpBinding) {
-            const bindingError = originHttpBindingError(input.options, envelope);
-            if (bindingError !== undefined) {
-                return Response.json({ ok: false, error: bindingError }, { status: 401 });
+        catch (error) {
+            // A JWKS outage means the delivery was never checked: answer 503 so
+            // Origin's delivery worker retries. Only a real signature mismatch
+            // is the terminal 401.
+            if (error instanceof OriginJwksUnavailableError) {
+                return Response.json({ ok: false, error: "signature_verification_unavailable" }, { status: 503 });
             }
+            return Response.json({ ok: false, error: "invalid_signature" }, { status: 401 });
         }
-        return dispatchOriginWebhook({
-            options: input.options,
-            envelope,
-            args: bindLocalIngressSend(input.args, {
-                identity: input.options.continuation,
-                kind: "origin",
-                eventType: envelope.event.type,
-                payload: originIngressExtractPayload(envelope),
-            }),
-        });
+    }
+    let payload;
+    try {
+        payload = JSON.parse(bodyText);
+    }
+    catch {
+        return Response.json({ ok: false, error: "invalid_json" }, { status: 400 });
+    }
+    const envelope = parseOriginWebhookEnvelope(payload);
+    if (envelope === null) {
+        return Response.json({ ok: false, error: "invalid_origin_payload" }, { status: 400 });
+    }
+    if (requireHttpBinding) {
+        const bindingError = originHttpBindingError(input.options, envelope);
+        if (bindingError !== undefined) {
+            return Response.json({ ok: false, error: bindingError }, { status: 401 });
+        }
+    }
+    return dispatchOriginWebhook({
+        options: input.options,
+        envelope,
+        args: bindLocalIngressSend(input.args, {
+            identity: input.options.continuation,
+            kind: "origin",
+            eventType: envelope.event.type,
+            payload: originIngressExtractPayload(envelope),
+        }),
     });
 }
 const originChannelOptionsByDefinition = new WeakMap();
@@ -537,7 +530,6 @@ export function getOriginChannelOptions(definition) {
     return originChannelOptionsByDefinition.get(definition);
 }
 export function originChannel(options = {}) {
-    var _a, _b;
     const usesCursorAccount = options.cursorAccount === true || typeof options.cursorAccount === "object";
     const cursorScope = typeof options.cursorAccount === "object"
         ? parseCursorOriginRepoScope(options.cursorAccount.repos)
@@ -545,27 +537,32 @@ export function originChannel(options = {}) {
     if (options.repos !== undefined) {
         parseCursorOriginRepoScope(options.repos);
     }
-    const routePath = (_a = options.path) !== null && _a !== void 0 ? _a : "/";
+    const routePath = options.path ?? "/";
     // v1ed + configured app id is the request auth (allowAll), matching GitHub
     // HMAC + webhookSecret. Without an app id, prod stays loopback-strict so a
     // reachable URL cannot be driven by any Origin-signed delivery. `--dev`
     // / skip-verify admits loopback only.
-    const auth = (_b = options.auth) !== null && _b !== void 0 ? _b : [
+    const auth = options.auth ?? [
         (request, info) => (shouldSkipOriginVerify()
             ? loopbackOnly()
             : configuredOriginAppIds(options).length > 0
                 ? allowAll()
                 : localDevStrict())(request, info),
     ];
-    const channelOptions = Object.assign({}, options);
+    const channelOptions = {
+        ...options,
+    };
     if (channelOptions.continuation !== undefined) {
         channelOptions.continuation = normalizeIdentity(channelOptions.continuation, "origin");
     }
-    const events = Object.assign(Object.assign({}, buildDefaultOriginEvents({
-        cursorAccount: channelOptions.cursorAccount,
-        app: channelOptions.app,
-        deliverReplies: channelOptions.deliverReplies,
-    })), options.events);
+    const events = {
+        ...buildDefaultOriginEvents({
+            cursorAccount: channelOptions.cursorAccount,
+            app: channelOptions.app,
+            deliverReplies: channelOptions.deliverReplies,
+        }),
+        ...options.events,
+    };
     const definition = defineChannel({
         auth,
         state: emptyOriginChannelState(),
@@ -580,12 +577,10 @@ export function originChannel(options = {}) {
             POST(routePath, {
                 bodySchema: z.unknown(),
                 description: "Origin webhook ingress",
-                handler: (request, args) => __awaiter(this, void 0, void 0, function* () {
-                    return handleOriginWebhookRequest({
-                        options: channelOptions,
-                        request,
-                        args,
-                    });
+                handler: async (request, args) => handleOriginWebhookRequest({
+                    options: channelOptions,
+                    request,
+                    args,
                 }),
             }),
         ],
@@ -594,7 +589,7 @@ export function originChannel(options = {}) {
     attachHostedAdmissionAdapter(definition, {
         kind: ORIGIN_CHANNEL_KIND,
         prepareArgs: withPropagatingBackgroundErrors,
-        dispatch: (_a) => __awaiter(this, [_a], void 0, function* ({ payload, args }) {
+        dispatch: async ({ payload, args }) => {
             const envelope = parseOriginWebhookEnvelope(payload);
             if (envelope === null) {
                 return Response.json({ ok: false, error: "invalid_origin_payload" }, { status: 400 });
@@ -604,7 +599,7 @@ export function originChannel(options = {}) {
                 envelope,
                 args,
             });
-        }),
+        },
     });
     if (usesCursorAccount) {
         registerOriginCursorAccountRuntime(definition, {
@@ -615,18 +610,17 @@ export function originChannel(options = {}) {
     return definition;
 }
 export function findOriginChannelTargets(mounts) {
-    var _a;
     const targets = [];
     for (const { slug, project } of mounts) {
         for (const channel of project.channels) {
             const meta = channel.definition.meta;
-            if ((meta === null || meta === void 0 ? void 0 : meta.kind) !== ORIGIN_CHANNEL_KIND) {
+            if (meta?.kind !== ORIGIN_CHANNEL_KIND) {
                 continue;
             }
             targets.push({
                 slug,
                 channelId: channel.id,
-                events: [...((_a = meta.originWebhookEvents) !== null && _a !== void 0 ? _a : [])],
+                events: [...(meta.originWebhookEvents ?? [])],
             });
         }
     }