@cursor/bdk 0.2.24 → 0.2.26

package/dist/internal/ids.js

@@ -3,6 +3,26 @@ import { randomBytes } from "node:crypto";
 export function newSessionId() {
     return `ses_${randomBytes(12).toString("hex")}`;
 }
+/** Fresh delivery id for one `send()` (`dlv_<24 hex>`). */
+export function newDeliveryId() {
+    return `dlv_${randomBytes(12).toString("hex")}`;
+}
+export const MAX_DELIVERY_ID_LENGTH = 256;
+/**
+ * The caller's {@link SendMessageOptions.deliveryId}, or a fresh one.
+ * Opaque: compared verbatim, never trimmed or rewritten.
+ */
+export function resolveDeliveryId(requested) {
+    if (requested === undefined) {
+        return newDeliveryId();
+    }
+    if (typeof requested !== "string" ||
+        requested.trim() === "" ||
+        requested.length > MAX_DELIVERY_ID_LENGTH) {
+        throw new TypeError(`invalid argument: deliveryId must be a non-empty string of at most ${MAX_DELIVERY_ID_LENGTH} characters`);
+    }
+    return requested;
+}
 export function newContinuationKey() {
     return randomBytes(16).toString("hex");
 }

package/dist/internal/init-scaffold.js

@@ -57,7 +57,7 @@ export function tsconfig(projectRoot) {
 `;
 }
 const ECHO_TS = `import { defineTool } from "${PACKAGE_NAME}/tools";
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 
 export default defineTool({
   description: "Echo a short message back (demo tool).",

package/dist/internal/interview/agent-questions.d.ts

@@ -3,7 +3,7 @@
  * validate against schemas built from it, and the create-agent skill's round
  * tables are rendered from it.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 import { type InterviewField } from "./question.js";
 export declare const PURPOSES: readonly ["chat", "repo-automation", "domain-assistant", "scheduled-reporter", "other"];
 export declare const CHANNELS: readonly ["slack", "github", "webhook", "schedule"];

package/dist/internal/interview/agent-questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agent-questions.d.ts","sourceRoot":"","sources":["../../../src/internal/interview/agent-questions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,EAAS,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE3D,eAAO,MAAM,QAAQ,YACnB,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,CACC,CAAC;AACX,eAAO,MAAM,QAAQ,YAAI,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAU,CAAC;AAC5E,eAAO,MAAM,SAAS,YAAI,gBAAgB,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AACxE,eAAO,MAAM,YAAY,YACvB,cAAc,EACd,aAAa,EACb,QAAQ,EACR,WAAW,EACX,OAAO,EACP,eAAe,EACf,OAAO,CACC,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAChD,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAehD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAKpC,CAAC;AAEL,eAAO,MAAM,YAAY,EAAE,SAAS,cAAc,EA0FjD,CAAC;AAOF,iDAAiD;AACjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C"}
+{"version":3,"file":"agent-questions.d.ts","sourceRoot":"","sources":["../../../src/internal/interview/agent-questions.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAS,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AAE3D,eAAO,MAAM,QAAQ,YACnB,MAAM,EACN,iBAAiB,EACjB,kBAAkB,EAClB,oBAAoB,EACpB,OAAO,CACC,CAAC;AACX,eAAO,MAAM,QAAQ,YAAI,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAU,CAAC;AAC5E,eAAO,MAAM,SAAS,YAAI,gBAAgB,EAAE,QAAQ,EAAE,OAAO,CAAU,CAAC;AACxE,eAAO,MAAM,YAAY,YACvB,cAAc,EACd,aAAa,EACb,QAAQ,EACR,WAAW,EACX,OAAO,EACP,eAAe,EACf,OAAO,CACC,CAAC;AAEX,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAChD,MAAM,MAAM,OAAO,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAehD,eAAO,MAAM,gBAAgB,EAAE,MAAiB,CAAC;AAEjD,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,CAKpC,CAAC;AAEL,eAAO,MAAM,YAAY,EAAE,SAAS,cAAc,EA0FjD,CAAC;AAOF,iDAAiD;AACjD,wBAAgB,qBAAqB,IAAI,MAAM,CAY9C"}

package/dist/internal/interview/agent-questions.js

@@ -3,7 +3,7 @@
  * validate against schemas built from it, and the create-agent skill's round
  * tables are rendered from it.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 import { DEFAULT_MODEL } from "../../types.js";
 import { NAME_PATTERN, RESERVED_SLUGS } from "../discovery/names.js";
 import { field } from "./question.js";

package/dist/internal/interview/question.d.ts

@@ -4,7 +4,7 @@
  * Answers arrive from flags or an answers file, from a TTY prompt, or from
  * defaults, in that order. Nothing prompts without a TTY.
  */
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 export type Choice = string | {
     value: string;
     label: string;
@@ -44,7 +44,7 @@ export interface InterviewField {
 }
 /** A field whose answers are checked against its schema before they are kept. */
 export declare function field(round: string, question: InterviewQuestion, schema: z.ZodTypeAny, options?: string): InterviewField;
-export declare function checkedString(error: (value: string) => string | undefined): z.ZodEffects<z.ZodString>;
+export declare function checkedString(error: (value: string) => string | undefined): z.ZodString;
 export type CollectResult = {
     ok: true;
     answers: Answers;

package/dist/internal/interview/question.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../src/internal/interview/question.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,MAAM,MAAM,MAAM,GAAG,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAE/D,oFAAoF;AACpF,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAE7C,MAAM,WAAW,iBAAiB;IAChC,sEAAsE;IACtE,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,mDAAmD;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,GAAG,SAAS,CAAC,CAAC;IAC9D,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5B,yEAAyE;IACzE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,wCAAwC;IACxC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,+DAA+D;IAC/D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,uDAAuD;IACvD,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC;IAClC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACrC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,MAAM,GAAG,SAAS,CAAC;CACjE;AAED,sDAAsD;AACtD,MAAM,WAAW,cAAc;IAC7B,+DAA+D;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,MAAM,EAAE,CAAC,CAAC,UAAU,CAAC;IACrB,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,iFAAiF;AACjF,wBAAgB,KAAK,CACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,iBAAiB,EAC3B,MAAM,EAAE,CAAC,CAAC,UAAU,EACpB,OAAO,CAAC,EAAE,MAAM,GACf,cAAc,CAchB;AAED,wBAAgB,aAAa,CAC3B,KAAK,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,GAC3C,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAO3B;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GACnD;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjC,uEAAuE;AACvE,MAAM,MAAM,GAAG,GAAG,CAAC,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEjG,MAAM,WAAW,YAAY;IAC3B,SAAS,EAAE,SAAS,iBAAiB,EAAE,CAAC;IACxC,8DAA8D;IAC9D,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC7B,gFAAgF;IAChF,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;IAChC,iDAAiD;IACjD,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,KAAK,MAAM,CAAC;CACnD;AAED,wBAAsB,cAAc,CAAC,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAUhF;AA+DD,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAQ5D;AAID;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,KAAK,EAAE,MAAM,CAAC,cAAc,EAC5B,MAAM,EAAE,MAAM,CAAC,cAAc,EAC7B,IAAI,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAuB,GAC9C;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,KAAK,EAAE,MAAM,IAAI,CAAA;CAAE,CA8BjC"}
+{"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../../src/internal/interview/question.ts"],"names":[],"mappings":"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"}

package/dist/internal/interview/question.js

@@ -5,7 +5,7 @@
  * defaults, in that order. Nothing prompts without a TTY.
  */
 import { createInterface } from "node:readline";
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 import { describeError } from "../describe-error.js";
 /** A field whose answers are checked against its schema before they are kept. */
 export function field(round, question, schema, options) {
@@ -27,7 +27,7 @@ export function checkedString(error) {
     return z.string().superRefine((value, ctx) => {
         const message = error(value);
         if (message !== undefined) {
-            ctx.addIssue({ code: z.ZodIssueCode.custom, message });
+            ctx.addIssue({ code: "custom", message });
         }
     });
 }

package/dist/internal/json-schema.d.ts

@@ -1,15 +1,15 @@
-import { z } from "zod/v3";
-import type { JsonSchemaObject } from "../types.js";
-export declare function isZodSchema(value: unknown): value is z.ZodTypeAny;
+import type { JsonSchemaObject, ZodSchema } from "../types.js";
+export declare function isZodSchema(value: unknown): value is ZodSchema;
 /** Convert an authored input schema into the JSON Schema shown to the model. */
-export declare function toolInputJsonSchema(inputSchema: z.ZodTypeAny | JsonSchemaObject | undefined): JsonSchemaObject;
+export declare function toolInputJsonSchema(inputSchema: ZodSchema | JsonSchemaObject | undefined): JsonSchemaObject;
 /**
  * Convert an authored output schema into the JSON Schema advertised on the
  * tool. Unlike {@link toolInputJsonSchema} there is no fallback: an
  * undeclared output schema stays undeclared (the MCP field is optional), and
- * outputs are never validated against it.
+ * outputs are never validated against it. Zod 4 schemas describe the
+ * `execute` result here, so fields with a default are required.
  */
-export declare function toolOutputJsonSchema(outputSchema: z.ZodTypeAny | JsonSchemaObject | undefined): JsonSchemaObject | undefined;
+export declare function toolOutputJsonSchema(outputSchema: ZodSchema | JsonSchemaObject | undefined): JsonSchemaObject | undefined;
 export type ToolInputValidation = {
     ok: true;
     value: unknown;
@@ -21,5 +21,5 @@ export type ToolInputValidation = {
  * Validate tool-call args before `execute` runs. Zod schemas validate (and
  * transform); plain JSON schemas pass through unvalidated.
  */
-export declare function validateToolInput(inputSchema: z.ZodTypeAny | JsonSchemaObject | undefined, args: unknown): ToolInputValidation;
+export declare function validateToolInput(inputSchema: ZodSchema | JsonSchemaObject | undefined, args: unknown): ToolInputValidation;
 //# sourceMappingURL=json-schema.d.ts.map

package/dist/internal/json-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/internal/json-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAQpD,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,UAAU,CAajE;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,CAAC,CAAC,UAAU,GAAG,gBAAgB,GAAG,SAAS,GACvD,gBAAgB,CAKlB;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,CAAC,CAAC,UAAU,GAAG,gBAAgB,GAAG,SAAS,GACxD,gBAAgB,GAAG,SAAS,CAK9B;AAsBD,MAAM,MAAM,mBAAmB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,CAAC,CAAC,UAAU,GAAG,gBAAgB,GAAG,SAAS,EACxD,IAAI,EAAE,OAAO,GACZ,mBAAmB,CAerB"}
+{"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/internal/json-schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAS/D,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,SAAS,CAU9D;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,CACjC,WAAW,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,GACpD,gBAAgB,CAKlB;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,GACrD,gBAAgB,GAAG,SAAS,CAK9B;AAmBD,MAAM,MAAM,mBAAmB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhG;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,WAAW,EAAE,SAAS,GAAG,gBAAgB,GAAG,SAAS,EACrD,IAAI,EAAE,OAAO,GACZ,mBAAmB,CAerB"}

package/dist/internal/json-schema.js

@@ -1,17 +1,14 @@
-import { z } from "zod/v3";
 import { zodToJsonSchema } from "zod-to-json-schema";
+import { isZodV4Schema, zodV4ToJsonSchema } from "./zod-schema.js";
 const ANY_OBJECT_SCHEMA = {
     type: "object",
     properties: {},
     additionalProperties: true,
 };
 export function isZodSchema(value) {
-    if (value instanceof z.ZodType) {
-        return true;
-    }
-    // Structural check for zod instances that come from a different module
-    // copy in the authoring project's node_modules. Zod 4 keeps `_zod`
-    // (and often `_def`).
+    // Structural, so zod instances from any module copy in the authoring
+    // project's node_modules match. Zod 3 schemas carry `_def`; zod 4
+    // schemas carry `_zod` (and often `_def`).
     return (typeof value === "object" &&
         value !== null &&
         typeof value.safeParse === "function" &&
@@ -22,38 +19,34 @@ export function toolInputJsonSchema(inputSchema) {
     if (inputSchema === undefined) {
         return ANY_OBJECT_SCHEMA;
     }
-    return authoredSchemaToJsonSchema(inputSchema);
+    return authoredSchemaToJsonSchema(inputSchema, "input");
 }
 /**
  * Convert an authored output schema into the JSON Schema advertised on the
  * tool. Unlike {@link toolInputJsonSchema} there is no fallback: an
  * undeclared output schema stays undeclared (the MCP field is optional), and
- * outputs are never validated against it.
+ * outputs are never validated against it. Zod 4 schemas describe the
+ * `execute` result here, so fields with a default are required.
  */
 export function toolOutputJsonSchema(outputSchema) {
     if (outputSchema === undefined) {
         return undefined;
     }
-    return authoredSchemaToJsonSchema(outputSchema);
+    return authoredSchemaToJsonSchema(outputSchema, "output");
 }
-function authoredSchemaToJsonSchema(schema) {
+function authoredSchemaToJsonSchema(schema, io) {
     if (!isZodSchema(schema)) {
         return schema;
     }
-    const converted = convertZodSchema(schema);
+    const converted = isZodV4Schema(schema)
+        ? zodV4ToJsonSchema(schema, io)
+        : zodToJsonSchema(schema, {
+            $refStrategy: "none",
+            target: "jsonSchema7",
+        });
     delete converted.$schema;
     return converted;
 }
-function convertZodSchema(schema) {
-    const native = schema.toJSONSchema;
-    if (typeof native === "function") {
-        return native.call(schema);
-    }
-    return zodToJsonSchema(schema, {
-        $refStrategy: "none",
-        target: "jsonSchema7",
-    });
-}
 /**
  * Validate tool-call args before `execute` runs. Zod schemas validate (and
  * transform); plain JSON schemas pass through unvalidated.
@@ -68,7 +61,7 @@ export function validateToolInput(inputSchema, args) {
     }
     const issues = parsed.error.issues
         .map((issue) => {
-        const path = issue.path.join(".");
+        const path = issue.path.map(String).join(".");
         return path === "" ? issue.message : `${path}: ${issue.message}`;
     })
         .join("; ");

package/dist/internal/mcp-endpoint.d.ts

@@ -18,11 +18,20 @@
 import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
 import type { AgentProject, AuthContext } from "../types.js";
 import { type SessionEngine } from "./session-engine.js";
-/** Channel id recorded on sessions created through the MCP surface. */
+/**
+ * Channel id recorded on sessions created through the MCP surface.
+ * @deprecated Deprecated on the package root.
+ */
 export declare const MCP_CHANNEL_ID = "mcp";
-/** Mount path of the MCP surface, relative to the agent base. */
+/**
+ * Mount path of the MCP surface, relative to the agent base.
+ * @deprecated Deprecated on the package root.
+ */
 export declare const MCP_ENDPOINT_PATH = "/v1/mcp";
-/** Direct authored server tools used by this agent's cloud turns. */
+/**
+ * Direct authored server tools used by this agent's cloud turns.
+ * @deprecated Deprecated on the package root.
+ */
 export declare const TOOL_MCP_ENDPOINT_PATH = "/v1/mcp/tools";
 export interface AgentMcpEndpoint {
     /**
@@ -58,7 +67,10 @@ export declare function handleStatelessMcpRequest(args: {
     label: string;
     logger?: (line: string) => void;
 }): Promise<Response>;
-/** Tool names the MCP surface exposes for `project` (info projection). */
+/**
+ * Tool names the MCP surface exposes for `project` (info projection).
+ * @deprecated Deprecated on the package root.
+ */
 export declare function mcpEndpointToolNames(project: AgentProject): string[];
 export declare function createAgentMcpEndpoint(args: {
     engine: SessionEngine;

package/dist/internal/mcp-endpoint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-endpoint.d.ts","sourceRoot":"","sources":["../../src/internal/mcp-endpoint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAC;AAOzH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAA8B,MAAM,aAAa,CAAC;AAGzF,OAAO,EAEL,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAE7B,uEAAuE;AACvE,eAAO,MAAM,cAAc,QAAQ,CAAC;AAEpC,iEAAiE;AACjE,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,qEAAqE;AACrE,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAUtD,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACvE;AAED,yEAAyE;AACzE,UAAU,oBAAoB;IAC5B,OAAO,CAAC,SAAS,EAAE,wCAAwC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,oBAAoB,CAAC;IACxC,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyCpB;AAED,0EAA0E;AAC1E,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,EAAE,CAMpE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,gBAAgB,CAanB;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,gBAAgB,CAyBnB"}
+{"version":3,"file":"mcp-endpoint.d.ts","sourceRoot":"","sources":["../../src/internal/mcp-endpoint.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAC;AAOzH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAA8B,MAAM,aAAa,CAAC;AAGzF,OAAO,EAEL,KAAK,aAAa,EAKnB,MAAM,qBAAqB,CAAC;AAE7B;;;GAGG;AACH,eAAO,MAAM,cAAc,QAAQ,CAAC;AAEpC;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C;;;GAGG;AACH,eAAO,MAAM,sBAAsB,kBAAkB,CAAC;AAUtD,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;CACvE;AAED,yEAAyE;AACzE,UAAU,oBAAoB;IAC5B,OAAO,CAAC,SAAS,EAAE,wCAAwC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5E,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAsB,yBAAyB,CAAC,IAAI,EAAE;IACpD,OAAO,EAAE,OAAO,CAAC;IACjB,0EAA0E;IAC1E,WAAW,EAAE,MAAM,oBAAoB,CAAC;IACxC,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyCpB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,EAAE,CAMpE;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE;IAC3C,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,gBAAgB,CAanB;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE;IAC1C,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,gBAAgB,CAyBnB"}

package/dist/internal/mcp-endpoint.js

@@ -19,15 +19,24 @@ import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/webStandardStreamableHttp.js";
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
-import { z } from "zod/v3";
+import * as z from "zod/v4";
 import { samePrincipal } from "./auth.js";
 import { describeError } from "./describe-error.js";
 import { SessionBusyError, ToolInputError, ToolNotDirectlyCallableError, UnknownSessionError, UnknownToolError, } from "./session-engine.js";
-/** Channel id recorded on sessions created through the MCP surface. */
+/**
+ * Channel id recorded on sessions created through the MCP surface.
+ * @deprecated Deprecated on the package root.
+ */
 export const MCP_CHANNEL_ID = "mcp";
-/** Mount path of the MCP surface, relative to the agent base. */
+/**
+ * Mount path of the MCP surface, relative to the agent base.
+ * @deprecated Deprecated on the package root.
+ */
 export const MCP_ENDPOINT_PATH = "/v1/mcp";
-/** Direct authored server tools used by this agent's cloud turns. */
+/**
+ * Direct authored server tools used by this agent's cloud turns.
+ * @deprecated Deprecated on the package root.
+ */
 export const TOOL_MCP_ENDPOINT_PATH = "/v1/mcp/tools";
 /**
  * Bounded waits stay below the MCP client default request timeout (60s) so
@@ -87,7 +96,10 @@ export async function handleStatelessMcpRequest(args) {
         void server.close().catch(() => { });
     }
 }
-/** Tool names the MCP surface exposes for `project` (info projection). */
+/**
+ * Tool names the MCP surface exposes for `project` (info projection).
+ * @deprecated Deprecated on the package root.
+ */
 export function mcpEndpointToolNames(project) {
     const names = ["ask", "check"];
     if (project.agent.tools.some((tool) => tool.execution === "server")) {
@@ -312,7 +324,7 @@ function buildAgentMcpServer(engine, auth) {
             inputSchema: {
                 toolName: z.string().describe("Name of the server tool to call."),
                 input: z
-                    .record(z.unknown())
+                    .record(z.string(), z.unknown())
                     .optional()
                     .describe("Tool input, validated against the tool's schema."),
                 sessionId: z

package/dist/internal/mcp-host.d.ts

@@ -14,6 +14,15 @@ export declare class McpNeedsAuthError extends Error {
     readonly connection: string;
     constructor(connection: string, cause?: unknown);
 }
+/**
+ * A connection needs authorization and this channel cannot wait for a person
+ * to grant it. Not a {@link McpNeedsAuthError}, so the auth park does not
+ * retry it.
+ */
+export declare class McpReconnectError extends Error {
+    readonly connection: string;
+    constructor(connection: string, message: string, cause?: unknown);
+}
 export declare function isMcpNeedsAuthError(error: unknown): error is McpNeedsAuthError;
 export declare function hostMcpCallNeedsAuth(result: HostMcpCallResult): boolean;
 /**

package/dist/internal/mcp-host.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-host.d.ts","sourceRoot":"","sources":["../../src/internal/mcp-host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AASrB,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,YAAY,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAS9C;CACF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAE9E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAMvE;AAoBD;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACxF;AAED,qBAAa,OAAQ,YAAW,eAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,YAAY,WAAW,EAAE,oBAAoB,EAAE,EAI9C;IAED,gFAAgF;IAChF,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAErC;IAED;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI,CAEpD;IAED,KAAK,IAAI,MAAM,EAAE,CAEhB;IAEK,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAUlE;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,UAAU,EAAE,oBAAoB,GAAG,aAAa,CAwCtD;IAEK,QAAQ,CACZ,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACjC,OAAO,CAAC,iBAAiB,CAAC,CAa5B;IAEK,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5C;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAY3B;IAED;;;;;;;;OAQG;YACW,UAAU;IAcxB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;YAwBH,gBAAgB;IAc9B,OAAO,CAAC,iBAAiB;YASX,OAAO;CAGtB;AASD,+BAA+B;AAC/B,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAU9D;AAKD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,OAAO,GAAG,kBAAkB,GAAG,SAAS,CAqB3F"}
+{"version":3,"file":"mcp-host.d.ts","sourceRoot":"","sources":["../../src/internal/mcp-host.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,eAAe,EAEpB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AASrB,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,YAAY,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAS9C;CACF;AAED;;;;GAIG;AACH,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,YAAY,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAO/D;CACF;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,iBAAiB,CAE9E;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAMvE;AAoBD;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B,SAAS,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;CACxF;AAED,qBAAa,OAAQ,YAAW,eAAe;IAC7C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA2C;IAClE,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAmC;IAC3D,OAAO,CAAC,gBAAgB,CAAqB;IAE7C,YAAY,WAAW,EAAE,oBAAoB,EAAE,EAI9C;IAED,gFAAgF;IAChF,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAErC;IAED;;;OAGG;IACH,aAAa,CAAC,UAAU,EAAE,oBAAoB,GAAG,IAAI,CAEpD;IAED,KAAK,IAAI,MAAM,EAAE,CAEhB;IAEK,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC,CAUlE;IAED;;;;;;;;OAQG;IACH,MAAM,CAAC,UAAU,EAAE,oBAAoB,GAAG,aAAa,CAwCtD;IAEK,QAAQ,CACZ,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,EAChB,IAAI,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GACjC,OAAO,CAAC,iBAAiB,CAAC,CAa5B;IAEK,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAW5C;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAY3B;IAED;;;;;;;;OAQG;YACW,UAAU;IAcxB;;;;;OAKG;IACH,OAAO,CAAC,SAAS;YAwBH,gBAAgB;IAc9B,OAAO,CAAC,iBAAiB;YASX,OAAO;CAGtB;AASD,+BAA+B;AAC/B,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAU9D;AAKD;;;;;;;;;;;GAWG;AACH,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,OAAO,GAAG,kBAAkB,GAAG,SAAS,CAqB3F"}

package/dist/internal/mcp-host.js

@@ -29,6 +29,21 @@ export class McpNeedsAuthError extends Error {
         }
     }
 }
+/**
+ * A connection needs authorization and this channel cannot wait for a person
+ * to grant it. Not a {@link McpNeedsAuthError}, so the auth park does not
+ * retry it.
+ */
+export class McpReconnectError extends Error {
+    constructor(connection, message, cause) {
+        super(message);
+        this.name = "McpReconnectError";
+        this.connection = connection;
+        if (cause !== undefined) {
+            this.cause = cause;
+        }
+    }
+}
 export function isMcpNeedsAuthError(error) {
     return error instanceof McpNeedsAuthError;
 }

package/dist/internal/otel/collector.d.ts

@@ -28,6 +28,11 @@ export interface OtelCollector {
      * applied yet (dispatch is async).
      */
     runInTurn<T>(args: OtelTurnContext, fn: () => T | Promise<T>): Promise<T>;
+    /**
+     * Run `fn` inside the turn span when that turn is still open.
+     * Does not open a span.
+     */
+    runInOpenTurn<T>(args: OtelTurnContext, fn: () => T | Promise<T>): Promise<T>;
     /**
      * Run `fn` under the tool span so outbound inject sees that context.
      * Opens the turn / tool span if the event stream has not reached

package/dist/internal/otel/collector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E,0FAA0F;IAC1F,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;IAC7D,yEAAyE;IACzE,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACrF,mEAAmE;IACnE,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAChF;AAkBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAs1Bf"}
+{"version":3,"file":"collector.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/collector.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAcH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAGhE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAMhD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,OAAO,CAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,GAAG,IAAI,CAAC;IACzD,KAAK,IAAI,IAAI,CAAC;IACd;;;;;OAKG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E;;;OAGG;IACH,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC9E;;;;OAIG;IACH,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,eAAe,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAC1E,0FAA0F;IAC1F,UAAU,CAAC,IAAI,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,IAAI,CAAC;IAC7D,yEAAyE;IACzE,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;IACrF,mEAAmE;IACnE,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAChF;AAkBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAs2Bf"}

package/dist/internal/otel/collector.js

@@ -11,6 +11,7 @@ import { SeverityNumber } from "@opentelemetry/api-logs";
 import { classifyExpectedDeliveryFailure } from "../expected-delivery-failure.js";
 import { toolCallErrorMessage } from "../tool-result.js";
 import { attrs } from "./attrs.js";
+import { withConversationId } from "./conversation-span-processor.js";
 import { computerUseRequestAttrs, computerUseResultAttrs } from "./computer-use-attrs.js";
 import { classifyToolErrorText } from "./tool-error-class.js";
 const CONTENT_MAX = 2_048;
@@ -72,15 +73,23 @@ export function createOtelCollector(runtime, agentName, log) {
             if (!runtime.config.enabled) {
                 return Promise.resolve(fn());
             }
-            const span = ensureTurnSpan(args);
-            return context.with(trace.setSpan(context.active(), span), () => Promise.resolve(fn()));
+            return bindSpan(ensureTurnSpan(args), args.sessionId, fn);
+        },
+        runInOpenTurn(args, fn) {
+            if (!runtime.config.enabled) {
+                return Promise.resolve(fn());
+            }
+            const span = sessions.get(args.sessionId)?.turns.get(args.turnId)?.span;
+            if (span === undefined) {
+                return Promise.resolve(fn());
+            }
+            return bindSpan(span, args.sessionId, fn);
         },
         runInCall(args, fn) {
             if (!runtime.config.enabled) {
                 return Promise.resolve(fn());
             }
-            const span = ensureCallSpan(args);
-            return context.with(trace.setSpan(context.active(), span), () => Promise.resolve(fn()));
+            return bindSpan(ensureCallSpan(args), args.sessionId, fn);
         },
         startPhase(args, phase) {
             if (!runtime.config.enabled) {
@@ -247,6 +256,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 const turn = ensureTurn(event, session, startTime);
                 const span = turn?.tools.get(event.data.callId);
                 const status = event.data.isError ? "failure" : "success";
+                const failureReason = event.data.isError ? toolFailureReason(event.data.output) : undefined;
                 if (span !== undefined) {
                     span.setAttribute("cursor.tool.status", status);
                     span.setAttributes(attrs(computerUseResultAttrs(event.data)));
@@ -259,10 +269,10 @@ export function createOtelCollector(runtime, agentName, log) {
                         span.setAttribute("agent_sdk.tool_error_class", errorClass);
                         span.setStatus({
                             code: SpanStatusCode.ERROR,
-                            message: toolFailureReason(event.data.output) ?? "tool error",
+                            message: failureReason ?? "tool error",
                         });
                     }
-                    span.end(startTime);
+                    span.end(completedTime(event.data.completedAt) ?? startTime);
                     turn?.tools.delete(event.data.callId);
                     turn?.pendingToolErrors.delete(event.data.callId);
                 }
@@ -277,6 +287,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     "cursor.tool.name": event.data.toolName,
                     "cursor.tool.status": status,
                     "agent_sdk.call_id": event.data.callId,
+                    "agent_sdk.error_message": failureReason,
                 }));
                 // Direct callTool never emits turn.completed — close when idle.
                 if (turn !== undefined &&
@@ -564,6 +575,9 @@ export function createOtelCollector(runtime, agentName, log) {
     function ensureTurnSpan(args) {
         return ensureTurnState(args).span;
     }
+    function bindSpan(span, sessionId, fn) {
+        return context.with(withConversationId(trace.setSpan(context.active(), span), sessionId), () => Promise.resolve(fn()));
+    }
     function ensureCallSpan(args) {
         const turn = ensureTurnState(args);
         return openToolSpan({
@@ -727,6 +741,13 @@ function truncate(value, max = CONTENT_MAX) {
     }
     return `${value.slice(0, max)}…`;
 }
+function completedTime(completedAt) {
+    if (completedAt === undefined) {
+        return undefined;
+    }
+    const parsed = Date.parse(completedAt);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
 function toolFailureReason(output) {
     const summary = toolCallErrorMessage(output);
     if (summary === undefined) {

package/dist/internal/otel/config.d.ts

@@ -1,7 +1,36 @@
 /**
- * Merge authored `defineOtel`, `serve({ otel })`, and standard OTel env.
+ * Standard `OTEL_*` variables for export. There is no instrumentation file.
  */
-import { type OtelConfig, type OtelDefinition, type OtelExporterConfig, type OtelLogOptions, type OtelMetricOptions, type OtelSignal, type OtelTraceOptions } from "../../otel.js";
+export type OtelSignal = "traces" | "metrics" | "logs";
+/**
+ * `service.name` when no agent name, `OTEL_SERVICE_NAME`, or
+ * `service.name` resource attribute is set. Matches the SDK fallback.
+ */
+export declare const UNKNOWN_SERVICE_NAME = "unknown_service:node";
+/** One OTLP destination. Multiple entries fan out. */
+export interface OtelExporterConfig {
+    url: string;
+    headers?: Record<string, string>;
+    protocol?: "http/json" | "http/protobuf";
+    signals?: OtelSignal[];
+    /** The URL is a signal endpoint. Use it as written. Do not append `/v1/<signal>`. */
+    literalUrl?: boolean;
+}
+export interface OtelTraceOptions {
+    sampleRatio?: number;
+}
+export interface OtelMetricOptions {
+    exportIntervalMillis?: number;
+}
+export interface OtelLogOptions {
+    userPrompts?: boolean;
+    toolContent?: boolean;
+}
+export type MetricsTemporality = "cumulative" | "delta" | "lowmemory";
+export interface ResolvedOtelMetrics extends OtelMetricOptions {
+    temporality: MetricsTemporality;
+    unrecognizedTemporality?: string;
+}
 export interface ResolvedOtelConfig {
     enabled: boolean;
     serviceName: string;
@@ -9,28 +38,14 @@ export interface ResolvedOtelConfig {
     resourceAttributes: Record<string, string>;
     exporters: OtelExporterConfig[];
     traces: false | OtelTraceOptions;
-    metrics: false | OtelMetricOptions;
+    metrics: false | ResolvedOtelMetrics;
     logs: false | OtelLogOptions;
+    warnings: string[];
 }
-/**
- * Process-global authored config. OTel SDK is one per serve process — if
- * several mounts ship `agent/otel.ts`, they must be identical.
- */
-export declare function pickAuthoredOtel(mounts: ReadonlyArray<{
-    slug: string;
-    name: string;
-    otel?: OtelDefinition;
-}>): OtelDefinition | undefined;
-/**
- * Resolve effective config.
- *
- * Precedence: `serve({ otel: false })` disables; otherwise merge
- * `serve({ otel })` over `defineOtel` over env defaults.
- */
-export declare function resolveOtelConfig(input: {
-    authored?: OtelConfig;
-    serve?: OtelConfig | false;
+/** Resolve export from `OTEL_EXPORTER_OTLP_*`. No endpoint means disabled. */
+export declare function resolveOtelConfig(input?: {
     env?: NodeJS.ProcessEnv;
+    defaultServiceName?: string;
 }): ResolvedOtelConfig;
 /** Values are URL-encoded per the OTel spec (`Authorization=Basic%20...`). */
 export declare function parseOtelHeaders(raw: string | undefined): Record<string, string>;
@@ -38,7 +53,7 @@ export declare function parseOtelHeaders(raw: string | undefined): Record<string
 export declare function stripSignalPath(url: string): string;
 /** Exporters that apply to one signal (honors per-exporter `signals`). */
 export declare function exportersForSignal(exporters: readonly OtelExporterConfig[], signal: OtelSignal): OtelExporterConfig[];
-export declare function disabledOtelConfig(): ResolvedOtelConfig;
+export declare function disabledOtelConfig(defaultServiceName?: string): ResolvedOtelConfig;
 /** Canonical JSON with sorted keys, so object key order does not change the result. */
 export declare function stableJson(value: unknown): string;
 //# sourceMappingURL=config.d.ts.map

package/dist/internal/otel/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,kBAAkB,EACvB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,UAAU,EACf,KAAK,gBAAgB,EAEtB,MAAM,eAAe,CAAC;AAEvB,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,MAAM,EAAE,KAAK,GAAG,gBAAgB,CAAC;IACjC,OAAO,EAAE,KAAK,GAAG,iBAAiB,CAAC;IACnC,IAAI,EAAE,KAAK,GAAG,cAAc,CAAC;CAC9B;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,aAAa,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,cAAc,CAAA;CAAE,CAAC,GAC3E,cAAc,GAAG,SAAS,CAmB5B;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE;IACvC,QAAQ,CAAC,EAAE,UAAU,CAAC;IACtB,KAAK,CAAC,EAAE,UAAU,GAAG,KAAK,CAAC;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;CACzB,GAAG,kBAAkB,CAkDrB;AAED,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBhF;AAWD,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,MAAM,EAAE,UAAU,GACjB,kBAAkB,EAAE,CAItB;AAED,wBAAgB,kBAAkB,IAAI,kBAAkB,CAWvD;AA8GD,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAYjD"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvD;;;GAGG;AACH,eAAO,MAAM,oBAAoB,yBAAyB,CAAC;AAE3D,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,QAAQ,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC;IACzC,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,qFAAqF;IACrF,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,kBAAkB,GAAG,YAAY,GAAG,OAAO,GAAG,WAAW,CAAC;AAEtE,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC5D,WAAW,EAAE,kBAAkB,CAAC;IAChC,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3C,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAChC,MAAM,EAAE,KAAK,GAAG,gBAAgB,CAAC;IACjC,OAAO,EAAE,KAAK,GAAG,mBAAmB,CAAC;IACrC,IAAI,EAAE,KAAK,GAAG,cAAc,CAAC;IAC7B,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,8EAA8E;AAC9E,wBAAgB,iBAAiB,CAC/B,KAAK,GAAE;IAAE,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IAAC,kBAAkB,CAAC,EAAE,MAAM,CAAA;CAAO,GACnE,kBAAkB,CA6CpB;AAED,8EAA8E;AAC9E,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBhF;AAWD,mEAAmE;AACnE,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,0EAA0E;AAC1E,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,kBAAkB,EAAE,EACxC,MAAM,EAAE,UAAU,GACjB,kBAAkB,EAAE,CAItB;AAED,wBAAgB,kBAAkB,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,kBAAkB,CAYlF;AAiKD,uFAAuF;AACvF,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAYjD"}