rivetkit 2.1.2-rc.1 → 2.1.2

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 _chunkMV5MNNF2cjs = require('../chunk-MV5MNNF2.cjs');
+var _chunkQABDKI3Wcjs = require('../chunk-QABDKI3W.cjs');
 
 
-var _chunkQQVYIMJKcjs = require('../chunk-QQVYIMJK.cjs');
-require('../chunk-H74QXLH7.cjs');
+var _chunkPZAV6PP2cjs = require('../chunk-PZAV6PP2.cjs');
+require('../chunk-ZHQDRRMY.cjs');
 
 
-var _chunkWGMREZC4cjs = require('../chunk-WGMREZC4.cjs');
+var _chunkMNS5LY6Mcjs = require('../chunk-MNS5LY6M.cjs');
 require('../chunk-NIYZDWMW.cjs');
-require('../chunk-XEHCOHAO.cjs');
+require('../chunk-HFWRHT5T.cjs');
 
 
-var _chunkVQ3ZBZFFcjs = require('../chunk-VQ3ZBZFF.cjs');
+var _chunkRMJJE43Bcjs = require('../chunk-RMJJE43B.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 _chunkVQ3ZBZFFcjs.getLogger.call(void 0, "test");
+  return _chunkRMJJE43Bcjs.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 = _chunkMV5MNNF2cjs.createFileSystemOrMemoryDriver.call(void 0, 
+  const driver = _chunkQABDKI3Wcjs.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 } = _chunkWGMREZC4cjs.buildManagerRouter.call(void 0, 
+  const { router } = _chunkMNS5LY6Mcjs.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 = _chunkQQVYIMJKcjs.createClient.call(void 0, {
+  const client = _chunkPZAV6PP2cjs.createClient.call(void 0, {
     endpoint,
     namespace: "default",
     runnerName: "default",

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

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { a5 as Registry, C as Client } from '../config-CAZphOS1.cjs';
+import { a5 as Registry, C as Client } from '../config-_gfywqqI.cjs';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '../config-BiNoIHRs.cjs';

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

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { a5 as Registry, C as Client } from '../config-BFqid9Gr.js';
+import { a5 as Registry, C as Client } from '../config-P3XujgRr.js';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';
 import '../config-BiNoIHRs.js';

package/dist/tsup/test/mod.js

@@ -1,18 +1,18 @@
 import {
   createFileSystemOrMemoryDriver
-} from "../chunk-4Q4OQCFP.js";
+} from "../chunk-RHUII57M.js";
 import {
   createClient
-} from "../chunk-JZFXDQ4A.js";
-import "../chunk-MA36UPL5.js";
+} from "../chunk-HB4RGGMC.js";
+import "../chunk-PW3YONDJ.js";
 import {
   buildManagerRouter
-} from "../chunk-TR6PPOIA.js";
+} from "../chunk-VMX4I4MP.js";
 import "../chunk-LXUQ667X.js";
-import "../chunk-KBMYS2AH.js";
+import "../chunk-PSUVV4HM.js";
 import {
   getLogger
-} from "../chunk-3WTCEG7J.js";
+} from "../chunk-WUXR722E.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 

package/dist/tsup/utils.cjs

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

package/dist/tsup/utils.js

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

package/dist/tsup/workflow/mod.cjs

@@ -2,15 +2,15 @@
 
 
 
-var _chunkRQW3ZCXGcjs = require('../chunk-RQW3ZCXG.cjs');
-require('../chunk-NSQACCER.cjs');
-require('../chunk-XEHCOHAO.cjs');
-require('../chunk-VQ3ZBZFF.cjs');
+var _chunkNXEHFUDBcjs = require('../chunk-NXEHFUDB.cjs');
+require('../chunk-GVQAVU7R.cjs');
+require('../chunk-HFWRHT5T.cjs');
+require('../chunk-RMJJE43B.cjs');
 require('../chunk-L47L3ZWJ.cjs');
 require('../chunk-HDQ2JUQT.cjs');
 
 
 
 
-exports.ActorWorkflowContext = _chunkRQW3ZCXGcjs.ActorWorkflowContext; exports.Loop = _chunkRQW3ZCXGcjs.Loop; exports.workflow = _chunkRQW3ZCXGcjs.workflow;
+exports.ActorWorkflowContext = _chunkNXEHFUDBcjs.ActorWorkflowContext; exports.Loop = _chunkNXEHFUDBcjs.Loop; exports.workflow = _chunkNXEHFUDBcjs.workflow;
 //# sourceMappingURL=mod.cjs.map

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

@@ -1,7 +1,7 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-CAZphOS1.cjs';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-_gfywqqI.cjs';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.cjs';
-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';
+import { A as ActorWorkflowContext } from '../context-Bxd8Cx4H.cjs';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-Bxd8Cx4H.cjs';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';

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

@@ -1,7 +1,7 @@
-import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-BFqid9Gr.js';
+import { c as EventSchemaConfig, Q as QueueSchemaConfig, ad as RunContext } from '../config-P3XujgRr.js';
 import { A as AnyDatabaseProvider } from '../config-BiNoIHRs.js';
-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';
+import { A as ActorWorkflowContext } from '../context-uNA4TRn3.js';
+export { W as WorkflowBranchContextOf, a as WorkflowContextOf, b as WorkflowLoopContextOf, c as WorkflowStepContextOf } from '../context-uNA4TRn3.js';
 export { Loop } from '@rivetkit/workflow-engine';
 import 'zod/v4';
 import '@rivetkit/virtual-websocket';

package/dist/tsup/workflow/mod.js

@@ -2,10 +2,10 @@ import {
   ActorWorkflowContext,
   Loop,
   workflow
-} from "../chunk-4HQKSHVJ.js";
-import "../chunk-J5YSDWR3.js";
-import "../chunk-KBMYS2AH.js";
-import "../chunk-3WTCEG7J.js";
+} from "../chunk-YQ5P6KMN.js";
+import "../chunk-TDFDR7AO.js";
+import "../chunk-PSUVV4HM.js";
+import "../chunk-WUXR722E.js";
 import "../chunk-7HTNH26M.js";
 import "../chunk-424PT5DM.js";
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rivetkit",
-  "version": "2.1.2-rc.1",
+  "version": "2.1.2",
   "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.2-rc.1",
-    "@rivetkit/traces": "2.1.2-rc.1",
+    "@rivetkit/engine-runner": "2.1.2",
+    "@rivetkit/traces": "2.1.2",
     "@rivetkit/virtual-websocket": "2.0.33",
-    "@rivetkit/workflow-engine": "2.1.2-rc.1",
-    "@rivetkit/sqlite-vfs": "2.1.2-rc.1"
+    "@rivetkit/sqlite-vfs": "2.1.2",
+    "@rivetkit/workflow-engine": "2.1.2"
   },
   "devDependencies": {
     "@bare-ts/tools": "^0.13.0",

package/src/actor/instance/queue.ts

@@ -66,6 +66,21 @@ export type QueueResultMessageForName<
 export interface QueueNextOptions<
 	TName extends string = string,
 	TCompletable extends boolean = boolean,
+> {
+	/** Queue names to receive from. If omitted, reads from all queue names. */
+	names?: readonly TName[];
+	/** Timeout in milliseconds. Omit to wait indefinitely. */
+	timeout?: number;
+	/** Optional abort signal for this receive call. */
+	signal?: AbortSignal;
+	/** Whether to return completable messages. */
+	completable?: TCompletable;
+}
+
+/** Options for receiving queue message batches. */
+export interface QueueNextBatchOptions<
+	TName extends string = string,
+	TCompletable extends boolean = boolean,
 > {
 	/** Queue names to receive from. If omitted, reads from all queue names. */
 	names?: readonly TName[];
@@ -83,6 +98,17 @@ export interface QueueNextOptions<
 export interface QueueTryNextOptions<
 	TName extends string = string,
 	TCompletable extends boolean = boolean,
+> {
+	/** Queue names to receive from. If omitted, reads from all queue names. */
+	names?: readonly TName[];
+	/** Whether to return completable messages. */
+	completable?: TCompletable;
+}
+
+/** Options for non-blocking queue batch reads. */
+export interface QueueTryNextBatchOptions<
+	TName extends string = string,
+	TCompletable extends boolean = boolean,
 > {
 	/** Queue names to receive from. If omitted, reads from all queue names. */
 	names?: readonly TName[];
@@ -133,11 +159,28 @@ export class ActorQueue<
 		const TCompletable extends boolean = false,
 	>(
 		opts?: QueueNextOptions<TName, TCompletable>,
-	): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>> {
+	): Promise<QueueResultMessageForName<TQueues, TName, TCompletable> | undefined> {
 		const resolvedOpts = (opts ?? {}) as QueueNextOptions<
 			TName,
 			TCompletable
 		>;
+		const messages = await this.nextBatch<TName, TCompletable>({
+			...(resolvedOpts as QueueNextBatchOptions<TName, TCompletable>),
+			count: 1,
+		});
+		return messages[0];
+	}
+
+	async nextBatch<
+		const TName extends QueueFilterName<TQueues>,
+		const TCompletable extends boolean = false,
+	>(
+		opts?: QueueNextBatchOptions<TName, TCompletable>,
+	): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>> {
+		const resolvedOpts = (opts ?? {}) as QueueNextBatchOptions<
+			TName,
+			TCompletable
+		>;
 		const completable = resolvedOpts.completable === true;
 
 		if (this.#pendingCompletableMessageIds.size > 0) {
@@ -174,20 +217,37 @@ export class ActorQueue<
 		const TCompletable extends boolean = false,
 	>(
 		opts?: QueueTryNextOptions<TName, TCompletable>,
-	): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>> {
+	): Promise<QueueResultMessageForName<TQueues, TName, TCompletable> | undefined> {
 		const resolvedOpts = (opts ?? {}) as QueueTryNextOptions<
 			TName,
 			TCompletable
 		>;
+		const messages = await this.tryNextBatch<TName, TCompletable>({
+			...(resolvedOpts as QueueTryNextBatchOptions<TName, TCompletable>),
+			count: 1,
+		});
+		return messages[0];
+	}
+
+	async tryNextBatch<
+		const TName extends QueueFilterName<TQueues>,
+		const TCompletable extends boolean = false,
+	>(
+		opts?: QueueTryNextBatchOptions<TName, TCompletable>,
+	): Promise<Array<QueueResultMessageForName<TQueues, TName, TCompletable>>> {
+		const resolvedOpts = (opts ?? {}) as QueueTryNextBatchOptions<
+			TName,
+			TCompletable
+		>;
 		if (resolvedOpts.completable === true) {
-			return (await this.next<TName, true>({
+			return (await this.nextBatch<TName, true>({
 				names: resolvedOpts.names,
 				count: resolvedOpts.count,
 				timeout: 0,
 				completable: true,
 			})) as Array<QueueResultMessageForName<TQueues, TName, TCompletable>>;
 		}
-		return (await this.next<TName, false>({
+		return (await this.nextBatch<TName, false>({
 			names: resolvedOpts.names,
 			count: resolvedOpts.count,
 			timeout: 0,
@@ -208,22 +268,20 @@ export class ActorQueue<
 		>;
 		while (!this.#abortSignal.aborted) {
 			try {
-				const messages = resolvedOpts.completable === true
+				const message = resolvedOpts.completable === true
 					? await this.next<TName, true>({
 							names: resolvedOpts.names,
-							count: 1,
 							signal: resolvedOpts.signal,
 							completable: true,
 						})
 					: await this.next<TName, false>({
 							names: resolvedOpts.names,
-							count: 1,
 							signal: resolvedOpts.signal,
 						});
-				if (messages.length === 0) {
+				if (!message) {
 					continue;
 				}
-				yield messages[0] as QueueResultMessageForName<
+				yield message as QueueResultMessageForName<
 					TQueues,
 					TName,
 					TCompletable

package/src/driver-helpers/mod.ts

@@ -30,4 +30,4 @@ export type {
 	ManagerDriver,
 } from "@/manager/driver";
 export { buildManagerRouter } from "@/manager/router";
-export { getInitialActorKvState } from "./utils";
+export { getInitialActorKvState, importSqliteVfs } from "./utils";

package/src/driver-helpers/utils.ts

@@ -7,6 +7,7 @@ import {
 } from "@/schemas/actor-persist/versioned";
 import { bufferToArrayBuffer } from "@/utils";
 import type { ActorDriver } from "./mod";
+import type { SqliteVfs } from "@rivetkit/sqlite-vfs";
 
 function serializeEmptyPersistData(input: unknown | undefined): Uint8Array {
 	const persistData: persistSchema.Actor = {
@@ -34,3 +35,20 @@ export function getInitialActorKvState(
 	const persistData = serializeEmptyPersistData(input);
 	return [[KEYS.PERSIST_DATA, persistData]];
 }
+
+/**
+ * Dynamically import @rivetkit/sqlite-vfs and return a fresh SqliteVfs instance.
+ *
+ * The module specifier is built with Array.join() so that bundlers (esbuild, tsup,
+ * Turbopack) cannot statically analyze or constant-fold the import path. This
+ * prevents them from tracing into the WASM dependency tree, which would cause
+ * errors in environments that don't support .wasm imports (e.g. Turbopack).
+ *
+ * Each call returns a new instance so that actors get independent SQLite modules,
+ * avoiding cross-actor re-entry on the non-reentrant async build.
+ */
+export async function importSqliteVfs(): Promise<SqliteVfs> {
+	const specifier = ["@rivetkit", "sqlite-vfs"].join("/");
+	const { SqliteVfs } = await import(specifier);
+	return new SqliteVfs();
+}

package/src/driver-test-suite/tests/actor-queue.ts

@@ -28,7 +28,7 @@ export function runActorQueueTests(driverTestConfig: DriverTestConfig) {
 			expect(message).toEqual({ name: "self", body: { value: 42 } });
 		});
 
-		test("next supports name arrays and counts", async (c) => {
+		test("nextBatch supports name arrays and counts", async (c) => {
 			const { client } = await setupDriverTest(c, driverTestConfig);
 			const handle = client.queueActor.getOrCreate(["receive-array"]);
 
@@ -43,7 +43,7 @@ export function runActorQueueTests(driverTestConfig: DriverTestConfig) {
 			]);
 		});
 
-		test("next supports request objects", async (c) => {
+		test("nextBatch supports request objects", async (c) => {
 			const { client } = await setupDriverTest(c, driverTestConfig);
 			const handle = client.queueActor.getOrCreate(["receive-request"]);
 
@@ -60,7 +60,7 @@ export function runActorQueueTests(driverTestConfig: DriverTestConfig) {
 			]);
 		});
 
-		test("next defaults to all names when names is omitted", async (c) => {
+		test("nextBatch defaults to all names when names is omitted", async (c) => {
 			const { client } = await setupDriverTest(c, driverTestConfig);
 			const handle = client.queueActor.getOrCreate([
 				"receive-request-all",
@@ -86,7 +86,7 @@ export function runActorQueueTests(driverTestConfig: DriverTestConfig) {
 			expect(messages).toEqual([]);
 		});
 
-		test("tryNext does not wait and returns empty array", async (c) => {
+		test("tryNextBatch does not wait and returns empty array", async (c) => {
 			const { client } = await setupDriverTest(c, driverTestConfig);
 			const handle = client.queueActor.getOrCreate(["try-next-empty"]);
 

package/src/drivers/file-system/actor.ts

@@ -1,10 +1,11 @@
 import type { AnyClient } from "@/client/client";
 import type { RawDatabaseClient } from "@/db/config";
 import type { SqliteVfs } from "@rivetkit/sqlite-vfs";
-import type {
-	ActorDriver,
-	AnyActorInstance,
-	ManagerDriver,
+import {
+	importSqliteVfs,
+	type ActorDriver,
+	type AnyActorInstance,
+	type ManagerDriver,
 } from "@/driver-helpers/mod";
 import type { FileSystemGlobalState } from "./global-state";
 import { RegistryConfig } from "@/registry/config";
@@ -83,18 +84,7 @@ export class FileSystemActorDriver implements ActorDriver {
 
 	/** Creates a SQLite VFS instance for creating KV-backed databases */
 	async createSqliteVfs(): Promise<SqliteVfs> {
-		// Dynamic import keeps @rivetkit/sqlite out of the main entrypoint bundle,
-		// preserving tree-shakeability for environments that don't use SQLite.
-		// The async @rivetkit/sqlite build is not re-entrant per module instance.
-		// Returning a fresh SqliteVfs here gives each actor its own module,
-		// allowing actor-level parallelism without cross-actor re-entry.
-		//
-		// The specifier is built via concatenation so that bundlers like
-		// wrangler's esbuild cannot statically analyze and attempt to
-		// bundle the module (it is never used on Cloudflare Workers).
-		const specifier = "@rivetkit/" + "sqlite-vfs";
-		const { SqliteVfs } = await import(specifier);
-		return new SqliteVfs();
+		return await importSqliteVfs();
 	}
 
 	startSleep(actorId: string): void {

package/src/workflow/context.ts

@@ -5,6 +5,7 @@ import type { ActorDefinition, AnyActorDefinition } from "@/actor/definition";
 import type { AnyDatabaseProvider, InferDatabaseClient } from "@/actor/database";
 import type {
 	QueueFilterName,
+	QueueNextBatchOptions,
 	QueueNextOptions,
 	QueueResultMessageForName,
 } from "@/actor/instance/queue";
@@ -29,21 +30,21 @@ import { WORKFLOW_GUARD_KV_KEY } from "./constants";
 type WorkflowActorQueueNextOptions<
 	TName extends string,
 	TCompletable extends boolean,
-> = Omit<QueueNextOptions<TName, TCompletable>, "signal" | "count">;
+> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
 
 type WorkflowActorQueueNextOptionsFallback<TCompletable extends boolean> = Omit<
 	QueueNextOptions<string, TCompletable>,
-	"signal" | "count"
+	"signal"
 >;
 
 type WorkflowActorQueueNextBatchOptions<
 	TName extends string,
 	TCompletable extends boolean,
-> = Omit<QueueNextOptions<TName, TCompletable>, "signal">;
+> = Omit<QueueNextBatchOptions<TName, TCompletable>, "signal">;
 
 type WorkflowActorQueueNextBatchOptionsFallback<
 	TCompletable extends boolean,
-> = Omit<QueueNextOptions<string, TCompletable>, "signal">;
+> = Omit<QueueNextBatchOptions<string, TCompletable>, "signal">;
 
 type ActorWorkflowLoopConfig<
 	S,