@octane-xplat/patches 0.16.1 → 0.17.0

package/patches/{octane@0.11.0.patch → octane@0.14.0.patch}

@@ -1,32 +1,33 @@
-diff --git a/dist/cjs/runtime.cjs b/dist/cjs/runtime.cjs
-index a035f05..e1c9ca1 100644
---- a/dist/cjs/runtime.cjs
-+++ b/dist/cjs/runtime.cjs
-@@ -365,6 +365,7 @@ var import_stream_protocol = require("./stream-protocol.cjs");
- var import_renderer_bridge = require("./renderer-bridge.cjs");
- var import_context_identity = require("./context-identity.cjs");
- var import_native_read_client = require("./signals/native-read-client.cjs");
-+var import_local_hook = require("./signals/local-hook.cjs");
- var import_native_read_collector = require("./signals/native-read-collector.cjs");
- var import_native_read_retry = require("./signals/native-read-retry.cjs");
- var import_transition_state = require("./signals/transition-state.cjs");
-@@ -8525,6 +8526,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
+diff --git a/dist/cjs/runtime/hooks.cjs b/dist/cjs/runtime/hooks.cjs
+index ee8fd63..9026e11 100644
+--- a/dist/cjs/runtime/hooks.cjs
++++ b/dist/cjs/runtime/hooks.cjs
+@@ -1,4 +1,5 @@
+ "use strict";
++var import_local_hook = require("../signals/local-hook.cjs");
+ var __defProp = Object.defineProperty;
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+ var __getOwnPropNames = Object.getOwnPropertyNames;
+@@ -156,6 +157,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
    }
    return cell.nativeValue;
  }
-+(0, import_local_hook.registerLocalSignalHook)(() => CURRENT_SCOPE === null ? null : nativeLocalHook);
- function useState(initial, slot) {
-   const s = readStateHook(initial, slot, arguments.length === 1);
-   return [s.value, s.setter];
-@@ -9659,6 +9661,8 @@ function renderClientContextProvider(context, props, renderScope) {
-       ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, dialect);
-     }
-     renderSharedBody(childrenAsBody(children), void 0, scope, void 0);
-+  } else {
-+    resetScopeChildren(scope);
-   }
++(0, import_local_hook.registerLocalSignalHook)(() => import_render.CURRENT_SCOPE === null ? null : nativeLocalHook);
+ function applyHookUpdate(state, action, reducer) {
+   return reducer !== null ? reducer(state, action) : typeof action === "function" ? action(state) : action;
+ }
+diff --git a/dist/cjs/runtime/templates.cjs b/dist/cjs/runtime/templates.cjs
+index 94e2ab9..e51a764 100644
+--- a/dist/cjs/runtime/templates.cjs
++++ b/dist/cjs/runtime/templates.cjs
+@@ -440,6 +440,7 @@ function bag16(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, $ = 0, next
+   return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, __journalWindow: 0, $, next, [import_commit.BINDING_BAG_ARITY]: 16 });
  }
- let SHARED_BODY_SCOPE = null;
+ function bagOf(s, r, bag) {
++  bag[import_commit.BINDING_BAG_ARITY] = -1;
+   return commitBag(s, r, bag);
+ }
+ function coerceText(value) {
 diff --git a/dist/cjs/signals/client.cjs b/dist/cjs/signals/client.cjs
 index 28e2844..af40518 100644
 --- a/dist/cjs/signals/client.cjs
@@ -36,27 +37,22 @@ index 28e2844..af40518 100644
  module.exports = __toCommonJS(client_exports);
  __reExport(client_exports, require("./index.cjs"), module.exports);
 -var import_runtime = require("../runtime.cjs");
--var import_engine = require("./engine.cjs");
--function disposeLocalSignal(cell) {
--  cell.scope.dispose();
--}
--function useSignal$(initial, slot) {
--  const cell = (0, import_runtime.nativeLocalHook)(
-+var import_engine = require("./engine.cjs");
+ var import_engine = require("./engine.cjs");
 +var import_local_hook = require("./local-hook.cjs");
-+function disposeLocalSignal(cell) {
-+  cell.scope.dispose();
-+}
-+function useSignal$(initial, slot) {
+ function disposeLocalSignal(cell) {
+   cell.scope.dispose();
+ }
+ function useSignal$(initial, slot) {
+-  const cell = (0, import_runtime.nativeLocalHook)(
 +  const cell = (0, import_local_hook.localSignalHook)(
      "useSignal$",
      () => {
        const value = typeof initial === "function" ? initial() : initial;
 diff --git a/dist/cjs/signals/document-owner.cjs b/dist/cjs/signals/document-owner.cjs
-index dbfcce2..ec264d5 100644
+index bfa5529..a106df1 100644
 --- a/dist/cjs/signals/document-owner.cjs
 +++ b/dist/cjs/signals/document-owner.cjs
-@@ -52,9 +52,9 @@ function enableSignalDocument(abi = 1) {
+@@ -53,9 +53,9 @@ function enableSignalDocument(abi = 1) {
    if (defaultInstalled) return;
    defaultInstalled = true;
    signalOwnerFrame = { enter: import_owner_context.enterSynchronousSignalOwner, restore: import_owner_context.restoreSynchronousSignalOwner };
@@ -70,11 +66,11 @@ index dbfcce2..ec264d5 100644
  function installStreamedSignalOwnerActivator(activate) {
    if (streamedSignalOwnerActivator !== void 0) {
 diff --git a/dist/cjs/signals/facade.cjs b/dist/cjs/signals/facade.cjs
-index 6b6d10a..917422a 100644
+index a425c5f..e81719a 100644
 --- a/dist/cjs/signals/facade.cjs
 +++ b/dist/cjs/signals/facade.cjs
-@@ -338,7 +338,7 @@ class Descriptor {
-   }
+@@ -330,7 +330,7 @@ class Descriptor {
+   lexical;
    /** The owner a use resolves for: its reader, or for a lexical handle its declaring owner. */
    reader() {
 -    return this.lexical === this ? this.owner : requireOwner();
@@ -213,283 +209,196 @@ index 0000000..00c323a
 +  universalSignalDocument
 +});
 diff --git a/dist/compiler/compile.js b/dist/compiler/compile.js
-index b891c6a..c736d3c 100644
+index 4ef283f..d3f3e0a 100644
 --- a/dist/compiler/compile.js
 +++ b/dist/compiler/compile.js
-@@ -2493,7 +2493,7 @@ function classifyViewTransitionOwnership(astBody, production, ownComponents) {
-
+@@ -2599,7 +2599,7 @@ function classifyViewTransitionOwnership(astBody, production, ownComponents) {
+ 
  function hookRuntimeModulesForCompile(options, universalUnits = []) {
--	const modules = new Set(options?.__hookRuntimeModules || []);
+ 	const modules = new Set(options?.__hookRuntimeModules || []);
 -	if (options?.nativeReads === true) {
--		modules.add('octane/signals/client');
--		modules.add('octane/signals/server');
--	}
-+	const modules = new Set(options?.__hookRuntimeModules || []);
 +	if (options?.nativeReads === true || options?.__universalSignalReads === true) {
-+		modules.add('octane/signals/client');
-+		modules.add('octane/signals/server');
-+	}
-@@ -11087,6 +11087,11 @@ function compileInternal(
--						universalRuntime: undefined,
--						rendererBoundaries: undefined,
--						rendererRegistry: undefined,
--						__hookRuntimeModules: [...(options?.__hookRuntimeModules || []), renderer.module],
--						__runtimeImportRoutes: [
--							...(options?.__runtimeImportRoutes ?? []),
-+						universalRuntime: undefined,
-+						rendererBoundaries: undefined,
-+						rendererRegistry: undefined,
+ 		modules.add('octane/signals/client');
+ 		modules.add('octane/signals/server');
+ 	}
+@@ -11633,6 +11633,11 @@ function compileInternal(
+ 						universalRuntime: undefined,
+ 						rendererBoundaries: undefined,
+ 						rendererRegistry: undefined,
 +						// Universal owners observe reads at render time; the inner
 +						// compile must not emit the DOM native-read runtime helpers,
 +						// but signal hook classification still applies.
 +						nativeReads: false,
 +						__universalSignalReads: options.nativeReads === true,
-+						__hookRuntimeModules: [...(options?.__hookRuntimeModules || []), renderer.module],
-+						__runtimeImportRoutes: [
-+							...(options?.__runtimeImportRoutes ?? []),
-@@ -11346,6 +11351,7 @@ function compileInternal(
--		nativeReads: options?.nativeReads === true,
--		opaqueSignalHandles:
--			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
--		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
--		signalHookSites: domSignalTarget(options),
--		// A split Hydrate query module is invoked as the existing server-rendered
-+		nativeReads: options?.nativeReads === true,
-+		opaqueSignalHandles:
-+			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
+ 						__hookRuntimeModules: [...(options?.__hookRuntimeModules || []), renderer.module],
+ 						__runtimeImportRoutes: [
+ 							...(options?.__runtimeImportRoutes ?? []),
+@@ -11920,6 +11925,7 @@ function compileInternal(
+ 		nativeReads: options?.nativeReads === true,
+ 		opaqueSignalHandles:
+ 			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
 +		signalReads: options?.nativeReads === true || options?.__universalSignalReads === true,
-+		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
-+		signalHookSites: domSignalTarget(options),
-+		// A split Hydrate query module is invoked as the existing server-rendered
-@@ -12814,6 +12820,7 @@ function compileServer(
--		nativeReads: options?.nativeReads === true,
--		opaqueSignalHandles:
--			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
--		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
--		signalHookSites: domSignalTarget(options),
--		hmr: false, // SSR never hot-swaps in place; client/server production slot shapes stay aligned
-+		nativeReads: options?.nativeReads === true,
-+		opaqueSignalHandles:
-+			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
+ 		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
+ 		signalHookSites: domSignalTarget(options),
+ 		// A split Hydrate query module is invoked as the existing server-rendered
+@@ -13467,6 +13473,7 @@ function compileServer(
+ 		nativeReads: options?.nativeReads === true,
+ 		opaqueSignalHandles:
+ 			options?.opaqueSignalHandles === true || options?.__signalModuleImport === true,
 +		signalReads: options?.nativeReads === true || options?.__universalSignalReads === true,
-+		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
-+		signalHookSites: domSignalTarget(options),
-+		hmr: false, // SSR never hot-swaps in place; client/server production slot shapes stay aligned
-@@ -20130,7 +20137,7 @@ function slotKeyedHookName(n, ctx) {
--			ctx.foreignImportLocals?.has(local) === true;
--		if (
--			imported !== undefined &&
+ 		nativeModuleStyles: options?.nativeReads === true && hasModuleStyleMaps(ast.body),
+ 		signalHookSites: domSignalTarget(options),
+ 		hmr: false, // SSR never hot-swaps in place; client/server production slot shapes stay aligned
+@@ -21093,7 +21100,7 @@ function slotKeyedHookName(n, ctx) {
+ 			ctx.foreignImportLocals?.has(local) === true;
+ 		if (
+ 			imported !== undefined &&
 -			(HOOK_NAMES.has(imported) || (ctx.nativeReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
--		)
--			return imported;
--		if (!shadowsImport && HOOK_NAMES.has(local)) return local;
-+			ctx.foreignImportLocals?.has(local) === true;
-+		if (
-+			imported !== undefined &&
 +			(HOOK_NAMES.has(imported) || (ctx.signalReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
-+		)
-+			return imported;
-+		if (!shadowsImport && HOOK_NAMES.has(local)) return local;
-@@ -20140,7 +20147,7 @@ function slotKeyedHookName(n, ctx) {
--	const imported = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
--	if (
--		imported !== undefined &&
+ 		)
+ 			return imported;
+ 		if (!shadowsImport && HOOK_NAMES.has(local)) return local;
+@@ -21103,7 +21110,7 @@ function slotKeyedHookName(n, ctx) {
+ 	const imported = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
+ 	if (
+ 		imported !== undefined &&
 -		(HOOK_NAMES.has(imported) || (ctx.nativeReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
--	) {
--		return imported;
--	}
-+	const imported = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
-+	if (
-+		imported !== undefined &&
 +		(HOOK_NAMES.has(imported) || (ctx.signalReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
-+	) {
-+		return imported;
-+	}
-@@ -20996,7 +21003,7 @@ function rewriteHookCalls(node, ctx, componentName, localRoot = false) {
--			// enforced by rejectHookInJsLoop.
--			const isBuiltin =
--				(HOOK_NAMES.has(name) ||
+ 	) {
+ 		return imported;
+ 	}
+@@ -21966,7 +21973,7 @@ function rewriteHookCalls(node, ctx, componentName, localRoot = false) {
+ 			// enforced by rejectHookInJsLoop.
+ 			const isBuiltin =
+ 				(HOOK_NAMES.has(name) ||
 -					(ctx.nativeReads &&
--						hookRuntimeImportedName !== undefined &&
--						NATIVE_SIGNAL_HOOK_NAMES.has(name))) &&
--				(generated ||
-+			// enforced by rejectHookInJsLoop.
-+			const isBuiltin =
-+				(HOOK_NAMES.has(name) ||
 +					(ctx.signalReads &&
-+						hookRuntimeImportedName !== undefined &&
-+						NATIVE_SIGNAL_HOOK_NAMES.has(name))) &&
-+				(generated ||
-@@ -21127,7 +21134,7 @@ function rewriteHookCalls(node, ctx, componentName, localRoot = false) {
--		) {
--			const name = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
--			const isBuiltin =
+ 						hookRuntimeImportedName !== undefined &&
+ 						NATIVE_SIGNAL_HOOK_NAMES.has(name))) &&
+ 				(generated ||
+@@ -22097,7 +22104,7 @@ function rewriteHookCalls(node, ctx, componentName, localRoot = false) {
+ 		) {
+ 			const name = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
+ 			const isBuiltin =
 -				HOOK_NAMES.has(name) || (ctx.nativeReads && NATIVE_SIGNAL_HOOK_NAMES.has(name));
--			const isServerUse = name === 'use' && ctx.mode === 'server';
--			if (isBuiltin || isServerUse) {
--				if (isBuiltin) {
-+		) {
-+			const name = n._octaneImportedHook ?? n._octaneHookRuntimeImportedHook;
-+			const isBuiltin =
 +				HOOK_NAMES.has(name) || (ctx.signalReads && NATIVE_SIGNAL_HOOK_NAMES.has(name));
-+			const isServerUse = name === 'use' && ctx.mode === 'server';
-+			if (isBuiltin || isServerUse) {
-+				if (isBuiltin) {
+ 			const isServerUse = name === 'use' && ctx.mode === 'server';
+ 			if (isBuiltin || isServerUse) {
+ 				if (isBuiltin) {
 diff --git a/dist/compiler/native-read-diagnostics.js b/dist/compiler/native-read-diagnostics.js
-index 89c9b5a..3baf9e9 100644
+index 7b2acff..d3356b4 100644
 --- a/dist/compiler/native-read-diagnostics.js
 +++ b/dist/compiler/native-read-diagnostics.js
-@@ -100,9 +100,12 @@ export function assertNativeReadOptions(options) {
--	if (
--		options?.nativeReads === true &&
--		options.renderer?.target != null &&
+@@ -149,9 +149,12 @@ export function assertNativeReadOptions(options) {
+ 	if (
+ 		options?.nativeReads === true &&
+ 		options.renderer?.target != null &&
 -		options.renderer.target !== 'dom'
--	) {
--		throw new Error('Octane native signal reads support only the DOM client and server.');
--	}
-+	if (
-+		options?.nativeReads === true &&
-+		options.renderer?.target != null &&
 +		options.renderer.target !== 'dom' &&
 +		options.renderer.target !== 'universal'
-+	) {
+ 	) {
+-		throw new Error('Octane native signal reads support only the DOM client and server.');
 +		throw new Error(
 +			'Octane native signal reads support only the DOM client, DOM server, and universal renderers.',
 +		);
-+	}
+ 	}
  }
-
-@@ -121,11 +124,11 @@ export function analyzeNativeReadDiagnostics(ast, source, filename, options = {}
--			filename,
--			rendererBoundaries: options.rendererBoundaries,
--		});
+ 
+@@ -200,11 +203,11 @@ export function analyzeNativeReadDiagnostics(ast, source, filename, options = {}
+ 			filename,
+ 			rendererBoundaries: options.rendererBoundaries,
+ 		});
 -		const unsupported = boundaries.find(
 -			(boundary) =>
 -				boundary.childRenderer !== 'dom' &&
 -				options.rendererRegistry?.[boundary.childRenderer]?.target !== 'dom',
 -		);
--		if (unsupported)
--			return [
--				nativeReadDiagnostic(
-+			filename,
-+			rendererBoundaries: options.rendererBoundaries,
-+		});
 +		const unsupported = boundaries.find((boundary) => {
 +			if (boundary.childRenderer === 'dom') return false;
 +			const target = options.rendererRegistry?.[boundary.childRenderer]?.target;
 +			return target !== 'dom' && target !== 'universal';
 +		});
-+		if (unsupported)
-+			return [
-+				nativeReadDiagnostic(
+ 		if (unsupported)
+ 			return [
+ 				nativeReadDiagnostic(
 diff --git a/dist/compiler/slot-hooks.js b/dist/compiler/slot-hooks.js
-index 90848a6..474c2bb 100644
+index e4c9bfb..7ca6112 100644
 --- a/dist/compiler/slot-hooks.js
 +++ b/dist/compiler/slot-hooks.js
-@@ -1034,12 +1034,12 @@ function walk(node, owner, st) {
--		}
--		const imported =
--			node._octaneImportedHook ??
+@@ -1044,12 +1044,12 @@ function walk(node, owner, st) {
+ 		}
+ 		const imported =
+ 			node._octaneImportedHook ??
 -			(st.nativeReads ? node._octaneHookRuntimeImportedHook : undefined);
--		collectStateGetterEdit(node, imported, st);
--		if (
--			!st.manualSlots &&
--			imported &&
--			(HOOK_NAMES.has(imported) || (st.nativeReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
--		) {
--			const local =
--				node.callee?.type === 'Identifier'
-+		}
-+		const imported =
-+			node._octaneImportedHook ??
 +			(st.signalReads ? node._octaneHookRuntimeImportedHook : undefined);
-+		collectStateGetterEdit(node, imported, st);
-+		if (
-+			!st.manualSlots &&
-+			imported &&
+ 		collectStateGetterEdit(node, imported, st);
+ 		if (
+ 			!st.manualSlots &&
+ 			imported &&
+-			(HOOK_NAMES.has(imported) || (st.nativeReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
 +			(HOOK_NAMES.has(imported) || (st.signalReads && NATIVE_SIGNAL_HOOK_NAMES.has(imported)))
-+		) {
-+			const local =
-+				node.callee?.type === 'Identifier'
-@@ -1255,7 +1255,9 @@ export function slotHooks(source, id, options) {
--			HOOK_NAMES.has(name),
--		);
--	const manualProviders = options?.manualSlots ? findManualHookProviders(ast) : new Map();
+ 		) {
+ 			const local =
+ 				node.callee?.type === 'Identifier'
+@@ -1265,7 +1265,9 @@ export function slotHooks(source, id, options) {
+ 			HOOK_NAMES.has(name),
+ 		);
+ 	const manualProviders = options?.manualSlots ? findManualHookProviders(ast) : new Map();
 -	const nativeReadActivation = options?.nativeReads === true && importsNativeRenderer(ast);
--	// Native signal reads exist only for the DOM client and server renderers.
--	const signalHookSites =
--		(options?.renderer?.target ?? 'dom') === 'dom' && options?.universalRuntime == null;
-+			HOOK_NAMES.has(name),
-+		);
-+	const manualProviders = options?.manualSlots ? findManualHookProviders(ast) : new Map();
 +	const universalTarget = options?.renderer?.target === 'universal';
 +	const nativeReadActivation =
 +		options?.nativeReads === true && !universalTarget && importsNativeRenderer(ast);
-+	// Native signal reads exist only for the DOM client and server renderers.
-+	const signalHookSites =
-+		(options?.renderer?.target ?? 'dom') === 'dom' && options?.universalRuntime == null;
-@@ -1350,7 +1352,8 @@ export function slotHooks(source, id, options) {
--			]),
--		),
--		manualSlots: options?.manualSlots === true,
+ 	// Native signal reads exist only for the DOM client and server renderers.
+ 	const signalHookSites =
+ 		(options?.renderer?.target ?? 'dom') === 'dom' && options?.universalRuntime == null;
+@@ -1376,7 +1378,8 @@ export function slotHooks(source, id, options) {
+ 			]),
+ 		),
+ 		manualSlots: options?.manualSlots === true,
 -		nativeReads: options?.nativeReads === true,
--		signalHookSites,
--		locals: importInfo.locals,
--		source,
-+			]),
-+		),
-+		manualSlots: options?.manualSlots === true,
 +		nativeReads: options?.nativeReads === true && !universalTarget,
 +		signalReads: options?.nativeReads === true,
-+		signalHookSites,
-+		locals: importInfo.locals,
-+		source,
-@@ -1459,7 +1462,9 @@ export function slotHooks(source, id, options) {
--				? 'enableServerSignalBindings'
--				: nativeReadActivation
--					? 'enableSignalBindings'
--					: '__enableSignalDocument';
--		const local = allocSlotName(st, `_$${imported}`);
--		let specifiers = signalHelperImports.get(request);
--		if (specifiers === undefined) signalHelperImports.set(request, (specifiers = []));
-+				? 'enableServerSignalBindings'
-+				: nativeReadActivation
-+					? 'enableSignalBindings'
+ 		signalHookSites,
+ 		locals: importInfo.locals,
+ 		source,
+@@ -1489,6 +1492,8 @@ export function slotHooks(source, id, options) {
+ 				? 'enableServerSignalBindings'
+ 				: nativeReadActivation
+ 					? 'enableSignalBindings'
 +					: universalTarget
 +						? '__enableUniversalSignalDocument'
-+						: '__enableSignalDocument';
-+		const local = allocSlotName(st, `_$${imported}`);
-+		let specifiers = signalHelperImports.get(request);
-+		if (specifiers === undefined) signalHelperImports.set(request, (specifiers = []));
-diff --git a/dist/node/runtime.js b/dist/node/runtime.js
-index 927d060..d311ac9 100644
---- a/dist/node/runtime.js
-+++ b/dist/node/runtime.js
-@@ -185,6 +185,7 @@ import {
-   createNativeReadDriver,
-   rebaseNativeRead
- } from "./signals/native-read-client.js";
-+import { registerLocalSignalHook } from "./signals/local-hook.js";
- import {
-   validateNativeReadWitness
- } from "./signals/native-read-collector.js";
-@@ -8398,6 +8399,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
+ 					: '__enableSignalDocument';
+ 		const local = allocSlotName(st, `_$${imported}`);
+ 		let specifiers = signalHelperImports.get(request);
+diff --git a/dist/node/runtime/hooks.js b/dist/node/runtime/hooks.js
+index 76f5deb..96fd3ac 100644
+--- a/dist/node/runtime/hooks.js
++++ b/dist/node/runtime/hooks.js
+@@ -1,3 +1,4 @@
++import { registerLocalSignalHook } from "../signals/local-hook.js";
+ const __octaneDev = process.env.NODE_ENV !== "production";
+ import {} from "./view-transition.js";
+ import { resolveHookPath } from "../hook-slot-cache.js";
+@@ -102,6 +103,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
    }
    return cell.nativeValue;
  }
 +registerLocalSignalHook(() => CURRENT_SCOPE === null ? null : nativeLocalHook);
- function useState(initial, slot) {
-   const s = readStateHook(initial, slot, arguments.length === 1);
-   return [s.value, s.setter];
-@@ -9532,6 +9534,8 @@ function renderClientContextProvider(context, props, renderScope) {
-       ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, dialect);
-     }
-     renderSharedBody(childrenAsBody(children), void 0, scope, void 0);
-+  } else {
-+    resetScopeChildren(scope);
-   }
+ function applyHookUpdate(state, action, reducer) {
+   return reducer !== null ? reducer(state, action) : typeof action === "function" ? action(state) : action;
+ }
+diff --git a/dist/node/runtime/templates.js b/dist/node/runtime/templates.js
+index 860aacd..af91a29 100644
+--- a/dist/node/runtime/templates.js
++++ b/dist/node/runtime/templates.js
+@@ -388,6 +388,7 @@ function bag16(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, $ = 0, next
+   return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, __journalWindow: 0, $, next, [BINDING_BAG_ARITY]: 16 });
+ }
+ function bagOf(s, r, bag) {
++  bag[BINDING_BAG_ARITY] = -1;
+   return commitBag(s, r, bag);
  }
- let SHARED_BODY_SCOPE = null;
+ function coerceText(value) {
 diff --git a/dist/node/signals/client.js b/dist/node/signals/client.js
 index 21a39c3..3f85700 100644
 --- a/dist/node/signals/client.js
@@ -497,27 +406,22 @@ index 21a39c3..3f85700 100644
 @@ -1,11 +1,11 @@
  export * from "./index.js";
 -import { nativeLocalHook } from "../runtime.js";
--import { createLocalScope } from "./engine.js";
--function disposeLocalSignal(cell) {
--  cell.scope.dispose();
--}
--function useSignal$(initial, slot) {
--  const cell = nativeLocalHook(
-+import { createLocalScope } from "./engine.js";
+ import { createLocalScope } from "./engine.js";
 +import { localSignalHook } from "./local-hook.js";
-+function disposeLocalSignal(cell) {
-+  cell.scope.dispose();
-+}
-+function useSignal$(initial, slot) {
+ function disposeLocalSignal(cell) {
+   cell.scope.dispose();
+ }
+ function useSignal$(initial, slot) {
+-  const cell = nativeLocalHook(
 +  const cell = localSignalHook(
      "useSignal$",
      () => {
        const value = typeof initial === "function" ? initial() : initial;
 diff --git a/dist/node/signals/document-owner.js b/dist/node/signals/document-owner.js
-index 35db8d5..aeeaabc 100644
+index 3b50394..e809030 100644
 --- a/dist/node/signals/document-owner.js
 +++ b/dist/node/signals/document-owner.js
-@@ -28,9 +28,8 @@ function enableSignalDocument(abi = 1) {
+@@ -30,9 +30,8 @@ function enableSignalDocument(abi = 1) {
    if (defaultInstalled) return;
    defaultInstalled = true;
    signalOwnerFrame = { enter: enterSynchronousSignalOwner, restore: restoreSynchronousSignalOwner };
@@ -530,11 +434,11 @@ index 35db8d5..aeeaabc 100644
  function installStreamedSignalOwnerActivator(activate) {
    if (streamedSignalOwnerActivator !== void 0) {
 diff --git a/dist/node/signals/facade.js b/dist/node/signals/facade.js
-index 11ec297..575233b 100644
+index 5b5554e..1deabb0 100644
 --- a/dist/node/signals/facade.js
 +++ b/dist/node/signals/facade.js
 @@ -326,7 +326,7 @@ class Descriptor {
-   }
+   lexical;
    /** The owner a use resolves for: its reader, or for a lexical handle its declaring owner. */
    reader() {
 -    return this.lexical === this ? this.owner : requireOwner();
@@ -614,7 +518,7 @@ index 0000000..ff5eb43
 +  universalSignalDocument
 +};
 diff --git a/dist/node/universal-core.js b/dist/node/universal-core.js
-index aa045ee..38d6b2b 100644
+index 8c89dbd..ff1defa 100644
 --- a/dist/node/universal-core.js
 +++ b/dist/node/universal-core.js
 @@ -17,6 +17,10 @@ import {
@@ -762,7 +666,7 @@ index aa045ee..38d6b2b 100644
  function universalChildren(renderer, render) {
    assertRendererId(renderer, "universalChildren renderer");
    if (typeof render !== "function") throw new TypeError("universalChildren expected a function.");
-@@ -863,6 +994,7 @@ function draftOwner(record, parent, replayPath) {
+@@ -856,6 +987,7 @@ function draftOwner(record, parent, replayPath) {
      boundaryThenable: record.boundaryThenable,
      isBoundary: record.isBoundary,
      canHandleSuspense: record.canHandleSuspense,
@@ -770,7 +674,7 @@ index aa045ee..38d6b2b 100644
      visibility: parent?.visibility ?? record.visibility,
      contextStable: null
    };
-@@ -1033,6 +1165,7 @@ function executeOwner(owner, build, initialRenderCount = 0) {
+@@ -1066,6 +1198,7 @@ function executeOwner(owner, build, initialRenderCount = 0) {
      owner.contextStable = null;
      owner.needsRender = false;
      owner.implicitSlot = 0;
@@ -778,33 +682,29 @@ index aa045ee..38d6b2b 100644
      const previousOwner = CURRENT_OWNER;
      const previousAttemptOwner = attempt.owner;
      CURRENT_OWNER = owner;
-@@ -1044,13 +1177,18 @@ function executeOwner(owner, build, initialRenderCount = 0) {
+@@ -1077,13 +1210,18 @@ function executeOwner(owner, build, initialRenderCount = 0) {
      const profileFrame = typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && component !== null ? __profileBeginRender(owner.record, component, owner.record.mounted) : null;
      let didThrow = false;
      let thrown;
--    try {
--      output = build();
--    } catch (error) {
--      didThrow = true;
--      thrown = error;
--      throw error;
--    } finally {
 +    const signalOwner = universalSignalOwner(owner.record);
 +    const previousReadObserver = setNativeReadObserver(observeUniversalSignalRead);
 +    const writeGuard = beginNativeWriteGuard();
-+    try {
+     try {
+-      output = build();
 +      output = runWithSignalOwner(signalOwner, build);
-+    } catch (error) {
-+      didThrow = true;
+     } catch (error) {
+       didThrow = true;
+-      thrown = error;
+-      throw error;
 +      thrown = isThenable(error) ? new UniversalSuspense(error) : error;
 +      throw thrown;
-+    } finally {
+     } finally {
 +      endNativeWriteGuard(writeGuard);
 +      setNativeReadObserver(previousReadObserver);
        if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
          __profileEndRender(profileFrame, didThrow, thrown);
        }
-@@ -1214,6 +1352,8 @@ function disposeUncommittedDraft(owner) {
+@@ -1247,6 +1385,8 @@ function disposeUncommittedDraft(owner) {
      owner.record.componentProps = null;
      owner.record.range = null;
      owner.record.updates.clear();
@@ -813,7 +713,7 @@ index aa045ee..38d6b2b 100644
      for (const hook of owner.hooks.values()) {
        if (hook.kind === "effect-event") hook.cell.active = false;
      }
-@@ -3048,6 +3188,7 @@ function tryCreateCompactTemplateUpdateTransaction(root, blueprint, attempt, com
+@@ -3081,6 +3221,7 @@ function tryCreateCompactTemplateUpdateTransaction(root, blueprint, attempt, com
        owner.componentProps = draftOwner2.componentProps;
        owner.componentRevision = draftOwner2.componentRevision;
        owner.hooks = draftOwner2.hooks;
@@ -821,7 +721,7 @@ index aa045ee..38d6b2b 100644
        for (const [slot, applied] of draftOwner2.appliedUpdates) {
          const queue = owner.updates.get(slot);
          if (queue !== applied.queue || applied.lane) continue;
-@@ -3514,6 +3655,86 @@ function scheduleOwner(owner, slot) {
+@@ -3628,6 +3769,86 @@ function scheduleOwner(owner, slot) {
    }
    owner.root.scheduleOwned(owner);
  }
@@ -908,7 +808,7 @@ index aa045ee..38d6b2b 100644
  function currentDraftOwner() {
    currentAttempt();
    const owner = activateLazyLeafOwner();
-@@ -4628,15 +4849,35 @@ function use(usable) {
+@@ -4742,15 +4963,35 @@ function use(usable) {
  function useImperativeHandle(ref, create, deps, slot) {
    useLayoutEffect(
      () => {
@@ -918,9 +818,6 @@ index aa045ee..38d6b2b 100644
 -      return () => {
 -        if (typeof ref === "function") ref(null);
 -        else if (ref !== null) ref.current = null;
--      };
--    },
--    deps,
 +      const cleanups = [];
 +      let value;
 +      let initialized = false;
@@ -941,32 +838,32 @@ index aa045ee..38d6b2b 100644
 +          target.current = value;
 +          cleanups.push(() => { target.current = null; });
 +        }
-+      };
+       };
 +      try {
 +        attach(ref);
 +      } catch (error) {
 +        try { runCommitTasks(cleanups); } finally { throw error; }
 +      }
 +      return () => runCommitTasks(cleanups);
-+    },
+     },
+-    deps,
 +    deps == null ? deps : [...deps, ref],
      slot
    );
  }
-@@ -5631,9 +5872,9 @@ class UniversalRootImpl {
+@@ -5745,9 +5986,9 @@ class UniversalRootImpl {
      }
      let result;
      try {
 -      result = event.handler(payload);
--    } catch (error) {
--      if (!routeUniversalOwnerError(event.owner, error)) throw error;
 +      result = runWithSignalOwner(universalSignalOwner(event.owner), () => event.handler(payload));
-+    } catch (error) {
+     } catch (error) {
+-      if (!routeUniversalOwnerError(event.owner, error)) throw error;
 +      if (!routeUniversalOwnerError(event.owner, error) && !reportUniversalUncaughtError(this, error)) throw error;
      }
      return result;
    }
-@@ -6204,6 +6445,8 @@ class UniversalRootImpl {
+@@ -6318,6 +6559,8 @@ class UniversalRootImpl {
        draft.record.componentProps = null;
        draft.record.range = null;
        draft.record.updates.clear();
@@ -975,7 +872,7 @@ index aa045ee..38d6b2b 100644
        for (const hook of draft.hooks.values()) {
          if (hook.kind === "effect-event") hook.cell.active = false;
        }
-@@ -6721,6 +6964,7 @@ class UniversalRootImpl {
+@@ -6836,6 +7079,7 @@ class UniversalRootImpl {
        record.componentRevision = draft.componentRevision;
        record.parent = draft.parent?.record ?? null;
        record.hooks = draft.hooks;
@@ -983,7 +880,7 @@ index aa045ee..38d6b2b 100644
        record.effectOrder = [...draft.seenEffects];
        for (let index = 0; index < draft.seenEffects.length; index++) {
          draft.seenEffects[index].previous = null;
-@@ -8369,6 +8613,8 @@ class UniversalRootImpl {
+@@ -8484,6 +8728,8 @@ class UniversalRootImpl {
            owner.componentProps = null;
            owner.range = null;
            owner.updates.clear();
@@ -992,7 +889,7 @@ index aa045ee..38d6b2b 100644
          }
          for (const draft of draftOwnersParentFirst) {
            const record = draft.record;
-@@ -8378,6 +8624,7 @@ class UniversalRootImpl {
+@@ -8493,6 +8739,7 @@ class UniversalRootImpl {
              record.parent = draft.parent?.record ?? null;
            }
            record.hooks = draft.hooks;
@@ -1000,7 +897,7 @@ index aa045ee..38d6b2b 100644
            record.effectOrder = [...draft.seenEffects];
            for (let index = 0; index < draft.seenEffects.length; index++) {
              draft.seenEffects[index].previous = null;
-@@ -8889,6 +9136,8 @@ class UniversalRootImpl {
+@@ -9004,6 +9251,8 @@ class UniversalRootImpl {
            owner.componentProps = null;
            owner.range = null;
            owner.updates.clear();
@@ -1009,7 +906,7 @@ index aa045ee..38d6b2b 100644
          }
          const deactivatedRegionCells = /* @__PURE__ */ new Set();
          for (const bridge of regionBridges) {
-@@ -10105,6 +10354,7 @@ function createObjectDriver(renderer = "object") {
+@@ -10220,6 +10469,7 @@ function createObjectDriver(renderer = "object") {
    };
  }
  export {
@@ -1025,14 +922,11 @@ index 55ac9b6..399633e 100644
  import {
    universalContext
  } from "./universal-core.js";
--import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
--import { CONTEXT_TAG } from "./runtime-tags.js";
--import { registerContext } from "./context-identity.js";
 +export { Children } from "./universal-core.js";
 +import { enableUniversalSignalDocument } from "./signals/universal-owner.js";
-+import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
-+import { CONTEXT_TAG } from "./runtime-tags.js";
-+import { registerContext } from "./context-identity.js";
+ import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
+ import { CONTEXT_TAG } from "./runtime-tags.js";
+ import { registerContext } from "./context-identity.js";
 +enableUniversalSignalDocument();
  // @__NO_SIDE_EFFECTS__
  function createContext(defaultValue) {
@@ -1051,35 +945,35 @@ index 6427a01..8049b78 100644
  export {
    createContext,
    createSubSlot,
-diff --git a/dist/runtime.js b/dist/runtime.js
-index 67ace09..afeb8ea 100644
---- a/dist/runtime.js
-+++ b/dist/runtime.js
-@@ -184,6 +184,7 @@ import {
-   createNativeReadDriver,
-   rebaseNativeRead
- } from "./signals/native-read-client.js";
-+import { registerLocalSignalHook } from "./signals/local-hook.js";
- import {
-   validateNativeReadWitness
- } from "./signals/native-read-collector.js";
-@@ -8397,6 +8398,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
+diff --git a/dist/runtime/hooks.js b/dist/runtime/hooks.js
+index 3365680..b369f2d 100644
+--- a/dist/runtime/hooks.js
++++ b/dist/runtime/hooks.js
+@@ -1,3 +1,4 @@
++import { registerLocalSignalHook } from "../signals/local-hook.js";
+ import {} from "./view-transition.js";
+ import { resolveHookPath } from "../hook-slot-cache.js";
+ import { __profileResolveHook, __profileSchedule, __profileCacheHit } from "../profiling.js";
+@@ -101,6 +102,7 @@ function nativeLocalHook(name, initialize, dispose, slot) {
    }
    return cell.nativeValue;
  }
 +registerLocalSignalHook(() => CURRENT_SCOPE === null ? null : nativeLocalHook);
- function useState(initial, slot) {
-   const s = readStateHook(initial, slot, arguments.length === 1);
-   return [s.value, s.setter];
-@@ -9531,6 +9533,8 @@ function renderClientContextProvider(context, props, renderScope) {
-       ensureHooks(scope).set(CHILDREN_DIALECT_SLOT, dialect);
-     }
-     renderSharedBody(childrenAsBody(children), void 0, scope, void 0);
-+  } else {
-+    resetScopeChildren(scope);
-   }
+ function applyHookUpdate(state, action, reducer) {
+   return reducer !== null ? reducer(state, action) : typeof action === "function" ? action(state) : action;
+ }
+diff --git a/dist/runtime/templates.js b/dist/runtime/templates.js
+index 5aa86e8..b700681 100644
+--- a/dist/runtime/templates.js
++++ b/dist/runtime/templates.js
+@@ -387,6 +387,7 @@ function bag16(s, r, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, $ = 0, next
+   return commitBag(s, r, { a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, __journalWindow: 0, $, next, [BINDING_BAG_ARITY]: 16 });
  }
- let SHARED_BODY_SCOPE = null;
+ function bagOf(s, r, bag) {
++  bag[BINDING_BAG_ARITY] = -1;
+   return commitBag(s, r, bag);
+ }
+ function coerceText(value) {
 diff --git a/dist/signals/client.d.ts b/dist/signals/client.d.ts
 index 6388c2f..f9e9862 100644
 --- a/dist/signals/client.d.ts
@@ -1097,27 +991,22 @@ index 21a39c3..3f85700 100644
 @@ -1,11 +1,11 @@
  export * from "./index.js";
 -import { nativeLocalHook } from "../runtime.js";
--import { createLocalScope } from "./engine.js";
--function disposeLocalSignal(cell) {
--  cell.scope.dispose();
--}
--function useSignal$(initial, slot) {
--  const cell = nativeLocalHook(
-+import { createLocalScope } from "./engine.js";
+ import { createLocalScope } from "./engine.js";
 +import { localSignalHook } from "./local-hook.js";
-+function disposeLocalSignal(cell) {
-+  cell.scope.dispose();
-+}
-+function useSignal$(initial, slot) {
+ function disposeLocalSignal(cell) {
+   cell.scope.dispose();
+ }
+ function useSignal$(initial, slot) {
+-  const cell = nativeLocalHook(
 +  const cell = localSignalHook(
      "useSignal$",
      () => {
        const value = typeof initial === "function" ? initial() : initial;
 diff --git a/dist/signals/document-owner.js b/dist/signals/document-owner.js
-index 4ad3aca..b2a5d0e 100644
+index 6f2891f..557d6cc 100644
 --- a/dist/signals/document-owner.js
 +++ b/dist/signals/document-owner.js
-@@ -27,9 +27,8 @@ function enableSignalDocument(abi = 1) {
+@@ -29,9 +29,8 @@ function enableSignalDocument(abi = 1) {
    if (defaultInstalled) return;
    defaultInstalled = true;
    signalOwnerFrame = { enter: enterSynchronousSignalOwner, restore: restoreSynchronousSignalOwner };
@@ -1130,11 +1019,11 @@ index 4ad3aca..b2a5d0e 100644
  function installStreamedSignalOwnerActivator(activate) {
    if (streamedSignalOwnerActivator !== void 0) {
 diff --git a/dist/signals/facade.js b/dist/signals/facade.js
-index 478c29d..b6b18b4 100644
+index 808e4ec..0ab799a 100644
 --- a/dist/signals/facade.js
 +++ b/dist/signals/facade.js
 @@ -325,7 +325,7 @@ class Descriptor {
-   }
+   lexical;
    /** The owner a use resolves for: its reader, or for a lexical handle its declaring owner. */
    reader() {
 -    return this.lexical === this ? this.owner : requireOwner();
@@ -1264,7 +1153,7 @@ index 0000000..ff5eb43
 +  universalSignalDocument
 +};
 diff --git a/dist/universal-core.d.ts b/dist/universal-core.d.ts
-index ddf95b3..3a6b744 100644
+index 15ecadf..716ac7f 100644
 --- a/dist/universal-core.d.ts
 +++ b/dist/universal-core.d.ts
 @@ -791,9 +791,8 @@ export declare function lazy<C extends UniversalComponent<any>>(load: () => Prom
@@ -1286,7 +1175,7 @@ index ddf95b3..3a6b744 100644
 +
 +export declare const Children: { toArray(children: UniversalRenderable): UniversalRenderable[]; map(children: UniversalRenderable, fn: (child: UniversalRenderable, index: number) => UniversalRenderable): UniversalRenderable[]; };
 diff --git a/dist/universal-core.js b/dist/universal-core.js
-index aa045ee..38d6b2b 100644
+index 8c89dbd..ff1defa 100644
 --- a/dist/universal-core.js
 +++ b/dist/universal-core.js
 @@ -17,6 +17,10 @@ import {
@@ -1434,7 +1323,7 @@ index aa045ee..38d6b2b 100644
  function universalChildren(renderer, render) {
    assertRendererId(renderer, "universalChildren renderer");
    if (typeof render !== "function") throw new TypeError("universalChildren expected a function.");
-@@ -863,6 +994,7 @@ function draftOwner(record, parent, replayPath) {
+@@ -856,6 +987,7 @@ function draftOwner(record, parent, replayPath) {
      boundaryThenable: record.boundaryThenable,
      isBoundary: record.isBoundary,
      canHandleSuspense: record.canHandleSuspense,
@@ -1442,7 +1331,7 @@ index aa045ee..38d6b2b 100644
      visibility: parent?.visibility ?? record.visibility,
      contextStable: null
    };
-@@ -1033,6 +1165,7 @@ function executeOwner(owner, build, initialRenderCount = 0) {
+@@ -1066,6 +1198,7 @@ function executeOwner(owner, build, initialRenderCount = 0) {
      owner.contextStable = null;
      owner.needsRender = false;
      owner.implicitSlot = 0;
@@ -1450,33 +1339,29 @@ index aa045ee..38d6b2b 100644
      const previousOwner = CURRENT_OWNER;
      const previousAttemptOwner = attempt.owner;
      CURRENT_OWNER = owner;
-@@ -1044,13 +1177,18 @@ function executeOwner(owner, build, initialRenderCount = 0) {
+@@ -1077,13 +1210,18 @@ function executeOwner(owner, build, initialRenderCount = 0) {
      const profileFrame = typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__ && component !== null ? __profileBeginRender(owner.record, component, owner.record.mounted) : null;
      let didThrow = false;
      let thrown;
--    try {
--      output = build();
--    } catch (error) {
--      didThrow = true;
--      thrown = error;
--      throw error;
--    } finally {
 +    const signalOwner = universalSignalOwner(owner.record);
 +    const previousReadObserver = setNativeReadObserver(observeUniversalSignalRead);
 +    const writeGuard = beginNativeWriteGuard();
-+    try {
+     try {
+-      output = build();
 +      output = runWithSignalOwner(signalOwner, build);
-+    } catch (error) {
-+      didThrow = true;
+     } catch (error) {
+       didThrow = true;
+-      thrown = error;
+-      throw error;
 +      thrown = isThenable(error) ? new UniversalSuspense(error) : error;
 +      throw thrown;
-+    } finally {
+     } finally {
 +      endNativeWriteGuard(writeGuard);
 +      setNativeReadObserver(previousReadObserver);
        if (typeof __OCTANE_PROFILE_ENABLED__ !== "undefined" && __OCTANE_PROFILE_ENABLED__) {
          __profileEndRender(profileFrame, didThrow, thrown);
        }
-@@ -1214,6 +1352,8 @@ function disposeUncommittedDraft(owner) {
+@@ -1247,6 +1385,8 @@ function disposeUncommittedDraft(owner) {
      owner.record.componentProps = null;
      owner.record.range = null;
      owner.record.updates.clear();
@@ -1485,7 +1370,7 @@ index aa045ee..38d6b2b 100644
      for (const hook of owner.hooks.values()) {
        if (hook.kind === "effect-event") hook.cell.active = false;
      }
-@@ -3048,6 +3188,7 @@ function tryCreateCompactTemplateUpdateTransaction(root, blueprint, attempt, com
+@@ -3081,6 +3221,7 @@ function tryCreateCompactTemplateUpdateTransaction(root, blueprint, attempt, com
        owner.componentProps = draftOwner2.componentProps;
        owner.componentRevision = draftOwner2.componentRevision;
        owner.hooks = draftOwner2.hooks;
@@ -1493,7 +1378,7 @@ index aa045ee..38d6b2b 100644
        for (const [slot, applied] of draftOwner2.appliedUpdates) {
          const queue = owner.updates.get(slot);
          if (queue !== applied.queue || applied.lane) continue;
-@@ -3514,6 +3655,86 @@ function scheduleOwner(owner, slot) {
+@@ -3628,6 +3769,86 @@ function scheduleOwner(owner, slot) {
    }
    owner.root.scheduleOwned(owner);
  }
@@ -1580,7 +1465,7 @@ index aa045ee..38d6b2b 100644
  function currentDraftOwner() {
    currentAttempt();
    const owner = activateLazyLeafOwner();
-@@ -4628,15 +4849,35 @@ function use(usable) {
+@@ -4742,15 +4963,35 @@ function use(usable) {
  function useImperativeHandle(ref, create, deps, slot) {
    useLayoutEffect(
      () => {
@@ -1590,9 +1475,6 @@ index aa045ee..38d6b2b 100644
 -      return () => {
 -        if (typeof ref === "function") ref(null);
 -        else if (ref !== null) ref.current = null;
--      };
--    },
--    deps,
 +      const cleanups = [];
 +      let value;
 +      let initialized = false;
@@ -1613,32 +1495,32 @@ index aa045ee..38d6b2b 100644
 +          target.current = value;
 +          cleanups.push(() => { target.current = null; });
 +        }
-+      };
+       };
 +      try {
 +        attach(ref);
 +      } catch (error) {
 +        try { runCommitTasks(cleanups); } finally { throw error; }
 +      }
 +      return () => runCommitTasks(cleanups);
-+    },
+     },
+-    deps,
 +    deps == null ? deps : [...deps, ref],
      slot
    );
  }
-@@ -5631,9 +5872,9 @@ class UniversalRootImpl {
+@@ -5745,9 +5986,9 @@ class UniversalRootImpl {
      }
      let result;
      try {
 -      result = event.handler(payload);
--    } catch (error) {
--      if (!routeUniversalOwnerError(event.owner, error)) throw error;
 +      result = runWithSignalOwner(universalSignalOwner(event.owner), () => event.handler(payload));
-+    } catch (error) {
+     } catch (error) {
+-      if (!routeUniversalOwnerError(event.owner, error)) throw error;
 +      if (!routeUniversalOwnerError(event.owner, error) && !reportUniversalUncaughtError(this, error)) throw error;
      }
      return result;
    }
-@@ -6204,6 +6445,8 @@ class UniversalRootImpl {
+@@ -6318,6 +6559,8 @@ class UniversalRootImpl {
        draft.record.componentProps = null;
        draft.record.range = null;
        draft.record.updates.clear();
@@ -1647,7 +1529,7 @@ index aa045ee..38d6b2b 100644
        for (const hook of draft.hooks.values()) {
          if (hook.kind === "effect-event") hook.cell.active = false;
        }
-@@ -6721,6 +6964,7 @@ class UniversalRootImpl {
+@@ -6836,6 +7079,7 @@ class UniversalRootImpl {
        record.componentRevision = draft.componentRevision;
        record.parent = draft.parent?.record ?? null;
        record.hooks = draft.hooks;
@@ -1655,7 +1537,7 @@ index aa045ee..38d6b2b 100644
        record.effectOrder = [...draft.seenEffects];
        for (let index = 0; index < draft.seenEffects.length; index++) {
          draft.seenEffects[index].previous = null;
-@@ -8369,6 +8613,8 @@ class UniversalRootImpl {
+@@ -8484,6 +8728,8 @@ class UniversalRootImpl {
            owner.componentProps = null;
            owner.range = null;
            owner.updates.clear();
@@ -1664,7 +1546,7 @@ index aa045ee..38d6b2b 100644
          }
          for (const draft of draftOwnersParentFirst) {
            const record = draft.record;
-@@ -8378,6 +8624,7 @@ class UniversalRootImpl {
+@@ -8493,6 +8739,7 @@ class UniversalRootImpl {
              record.parent = draft.parent?.record ?? null;
            }
            record.hooks = draft.hooks;
@@ -1672,7 +1554,7 @@ index aa045ee..38d6b2b 100644
            record.effectOrder = [...draft.seenEffects];
            for (let index = 0; index < draft.seenEffects.length; index++) {
              draft.seenEffects[index].previous = null;
-@@ -8889,6 +9136,8 @@ class UniversalRootImpl {
+@@ -9004,6 +9251,8 @@ class UniversalRootImpl {
            owner.componentProps = null;
            owner.range = null;
            owner.updates.clear();
@@ -1681,7 +1563,7 @@ index aa045ee..38d6b2b 100644
          }
          const deactivatedRegionCells = /* @__PURE__ */ new Set();
          for (const bridge of regionBridges) {
-@@ -10105,6 +10354,7 @@ function createObjectDriver(renderer = "object") {
+@@ -10220,6 +10469,7 @@ function createObjectDriver(renderer = "object") {
    };
  }
  export {
@@ -1697,14 +1579,11 @@ index 55ac9b6..399633e 100644
  import {
    universalContext
  } from "./universal-core.js";
--import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
--import { CONTEXT_TAG } from "./runtime-tags.js";
--import { registerContext } from "./context-identity.js";
 +export { Children } from "./universal-core.js";
 +import { enableUniversalSignalDocument } from "./signals/universal-owner.js";
-+import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
-+import { CONTEXT_TAG } from "./runtime-tags.js";
-+import { registerContext } from "./context-identity.js";
+ import { registerRendererContext, renderRendererContextProvider } from "./renderer-bridge.js";
+ import { CONTEXT_TAG } from "./runtime-tags.js";
+ import { registerContext } from "./context-identity.js";
 +enableUniversalSignalDocument();
  // @__NO_SIDE_EFFECTS__
  function createContext(defaultValue) {