rivetkit 2.3.9 → 2.3.10

package/dist/tsup/test/mod.cjs

@@ -1,13 +1,13 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkAVUMOGUEcjs = require('../chunk-AVUMOGUE.cjs');
+var _chunkINXPYXN6cjs = require('../chunk-INXPYXN6.cjs');
 
 
-var _chunk3IDKUXQTcjs = require('../chunk-3IDKUXQT.cjs');
+var _chunkLCWHS6K7cjs = require('../chunk-LCWHS6K7.cjs');
 require('../chunk-MYWZCDML.cjs');
 require('../chunk-UEULFXUI.cjs');
-require('../chunk-S57DMBTM.cjs');
-require('../chunk-M4R2O5NJ.cjs');
+require('../chunk-PCJSDS7N.cjs');
+require('../chunk-Z2ESFE5Z.cjs');
 require('../chunk-4FC7TVS6.cjs');
 
 // src/test/ready.ts
@@ -36,8 +36,8 @@ async function setupTest(c, registry) {
   registry.config.noWelcome = true;
   registry.start();
   await waitForRegistryReady(registry);
-  const client = _chunkAVUMOGUEcjs.createClient.call(void 0, {
-    ..._chunk3IDKUXQTcjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
+  const client = _chunkINXPYXN6cjs.createClient.call(void 0, {
+    ..._chunkLCWHS6K7cjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
     disableMetadataLookup: false
   });
   c.onTestFinished(async () => {

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

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { aC as Registry, a2 as Client } from '../config-CpB-e4I9.cjs';
+import { aC as Registry, a2 as Client } from '../config-BobvQpex.cjs';
 import 'zod/v4';
 import '../config-BxOimoGX.cjs';
 import '@rivetkit/rivetkit-wasm';

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

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { aC as Registry, a2 as Client } from '../config-CUymbyM6.js';
+import { aC as Registry, a2 as Client } from '../config-BRpVbJCD.js';
 import 'zod/v4';
 import '../config-BxOimoGX.js';
 import '@rivetkit/rivetkit-wasm';

package/dist/tsup/test/mod.js

@@ -1,13 +1,13 @@
 import {
   createClient
-} from "../chunk-KVKWTOW7.js";
+} from "../chunk-6UHZLL6S.js";
 import {
   convertRegistryConfigToClientConfig
-} from "../chunk-MQDQ3A72.js";
+} from "../chunk-DPM73GAL.js";
 import "../chunk-JI6GZ2C2.js";
 import "../chunk-7AFZMFPQ.js";
-import "../chunk-X25YYVFL.js";
-import "../chunk-UBYPRYJR.js";
+import "../chunk-Q5H37KNQ.js";
+import "../chunk-X7XY6NCU.js";
 import "../chunk-ZZ3WBRPD.js";
 
 // src/test/ready.ts

package/dist/tsup/utils.cjs

@@ -19,7 +19,7 @@
 
 
 
-var _chunkM4R2O5NJcjs = require('./chunk-M4R2O5NJ.cjs');
+var _chunkZ2ESFE5Zcjs = require('./chunk-Z2ESFE5Z.cjs');
 require('./chunk-4FC7TVS6.cjs');
 
 
@@ -42,5 +42,5 @@ require('./chunk-4FC7TVS6.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunkM4R2O5NJcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkM4R2O5NJcjs.SinglePromiseQueue; exports.VERSION = _chunkM4R2O5NJcjs.VERSION; exports.arrayBuffersEqual = _chunkM4R2O5NJcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkM4R2O5NJcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkM4R2O5NJcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkM4R2O5NJcjs.combineUrlPath; exports.dbg = _chunkM4R2O5NJcjs.dbg; exports.detectRuntime = _chunkM4R2O5NJcjs.detectRuntime; exports.getEnvUniversal = _chunkM4R2O5NJcjs.getEnvUniversal; exports.httpUserAgent = _chunkM4R2O5NJcjs.httpUserAgent; exports.interval = _chunkM4R2O5NJcjs.interval; exports.joinSignals = _chunkM4R2O5NJcjs.joinSignals; exports.jsonParseCompat = _chunkM4R2O5NJcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkM4R2O5NJcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkM4R2O5NJcjs.promiseWithResolvers; exports.setLongTimeout = _chunkM4R2O5NJcjs.setLongTimeout; exports.sleep = _chunkM4R2O5NJcjs.sleep; exports.stringifyError = _chunkM4R2O5NJcjs.stringifyError; exports.toUint8Array = _chunkM4R2O5NJcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunkZ2ESFE5Zcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkZ2ESFE5Zcjs.SinglePromiseQueue; exports.VERSION = _chunkZ2ESFE5Zcjs.VERSION; exports.arrayBuffersEqual = _chunkZ2ESFE5Zcjs.arrayBuffersEqual; exports.assertUnreachable = _chunkZ2ESFE5Zcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkZ2ESFE5Zcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkZ2ESFE5Zcjs.combineUrlPath; exports.dbg = _chunkZ2ESFE5Zcjs.dbg; exports.detectRuntime = _chunkZ2ESFE5Zcjs.detectRuntime; exports.getEnvUniversal = _chunkZ2ESFE5Zcjs.getEnvUniversal; exports.httpUserAgent = _chunkZ2ESFE5Zcjs.httpUserAgent; exports.interval = _chunkZ2ESFE5Zcjs.interval; exports.joinSignals = _chunkZ2ESFE5Zcjs.joinSignals; exports.jsonParseCompat = _chunkZ2ESFE5Zcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkZ2ESFE5Zcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkZ2ESFE5Zcjs.promiseWithResolvers; exports.setLongTimeout = _chunkZ2ESFE5Zcjs.setLongTimeout; exports.sleep = _chunkZ2ESFE5Zcjs.sleep; exports.stringifyError = _chunkZ2ESFE5Zcjs.stringifyError; exports.toUint8Array = _chunkZ2ESFE5Zcjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -19,7 +19,7 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-UBYPRYJR.js";
+} from "./chunk-X7XY6NCU.js";
 import "./chunk-ZZ3WBRPD.js";
 export {
   EXTRA_ERROR_LOG,

package/dist/tsup/workflow/mod.cjs

@@ -1,7 +1,7 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } async function _asyncNullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return await rhsFn(); } } var _class; var _class2;
 
-var _chunkKPP2YRS5cjs = require('../chunk-KPP2YRS5.cjs');
-require('../chunk-GZ5DYSIR.cjs');
+var _chunkU2A3Y7OKcjs = require('../chunk-U2A3Y7OK.cjs');
+require('../chunk-G6XA2OSW.cjs');
 
 
 
@@ -12,7 +12,7 @@ var _chunkHNHLBM3Ycjs = require('../chunk-HNHLBM3Y.cjs');
 var _chunkMYWZCDMLcjs = require('../chunk-MYWZCDML.cjs');
 
 
-var _chunkM4R2O5NJcjs = require('../chunk-M4R2O5NJ.cjs');
+var _chunkZ2ESFE5Zcjs = require('../chunk-Z2ESFE5Z.cjs');
 
 
 
@@ -716,7 +716,7 @@ function workflow(fn, options = {}) {
   function getWorkflowInspector(actorId) {
     let workflowInspector = workflowInspectors.get(actorId);
     if (!workflowInspector) {
-      workflowInspector = _chunkKPP2YRS5cjs.createWorkflowInspectorAdapter.call(void 0, );
+      workflowInspector = _chunkU2A3Y7OKcjs.createWorkflowInspectorAdapter.call(void 0, );
       workflowInspectors.set(actorId, workflowInspector);
     }
     return workflowInspector;
@@ -784,13 +784,13 @@ function workflow(fn, options = {}) {
       if (shouldRethrowWorkflowError(error)) {
         runCtx.log.error({
           msg: "workflow run failed",
-          error: _chunkM4R2O5NJcjs.stringifyError.call(void 0, error)
+          error: _chunkZ2ESFE5Zcjs.stringifyError.call(void 0, error)
         });
         throw error;
       }
       runCtx.log.warn({
         msg: "workflow failed and will sleep until woken",
-        error: _chunkM4R2O5NJcjs.stringifyError.call(void 0, error)
+        error: _chunkZ2ESFE5Zcjs.stringifyError.call(void 0, error)
       });
     } finally {
       runCtx.abortSignal.removeEventListener("abort", onAbort);

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

@@ -1,9 +1,9 @@
 import { WorkflowErrorEvent } from '@rivetkit/workflow-engine';
 export { Loop, TryBlockCatchKind, TryBlockConfig, TryBlockFailure, TryBlockResult, TryStepCatchKind, TryStepConfig, TryStepFailure, TryStepResult, WorkflowError, WorkflowErrorEvent } from '@rivetkit/workflow-engine';
-import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-CpB-e4I9.cjs';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BobvQpex.cjs';
 import { A as AnyDatabaseProvider } from '../config-BxOimoGX.cjs';
-import { d as WorkflowContext } from '../context-c-6G4mjk.cjs';
-export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-c-6G4mjk.cjs';
+import { d as WorkflowContext } from '../context-YEBNJrws.cjs';
+export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-YEBNJrws.cjs';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

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

@@ -1,9 +1,9 @@
 import { WorkflowErrorEvent } from '@rivetkit/workflow-engine';
 export { Loop, TryBlockCatchKind, TryBlockConfig, TryBlockFailure, TryBlockResult, TryStepCatchKind, TryStepConfig, TryStepFailure, TryStepResult, WorkflowError, WorkflowErrorEvent } from '@rivetkit/workflow-engine';
-import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-CUymbyM6.js';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BRpVbJCD.js';
 import { A as AnyDatabaseProvider } from '../config-BxOimoGX.js';
-import { d as WorkflowContext } from '../context-YBUBTwTS.js';
-export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-YBUBTwTS.js';
+import { d as WorkflowContext } from '../context-Cj-DFyiy.js';
+export { e as WorkflowBranchConfig, W as WorkflowBranchContextOf, a as WorkflowContextOf, f as WorkflowLoopConfig, b as WorkflowLoopContextOf, g as WorkflowStepConfig, h as WorkflowStepContext, c as WorkflowStepContextOf, i as WorkflowTryConfig, j as WorkflowTryStepConfig } from '../context-Cj-DFyiy.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/workflow/mod.js

@@ -1,7 +1,7 @@
 import {
   createWorkflowInspectorAdapter
-} from "../chunk-BQU4XTKM.js";
-import "../chunk-CQ23UFQ4.js";
+} from "../chunk-E6IEX6AP.js";
+import "../chunk-XSPAARQ5.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   RUN_FUNCTION_CONFIG_SYMBOL
@@ -12,7 +12,7 @@ import {
 } from "../chunk-JI6GZ2C2.js";
 import {
   stringifyError
-} from "../chunk-UBYPRYJR.js";
+} from "../chunk-X7XY6NCU.js";
 import {
   RivetError,
   isActorAbortedError

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "rivetkit",
-	"version": "2.3.9",
+	"version": "2.3.10",
 	"description": "Lightweight libraries for building stateful actors on edge platforms",
 	"license": "Apache-2.0",
 	"keywords": [
@@ -201,14 +201,14 @@
 		"@hono/zod-openapi": "^1.1.5",
 		"@rivet-dev/agent-os-core": "^0.1.1",
 		"@rivetkit/bare-ts": "^0.6.2",
-		"@rivetkit/engine-cli": "2.3.9",
-		"@rivetkit/engine-envoy-protocol": "2.3.9",
+		"@rivetkit/engine-cli": "2.3.10",
+		"@rivetkit/engine-envoy-protocol": "2.3.10",
 		"@rivetkit/on-change": "6.0.1",
-		"@rivetkit/rivetkit-napi": "2.3.9",
-		"@rivetkit/rivetkit-wasm": "2.3.9",
-		"@rivetkit/traces": "2.3.9",
-		"@rivetkit/virtual-websocket": "2.3.9",
-		"@rivetkit/workflow-engine": "2.3.9",
+		"@rivetkit/rivetkit-napi": "2.3.10",
+		"@rivetkit/rivetkit-wasm": "2.3.10",
+		"@rivetkit/traces": "2.3.10",
+		"@rivetkit/virtual-websocket": "2.3.10",
+		"@rivetkit/workflow-engine": "2.3.10",
 		"cbor-x": "^1.6.0",
 		"drizzle-orm": "^0.44.2",
 		"hono": "^4.7.0",

package/src/client/actor-handle.ts

@@ -4,7 +4,6 @@ import {
 	HEADER_CONN_PARAMS,
 	HEADER_ENCODING,
 } from "@/common/actor-router-consts";
-import { isRequestLike } from "@/common/fetch-like";
 import type * as protocol from "@/common/client-protocol";
 import {
 	CURRENT_VERSION as CLIENT_PROTOCOL_CURRENT_VERSION,
@@ -641,7 +640,6 @@ export class ActorHandleRaw {
 	) {
 		const maxAttempts = this.#getDynamicQueryMaxAttempts();
 		let useQueryTarget = false;
-		const retryableRequest = isRequestLike(input) ? input.clone() : undefined;
 		const { skipReadyWait, ...requestInit } = init ?? {};
 		const gatewayOptions = resolveActorGatewayOptions(
 			this.#gatewayOptions,
@@ -662,7 +660,7 @@ export class ActorHandleRaw {
 					this.#driver,
 					target,
 					this.#params,
-					retryableRequest ? retryableRequest.clone() : input,
+					input,
 					requestInit,
 					gatewayOptions,
 				);

package/src/client/raw-utils.ts

@@ -1,10 +1,8 @@
 import {
 	HEADER_CONN_PARAMS,
-	HEADER_ORIGINAL_REQUEST_URL,
 	PATH_WEBSOCKET_PREFIX,
 } from "@/common/actor-router-consts";
 import { deconstructError } from "@/common/utils";
-import { isRequestLike, isUrlLike } from "@/common/fetch-like";
 import type {
 	EngineControlClient,
 	GatewayRequestOptions,
@@ -26,19 +24,16 @@ export async function rawHttpFetch(
 ): Promise<Response> {
 	// Extract path and merge init options
 	let path: string;
-	let originalUrl: string | undefined;
 	let mergedInit: RequestInit = init || {};
 
 	if (typeof input === "string") {
 		path = input;
-	} else if (isUrlLike(input)) {
+	} else if (input instanceof URL) {
 		path = input.pathname + input.search;
-		originalUrl = input.toString();
-	} else if (isRequestLike(input)) {
+	} else if (input instanceof Request) {
 		// Extract path from Request URL
 		const url = new URL(input.url);
 		path = url.pathname + url.search;
-		originalUrl = url.toString();
 		// Merge Request properties with init
 		const requestHeaders = new Headers(input.headers);
 		const initHeaders = new Headers(init?.headers || {});
@@ -90,10 +85,6 @@ export async function rawHttpFetch(
 
 		// Forward conn params if provided
 		const proxyRequestHeaders = new Headers(mergedInit.headers);
-		proxyRequestHeaders.delete(HEADER_ORIGINAL_REQUEST_URL);
-		if (originalUrl) {
-			proxyRequestHeaders.set(HEADER_ORIGINAL_REQUEST_URL, originalUrl);
-		}
 		if (params) {
 			proxyRequestHeaders.set(HEADER_CONN_PARAMS, JSON.stringify(params));
 		}

package/src/common/actor-router-consts.ts

@@ -12,7 +12,6 @@ export const HEADER_ENCODING = "x-rivet-encoding";
 
 // IMPORTANT: Params must be in headers or in an E2EE part of the request (i.e. NOT the URL or query string) in order to ensure that tokens can be securely passed in params.
 export const HEADER_CONN_PARAMS = "x-rivet-conn-params";
-export const HEADER_ORIGINAL_REQUEST_URL = "x-rivet-internal-original-request-url";
 
 export const HEADER_ACTOR_ID = "x-rivet-actor";
 export const HEADER_ACTOR_GENERATION = "x-rivet-actor-generation";

package/src/common/encoding.ts

@@ -484,10 +484,7 @@ export function jsonStringifyCompat(
 				return [JSON_COMPAT_BIGINT, value.toString()];
 			}
 			if (value instanceof ArrayBuffer) {
-				return [
-					JSON_COMPAT_ARRAY_BUFFER,
-					base64EncodeArrayBuffer(value),
-				];
+				return [JSON_COMPAT_ARRAY_BUFFER, base64EncodeArrayBuffer(value)];
 			}
 			if (value instanceof Uint8Array) {
 				return [JSON_COMPAT_UINT8_ARRAY, base64EncodeUint8Array(value)];

package/src/engine-client/actor-http-client.ts

@@ -17,7 +17,8 @@ export async function sendHttpRequestToGateway(
 	actorRequest: Request,
 	options: HttpGatewayRequestOptions = {},
 ): Promise<Response> {
-	let bodyToSend: ReadableStream<Uint8Array> | null = null;
+	// Handle body properly based on method and presence
+	let bodyToSend: ArrayBuffer | null = null;
 	const guardHeaders = buildGuardHeaders(runConfig, actorRequest, options);
 
 	if (actorRequest.method !== "GET" && actorRequest.method !== "HEAD") {
@@ -25,20 +26,35 @@ export async function sendHttpRequestToGateway(
 			throw new Error("Request body has already been consumed");
 		}
 
-		if (actorRequest.body) {
-			bodyToSend = actorRequest.body;
+		// TODO: This buffers the entire request in memory every time. We
+		// need to properly implement streaming bodies.
+		const reqBody = await actorRequest.arrayBuffer();
+
+		if (reqBody.byteLength !== 0) {
+			bodyToSend = reqBody;
+
+			// If this is a streaming request, we need to convert the headers
+			// for the basic array buffer.
 			guardHeaders.delete("transfer-encoding");
 			guardHeaders.delete("content-length");
 		}
 	}
 
-	return fetch(gatewayUrl, {
+	const guardRequest = new Request(gatewayUrl, {
 		method: actorRequest.method,
 		headers: guardHeaders,
 		body: bodyToSend,
 		signal: actorRequest.signal,
-		...(bodyToSend ? { duplex: "half" } : {}),
-	} as RequestInit);
+	});
+
+	return mutableResponse(await fetch(guardRequest));
+}
+
+function mutableResponse(fetchRes: Response): Response {
+	// We cannot return the raw response from `fetch` since the response type is not mutable.
+	//
+	// In order for middleware to be able to mutate the response, we need to build a new Response object that is mutable.
+	return new Response(fetchRes.body, fetchRes);
 }
 
 function buildGuardHeaders(

package/src/registry/index.ts

@@ -1,5 +1,4 @@
 import { isLocalEngineEndpoint } from "@/common/engine";
-import { isResponseLike } from "@/common/fetch-like";
 import { configureBaseLogger } from "@/common/log";
 import { configureServerlessPool } from "@/serverless/configure";
 import { VERSION } from "@/utils";
@@ -15,16 +14,8 @@ import {
 	RegistryConfigSchema,
 } from "./config";
 import { logger } from "./log";
-import {
-	buildConfiguredRegistry,
-} from "./native";
-import { convertNativeHttpResponse } from "./native-http";
-import type {
-	CoreRuntime,
-	RuntimeApplicationFetch,
-	RuntimeHttpResponseBodyStream,
-	RuntimeServerlessResponseHead,
-} from "./runtime";
+import { buildConfiguredRegistry } from "./native";
+import type { RuntimeServerlessResponseHead } from "./runtime";
 
 type ShutdownSignal = "SIGINT" | "SIGTERM";
 
@@ -46,66 +37,6 @@ function finishShutdownSignal(signal: ShutdownSignal): void {
 	process.kill(process.pid, signal);
 }
 
-function createApplicationFetch(
-	application: RegistryApplication,
-	runtime: CoreRuntime,
-): RuntimeApplicationFetch {
-	return async (
-		request,
-		responseBodyStream?: RuntimeHttpResponseBodyStream,
-	) => {
-		const method = request.method.toUpperCase();
-		const body =
-			method === "GET" || method === "HEAD" || request.body.length === 0
-				? undefined
-				: Uint8Array.from(request.body).buffer;
-		const abortController = new AbortController();
-		if (request.cancelToken) {
-			if (runtime.cancellationTokenAborted(request.cancelToken)) {
-				abortController.abort();
-			} else {
-				runtime.onCancellationTokenCancelled(
-					request.cancelToken,
-					() => abortController.abort(),
-				);
-			}
-		}
-		const response = await application.fetch(
-			new Request(request.url, {
-				method,
-				headers: request.headers,
-				body,
-				signal: abortController.signal,
-			}),
-		);
-		if (!isResponseLike(response)) {
-			throw new TypeError(
-				"registry.listen() application fetch must return a Response",
-			);
-		}
-		const conversion = await convertNativeHttpResponse(
-			response,
-			responseBodyStream,
-		);
-		if (conversion.bodyCompletion) {
-			void conversion.bodyCompletion.catch((error) => {
-				logger().error({
-					msg: "application response stream failed",
-					error,
-				});
-			});
-		}
-		return {
-			status: conversion.response.status ?? response.status,
-			headers:
-				conversion.response.headers ??
-				Object.fromEntries(response.headers.entries()),
-			body: conversion.response.body,
-			stream: conversion.response.stream,
-		};
-	};
-}
-
 export type FetchHandler = (
 	request: Request,
 	...args: any
@@ -115,17 +46,6 @@ export interface ServerlessHandler {
 	fetch: FetchHandler;
 }
 
-export interface RegistryApplication {
-	fetch: FetchHandler;
-}
-
-export interface RegistryListenOptions {
-	port?: number;
-	host?: string;
-	publicDir?: string;
-	application?: RegistryApplication;
-}
-
 export interface RegistryRoutes {
 	health(): Promise<Response>;
 	metadata(): Promise<Response>;
@@ -159,7 +79,6 @@ export class Registry<A extends RegistryActors> {
 	#runtimeReadyPromise?: Promise<void>;
 	#runtimeServeConfiguredPromise?: ReturnType<typeof buildConfiguredRegistry>;
 	#runtimeServerlessPromise?: ReturnType<typeof buildConfiguredRegistry>;
-	#applicationListenerPromise?: Promise<void>;
 	#configureServerlessPoolPromise?: Promise<void>;
 	#welcomePrinted = false;
 	#shutdownInstalled = false;
@@ -429,72 +348,22 @@ export class Registry<A extends RegistryActors> {
 	 * @param opts.host      Address to bind. Defaults to `0.0.0.0`.
 	 * @param opts.publicDir If set, serves static files from this directory
 	 *                       as a fallback below the framework routes.
-	 * @param opts.application If set, handles requests that do not match a
-	 *                         framework route.
 	 *
 	 * @example
 	 * ```ts
 	 * await registry.listen();
-	 * await registry.listen({ application: app });
+	 * await registry.listen({ port: 8080, publicDir: "./public" });
 	 * ```
 	 */
-	public async listen(opts: RegistryListenOptions = {}): Promise<void> {
+	public async listen(
+		opts: { port?: number; host?: string; publicDir?: string } = {},
+	): Promise<void> {
 		const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3000;
 		const publicDir = opts.publicDir ?? getRivetkitPublicDir();
 		const config = this.parseConfig();
 
-		if (opts.application && getRivetkitRuntimeMode() !== "serverless") {
-			if (config.runtime === "wasm") {
-				throw new Error(
-					"registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly",
-				);
-			}
-			this.#installSignalHandlers(config);
-			this.#printWelcome(config, "serverful", {
-				port,
-				host: opts.host,
-				publicDir,
-			});
-			this.#startEnvoy(config, true);
-			const readyPromise = this.startAndWait();
-			const configuredRegistryPromise =
-				this.#runtimeServeConfiguredPromise;
-			if (!configuredRegistryPromise) {
-				throw new Error("registry envoy startup did not initialize");
-			}
-			const { runtime, registry, serveConfig } =
-				await configuredRegistryPromise;
-			const application = createApplicationFetch(
-				opts.application,
-				runtime,
-			);
-			await readyPromise;
-			const listenerPromise = runtime.serveApplicationListener(
-				registry,
-				{
-					port,
-					host: opts.host,
-					publicDir,
-					application,
-				},
-				serveConfig,
-			);
-			this.#applicationListenerPromise = listenerPromise;
-			const serveLifecyclePromise = this.#runtimeServeLifecyclePromise;
-			if (!serveLifecyclePromise) {
-				throw new Error(
-					"registry envoy serve lifecycle did not initialize",
-				);
-			}
-			await Promise.all([
-				listenerPromise,
-				serveLifecyclePromise,
-			]);
-			return;
-		}
-
 		// Cache on both promise fields so the shutdown drain sees Mode A and B.
-		const configuredRegistryPromise = this.#buildConfiguredRegistry(config);
+		const configuredRegistryPromise = buildConfiguredRegistry(config);
 		this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
 		this.#runtimeServerlessPromise = configuredRegistryPromise;
 		this.#installSignalHandlers(config);
@@ -510,17 +379,9 @@ export class Registry<A extends RegistryActors> {
 
 		const { runtime, registry, serveConfig } =
 			await configuredRegistryPromise;
-		const application = opts.application
-			? createApplicationFetch(opts.application, runtime)
-			: undefined;
 		await runtime.serveListener(
 			registry,
-			{
-				port,
-				host: opts.host,
-				publicDir,
-				application,
-			},
+			{ port, host: opts.host, publicDir },
 			serveConfig,
 		);
 	}
@@ -638,14 +499,15 @@ export class Registry<A extends RegistryActors> {
 					await runtime.serveRegistry(registry, serveConfig);
 				},
 			);
-			this.#runtimeServePromise =
-				this.#runtimeServeLifecyclePromise.catch((error) => {
+			this.#runtimeServePromise = this.#runtimeServeLifecyclePromise.catch(
+				(error) => {
 					// Always-attached catch so the stored promise never leaves a
 					// rejection unhandled. Downstream awaits (e.g. #runShutdown's
 					// Promise.race) attach their own catches and still observe
 					// resolution via the race.
 					logger().warn({ error }, "runtime registry serve errored");
-				});
+				},
+			);
 			// Install signal handlers once an envoy lifecycle has begun. Only
 			// Mode A ever reaches here. Mode B (handler(request)) intentionally
 			// does not install handlers because it runs on Workers/Vercel/Deno
@@ -791,9 +653,6 @@ export class Registry<A extends RegistryActors> {
 				// already logged any serve-side error.
 				await runtimeServePromise.catch(() => undefined);
 			}
-			if (this.#applicationListenerPromise !== undefined) {
-				await this.#applicationListenerPromise.catch(() => undefined);
-			}
 		};
 		await Promise.race([
 			drain(),
@@ -853,9 +712,7 @@ export class Registry<A extends RegistryActors> {
 	public startAndWait(): Promise<void> {
 		if (this.#shutdownInFlight !== null) {
 			return Promise.reject(
-				new Error(
-					"registry.startAndWait() cannot run after shutdown has begun",
-				),
+				new Error("registry.startAndWait() cannot run after shutdown has begun"),
 			);
 		}
 		if (this.#runtimeReadyPromise) return this.#runtimeReadyPromise;
@@ -898,9 +755,7 @@ export class Registry<A extends RegistryActors> {
 		const readinessPromise = (async () => {
 			const { runtime, registry } = await configuredRegistryPromise;
 			const stoppedBeforeReady = serveLifecyclePromise.then(() => {
-				throw new Error(
-					"RivetKit registry stopped before becoming ready",
-				);
+				throw new Error("RivetKit registry stopped before becoming ready");
 			});
 			await Promise.race([
 				runtime.waitRegistryReady(registry),