@cursor/july 0.1.101 → 0.1.103

package/dist/internal/otel/collector.js

@@ -6,7 +6,7 @@
  * `cursor.cost.usage`, `cursor.model.name`) so Agent SDK traces join org
  * metrics/logs in the same collector. Agent-SDK-only fields use `agent_sdk.*`.
  */
-import { context, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
+import { context, ROOT_CONTEXT, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
 import { SeverityNumber } from "@opentelemetry/api-logs";
 import { attrs } from "./attrs.js";
 const CONTENT_MAX = 2048;
@@ -26,8 +26,11 @@ export function createOtelCollector(runtime, agentName, log) {
         },
         close() {
             for (const [sessionId, state] of sessions) {
-                state.span.setStatus({ code: SpanStatusCode.UNSET });
-                state.span.end();
+                for (const turn of state.turns.values()) {
+                    endOpenChildren(turn, undefined);
+                    turn.span.setStatus({ code: SpanStatusCode.UNSET });
+                    turn.span.end();
+                }
                 sessions.delete(sessionId);
             }
             extraBySession.clear();
@@ -43,65 +46,64 @@ export function createOtelCollector(runtime, agentName, log) {
             const bag = extraBySession.get(sessionId);
             return bag === undefined ? undefined : Object.assign({}, bag);
         },
+        runInTurn(args, fn) {
+            const span = ensureTurnSpan(args);
+            return context.with(trace.setSpan(context.active(), span), () => Promise.resolve(fn()));
+        },
+        runInCall(args, fn) {
+            const span = ensureCallSpan(args);
+            return context.with(trace.setSpan(context.active(), span), () => Promise.resolve(fn()));
+        },
     };
     function handle(event, session) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-        var _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
+        var _q, _r, _s;
         const at = Date.parse(event.at);
         const startTime = Number.isFinite(at) ? at : undefined;
         switch (event.type) {
             case "session.started": {
-                openSession({
-                    sessionId: event.sessionId,
-                    session,
-                    channelId: event.data.channelId,
-                    startTime,
-                    restored: false,
-                });
+                if (sessions.has(event.sessionId)) {
+                    return;
+                }
+                sessionState(event.sessionId);
+                metrics === null || metrics === void 0 ? void 0 : metrics.sessions.add(1, join(event.sessionId, {
+                    "agent_sdk.agent": agentName,
+                    "agent_sdk.channel": event.data.channelId,
+                }));
                 return;
             }
             case "agent.bound": {
-                const state = ensureSession(event, session, startTime);
-                if (state === undefined) {
+                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,
+                });
+                if (Object.keys(painted).length === 0) {
                     return;
                 }
-                state.span.setAttribute("agent_sdk.sdk_agent_id", event.data.sdkAgentId);
-                // URL can identify a deployment; keep it off spans unless opted in.
-                if ((logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && event.data.url !== undefined) {
-                    state.span.setAttribute("agent_sdk.sdk_agent_url", event.data.url);
-                }
+                const bag = (_q = extraBySession.get(event.sessionId)) !== null && _q !== void 0 ? _q : {};
+                Object.assign(bag, painted);
+                extraBySession.set(event.sessionId, bag);
+                paintOpenSpans(event.sessionId, painted);
                 return;
             }
             case "message.received": {
-                const state = ensureSession(event, session, startTime);
-                if (state === undefined) {
-                    return;
-                }
-                state.span.addEvent("message.received", attrs({
-                    "agent_sdk.event": "message.received",
-                    "agent_sdk.user_prompt": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.userPrompts) === true
-                        ? truncate(event.data.text)
-                        : undefined,
-                }), startTime);
                 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 })));
                 return;
             }
-            case "turn.queued": {
-                (_a = ensureSession(event, session, startTime)) === null || _a === void 0 ? void 0 : _a.span.addEvent("turn.queued", attrs({
-                    "agent_sdk.turn_id": event.turnId,
-                    "agent_sdk.queue_position": event.data.position,
-                    "agent_sdk.max_running_turns": event.data.maxRunningTurns,
-                }), startTime);
-                return;
-            }
             case "turn.started": {
                 if (event.turnId === undefined) {
                     return;
                 }
-                const state = ensureSession(event, session, startTime);
-                if (state === undefined) {
+                const state = sessionState(event.sessionId);
+                // `runInCall` can open a synthetic turn before this event is
+                // applied. Keep that entry (and its in-flight tool spans) and
+                // just mark it real so `action.result` will not auto-close it.
+                const existing = state.turns.get(event.turnId);
+                if (existing !== undefined) {
+                    existing.synthetic = false;
+                    existing.span.setAttribute("agent_sdk.turn_synthetic", false);
                     return;
                 }
                 openTurn({
@@ -116,7 +118,7 @@ export function createOtelCollector(runtime, agentName, log) {
             }
             case "step.started":
             case "step.completed": {
-                (_b = ensureTurn(event, session, startTime)) === null || _b === void 0 ? void 0 : _b.span.addEvent(event.type, attrs({
+                (_a = ensureTurn(event, session, startTime)) === null || _a === void 0 ? void 0 : _a.span.addEvent(event.type, attrs({
                     "agent_sdk.step_id": event.data.stepId,
                     "agent_sdk.duration_ms": event.type === "step.completed"
                         ? event.data.durationMs
@@ -125,14 +127,14 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "reasoning.completed": {
-                (_c = ensureTurn(event, session, startTime)) === null || _c === void 0 ? void 0 : _c.span.addEvent("reasoning.completed", attrs({
+                (_b = ensureTurn(event, session, startTime)) === null || _b === void 0 ? void 0 : _b.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": {
-                (_d = ensureTurn(event, session, startTime)) === null || _d === void 0 ? void 0 : _d.span.addEvent("message.completed", attrs({
+                (_c = ensureTurn(event, session, startTime)) === null || _c === void 0 ? void 0 : _c.span.addEvent("message.completed", attrs({
                     "agent_sdk.finish_reason": event.data.finishReason,
                     "agent_sdk.parent_call_id": event.data.parentCallId,
                 }), startTime);
@@ -144,46 +146,36 @@ export function createOtelCollector(runtime, agentName, log) {
                     return;
                 }
                 for (const call of event.data.calls) {
-                    const parentCtx = parentCtxFor(turn, (_t = event.data.parentCallId) !== null && _t !== void 0 ? _t : call.parentCallId);
-                    const span = runtime.tracer.startSpan("agent_sdk.tool", {
-                        kind: SpanKind.INTERNAL,
+                    openToolSpan({
+                        turn,
+                        sessionId: event.sessionId,
+                        turnId: event.turnId,
+                        call,
+                        parentCallId: (_r = event.data.parentCallId) !== null && _r !== void 0 ? _r : call.parentCallId,
                         startTime,
-                        attributes: join(event.sessionId, {
-                            "cursor.conversation.id": event.sessionId,
-                            "cursor.tool.name": call.toolName,
-                            "cursor.tool.kind": "builtin",
-                            "agent_sdk.agent": agentName,
-                            "agent_sdk.turn_id": event.turnId,
-                            "agent_sdk.call_id": call.callId,
-                            "agent_sdk.parent_call_id": call.parentCallId,
-                            "agent_sdk.tool_args": (logOpts === null || logOpts === void 0 ? void 0 : logOpts.toolContent) === true && call.args !== undefined
-                                ? truncate(json(call.args))
-                                : undefined,
-                        }),
-                    }, parentCtx);
-                    turn.tools.set(call.callId, span);
+                    });
                 }
                 return;
             }
             case "action.approval_requested": {
-                (_f = (_e = ensureTurn(event, session, startTime)) === null || _e === void 0 ? void 0 : _e.tools.get(event.data.callId)) === null || _f === void 0 ? void 0 : _f.addEvent("approval_requested", undefined, startTime);
+                (_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 })));
                 return;
             }
             case "action.approval_resolved": {
-                (_h = (_g = ensureTurn(event, session, startTime)) === null || _g === void 0 ? void 0 : _g.tools.get(event.data.callId)) === null || _h === void 0 ? void 0 : _h.addEvent("approval_resolved", attrs({
+                (_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({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                 }), startTime);
                 return;
             }
             case "action.auth_requested": {
-                (_k = (_j = ensureTurn(event, session, startTime)) === null || _j === void 0 ? void 0 : _j.tools.get(event.data.callId)) === null || _k === void 0 ? void 0 : _k.addEvent("auth_requested", undefined, startTime);
+                (_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 })));
                 return;
             }
             case "action.auth_resolved": {
-                (_m = (_l = ensureTurn(event, session, startTime)) === null || _l === void 0 ? void 0 : _l.tools.get(event.data.callId)) === null || _m === void 0 ? void 0 : _m.addEvent("auth_resolved", attrs({
+                (_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({
                     "agent_sdk.decision": event.data.decision,
                     "agent_sdk.decision_by": event.data.by,
                     "agent_sdk.mcp_connection": event.data.connection,
@@ -224,7 +216,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     event.turnId !== undefined) {
                     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);
+                    (_m = sessions.get(event.sessionId)) === null || _m === void 0 ? void 0 : _m.turns.delete(event.turnId);
                 }
                 return;
             }
@@ -251,7 +243,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 turn.subagents.set(event.data.callId, span);
                 metrics === null || metrics === void 0 ? void 0 : metrics.subagents.add(1, join(event.sessionId, {
                     "agent_sdk.agent": agentName,
-                    "agent_sdk.subagent_name": (_u = event.data.name) !== null && _u !== void 0 ? _u : "unknown",
+                    "agent_sdk.subagent_name": (_s = event.data.name) !== null && _s !== void 0 ? _s : "unknown",
                 }));
                 return;
             }
@@ -265,12 +257,19 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
             }
             case "artifact.tagged": {
-                (_p = ensureSession(event, session, startTime)) === null || _p === void 0 ? void 0 : _p.span.addEvent("artifact.tagged", attrs({
+                const state = sessions.get(event.sessionId);
+                if (state === undefined) {
+                    return;
+                }
+                const tagged = attrs({
                     "agent_sdk.artifact_id": event.data.id,
                     "agent_sdk.artifact_kind": event.data.kind,
                     "agent_sdk.artifact_key": event.data.key,
                     "agent_sdk.artifact_source": event.data.source,
-                }), startTime);
+                });
+                for (const turn of state.turns.values()) {
+                    turn.span.addEvent("artifact.tagged", tagged, startTime);
+                }
                 return;
             }
             case "turn.completed": {
@@ -304,7 +303,7 @@ export function createOtelCollector(runtime, agentName, log) {
                 }
                 turn.span.setStatus({ code: SpanStatusCode.OK });
                 turn.span.end(startTime);
-                (_q = sessions.get(event.sessionId)) === null || _q === void 0 ? void 0 : _q.turns.delete(event.turnId);
+                (_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, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.turn_status": "completed",
@@ -328,7 +327,7 @@ export function createOtelCollector(runtime, agentName, log) {
                     turn.span.recordException(new Error(failureText));
                 }
                 turn.span.end(startTime);
-                (_r = sessions.get(event.sessionId)) === null || _r === void 0 ? void 0 : _r.turns.delete(event.turnId);
+                (_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, {
                     "agent_sdk.agent": agentName,
                     "agent_sdk.turn_status": "failed",
@@ -336,10 +335,6 @@ export function createOtelCollector(runtime, agentName, log) {
                 emitLog("turn.failed", SeverityNumber.ERROR, attrs(Object.assign(Object.assign({}, baseLog(event, session)), { "agent_sdk.error_message": failureText })));
                 return;
             }
-            case "session.waiting": {
-                (_s = ensureSession(event, session, startTime)) === null || _s === void 0 ? void 0 : _s.span.addEvent("session.waiting", undefined, startTime);
-                return;
-            }
             case "session.completed": {
                 endSession({
                     sessionId: event.sessionId,
@@ -364,51 +359,13 @@ export function createOtelCollector(runtime, agentName, log) {
                 return;
         }
     }
-    /**
-     * Open a session span on first live event after restore/resume (no
-     * `session.started` in this process). Fresh sessions still use the
-     * dedicated `session.started` case.
-     */
-    function ensureSession(event, session, startTime) {
-        const existing = sessions.get(event.sessionId);
+    function sessionState(sessionId) {
+        const existing = sessions.get(sessionId);
         if (existing !== undefined) {
             return existing;
         }
-        return openSession({
-            sessionId: event.sessionId,
-            session,
-            channelId: session.channelId,
-            startTime,
-            restored: true,
-        });
-    }
-    function openSession(args) {
-        var _a;
-        const parent = context.active();
-        const span = runtime.tracer.startSpan("agent_sdk.session", {
-            kind: SpanKind.INTERNAL,
-            startTime: args.startTime,
-            attributes: join(args.sessionId, {
-                "cursor.conversation.id": args.sessionId,
-                "agent_sdk.agent": agentName,
-                "agent_sdk.channel": args.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_restored": args.restored ? true : undefined,
-            }),
-        }, parent);
-        const state = {
-            span,
-            ctx: trace.setSpan(parent, span),
-            turns: new Map(),
-        };
-        sessions.set(args.sessionId, state);
-        if (!args.restored) {
-            metrics === null || metrics === void 0 ? void 0 : metrics.sessions.add(1, join(args.sessionId, {
-                "agent_sdk.agent": agentName,
-                "agent_sdk.channel": args.channelId,
-            }));
-        }
+        const state = { turns: new Map() };
+        sessions.set(sessionId, state);
         return state;
     }
     /**
@@ -419,10 +376,7 @@ export function createOtelCollector(runtime, agentName, log) {
         if (event.turnId === undefined) {
             return undefined;
         }
-        const state = ensureSession(event, session, startTime);
-        if (state === undefined) {
-            return undefined;
-        }
+        const state = sessionState(event.sessionId);
         const existing = state.turns.get(event.turnId);
         if (existing !== undefined) {
             return existing;
@@ -437,6 +391,7 @@ 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,
@@ -445,9 +400,11 @@ export function createOtelCollector(runtime, agentName, log) {
                 "agent_sdk.agent": agentName,
                 "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.turn_synthetic": args.synthetic ? true : undefined,
             }),
-        }, args.state.ctx);
+        }, ROOT_CONTEXT);
         const turn = {
             span,
             tools: new Map(),
@@ -466,6 +423,67 @@ 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
+            // parent linkage and opt-in args when `actions.requested` arrives.
+            // 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
+                    ? truncate(json(args.call.args))
+                    : undefined,
+            }));
+            return existing;
+        }
+        const span = runtime.tracer.startSpan("agent_sdk.tool", {
+            kind: SpanKind.INTERNAL,
+            startTime: args.startTime,
+            attributes: join(args.sessionId, {
+                "cursor.conversation.id": args.sessionId,
+                "cursor.tool.name": args.call.toolName,
+                "cursor.tool.kind": "builtin",
+                "agent_sdk.agent": agentName,
+                "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
+                    ? truncate(json(args.call.args))
+                    : undefined,
+            }),
+        }, parentCtxFor(args.turn, (_b = args.parentCallId) !== null && _b !== void 0 ? _b : 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,
+        }));
+    }
+    function ensureTurnSpan(args) {
+        return ensureTurnState(args).span;
+    }
+    function ensureCallSpan(args) {
+        const turn = ensureTurnState(args);
+        return openToolSpan({
+            turn,
+            sessionId: args.sessionId,
+            turnId: args.turnId,
+            call: { callId: args.callId, toolName: args.toolName },
+            startTime: Date.now(),
+        });
+    }
     function endOpenChildren(turn, endTime) {
         for (const span of turn.tools.values()) {
             span.end(endTime);
@@ -483,13 +501,15 @@ export function createOtelCollector(runtime, agentName, log) {
         }
         for (const turn of state.turns.values()) {
             endOpenChildren(turn, args.endTime);
+            if (args.message !== undefined) {
+                turn.span.setStatus({ code: args.code, message: args.message });
+            }
+            else {
+                turn.span.setStatus({ code: args.code });
+            }
             turn.span.end(args.endTime);
         }
         state.turns.clear();
-        state.span.setStatus(args.message === undefined
-            ? { code: args.code }
-            : { code: args.code, message: args.message });
-        state.span.end(args.endTime);
         sessions.delete(args.sessionId);
         extraBySession.delete(args.sessionId);
     }
@@ -498,7 +518,7 @@ export function createOtelCollector(runtime, agentName, log) {
         return (_a = extraBySession.get(sessionId)) !== null && _a !== void 0 ? _a : {};
     }
     function join(sessionId, rest) {
-        return attrs(Object.assign(Object.assign({}, extra(sessionId)), rest));
+        return attrs(Object.assign(Object.assign(Object.assign({}, extra(sessionId)), { "cursor.conversation.id": sessionId, "agent_sdk.session_id": sessionId }), rest));
     }
     function paintOpenSpans(sessionId, incoming) {
         const state = sessions.get(sessionId);
@@ -509,7 +529,6 @@ export function createOtelCollector(runtime, agentName, log) {
         if (Object.keys(painted).length === 0) {
             return;
         }
-        state.span.setAttributes(painted);
         for (const turn of state.turns.values()) {
             turn.span.setAttributes(painted);
             for (const span of turn.tools.values()) {

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

@@ -12,8 +12,6 @@ export interface ResolvedOtelConfig {
     metrics: false | OtelMetricOptions;
     logs: false | OtelLogOptions;
 }
-/** True when any standard OTLP endpoint env var is set. */
-export declare function hasOtelEnv(env?: NodeJS.ProcessEnv): boolean;
 /**
  * Process-global authored config. OTel SDK is one per serve process — if
  * several mounts ship `agent/otel.ts`, they must be identical.

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,KAAK,EACV,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EACjB,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,2DAA2D;AAC3D,wBAAgB,UAAU,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAOxE;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,CAiDrB;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,GAAG,SAAS,GACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBxB;AAED,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,CAKtB"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,iBAAiB,EACjB,UAAU,EACV,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,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,CAsDrB;AAED,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,GAAG,SAAS,GACtB,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBxB;AAED,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,CAKtB"}

package/dist/internal/otel/config.js

@@ -12,13 +12,7 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-/** True when any standard OTLP endpoint env var is set. */
-export function hasOtelEnv(env = process.env) {
-    return (nonEmpty(env.OTEL_EXPORTER_OTLP_ENDPOINT) ||
-        nonEmpty(env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT) ||
-        nonEmpty(env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT) ||
-        nonEmpty(env.OTEL_EXPORTER_OTLP_LOGS_ENDPOINT));
-}
+import { resolveOtelDefinition } from "../../otel.js";
 /**
  * Process-global authored config. OTel SDK is one per serve process — if
  * several mounts ship `agent/otel.ts`, they must be identical.
@@ -46,21 +40,21 @@ 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, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
     const env = (_a = input.env) !== null && _a !== void 0 ? _a : process.env;
     if (input.serve === false) {
         return disabled();
     }
-    const authored = (_b = input.authored) !== null && _b !== void 0 ? _b : {};
+    const authored = input.authored === undefined ? {} : resolveOtelDefinition(input.authored);
     const serve = input.serve === undefined ? {} : input.serve;
     const merged = {
-        serviceName: (_c = serve.serviceName) !== null && _c !== void 0 ? _c : authored.serviceName,
-        serviceVersion: (_d = serve.serviceVersion) !== null && _d !== void 0 ? _d : authored.serviceVersion,
+        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: (_e = serve.exporters) !== null && _e !== void 0 ? _e : authored.exporters,
-        traces: (_f = serve.traces) !== null && _f !== void 0 ? _f : authored.traces,
-        metrics: (_g = serve.metrics) !== null && _g !== void 0 ? _g : authored.metrics,
-        logs: (_h = serve.logs) !== null && _h !== void 0 ? _h : authored.logs,
+        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,
     };
     const envExporters = exportersFromEnv(env);
     const exporters = merged.exporters !== undefined && merged.exporters.length > 0
@@ -69,17 +63,20 @@ export function resolveOtelConfig(input) {
     const optedIn = input.authored !== undefined ||
         input.serve !== undefined ||
         envExporters.length > 0;
-    if (!optedIn || exporters.length === 0) {
+    if (!optedIn) {
         return disabled();
     }
     const traces = resolveSignal(merged.traces);
-    const metrics = resolveSignal(merged.metrics);
-    const logs = resolveLogs(merged.logs, env);
+    const metrics = exporters.length === 0 ? false : resolveSignal(merged.metrics);
+    const logs = exporters.length === 0 ? false : resolveLogs(merged.logs, env);
+    if (exporters.length === 0 && traces === false) {
+        return disabled();
+    }
     return {
         enabled: traces !== false || metrics !== false || logs !== false,
-        serviceName: (_k = (_j = merged.serviceName) !== null && _j !== void 0 ? _j : env.OTEL_SERVICE_NAME) !== null && _k !== void 0 ? _k : "cursor",
+        serviceName: (_j = (_h = merged.serviceName) !== null && _h !== void 0 ? _h : env.OTEL_SERVICE_NAME) !== null && _j !== void 0 ? _j : "cursor",
         serviceVersion: merged.serviceVersion,
-        resourceAttributes: (_l = merged.resourceAttributes) !== null && _l !== void 0 ? _l : {},
+        resourceAttributes: (_k = merged.resourceAttributes) !== null && _k !== void 0 ? _k : {},
         exporters,
         traces,
         metrics,

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

@@ -3,6 +3,8 @@
  */
 import type { IncomingMessage, ServerResponse } from "node:http";
 import type { OtelRuntime } from "./runtime.js";
+/** End the inbound SERVER span once the Fetch status is known (hosted flush). */
+export declare function endActiveHttpSpan(statusCode: number, error?: unknown): void;
 /**
  * Instrument one inbound Node request: SERVER span, W3C extract, auto-end
  * on response finish/close, run `fn` under the span context.

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

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/http.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAUjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAiBhD;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAcZ"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/http.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAUjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAShD,iFAAiF;AACjF,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,GAAG,IAAI,CAK3E;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,WAAW,GAAG,SAAS,EAChC,GAAG,EAAE,eAAe,EACpB,GAAG,EAAE,cAAc,EACnB,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAiBZ"}

package/dist/internal/otel/http.js

@@ -2,14 +2,12 @@
  * HTTP SERVER spans + W3C `traceparent` extraction for inbound requests.
  */
 import { context, propagation, SpanKind, SpanStatusCode, trace, } from "@opentelemetry/api";
-import { W3CTraceContextPropagator } from "@opentelemetry/core";
-let propagatorInstalled = false;
-function ensurePropagator() {
-    if (propagatorInstalled) {
-        return;
-    }
-    propagation.setGlobalPropagator(new W3CTraceContextPropagator());
-    propagatorInstalled = true;
+import { ensureW3cPropagator } from "./propagation.js";
+const HTTP_SPAN_HANDLE_KEY = Symbol.for("anysphere.july.otel.httpSpanHandle");
+/** End the inbound SERVER span once the Fetch status is known (hosted flush). */
+export function endActiveHttpSpan(statusCode, error) {
+    const handle = context.active().getValue(HTTP_SPAN_HANDLE_KEY);
+    handle === null || handle === void 0 ? void 0 : handle.end(statusCode, error);
 }
 /**
  * Instrument one inbound Node request: SERVER span, W3C extract, auto-end
@@ -28,14 +26,14 @@ export function instrumentHttp(runtime, req, res, fn) {
             handle.end(res.statusCode || 499);
         }
     });
-    return context.with(handle.context, fn);
+    return context.with(handle.context.setValue(HTTP_SPAN_HANDLE_KEY, handle), fn);
 }
 function startHttpSpan(runtime, req) {
     var _a, _b, _c, _d;
     if (runtime === undefined || runtime.config.traces === false) {
         return undefined;
     }
-    ensurePropagator();
+    ensureW3cPropagator();
     const headers = {};
     for (const [key, value] of Object.entries(req.headers)) {
         if (typeof value === "string") {

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

@@ -0,0 +1,16 @@
+/**
+ * Client-side MCP instrumentation: W3C / Cursor HTTP inject on Streamable
+ * HTTP + SSE fetches, SEP-414 `_meta.traceparent` on JSON-RPC params, and
+ * CLIENT spans for `tools/list` / `tools/call`.
+ */
+export declare function instrumentedMcpFetch(base?: typeof fetch): typeof fetch;
+/** SEP-414 / OTel MCP carrier for `params._meta`. */
+export declare function mcpTraceMeta(): {
+    traceparent: string;
+} | undefined;
+export declare function runMcpClientSpan<T>(args: {
+    method: string;
+    connection: string;
+    toolName?: string;
+}, fn: () => Promise<T>): Promise<T>;
+//# sourceMappingURL=mcp.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"mcp.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/mcp.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,wBAAgB,oBAAoB,CAAC,IAAI,GAAE,OAAO,KAAa,GAAG,OAAO,KAAK,CAE7E;AAED,qDAAqD;AACrD,wBAAgB,YAAY,IAAI;IAAE,WAAW,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAMlE;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,IAAI,EAAE;IACJ,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,EACD,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GACnB,OAAO,CAAC,CAAC,CAAC,CAuBZ"}