@cursor/july 0.1.102 → 0.1.104

package/dist/internal/local-control-plane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"local-control-plane.d.ts","sourceRoot":"","sources":["../../src/internal/local-control-plane.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,kCAAkC,EAExC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD;;;OAGG;IACH,iBAAiB,CACf,KAAK,EAAE,kCAAkC,GACxC,wBAAwB,CAAC;IAC5B;;;OAGG;IACH,eAAe,CAAC,KAAK,EAAE;QAAE,KAAK,IAAI,IAAI,CAAC;QAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;IACvE,yEAAyE;IACzE,WAAW,IAAI,IAAI,CAAC;IACpB,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAwK7B"}
+{"version":3,"file":"local-control-plane.d.ts","sourceRoot":"","sources":["../../src/internal/local-control-plane.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EACL,KAAK,wBAAwB,EAC7B,KAAK,kCAAkC,EAExC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAI3D,MAAM,WAAW,iBAAkB,SAAQ,cAAc;IACvD;;;OAGG;IACH,iBAAiB,CACf,KAAK,EAAE,kCAAkC,GACxC,wBAAwB,CAAC;IAC5B;;;OAGG;IACH,eAAe,CAAC,KAAK,EAAE;QAAE,KAAK,IAAI,IAAI,CAAC;QAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;KAAE,GAAG,IAAI,CAAC;IACvE,yEAAyE;IACzE,WAAW,IAAI,IAAI,CAAC;IACpB,IAAI,IAAI,IAAI,CAAC;CACd;AAED,wBAAsB,uBAAuB,CAAC,IAAI,EAAE;IAClD,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,YAAY,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAClE;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,6DAA6D;IAC7D,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACjC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAsJ7B"}

package/dist/internal/local-control-plane.js

@@ -17,14 +17,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { dirname, join } from "node:path";
+import { join } from "node:path";
 import { parseCron } from "./cron.js";
 import { routeLocalIngressContinuation, } from "./local-ingress.js";
 import { MAX_TIMER_MS } from "./reminder-schedule.js";
 import { ReminderStore } from "./reminder-store.js";
 export function createLocalControlPlane(opts) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const logger = (_a = opts.logger) !== null && _a !== void 0 ? _a : (() => { });
         const armReminderClocks = opts.armReminderClocks !== false;
         const store = opts.stateDir === undefined
@@ -32,27 +32,10 @@ export function createLocalControlPlane(opts) {
             : new ReminderStore(join(opts.stateDir, "reminders"));
         const schedules = new Map();
         const reminderTimers = new Map();
-        const reminders = new Map();
+        const reminders = new Map(((_b = (yield store === null || store === void 0 ? void 0 : store.list())) !== null && _b !== void 0 ? _b : []).map((record) => [record.id, record]));
         let scheduleTimer;
         let lastFiredMinute = -1;
         let scmRelay;
-        if (store !== undefined) {
-            for (const record of yield store.list()) {
-                reminders.set(record.id, record);
-            }
-            if (opts.stateDir !== undefined) {
-                const legacyStore = new ReminderStore(join(dirname(opts.stateDir), "reminders"));
-                for (const record of yield legacyStore.list()) {
-                    if (reminders.has(record.id)) {
-                        yield legacyStore.delete(record.id);
-                        continue;
-                    }
-                    reminders.set(record.id, record);
-                    yield store.save(record);
-                    yield legacyStore.delete(record.id);
-                }
-            }
-        }
         function armScheduleTicker() {
             var _a;
             if (scheduleTimer !== undefined || schedules.size === 0) {

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;AASH,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAC;AAOzH,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EAGZ,MAAM,aAAa,CAAC;AAErB,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;AASH,OAAO,EAAE,wCAAwC,EAAE,MAAM,+DAA+D,CAAC;AAOzH,OAAO,KAAK,EACV,YAAY,EACZ,WAAW,EAGZ,MAAM,aAAa,CAAC;AAGrB,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"}

package/dist/internal/mcp-endpoint.js

@@ -30,6 +30,7 @@ import { WebStandardStreamableHTTPServerTransport } from "@modelcontextprotocol/
 import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
 import { z } from "zod";
 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. */
 export const MCP_CHANNEL_ID = "mcp";
@@ -537,6 +538,3 @@ function raceTimeout(promise, ms) {
         });
     });
 }
-function describeError(error) {
-    return error instanceof Error ? error.message : String(error);
-}

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

@@ -9,20 +9,29 @@
 import type { SessionEvent, SessionInfo } from "../../types.js";
 import { type AttrValue } from "./attrs.js";
 import type { OtelRuntime } from "./runtime.js";
-export interface OtelCallContext {
+export interface OtelTurnContext {
     sessionId: string;
     session: SessionInfo;
     turnId: string;
+}
+export interface OtelCallContext extends OtelTurnContext {
     callId: string;
     toolName: string;
 }
 export interface OtelCollector {
     onEvent(event: SessionEvent, session: SessionInfo): void;
     close(): void;
+    /**
+     * Run `fn` under the turn span so outbound inject sees that context.
+     * Host files / VFS / Factory RPCs during `runner.runTurn` are not
+     * inside `runInCall`. Opens the turn if `turn.started` has not been
+     * applied yet (dispatch is async).
+     */
+    runInTurn<T>(args: OtelTurnContext, fn: () => T | Promise<T>): Promise<T>;
     /**
      * Run `fn` under the tool span so outbound inject sees that context.
-     * Opens the session / turn / tool span if the event stream has not
-     * reached `actions.requested` yet (dispatch is async).
+     * Opens the turn / tool span if the event stream has not reached
+     * `actions.requested` yet (dispatch is async).
      */
     runInCall<T>(args: OtelCallContext, fn: () => T | Promise<T>): Promise<T>;
     /** Merge author tags onto the session; paints open spans immediately. */

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;AAaH,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,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;;;;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,yEAAyE;IACzE,oBAAoB,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,IAAI,CAAC;IACR,mEAAmE;IACnE,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAC1C;AAgBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAo3Bf"}
+{"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;AAChE,OAAO,EAAE,KAAK,SAAS,EAAS,MAAM,YAAY,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAIhD,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,yEAAyE;IACzE,oBAAoB,CAClB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GACpC,IAAI,CAAC;IACR,mEAAmE;IACnE,oBAAoB,CAClB,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,SAAS,CAAC;CAC1C;AAiBD,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,GAC1B,aAAa,CAuyBf"}

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,74 +46,57 @@ 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": {
-                if (sessions.get(event.sessionId) !== undefined) {
+                if (sessions.has(event.sessionId)) {
                     return;
                 }
-                openSession({
-                    sessionId: event.sessionId,
-                    session,
-                    channelId: event.data.channelId,
-                    startTime,
-                    restored: false,
-                });
+                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) {
-                    return;
-                }
+                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.
@@ -132,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
@@ -141,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);
@@ -165,31 +151,31 @@ export function createOtelCollector(runtime, agentName, log) {
                         sessionId: event.sessionId,
                         turnId: event.turnId,
                         call,
-                        parentCallId: (_t = event.data.parentCallId) !== null && _t !== void 0 ? _t : call.parentCallId,
+                        parentCallId: (_r = event.data.parentCallId) !== null && _r !== void 0 ? _r : call.parentCallId,
                         startTime,
                     });
                 }
                 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,
@@ -230,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;
             }
@@ -257,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;
             }
@@ -271,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": {
@@ -310,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",
@@ -334,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",
@@ -342,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,
@@ -370,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;
     }
     /**
@@ -425,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;
@@ -443,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,
@@ -451,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(),
@@ -507,30 +458,30 @@ export function createOtelCollector(runtime, agentName, log) {
         args.turn.tools.set(args.call.callId, span);
         return span;
     }
-    function ensureCallSpan(args) {
-        var _a, _b;
+    function ensureTurnState(args) {
+        var _a;
         const startTime = Date.now();
-        const state = (_a = sessions.get(args.sessionId)) !== null && _a !== void 0 ? _a : openSession({
-            sessionId: args.sessionId,
-            session: args.session,
-            channelId: args.session.channelId,
-            startTime,
-            restored: true,
-        });
-        const turn = (_b = state.turns.get(args.turnId)) !== null && _b !== void 0 ? _b : openTurn({
+        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,
+            startTime: Date.now(),
         });
     }
     function endOpenChildren(turn, endTime) {
@@ -550,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);
     }
@@ -565,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);
@@ -576,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.