@cursor/july 0.1.61 → 0.1.68

package/dist/internal/deployment-scm-event-stream.js

@@ -0,0 +1,460 @@
+/**
+ * Deployment-scoped SCM event intake for hosted multi-tenant agents.
+ *
+ * Instead of receiving HMAC-signed webhook forwards from the backend (which
+ * required a shared `GITHUB_WEBHOOK_SECRET` / forward-secret pair), the
+ * engine pulls its deliveries from the control plane's deployment-scoped
+ * event stream:
+ *
+ *   GET /internal/agent-serve/automation-agent-sdk/events
+ *
+ * authenticated with the engine pod's `CURSOR_API_KEY` — the same
+ * credential (and server-side deployment allowlist) that authorizes the
+ * consuming agent's customer list read. The backend writes each envelope's
+ * `installationId` itself from the verified GitHub delivery, so agent-side
+ * tenant binding does not depend on an HMAC-covered payload.
+ *
+ * Each envelope is stubbed into a GitHub-shaped `pull_request` webhook body
+ * and POSTed to this process's own github channel route over loopback
+ * (admitted by the channel's no-secret `localDevStrict` policy), so the
+ * consuming agent's whole pipeline — Zod parse, cursorAccount credential
+ * lease, customer routing, tools — runs unchanged. Loopback (rather than
+ * the in-process `handleAgentServeTrigger` fan-out the `--cursor-events`
+ * relay uses) is deliberate: this stream is started from a channel's
+ * `onStart`, which cannot reach the serve-level mount/handler wiring.
+ *
+ * Offsets are client-owned (`<ms>-<seq>` Redis stream ids) and persisted
+ * under the state dir so a restart resumes where it left off instead of
+ * dropping deliveries (the old push path was fire-and-forget).
+ *
+ * INTERNAL: first-party host plumbing shared by agents in `factory/*`.
+ * Consumed via relative source imports, following
+ * `tenant-mcp/run-mcp-registry.ts`. Policy (which deliveries to act on,
+ * tenant routing) stays in the consuming agent; this module is transport
+ * only.
+ */
+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());
+    });
+};
+// Node builtins only: hosted engines install the consuming agent's directory
+// alone and load this file as raw TypeScript source, so third-party imports
+// (even zod) do not resolve from here. See the tenant-mcp internals for the
+// same constraint.
+import { createHmac } from "node:crypto";
+import { mkdir, readFile, rename, writeFile } from "node:fs/promises";
+import { join } from "node:path";
+const DEFAULT_BASE_URL = "https://api.cursor.com";
+const EVENTS_PATH = "/internal/agent-serve/automation-agent-sdk/events";
+const POLL_WAIT_MS = 20000;
+const POLL_LIMIT = 100;
+const MIN_BACKOFF_MS = 1000;
+const MAX_BACKOFF_MS = 30000;
+// Bounded self-dispatch retry before the offset advances past a delivery
+// (mirrors CursorRelayCore): transient loopback failures (connection
+// reset, channel briefly unavailable at startup) get a few tries; a
+// poison delivery still costs only DISPATCH_ATTEMPTS and is then skipped.
+const DISPATCH_ATTEMPTS = 3;
+const DISPATCH_RETRY_DELAYS_MS = [250, 1000];
+/** Auth/gate failures (401/403/404) are config problems; poll slowly. */
+const AUTH_FAILURE_BACKOFF_MS = 60000;
+const OFFSET_SNAPSHOT_VERSION = 1;
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function nonEmptyString(value) {
+    return typeof value === "string" && value.length > 0 ? value : undefined;
+}
+function optionalString(value) {
+    return value === undefined || typeof value === "string";
+}
+function optionalBoolean(value) {
+    return value === undefined || typeof value === "boolean";
+}
+function parsePullRequestMeta(value) {
+    if (!isRecord(value)) {
+        return undefined;
+    }
+    const number = value.number;
+    const url = nonEmptyString(value.url);
+    const headRef = nonEmptyString(value.headRef);
+    const headSha = nonEmptyString(value.headSha);
+    const baseRef = nonEmptyString(value.baseRef);
+    if (typeof number !== "number" ||
+        !Number.isInteger(number) ||
+        number <= 0 ||
+        url === undefined ||
+        typeof value.title !== "string" ||
+        !(value.body === undefined ||
+            value.body === null ||
+            typeof value.body === "string") ||
+        !optionalBoolean(value.draft) ||
+        !optionalBoolean(value.merged) ||
+        !optionalString(value.authorLogin) ||
+        headRef === undefined ||
+        headSha === undefined ||
+        baseRef === undefined ||
+        !optionalString(value.baseSha)) {
+        return undefined;
+    }
+    return {
+        number,
+        url,
+        title: value.title,
+        body: value.body,
+        draft: value.draft,
+        merged: value.merged,
+        authorLogin: value.authorLogin,
+        headRef,
+        headSha,
+        baseRef,
+        baseSha: value.baseSha,
+    };
+}
+/** Unknown envelope shapes return undefined (skipped, forward compat). */
+export function parseAgentSdkScmEventEnvelope(value) {
+    if (!isRecord(value) || value.provider !== "github") {
+        return undefined;
+    }
+    const eventName = nonEmptyString(value.eventName);
+    const deliveryId = nonEmptyString(value.deliveryId);
+    const repo = nonEmptyString(value.repo);
+    const action = nonEmptyString(value.action);
+    const installationId = value.installationId;
+    const pullRequest = parsePullRequestMeta(value.pullRequest);
+    if (eventName === undefined ||
+        deliveryId === undefined ||
+        repo === undefined ||
+        typeof value.receivedAtMs !== "number" ||
+        action === undefined ||
+        typeof installationId !== "number" ||
+        !Number.isInteger(installationId) ||
+        installationId <= 0 ||
+        pullRequest === undefined ||
+        !(value.occurredAtMs === undefined || typeof value.occurredAtMs === "number")) {
+        return undefined;
+    }
+    return {
+        provider: "github",
+        eventName,
+        deliveryId,
+        repo,
+        receivedAtMs: value.receivedAtMs,
+        action,
+        installationId,
+        pullRequest,
+        occurredAtMs: value.occurredAtMs,
+    };
+}
+function parsePollResponse(value) {
+    if (!isRecord(value) || !Array.isArray(value.events)) {
+        throw new Error("malformed poll response");
+    }
+    const events = [];
+    for (const entry of value.events) {
+        if (!isRecord(entry)) {
+            throw new Error("malformed poll response event");
+        }
+        const offset = nonEmptyString(entry.offset);
+        if (offset === undefined) {
+            throw new Error("malformed poll response event offset");
+        }
+        events.push({ offset, envelope: entry.envelope });
+    }
+    if (typeof value.nextOffset !== "string" ||
+        typeof value.gapDetected !== "boolean") {
+        throw new Error("malformed poll response fields");
+    }
+    return {
+        events,
+        nextOffset: value.nextOffset,
+        gapDetected: value.gapDetected,
+    };
+}
+/**
+ * Stub a GitHub-shaped `pull_request` webhook body from an envelope —
+ * enough for agent-serve's pull_request Zod schema, plus `installation.id`
+ * so the channel's `ctx.installationId` tenant binding keeps working.
+ * Pure — exported for tests.
+ */
+export function envelopeToGitHubPayload(envelope) {
+    const slash = envelope.repo.indexOf("/");
+    const owner = slash === -1 ? "" : envelope.repo.slice(0, slash);
+    const name = slash === -1 ? envelope.repo : envelope.repo.slice(slash + 1);
+    const pr = envelope.pullRequest;
+    return {
+        action: envelope.action,
+        repository: {
+            full_name: envelope.repo,
+            name,
+            html_url: `https://github.com/${envelope.repo}`,
+            owner: { login: owner },
+        },
+        pull_request: {
+            number: pr.number,
+            html_url: pr.url,
+            title: pr.title,
+            body: pr.body,
+            draft: pr.draft,
+            merged: pr.merged,
+            user: pr.authorLogin === undefined ? undefined : { login: pr.authorLogin },
+            head: { ref: pr.headRef, sha: pr.headSha },
+            base: { ref: pr.baseRef, sha: pr.baseSha },
+        },
+        installation: { id: envelope.installationId },
+    };
+}
+/** Durable offset snapshot under `<stateDir>/offset.json`. */
+class OffsetStore {
+    constructor(stateDir) {
+        this.stateDir = stateDir;
+    }
+    get filePath() {
+        return join(this.stateDir, "offset.json");
+    }
+    load() {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const raw = yield readFile(this.filePath, "utf8");
+                const parsed = JSON.parse(raw);
+                if (parsed.version === OFFSET_SNAPSHOT_VERSION &&
+                    typeof parsed.offset === "string" &&
+                    parsed.offset !== "") {
+                    return parsed.offset;
+                }
+                return undefined;
+            }
+            catch (_a) {
+                return undefined;
+            }
+        });
+    }
+    save(offset) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield mkdir(this.stateDir, { recursive: true });
+            // Write-then-rename so a crash mid-write never corrupts the snapshot.
+            const tmpPath = `${this.filePath}.tmp`;
+            yield writeFile(tmpPath, JSON.stringify({
+                version: OFFSET_SNAPSHOT_VERSION,
+                offset,
+                updatedAt: new Date().toISOString(),
+            }, null, 2), "utf8");
+            yield rename(tmpPath, this.filePath);
+        });
+    }
+}
+/**
+ * Port the serve process is actually listening on, read from its own argv.
+ *
+ * The channel runs inside the serve process, so `--port <n>` / `--port=<n>`
+ * on the command line is authoritative. Hosted-platform engines start with
+ * `--port 26100` and export no `PORT` env, so guessing a fixed default posts
+ * self-dispatches at a port nothing listens on ("fetch failed" for every
+ * delivery).
+ */
+export function servePortFromArgv(argv) {
+    var _a;
+    const flagIndex = argv.lastIndexOf("--port");
+    if (flagIndex !== -1) {
+        const value = (_a = argv[flagIndex + 1]) === null || _a === void 0 ? void 0 : _a.trim();
+        if (value !== undefined && /^\d+$/.test(value)) {
+            return value;
+        }
+    }
+    for (let i = argv.length - 1; i >= 0; i--) {
+        const arg = argv[i];
+        if (arg !== undefined && arg.startsWith("--port=")) {
+            const value = arg.slice("--port=".length).trim();
+            if (/^\d+$/.test(value)) {
+                return value;
+            }
+        }
+    }
+    return undefined;
+}
+function delay(ms, signal) {
+    return new Promise((resolve) => {
+        var _a;
+        const timer = setTimeout(finish, ms);
+        (_a = timer.unref) === null || _a === void 0 ? void 0 : _a.call(timer);
+        signal.addEventListener("abort", finish, { once: true });
+        function finish() {
+            clearTimeout(timer);
+            signal.removeEventListener("abort", finish);
+            resolve();
+        }
+    });
+}
+/**
+ * Start the pull loop. Returns undefined (with a log line) when required
+ * config is missing so `serve` still starts — mirroring how other relays
+ * degrade instead of failing the host.
+ */
+export function startAgentSdkEventStream(options = {}) {
+    var _a, _b, _c, _d, _e;
+    var _f, _g, _h, _j, _k, _l, _m, _o;
+    const env = (_f = options.env) !== null && _f !== void 0 ? _f : process.env;
+    const logLabel = (_g = options.logLabel) !== null && _g !== void 0 ? _g : "agent-sdk/deployment-events";
+    const rawLog = (_h = options.logger) !== null && _h !== void 0 ? _h : (() => { });
+    const log = (message) => {
+        rawLog(`[${logLabel}] ${message}`);
+    };
+    const doFetch = (_j = options.fetch) !== null && _j !== void 0 ? _j : fetch;
+    const envPrefix = (_k = options.envPrefix) !== null && _k !== void 0 ? _k : "AGENT_SERVE";
+    const apiKey = (_a = env.CURSOR_API_KEY) === null || _a === void 0 ? void 0 : _a.trim();
+    if (apiKey === undefined || apiKey === "") {
+        log("CURSOR_API_KEY missing; deployment event stream disabled");
+        return undefined;
+    }
+    const baseRaw = ((_l = env.CURSOR_API_BASE_URL) !== null && _l !== void 0 ? _l : DEFAULT_BASE_URL).trim();
+    const base = baseRaw.endsWith("/") ? baseRaw.slice(0, -1) : baseRaw;
+    // Loopback self-dispatch into this process's github channel route, single
+    // agent mounting assumed (multi-agent mounts need the slugged path via the
+    // env var override). Port resolution: explicit env override, then `PORT`,
+    // then the serve process's own `--port` argv (hosted-platform engines run
+    // `serve --port 26100` and export no PORT), then the :3000 default of the
+    // corp hosted image.
+    const selfUrl = ((_b = env[`${envPrefix}_SELF_WEBHOOK_URL`]) === null || _b === void 0 ? void 0 : _b.trim()) ||
+        `http://127.0.0.1:${((_c = env.PORT) === null || _c === void 0 ? void 0 : _c.trim()) ||
+            servePortFromArgv((_m = options.argv) !== null && _m !== void 0 ? _m : process.argv) ||
+            "3000"}/v1/channels/github`;
+    log(`self-dispatch url: ${selfUrl}`);
+    const stateDir = ((_d = env[`${envPrefix}_EVENTS_STATE_DIR`]) === null || _d === void 0 ? void 0 : _d.trim()) ||
+        join(process.cwd(), ".agent-serve", (_o = options.stateDirName) !== null && _o !== void 0 ? _o : "deployment-events");
+    const offsetStore = new OffsetStore(stateDir);
+    const abort = new AbortController();
+    // Transition aid: while the deployment still sets GITHUB_WEBHOOK_SECRET,
+    // the channel's auth is HMAC-only (allowAll + signature check), so sign
+    // the self-dispatch with it. Once the secret is removed from the env,
+    // the channel falls back to its loopback policy and the unsigned POST is
+    // admitted — either configuration works, so rollout order doesn't matter.
+    const webhookSecret = (_e = env.GITHUB_WEBHOOK_SECRET) === null || _e === void 0 ? void 0 : _e.trim();
+    function dispatch(envelope) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const body = JSON.stringify(envelopeToGitHubPayload(envelope));
+            const headers = {
+                "content-type": "application/json",
+                "x-github-event": envelope.eventName,
+                "x-github-delivery": envelope.deliveryId,
+            };
+            if (webhookSecret !== undefined && webhookSecret !== "") {
+                const signature = createHmac("sha256", webhookSecret)
+                    .update(body)
+                    .digest("hex");
+                headers["x-hub-signature-256"] = `sha256=${signature}`;
+            }
+            const response = yield doFetch(selfUrl, {
+                method: "POST",
+                headers,
+                body,
+                signal: AbortSignal.timeout(POLL_WAIT_MS),
+            });
+            void ((_a = response.body) === null || _a === void 0 ? void 0 : _a.cancel().catch(() => { }));
+            if (!response.ok) {
+                throw new Error(`self dispatch returned ${response.status}`);
+            }
+        });
+    }
+    function run() {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            var _b;
+            let after = (_b = (yield offsetStore.load())) !== null && _b !== void 0 ? _b : "$";
+            let backoffMs = MIN_BACKOFF_MS;
+            log(`pulling ${base}${EVENTS_PATH} (after=${after})`);
+            while (!abort.signal.aborted) {
+                let parsed;
+                try {
+                    const query = new URLSearchParams({
+                        after,
+                        limit: String(POLL_LIMIT),
+                        waitMs: String(POLL_WAIT_MS),
+                    });
+                    const response = yield doFetch(`${base}${EVENTS_PATH}?${query}`, {
+                        headers: { authorization: `Bearer ${apiKey}` },
+                        signal: AbortSignal.any([
+                            abort.signal,
+                            AbortSignal.timeout(POLL_WAIT_MS + 10000),
+                        ]),
+                    });
+                    if (!response.ok) {
+                        void ((_a = response.body) === null || _a === void 0 ? void 0 : _a.cancel().catch(() => { }));
+                        const authFailure = [401, 403, 404].includes(response.status);
+                        log(`poll failed (${response.status}); backing off`);
+                        yield delay(authFailure ? AUTH_FAILURE_BACKOFF_MS : backoffMs, abort.signal);
+                        backoffMs = Math.min(backoffMs * 2, MAX_BACKOFF_MS);
+                        continue;
+                    }
+                    parsed = parsePollResponse(yield response.json());
+                }
+                catch (error) {
+                    if (abort.signal.aborted)
+                        return;
+                    log(`poll error (${error instanceof Error ? error.message : String(error)}); backing off`);
+                    yield delay(backoffMs, abort.signal);
+                    backoffMs = Math.min(backoffMs * 2, MAX_BACKOFF_MS);
+                    continue;
+                }
+                backoffMs = MIN_BACKOFF_MS;
+                if (parsed.gapDetected) {
+                    log("gap detected: some deliveries were trimmed before this consumer read them");
+                }
+                for (const entry of parsed.events) {
+                    if (abort.signal.aborted)
+                        return;
+                    const envelope = parseAgentSdkScmEventEnvelope(entry.envelope);
+                    if (envelope !== undefined) {
+                        for (let attempt = 1; attempt <= DISPATCH_ATTEMPTS; attempt++) {
+                            if (abort.signal.aborted)
+                                return;
+                            try {
+                                yield dispatch(envelope);
+                                log(`dispatched ${envelope.repo}#${envelope.pullRequest.number} (${envelope.action}, delivery=${envelope.deliveryId})`);
+                                break;
+                            }
+                            catch (error) {
+                                if (abort.signal.aborted)
+                                    return;
+                                const message = error instanceof Error ? error.message : String(error);
+                                if (attempt === DISPATCH_ATTEMPTS) {
+                                    // Skip, don't wedge: the offset advances so one poison
+                                    // delivery cannot stall the stream.
+                                    log(`dispatch failed for ${envelope.deliveryId} after ${attempt} attempts: ${message}`);
+                                    break;
+                                }
+                                log(`dispatch attempt ${attempt} failed for ${envelope.deliveryId}: ${message}; retrying`);
+                                yield delay(DISPATCH_RETRY_DELAYS_MS[Math.min(attempt - 1, DISPATCH_RETRY_DELAYS_MS.length - 1)], abort.signal);
+                            }
+                        }
+                    }
+                    after = entry.offset;
+                    yield offsetStore.save(after).catch(() => { });
+                }
+                if (parsed.events.length === 0 && parsed.nextOffset !== after) {
+                    // "$" anchor resolution. An empty stream anchors at "" (read from
+                    // the beginning), which is valid in-memory but not worth persisting
+                    // (a restart re-anchors at "$" anyway).
+                    after = parsed.nextOffset;
+                    if (after !== "") {
+                        yield offsetStore.save(after).catch(() => { });
+                    }
+                }
+            }
+        });
+    }
+    const done = run().catch((error) => {
+        log(`loop crashed: ${error instanceof Error ? error.message : String(error)}`);
+    });
+    return {
+        stop: () => __awaiter(this, void 0, void 0, function* () {
+            abort.abort();
+            yield done;
+        }),
+    };
+}

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;AAkBH,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAUrB,KAAK,UAAU,EAuBhB,MAAM,aAAa,CAAC;AA2BrB,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,CA6BzD;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,CAmEvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAmuBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAgyBD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CA2JnE"}
+{"version":3,"file":"discovery.d.ts","sourceRoot":"","sources":["../../src/internal/discovery.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAkBH,OAAO,EAIL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAUrB,KAAK,UAAU,EAuBhB,MAAM,aAAa,CAAC;AA2BrB,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,CA6BzD;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,CAmEvB;AAED,qEAAqE;AACrE,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAElE;AAED,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,CAOnE;AAovBD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAiB3E;AAo2BD,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,gBAAgB,CA2JnE"}

package/dist/internal/discovery.js

@@ -329,6 +329,20 @@ function loadAgent(ctx, agentDir, options) {
                 message: 'tools cannot be enforced on runtime: "cloud" yet (the Cursor SDK rejects tool restrictions on cloud agents). Remove `tools` or run the agent on the local runtime.',
             });
         }
+        // Per-session connection features (defineConnection auth/advertiseTools)
+        // only run on local turns: advertised tools are in-process server tools,
+        // and per-session headers cannot reach a cloud VM's MCP config. A
+        // cloud-runtime agent that declares them must fail at serve start —
+        // never run without the connection's tools or identity. (Hybrid
+        // per-send cloud sessions fail closed in the session engine.)
+        const perSessionConnection = connections.find((connection) => connection.advertiseTools === true || connection.auth !== undefined);
+        if (perSessionConnection !== undefined && runtime === "cloud") {
+            ctx.diagnostics.push({
+                severity: "error",
+                path: displayPath(ctx, join(agentDir, "agent.ts")),
+                message: `MCP connection "${perSessionConnection.name}" uses advertiseTools/auth, which only run on runtime: "local". Remove them or run the agent on the local runtime.`,
+            });
+        }
         // `execution: "agent"` tool scripts run through the shell tool. Shell is
         // a real capability, so it is never injected — but an allowlist that
         // strands authored scripts deserves a loud diagnostic, not silence.
@@ -936,6 +950,59 @@ function loadConnections(ctx, connectionsDir) {
                 });
                 continue;
             }
+            if (connection.auth !== undefined &&
+                typeof connection.auth !== "function") {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `auth` must be a function: (session) => { headers }.",
+                });
+                continue;
+            }
+            if (connection.auth !== undefined && !("url" in connection)) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `auth` (per-session headers) is only supported on http/sse connections (`url`).",
+                });
+                continue;
+            }
+            if (connection.advertiseTools !== undefined &&
+                typeof connection.advertiseTools !== "boolean") {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `advertiseTools` must be a boolean.",
+                });
+                continue;
+            }
+            if (connection.advertiseTools === true &&
+                isInlineStdioConnection(connection)) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `advertiseTools` is not supported on inline `tools` connections — author those as agent/tools/ server tools instead.",
+                });
+                continue;
+            }
+            if (connection.advertiseTools === true && connection.hostOnly === true) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `advertiseTools` puts the connection's tools in the model's toolset, which contradicts `hostOnly` (off the model entirely). Drop one of them.",
+                });
+                continue;
+            }
+            if (connection.auth !== undefined &&
+                "url" in connection &&
+                connection.oauth === true) {
+                ctx.diagnostics.push({
+                    severity: "error",
+                    path: displayPath(ctx, entryPath),
+                    message: "MCP connection `oauth: true` cannot be combined with `auth` (per-session headers): the host OAuth provider owns the Authorization header. Drop one of them.",
+                });
+                continue;
+            }
             if (isInlineStdioConnection(connection)) {
                 const packed = yield loadInlineStdioConnection(ctx, name, entryPath, connection);
                 if (packed === undefined) {
@@ -997,6 +1064,8 @@ function loadConnections(ctx, connectionsDir) {
                 transport,
                 description: connection.description,
                 hostOnly: connection.hostOnly,
+                auth: connection.auth,
+                advertiseTools: connection.advertiseTools,
             });
         }
         return connections;

package/dist/internal/init-project.d.ts.map

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

package/dist/internal/init-project.js

@@ -11,9 +11,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { spawn } from "node:child_process";
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync } from "node:fs";
 import { mkdir, readdir, readFile, writeFile } from "node:fs/promises";
 import { basename, dirname, join, relative, resolve } from "node:path";
+import { canonicalTemplateName, isTemplateName, readCursorAgentTemplate, } from "./cursor-agent-template.js";
 import { CLI_COMMAND_NAME, PACKAGE_NAME, packageRootDir, packageVersion, } from "./distribution.js";
 import { applyInitReplacements, isTemplateMetaPath, loadTemplateInitSpec, posixRel, templateFileHasReplacements, } from "./init-interview.js";
 import { makePalette, stdoutPalette, } from "./terminal-style.js";
@@ -25,9 +26,6 @@ const TEMPLATES = {
     "triage-linear": { dir: "triage", overlay: "linear" },
     "triage-jira": { dir: "triage", overlay: "jira" },
 };
-function canonicalTemplateName(name) {
-    return name === "triage" ? "triage-linear" : name;
-}
 export function availableTemplates() {
     return Object.keys(TEMPLATES).sort();
 }
@@ -39,13 +37,13 @@ export function resolveTemplate(name) {
         };
     }
     const resolved = canonicalTemplateName(name);
-    const entry = TEMPLATES[resolved];
-    if (entry === undefined) {
+    if (!isTemplateName(resolved)) {
         return {
             ok: false,
             message: `unknown template "${name}" (available: ${availableTemplates().join(", ")})`,
         };
     }
+    const entry = TEMPLATES[resolved];
     const dir = join(packageRootDir(), "templates", entry.dir);
     return {
         ok: true,
@@ -67,17 +65,7 @@ export function checkInitTarget(rootDir, template) {
     if (!existsSync(pkgPath)) {
         return { ok: true };
     }
-    let marker;
-    try {
-        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-        marker =
-            typeof pkg.cursorAgentTemplate === "string"
-                ? pkg.cursorAgentTemplate
-                : undefined;
-    }
-    catch (_a) {
-        marker = undefined;
-    }
+    const marker = readCursorAgentTemplate(rootDir);
     if (marker === template) {
         return { ok: true };
     }

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

@@ -9,6 +9,14 @@
  *   {@link HostMcpRegistry} on {@link ChannelHandlerArgs.host}.mcp
  */
 import type { DiscoveredConnection, HostMcpCallResult, HostMcpRegistry, HostMcpToolInfo } from "../types.js";
+/**
+ * A non-caching view of one connection: every operation opens a fresh
+ * client and closes it afterwards. See {@link McpHost.oneOff}.
+ */
+export interface HostMcpOneOff {
+    listTools(): Promise<HostMcpToolInfo[]>;
+    callTool(toolName: string, args?: Record<string, unknown>): Promise<HostMcpCallResult>;
+}
 export declare class McpHost implements HostMcpRegistry {
     private readonly byName;
     private readonly clients;
@@ -20,6 +28,16 @@ export declare class McpHost implements HostMcpRegistry {
     addConnection(connection: DiscoveredConnection): void;
     names(): string[];
     listTools(connectionName: string): Promise<HostMcpToolInfo[]>;
+    /**
+     * A one-off view of a connection that is not (or not exactly) in the
+     * registry — e.g. a registered connection with per-session auth headers
+     * substituted in. Every operation opens a fresh client and closes it
+     * afterwards: the registry's cached per-name client would leak one
+     * session's identity into another, and stateless streamable-HTTP
+     * servers answer a fresh initialize cheaply. Results ride the same
+     * mapping as registry calls.
+     */
+    oneOff(connection: DiscoveredConnection): HostMcpOneOff;
     callTool(connectionName: string, toolName: string, args?: Record<string, unknown>): Promise<HostMcpCallResult>;
     close(): Promise<void>;
     /**