@cursor/july 0.1.101 → 0.1.103

package/src/internal/otel/collector.ts

@@ -12,6 +12,7 @@ import {
   type Counter,
   context,
   type Meter,
+  ROOT_CONTEXT,
   type Span,
   SpanKind,
   SpanStatusCode,
@@ -24,9 +25,33 @@ import type { OtelRuntime } from "./runtime.js";
 
 const CONTENT_MAX = 2_048;
 
+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 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. */
   setSessionAttributes(
     sessionId: string,
@@ -46,9 +71,10 @@ interface TurnState {
   synthetic: boolean;
 }
 
+/** Per-conversation bag for in-flight turns. No session span — those
+ * stay open across `session.waiting` and never export on hosted
+ * conversational agents. Each turn is its own root. */
 interface SessionState {
-  span: Span;
-  ctx: Context;
   turns: Map<string, TurnState>;
 }
 
@@ -77,8 +103,11 @@ export function createOtelCollector(
     },
     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();
@@ -93,6 +122,18 @@ export function createOtelCollector(
       const bag = extraBySession.get(sessionId);
       return bag === undefined ? undefined : { ...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: SessionEvent, session: SessionInfo): void {
@@ -101,46 +142,35 @@ export function createOtelCollector(
 
     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?.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?.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?.toolContent === true && event.data.url !== undefined) {
-          state.span.setAttribute("agent_sdk.sdk_agent_url", event.data.url);
-        }
+        const bag = extraBySession.get(event.sessionId) ?? {};
+        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?.userPrompts === true
-                ? truncate(event.data.text)
-                : undefined,
-          }),
-          startTime
-        );
         emitLog(
           "message.received",
           SeverityNumber.INFO,
@@ -154,24 +184,18 @@ export function createOtelCollector(
         );
         return;
       }
-      case "turn.queued": {
-        ensureSession(event, session, startTime)?.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({
@@ -227,32 +251,14 @@ export function createOtelCollector(
           return;
         }
         for (const call of event.data.calls) {
-          const parentCtx = parentCtxFor(
+          openToolSpan({
             turn,
-            event.data.parentCallId ?? call.parentCallId
-          );
-          const span = runtime.tracer.startSpan(
-            "agent_sdk.tool",
-            {
-              kind: SpanKind.INTERNAL,
-              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?.toolContent === true && call.args !== undefined
-                    ? truncate(json(call.args))
-                    : undefined,
-              }),
-            },
-            parentCtx
-          );
-          turn.tools.set(call.callId, span);
+            sessionId: event.sessionId,
+            turnId: event.turnId,
+            call,
+            parentCallId: event.data.parentCallId ?? call.parentCallId,
+            startTime,
+          });
         }
         return;
       }
@@ -416,16 +422,19 @@ export function createOtelCollector(
         return;
       }
       case "artifact.tagged": {
-        ensureSession(event, session, startTime)?.span.addEvent(
-          "artifact.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
-        );
+        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,
+        });
+        for (const turn of state.turns.values()) {
+          turn.span.addEvent("artifact.tagged", tagged, startTime);
+        }
         return;
       }
       case "turn.completed": {
@@ -521,14 +530,6 @@ export function createOtelCollector(
         );
         return;
       }
-      case "session.waiting": {
-        ensureSession(event, session, startTime)?.span.addEvent(
-          "session.waiting",
-          undefined,
-          startTime
-        );
-        return;
-      }
       case "session.completed": {
         endSession({
           sessionId: event.sessionId,
@@ -561,68 +562,13 @@ export function createOtelCollector(
     }
   }
 
-  /**
-   * 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: SessionEvent,
-    session: SessionInfo,
-    startTime: number | undefined
-  ): SessionState | undefined {
-    const existing = sessions.get(event.sessionId);
+  function sessionState(sessionId: string): SessionState {
+    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: {
-    sessionId: string;
-    session: SessionInfo;
-    channelId: string;
-    startTime: number | undefined;
-    restored: boolean;
-  }): SessionState {
-    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": args.session.purpose ?? "live",
-          "agent_sdk.session_restored": args.restored ? true : undefined,
-        }),
-      },
-      parent
-    );
-    const state: SessionState = {
-      span,
-      ctx: trace.setSpan(parent, span),
-      turns: new Map(),
-    };
-    sessions.set(args.sessionId, state);
-    if (!args.restored) {
-      metrics?.sessions.add(
-        1,
-        join(args.sessionId, {
-          "agent_sdk.agent": agentName,
-          "agent_sdk.channel": args.channelId,
-        })
-      );
-    }
+    const state: SessionState = { turns: new Map() };
+    sessions.set(sessionId, state);
     return state;
   }
 
@@ -638,10 +584,7 @@ export function createOtelCollector(
     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;
@@ -674,10 +617,12 @@ export function createOtelCollector(
           "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": args.session.purpose ?? "live",
           "agent_sdk.turn_synthetic": args.synthetic ? true : undefined,
         }),
       },
-      args.state.ctx
+      ROOT_CONTEXT
     );
     const turn: TurnState = {
       span,
@@ -702,6 +647,93 @@ export function createOtelCollector(
     return trace.setSpan(context.active(), turn.span);
   }
 
+  function openToolSpan(args: {
+    turn: TurnState;
+    sessionId: string;
+    turnId: string | undefined;
+    call: {
+      callId: string;
+      toolName: string;
+      args?: unknown;
+      parentCallId?: string;
+    };
+    parentCallId?: string;
+    startTime: number | undefined;
+  }): Span {
+    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":
+            args.parentCallId ?? args.call.parentCallId,
+          "agent_sdk.tool_args":
+            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?.toolContent === true && args.call.args !== undefined
+              ? truncate(json(args.call.args))
+              : undefined,
+        }),
+      },
+      parentCtxFor(args.turn, args.parentCallId ?? args.call.parentCallId)
+    );
+    args.turn.tools.set(args.call.callId, span);
+    return span;
+  }
+
+  function ensureTurnState(args: OtelTurnContext): TurnState {
+    const startTime = Date.now();
+    const state = sessionState(args.sessionId);
+    return (
+      state.turns.get(args.turnId) ??
+      openTurn({
+        state,
+        sessionId: args.sessionId,
+        turnId: args.turnId,
+        session: args.session,
+        startTime,
+        synthetic: true,
+      })
+    );
+  }
+
+  function ensureTurnSpan(args: OtelTurnContext): Span {
+    return ensureTurnState(args).span;
+  }
+
+  function ensureCallSpan(args: OtelCallContext): Span {
+    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: TurnState, endTime: number | undefined): void {
     for (const span of turn.tools.values()) {
       span.end(endTime);
@@ -725,15 +757,14 @@ export function createOtelCollector(
     }
     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);
   }
@@ -746,7 +777,12 @@ export function createOtelCollector(
     sessionId: string,
     rest: Record<string, AttrValue | undefined>
   ): Record<string, AttrValue> {
-    return attrs({ ...extra(sessionId), ...rest });
+    return attrs({
+      ...extra(sessionId),
+      "cursor.conversation.id": sessionId,
+      "agent_sdk.session_id": sessionId,
+      ...rest,
+    });
   }
 
   function paintOpenSpans(
@@ -761,7 +797,6 @@ export function createOtelCollector(
     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/src/internal/otel/config.ts

@@ -11,6 +11,7 @@ import type {
   OtelSignal,
   OtelTraceOptions,
 } from "../../otel.js";
+import { resolveOtelDefinition } from "../../otel.js";
 
 export interface ResolvedOtelConfig {
   enabled: boolean;
@@ -23,16 +24,6 @@ export interface ResolvedOtelConfig {
   logs: false | OtelLogOptions;
 }
 
-/** True when any standard OTLP endpoint env var is set. */
-export function hasOtelEnv(env: NodeJS.ProcessEnv = process.env): boolean {
-  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)
-  );
-}
-
 /**
  * Process-global authored config. OTel SDK is one per serve process — if
  * several mounts ship `agent/otel.ts`, they must be identical.
@@ -76,7 +67,8 @@ export function resolveOtelConfig(input: {
     return disabled();
   }
 
-  const authored = input.authored ?? {};
+  const authored =
+    input.authored === undefined ? {} : resolveOtelDefinition(input.authored);
   const serve = input.serve === undefined ? {} : input.serve;
   const merged: OtelConfig = {
     serviceName: serve.serviceName ?? authored.serviceName,
@@ -101,13 +93,17 @@ export function resolveOtelConfig(input: {
     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,

package/src/internal/otel/http.ts

@@ -11,24 +11,24 @@ import {
   SpanStatusCode,
   trace,
 } from "@opentelemetry/api";
-import { W3CTraceContextPropagator } from "@opentelemetry/core";
+import { ensureW3cPropagator } from "./propagation.js";
 import type { OtelRuntime } from "./runtime.js";
 
-let propagatorInstalled = false;
-
-function ensurePropagator(): void {
-  if (propagatorInstalled) {
-    return;
-  }
-  propagation.setGlobalPropagator(new W3CTraceContextPropagator());
-  propagatorInstalled = true;
-}
-
 interface HttpSpanHandle {
   context: Context;
   end(statusCode: number, error?: unknown): void;
 }
 
+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: number, error?: unknown): void {
+  const handle = context.active().getValue(HTTP_SPAN_HANDLE_KEY) as
+    | HttpSpanHandle
+    | undefined;
+  handle?.end(statusCode, error);
+}
+
 /**
  * Instrument one inbound Node request: SERVER span, W3C extract, auto-end
  * on response finish/close, run `fn` under the span context.
@@ -51,7 +51,10 @@ export function instrumentHttp<T>(
       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(
@@ -61,7 +64,7 @@ function startHttpSpan(
   if (runtime === undefined || runtime.config.traces === false) {
     return undefined;
   }
-  ensurePropagator();
+  ensureW3cPropagator();
   const headers: Record<string, string> = {};
   for (const [key, value] of Object.entries(req.headers)) {
     if (typeof value === "string") {

package/src/internal/otel/mcp.ts

@@ -0,0 +1,56 @@
+/**
+ * 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`.
+ */
+
+import { context, SpanKind, SpanStatusCode, trace } from "@opentelemetry/api";
+import { activeTraceparent, instrumentedFetch } from "../../otel.js";
+import { attrs } from "./attrs.js";
+
+const TRACER = "agent_sdk";
+
+export function instrumentedMcpFetch(base: typeof fetch = fetch): typeof fetch {
+  return instrumentedFetch(base);
+}
+
+/** SEP-414 / OTel MCP carrier for `params._meta`. */
+export function mcpTraceMeta(): { traceparent: string } | undefined {
+  const traceparent = activeTraceparent();
+  if (traceparent === undefined) {
+    return undefined;
+  }
+  return { traceparent };
+}
+
+export function runMcpClientSpan<T>(
+  args: {
+    method: string;
+    connection: string;
+    toolName?: string;
+  },
+  fn: () => Promise<T>
+): Promise<T> {
+  const span = trace.getTracer(TRACER).startSpan(args.method, {
+    kind: SpanKind.CLIENT,
+    attributes: attrs({
+      "rpc.system": "mcp",
+      "mcp.method.name": args.method,
+      "mcp.tool.name": args.toolName,
+      "agent_sdk.mcp.connection": args.connection,
+    }),
+  });
+  return context.with(trace.setSpan(context.active(), span), async () => {
+    try {
+      return await fn();
+    } catch (error) {
+      span.setStatus({
+        code: SpanStatusCode.ERROR,
+        message: error instanceof Error ? error.message : String(error),
+      });
+      throw error;
+    } finally {
+      span.end();
+    }
+  });
+}

package/src/internal/otel/propagation.ts

@@ -0,0 +1,17 @@
+/**
+ * Process-global W3C `traceparent` propagator. Inbound HTTP extracts;
+ * outbound Factory / Cursor API calls inject.
+ */
+
+import { propagation } from "@opentelemetry/api";
+import { W3CTraceContextPropagator } from "@opentelemetry/core";
+
+let installed = false;
+
+export function ensureW3cPropagator(): void {
+  if (installed) {
+    return;
+  }
+  propagation.setGlobalPropagator(new W3CTraceContextPropagator());
+  installed = true;
+}