@cursor/july 0.1.101 → 0.1.103

package/dist/internal/continuation-identity.js

@@ -27,6 +27,10 @@ export const CONTINUATION_SELECTORS = [
     "origin.pr/v1",
     "origin.pr/v2",
     "origin.none/v2",
+    "gitlab.mr/v2",
+    "gitlab.none/v2",
+    "bitbucket.pr/v2",
+    "bitbucket.none/v2",
     "deployments.none/v1",
     "deployments.none/v2",
     "deployments.deployment/v2",
@@ -62,6 +66,9 @@ export const BUILTINS = [
     {
         type: "origin-pr",
         kind: "origin",
+        // Public webhook deliveries carry `pullRequest.number` + repository
+        // (`owner.slug` / `name`); keep in lockstep with the control plane's
+        // `conversation/origin.ts`.
         events: [
             "pull_request.created",
             "pull_request.published",
@@ -71,9 +78,34 @@ export const BUILTINS = [
             "pull_request.merged",
             "pull_request.comment.created",
             "pull_request.review.submitted",
+            "pull_request.metadata.updated",
         ],
         format: "origin-pr:{fullName}#{number}",
     },
+    {
+        type: "gitlab-mr",
+        kind: "gitlab",
+        // GitLab `object_kind`s that carry a merge request: `note` only when
+        // `noteable_type` is MergeRequest, `pipeline` only with `merge_request`.
+        events: ["merge_request", "note", "pipeline"],
+        format: "gitlab-mr:{fullName}!{number}",
+    },
+    {
+        type: "bitbucket-pr",
+        kind: "bitbucket",
+        // Cloud vocabulary; Data Center keys are normalized before the stamp.
+        events: [
+            "pullrequest:created",
+            "pullrequest:updated",
+            "pullrequest:approved",
+            "pullrequest:unapproved",
+            "pullrequest:changes_request_created",
+            "pullrequest:fulfilled",
+            "pullrequest:rejected",
+            "pullrequest:comment_created",
+        ],
+        format: "bitbucket-pr:{fullName}#{number}",
+    },
     {
         type: "deployment",
         kind: "deployments",
@@ -101,6 +133,10 @@ const SELECTOR_FIELDS = {
     "origin.pr/v1": { version: 1, type: "origin-pr", kind: "origin" },
     "origin.pr/v2": { version: 2, type: "origin-pr", kind: "origin" },
     "origin.none/v2": { version: 2, type: "none", kind: "origin" },
+    "gitlab.mr/v2": { version: 2, type: "gitlab-mr", kind: "gitlab" },
+    "gitlab.none/v2": { version: 2, type: "none", kind: "gitlab" },
+    "bitbucket.pr/v2": { version: 2, type: "bitbucket-pr", kind: "bitbucket" },
+    "bitbucket.none/v2": { version: 2, type: "none", kind: "bitbucket" },
     "deployments.none/v1": { version: 1, type: "none", kind: "deployments" },
     "deployments.none/v2": { version: 2, type: "none", kind: "deployments" },
     "deployments.deployment/v2": {
@@ -111,7 +147,7 @@ const SELECTOR_FIELDS = {
     "none/v1": { version: 1, type: "none", kind: "http" },
     "none/v2": { version: 2, type: "none", kind: "http" },
 };
-export function isContinuationSelector(value) {
+function isContinuationSelector(value) {
     return Object.hasOwn(SELECTOR_FIELDS, value);
 }
 export function defaultContinuationSelector(kind, version = "v1", eventTypes) {
@@ -136,12 +172,26 @@ export function defaultContinuationSelector(kind, version = "v1", eventTypes) {
             return "slack.thread/v2";
         case "origin":
             return originV2Default(eventTypes);
+        case "gitlab":
+            return membershipOrNone(eventTypes, "gitlab-mr", "gitlab.mr/v2", "gitlab.none/v2");
+        case "bitbucket":
+            return membershipOrNone(eventTypes, "bitbucket-pr", "bitbucket.pr/v2", "bitbucket.none/v2");
         case "deployments":
             return deploymentsV2Default(eventTypes);
         default:
             return "none/v2";
     }
 }
+/** Typed selector when every declared event is in the type's membership. */
+function membershipOrNone(eventTypes, type, typed, none) {
+    var _a;
+    var _b;
+    const allowed = new Set((_b = (_a = builtinForType(type)) === null || _a === void 0 ? void 0 : _a.events) !== null && _b !== void 0 ? _b : []);
+    if ((eventTypes !== null && eventTypes !== void 0 ? eventTypes : []).some((event) => !allowed.has(event))) {
+        return none;
+    }
+    return typed;
+}
 function githubV2Default(eventTypes) {
     var _a, _b;
     var _c, _d;
@@ -166,6 +216,38 @@ function originV2Default(eventTypes) {
     }
     return "origin.pr/v2";
 }
+/**
+ * Omitted `/v2` default became type `none` because a declared event sits
+ * outside the kind's typed membership. Validate warns; handshake stays
+ * silent on omitted selectors (type `none` is always admitted).
+ */
+export function omittedV2MembershipDowngrade(kind, eventTypes) {
+    const events = eventTypes !== null && eventTypes !== void 0 ? eventTypes : [];
+    if (events.length === 0) {
+        return undefined;
+    }
+    const selector = defaultContinuationSelector(kind, "v2", events);
+    const parsed = parseContinuationSelector(selector);
+    if (parsed === undefined || parsed.type !== "none") {
+        return undefined;
+    }
+    const typed = kind === "github"
+        ? builtinForType("pr")
+        : kind === "origin"
+            ? builtinForType("origin-pr")
+            : kind === "deployments"
+                ? builtinForType("deployment")
+                : undefined;
+    if (typed === undefined) {
+        return undefined;
+    }
+    const allowed = new Set(typed.events);
+    const unexpected = events.filter((event) => !allowed.has(event));
+    if (unexpected.length === 0) {
+        return undefined;
+    }
+    return { selector, unexpected };
+}
 function deploymentsV2Default(eventTypes) {
     var _a;
     var _b;
@@ -182,7 +264,7 @@ export function parseContinuationSelector(selector) {
     }
     return Object.assign({ selector }, SELECTOR_FIELDS[selector]);
 }
-export function resolveContinuation(raw, kind) {
+function resolveContinuation(raw, kind) {
     const selector = raw !== null && raw !== void 0 ? raw : defaultContinuationSelector(kind);
     const parsed = parseContinuationSelector(selector);
     if (parsed === undefined) {
@@ -201,13 +283,13 @@ export function continuationSource(identity, kind) {
 export function isV2DurableContinuationKey(key) {
     return key.startsWith("cont:") || key.startsWith("evt:");
 }
-export function newEvtKey() {
+function newEvtKey() {
     return `evt:${randomBytes(16).toString("hex")}`;
 }
-export function builtinForType(type) {
+function builtinForType(type) {
     return BUILTINS.find((builtin) => builtin.type === type);
 }
-export function formatConversationKey(type, fields) {
+function formatConversationKey(type, fields) {
     switch (type) {
         case "pr":
             return `github-pr:${fields.fullName}#${fields.number}`;
@@ -215,6 +297,10 @@ export function formatConversationKey(type, fields) {
             return `github-issue:${fields.fullName}#${fields.number}`;
         case "origin-pr":
             return `origin-pr:${fields.fullName}#${fields.number}`;
+        case "gitlab-mr":
+            return `gitlab-mr:${fields.fullName}!${fields.number}`;
+        case "bitbucket-pr":
+            return `bitbucket-pr:${fields.fullName}#${fields.number}`;
         case "thread":
             return `${fields.channelId}:${fields.threadTs}`;
         case "deployment":
@@ -239,7 +325,9 @@ export function mintClaim(claim) {
         }
         case "pr":
         case "issue":
-        case "origin-pr": {
+        case "origin-pr":
+        case "gitlab-mr":
+        case "bitbucket-pr": {
             const resource = claim.resource;
             const fullName = "fullName" in resource
                 ? resource.fullName
@@ -250,8 +338,14 @@ export function mintClaim(claim) {
             if (fullName === undefined || number === undefined) {
                 throw new V2EngineError(`v2: ${claim.type} claim requires repository and number`);
             }
+            // GitLab paths and Bitbucket project keys arrive in API-native casing;
+            // the webhook extractors lowercase them, so the claim must too or the
+            // two mint different keys for the same MR / PR.
+            const caseFolded = claim.type === "gitlab-mr" || claim.type === "bitbucket-pr"
+                ? fullName.toLowerCase()
+                : fullName;
             return `cont:${formatConversationKey(claim.type, {
-                fullName,
+                fullName: caseFolded,
                 number,
             })}`;
         }
@@ -319,6 +413,10 @@ export function extractContinuation(type, eventName, payload) {
             return extractSlack(payload);
         case "origin-pr":
             return extractOrigin(payload);
+        case "gitlab-mr":
+            return extractGitlab(eventName, payload);
+        case "bitbucket-pr":
+            return extractBitbucket(payload);
         case "deployment":
             return extractDeployment(payload);
     }
@@ -475,6 +573,83 @@ function originExtractRecord(payload) {
     }
     return record;
 }
+/**
+ * GitLab merge request identity: `project.path_with_namespace` (nested
+ * groups keep their slashes; lowercased like the scope key) plus the MR
+ * `iid`. `merge_request` reads `object_attributes.iid`; `note` binds only
+ * MR notes (`noteable_type: "MergeRequest"`); `pipeline` binds only when
+ * the payload carries a `merge_request`.
+ */
+function extractGitlab(eventName, payload) {
+    var _a, _b, _c, _d, _e, _f;
+    const record = asRecord(payload);
+    if (record === undefined) {
+        return undefined;
+    }
+    const fullName = (_b = nonEmpty((_a = asRecord(record.project)) === null || _a === void 0 ? void 0 : _a.path_with_namespace)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+    if (fullName === undefined) {
+        return undefined;
+    }
+    let number;
+    switch (eventName) {
+        case "merge_request":
+            number = positiveInt((_c = asRecord(record.object_attributes)) === null || _c === void 0 ? void 0 : _c.iid);
+            break;
+        case "note":
+            if (((_d = asRecord(record.object_attributes)) === null || _d === void 0 ? void 0 : _d.noteable_type) !== "MergeRequest") {
+                return undefined;
+            }
+            number = positiveInt((_e = asRecord(record.merge_request)) === null || _e === void 0 ? void 0 : _e.iid);
+            break;
+        case "pipeline":
+            number = positiveInt((_f = asRecord(record.merge_request)) === null || _f === void 0 ? void 0 : _f.iid);
+            break;
+        default:
+            return undefined;
+    }
+    if (number === undefined) {
+        return undefined;
+    }
+    return `cont:${formatConversationKey("gitlab-mr", { fullName, number })}`;
+}
+/**
+ * Bitbucket pull request identity from either dialect. Cloud payloads carry
+ * `repository.full_name` + `pullrequest.id`; Data Center payloads carry
+ * `pullRequest.id` and the repo under `pullRequest.toRef.repository`
+ * (`project.key/slug`). Lowercased so a Cloud/DC pair for one logical PR
+ * shares a key.
+ */
+function extractBitbucket(payload) {
+    var _a;
+    var _b, _c;
+    const record = asRecord(payload);
+    if (record === undefined) {
+        return undefined;
+    }
+    const pullRequest = (_b = asRecord(record.pullrequest)) !== null && _b !== void 0 ? _b : asRecord(record.pullRequest);
+    const number = positiveInt(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.id);
+    const fullName = bitbucketFullName((_c = asRecord(record.repository)) !== null && _c !== void 0 ? _c : asRecord((_a = asRecord(pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.toRef)) === null || _a === void 0 ? void 0 : _a.repository));
+    if (number === undefined || fullName === undefined) {
+        return undefined;
+    }
+    return `cont:${formatConversationKey("bitbucket-pr", { fullName, number })}`;
+}
+function bitbucketFullName(repository) {
+    var _a;
+    if (repository === undefined) {
+        return undefined;
+    }
+    const cloud = nonEmpty(repository.full_name);
+    if (cloud !== undefined) {
+        return cloud.toLowerCase();
+    }
+    const projectKey = nonEmpty((_a = asRecord(repository.project)) === null || _a === void 0 ? void 0 : _a.key);
+    const slug = nonEmpty(repository.slug);
+    if (projectKey === undefined || slug === undefined) {
+        return undefined;
+    }
+    return `${projectKey}/${slug}`.toLowerCase();
+}
 function extractDeployment(payload) {
     const record = asRecord(payload);
     const deploymentId = nonEmpty(record === null || record === void 0 ? void 0 : record.deploymentId);

package/dist/internal/conversation-mirror.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conversation-mirror.d.ts","sourceRoot":"","sources":["../../src/internal/conversation-mirror.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,KAAK,EAAsB,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAK5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAYD,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,QAAQ,CAAC;IACf,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,GACvC,kBAAkB,CAqMpB;AA6ED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C,GAAG,kBAAkB,GAAG,SAAS,CAoBjC"}
+{"version":3,"file":"conversation-mirror.d.ts","sourceRoot":"","sources":["../../src/internal/conversation-mirror.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,KAAK,EAAsB,eAAe,EAAE,MAAM,aAAa,CAAC;AACvE,OAAO,EAA0B,KAAK,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC;;;;;;;OAOG;IACH,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACtE;;;OAGG;IACH,OAAO,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpE;AAYD,MAAM,WAAW,+BAA+B;IAC9C,IAAI,EAAE,QAAQ,CAAC;IACf,8CAA8C;IAC9C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC;AAED,kEAAkE;AAClE,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,+BAA+B,GACvC,kBAAkB,CA6MpB;AA6ED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE;IAC9C,OAAO,EAAE,YAAY,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C,GAAG,kBAAkB,GAAG,SAAS,CAqBjC"}

package/dist/internal/conversation-mirror.js

@@ -44,12 +44,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { agentStoreKeys } from "../files.js";
-import { cursorFrameworkStoreSourceId, cursorHostedFiles, } from "../files-backends/cursor-hosted.js";
+import { agentSdkAgentStoreKeys } from "../files.js";
+import { cursorHostedFiles } from "../files-backends/cursor-hosted.js";
 import { mapBounded } from "./bounded.js";
 import { resolveApiKeySync } from "./cursor/credentials.js";
-import { AGENT_SERVE_GENERATION_ENV_VAR } from "./cursor-relay-core.js";
 import { describeError } from "./describe-error.js";
+import { resolveAgentV2Hosting } from "./v2-hosting.js";
 /** Build a {@link ConversationMirror} over a {@link FileSink}. */
 export function createConversationMirror(options) {
     var _a;
@@ -139,7 +139,7 @@ export function createConversationMirror(options) {
                     if (bytes === null) {
                         continue;
                     }
-                    yield sink.put(agentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId), bytes);
+                    yield sink.put(agentSdkAgentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId), bytes);
                     // Content-addressed: once in the sink, never re-uploaded.
                     uploaded.add(blobId);
                 }
@@ -152,7 +152,7 @@ export function createConversationMirror(options) {
                     persistedAtMs: Date.now(),
                 };
                 // Manifest last: it only ever references blobs already uploaded.
-                yield sink.put(agentStoreKeys.conversationManifest(agentName, sdkAgentId), new TextEncoder().encode(JSON.stringify(manifest)));
+                yield sink.put(agentSdkAgentStoreKeys.conversationManifest(agentName, sdkAgentId), new TextEncoder().encode(JSON.stringify(manifest)));
             }));
         },
         hydrate(store, sdkAgentId) {
@@ -186,7 +186,7 @@ export function createConversationMirror(options) {
                 const bodies = yield mapBounded(manifest.blobIds, HYDRATE_DOWNLOAD_CONCURRENCY, (blobId) => __awaiter(this, void 0, void 0, function* () {
                     return ({
                         blobId,
-                        body: yield sink.get(agentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId)),
+                        body: yield sink.get(agentSdkAgentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId)),
                     });
                 }));
                 const missing = bodies.filter((entry) => entry.body === undefined);
@@ -236,7 +236,7 @@ const HYDRATE_DOWNLOAD_CONCURRENCY = 8;
  */
 function readManifest(sink, agentName, sdkAgentId) {
     return __awaiter(this, void 0, void 0, function* () {
-        const body = yield sink.get(agentStoreKeys.conversationManifest(agentName, sdkAgentId));
+        const body = yield sink.get(agentSdkAgentStoreKeys.conversationManifest(agentName, sdkAgentId));
         if (body === undefined) {
             return { outcome: "miss" };
         }
@@ -288,21 +288,20 @@ function listCheckpointBlobIds(store, sdkAgentId) {
  * operator owns the disk), and v1 keeps today's behavior while it runs.
  */
 export function selectConversationMirror(input) {
-    var _a;
-    if (input.project.agent.architecture !== "v2") {
-        return undefined;
-    }
-    const env = (_a = input.env) !== null && _a !== void 0 ? _a : process.env;
-    if (env[AGENT_SERVE_GENERATION_ENV_VAR] === undefined) {
+    const hosting = resolveAgentV2Hosting({
+        architecture: input.project.agent.architecture,
+        env: input.env,
+    });
+    if (hosting.kind !== "cursor-managed") {
         return undefined;
     }
-    const envSnapshot = env;
     return createConversationMirror({
         sink: cursorHostedFiles({
-            resolveStoreSourceId: () => cursorFrameworkStoreSourceId(envSnapshot),
-            // Full chain (env → key file → stored login): frozen engines listen
-            // unsigned and bind CURSOR_API_KEY_FILE at task time, after this sink
-            // is constructed.
+            resolveStoreSourceId: () => hosting.resolveStoreIds().frameworkStoreSourceId,
+            // Full chain (env → key file → stored login), resolved lazily: frozen
+            // engines listen unsigned and only gain a credential at task time,
+            // after this sink is constructed. Hosted deliveries have consumed the
+            // bind file into CURSOR_API_KEY by then, so this resolves from env.
             resolveApiKey: () => { var _a; return (_a = resolveApiKeySync()) === null || _a === void 0 ? void 0 : _a.apiKey; },
         }),
         agentName: input.project.name,

package/dist/internal/convert-automation/types.d.ts

@@ -1,6 +1,6 @@
 /**
  * Types for `convertWorkflow` — the pure automation → agentsdk project
- * converter behind `agent-serve convert-automation`.
+ * converter behind `agent-sdk convert-automation`.
  *
  * The workflow arrives as generic proto3 JSON (lowerCamelCase field names,
  * enum value names as strings) produced by the backend export endpoint

package/dist/internal/convert-automation/types.js

@@ -1,6 +1,6 @@
 /**
  * Types for `convertWorkflow` — the pure automation → agentsdk project
- * converter behind `agent-serve convert-automation`.
+ * converter behind `agent-sdk convert-automation`.
  *
  * The workflow arrives as generic proto3 JSON (lowerCamelCase field names,
  * enum value names as strings) produced by the backend export endpoint

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

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

@@ -28,6 +28,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextpro
 import { bearerAuth } from "../../channels.js";
 import { isCursorAccountTransport } from "../../types.js";
 import { probeConnectorAuthUrls } from "../cursor-account-mcp-auth.js";
+import { describeError } from "../describe-error.js";
 import { LOG_PREFIX } from "../distribution.js";
 import { handleStatelessMcpRequest } from "../mcp-endpoint.js";
 import { isLoopbackAddress } from "../net.js";
@@ -384,9 +385,6 @@ function buildCatalog(servers) {
 function trimTrailingSlash(url) {
     return url.endsWith("/") ? url.slice(0, -1) : url;
 }
-function describeError(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 const MAX_ERROR_DETAIL_CHARS = 72;
 function truncateDetail(detail) {
     const trimmed = detail.trim();

package/dist/internal/cursor/backend-client.d.ts

@@ -2,7 +2,8 @@
  * Minimal Connect-JSON client for the handful of `aiserver.v1.DashboardService`
  * RPCs agent-serve needs — `GetMe`, `ListSandMcpTools`, `ExecuteSandMcpTool`,
  * and the login-time key lifecycle (`CreateUserApiKey`, `ListUserApiKeys`,
- * `RevokeUserApiKey`).
+ * `RevokeUserApiKey`) — plus {@link CursorBackendClient.serviceRpc} for the
+ * odd unary call on another `aiserver.v1` service under the same token.
  *
  * Plain `fetch` POSTs with proto-JSON bodies and zod-validated responses:
  * agent-serve is a published package and should not pull the generated
@@ -88,9 +89,10 @@ export interface CursorBackendClientOptions {
     backendUrl: string;
     apiKey: string;
     /**
-     * Re-read the key on each authenticated call. Hosted freeze listens
-     * unsigned and the binder drops the key after restore; a constructor-frozen
-     * key would miss that bind.
+     * Re-resolve the key on each authenticated call. Hosted freeze listens
+     * unsigned and only gains a credential at task time (hosted deliveries
+     * consume the bind file into `CURSOR_API_KEY` before authored work); a
+     * constructor-frozen key would miss that bind.
      */
     getApiKey?: () => string;
     logger?: (line: string) => void;
@@ -148,6 +150,12 @@ export declare class CursorBackendClient {
     getGithubToken(repos: readonly string[], options?: {
         permissions?: "read" | "pr-write" | "contents-write";
     }): Promise<CursorGithubToken>;
+    /**
+     * One unary Connect-JSON call on `aiserver.v1.<service>` with the same
+     * token exchange and 401 retry as the dashboard RPCs. Callers parse the
+     * proto-JSON response themselves.
+     */
+    serviceRpc(service: string, method: string, body: unknown, timeoutMs?: number): Promise<unknown>;
     private rpc;
     /**
      * Serve a cached access token for the account, exchanging the API key
@@ -158,7 +166,7 @@ export declare class CursorBackendClient {
 }
 /**
  * Mint a named user API key from a short-lived login session token. Used
- * exactly once per `agent-serve login`; the session token is then discarded.
+ * exactly once per `agent-sdk login`; the session token is then discarded.
  */
 export declare function createUserApiKeyWithSessionToken(args: {
     backendUrl: string;

package/dist/internal/cursor/backend-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"backend-client.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/backend-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAezD,qBAAa,kBAAmB,SAAQ,KAAK;IAGzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;IAHhC,YACE,OAAO,EAAE,MAAM,EACN,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,YAAY,CAAC,EAAE,MAAM,YAAA,EAI/B;CACF;AAMD,QAAA,MAAM,mBAAmB,EAAE,CAAC,CAAC,SAAS,CACpC;IACE,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAClC,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CACtC,EACD,OAAO,CAQP,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAMjE,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAiCD,kEAAkE;AAClE,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAeD,+EAA+E;AAC/E,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAeD,MAAM,WAAW,cAAc;IAC7B,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB;AAgDD,yEAAyE;AACzE,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,KAAK,CACV;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAC9B;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CACrD,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAkED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,SAAS,CAAC,EAAE,MAAM,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAAqD;IAClE,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,YAAY,OAAO,EAAE,0BAA0B,EAO9C;IAED,OAAO,CAAC,aAAa;IAIrB,gCAAgC;IAC1B,KAAK,IAAI,OAAO,CAAC,cAAc,CAAC,CAErC;IAED;;;;OAIG;IACG,mBAAmB,CACvB,iBAAiB,EAAE,SAAS,MAAM,EAAE,GACnC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsB7B;IAED;;;;OAIG;IACG,qBAAqB,CAAC,IAAI,EAAE;QAChC,gBAAgB,EAAE,MAAM,CAAC;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAahC;IAED;;;;OAIG;IACG,sBAAsB,CAAC,OAAO,CAAC,EAAE;QACrC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAahC;IAED;;;;;OAKG;IACG,kBAAkB,CAAC,IAAI,EAAE;QAC7B,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,gBAAgB,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiBhC;IAED,4EAA4E;IACtE,cAAc,CAClB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAA;KAAE,GACjE,OAAO,CAAC,iBAAiB,CAAC,CAsC5B;YAEa,GAAG;IA+CjB;;;OAGG;IACH,OAAO,CAAC,cAAc;YA4BR,cAAc;CAoC7B;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAalB;AAqBD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAmChB"}
+{"version":3,"file":"backend-client.d.ts","sourceRoot":"","sources":["../../../src/internal/cursor/backend-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAiBzD,qBAAa,kBAAmB,SAAQ,KAAK;IAGzC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM;IACxB,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM;IAHhC,YACE,OAAO,EAAE,MAAM,EACN,MAAM,CAAC,EAAE,MAAM,YAAA,EACf,YAAY,CAAC,EAAE,MAAM,YAAA,EAI/B;CACF;AAMD,QAAA,MAAM,mBAAmB,EAAE,CAAC,CAAC,SAAS,CACpC;IACE,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,KAAK,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAClC,SAAS,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACnC,QAAQ,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;CACtC,EACD,OAAO,CAQP,CAAC;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAC;AAMjE,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB;AAiCD,kEAAkE;AAClE,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAeD,+EAA+E;AAC/E,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,YAAY,EAAE,OAAO,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAeD,MAAM,WAAW,cAAc;IAC7B,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,2EAA2E;IAC3E,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvC;;;;;OAKG;IACH,WAAW,CAAC,EAAE,kBAAkB,CAAC;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,gBAAgB,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,cAAc,EAAE,CAAC;CACzB;AAgDD,yEAAyE;AACzE,MAAM,WAAW,oBAAoB;IACnC,OAAO,EAAE,KAAK,CACV;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,GAC9B;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CACrD,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC7C;AAmED,MAAM,WAAW,0BAA0B;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,2CAA2C;IAC3C,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B;AAED,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,KAAK,CAAqD;IAClE,OAAO,CAAC,aAAa,CAA8B;IACnD,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,YAAY,OAAO,EAAE,0BAA0B,EAO9C;IAED,OAAO,CAAC,aAAa;IAIrB,gCAAgC;IAC1B,KAAK,IAAI,OAAO,CAAC,cAAc,CAAC,CAErC;IAED;;;;OAIG;IACG,mBAAmB,CACvB,iBAAiB,EAAE,SAAS,MAAM,EAAE,GACnC,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsB7B;IAED;;;;OAIG;IACG,qBAAqB,CAAC,IAAI,EAAE;QAChC,gBAAgB,EAAE,MAAM,CAAC;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/B,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAahC;IAED;;;;OAIG;IACG,sBAAsB,CAAC,OAAO,CAAC,EAAE;QACrC,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAahC;IAED;;;;;OAKG;IACG,kBAAkB,CAAC,IAAI,EAAE;QAC7B,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,gBAAgB,EAAE,MAAM,CAAC;QACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAiBhC;IAED,4EAA4E;IACtE,cAAc,CAClB,KAAK,EAAE,SAAS,MAAM,EAAE,EACxB,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,gBAAgB,CAAA;KAAE,GACjE,OAAO,CAAC,iBAAiB,CAAC,CAsC5B;IAED;;;;OAIG;IACH,UAAU,CACR,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,OAAO,EACb,SAAS,GAAE,MAAwB,GAClC,OAAO,CAAC,OAAO,CAAC,CAElB;YAEa,GAAG;IAkDjB;;;OAGG;IACH,OAAO,CAAC,cAAc;YA4BR,cAAc;CAoC7B;AAED;;;GAGG;AACH,wBAAsB,gCAAgC,CAAC,IAAI,EAAE;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,GAAG,OAAO,CAAC,MAAM,CAAC,CAclB;AAqBD;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IACjD,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,sEAAsE;IACtE,MAAM,EAAE,MAAM,CAAC;IACf,uEAAuE;IACvE,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,KAAK,CAAC;CAC1B,GAAG,OAAO,CAAC,IAAI,CAAC,CAqChB"}

package/dist/internal/cursor/backend-client.js

@@ -2,7 +2,8 @@
  * Minimal Connect-JSON client for the handful of `aiserver.v1.DashboardService`
  * RPCs agent-serve needs — `GetMe`, `ListSandMcpTools`, `ExecuteSandMcpTool`,
  * and the login-time key lifecycle (`CreateUserApiKey`, `ListUserApiKeys`,
- * `RevokeUserApiKey`).
+ * `RevokeUserApiKey`) — plus {@link CursorBackendClient.serviceRpc} for the
+ * odd unary call on another `aiserver.v1` service under the same token.
  *
  * Plain `fetch` POSTs with proto-JSON bodies and zod-validated responses:
  * agent-serve is a published package and should not pull the generated
@@ -23,10 +24,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { randomUUID } from "node:crypto";
 import { z } from "zod";
+import { describeError } from "../describe-error.js";
+import { CLI_COMMAND_NAME as CLI } from "../distribution.js";
 import { boundedToolAnnotations } from "../mcp-host.js";
 import { CURSOR_SESSION_EXCHANGE_PATH, CursorSessionExchangeError, exchangeCursorApiKeyForSession, SESSION_TOKEN_EXPIRY_LEEWAY_MS, } from "./session-token.js";
 const CLIENT_VERSION = "agent-serve-0.1.0";
-const SERVICE_PREFIX = "/aiserver.v1.DashboardService";
+const DASHBOARD_SERVICE = "DashboardService";
 const LIST_TIMEOUT_MS = 60000;
 /** Backend-executed tools call out to third-party servers; be generous. */
 const EXECUTE_TIMEOUT_MS = 120000;
@@ -144,11 +147,11 @@ const executeResponseSchema = z.object({
 // Shared request machinery (used by the client and the login-time mint)
 // ============================================================================
 /** One DashboardService Connect-JSON POST; auth is the caller's bearer. */
-function dashboardRpc(args) {
+function connectRpc(args) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
         try {
-            return yield args.fetchImpl(`${args.backendUrl}${SERVICE_PREFIX}/${args.method}`, {
+            return yield args.fetchImpl(`${args.backendUrl}/aiserver.v1.${args.service}/${args.method}`, {
                 method: "POST",
                 headers: Object.assign({ "content-type": "application/json", authorization: `Bearer ${args.bearer}`, "x-ghost-mode": "true", "x-cursor-client-version": CLIENT_VERSION, "x-cursor-client-type": "agent-serve", "x-request-id": randomUUID() }, args.extraHeaders),
                 body: JSON.stringify((_a = args.body) !== null && _a !== void 0 ? _a : {}),
@@ -313,16 +316,27 @@ export class CursorBackendClient {
             return githubTokenResponseSchema.parse(parsed);
         });
     }
+    /**
+     * One unary Connect-JSON call on `aiserver.v1.<service>` with the same
+     * token exchange and 401 retry as the dashboard RPCs. Callers parse the
+     * proto-JSON response themselves.
+     */
+    serviceRpc(service, method, body, timeoutMs = LIST_TIMEOUT_MS) {
+        return this.rpc(method, body, timeoutMs, { service });
+    }
     rpc(method_1, body_1) {
         return __awaiter(this, arguments, void 0, function* (method, body, timeoutMs = LIST_TIMEOUT_MS, options) {
             var _a, _b;
+            var _c;
+            const service = (_c = options === null || options === void 0 ? void 0 : options.service) !== null && _c !== void 0 ? _c : DASHBOARD_SERVICE;
             const extraHeaders = (options === null || options === void 0 ? void 0 : options.teamId) === undefined
                 ? undefined
                 : { "x-cursor-team-id": String(options.teamId) };
             const bearer = yield this.getAccessToken();
-            const first = yield dashboardRpc({
+            const first = yield connectRpc({
                 fetchImpl: this.fetchImpl,
                 backendUrl: this.backendUrl,
+                service,
                 method,
                 bearer,
                 body,
@@ -340,9 +354,10 @@ export class CursorBackendClient {
                 this.token = undefined;
             }
             const retryBearer = yield this.getAccessToken();
-            const second = yield dashboardRpc({
+            const second = yield connectRpc({
                 fetchImpl: this.fetchImpl,
                 backendUrl: this.backendUrl,
+                service,
                 method,
                 bearer: retryBearer,
                 body,
@@ -402,7 +417,7 @@ export class CursorBackendClient {
                         throw new CursorBackendError("Cursor API key exchange returned no access token.");
                     }
                     throw new CursorBackendError(error.status === 401
-                        ? "The Cursor API key was rejected. Run `agent-serve login` again or update CURSOR_API_KEY."
+                        ? `The Cursor API key was rejected. Run \`${CLI} login\` again or update CURSOR_API_KEY.`
                         : `Cursor API key exchange failed (${error.status}).`, error.status);
                 }
                 throw error;
@@ -416,16 +431,17 @@ export class CursorBackendClient {
 }
 /**
  * Mint a named user API key from a short-lived login session token. Used
- * exactly once per `agent-serve login`; the session token is then discarded.
+ * exactly once per `agent-sdk login`; the session token is then discarded.
  */
 export function createUserApiKeyWithSessionToken(args) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const response = yield dashboardRpc({
+        const response = yield connectRpc({
             fetchImpl: (_a = args.fetchImpl) !== null && _a !== void 0 ? _a : fetch,
             backendUrl: args.backendUrl.endsWith("/")
                 ? args.backendUrl.slice(0, -1)
                 : args.backendUrl,
+            service: DASHBOARD_SERVICE,
             method: "CreateUserApiKey",
             bearer: args.sessionToken,
             body: { name: args.keyName },
@@ -463,9 +479,10 @@ export function revokeMintedUserApiKey(args) {
         const backendUrl = args.backendUrl.endsWith("/")
             ? args.backendUrl.slice(0, -1)
             : args.backendUrl;
-        const listResponse = yield dashboardRpc({
+        const listResponse = yield connectRpc({
             fetchImpl,
             backendUrl,
+            service: DASHBOARD_SERVICE,
             method: "ListUserApiKeys",
             bearer: args.sessionToken,
             body: {},
@@ -479,9 +496,10 @@ export function revokeMintedUserApiKey(args) {
             // lagging replica — skip rather than touch any other key.
             return;
         }
-        const revokeResponse = yield dashboardRpc({
+        const revokeResponse = yield connectRpc({
             fetchImpl,
             backendUrl,
+            service: DASHBOARD_SERVICE,
             method: "RevokeUserApiKey",
             bearer: args.sessionToken,
             body: { id: match.id },
@@ -608,7 +626,7 @@ const MAX_GITHUB_TOKEN_RETRY_AFTER_MS = 60 * 60000;
 function describeGithubTokenHttpFailure(status, bodyText) {
     const detail = githubTokenErrorFromBody(bodyText);
     if (status === 401) {
-        return `The Cursor API key was rejected${detail === undefined ? "" : `: ${detail}`}. Run \`agent-serve login\` again or update CURSOR_API_KEY.`;
+        return `The Cursor API key was rejected${detail === undefined ? "" : `: ${detail}`}. Run \`${CLI} login\` again or update CURSOR_API_KEY.`;
     }
     if (detail !== undefined) {
         return detail;
@@ -638,9 +656,6 @@ function retryAfterMsFromResponse(response) {
     }
     return Math.min(retryAfter * 1000, MAX_GITHUB_TOKEN_RETRY_AFTER_MS);
 }
-function describeError(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 /** Release undici/fetch connection slots on responses we will not parse. */
 function drainResponseBody(response) {
     return __awaiter(this, void 0, void 0, function* () {