rivetkit 2.1.0-rc.2 → 2.1.1

package/dist/tsup/serve-test-suite/mod.js

@@ -16,9 +16,9 @@ import {
   workflowQueueActor,
   workflowSleepActor,
   workflowStopTeardownActor
-} from "../chunk-373WW2VF.js";
-import "../chunk-QT5ERRYT.js";
-import "../chunk-BOGEGTFB.js";
+} from "../chunk-NAM3D5W5.js";
+import "../chunk-74ER4FEE.js";
+import "../chunk-WTRB56DR.js";
 import {
   db as db2,
   integer,
@@ -31,22 +31,22 @@ import {
   event,
   queue,
   setup
-} from "../chunk-LX443DPV.js";
+} from "../chunk-OONQLPOH.js";
 import {
   createFileSystemOrMemoryDriver
-} from "../chunk-V4B4XYFC.js";
-import "../chunk-EW3FYVI2.js";
-import "../chunk-IQ4ICNLA.js";
+} from "../chunk-T4PQK4WA.js";
+import "../chunk-AWJU3AZB.js";
+import "../chunk-VBU4P2IX.js";
 import {
   db
 } from "../chunk-KJSYAUOM.js";
 import "../chunk-N4KRDJ56.js";
 import {
   buildManagerRouter
-} from "../chunk-DVE2W5T7.js";
+} from "../chunk-MICYEINX.js";
 import "../chunk-LXUQ667X.js";
-import "../chunk-P56VSQ4X.js";
-import "../chunk-ZM2VLOBC.js";
+import "../chunk-XQWBEBLD.js";
+import "../chunk-IZ4M5TJU.js";
 import {
   UserError
 } from "../chunk-7HTNH26M.js";

package/dist/tsup/test/mod.cjs

@@ -1,18 +1,18 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkRIAVCHBWcjs = require('../chunk-RIAVCHBW.cjs');
+var _chunkLPXB254Rcjs = require('../chunk-LPXB254R.cjs');
 
 
-var _chunkIJFB2TQWcjs = require('../chunk-IJFB2TQW.cjs');
-require('../chunk-2NO5SHUF.cjs');
+var _chunkAGERRJ32cjs = require('../chunk-AGERRJ32.cjs');
+require('../chunk-FUBHHHK5.cjs');
 
 
-var _chunkKZLQXXHLcjs = require('../chunk-KZLQXXHL.cjs');
+var _chunkQ5CW77ITcjs = require('../chunk-Q5CW77IT.cjs');
 require('../chunk-NIYZDWMW.cjs');
-require('../chunk-MOFY4NC2.cjs');
+require('../chunk-LNDVGTPQ.cjs');
 
 
-var _chunk6YBHLX3Dcjs = require('../chunk-6YBHLX3D.cjs');
+var _chunkMMUXNMJFcjs = require('../chunk-MMUXNMJF.cjs');
 require('../chunk-L47L3ZWJ.cjs');
 require('../chunk-HDQ2JUQT.cjs');
 
@@ -23,14 +23,14 @@ var _invariant = require('invariant'); var _invariant2 = _interopRequireDefault(
 
 // src/test/log.ts
 function logger() {
-  return _chunk6YBHLX3Dcjs.getLogger.call(void 0, "test");
+  return _chunkMMUXNMJFcjs.getLogger.call(void 0, "test");
 }
 
 // src/test/mod.ts
 async function setupTest(c, registry) {
   var _a;
   registry.config.test = { ...registry.config.test, enabled: true };
-  const driver = _chunkRIAVCHBWcjs.createFileSystemOrMemoryDriver.call(void 0, 
+  const driver = _chunkLPXB254Rcjs.createFileSystemOrMemoryDriver.call(void 0, 
     true,
     { path: `/tmp/rivetkit-test-${crypto.randomUUID()}` }
   );
@@ -45,7 +45,7 @@ async function setupTest(c, registry) {
   _invariant2.default.call(void 0, managerDriver, "missing manager driver");
   const getUpgradeWebSocket = () => upgradeWebSocket;
   managerDriver.setGetUpgradeWebSocket(getUpgradeWebSocket);
-  const { router } = _chunkKZLQXXHLcjs.buildManagerRouter.call(void 0, 
+  const { router } = _chunkQ5CW77ITcjs.buildManagerRouter.call(void 0, 
     parsedConfig,
     managerDriver,
     getUpgradeWebSocket
@@ -75,7 +75,7 @@ async function setupTest(c, registry) {
   c.onTestFinished(async () => {
     await new Promise((resolve) => server.close(() => resolve(void 0)));
   });
-  const client = _chunkIJFB2TQWcjs.createClient.call(void 0, {
+  const client = _chunkAGERRJ32cjs.createClient.call(void 0, {
     endpoint,
     namespace: "default",
     runnerName: "default",

package/dist/tsup/test/mod.js

@@ -1,18 +1,18 @@
 import {
   createFileSystemOrMemoryDriver
-} from "../chunk-V4B4XYFC.js";
+} from "../chunk-T4PQK4WA.js";
 import {
   createClient
-} from "../chunk-EW3FYVI2.js";
-import "../chunk-IQ4ICNLA.js";
+} from "../chunk-AWJU3AZB.js";
+import "../chunk-VBU4P2IX.js";
 import {
   buildManagerRouter
-} from "../chunk-DVE2W5T7.js";
+} from "../chunk-MICYEINX.js";
 import "../chunk-LXUQ667X.js";
-import "../chunk-P56VSQ4X.js";
+import "../chunk-XQWBEBLD.js";
 import {
   getLogger
-} from "../chunk-ZM2VLOBC.js";
+} from "../chunk-IZ4M5TJU.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 

package/dist/tsup/utils.cjs

@@ -17,7 +17,7 @@
 
 
 
-var _chunk6YBHLX3Dcjs = require('./chunk-6YBHLX3D.cjs');
+var _chunkMMUXNMJFcjs = require('./chunk-MMUXNMJF.cjs');
 require('./chunk-L47L3ZWJ.cjs');
 require('./chunk-HDQ2JUQT.cjs');
 
@@ -39,5 +39,5 @@ require('./chunk-HDQ2JUQT.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunk6YBHLX3Dcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunk6YBHLX3Dcjs.SinglePromiseQueue; exports.VERSION = _chunk6YBHLX3Dcjs.VERSION; exports.arrayBuffersEqual = _chunk6YBHLX3Dcjs.arrayBuffersEqual; exports.assertUnreachable = _chunk6YBHLX3Dcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunk6YBHLX3Dcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunk6YBHLX3Dcjs.combineUrlPath; exports.dbg = _chunk6YBHLX3Dcjs.dbg; exports.detectRuntime = _chunk6YBHLX3Dcjs.detectRuntime; exports.getEnvUniversal = _chunk6YBHLX3Dcjs.getEnvUniversal; exports.httpUserAgent = _chunk6YBHLX3Dcjs.httpUserAgent; exports.interval = _chunk6YBHLX3Dcjs.interval; exports.joinSignals = _chunk6YBHLX3Dcjs.joinSignals; exports.promiseWithResolvers = _chunk6YBHLX3Dcjs.promiseWithResolvers; exports.setLongTimeout = _chunk6YBHLX3Dcjs.setLongTimeout; exports.sleep = _chunk6YBHLX3Dcjs.sleep; exports.stringifyError = _chunk6YBHLX3Dcjs.stringifyError; exports.toUint8Array = _chunk6YBHLX3Dcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunkMMUXNMJFcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkMMUXNMJFcjs.SinglePromiseQueue; exports.VERSION = _chunkMMUXNMJFcjs.VERSION; exports.arrayBuffersEqual = _chunkMMUXNMJFcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkMMUXNMJFcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkMMUXNMJFcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkMMUXNMJFcjs.combineUrlPath; exports.dbg = _chunkMMUXNMJFcjs.dbg; exports.detectRuntime = _chunkMMUXNMJFcjs.detectRuntime; exports.getEnvUniversal = _chunkMMUXNMJFcjs.getEnvUniversal; exports.httpUserAgent = _chunkMMUXNMJFcjs.httpUserAgent; exports.interval = _chunkMMUXNMJFcjs.interval; exports.joinSignals = _chunkMMUXNMJFcjs.joinSignals; exports.promiseWithResolvers = _chunkMMUXNMJFcjs.promiseWithResolvers; exports.setLongTimeout = _chunkMMUXNMJFcjs.setLongTimeout; exports.sleep = _chunkMMUXNMJFcjs.sleep; exports.stringifyError = _chunkMMUXNMJFcjs.stringifyError; exports.toUint8Array = _chunkMMUXNMJFcjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -17,7 +17,7 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-ZM2VLOBC.js";
+} from "./chunk-IZ4M5TJU.js";
 import "./chunk-7HTNH26M.js";
 import "./chunk-424PT5DM.js";
 export {

package/dist/tsup/workflow/mod.cjs

@@ -2,15 +2,15 @@
 
 
 
-var _chunk4H3KSRC2cjs = require('../chunk-4H3KSRC2.cjs');
-require('../chunk-X3TPWS5J.cjs');
-require('../chunk-MOFY4NC2.cjs');
-require('../chunk-6YBHLX3D.cjs');
+var _chunkZR76ZGYScjs = require('../chunk-ZR76ZGYS.cjs');
+require('../chunk-WPDQXB7R.cjs');
+require('../chunk-LNDVGTPQ.cjs');
+require('../chunk-MMUXNMJF.cjs');
 require('../chunk-L47L3ZWJ.cjs');
 require('../chunk-HDQ2JUQT.cjs');
 
 
 
 
-exports.ActorWorkflowContext = _chunk4H3KSRC2cjs.ActorWorkflowContext; exports.Loop = _chunk4H3KSRC2cjs.Loop; exports.workflow = _chunk4H3KSRC2cjs.workflow;
+exports.ActorWorkflowContext = _chunkZR76ZGYScjs.ActorWorkflowContext; exports.Loop = _chunkZR76ZGYScjs.Loop; exports.workflow = _chunkZR76ZGYScjs.workflow;
 //# sourceMappingURL=mod.cjs.map

package/dist/tsup/workflow/mod.d.cts

@@ -1,13 +1,14 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext, b9 as QueueFilterName, ba as QueueNextOptions, bb as QueueResultMessageForName, bc as InferSchemaMap, a5 as Registry, C as Client, bd as InferDatabaseClient, be as InferEventArgs } from '../config-CAZphOS1.cjs';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-CAZphOS1.cjs';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.cjs';
-import * as pino from 'pino';
-import { WorkflowContextInterface, LoopResult, LoopConfig, BranchConfig, BranchOutput, EntryKindType } from '@rivetkit/workflow-engine';
+import { A as ActorWorkflowContext } from '../context-7X-Dm6_f.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-7X-Dm6_f.cjs';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '@rivetkit/traces';
 import 'hono';
 import 'vbare';
+import 'pino';
 import '../utils.cjs';
 import '../utils-fwx3o3K9.cjs';
 import 'hono/utils/http-status';
@@ -19,65 +20,6 @@ import 'nanoevents';
 import '../v3-DnYObHH3.cjs';
 import '@rivetkit/bare-ts';
 
-type WorkflowActorQueueNextOptions<TName extends string, TCompletable extends boolean> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
-type WorkflowActorQueueNextOptionsFallback<TCompletable extends boolean> = Omit<QueueNextOptions<string, TCompletable>, "signal">;
-type ActorWorkflowLoopConfig<S, T, TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig, TQueues extends QueueSchemaConfig> = Omit<LoopConfig<S, T>, "run"> & {
-    run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>, state: S) => Promise<LoopResult<S, T>>;
-};
-type ActorWorkflowBranchConfig<TOutput, TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig, TQueues extends QueueSchemaConfig> = {
-    run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<TOutput>;
-};
-declare class ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig = Record<never, never>, TQueues extends QueueSchemaConfig = Record<never, never>> implements WorkflowContextInterface {
-    #private;
-    constructor(inner: WorkflowContextInterface, runCtx: RunContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>);
-    get workflowId(): string;
-    get abortSignal(): AbortSignal;
-    get queue(): {
-        next: {
-            <const TName extends QueueFilterName<TQueues>, const TCompletable extends boolean = false>(name: string, opts?: WorkflowActorQueueNextOptions<TName, TCompletable>): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>>;
-            <const TCompletable extends boolean = false>(name: string, opts?: WorkflowActorQueueNextOptionsFallback<TCompletable>): Promise<Array<QueueResultMessageForName<TQueues, QueueFilterName<TQueues>, TCompletable>>>;
-        };
-        send: {
-            <K extends keyof TQueues & string>(name: K, body: InferSchemaMap<TQueues>[K]): Promise<void>;
-            (name: keyof TQueues extends never ? string : never, body: unknown): Promise<void>;
-        };
-    };
-    step<T>(nameOrConfig: string | Parameters<WorkflowContextInterface["step"]>[0], run?: () => Promise<T>): Promise<T>;
-    loop<T>(name: string, run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<LoopResult<undefined, T>>): Promise<T>;
-    loop<T>(name: string, run: (ctx: WorkflowContextInterface) => Promise<LoopResult<undefined, T>>): Promise<T>;
-    loop<S, T>(config: ActorWorkflowLoopConfig<S, T, TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>): Promise<T>;
-    loop<S, T>(config: LoopConfig<S, T>): Promise<T>;
-    sleep(name: string, durationMs: number): Promise<void>;
-    sleepUntil(name: string, timestampMs: number): Promise<void>;
-    rollbackCheckpoint(name: string): Promise<void>;
-    join<T extends Record<string, ActorWorkflowBranchConfig<unknown, TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>>>(name: string, branches: T): Promise<{
-        [K in keyof T]: Awaited<ReturnType<T[K]["run"]>>;
-    }>;
-    join<T extends Record<string, BranchConfig<unknown>>>(name: string, branches: T): Promise<{
-        [K in keyof T]: BranchOutput<T[K]>;
-    }>;
-    race<T>(name: string, branches: Array<{
-        name: string;
-        run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<T>;
-    }>): Promise<{
-        winner: string;
-        value: T;
-    }>;
-    removed(name: string, originalType: EntryKindType): Promise<void>;
-    isEvicted(): boolean;
-    get state(): TState extends never ? never : TState;
-    get vars(): TVars extends never ? never : TVars;
-    client<R extends Registry<any>>(): Client<R>;
-    get db(): TDatabase extends never ? never : InferDatabaseClient<TDatabase>;
-    get log(): pino.Logger;
-    keepAwake<T>(promise: Promise<T>): Promise<T>;
-    waitUntil(promise: Promise<void>): void;
-    get actorId(): string;
-    broadcast<K extends keyof TEvents & string>(name: K, ...args: InferEventArgs<InferSchemaMap<TEvents>[K]>): void;
-    broadcast(name: keyof TEvents extends never ? string : never, ...args: Array<unknown>): void;
-    consumeGuardViolation(): boolean;
-}
-
 declare function workflow<TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig = Record<never, never>, TQueues extends QueueSchemaConfig = Record<never, never>>(fn: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<unknown>): (c: RunContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<void>;
 
 export { ActorWorkflowContext, workflow };

package/dist/tsup/workflow/mod.d.ts

@@ -1,13 +1,14 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext, b9 as QueueFilterName, ba as QueueNextOptions, bb as QueueResultMessageForName, bc as InferSchemaMap, a5 as Registry, C as Client, bd as InferDatabaseClient, be as InferEventArgs } from '../config-BFqid9Gr.js';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-BFqid9Gr.js';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.js';
-import * as pino from 'pino';
-import { WorkflowContextInterface, LoopResult, LoopConfig, BranchConfig, BranchOutput, EntryKindType } from '@rivetkit/workflow-engine';
+import { A as ActorWorkflowContext } from '../context-x9zKhx5T.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-x9zKhx5T.js';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '@rivetkit/traces';
 import 'hono';
 import 'vbare';
+import 'pino';
 import '../utils.js';
 import '../utils-fwx3o3K9.js';
 import 'hono/utils/http-status';
@@ -19,65 +20,6 @@ import 'nanoevents';
 import '../v3-DnYObHH3.js';
 import '@rivetkit/bare-ts';
 
-type WorkflowActorQueueNextOptions<TName extends string, TCompletable extends boolean> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
-type WorkflowActorQueueNextOptionsFallback<TCompletable extends boolean> = Omit<QueueNextOptions<string, TCompletable>, "signal">;
-type ActorWorkflowLoopConfig<S, T, TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig, TQueues extends QueueSchemaConfig> = Omit<LoopConfig<S, T>, "run"> & {
-    run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>, state: S) => Promise<LoopResult<S, T>>;
-};
-type ActorWorkflowBranchConfig<TOutput, TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig, TQueues extends QueueSchemaConfig> = {
-    run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<TOutput>;
-};
-declare class ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig = Record<never, never>, TQueues extends QueueSchemaConfig = Record<never, never>> implements WorkflowContextInterface {
-    #private;
-    constructor(inner: WorkflowContextInterface, runCtx: RunContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>);
-    get workflowId(): string;
-    get abortSignal(): AbortSignal;
-    get queue(): {
-        next: {
-            <const TName extends QueueFilterName<TQueues>, const TCompletable extends boolean = false>(name: string, opts?: WorkflowActorQueueNextOptions<TName, TCompletable>): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>>;
-            <const TCompletable extends boolean = false>(name: string, opts?: WorkflowActorQueueNextOptionsFallback<TCompletable>): Promise<Array<QueueResultMessageForName<TQueues, QueueFilterName<TQueues>, TCompletable>>>;
-        };
-        send: {
-            <K extends keyof TQueues & string>(name: K, body: InferSchemaMap<TQueues>[K]): Promise<void>;
-            (name: keyof TQueues extends never ? string : never, body: unknown): Promise<void>;
-        };
-    };
-    step<T>(nameOrConfig: string | Parameters<WorkflowContextInterface["step"]>[0], run?: () => Promise<T>): Promise<T>;
-    loop<T>(name: string, run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<LoopResult<undefined, T>>): Promise<T>;
-    loop<T>(name: string, run: (ctx: WorkflowContextInterface) => Promise<LoopResult<undefined, T>>): Promise<T>;
-    loop<S, T>(config: ActorWorkflowLoopConfig<S, T, TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>): Promise<T>;
-    loop<S, T>(config: LoopConfig<S, T>): Promise<T>;
-    sleep(name: string, durationMs: number): Promise<void>;
-    sleepUntil(name: string, timestampMs: number): Promise<void>;
-    rollbackCheckpoint(name: string): Promise<void>;
-    join<T extends Record<string, ActorWorkflowBranchConfig<unknown, TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>>>(name: string, branches: T): Promise<{
-        [K in keyof T]: Awaited<ReturnType<T[K]["run"]>>;
-    }>;
-    join<T extends Record<string, BranchConfig<unknown>>>(name: string, branches: T): Promise<{
-        [K in keyof T]: BranchOutput<T[K]>;
-    }>;
-    race<T>(name: string, branches: Array<{
-        name: string;
-        run: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<T>;
-    }>): Promise<{
-        winner: string;
-        value: T;
-    }>;
-    removed(name: string, originalType: EntryKindType): Promise<void>;
-    isEvicted(): boolean;
-    get state(): TState extends never ? never : TState;
-    get vars(): TVars extends never ? never : TVars;
-    client<R extends Registry<any>>(): Client<R>;
-    get db(): TDatabase extends never ? never : InferDatabaseClient<TDatabase>;
-    get log(): pino.Logger;
-    keepAwake<T>(promise: Promise<T>): Promise<T>;
-    waitUntil(promise: Promise<void>): void;
-    get actorId(): string;
-    broadcast<K extends keyof TEvents & string>(name: K, ...args: InferEventArgs<InferSchemaMap<TEvents>[K]>): void;
-    broadcast(name: keyof TEvents extends never ? string : never, ...args: Array<unknown>): void;
-    consumeGuardViolation(): boolean;
-}
-
 declare function workflow<TState, TConnParams, TConnState, TVars, TInput, TDatabase extends AnyDatabaseProvider, TEvents extends EventSchemaConfig = Record<never, never>, TQueues extends QueueSchemaConfig = Record<never, never>>(fn: (ctx: ActorWorkflowContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<unknown>): (c: RunContext<TState, TConnParams, TConnState, TVars, TInput, TDatabase, TEvents, TQueues>) => Promise<void>;
 
 export { ActorWorkflowContext, workflow };

package/dist/tsup/workflow/mod.js

@@ -2,10 +2,10 @@ import {
   ActorWorkflowContext,
   Loop,
   workflow
-} from "../chunk-QT5ERRYT.js";
-import "../chunk-BOGEGTFB.js";
-import "../chunk-P56VSQ4X.js";
-import "../chunk-ZM2VLOBC.js";
+} from "../chunk-74ER4FEE.js";
+import "../chunk-WTRB56DR.js";
+import "../chunk-XQWBEBLD.js";
+import "../chunk-IZ4M5TJU.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rivetkit",
-  "version": "2.1.0-rc.2",
+  "version": "2.1.1",
   "description": "Lightweight libraries for building stateful actors on edge platforms",
   "license": "Apache-2.0",
   "keywords": [
@@ -219,11 +219,11 @@
     "vbare": "^0.0.4",
     "@rivetkit/sqlite": "^0.1.1",
     "zod": "^4.1.0",
-    "@rivetkit/engine-runner": "2.1.0-rc.2",
-    "@rivetkit/traces": "2.1.0-rc.2",
+    "@rivetkit/engine-runner": "2.1.1",
+    "@rivetkit/traces": "2.1.1",
+    "@rivetkit/sqlite-vfs": "2.1.1",
     "@rivetkit/virtual-websocket": "2.0.33",
-    "@rivetkit/workflow-engine": "2.1.0-rc.2",
-    "@rivetkit/sqlite-vfs": "2.1.0-rc.2"
+    "@rivetkit/workflow-engine": "2.1.1"
   },
   "devDependencies": {
     "@bare-ts/tools": "^0.13.0",

package/src/mod.ts

@@ -1,5 +1,11 @@
 export * from "@/actor/mod";
 export type * from "@/actor/contexts";
+export type {
+	WorkflowBranchContextOf,
+	WorkflowContextOf,
+	WorkflowLoopContextOf,
+	WorkflowStepContextOf,
+} from "@/workflow/context";
 export {
 	type AnyClient,
 	type Client,

package/src/workflow/context.ts

@@ -1,6 +1,7 @@
 import type { RunContext } from "@/actor/contexts/run";
 import type { Client } from "@/client/client";
 import type { Registry } from "@/registry";
+import type { ActorDefinition, AnyActorDefinition } from "@/actor/definition";
 import type { AnyDatabaseProvider, InferDatabaseClient } from "@/actor/database";
 import type {
 	QueueFilterName,
@@ -28,13 +29,22 @@ import { WORKFLOW_GUARD_KV_KEY } from "./constants";
 type WorkflowActorQueueNextOptions<
 	TName extends string,
 	TCompletable extends boolean,
-> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
+> = Omit<QueueNextOptions<TName, TCompletable>, "signal" | "count">;
 
 type WorkflowActorQueueNextOptionsFallback<TCompletable extends boolean> = Omit<
 	QueueNextOptions<string, TCompletable>,
-	"signal"
+	"signal" | "count"
 >;
 
+type WorkflowActorQueueNextBatchOptions<
+	TName extends string,
+	TCompletable extends boolean,
+> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
+
+type WorkflowActorQueueNextBatchOptionsFallback<
+	TCompletable extends boolean,
+> = Omit<QueueNextOptions<string, TCompletable>, "signal">;
+
 type ActorWorkflowLoopConfig<
 	S,
 	T,
@@ -59,7 +69,7 @@ type ActorWorkflowLoopConfig<
 			TQueues
 		>,
 		state: S,
-	) => Promise<LoopResult<S, T>>;
+	) => Promise<LoopResult<S, T> | (S extends undefined ? void : never)>;
 };
 
 type ActorWorkflowBranchConfig<
@@ -146,10 +156,35 @@ export class ActorWorkflowContext<
 		>(
 			name: string,
 			opts?: WorkflowActorQueueNextOptions<TName, TCompletable>,
-		): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>>;
+		): Promise<QueueResultMessageForName<TQueues, TName, TCompletable>>;
 		function next<const TCompletable extends boolean = false>(
 			name: string,
 			opts?: WorkflowActorQueueNextOptionsFallback<TCompletable>,
+		): Promise<
+			QueueResultMessageForName<
+				TQueues,
+				QueueFilterName<TQueues>,
+				TCompletable
+			>
+		>;
+		async function next(
+			name: string,
+			opts?: WorkflowActorQueueNextOptions<string, boolean>,
+		): Promise<WorkflowQueueMessage<unknown>> {
+			const message = await self.#inner.queue.next(name, opts);
+			return self.#toActorQueueMessage(message);
+		}
+
+		function nextBatch<
+			const TName extends QueueFilterName<TQueues>,
+			const TCompletable extends boolean = false,
+		>(
+			name: string,
+			opts?: WorkflowActorQueueNextBatchOptions<TName, TCompletable>,
+		): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>>;
+		function nextBatch<const TCompletable extends boolean = false>(
+			name: string,
+			opts?: WorkflowActorQueueNextBatchOptionsFallback<TCompletable>,
 		): Promise<
 			Array<
 				QueueResultMessageForName<
@@ -159,11 +194,11 @@ export class ActorWorkflowContext<
 				>
 			>
 		>;
-		async function next(
+		async function nextBatch(
 			name: string,
-			opts?: WorkflowActorQueueNextOptions<string, boolean>,
+			opts?: WorkflowActorQueueNextBatchOptions<string, boolean>,
 		): Promise<Array<WorkflowQueueMessage<unknown>>> {
-			const messages = await self.#inner.queue.next(name, opts);
+			const messages = await self.#inner.queue.nextBatch(name, opts);
 			return messages.map((message) => self.#toActorQueueMessage(message));
 		}
 
@@ -181,6 +216,7 @@ export class ActorWorkflowContext<
 
 		return {
 			next,
+			nextBatch,
 			send,
 		};
 	}
@@ -218,13 +254,13 @@ export class ActorWorkflowContext<
 				TEvents,
 				TQueues
 			>,
-		) => Promise<LoopResult<undefined, T>>,
+		) => Promise<LoopResult<undefined, T> | void>,
 	): Promise<T>;
 	async loop<T>(
 		name: string,
 		run: (
 			ctx: WorkflowContextInterface,
-		) => Promise<LoopResult<undefined, T>>,
+		) => Promise<LoopResult<undefined, T> | void>,
 	): Promise<T>;
 	async loop<S, T>(
 		config: ActorWorkflowLoopConfig<
@@ -244,10 +280,10 @@ export class ActorWorkflowContext<
 	async loop(
 		nameOrConfig:
 			| string
-			| LoopConfig<unknown, unknown>
+			| LoopConfig<any, any>
 			| ActorWorkflowLoopConfig<
-					unknown,
-					unknown,
+					any,
+					any,
 					TState,
 					TConnParams,
 					TConnState,
@@ -268,8 +304,8 @@ export class ActorWorkflowContext<
 				TEvents,
 				TQueues
 			>,
-		) => Promise<LoopResult<undefined, unknown>>,
-	): Promise<unknown> {
+		) => Promise<LoopResult<undefined, any> | void>,
+	): Promise<any> {
 		if (typeof nameOrConfig === "string") {
 			if (!run) {
 				throw new Error("Loop run function missing");
@@ -280,7 +316,7 @@ export class ActorWorkflowContext<
 				),
 			);
 		}
-		const wrapped: LoopConfig<unknown, unknown> = {
+		const wrapped: LoopConfig<any, any> = {
 			...nameOrConfig,
 			run: async (ctx, state) =>
 				nameOrConfig.run(this.#createChildContext(ctx), state),
@@ -530,3 +566,27 @@ export class ActorWorkflowContext<
 		return new ActorWorkflowContext(ctx, this.#runCtx);
 	}
 }
+
+export type WorkflowContextOf<AD extends AnyActorDefinition> =
+	AD extends ActorDefinition<
+		infer S,
+		infer CP,
+		infer CS,
+		infer V,
+		infer I,
+		infer DB extends AnyDatabaseProvider,
+		infer E extends EventSchemaConfig,
+		infer Q extends QueueSchemaConfig,
+		any
+	>
+		? ActorWorkflowContext<S, CP, CS, V, I, DB, E, Q>
+		: never;
+
+export type WorkflowLoopContextOf<AD extends AnyActorDefinition> =
+	WorkflowContextOf<AD>;
+
+export type WorkflowBranchContextOf<AD extends AnyActorDefinition> =
+	WorkflowContextOf<AD>;
+
+export type WorkflowStepContextOf<AD extends AnyActorDefinition> =
+	WorkflowContextOf<AD>;

package/src/workflow/mod.ts

@@ -12,7 +12,13 @@ import { ActorWorkflowDriver } from "./driver";
 import { createWorkflowInspectorAdapter } from "./inspector";
 
 export { Loop } from "@rivetkit/workflow-engine";
-export { ActorWorkflowContext } from "./context";
+export {
+	ActorWorkflowContext,
+	type WorkflowBranchContextOf,
+	type WorkflowContextOf,
+	type WorkflowLoopContextOf,
+	type WorkflowStepContextOf,
+} from "./context";
 
 export function workflow<
 	TState,