@cursor/july 0.1.10 → 0.1.12

package/dist/internal/cli-mcp-oauth.js

@@ -0,0 +1,194 @@
+/**
+ * `agentkit mcp oauth <connection> [--store]` for `defineConnection({ url, oauth: true })`.
+ */
+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 { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
+import { Client } from "@modelcontextprotocol/sdk/client/index.js";
+import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
+import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
+import { resolveDeployAuth } from "./cli-deploy.js";
+import { loadAgentProject } from "./discovery.js";
+import { CLI_COMMAND_NAME as CLI, LOG_PREFIX } from "./distribution.js";
+import { createHostMcpOAuthProvider, MCP_OAUTH_CALLBACK_URL, mcpOauthSecretNames, openBrowser, waitForMcpOAuthCallback, } from "./mcp-oauth.js";
+import { resolveProdSlug } from "./resolve-prod-target.js";
+function describe(error) {
+    if (!(error instanceof Error)) {
+        return String(error);
+    }
+    const cause = error.cause;
+    if (!(cause instanceof Error)) {
+        return error.message;
+    }
+    const code = "code" in cause && typeof cause.code === "string" ? cause.code : undefined;
+    const detail = code === undefined ? cause.message : `${cause.message} (${code})`;
+    return `${error.message}: ${detail}`;
+}
+export function cmdMcpOauth(options) {
+    return __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        var _b, _c;
+        const err = (_b = options.err) !== null && _b !== void 0 ? _b : ((text) => process.stderr.write(text));
+        const out = (_c = options.out) !== null && _c !== void 0 ? _c : ((text) => process.stdout.write(text));
+        const project = yield loadAgentProject(options.dir);
+        const connection = project.agent.connections.find((entry) => entry.name === options.connection);
+        if (connection === undefined) {
+            const known = project.agent.connections.map((entry) => entry.name).join(", ") ||
+                "(none)";
+            err(`${LOG_PREFIX} Unknown MCP connection "${options.connection}". Authored: ${known}.\n`);
+            return 1;
+        }
+        const transport = connection.transport;
+        if (!("url" in transport) || transport.oauth !== true) {
+            err(`${LOG_PREFIX} "${options.connection}" must be defineConnection({ url, oauth: true }).\n`);
+            return 1;
+        }
+        out(`${LOG_PREFIX} Authorizing "${options.connection}" (${transport.url})…\n`);
+        let authorizationUrl;
+        const provider = yield createHostMcpOAuthProvider({
+            identifier: options.connection,
+            resourceUrl: transport.url,
+            onRedirect: (url) => {
+                authorizationUrl = url;
+            },
+        });
+        const client = new Client({ name: "agentkit-mcp-oauth", version: "0.1.0" });
+        const url = new URL(transport.url);
+        const requestInit = transport.headers === undefined
+            ? undefined
+            : { headers: transport.headers };
+        const makeTransport = () => {
+            if (transport.type === "sse") {
+                return new SSEClientTransport(url, {
+                    authProvider: provider,
+                    requestInit,
+                });
+            }
+            return new StreamableHTTPClientTransport(url, {
+                authProvider: provider,
+                requestInit,
+            });
+        };
+        let mcpTransport = makeTransport();
+        let authorized = false;
+        try {
+            yield client.connect(mcpTransport);
+            out(`${LOG_PREFIX} "${options.connection}" already authorized.\n`);
+            yield client.close().catch(() => undefined);
+            authorized = true;
+        }
+        catch (error) {
+            if (!(error instanceof UnauthorizedError)) {
+                err(`${LOG_PREFIX} Failed to connect to "${options.connection}": ${describe(error)}\n`);
+                return 1;
+            }
+        }
+        if (!authorized) {
+            const redirect = authorizationUrl !== null && authorizationUrl !== void 0 ? authorizationUrl : provider.lastRedirectUrl;
+            if (redirect === undefined) {
+                err(`${LOG_PREFIX} Auth required but no authorization URL was provided.\n`);
+                return 1;
+            }
+            out(`${LOG_PREFIX} Open if needed:\n  ${redirect.toString()}\n`);
+            out(`${LOG_PREFIX} Waiting on ${MCP_OAUTH_CALLBACK_URL}…\n`);
+            openBrowser(redirect.toString());
+            let callback;
+            try {
+                callback = yield waitForMcpOAuthCallback();
+            }
+            catch (error) {
+                err(`${LOG_PREFIX} OAuth callback failed: ${describe(error)}\n`);
+                return 1;
+            }
+            try {
+                yield mcpTransport.finishAuth(callback.code);
+            }
+            catch (error) {
+                err(`${LOG_PREFIX} Token exchange failed: ${describe(error)}\n`);
+                return 1;
+            }
+            mcpTransport = makeTransport();
+            try {
+                yield client.connect(mcpTransport);
+                const tools = yield client.listTools();
+                out(`${LOG_PREFIX} Authorized "${options.connection}" (${tools.tools.length} tools). Local tokens in the agent-serve config dir.\n`);
+                yield client.close().catch(() => undefined);
+            }
+            catch (error) {
+                err(`${LOG_PREFIX} Reconnect failed: ${describe(error)}. Re-run \`${CLI} mcp oauth ${options.connection}\`.\n`);
+                return 1;
+            }
+        }
+        if (options.store !== true) {
+            return 0;
+        }
+        return storeOauthSecrets({
+            connection: options.connection,
+            dir: options.dir,
+            slug: options.slug,
+            team: options.team,
+            apiKey: options.apiKey,
+            tokens: provider.tokens(),
+            clientId: (_a = provider.clientInformation()) === null || _a === void 0 ? void 0 : _a.client_id,
+            err,
+            out,
+        });
+    });
+}
+function storeOauthSecrets(args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const tokens = args.tokens;
+        if (tokens === undefined || tokens.access_token.trim() === "") {
+            args.err(`${LOG_PREFIX} No access token to store for "${args.connection}".\n`);
+            return 1;
+        }
+        let slug;
+        try {
+            slug = resolveProdSlug({ dir: args.dir, slug: args.slug });
+        }
+        catch (error) {
+            args.err(`${LOG_PREFIX} ${describe(error)}\n`);
+            return 1;
+        }
+        const auth = yield resolveDeployAuth({
+            team: args.team,
+            apiKey: args.apiKey,
+            err: args.err,
+        });
+        if (typeof auth === "number") {
+            return auth;
+        }
+        const names = mcpOauthSecretNames(args.connection);
+        const secrets = [
+            { name: names.accessToken, value: tokens.access_token },
+        ];
+        if (tokens.refresh_token !== undefined &&
+            tokens.refresh_token.trim() !== "") {
+            secrets.push({ name: names.refreshToken, value: tokens.refresh_token });
+        }
+        if (args.clientId !== undefined && args.clientId.trim() !== "") {
+            secrets.push({ name: names.clientId, value: args.clientId });
+        }
+        try {
+            const secretNames = yield auth.client.setSecrets({
+                teamId: auth.teamId,
+                slug,
+                secrets,
+            });
+            args.out(`${LOG_PREFIX} Stored on ${slug}: ${secrets.map((s) => s.name).join(", ")}.\n` +
+                `${LOG_PREFIX} Secrets now: ${secretNames.join(", ")}. Next deploy picks them up.\n`);
+            return 0;
+        }
+        catch (error) {
+            args.err(`${LOG_PREFIX} Failed to store secrets on ${slug}: ${describe(error)}\n`);
+            return 1;
+        }
+    });
+}

package/dist/internal/cli-mcp.d.ts

@@ -54,7 +54,10 @@ export interface McpCliOptions {
     now?: () => number;
     sleep?: (ms: number) => Promise<void>;
 }
-export declare function cmdMcp(subcommand: string | undefined, options: McpCliOptions): Promise<number>;
+export declare function cmdMcp(subcommand: string | undefined, options: McpCliOptions & {
+    oauthConnection?: string;
+    store?: boolean;
+}): Promise<number>;
 export declare function cmdMcpServe(options: McpCliOptions): Promise<number>;
 export declare function cmdMcpInstall(options: McpCliOptions): Promise<number>;
 /** `~/.cursor/mcp.json` — the user-level Cursor MCP config. */

package/dist/internal/cli-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli-mcp.d.ts","sourceRoot":"","sources":["../../src/internal/cli-mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAMH,OAAO,EAGL,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AA0BlC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0CAA0C;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gCAAgC;IAChC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,iBAAiB,CAAC;IACjD,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC3C,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,CAajB;AAMD,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAkFzE;AAyRD,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAqG3E;AAED,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,IAAI,GAAE,MAAsC,GAC3C,MAAM,CAGR;AAqED,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnD"}
+{"version":3,"file":"cli-mcp.d.ts","sourceRoot":"","sources":["../../src/internal/cli-mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAMH,OAAO,EAGL,iBAAiB,EAClB,MAAM,0BAA0B,CAAC;AA0BlC,MAAM,WAAW,aAAa;IAC5B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,gFAAgF;IAChF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,4EAA4E;IAC5E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wEAAwE;IACxE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,0CAA0C;IAC1C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,gCAAgC;IAChC,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;IACzB,qBAAqB,CAAC,EAAE,OAAO,iBAAiB,CAAC;IACjD,KAAK,CAAC,EAAE,MAAM,CAAC,cAAc,CAAC;IAC9B,MAAM,CAAC,EAAE;QAAE,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;IAC3C,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACvC;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,aAAa,GAAG;IACvB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,GACA,OAAO,CAAC,MAAM,CAAC,CAiCjB;AAMD,wBAAsB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAkFzE;AAyRD,wBAAsB,aAAa,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAqG3E;AAED,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,IAAI,GAAE,MAAsC,GAC3C,MAAM,CAGR;AAqED,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAQnD"}

package/dist/internal/cli-mcp.js

@@ -68,8 +68,26 @@ export function cmdMcp(subcommand, options) {
         if (subcommand === "install") {
             return cmdMcpInstall(options);
         }
+        if (subcommand === "oauth") {
+            const connection = options.oauthConnection;
+            if (connection === undefined || connection.trim() === "") {
+                err(`Usage: ${CLI} mcp oauth <connection> [--dir .] [--store] [--slug <slug>] [--team <id>]\n` +
+                    `Authorize defineConnection({ url, oauth: true }) (host PKCE).\n` +
+                    `--store upserts MCP_OAUTH_<NAME>_* secrets on the hosted deployment.\n`);
+                return 1;
+            }
+            const { cmdMcpOauth } = yield import("./cli-mcp-oauth.js");
+            return cmdMcpOauth({
+                dir: options.dir,
+                connection,
+                store: options.store,
+                slug: options.slug,
+                team: options.team,
+                apiKey: options.apiKey,
+            });
+        }
         err(`Unknown mcp subcommand "${subcommand}".\n` +
-            `Usage: ${CLI} mcp [install] --prod [--slug <slug>] | --url <baseUrl>\n`);
+            `Usage: ${CLI} mcp [install|oauth <connection>] --prod [--slug <slug>] | --url <baseUrl>\n`);
         return 1;
     });
 }

package/dist/internal/cursor/account-mcp.d.ts

@@ -15,7 +15,7 @@
  */
 import type { AgentProject, AuthPolicy } from "../../types.js";
 import type { EngineResolvedConnection } from "../session-engine.js";
-import type { CursorBackendClient } from "./backend-client.js";
+import type { AccountMcpServer, CursorBackendClient } from "./backend-client.js";
 export interface CursorAccountConnectionRef {
     /** Connection (MCP server) name — the filename under `agent/mcp-connections/`. */
     name: string;
@@ -78,10 +78,15 @@ export declare class CursorAccountMcpBridge {
     handle(request: Request, ref: CursorAccountConnectionRef): Promise<Response>;
     /**
      * Startup DX: log the account's connector statuses for `refs` without
-     * blocking serve startup. Surfaces "needsAuth" connectors (authorize in
-     * Cursor) and filters that matched nothing (typo'd connector names).
+     * blocking serve startup. Surfaces "needsAuth" / "error" connectors with
+     * remediation hints (and a backend probe detail for `error`), and filters
+     * that matched nothing (typo'd connector names).
+     *
+     * Returns a promise that settles when every ref's log lines are written —
+     * callers may ignore it; tests can await it.
      */
-    logPreflight(refs: CursorAccountConnectionRef[]): void;
+    logPreflight(refs: CursorAccountConnectionRef[]): Promise<void>;
+    private runPreflight;
     private buildServer;
     /** Resolve a tool by exposed name, refreshing once when it is unknown. */
     private findTool;
@@ -92,4 +97,12 @@ export declare class CursorAccountMcpBridge {
      */
     private getCatalog;
 }
+/** One-line status for the preflight summary (`name (12 tools)` / `name (error: …)`). */
+export declare function formatServerStatusSummary(server: AccountMcpServer, errorDetail?: string): string;
+/**
+ * Best-effort detail for an `error`-status connector. ListSandMcpTools only
+ * returns the status enum today, so probe ExecuteSandMcpTool (ping) and surface
+ * the backend failure text (e.g. `HTTP MCP tool execution failed: fetch failed`).
+ */
+export declare function diagnoseConnectorError(client: Pick<CursorBackendClient, "executeAccountMcpTool">, serverIdentifier: string): Promise<string | undefined>;
 //# sourceMappingURL=account-mcp.d.ts.map

package/dist/internal/cursor/account-mcp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account-mcp.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/account-mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAEV,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAgB7B,MAAM,WAAW,0BAA0B;IACzC,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,GACrD,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAoB3C;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,0BAA0B,EAAE,CAAC;IACnC,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,wBAAwB,EAAE,CAkB7B;AAiCD,qBAAa,sBAAsB;IACjC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAChC;;;;WAIG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,EAKA;IAED;;;;OAIG;IACH,UAAU,IAAI,UAAU,CAgBvB;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,0BAA0B,GAAG,OAAO,CAAC,QAAQ,CAAC,CAO3E;IAED;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE,GAAG,IAAI,CAwCrD;IAED,OAAO,CAAC,WAAW;IAkEnB,0EAA0E;YAC5D,QAAQ;IAatB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAwCnB"}
+{"version":3,"file":"account-mcp.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/account-mcp.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAI/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAgB7B,MAAM,WAAW,0BAA0B;IACzC,kFAAkF;IAClF,IAAI,EAAE,MAAM,CAAC;IACb,sEAAsE;IACtE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,MAAM,EAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,GACrD,GAAG,CAAC,MAAM,EAAE,0BAA0B,EAAE,CAAC,CAoB3C;AAED,oFAAoF;AACpF,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED;;;;;GAKG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE;IACpD,IAAI,EAAE,0BAA0B,EAAE,CAAC;IACnC,+CAA+C;IAC/C,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,GAAG,wBAAwB,EAAE,CAkB7B;AAiCD,qBAAa,sBAAsB;IACjC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAmC;IAC1D,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAsB;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAa;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAU;IAC7C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmC;IAE5D,YAAY,IAAI,EAAE;QAChB,MAAM,EAAE,mBAAmB,CAAC;QAC5B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;QAChC;;;;WAIG;QACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;KAC9B,EAKA;IAED;;;;OAIG;IACH,UAAU,IAAI,UAAU,CAgBvB;IAED;;;OAGG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,0BAA0B,GAAG,OAAO,CAAC,QAAQ,CAAC,CAO3E;IAED;;;;;;;;OAQG;IACH,YAAY,CAAC,IAAI,EAAE,0BAA0B,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9D;YAEa,YAAY;IAyE1B,OAAO,CAAC,WAAW;IA2EnB,0EAA0E;YAC5D,QAAQ;IAatB;;;;OAIG;IACH,OAAO,CAAC,UAAU;CAwCnB;AAwFD,yFAAyF;AACzF,wBAAgB,yBAAyB,CACvC,MAAM,EAAE,gBAAgB,EACxB,WAAW,CAAC,EAAE,MAAM,GACnB,MAAM,CAkBR;AAED;;;;GAIG;AACH,wBAAsB,sBAAsB,CAC1C,MAAM,EAAE,IAAI,CAAC,mBAAmB,EAAE,uBAAuB,CAAC,EAC1D,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4B7B"}

package/dist/internal/cursor/account-mcp.js

@@ -129,32 +129,60 @@ export class CursorAccountMcpBridge {
     }
     /**
      * Startup DX: log the account's connector statuses for `refs` without
-     * blocking serve startup. Surfaces "needsAuth" connectors (authorize in
-     * Cursor) and filters that matched nothing (typo'd connector names).
+     * blocking serve startup. Surfaces "needsAuth" / "error" connectors with
+     * remediation hints (and a backend probe detail for `error`), and filters
+     * that matched nothing (typo'd connector names).
+     *
+     * Returns a promise that settles when every ref's log lines are written —
+     * callers may ignore it; tests can await it.
      */
     logPreflight(refs) {
-        for (const ref of refs) {
-            void this.getCatalog(ref)
-                .then((catalog) => {
+        return Promise.all(refs.map((ref) => this.runPreflight(ref))).then(() => undefined);
+    }
+    runPreflight(ref) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const catalog = yield this.getCatalog(ref);
+                if (catalog.servers.length === 0) {
+                    this.logger(`[agentkit] Cursor account MCP connection "${ref.name}": no matching connectors on this account — connect servers in Cursor (dashboard → MCP) or fix the \`servers\` filter`);
+                    return;
+                }
+                const errorDetails = new Map();
+                yield Promise.all(catalog.servers
+                    .filter((server) => server.status === "error")
+                    .map((server) => __awaiter(this, void 0, void 0, function* () {
+                    const detail = yield diagnoseConnectorError(this.client, server.serverIdentifier);
+                    if (detail !== undefined) {
+                        errorDetails.set(server.serverIdentifier, detail);
+                    }
+                })));
                 const summary = catalog.servers
-                    .map((server) => `${server.serverIdentifier} (${server.status === "connected"
-                    ? `${server.tools.length} tools`
-                    : server.status})`)
+                    .map((server) => formatServerStatusSummary(server, errorDetails.get(server.serverIdentifier)))
                     .join(", ");
-                this.logger(`[agentkit] Cursor account MCP connection "${ref.name}": ${catalog.servers.length === 0
-                    ? "no matching connectors on this account — connect servers in Cursor (dashboard → MCP) or fix the `servers` filter"
-                    : summary}`);
+                this.logger(`[agentkit] Cursor account MCP connection "${ref.name}": ${summary}`);
                 const needsAuth = catalog.servers.filter((server) => server.status === "needsAuth");
                 if (needsAuth.length > 0) {
                     this.logger(`[agentkit] Cursor account MCP connection "${ref.name}": ${needsAuth
                         .map((server) => server.serverIdentifier)
-                        .join(", ")} need re-authorization in Cursor before their tools appear`);
+                        .join(", ")} need re-authorization in Cursor (dashboard → MCP / Settings → MCP) before their tools appear`);
                 }
-            })
-                .catch((error) => {
+                const errored = catalog.servers.filter((server) => server.status === "error");
+                if (errored.length > 0) {
+                    const details = errored
+                        .map((server) => {
+                        const detail = errorDetails.get(server.serverIdentifier);
+                        return detail === undefined
+                            ? server.serverIdentifier
+                            : `${server.serverIdentifier} (${detail})`;
+                    })
+                        .join("; ");
+                    this.logger(`[agentkit] Cursor account MCP connection "${ref.name}": ${details} — Cursor backend could not use this connector (not a missing agentkit login). Re-check the server in Cursor dashboard → MCP, confirm the URL is healthy, and retry after the backend can reach it`);
+                }
+            }
+            catch (error) {
                 this.logger(`[agentkit] Cursor account MCP connection "${ref.name}" preflight failed: ${describeError(error)}`);
-            });
-        }
+            }
+        });
     }
     buildServer(ref) {
         const server = new Server({ name: `cursor-account:${ref.name}`, version: "0.1.0" }, {
@@ -176,11 +204,17 @@ export class CursorAccountMcpBridge {
             const tool = yield this.findTool(ref, request.params.name);
             if (tool === undefined) {
                 const catalog = yield this.getCatalog(ref);
+                const unhealthy = catalog.servers.filter((server) => server.status !== "connected");
+                const statusHint = unhealthy.length === 0
+                    ? ""
+                    : ` Unhealthy connectors: ${unhealthy
+                        .map((server) => `${server.serverIdentifier}=${server.status}`)
+                        .join(", ")}.`;
                 return {
                     content: [
                         {
                             type: "text",
-                            text: `Unknown tool "${request.params.name}". Available: ${catalog.tools.map((t) => t.exposedName).join(", ") || "(none)"}.`,
+                            text: `Unknown tool "${request.params.name}". Available: ${catalog.tools.map((t) => t.exposedName).join(", ") || "(none)"}.${statusHint}`,
                         },
                     ],
                     isError: true,
@@ -340,3 +374,57 @@ function trimTrailingSlash(url) {
 function describeError(error) {
     return error instanceof Error ? error.message : String(error);
 }
+/** One-line status for the preflight summary (`name (12 tools)` / `name (error: …)`). */
+export function formatServerStatusSummary(server, errorDetail) {
+    switch (server.status) {
+        case "connected":
+            return `${server.serverIdentifier} (${server.tools.length} tools)`;
+        case "needsAuth":
+            return `${server.serverIdentifier} (needsAuth — re-authorize in Cursor)`;
+        case "loading":
+            return `${server.serverIdentifier} (loading)`;
+        case "error": {
+            const detail = errorDetail === undefined || errorDetail.trim() === ""
+                ? "backend could not reach connector"
+                : errorDetail.trim();
+            return `${server.serverIdentifier} (error: ${detail})`;
+        }
+        default:
+            return `${server.serverIdentifier} (${server.status})`;
+    }
+}
+/**
+ * Best-effort detail for an `error`-status connector. ListSandMcpTools only
+ * returns the status enum today, so probe ExecuteSandMcpTool (ping) and surface
+ * the backend failure text (e.g. `HTTP MCP tool execution failed: fetch failed`).
+ */
+export function diagnoseConnectorError(client, serverIdentifier) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const result = yield client.executeAccountMcpTool({
+                serverIdentifier,
+                // Conventional health tool; even a tool-not-found path usually still
+                // surfaces the same transport failure when the connector is down.
+                toolName: `${serverIdentifier}-ping`,
+                args: {},
+            });
+            const text = result.content
+                .filter((part) => part.type === "text")
+                .map((part) => part.text.trim())
+                .filter((part) => part.length > 0)
+                .join(" ");
+            if (result.isError) {
+                return text.length > 0
+                    ? text
+                    : "backend reported an error with no detail";
+            }
+            // Listing said error but ping succeeded — surface that inconsistency.
+            return text.length > 0
+                ? `listing reported error but probe succeeded: ${text}`
+                : "listing reported error but probe succeeded";
+        }
+        catch (error) {
+            return describeError(error);
+        }
+    });
+}

package/dist/internal/cursor-event-relay.d.ts

@@ -18,6 +18,8 @@ export type CursorScmPullRequestMeta = {
     title?: string;
     body?: string | null;
     draft?: boolean;
+    /** True when the PR was merged — required by closed+merged channel hooks. */
+    merged?: boolean;
     authorLogin?: string;
     headRef?: string;
     headSha?: string;

package/dist/internal/cursor-event-relay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cursor-event-relay.d.ts","sourceRoot":"","sources":["../../src/internal/cursor-event-relay.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cursor-event-relay.d.ts","sourceRoot":"","sources":["../../src/internal/cursor-event-relay.ts"],"names":[],"mappings":"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"}

package/dist/internal/cursor-event-relay.js

@@ -79,6 +79,9 @@ export function scmMetadataToGitHubPayload(event) {
             head: { ref: headRef, sha: headSha },
             base: { ref: baseRef, sha: prMeta === null || prMeta === void 0 ? void 0 : prMeta.baseSha },
         };
+        if ((prMeta === null || prMeta === void 0 ? void 0 : prMeta.merged) !== undefined) {
+            pullRequest.merged = prMeta.merged;
+        }
         if ((prMeta === null || prMeta === void 0 ? void 0 : prMeta.authorLogin) !== undefined) {
             pullRequest.user = { login: prMeta.authorLogin };
         }

package/dist/internal/discovery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAKrB,KAAK,UAAU,EAmBhB,MAAM,aAAa,CAAC;AAoBrB,MAAM,WAAW,uBAAuB;IACtC,sDAAsD;IACtD,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3E;AAmBD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrE;AAED,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,EAAE,CAAC,CA2B1B;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAoBzD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAAuB,GAAG;IACjC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtB,GACL,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAgBzD;AAWD,iFAAiF;AACjF,eAAO,MAAM,cAAc,EAAE,GAAG,CAAC,MAAM,CAIrC,CAAC;AAEH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA8DvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAskBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAukBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAkInE"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAgBH,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAKrB,KAAK,UAAU,EAoBhB,MAAM,aAAa,CAAC;AAqBrB,MAAM,WAAW,uBAAuB;IACtC,sDAAsD;IACtD,YAAY,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;CAC3E;AAmBD;;;;GAIG;AACH,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CASrE;AAED,sEAAsE;AACtE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,EAAE,CAAC,CA2B1B;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAoBzD;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,GAAE,uBAAuB,GAAG;IACjC,IAAI,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CACtB,GACL,OAAO,CAAC,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,CAAC,CAAC,CAgBzD;AAWD,iFAAiF;AACjF,eAAO,MAAM,cAAc,EAAE,GAAG,CAAC,MAAM,CAIrC,CAAC;AAEH,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,uBAA4B,GACpC,OAAO,CAAC,YAAY,CAAC,CA8DvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAmnBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAmlBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CAoInE"}

package/dist/internal/discovery.js

@@ -30,8 +30,9 @@ import { basename, extname, isAbsolute, join, relative, resolve, } from "node:pa
 import { pathToFileURL } from "node:url";
 import { resolveABMaxPlaygroundSessions } from "../ab.js";
 import { httpChannel } from "../channels.js";
-import { DEFAULT_MODEL, toPublicCloudInfo, } from "../types.js";
+import { DEFAULT_MODEL, MAX_RUNNING_TURNS_LIMIT, toPublicCloudInfo, } from "../types.js";
 import { registerAuthoredModuleLoaders } from "./authored-loaders.js";
+import { normalizePositiveInt } from "./bounded-int.js";
 import { getDefinitionKind } from "./brand.js";
 import { isValidCron } from "./cron.js";
 import { parseFrontmatter } from "./frontmatter.js";
@@ -272,6 +273,7 @@ function loadAgent(ctx, agentDir, options) {
                 cwd: localCwd,
             };
         const hosting = resolveHosting(ctx, agentDir, config === null || config === void 0 ? void 0 : config.hosting);
+        const concurrency = resolveConcurrency(ctx, agentDir, config === null || config === void 0 ? void 0 : config.concurrency);
         if (runtime === "cloud") {
             warnCloudRuntimeLimitations(ctx, agentDir, {
                 serverTools: tools.filter((tool) => tool.execution === "server").length,
@@ -291,6 +293,7 @@ function loadAgent(ctx, agentDir, options) {
             cloud,
             local,
             hosting,
+            concurrency,
             tools,
             skills,
             connections,
@@ -350,6 +353,33 @@ function resolveHosting(ctx, agentDir, hosting) {
         ? {}
         : { secretNames: [...hosting.secretNames] }));
 }
+/**
+ * Validate the authored `concurrency` block. Invalid values are **error**
+ * diagnostics (serve refuses to start): silently dropping a turn ceiling
+ * would fail open to unlimited parallelism, the opposite of what the
+ * author asked for.
+ */
+function resolveConcurrency(ctx, agentDir, concurrency) {
+    if (concurrency === undefined || concurrency.maxRunningTurns === undefined) {
+        return undefined;
+    }
+    try {
+        return {
+            maxRunningTurns: normalizePositiveInt(concurrency.maxRunningTurns, {
+                label: "concurrency.maxRunningTurns",
+                max: MAX_RUNNING_TURNS_LIMIT,
+            }),
+        };
+    }
+    catch (error) {
+        ctx.diagnostics.push({
+            severity: "error",
+            path: displayPath(ctx, join(agentDir, "agent.ts")),
+            message: error instanceof Error ? error.message : String(error),
+        });
+        return undefined;
+    }
+}
 function loadAgentConfig(ctx, agentDir, isRoot) {
     return __awaiter(this, void 0, void 0, function* () {
         const configPath = yield findModuleFile(agentDir, "agent");
@@ -666,10 +696,18 @@ function connectionTransportLabel(transport) {
         return `agent:${transport.agent}`;
     }
     if ("url" in transport) {
-        return transport.url;
+        return transport.oauth === true
+            ? `${transport.url} (oauth)`
+            : transport.url;
     }
     return transport.command;
 }
+function hasAuthorizationHeader(headers) {
+    if (headers === undefined) {
+        return false;
+    }
+    return Object.keys(headers).some((key) => key.toLowerCase() === "authorization");
+}
 function connectionTransport(connection) {
     if ("cursorAccount" in connection && connection.cursorAccount === true) {
         return Object.assign({ cursorAccount: true }, (connection.servers === undefined
@@ -680,9 +718,12 @@ function connectionTransport(connection) {
         return { agent: connection.agent };
     }
     if ("url" in connection && !isBlank(connection.url)) {
-        return Object.assign(Object.assign(Object.assign({}, (connection.type === undefined ? {} : { type: connection.type })), { url: connection.url }), (connection.headers === undefined
-            ? {}
-            : { headers: connection.headers }));
+        return {
+            type: connection.type,
+            url: connection.url,
+            headers: connection.headers,
+            oauth: connection.oauth === true ? true : undefined,
+        };
     }
     if ("command" in connection && !isBlank(connection.command)) {
         return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, (connection.type === undefined ? {} : { type: connection.type })), { command: connection.command }), (connection.args === undefined ? {} : { args: connection.args })), (connection.env === undefined ? {} : { env: connection.env })), (connection.cwd === undefined ? {} : { cwd: connection.cwd }));
@@ -779,6 +820,16 @@ function loadConnections(ctx, connectionsDir) {
                 continue;
             }
             const connection = definition;
+            if ("url" in connection &&
+                connection.oauth === true &&
+                hasAuthorizationHeader(connection.headers)) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `oauth: true` cannot set an Authorization header. Drop the header or remove `oauth`.",
+                });
+                continue;
+            }
             const transport = connectionTransport(connection);
             if (transport === undefined) {
                 ctx.diagnostics.push({
@@ -807,10 +858,12 @@ function loadConnections(ctx, connectionsDir) {
                 });
                 continue;
             }
-            connections.push(Object.assign({ name,
-                transport }, (connection.description === undefined
-                ? {}
-                : { description: connection.description })));
+            connections.push({
+                name,
+                transport,
+                description: connection.description,
+                hostOnly: connection.hostOnly,
+            });
         }
         return connections;
     });
@@ -1256,7 +1309,7 @@ export function projectInfo(project) {
             url: "/v1/session/:sessionId/approvals/:callId",
         },
     ];
-    return Object.assign(Object.assign({ name: project.name, model: agent.model, runtime: agent.runtime, cloud: agent.cloud === undefined ? undefined : toPublicCloudInfo(agent.cloud), local: agent.local, hosting: agent.hosting, mcp: { path: MCP_ENDPOINT_PATH, tools: mcpEndpointToolNames(project) }, instructions: agent.instructions === undefined
+    return Object.assign(Object.assign({ name: project.name, model: agent.model, runtime: agent.runtime, cloud: agent.cloud === undefined ? undefined : toPublicCloudInfo(agent.cloud), local: agent.local, hosting: agent.hosting, concurrency: agent.concurrency, mcp: { path: MCP_ENDPOINT_PATH, tools: mcpEndpointToolNames(project) }, instructions: agent.instructions === undefined
             ? undefined
             : {
                 chars: agent.instructions.length,
@@ -1275,6 +1328,7 @@ export function projectInfo(project) {
         })), connections: agent.connections.map((connection) => ({
             name: connection.name,
             transport: connectionTransportLabel(connection.transport),
+            hostOnly: connection.hostOnly,
         })), subagents: agent.subagents.map((subagent) => ({
             name: subagent.name,
             description: subagent.description,

package/dist/internal/distribution.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distribution.d.ts","sourceRoot":"","sources":["../../src/internal/distribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,qEAAqE;AACrE,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,6EAA6E;AAC7E,eAAO,MAAM,mBAAmB,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,UAAU,EAAE,MAA2B,CAAC;AACrD,eAAO,MAAM,gBAAgB,EAAE,MAAiC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA+B,CAAC;AAc/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAGhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,kEAAkE;AAClE,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAkBzC,CAAC"}
+{"version":3,"file":"distribution.d.ts","sourceRoot":"","sources":["../../src/internal/distribution.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,qEAAqE;AACrE,eAAO,MAAM,YAAY,iBAAiB,CAAC;AAE3C,6EAA6E;AAC7E,eAAO,MAAM,mBAAmB,2BAA2B,CAAC;AAE5D;;;GAGG;AACH,eAAO,MAAM,qBAAqB,qBAAqB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,WAAW,aAAa,CAAC;AACtC,eAAO,MAAM,UAAU,EAAE,MAA2B,CAAC;AACrD,eAAO,MAAM,gBAAgB,EAAE,MAAiC,CAAC;AAEjE;;;GAGG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAA+B,CAAC;AAc/D;;;;;GAKG;AACH,wBAAgB,sBAAsB,IAAI,OAAO,CAGhD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,MAAM,CAEvC;AAED,kEAAkE;AAClE,wBAAgB,cAAc,IAAI,MAAM,CAOvC;AAED;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,EAAE,aAAa,CAC/C,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAmBzC,CAAC"}