@cursor/july 0.1.85 → 0.1.87

package/dist/internal/server.js

@@ -91,6 +91,21 @@ const MAX_BODY_BYTES = 32 * 1024 * 1024;
 /** `GET /v1/artifacts` limit defaults / ceiling. */
 const ARTIFACTS_LIST_DEFAULT_LIMIT = 200;
 const ARTIFACTS_LIST_MAX_LIMIT = 1000;
+function localControlPlaneRoute(runtimes) {
+    for (const runtime of runtimes) {
+        if (runtime.controlPlane !== undefined) {
+            return (input) => runtime.controlPlane.routeContinuation(input);
+        }
+    }
+    return undefined;
+}
+function firstLocalControlPlane(runtimes) {
+    var _a;
+    return (_a = runtimes.find((runtime) => runtime.controlPlane !== undefined)) === null || _a === void 0 ? void 0 : _a.controlPlane;
+}
+function isV2Project(project) {
+    return project.agent.architecture === "v2";
+}
 /**
  * Start an HTTP server hosting one or more agents. A single agent with an
  * empty slug serves at `/v1/*` and `/playground`; multiple agents each serve
@@ -98,9 +113,9 @@ const ARTIFACTS_LIST_MAX_LIMIT = 1000;
  */
 export function startServer(mounts_1) {
     return __awaiter(this, arguments, void 0, function* (mounts, options = {}) {
-        var _a, _b, _c, _d, _e;
-        var _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
-        var _y;
+        var _a, _b, _c, _d, _e, _f;
+        var _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
+        var _1;
         if (mounts.length === 0) {
             throw new Error("startServer requires at least one agent mount");
         }
@@ -112,16 +127,16 @@ export function startServer(mounts_1) {
             }
         }
         const logRing = createLogRing({ capacity: 2000 });
-        const logger = logRing.wrap((_f = options.logger) !== null && _f !== void 0 ? _f : ((line) => console.log(line)));
-        const dev = (_g = options.dev) !== null && _g !== void 0 ? _g : false;
-        const playground = (_h = options.playground) !== null && _h !== void 0 ? _h : true;
+        const logger = logRing.wrap((_g = options.logger) !== null && _g !== void 0 ? _g : ((line) => console.log(line)));
+        const dev = (_h = options.dev) !== null && _h !== void 0 ? _h : false;
+        const playground = (_j = options.playground) !== null && _j !== void 0 ? _j : true;
         const noControlPlane = options.noControlPlane === true;
-        const runSchedules = (_j = options.schedules) !== null && _j !== void 0 ? _j : !dev;
-        const runReminders = (_k = options.reminders) !== null && _k !== void 0 ? _k : !dev;
+        const runSchedules = (_k = options.schedules) !== null && _k !== void 0 ? _k : !dev;
+        const runReminders = (_l = options.reminders) !== null && _l !== void 0 ? _l : !dev;
         // Identify this process to the Cursor backend as agentkit (the SDK reads
         // this when building its client-version header) so the internal-only
         // agentkit_enabled gate applies to every turn.
-        (_l = (_y = process.env).CURSOR_AGENTKIT_VERSION) !== null && _l !== void 0 ? _l : (_y.CURSOR_AGENTKIT_VERSION = packageVersion());
+        (_m = (_1 = process.env).CURSOR_AGENTKIT_VERSION) !== null && _m !== void 0 ? _m : (_1.CURSOR_AGENTKIT_VERSION = packageVersion());
         const authoredOtel = pickAuthoredOtel(mounts.map((m) => ({
             slug: m.slug,
             name: m.project.name,
@@ -143,10 +158,10 @@ export function startServer(mounts_1) {
             targets: cursorGithubTargets,
         });
         const cursorOriginScope = resolveCursorOriginRepoScope({
-            explicitRepos: (_m = (_b = options.cursorEvents) === null || _b === void 0 ? void 0 : _b.repos) !== null && _m !== void 0 ? _m : [],
+            explicitRepos: (_o = (_b = options.cursorEvents) === null || _b === void 0 ? void 0 : _b.repos) !== null && _o !== void 0 ? _o : [],
             targets: cursorOriginTargets,
         });
-        const effectiveCursorEvents = (_o = cursorGithubConfig.cursorEvents) !== null && _o !== void 0 ? _o : (cursorOriginScope === undefined
+        const effectiveCursorEvents = (_p = cursorGithubConfig.cursorEvents) !== null && _p !== void 0 ? _p : (cursorOriginScope === undefined
             ? undefined
             : { repos: [...cursorOriginScope.repos] });
         // One resolution for every Cursor credential consumer (SDK runner, account
@@ -159,6 +174,19 @@ export function startServer(mounts_1) {
         const cursorEventsAuth = effectiveCursorEvents === undefined
             ? undefined
             : requireCursorEventsAuth(effectiveCursorEvents, accountKey);
+        // Two architectures + local CP + cursor-events would register two
+        // /v0/scm-events consumers (engine offset vs control-plane offset).
+        // Fail before engines or relays start. `--no-control-plane` mixed is one
+        // July consumer (v1 engine); hosted CP owns v2.
+        assertSingleCursorEventsLane({
+            noControlPlane,
+            config: effectiveCursorEvents,
+            auth: cursorEventsAuth,
+            v1Mounts: mounts.filter((mount) => !isV2Project(mount.project)),
+            v2Mounts: mounts.filter((mount) => isV2Project(mount.project)),
+            githubRepos: (_q = (_c = cursorGithubConfig.cursorEvents) === null || _c === void 0 ? void 0 : _c.repos) !== null && _q !== void 0 ? _q : [],
+            originRepos: (_r = cursorOriginScope === null || cursorOriginScope === void 0 ? void 0 : cursorOriginScope.repos) !== null && _r !== void 0 ? _r : [],
+        });
         let cursorGithubCredentials;
         // Proxy-wired GitHub token resolver for `ctx.host.github` when no startup
         // token mint runs (empty repo scope): host Octokit calls must route
@@ -262,7 +290,7 @@ export function startServer(mounts_1) {
             // Published installs already ship the bundle; vite may be absent there.
             yield ensurePlaygroundBundle(logger);
         }
-        const docsSite = (_p = options.docs) !== null && _p !== void 0 ? _p : true;
+        const docsSite = (_s = options.docs) !== null && _s !== void 0 ? _s : true;
         if (docsSite) {
             // Same pattern for the documentation site at /docs.
             yield ensureDocsSiteBundle(logger);
@@ -270,7 +298,7 @@ export function startServer(mounts_1) {
         if (options.allowAnonymous === true) {
             logger("[agent-sdk] warning: --allow-anonymous admits every HTTP caller as the same principal; use only on a trusted network (e.g. Tailscale) and prefer --bearer-token for shared hosts");
         }
-        const runner = (_q = options.runner) !== null && _q !== void 0 ? _q : new CursorSdkRunner(Object.assign(Object.assign({}, (accountKey === undefined ? {} : { apiKey: accountKey.apiKey })), { logger }));
+        const runner = (_t = options.runner) !== null && _t !== void 0 ? _t : new CursorSdkRunner(Object.assign(Object.assign({}, (accountKey === undefined ? {} : { apiKey: accountKey.apiKey })), { logger }));
         const router = new Router();
         const runtimes = [];
         const channelStopHooks = [];
@@ -313,7 +341,7 @@ export function startServer(mounts_1) {
         }
         for (const { slug, project } of mounts) {
             // Each agent gets an isolated state root so their sessions never mix.
-            const baseStateRoot = (_r = options.stateRoot) !== null && _r !== void 0 ? _r : join(project.rootDir, ".agent-serve");
+            const baseStateRoot = (_u = options.stateRoot) !== null && _u !== void 0 ? _u : join(project.rootDir, ".agent-serve");
             const stateRoot = slug === "" ? baseStateRoot : join(baseStateRoot, slug);
             const otelCollector = otelRuntime === undefined
                 ? undefined
@@ -360,7 +388,7 @@ export function startServer(mounts_1) {
             reminderRunner = new ReminderRunner(engine, logger, timerClient);
             const evalRuns = new EvalRunStore(project.rootDir, logger, 
             // Playground eval history mirrors onto the defineStorage evals table.
-            (_c = engine.storage) === null || _c === void 0 ? void 0 : _c.evalRuns());
+            (_d = engine.storage) === null || _d === void 0 ? void 0 : _d.evalRuns());
             // Eval history restores with the same startup step as sessions (reads
             // also hydrate lazily, but doing it here surfaces store problems at
             // boot and makes /v1/dev/evals complete from the first request).
@@ -429,7 +457,7 @@ export function startServer(mounts_1) {
                     }
                     catch (error) {
                         logger(`[agent-sdk] channel "${channel.id}" onStart failed: ${error instanceof Error
-                            ? ((_s = error.stack) !== null && _s !== void 0 ? _s : error.message)
+                            ? ((_v = error.stack) !== null && _v !== void 0 ? _v : error.message)
                             : String(error)}`);
                     }
                 }
@@ -507,20 +535,26 @@ export function startServer(mounts_1) {
         // job (backend `/github_webhook` already verified); we only admit loopback
         // so this route is not a public unsigned endpoint. Agents decide whether
         // to run via their onPullRequest / onComment / … hooks.
-        const collectGitHubTargets = () => collectGitHubTriggerTargets({
-            mounts: runtimes.map((runtime) => ({
+        const collectGitHubTargetsFrom = (selected) => collectGitHubTriggerTargets({
+            mounts: selected.map((runtime) => ({
                 slug: runtime.slug,
                 channels: runtime.project.channels,
                 buildHandlerArgs: (channelId) => buildChannelHandlerArgs({ runtime, channelId }),
             })),
         });
-        const collectOriginTargets = () => collectOriginTriggerTargets({
-            mounts: runtimes.map((runtime) => ({
+        const collectOriginTargetsFrom = (selected) => collectOriginTriggerTargets({
+            mounts: selected.map((runtime) => ({
                 slug: runtime.slug,
                 channels: runtime.project.channels,
                 buildHandlerArgs: (channelId) => buildChannelHandlerArgs({ runtime, channelId }),
             })),
         });
+        const collectGitHubTargets = () => collectGitHubTargetsFrom(runtimes);
+        const collectOriginTargets = () => collectOriginTargetsFrom(runtimes);
+        const v1Runtimes = runtimes.filter((runtime) => !isV2Project(runtime.project));
+        const v2Runtimes = runtimes.filter((runtime) => isV2Project(runtime.project));
+        const v1Mounts = mounts.filter((mount) => !isV2Project(mount.project));
+        const v2Mounts = mounts.filter((mount) => isV2Project(mount.project));
         router.add({
             method: "POST",
             pattern: "/v1/webhooks/github",
@@ -529,13 +563,8 @@ export function startServer(mounts_1) {
                 var _a;
                 var _b, _c;
                 const bodyText = yield request.text();
-                const result = yield handleAgentServeTrigger({
-                    type: "github",
-                    bodyText,
-                    eventName: request.headers.get("x-github-event"),
-                    deliveryId: (_b = request.headers.get("x-github-delivery")) !== null && _b !== void 0 ? _b : undefined,
-                    targets: collectGitHubTargets(),
-                });
+                const routeContinuation = localControlPlaneRoute(runtimes);
+                const result = yield handleAgentServeTrigger(Object.assign({ type: "github", bodyText, eventName: request.headers.get("x-github-event"), deliveryId: (_b = request.headers.get("x-github-delivery")) !== null && _b !== void 0 ? _b : undefined, targets: collectGitHubTargets() }, (routeContinuation === undefined ? {} : { routeContinuation })));
                 const status = result.ok ? 202 : ((_c = (_a = result.targets[0]) === null || _a === void 0 ? void 0 : _a.status) !== null && _c !== void 0 ? _c : 500);
                 return jsonResponse(result, { status });
             }),
@@ -563,20 +592,30 @@ export function startServer(mounts_1) {
             yield cursorSlackRelay === null || cursorSlackRelay === void 0 ? void 0 : cursorSlackRelay.stop();
             throw error;
         }
-        // Cursor SCM events relay (opt-in: serve({ cursorEvents }) / --cursor-events).
-        const cursorEventRelay = startCursorEventRelay({
+        // Cursor SCM events: v1 stays on the engine poll. v2 ingest is local-CP
+        // only — hosted `--no-control-plane` skips the July poll (hosted CP wakes).
+        const routeContinuation = localControlPlaneRoute(runtimes);
+        const cursorEventsCommon = {
             config: effectiveCursorEvents,
-            githubRepos: (_t = (_d = cursorGithubConfig.cursorEvents) === null || _d === void 0 ? void 0 : _d.repos) !== null && _t !== void 0 ? _t : [],
-            originRepos: (_u = cursorOriginScope === null || cursorOriginScope === void 0 ? void 0 : cursorOriginScope.repos) !== null && _u !== void 0 ? _u : [],
+            githubRepos: (_w = (_e = cursorGithubConfig.cursorEvents) === null || _e === void 0 ? void 0 : _e.repos) !== null && _w !== void 0 ? _w : [],
+            originRepos: (_x = cursorOriginScope === null || cursorOriginScope === void 0 ? void 0 : cursorOriginScope.repos) !== null && _x !== void 0 ? _x : [],
             stateRoot: options.stateRoot,
-            mounts,
             auth: cursorEventsAuth,
             logger,
-            collectGitHubTargets,
-            collectOriginTargets,
             cursorAccountOnly: options.cursorEvents === undefined &&
                 (cursorGithubTargets.length > 0 || cursorOriginTargets.length > 0),
-        });
+        };
+        const cursorEventRelay = startCursorEventRelay(Object.assign(Object.assign({}, cursorEventsCommon), { mounts: v1Mounts, collectGitHubTargets: () => collectGitHubTargetsFrom(v1Runtimes), collectOriginTargets: () => collectOriginTargetsFrom(v1Runtimes), lane: "engine", skippedV2: v2Mounts.length > 0 }));
+        const controlPlaneScmRelay = startCursorEventRelay(Object.assign(Object.assign(Object.assign(Object.assign({}, cursorEventsCommon), { mounts: v2Mounts, collectGitHubTargets: () => collectGitHubTargetsFrom(v2Runtimes), collectOriginTargets: () => collectOriginTargetsFrom(v2Runtimes) }), (routeContinuation === undefined ? {} : { routeContinuation })), { lane: "control-plane", start: false, stateDirName: join("control-plane", "cursor-events") }));
+        const localCp = firstLocalControlPlane(runtimes);
+        if (controlPlaneScmRelay !== undefined) {
+            if (localCp !== undefined) {
+                localCp.attachScmEvents(controlPlaneScmRelay);
+            }
+            else {
+                logger("[agent-sdk] cursor-events: skipping v2 scm-events poll (--no-control-plane); hosted CP owns ingest");
+            }
+        }
         // Cursor deployment-events relay: automatic when a mounted agent authored
         // `deploymentsChannel({ ... })`.
         const cursorDeploymentRelay = startCursorDeploymentRelay({
@@ -588,9 +627,9 @@ export function startServer(mounts_1) {
         const server = createServer((req, res) => {
             void instrumentHttp(otelRuntime, req, res, () => handleRequest(router, req, res, logger));
         });
-        const host = (_v = options.host) !== null && _v !== void 0 ? _v : "127.0.0.1";
+        const host = (_y = options.host) !== null && _y !== void 0 ? _y : "127.0.0.1";
         const portWasExplicit = options.port !== undefined;
-        const requestedPort = (_w = options.port) !== null && _w !== void 0 ? _w : DEFAULT_SERVE_PORT;
+        const requestedPort = (_z = options.port) !== null && _z !== void 0 ? _z : DEFAULT_SERVE_PORT;
         let boundPort;
         try {
             boundPort = yield listenHttpServer({
@@ -604,6 +643,7 @@ export function startServer(mounts_1) {
         catch (error) {
             yield cursorDeploymentRelay === null || cursorDeploymentRelay === void 0 ? void 0 : cursorDeploymentRelay.stop();
             yield cursorEventRelay === null || cursorEventRelay === void 0 ? void 0 : cursorEventRelay.stop();
+            yield controlPlaneScmRelay === null || controlPlaneScmRelay === void 0 ? void 0 : controlPlaneScmRelay.stop();
             yield cursorSlackRelay === null || cursorSlackRelay === void 0 ? void 0 : cursorSlackRelay.stop();
             cursorGithubCredentials === null || cursorGithubCredentials === void 0 ? void 0 : cursorGithubCredentials.stop();
             yield shutdownOtelRuntime(otelRuntime);
@@ -635,7 +675,7 @@ export function startServer(mounts_1) {
                 runtime.project.agent.cloud !== undefined;
             if ((hasServerTools || bridgeableNames.length > 0) && cloudCapable) {
                 const basePath = runtime.slug === "" ? "" : `/${runtime.slug}`;
-                const publicToolsUrl = (_x = options.cloudToolsUrl) !== null && _x !== void 0 ? _x : (options.publicUrl === undefined
+                const publicToolsUrl = (_0 = options.cloudToolsUrl) !== null && _0 !== void 0 ? _0 : (options.publicUrl === undefined
                     ? undefined
                     : `${options.publicUrl.replace(/\/$/, "")}${basePath}${TOOL_MCP_ENDPOINT_PATH}`);
                 if (publicToolsUrl === undefined) {
@@ -687,7 +727,7 @@ export function startServer(mounts_1) {
         const handle = {
             url,
             port: address.port,
-            project: (_e = runtimes[0]) === null || _e === void 0 ? void 0 : _e.project,
+            project: (_f = runtimes[0]) === null || _f === void 0 ? void 0 : _f.project,
             agents,
             dispatchSchedule: (name, slug) => {
                 var _a;
@@ -755,6 +795,7 @@ export function startServer(mounts_1) {
                 playgroundDev === null || playgroundDev === void 0 ? void 0 : playgroundDev.stop();
                 yield cursorDeploymentRelay === null || cursorDeploymentRelay === void 0 ? void 0 : cursorDeploymentRelay.stop();
                 yield cursorEventRelay === null || cursorEventRelay === void 0 ? void 0 : cursorEventRelay.stop();
+                yield controlPlaneScmRelay === null || controlPlaneScmRelay === void 0 ? void 0 : controlPlaneScmRelay.stop();
                 yield cursorSlackRelay === null || cursorSlackRelay === void 0 ? void 0 : cursorSlackRelay.stop();
                 for (const runtime of runtimes) {
                     (_a = runtime.controlPlane) === null || _a === void 0 ? void 0 : _a.stop();
@@ -1452,15 +1493,9 @@ function requireCursorEventsAuth(config, accountKey) {
  * channels; Origin is subscribed only when an `originChannel({ cursorAccount })`
  * opted in.
  */
-function startCursorEventRelay(input) {
-    var _a;
-    var _b;
-    const { config, stateRoot, mounts, auth, logger } = input;
-    if (config === undefined || auth === undefined) {
-        return undefined;
-    }
-    const githubTargets = findGitHubChannelTargets(mounts);
-    const originTargets = findOriginChannelTargets(mounts);
+function collectCursorEventSubscriptions(input) {
+    const githubTargets = findGitHubChannelTargets(input.mounts);
+    const originTargets = findOriginChannelTargets(input.mounts);
     const githubEvents = [
         ...new Set(githubTargets.flatMap((target) => target.events)),
     ];
@@ -1492,8 +1527,52 @@ function startCursorEventRelay(input) {
             });
         }
     }
+    return subscriptions;
+}
+/**
+ * Local CP + `--cursor-events` + both architectures would start two
+ * consumers (different offset dirs). Refuse that at serve start.
+ * `--no-control-plane` is one July consumer — hosted CP owns v2.
+ */
+function assertSingleCursorEventsLane(input) {
+    if (input.noControlPlane ||
+        input.config === undefined ||
+        input.auth === undefined) {
+        return;
+    }
+    const shared = {
+        githubRepos: input.githubRepos,
+        originRepos: input.originRepos,
+    };
+    if (collectCursorEventSubscriptions(Object.assign({ mounts: input.v1Mounts }, shared))
+        .length === 0 ||
+        collectCursorEventSubscriptions(Object.assign({ mounts: input.v2Mounts }, shared))
+            .length === 0) {
+        return;
+    }
+    throw new Error("[agent-sdk] cursor-events: refusing to serve v1 and v2 github/origin agents in one process — they would open two /v0/scm-events consumers. Serve one architecture per process.");
+}
+function startCursorEventRelay(input) {
+    var _a;
+    var _b, _c;
+    const { config, stateRoot, mounts, auth, logger } = input;
+    if (config === undefined || auth === undefined) {
+        return undefined;
+    }
+    const subscriptions = collectCursorEventSubscriptions({
+        mounts,
+        githubRepos: input.githubRepos,
+        originRepos: input.originRepos,
+    });
     if (subscriptions.length === 0) {
-        if (githubRepos.length === 0 && originRepos.length === 0) {
+        if (input.lane === "engine" && input.skippedV2 === true) {
+            logger("[agent-sdk] cursor-events: no v1 github/origin targets; v2 ingest is control-plane only");
+        }
+        else if (input.lane === "control-plane") {
+            return undefined;
+        }
+        else if (input.githubRepos.every((repo) => repo.trim() === "") &&
+            input.originRepos.every((repo) => repo.trim() === "")) {
             logger("[agent-sdk] cursor-events: no repos configured (pass --repo owner/name); relay disabled");
         }
         else {
@@ -1506,7 +1585,7 @@ function startCursorEventRelay(input) {
         baseUrl: auth.baseUrl,
         apiKey: auth.apiKey,
         subscriptions,
-        stateDir: join(baseStateRoot, "cursor-events"),
+        stateDir: join(baseStateRoot, (_c = input.stateDirName) !== null && _c !== void 0 ? _c : "cursor-events"),
         logger,
         dispatch: (event) => __awaiter(this, void 0, void 0, function* () {
             if (event.provider === "origin") {
@@ -1521,11 +1600,9 @@ function startCursorEventRelay(input) {
                         ? true
                         : cursorAccount.repos.some((repo) => repo.toLowerCase() === event.repo.toLowerCase());
                 });
-                const result = yield handleAgentServeTrigger({
-                    type: "origin",
-                    bodyText: JSON.stringify(scmMetadataToOriginPayload(event)),
-                    targets,
-                });
+                const result = yield handleAgentServeTrigger(Object.assign({ type: "origin", bodyText: JSON.stringify(scmMetadataToOriginPayload(event)), targets }, (input.routeContinuation === undefined
+                    ? {}
+                    : { routeContinuation: input.routeContinuation })));
                 logCursorScmDispatch(logger, event, result);
                 return;
             }
@@ -1542,16 +1619,15 @@ function startCursorEventRelay(input) {
                     ? true
                     : cursorAccount.repos.some((repo) => repo.toLowerCase() === event.repo.toLowerCase());
             });
-            const result = yield handleAgentServeTrigger({
-                type: "github",
-                bodyText: JSON.stringify(scmEventToGitHubPayload(event)),
-                eventName: event.eventName,
-                deliveryId: event.deliveryId,
-                targets,
-            });
+            const result = yield handleAgentServeTrigger(Object.assign({ type: "github", bodyText: JSON.stringify(scmEventToGitHubPayload(event)), eventName: event.eventName, deliveryId: event.deliveryId, targets }, (input.routeContinuation === undefined
+                ? {}
+                : { routeContinuation: input.routeContinuation })));
             logCursorScmDispatch(logger, event, result);
         }),
     });
+    if (input.start === false) {
+        return relay;
+    }
     relay.start();
     logger(`[agent-sdk] cursor-events: relaying ${subscriptions.length} subscription(s) from ${auth.baseUrl}`);
     return relay;