@cursor/bdk 0.2.9 → 0.2.11

package/dist/channels/gitlab/cursor-account.js

@@ -48,7 +48,7 @@ export function createPendingCursorGitLabCredentials() {
             if (getApiKey === undefined || transport === undefined) {
                 return undefined;
             }
-            return Object.assign(Object.assign({}, transport), { getApiKey });
+            return { ...transport, getApiKey };
         },
     };
 }

package/dist/channels/gitlab/defaults.js

@@ -16,7 +16,14 @@ export function defaultGitLabAuth(ctx) {
         authenticator: "gitlab-webhook",
         principalId: sender === undefined ? "gitlab" : String(sender.id),
         principalType: "user",
-        attributes: Object.assign(Object.assign(Object.assign({ conversation_kind: ctx.mergeRequestIid === undefined ? ctx.eventType : "merge_request", project: ctx.project.pathWithNamespace, project_id: String(ctx.project.id) }, (ctx.deliveryId === undefined ? {} : { delivery_id: ctx.deliveryId })), (sender === undefined ? {} : { subject: String(sender.id), username: sender.username })), { issuer: `gitlab:${host}` }),
+        attributes: {
+            conversation_kind: ctx.mergeRequestIid === undefined ? ctx.eventType : "merge_request",
+            project: ctx.project.pathWithNamespace,
+            project_id: String(ctx.project.id),
+            ...(ctx.deliveryId === undefined ? {} : { delivery_id: ctx.deliveryId }),
+            ...(sender === undefined ? {} : { subject: String(sender.id), username: sender.username }),
+            issuer: `gitlab:${host}`,
+        },
     };
 }
 export function defaultGitLabTitle(ctx) {
@@ -25,13 +32,12 @@ export function defaultGitLabTitle(ctx) {
         : `GitLab ${ctx.project.pathWithNamespace}!${ctx.mergeRequestIid}`;
 }
 export function defaultGitLabMergeRequestMessage(ctx, mergeRequest) {
-    var _a;
     const head = mergeRequest.sourceBranch !== undefined && mergeRequest.headSha !== undefined
         ? `Head: ${mergeRequest.sourceBranch} (${mergeRequest.headSha})`
         : undefined;
     return [
         `GitLab merge request trigger: ${ctx.project.pathWithNamespace}!${mergeRequest.iid}`,
-        `Action: ${(_a = mergeRequest.action) !== null && _a !== void 0 ? _a : "unknown"}`,
+        `Action: ${mergeRequest.action ?? "unknown"}`,
         `URL: ${mergeRequest.url}`,
         ...(mergeRequest.title === undefined ? [] : [`Title: ${mergeRequest.title}`]),
         ...(head === undefined ? [] : [head]),

package/dist/channels/gitlab/gitlab-channel.d.ts

@@ -1,7 +1,22 @@
-import type { ChannelDefinition } from "../../types.js";
+import { type AuthPolicy, type ChannelDefinition } from "../../types.js";
 import { type GitLabChannelState } from "./state.js";
 import type { GitLabChannelOptions } from "./types.js";
 export declare function getGitLabChannelOptions(definition: object): GitLabChannelOptions | undefined;
+/**
+ * Why a `gitlabChannel` cannot deploy onto architecture v2 as authored, or
+ * `undefined` when it can: v2 needs a named `webhookSecret` so the control
+ * plane can compare `X-Gitlab-Token` before any compute starts.
+ */
+export declare function gitlabChannelArchitectureError(definition: object): string | undefined;
+/**
+ * The route policy for a GitLab webhook whose secret is named: compare
+ * `X-Gitlab-Token` against the env var / deployment secret `secretName`.
+ * Being a {@link sharedSecretAuth} policy, `deploy` writes it into the
+ * manifest, so on Cursor hosting the control plane runs the same compare at
+ * ingestion, refuses a bad token before any compute starts, and strips the
+ * header (it is the secret) before the request reaches the guest.
+ */
+export declare function gitlabWebhookTokenAuth(secretName: string): AuthPolicy;
 export declare function gitlabChannel(options?: GitLabChannelOptions): ChannelDefinition<GitLabChannelState>;
 /** Minimal mount shape shared by `serve` / the `gitlab` CLI. */
 export interface GitLabAgentMountLike {

package/dist/channels/gitlab/gitlab-channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitlab-channel.d.ts","sourceRoot":"","sources":["../../../src/channels/gitlab/gitlab-channel.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAaxD,OAAO,EAA2B,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIvD,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAE5F;AAED,wBAAgB,aAAa,CAC3B,OAAO,GAAE,oBAAyB,GACjC,iBAAiB,CAAC,kBAAkB,CAAC,CAqFvC;AAED,gEAAgE;AAChE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,QAAQ,EAAE,KAAK,CAAC;YACd,EAAE,EAAE,MAAM,CAAC;YACX,UAAU,EAAE;gBACV,IAAI,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;iBAAE,CAAC;gBAClE,MAAM,CAAC,EAAE,aAAa,CAAC;oBAAE,MAAM,EAAE,MAAM,CAAC;oBAAC,IAAI,EAAE,MAAM,CAAA;iBAAE,CAAC,CAAC;aAC1D,CAAC;SACH,CAAC,CAAC;KACJ,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,GAC1C,mBAAmB,EAAE,CAkBvB"}
+{"version":3,"file":"gitlab-channel.d.ts","sourceRoot":"","sources":["../../../src/channels/gitlab/gitlab-channel.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,iBAAiB,EAAe,MAAM,gBAAgB,CAAC;AActF,OAAO,EAA2B,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAIvD,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,oBAAoB,GAAG,SAAS,CAE5F;AAED;;;;GAIG;AACH,wBAAgB,8BAA8B,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAWrF;AAED;;;;;;;GAOG;AACH,wBAAgB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,UAAU,CAErE;AA0BD,wBAAgB,aAAa,CAC3B,OAAO,GAAE,oBAAyB,GACjC,iBAAiB,CAAC,kBAAkB,CAAC,CA8FvC;AAED,gEAAgE;AAChE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,QAAQ,EAAE,KAAK,CAAC;YACd,EAAE,EAAE,MAAM,CAAC;YACX,UAAU,EAAE;gBACV,IAAI,CAAC,EAAE;oBAAE,IAAI,CAAC,EAAE,MAAM,CAAC;oBAAC,mBAAmB,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;iBAAE,CAAC;gBAClE,MAAM,CAAC,EAAE,aAAa,CAAC;oBAAE,MAAM,EAAE,MAAM,CAAC;oBAAC,IAAI,EAAE,MAAM,CAAA;iBAAE,CAAC,CAAC;aAC1D,CAAC;SACH,CAAC,CAAC;KACJ,CAAC;CACH;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,aAAa,CAAC,oBAAoB,CAAC,GAC1C,mBAAmB,EAAE,CAkBvB"}

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

@@ -1,41 +1,78 @@
-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 { allowAll, defineChannel, localDevStrict, loopbackOnly, POST, sharedSecretAuth, } from "../../channels.js";
 import { withPropagatingBackgroundErrors } from "../../internal/channel-dispatch.js";
 import { normalizeIdentity } from "../../internal/continuation-identity.js";
 import { isDevMode } from "../../internal/dev-mode.js";
 import { attachHostedAdmissionAdapter } from "../../internal/hosted-admission-adapter.js";
+import { replayCatchRequest } from "../../internal/hosted-catch.js";
+import { AGENT_SDK_CATCH_EVENT_TYPE } from "../../internal/hosted-catch-protocol.js";
+import { envSecretRef, namedWebhookSecretArchitectureError, } from "../../internal/named-webhook-secret.js";
+import { isSecretRef } from "../../types.js";
 import { createPendingCursorGitLabCredentials, parseCursorGitLabProjectScope, registerGitLabCursorAccountRuntime, } from "./cursor-account.js";
 import { deriveGitLabWebhookEvents, GITLAB_CHANNEL_KIND } from "./events.js";
-import { dispatchGitLabWebhook, handleGitLabWebhookRequest, parseGitLabWebhookPayload, resolveGitLabWebhookSecret, } from "./gitlab-webhook.js";
+import { dispatchGitLabWebhook, GITLAB_TOKEN_HEADER, GITLAB_WEBHOOK_SECRET_ENV, handleGitLabWebhookRequest, parseGitLabWebhookPayload, } from "./gitlab-webhook.js";
 import { emptyGitLabChannelState } from "./state.js";
 const gitlabChannelOptionsByDefinition = new WeakMap();
 export function getGitLabChannelOptions(definition) {
     return gitlabChannelOptionsByDefinition.get(definition);
 }
+/**
+ * Why a `gitlabChannel` cannot deploy onto architecture v2 as authored, or
+ * `undefined` when it can: v2 needs a named `webhookSecret` so the control
+ * plane can compare `X-Gitlab-Token` before any compute starts.
+ */
+export function gitlabChannelArchitectureError(definition) {
+    const options = getGitLabChannelOptions(definition);
+    if (options === undefined) {
+        return undefined;
+    }
+    return namedWebhookSecretArchitectureError({
+        option: "gitlabChannel webhookSecret",
+        webhookSecret: options.webhookSecret,
+        envName: GITLAB_WEBHOOK_SECRET_ENV,
+        verifies: "X-Gitlab-Token",
+    });
+}
+/**
+ * The route policy for a GitLab webhook whose secret is named: compare
+ * `X-Gitlab-Token` against the env var / deployment secret `secretName`.
+ * Being a {@link sharedSecretAuth} policy, `deploy` writes it into the
+ * manifest, so on Cursor hosting the control plane runs the same compare at
+ * ingestion, refuses a bad token before any compute starts, and strips the
+ * header (it is the secret) before the request reaches the guest.
+ */
+export function gitlabWebhookTokenAuth(secretName) {
+    return sharedSecretAuth({ header: GITLAB_TOKEN_HEADER, secret: secretName });
+}
+/**
+ * Default route auth for the resolved webhook secret:
+ *
+ * - A named secret makes the token compare the route policy itself
+ *   ({@link gitlabWebhookTokenAuth}), which is also what makes the channel
+ *   catchable on the control plane.
+ * - A literal or getter secret keeps the compare inside the handler, so
+ *   the route admits everything (allowAll) and the handler is the request
+ *   auth.
+ * - No secret: prod stays loopback-strict; `--dev` admits loopback only.
+ *   `isDevMode()` is read per request: channel modules construct at import.
+ */
+function defaultGitLabRouteAuth(webhookSecret) {
+    if (webhookSecret === undefined) {
+        return [(request, info) => (isDevMode() ? loopbackOnly() : localDevStrict())(request, info)];
+    }
+    if (isSecretRef(webhookSecret)) {
+        return [gitlabWebhookTokenAuth(webhookSecret.secretName)];
+    }
+    return [allowAll()];
+}
 export function gitlabChannel(options = {}) {
-    var _a, _b, _c;
-    const routePath = (_a = options.path) !== null && _a !== void 0 ? _a : "/";
-    // With a hook secret the `X-Gitlab-Token` compare is the request auth
-    // (allowAll), matching GitHub HMAC + webhookSecret. Without one, prod stays
-    // loopback-strict; `--dev` admits loopback only. `isDevMode()` and the
-    // secret are read per request: channel modules construct at import time.
-    const auth = (_b = options.auth) !== null && _b !== void 0 ? _b : [
-        (request, info) => (resolveGitLabWebhookSecret(options) !== undefined
-            ? allowAll()
-            : isDevMode()
-                ? loopbackOnly()
-                : localDevStrict())(request, info),
-    ];
-    const channelOptions = Object.assign({}, options);
+    const routePath = options.path ?? "/";
+    // The env fallback is named, not read, so it deploys like an authored
+    // `{ secretName: "GITLAB_WEBHOOK_SECRET" }` and the handler resolves the
+    // same name per request.
+    const webhookSecret = options.webhookSecret ?? envSecretRef(GITLAB_WEBHOOK_SECRET_ENV);
+    const auth = options.auth ?? defaultGitLabRouteAuth(webhookSecret);
+    const channelOptions = { ...options, webhookSecret };
     if (channelOptions.continuation !== undefined) {
         channelOptions.continuation = normalizeIdentity(channelOptions.continuation, GITLAB_CHANNEL_KIND);
     }
@@ -49,11 +86,11 @@ export function gitlabChannel(options = {}) {
                 ? parseCursorGitLabProjectScope(options.cursorAccount.projects)
                 : undefined,
         };
-    const proxy = () => cursorAccount === null || cursorAccount === void 0 ? void 0 : cursorAccount.credentials.getProxyTransport();
+    const proxy = () => cursorAccount?.credentials.getProxyTransport();
     const definition = defineChannel({
         auth,
         state: emptyGitLabChannelState(),
-        events: (_c = options.events) !== null && _c !== void 0 ? _c : {},
+        events: options.events ?? {},
         onStart: options.onStart,
         onStop: options.onStop,
         meta: {
@@ -64,25 +101,42 @@ export function gitlabChannel(options = {}) {
             POST(routePath, {
                 bodySchema: z.unknown(),
                 description: "GitLab webhook ingress",
-                handler: (request, args) => __awaiter(this, void 0, void 0, function* () {
-                    return handleGitLabWebhookRequest({
-                        options: channelOptions,
-                        request,
-                        args,
-                        proxy,
-                    });
+                handler: async (request, args) => handleGitLabWebhookRequest({
+                    options: channelOptions,
+                    request,
+                    args,
+                    proxy,
                 }),
             }),
         ],
     });
     gitlabChannelOptionsByDefinition.set(definition, channelOptions);
     if (cursorAccount !== undefined) {
-        registerGitLabCursorAccountRuntime(definition, Object.assign({ options: channelOptions }, cursorAccount));
+        registerGitLabCursorAccountRuntime(definition, {
+            options: channelOptions,
+            ...cursorAccount,
+        });
     }
     attachHostedAdmissionAdapter(definition, {
         kind: GITLAB_CHANNEL_KIND,
         prepareArgs: withPropagatingBackgroundErrors,
-        dispatch: (_a) => __awaiter(this, [_a], void 0, function* ({ eventType, payload, deliveryId, args }) {
+        dispatch: async ({ channelId, eventType, payload, deliveryId, args }) => {
+            // A named-secret catch is an http.request envelope the control plane
+            // already admitted by comparing X-Gitlab-Token with the deployment
+            // secret (and then stripped, since that header is the secret).
+            // Replay it into the route handler under the catch principal, which
+            // is what tells the handler the compare already happened.
+            // Cursor-account deliveries carry a GitLab object kind and stay on
+            // dispatchGitLabWebhook.
+            if (eventType === AGENT_SDK_CATCH_EVENT_TYPE) {
+                return replayCatchRequest({
+                    channelId: channelId ?? GITLAB_CHANNEL_KIND,
+                    deliveryId,
+                    routes: definition.routes ?? [],
+                    payload,
+                    args,
+                });
+            }
             const delivery = parseGitLabWebhookPayload(payload, eventType);
             if (delivery === null) {
                 return Response.json({ ok: false, error: "invalid_gitlab_payload" }, { status: 400 });
@@ -94,25 +148,24 @@ export function gitlabChannel(options = {}) {
                 args,
                 proxy,
             });
-        }),
+        },
     });
     return definition;
 }
 export function findGitLabChannelTargets(mounts) {
-    var _a, _b, _c;
     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) !== GITLAB_CHANNEL_KIND) {
+            if (meta?.kind !== GITLAB_CHANNEL_KIND) {
                 continue;
             }
-            const postRoute = ((_a = channel.definition.routes) !== null && _a !== void 0 ? _a : []).find(route => route.method === "POST");
+            const postRoute = (channel.definition.routes ?? []).find(route => route.method === "POST");
             targets.push({
                 slug,
                 channelId: channel.id,
-                routePath: (_b = postRoute === null || postRoute === void 0 ? void 0 : postRoute.path) !== null && _b !== void 0 ? _b : "/",
-                events: [...((_c = meta.gitlabWebhookEvents) !== null && _c !== void 0 ? _c : [])],
+                routePath: postRoute?.path ?? "/",
+                events: [...(meta.gitlabWebhookEvents ?? [])],
             });
         }
     }

package/dist/channels/gitlab/gitlab-webhook.d.ts

@@ -1,8 +1,17 @@
-import type { ChannelHandlerArgs } from "../../types.js";
+import { type ChannelHandlerArgs } from "../../types.js";
 import type { GitLabProxyTransport } from "./api.js";
 import type { GitLabChannelOptions, GitLabEventContext, GitLabWebhookDelivery } from "./types.js";
+/** Env var / deployment secret an omitted `webhookSecret` falls back to. */
+export declare const GITLAB_WEBHOOK_SECRET_ENV = "GITLAB_WEBHOOK_SECRET";
+/** Header GitLab sends the hook secret in, verbatim. */
+export declare const GITLAB_TOKEN_HEADER = "x-gitlab-token";
 /** `GITLAB_WEBHOOK_SECRET` fallback for {@link GitLabChannelOptions.webhookSecret}. */
 export declare function envGitLabWebhookSecret(): string | undefined;
+/**
+ * The secret's value for the handler's own token compare. A named secret
+ * resolves from the environment (locally the shell's, hosted the bound
+ * deployment secrets); an unset field falls back to `GITLAB_WEBHOOK_SECRET`.
+ */
 export declare function resolveGitLabWebhookSecret(options: Pick<GitLabChannelOptions, "webhookSecret">): string | undefined;
 /**
  * GitLab sends the hook's secret verbatim in `X-Gitlab-Token` (no HMAC).

package/dist/channels/gitlab/gitlab-webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gitlab-webhook.d.ts","sourceRoot":"","sources":["../../../src/channels/gitlab/gitlab-webhook.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAqB,kBAAkB,EAAa,MAAM,gBAAgB,CAAC;AACvF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAoBrD,OAAO,KAAK,EACV,oBAAoB,EAEpB,kBAAkB,EAOlB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAEpB,uFAAuF;AACvF,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAG3D;AAED,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,GACnD,MAAM,GAAG,SAAS,CAKpB;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,MAAM,EAAE,MAAM,GACb,OAAO,CAOT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,qBAAqB,GAAG,IAAI,CAU9B;AA0CD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,qBAAqB,GAC9B,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC,GAAG,IAAI,CA4B3E;AAsJD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE;IACjD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,kBAAkB,CAAC;IACzB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,oBAAoB,GAAG,SAAS,CAAC;CAChD,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyIpB;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,kBAAkB,CAAC;IACzB,wEAAwE;IACxE,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,oBAAoB,GAAG,SAAS,CAAC;CAChD,GAAG,OAAO,CAAC,QAAQ,CAAC,CA+BpB"}
+{"version":3,"file":"gitlab-webhook.d.ts","sourceRoot":"","sources":["../../../src/channels/gitlab/gitlab-webhook.ts"],"names":[],"mappings":"AAUA,OAAO,EAEL,KAAK,kBAAkB,EAGxB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAoBrD,OAAO,KAAK,EACV,oBAAoB,EAEpB,kBAAkB,EAOlB,qBAAqB,EACtB,MAAM,YAAY,CAAC;AAEpB,4EAA4E;AAC5E,eAAO,MAAM,yBAAyB,0BAA0B,CAAC;AACjE,wDAAwD;AACxD,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAEpD,uFAAuF;AACvF,wBAAgB,sBAAsB,IAAI,MAAM,GAAG,SAAS,CAG3D;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB,EAAE,eAAe,CAAC,GACnD,MAAM,GAAG,SAAS,CAEpB;AA4BD;;;GAGG;AACH,wBAAgB,wBAAwB,CACtC,WAAW,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EACtC,MAAM,EAAE,MAAM,GACb,OAAO,CAOT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,OAAO,EAChB,SAAS,CAAC,EAAE,MAAM,GACjB,qBAAqB,GAAG,IAAI,CAU9B;AA0CD,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,qBAAqB,GAC9B,IAAI,CAAC,kBAAkB,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC,GAAG,IAAI,CA4B3E;AAsJD;;;;;GAKG;AACH,wBAAsB,qBAAqB,CAAC,KAAK,EAAE;IACjD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,QAAQ,EAAE,qBAAqB,CAAC;IAChC,IAAI,EAAE,kBAAkB,CAAC;IACzB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,oBAAoB,GAAG,SAAS,CAAC;CAChD,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyIpB;AAED;;;;;GAKG;AACH,wBAAsB,0BAA0B,CAAC,KAAK,EAAE;IACtD,OAAO,EAAE,oBAAoB,CAAC;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,kBAAkB,CAAC;IACzB,wEAAwE;IACxE,yBAAyB,CAAC,EAAE,OAAO,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,oBAAoB,GAAG,SAAS,CAAC;CAChD,GAAG,OAAO,CAAC,QAAQ,CAAC,CAmCpB"}