rivetkit 2.3.12-rc.3 → 2.3.12

package/dist/tsup/test/mod.cjs

@@ -1,14 +1,14 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _chunkUBB32UOGcjs = require('../chunk-UBB32UOG.cjs');
+var _chunkSSPTEGTXcjs = require('../chunk-SSPTEGTX.cjs');
 
 
-var _chunkPZBWSCQRcjs = require('../chunk-PZBWSCQR.cjs');
+var _chunkTZPNSOG2cjs = require('../chunk-TZPNSOG2.cjs');
 require('../chunk-MYWZCDML.cjs');
+require('../chunk-TXUHVBKH.cjs');
 require('../chunk-KVFIONKQ.cjs');
-require('../chunk-EQKSWDIH.cjs');
-require('../chunk-4ESGNS3Z.cjs');
-require('../chunk-SPJORZMM.cjs');
+require('../chunk-TAG6UEL5.cjs');
+require('../chunk-2JSYYH6P.cjs');
 
 // src/test/ready.ts
 var _pretry = require('p-retry'); var _pretry2 = _interopRequireDefault(_pretry);
@@ -36,8 +36,8 @@ async function setupTest(c, registry) {
   registry.config.noWelcome = true;
   registry.start();
   await waitForRegistryReady(registry);
-  const client = _chunkUBB32UOGcjs.createClient.call(void 0, {
-    ..._chunkPZBWSCQRcjs.convertRegistryConfigToClientConfig.call(void 0, registry.parseConfig()),
+  const client = _chunkSSPTEGTXcjs.createClient.call(void 0, {
+    ..._chunkTZPNSOG2cjs.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 { aF as Registry, a3 as Client } from '../config-BXSV17G7.cjs';
+import { aF as Registry, a3 as Client } from '../config-NHz6oMb9.cjs';
 import 'zod/v4';
 import '../config-ey2I2zz5.cjs';
 import '@rivetkit/rivetkit-wasm';

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

@@ -1,5 +1,5 @@
 import { TestContext } from 'vitest';
-import { aF as Registry, a3 as Client } from '../config-Bi1r6gI7.js';
+import { aF as Registry, a3 as Client } from '../config-BGTanB_3.js';
 import 'zod/v4';
 import '../config-ey2I2zz5.js';
 import '@rivetkit/rivetkit-wasm';

package/dist/tsup/test/mod.js

@@ -1,14 +1,14 @@
 import {
   createClient
-} from "../chunk-NHI5L7C7.js";
+} from "../chunk-RBXJWAJB.js";
 import {
   convertRegistryConfigToClientConfig
-} from "../chunk-YYIDQBBM.js";
+} from "../chunk-VOYNLY57.js";
 import "../chunk-JI6GZ2C2.js";
+import "../chunk-JYTXOMM7.js";
 import "../chunk-JTHHCZCZ.js";
-import "../chunk-XI4MEUUI.js";
-import "../chunk-OLGQYFUW.js";
-import "../chunk-IXBD7BXC.js";
+import "../chunk-MF42PRF2.js";
+import "../chunk-OUQUIBVW.js";
 
 // src/test/ready.ts
 import pRetry from "p-retry";

package/dist/tsup/utils.cjs

@@ -19,8 +19,8 @@
 
 
 
-var _chunk4ESGNS3Zcjs = require('./chunk-4ESGNS3Z.cjs');
-require('./chunk-SPJORZMM.cjs');
+var _chunkTAG6UEL5cjs = require('./chunk-TAG6UEL5.cjs');
+require('./chunk-2JSYYH6P.cjs');
 
 
 
@@ -42,5 +42,5 @@ require('./chunk-SPJORZMM.cjs');
 
 
 
-exports.EXTRA_ERROR_LOG = _chunk4ESGNS3Zcjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunk4ESGNS3Zcjs.SinglePromiseQueue; exports.VERSION = _chunk4ESGNS3Zcjs.VERSION; exports.arrayBuffersEqual = _chunk4ESGNS3Zcjs.arrayBuffersEqual; exports.assertUnreachable = _chunk4ESGNS3Zcjs.assertUnreachable; exports.bufferToArrayBuffer = _chunk4ESGNS3Zcjs.bufferToArrayBuffer; exports.combineUrlPath = _chunk4ESGNS3Zcjs.combineUrlPath; exports.dbg = _chunk4ESGNS3Zcjs.dbg; exports.detectRuntime = _chunk4ESGNS3Zcjs.detectRuntime; exports.getEnvUniversal = _chunk4ESGNS3Zcjs.getEnvUniversal; exports.httpUserAgent = _chunk4ESGNS3Zcjs.httpUserAgent; exports.interval = _chunk4ESGNS3Zcjs.interval; exports.joinSignals = _chunk4ESGNS3Zcjs.joinSignals; exports.jsonParseCompat = _chunk4ESGNS3Zcjs.jsonParseCompat; exports.jsonStringifyCompat = _chunk4ESGNS3Zcjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunk4ESGNS3Zcjs.promiseWithResolvers; exports.setLongTimeout = _chunk4ESGNS3Zcjs.setLongTimeout; exports.sleep = _chunk4ESGNS3Zcjs.sleep; exports.stringifyError = _chunk4ESGNS3Zcjs.stringifyError; exports.toUint8Array = _chunk4ESGNS3Zcjs.toUint8Array;
+exports.EXTRA_ERROR_LOG = _chunkTAG6UEL5cjs.EXTRA_ERROR_LOG; exports.SinglePromiseQueue = _chunkTAG6UEL5cjs.SinglePromiseQueue; exports.VERSION = _chunkTAG6UEL5cjs.VERSION; exports.arrayBuffersEqual = _chunkTAG6UEL5cjs.arrayBuffersEqual; exports.assertUnreachable = _chunkTAG6UEL5cjs.assertUnreachable; exports.bufferToArrayBuffer = _chunkTAG6UEL5cjs.bufferToArrayBuffer; exports.combineUrlPath = _chunkTAG6UEL5cjs.combineUrlPath; exports.dbg = _chunkTAG6UEL5cjs.dbg; exports.detectRuntime = _chunkTAG6UEL5cjs.detectRuntime; exports.getEnvUniversal = _chunkTAG6UEL5cjs.getEnvUniversal; exports.httpUserAgent = _chunkTAG6UEL5cjs.httpUserAgent; exports.interval = _chunkTAG6UEL5cjs.interval; exports.joinSignals = _chunkTAG6UEL5cjs.joinSignals; exports.jsonParseCompat = _chunkTAG6UEL5cjs.jsonParseCompat; exports.jsonStringifyCompat = _chunkTAG6UEL5cjs.jsonStringifyCompat; exports.promiseWithResolvers = _chunkTAG6UEL5cjs.promiseWithResolvers; exports.setLongTimeout = _chunkTAG6UEL5cjs.setLongTimeout; exports.sleep = _chunkTAG6UEL5cjs.sleep; exports.stringifyError = _chunkTAG6UEL5cjs.stringifyError; exports.toUint8Array = _chunkTAG6UEL5cjs.toUint8Array;
 //# sourceMappingURL=utils.cjs.map

package/dist/tsup/utils.js

@@ -19,8 +19,8 @@ import {
   sleep,
   stringifyError,
   toUint8Array
-} from "./chunk-OLGQYFUW.js";
-import "./chunk-IXBD7BXC.js";
+} from "./chunk-MF42PRF2.js";
+import "./chunk-OUQUIBVW.js";
 export {
   EXTRA_ERROR_LOG,
   SinglePromiseQueue,

package/dist/tsup/workflow/mod.cjs

@@ -1,8 +1,8 @@
 "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 _chunkOX6WVQE6cjs = require('../chunk-OX6WVQE6.cjs');
-require('../chunk-IJWTHKH6.cjs');
-require('../chunk-QLOBB27M.cjs');
+var _chunkMEF7RVQ7cjs = require('../chunk-MEF7RVQ7.cjs');
+require('../chunk-AN7WO7BM.cjs');
+require('../chunk-PW2VSGUR.cjs');
 
 
 
@@ -13,11 +13,11 @@ var _chunk4KGXFC6Mcjs = require('../chunk-4KGXFC6M.cjs');
 var _chunkMYWZCDMLcjs = require('../chunk-MYWZCDML.cjs');
 
 
-var _chunk4ESGNS3Zcjs = require('../chunk-4ESGNS3Z.cjs');
+var _chunkTAG6UEL5cjs = require('../chunk-TAG6UEL5.cjs');
 
 
 
-var _chunkSPJORZMMcjs = require('../chunk-SPJORZMM.cjs');
+var _chunk2JSYYH6Pcjs = require('../chunk-2JSYYH6P.cjs');
 
 // src/workflow/mod.ts
 
@@ -705,7 +705,7 @@ function shouldRethrowWorkflowError(error) {
   return true;
 }
 function workflowReplayInFlightError() {
-  return new (0, _chunkSPJORZMMcjs.RivetError)(
+  return new (0, _chunk2JSYYH6Pcjs.RivetError)(
     "actor",
     "workflow_in_flight",
     "Workflow replay is unavailable while the workflow is currently in flight.",
@@ -719,7 +719,7 @@ function isWorkflowReplayBlockedByRunningEntry(error) {
   return error instanceof Error && error.message === "Cannot replay a workflow while a step is currently running";
 }
 function isRunHandlerUnavailable(error) {
-  return error instanceof _chunkSPJORZMMcjs.RivetError && error.group === "actor" && error.code === "run_handler_unavailable";
+  return error instanceof _chunk2JSYYH6Pcjs.RivetError && error.group === "actor" && error.code === "run_handler_unavailable";
 }
 function workflow(fn, options = {}) {
   const onError = options.onError;
@@ -727,7 +727,7 @@ function workflow(fn, options = {}) {
   function getWorkflowInspector(actorId) {
     let workflowInspector = workflowInspectors.get(actorId);
     if (!workflowInspector) {
-      workflowInspector = _chunkOX6WVQE6cjs.createWorkflowInspectorAdapter.call(void 0, );
+      workflowInspector = _chunkMEF7RVQ7cjs.createWorkflowInspectorAdapter.call(void 0, );
       workflowInspectors.set(actorId, workflowInspector);
     }
     return workflowInspector;
@@ -794,19 +794,19 @@ function workflow(fn, options = {}) {
     try {
       await handle.result;
     } catch (error) {
-      if (runCtx.abortSignal.aborted || _chunkSPJORZMMcjs.isActorAbortedError.call(void 0, error)) {
+      if (runCtx.abortSignal.aborted || _chunk2JSYYH6Pcjs.isActorAbortedError.call(void 0, error)) {
         return;
       }
       if (shouldRethrowWorkflowError(error)) {
         runCtx.log.error({
           msg: "workflow run failed",
-          error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)
+          error: _chunkTAG6UEL5cjs.stringifyError.call(void 0, error)
         });
         throw error;
       }
       runCtx.log.warn({
         msg: "workflow failed and will sleep until woken",
-        error: _chunk4ESGNS3Zcjs.stringifyError.call(void 0, error)
+        error: _chunkTAG6UEL5cjs.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-BXSV17G7.cjs';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-NHz6oMb9.cjs';
 import { A as AnyDatabaseProvider } from '../config-ey2I2zz5.cjs';
-import { d as WorkflowContext } from '../context-4fJemY0D.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-4fJemY0D.cjs';
+import { d as WorkflowContext } from '../context-DB8zG_Ib.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-DB8zG_Ib.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-Bi1r6gI7.js';
+import { E as EventSchemaConfig, Q as QueueSchemaConfig, h as RunContext } from '../config-BGTanB_3.js';
 import { A as AnyDatabaseProvider } from '../config-ey2I2zz5.js';
-import { d as WorkflowContext } from '../context-D4sNYboo.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-D4sNYboo.js';
+import { d as WorkflowContext } from '../context-SHomdVV8.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-SHomdVV8.js';
 import 'zod/v4';
 import '@rivetkit/rivetkit-wasm';
 import 'zod';

package/dist/tsup/workflow/mod.js

@@ -1,8 +1,8 @@
 import {
   createWorkflowInspectorAdapter
-} from "../chunk-UN5JNDBT.js";
-import "../chunk-34Q4YVCX.js";
-import "../chunk-WVFTFWJL.js";
+} from "../chunk-XUODFCRJ.js";
+import "../chunk-ZIPXAVKR.js";
+import "../chunk-GEN4NHXM.js";
 import {
   ACTOR_CONTEXT_INTERNAL_SYMBOL,
   defineRunHandler
@@ -13,11 +13,11 @@ import {
 } from "../chunk-JI6GZ2C2.js";
 import {
   stringifyError
-} from "../chunk-OLGQYFUW.js";
+} from "../chunk-MF42PRF2.js";
 import {
   RivetError,
   isActorAbortedError
-} from "../chunk-IXBD7BXC.js";
+} from "../chunk-OUQUIBVW.js";
 
 // src/workflow/mod.ts
 import {

package/package.json

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

package/src/actor/errors.ts

@@ -45,7 +45,8 @@ export interface BridgeRivetErrorPayload extends RivetErrorLike {}
  * Shape as it arrives from the native bridge, where an absent ray ID serializes
  * to null. Normalized to a BridgeRivetErrorPayload before validation.
  */
-interface NativeBridgeErrorPayload extends Omit<BridgeRivetErrorPayload, "rayId"> {
+interface NativeBridgeErrorPayload
+	extends Omit<BridgeRivetErrorPayload, "rayId"> {
 	rayId?: string | null;
 }
 

package/src/client/actor-handle.ts

@@ -4,6 +4,7 @@ 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,
@@ -142,7 +143,9 @@ export class ActorHandleRaw {
 			// Dynamic (get/getOrCreate) handles resolve at the gateway per
 			// request so cross-datacenter queries forward to the reserved dc,
 			// rather than pre-resolving via the non-forwarding PUT /actors path.
-			let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
+			let useQueryTarget = isDynamicActorQuery(
+				this.#actorResolutionState,
+			);
 
 			for (let attempt = 0; attempt < maxAttempts; attempt++) {
 				let actorId: string | undefined;
@@ -651,9 +654,13 @@ export class ActorHandleRaw {
 		input: string | URL | Request,
 		init?: ActorFetchInit,
 	) {
-		const maxAttempts = this.#getDynamicQueryMaxAttempts();
-		let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
 		const { skipReadyWait, ...requestInit } = init ?? {};
+		const hasBody =
+			requestInit.body !== undefined
+				? requestInit.body !== null
+				: isRequestLike(input) && input.body !== null;
+		const maxAttempts = hasBody ? 1 : this.#getDynamicQueryMaxAttempts();
+		let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
 		const gatewayOptions = resolveActorGatewayOptions(
 			this.#gatewayOptions,
 			{

package/src/client/raw-utils.ts

@@ -1,5 +1,6 @@
 import {
 	HEADER_CONN_PARAMS,
+	HEADER_ORIGINAL_REQUEST_URL,
 	PATH_WEBSOCKET_PREFIX,
 } from "@/common/actor-router-consts";
 import { deconstructError } from "@/common/utils";
@@ -25,16 +26,19 @@ 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)) {
 		path = input.pathname + input.search;
+		originalUrl = input.toString();
 	} else if (isRequestLike(input)) {
 		// 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 || {});
@@ -86,6 +90,10 @@ 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,6 +12,8 @@ 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/engine-client/actor-http-client.ts

@@ -17,8 +17,7 @@ export async function sendHttpRequestToGateway(
 	actorRequest: Request,
 	options: HttpGatewayRequestOptions = {},
 ): Promise<Response> {
-	// Handle body properly based on method and presence
-	let bodyToSend: ArrayBuffer | null = null;
+	let bodyToSend: ReadableStream<Uint8Array> | null = null;
 	const guardHeaders = buildGuardHeaders(runConfig, actorRequest, options);
 
 	if (actorRequest.method !== "GET" && actorRequest.method !== "HEAD") {
@@ -26,35 +25,20 @@ export async function sendHttpRequestToGateway(
 			throw new Error("Request body has already been consumed");
 		}
 
-		// 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.
+		if (actorRequest.body) {
+			bodyToSend = actorRequest.body;
 			guardHeaders.delete("transfer-encoding");
 			guardHeaders.delete("content-length");
 		}
 	}
 
-	const guardRequest = new Request(gatewayUrl, {
+	return fetch(gatewayUrl, {
 		method: actorRequest.method,
 		headers: guardHeaders,
 		body: bodyToSend,
 		signal: actorRequest.signal,
-	});
-
-	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);
+		...(bodyToSend ? { duplex: "half" } : {}),
+	} as RequestInit);
 }
 
 function buildGuardHeaders(

package/src/engine-client/mod.ts

@@ -462,7 +462,7 @@ export class RemoteEngineControlClient implements EngineControlClient {
 				undefined,
 				"getOrCreateForKey" in target
 					? (target.getOrCreateForKey.poolName ??
-						this.#config.poolName)
+							this.#config.poolName)
 					: undefined,
 				options,
 			);

package/src/registry/config/index.ts

@@ -1,7 +1,12 @@
 import { z } from "zod";
 import { getRunMetadata } from "@/actor/config";
 import type { AnyActorDefinition } from "@/actor/definition";
-import { buildEngineEndpoint, ENGINE_HOST, ENGINE_PORT } from "@/common/engine";
+import {
+	buildEngineEndpoint,
+	ENGINE_HOST,
+	ENGINE_PORT,
+	isLocalEngineEndpoint,
+} from "@/common/engine";
 import { type Logger, LogLevelSchema } from "@/common/log";
 import { VERSION } from "@/utils";
 import { tryParseEndpoint } from "@/utils/endpoint-parser";
@@ -14,6 +19,7 @@ import {
 	getRivetRunEngineHost,
 	getRivetRunEnginePort,
 	getRivetRunEngineVersion,
+	getRivetRunServices,
 	getRivetToken,
 	isDev,
 } from "@/utils/env-vars";
@@ -243,6 +249,12 @@ export const RegistryConfigSchema = z
 			.string()
 			.optional()
 			.default(() => getRivetRunEngineVersion() ?? VERSION),
+		/**
+		 * Starts the first-party Services actor host when RivetKit manages
+		 * a local engine. Defaults to the local-engine decision. Set
+		 * RIVET_RUN_SERVICES=0 or 1 to override it.
+		 */
+		startServices: z.boolean().optional(),
 		/**
 		 * @experimental
 		 *
@@ -354,6 +366,13 @@ export const RegistryConfigSchema = z
 			? localEngineEndpoint
 			: (parsedEndpoint?.endpoint ??
 				(isDevEnv ? localEngineEndpoint : undefined));
+		// Services is another local development actor host. Its default
+		// follows the same local-endpoint decision that causes core to manage the
+		// Engine, while explicit config and RIVET_RUN_SERVICES take precedence.
+		const startServices =
+			config.startServices ??
+			getRivetRunServices() ??
+			Boolean(endpoint && isLocalEngineEndpoint(endpoint));
 		const validateServerlessEndpoint = Boolean(
 			config.startEngine || parsedEndpoint,
 		);
@@ -398,6 +417,7 @@ export const RegistryConfigSchema = z
 			...config,
 			sqlite,
 			endpoint,
+			startServices,
 			namespace,
 			token,
 			publicEndpoint,
@@ -629,6 +649,12 @@ export const DocRegistryConfigSchema = z
 			.describe(
 				"Version of the local engine package to use. Defaults to the current RivetKit version.",
 			),
+		startServices: z
+			.boolean()
+			.optional()
+			.describe(
+				"Starts Services when RivetKit manages a local Engine. Defaults to the local-Engine decision. Set RIVET_RUN_SERVICES=0 or 1 to override.",
+			),
 		configurePool: DocConfigurePoolSchema.describe(
 			"Automatically configure serverless runners in the engine.",
 		),

package/src/registry/index.ts

@@ -16,8 +16,11 @@ import {
 } from "./config";
 import { logger } from "./log";
 import { buildConfiguredRegistry } from "./native";
+import { convertNativeHttpResponse } from "./native-http";
 import type {
+	CoreRuntime,
 	RuntimeApplicationFetch,
+	RuntimeHttpResponseBodyStream,
 	RuntimeServerlessResponseHead,
 } from "./runtime";
 
@@ -43,18 +46,33 @@ function finishShutdownSignal(signal: ShutdownSignal): void {
 
 function createApplicationFetch(
 	application: RegistryApplication,
+	runtime: CoreRuntime,
 ): RuntimeApplicationFetch {
-	return async (request) => {
+	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)) {
@@ -62,10 +80,25 @@ function createApplicationFetch(
 				"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: response.status,
-			headers: Object.fromEntries(response.headers.entries()),
-			body: new Uint8Array(await response.arrayBuffer()),
+			status: conversion.response.status ?? response.status,
+			headers:
+				conversion.response.headers ??
+				Object.fromEntries(response.headers.entries()),
+			body: conversion.response.body,
+			stream: conversion.response.stream,
 		};
 	};
 }
@@ -406,11 +439,8 @@ export class Registry<A extends RegistryActors> {
 		const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3000;
 		const publicDir = opts.publicDir ?? getRivetkitPublicDir();
 		const config = this.parseConfig();
-		const application = opts.application
-			? createApplicationFetch(opts.application)
-			: undefined;
 
-		if (application && getRivetkitRuntimeMode() !== "serverless") {
+		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",
@@ -431,6 +461,11 @@ export class Registry<A extends RegistryActors> {
 			}
 			const { runtime, registry, serveConfig } =
 				await configuredRegistryPromise;
+			const application = createApplicationFetch(
+				opts.application,
+				runtime,
+			);
+			await readyPromise;
 			const listenerPromise = runtime.serveApplicationListener(
 				registry,
 				{
@@ -448,16 +483,12 @@ export class Registry<A extends RegistryActors> {
 					"registry envoy serve lifecycle did not initialize",
 				);
 			}
-			await Promise.all([
-				readyPromise,
-				listenerPromise,
-				serveLifecyclePromise,
-			]);
+			await Promise.all([listenerPromise, serveLifecyclePromise]);
 			return;
 		}
 
 		// Cache on both promise fields so the shutdown drain sees Mode A and B.
-		const configuredRegistryPromise = buildConfiguredRegistry(config);
+		const configuredRegistryPromise = this.#buildConfiguredRegistry(config);
 		this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
 		this.#runtimeServerlessPromise = configuredRegistryPromise;
 		this.#installSignalHandlers(config);
@@ -473,6 +504,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,
 			{