@cursor/july 0.1.102 → 0.1.103

package/dist/otel.d.ts

@@ -9,6 +9,9 @@
  *   serviceName: "cursor",
  *   exporters: [{ url: "https://otel.example.com", protocol: "http/protobuf" }],
  * });
+ *
+ * // Hosted v2: re-read env on flush after deployment secrets bind.
+ * export default defineOtel(() => resolveMyOtelConfig());
  * ```
  */
 export type OtelSignal = "traces" | "metrics" | "logs";
@@ -83,8 +86,17 @@ export interface OtelConfig {
 export type OtelDefinition = OtelConfig & {
     readonly __agentServe: "otel";
 };
+/** Re-read authored config after bake (hosted v2 binds secrets later). */
+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`. */
-export declare function defineOtel(config?: OtelConfig): OtelDefinition;
+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";
@@ -96,9 +108,19 @@ export declare function formatTraceparent(spanContext: {
 /**
  * Copy the active span onto outbound headers as W3C `traceparent` and
  * Cursor `backend-traceparent`. No-op when no valid span is active.
+ *
+ * Prefers the Agent SDK ALS (`instrumentHttp`, `runInTurn`,
+ * `runInCall`). Falls back to the `@anysphere/context` process-wide
+ * ALS: `createSpan` does not bind OTel API context, and SPAN keys
+ * are per `@opentelemetry/api` copy.
  */
 export declare function injectActiveTraceContext(headers: {
     get(name: string): string | null;
     set(name: string, value: string): void;
 }): void;
+/** 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. */
+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;;;;;;;;;;;;GAYG;AAKH,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,yDAAyD;AACzD,wBAAgB,UAAU,CAAC,MAAM,GAAE,UAAe,GAAG,cAAc,CA+BlE;AA+BD,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;;;GAGG;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"}
+{"version":3,"file":"otel.d.ts","sourceRoot":"","sources":["../src/otel.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;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,MAEjC,CAAC;AAEF,yDAAyD;AACzD,wBAAgB,UAAU,CACxB,MAAM,GAAE,UAAU,GAAG,iBAAsB,GAC1C,cAAc,CAWhB;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU,CAUjE;AA+DD,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;AAwBD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,OAAO,KAAa,GAAG,OAAO,KAAK,CAQ1E;AAMD,wEAAwE;AACxE,wBAAgB,mCAAmC,IAAI,IAAI,CAO1D"}

package/dist/otel.js

@@ -9,12 +9,42 @@
  *   serviceName: "cursor",
  *   exporters: [{ url: "https://otel.example.com", protocol: "http/protobuf" }],
  * });
+ *
+ * // Hosted v2: re-read env on flush after deployment secrets bind.
+ * export default defineOtel(() => resolveMyOtelConfig());
  * ```
  */
+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`. */
 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) {
@@ -36,7 +66,6 @@ export function defineOtel(config = {}) {
         }
     }
     assertSampleRatio(config.traces);
-    return brandDefinition("otel", config);
 }
 function assertSignals(signals) {
     if (signals === undefined) {
@@ -75,9 +104,15 @@ export function formatTraceparent(spanContext) {
 /**
  * Copy the active span onto outbound headers as W3C `traceparent` and
  * Cursor `backend-traceparent`. No-op when no valid span is active.
+ *
+ * Prefers the Agent SDK ALS (`instrumentHttp`, `runInTurn`,
+ * `runInCall`). Falls back to the `@anysphere/context` process-wide
+ * ALS: `createSpan` does not bind OTel API context, and SPAN keys
+ * are per `@opentelemetry/api` copy.
  */
 export function injectActiveTraceContext(headers) {
-    const span = trace.getSpan(context.active());
+    var _a;
+    const span = (_a = trace.getSpan(context.active())) !== null && _a !== void 0 ? _a : getContextTracerSpan();
     if (span === undefined) {
         return;
     }
@@ -88,3 +123,59 @@ export function injectActiveTraceContext(headers) {
     headers.set(TRACEPARENT_HEADER, traceparent);
     headers.set(BACKEND_TRACEPARENT_HEADER, traceparent);
 }
+/** W3C `traceparent` for the active span, or undefined if none. */
+export function activeTraceparent() {
+    var _a;
+    const headers = new Headers();
+    injectActiveTraceContext(headers);
+    return (_a = headers.get(TRACEPARENT_HEADER)) !== null && _a !== void 0 ? _a : undefined;
+}
+/**
+ * Copy the active span onto every outbound `fetch`. Agents should not
+ * wrap their own Connect / MCP clients for this — `createOtelRuntime`
+ * installs it on `globalThis.fetch` when traces are on.
+ */
+function headersForFetch(input, init) {
+    // Fetch: `init.headers` replaces `Request` headers. If `init` omits
+    // headers (`fetch(request, { signal })`), keep the Request's.
+    const headers = new Headers((init === null || init === void 0 ? void 0 : init.headers) !== undefined
+        ? init.headers
+        : input instanceof Request
+            ? input.headers
+            : undefined);
+    injectActiveTraceContext(headers);
+    return headers;
+}
+export function instrumentedFetch(base = fetch) {
+    return (input, init) => {
+        const headers = headersForFetch(input, init);
+        if (input instanceof Request && init === undefined) {
+            return base(new Request(input, { headers }));
+        }
+        return base(input, Object.assign(Object.assign({}, init), { headers }));
+    };
+}
+const OUTBOUND_FETCH_INSTALLED = Symbol.for("anysphere.july.otel.outboundFetch");
+/** Idempotent. Safe to call from `createOtelRuntime` on every serve. */
+export function installOutboundFetchInstrumentation() {
+    const slots = globalThis;
+    if (slots[OUTBOUND_FETCH_INSTALLED] === true) {
+        return;
+    }
+    slots[OUTBOUND_FETCH_INSTALLED] = true;
+    globalThis.fetch = instrumentedFetch(globalThis.fetch);
+}
+/** Must match `@anysphere/context` `ACTIVE_OTEL_SPAN_ALS`. */
+const ACTIVE_OTEL_SPAN_ALS = Symbol.for("anysphere.context.activeOtelSpanAls");
+function ensureContextTracerAls() {
+    const slots = globalThis;
+    if (slots[ACTIVE_OTEL_SPAN_ALS] === undefined) {
+        slots[ACTIVE_OTEL_SPAN_ALS] = new AsyncLocalStorage();
+    }
+}
+ensureContextTracerAls();
+function getContextTracerSpan() {
+    var _a;
+    const als = globalThis[ACTIVE_OTEL_SPAN_ALS];
+    return (_a = als === null || als === void 0 ? void 0 : als.getStore) === null || _a === void 0 ? void 0 : _a.call(als);
+}