@cursor/july 0.1.2 → 0.1.4

package/src/internal/reminder-runner.ts

@@ -143,7 +143,7 @@ export class ReminderRunner {
     }
     if (restored > 0 || disarmedOrphan > 0) {
       this.logger(
-        `[agent-serve] reminders: restored ${restored} armed reminder(s)` +
+        `[agentkit] reminders: restored ${restored} armed reminder(s)` +
           (disarmedOrphan > 0
             ? `; disarmed ${disarmedOrphan} without live handlers`
             : "")
@@ -174,14 +174,12 @@ export class ReminderRunner {
       }
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
-      this.logger(
-        `[agent-serve] reminders: storage hydrate failed: ${message}`
-      );
+      this.logger(`[agentkit] reminders: storage hydrate failed: ${message}`);
       return;
     }
     if (hydrated > 0) {
       this.logger(
-        `[agent-serve] reminders: hydrated ${hydrated} reminder(s) from storage`
+        `[agentkit] reminders: hydrated ${hydrated} reminder(s) from storage`
       );
     }
   }
@@ -366,7 +364,7 @@ export class ReminderRunner {
     const timer = setTimeout(() => {
       void this.fire(record.id).catch(async (error) => {
         this.logger(
-          `[agent-serve] reminder "${record.id}" fire failed: ${
+          `[agentkit] reminder "${record.id}" fire failed: ${
             error instanceof Error ? error.message : String(error)
           }`
         );
@@ -384,7 +382,7 @@ export class ReminderRunner {
           await this.afterFire(current, "skip");
         } catch (rescheduleError) {
           this.logger(
-            `[agent-serve] reminder "${record.id}" reschedule after failure failed: ${
+            `[agentkit] reminder "${record.id}" reschedule after failure failed: ${
               rescheduleError instanceof Error
                 ? rescheduleError.message
                 : String(rescheduleError)
@@ -447,7 +445,7 @@ export class ReminderRunner {
           }
         } catch (error) {
           this.logger(
-            `[agent-serve] reminder "${id}" until() failed: ${
+            `[agentkit] reminder "${id}" until() failed: ${
               error instanceof Error ? error.message : String(error)
             }`
           );
@@ -460,7 +458,7 @@ export class ReminderRunner {
         if (record.busyPolicy === "skipIfBusy") {
           await this.afterFire(record, "skip");
           this.logger(
-            `[agent-serve] reminder "${id}" (${record.purpose}) skipped: session busy`
+            `[agentkit] reminder "${id}" (${record.purpose}) skipped: session busy`
           );
           return { outcome: "fired", reason: "skipped_busy" };
         }
@@ -488,7 +486,7 @@ export class ReminderRunner {
         if (latest !== undefined && latest.status === "armed") {
           await this.disarm(latest, "run_stop");
           this.logger(
-            `[agent-serve] reminder "${id}" (${record.purpose}) disarmed: run_stop`
+            `[agentkit] reminder "${id}" (${record.purpose}) disarmed: run_stop`
           );
           return { outcome: "fired", reason: "run_stop" };
         }
@@ -503,15 +501,11 @@ export class ReminderRunner {
 
       if (result.action === "skip") {
         await this.afterFire(latest, "skip", result.reschedule);
-        this.logger(
-          `[agent-serve] reminder "${id}" (${record.purpose}) skipped`
-        );
+        this.logger(`[agentkit] reminder "${id}" (${record.purpose}) skipped`);
         return { outcome: "fired", reason: "skipped" };
       }
       await this.afterFire(latest, "delivered", result.reschedule);
-      this.logger(
-        `[agent-serve] reminder "${id}" (${record.purpose}) delivered`
-      );
+      this.logger(`[agentkit] reminder "${id}" (${record.purpose}) delivered`);
       return { outcome: "fired", reason: "delivered" };
     } finally {
       this.firing.delete(id);
@@ -613,7 +607,7 @@ export class ReminderRunner {
           return { action: "delivered" };
         } catch (retryError) {
           this.logger(
-            `[agent-serve] reminder "${record.id}" followup failed after wait: ${
+            `[agentkit] reminder "${record.id}" followup failed after wait: ${
               retryError instanceof Error
                 ? retryError.message
                 : String(retryError)

package/src/internal/request-headers.ts

@@ -0,0 +1,23 @@
+/**
+ * Merge Authorization bearer + arbitrary request headers for agent HTTP
+ * clients (local `--bearer-token`, hosted `engineAccess.headers`, etc.).
+ */
+
+export interface RequestAuth {
+  bearerToken?: string;
+  /** Extra headers (e.g. X-Anyrun-Port-Token from engineAccess). */
+  headers?: Record<string, string>;
+}
+
+export function mergeRequestHeaders(
+  auth: RequestAuth | undefined
+): Record<string, string> {
+  const out: Record<string, string> = {};
+  if (auth?.headers !== undefined) {
+    Object.assign(out, auth.headers);
+  }
+  if (auth?.bearerToken !== undefined) {
+    out.authorization = `Bearer ${auth.bearerToken}`;
+  }
+  return out;
+}

package/src/internal/resolve-prod-target.ts

@@ -0,0 +1,182 @@
+/**
+ * Resolve a hosted (managed) agent-serve deployment into a base URL +
+ * request headers for chat/run/call/eval `--prod`.
+ *
+ * Uses short-lived `engineAccess` from the deployment status route
+ * (Cursor API key on the management API; `X-Anyrun-Port-Token` on the
+ * engine). Alias tokens are out of scope here.
+ */
+
+import { basename, resolve } from "node:path";
+import { resolveDeployAuth } from "./cli-deploy.js";
+import {
+  DeployApiError,
+  type DeploymentDetail,
+  slugFromDirectoryName,
+  validateDeploymentSlug,
+} from "./deploy-client.js";
+import { CLI_COMMAND_NAME as CLI } from "./distribution.js";
+import { stderrPalette } from "./terminal-style.js";
+
+/**
+ * Interactive CLI keep-alive for hosted engines. Without these, a hibernated
+ * Anyrun pod returns 417 `pod_hibernated` and never wakes. Matches the
+ * cloud-agent interactive keep-alive shape (lower ≤ upper, seconds).
+ */
+export const PROD_ENGINE_WAKE_HEADERS: Readonly<Record<string, string>> = {
+  "x-anyrun-hibernation-lower-bound-s": "1800",
+  "x-anyrun-hibernation-upper-bound-s": "3600",
+};
+
+export interface ResolveProdTargetOptions {
+  dir: string;
+  cwd?: string;
+  /** Explicit deployment slug; otherwise derived from `--dir` basename. */
+  slug?: string;
+  team?: string;
+  apiKey?: string;
+  fetchImpl?: typeof fetch;
+  err?: (text: string) => void;
+  /** Test seam for reachability-retry backoff. */
+  sleep?: (ms: number) => Promise<void>;
+}
+
+export interface ResolvedProdTarget {
+  agentUrl: string;
+  headers: Record<string, string>;
+  slug: string;
+  expiresAt: string;
+}
+
+/**
+ * Look up a running deployment and return its engineAccess URL/headers.
+ * Throws {@link Error} with a CLI-ready message on failure.
+ */
+export async function resolveProdTarget(
+  options: ResolveProdTargetOptions
+): Promise<ResolvedProdTarget> {
+  const err =
+    options.err ?? ((text: string) => void process.stderr.write(text));
+  const slug = resolveProdSlug(options);
+  const auth = await resolveDeployAuth({
+    team: options.team,
+    apiKey: options.apiKey,
+    fetchImpl: options.fetchImpl,
+    err,
+  });
+  if (typeof auth === "number") {
+    throw new Error(
+      `Could not resolve Cursor credentials/team for --prod (see above).`
+    );
+  }
+
+  // A hibernated engine can briefly omit engineAccess while getPod fails
+  // during wake. Retry a few times before surfacing "not reachable yet".
+  const maxReachabilityAttempts = 5;
+  const sleep = options.sleep ?? sleepMs;
+  let detail: DeploymentDetail | undefined;
+  for (let attempt = 0; attempt < maxReachabilityAttempts; attempt++) {
+    try {
+      detail = await auth.client.getDeployment({
+        teamId: auth.teamId,
+        slug,
+      });
+    } catch (error) {
+      if (error instanceof DeployApiError) {
+        throw new Error(
+          `Deployment "${slug}" (team ${auth.teamId}): ${error.message}`
+        );
+      }
+      throw error;
+    }
+
+    // `degraded` still serves the previous ACTIVE engine; allow runtime access
+    // when the control plane minted engineAccess for it.
+    const statusOk =
+      detail.status === "running" || detail.status === "degraded";
+    if (!statusOk) {
+      const lastError =
+        detail.lastError === null || detail.lastError === undefined
+          ? ""
+          : ` ${sanitizeCustomerFacingDetail(detail.lastError)}`;
+      throw new Error(
+        `Deployment "${slug}" is ${detail.status}, not running.${lastError}\n` +
+          `Deploy or wait: \`${CLI} deploy --slug ${slug}\` / \`${CLI} deployment ${slug}\``
+      );
+    }
+    if (detail.engineAccess !== null && detail.engineAccess !== undefined) {
+      break;
+    }
+    if (attempt + 1 < maxReachabilityAttempts) {
+      if (attempt === 0) {
+        err(
+          `${stderrPalette().dim(
+            `Deployment "${slug}" is waking; waiting for engine access…`
+          )}\n`
+        );
+      }
+      await sleep(1000 * (attempt + 1));
+    }
+  }
+
+  if (detail === undefined) {
+    throw new Error(`Deployment "${slug}" lookup failed.`);
+  }
+  const access = detail.engineAccess;
+  if (access === null || access === undefined) {
+    throw new Error(
+      `Deployment "${slug}" is ${detail.status} but is not reachable yet. ` +
+        `Try \`${CLI} deployment ${slug}\` or redeploy.`
+    );
+  }
+
+  err(`${stderrPalette().dim(`Using hosted deployment "${slug}".`)}\n`);
+
+  return {
+    agentUrl: access.url.replace(/\/$/, ""),
+    headers: {
+      ...access.headers,
+      ...PROD_ENGINE_WAKE_HEADERS,
+    },
+    slug,
+    expiresAt: access.expiresAt,
+  };
+}
+
+/** Strip obvious hosting internals from customer-facing error fragments. */
+function sanitizeCustomerFacingDetail(message: string): string {
+  return message
+    .replace(/https?:\/\/\S+/gi, "[url]")
+    .replace(/\bpod-[a-z0-9]+\b/gi, "[runtime]")
+    .replace(/\banyrun\b/gi, "runtime")
+    .replace(/\bcursorvm\.com\b/gi, "host");
+}
+
+function sleepMs(ms: number): Promise<void> {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
+/** Resolve the deployment slug the same way `deploy` does for a single dir. */
+export function resolveProdSlug(options: {
+  dir: string;
+  cwd?: string;
+  slug?: string;
+}): string {
+  if (options.slug !== undefined && options.slug !== "") {
+    const slugError = validateDeploymentSlug(options.slug);
+    if (slugError !== undefined) {
+      throw new Error(slugError);
+    }
+    return options.slug;
+  }
+  const dir = resolve(options.cwd ?? process.cwd(), options.dir);
+  const derived = slugFromDirectoryName(basename(dir));
+  if (derived === undefined) {
+    throw new Error(
+      `Could not derive a deployment slug from the directory name ${JSON.stringify(basename(dir))}; pass --slug.`
+    );
+  }
+  return derived;
+}

package/src/internal/resolved-connections.ts

@@ -42,7 +42,7 @@ export function validateMountConnectionsConfig(args: {
     return;
   }
   throw new Error(
-    `[agent-serve] agent "${label}" has Cursor account MCP connections with \`servers\` filters (${filteredRefs
+    `[agentkit] agent "${label}" has Cursor account MCP connections with \`servers\` filters (${filteredRefs
       .map((ref) => ref.name)
       .join(
         ", "
@@ -67,7 +67,7 @@ export function assertCloudCanHonorAccountServersFilters(args: {
     return;
   }
   throw new Error(
-    `[agent-serve] cloud turn cannot honor Cursor account \`servers\` filters (${blocked
+    `[agentkit] cloud turn cannot honor Cursor account \`servers\` filters (${blocked
       .map((connection) => connection.name)
       .join(
         ", "
@@ -82,7 +82,7 @@ export function assertAccountConnectionsNotAnonymous(args: {
 }): void {
   if (args.allowAnonymous === true && args.hasAccountConnections) {
     throw new Error(
-      "[agent-serve] --allow-anonymous cannot be used with Cursor account MCP connections (defineConnection({ cursorAccount: true })); use --bearer-token or remove the account MCP connections."
+      "[agentkit] --allow-anonymous cannot be used with Cursor account MCP connections (defineConnection({ cursorAccount: true })); use --bearer-token or remove the account MCP connections."
     );
   }
 }
@@ -113,7 +113,7 @@ export function resolveMountConnections(args: {
     resolved.push(...peers);
     if (cloudCapable && args.publicUrl === undefined) {
       args.logger(
-        `[agent-serve] warning: agent "${label}" has peer MCP connections (${peers
+        `[agentkit] warning: agent "${label}" has peer MCP connections (${peers
           .map((peer) => peer.name)
           .join(
             ", "
@@ -136,7 +136,7 @@ export function resolveMountConnections(args: {
     args.accountBridge.logPreflight(args.accountRefs);
     if (cloudCapable && args.publicUrl === undefined) {
       args.logger(
-        `[agent-serve] agent "${label}": cloud-runtime turns omit the account bridge without --public-url (cloud agents fall back to the account's native connectors).`
+        `[agentkit] agent "${label}": cloud-runtime turns omit the account bridge without --public-url (cloud agents fall back to the account's native connectors).`
       );
     }
   }

package/src/internal/run-client.ts

@@ -7,6 +7,7 @@
  */
 
 import type { SessionEvent, SessionPurpose } from "../types.js";
+import { mergeRequestHeaders, type RequestAuth } from "./request-headers.js";
 import { buildTrajectory, type Trajectory } from "./trajectory.js";
 
 /** Thrown when a turn stream exceeds `timeoutMs`; carries the session id. */
@@ -19,9 +20,8 @@ export class RunSessionTimeoutError extends Error {
     this.name = "RunSessionTimeoutError";
   }
 }
-export interface RunClientOptions {
+export interface RunClientOptions extends RequestAuth {
   baseUrl: string;
-  bearerToken?: string;
   /** Abort a hung turn. */
   timeoutMs?: number;
   /** Called for each stream event as it arrives (for CLI progress). */
@@ -72,6 +72,11 @@ export async function runSession(
   const allEvents: SessionEvent[] = [];
   let nextEventIndex = 0;
 
+  const auth: RequestAuth = {
+    bearerToken: options.bearerToken,
+    headers: options.headers,
+  };
+
   for (const message of options.messages) {
     const turn = await runOneTurn({
       baseUrl,
@@ -79,18 +84,13 @@ export async function runSession(
       sessionId,
       continuationToken,
       startIndex: sessionId === undefined ? 0 : nextEventIndex,
-      bearerToken: options.bearerToken,
+      auth,
       timeoutMs: options.timeoutMs,
       onEvent: options.onEvent,
-      ...(sessionId === undefined && options.purpose !== undefined
-        ? { purpose: options.purpose }
-        : {}),
-      ...(sessionId === undefined && options.workspaceDir !== undefined
-        ? { workspaceDir: options.workspaceDir }
-        : {}),
-      ...(sessionId === undefined && options.workspaceFiles !== undefined
-        ? { workspaceFiles: options.workspaceFiles }
-        : {}),
+      purpose: sessionId === undefined ? options.purpose : undefined,
+      workspaceDir: sessionId === undefined ? options.workspaceDir : undefined,
+      workspaceFiles:
+        sessionId === undefined ? options.workspaceFiles : undefined,
     });
     sessionId = turn.sessionId;
     continuationToken = turn.continuationToken;
@@ -128,7 +128,7 @@ interface OneTurnArgs {
   workspaceDir?: string;
   workspaceFiles?: Record<string, string>;
   startIndex: number;
-  bearerToken?: string;
+  auth?: RequestAuth;
   timeoutMs?: number;
   onEvent?: (event: SessionEvent) => void;
 }
@@ -145,20 +145,21 @@ async function runOneTurn(args: OneTurnArgs): Promise<OneTurnResult> {
   let continuationToken = args.continuationToken;
 
   if (sessionId === undefined) {
+    const body: Record<string, unknown> = { message: args.message };
+    if (args.purpose !== undefined) {
+      body.purpose = args.purpose;
+    }
+    if (args.workspaceDir !== undefined) {
+      body.workspaceDir = args.workspaceDir;
+    }
+    if (args.workspaceFiles !== undefined) {
+      body.workspaceFiles = args.workspaceFiles;
+    }
     const created = await postJson(
       args.baseUrl,
       "/v1/session",
-      {
-        message: args.message,
-        ...(args.purpose === undefined ? {} : { purpose: args.purpose }),
-        ...(args.workspaceDir === undefined
-          ? {}
-          : { workspaceDir: args.workspaceDir }),
-        ...(args.workspaceFiles === undefined
-          ? {}
-          : { workspaceFiles: args.workspaceFiles }),
-      },
-      args.bearerToken
+      body,
+      args.auth
     );
     if (created.status >= 400 || created.body.ok === false) {
       throw new Error(
@@ -172,7 +173,7 @@ async function runOneTurn(args: OneTurnArgs): Promise<OneTurnResult> {
       args.baseUrl,
       `/v1/session/${sessionId}`,
       { message: args.message, continuationToken },
-      args.bearerToken
+      args.auth
     );
     if (resp.status >= 400 || resp.body.ok === false) {
       throw new Error(
@@ -190,7 +191,7 @@ async function runOneTurn(args: OneTurnArgs): Promise<OneTurnResult> {
     baseUrl: args.baseUrl,
     sessionId,
     startIndex: args.startIndex,
-    bearerToken: args.bearerToken,
+    auth: args.auth,
     timeoutMs: args.timeoutMs,
     onEvent: args.onEvent,
   });
@@ -209,7 +210,7 @@ async function collectStream(args: {
   baseUrl: string;
   sessionId: string;
   startIndex: number;
-  bearerToken?: string;
+  auth?: RequestAuth;
   timeoutMs?: number;
   onEvent?: (event: SessionEvent) => void;
 }): Promise<SessionEvent[]> {
@@ -223,7 +224,7 @@ async function collectStream(args: {
     const resp = await fetch(
       `${args.baseUrl}/v1/session/${args.sessionId}/stream?startIndex=${args.startIndex}`,
       {
-        headers: authHeaders(args.bearerToken),
+        headers: mergeRequestHeaders(args.auth),
         signal: controller.signal,
       }
     );
@@ -283,23 +284,17 @@ async function collectStream(args: {
   }
 }
 
-function authHeaders(bearerToken: string | undefined): Record<string, string> {
-  return bearerToken === undefined
-    ? {}
-    : { authorization: `Bearer ${bearerToken}` };
-}
-
 async function postJson(
   baseUrl: string,
   path: string,
   body: unknown,
-  bearerToken?: string
+  auth?: RequestAuth
 ): Promise<{ status: number; body: Record<string, unknown> }> {
   const resp = await fetch(`${baseUrl}${path}`, {
     method: "POST",
     headers: {
       "content-type": "application/json",
-      ...authHeaders(bearerToken),
+      ...mergeRequestHeaders(auth),
     },
     body: JSON.stringify(body),
   });
@@ -312,6 +307,14 @@ async function postJson(
       parsed = { message: text };
     }
   }
+  const anyrunReason = resp.headers.get("x-anyrun-failure-reason");
+  if (
+    anyrunReason !== null &&
+    anyrunReason !== "" &&
+    (parsed.message === undefined || parsed.message === "")
+  ) {
+    parsed.message = anyrunReason;
+  }
   return { status: resp.status, body: parsed };
 }
 

package/src/internal/schedule-runner.ts

@@ -90,7 +90,7 @@ export class ScheduleRunner {
         if (schedule.cron.matches(now)) {
           void this.dispatch(schedule.name).catch((error) => {
             this.logger(
-              `[agent-serve] schedule "${schedule.name}" dispatch failed: ${
+              `[agentkit] schedule "${schedule.name}" dispatch failed: ${
                 error instanceof Error ? error.message : String(error)
               }`
             );

package/src/internal/server.ts

@@ -50,6 +50,7 @@ import {
 import { CursorBackendClient } from "./cursor/backend-client.js";
 import {
   cursorBackendUrl,
+  cursorExternalApiUrl,
   type ResolvedApiKey,
   resolveApiKey,
   SIGN_IN_HINT,
@@ -227,13 +228,18 @@ export async function startServer(
       );
     }
     if (options.allowAnonymous === true) {
-      throw new Error(
-        "githubChannel({ cursorAccount: true }) cannot be served with --allow-anonymous because admitted callers could use the signed-in account's GitHub access."
+      if (options.allowAnonymousCursorGithub !== true) {
+        throw new Error(
+          "githubChannel({ cursorAccount: true }) cannot be served with --allow-anonymous because admitted callers could use the signed-in account's GitHub access. If every admitted caller is trusted (e.g. behind an SSO proxy), opt in with --allow-anonymous-cursor-github."
+        );
+      }
+      logger(
+        "[agentkit] warning: --allow-anonymous-cursor-github — every admitted HTTP caller can drive sessions holding the signed-in account's repo-scoped GitHub credential; serve this only behind a trusted boundary (e.g. an SSO proxy)"
       );
     }
     if (cursorGithubConfig.scope.permissions === "contents-write") {
       logger(
-        '[agent-serve] warning: Cursor GitHub credentials include contents:write — the host holds a push-capable token shared with model-driven tools and untrusted webhook content; prefer permissions: "pr-write" unless this agent must push code'
+        '[agentkit] warning: Cursor GitHub credentials include contents:write — the host holds a push-capable token shared with model-driven tools and untrusted webhook content; prefer permissions: "pr-write" unless this agent must push code'
       );
     }
     const provider = new CursorGithubCredentialProvider({
@@ -275,7 +281,7 @@ export async function startServer(
   }
   if (options.allowAnonymous === true) {
     logger(
-      "[agent-serve] 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"
+      "[agentkit] 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 =
@@ -424,7 +430,7 @@ export async function startServer(
           await definition.onStart(startArgs);
         } catch (error) {
           logger(
-            `[agent-serve] channel "${channel.id}" onStart failed: ${
+            `[agentkit] channel "${channel.id}" onStart failed: ${
               error instanceof Error
                 ? (error.stack ?? error.message)
                 : String(error)
@@ -738,7 +744,7 @@ export async function startServer(
           await stop();
         } catch (error) {
           logger(
-            `[agent-serve] channel onStop failed: ${
+            `[agentkit] channel onStop failed: ${
               error instanceof Error
                 ? (error.stack ?? error.message)
                 : String(error)
@@ -1325,12 +1331,15 @@ function requireCursorEventsAuth(
   const apiKey = (config.apiKey ?? accountKey?.apiKey ?? "").trim();
   if (apiKey === "") {
     throw new Error(
-      `[agent-serve] --cursor-events (serve({ cursorEvents })) requires a signed-in Cursor account: the SCM event stream is read as the host's user. ${SIGN_IN_HINT}`
+      `[agentkit] --cursor-events (serve({ cursorEvents })) requires a signed-in Cursor account: the SCM event stream is read as the host's user. ${SIGN_IN_HINT}`
     );
   }
   return {
     apiKey,
-    baseUrl: config.baseUrl ?? accountKey?.backendUrl ?? cursorBackendUrl(),
+    // `/v0/scm-events/*` lives on the external API (api.cursor.com), not
+    // api2. Prefer that default over the account key's backendUrl, which
+    // follows cursorBackendUrl() (api2) when CURSOR_API_KEY is set.
+    baseUrl: config.baseUrl ?? cursorExternalApiUrl(),
   };
 }
 
@@ -1358,7 +1367,7 @@ function startCursorEventRelay(input: {
   );
   if (repos.length === 0) {
     logger(
-      "[agent-serve] cursor-events: no repos configured (pass --repo owner/name); relay disabled"
+      "[agentkit] cursor-events: no repos configured (pass --repo owner/name); relay disabled"
     );
     return undefined;
   }
@@ -1366,7 +1375,7 @@ function startCursorEventRelay(input: {
   const events = [...new Set(githubTargets.flatMap((target) => target.events))];
   if (events.length === 0) {
     logger(
-      "[agent-serve] cursor-events: no mounted agent declares a github channel; relay disabled"
+      "[agentkit] cursor-events: no mounted agent declares a github channel; relay disabled"
     );
     return undefined;
   }
@@ -1410,13 +1419,13 @@ function startCursorEventRelay(input: {
         .map((target) => `${target.slug || "default"}:${target.status}`)
         .join(", ");
       logger(
-        `[agent-serve] cursor-events: dispatched ${formatCursorScmEventLog(event)}${outcomes === "" ? "" : ` → ${outcomes}`}`
+        `[agentkit] cursor-events: dispatched ${formatCursorScmEventLog(event)}${outcomes === "" ? "" : ` → ${outcomes}`}`
       );
     },
   });
   relay.start();
   logger(
-    `[agent-serve] cursor-events: relaying ${events.length} event kind(s) for ${repos.join(", ")} from ${auth.baseUrl}`
+    `[agentkit] cursor-events: relaying ${events.length} event kind(s) for ${repos.join(", ")} from ${auth.baseUrl}`
   );
   return relay;
 }
@@ -1602,7 +1611,7 @@ async function startCursorSlackRelay(input: {
         channelId: target.channelId,
       });
       logger(
-        `[agent-serve] cursor-slack: dispatching ${formatCursorSlackEventLog(envelope)} → ${target.runtime.slug || "default"}`
+        `[agentkit] cursor-slack: dispatching ${formatCursorSlackEventLog(envelope)} → ${target.runtime.slug || "default"}`
       );
       await dispatchCursorSlackEnvelope({
         runtime: target.accountRuntime,
@@ -1630,7 +1639,7 @@ async function startCursorSlackRelay(input: {
 
   relay.start();
   logger(
-    `[agent-serve] cursor-slack: relaying Slack for ${targets
+    `[agentkit] cursor-slack: relaying Slack for ${targets
       .map(
         (target) => `${target.agentName} (${target.runtime.slug || "default"})`
       )
@@ -1726,7 +1735,7 @@ async function handleRequest(
       response = errorResponse(403, "forbidden", error.message);
     } else {
       logger(
-        `[agent-serve] request failed: ${
+        `[agentkit] request failed: ${
           error instanceof Error
             ? (error.stack ?? error.message)
             : String(error)
@@ -1740,7 +1749,7 @@ async function handleRequest(
     await writeFetchResponse(response, res, method);
   } catch (error) {
     logger(
-      `[agent-serve] response write failed: ${
+      `[agentkit] response write failed: ${
         error instanceof Error ? error.message : String(error)
       }`
     );