@cursor/bdk 0.2.8 → 0.2.10

package/dist/internal/named-webhook-secret.js

@@ -0,0 +1,47 @@
+import { isSecretRef } from "../types.js";
+/**
+ * The omitted-`webhookSecret` fallback: a {@link SecretRef} naming `envName`,
+ * present only while that env var is non-empty at channel construction.
+ * Named rather than read so the fallback keeps the same route policy (and
+ * the same control-plane catch declaration) as an authored
+ * `{ secretName: envName }`.
+ */
+export function envSecretRef(envName) {
+    const value = process.env[envName]?.trim();
+    return value === undefined || value === "" ? undefined : { secretName: envName };
+}
+/**
+ * The secret's value for the handler's own check. A named secret resolves
+ * from the environment: locally the shell's, hosted the bound deployment
+ * secrets. Empty and whitespace-only values count as unset.
+ */
+export function resolveWebhookSecretValue(value) {
+    if (value === undefined) {
+        return undefined;
+    }
+    const resolved = typeof value === "function"
+        ? value()
+        : isSecretRef(value)
+            ? process.env[value.secretName]
+            : value;
+    const trimmed = resolved?.trim();
+    return trimmed === undefined || trimmed === "" ? undefined : trimmed;
+}
+/**
+ * Why an SCM channel cannot deploy onto architecture v2 as authored, or
+ * `undefined` when it can. v2 terminates the provider's webhook check on
+ * the control plane, which can only do that for a secret it can name: a
+ * literal or getter value never reaches the manifest, so the check would
+ * run inside the guest only — after compute was spent and after the SCM
+ * already got its 202. Omitting the field (the env fallback) is allowed.
+ */
+export function namedWebhookSecretArchitectureError(args) {
+    if (args.webhookSecret === undefined || isSecretRef(args.webhookSecret)) {
+        return undefined;
+    }
+    const authored = typeof args.webhookSecret === "function" ? "a function" : "a literal value";
+    return (`${args.option} is ${authored}; architecture "v2" requires a named secret: ` +
+        `{ secretName: "${args.envName}" }. The control plane verifies ${args.verifies} with ` +
+        `the deployment secret of that name before any compute starts; a literal or function value is ` +
+        `only checkable inside the guest. Set the value with \`secrets set <slug> ${args.envName}\`.`);
+}

package/dist/internal/open-browser.js

@@ -4,12 +4,11 @@
 import { spawn } from "node:child_process";
 import { join } from "node:path";
 export function openBrowser(url) {
-    var _a;
     const command = process.platform === "darwin"
         ? { cmd: "open", args: [url] }
         : process.platform === "win32"
             ? {
-                cmd: join((_a = process.env.SYSTEMROOT) !== null && _a !== void 0 ? _a : "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe"),
+                cmd: join(process.env.SYSTEMROOT ?? "C:\\Windows", "System32", "WindowsPowerShell", "v1.0", "powershell.exe"),
                 args: [
                     "-NoProfile",
                     "-NonInteractive",
@@ -28,7 +27,7 @@ export function openBrowser(url) {
         child.on("error", () => { });
         child.unref();
     }
-    catch (_b) {
+    catch {
         // Printed URL is the fallback.
     }
 }

package/dist/internal/otel/collector.js

@@ -10,7 +10,7 @@ import { context, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace, } from "@opente
 import { SeverityNumber } from "@opentelemetry/api-logs";
 import { classifyExpectedDeliveryFailure } from "../expected-delivery-failure.js";
 import { attrs } from "./attrs.js";
-const CONTENT_MAX = 2048;
+const CONTENT_MAX = 2_048;
 export function createOtelCollector(runtime, agentName, log) {
     const sessions = new Map();
     const extraBySession = new Map();
@@ -37,15 +37,14 @@ export function createOtelCollector(runtime, agentName, log) {
             extraBySession.clear();
         },
         setSessionAttributes(sessionId, attributes) {
-            var _a;
-            const bag = (_a = extraBySession.get(sessionId)) !== null && _a !== void 0 ? _a : {};
+            const bag = extraBySession.get(sessionId) ?? {};
             Object.assign(bag, attributes);
             extraBySession.set(sessionId, bag);
             paintOpenSpans(sessionId, attributes);
         },
         getSessionAttributes(sessionId) {
             const bag = extraBySession.get(sessionId);
-            return bag === undefined ? undefined : Object.assign({}, bag);
+            return bag === undefined ? undefined : { ...bag };
         },
         runInTurn(args, fn) {
             const span = ensureTurnSpan(args);
@@ -57,8 +56,6 @@ export function createOtelCollector(runtime, agentName, log) {
         },
     };
     function handle(event, session) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
-        var _q, _r, _s, _t;
         const at = Date.parse(event.at);
         const startTime = Number.isFinite(at) ? at : undefined;
         switch (event.type) {
@@ -67,7 +64,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     return;
                 }
                 sessionState(event.sessionId);
-                metrics === null || metrics === void 0 ? void 0 : metrics.sessions.add(1, join(event.sessionId, {
+                metrics?.sessions.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.channel": event.data.channelId,
                 }));
@@ -76,19 +73,22 @@ export function createOtelCollector(runtime, agentName, log) {
             case "agent.bound": {
                 const painted = attrs({
                     "agent_sdk.sdk_agent_id": event.data.sdkAgentId,
-                    "agent_sdk.sdk_agent_url": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true ? event.data.url : undefined,
+                    "agent_sdk.sdk_agent_url": logOpts?.toolContent === true ? event.data.url : undefined,
                 });
                 if (Object.keys(painted).length === 0) {
                     return;
                 }
-                const bag = (_q = extraBySession.get(event.sessionId)) !== null && _q !== void 0 ? _q : {};
+                const bag = extraBySession.get(event.sessionId) ?? {};
                 Object.assign(bag, painted);
                 extraBySession.set(event.sessionId, bag);
                 paintOpenSpans(event.sessionId, painted);
                 return;
             }
             case "message.received": {
-                emitLog("message.received", SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "agent_sdk.user_prompt": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.userPrompts) === true ? truncate(event.data.text) : undefined })));
+                emitLog("message.received", SeverityNumber.INFO, attrs({
+                    ...baseLog(event, session),
+                    "agent_sdk.user_prompt": logOpts?.userPrompts === true ? truncate(event.data.text) : undefined,
+                }));
                 return;
             }
             case "turn.started": {
@@ -117,21 +117,21 @@ export function createOtelCollector(runtime, agentName, log) {
             }
             case "step.started":
             case "step.completed": {
-                (_a = ensureTurn(event, session, startTime)) === null || _a === void 0 ? void 0 : _a.span.addEvent(event.type, attrs({
+                ensureTurn(event, session, startTime)?.span.addEvent(event.type, attrs({
                     "agent_sdk.step_id": event.data.stepId,
                     "agent_sdk.duration_ms": event.type === "step.completed" ? event.data.durationMs : undefined,
                 }), startTime);
                 return;
             }
             case "reasoning.completed": {
-                (_b = ensureTurn(event, session, startTime)) === null || _b === void 0 ? void 0 : _b.span.addEvent("reasoning.completed", attrs({
+                ensureTurn(event, session, startTime)?.span.addEvent("reasoning.completed", attrs({
                     "agent_sdk.duration_ms": event.data.durationMs,
                     "agent_sdk.parent_call_id": event.data.parentCallId,
                 }), startTime);
                 return;
             }
             case "message.completed": {
-                (_c = ensureTurn(event, session, startTime)) === null || _c === void 0 ? void 0 : _c.span.addEvent("message.completed", attrs({
+                ensureTurn(event, session, startTime)?.span.addEvent("message.completed", attrs({
                     "agent_sdk.finish_reason": event.data.finishReason,
                     "agent_sdk.parent_call_id": event.data.parentCallId,
                 }), startTime);
@@ -148,31 +148,48 @@ export function createOtelCollector(runtime, agentName, log) {
                         sessionId: event.sessionId,
                         turnId: event.turnId,
                         call,
-                        parentCallId: (_r = event.data.parentCallId) !== null && _r !== void 0 ? _r : call.parentCallId,
+                        parentCallId: event.data.parentCallId ?? call.parentCallId,
                         startTime,
                     });
                 }
                 return;
             }
             case "action.approval_requested": {
-                (_e = (_d = ensureTurn(event, session, startTime)) === null || _d === void 0 ? void 0 : _d.tools.get(event.data.callId)) === null || _e === void 0 ? void 0 : _e.addEvent("approval_requested", undefined, startTime);
-                emitLog("action.approval_requested", SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "cursor.tool.name": event.data.toolName, "agent_sdk.call_id": event.data.callId })));
+                ensureTurn(event, session, startTime)
+                    ?.tools.get(event.data.callId)
+                    ?.addEvent("approval_requested", undefined, startTime);
+                emitLog("action.approval_requested", SeverityNumber.INFO, attrs({
+                    ...baseLog(event, session),
+                    "cursor.tool.name": event.data.toolName,
+                    "agent_sdk.call_id": event.data.callId,
+                }));
                 return;
             }
             case "action.approval_resolved": {
-                (_g = (_f = ensureTurn(event, session, startTime)) === null || _f === void 0 ? void 0 : _f.tools.get(event.data.callId)) === null || _g === void 0 ? void 0 : _g.addEvent("approval_resolved", attrs({
+                ensureTurn(event, session, startTime)
+                    ?.tools.get(event.data.callId)
+                    ?.addEvent("approval_resolved", attrs({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                 }), startTime);
                 return;
             }
             case "action.auth_requested": {
-                (_j = (_h = ensureTurn(event, session, startTime)) === null || _h === void 0 ? void 0 : _h.tools.get(event.data.callId)) === null || _j === void 0 ? void 0 : _j.addEvent("auth_requested", undefined, startTime);
-                emitLog("action.auth_requested", SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "cursor.tool.name": event.data.toolName, "agent_sdk.call_id": event.data.callId, "agent_sdk.mcp_connection": event.data.connection })));
+                ensureTurn(event, session, startTime)
+                    ?.tools.get(event.data.callId)
+                    ?.addEvent("auth_requested", undefined, startTime);
+                emitLog("action.auth_requested", SeverityNumber.INFO, attrs({
+                    ...baseLog(event, session),
+                    "cursor.tool.name": event.data.toolName,
+                    "agent_sdk.call_id": event.data.callId,
+                    "agent_sdk.mcp_connection": event.data.connection,
+                }));
                 return;
             }
             case "action.auth_resolved": {
-                (_l = (_k = ensureTurn(event, session, startTime)) === null || _k === void 0 ? void 0 : _k.tools.get(event.data.callId)) === null || _l === void 0 ? void 0 : _l.addEvent("auth_resolved", attrs({
+                ensureTurn(event, session, startTime)
+                    ?.tools.get(event.data.callId)
+                    ?.addEvent("auth_resolved", attrs({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                     "agent_sdk.mcp_connection": event.data.connection,
@@ -181,11 +198,11 @@ export function createOtelCollector(runtime, agentName, log) {
             }
             case "action.result": {
                 const turn = ensureTurn(event, session, startTime);
-                const span = turn === null || turn === void 0 ? void 0 : turn.tools.get(event.data.callId);
+                const span = turn?.tools.get(event.data.callId);
                 const status = event.data.isError ? "failure" : "success";
                 if (span !== undefined) {
                     span.setAttribute("cursor.tool.status", status);
-                    if ((logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && event.data.output !== undefined) {
+                    if (logOpts?.toolContent === true && event.data.output !== undefined) {
                         span.setAttribute("agent_sdk.tool_output", truncate(json(event.data.output)));
                     }
                     if (event.data.isError) {
@@ -195,15 +212,20 @@ export function createOtelCollector(runtime, agentName, log) {
                         });
                     }
                     span.end(startTime);
-                    turn === null || turn === void 0 ? void 0 : turn.tools.delete(event.data.callId);
+                    turn?.tools.delete(event.data.callId);
                 }
-                metrics === null || metrics === void 0 ? void 0 : metrics.toolCalls.add(1, join(event.sessionId, {
+                metrics?.toolCalls.add(1, join(event.sessionId, {
                     "cursor.tool.name": event.data.toolName,
                     "cursor.tool.kind": "builtin",
                     "cursor.tool.status": status,
                     "agent_sdk.agent": agentName,
                 }));
-                emitLog("action.result", event.data.isError ? SeverityNumber.ERROR : SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "cursor.tool.name": event.data.toolName, "cursor.tool.status": status, "agent_sdk.call_id": event.data.callId })));
+                emitLog("action.result", event.data.isError ? SeverityNumber.ERROR : SeverityNumber.INFO, attrs({
+                    ...baseLog(event, session),
+                    "cursor.tool.name": event.data.toolName,
+                    "cursor.tool.status": status,
+                    "agent_sdk.call_id": event.data.callId,
+                }));
                 // Direct callTool never emits turn.completed — close when idle.
                 if (turn !== undefined &&
                     turn.synthetic &&
@@ -212,7 +234,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     event.turnId !== undefined) {
                     turn.span.setStatus({ code: SpanStatusCode.OK });
                     turn.span.end(startTime);
-                    (_m = sessions.get(event.sessionId)) === null || _m === void 0 ? void 0 : _m.turns.delete(event.turnId);
+                    sessions.get(event.sessionId)?.turns.delete(event.turnId);
                 }
                 return;
             }
@@ -230,24 +252,24 @@ export function createOtelCollector(runtime, agentName, log) {
                         "agent_sdk.turn_id": event.turnId,
                         "agent_sdk.call_id": event.data.callId,
                         "agent_sdk.subagent_name": event.data.name,
-                        "agent_sdk.subagent_description": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && event.data.description !== undefined
+                        "agent_sdk.subagent_description": logOpts?.toolContent === true && event.data.description !== undefined
                             ? truncate(event.data.description)
                             : undefined,
                     }),
                 }, trace.setSpan(context.active(), turn.span));
                 turn.subagents.set(event.data.callId, span);
-                metrics === null || metrics === void 0 ? void 0 : metrics.subagents.add(1, join(event.sessionId, {
+                metrics?.subagents.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
-                    "agent_sdk.subagent_name": (_s = event.data.name) !== null && _s !== void 0 ? _s : "unknown",
+                    "agent_sdk.subagent_name": event.data.name ?? "unknown",
                 }));
                 return;
             }
             case "subagent.completed": {
                 const turn = ensureTurn(event, session, startTime);
-                const span = turn === null || turn === void 0 ? void 0 : turn.subagents.get(event.data.callId);
+                const span = turn?.subagents.get(event.data.callId);
                 if (span !== undefined) {
                     span.end(startTime);
-                    turn === null || turn === void 0 ? void 0 : turn.subagents.delete(event.data.callId);
+                    turn?.subagents.delete(event.data.callId);
                 }
                 return;
             }
@@ -291,19 +313,25 @@ export function createOtelCollector(runtime, agentName, log) {
                         "agent_sdk.cost_usd": cost.totalUsd,
                         "agent_sdk.cost_source": cost.source,
                     }));
-                    metrics === null || metrics === void 0 ? void 0 : metrics.cost.add(cost.totalUsd, join(event.sessionId, {
+                    metrics?.cost.add(cost.totalUsd, join(event.sessionId, {
                         "cursor.model.name": cost.model,
                         "agent_sdk.agent": agentName,
                     }));
                 }
                 turn.span.setStatus({ code: SpanStatusCode.OK });
                 turn.span.end(startTime);
-                (_o = sessions.get(event.sessionId)) === null || _o === void 0 ? void 0 : _o.turns.delete(event.turnId);
-                metrics === null || metrics === void 0 ? void 0 : metrics.turns.add(1, join(event.sessionId, {
+                sessions.get(event.sessionId)?.turns.delete(event.turnId);
+                metrics?.turns.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.turn_status": "completed",
                 }));
-                emitLog("turn.completed", SeverityNumber.INFO, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "agent_sdk.usage.input_tokens": usage === null || usage === void 0 ? void 0 : usage.inputTokens, "agent_sdk.usage.output_tokens": usage === null || usage === void 0 ? void 0 : usage.outputTokens, "agent_sdk.cost_usd": cost === null || cost === void 0 ? void 0 : cost.totalUsd, "cursor.model.name": cost === null || cost === void 0 ? void 0 : cost.model })));
+                emitLog("turn.completed", SeverityNumber.INFO, attrs({
+                    ...baseLog(event, session),
+                    "agent_sdk.usage.input_tokens": usage?.inputTokens,
+                    "agent_sdk.usage.output_tokens": usage?.outputTokens,
+                    "agent_sdk.cost_usd": cost?.totalUsd,
+                    "cursor.model.name": cost?.model,
+                }));
                 return;
             }
             case "turn.failed": {
@@ -326,19 +354,23 @@ export function createOtelCollector(runtime, agentName, log) {
                 else {
                     turn.span.setStatus({
                         code: SpanStatusCode.ERROR,
-                        message: failureText !== null && failureText !== void 0 ? failureText : "turn failed",
+                        message: failureText ?? "turn failed",
                     });
                     if (failureText !== undefined) {
                         turn.span.recordException(new Error(failureText));
                     }
                 }
                 turn.span.end(startTime);
-                (_p = sessions.get(event.sessionId)) === null || _p === void 0 ? void 0 : _p.turns.delete(event.turnId);
-                metrics === null || metrics === void 0 ? void 0 : metrics.turns.add(1, join(event.sessionId, {
+                sessions.get(event.sessionId)?.turns.delete(event.turnId);
+                metrics?.turns.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
-                    "agent_sdk.turn_status": expected !== null && expected !== void 0 ? expected : "failed",
+                    "agent_sdk.turn_status": expected ?? "failed",
+                }));
+                emitLog("turn.failed", expected === undefined ? SeverityNumber.ERROR : SeverityNumber.WARN, attrs({
+                    ...baseLog(event, session),
+                    "agent_sdk.error_message": failureText,
+                    "agent_sdk.expected_error": expected,
                 }));
-                emitLog("turn.failed", expected === undefined ? SeverityNumber.ERROR : SeverityNumber.WARN, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "agent_sdk.error_message": failureText, "agent_sdk.expected_error": expected })));
                 return;
             }
             case "session.completed": {
@@ -355,17 +387,21 @@ export function createOtelCollector(runtime, agentName, log) {
                 const failureText = gatedContent(event.data.message);
                 if (expected !== undefined) {
                     const state = sessions.get(event.sessionId);
-                    for (const turn of (_t = state === null || state === void 0 ? void 0 : state.turns.values()) !== null && _t !== void 0 ? _t : []) {
+                    for (const turn of state?.turns.values() ?? []) {
                         turn.span.setAttribute("agent_sdk.expected_error", expected);
                     }
                 }
                 endSession({
                     sessionId: event.sessionId,
                     code: expected === undefined ? SpanStatusCode.ERROR : SpanStatusCode.OK,
-                    message: expected === undefined ? (failureText !== null && failureText !== void 0 ? failureText : "session failed") : undefined,
+                    message: expected === undefined ? (failureText ?? "session failed") : undefined,
                     endTime: startTime,
                 });
-                emitLog("session.failed", expected === undefined ? SeverityNumber.ERROR : SeverityNumber.WARN, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "agent_sdk.error_message": failureText, "agent_sdk.expected_error": expected })));
+                emitLog("session.failed", expected === undefined ? SeverityNumber.ERROR : SeverityNumber.WARN, attrs({
+                    ...baseLog(event, session),
+                    "agent_sdk.error_message": failureText,
+                    "agent_sdk.expected_error": expected,
+                }));
                 return;
             }
             default:
@@ -404,7 +440,6 @@ export function createOtelCollector(runtime, agentName, log) {
         });
     }
     function openTurn(args) {
-        var _a;
         const span = runtime.tracer.startSpan("agent_sdk.turn", {
             kind: SpanKind.INTERNAL,
             startTime: args.startTime,
@@ -414,7 +449,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 "agent_sdk.turn_id": args.turnId,
                 "agent_sdk.channel": args.session.channelId,
                 "agent_sdk.session_mode": args.session.mode,
-                "agent_sdk.session_purpose": (_a = args.session.purpose) !== null && _a !== void 0 ? _a : "live",
+                "agent_sdk.session_purpose": args.session.purpose ?? "live",
                 "agent_sdk.turn_synthetic": args.synthetic ? true : undefined,
             }),
         }, ROOT_CONTEXT);
@@ -437,7 +472,6 @@ export function createOtelCollector(runtime, agentName, log) {
         return trace.setSpan(context.active(), turn.span);
     }
     function openToolSpan(args) {
-        var _a, _b;
         const existing = args.turn.tools.get(args.call.callId);
         if (existing !== undefined) {
             // Early `runInCall` opens with callId/toolName only. Fill in
@@ -445,8 +479,8 @@ export function createOtelCollector(runtime, agentName, log) {
             // The OTel parent is fixed at start; `parent_call_id` still records
             // the event-stream hierarchy for nested/subagent calls.
             existing.setAttributes(join(args.sessionId, {
-                "agent_sdk.parent_call_id": (_a = args.parentCallId) !== null && _a !== void 0 ? _a : args.call.parentCallId,
-                "agent_sdk.tool_args": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && args.call.args !== undefined
+                "agent_sdk.parent_call_id": args.parentCallId ?? args.call.parentCallId,
+                "agent_sdk.tool_args": logOpts?.toolContent === true && args.call.args !== undefined
                     ? truncate(json(args.call.args))
                     : undefined,
             }));
@@ -463,26 +497,26 @@ export function createOtelCollector(runtime, agentName, log) {
                 "agent_sdk.turn_id": args.turnId,
                 "agent_sdk.call_id": args.call.callId,
                 "agent_sdk.parent_call_id": args.call.parentCallId,
-                "agent_sdk.tool_args": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && args.call.args !== undefined
+                "agent_sdk.tool_args": logOpts?.toolContent === true && args.call.args !== undefined
                     ? truncate(json(args.call.args))
                     : undefined,
             }),
-        }, parentCtxFor(args.turn, (_b = args.parentCallId) !== null && _b !== void 0 ? _b : args.call.parentCallId));
+        }, parentCtxFor(args.turn, args.parentCallId ?? args.call.parentCallId));
         args.turn.tools.set(args.call.callId, span);
         return span;
     }
     function ensureTurnState(args) {
-        var _a;
         const startTime = Date.now();
         const state = sessionState(args.sessionId);
-        return ((_a = state.turns.get(args.turnId)) !== null && _a !== void 0 ? _a : openTurn({
-            state,
-            sessionId: args.sessionId,
-            turnId: args.turnId,
-            session: args.session,
-            startTime,
-            synthetic: true,
-        }));
+        return (state.turns.get(args.turnId) ??
+            openTurn({
+                state,
+                sessionId: args.sessionId,
+                turnId: args.turnId,
+                session: args.session,
+                startTime,
+                synthetic: true,
+            }));
     }
     function ensureTurnSpan(args) {
         return ensureTurnState(args).span;
@@ -527,11 +561,15 @@ export function createOtelCollector(runtime, agentName, log) {
         extraBySession.delete(args.sessionId);
     }
     function extra(sessionId) {
-        var _a;
-        return (_a = extraBySession.get(sessionId)) !== null && _a !== void 0 ? _a : {};
+        return extraBySession.get(sessionId) ?? {};
     }
     function join(sessionId, rest) {
-        return attrs(Object.assign(Object.assign(Object.assign({}, extra(sessionId)), { "cursor.conversation.id": sessionId, "agent_sdk.session_id": sessionId }), rest));
+        return attrs({
+            ...extra(sessionId),
+            "cursor.conversation.id": sessionId,
+            "agent_sdk.session_id": sessionId,
+            ...rest,
+        });
     }
     function paintOpenSpans(sessionId, incoming) {
         const state = sessions.get(sessionId);
@@ -581,7 +619,7 @@ export function createOtelCollector(runtime, agentName, log) {
     }
     /** Content opt-in for failure text (same gate as tool payloads). */
     function gatedContent(value) {
-        if ((logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) !== true) {
+        if (logOpts?.toolContent !== true) {
             return undefined;
         }
         return truncate(value);
@@ -596,8 +634,7 @@ export function createOtelCollector(runtime, agentName, log) {
         };
     }
     function emitLog(eventName, severity, attributes) {
-        var _a;
-        (_a = runtime.logger) === null || _a === void 0 ? void 0 : _a.emit({
+        runtime.logger?.emit({
             body: eventName,
             severityNumber: severity,
             attributes,
@@ -640,11 +677,10 @@ function truncate(value) {
     return `${value.slice(0, CONTENT_MAX)}…`;
 }
 function json(value) {
-    var _a;
     try {
-        return (_a = JSON.stringify(value)) !== null && _a !== void 0 ? _a : String(value);
+        return JSON.stringify(value) ?? String(value);
     }
-    catch (_b) {
+    catch {
         return String(value);
     }
 }

package/dist/internal/otel/config.js

@@ -1,17 +1,6 @@
 /**
  * Merge authored `defineOtel`, `serve({ otel })`, and standard OTel env.
  */
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { resolveOtelDefinition } from "../../otel.js";
 /**
  * Process-global authored config. OTel SDK is one per serve process — if
@@ -40,21 +29,23 @@ export function pickAuthoredOtel(mounts) {
  * `serve({ otel })` over `defineOtel` over env defaults.
  */
 export function resolveOtelConfig(input) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    const env = (_a = input.env) !== null && _a !== void 0 ? _a : process.env;
+    const env = input.env ?? process.env;
     if (input.serve === false) {
         return disabled();
     }
     const authored = input.authored === undefined ? {} : resolveOtelDefinition(input.authored);
     const serve = input.serve === undefined ? {} : input.serve;
     const merged = {
-        serviceName: (_b = serve.serviceName) !== null && _b !== void 0 ? _b : authored.serviceName,
-        serviceVersion: (_c = serve.serviceVersion) !== null && _c !== void 0 ? _c : authored.serviceVersion,
-        resourceAttributes: Object.assign(Object.assign({}, authored.resourceAttributes), serve.resourceAttributes),
-        exporters: (_d = serve.exporters) !== null && _d !== void 0 ? _d : authored.exporters,
-        traces: (_e = serve.traces) !== null && _e !== void 0 ? _e : authored.traces,
-        metrics: (_f = serve.metrics) !== null && _f !== void 0 ? _f : authored.metrics,
-        logs: (_g = serve.logs) !== null && _g !== void 0 ? _g : authored.logs,
+        serviceName: serve.serviceName ?? authored.serviceName,
+        serviceVersion: serve.serviceVersion ?? authored.serviceVersion,
+        resourceAttributes: {
+            ...authored.resourceAttributes,
+            ...serve.resourceAttributes,
+        },
+        exporters: serve.exporters ?? authored.exporters,
+        traces: serve.traces ?? authored.traces,
+        metrics: serve.metrics ?? authored.metrics,
+        logs: serve.logs ?? authored.logs,
     };
     const envExporters = exportersFromEnv(env);
     const exporters = merged.exporters !== undefined && merged.exporters.length > 0
@@ -72,9 +63,9 @@ export function resolveOtelConfig(input) {
     }
     return {
         enabled: traces !== false || metrics !== false || logs !== false,
-        serviceName: (_j = (_h = merged.serviceName) !== null && _h !== void 0 ? _h : env.OTEL_SERVICE_NAME) !== null && _j !== void 0 ? _j : "cursor",
+        serviceName: merged.serviceName ?? env.OTEL_SERVICE_NAME ?? "cursor",
         serviceVersion: merged.serviceVersion,
-        resourceAttributes: (_k = merged.resourceAttributes) !== null && _k !== void 0 ? _k : {},
+        resourceAttributes: merged.resourceAttributes ?? {},
         exporters,
         traces,
         metrics,
@@ -126,11 +117,10 @@ function disabled() {
  * signal (OTel env spec).
  */
 function exportersFromEnv(env) {
-    var _a, _b, _c, _d;
-    const base = (_a = env.OTEL_EXPORTER_OTLP_ENDPOINT) === null || _a === void 0 ? void 0 : _a.trim();
-    const traces = (_b = env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) === null || _b === void 0 ? void 0 : _b.trim();
-    const metrics = (_c = env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT) === null || _c === void 0 ? void 0 : _c.trim();
-    const logs = (_d = env.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT) === null || _d === void 0 ? void 0 : _d.trim();
+    const base = env.OTEL_EXPORTER_OTLP_ENDPOINT?.trim();
+    const traces = env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT?.trim();
+    const metrics = env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT?.trim();
+    const logs = env.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT?.trim();
     const protocol = protocolFromEnv(env.OTEL_EXPORTER_OTLP_PROTOCOL);
     const headers = parseOtelHeaders(env.OTEL_EXPORTER_OTLP_HEADERS);
     if (nonEmpty(base)) {
@@ -154,17 +144,16 @@ function pushSignalExporter(out, raw, signal, headers, protocol) {
     });
 }
 function withEnvHeaders(exporter, env) {
-    var _a;
     const envHeaders = parseOtelHeaders(env.OTEL_EXPORTER_OTLP_HEADERS);
     return {
         url: stripSignalPath(exporter.url),
-        headers: Object.assign(Object.assign({}, envHeaders), exporter.headers),
-        protocol: (_a = exporter.protocol) !== null && _a !== void 0 ? _a : protocolFromEnv(env.OTEL_EXPORTER_OTLP_PROTOCOL),
+        headers: { ...envHeaders, ...exporter.headers },
+        protocol: exporter.protocol ?? protocolFromEnv(env.OTEL_EXPORTER_OTLP_PROTOCOL),
         signals: exporter.signals,
     };
 }
 function protocolFromEnv(raw) {
-    const v = raw === null || raw === void 0 ? void 0 : raw.trim().toLowerCase();
+    const v = raw?.trim().toLowerCase();
     if (v === "http/json" || v === "json") {
         return "http/json";
     }
@@ -181,7 +170,6 @@ function resolveSignal(value) {
     return value;
 }
 function resolveLogs(value, env) {
-    var _a, _b;
     if (value === false) {
         return false;
     }
@@ -199,18 +187,17 @@ function resolveLogs(value, env) {
         return { userPrompts: envPrompts, toolContent: envTools };
     }
     return {
-        userPrompts: (_a = value.userPrompts) !== null && _a !== void 0 ? _a : envPrompts,
-        toolContent: (_b = value.toolContent) !== null && _b !== void 0 ? _b : envTools,
+        userPrompts: value.userPrompts ?? envPrompts,
+        toolContent: value.toolContent ?? envTools,
     };
 }
 /** `OTEL_LOGS_EXPORTER=none` (or unset) must not enable log export. */
 function logsExporterOptIn(env) {
-    var _a;
-    const raw = (_a = env.OTEL_LOGS_EXPORTER) === null || _a === void 0 ? void 0 : _a.trim().toLowerCase();
+    const raw = env.OTEL_LOGS_EXPORTER?.trim().toLowerCase();
     return raw !== undefined && raw.length > 0 && raw !== "none";
 }
 function stableConfigKey(def) {
-    const { __agentServe: _brand } = def, rest = __rest(def, ["__agentServe"]);
+    const { __agentServe: _brand, ...rest } = def;
     return stable(rest);
 }
 function stable(value) {