@cursor/july 0.1.102 → 0.1.104

package/src/internal/server.ts

@@ -14,6 +14,14 @@ import {
 } from "node:http";
 import type { AddressInfo } from "node:net";
 import { join } from "node:path";
+import {
+  type BitbucketProxyTransport,
+  CURSOR_BITBUCKET_REPOS_HEADER,
+} from "../channels/bitbucket/api.js";
+import {
+  getBitbucketCursorAccountRuntime,
+  resolveCursorBitbucketProxyUrl,
+} from "../channels/bitbucket/cursor-account.js";
 import {
   dispatchDeploymentEvent,
   getDeploymentsChannelOptions,
@@ -32,6 +40,14 @@ import {
   resolveCursorGithubProxyUrl,
 } from "../channels/github/cursor-account.js";
 import { findGitHubChannelTargets } from "../channels/github/forward.js";
+import {
+  CURSOR_GITLAB_PROJECTS_HEADER,
+  type GitLabProxyTransport,
+} from "../channels/gitlab/api.js";
+import {
+  getGitLabCursorAccountRuntime,
+  resolveCursorGitLabProxyUrl,
+} from "../channels/gitlab/cursor-account.js";
 import {
   getOriginCursorAccountRuntime,
   type OriginCursorAccountRuntime,
@@ -50,8 +66,6 @@ import type {
   ReminderInfo,
   ServeOptions,
 } from "../types.js";
-import { InvalidAsOfError, VacuousTimeArgsError } from "./as-of.js";
-import { V2EngineError } from "./continuation-identity.js";
 import { selectConversationMirror } from "./conversation-mirror.js";
 import {
   type CursorAccountConnectionRef,
@@ -104,6 +118,10 @@ import {
   EvalRunStore,
   EvalRunUnknownError,
 } from "./eval-run-store.js";
+import {
+  GUEST_NETWORK_PATH,
+  guestNetworkReadinessResponse,
+} from "./guest-network.js";
 import {
   collectGitHubTriggerTargets,
   collectOriginTriggerTargets,
@@ -143,7 +161,11 @@ import { isLoopbackAddress } from "./net.js";
 import { createOtelCollector, type OtelCollector } from "./otel/collector.js";
 import { pickAuthoredOtel, resolveOtelConfig } from "./otel/config.js";
 import { instrumentHttp } from "./otel/http.js";
-import { createOtelRuntime, shutdownOtelRuntime } from "./otel/runtime.js";
+import {
+  createOtelRuntime,
+  forceFlushOtelRuntime,
+  shutdownOtelRuntime,
+} from "./otel/runtime.js";
 import { collectPeerConnections } from "./peer-connections.js";
 import {
   PLATFORM_SCHEDULE_CATALOG_FILENAME,
@@ -171,6 +193,7 @@ import {
   ReminderValidationError,
   UnknownReminderError,
 } from "./reminder-runner.js";
+import { mapThrownRequestError } from "./request-error-status.js";
 import {
   assertAccountConnectionsNotAnonymous,
   resolveMountConnections,
@@ -182,8 +205,6 @@ import { ScheduleRunner, UnknownScheduleError } from "./schedule-runner.js";
 import { type AgentRunner, CursorSdkRunner } from "./sdk-runner.js";
 import {
   InvalidContinuationTokenError,
-  SessionAuthError,
-  SessionBusyError,
   SessionEngine,
   ToolInputError,
   ToolNotDirectlyCallableError,
@@ -296,9 +317,14 @@ export async function startServer(
   const playground = options.playground ?? true;
   const hosted = options as {
     noControlPlane?: boolean;
+    /** `--cursor-scm-proxy`: every cursorAccount SCM pack routes via the backend forwarder. */
+    cursorScmProxy?: boolean;
+    /** Deprecated alias (`--cursor-github-proxy`); same effect as cursorScmProxy. */
     cursorGithubProxy?: boolean;
   };
   const noControlPlane = hosted.noControlPlane === true;
+  const scmProxyRequested =
+    hosted.cursorScmProxy === true || hosted.cursorGithubProxy === true;
   const runSchedules = options.schedules ?? !dev;
   const runReminders = options.reminders ?? !dev;
 
@@ -314,22 +340,14 @@ export async function startServer(
       otel: m.project.otel,
     }))
   );
-  const otelRuntime = createOtelRuntime(
+  const resolveOtelExport = () =>
     resolveOtelConfig({
       authored: authoredOtel,
       serve: options.otel,
-    }),
-    logger
-  );
-  if (
-    otelRuntime === undefined &&
-    options.otel !== false &&
-    authoredOtel !== undefined
-  ) {
-    logger(
-      "[agent-sdk] otel: agent/otel.ts present but no OTLP exporters configured (set exporters or OTEL_EXPORTER_OTLP_ENDPOINT)"
-    );
-  }
+    });
+  const otelRuntime = createOtelRuntime(resolveOtelExport(), logger, {
+    resolveExport: resolveOtelExport,
+  });
 
   const cursorGithubTargets = collectCursorGithubTargets(mounts);
   const cursorOriginTargets = collectCursorOriginTargets(mounts);
@@ -350,7 +368,7 @@ export async function startServer(
   // One resolution for every Cursor credential consumer (SDK runner, account
   // MCP bridge, SCM event relay, GitHub credentials): explicit option →
   // CURSOR_API_KEY → CURSOR_API_KEY_FILE (or the hosted default path) →
-  // stored `agent-serve login`. SDK / GitHub / account MCP re-read later;
+  // stored `agent-sdk login`. SDK / GitHub / account MCP re-read later;
   // Slack and deployment-event relays capture the key at start.
   const accountKey = await resolveApiKey(
     options.apiKey === undefined ? {} : { apiKey: options.apiKey }
@@ -390,7 +408,7 @@ export async function startServer(
   // through github-proxy exactly like channel Octokit calls.
   let hostGithubProxyResolver: CursorAccountGithubTokenResolver | undefined;
   if (cursorGithubTargets.length > 0) {
-    const githubProxyRequested = hosted.cursorGithubProxy === true;
+    const githubProxyRequested = scmProxyRequested;
     const needsGithubAuth =
       cursorGithubConfig.scope !== undefined || githubProxyRequested;
     if (needsGithubAuth) {
@@ -509,6 +527,91 @@ export async function startServer(
       }
     }
   }
+  // GitLab `cursorAccount` channels: `ctx.gitlab` routes through the SCM
+  // proxy in proxy mode. Without `--cursor-scm-proxy` the runtime stays
+  // unbound and the handle falls back to direct `GITLAB_TOKEN` access.
+  if (scmProxyRequested) {
+    const gitlabProxyUrl = resolveCursorGitLabProxyUrl(cursorExternalApiUrl());
+    let gitlabTargets = 0;
+    for (const mount of mounts) {
+      for (const channel of mount.project.channels) {
+        const runtime = getGitLabCursorAccountRuntime(channel.definition);
+        if (runtime === undefined) {
+          continue;
+        }
+        gitlabTargets += 1;
+        const transport: Omit<GitLabProxyTransport, "getApiKey"> = {
+          apiBaseUrl: gitlabProxyUrl,
+          ...(runtime.scope === undefined
+            ? {}
+            : {
+                headers: {
+                  [CURSOR_GITLAB_PROJECTS_HEADER]:
+                    runtime.scope.projects.join(","),
+                },
+              }),
+        };
+        runtime.credentials.bind(async () => {
+          const apiKey = liveCursorApiKey();
+          if (apiKey === undefined) {
+            throw new Error(
+              `gitlabChannel({ cursorAccount }) has no Cursor credential yet. ${SIGN_IN_HINT}`
+            );
+          }
+          return apiKey;
+        });
+        runtime.credentials.bindProxyTransport(transport);
+      }
+    }
+    if (gitlabTargets > 0) {
+      logger(
+        `[agent-sdk] GitLab auth: channel API calls route through ${gitlabProxyUrl}`
+      );
+    }
+    // Bitbucket `cursorAccount` channels: same shape, `/v0/bitbucket-proxy`
+    // with `x-cursor-bitbucket-repos` scope. The proxy picks Cloud 2.0 or
+    // the DC host's 1.0 upstream per tenant; the pack picks the dialect
+    // from the delivery payload.
+    const bitbucketProxyUrl = resolveCursorBitbucketProxyUrl(
+      cursorExternalApiUrl()
+    );
+    let bitbucketTargets = 0;
+    for (const mount of mounts) {
+      for (const channel of mount.project.channels) {
+        const runtime = getBitbucketCursorAccountRuntime(channel.definition);
+        if (runtime === undefined) {
+          continue;
+        }
+        bitbucketTargets += 1;
+        const transport: Omit<BitbucketProxyTransport, "getApiKey"> = {
+          apiBaseUrl: bitbucketProxyUrl,
+          ...(runtime.scope === undefined
+            ? {}
+            : {
+                headers: {
+                  [CURSOR_BITBUCKET_REPOS_HEADER]:
+                    runtime.scope.repos.join(","),
+                },
+              }),
+        };
+        runtime.credentials.bind(async () => {
+          const apiKey = liveCursorApiKey();
+          if (apiKey === undefined) {
+            throw new Error(
+              `bitbucketChannel({ cursorAccount }) has no Cursor credential yet. ${SIGN_IN_HINT}`
+            );
+          }
+          return apiKey;
+        });
+        runtime.credentials.bindProxyTransport(transport);
+      }
+    }
+    if (bitbucketTargets > 0) {
+      logger(
+        `[agent-sdk] Bitbucket auth: channel API calls route through ${bitbucketProxyUrl}`
+      );
+    }
+  }
   const resolvedCursorGithubCredentials = cursorGithubCredentials;
   const hostGithubToken =
     hostGithubProxyResolver ??
@@ -616,18 +719,24 @@ export async function startServer(
   }
   let runner: AgentRunner = sdkRunner;
   if (hasGrokBotMounts && options.runner === undefined) {
+    // Cursor-internal client, left out of the npm tarball (`files`); loaded
+    // only when a mount needs it, so a published install fails here, before
+    // listen, rather than on the first turn.
+    const { GrokBotRunner } = await import("./grokbot/runner.js").catch(() => {
+      throw new Error(
+        'runtime: "grokbot" is not available in the published @cursor/july package'
+      );
+    });
     runner = new RuntimeDispatchingRunner({
       sdkRunner,
-      grokbot: {
-        ...(options.apiKey === undefined || options.apiKey.trim() === ""
-          ? {}
-          : { apiKey: options.apiKey }),
+      grokbot: new GrokBotRunner({
+        apiKey: options.apiKey,
         // `/v0/grokbot` lives on the external API (api.cursor.com), not
         // api2. Prefer that default over the account key's backendUrl.
         // Do not pass stored login as apiKey: that would pin it as an
         // option and beat a later CURSOR_API_KEY_FILE bind.
         backendUrl: cursorExternalApiUrl(),
-      },
+      }),
     });
     logger(
       "[agent-sdk] grokbot runtime: remote client (turns run on the hosted Grok Bot harness)"
@@ -801,6 +910,7 @@ export async function startServer(
       diagStateRoot: baseStateRoot,
       sessionRunLog,
       flushStartLog,
+      flushOtel: () => forceFlushOtelRuntime(otelRuntime),
       ...(options.authToken === undefined
         ? {}
         : { authToken: options.authToken }),
@@ -962,7 +1072,6 @@ export async function startServer(
       })),
     });
   const collectGitHubTargets = () => collectGitHubTargetsFrom(runtimes);
-  const collectOriginTargets = () => collectOriginTargetsFrom(runtimes);
   const v1Runtimes = runtimes.filter(
     (runtime) => !isV2Project(runtime.project)
   );
@@ -1320,6 +1429,7 @@ function mountAgentRoutes(
     logRing: LogRing;
     sessionRunLog?: ReturnType<typeof selectSessionRunLogStore>;
     flushStartLog?: (startLogId: string) => Promise<void>;
+    flushOtel?: () => Promise<void>;
     authToken?: string;
     allowAnonymous?: boolean;
     /** Cursor account bridge + this mount's account MCP connections, when authored. */
@@ -1400,6 +1510,7 @@ function mountAgentRoutes(
         }),
       drainSessionDurability: (sessionId) =>
         engine.drainSessionDurability(sessionId),
+      flushOtel: args.flushOtel,
       ...(args.diagStateRoot === undefined
         ? {}
         : { stateRoot: args.diagStateRoot }),
@@ -1450,6 +1561,16 @@ function mountAgentRoutes(
       }),
   });
 
+  // TAS polls this after `/v1/health` and before the hosted POST. Auth none
+  // mirrors health: the engine is reachable only through the anyrun port
+  // proxy (network token) or the alias route.
+  router.add({
+    method: "GET",
+    pattern: `${base}${GUEST_NETWORK_PATH}`,
+    auth: "none",
+    handler: () => guestNetworkReadinessResponse(),
+  });
+
   // Bootstrap the SPA can't derive from its own URL (agent name, dev mode, and
   // — in multi-agent mode — where the agents index lives).
   router.add({
@@ -2750,12 +2871,12 @@ function startCursorDeploymentRelay(input: {
       return undefined;
     }
     throw new Error(
-      `This project has channels subscribed to deployment events (deploymentsChannel({ deploySourceUris })) but the host is not signed in to Cursor. ${SIGN_IN_HINT}`
+      `This project has channels subscribed to deployment events (deploymentsChannel({ ... })) but the host is not signed in to Cursor. ${SIGN_IN_HINT}`
     );
   }
   // Union is re-resolved on each heartbeat and fan-out so a channel that
-  // refreshes `deploySourceUris` after start (Change Monitor lists the
-  // team's sources every 10 minutes) registers the new URIs.
+  // fills `deploySourceUris` after start registers the new URIs. This wire
+  // names every source, so a channel that omits the option registers nothing.
   const initial = liveDeploymentSubscriptionUnion(targets);
   if (initial.length === 0) {
     logger(
@@ -2886,21 +3007,9 @@ async function handleRequest(
           });
     }
   } catch (error) {
-    if (error instanceof SessionBusyError) {
-      response = errorResponse(409, "session_busy", error.message);
-    } else if (error instanceof V2EngineError) {
-      response = errorResponse(
-        409,
-        "v2_identity_conflict",
-        "Control-plane session identity conflicts with existing state."
-      );
-    } else if (error instanceof SessionAuthError) {
-      response = errorResponse(403, "forbidden", error.message);
-    } else if (
-      error instanceof InvalidAsOfError ||
-      error instanceof VacuousTimeArgsError
-    ) {
-      response = errorResponse(400, "invalid_request", error.message);
+    const mapped = mapThrownRequestError(error);
+    if (mapped !== undefined) {
+      response = errorResponse(mapped.status, mapped.code, mapped.message);
     } else {
       logger(
         `[agent-sdk] request failed: ${

package/src/internal/session-cost.ts

@@ -1,7 +1,7 @@
 /**
  * Per-session cost metrics folded from a durable session event stream.
  *
- * Powers `agent-serve cost [sessionId]`: each `turn.completed` event carries
+ * Powers `agent-sdk cost [sessionId]`: each `turn.completed` event carries
  * the turn's token usage and the estimated dollar cost recorded by the
  * engine via `POST /v1/models/estimate-cost`, so a session's spend is a
  * pure fold over its `events.ndjson`. `GET /v1/session/:id/cost` is the
@@ -115,7 +115,7 @@ function formatCount(value: number): string {
   return String(value);
 }
 
-/** Per-turn table for `agent-serve cost <sessionId>`. */
+/** Per-turn table for `agent-sdk cost <sessionId>`. */
 export function formatSessionCostText(report: SessionCostReport): string {
   const lines: string[] = [];
   lines.push(
@@ -170,7 +170,7 @@ export interface SessionCostRow {
   totals: SessionCostTotals;
 }
 
-/** All-sessions table for `agent-serve cost` (no session id). */
+/** All-sessions table for `agent-sdk cost` (no session id). */
 export function formatSessionsCostText(rows: SessionCostRow[]): string {
   if (rows.length === 0) {
     return "No sessions.\n";