@cursor/july 0.1.101 → 0.1.103

package/src/internal/continuation-channel.ts

@@ -1,5 +1,7 @@
+import { getBitbucketChannelOptions } from "../channels/bitbucket/bitbucket-channel.js";
 import { getDeploymentsChannelOptions } from "../channels/deployments/deployments-channel.js";
 import { getGitHubChannelOptions } from "../channels/github/github-channel.js";
+import { getGitLabChannelOptions } from "../channels/gitlab/gitlab-channel.js";
 import { getOriginChannelOptions } from "../channels/origin/origin-channel.js";
 import { getSlackChannelOptions } from "../channels/slack/slack-channel.js";
 import type {
@@ -14,6 +16,7 @@ import {
   defaultContinuationSelector,
   handshakeContinuation,
   normalizeIdentity,
+  omittedV2MembershipDowngrade,
 } from "./continuation-identity.js";
 
 type ContinuationChannelOptions = {
@@ -21,10 +24,20 @@ type ContinuationChannelOptions = {
 };
 
 const CONTINUATION_CHANNEL_PACKS: ReadonlyArray<{
-  kind: "github" | "slack" | "origin" | "deployments";
+  kind: "github" | "slack" | "origin" | "gitlab" | "bitbucket" | "deployments";
   getOptions: (definition: object) => ContinuationChannelOptions | undefined;
   usesDeclaredEvents: boolean;
 }> = [
+  {
+    kind: "gitlab",
+    getOptions: getGitLabChannelOptions,
+    usesDeclaredEvents: true,
+  },
+  {
+    kind: "bitbucket",
+    getOptions: getBitbucketChannelOptions,
+    usesDeclaredEvents: true,
+  },
   {
     kind: "github",
     getOptions: getGitHubChannelOptions,
@@ -94,6 +107,72 @@ export function applyAgentContinuationDefaults(project: {
   }
 }
 
+/**
+ * Warn when an omitted `/v2` selector became type `none` because one
+ * declared event sits outside the kind membership. Call before
+ * {@link applyAgentContinuationDefaults} so the omitted field is still
+ * visible. An explicit `*.none/v2` pin stays silent.
+ */
+export function warnOmittedContinuationDowngrades(input: {
+  architecture?: AgentArchitecture;
+  channels: ReadonlyArray<{ id: string; definition: object }>;
+  warn: (id: string, message: string) => void;
+}): void {
+  if (input.architecture !== "v2") {
+    return;
+  }
+  for (const channel of input.channels) {
+    const events = channelDeclaredEventTypes(
+      (channel.definition as ChannelDefinition).meta
+    );
+    for (const pack of CONTINUATION_CHANNEL_PACKS) {
+      const options = pack.getOptions(channel.definition);
+      if (options === undefined) {
+        continue;
+      }
+      if (options.continuation !== undefined) {
+        break;
+      }
+      const downgrade = omittedV2MembershipDowngrade(
+        pack.kind,
+        pack.usesDeclaredEvents ? events : undefined
+      );
+      if (downgrade !== undefined) {
+        input.warn(
+          channel.id,
+          omittedContinuationDowngradeMessage(pack.kind, downgrade)
+        );
+      }
+      break;
+    }
+  }
+}
+
+function omittedContinuationDowngradeMessage(
+  kind: string,
+  downgrade: {
+    selector: ContinuationIdentity;
+    unexpected: readonly string[];
+  }
+): string {
+  const membership =
+    kind === "github"
+      ? "pr"
+      : kind === "origin"
+        ? "origin-pr"
+        : kind === "deployments"
+          ? "deployment"
+          : kind;
+  return (
+    `omitted continuation stamped ${downgrade.selector} because ` +
+    `${downgrade.unexpected.join(", ")} ${
+      downgrade.unexpected.length === 1 ? "is" : "are"
+    } not in the ${membership} membership; every delivery on this ` +
+    `channel starts a fresh session. Pin continuation: "${downgrade.selector}" ` +
+    `if that is intended, or drop the event.`
+  );
+}
+
 function stampOmittedChannelContinuation(
   definition: object,
   version: ContinuationProtocolVersion
@@ -124,6 +203,8 @@ export function channelDeclaredEventTypes(
   return (
     meta?.githubWebhookEvents ??
     meta?.originWebhookEvents ??
+    meta?.gitlabWebhookEvents ??
+    meta?.bitbucketWebhookEvents ??
     meta?.deploymentEventTypes
   );
 }

package/src/internal/continuation-identity.ts

@@ -22,8 +22,19 @@ export type ConversationType =
   | "issue"
   | "thread"
   | "origin-pr"
+  | "gitlab-mr"
+  | "bitbucket-pr"
   | "deployment";
 
+export type ContinuationKind =
+  | "github"
+  | "slack"
+  | "origin"
+  | "gitlab"
+  | "bitbucket"
+  | "deployments"
+  | "http";
+
 export const CONTINUATION_SELECTORS = [
   "github.pr/v1",
   "github.pr/v2",
@@ -36,6 +47,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",
@@ -52,7 +67,7 @@ export type ParsedContinuation = {
   selector: ContinuationSelector;
   version: 1 | 2;
   type: ConversationType | "none";
-  kind: "github" | "slack" | "origin" | "deployments" | "http";
+  kind: ContinuationKind;
 };
 
 export type ContinuationClaim = {
@@ -70,7 +85,7 @@ export type MailboxContinuation = {
 
 export type ContinuationBuiltin = {
   type: ConversationType;
-  kind: "github" | "slack" | "origin" | "deployments";
+  kind: Exclude<ContinuationKind, "http">;
   events: readonly string[];
   format: string;
 };
@@ -104,6 +119,9 @@ export const BUILTINS: readonly ContinuationBuiltin[] = [
   {
     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",
@@ -113,9 +131,34 @@ export const BUILTINS: readonly ContinuationBuiltin[] = [
       "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",
@@ -147,6 +190,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": {
@@ -158,9 +205,7 @@ const SELECTOR_FIELDS: {
   "none/v2": { version: 2, type: "none", kind: "http" },
 };
 
-export function isContinuationSelector(
-  value: string
-): value is ContinuationSelector {
+function isContinuationSelector(value: string): value is ContinuationSelector {
   return Object.hasOwn(SELECTOR_FIELDS, value);
 }
 
@@ -190,6 +235,20 @@ export function defaultContinuationSelector(
       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:
@@ -197,6 +256,20 @@ export function defaultContinuationSelector(
   }
 }
 
+/** Typed selector when every declared event is in the type's membership. */
+function membershipOrNone(
+  eventTypes: readonly string[] | undefined,
+  type: ConversationType,
+  typed: ContinuationSelector,
+  none: ContinuationSelector
+): ContinuationSelector {
+  const allowed = new Set(builtinForType(type)?.events ?? []);
+  if ((eventTypes ?? []).some((event) => !allowed.has(event))) {
+    return none;
+  }
+  return typed;
+}
+
 function githubV2Default(eventTypes?: readonly string[]): ContinuationSelector {
   const events = eventTypes ?? [];
   const issueEvents = new Set(builtinForType("issue")?.events ?? []);
@@ -219,6 +292,45 @@ function originV2Default(eventTypes?: readonly string[]): ContinuationSelector {
   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: string,
+  eventTypes?: readonly string[]
+):
+  | { selector: ContinuationSelector; unexpected: readonly string[] }
+  | undefined {
+  const events = 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?: readonly string[]
 ): ContinuationSelector {
@@ -239,7 +351,7 @@ export function parseContinuationSelector(
   return { selector, ...SELECTOR_FIELDS[selector] };
 }
 
-export function resolveContinuation(
+function resolveContinuation(
   raw?: ContinuationIdentity,
   kind?: string
 ): ParsedContinuation {
@@ -273,17 +385,17 @@ export function isV2DurableContinuationKey(key: string): boolean {
   return key.startsWith("cont:") || key.startsWith("evt:");
 }
 
-export function newEvtKey(): string {
+function newEvtKey(): string {
   return `evt:${randomBytes(16).toString("hex")}`;
 }
 
-export function builtinForType(
+function builtinForType(
   type: ConversationType
 ): ContinuationBuiltin | undefined {
   return BUILTINS.find((builtin) => builtin.type === type);
 }
 
-export function formatConversationKey(
+function formatConversationKey(
   type: ConversationType,
   fields: {
     fullName?: string;
@@ -300,6 +412,10 @@ export function formatConversationKey(
       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":
@@ -327,7 +443,9 @@ export function mintClaim(claim: ContinuationClaim): string {
     }
     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
@@ -341,8 +459,15 @@ export function mintClaim(claim: ContinuationClaim): string {
           `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,
       })}`;
     }
@@ -421,6 +546,10 @@ export function extractContinuation(
       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);
   }
@@ -629,6 +758,95 @@ function originExtractRecord(
   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: string,
+  payload: unknown
+): string | undefined {
+  const record = asRecord(payload);
+  if (record === undefined) {
+    return undefined;
+  }
+  const fullName = nonEmpty(
+    asRecord(record.project)?.path_with_namespace
+  )?.toLowerCase();
+  if (fullName === undefined) {
+    return undefined;
+  }
+  let number: number | undefined;
+  switch (eventName) {
+    case "merge_request":
+      number = positiveInt(asRecord(record.object_attributes)?.iid);
+      break;
+    case "note":
+      if (
+        asRecord(record.object_attributes)?.noteable_type !== "MergeRequest"
+      ) {
+        return undefined;
+      }
+      number = positiveInt(asRecord(record.merge_request)?.iid);
+      break;
+    case "pipeline":
+      number = positiveInt(asRecord(record.merge_request)?.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: unknown): string | undefined {
+  const record = asRecord(payload);
+  if (record === undefined) {
+    return undefined;
+  }
+  const pullRequest =
+    asRecord(record.pullrequest) ?? asRecord(record.pullRequest);
+  const number = positiveInt(pullRequest?.id);
+  const fullName = bitbucketFullName(
+    asRecord(record.repository) ??
+      asRecord(asRecord(pullRequest?.toRef)?.repository)
+  );
+  if (number === undefined || fullName === undefined) {
+    return undefined;
+  }
+  return `cont:${formatConversationKey("bitbucket-pr", { fullName, number })}`;
+}
+
+function bitbucketFullName(
+  repository: Record<string, unknown> | undefined
+): string | undefined {
+  if (repository === undefined) {
+    return undefined;
+  }
+  const cloud = nonEmpty(repository.full_name);
+  if (cloud !== undefined) {
+    return cloud.toLowerCase();
+  }
+  const projectKey = nonEmpty(asRecord(repository.project)?.key);
+  const slug = nonEmpty(repository.slug);
+  if (projectKey === undefined || slug === undefined) {
+    return undefined;
+  }
+  return `${projectKey}/${slug}`.toLowerCase();
+}
+
 function extractDeployment(payload: unknown): string | undefined {
   const record = asRecord(payload);
   const deploymentId = nonEmpty(record?.deploymentId);

package/src/internal/conversation-mirror.ts

@@ -37,16 +37,13 @@
  */
 
 import type { LocalAgentDocument, LocalAgentStore } from "@cursor/sdk";
-import { agentStoreKeys, type FileSink } from "../files.js";
-import {
-  cursorFrameworkStoreSourceId,
-  cursorHostedFiles,
-} from "../files-backends/cursor-hosted.js";
+import { agentSdkAgentStoreKeys, type FileSink } from "../files.js";
+import { cursorHostedFiles } from "../files-backends/cursor-hosted.js";
 import type { AgentProject } from "../types.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";
 
 /**
  * Persist/restore one SDK conversation between a {@link LocalAgentStore} and
@@ -70,7 +67,7 @@ export interface ConversationMirror {
   persist(store: LocalAgentStore, sdkAgentId: string): Promise<void>;
 }
 
-/** Wire shape at {@link agentStoreKeys.conversationManifest}. */
+/** Wire shape at {@link agentSdkAgentStoreKeys.conversationManifest}. */
 interface ConversationManifestV1 {
   v: 1;
   /** The SDK agent document, verbatim apart from `activeRunId` (nulled). */
@@ -181,7 +178,11 @@ export function createConversationMirror(
             continue;
           }
           await sink.put(
-            agentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId),
+            agentSdkAgentStoreKeys.conversationBlob(
+              agentName,
+              sdkAgentId,
+              blobId
+            ),
             bytes
           );
           // Content-addressed: once in the sink, never re-uploaded.
@@ -197,7 +198,7 @@ export function createConversationMirror(
         };
         // Manifest last: it only ever references blobs already uploaded.
         await sink.put(
-          agentStoreKeys.conversationManifest(agentName, sdkAgentId),
+          agentSdkAgentStoreKeys.conversationManifest(agentName, sdkAgentId),
           new TextEncoder().encode(JSON.stringify(manifest))
         );
       });
@@ -242,7 +243,11 @@ export function createConversationMirror(
           async (blobId) => ({
             blobId,
             body: await sink.get(
-              agentStoreKeys.conversationBlob(agentName, sdkAgentId, blobId)
+              agentSdkAgentStoreKeys.conversationBlob(
+                agentName,
+                sdkAgentId,
+                blobId
+              )
             ),
           })
         );
@@ -317,7 +322,7 @@ async function readManifest(
   sdkAgentId: string
 ): Promise<ManifestRead> {
   const body = await sink.get(
-    agentStoreKeys.conversationManifest(agentName, sdkAgentId)
+    agentSdkAgentStoreKeys.conversationManifest(agentName, sdkAgentId)
   );
   if (body === undefined) {
     return { outcome: "miss" };
@@ -379,20 +384,21 @@ export function selectConversationMirror(input: {
   logger?: (line: string) => void;
   env?: Record<string, string | undefined>;
 }): ConversationMirror | undefined {
-  if (input.project.agent.architecture !== "v2") {
-    return undefined;
-  }
-  const env = input.env ?? process.env;
-  if (env[AGENT_SERVE_GENERATION_ENV_VAR] === undefined) {
+  const hosting = resolveAgentV2Hosting({
+    architecture: input.project.agent.architecture,
+    env: input.env as NodeJS.ProcessEnv | undefined,
+  });
+  if (hosting.kind !== "cursor-managed") {
     return undefined;
   }
-  const envSnapshot = env as NodeJS.ProcessEnv;
   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: () => resolveApiKeySync()?.apiKey,
     }),
     agentName: input.project.name,

package/src/internal/convert-automation/types.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/src/internal/cursor/account-mcp.ts

@@ -28,6 +28,7 @@ import type {
 } from "../../types.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";
@@ -560,10 +561,6 @@ function trimTrailingSlash(url: string): string {
   return url.endsWith("/") ? url.slice(0, -1) : url;
 }
 
-function describeError(error: unknown): string {
-  return error instanceof Error ? error.message : String(error);
-}
-
 export interface CursorAccountMcpWarningServer {
   serverIdentifier: string;
   status: string;