rivetkit 2.3.18-rc.4 → 2.3.19

package/dist/tsup/mod.cjs

@@ -1,6 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2; var _class3;
 
-var _chunkF3IP3SGOcjs = require('./chunk-F3IP3SGO.cjs');
 
 
 
@@ -14,9 +13,10 @@ var _chunkF3IP3SGOcjs = require('./chunk-F3IP3SGO.cjs');
 
 
 
+var _chunkEO5UOXXYcjs = require('./chunk-EO5UOXXY.cjs');
 
 
-var _chunk4KGXFC6Mcjs = require('./chunk-4KGXFC6M.cjs');
+var _chunkPPEIPCW4cjs = require('./chunk-PPEIPCW4.cjs');
 
 
 
@@ -28,17 +28,19 @@ var _chunk4KGXFC6Mcjs = require('./chunk-4KGXFC6M.cjs');
 
 
 
-var _chunkTGGF6SZNcjs = require('./chunk-TGGF6SZN.cjs');
+
+
+var _chunkIJUXBWH4cjs = require('./chunk-IJUXBWH4.cjs');
 
 
 
 var _chunkMYWZCDMLcjs = require('./chunk-MYWZCDML.cjs');
-require('./chunk-N3DJTMSZ.cjs');
+require('./chunk-OGPFN6BT.cjs');
 
 
 
 
-var _chunk4OMHYVOQcjs = require('./chunk-4OMHYVOQ.cjs');
+var _chunkZ4RAXFSDcjs = require('./chunk-Z4RAXFSD.cjs');
 require('./chunk-KVFIONKQ.cjs');
 
 
@@ -73,7 +75,8 @@ require('./chunk-KVFIONKQ.cjs');
 
 
 
-var _chunk7E2W2YSMcjs = require('./chunk-7E2W2YSM.cjs');
+var _chunkRJC5O2SDcjs = require('./chunk-RJC5O2SD.cjs');
+
 
 
 
@@ -85,11 +88,11 @@ var _chunk7E2W2YSMcjs = require('./chunk-7E2W2YSM.cjs');
 
 
 
-var _chunk2JSYYH6Pcjs = require('./chunk-2JSYYH6P.cjs');
+var _chunkJX2ITWAVcjs = require('./chunk-JX2ITWAV.cjs');
 
 // src/actor/log.ts
 function loggerWithoutContext() {
-  return _chunk7E2W2YSMcjs.getLogger.call(void 0, "actor-runtime");
+  return _chunkRJC5O2SDcjs.getLogger.call(void 0, "actor-runtime");
 }
 
 // src/actor/definition.ts
@@ -128,9 +131,9 @@ function actor(input) {
   warnDeprecatedOptionKeys(
     input == null ? void 0 : input.options
   );
-  const config = _chunk4KGXFC6Mcjs.ActorConfigSchema.parse(input);
-  _chunk4KGXFC6Mcjs.flattenActionHandlers.call(void 0, config.actions);
-  _chunk4KGXFC6Mcjs.flattenActionInputSchemas.call(void 0, config.actions, config.actionInputSchemas);
+  const config = _chunkEO5UOXXYcjs.ActorConfigSchema.parse(input);
+  _chunkEO5UOXXYcjs.flattenActionHandlers.call(void 0, config.actions);
+  _chunkEO5UOXXYcjs.flattenActionInputSchemas.call(void 0, config.actions, config.actionInputSchemas);
   return new ActorDefinition(config);
 }
 function isStaticActorDefinition(definition) {
@@ -212,7 +215,7 @@ function validateSchemaSync(schemas, key, data) {
   if (isStandardSchema(schema)) {
     const result = schema["~standard"].validate(data);
     if (isPromiseLike(result)) {
-      throw _chunk2JSYYH6Pcjs.unsupportedFeature.call(void 0, "async schema validation");
+      throw _chunkJX2ITWAVcjs.unsupportedFeature.call(void 0, "async schema validation");
     }
     if (result.issues) {
       return { success: false, issues: [...result.issues] };
@@ -229,7 +232,7 @@ function validateSchemaSync(schemas, key, data) {
 var _virtualwebsocket = require('@rivetkit/virtual-websocket');
 var _ws = require('hono/ws');
 function logger() {
-  return _chunk7E2W2YSMcjs.getLogger.call(void 0, "inline-websocket-adapter");
+  return _chunkRJC5O2SDcjs.getLogger.call(void 0, "inline-websocket-adapter");
 }
 var InlineWebSocketAdapter = class {
   #handler;
@@ -400,7 +403,7 @@ function isLocalEngineEndpoint(endpoint) {
 
 // src/registry/log.ts
 function logger2() {
-  return _chunk7E2W2YSMcjs.getLogger.call(void 0, "registry");
+  return _chunkRJC5O2SDcjs.getLogger.call(void 0, "registry");
 }
 
 // src/serverless/configure.ts
@@ -446,8 +449,8 @@ async function configureServerlessPool(config) {
         );
       }
       const customConfig = config.configurePool;
-      const clientConfig = _chunkTGGF6SZNcjs.convertRegistryConfigToClientConfig.call(void 0, config);
-      const dcsRes = await _chunkTGGF6SZNcjs.getDatacenters.call(void 0, clientConfig);
+      const clientConfig = _chunkIJUXBWH4cjs.convertRegistryConfigToClientConfig.call(void 0, config);
+      const dcsRes = await _chunkIJUXBWH4cjs.getDatacenters.call(void 0, clientConfig);
       const poolName = _nullishCoalesce(customConfig.name, () => ( "default"));
       const serverlessToken = _nullishCoalesce(config.token, () => ( config.publicToken));
       const headers = {
@@ -469,7 +472,7 @@ async function configureServerlessPool(config) {
         metadata: _nullishCoalesce(customConfig.metadata, () => ( {})),
         drain_on_version_upgrade: _nullishCoalesce(customConfig.drainOnVersionUpgrade, () => ( true))
       };
-      await _chunkTGGF6SZNcjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
+      await _chunkIJUXBWH4cjs.updateRunnerConfig.call(void 0, clientConfig, poolName, {
         datacenters: Object.fromEntries(
           dcsRes.datacenters.map((dc) => [dc.name, serverlessConfig])
         )
@@ -486,7 +489,7 @@ async function configureServerlessPool(config) {
       logger2().warn({
         msg: "serverless pool configuration attempt failed",
         attempts,
-        error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+        error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
       });
       await sleep(CONFIGURE_RETRY_DELAY_MS);
     }
@@ -494,7 +497,7 @@ async function configureServerlessPool(config) {
   logger2().error({
     msg: "failed to configure serverless pool, validate endpoint is configured correctly then restart this process",
     attempts,
-    error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, lastError)
+    error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, lastError)
   });
   throw lastError;
 }
@@ -506,20 +509,20 @@ var _zod = require('zod');
 var _v4 = require('zod/v4');
 var warnedMissingVersion = false;
 var EnvoyConfigSchema = _v4.z.object({
-  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetPool.call(void 0, ), () => ( "default"))),
+  poolName: _v4.z.string().default(() => _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetPool.call(void 0, ), () => ( "default"))),
   version: _v4.z.number().default(() => {
-    const version = _chunk7E2W2YSMcjs.getRivetEnvoyVersion.call(void 0, );
+    const version = _chunkRJC5O2SDcjs.getRivetEnvoyVersion.call(void 0, );
     if (version !== void 0) return version;
-    if (_chunk7E2W2YSMcjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
+    if (_chunkRJC5O2SDcjs.getNodeEnv.call(void 0, ) === "production" && !warnedMissingVersion) {
       warnedMissingVersion = true;
-      _chunk7E2W2YSMcjs.getLogger.call(void 0, "rivetkit").error(
+      _chunkRJC5O2SDcjs.getLogger.call(void 0, "rivetkit").error(
         "RIVET_ENVOY_VERSION is not set. Actors will not be versioned, which means they won't be drained on deploy. This is only needed when self-hosting or using a custom envoy (not needed for Rivet Compute). Set this as a build arg in your Dockerfile. See https://rivet.dev/docs/actors/versions"
       );
     }
     return 1;
   }),
   // Deprecated.
-  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
+  totalSlots: _v4.z.number().default(() => _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetTotalSlots.call(void 0, ), () => ( 1e5))),
   envoyKey: _v4.z.string().optional()
 });
 
@@ -557,7 +560,7 @@ var ServerlessConfigSchema = _v4.z.object({
    *
    * Can also be set via RIVET_PUBLIC_ENDPOINT environment variable.
    */
-  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetPublicEndpoint.call(void 0, )))),
+  publicEndpoint: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetPublicEndpoint.call(void 0, )))),
   /**
    * Token that clients should use when connecting via the public endpoint.
    *
@@ -565,7 +568,7 @@ var ServerlessConfigSchema = _v4.z.object({
    *
    * Can also be specified in the publicEndpoint URL as `https://namespace:token@host`.
    */
-  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetPublicToken.call(void 0, ))))
+  publicToken: _v4.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetPublicToken.call(void 0, ))))
   // There is no publicNamespace config option because the frontend and backend
   // cannot use different namespaces. The namespace is extracted from the
   // publicEndpoint URL auth syntax if provided.
@@ -619,7 +622,7 @@ var RegistryConfigSchema = _zod.z.object({
    * Runtime binding to use for RivetKit core.
    * */
   runtime: RuntimeKindSchema.optional().transform((val, ctx) => {
-    const rawRuntime = _nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetkitRuntime.call(void 0, )));
+    const rawRuntime = _nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetkitRuntime.call(void 0, )));
     if (rawRuntime === void 0) {
       return "auto";
     }
@@ -656,7 +659,7 @@ var RegistryConfigSchema = _zod.z.object({
    * */
   logging: _zod.z.object({
     baseLogger: _zod.z.custom().optional(),
-    level: _chunk7E2W2YSMcjs.LogLevelSchema.optional()
+    level: _chunkRJC5O2SDcjs.LogLevelSchema.optional()
   }).optional().default(() => ({})),
   // MARK: Routing
   // // This is a function to allow for lazy configuration of upgradeWebSocket on the
@@ -674,9 +677,9 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Can also be set via RIVET_ENDPOINT environment variables.
    */
-  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetEngine.call(void 0, ))), () => ( _chunk7E2W2YSMcjs.getRivetEndpoint.call(void 0, )))),
-  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetToken.call(void 0, )))),
-  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunk7E2W2YSMcjs.getRivetNamespace.call(void 0, )))),
+  endpoint: _zod.z.string().optional().transform((val) => _nullishCoalesce(_nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetEngine.call(void 0, ))), () => ( _chunkRJC5O2SDcjs.getRivetEndpoint.call(void 0, )))),
+  token: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetToken.call(void 0, )))),
+  namespace: _zod.z.string().optional().transform((val) => _nullishCoalesce(val, () => ( _chunkRJC5O2SDcjs.getRivetNamespace.call(void 0, )))),
   headers: _zod.z.record(_zod.z.string(), _zod.z.string()).optional().default({}),
   // MARK: Client
   // TODO:
@@ -716,21 +719,21 @@ var RegistryConfigSchema = _zod.z.object({
    *
    * Starts the full Rust engine process locally.
    */
-  startEngine: _zod.z.boolean().default(() => _chunk7E2W2YSMcjs.getRivetRunEngine.call(void 0, )),
+  startEngine: _zod.z.boolean().default(() => _chunkRJC5O2SDcjs.getRivetRunEngine.call(void 0, )),
   /**
    * @experimental
    *
    * Host to bind the spawned local engine process to.
    */
-  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetRunEngineHost.call(void 0, ), () => ( ENGINE_HOST))),
+  engineHost: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetRunEngineHost.call(void 0, ), () => ( ENGINE_HOST))),
   /**
    * @experimental
    *
    * Port to bind the spawned local engine process to.
    */
-  enginePort: _zod.z.number().int().min(1).max(65535).optional().default(() => _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetRunEnginePort.call(void 0, ), () => ( ENGINE_PORT))),
+  enginePort: _zod.z.number().int().min(1).max(65535).optional().default(() => _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetRunEnginePort.call(void 0, ), () => ( ENGINE_PORT))),
   /** @experimental */
-  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunk7E2W2YSMcjs.VERSION))),
+  engineVersion: _zod.z.string().optional().default(() => _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetRunEngineVersion.call(void 0, ), () => ( _chunkRJC5O2SDcjs.VERSION))),
   /**
    * Starts the first-party Services actor host when RivetKit manages
    * a local engine. Defaults to the local-engine decision. Set
@@ -784,7 +787,7 @@ var RegistryConfigSchema = _zod.z.object({
   }))
 }).transform((config, ctx) => {
   var _a, _b, _c;
-  const isDevEnv = _chunk7E2W2YSMcjs.isDev.call(void 0, );
+  const isDevEnv = _chunkRJC5O2SDcjs.isDev.call(void 0, );
   const sqliteBackend = _nullishCoalesce(((_a = config.sqlite) == null ? void 0 : _a.backend), () => ( ((_b = config.test) == null ? void 0 : _b.sqliteBackend)));
   if (config.runtime === "wasm" && sqliteBackend === "local") {
     ctx.addIssue({
@@ -794,7 +797,7 @@ var RegistryConfigSchema = _zod.z.object({
     });
   }
   const sqlite = config.runtime === "wasm" && config.sqlite === void 0 ? { backend: "remote" } : config.sqlite;
-  const parsedEndpoint = config.endpoint ? _chunkTGGF6SZNcjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedEndpoint = config.endpoint ? _chunkIJUXBWH4cjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.endpoint,
     path: ["endpoint"],
     namespace: config.namespace,
@@ -817,13 +820,13 @@ var RegistryConfigSchema = _zod.z.object({
     config.enginePort
   );
   const endpoint = config.startEngine ? localEngineEndpoint : _nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint), () => ( (isDevEnv ? localEngineEndpoint : void 0)));
-  const startServices = _nullishCoalesce(_nullishCoalesce(config.startServices, () => ( _chunk7E2W2YSMcjs.getRivetRunServices.call(void 0, ))), () => ( Boolean(endpoint && isLocalEngineEndpoint(endpoint))));
+  const startServices = _nullishCoalesce(_nullishCoalesce(config.startServices, () => ( _chunkRJC5O2SDcjs.getRivetRunServices.call(void 0, ))), () => ( Boolean(endpoint && isLocalEngineEndpoint(endpoint))));
   const validateServerlessEndpoint = Boolean(
     config.startEngine || parsedEndpoint
   );
   const namespace = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.namespace), () => ( config.namespace)), () => ( "default"));
   const token = _nullishCoalesce(_nullishCoalesce((parsedEndpoint == null ? void 0 : parsedEndpoint.token), () => ( config.token)), () => ( "dev"));
-  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkTGGF6SZNcjs.tryParseEndpoint.call(void 0, ctx, {
+  const parsedPublicEndpoint = config.serverless.publicEndpoint ? _chunkIJUXBWH4cjs.tryParseEndpoint.call(void 0, ctx, {
     endpoint: config.serverless.publicEndpoint,
     path: ["serverless", "publicEndpoint"]
   }) : void 0;
@@ -859,7 +862,7 @@ function buildActorNames(config) {
     Object.keys(config.use).map((actorName) => {
       const definition = config.use[actorName];
       const options = _nullishCoalesce(definition.config.options, () => ( {}));
-      const runMeta = _chunk4KGXFC6Mcjs.getRunMetadata.call(void 0, definition.config.run);
+      const runMeta = _chunkEO5UOXXYcjs.getRunMetadata.call(void 0, definition.config.run);
       const metadata = {};
       metadata.icon = _nullishCoalesce(options.icon, () => ( runMeta.icon));
       metadata.name = _nullishCoalesce(options.name, () => ( runMeta.name));
@@ -927,7 +930,7 @@ var DocRegistryConfigSchema = _zod.z.object({
   noWelcome: _zod.z.boolean().optional().describe("Disable the welcome message on startup. Default: false"),
   sqlite: DocSqliteConfigSchema,
   logging: _zod.z.object({
-    level: _chunk7E2W2YSMcjs.LogLevelSchema.optional().describe(
+    level: _chunkRJC5O2SDcjs.LogLevelSchema.optional().describe(
       "Log level for RivetKit. Default: 'warn'"
     )
   }).optional().describe("Logging configuration."),
@@ -975,7 +978,7 @@ function shouldAttachNativeKvError(message) {
 function enrichNativeDatabaseError(database, error) {
   var _a;
   const bridgeReason = typeof error === "string" ? error : error instanceof Error ? error.message : void 0;
-  const bridged = bridgeReason === void 0 ? void 0 : _chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, bridgeReason);
+  const bridged = bridgeReason === void 0 ? void 0 : _chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, bridgeReason);
   if (bridged) {
     throw bridged;
   }
@@ -1545,20 +1548,43 @@ function toNapiQueueMessage(message) {
 var NapiCoreRuntime = (_class = class {
   __init() {this.kind = "napi"}
   #bindings;
-  #sql = /* @__PURE__ */ new WeakMap();
-  constructor(bindings) {;_class.prototype.__init.call(this);
+  #sqlOpened = /* @__PURE__ */ new WeakSet();
+  #invocationContext;
+  constructor(bindings, invocationContext) {;_class.prototype.__init.call(this);
     this.#bindings = bindings;
+    this.#invocationContext = invocationContext;
   }
-  #actorSql(ctx) {
-    const nativeCtx = asNativeActorContext(ctx);
-    let database = this.#sql.get(nativeCtx);
-    if (!database) {
-      database = nativeCtx.sql();
-      this.#sql.set(nativeCtx, database);
+  #actorContextForOperation(owner) {
+    const ownerCtx = asNativeActorContext(owner);
+    const active = this.#invocationContext.getStore();
+    if (!(active == null ? void 0 : active.sameActorInstance(ownerCtx))) {
+      return ownerCtx;
     }
-    return database;
+    const applicationSpan = _chunkIJUXBWH4cjs.readActiveTraceHeaders.call(void 0, );
+    if (!applicationSpan) {
+      return active;
+    }
+    return active.withApplicationSpan(
+      applicationSpan.traceparent,
+      _nullishCoalesce(applicationSpan.tracestate, () => ( null))
+    );
+  }
+  #actorSql(ctx) {
+    this.#sqlOpened.add(asNativeActorContext(ctx));
+    return this.#actorContextForOperation(ctx).sql();
   }
   createRegistry() {
+    this.#bindings.setTelemetryLogSink(
+      (event2) => {
+        const fields = { otelEvent: event2.name };
+        const message = event2.message || event2.name;
+        if (event2.level === "error") {
+          logger2().error(fields, message);
+        } else {
+          logger2().warn(fields, message);
+        }
+      }
+    );
     return asRegistryHandle(new this.#bindings.CoreRegistry());
   }
   registerActor(registry, name, factory) {
@@ -1573,6 +1599,9 @@ var NapiCoreRuntime = (_class = class {
   async shutdownRegistry(registry) {
     await asNativeRegistry(registry).shutdown();
   }
+  async shutdownTelemetry() {
+    await this.#bindings.shutdownTelemetry();
+  }
   async registryActorStopThresholdMs(registry) {
     return await _asyncNullishCoalesce(await asNativeRegistry(registry).actorStopThresholdMs(), async () => ( void 0));
   }
@@ -1726,6 +1755,57 @@ var NapiCoreRuntime = (_class = class {
   actorId(ctx) {
     return asNativeActorContext(ctx).actorId();
   }
+  runWithActorInvocationContext(ctx, run) {
+    return this.#runAs(asNativeActorContext(ctx), run);
+  }
+  #runAs(nativeCtx, run) {
+    var _a;
+    const span = (_a = nativeCtx.invocationTraceContext()) == null ? void 0 : _a.span;
+    return this.#invocationContext.run(
+      nativeCtx,
+      () => _chunkIJUXBWH4cjs.runWithActorInvocationSpan.call(void 0, span, run)
+    );
+  }
+  actorInvocationTraceContext(ctx) {
+    return _nullishCoalesce(this.#actorContextForOperation(ctx).invocationTraceContext(), () => ( void 0));
+  }
+  startCallSpan(ctx, actorName, actionName) {
+    const call = this.#actorContextForOperation(ctx).startCallSpan(
+      actorName,
+      actionName
+    );
+    if (!call) return void 0;
+    return {
+      span: _nullishCoalesce(call.spanContext(), () => ( void 0)),
+      finish: (error) => call.finish(error)
+    };
+  }
+  async startWorkflowSpan(ctx) {
+    const span = await asNativeActorContext(ctx).startWorkflowSpan();
+    const spanCtx = span.ctx();
+    return {
+      run: (body) => this.#runAs(spanCtx, body),
+      startStep: (name, attempt) => {
+        const step = spanCtx.startWorkflowStepSpan(name, attempt);
+        if (!step) return void 0;
+        const stepCtx = step.ctx();
+        return {
+          run: (body) => this.#runAs(stepCtx, body),
+          finish: (outcome, error) => step.finish(
+            outcome,
+            error === void 0 ? void 0 : _chunkJX2ITWAVcjs.encodeErrorForBridge.call(void 0, error)
+          )
+        };
+      },
+      finish: (outcome) => span.finish(outcome)
+    };
+  }
+  runOutsideActorInvocationContext(run) {
+    return this.#invocationContext.exit(run);
+  }
+  currentInvocationScope() {
+    return this.#invocationContext.getStore();
+  }
   actorName(ctx) {
     return asNativeActorContext(ctx).name();
   }
@@ -1757,7 +1837,7 @@ var NapiCoreRuntime = (_class = class {
     asNativeActorContext(ctx).broadcast(name, toNapiBuffer(args));
   }
   actorWaitUntil(ctx, promise) {
-    asNativeActorContext(ctx).waitUntil(promise);
+    this.#actorContextForOperation(ctx).waitUntil(promise);
   }
   async actorWaitForTrackedShutdownWork(ctx) {
     return await asNativeActorContext(ctx).waitForTrackedShutdownWork();
@@ -1858,7 +1938,7 @@ var NapiCoreRuntime = (_class = class {
     await asNativeSqlTransaction(transaction).rollback();
   }
   async actorBeginStateTransaction(ctx, timeoutMs) {
-    return await asNativeActorContext(ctx).beginStateTransaction(
+    return await this.#actorContextForOperation(ctx).beginStateTransaction(
       timeoutMs
     );
   }
@@ -1896,23 +1976,21 @@ var NapiCoreRuntime = (_class = class {
   }
   async actorSqlClose(ctx) {
     const nativeCtx = asNativeActorContext(ctx);
-    const database = this.#sql.get(nativeCtx);
-    if (!database) {
+    if (!this.#sqlOpened.delete(nativeCtx)) {
       return;
     }
-    this.#sql.delete(nativeCtx);
-    await database.close();
+    await nativeCtx.sql().close();
   }
   async actorRuntimeSocketProvision(ctx) {
     return await asNativeActorContext(ctx).provisionActorRuntimeSocket();
   }
   async actorQueueSend(ctx, name, body) {
     return toNapiQueueMessage(
-      await asNativeActorContext(ctx).queue().send(name, toNapiBuffer(body))
+      await this.#actorContextForOperation(ctx).queue().send(name, toNapiBuffer(body))
     );
   }
   async actorQueueNextBatch(ctx, options, signal) {
-    const messages = await asNativeActorContext(ctx).queue().nextBatch(
+    const messages = await this.#actorContextForOperation(ctx).queue().nextBatch(
       options,
       signal ? asNativeCancellationToken(signal) : signal
     );
@@ -1920,7 +1998,7 @@ var NapiCoreRuntime = (_class = class {
   }
   async actorQueueWaitForNames(ctx, names, options, signal) {
     return toNapiQueueMessage(
-      await asNativeActorContext(ctx).queue().waitForNames(
+      await this.#actorContextForOperation(ctx).queue().waitForNames(
         names,
         options,
         signal ? asNativeCancellationToken(signal) : signal
@@ -1942,7 +2020,7 @@ var NapiCoreRuntime = (_class = class {
     );
   }
   async actorQueueEnqueueAndWait(ctx, name, body, options, signal) {
-    return await asNativeActorContext(ctx).queue().enqueueAndWait(
+    return await this.#actorContextForOperation(ctx).queue().enqueueAndWait(
       name,
       toNapiBuffer(body),
       options,
@@ -1962,22 +2040,22 @@ var NapiCoreRuntime = (_class = class {
     await asNativeActorContext(ctx).queue().reset();
   }
   async actorScheduleAfter(ctx, durationMs, actionName, args) {
-    return await asNativeActorContext(ctx).schedule().after(durationMs, actionName, toNapiBuffer(args));
+    return await this.#actorContextForOperation(ctx).schedule().after(durationMs, actionName, toNapiBuffer(args));
   }
   async actorScheduleAt(ctx, timestampMs, actionName, args) {
-    return await asNativeActorContext(ctx).schedule().at(timestampMs, actionName, toNapiBuffer(args));
+    return await this.#actorContextForOperation(ctx).schedule().at(timestampMs, actionName, toNapiBuffer(args));
   }
   async actorScheduleCancel(ctx, id) {
-    return await asNativeActorContext(ctx).schedule().cancel(id);
+    return await this.#actorContextForOperation(ctx).schedule().cancel(id);
   }
   async actorScheduleGet(ctx, id) {
-    return await _asyncNullishCoalesce(await asNativeActorContext(ctx).schedule().get(id), async () => ( void 0));
+    return await _asyncNullishCoalesce(await this.#actorContextForOperation(ctx).schedule().get(id), async () => ( void 0));
   }
   async actorScheduleList(ctx) {
-    return await asNativeActorContext(ctx).schedule().list();
+    return await this.#actorContextForOperation(ctx).schedule().list();
   }
   async actorCronSet(ctx, name, expression, timezone, actionName, args, maxHistory) {
-    await asNativeActorContext(ctx).schedule().cronSet(
+    await this.#actorContextForOperation(ctx).schedule().cronSet(
       name,
       expression,
       timezone,
@@ -1987,7 +2065,7 @@ var NapiCoreRuntime = (_class = class {
     );
   }
   async actorCronEvery(ctx, name, intervalMs, actionName, args, maxHistory) {
-    await asNativeActorContext(ctx).schedule().cronEvery(
+    await this.#actorContextForOperation(ctx).schedule().cronEvery(
       name,
       intervalMs,
       actionName,
@@ -1996,16 +2074,16 @@ var NapiCoreRuntime = (_class = class {
     );
   }
   async actorCronGet(ctx, name) {
-    return await _asyncNullishCoalesce(await asNativeActorContext(ctx).schedule().cronGet(name), async () => ( void 0));
+    return await _asyncNullishCoalesce(await this.#actorContextForOperation(ctx).schedule().cronGet(name), async () => ( void 0));
   }
   async actorCronList(ctx) {
-    return await asNativeActorContext(ctx).schedule().cronList();
+    return await this.#actorContextForOperation(ctx).schedule().cronList();
   }
   async actorCronDelete(ctx, name) {
-    return await asNativeActorContext(ctx).schedule().cronDelete(name);
+    return await this.#actorContextForOperation(ctx).schedule().cronDelete(name);
   }
   async actorCronHistory(ctx, name, limit) {
-    return await asNativeActorContext(ctx).schedule().cronHistory(name, limit);
+    return await this.#actorContextForOperation(ctx).schedule().cronHistory(name, limit);
   }
   connId(conn) {
     return asNativeConn(conn).id();
@@ -2039,10 +2117,13 @@ var NapiCoreRuntime = (_class = class {
   }
 }, _class);
 async function loadNapiRuntime() {
-  const bindings = await Promise.resolve().then(() => _interopRequireWildcard(require(["@rivetkit", "rivetkit-napi"].join("/"))));
+  const [{ AsyncLocalStorage }, bindings] = await Promise.all([
+    Promise.resolve().then(() => _interopRequireWildcard(require("async_hooks"))),
+    Promise.resolve().then(() => _interopRequireWildcard(require(["@rivetkit", "rivetkit-napi"].join("/"))))
+  ]);
   return {
     bindings,
-    runtime: new NapiCoreRuntime(bindings)
+    runtime: new NapiCoreRuntime(bindings, new AsyncLocalStorage())
   };
 }
 
@@ -2057,8 +2138,8 @@ function runtimeBytesToArrayBuffer(value) {
 function buildNativeHttpRequest(init) {
   var _a;
   const headers = new Headers(init.headers);
-  const originalUrl = headers.get(_chunkTGGF6SZNcjs.HEADER_ORIGINAL_REQUEST_URL);
-  headers.delete(_chunkTGGF6SZNcjs.HEADER_ORIGINAL_REQUEST_URL);
+  const originalUrl = headers.get(_chunkIJUXBWH4cjs.HEADER_ORIGINAL_REQUEST_URL);
+  headers.delete(_chunkIJUXBWH4cjs.HEADER_ORIGINAL_REQUEST_URL);
   const url = _nullishCoalesce(originalUrl, () => ( (init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString())));
   const method2 = init.method.toUpperCase();
   const bodyForbidden = method2 === "GET" || method2 === "HEAD";
@@ -2137,7 +2218,7 @@ async function pumpResponseBody(reader, stream) {
     }
   } catch (error) {
     try {
-      await stream.error(_chunk7E2W2YSMcjs.stringifyError.call(void 0, error));
+      await stream.error(_chunkRJC5O2SDcjs.stringifyError.call(void 0, error));
     } catch (streamError) {
       logger2().debug({
         msg: "failed to report native http response stream error",
@@ -2267,7 +2348,7 @@ function validateQueueComplete(schemas, name, response) {
   return result.data;
 }
 function validationError(target, issues) {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)("actor", "validation_error", `Invalid ${target}`, {
+  return new (0, _chunkJX2ITWAVcjs.RivetError)("actor", "validation_error", `Invalid ${target}`, {
     public: true,
     metadata: { issues }
   });
@@ -2275,7 +2356,7 @@ function validationError(target, issues) {
 
 // src/registry/run-handler-coordinator.ts
 function runUnavailable(actorId, reason) {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "run_handler_unavailable",
     `Run handler control is unavailable for actor ${actorId}: ${reason}.`,
@@ -2305,7 +2386,7 @@ var RunHandlerCoordinator = class {
     this.#run = run;
   }
   get inspectorKind() {
-    return _chunk4KGXFC6Mcjs.getRunInspectorKind.call(void 0, this.#run);
+    return _chunkEO5UOXXYcjs.getRunInspectorKind.call(void 0, this.#run);
   }
   async run(actorId, restart, callback) {
     const state = this.#getOrCreate(actorId);
@@ -2413,7 +2494,7 @@ var RunHandlerCoordinator = class {
   }
   #initializeInspector(actorId, state) {
     if (state.inspectorInitialized) return;
-    const inspector = _chunk4KGXFC6Mcjs.createRunInspector.call(void 0, this.#run, {
+    const inspector = _chunkEO5UOXXYcjs.createRunInspector.call(void 0, this.#run, {
       actorId,
       control: this.#control(actorId, state)
     });
@@ -2496,16 +2577,16 @@ function normalizeQueueMessage(message) {
 }
 function normalizeWasmBridgeError(error) {
   if (typeof error === "string") {
-    return _nullishCoalesce(_chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
+    return _nullishCoalesce(_chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
   }
   if (error instanceof Error) {
-    const bridged = _chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error.message);
+    const bridged = _chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error.message);
     if (bridged) {
       return bridged;
     }
   }
   if (typeof error === "object" && error !== null && "reason" in error && typeof error.reason === "string") {
-    const bridged = _chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error.reason);
+    const bridged = _chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error.reason);
     if (bridged) {
       return bridged;
     }
@@ -2527,7 +2608,7 @@ function callWasmSync(invoke) {
   }
 }
 function unsupportedWasmMethod(method2) {
-  throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  throw new (0, _chunkJX2ITWAVcjs.RivetError)(
     "runtime",
     "unsupported",
     `Unsupported wasm runtime method: ${method2}`,
@@ -2742,6 +2823,29 @@ var WasmCoreRuntime = (_class2 = class {
   actorId(ctx) {
     return callHandle(asWasmActorContext(ctx), "actorId");
   }
+  runWithActorInvocationContext(_ctx, run) {
+    return run();
+  }
+  actorInvocationTraceContext(_ctx) {
+    return void 0;
+  }
+  startCallSpan(_ctx, _actorName, _actionName) {
+    return void 0;
+  }
+  async startWorkflowSpan(_ctx) {
+    return {
+      run: (body) => body(),
+      startStep: () => void 0,
+      finish: async () => {
+      }
+    };
+  }
+  runOutsideActorInvocationContext(run) {
+    return run();
+  }
+  currentInvocationScope() {
+    return void 0;
+  }
   actorName(ctx) {
     return callHandle(asWasmActorContext(ctx), "name");
   }
@@ -2962,7 +3066,7 @@ var WasmCoreRuntime = (_class2 = class {
     await callWasm(() => database.close());
   }
   async actorRuntimeSocketProvision(_ctx) {
-    throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+    throw new (0, _chunkJX2ITWAVcjs.RivetError)(
       "actor_runtime_socket",
       "unsupported",
       "Actor Runtime Socket is only available on Unix native runtimes.",
@@ -3331,7 +3435,7 @@ function loadedRuntimeKind(runtime) {
     case "wasm":
       return "wasm";
   }
-  throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  throw new (0, _chunkJX2ITWAVcjs.RivetError)(
     "config",
     "unknown_runtime",
     "RivetKit runtime must be NAPI or wasm.",
@@ -3352,16 +3456,16 @@ async function loadAutoRuntime(config, loaders = defaultRuntimeLoaders) {
     nativeError = error;
     logger2().warn({
       msg: "native runtime failed to load; falling back to wasm",
-      error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+      error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
     });
   }
   try {
     return (await loaders.loadWasm(config.wasm)).runtime;
   } catch (wasmError) {
-    throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+    throw new (0, _chunkJX2ITWAVcjs.RivetError)(
       "config",
       "runtime_unavailable",
-      `RivetKit could not load a core runtime. Native runtime: ${_chunk7E2W2YSMcjs.stringifyError.call(void 0, nativeError)} Wasm runtime: ${_chunk7E2W2YSMcjs.stringifyError.call(void 0, wasmError)}`,
+      `RivetKit could not load a core runtime. Native runtime: ${_chunkRJC5O2SDcjs.stringifyError.call(void 0, nativeError)} Wasm runtime: ${_chunkRJC5O2SDcjs.stringifyError.call(void 0, wasmError)}`,
       {
         public: true,
         statusCode: 500
@@ -3389,7 +3493,7 @@ function normalizeRuntimeConfigForKind(config, runtimeKind) {
     return config;
   }
   if (sqliteBackendForConfig(config) === "local") {
-    throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+    throw new (0, _chunkJX2ITWAVcjs.RivetError)(
       "config",
       "wasm_local_sqlite",
       "WebAssembly runtime cannot use local SQLite. Use remote SQLite instead.",
@@ -3455,14 +3559,14 @@ function getNativeConnPersistState(runtime, ctx, conn) {
   return connState;
 }
 function stateMutationReentrantError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "state_mutation_reentrant",
     "State mutations are not allowed inside onStateChange."
   );
 }
 function stateTransactionConflictError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "state_transaction_conflict",
     "State cannot be mutated by another action while an experimental state-aware database transaction is active.",
@@ -3470,7 +3574,7 @@ function stateTransactionConflictError() {
   );
 }
 function databaseNotConfiguredError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "database_not_configured",
     "database is not configured for this actor",
@@ -3478,7 +3582,7 @@ function databaseNotConfiguredError() {
   );
 }
 function databaseClientNotReadyError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "database_client_not_ready",
     "actor database client was not initialized before user code ran. this is an internal lifecycle error; the migration callback should have pre-warmed the client. file an issue if you can reproduce.",
@@ -3486,7 +3590,7 @@ function databaseClientNotReadyError() {
   );
 }
 function runHandlerNotConfiguredError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "run_handler_unavailable",
     "Cannot schedule a run wake because this actor does not define a run handler.",
@@ -3494,7 +3598,7 @@ function runHandlerNotConfiguredError() {
   );
 }
 function stateNotEnabledError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "actor",
     "state_not_enabled",
     "State not enabled. Must implement `createState` or `state` to use state. (https://www.rivet.dev/docs/actors/state/#initializing-state)",
@@ -3502,7 +3606,7 @@ function stateNotEnabledError() {
   );
 }
 function nativeClientNotConfiguredError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "native",
     "client_not_configured",
     "native actor client is not configured",
@@ -3510,7 +3614,7 @@ function nativeClientNotConfiguredError() {
   );
 }
 function nativeEndpointNotConfiguredError() {
-  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
+  return new (0, _chunkJX2ITWAVcjs.RivetError)(
     "native",
     "endpoint_not_configured",
     "registry endpoint is required for native envoy startup",
@@ -3555,7 +3659,7 @@ async function cleanupNativeSleepRuntimeState(runtime, ctx, afterTrackedWorkDrai
     }).catch((error) => {
       logger2().warn({
         msg: "deferred native sleep cleanup failed",
-        error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+        error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
       });
     });
     return;
@@ -3718,10 +3822,10 @@ function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
   }
-  return _chunk7E2W2YSMcjs.decodeCborCompat.call(void 0, value);
+  return _chunkRJC5O2SDcjs.decodeCborCompat.call(void 0, value);
 }
 function encodeValue(value) {
-  return _chunk7E2W2YSMcjs.encodeCborCompat.call(void 0, value);
+  return _chunkRJC5O2SDcjs.encodeCborCompat.call(void 0, value);
 }
 function normalizeArgs(value) {
   return Array.isArray(value) ? value : value === void 0 || value === null ? [] : [value];
@@ -3734,16 +3838,16 @@ function unwrapTsfnPayload(error, payload) {
 }
 function normalizeNativeBridgeError(error) {
   if (typeof error === "string") {
-    return _nullishCoalesce(_chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
+    return _nullishCoalesce(_chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error), () => ( error));
   }
   if (error instanceof Error) {
-    const bridged = _chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error.message);
+    const bridged = _chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error.message);
     if (bridged) {
       return bridged;
     }
   }
   if (typeof error === "object" && error !== null && "reason" in error && typeof error.reason === "string") {
-    const bridged = _chunk2JSYYH6Pcjs.decodeBridgeRivetError.call(void 0, error.reason);
+    const bridged = _chunkJX2ITWAVcjs.decodeBridgeRivetError.call(void 0, error.reason);
     if (bridged) {
       return bridged;
     }
@@ -3751,14 +3855,14 @@ function normalizeNativeBridgeError(error) {
   return error;
 }
 function isStructuredBridgeError(error) {
-  if (error instanceof _chunk2JSYYH6Pcjs.RivetError) {
+  if (error instanceof _chunkJX2ITWAVcjs.RivetError) {
     return true;
   }
-  return _chunk2JSYYH6Pcjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
+  return _chunkJX2ITWAVcjs.isRivetErrorLike.call(void 0, error) && "__type" in error && (error.__type === "RivetError" || error.__type === "ActorError");
 }
 function encodeNativeCallbackError(error) {
-  const structuredError = isStructuredBridgeError(error) ? error : _chunk7E2W2YSMcjs.deconstructError.call(void 0, error, true);
-  const bridgeError = new Error(_chunk2JSYYH6Pcjs.encodeBridgeRivetError.call(void 0, structuredError), {
+  const structuredError = isStructuredBridgeError(error) ? error : _chunkRJC5O2SDcjs.deconstructError.call(void 0, error, true);
+  const bridgeError = new Error(_chunkJX2ITWAVcjs.encodeBridgeRivetError.call(void 0, structuredError), {
     cause: error instanceof Error ? error : void 0
   });
   return Object.assign(bridgeError, {
@@ -3783,9 +3887,9 @@ function callNativeSync(invoke) {
   }
 }
 function isClosedTaskRegistrationError(error) {
-  const metadata = error instanceof _chunk2JSYYH6Pcjs.RivetError ? error.metadata : void 0;
+  const metadata = error instanceof _chunkJX2ITWAVcjs.RivetError ? error.metadata : void 0;
   const metadataError = metadata && typeof metadata === "object" && "error" in metadata ? metadata.error : void 0;
-  return error instanceof _chunk2JSYYH6Pcjs.RivetError && error.group === "core" && error.code === _chunk2JSYYH6Pcjs.INTERNAL_ERROR_CODE && typeof metadataError === "string" && /actor task registration is (closed|not configured)/.test(metadataError);
+  return error instanceof _chunkJX2ITWAVcjs.RivetError && error.group === "core" && error.code === _chunkJX2ITWAVcjs.INTERNAL_ERROR_CODE && typeof metadataError === "string" && /actor task registration is (closed|not configured)/.test(metadataError);
 }
 async function createCancellationTokenHandle(runtime, signal) {
   if (!signal) {
@@ -3808,7 +3912,7 @@ function decodeWorkflowCbor(data) {
     return null;
   }
   try {
-    return _chunk7E2W2YSMcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
+    return _chunkRJC5O2SDcjs.decodeCborCompat.call(void 0, new Uint8Array(data));
   } catch (e4) {
     return null;
   }
@@ -3921,7 +4025,7 @@ function serializeWorkflowHistoryForJson(data) {
   if (data === null) {
     return null;
   }
-  const history = _chunkF3IP3SGOcjs.decodeWorkflowHistoryTransport.call(void 0, data);
+  const history = _chunkPPEIPCW4cjs.decodeWorkflowHistoryTransport.call(void 0, data);
   return jsonSafe({
     nameRegistry: [...history.nameRegistry],
     entries: history.entries.map((entry) => ({
@@ -4020,7 +4124,7 @@ var NativeConnAdapter = class {
     this.#ctx = ctx;
     this.#queueHibernationRemoval = queueHibernationRemoval;
     this.#assertCanMutateState = assertCanMutateState;
-    this[_chunk4KGXFC6Mcjs.CONN_STATE_MANAGER_SYMBOL] = {
+    this[_chunkEO5UOXXYcjs.CONN_STATE_MANAGER_SYMBOL] = {
       stateEnabled: true,
       get state() {
         return thisConn.state;
@@ -4037,7 +4141,7 @@ var NativeConnAdapter = class {
       decodeValue(this.#runtime.connParams(this.#conn))
     );
   }
-  [_chunk4KGXFC6Mcjs.RAW_STATE_SYMBOL]() {
+  [_chunkEO5UOXXYcjs.RAW_STATE_SYMBOL]() {
     return this.#readState();
   }
   get state() {
@@ -4067,7 +4171,7 @@ var NativeConnAdapter = class {
       },
       (newValue) => {
         assertCurrentState();
-        _chunk7E2W2YSMcjs.assertJsonCompatValue.call(void 0, newValue);
+        _chunkRJC5O2SDcjs.assertJsonCompatValue.call(void 0, newValue);
       }
     );
   }
@@ -4075,7 +4179,7 @@ var NativeConnAdapter = class {
     var _a;
     (_a = this.#assertCanMutateState) == null ? void 0 : _a.call(this);
     const nextValue = unwrapWriteThroughProxy(value);
-    _chunk7E2W2YSMcjs.assertJsonCompatValue.call(void 0, nextValue);
+    _chunkRJC5O2SDcjs.assertJsonCompatValue.call(void 0, nextValue);
     this.#writeState(nextValue, { writeNative: true });
   }
   initializeState(value) {
@@ -4458,7 +4562,7 @@ var NativeQueueAdapter = class {
   async nextBatch(options) {
     const completable = (options == null ? void 0 : options.completable) === true;
     if (this.#pendingCompletableMessageIds.size > 0) {
-      throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+      throw new (0, _chunkJX2ITWAVcjs.RivetError)(
         "queue",
         "previous_message_not_completed",
         "Previous completable queue message is not completed. Call `message.complete(...)` before receiving the next message.",
@@ -4625,7 +4729,7 @@ var NativeQueueAdapter = class {
         }
         yield message;
       } catch (error) {
-        if (_chunk2JSYYH6Pcjs.isActorAbortedError.call(void 0, error)) {
+        if (_chunkJX2ITWAVcjs.isActorAbortedError.call(void 0, error)) {
           return;
         }
         throw error;
@@ -4646,7 +4750,7 @@ var NativeQueueAdapter = class {
       ...message,
       complete: async (response) => {
         if (typeof message.complete !== "function") {
-          throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+          throw new (0, _chunkJX2ITWAVcjs.RivetError)(
             "queue",
             "complete_not_configured",
             `Queue '${message.name}' does not support completion responses.`,
@@ -4658,7 +4762,7 @@ var NativeQueueAdapter = class {
           );
         }
         if (completed) {
-          throw new (0, _chunk2JSYYH6Pcjs.RivetError)(
+          throw new (0, _chunkJX2ITWAVcjs.RivetError)(
             "queue",
             "already_completed",
             "Queue message was already completed.",
@@ -5055,6 +5159,7 @@ var NativeConnectionMap = (_class3 = class {
   }
   __init3() {this[Symbol.toStringTag] = "NativeConnectionMap"}
 }, _class3);
+var NO_INVOCATION_SCOPE = {};
 var ActorContextHandleAdapter = class {
   #runtime;
   #ctx;
@@ -5069,6 +5174,7 @@ var ActorContextHandleAdapter = class {
   #db;
   #dispatchCancelToken;
   #kv;
+  #logByInvocationScope = /* @__PURE__ */ new WeakMap();
   #queue;
   #request;
   #schedule;
@@ -5092,7 +5198,7 @@ var ActorContextHandleAdapter = class {
       this.#databaseProvider = databaseProvider;
     }
     this.#request = request;
-    this[_chunk4KGXFC6Mcjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
+    this[_chunkEO5UOXXYcjs.ACTOR_CONTEXT_INTERNAL_SYMBOL] = new NativeWorkflowRuntimeAdapter(
       this
     );
   }
@@ -5122,7 +5228,7 @@ var ActorContextHandleAdapter = class {
     }
     throw databaseClientNotReadyError();
   }
-  [_chunk4KGXFC6Mcjs.RAW_STATE_SYMBOL]() {
+  [_chunkEO5UOXXYcjs.RAW_STATE_SYMBOL]() {
     if (!this.#stateEnabled) {
       throw stateNotEnabledError();
     }
@@ -5149,7 +5255,7 @@ var ActorContextHandleAdapter = class {
         },
         (newValue) => {
           assertCurrentState();
-          _chunk7E2W2YSMcjs.assertJsonCompatValue.call(void 0, newValue);
+          _chunkRJC5O2SDcjs.assertJsonCompatValue.call(void 0, newValue);
         }
       );
     }
@@ -5161,7 +5267,7 @@ var ActorContextHandleAdapter = class {
     }
     this.#assertCanMutateState();
     const nextValue = unwrapWriteThroughProxy(value);
-    _chunk7E2W2YSMcjs.assertJsonCompatValue.call(void 0, nextValue);
+    _chunkRJC5O2SDcjs.assertJsonCompatValue.call(void 0, nextValue);
     this.#writeState(nextValue, { scheduleSave: true });
   }
   initializeState(value) {
@@ -5211,7 +5317,11 @@ var ActorContextHandleAdapter = class {
           await callNative(
             () => this.#runtime.actorSetRunWakeAt(this.#ctx, timestamp)
           );
-        }
+        },
+        startWorkflowSpan: () => callNative(
+          () => this.#runtime.startWorkflowSpan(this.#ctx)
+        ),
+        runOutsideWorkflowSpan: (body) => this.#runtime.runOutsideActorInvocationContext(body)
       };
     }
     return this.#run;
@@ -5256,8 +5366,29 @@ var ActorContextHandleAdapter = class {
     }
     return this.#connMap;
   }
+  #invocationTraceContext() {
+    return callNativeSync(
+      () => this.#runtime.actorInvocationTraceContext(this.#ctx)
+    );
+  }
+  /** Cached per invocation, because the `run` context outlives workflow runs and steps. */
   get log() {
-    return logger2();
+    const scope = _nullishCoalesce(this.#runtime.currentInvocationScope(), () => ( NO_INVOCATION_SCOPE));
+    const cached = this.#logByInvocationScope.get(scope);
+    if (cached) return cached;
+    const invocation = this.#invocationTraceContext();
+    const log = logger2().child({
+      actorId: this.actorId,
+      actorName: this.name,
+      actorKey: this.key,
+      ...(invocation == null ? void 0 : invocation.rayId) && { rayId: invocation.rayId },
+      ...(invocation == null ? void 0 : invocation.span) && {
+        traceId: invocation.span.traceId,
+        spanId: invocation.span.spanId
+      }
+    });
+    this.#logByInvocationScope.set(scope, log);
+    return log;
   }
   get abortSignal() {
     if (!this.#abortSignal) {
@@ -5345,7 +5476,7 @@ var ActorContextHandleAdapter = class {
       log: {
         debug: (obj) => logger2().debug(obj)
       },
-      nativeDatabaseProvider: _chunk4OMHYVOQcjs.registerNativeStateTransactionOpener.call(void 0, 
+      nativeDatabaseProvider: _chunkZ4RAXFSDcjs.registerNativeStateTransactionOpener.call(void 0, 
         {
           open: async (requestedActorId) => {
             void requestedActorId;
@@ -5368,7 +5499,7 @@ var ActorContextHandleAdapter = class {
     return this.#db;
   }
   #bindDatabaseClient(client) {
-    return _chunk4OMHYVOQcjs.bindNativeStateTransactionContext.call(void 0, client, {
+    return _chunkZ4RAXFSDcjs.bindNativeStateTransactionContext.call(void 0, client, {
       enter: async () => await this.#enterStateTransaction(),
       exit: (scope) => this.#exitStateTransaction(
         scope
@@ -5572,7 +5703,7 @@ var ActorContextHandleAdapter = class {
     const trackedPromise = Promise.resolve(promise).catch((error) => {
       logger2().warn({
         msg: "keepAwake promise rejected",
-        error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+        error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
       });
     }).then(() => null);
     try {
@@ -5958,7 +6089,7 @@ function buildActorConfig(definition, registryConfig, runtimeKind) {
     maxOutgoingMessageSize: registryConfig.maxOutgoingMessageSize,
     preloadMaxWorkflowBytes: options.preloadMaxWorkflowBytes,
     preloadMaxConnectionsBytes: options.preloadMaxConnectionsBytes,
-    actions: Object.keys(_chunk4KGXFC6Mcjs.flattenActionHandlers.call(void 0, config.actions)).sort().map((name) => ({ name })),
+    actions: Object.keys(_chunkEO5UOXXYcjs.flattenActionHandlers.call(void 0, config.actions)).sort().map((name) => ({ name })),
     inspectorTabs: buildInspectorTabs(config.inspector, runtimeKind)
   };
 }
@@ -6034,10 +6165,10 @@ function validateInspectorTabSource(tabId, resolved) {
 function buildNativeFactory(runtime, registryConfig, definition) {
   var _a;
   const config = definition.config;
-  const databaseProvider = _nullishCoalesce(config.db, () => ( _chunk4OMHYVOQcjs.db.call(void 0, )));
-  const actionHandlers = _chunk4KGXFC6Mcjs.flattenActionHandlers.call(void 0, config.actions);
+  const databaseProvider = _nullishCoalesce(config.db, () => ( _chunkZ4RAXFSDcjs.db.call(void 0, )));
+  const actionHandlers = _chunkEO5UOXXYcjs.flattenActionHandlers.call(void 0, config.actions);
   const schemaConfig = {
-    actionInputSchemas: _chunk4KGXFC6Mcjs.flattenActionInputSchemas.call(void 0, 
+    actionInputSchemas: _chunkEO5UOXXYcjs.flattenActionInputSchemas.call(void 0, 
       config.actions,
       config.actionInputSchemas
     ),
@@ -6045,19 +6176,27 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     events: config.events,
     queues: config.queues
   };
-  const createClient = () => _chunkTGGF6SZNcjs.createClientWithDriver.call(void 0, 
-    new (0, _chunkTGGF6SZNcjs.RemoteEngineControlClient)(
-      _chunkTGGF6SZNcjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
+  const createClient = (ctx) => _chunkIJUXBWH4cjs.createClientWithDriver.call(void 0, 
+    new (0, _chunkIJUXBWH4cjs.RemoteEngineControlClient)(
+      _chunkIJUXBWH4cjs.convertRegistryConfigToClientConfig.call(void 0, registryConfig)
     ),
-    { encoding: "bare" }
+    {
+      encoding: "bare",
+      currentActorInvocation: () => callNativeSync(
+        () => runtime.actorInvocationTraceContext(ctx)
+      ),
+      startCallSpan: (actorName, actionName) => callNativeSync(
+        () => runtime.startCallSpan(ctx, actorName, actionName)
+      )
+    }
   );
-  const run = _chunk4KGXFC6Mcjs.getRunFunction.call(void 0, config.run);
-  const runHandlerCoordinator = _chunk4KGXFC6Mcjs.getRunInspectorKind.call(void 0, config.run) === "workflow" ? new RunHandlerCoordinator(config.run) : void 0;
+  const run = _chunkEO5UOXXYcjs.getRunFunction.call(void 0, config.run);
+  const runHandlerCoordinator = _chunkEO5UOXXYcjs.getRunInspectorKind.call(void 0, config.run) === "workflow" ? new RunHandlerCoordinator(config.run) : void 0;
   const getNativeWorkflowInspector = (ctx) => {
     var _a2, _b;
     const actorId = callNativeSync(() => runtime.actorId(ctx));
     const restart = () => callNativeSync(() => runtime.actorRestartRunHandler(ctx));
-    return _nullishCoalesce(((_a2 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a2.workflow), () => ( ((_b = _chunk4KGXFC6Mcjs.getRunInspectorConfig.call(void 0, config.run, actorId)) == null ? void 0 : _b.workflow)));
+    return _nullishCoalesce(((_a2 = runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.getInspector(actorId, restart)) == null ? void 0 : _a2.workflow), () => ( ((_b = _chunkEO5UOXXYcjs.getRunInspectorConfig.call(void 0, config.run, actorId)) == null ? void 0 : _b.workflow)));
   };
   const onStateChange = typeof config.onStateChange === "function" ? (actorCtx, nextState) => {
     config.onStateChange(actorCtx, nextState);
@@ -6072,7 +6211,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
   const makeActorCtx = (ctx, request, cancelToken) => new ActorContextHandleAdapter(
     runtime,
     ctx,
-    createClient,
+    () => createClient(ctx),
     schemaConfig,
     databaseProvider,
     request,
@@ -6085,7 +6224,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     runtime,
     ctx,
     conn,
-    createClient,
+    () => createClient(ctx),
     schemaConfig,
     databaseProvider,
     request,
@@ -6110,7 +6249,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       }
     });
     const errorResponse = (error, status) => {
-      const rivetError = _chunk2JSYYH6Pcjs.toRivetError.call(void 0, error);
+      const rivetError = _chunkJX2ITWAVcjs.toRivetError.call(void 0, error);
       return jsonResponse(
         {
           group: rivetError.group,
@@ -6210,7 +6349,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           body = await jsRequest.json();
         } catch (e5) {
           return errorResponse(
-            new (0, _chunk2JSYYH6Pcjs.RivetError)(
+            new (0, _chunkJX2ITWAVcjs.RivetError)(
               "actor",
               "invalid_request",
               "Invalid inspector JSON body",
@@ -6222,7 +6361,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const name = _nullishCoalesce(body.name, () => ( ""));
         if (name === "") {
           return errorResponse(
-            new (0, _chunk2JSYYH6Pcjs.RivetError)(
+            new (0, _chunkJX2ITWAVcjs.RivetError)(
               "actor",
               "invalid_request",
               "Queue message name must not be empty",
@@ -6231,7 +6370,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             400
           );
         }
-        const cbor = _chunk7E2W2YSMcjs.encodeCborCompat.call(void 0, 
+        const cbor = _chunkRJC5O2SDcjs.encodeCborCompat.call(void 0, 
           _nullishCoalesce(body.body, () => ( null))
         );
         const message = await runtime.actorQueueSend(ctx, name, cbor);
@@ -6396,7 +6535,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const action = actionHandlers[actionName];
         if (!action) {
           return errorResponse(
-            new (0, _chunk2JSYYH6Pcjs.RivetError)(
+            new (0, _chunkJX2ITWAVcjs.RivetError)(
               "action",
               "action_not_found",
               `Action ${actionName} not found`
@@ -6599,7 +6738,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             );
           } finally {
             runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
-            _chunk4KGXFC6Mcjs.disposeRunInspector.call(void 0, config.run, actorId);
+            _chunkEO5UOXXYcjs.disposeRunInspector.call(void 0, config.run, actorId);
             await actorCtx.dispose();
           }
         }
@@ -6611,7 +6750,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const actorCtx = makeActorCtx(ctx);
         const actorId = callNativeSync(() => runtime.actorId(ctx));
         runHandlerCoordinator == null ? void 0 : runHandlerCoordinator.destroy(actorId);
-        _chunk4KGXFC6Mcjs.disposeRunInspector.call(void 0, config.run, actorId);
+        _chunkEO5UOXXYcjs.disposeRunInspector.call(void 0, config.run, actorId);
         try {
           if (typeof config.onDestroy === "function") {
             await config.onDestroy(actorCtx);
@@ -6769,7 +6908,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             );
           }
           if (!result) {
-            throw _chunk2JSYYH6Pcjs.forbiddenError.call(void 0, );
+            throw _chunkJX2ITWAVcjs.forbiddenError.call(void 0, );
           }
         } finally {
           await actorCtx.dispose();
@@ -6798,111 +6937,125 @@ function buildNativeFactory(runtime, registryConfig, definition) {
       async (error, payload) => {
         try {
           const { ctx, request, cancelToken, responseBodyStream } = unwrapTsfnPayload(error, payload);
-          const inspectorResponse = await maybeHandleNativeInspectorRequest(ctx, request);
-          if (inspectorResponse) {
-            await cancelNativeHttpRequestBody(request.bodyStream);
-            return (await convertNativeHttpResponse(
-              inspectorResponse,
-              responseBodyStream
-            )).response;
-          }
-          if (typeof config.onRequest !== "function") {
-            await cancelNativeHttpRequestBody(request.bodyStream);
-            return (await convertNativeHttpResponse(
-              new Response(null, { status: 404 }),
-              responseBodyStream
-            )).response;
-          }
-          const requestAbortController = new AbortController();
-          const handlerRequest = buildNativeHttpRequest({
-            ...request,
-            abortController: requestAbortController
-          });
-          const rawConnParams = handlerRequest.headers.get(_chunkTGGF6SZNcjs.HEADER_CONN_PARAMS);
-          let requestCtx;
-          let conn;
-          let removeRequestAbortListener;
-          let cleanupDeferredToBody = false;
-          let cleanedUp = false;
-          const cleanupRequest = async () => {
-            if (cleanedUp) return;
-            cleanedUp = true;
-            removeRequestAbortListener == null ? void 0 : removeRequestAbortListener();
-            try {
-              await (requestCtx == null ? void 0 : requestCtx.dispose());
-            } finally {
-              if (conn) {
-                await runtime.connDisconnect(conn);
-              }
-            }
-          };
-          try {
-            const connParams = validateConnParams(
-              schemaConfig.connParamsSchema,
-              rawConnParams ? JSON.parse(rawConnParams) : void 0
-            );
-            conn = await callNative(
-              () => runtime.actorConnectConn(
+          return await runtime.runWithActorInvocationContext(
+            ctx,
+            async () => {
+              const inspectorResponse = await maybeHandleNativeInspectorRequest(
                 ctx,
-                encodeValue(connParams),
                 request
-              )
-            );
-            requestCtx = makeConnCtx(
-              ctx,
-              conn,
-              handlerRequest,
-              cancelToken
-            );
-            const ctxAbortSignal = requestCtx.abortSignal;
-            const abortRequest = () => requestAbortController.abort(ctxAbortSignal.reason);
-            if (ctxAbortSignal.aborted) {
-              abortRequest();
-            } else {
-              ctxAbortSignal.addEventListener(
-                "abort",
-                abortRequest,
-                { once: true }
-              );
-              removeRequestAbortListener = () => ctxAbortSignal.removeEventListener(
-                "abort",
-                abortRequest
-              );
-            }
-            const response = await config.onRequest(
-              requestCtx,
-              handlerRequest
-            );
-            if (!_chunkTGGF6SZNcjs.isResponseLike.call(void 0, response)) {
-              throw new Error(
-                "onRequest handler must return a Response"
               );
-            }
-            const conversion = await convertNativeHttpResponse(
-              response,
-              responseBodyStream
-            );
-            if (conversion.bodyCompletion) {
-              cleanupDeferredToBody = true;
-              void conversion.bodyCompletion.then(cleanupRequest).catch((cleanupError) => {
-                logger2().error({
-                  msg: "failed to clean up native streaming http request",
-                  error: cleanupError
-                });
+              if (inspectorResponse) {
+                await cancelNativeHttpRequestBody(
+                  request.bodyStream
+                );
+                return (await convertNativeHttpResponse(
+                  inspectorResponse,
+                  responseBodyStream
+                )).response;
+              }
+              if (typeof config.onRequest !== "function") {
+                await cancelNativeHttpRequestBody(
+                  request.bodyStream
+                );
+                return (await convertNativeHttpResponse(
+                  new Response(null, { status: 404 }),
+                  responseBodyStream
+                )).response;
+              }
+              const requestAbortController = new AbortController();
+              const handlerRequest = buildNativeHttpRequest({
+                ...request,
+                abortController: requestAbortController
               });
-            }
-            return conversion.response;
-          } finally {
-            try {
-              await cancelNativeHttpRequestBody(
-                request.bodyStream
-              );
-            } finally {
-              if (!cleanupDeferredToBody) {
-                await cleanupRequest();
+              const rawConnParams = handlerRequest.headers.get(_chunkIJUXBWH4cjs.HEADER_CONN_PARAMS);
+              let requestCtx;
+              let conn;
+              let removeRequestAbortListener;
+              let cleanupDeferredToBody = false;
+              let cleanedUp = false;
+              const cleanupRequest = async () => {
+                if (cleanedUp) return;
+                cleanedUp = true;
+                removeRequestAbortListener == null ? void 0 : removeRequestAbortListener();
+                try {
+                  await (requestCtx == null ? void 0 : requestCtx.dispose());
+                } finally {
+                  if (conn) {
+                    await runtime.connDisconnect(conn);
+                  }
+                }
+              };
+              try {
+                const connParams = validateConnParams(
+                  schemaConfig.connParamsSchema,
+                  rawConnParams ? JSON.parse(rawConnParams) : void 0
+                );
+                conn = await callNative(
+                  () => runtime.actorConnectConn(
+                    ctx,
+                    encodeValue(connParams),
+                    request
+                  )
+                );
+                requestCtx = makeConnCtx(
+                  ctx,
+                  conn,
+                  handlerRequest,
+                  cancelToken
+                );
+                const ctxAbortSignal = requestCtx.abortSignal;
+                const abortRequest = () => requestAbortController.abort(
+                  ctxAbortSignal.reason
+                );
+                if (ctxAbortSignal.aborted) {
+                  abortRequest();
+                } else {
+                  ctxAbortSignal.addEventListener(
+                    "abort",
+                    abortRequest,
+                    { once: true }
+                  );
+                  removeRequestAbortListener = () => ctxAbortSignal.removeEventListener(
+                    "abort",
+                    abortRequest
+                  );
+                }
+                const response = await config.onRequest(
+                  requestCtx,
+                  handlerRequest
+                );
+                if (!_chunkIJUXBWH4cjs.isResponseLike.call(void 0, response)) {
+                  throw new Error(
+                    "onRequest handler must return a Response"
+                  );
+                }
+                const conversion = await convertNativeHttpResponse(
+                  response,
+                  responseBodyStream
+                );
+                if (conversion.bodyCompletion) {
+                  cleanupDeferredToBody = true;
+                  void conversion.bodyCompletion.then(cleanupRequest).catch((cleanupError) => {
+                    logger2().error({
+                      msg: "failed to clean up native streaming http request",
+                      error: cleanupError
+                    });
+                  });
+                }
+                return conversion.response;
+              } finally {
+                try {
+                  await cancelNativeHttpRequestBody(
+                    request.bodyStream
+                  );
+                } finally {
+                  if (!cleanupDeferredToBody) {
+                    await cleanupRequest();
+                  }
+                }
               }
             }
-          }
+          );
         } catch (error2) {
           logger2().error({
             msg: "native onRequest failed",
@@ -6961,15 +7114,15 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         }
       );
     })(),
-    getWorkflowHistory: _chunk4KGXFC6Mcjs.hasRunInspectorConfig.call(void 0, config.run) ? wrapNativeCallback(
+    getWorkflowHistory: _chunkEO5UOXXYcjs.hasRunInspectorConfig.call(void 0, config.run) ? wrapNativeCallback(
       async (error, payload) => {
         var _a2;
         const { ctx } = unwrapTsfnPayload(error, payload);
         const history = (_a2 = getNativeWorkflowInspector(ctx)) == null ? void 0 : _a2.getHistory();
-        return history == null ? void 0 : _chunk7E2W2YSMcjs.toUint8Array.call(void 0, history);
+        return history == null ? void 0 : _chunkRJC5O2SDcjs.toUint8Array.call(void 0, history);
       }
     ) : void 0,
-    replayWorkflow: _chunk4KGXFC6Mcjs.hasRunInspectorConfig.call(void 0, config.run) ? wrapNativeCallback(
+    replayWorkflow: _chunkEO5UOXXYcjs.hasRunInspectorConfig.call(void 0, config.run) ? wrapNativeCallback(
       async (error, payload) => {
         const { ctx, entryId } = unwrapTsfnPayload(
           error,
@@ -6980,7 +7133,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           return void 0;
         }
         const history = await _asyncNullishCoalesce(await workflowInspector.replayFromStep(entryId), async () => ( null));
-        return history == null ? void 0 : _chunk7E2W2YSMcjs.toUint8Array.call(void 0, history);
+        return history == null ? void 0 : _chunkRJC5O2SDcjs.toUint8Array.call(void 0, history);
       }
     ) : void 0,
     actions: Object.fromEntries(
@@ -6990,21 +7143,27 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           async (error, payload) => {
             const { ctx, conn, args, scheduledFire, cancelToken } = unwrapTsfnPayload(error, payload);
             const actorCtx = conn != null ? makeConnCtx(ctx, conn, void 0, cancelToken) : makeActorCtx(ctx, void 0, cancelToken);
-            try {
-              return encodeValue(
-                await handler(
-                  actorCtx,
-                  ...validateActionArgs(
-                    schemaConfig.actionInputSchemas,
-                    name,
-                    decodeArgs(args)
-                  ),
-                  ...scheduledFire ? [scheduledFire] : []
-                )
-              );
-            } finally {
-              await actorCtx.dispose();
-            }
+            const runAction = async () => {
+              try {
+                return encodeValue(
+                  await handler(
+                    actorCtx,
+                    ...validateActionArgs(
+                      schemaConfig.actionInputSchemas,
+                      name,
+                      decodeArgs(args)
+                    ),
+                    ...scheduledFire ? [scheduledFire] : []
+                  )
+                );
+              } finally {
+                await actorCtx.dispose();
+              }
+            };
+            return await runtime.runWithActorInvocationContext(
+              ctx,
+              runAction
+            );
           }
         )
       ])
@@ -7026,7 +7185,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           runtime,
           ctx,
           conn,
-          createClient,
+          () => createClient(ctx),
           schemaConfig,
           databaseProvider,
           jsRequest,
@@ -7035,43 +7194,48 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           cancelToken,
           run !== void 0
         );
-        try {
-          if (!schemaConfig.queues || !hasSchemaConfigKey(schemaConfig.queues, name)) {
-            return { status: "completed" };
-          }
-          const canPublish = getQueueCanPublish(
-            schemaConfig.queues,
-            name
-          );
-          if (canPublish && !await canPublish(actorCtx)) {
-            throw _chunk2JSYYH6Pcjs.forbiddenError.call(void 0, );
-          }
-          const decodedBody = decodeValue(body);
-          if (wait) {
+        return await runtime.runWithActorInvocationContext(
+          ctx,
+          async () => {
             try {
-              const response = await actorCtx.queue.enqueueAndWait(
-                name,
-                decodedBody,
-                {
-                  timeout: timeoutMs === void 0 || timeoutMs === null ? void 0 : Number(timeoutMs)
-                }
+              if (!schemaConfig.queues || !hasSchemaConfigKey(schemaConfig.queues, name)) {
+                return { status: "completed" };
+              }
+              const canPublish = getQueueCanPublish(
+                schemaConfig.queues,
+                name
               );
-              return {
-                status: "completed",
-                response: response === void 0 ? void 0 : encodeValue(response)
-              };
-            } catch (error2) {
-              if (error2.group === "queue" && error2.code === "timed_out") {
-                return { status: "timedOut" };
+              if (canPublish && !await canPublish(actorCtx)) {
+                throw _chunkJX2ITWAVcjs.forbiddenError.call(void 0, );
               }
-              throw error2;
+              const decodedBody = decodeValue(body);
+              if (wait) {
+                try {
+                  const response = await actorCtx.queue.enqueueAndWait(
+                    name,
+                    decodedBody,
+                    {
+                      timeout: timeoutMs === void 0 || timeoutMs === null ? void 0 : Number(timeoutMs)
+                    }
+                  );
+                  return {
+                    status: "completed",
+                    response: response === void 0 ? void 0 : encodeValue(response)
+                  };
+                } catch (error2) {
+                  if (error2.group === "queue" && error2.code === "timed_out") {
+                    return { status: "timedOut" };
+                  }
+                  throw error2;
+                }
+              }
+              await actorCtx.queue.send(name, decodedBody);
+              return { status: "completed" };
+            } finally {
+              await actorCtx.dispose();
             }
           }
-          await actorCtx.queue.send(name, decodedBody);
-          return { status: "completed" };
-        } finally {
-          await actorCtx.dispose();
-        }
+        );
       }
     ),
     serializeState: wrapNativeCallback(
@@ -7105,7 +7269,7 @@ async function buildServeConfig(config, resolveServicesBinary = true) {
     startServices: resolveServicesBinary && config.startServices,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config.serverless.basePath,
-    serverlessPackageVersion: _chunk7E2W2YSMcjs.VERSION,
+    serverlessPackageVersion: _chunkRJC5O2SDcjs.VERSION,
     serverlessClientEndpoint: config.publicEndpoint,
     serverlessClientNamespace: config.publicNamespace,
     serverlessClientToken: config.publicToken,
@@ -7118,7 +7282,7 @@ async function buildServeConfig(config, resolveServicesBinary = true) {
   } catch (error) {
     logger2().warn({
       msg: "could not resolve a local engine binary; if a local engine must be spawned it will fail with engine.binary_unavailable \u2014 set RIVET_ENGINE_BINARY_PATH or install the @rivetkit/engine-cli platform package",
-      error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+      error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
     });
   }
   if (resolveServicesBinary && config.startServices) {
@@ -7128,20 +7292,20 @@ async function buildServeConfig(config, resolveServicesBinary = true) {
     } catch (error) {
       logger2().warn({
         msg: "could not resolve the Services binary; a local engine will fail with services.binary_unavailable \u2014 set RIVET_RUN_SERVICES=0 to disable Services or RIVET_SERVICES_BINARY to a local rivet-services binary",
-        error: _chunk7E2W2YSMcjs.stringifyError.call(void 0, error)
+        error: _chunkRJC5O2SDcjs.stringifyError.call(void 0, error)
       });
     }
   }
   serveConfig.engineHost = config.engineHost;
   serveConfig.enginePort = config.enginePort;
   if ((_a = config.test) == null ? void 0 : _a.enabled) {
-    serveConfig.inspectorTestToken = _nullishCoalesce(_chunk7E2W2YSMcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
+    serveConfig.inspectorTestToken = _nullishCoalesce(_chunkRJC5O2SDcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN"), () => ( "token"));
   }
   return serveConfig;
 }
 async function buildRegistryWithRuntime(config, runtime) {
   var _a;
-  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunk7E2W2YSMcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
+  if (((_a = config.test) == null ? void 0 : _a.enabled) && _chunkRJC5O2SDcjs.getEnvUniversal.call(void 0, "_RIVET_TEST_INSPECTOR_TOKEN") === void 0) {
     trySetProcessEnv("_RIVET_TEST_INSPECTOR_TOKEN", "token");
   }
   if (runtime.kind === "napi") {
@@ -7208,7 +7372,7 @@ function createApplicationFetch(application, runtime) {
         signal: abortController.signal
       })
     );
-    if (!_chunkTGGF6SZNcjs.isResponseLike.call(void 0, response)) {
+    if (!_chunkIJUXBWH4cjs.isResponseLike.call(void 0, response)) {
       throw new TypeError(
         "registry.listen() application fetch must return a Response"
       );
@@ -7258,7 +7422,7 @@ var Registry = class {
     var _a;
     this.#config = config;
     if ((_a = config.logging) == null ? void 0 : _a.baseLogger) {
-      _chunk7E2W2YSMcjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
+      _chunkRJC5O2SDcjs.configureBaseLogger.call(void 0, config.logging.baseLogger);
     }
     this.#buildConfiguredRegistry = _nullishCoalesce((deps == null ? void 0 : deps.buildConfiguredRegistry), () => ( buildConfiguredRegistry));
     this.routes = {
@@ -7484,10 +7648,10 @@ var Registry = class {
    * ```
    */
   async listen(opts = {}) {
-    const port = _nullishCoalesce(_nullishCoalesce(opts.port, () => ( _chunk7E2W2YSMcjs.parsePortEnv.call(void 0, process.env.RIVET_PORT))), () => ( 3e3));
-    const publicDir = _nullishCoalesce(opts.publicDir, () => ( _chunk7E2W2YSMcjs.getRivetkitPublicDir.call(void 0, )));
+    const port = _nullishCoalesce(_nullishCoalesce(opts.port, () => ( _chunkRJC5O2SDcjs.parsePortEnv.call(void 0, process.env.RIVET_PORT))), () => ( 3e3));
+    const publicDir = _nullishCoalesce(opts.publicDir, () => ( _chunkRJC5O2SDcjs.getRivetkitPublicDir.call(void 0, )));
     const config = this.parseConfig();
-    if (opts.application && _chunk7E2W2YSMcjs.getRivetkitRuntimeMode.call(void 0, ) !== "serverless") {
+    if (opts.application && _chunkRJC5O2SDcjs.getRivetkitRuntimeMode.call(void 0, ) !== "serverless") {
       if (config.runtime === "wasm") {
         throw new Error(
           "registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly"
@@ -7563,7 +7727,7 @@ var Registry = class {
       return jsonRouteResponse(503, {
         status: "not_started",
         runtime: "rivetkit",
-        version: _chunk7E2W2YSMcjs.VERSION
+        version: _chunkRJC5O2SDcjs.VERSION
       });
     }
     const { runtime, registry } = configured;
@@ -7571,7 +7735,7 @@ var Registry = class {
       return jsonRouteResponse(501, {
         status: "unsupported",
         runtime: "rivetkit",
-        version: _chunk7E2W2YSMcjs.VERSION
+        version: _chunkRJC5O2SDcjs.VERSION
       });
     }
     const response = await runtime.registryHealth(registry);
@@ -7721,6 +7885,7 @@ var Registry = class {
     var _a;
     const modeAPromise = this.#runtimeServeConfiguredPromise;
     const modeBPromise = this.#runtimeServerlessPromise;
+    const runtimes = /* @__PURE__ */ new Set();
     const gracePeriodMs = await _asyncNullishCoalesce(await _asyncNullishCoalesce(((_a = config.shutdown) == null ? void 0 : _a.gracePeriodMs), async () => ( await this.#actorStopThresholdMs(_nullishCoalesce(modeAPromise, () => ( modeBPromise))))), async () => ( 30 * 60 * 1e3));
     const drain = async () => {
       const registries = [];
@@ -7729,6 +7894,7 @@ var Registry = class {
           (async () => {
             try {
               const { runtime, registry } = await modeAPromise;
+              runtimes.add(runtime);
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
@@ -7744,6 +7910,7 @@ var Registry = class {
           (async () => {
             try {
               const { runtime, registry } = await modeBPromise;
+              runtimes.add(runtime);
               await runtime.shutdownRegistry(registry);
             } catch (err) {
               logger2().warn(
@@ -7772,6 +7939,12 @@ var Registry = class {
         }
       )
     ]);
+    await Promise.all(
+      [...runtimes].map((runtime) => {
+        var _a2;
+        return (_a2 = runtime.shutdownTelemetry) == null ? void 0 : _a2.call(runtime);
+      })
+    );
   }
   async #actorStopThresholdMs(configuredRegistryPromise) {
     var _a;
@@ -7818,7 +7991,7 @@ var Registry = class {
       );
     }
     if (this.#runtimeReadyPromise) return this.#runtimeReadyPromise;
-    if (_chunk7E2W2YSMcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
+    if (_chunkRJC5O2SDcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
       return Promise.reject(
         new Error(
           "registry.startAndWait() requires envoy runtime mode; serverless registries become ready per request"
@@ -7888,8 +8061,8 @@ var Registry = class {
    * ```
    */
   start() {
-    if (_chunk7E2W2YSMcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
-      const publicDir = _nullishCoalesce(_chunk7E2W2YSMcjs.getRivetkitPublicDir.call(void 0, ), () => ( "/public"));
+    if (_chunkRJC5O2SDcjs.getRivetkitRuntimeMode.call(void 0, ) === "serverless") {
+      const publicDir = _nullishCoalesce(_chunkRJC5O2SDcjs.getRivetkitPublicDir.call(void 0, ), () => ( "/public"));
       this.listen({ publicDir }).catch((error) => {
         logger2().error({ error }, "auto-listen failed; exiting");
         if (typeof process !== "undefined" && typeof process.exit === "function") {
@@ -7910,7 +8083,7 @@ var Registry = class {
     };
     console.log();
     console.log(
-      `  RivetKit ${_chunk7E2W2YSMcjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
+      `  RivetKit ${_chunkRJC5O2SDcjs.VERSION} (Engine - ${kind === "serverless" ? "Serverless" : "Serverful"})`
     );
     if (config.namespace !== "default") {
       logLine("Namespace", config.namespace);
@@ -7986,5 +8159,5 @@ function setup(input) {
 
 
 
-exports.ALLOWED_PUBLIC_HEADERS = _chunkTGGF6SZNcjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunk2JSYYH6Pcjs.RivetError; exports.ActorsSchema = ActorsSchema; exports.DocConfigurePoolSchema = DocConfigurePoolSchema; exports.DocEnvoyConfigSchema = DocEnvoyConfigSchema; exports.DocRegistryConfigSchema = DocRegistryConfigSchema; exports.DocServerlessConfigSchema = DocServerlessConfigSchema; exports.DocSqliteConfigSchema = DocSqliteConfigSchema; exports.InlineWebSocketAdapter = InlineWebSocketAdapter; exports.Registry = Registry; exports.RegistryConfigSchema = RegistryConfigSchema; exports.RivetError = _chunk2JSYYH6Pcjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunk2JSYYH6Pcjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunkTGGF6SZNcjs.createClientWithDriver; exports.defineRunHandler = _chunk4KGXFC6Mcjs.defineRunHandler; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunk7E2W2YSMcjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunk7E2W2YSMcjs.toUint8Array;
+exports.ALLOWED_PUBLIC_HEADERS = _chunkIJUXBWH4cjs.ALLOWED_PUBLIC_HEADERS; exports.ActorDefinition = ActorDefinition; exports.ActorError = _chunkJX2ITWAVcjs.RivetError; exports.ActorsSchema = ActorsSchema; exports.DocConfigurePoolSchema = DocConfigurePoolSchema; exports.DocEnvoyConfigSchema = DocEnvoyConfigSchema; exports.DocRegistryConfigSchema = DocRegistryConfigSchema; exports.DocServerlessConfigSchema = DocServerlessConfigSchema; exports.DocSqliteConfigSchema = DocSqliteConfigSchema; exports.InlineWebSocketAdapter = InlineWebSocketAdapter; exports.Registry = Registry; exports.RegistryConfigSchema = RegistryConfigSchema; exports.RivetError = _chunkJX2ITWAVcjs.RivetError; exports.RuntimeKindSchema = RuntimeKindSchema; exports.SqliteBackendSchema = SqliteBackendSchema; exports.SqliteConfigSchema = SqliteConfigSchema; exports.TestConfigSchema = TestConfigSchema; exports.UserError = _chunkJX2ITWAVcjs.UserError; exports.WasmRuntimeConfigSchema = WasmRuntimeConfigSchema; exports.actor = actor; exports.buildActorNames = buildActorNames; exports.createClientWithDriver = _chunkIJUXBWH4cjs.createClientWithDriver; exports.defineRunHandler = _chunkEO5UOXXYcjs.defineRunHandler; exports.event = event; exports.isStaticActorDefinition = isStaticActorDefinition; exports.isStaticActorInstance = isStaticActorInstance; exports.lookupInRegistry = lookupInRegistry; exports.noopNext = _chunkRJC5O2SDcjs.noopNext; exports.queue = queue; exports.setup = setup; exports.toUint8Array = _chunkRJC5O2SDcjs.toUint8Array;
 //# sourceMappingURL=mod.cjs.map