@sentry/cloudflare 10.69.0 → 10.71.0

package/build/esm/workflows.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.js","sources":["../../src/workflows.ts"],"sourcesContent":["import type { PropagationContext } from '@sentry/core';\nimport {\n  captureException,\n  flush,\n  getCurrentScope,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n  withScope,\n} from '@sentry/core';\nimport type {\n  WorkflowDelayDuration,\n  WorkflowEntrypoint,\n  WorkflowEvent,\n  WorkflowSleepDuration,\n  WorkflowStep,\n  WorkflowStepConfig,\n  WorkflowStepContext,\n  WorkflowStepEvent,\n  WorkflowStepRollbackOptions,\n  WorkflowTimeoutDuration,\n} from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose } from './flush';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\nconst UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;\n\n/**\n * Hashes a string to a UUID using SHA-1.\n */\nexport async function deterministicTraceIdFromInstanceId(instanceId: string): Promise<string> {\n  const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(instanceId));\n  return (\n    Array.from(new Uint8Array(buf))\n      // We only need the first 16 bytes for the 32 characters\n      .slice(0, 16)\n      .map(b => b.toString(16).padStart(2, '0'))\n      .join('')\n  );\n}\n\nasync function propagationContextFromInstanceId(instanceId: string): Promise<PropagationContext> {\n  const traceId = UUID_REGEX.test(instanceId)\n    ? instanceId.replace(/-/g, '')\n    : await deterministicTraceIdFromInstanceId(instanceId);\n\n  // Derive sampleRand from last 4 characters of the random UUID\n  //\n  // We cannot store any state between workflow steps, so we derive the\n  // sampleRand from the traceId itself. This ensures that the sampling is\n  // consistent across all steps in the same workflow instance.\n  const sampleRand = parseInt(traceId.slice(-4), 16) / 0xffff;\n\n  return {\n    traceId,\n    sampleRand,\n  };\n}\n\nclass WrappedWorkflowStep implements WorkflowStep {\n  public constructor(\n    private _instanceId: string,\n    private _options: CloudflareOptions,\n    private _step: WorkflowStep,\n    private _waitUntil: ExecutionContext['waitUntil'],\n  ) {}\n\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    callback: (ctx: WorkflowStepContext) => Promise<T>,\n    rollbackOptions?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>, const C extends WorkflowStepConfig>(\n    name: string,\n    config: C,\n    callback: (\n      ctx: WorkflowStepContext<C['retries'] extends { delay: infer D } ? D : WorkflowDelayDuration | number>,\n    ) => Promise<T>,\n    rollbackOptions?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | ((ctx: WorkflowStepContext) => Promise<T>),\n    callbackOrRollback?: ((ctx: WorkflowStepContext) => Promise<T>) | WorkflowStepRollbackOptions<T>,\n    maybeRollback?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T> {\n    // Capture the current scope, so parent span (e.g., a startSpan surrounding step.do) is preserved\n    const scopeForStep = getCurrentScope();\n\n    const hasConfig = typeof configOrCallback !== 'function';\n    const config = hasConfig ? configOrCallback : undefined;\n    const userCallback = (hasConfig ? callbackOrRollback : configOrCallback) as (\n      ctx: WorkflowStepContext,\n    ) => Promise<T>;\n    const rollbackOptions = (hasConfig ? maybeRollback : callbackOrRollback) as\n      | WorkflowStepRollbackOptions<T>\n      | undefined;\n\n    const instrumentedCallback = async (...args: unknown[]): Promise<T> => {\n      // Feature detection: Cloudflare Workflows (April 2026+) pass a step context\n      // with `attempt` and `config.retries.limit`. When available, we only capture\n      // errors on the final attempt to avoid duplicates during retries.\n      const stepContext = args[0] as { attempt?: number; config?: { retries?: { limit?: number } } } | undefined;\n      const attempt = stepContext?.attempt;\n      const retryLimit = stepContext?.config?.retries?.limit;\n      const hasStepContext = typeof attempt === 'number' && typeof retryLimit === 'number';\n\n      // Only capture error on final attempt (attempt > retryLimit means no more retries left)\n      // or when step context is unavailable (legacy behavior - capture all errors)\n      const isFinalAttempt = !hasStepContext || attempt > retryLimit;\n\n      return startSpan(\n        {\n          op: 'function.step.do',\n          name,\n          scope: scopeForStep,\n          attributes: {\n            'cloudflare.workflow.timeout': config?.timeout,\n            'cloudflare.workflow.retries.backoff': config?.retries?.backoff,\n            // In workers-types v5, `delay` may be a `WorkflowDelayFunction`, which isn't a valid span attribute value.\n            'cloudflare.workflow.retries.delay':\n              typeof config?.retries?.delay === 'function' ? undefined : config?.retries?.delay,\n            'cloudflare.workflow.retries.limit': config?.retries?.limit,\n            'cloudflare.workflow.attempt': attempt,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.workflow',\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n          },\n        },\n        async span => {\n          try {\n            const result = await (userCallback as (...args: unknown[]) => Promise<T>)(...args);\n            span.setStatus({ code: 1 });\n            return result;\n          } catch (error) {\n            if (isFinalAttempt) {\n              captureException(error, { mechanism: { handled: true, type: 'auto.faas.cloudflare.workflow' } });\n            }\n            throw error;\n          } finally {\n            this._waitUntil(flush(2000));\n          }\n        },\n      );\n    };\n\n    if (config) {\n      return rollbackOptions\n        ? this._step.do(name, config, instrumentedCallback, rollbackOptions)\n        : this._step.do(name, config, instrumentedCallback);\n    }\n\n    return rollbackOptions\n      ? this._step.do(name, instrumentedCallback, rollbackOptions)\n      : this._step.do(name, instrumentedCallback);\n  }\n\n  public async sleep(name: string, duration: WorkflowSleepDuration): Promise<void> {\n    return this._step.sleep(name, duration);\n  }\n\n  public async sleepUntil(name: string, timestamp: Date | number): Promise<void> {\n    return this._step.sleepUntil(name, timestamp);\n  }\n\n  public async waitForEvent<T extends Rpc.Serializable<T>>(\n    name: string,\n    options: { type: string; timeout?: WorkflowTimeoutDuration | number },\n  ): Promise<WorkflowStepEvent<T>> {\n    return this._step.waitForEvent<T>(name, options);\n  }\n}\n\n/**\n * Instruments a Cloudflare Workflow class with Sentry.\n *\n * @example\n * ```typescript\n * const InstrumentedWorkflow = instrumentWorkflowWithSentry(\n *   (env) => ({ dsn: env.SENTRY_DSN }),\n *   MyWorkflowClass\n * );\n *\n * export default InstrumentedWorkflow;\n * ```\n *\n * @param optionsCallback - Function that returns Sentry options to initialize Sentry\n * @param WorkflowClass - The workflow class to instrument\n * @returns Instrumented workflow class with the same interface\n */\nexport function instrumentWorkflowWithSentry<\n  E, // Environment type\n  P, // Payload type\n  T extends WorkflowEntrypoint<E, P>, // WorkflowEntrypoint type\n  C extends new (ctx: ExecutionContext, env: E) => T, // Constructor type of the WorkflowEntrypoint class\n>(optionsCallback: (env: E) => CloudflareOptions, WorkFlowClass: C): C {\n  return new Proxy(WorkFlowClass, {\n    construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {\n      const [ctx, env] = args;\n      const context = instrumentContext(ctx);\n      const options = optionsCallback(env);\n      args[0] = context;\n      args[1] = instrumentEnv(env as Record<string, unknown>, options) as E;\n      const instance = Reflect.construct(target, args, newTarget) as T;\n      return new Proxy(instance, {\n        get(obj, prop, receiver) {\n          if (prop === 'run') {\n            return async function (event: WorkflowEvent<P>, step: WorkflowStep): Promise<unknown> {\n              setAsyncLocalStorageAsyncContextStrategy();\n\n              return withIsolationScope(async isolationScope => {\n                const waitUntil = context.waitUntil.bind(context);\n                const client = init({ ...options, ctx: context, enableDedupe: false });\n                isolationScope.setClient(client);\n\n                addCloudResourceContext(isolationScope);\n\n                return withScope(async scope => {\n                  const propagationContext = await propagationContextFromInstanceId(event.instanceId);\n                  scope.setPropagationContext(propagationContext);\n\n                  try {\n                    return await obj.run.call(\n                      obj,\n                      event,\n                      new WrappedWorkflowStep(event.instanceId, options, step, waitUntil),\n                    );\n                  } finally {\n                    waitUntil(flushAndDispose(client));\n                  }\n                });\n              });\n            };\n          }\n          return Reflect.get(obj, prop, receiver);\n        },\n      });\n    },\n  });\n}\n"],"names":[],"mappings":";;;;;;;;AA+BA,MAAM,UAAA,GAAa,qEAAA;AAKnB,eAAsB,mCAAmC,UAAA,EAAqC;AAC5F,EAAA,MAAM,GAAA,GAAM,MAAM,MAAA,CAAO,MAAA,CAAO,MAAA,CAAO,OAAA,EAAS,IAAI,WAAA,EAAY,CAAE,MAAA,CAAO,UAAU,CAAC,CAAA;AACpF,EAAA,OACE,KAAA,CAAM,KAAK,IAAI,UAAA,CAAW,GAAG,CAAC,CAAA,CAE3B,KAAA,CAAM,CAAA,EAAG,EAAE,CAAA,CACX,IAAI,CAAA,CAAA,KAAK,CAAA,CAAE,QAAA,CAAS,EAAE,CAAA,CAAE,QAAA,CAAS,GAAG,GAAG,CAAC,CAAA,CACxC,IAAA,CAAK,EAAE,CAAA;AAEd;AAEA,eAAe,iCAAiC,UAAA,EAAiD;AAC/F,EAAA,MAAM,OAAA,GAAU,UAAA,CAAW,IAAA,CAAK,UAAU,CAAA,GACtC,UAAA,CAAW,OAAA,CAAQ,IAAA,EAAM,EAAE,CAAA,GAC3B,MAAM,kCAAA,CAAmC,UAAU,CAAA;AAOvD,EAAA,MAAM,aAAa,QAAA,CAAS,OAAA,CAAQ,MAAM,EAAE,CAAA,EAAG,EAAE,CAAA,GAAI,KAAA;AAErD,EAAA,OAAO;AAAA,IACL,OAAA;AAAA,IACA;AAAA,GACF;AACF;AAEA,MAAM,mBAAA,CAA4C;AAAA,EACzC,WAAA,CACG,WAAA,EACA,QAAA,EACA,KAAA,EACA,UAAA,EACR;AAJQ,IAAA,IAAA,CAAA,WAAA,GAAA,WAAA;AACA,IAAA,IAAA,CAAA,QAAA,GAAA,QAAA;AACA,IAAA,IAAA,CAAA,KAAA,GAAA,KAAA;AACA,IAAA,IAAA,CAAA,UAAA,GAAA,UAAA;AAAA,EACP;AAAA,EAeH,MAAa,EAAA,CACX,IAAA,EACA,gBAAA,EACA,oBACA,aAAA,EACY;AAEZ,IAAA,MAAM,eAAe,eAAA,EAAgB;AAErC,IAAA,MAAM,SAAA,GAAY,OAAO,gBAAA,KAAqB,UAAA;AAC9C,IAAA,MAAM,MAAA,GAAS,YAAY,gBAAA,GAAmB,MAAA;AAC9C,IAAA,MAAM,YAAA,GAAgB,YAAY,kBAAA,GAAqB,gBAAA;AAGvD,IAAA,MAAM,eAAA,GAAmB,YAAY,aAAA,GAAgB,kBAAA;AAIrD,IAAA,MAAM,oBAAA,GAAuB,UAAU,IAAA,KAAgC;AAIrE,MAAA,MAAM,WAAA,GAAc,KAAK,CAAC,CAAA;AAC1B,MAAA,MAAM,UAAU,WAAA,EAAa,OAAA;AAC7B,MAAA,MAAM,UAAA,GAAa,WAAA,EAAa,MAAA,EAAQ,OAAA,EAAS,KAAA;AACjD,MAAA,MAAM,cAAA,GAAiB,OAAO,OAAA,KAAY,QAAA,IAAY,OAAO,UAAA,KAAe,QAAA;AAI5E,MAAA,MAAM,cAAA,GAAiB,CAAC,cAAA,IAAkB,OAAA,GAAU,UAAA;AAEpD,MAAA,OAAO,SAAA;AAAA,QACL;AAAA,UACE,EAAA,EAAI,kBAAA;AAAA,UACJ,IAAA;AAAA,UACA,KAAA,EAAO,YAAA;AAAA,UACP,UAAA,EAAY;AAAA,YACV,+BAA+B,MAAA,EAAQ,OAAA;AAAA,YACvC,qCAAA,EAAuC,QAAQ,OAAA,EAAS,OAAA;AAAA;AAAA,YAExD,mCAAA,EACE,OAAO,MAAA,EAAQ,OAAA,EAAS,UAAU,UAAA,GAAa,MAAA,GAAY,QAAQ,OAAA,EAAS,KAAA;AAAA,YAC9E,mCAAA,EAAqC,QAAQ,OAAA,EAAS,KAAA;AAAA,YACtD,6BAAA,EAA+B,OAAA;AAAA,YAC/B,CAAC,gCAAgC,GAAG,+BAAA;AAAA,YACpC,CAAC,gCAAgC,GAAG;AAAA;AACtC,SACF;AAAA,QACA,OAAM,IAAA,KAAQ;AACZ,UAAA,IAAI;AACF,YAAA,MAAM,MAAA,GAAS,MAAO,YAAA,CAAoD,GAAG,IAAI,CAAA;AACjF,YAAA,IAAA,CAAK,SAAA,CAAU,EAAE,IAAA,EAAM,CAAA,EAAG,CAAA;AAC1B,YAAA,OAAO,MAAA;AAAA,UACT,SAAS,KAAA,EAAO;AACd,YAAA,IAAI,cAAA,EAAgB;AAClB,cAAA,gBAAA,CAAiB,KAAA,EAAO,EAAE,SAAA,EAAW,EAAE,SAAS,IAAA,EAAM,IAAA,EAAM,+BAAA,EAAgC,EAAG,CAAA;AAAA,YACjG;AACA,YAAA,MAAM,KAAA;AAAA,UACR,CAAA,SAAE;AACA,YAAA,IAAA,CAAK,UAAA,CAAW,KAAA,CAAM,GAAI,CAAC,CAAA;AAAA,UAC7B;AAAA,QACF;AAAA,OACF;AAAA,IACF,CAAA;AAEA,IAAA,IAAI,MAAA,EAAQ;AACV,MAAA,OAAO,eAAA,GACH,IAAA,CAAK,KAAA,CAAM,EAAA,CAAG,MAAM,MAAA,EAAQ,oBAAA,EAAsB,eAAe,CAAA,GACjE,IAAA,CAAK,KAAA,CAAM,EAAA,CAAG,IAAA,EAAM,QAAQ,oBAAoB,CAAA;AAAA,IACtD;AAEA,IAAA,OAAO,eAAA,GACH,IAAA,CAAK,KAAA,CAAM,EAAA,CAAG,IAAA,EAAM,oBAAA,EAAsB,eAAe,CAAA,GACzD,IAAA,CAAK,KAAA,CAAM,EAAA,CAAG,IAAA,EAAM,oBAAoB,CAAA;AAAA,EAC9C;AAAA,EAEA,MAAa,KAAA,CAAM,IAAA,EAAc,QAAA,EAAgD;AAC/E,IAAA,OAAO,IAAA,CAAK,KAAA,CAAM,KAAA,CAAM,IAAA,EAAM,QAAQ,CAAA;AAAA,EACxC;AAAA,EAEA,MAAa,UAAA,CAAW,IAAA,EAAc,SAAA,EAAyC;AAC7E,IAAA,OAAO,IAAA,CAAK,KAAA,CAAM,UAAA,CAAW,IAAA,EAAM,SAAS,CAAA;AAAA,EAC9C;AAAA,EAEA,MAAa,YAAA,CACX,IAAA,EACA,OAAA,EAC+B;AAC/B,IAAA,OAAO,IAAA,CAAK,KAAA,CAAM,YAAA,CAAgB,IAAA,EAAM,OAAO,CAAA;AAAA,EACjD;AACF;AAmBO,SAAS,4BAAA,CAKd,iBAAgD,aAAA,EAAqB;AACrE,EAAA,OAAO,IAAI,MAAM,aAAA,EAAe;AAAA,IAC9B,SAAA,CAAU,MAAA,EAAW,IAAA,EAAuC,SAAA,EAAW;AACrE,MAAA,MAAM,CAAC,GAAA,EAAK,GAAG,CAAA,GAAI,IAAA;AACnB,MAAA,MAAM,OAAA,GAAU,kBAAkB,GAAG,CAAA;AACrC,MAAA,MAAM,OAAA,GAAU,gBAAgB,GAAG,CAAA;AACnC,MAAA,IAAA,CAAK,CAAC,CAAA,GAAI,OAAA;AACV,MAAA,IAAA,CAAK,CAAC,CAAA,GAAI,aAAA,CAAc,GAAA,EAAgC,OAAO,CAAA;AAC/D,MAAA,MAAM,QAAA,GAAW,OAAA,CAAQ,SAAA,CAAU,MAAA,EAAQ,MAAM,SAAS,CAAA;AAC1D,MAAA,OAAO,IAAI,MAAM,QAAA,EAAU;AAAA,QACzB,GAAA,CAAI,GAAA,EAAK,IAAA,EAAM,QAAA,EAAU;AACvB,UAAA,IAAI,SAAS,KAAA,EAAO;AAClB,YAAA,OAAO,eAAgB,OAAyB,IAAA,EAAsC;AACpF,cAAA,wCAAA,EAAyC;AAEzC,cAAA,OAAO,kBAAA,CAAmB,OAAM,cAAA,KAAkB;AAChD,gBAAA,MAAM,SAAA,GAAY,OAAA,CAAQ,SAAA,CAAU,IAAA,CAAK,OAAO,CAAA;AAChD,gBAAA,MAAM,MAAA,GAAS,KAAK,EAAE,GAAG,SAAS,GAAA,EAAK,OAAA,EAAS,YAAA,EAAc,KAAA,EAAO,CAAA;AACrE,gBAAA,cAAA,CAAe,UAAU,MAAM,CAAA;AAE/B,gBAAA,uBAAA,CAAwB,cAAc,CAAA;AAEtC,gBAAA,OAAO,SAAA,CAAU,OAAM,KAAA,KAAS;AAC9B,kBAAA,MAAM,kBAAA,GAAqB,MAAM,gCAAA,CAAiC,KAAA,CAAM,UAAU,CAAA;AAClF,kBAAA,KAAA,CAAM,sBAAsB,kBAAkB,CAAA;AAE9C,kBAAA,IAAI;AACF,oBAAA,OAAO,MAAM,IAAI,GAAA,CAAI,IAAA;AAAA,sBACnB,GAAA;AAAA,sBACA,KAAA;AAAA,sBACA,IAAI,mBAAA,CAAoB,KAAA,CAAM,UAAA,EAAY,OAAA,EAAS,MAAM,SAAS;AAAA,qBACpE;AAAA,kBACF,CAAA,SAAE;AACA,oBAAA,SAAA,CAAU,eAAA,CAAgB,MAAM,CAAC,CAAA;AAAA,kBACnC;AAAA,gBACF,CAAC,CAAA;AAAA,cACH,CAAC,CAAA;AAAA,YACH,CAAA;AAAA,UACF;AACA,UAAA,OAAO,OAAA,CAAQ,GAAA,CAAI,GAAA,EAAK,IAAA,EAAM,QAAQ,CAAA;AAAA,QACxC;AAAA,OACD,CAAA;AAAA,IACH;AAAA,GACD,CAAA;AACH;;;;"}
+{"version":3,"file":"workflows.js","sources":["../../src/workflows.ts"],"sourcesContent":["import type { PropagationContext } from '@sentry/core';\nimport {\n  captureException,\n  flush,\n  getCurrentScope,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  SEMANTIC_ATTRIBUTE_SENTRY_SOURCE,\n  startSpan,\n  withIsolationScope,\n  withScope,\n} from '@sentry/core';\nimport type {\n  WorkflowDelayDuration,\n  WorkflowEntrypoint,\n  WorkflowEvent,\n  WorkflowSleepDuration,\n  WorkflowStep,\n  WorkflowStepConfig,\n  WorkflowStepContext,\n  WorkflowStepEvent,\n  WorkflowStepRollbackOptions,\n  WorkflowTimeoutDuration,\n} from 'cloudflare:workers';\nimport { setAsyncLocalStorageAsyncContextStrategy } from './async';\nimport type { CloudflareOptions } from './client';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { instrumentEnv } from './instrumentations/worker/instrumentEnv';\nimport { addCloudResourceContext } from './scope-utils';\nimport { init } from './sdk';\nimport { instrumentContext } from './utils/instrumentContext';\n\nconst UUID_REGEX = /^[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}$/i;\n\n/**\n * Hashes a string to a UUID using SHA-1.\n */\nexport async function deterministicTraceIdFromInstanceId(instanceId: string): Promise<string> {\n  const buf = await crypto.subtle.digest('SHA-1', new TextEncoder().encode(instanceId));\n  return (\n    Array.from(new Uint8Array(buf))\n      // We only need the first 16 bytes for the 32 characters\n      .slice(0, 16)\n      .map(b => b.toString(16).padStart(2, '0'))\n      .join('')\n  );\n}\n\nasync function propagationContextFromInstanceId(instanceId: string): Promise<PropagationContext> {\n  const traceId = UUID_REGEX.test(instanceId)\n    ? instanceId.replace(/-/g, '')\n    : await deterministicTraceIdFromInstanceId(instanceId);\n\n  // Derive sampleRand from last 4 characters of the random UUID\n  //\n  // We cannot store any state between workflow steps, so we derive the\n  // sampleRand from the traceId itself. This ensures that the sampling is\n  // consistent across all steps in the same workflow instance.\n  const sampleRand = parseInt(traceId.slice(-4), 16) / 0xffff;\n\n  return {\n    traceId,\n    sampleRand,\n  };\n}\n\nclass WrappedWorkflowStep implements WorkflowStep {\n  public constructor(\n    private _instanceId: string,\n    private _options: CloudflareOptions,\n    private _step: WorkflowStep,\n    private _waitUntil: ExecutionContext['waitUntil'],\n  ) {}\n\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    callback: (ctx: WorkflowStepContext) => Promise<T>,\n    rollbackOptions?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>, const C extends WorkflowStepConfig>(\n    name: string,\n    config: C,\n    callback: (\n      ctx: WorkflowStepContext<C['retries'] extends { delay: infer D } ? D : WorkflowDelayDuration | number>,\n    ) => Promise<T>,\n    rollbackOptions?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T>;\n  public async do<T extends Rpc.Serializable<T>>(\n    name: string,\n    configOrCallback: WorkflowStepConfig | ((ctx: WorkflowStepContext) => Promise<T>),\n    callbackOrRollback?: ((ctx: WorkflowStepContext) => Promise<T>) | WorkflowStepRollbackOptions<T>,\n    maybeRollback?: WorkflowStepRollbackOptions<T>,\n  ): Promise<T> {\n    // Capture the current scope, so parent span (e.g., a startSpan surrounding step.do) is preserved\n    const scopeForStep = getCurrentScope();\n\n    const hasConfig = typeof configOrCallback !== 'function';\n    const config = hasConfig ? configOrCallback : undefined;\n    const userCallback = (hasConfig ? callbackOrRollback : configOrCallback) as (\n      ctx: WorkflowStepContext,\n    ) => Promise<T>;\n    const rollbackOptions = (hasConfig ? maybeRollback : callbackOrRollback) as\n      | WorkflowStepRollbackOptions<T>\n      | undefined;\n\n    const instrumentedCallback = async (...args: unknown[]): Promise<T> => {\n      // Feature detection: Cloudflare Workflows (April 2026+) pass a step context\n      // with `attempt` and `config.retries.limit`. When available, we only capture\n      // errors on the final attempt to avoid duplicates during retries.\n      const stepContext = args[0] as { attempt?: number; config?: { retries?: { limit?: number } } } | undefined;\n      const attempt = stepContext?.attempt;\n      const retryLimit = stepContext?.config?.retries?.limit;\n      const hasStepContext = typeof attempt === 'number' && typeof retryLimit === 'number';\n\n      // Only capture error on final attempt (attempt > retryLimit means no more retries left)\n      // or when step context is unavailable (legacy behavior - capture all errors)\n      const isFinalAttempt = !hasStepContext || attempt > retryLimit;\n\n      return startSpan(\n        {\n          op: 'function.step.do',\n          name,\n          scope: scopeForStep,\n          attributes: {\n            'cloudflare.workflow.timeout': config?.timeout,\n            'cloudflare.workflow.retries.backoff': config?.retries?.backoff,\n            // In workers-types v5, `delay` may be a `WorkflowDelayFunction`, which isn't a valid span attribute value.\n            'cloudflare.workflow.retries.delay':\n              typeof config?.retries?.delay === 'function' ? undefined : config?.retries?.delay,\n            'cloudflare.workflow.retries.limit': config?.retries?.limit,\n            'cloudflare.workflow.attempt': attempt,\n            [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: 'auto.faas.cloudflare.workflow',\n            [SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]: 'task',\n          },\n        },\n        async span => {\n          try {\n            const result = await (userCallback as (...args: unknown[]) => Promise<T>)(...args);\n            span.setStatus({ code: 1 });\n            return result;\n          } catch (error) {\n            if (isFinalAttempt) {\n              captureException(error, { mechanism: { handled: true, type: 'auto.faas.cloudflare.workflow' } });\n            }\n            throw error;\n          } finally {\n            this._waitUntil(flush(2000));\n          }\n        },\n      );\n    };\n\n    if (config) {\n      return rollbackOptions\n        ? this._step.do(name, config, instrumentedCallback, rollbackOptions)\n        : this._step.do(name, config, instrumentedCallback);\n    }\n\n    return rollbackOptions\n      ? this._step.do(name, instrumentedCallback, rollbackOptions)\n      : this._step.do(name, instrumentedCallback);\n  }\n\n  public async sleep(name: string, duration: WorkflowSleepDuration): Promise<void> {\n    return this._step.sleep(name, duration);\n  }\n\n  public async sleepUntil(name: string, timestamp: Date | number): Promise<void> {\n    return this._step.sleepUntil(name, timestamp);\n  }\n\n  public async waitForEvent<T extends Rpc.Serializable<T>>(\n    name: string,\n    options: { type: string; timeout?: WorkflowTimeoutDuration | number },\n  ): Promise<WorkflowStepEvent<T>> {\n    return this._step.waitForEvent<T>(name, options);\n  }\n}\n\n/**\n * Instruments a Cloudflare Workflow class with Sentry.\n *\n * @example\n * ```typescript\n * const InstrumentedWorkflow = instrumentWorkflowWithSentry(\n *   (env) => ({ dsn: env.SENTRY_DSN }),\n *   MyWorkflowClass\n * );\n *\n * export default InstrumentedWorkflow;\n * ```\n *\n * @param optionsCallback - Function that returns Sentry options to initialize Sentry\n * @param WorkflowClass - The workflow class to instrument\n * @returns Instrumented workflow class with the same interface\n */\nexport function instrumentWorkflowWithSentry<\n  E, // Environment type\n  P, // Payload type\n  T extends WorkflowEntrypoint<E, P>, // WorkflowEntrypoint type\n  C extends new (ctx: ExecutionContext, env: E) => T, // Constructor type of the WorkflowEntrypoint class\n>(optionsCallback: (env: E) => CloudflareOptions, WorkFlowClass: C): C {\n  return new Proxy(WorkFlowClass, {\n    construct(target: C, args: [ctx: ExecutionContext, env: E], newTarget) {\n      const [ctx, env] = args;\n      const context = instrumentContext(ctx);\n      const options = optionsCallback(env);\n      args[0] = context;\n      args[1] = instrumentEnv(env as Record<string, unknown>, options) as E;\n      const instance = Reflect.construct(target, args, newTarget) as T;\n      return new Proxy(instance, {\n        get(obj, prop, receiver) {\n          if (prop === 'run') {\n            return async function (event: WorkflowEvent<P>, step: WorkflowStep): Promise<unknown> {\n              setAsyncLocalStorageAsyncContextStrategy();\n\n              return withIsolationScope(async isolationScope => {\n                const waitUntil = getOriginalWaitUntil(context).bind(context);\n                const client = init({ ...options, ctx: context, enableDedupe: false });\n                isolationScope.setClient(client);\n\n                addCloudResourceContext(isolationScope);\n\n                return withScope(async scope => {\n                  const propagationContext = await propagationContextFromInstanceId(event.instanceId);\n                  scope.setPropagationContext(propagationContext);\n\n                  try {\n                    return await obj.run.call(\n                      obj,\n                      event,\n                      new WrappedWorkflowStep(event.instanceId, options, step, waitUntil),\n                    );\n                  } finally {\n                    waitUntil(flushAndDispose(client));\n                  }\n                });\n              });\n            };\n          }\n          return Reflect.get(obj, prop, receiver);\n        },\n      });\n    },\n  });\n}\n"],"names":[],"mappings":"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"}

package/build/esm/wrapMethodWithSentry.js

@@ -1,7 +1,8 @@
-import { getClient, withIsolationScope, withScope, isThenable, SEMANTIC_ATTRIBUTE_SENTRY_OP, continueTrace, startNewTrace, captureException, startSpan, isObjectLike, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
+import { isThenable, SEMANTIC_ATTRIBUTE_SENTRY_OP, continueTrace, startNewTrace, captureException, startSpan, isObjectLike, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';
 import { getOriginalWaitUntil, flushAndDispose } from './flush.js';
 import { ensureInstrumented } from './instrument.js';
 import { init } from './sdk.js';
+import { withInvocationIsolationScope } from './utils/invocationScope.js';
 import { extractRpcMeta } from './utils/rpcMeta.js';
 import { getStoredSpanContext, buildSpanLinks, storeSpanContext } from './utils/traceLinks.js';
 
@@ -30,8 +31,6 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
           args = extracted.args;
           rpcMeta = extracted.rpcMeta;
         }
-        const currentClient = getClient();
-        const sentryWithScope = startNewTrace$1 ? withIsolationScope : currentClient ? withScope : withIsolationScope;
         const wrappedFunction = (scope) => {
           const context = wrapperOptions.context;
           const waitUntil = context ? getOriginalWaitUntil(context)?.bind(context) : void 0;
@@ -122,7 +121,7 @@ function wrapMethodWithSentry(wrapperOptions, handler, callback, noMark) {
           }
           return executeSpan();
         };
-        return sentryWithScope(wrappedFunction);
+        return withInvocationIsolationScope(wrappedFunction);
       }
     }),
     noMark

package/build/esm/wrapMethodWithSentry.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  getClient,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n  withIsolationScope,\n  withScope,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\ninterface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  spanName?: string;\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          // For startNewTrace, always use withIsolationScope to ensure a fresh scope\n          // Otherwise, use existing client's scope or isolation scope\n          const currentClient = getClient();\n          const sentryWithScope = startNewTrace ? withIsolationScope : currentClient ? withScope : withIsolationScope;\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = wrapperOptions.spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!wrapperOptions.spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return sentryWithScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["startNewTrace","startNewTraceCore"],"mappings":"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"}
+{"version":3,"file":"wrapMethodWithSentry.js","sources":["../../src/wrapMethodWithSentry.ts"],"sourcesContent":["import type { DurableObjectStorage } from '@cloudflare/workers-types';\nimport type { SerializedTraceData } from '@sentry/core';\nimport {\n  isObjectLike,\n  captureException,\n  continueTrace,\n  isThenable,\n  type Scope,\n  SEMANTIC_ATTRIBUTE_SENTRY_OP,\n  SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN,\n  startNewTrace as startNewTraceCore,\n  startSpan,\n} from '@sentry/core';\nimport type { CloudflareOptions } from './client';\nimport type { ExecutionContextCompat } from './executionContext';\nimport { flushAndDispose, getOriginalWaitUntil } from './flush';\nimport { ensureInstrumented } from './instrument';\nimport { init } from './sdk';\nimport { withInvocationIsolationScope } from './utils/invocationScope';\nimport { extractRpcMeta } from './utils/rpcMeta';\nimport { buildSpanLinks, getStoredSpanContext, storeSpanContext } from './utils/traceLinks';\n\n/** Extended DurableObjectState with originalStorage exposed by instrumentContext */\nexport interface InstrumentedDurableObjectState extends DurableObjectState {\n  originalStorage?: DurableObjectStorage;\n}\n\n/**\n * Resolves uninstrumented DO storage for the current invocation.\n * Prefer `thisArg.ctx` (the live Durable Object instance) over the context captured at\n * construction time to avoid cross-DO I/O errors in the same isolate.\n */\nfunction resolveOriginalStorage(\n  context: ExecutionContext | InstrumentedDurableObjectState | undefined,\n  thisArg: unknown,\n): DurableObjectStorage | undefined {\n  if (isObjectLike(thisArg) && 'ctx' in thisArg) {\n    const doCtx = (thisArg as { ctx: InstrumentedDurableObjectState }).ctx;\n    if (doCtx?.originalStorage) {\n      return doCtx.originalStorage;\n    }\n  }\n\n  if (context && 'originalStorage' in context && context.originalStorage) {\n    return context.originalStorage;\n  }\n\n  return undefined;\n}\n\ntype MethodWrapperOptions = {\n  spanName?: string;\n  spanOp?: string;\n  options: CloudflareOptions;\n  context: ExecutionContext | InstrumentedDurableObjectState;\n  /**\n   * If true, starts a fresh trace instead of inheriting from a parent trace.\n   * Useful for scheduled/independent invocations like alarms.\n   *\n   * If true, it also stores the current span context and links to the previous invocation's span.\n   * Uses Durable Object storage to persist the link. The link is set asynchronously via `span.addLinks()`\n   * in a `waitUntil` to avoid blocking.\n   *\n   * @default false\n   */\n  startNewTrace?: boolean;\n  /**\n   * The trace origin identifying which instrumentation created the span, e.g. `auto.faas.cloudflare.durable_object`.\n   * Used both as the span's `sentry.origin` attribute and as the `mechanism.type` for captured exceptions.\n   */\n  origin: string;\n};\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type UncheckedMethod = (...args: any[]) => any;\ntype OriginalMethod = UncheckedMethod;\n\n/**\n * Wraps a method with Sentry error tracking and optional tracing.\n * Supports starting new traces and linking to previous invocations via Durable Object storage.\n *\n * @param wrapperOptions - The options for the wrapper.\n * @param handler - The method to wrap.\n * @param callback - The callback to call.\n * @param noMark - Whether to mark the method as instrumented.\n * @returns The wrapped method.\n */\nexport function wrapMethodWithSentry<T extends OriginalMethod>(\n  wrapperOptions: MethodWrapperOptions,\n  handler: T,\n  callback?: (...args: Parameters<T>) => void,\n  noMark?: true,\n): T {\n  return ensureInstrumented(\n    handler,\n    original =>\n      new Proxy(original, {\n        apply(target, thisArg, rawArgs: Parameters<T>) {\n          const { startNewTrace, origin } = wrapperOptions;\n\n          // For RPC methods, extract Sentry trace context from the trailing argument.\n          // The caller side (instrumentDurableObjectStub / JSRPC proxy) appends it;\n          // we strip it here so the user's method never sees it.\n          let args = rawArgs;\n          let rpcMeta: SerializedTraceData | undefined;\n\n          if (wrapperOptions.spanOp === 'rpc') {\n            const extracted = extractRpcMeta(rawArgs);\n            args = extracted.args;\n            rpcMeta = extracted.rpcMeta;\n          }\n\n          const wrappedFunction = (scope: Scope): unknown | Promise<unknown> => {\n            // In certain situations, the passed context can become undefined.\n            // For example, for Astro while prerendering pages at build time.\n            // see: https://github.com/getsentry/sentry-javascript/issues/13217\n            const context: typeof wrapperOptions.context | undefined = wrapperOptions.context;\n\n            // see: https://github.com/getsentry/sentry-javascript/issues/22328\n            const waitUntil = context\n              ? getOriginalWaitUntil(context as ExecutionContextCompat)?.bind(context)\n              : undefined;\n            const storage = resolveOriginalStorage(context, thisArg);\n\n            let scopeClient = scope.getClient();\n            // Check if client exists AND is still usable (transport not disposed)\n            // This handles the case where a previous handler disposed the client\n            // but the scope still holds a reference to it (e.g., alarm handlers in Durable Objects)\n            // For startNewTrace, always create a fresh client\n            if (startNewTrace || !scopeClient?.getTransport()) {\n              const client = init({\n                ...wrapperOptions.options,\n                ctx: context as unknown as ExecutionContext | undefined,\n              });\n              scope.setClient(client);\n              scopeClient = client;\n            }\n\n            const clientToDispose = scopeClient;\n            const methodName = wrapperOptions.spanName || 'unknown';\n\n            const teardown = async (): Promise<void> => {\n              if (startNewTrace && storage) {\n                storeSpanContext(storage, methodName);\n              }\n              await flushAndDispose(clientToDispose);\n            };\n\n            const onFulfilled = (res: unknown) => {\n              waitUntil?.(teardown());\n              return res;\n            };\n\n            const onRejected = (e: unknown) => {\n              captureException(e, {\n                mechanism: {\n                  type: origin,\n                  handled: false,\n                },\n              });\n              waitUntil?.(teardown());\n              throw e;\n            };\n\n            if (!wrapperOptions.spanName) {\n              try {\n                if (callback) {\n                  callback(...args);\n                }\n\n                const result = Reflect.apply(target, thisArg, args);\n\n                if (isThenable(result)) {\n                  return result.then(onFulfilled, onRejected);\n                } else {\n                  return onFulfilled(result);\n                }\n              } catch (e) {\n                return onRejected(e);\n              }\n            }\n\n            const attributes = wrapperOptions.spanOp\n              ? {\n                  [SEMANTIC_ATTRIBUTE_SENTRY_OP]: wrapperOptions.spanOp,\n                  [SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]: origin,\n                }\n              : {};\n\n            const executeSpan = (): unknown => {\n              return startSpan({ name: methodName, attributes }, span => {\n                if (startNewTrace && storage) {\n                  const storedContext = getStoredSpanContext(storage, methodName);\n\n                  if (storedContext) {\n                    span.addLinks(buildSpanLinks(storedContext));\n                    // TODO: Remove this once EAP can store span links. We currently only set this attribute so that we\n                    // can obtain the previous trace information from the EAP store. Long-term, EAP will handle\n                    // span links and then we should remove this again. Also throwing in a TODO(v11), to remind us\n                    // to check this at v11 time :)\n                    const sampledFlag = storedContext.sampled ? '1' : '0';\n                    span.setAttribute(\n                      'sentry.previous_trace',\n                      `${storedContext.traceId}-${storedContext.spanId}-${sampledFlag}`,\n                    );\n                  }\n                }\n\n                try {\n                  const result = Reflect.apply(target, thisArg, args);\n\n                  if (isThenable(result)) {\n                    return result.then(onFulfilled, onRejected);\n                  } else {\n                    return onFulfilled(result);\n                  }\n                } catch (e) {\n                  return onRejected(e);\n                }\n              });\n            };\n\n            if (rpcMeta) {\n              return continueTrace(\n                { sentryTrace: rpcMeta['sentry-trace'] || '', baggage: rpcMeta.baggage || '' },\n                executeSpan,\n              );\n            }\n\n            if (startNewTrace) {\n              return startNewTraceCore(() => executeSpan());\n            }\n\n            return executeSpan();\n          };\n\n          return withInvocationIsolationScope(wrappedFunction);\n        },\n      }),\n    noMark,\n  );\n}\n"],"names":["startNewTrace","startNewTraceCore"],"mappings":"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"}

package/build/types/durableobject.d.ts

@@ -18,8 +18,8 @@ type InstrumentedDurableObjectContext = any;
  *
  * This is the shared construction path used by both {@link instrumentDurableObjectWithSentry}
  * and {@link instrumentAgentWithSentry}. It intentionally does NOT apply the RPC prototype-method
- * proxy — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any additional
- * per-instance instrumentation has been layered onto the returned object.
+ * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any
+ * additional per-instance instrumentation has been layered onto the returned object.
  *
  * @internal
  */
@@ -27,18 +27,27 @@ export declare function constructInstrumentedDurableObject<E, T extends DurableO
     obj: T;
     options: CloudflareOptions;
     context: InstrumentedDurableObjectContext;
+    frameworkManagedMethods: ReadonlySet<string>;
 };
 /**
- * Wraps a constructed (and already handler-instrumented) Durable Object instance with the RPC
- * prototype-method proxy, when RPC trace propagation is enabled. Returns the object unchanged when
- * RPC instrumentation is disabled.
+ * Adds trace propagation to a constructed Durable Object's RPC methods.
  *
- * This must be applied last, so that any per-instance instrumentation (own properties such as
- * `fetch`, `alarm`, or Agent-specific handlers) is excluded from RPC method tracing.
+ * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable
+ * Object instance as the receiver. This preserves native private-field access and keeps the methods
+ * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by
+ * another framework are left untouched.
  *
+ * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is
+ * disabled, the object is returned unchanged.
+ *
+ * @param obj The constructed Durable Object instance.
+ * @param options The resolved SDK options for this instance.
+ * @param context The instrumented execution context for this instance.
+ * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.
+ * @returns The same Durable Object instance, with eligible prototype methods instrumented.
  * @internal
  */
-export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T, options: CloudflareOptions, context: InstrumentedDurableObjectContext): T;
+export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T, options: CloudflareOptions, context: InstrumentedDurableObjectContext, excludedMethods?: ReadonlySet<string>): T;
 /**
  * Instruments a Durable Object class to capture errors and performance data.
  *

package/build/types/durableobject.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableobject.d.ts","sourceRoot":"","sources":["../../src/durableobject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWlD;;;;;;;;;;GAUG;AAEH,KAAK,gCAAgC,GAAG,GAAG,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC9E,MAAM,EAAE,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACpD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,CAAC,EACN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,GAC7C;IAAE,GAAG,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,iBAAiB,CAAC;IAAC,OAAO,EAAE,gCAAgC,CAAA;CAAE,CAiBnF;AAgFD;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,CAAC,SAAS,MAAM,EAC7D,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,gCAAgC,GACxC,CAAC,CAoFH;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAc1E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,yBAAyB,CACvC,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAkBlE"}
+{"version":3,"file":"durableobject.d.ts","sourceRoot":"","sources":["../../src/durableobject.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAWlD;;;;;;;;;;GAUG;AAEH,KAAK,gCAAgC,GAAG,GAAG,CAAC;AAE5C;;;;;;;;;;GAUG;AACH,wBAAgB,kCAAkC,CAAC,CAAC,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC9E,MAAM,EAAE,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACpD,GAAG,EAAE,kBAAkB,EACvB,GAAG,EAAE,CAAC,EACN,SAAS,EAAE,eAAe,EAC1B,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,GAC7C;IACD,GAAG,EAAE,CAAC,CAAC;IACP,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gCAAgC,CAAC;IAC1C,uBAAuB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC9C,CA4BA;AA6KD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,8BAA8B,CAAC,CAAC,SAAS,MAAM,EAC7D,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,gCAAgC,EACzC,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,GACpC,CAAC,CA0BH;AAqHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,wBAAgB,iCAAiC,CAC/C,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,CAAC,GAAG,CAAC,CAc1E;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,wBAAgB,yBAAyB,CACvC,CAAC,EACD,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EAC1B,CAAC,SAAS,KAAK,KAAK,EAAE,kBAAkB,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,EACtD,eAAe,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,iBAAiB,EAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAoBlE"}

package/build/types/flush.d.ts

@@ -19,7 +19,7 @@ type FlushLock = {
  *
  * By using the original waitUntil for flush operations, we bypass this issue.
  */
-export declare function getOriginalWaitUntil(context: ExecutionContextCompat): ExecutionContext['waitUntil'] | undefined;
+export declare function getOriginalWaitUntil(context: ExecutionContextCompat): ExecutionContext['waitUntil'];
 /**
  * Enhances the given execution context by wrapping its `waitUntil` method with a proxy
  * to monitor pending tasks, and provides a flusher function to ensure all tasks

package/build/types/flush.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flush.d.ts","sourceRoot":"","sources":["../../src/flush.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CAAC;AAcF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,GAAG,gBAAgB,CAAC,WAAW,CAAC,GAAG,SAAS,CAK/G;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CA8BxE;AAoCD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/F"}
+{"version":3,"file":"flush.d.ts","sourceRoot":"","sources":["../../src/flush.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CACxC,CAAC;AAcF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,sBAAsB,GAAG,gBAAgB,CAAC,WAAW,CAAC,CAKnG;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,sBAAsB,GAAG,SAAS,CA8BxE;AAoCD;;;;;;;;;;;;GAYG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB/F"}

package/build/types/instrumentations/agents/index.d.ts

@@ -4,9 +4,10 @@
  *
  * - **Callable RPC spans** — a span (op `rpc`) for each `@callable()` method invoked over WebSocket.
  * - **Conversation correlation** — sets the conversation id on the scope for each unit of agent
- *   work — chat turn or callable RPC call — so `gen_ai` spans created within it are correlated, for
- *   chat and plain agents alike. Defaults to the instance `name` and is rotated when the chat is
- *   cleared (the `message:clear` observability event).
+ *   work — chat turn, callable RPC call, or HTTP request — so `gen_ai` spans created within it are
+ *   correlated, for chat and plain agents alike. The id is minted once per agent instance and
+ *   rotated when the chat is cleared (the `message:clear` observability event); it is persisted to
+ *   Durable Object storage so it survives hibernation.
  *
  * It only hooks the `agents` package internals and uses Sentry's tracing primitives. On Cloudflare
  * Workers, prefer `instrumentAgentWithSentry`, which additionally instruments the Durable Object

package/build/types/instrumentations/agents/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/index.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAOvE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/index.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,yBAAyB,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAQvE"}

package/build/types/instrumentations/agents/instrumentAgentCallableRpc.d.ts

@@ -5,7 +5,10 @@ import { type AgentInternals } from './types';
  * the WebSocket message (on Cloudflare, the instrumented Durable Object `webSocketMessage` hook).
  *
  * Also sets the conversation id on the scope for the duration of the call: callable methods are the
- * unit of work for plain (non-chat) agents, which run LLM calls just like chat turns do.
+ * unit of work for plain (non-chat) agents, which run LLM calls just like chat turns do. It is
+ * awaited so the id is on the scope before the method body creates any span; the `agents`
+ * `onMessage` own property this wraps is already `async`, so the promise return is nothing new to
+ * the WebSocket dispatch upstream.
  */
 export declare function instrumentAgentCallableRpc(obj: AgentInternals): void;
 //# sourceMappingURL=instrumentAgentCallableRpc.d.ts.map

package/build/types/instrumentations/agents/instrumentAgentCallableRpc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentAgentCallableRpc.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/instrumentAgentCallableRpc.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,KAAK,cAAc,EAA8C,MAAM,SAAS,CAAC;AAE7G;;;;;;;GAOG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CA+BpE"}
+{"version":3,"file":"instrumentAgentCallableRpc.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/instrumentAgentCallableRpc.ts"],"names":[],"mappings":"AAEA,OAAO,EAAqB,KAAK,cAAc,EAA8C,MAAM,SAAS,CAAC;AAE7G;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CA+BpE"}

package/build/types/instrumentations/agents/instrumentAgentRequestConversation.d.ts

@@ -0,0 +1,16 @@
+import { type AgentInternals } from './types';
+/**
+ * Correlates the AI spans of an HTTP-driven agent turn with a conversation id on the active scope.
+ *
+ * `onRequest` is the third unit of agent work, alongside chat turns and `@callable()` RPC: the
+ * `agents` router sends every non-WebSocket request to it, which is how REST endpoints and webhooks
+ * reach an agent.
+ *
+ * `agents` installs `onRequest` as an own property in the `Agent` constructor (as it does
+ * `onMessage`), and we instrument after construction, so wrapping the own property is what the
+ * router ends up calling. That own property is already `async`, and partyserver's `fetch` awaits it,
+ * so returning a promise from this wrapper — to get the conversation id onto the scope before the
+ * request handler creates any span — keeps the existing contract.
+ */
+export declare function instrumentAgentRequestConversation(obj: AgentInternals): void;
+//# sourceMappingURL=instrumentAgentRequestConversation.d.ts.map

package/build/types/instrumentations/agents/instrumentAgentRequestConversation.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"instrumentAgentRequestConversation.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/instrumentAgentRequestConversation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,SAAS,CAAC;AAEtE;;;;;;;;;;;;GAYG;AACH,wBAAgB,kCAAkC,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAc5E"}

package/build/types/instrumentations/agents/instrumentChatAgentConversation.d.ts

@@ -3,16 +3,17 @@ import { type AgentInternals } from './types';
  * For chat agents (`AIChatAgent` from `@cloudflare/ai-chat`), correlates each chat turn's AI spans
  * with a conversation id on the active scope.
  *
- * In the Agents model one agent instance is one long-lived conversation, so the instance `name` is
- * the base conversation id. When the user clears the chat, they expect a fresh conversation — but
- * recreating the Durable Object for that would also drop the MCP/OAuth state stored per instance
- * (GitHub/Sentry sign-in). To get a fresh conversation id *without* losing that state, we rotate an
- * in-memory id on the instance when the SDK reports a cleared chat, and stamp that (falling back to
- * the instance `name` before the first clear).
+ * In the Agents model one agent instance is one long-lived conversation, so the conversation id is
+ * minted once per instance and persisted to Durable Object storage, which is what carries it across
+ * hibernation (that destroys the in-memory instance). When the user clears the chat, they expect a
+ * fresh conversation — but recreating the Durable Object for that would also drop the MCP/OAuth
+ * state stored per instance (GitHub/Sentry sign-in). To get a fresh conversation id *without*
+ * losing that state, we rotate the persisted id when the SDK reports a cleared chat.
  *
- * The id itself is not attached to spans here — the SDK's `conversationIdIntegration` reads it off
- * the scope at `spanStart` and stamps `gen_ai.conversation.id` onto the AI spans created inside the
- * turn (e.g. by the Workers AI instrumentation), which correlates a turn's model and tool calls.
+ * The id itself is not attached to spans here — `setAgentConversationId` resolves it, and the SDK's
+ * `conversationIdIntegration` picks it off the scope at `spanStart` to stamp
+ * `gen_ai.conversation.id` onto the AI spans created inside the turn (e.g. by the Workers AI
+ * instrumentation), which correlates a turn's model and tool calls.
  *
  * Plain (non-chat) `Agent`s do not define `onChatMessage`, so they are skipped here — their unit
  * of work is the callable RPC method, where `instrumentAgentCallableRpc` sets the conversation id

package/build/types/instrumentations/agents/instrumentChatAgentConversation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instrumentChatAgentConversation.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/instrumentChatAgentConversation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,SAAS,CAAC;AAEtE;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAgCzE"}
+{"version":3,"file":"instrumentChatAgentConversation.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/instrumentChatAgentConversation.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,cAAc,EAAoD,MAAM,SAAS,CAAC;AAEhG;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,+BAA+B,CAAC,GAAG,EAAE,cAAc,GAAG,IAAI,CAgCzE"}

package/build/types/instrumentations/agents/types.d.ts

@@ -1,6 +1,14 @@
+import type { InstrumentedDurableObjectState } from '../../wrapMethodWithSentry';
 export declare const AGENT_SPAN_ORIGIN = "auto.faas.cloudflare.agents";
-export declare const AGENT_CLASS_ATTRIBUTE = "cloudflare.agent.class";
-export declare const AGENT_NAME_ATTRIBUTE = "cloudflare.agent.name";
+/** DO storage key under which the conversation id is persisted so it survives hibernation. */
+export declare const AGENT_CONVERSATION_ID_STORAGE_KEY = "__SENTRY_AGENT_CONVERSATION_ID__";
+/**
+ * Instance keys for our conversation-id bookkeeping, keyed by symbol so the state stays invisible
+ * to anything enumerating the user-owned agent instance (`Object.keys`, `JSON.stringify`, spread).
+ * Exported because the exported `AgentInternals` interface references them.
+ */
+export declare const AGENT_CONVERSATION_ID_SYMBOL: unique symbol;
+export declare const AGENT_APPLIED_CONVERSATION_ID_SYMBOL: unique symbol;
 /**
  * The subset of the `agents` `Agent` instance internals that we instrument. These are runtime
  * implementation details of the `agents` package (v0.13.x) rather than part of its public type
@@ -16,34 +24,71 @@ export interface AgentInternals {
      * does not, so its presence discriminates a chat agent.
      */
     onChatMessage?: (...args: unknown[]) => unknown;
+    /** HTTP request handler; the router sends every non-WebSocket request here. */
+    onRequest?: (...args: unknown[]) => unknown;
     /** The user's Agent class (used by the SDK for the observability event `agent` field). */
     _ParentClass?: {
         name?: string;
     };
-    /** The Agent instance name, which in the Agents model identifies the conversation/thread. */
+    /** The Agent instance name, reported as the `cloudflare.agent.name` span attribute. */
     name?: string;
     /**
-     * Internal: the active conversation id, rotated when the chat is cleared (the `message:clear`
-     * observability event) so a reset chat groups as a fresh conversation while the instance (and its
-     * MCP/OAuth state) stays put. Set by `instrumentChatAgentConversation`; falls back to `name`
-     * before the first clear.
+     * The Durable Object state of the instance. Present on every real Agent; guarded like the other
+     * internals so partially-mocked instances keep working.
+     */
+    ctx?: InstrumentedDurableObjectState;
+    /**
+     * The current conversation id for this agent instance. It is cached in memory after being loaded
+     * from Durable Object storage and updated when the conversation rotates. `undefined` means storage
+     * has not been read yet.
+     */
+    [AGENT_CONVERSATION_ID_SYMBOL]?: string;
+    /**
+     * The conversation id this instrumentation most recently applied to the isolation scope. It lets
+     * subsequent units of work distinguish an SDK-applied id, which may be replaced after rotation,
+     * from an id explicitly set by the user, which must be preserved.
      */
-    __sentryConversationId?: string;
+    [AGENT_APPLIED_CONVERSATION_ID_SYMBOL]?: string;
 }
 /** Reads best-effort agent identity attributes from the instance, tolerating missing internals. */
 export declare function getAgentAttributes(instance: AgentInternals): Record<string, string>;
 /**
- * Sets the agent instance's conversation id on the current scope for the duration of the
- * surrounding unit of work (chat turn, callable RPC call). In the Agents model one instance is one
- * conversation, so the instance `name` is the natural conversation id — for chat and plain agents
- * alike, since plain agents run LLM calls too (e.g. inside `@callable()` methods). Once the chat
- * has been cleared, the rotated `__sentryConversationId` takes precedence so LLM calls from any
- * unit of work group under the fresh conversation.
+ * Persists the conversation id to Durable Object storage, so it survives hibernation, and updates
+ * the in-memory cache synchronously so the current wake is immediately consistent even if the
+ * write fails. Uses the async storage API, which exists on KV- and SQLite-backed DOs alike.
+ * The write is fire-and-forget: DO storage writes are tracked by the runtime and land without
+ * awaiting (`waitUntil` is a no-op in Durable Objects), and the catch keeps a rejection from
+ * surfacing as unhandled — a failed write just means the next wake starts a new conversation,
+ * which must never throw into user code. Uses the original uninstrumented storage so internal
+ * bookkeeping doesn't create spans.
+ */
+export declare function storeAgentConversationId(instance: AgentInternals, conversationId: string): void;
+/**
+ * Sets the agent instance's conversation id on the active scope for the duration of the
+ * surrounding unit of work (chat turn, callable RPC call, HTTP request). In the Agents model one
+ * instance is one long-lived conversation, so the id is minted once per instance and persisted to
+ * DO storage — for chat and plain agents alike, since plain agents run LLM calls too (e.g. inside
+ * `@callable()` methods). The instance `name` is deliberately not used: it is caller-chosen and can
+ * be a stable, guessable, or shared value, whereas a conversation id should identify exactly one
+ * conversation. Clearing the chat rotates it (see `storeAgentConversationId`) so subsequent LLM
+ * calls group under the fresh conversation.
+ *
+ * Every handler wrapper awaits this before invoking the original, so the id is on the scope before
+ * the unit of work — and any `gen_ai` span it creates — starts. Only the first unit of work per wake
+ * pays the storage read; the rest resolve from the in-memory cache. Awaiting is safe on all three
+ * paths because the `agents` `Agent` constructor already replaces `onMessage` and `onRequest` with
+ * `async` wrappers of its own, and `onChatMessage` is async by contract, so every caller upstream
+ * already handles a promise.
+ *
+ * An id the user set explicitly outranks this inferred one, in either order: a `setConversationId()`
+ * call that already happened is detected here and left alone, and one made inside the handler lands
+ * on the same scope afterwards and therefore wins. That is why the write targets the isolation scope
+ * — it is the scope the public `Sentry.setConversationId()` writes to, and `conversationIdIntegration`
+ * prefers the current scope over it, so writing there would make a user's call unoverridable.
  *
  * `conversationIdIntegration` reads the id off the scope at `spanStart` and stamps
- * `gen_ai.conversation.id` onto AI spans created within the unit of work, correlating its model
- * and tool calls. Callers run inside a per-event forked scope (`wrapMethodWithSentry`), so the id
- * does not leak into unrelated events.
+ * `gen_ai.conversation.id` onto AI spans created within the unit of work, correlating its model and
+ * tool calls.
  */
-export declare function setAgentConversationId(instance: AgentInternals): void;
+export declare function setAgentConversationId(instance: AgentInternals): Promise<void>;
 //# sourceMappingURL=types.d.ts.map

package/build/types/instrumentations/agents/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/types.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,iBAAiB,gCAAgC,CAAC;AAC/D,eAAO,MAAM,qBAAqB,2BAA2B,CAAC;AAC9D,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAE5D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,2FAA2F;IAC3F,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,wEAAwE;IACxE,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC5C;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAChD,0FAA0F;IAC1F,YAAY,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,6FAA6F;IAC7F,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;OAKG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,mGAAmG;AACnG,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAcnF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,CAMrE"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/instrumentations/agents/types.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,4BAA4B,CAAC;AAMjF,eAAO,MAAM,iBAAiB,gCAAgC,CAAC;AAE/D,8FAA8F;AAC9F,eAAO,MAAM,iCAAiC,qCAAqC,CAAC;AAEpF;;;;GAIG;AACH,eAAO,MAAM,4BAA4B,EAAE,OAAO,MAA4C,CAAC;AAC/F,eAAO,MAAM,oCAAoC,EAAE,OAAO,MAAmD,CAAC;AAE9G;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,2FAA2F;IAC3F,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,IAAI,CAAC;IAClE,wEAAwE;IACxE,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC5C;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAChD,+EAA+E;IAC/E,SAAS,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC;IAC5C,0FAA0F;IAC1F,YAAY,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACjC,uFAAuF;IACvF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,GAAG,CAAC,EAAE,8BAA8B,CAAC;IACrC;;;;OAIG;IACH,CAAC,4BAA4B,CAAC,CAAC,EAAE,MAAM,CAAC;IACxC;;;;OAIG;IACH,CAAC,oCAAoC,CAAC,CAAC,EAAE,MAAM,CAAC;CACjD;AAED,mGAAmG;AACnG,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CASnF;AAED;;;;;;;;;GASG;AACH,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,GAAG,IAAI,CAe/F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAsB,sBAAsB,CAAC,QAAQ,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAapF"}

package/build/types/request.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAe3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAWjE,UAAU,4BAA4B;IACpC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACxF,OAAO,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC5C;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,4BAA4B,EAC5C,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CAsJnB"}
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,2BAA2B,EAAE,MAAM,2BAA2B,CAAC;AAc3F,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAClD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAYjE,UAAU,4BAA4B;IACpC,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;IACxF,OAAO,EAAE,sBAAsB,GAAG,SAAS,CAAC;IAC5C;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,cAAc,EAAE,4BAA4B,EAC5C,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,GAC5D,OAAO,CAAC,QAAQ,CAAC,CAsJnB"}

package/build/types/utils/invocationScope.d.ts

@@ -0,0 +1,24 @@
+import { type Scope } from '@sentry/core';
+/**
+ * Runs `callback` on the isolation scope for the current invocation.
+ *
+ * An instrumented handler is either the entry point of an invocation or reentrant — reached from
+ * another instrumented handler already serving the same invocation (a Durable Object method calling
+ * its own `fetch`, an RPC method reaching a sibling method). Only the entry point may fork:
+ *
+ * - Forking at the entry point is mandatory. `setUser`/`setTag` write to the isolation scope, and a
+ *   Durable Object's isolation scope outlives the invocation that touched it, so without a fork one
+ *   invocation's user and tags reappear on the next invocation's events in the same isolate.
+ *   Forking clones, so request data set by an enclosing wrapper is still inherited.
+ * - Forking again when reentrant would be wrong. Everything below the entry point is one logical
+ *   unit of work: a nested call must see what the caller set and be able to add to it, the way it
+ *   would if the SDK were not wrapping it at all.
+ *
+ * The AsyncLocalStorage strategy hands the default isolation scope back whenever no invocation is in
+ * flight, and a forked one while inside `withIsolationScope`. Reference-comparing against the default
+ * is therefore enough to tell the two cases apart. The stack fallback does not fork, so it reports the
+ * default scope even inside an invocation; there the fork degrades to a no-op, which the stack strategy
+ * tolerates. This matches the approach used by `patchEventHandler` in Nuxt.
+ */
+export declare function withInvocationIsolationScope<T>(callback: (scope: Scope) => T): T;
+//# sourceMappingURL=invocationScope.d.ts.map

package/build/types/utils/invocationScope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"invocationScope.d.ts","sourceRoot":"","sources":["../../../src/utils/invocationScope.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,KAAK,EAAsB,MAAM,cAAc,CAAC;AAE3G;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,4BAA4B,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,CAAC,GAAG,CAAC,CAMhF"}

package/build/types/utils/rpcMeta.d.ts

@@ -4,6 +4,14 @@ import { type SerializedTraceData } from '@sentry/core';
  * If no active trace exists, returns the original args unchanged.
  */
 export declare function appendRpcMeta(args: unknown[]): unknown[];
+/**
+ * Whether the trailing argument carries Sentry RPC metadata.
+ *
+ * Separate from {@link extractRpcMeta} because the RPC method wrappers run this check on every
+ * call — including the instance's own internal method calls, which never carry metadata — and
+ * must not allocate on that path.
+ */
+export declare function hasRpcMeta(args: unknown[]): boolean;
 /**
  * Extracts Sentry RPC metadata from the trailing argument of an args array.
  * Returns cleaned args (without meta) and the extracted trace data if found.

package/build/types/utils/rpcMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rpcMeta.d.ts","sourceRoot":"","sources":["../../../src/utils/rpcMeta.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAoBpF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAQxD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,EAChD,IAAI,EAAE,CAAC,GACN;IACD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAcA"}
+{"version":3,"file":"rpcMeta.d.ts","sourceRoot":"","sources":["../../../src/utils/rpcMeta.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAoBpF;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,EAAE,CAQxD;AAED;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAEnD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,SAAS,OAAO,EAAE,EAChD,IAAI,EAAE,CAAC,GACN;IACD,IAAI,EAAE,CAAC,CAAC;IACR,OAAO,CAAC,EAAE,mBAAmB,CAAC;CAC/B,CAcA"}

package/build/types/wrapMethodWithSentry.d.ts

@@ -1,7 +1,7 @@
 import type { DurableObjectStorage } from '@cloudflare/workers-types';
 import type { CloudflareOptions } from './client';
 /** Extended DurableObjectState with originalStorage exposed by instrumentContext */
-interface InstrumentedDurableObjectState extends DurableObjectState {
+export interface InstrumentedDurableObjectState extends DurableObjectState {
     originalStorage?: DurableObjectStorage;
 }
 type MethodWrapperOptions = {

package/build/types/wrapMethodWithSentry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapMethodWithSentry.d.ts","sourceRoot":"","sources":["../../src/wrapMethodWithSentry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAgBtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAQlD,oFAAoF;AACpF,UAAU,8BAA+B,SAAQ,kBAAkB;IACjE,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAyBD,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gBAAgB,GAAG,8BAA8B,CAAC;IAC3D;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACtD,KAAK,cAAc,GAAG,eAAe,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,cAAc,EAC3D,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,CAAC,EACV,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAC3C,MAAM,CAAC,EAAE,IAAI,GACZ,CAAC,CA0JH"}
+{"version":3,"file":"wrapMethodWithSentry.d.ts","sourceRoot":"","sources":["../../src/wrapMethodWithSentry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAatE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AASlD,oFAAoF;AACpF,MAAM,WAAW,8BAA+B,SAAQ,kBAAkB;IACxE,eAAe,CAAC,EAAE,oBAAoB,CAAC;CACxC;AAyBD,KAAK,oBAAoB,GAAG;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,gBAAgB,GAAG,8BAA8B,CAAC;IAC3D;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB;;;OAGG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAGF,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC;AACtD,KAAK,cAAc,GAAG,eAAe,CAAC;AAEtC;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,cAAc,EAC3D,cAAc,EAAE,oBAAoB,EACpC,OAAO,EAAE,CAAC,EACV,QAAQ,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAC3C,MAAM,CAAC,EAAE,IAAI,GACZ,CAAC,CAqJH"}

package/build/types-ts3.8/durableobject.d.ts

@@ -18,8 +18,8 @@ type InstrumentedDurableObjectContext = any;
  *
  * This is the shared construction path used by both {@link instrumentDurableObjectWithSentry}
  * and {@link instrumentAgentWithSentry}. It intentionally does NOT apply the RPC prototype-method
- * proxy — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any additional
- * per-instance instrumentation has been layered onto the returned object.
+ * instrumentation — callers apply that last via {@link finalizeWithRpcInstrumentation}, after any
+ * additional per-instance instrumentation has been layered onto the returned object.
  *
  * @internal
  */
@@ -27,18 +27,27 @@ export declare function constructInstrumentedDurableObject<E, T extends DurableO
     obj: T;
     options: CloudflareOptions;
     context: InstrumentedDurableObjectContext;
+    frameworkManagedMethods: ReadonlySet<string>;
 };
 /**
- * Wraps a constructed (and already handler-instrumented) Durable Object instance with the RPC
- * prototype-method proxy, when RPC trace propagation is enabled. Returns the object unchanged when
- * RPC instrumentation is disabled.
+ * Adds trace propagation to a constructed Durable Object's RPC methods.
  *
- * This must be applied last, so that any per-instance instrumentation (own properties such as
- * `fetch`, `alarm`, or Agent-specific handlers) is excluded from RPC method tracing.
+ * RPC methods are wrapped on the prototype because Cloudflare dispatches them with the Durable
+ * Object instance as the receiver. This preserves native private-field access and keeps the methods
+ * visible to Cloudflare's RPC dispatcher. Built-in handlers, Agent handlers, and methods managed by
+ * another framework are left untouched.
  *
+ * Call this after all per-instance instrumentation has been applied. If RPC trace propagation is
+ * disabled, the object is returned unchanged.
+ *
+ * @param obj The constructed Durable Object instance.
+ * @param options The resolved SDK options for this instance.
+ * @param context The instrumented execution context for this instance.
+ * @param excludedMethods Method names owned by another framework and therefore not safe to wrap.
+ * @returns The same Durable Object instance, with eligible prototype methods instrumented.
  * @internal
  */
-export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T, options: CloudflareOptions, context: InstrumentedDurableObjectContext): T;
+export declare function finalizeWithRpcInstrumentation<T extends object>(obj: T, options: CloudflareOptions, context: InstrumentedDurableObjectContext, excludedMethods?: ReadonlySet<string>): T;
 /**
  * Instruments a Durable Object class to capture errors and performance data.
  *

package/build/types-ts3.8/flush.d.ts

@@ -19,7 +19,7 @@ type FlushLock = {
  *
  * By using the original waitUntil for flush operations, we bypass this issue.
  */
-export declare function getOriginalWaitUntil(context: ExecutionContextCompat): ExecutionContext['waitUntil'] | undefined;
+export declare function getOriginalWaitUntil(context: ExecutionContextCompat): ExecutionContext['waitUntil'];
 /**
  * Enhances the given execution context by wrapping its `waitUntil` method with a proxy
  * to monitor pending tasks, and provides a flusher function to ensure all tasks