@cursor/bdk 0.2.23 → 0.2.24

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

@@ -10,32 +10,35 @@ import { type ResolvedOtelConfig } from "./config.js";
  * delivery (OTLP BatchSpanProcessor defaults to 30s).
  */
 export declare const OTEL_FORCE_FLUSH_TIMEOUT_MS = 1000;
-/**
- * First hosted OTLP POST may include a cold TLS handshake to Datadog.
- * Bound separately from {@link OTEL_FORCE_FLUSH_TIMEOUT_MS} so the
- * queued turn/tool batch is not abandoned after 1s.
- */
-export declare const OTEL_DEFERRED_EXPORT_TIMEOUT_MS = 5000;
-/** Drop oldest finished spans when no collector has drained the buffer. */
-export declare const OTEL_IN_MEMORY_SPAN_LIMIT = 2048;
 export interface OtelRuntime {
     config: ResolvedOtelConfig;
     tracer: Tracer;
+    /** Absent until the first config with an exporter. Then it stays. */
     meter: Meter | undefined;
     logger: OtelLogger | undefined;
     httpDuration: Histogram | undefined;
     forceFlush: () => Promise<void>;
     shutdown: () => Promise<void>;
 }
-export interface CreateOtelRuntimeOptions {
+export interface OtelRuntimeHandle {
+    runtime: OtelRuntime;
     /**
-     * Re-resolve exporters at flush (hosted v2 binds deployment secrets
-     * after bake). When bake had no OTLP exporters, finished spans sit
-     * in memory until this returns destinations.
+     * Resolve the config again. Local `serve` calls this at start. A hosted v2
+     * guest calls it after each secret load, because secrets arrive with the
+     * first request.
      */
-    resolveExport?: () => ResolvedOtelConfig;
+    reload(): void;
 }
-export declare function createOtelRuntime(config: ResolvedOtelConfig, log: (line: string) => void, options?: CreateOtelRuntimeOptions): OtelRuntime | undefined;
+export interface CreateOtelRuntimeOptions {
+    /** Hosted egress allowlist. An exporter host outside it logs an error. */
+    egressDomains?: readonly string[];
+}
+/**
+ * BDK builds the providers from the first config that has an exporter. After
+ * that, only the headers change: exporters read them on each export. A change
+ * to any other setting logs a warning to redeploy.
+ */
+export declare function createOtelRuntime(resolve: () => ResolvedOtelConfig, log: (line: string) => void, options?: CreateOtelRuntimeOptions): OtelRuntimeHandle;
 export declare function forceFlushOtelRuntime(runtime: OtelRuntime | undefined): Promise<void>;
 export declare function shutdownOtelRuntime(runtime: OtelRuntime | undefined): Promise<void>;
 export declare function raceOtelForceFlush(work: Promise<unknown>, log: (line: string) => void, timeoutMs?: number): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,MAAM,EAKZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,IAAI,UAAU,EAAQ,MAAM,yBAAyB,CAAC;AAiC1E,OAAO,EAAsB,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAK1E;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,+BAA+B,OAAQ,CAAC;AAErD,2EAA2E;AAC3E,eAAO,MAAM,yBAAyB,OAAQ,CAAC;AAE/C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,wBAAwB;IACvC;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,kBAAkB,CAAC;CAC1C;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,kBAAkB,EAC1B,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,OAAO,CAAC,EAAE,wBAAwB,GACjC,WAAW,GAAG,SAAS,CA8BzB;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,SAAS,GAAE,MAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAef"}
+{"version":3,"file":"runtime.d.ts","sourceRoot":"","sources":["../../../src/internal/otel/runtime.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACL,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,MAAM,EAMZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,MAAM,IAAI,UAAU,EAAQ,MAAM,yBAAyB,CAAC;AAiC1E,OAAO,EAGL,KAAK,kBAAkB,EAExB,MAAM,aAAa,CAAC;AAKrB;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,OAAQ,CAAC;AAEjD,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,kBAAkB,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,qEAAqE;IACrE,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;IACzB,MAAM,EAAE,UAAU,GAAG,SAAS,CAAC;IAC/B,YAAY,EAAE,SAAS,GAAG,SAAS,CAAC;IACpC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,WAAW,CAAC;IACrB;;;;OAIG;IACH,MAAM,IAAI,IAAI,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,0EAA0E;IAC1E,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,kBAAkB,EACjC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,OAAO,GAAE,wBAA6B,GACrC,iBAAiB,CAsEnB;AAED,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAE3F;AAED,wBAAsB,mBAAmB,CAAC,OAAO,EAAE,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;AAED,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAC3B,SAAS,GAAE,MAAoC,GAC9C,OAAO,CAAC,IAAI,CAAC,CAef"}

package/dist/internal/otel/runtime.js

@@ -1,9 +1,8 @@
 /**
  * Process-level OTel SDK (OTLP HTTP exporters for traces / metrics / logs).
  */
-import { DiagLogLevel, diag, metrics, trace, } from "@opentelemetry/api";
+import { DiagLogLevel, diag, metrics, ProxyTracerProvider, trace, } from "@opentelemetry/api";
 import { logs } from "@opentelemetry/api-logs";
-import { ExportResultCode } from "@opentelemetry/core";
 import { OTLPLogExporter as OTLPLogExporterHttp } from "@opentelemetry/exporter-logs-otlp-http";
 import { OTLPLogExporter as OTLPLogExporterProto } from "@opentelemetry/exporter-logs-otlp-proto";
 import { OTLPMetricExporter as OTLPMetricExporterHttp } from "@opentelemetry/exporter-metrics-otlp-http";
@@ -11,13 +10,13 @@ import { OTLPMetricExporter as OTLPMetricExporterProto } from "@opentelemetry/ex
 import { OTLPTraceExporter as OTLPTraceExporterHttp } from "@opentelemetry/exporter-trace-otlp-http";
 import { OTLPTraceExporter as OTLPTraceExporterProto } from "@opentelemetry/exporter-trace-otlp-proto";
 import { resourceFromAttributes } from "@opentelemetry/resources";
-import { BatchLogRecordProcessor, LoggerProvider } from "@opentelemetry/sdk-logs";
+import { BatchLogRecordProcessor, LoggerProvider, } from "@opentelemetry/sdk-logs";
 import { AggregationTemporality, MeterProvider, PeriodicExportingMetricReader, } from "@opentelemetry/sdk-metrics";
-import { SimpleSpanProcessor, } from "@opentelemetry/sdk-trace-base";
 import { BatchSpanProcessor, NodeTracerProvider, ParentBasedSampler, TraceIdRatioBasedSampler, } from "@opentelemetry/sdk-trace-node";
 import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions";
 import { installOutboundFetchInstrumentation, } from "../../otel.js";
-import { exportersForSignal } from "./config.js";
+import { egressAllowsHost } from "../hosting.js";
+import { disabledOtelConfig, exportersForSignal, stableJson, } from "./config.js";
 import { ensureW3cPropagator } from "./propagation.js";
 const INSTRUMENTATION = "agent_sdk";
 /**
@@ -27,40 +26,71 @@ const INSTRUMENTATION = "agent_sdk";
  */
 export const OTEL_FORCE_FLUSH_TIMEOUT_MS = 1_000;
 /**
- * First hosted OTLP POST may include a cold TLS handshake to Datadog.
- * Bound separately from {@link OTEL_FORCE_FLUSH_TIMEOUT_MS} so the
- * queued turn/tool batch is not abandoned after 1s.
+ * BDK builds the providers from the first config that has an exporter. After
+ * that, only the headers change: exporters read them on each export. A change
+ * to any other setting logs a warning to redeploy.
  */
-export const OTEL_DEFERRED_EXPORT_TIMEOUT_MS = 5_000;
-/** Drop oldest finished spans when no collector has drained the buffer. */
-export const OTEL_IN_MEMORY_SPAN_LIMIT = 2_048;
-export function createOtelRuntime(config, log, options) {
-    if (!config.enabled) {
-        return undefined;
-    }
-    if (config.traces !== false) {
-        installOutboundFetchInstrumentation();
-    }
-    const proto = process.env.OTEL_EXPORTER_OTLP_PROTOCOL?.trim().toLowerCase();
-    if (proto === "grpc") {
-        log("[bdk:otel] OTEL_EXPORTER_OTLP_PROTOCOL=grpc is unsupported; using http/protobuf");
-    }
-    ensureW3cPropagator();
-    const sdk = startOtelSdk(config, log, options?.resolveExport);
-    const meter = config.metrics === false ? undefined : (sdk.meter ?? metrics.getMeter(INSTRUMENTATION));
+export function createOtelRuntime(resolve, log, options = {}) {
+    let built;
+    let latest = disabledOtelConfig();
+    let started = false;
+    let warnedKey;
+    const runtime = {
+        config: disabledOtelConfig(),
+        tracer: noopTracer(),
+        meter: undefined,
+        logger: undefined,
+        httpDuration: undefined,
+        forceFlush: () => raceOtelForceFlush(Promise.allSettled(all(built?.providers).map((p) => p.forceFlush())), log),
+        shutdown: async () => {
+            await Promise.allSettled(all(built?.providers).map((p) => p.shutdown()));
+        },
+    };
+    // Exporters read headers from the latest config on each export. The rest
+    // of `runtime.config` stays as it was when the providers were built.
+    const read = () => latest;
+    const apply = (config) => {
+        if (config.enabled && !started) {
+            started = true;
+            startSdk(log);
+        }
+        if (config.traces !== false) {
+            installOutboundFetchInstrumentation();
+        }
+        const key = settingsKey(config);
+        if (built !== undefined) {
+            // A new URL, protocol, or signal list does not match the exporters
+            // already built. Leave `latest` so those exporters still find their headers.
+            if (key === built.key) {
+                latest = config;
+            }
+            else if (key !== warnedKey) {
+                warnedKey = key;
+                log("[bdk:otel] only exporter headers change after the first export; redeploy to apply the new OTel settings");
+            }
+            return;
+        }
+        latest = config;
+        runtime.config = config;
+        if (config.exporters.length > 0) {
+            built = { key, providers: buildProviders(config, read, log) };
+            warnEgress(config, options.egressDomains, log);
+            log(`[bdk] otel enabled service=${config.serviceName} exporters=${config.exporters.length} traces=${config.traces !== false} metrics=${config.metrics !== false} logs=${config.logs !== false}`);
+        }
+        bindInstruments(runtime, config, built?.providers);
+    };
     return {
-        config,
-        tracer: sdk.tracer,
-        meter,
-        logger: config.logs === false ? undefined : (sdk.logger ?? logs.getLogger(INSTRUMENTATION)),
-        httpDuration: meter === undefined
-            ? undefined
-            : meter.createHistogram("agent_sdk.http.duration", {
-                description: "HTTP request duration",
-                unit: "ms",
-            }),
-        forceFlush: sdk.forceFlush,
-        shutdown: sdk.shutdown,
+        runtime,
+        // The authored factory runs inside hosted delivery; telemetry must not
+        // fail the request.
+        reload: () => {
+            try {
+                apply(resolve());
+            }
+            catch (error) {
+                log(`[bdk:otel] error: OTel config failed: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        },
     };
 }
 export async function forceFlushOtelRuntime(runtime) {
@@ -85,171 +115,133 @@ export async function raceOtelForceFlush(work, log, timeoutMs = OTEL_FORCE_FLUSH
         log(`[bdk:otel] forceFlush exceeded ${timeoutMs}ms; continuing`);
     }
 }
-function startOtelSdk(config, logger, resolveExport) {
+function all(providers) {
+    return providers === undefined
+        ? []
+        : [providers.traces, providers.metrics, providers.logs].filter((provider) => provider !== undefined);
+}
+function startSdk(log) {
     diag.setLogger({
-        verbose: (m) => logger(`[bdk:otel] ${m}`),
-        debug: (m) => logger(`[bdk:otel] ${m}`),
-        info: (m) => logger(`[bdk:otel] ${m}`),
-        warn: (m) => logger(`[bdk:otel] warn: ${m}`),
-        error: (m) => logger(`[bdk:otel] error: ${m}`),
+        verbose: (message) => log(`[bdk:otel] ${message}`),
+        debug: (message) => log(`[bdk:otel] ${message}`),
+        info: (message) => log(`[bdk:otel] ${message}`),
+        warn: (message) => log(`[bdk:otel] warn: ${message}`),
+        error: (message) => log(`[bdk:otel] error: ${message}`),
     }, DiagLogLevel.ERROR);
-    const resource = buildResource(config);
-    let tracerProvider;
-    let meterProvider;
-    let loggerProvider;
-    let memoryExporter;
-    const traceOpts = config.traces;
-    if (traceOpts !== false) {
-        const exporters = exportersForSignal(config.exporters, "traces");
-        const globalTracer = hasRealTracerProvider();
-        const spanProcessors = [];
-        if (exporters.length > 0) {
-            for (const exporter of exporters) {
-                spanProcessors.push(new BatchSpanProcessor(createTraceExporter(exporter, signalUrl(exporter.url, "traces"))));
-            }
-        }
-        else if (!globalTracer) {
-            memoryExporter = new BoundedMemorySpanExporter(OTEL_IN_MEMORY_SPAN_LIMIT);
-            spanProcessors.push(new SimpleSpanProcessor(memoryExporter));
-        }
-        if (spanProcessors.length > 0) {
-            tracerProvider = new NodeTracerProvider({
-                resource,
-                spanProcessors,
-                sampler: new ParentBasedSampler({
-                    root: new TraceIdRatioBasedSampler(traceOpts.sampleRatio ?? 1),
-                }),
-            });
-            if (globalTracer) {
-                logger("[bdk:otel] TracerProvider already registered; BDK traces export on a local provider");
-            }
-            else {
-                tracerProvider.register();
-            }
-        }
-    }
-    const metricOpts = config.metrics;
-    if (metricOpts !== false) {
-        const exporters = exportersForSignal(config.exporters, "metrics");
-        if (exporters.length > 0) {
-            const exportIntervalMillis = metricOpts.exportIntervalMillis ?? 10_000;
-            const provider = new MeterProvider({
-                resource,
-                readers: exporters.map((exporter) => new PeriodicExportingMetricReader({
-                    exporter: createMetricExporter(exporter, signalUrl(exporter.url, "metrics")),
-                    exportIntervalMillis,
-                })),
-            });
-            meterProvider = provider;
-            if (!metrics.setGlobalMeterProvider(provider)) {
-                logger("[bdk:otel] MeterProvider already registered; BDK metrics export on a local provider");
-            }
-        }
-    }
-    if (config.logs !== false) {
-        const exporters = exportersForSignal(config.exporters, "logs");
-        if (exporters.length > 0) {
-            const provider = new LoggerProvider({
-                resource,
-                processors: exporters.map((exporter) => new BatchLogRecordProcessor(createLogExporter(exporter, signalUrl(exporter.url, "logs")))),
-            });
-            loggerProvider = provider;
-            // api-logs returns the active provider (ours on success, existing otherwise).
-            if (logs.setGlobalLoggerProvider(provider) !== provider) {
-                logger("[bdk:otel] LoggerProvider already registered; BDK logs export on a local provider");
-            }
-        }
-    }
-    if (memoryExporter === undefined) {
-        logger(`[bdk] otel enabled service=${config.serviceName} exporters=${config.exporters.length} traces=${config.traces !== false} metrics=${config.metrics !== false} logs=${config.logs !== false}`);
+    ensureW3cPropagator();
+    if (process.env.OTEL_EXPORTER_OTLP_PROTOCOL?.trim().toLowerCase() === "grpc") {
+        log("[bdk:otel] OTEL_EXPORTER_OTLP_PROTOCOL=grpc is unsupported; using http/protobuf");
     }
-    else {
-        logger(`[bdk] otel recording service=${config.serviceName} (export on flush when OTLP exporters resolve)`);
+}
+function warnEgress(config, egressDomains, log) {
+    if (egressDomains === undefined) {
+        return;
     }
-    let draining;
-    const flushDeferred = () => {
-        draining ??= drainDeferred().finally(() => {
-            draining = undefined;
-        });
-        return draining;
-    };
-    const drainDeferred = async () => {
-        if (memoryExporter === undefined) {
-            return;
+    for (const exporter of config.exporters) {
+        if (!URL.canParse(exporter.url)) {
+            continue;
         }
-        const exportConfig = resolveExport?.() ?? config;
-        const destinations = exportersForSignal(exportConfig.exporters, "traces");
-        if (destinations.length === 0) {
-            return;
-        }
-        // Spans already carry the bake-time Resource. Hosted v2 binds
-        // deployment secrets after bake, so env / service extras on
-        // exportConfig must replace that Resource on the wire.
-        const resource = buildResource(exportConfig);
-        for (;;) {
-            const spans = memoryExporter.getFinishedSpans();
-            if (spans.length === 0) {
-                return;
-            }
-            const ok = await exportQueuedSpans(spans, destinations, logger, resource);
-            if (!ok) {
-                return;
-            }
-            memoryExporter.dropExported(spans);
+        const host = new URL(exporter.url).hostname;
+        if (!egressAllowsHost(egressDomains, host)) {
+            log(`[bdk:otel] error: exporter host ${host} is not in hosting.egressDomains; add the host and redeploy`);
         }
-    };
+    }
+}
+function bindInstruments(runtime, config, providers) {
+    runtime.tracer =
+        config.traces === false
+            ? noopTracer()
+            : (providers?.traces?.getTracer(INSTRUMENTATION) ?? trace.getTracer(INSTRUMENTATION));
+    const meter = config.metrics === false
+        ? undefined
+        : (providers?.metrics?.getMeter(INSTRUMENTATION) ?? metrics.getMeter(INSTRUMENTATION));
+    runtime.meter = meter;
+    runtime.logger =
+        config.logs === false
+            ? undefined
+            : (providers?.logs?.getLogger(INSTRUMENTATION) ?? logs.getLogger(INSTRUMENTATION));
+    runtime.httpDuration =
+        meter === undefined
+            ? undefined
+            : meter.createHistogram("agent_sdk.http.duration", {
+                description: "HTTP request duration",
+                unit: "ms",
+            });
+}
+function buildProviders(config, read, log) {
+    const resource = buildResource(config);
+    const exportersFor = (signal, on, create) => on
+        ? exportersForSignal(config.exporters, signal).map((exporter) => create(isProtobuf(exporter), {
+            url: signalUrl(exporter.url, signal),
+            headers: headersAt(read, config.exporters.indexOf(exporter)),
+        }))
+        : [];
+    const spanExporters = exportersFor("traces", config.traces !== false, (protobuf, options) => protobuf ? new OTLPTraceExporterProto(options) : new OTLPTraceExporterHttp(options));
+    const metricExporters = exportersFor("metrics", config.metrics !== false, (protobuf, options) => {
+        const opts = { ...options, temporalityPreference: AggregationTemporality.DELTA };
+        return protobuf ? new OTLPMetricExporterProto(opts) : new OTLPMetricExporterHttp(opts);
+    });
+    const logExporters = exportersFor("logs", config.logs !== false, (protobuf, options) => protobuf ? new OTLPLogExporterProto(options) : new OTLPLogExporterHttp(options));
     return {
-        tracer: tracerProvider?.getTracer(INSTRUMENTATION) ?? trace.getTracer(INSTRUMENTATION),
-        meter: meterProvider?.getMeter(INSTRUMENTATION),
-        logger: loggerProvider?.getLogger(INSTRUMENTATION),
-        forceFlush: async () => {
-            await Promise.allSettled([
-                raceOtelForceFlush(Promise.allSettled([
-                    tracerProvider?.forceFlush(),
-                    meterProvider?.forceFlush(),
-                    loggerProvider?.forceFlush(),
-                ]), logger),
-                raceOtelForceFlush(flushDeferred(), logger, OTEL_DEFERRED_EXPORT_TIMEOUT_MS),
-            ]);
-        },
-        shutdown: async () => {
-            await flushDeferred();
-            await Promise.allSettled([
-                tracerProvider?.shutdown(),
-                meterProvider?.shutdown(),
-                loggerProvider?.shutdown(),
-            ]);
-        },
+        traces: spanExporters.length === 0 ? undefined : traceProvider(config, resource, spanExporters, log),
+        metrics: metricExporters.length === 0
+            ? undefined
+            : meterProvider(config, resource, metricExporters, log),
+        logs: logExporters.length === 0 ? undefined : loggerProvider(resource, logExporters, log),
     };
 }
-function withExportResource(span, resource) {
-    return new Proxy(span, {
-        get(target, prop, receiver) {
-            if (prop === "resource") {
-                return resource;
-            }
-            return Reflect.get(target, prop, receiver);
-        },
+function traceProvider(config, resource, exporters, log) {
+    const sampleRatio = config.traces === false ? undefined : config.traces.sampleRatio;
+    const provider = new NodeTracerProvider({
+        resource,
+        spanProcessors: exporters.map((exporter) => new BatchSpanProcessor(exporter)),
+        sampler: new ParentBasedSampler({ root: new TraceIdRatioBasedSampler(sampleRatio ?? 1) }),
     });
-}
-async function exportQueuedSpans(spans, destinations, logger, resource) {
-    const payload = spans.map((span) => withExportResource(span, resource));
-    const exporters = destinations.map((destination) => createTraceExporter(destination, signalUrl(destination.url, "traces")));
-    try {
-        const results = await Promise.all(exporters.map((exporter) => new Promise((resolve) => {
-            exporter.export(payload, (result) => {
-                resolve(result.code === ExportResultCode.SUCCESS);
-            });
-        })));
-        return results.every((ok) => ok);
+    if (hasRealTracerProvider()) {
+        log("[bdk:otel] TracerProvider already registered; BDK traces export on a local provider");
     }
-    catch (error) {
-        logger(`[bdk:otel] deferred export failed: ${error instanceof Error ? error.message : String(error)}`);
-        return false;
+    else {
+        provider.register();
+    }
+    return provider;
+}
+function meterProvider(config, resource, exporters, log) {
+    const exportIntervalMillis = (config.metrics === false ? undefined : config.metrics.exportIntervalMillis) ?? 10_000;
+    const provider = new MeterProvider({
+        resource,
+        readers: exporters.map((exporter) => new PeriodicExportingMetricReader({ exporter, exportIntervalMillis })),
+    });
+    if (!metrics.setGlobalMeterProvider(provider)) {
+        log("[bdk:otel] MeterProvider already registered; BDK metrics export on a local provider");
     }
-    finally {
-        await Promise.allSettled(exporters.map((exporter) => exporter.shutdown()));
+    return provider;
+}
+function loggerProvider(resource, exporters, log) {
+    const provider = new LoggerProvider({
+        resource,
+        processors: exporters.map((exporter) => new BatchLogRecordProcessor(exporter)),
+    });
+    if (logs.setGlobalLoggerProvider(provider) !== provider) {
+        log("[bdk:otel] LoggerProvider already registered; BDK logs export on a local provider");
     }
+    return provider;
+}
+/** Every setting the providers are built from: the config without the headers. */
+function settingsKey(config) {
+    return stableJson({ ...config, exporters: config.exporters.map(exporterIdentity) });
+}
+function exporterIdentity(exporter) {
+    return [
+        exporter.url,
+        exporter.protocol ?? "http/protobuf",
+        [...(exporter.signals ?? [])].sort().join("+"),
+    ].join("|");
+}
+function headersAt(read, index) {
+    return async () => read().exporters[index]?.headers ?? {};
+}
+function noopTracer() {
+    return new ProxyTracerProvider().getTracer(INSTRUMENTATION);
 }
 function buildResource(config) {
     // Align with Cursor enterprise wire resource attrs where they overlap so
@@ -279,52 +271,3 @@ function hasRealTracerProvider() {
 function isProtobuf(exporter) {
     return exporter.protocol !== "http/json";
 }
-function createTraceExporter(exporter, url) {
-    const opts = { url, headers: exporter.headers };
-    return isProtobuf(exporter) ? new OTLPTraceExporterProto(opts) : new OTLPTraceExporterHttp(opts);
-}
-function createMetricExporter(exporter, url) {
-    const opts = {
-        url,
-        headers: exporter.headers,
-        temporalityPreference: AggregationTemporality.DELTA,
-    };
-    return isProtobuf(exporter)
-        ? new OTLPMetricExporterProto(opts)
-        : new OTLPMetricExporterHttp(opts);
-}
-function createLogExporter(exporter, url) {
-    const opts = { url, headers: exporter.headers };
-    return isProtobuf(exporter) ? new OTLPLogExporterProto(opts) : new OTLPLogExporterHttp(opts);
-}
-/** In-memory finished-span queue with a hard cap (oldest dropped). */
-class BoundedMemorySpanExporter {
-    constructor(limit) {
-        this.limit = limit;
-        this.spans = [];
-    }
-    export(spans, resultCallback) {
-        this.spans.push(...spans);
-        if (this.spans.length > this.limit) {
-            this.spans.splice(0, this.spans.length - this.limit);
-        }
-        resultCallback({ code: ExportResultCode.SUCCESS });
-    }
-    getFinishedSpans() {
-        return this.spans.slice();
-    }
-    dropExported(exported) {
-        const exportedSet = new Set(exported);
-        this.spans = this.spans.filter((span) => !exportedSet.has(span));
-    }
-    reset() {
-        this.spans = [];
-    }
-    shutdown() {
-        this.reset();
-        return Promise.resolve();
-    }
-    forceFlush() {
-        return Promise.resolve();
-    }
-}

package/dist/internal/package-inline-stdio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-inline-stdio.d.ts","sourceRoot":"","sources":["../../src/internal/package-inline-stdio.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAE5B,MAAM,aAAa,CAAC;AA2BrB,wBAAsB,4BAA4B,CAAC,OAAO,EAAE;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAmE/B"}
+{"version":3,"file":"package-inline-stdio.d.ts","sourceRoot":"","sources":["../../src/internal/package-inline-stdio.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAOH,OAAO,KAAK,EACV,mBAAmB,EACnB,2BAA2B,EAE5B,MAAM,aAAa,CAAC;AA2BrB,wBAAsB,4BAA4B,CAAC,OAAO,EAAE;IAC1D,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC5C,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAoE/B"}

package/dist/internal/package-inline-stdio.js

@@ -42,6 +42,7 @@ export async function packageInlineStdioConnection(options) {
         absWorkingDir: options.absWorkingDir,
         alias: {
             zod: require.resolve("zod"),
+            "zod/v3": require.resolve("zod/v3"),
         },
         plugins: [
             {

package/dist/internal/process-memory-telemetry.d.ts

@@ -31,7 +31,7 @@ export type ProcessMemoryTelemetryOptions = {
     agentName: string;
     getEventLogStats: () => EventLogMemoryStats;
     logger?: (line: string) => void;
-    meter?: Meter;
+    meter?: () => Meter | undefined;
     env?: NodeJS.ProcessEnv;
     intervalMs?: number;
     now?: () => number;

package/dist/internal/process-memory-telemetry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"process-memory-telemetry.d.ts","sourceRoot":"","sources":["../../src/internal/process-memory-telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAGH,OAAO,KAAK,EAAc,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAO1D,eAAO,MAAM,oBAAoB,qBAAqB,CAAC;AACvD,eAAO,MAAM,uBAAuB,wBAAwB,CAAC;AAE7D,MAAM,MAAM,mBAAmB,GAAG;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;IAC5C,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM;QAClB,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;QAClB,GAAG,EAAE,MAAM,CAAC;QACZ,QAAQ,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,aAAa,CAAC,EAAE,MAAM,MAAM,CAAC;IAC7B,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,0BAA0B,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAClF,CAAC;AAEF,wBAAgB,iCAAiC,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,OAAO,CAG/F;AAED,wBAAgB,iCAAiC,CAC/C,GAAG,GAAE,MAAM,CAAC,UAAwB,GACnC,0BAA0B,GAAG,SAAS,CAWxC;AAED,wBAAgB,mBAAmB,CACjC,IAAI,GAAE;IACJ,WAAW,CAAC,EAAE,6BAA6B,CAAC,aAAa,CAAC,CAAC;IAC3D,aAAa,CAAC,EAAE,6BAA6B,CAAC,eAAe,CAAC,CAAC;CAC3D,GACL,mBAAmB,CAUrB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,mBAAmB,GAAG;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,QAAQ,EAAE,IAAI,CAAC,mBAAmB,EAAE,kBAAkB,CAAC,CAAC;CACzD,CAAC;AAEF,wBAAgB,aAAa,CAAC,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAEjE;AAED,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,mBAAmB,EAAE,GAAG,mBAAmB,CAU3F;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,GAAE,mBAA2C,GAClD,kBAAkB,CAKpB;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE;IAC9C,QAAQ,EAAE,MAAM,mBAAmB,CAAC;IACpC,MAAM,CAAC,EAAE,MAAM,mBAAmB,CAAC;CACpC,GAAG,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAS7C;AAED,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,EAAE,mBAAmB,CAAC;CAC/B,GAAG,MAAM,CAWT;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,KAAK,CAAC;IACR,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,CAAC,CAiCD;AAED,kDAAkD;AAClD,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,6BAA6B,GAAG,MAAM,IAAI,CA8C9F"}
+{"version":3,"file":"process-memory-telemetry.d.ts","sourceRoot":"","sources":["../../src/internal/process-memory-telemetry.ts"],"names":[],"mappings":"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"}

package/dist/internal/process-memory-telemetry.js

@@ -141,7 +141,7 @@ export function startProcessMemoryTelemetry(options) {
         });
         const eventLog = options.getEventLogStats();
         logger(formatMemoryLogLine({ agentName: options.agentName, memory, eventLog }));
-        recordOtel(options.meter, memory, eventLog, attributes);
+        recordOtel(options.meter?.(), memory, eventLog, attributes);
         if (datadog === undefined) {
             return;
         }

package/dist/internal/sdk-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../src/internal/sdk-runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sdk-runner.d.ts","sourceRoot":"","sources":["../../src/internal/sdk-runner.ts"],"names":[],"mappings":"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"}

package/dist/internal/sdk-runner.js

@@ -99,6 +99,24 @@ function retryReason(message, isFirstTurn) {
     }
     return undefined;
 }
+/**
+ * Whether an update is output a restarted turn would replay. The harness
+ * echoes the user message and opens a step before the first model call, and
+ * closes that step when the call throws, so a rejection at that call (a team
+ * admin block, capacity) still arrives before any output and the turn can
+ * move to the next model. Unknown types count as output.
+ */
+function isTurnOutputUpdate(update) {
+    switch (update.type) {
+        case "user-message-appended":
+        case "step-started":
+        case "step-completed":
+        case "turn-ended":
+            return false;
+        default:
+            return true;
+    }
+}
 /**
  * The SDK rejects a selection the credential's catalog does not list with
  * this copy, thrown from `Agent.create` / `Agent.resume` before the turn
@@ -266,8 +284,10 @@ export class CursorSdkRunner {
         const tracked = {
             ...request,
             onUpdate: (update) => {
-                sawUpdate = true;
-                onStreamed();
+                if (isTurnOutputUpdate(update)) {
+                    sawUpdate = true;
+                    onStreamed();
+                }
                 return request.onUpdate(update);
             },
             onSdkAgentId: async (sdkAgentId) => {

package/dist/internal/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/internal/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AA6CpF,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAQhB,YAAY,EACb,MAAM,aAAa,CAAC;AA6FrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAgDpE,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAUpE,OAAO,EAEL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAsB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW/E,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAuCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,yEAAyE;IACzE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAC5D,wEAAwE;IACxE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CA2nC3B;AAkmDD,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,SAAQ,GACb,OAAO,CAAC,IAAI,CAAC,CAkDf"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/internal/server.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAsC,KAAK,cAAc,EAAE,MAAM,WAAW,CAAC;AA6CpF,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAQhB,YAAY,EACb,MAAM,aAAa,CAAC;AA6FrB,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAgDpE,OAAO,EAAE,KAAK,WAAW,EAAmB,MAAM,iBAAiB,CAAC;AAUpE,OAAO,EAEL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAO9B,OAAO,EAAsB,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAW/E,8EAA8E;AAC9E,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,CAAC;CACvB;AAuCD,6EAA6E;AAC7E,MAAM,WAAW,0BAA0B;IACzC,oEAAoE;IACpE,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,4EAA4E;IAC5E,eAAe,CAAC,EAAE,qBAAqB,CAAC;IACxC,yEAAyE;IACzE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC;IAC5D,wEAAwE;IACxE,aAAa,CAAC,EAAE,UAAU,CAAC,OAAO,mBAAmB,CAAC,CAAC;IACvD;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,MAAM,EAAE,UAAU,EAAE,EACpB,OAAO,GAAE,YAAY,GAAG,0BAA+B,GACtD,OAAO,CAAC,gBAAgB,CAAC,CAooC3B;AAqmDD,wBAAsB,kBAAkB,CACtC,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,cAAc,EACnB,MAAM,SAAQ,GACb,OAAO,CAAC,IAAI,CAAC,CAkDf"}