@rivetkit/supabase 2.3.12-rc.3 → 2.3.12

package/dist/mod.js

@@ -335,7 +335,7 @@ __export(mod_exports, {
 module.exports = __toCommonJS(mod_exports);
 var wasmBindings = __toESM(require("@rivetkit/rivetkit-wasm"));
 
-// ../rivetkit/dist/tsup/chunk-IXBD7BXC.js
+// ../rivetkit/dist/tsup/chunk-OUQUIBVW.js
 var INTERNAL_ERROR_CODE = "internal_error";
 var INTERNAL_ERROR_DESCRIPTION = "An internal error occurred";
 var USER_ERROR_CODE = "user_error";
@@ -519,7 +519,7 @@ function unsupportedFeature(feature) {
   );
 }
 
-// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
+// ../rivetkit/dist/tsup/chunk-MF42PRF2.js
 var import_pino = require("pino");
 
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/classic/external.js
@@ -13192,7 +13192,7 @@ var classic_default = external_exports;
 // ../../../node_modules/.pnpm/zod@4.1.13/node_modules/zod/v4/index.js
 var v4_default = classic_default;
 
-// ../rivetkit/dist/tsup/chunk-OLGQYFUW.js
+// ../rivetkit/dist/tsup/chunk-MF42PRF2.js
 var cbor = __toESM(require("cbor-x"), 1);
 var import_invariant = __toESM(require_invariant(), 1);
 var getRivetEngine = () => getEnvUniversal("RIVET_ENGINE");
@@ -13211,6 +13211,10 @@ var getRivetRunEnginePort = () => {
   return value !== void 0 ? parseInt(value, 10) : void 0;
 };
 var getRivetRunEngineVersion = () => getEnvUniversal("RIVET_RUN_ENGINE_VERSION");
+var getRivetRunServices = () => {
+  const value = getEnvUniversal("RIVET_RUN_SERVICES");
+  return value === void 0 ? void 0 : value === "1";
+};
 var getRivetEnvoyVersion = () => {
   const value = getEnvUniversal("RIVET_ENVOY_VERSION");
   return value !== void 0 ? parseInt(value, 10) : void 0;
@@ -13362,7 +13366,7 @@ function noopNext() {
 }
 var package_default = {
   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: [
@@ -13572,6 +13576,7 @@ var package_default = {
   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": "workspace:*",
     "@rivetkit/engine-envoy-protocol": "workspace:*",
@@ -14665,7 +14670,7 @@ function Config({ initialBufferLength = 1024, maxBufferLength = 1024 * 1024 * 32
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-WVFTFWJL.js
+// ../rivetkit/dist/tsup/chunk-GEN4NHXM.js
 var config2 = /* @__PURE__ */ Config({});
 function readWorkflowCbor(bc) {
   return readData(bc);
@@ -15544,6 +15549,44 @@ function removePrefixFromKey(prefixedKey) {
   return prefixedKey.slice(KEYS.KV.length);
 }
 
+// ../rivetkit/dist/tsup/chunk-JYTXOMM7.js
+function logger() {
+  return getLogger("actor-client");
+}
+var webSocketPromise = null;
+async function importWebSocket() {
+  if (webSocketPromise !== null) {
+    return webSocketPromise;
+  }
+  webSocketPromise = (async () => {
+    let _WebSocket;
+    if (typeof WebSocket !== "undefined") {
+      _WebSocket = WebSocket;
+    } else {
+      try {
+        const moduleName = "ws";
+        const ws = await import(
+          /* webpackIgnore: true */
+          moduleName
+        );
+        _WebSocket = ws.default;
+        logger().debug("using websocket from npm");
+      } catch {
+        _WebSocket = class MockWebSocket {
+          constructor() {
+            throw new Error(
+              'WebSocket support requires installing the "ws" peer dependency.'
+            );
+          }
+        };
+        logger().debug("using mock websocket");
+      }
+    }
+    return _WebSocket;
+  })();
+  return webSocketPromise;
+}
+
 // ../rivetkit/dist/tsup/chunk-JTHHCZCZ.js
 var MIGRATION_TRANSACTION_TIMEOUT_MS = 5 * 6e4;
 function isManualTransactionControl(query) {
@@ -15627,45 +15670,7 @@ var AsyncMutex = class {
   }
 };
 
-// ../rivetkit/dist/tsup/chunk-XI4MEUUI.js
-function logger() {
-  return getLogger("actor-client");
-}
-var webSocketPromise = null;
-async function importWebSocket() {
-  if (webSocketPromise !== null) {
-    return webSocketPromise;
-  }
-  webSocketPromise = (async () => {
-    let _WebSocket;
-    if (typeof WebSocket !== "undefined") {
-      _WebSocket = WebSocket;
-    } else {
-      try {
-        const moduleName = "ws";
-        const ws = await import(
-          /* webpackIgnore: true */
-          moduleName
-        );
-        _WebSocket = ws.default;
-        logger().debug("using websocket from npm");
-      } catch {
-        _WebSocket = class MockWebSocket {
-          constructor() {
-            throw new Error(
-              'WebSocket support requires installing the "ws" peer dependency.'
-            );
-          }
-        };
-        logger().debug("using mock websocket");
-      }
-    }
-    return _WebSocket;
-  })();
-  return webSocketPromise;
-}
-
-// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
+// ../rivetkit/dist/tsup/chunk-VOYNLY57.js
 var import_invariant2 = __toESM(require_invariant(), 1);
 
 // ../../../node_modules/.pnpm/p-retry@6.2.1/node_modules/p-retry/index.js
@@ -15843,7 +15848,7 @@ function createVersionedDataHandler(config3) {
   return new VersionedDataHandler(config3);
 }
 
-// ../rivetkit/dist/tsup/chunk-YYIDQBBM.js
+// ../rivetkit/dist/tsup/chunk-VOYNLY57.js
 var import_invariant3 = __toESM(require_invariant(), 1);
 var import_invariant4 = __toESM(require_invariant(), 1);
 var PATH_CONNECT = "/connect";
@@ -15852,6 +15857,7 @@ var PATH_WEBSOCKET_PREFIX = "/websocket/";
 var HEADER_ACTOR_QUERY = "x-rivet-query";
 var HEADER_ENCODING = "x-rivet-encoding";
 var HEADER_CONN_PARAMS = "x-rivet-conn-params";
+var HEADER_ORIGINAL_REQUEST_URL = "x-rivet-internal-original-request-url";
 var HEADER_ACTOR_ID = "x-rivet-actor";
 var HEADER_ACTOR_GENERATION = "x-rivet-actor-generation";
 var HEADER_ACTOR_KEY = "x-rivet-actor-key";
@@ -17910,6 +17916,18 @@ async function checkForSchedulingError(group, code, actorId, query, driver, rayI
   }
   return null;
 }
+function isUrlLike(value) {
+  return typeof value === "object" && value !== null && typeof value.href === "string" && typeof value.pathname === "string" && typeof value.search === "string";
+}
+function isRequestLike(value) {
+  return typeof value === "object" && value !== null && typeof value.url === "string" && typeof value.method === "string" && isHeadersLike(value.headers);
+}
+function isResponseLike(value) {
+  return typeof value === "object" && value !== null && typeof value.status === "number" && isHeadersLike(value.headers) && typeof value.arrayBuffer === "function";
+}
+function isHeadersLike(value) {
+  return typeof value === "object" && value !== null && typeof value.entries === "function";
+}
 function* walkErrorChain(error46, maxDepth = 8) {
   let current = error46;
   let depth = 0;
@@ -18335,28 +18353,19 @@ function createQueueSender(senderOptions) {
     send
   };
 }
-function isUrlLike(value) {
-  return typeof value === "object" && value !== null && typeof value.href === "string" && typeof value.pathname === "string" && typeof value.search === "string";
-}
-function isRequestLike(value) {
-  return typeof value === "object" && value !== null && typeof value.url === "string" && typeof value.method === "string" && isHeadersLike(value.headers);
-}
-function isResponseLike(value) {
-  return typeof value === "object" && value !== null && typeof value.status === "number" && isHeadersLike(value.headers) && typeof value.arrayBuffer === "function";
-}
-function isHeadersLike(value) {
-  return typeof value === "object" && value !== null && typeof value.entries === "function";
-}
 async function rawHttpFetch(driver, target, params, input, init, options = {}) {
   let path2;
+  let originalUrl;
   let mergedInit = init || {};
   if (typeof input === "string") {
     path2 = input;
   } else if (isUrlLike(input)) {
     path2 = input.pathname + input.search;
+    originalUrl = input.toString();
   } else if (isRequestLike(input)) {
     const url2 = new URL(input.url);
     path2 = url2.pathname + url2.search;
+    originalUrl = url2.toString();
     const requestHeaders = new Headers(input.headers);
     const initHeaders = new Headers((init == null ? void 0 : init.headers) || {});
     const mergedHeaders = new Headers(requestHeaders);
@@ -18398,6 +18407,10 @@ async function rawHttpFetch(driver, target, params, input, init, options = {}) {
     const normalizedPath = path2.startsWith("/") ? path2.slice(1) : path2;
     const url2 = new URL(`http://actor/request/${normalizedPath}`);
     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));
     }
@@ -18523,7 +18536,9 @@ var ActorHandleRaw = class {
   async #sendQueueMessage(name, body, options) {
     return await this.#queueSendMutex.run(async () => {
       const maxAttempts = this.#getDynamicQueryMaxAttempts();
-      let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
+      let useQueryTarget = isDynamicActorQuery(
+        this.#actorResolutionState
+      );
       for (let attempt = 0; attempt < maxAttempts; attempt++) {
         let actorId;
         try {
@@ -18872,9 +18887,10 @@ var ActorHandleRaw = class {
     return this.#fetchWithResolvedActor(input, init);
   }
   async #fetchWithResolvedActor(input, init) {
-    const maxAttempts = this.#getDynamicQueryMaxAttempts();
-    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const { skipReadyWait, ...requestInit } = init ?? {};
+    const hasBody = requestInit.body !== void 0 ? requestInit.body !== null : isRequestLike(input) && input.body !== null;
+    const maxAttempts = hasBody ? 1 : this.#getDynamicQueryMaxAttempts();
+    let useQueryTarget = isDynamicActorQuery(this.#actorResolutionState);
     const gatewayOptions = resolveActorGatewayOptions(
       this.#gatewayOptions,
       {
@@ -20642,23 +20658,19 @@ async function sendHttpRequestToGateway(runConfig, gatewayUrl, actorRequest, opt
     if (actorRequest.bodyUsed) {
       throw new Error("Request body has already been consumed");
     }
-    const reqBody = await actorRequest.arrayBuffer();
-    if (reqBody.byteLength !== 0) {
-      bodyToSend = reqBody;
+    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
+    signal: actorRequest.signal,
+    ...bodyToSend ? { duplex: "half" } : {}
   });
-  return mutableResponse(await fetch(guardRequest));
-}
-function mutableResponse(fetchRes) {
-  return new Response(fetchRes.body, fetchRes);
 }
 function buildGuardHeaders(runConfig, actorRequest, options) {
   const headers = new Headers();
@@ -21608,7 +21620,7 @@ function apiActorToOutput(actor2) {
   };
 }
 
-// ../rivetkit/dist/tsup/chunk-PSXMESQJ.js
+// ../rivetkit/dist/tsup/chunk-EBXARMGI.js
 var nativeStateTransactionOpeners = /* @__PURE__ */ new WeakMap();
 var nativeStateTransactionClientBinders = /* @__PURE__ */ new WeakMap();
 function registerNativeStateTransactionOpener(provider, opener) {
@@ -23684,6 +23696,12 @@ var RegistryConfigSchema = external_exports.object({
   enginePort: external_exports.number().int().min(1).max(65535).optional().default(() => getRivetRunEnginePort() ?? ENGINE_PORT),
   /** @experimental */
   engineVersion: external_exports.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: external_exports.boolean().optional(),
   /**
    * @experimental
    *
@@ -23764,6 +23782,7 @@ var RegistryConfigSchema = external_exports.object({
     config3.enginePort
   );
   const endpoint = config3.startEngine ? localEngineEndpoint : (parsedEndpoint == null ? void 0 : parsedEndpoint.endpoint) ?? (isDevEnv ? localEngineEndpoint : void 0);
+  const startServices = config3.startServices ?? getRivetRunServices() ?? Boolean(endpoint && isLocalEngineEndpoint(endpoint));
   const validateServerlessEndpoint = Boolean(
     config3.startEngine || parsedEndpoint
   );
@@ -23787,6 +23806,7 @@ var RegistryConfigSchema = external_exports.object({
     ...config3,
     sqlite,
     endpoint,
+    startServices,
     namespace,
     token,
     publicEndpoint,
@@ -23900,6 +23920,9 @@ var DocRegistryConfigSchema = external_exports.object({
   engineVersion: external_exports.string().optional().describe(
     "Version of the local engine package to use. Defaults to the current RivetKit version."
   ),
+  startServices: external_exports.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."
   ),
@@ -24409,16 +24432,30 @@ function toNapiApplication(application) {
     if (!request) {
       throw new Error("application fetch callback received no request");
     }
-    const response = await application({
-      ...request,
-      body: new Uint8Array(request.body)
-    });
+    const response = await application(
+      {
+        ...request,
+        body: new Uint8Array(request.body),
+        cancelToken: request.cancelToken
+      },
+      request.responseBodyStream ? fromNapiHttpResponseBodyStream(
+        request.responseBodyStream
+      ) : void 0
+    );
     return {
       ...response,
-      body: toNapiBuffer(response.body)
+      body: response.body === void 0 ? void 0 : toNapiBuffer(response.body)
     };
   };
 }
+function fromNapiHttpResponseBodyStream(stream) {
+  return {
+    cancelled: () => stream.cancelled(),
+    write: (chunk) => stream.write(Buffer.from(chunk)),
+    end: () => stream.end(),
+    error: (message) => stream.error(message)
+  };
+}
 function toNapiHttpRequest(request) {
   if (!request) {
     return request;
@@ -24961,6 +24998,147 @@ async function loadNapiRuntime() {
     runtime: new NapiCoreRuntime(bindings)
   };
 }
+var HTTP_BODY_CHUNK_SIZE = 64 * 1024;
+function runtimeBytesToArrayBuffer(value) {
+  return value.buffer.slice(
+    value.byteOffset,
+    value.byteOffset + value.byteLength
+  );
+}
+function buildNativeHttpRequest(init) {
+  var _a2;
+  const headers = new Headers(init.headers);
+  const originalUrl = headers.get(HEADER_ORIGINAL_REQUEST_URL);
+  headers.delete(HEADER_ORIGINAL_REQUEST_URL);
+  const url2 = originalUrl ?? (init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString());
+  const method2 = init.method.toUpperCase();
+  const bodyForbidden = method2 === "GET" || method2 === "HEAD";
+  const body = bodyForbidden ? void 0 : init.bodyStream ? new ReadableStream({
+    async pull(controller) {
+      var _a22, _b;
+      try {
+        if (init.body && init.body.length > 0) {
+          controller.enqueue(new Uint8Array(init.body));
+          init.body = void 0;
+          return;
+        }
+        const chunk = await ((_a22 = init.bodyStream) == null ? void 0 : _a22.read());
+        if (!chunk) {
+          controller.close();
+        } else {
+          controller.enqueue(new Uint8Array(chunk));
+        }
+      } catch (error46) {
+        (_b = init.abortController) == null ? void 0 : _b.abort(error46);
+        controller.error(error46);
+      }
+    },
+    async cancel() {
+      var _a22;
+      await ((_a22 = init.bodyStream) == null ? void 0 : _a22.cancel());
+    }
+  }) : init.body && init.body.length > 0 ? runtimeBytesToArrayBuffer(init.body) : void 0;
+  const streamInit = init.bodyStream && !bodyForbidden ? { duplex: "half" } : {};
+  return new Request(url2, {
+    method: method2,
+    headers,
+    body,
+    signal: ((_a2 = init.abortController) == null ? void 0 : _a2.signal) ?? init.signal,
+    ...streamInit
+  });
+}
+async function cancelNativeHttpRequestBody(bodyStream) {
+  await (bodyStream == null ? void 0 : bodyStream.cancel());
+}
+async function writeResponseChunk(stream, chunk) {
+  for (let offset = 0; offset < chunk.byteLength; offset += HTTP_BODY_CHUNK_SIZE) {
+    await stream.write(
+      chunk.subarray(offset, offset + HTTP_BODY_CHUNK_SIZE)
+    );
+  }
+}
+async function pumpResponseBody(reader, stream) {
+  var _a2;
+  const cancelled = stream.cancelled().then(() => ({ cancelled: true }));
+  try {
+    for (; ; ) {
+      const read = reader.read().then((next2) => ({ cancelled: false, next: next2 }));
+      const result = await Promise.race([read, cancelled]);
+      if (result.cancelled) {
+        void reader.cancel(
+          new Error(
+            "native http response stream receiver dropped"
+          )
+        ).catch((error46) => {
+          logger22().debug({
+            msg: "failed to cancel native http response reader",
+            error: error46
+          });
+        });
+        return;
+      }
+      const { next } = result;
+      if (next.done) {
+        await stream.end();
+        return;
+      }
+      if ((_a2 = next.value) == null ? void 0 : _a2.byteLength) {
+        await writeResponseChunk(stream, next.value);
+      }
+    }
+  } catch (error46) {
+    try {
+      await stream.error(stringifyError(error46));
+    } catch (streamError) {
+      logger22().debug({
+        msg: "failed to report native http response stream error",
+        error: streamError
+      });
+    }
+    void reader.cancel(error46).catch(() => {
+    });
+  } finally {
+    try {
+      reader.releaseLock();
+    } catch (error46) {
+      logger22().debug({
+        msg: "failed to release native http response reader lock",
+        error: error46
+      });
+    }
+  }
+}
+async function convertNativeHttpResponse(response, responseBodyStream) {
+  const headers = Object.fromEntries(response.headers.entries());
+  if (!response.body) {
+    return {
+      response: {
+        status: response.status,
+        headers,
+        body: new Uint8Array()
+      }
+    };
+  }
+  if (responseBodyStream) {
+    const reader = response.body.getReader();
+    const bodyCompletion = pumpResponseBody(reader, responseBodyStream);
+    return {
+      response: {
+        status: response.status,
+        headers,
+        stream: true
+      },
+      bodyCompletion
+    };
+  }
+  return {
+    response: {
+      status: response.status,
+      headers,
+      body: new Uint8Array(await response.arrayBuffer())
+    }
+  };
+}
 var CONN_PARAMS_KEY = "__conn_params__";
 function validateActionArgs(schemas, name, args) {
   if (!(schemas == null ? void 0 : schemas[name])) {
@@ -26409,7 +26587,7 @@ function toRuntimeBytes(value) {
 function arrayBufferViewToRuntimeBytes(value) {
   return new Uint8Array(value.buffer, value.byteOffset, value.byteLength);
 }
-function runtimeBytesToArrayBuffer(value) {
+function runtimeBytesToArrayBuffer2(value) {
   return value.buffer.slice(
     value.byteOffset,
     value.byteOffset + value.byteLength
@@ -26455,6 +26633,9 @@ function decodeNativeKvValue(value, options) {
 async function loadEngineCli() {
   return import(["@rivetkit", "engine-cli"].join("/"));
 }
+async function loadServices() {
+  return import(["@rivet-dev", "services"].join("/"));
+}
 function decodeValue(value) {
   if (!value || value.length === 0) {
     return void 0;
@@ -26740,24 +26921,6 @@ function decodeArgs(value) {
   const decoded = decodeValue(value);
   return normalizeArgs(decoded);
 }
-function buildRequest(init) {
-  const url2 = init.uri.startsWith("http") ? init.uri : new URL(init.uri, "http://127.0.0.1").toString();
-  const body = init.body && init.body.length > 0 ? runtimeBytesToArrayBuffer(init.body) : void 0;
-  return new Request(url2, {
-    method: init.method,
-    headers: init.headers,
-    body
-  });
-}
-async function toRuntimeHttpResponse(response) {
-  const headers = Object.fromEntries(response.headers.entries());
-  const body = new Uint8Array(await response.arrayBuffer());
-  return {
-    status: response.status,
-    headers,
-    body
-  };
-}
 function toActorKey(segments) {
   return segments.map(
     (segment) => segment.kind === "number" ? String(segment.numberValue ?? 0) : segment.stringValue ?? ""
@@ -27470,7 +27633,7 @@ var NativeWebSocketAdapter = class {
     this.#runtime.webSocketSetEventCallback(this.#ws, (event2) => {
       if (event2.kind === "message") {
         this.#virtual.triggerMessage(
-          event2.binary ? runtimeBytesToArrayBuffer(event2.data) : event2.data,
+          event2.binary ? runtimeBytesToArrayBuffer2(event2.data) : event2.data,
           event2.messageIndex
         );
         return;
@@ -28853,12 +29016,14 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     cancelToken,
     run !== void 0
   );
-  const maybeHandleNativeInspectorRequest = async (ctx, _rawRequest, jsRequest) => {
+  const maybeHandleNativeInspectorRequest = async (ctx, rawRequest) => {
     var _a22, _b, _c, _d;
-    const url2 = new URL(jsRequest.url);
+    const rawUrl = rawRequest.uri.startsWith("http") ? rawRequest.uri : new URL(rawRequest.uri, "http://127.0.0.1").toString();
+    const url2 = new URL(rawUrl);
     if (!url2.pathname.startsWith("/inspector/")) {
       return void 0;
     }
+    const jsRequest = buildNativeHttpRequest(rawRequest);
     const jsonResponse = (body, init) => new Response(JSON.stringify(body), {
       status: (init == null ? void 0 : init.status) ?? 200,
       headers: {
@@ -29389,7 +29554,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         try {
           await config3.onBeforeConnect(
@@ -29409,7 +29574,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         const { ctx, conn, params, request } = unwrapTsfnPayload(error46, payload);
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -29447,7 +29612,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
         );
         const actorCtx = makeActorCtx(
           ctx,
-          request ? buildRequest(request) : void 0
+          request ? buildNativeHttpRequest(request) : void 0
         );
         const connAdapter = new NativeConnAdapter(
           runtime,
@@ -29554,27 +29719,45 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onRequest: wrapNativeCallback(
       async (error46, payload) => {
         try {
-          const { ctx, request, cancelToken } = unwrapTsfnPayload(
-            error46,
-            payload
-          );
-          const jsRequest = buildRequest(request);
-          const inspectorResponse = await maybeHandleNativeInspectorRequest(
-            ctx,
-            request,
-            jsRequest
-          );
+          const { ctx, request, cancelToken, responseBodyStream } = unwrapTsfnPayload(error46, payload);
+          const inspectorResponse = await maybeHandleNativeInspectorRequest(ctx, request);
           if (inspectorResponse) {
-            return await toRuntimeHttpResponse(inspectorResponse);
+            await cancelNativeHttpRequestBody(request.bodyStream);
+            return (await convertNativeHttpResponse(
+              inspectorResponse,
+              responseBodyStream
+            )).response;
           }
           if (typeof config3.onRequest !== "function") {
-            return await toRuntimeHttpResponse(
-              new Response(null, { status: 404 })
-            );
+            await cancelNativeHttpRequestBody(request.bodyStream);
+            return (await convertNativeHttpResponse(
+              new Response(null, { status: 404 }),
+              responseBodyStream
+            )).response;
           }
-          const rawConnParams = jsRequest.headers.get(HEADER_CONN_PARAMS);
+          const requestAbortController = new AbortController();
+          const handlerRequest = buildNativeHttpRequest({
+            ...request,
+            abortController: requestAbortController
+          });
+          const rawConnParams = handlerRequest.headers.get(HEADER_CONN_PARAMS);
           let requestCtx;
           let conn;
+          let removeRequestAbortListener;
+          let cleanupDeferredToBody = false;
+          let cleanedUp = false;
+          const cleanupRequest = async () => {
+            if (cleanedUp) return;
+            cleanedUp = true;
+            removeRequestAbortListener == null ? void 0 : removeRequestAbortListener();
+            try {
+              await (requestCtx == null ? void 0 : requestCtx.dispose());
+            } finally {
+              if (conn) {
+                await runtime.connDisconnect(conn);
+              }
+            }
+          };
           try {
             const connParams = validateConnParams(
               schemaConfig.connParamsSchema,
@@ -29590,23 +29773,56 @@ function buildNativeFactory(runtime, registryConfig, definition) {
             requestCtx = makeConnCtx(
               ctx,
               conn,
-              jsRequest,
+              handlerRequest,
               cancelToken
             );
+            const ctxAbortSignal = requestCtx.abortSignal;
+            const abortRequest = () => requestAbortController.abort(ctxAbortSignal.reason);
+            if (ctxAbortSignal.aborted) {
+              abortRequest();
+            } else {
+              ctxAbortSignal.addEventListener(
+                "abort",
+                abortRequest,
+                { once: true }
+              );
+              removeRequestAbortListener = () => ctxAbortSignal.removeEventListener(
+                "abort",
+                abortRequest
+              );
+            }
             const response = await config3.onRequest(
               requestCtx,
-              jsRequest
+              handlerRequest
             );
             if (!isResponseLike(response)) {
               throw new Error(
                 "onRequest handler must return a Response"
               );
             }
-            return await toRuntimeHttpResponse(response);
+            const conversion = await convertNativeHttpResponse(
+              response,
+              responseBodyStream
+            );
+            if (conversion.bodyCompletion) {
+              cleanupDeferredToBody = true;
+              void conversion.bodyCompletion.then(cleanupRequest).catch((cleanupError) => {
+                logger22().error({
+                  msg: "failed to clean up native streaming http request",
+                  error: cleanupError
+                });
+              });
+            }
+            return conversion.response;
           } finally {
-            await (requestCtx == null ? void 0 : requestCtx.dispose());
-            if (conn) {
-              await runtime.connDisconnect(conn);
+            try {
+              await cancelNativeHttpRequestBody(
+                request.bodyStream
+              );
+            } finally {
+              if (!cleanupDeferredToBody) {
+                await cleanupRequest();
+              }
             }
           }
         } catch (error210) {
@@ -29621,7 +29837,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     onWebSocket: typeof config3.onWebSocket === "function" ? wrapNativeCallback(
       async (error46, payload) => {
         const { ctx, conn, ws, request } = unwrapTsfnPayload(error46, payload);
-        const jsRequest = request ? buildRequest(request) : void 0;
+        const jsRequest = request ? buildNativeHttpRequest(request) : void 0;
         const actorCtx = makeConnCtx(ctx, conn, jsRequest);
         try {
           await config3.onWebSocket(
@@ -29727,7 +29943,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
           timeoutMs,
           cancelToken
         } = unwrapTsfnPayload(error46, payload);
-        const jsRequest = buildRequest(request);
+        const jsRequest = buildNativeHttpRequest(request);
         const actorCtx = withConnContext(
           runtime,
           ctx,
@@ -29797,7 +30013,7 @@ function buildNativeFactory(runtime, registryConfig, definition) {
     buildActorConfig(definition, registryConfig, runtime.kind)
   );
 }
-async function buildServeConfig(config3) {
+async function buildServeConfig(config3, resolveServicesBinary = true) {
   var _a2;
   if (!config3.endpoint) {
     throw nativeEndpointNotConfiguredError();
@@ -29808,6 +30024,7 @@ async function buildServeConfig(config3) {
     token: config3.token,
     namespace: config3.namespace,
     poolName: config3.envoy.poolName,
+    startServices: resolveServicesBinary && config3.startServices,
     handleInspectorHttpInRuntime: true,
     serverlessBasePath: config3.serverless.basePath,
     serverlessPackageVersion: VERSION,
@@ -29826,6 +30043,17 @@ async function buildServeConfig(config3) {
       error: stringifyError(error46)
     });
   }
+  if (resolveServicesBinary && config3.startServices) {
+    try {
+      const { getServicesPath } = await loadServices();
+      serveConfig.servicesBinaryPath = getServicesPath();
+    } catch (error46) {
+      logger22().warn({
+        msg: "could not resolve the Services binary; a local engine will fail with services.binary_unavailable \u2014 set RIVET_RUN_SERVICES=0 to disable Services or RIVET_SERVICES_BINARY to a local rivet-services binary",
+        error: stringifyError(error46)
+      });
+    }
+  }
   serveConfig.engineHost = config3.engineHost;
   serveConfig.enginePort = config3.enginePort;
   if ((_a2 = config3.test) == null ? void 0 : _a2.enabled) {
@@ -29852,7 +30080,7 @@ async function buildRegistryWithRuntime(config3, runtime) {
   return {
     runtime,
     registry: registry2,
-    serveConfig: await buildServeConfig(config3)
+    serveConfig: await buildServeConfig(config3, runtime.kind === "napi")
   };
 }
 async function buildConfiguredRegistry(config3) {
@@ -29877,15 +30105,27 @@ function finishShutdownSignal(signal) {
   }
   process.kill(process.pid, signal);
 }
-function createApplicationFetch(application) {
-  return async (request) => {
+function createApplicationFetch(application, runtime) {
+  return async (request, responseBodyStream) => {
     const method2 = request.method.toUpperCase();
     const body = method2 === "GET" || method2 === "HEAD" || request.body.length === 0 ? void 0 : 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: method2,
         headers: request.headers,
-        body
+        body,
+        signal: abortController.signal
       })
     );
     if (!isResponseLike(response)) {
@@ -29893,10 +30133,23 @@ function createApplicationFetch(application) {
         "registry.listen() application fetch must return a Response"
       );
     }
+    const conversion = await convertNativeHttpResponse(
+      response,
+      responseBodyStream
+    );
+    if (conversion.bodyCompletion) {
+      void conversion.bodyCompletion.catch((error46) => {
+        logger22().error({
+          msg: "application response stream failed",
+          error: error46
+        });
+      });
+    }
     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
     };
   };
 }
@@ -30154,8 +30407,7 @@ var Registry = class {
     const port = opts.port ?? parsePortEnv(process.env.RIVET_PORT) ?? 3e3;
     const publicDir = opts.publicDir ?? getRivetkitPublicDir();
     const config3 = this.parseConfig();
-    const application = opts.application ? createApplicationFetch(opts.application) : void 0;
-    if (application && getRivetkitRuntimeMode() !== "serverless") {
+    if (opts.application && getRivetkitRuntimeMode() !== "serverless") {
       if (config3.runtime === "wasm") {
         throw new Error(
           "registry.listen() requires the native runtime; use an application-owned HTTP server with WebAssembly"
@@ -30174,13 +30426,18 @@ var Registry = class {
         throw new Error("registry envoy startup did not initialize");
       }
       const { runtime: runtime2, registry: registry22, serveConfig: serveConfig2 } = await configuredRegistryPromise2;
+      const application2 = createApplicationFetch(
+        opts.application,
+        runtime2
+      );
+      await readyPromise;
       const listenerPromise = runtime2.serveApplicationListener(
         registry22,
         {
           port,
           host: opts.host,
           publicDir,
-          application
+          application: application2
         },
         serveConfig2
       );
@@ -30191,14 +30448,10 @@ var Registry = class {
           "registry envoy serve lifecycle did not initialize"
         );
       }
-      await Promise.all([
-        readyPromise,
-        listenerPromise,
-        serveLifecyclePromise
-      ]);
+      await Promise.all([listenerPromise, serveLifecyclePromise]);
       return;
     }
-    const configuredRegistryPromise = buildConfiguredRegistry(config3);
+    const configuredRegistryPromise = this.#buildConfiguredRegistry(config3);
     this.#runtimeServeConfiguredPromise = configuredRegistryPromise;
     this.#runtimeServerlessPromise = configuredRegistryPromise;
     this.#installSignalHandlers(config3);
@@ -30209,6 +30462,7 @@ var Registry = class {
     });
     this.#ensureServerlessPoolConfigured(config3);
     const { runtime, registry: registry2, serveConfig } = await configuredRegistryPromise;
+    const application = opts.application ? createApplicationFetch(opts.application, runtime) : void 0;
     await runtime.serveListener(
       registry2,
       {