@cursor/july 0.1.99 → 0.1.101

package/src/internal/cursor-deployment-relay.ts

@@ -33,17 +33,33 @@ interface SubscriptionStatus {
   detail?: string;
 }
 
+export type DeploymentSubscriptionSource =
+  | readonly ResolvedSubscription[]
+  | (() => readonly ResolvedSubscription[]);
+
 export interface DeploymentEventRelayOptions {
   baseUrl: string;
   apiKey: string;
   stateDir: string;
-  subscriptions: readonly ResolvedSubscription[];
+  /**
+   * Snapshot or a getter. A getter is re-read on every registration
+   * heartbeat so a channel that refreshes `deploySourceUris` after start
+   * can add sources without restarting the relay.
+   */
+  subscriptions: DeploymentSubscriptionSource;
   dispatch: (event: DeploymentEvent) => Promise<void>;
   logger: (line: string) => void;
   fetchImpl?: typeof fetch;
   pollWaitMs?: number;
 }
 
+/** Current subscriptions: a live getter, otherwise the snapshot. */
+export function currentDeploymentSubscriptions(
+  subscriptions: DeploymentSubscriptionSource
+): readonly ResolvedSubscription[] {
+  return typeof subscriptions === "function" ? subscriptions() : subscriptions;
+}
+
 /** Normalize the channel's `deploySourceUris` option into concrete subscriptions. */
 export function resolveDeploymentSubscriptions(options: {
   deploySourceUris: readonly (string | DeploymentSubscription)[];
@@ -90,10 +106,46 @@ export function resolveDeploymentSubscriptions(options: {
         ? []
         : [...new Set([...existing.environments, ...environments])];
   }
-  // Empty is legal here and means "this channel wants nothing", which is how
-  // an env-configured channel stays inert without a deploy-source list. The
-  // wire-level empty list means deregister, so the host simply never
-  // registers it.
+  // Empty is legal here and means "this channel wants nothing". The
+  // wire-level empty list means deregister. The host re-resolves on each
+  // heartbeat, so a channel that later fills `deploySourceUris` can
+  // register without a restart.
+  return [...bySource.values()];
+}
+
+/**
+ * Union per-channel subscriptions, widening events and environments when
+ * the same deploy source appears more than once. An empty environment
+ * list means every environment and absorbs a narrower list.
+ */
+export function mergeResolvedSubscriptions(
+  groups: readonly (readonly ResolvedSubscription[])[]
+): ResolvedSubscription[] {
+  const bySource = new Map<string, ResolvedSubscription>();
+  for (const group of groups) {
+    for (const subscription of group) {
+      const existing = bySource.get(subscription.deploySourceUri);
+      if (existing === undefined) {
+        bySource.set(subscription.deploySourceUri, {
+          deploySourceUri: subscription.deploySourceUri,
+          environments: [...subscription.environments],
+          events: new Set(subscription.events),
+        });
+        continue;
+      }
+      for (const event of subscription.events) existing.events.add(event);
+      existing.environments =
+        existing.environments.length === 0 ||
+        subscription.environments.length === 0
+          ? []
+          : [
+              ...new Set([
+                ...existing.environments,
+                ...subscription.environments,
+              ]),
+            ];
+    }
+  }
   return [...bySource.values()];
 }
 
@@ -176,7 +228,9 @@ export class DeploymentEventRelay {
       pollPath: "/v0/deployment-events",
       buildRegistrationBody: (consumerId) => ({
         consumerId,
-        subscriptions: options.subscriptions.map((subscription) => ({
+        subscriptions: currentDeploymentSubscriptions(
+          options.subscriptions
+        ).map((subscription) => ({
           deploySourceUri: subscription.deploySourceUri,
           environments: subscription.environments,
           events: [...subscription.events],
@@ -190,12 +244,15 @@ export class DeploymentEventRelay {
       }),
       applyRegistrationResponse: (json) => {
         const result = json as { deploySourceUris?: SubscriptionStatus[] };
+        const wantedSubscriptions = currentDeploymentSubscriptions(
+          options.subscriptions
+        );
         this.subscribed = new Map();
         this.loggedSkippedSources.clear();
         const lines: string[] = [];
         const confirmed: string[] = [];
         for (const status of result.deploySourceUris ?? []) {
-          const wanted = options.subscriptions.find(
+          const wanted = wantedSubscriptions.find(
             (subscription) =>
               subscription.deploySourceUri === status.deploySourceUri
           );
@@ -210,7 +267,7 @@ export class DeploymentEventRelay {
         }
         if (confirmed.length > 0) {
           const kinds = [
-            ...new Set(options.subscriptions.flatMap((s) => [...s.events])),
+            ...new Set(wantedSubscriptions.flatMap((s) => [...s.events])),
           ];
           lines.push(
             `subscribed to ${confirmed.join(", ")} for events: ${kinds.join(", ")}`

package/src/internal/deploy-client.ts

@@ -1,7 +1,7 @@
 /**
  * Thin client for the Agent Serve deployment management API
  * (`/internal/agent-serve/deployments` on the Cursor backend) and the v2
- * AgentSDK accept path (`/internal/agentkit/deployments`). Pure
+ * AgentSDK accept path (`/internal/agentsdk/deployments`). Pure
  * request/response + error mapping — no console I/O, no polling loops;
  * rendering lives in `cli-deploy.ts`.
  *
@@ -214,7 +214,7 @@ export interface StopAccepted {
 export type DeleteAccepted = StopAccepted;
 
 /**
- * `POST /internal/agentkit/deployments` 202 body. Distinct from v1
+ * `POST /internal/agentsdk/deployments` 202 body. Distinct from v1
  * {@link DeployAccepted}: the v2 control plane returns catalog ids, not
  * an engine alias or one-shot alias token.
  */
@@ -234,7 +234,7 @@ export interface AgentkitDeployComponent {
   agentPath?: string;
 }
 
-/** Customer-visible v2 deploy status (`GET /internal/agentkit/deployments/:slug`). */
+/** Customer-visible v2 deploy status (`GET /internal/agentsdk/deployments/:slug`). */
 export type AgentkitCustomerStatus =
   | "pending"
   | "deploying"
@@ -267,13 +267,15 @@ export interface AgentkitDeployStatus {
    * Absent on control planes that predate the field.
    */
   repositories?: string[];
+  /** Names of application-scoped secrets (values are never returned). */
+  secretNames?: string[];
 }
 
 export const TERMINAL_AGENTKIT_DEPLOY_STATUSES: ReadonlySet<AgentkitCustomerStatus> =
   new Set(["running", "failed", "stopped"]);
 
 /**
- * `POST /internal/agentkit/deployments/:slug/stop` 202 body. Like v1
+ * `POST /internal/agentsdk/deployments/:slug/stop` 202 body. Like v1
  * {@link StopAccepted} but keyed by catalog ids instead of the numeric
  * deployment row id.
  */
@@ -359,6 +361,7 @@ const agentkitDeployStatusSchema = z
     statusMessage: z.string().nullable(),
     // Optional: backends that predate the v2 bake-failure column omit it.
     lastError: z.string().nullable().optional(),
+    secretNames: z.array(z.string()).optional(),
   })
   .passthrough();
 
@@ -594,7 +597,7 @@ export class AgentServeDeployClient {
 
   /**
    * Create or redeploy onto the v2 control plane
-   * (`POST /internal/agentkit/deployments`). 202 means accepted; poll
+   * (`POST /internal/agentsdk/deployments`). 202 means accepted; poll
    * {@link getAgentkitDeploy} until a terminal status. `components` deploys
    * one application with several release components (one per agent
    * directory); it is mutually exclusive with `agentPath`.
@@ -625,7 +628,7 @@ export class AgentServeDeployClient {
     }
     const raw = await this.request({
       method: "POST",
-      path: "/internal/agentkit/deployments",
+      path: "/internal/agentsdk/deployments",
       body: {
         teamId: args.teamId,
         slug: args.slug,
@@ -650,14 +653,14 @@ export class AgentServeDeployClient {
   }): Promise<AgentkitDeployStatus> {
     const raw = await this.request({
       method: "GET",
-      path: `/internal/agentkit/deployments/${encodeURIComponent(args.slug)}?teamId=${args.teamId}`,
+      path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}?teamId=${args.teamId}`,
       context: { verb: "get deployment", slug: args.slug },
     });
     return agentkitDeployStatusSchema.parse(raw);
   }
 
   /**
-   * Stop a v2 deployment (`POST /internal/agentkit/deployments/:slug/stop`).
+   * Stop a v2 deployment (`POST /internal/agentsdk/deployments/:slug/stop`).
    * 202 means accepted; poll {@link getAgentkitDeploy} until `stopped`.
    */
   async stopAgentkit(args: {
@@ -666,7 +669,7 @@ export class AgentServeDeployClient {
   }): Promise<AgentkitStopAccepted> {
     const raw = await this.request({
       method: "POST",
-      path: `/internal/agentkit/deployments/${encodeURIComponent(args.slug)}/stop?teamId=${args.teamId}`,
+      path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/stop?teamId=${args.teamId}`,
       context: { verb: "stop", slug: args.slug },
     });
     return agentkitStopAcceptedSchema.parse(raw);
@@ -740,24 +743,7 @@ export class AgentServeDeployClient {
     slug: string;
     secrets: Array<{ name: string; value: string }>;
   }): Promise<string[]> {
-    for (const { name, value } of args.secrets) {
-      const nameError = validateSettableSecretName(name);
-      if (nameError !== undefined) {
-        throw new DeployApiError(nameError, 400);
-      }
-      if (Buffer.byteLength(value, "utf8") > MAX_SECRET_VALUE_BYTES) {
-        throw new DeployApiError(
-          `The value for ${name} is too large (max ${MAX_SECRET_VALUE_BYTES} bytes).`,
-          400
-        );
-      }
-    }
-    if (args.secrets.length > MAX_SECRETS) {
-      throw new DeployApiError(
-        `Too many secrets in one request (${args.secrets.length}); deployments hold at most ${MAX_SECRETS}.`,
-        400
-      );
-    }
+    this.validateSecrets(args.secrets);
     const raw = await this.request({
       method: "PUT",
       path: `/internal/agent-serve/deployments/${encodeURIComponent(args.slug)}/secrets`,
@@ -767,6 +753,22 @@ export class AgentServeDeployClient {
     return setSecretsResponseSchema.parse(raw).secretNames;
   }
 
+  /** Upsert application-scoped secrets on an AgentSDK v2 deployment. */
+  async setAgentkitSecrets(args: {
+    teamId: number;
+    slug: string;
+    secrets: Array<{ name: string; value: string }>;
+  }): Promise<string[]> {
+    this.validateSecrets(args.secrets);
+    const raw = await this.request({
+      method: "PUT",
+      path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/secrets`,
+      body: { teamId: args.teamId, secrets: args.secrets },
+      context: { verb: "set secrets", slug: args.slug },
+    });
+    return setSecretsResponseSchema.parse(raw).secretNames;
+  }
+
   /** Secret names + creation times; values are never returned. */
   async listSecrets(args: {
     teamId: number;
@@ -780,6 +782,19 @@ export class AgentServeDeployClient {
     return listSecretsResponseSchema.parse(raw).secrets;
   }
 
+  /** Secret names + creation times for an AgentSDK v2 application. */
+  async listAgentkitSecrets(args: {
+    teamId: number;
+    slug: string;
+  }): Promise<SecretInfo[]> {
+    const raw = await this.request({
+      method: "GET",
+      path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/secrets?teamId=${args.teamId}`,
+      context: { verb: "list secrets", slug: args.slug },
+    });
+    return listSecretsResponseSchema.parse(raw).secrets;
+  }
+
   /** Remove one secret by name; 404 when it is not set. */
   async deleteSecret(args: {
     teamId: number;
@@ -797,6 +812,46 @@ export class AgentServeDeployClient {
     });
   }
 
+  /** Remove one application-scoped secret from an AgentSDK v2 deployment. */
+  async deleteAgentkitSecret(args: {
+    teamId: number;
+    slug: string;
+    name: string;
+  }): Promise<void> {
+    const nameError = validateSettableSecretName(args.name);
+    if (nameError !== undefined) {
+      throw new DeployApiError(nameError, 400);
+    }
+    await this.request({
+      method: "DELETE",
+      path: `/internal/agentsdk/deployments/${encodeURIComponent(args.slug)}/secrets/${encodeURIComponent(args.name)}?teamId=${args.teamId}`,
+      context: { verb: "unset secret", slug: args.slug },
+    });
+  }
+
+  private validateSecrets(
+    secrets: Array<{ name: string; value: string }>
+  ): void {
+    for (const { name, value } of secrets) {
+      const nameError = validateSettableSecretName(name);
+      if (nameError !== undefined) {
+        throw new DeployApiError(nameError, 400);
+      }
+      if (Buffer.byteLength(value, "utf8") > MAX_SECRET_VALUE_BYTES) {
+        throw new DeployApiError(
+          `The value for ${name} is too large (max ${MAX_SECRET_VALUE_BYTES} bytes).`,
+          400
+        );
+      }
+    }
+    if (secrets.length > MAX_SECRETS) {
+      throw new DeployApiError(
+        `Too many secrets in one request (${secrets.length}); deployments hold at most ${MAX_SECRETS}.`,
+        400
+      );
+    }
+  }
+
   /**
    * Rotate the deployment's pod credential. Returns the masked new key —
    * the raw key is injected into the pod on the next deploy, never
@@ -977,7 +1032,7 @@ function mapErrorResponse(
       // (api2 vs api.cursor.com), not a missing deployment / closed gate.
       if (/Route \S+ not found/i.test(bodyText)) {
         return new DeployApiError(
-          `Agent Serve deploy API not found on this host — use the default api.cursor.com (unset CURSOR_API_BASE_URL), or point CURSOR_API_BASE_URL at a backend that mounts /internal/agent-serve/* and /internal/agentkit/*.`,
+          `Agent Serve deploy API not found on this host — use the default api.cursor.com (unset CURSOR_API_BASE_URL), or point CURSOR_API_BASE_URL at a backend that mounts /internal/agent-serve/* and /internal/agentsdk/*.`,
           404
         );
       }