@cursor/bdk 0.2.25 → 0.2.26

package/dist/otel.d.ts

@@ -1,106 +1,7 @@
 /**
- * OpenTelemetry for Agent SDK — author `agent/otel.ts`, pass `serve({ otel })`,
- * or set `OTEL_EXPORTER_OTLP_ENDPOINT` (standard OTel env).
- *
- * ```ts
- * import { defineOtel } from "@cursor/bdk/internal/otel";
- *
- * export default defineOtel({
- *   serviceName: "cursor",
- *   exporters: [{ url: "https://otel.example.com", protocol: "http/protobuf" }],
- * });
- *
- * export default defineOtel(() => resolveMyOtelConfig());
- * ```
- *
- * Internal only: Cursor factory agents. Not a public Agent SDK export.
- */
-export type OtelSignal = "traces" | "metrics" | "logs";
-/** One OTLP destination. Multiple entries fan out. */
-export interface OtelExporterConfig {
-    /**
-     * OTLP base URL (`https://otel.example.com`) or signal path
-     * (`…/v1/traces`). Signal paths are stripped to the base; the runtime
-     * re-appends `/v1/{signal}`.
-     */
-    url: string;
-    /** Extra HTTP headers (merged with `OTEL_EXPORTER_OTLP_HEADERS`). */
-    headers?: Record<string, string>;
-    /**
-     * Wire format. Default `http/protobuf` (matches Cursor enterprise OTLP).
-     * Use `http/json` for collectors that only accept JSON.
-     */
-    protocol?: "http/json" | "http/protobuf";
-    /**
-     * Restrict this destination to these signals. Default: all enabled
-     * signals. Set by env when per-signal `OTEL_EXPORTER_OTLP_*_ENDPOINT`
-     * vars differ.
-     */
-    signals?: OtelSignal[];
-}
-export interface OtelTraceOptions {
-    /** Sample ratio in `[0, 1]`. Default `1`. */
-    sampleRatio?: number;
-}
-export interface OtelMetricOptions {
-    /** Export interval in ms. Default `10000`. */
-    exportIntervalMillis?: number;
-}
-export interface OtelLogOptions {
-    /**
-     * Include user prompt text on log records / span events.
-     * Default false; also toggled by `OTEL_LOG_USER_PROMPTS=1`.
-     */
-    userPrompts?: boolean;
-    /**
-     * Include tool argument / result payloads and failure text (truncated).
-     * Default false; also `OTEL_LOG_TOOL_CONTENT=1`.
-     */
-    toolContent?: boolean;
-}
-/**
- * Authored / programmatic OTel config. Empty config still enables when
- * standard `OTEL_EXPORTER_OTLP_*` env vars are set.
- */
-export interface OtelConfig {
-    /**
-     * Resource `service.name`. Default: `OTEL_SERVICE_NAME` or `"cursor"`
-     * (same as enterprise export) so Agent SDK signals join org streams.
-     */
-    serviceName?: string;
-    /** Resource `service.version`. */
-    serviceVersion?: string;
-    /** Extra resource attributes on every signal. */
-    resourceAttributes?: Record<string, string>;
-    /**
-     * OTLP destinations. Default: from `OTEL_EXPORTER_OTLP_ENDPOINT` /
-     * per-signal `*_TRACES_ENDPOINT` etc. Empty with no env = disabled.
-     */
-    exporters?: OtelExporterConfig[];
-    /** Traces on/off or options. Default on. */
-    traces?: boolean | OtelTraceOptions;
-    /** Metrics on/off or options. Default on. */
-    metrics?: boolean | OtelMetricOptions;
-    /** Logs on/off or options. Default off (opt-in content). */
-    logs?: boolean | OtelLogOptions;
-}
-export type OtelDefinition = OtelConfig & {
-    readonly __agentServe: "otel";
-};
-/** Re-read authored config on each hosted request, after secrets load. */
-export type OtelConfigFactory = () => OtelConfig;
-/**
- * Hidden factory on {@link OtelDefinition}. Not enumerable so
- * `pickAuthoredOtel` compares the bake-time snapshot, not the thunk.
- */
-export declare const OTEL_CONFIG_RESOLVE: symbol;
-/**
- * Author OpenTelemetry export under `agent/otel.ts`.
- * Import from `@cursor/bdk/internal/otel`, not `@cursor/bdk`.
+ * W3C `traceparent` helpers for outbound calls.
+ * Set `OTEL_*` variables. There is no instrumentation file.
  */
-export declare function defineOtel(config?: OtelConfig | OtelConfigFactory): OtelDefinition;
-/** Invoke a `defineOtel(() => …)` factory, or return the static snapshot. */
-export declare function resolveOtelDefinition(def: OtelConfig): OtelConfig;
 export declare const TRACEPARENT_HEADER = "traceparent";
 /** Cursor backend prefers this; `remoteSpanContextFromRequest` falls back to W3C. */
 export declare const BACKEND_TRACEPARENT_HEADER = "backend-traceparent";
@@ -125,6 +26,6 @@ export declare function injectActiveTraceContext(headers: {
 /** W3C `traceparent` for the active span, or undefined if none. */
 export declare function activeTraceparent(): string | undefined;
 export declare function instrumentedFetch(base?: typeof fetch): typeof fetch;
-/** Idempotent. Safe to call from `createOtelRuntime` on every serve. */
+/** Idempotent. Safe to call on every serve. */
 export declare function installOutboundFetchInstrumentation(): void;
 //# sourceMappingURL=otel.d.ts.map

package/dist/otel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,CAAC;AAEvD,sDAAsD;AACtD,MAAM,WAAW,kBAAkB;IACjC;;;;OAIG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC;;;OAGG;IACH,QAAQ,CAAC,EAAE,WAAW,GAAG,eAAe,CAAC;IACzC;;;;OAIG;IACH,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,gBAAgB;IAC/B,6CAA6C;IAC7C,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,iBAAiB;IAChC,8CAA8C;IAC9C,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB;;;OAGG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;;GAGG;AACH,MAAM,WAAW,UAAU;IACzB;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,kCAAkC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iDAAiD;IACjD,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC5C;;;OAGG;IACH,SAAS,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACjC,4CAA4C;IAC5C,MAAM,CAAC,EAAE,OAAO,GAAG,gBAAgB,CAAC;IACpC,6CAA6C;IAC7C,OAAO,CAAC,EAAE,OAAO,GAAG,iBAAiB,CAAC;IACtC,4DAA4D;IAC5D,IAAI,CAAC,EAAE,OAAO,GAAG,cAAc,CAAC;CACjC;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG;IAAE,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;CAAE,CAAC;AAE5E,0EAA0E;AAC1E,MAAM,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC;AAEjD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,EAAE,MAAwD,CAAC;AAE3F;;;GAGG;AACH,wBAAgB,UAAU,CAAC,MAAM,GAAE,UAAU,GAAG,iBAAsB,GAAG,cAAc,CAUtF;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU,CAUjE;AAuDD,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,qFAAqF;AACrF,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,GAAG,SAAS,CAOrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACjC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,mEAAmE;AACnE,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAItD;AAqBD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,OAAO,KAAa,GAAG,OAAO,KAAK,CAQ1E;AAID,wEAAwE;AACxE,wBAAgB,mCAAmC,IAAI,IAAI,CAO1D"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,qFAAqF;AACrF,eAAO,MAAM,0BAA0B,wBAAwB,CAAC;AAEhE,wBAAgB,iBAAiB,CAAC,WAAW,EAAE;IAC7C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,GAAG,SAAS,CAOrB;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE;IAChD,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACjC,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC,GAAG,IAAI,CAWP;AAED,mEAAmE;AACnE,wBAAgB,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAItD;AAoBD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,OAAO,KAAa,GAAG,OAAO,KAAK,CAS1E;AAiED,+CAA+C;AAC/C,wBAAgB,mCAAmC,IAAI,IAAI,CAO1D"}

package/dist/otel.js

@@ -1,101 +1,9 @@
 /**
- * OpenTelemetry for Agent SDK — author `agent/otel.ts`, pass `serve({ otel })`,
- * or set `OTEL_EXPORTER_OTLP_ENDPOINT` (standard OTel env).
- *
- * ```ts
- * import { defineOtel } from "@cursor/bdk/internal/otel";
- *
- * export default defineOtel({
- *   serviceName: "cursor",
- *   exporters: [{ url: "https://otel.example.com", protocol: "http/protobuf" }],
- * });
- *
- * export default defineOtel(() => resolveMyOtelConfig());
- * ```
- *
- * Internal only: Cursor factory agents. Not a public Agent SDK export.
+ * W3C `traceparent` helpers for outbound calls.
+ * Set `OTEL_*` variables. There is no instrumentation file.
  */
 import { AsyncLocalStorage } from "node:async_hooks";
 import { context, trace } from "@opentelemetry/api";
-import { brandDefinition } from "./internal/brand.js";
-/**
- * Hidden factory on {@link OtelDefinition}. Not enumerable so
- * `pickAuthoredOtel` compares the bake-time snapshot, not the thunk.
- */
-export const OTEL_CONFIG_RESOLVE = Symbol.for("anysphere.july.otel.configResolve");
-/**
- * Author OpenTelemetry export under `agent/otel.ts`.
- * Import from `@cursor/bdk/internal/otel`, not `@cursor/bdk`.
- */
-export function defineOtel(config = {}) {
-    const resolve = typeof config === "function" ? config : () => config;
-    const snapshot = resolve();
-    validateOtelConfig(snapshot);
-    const def = brandDefinition("otel", snapshot);
-    Object.defineProperty(def, OTEL_CONFIG_RESOLVE, {
-        value: resolve,
-        enumerable: false,
-    });
-    return def;
-}
-/** Invoke a `defineOtel(() => …)` factory, or return the static snapshot. */
-export function resolveOtelDefinition(def) {
-    const resolve = def[OTEL_CONFIG_RESOLVE];
-    if (resolve === undefined) {
-        return def;
-    }
-    const next = resolve();
-    validateOtelConfig(next);
-    return next;
-}
-function validateOtelConfig(config) {
-    if (config.exporters !== undefined) {
-        for (const exporter of config.exporters) {
-            if (typeof exporter.url !== "string" || exporter.url.length === 0) {
-                throw new Error("defineOtel: exporters[].url must be a non-empty string");
-            }
-            if (exporter.protocol !== undefined &&
-                exporter.protocol !== "http/json" &&
-                exporter.protocol !== "http/protobuf") {
-                throw new Error('defineOtel: exporters[].protocol must be "http/json" or "http/protobuf"');
-            }
-            assertSignals(exporter.signals);
-        }
-    }
-    if (config.resourceAttributes !== undefined) {
-        for (const [key, value] of Object.entries(config.resourceAttributes)) {
-            if (typeof value !== "string") {
-                throw new Error(`defineOtel: resourceAttributes.${key} must be a string`);
-            }
-        }
-    }
-    assertSampleRatio(config.traces);
-}
-function assertSignals(signals) {
-    if (signals === undefined) {
-        return;
-    }
-    if (signals.length === 0) {
-        throw new Error("defineOtel: exporters[].signals must be non-empty");
-    }
-    for (const signal of signals) {
-        if (signal !== "traces" && signal !== "metrics" && signal !== "logs") {
-            throw new Error('defineOtel: exporters[].signals must be "traces" | "metrics" | "logs"');
-        }
-    }
-}
-function assertSampleRatio(traces) {
-    if (traces === undefined || typeof traces === "boolean") {
-        return;
-    }
-    const ratio = traces.sampleRatio;
-    if (ratio === undefined) {
-        return;
-    }
-    if (!Number.isFinite(ratio) || ratio < 0 || ratio > 1) {
-        throw new Error("defineOtel: traces.sampleRatio must be in [0, 1]");
-    }
-}
 export const TRACEPARENT_HEADER = "traceparent";
 /** Cursor backend prefers this; `remoteSpanContextFromRequest` falls back to W3C. */
 export const BACKEND_TRACEPARENT_HEADER = "backend-traceparent";
@@ -134,7 +42,7 @@ export function activeTraceparent() {
 }
 /**
  * Copy the active span onto every outbound `fetch`. Agents should not
- * wrap their own Connect / MCP clients for this — `createOtelRuntime`
+ * wrap their own Connect / MCP clients for this. The serve runtime
  * installs it on `globalThis.fetch` when traces are on.
  */
 function headersForFetch(input, init) {
@@ -145,20 +53,76 @@ function headersForFetch(input, init) {
         : input instanceof Request
             ? input.headers
             : undefined);
-    injectActiveTraceContext(headers);
     return headers;
 }
 export function instrumentedFetch(base = fetch) {
     return (input, init) => {
         const headers = headersForFetch(input, init);
+        applyOutboundTraceHeaders(headers, requestHost(input));
         if (input instanceof Request && init === undefined) {
             return base(new Request(input, { headers }));
         }
         return base(input, { ...init, headers });
     };
 }
+function requestHost(input) {
+    const raw = typeof input === "string" ? input : input instanceof URL ? input.toString() : input.url;
+    try {
+        return new URL(raw).hostname;
+    }
+    catch {
+        return undefined;
+    }
+}
+function applyOutboundTraceHeaders(headers, host) {
+    if (host === undefined) {
+        return;
+    }
+    const span = trace.getSpan(context.active()) ?? getContextTracerSpan();
+    if (span === undefined) {
+        return;
+    }
+    const traceparent = formatTraceparent(span.spanContext());
+    if (traceparent === undefined) {
+        return;
+    }
+    if (isCursorHost(host) || isCollectorHost(host)) {
+        headers.set(TRACEPARENT_HEADER, traceparent);
+    }
+    if (isCursorHost(host)) {
+        headers.set(BACKEND_TRACEPARENT_HEADER, traceparent);
+    }
+}
+function isCursorHost(host) {
+    return (host === "cursor.com" ||
+        host === "cursor.sh" ||
+        host.endsWith(".cursor.com") ||
+        host.endsWith(".cursor.sh"));
+}
+function isCollectorHost(host) {
+    for (const key of [
+        "OTEL_EXPORTER_OTLP_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_TRACES_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_METRICS_ENDPOINT",
+        "OTEL_EXPORTER_OTLP_LOGS_ENDPOINT",
+    ]) {
+        const raw = process.env[key];
+        if (raw === undefined || raw.length === 0) {
+            continue;
+        }
+        try {
+            if (new URL(raw).hostname === host) {
+                return true;
+            }
+        }
+        catch {
+            // Ignore a value that is not a URL.
+        }
+    }
+    return false;
+}
 const OUTBOUND_FETCH_INSTALLED = Symbol.for("anysphere.july.otel.outboundFetch");
-/** Idempotent. Safe to call from `createOtelRuntime` on every serve. */
+/** Idempotent. Safe to call on every serve. */
 export function installOutboundFetchInstrumentation() {
     const slots = globalThis;
     if (slots[OUTBOUND_FETCH_INSTALLED] === true) {