@pyreon/reactivity 0.14.0 → 0.15.0

package/lib/analysis/index.js.html

@@ -5386,7 +5386,7 @@ var drawChart = (function (exports) {
   </script>
   <script>
     /*<!--*/
-    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"1ddc8440-1","name":"batch.ts"},{"uid":"1ddc8440-3","name":"cell.ts"},{"uid":"1ddc8440-5","name":"scope.ts"},{"uid":"1ddc8440-7","name":"tracking.ts"},{"uid":"1ddc8440-9","name":"effect.ts"},{"uid":"1ddc8440-11","name":"computed.ts"},{"uid":"1ddc8440-13","name":"createSelector.ts"},{"uid":"1ddc8440-15","name":"debug.ts"},{"uid":"1ddc8440-17","name":"signal.ts"},{"uid":"1ddc8440-19","name":"store.ts"},{"uid":"1ddc8440-21","name":"reconcile.ts"},{"uid":"1ddc8440-23","name":"resource.ts"},{"uid":"1ddc8440-25","name":"watch.ts"},{"uid":"1ddc8440-27","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"1ddc8440-1":{"renderedLength":1079,"gzipLength":520,"brotliLength":0,"metaUid":"1ddc8440-0"},"1ddc8440-3":{"renderedLength":1636,"gzipLength":786,"brotliLength":0,"metaUid":"1ddc8440-2"},"1ddc8440-5":{"renderedLength":1977,"gzipLength":786,"brotliLength":0,"metaUid":"1ddc8440-4"},"1ddc8440-7":{"renderedLength":2227,"gzipLength":858,"brotliLength":0,"metaUid":"1ddc8440-6"},"1ddc8440-9":{"renderedLength":5389,"gzipLength":1826,"brotliLength":0,"metaUid":"1ddc8440-8"},"1ddc8440-11":{"renderedLength":4068,"gzipLength":1253,"brotliLength":0,"metaUid":"1ddc8440-10"},"1ddc8440-13":{"renderedLength":1810,"gzipLength":833,"brotliLength":0,"metaUid":"1ddc8440-12"},"1ddc8440-15":{"renderedLength":2469,"gzipLength":1092,"brotliLength":0,"metaUid":"1ddc8440-14"},"1ddc8440-17":{"renderedLength":2671,"gzipLength":1169,"brotliLength":0,"metaUid":"1ddc8440-16"},"1ddc8440-19":{"renderedLength":2879,"gzipLength":1056,"brotliLength":0,"metaUid":"1ddc8440-18"},"1ddc8440-21":{"renderedLength":2109,"gzipLength":867,"brotliLength":0,"metaUid":"1ddc8440-20"},"1ddc8440-23":{"renderedLength":1029,"gzipLength":475,"brotliLength":0,"metaUid":"1ddc8440-22"},"1ddc8440-25":{"renderedLength":1249,"gzipLength":582,"brotliLength":0,"metaUid":"1ddc8440-24"},"1ddc8440-27":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"1ddc8440-26"}},"nodeMetas":{"1ddc8440-0":{"id":"/src/batch.ts","moduleParts":{"index.js":"1ddc8440-1"},"imported":[],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-16"},{"uid":"1ddc8440-6"}]},"1ddc8440-2":{"id":"/src/cell.ts","moduleParts":{"index.js":"1ddc8440-3"},"imported":[],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-4":{"id":"/src/scope.ts","moduleParts":{"index.js":"1ddc8440-5"},"imported":[],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-10"},{"uid":"1ddc8440-8"}]},"1ddc8440-6":{"id":"/src/tracking.ts","moduleParts":{"index.js":"1ddc8440-7"},"imported":[{"uid":"1ddc8440-0"}],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-10"},{"uid":"1ddc8440-12"},{"uid":"1ddc8440-8"},{"uid":"1ddc8440-22"},{"uid":"1ddc8440-16"}]},"1ddc8440-8":{"id":"/src/effect.ts","moduleParts":{"index.js":"1ddc8440-9"},"imported":[{"uid":"1ddc8440-4"},{"uid":"1ddc8440-6"}],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-10"},{"uid":"1ddc8440-12"},{"uid":"1ddc8440-22"},{"uid":"1ddc8440-24"}]},"1ddc8440-10":{"id":"/src/computed.ts","moduleParts":{"index.js":"1ddc8440-11"},"imported":[{"uid":"1ddc8440-8"},{"uid":"1ddc8440-4"},{"uid":"1ddc8440-6"}],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-12":{"id":"/src/createSelector.ts","moduleParts":{"index.js":"1ddc8440-13"},"imported":[{"uid":"1ddc8440-8"},{"uid":"1ddc8440-6"}],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-14":{"id":"/src/debug.ts","moduleParts":{"index.js":"1ddc8440-15"},"imported":[],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-16"}]},"1ddc8440-16":{"id":"/src/signal.ts","moduleParts":{"index.js":"1ddc8440-17"},"imported":[{"uid":"1ddc8440-0"},{"uid":"1ddc8440-14"},{"uid":"1ddc8440-6"}],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-22"},{"uid":"1ddc8440-18"}]},"1ddc8440-18":{"id":"/src/store.ts","moduleParts":{"index.js":"1ddc8440-19"},"imported":[{"uid":"1ddc8440-16"}],"importedBy":[{"uid":"1ddc8440-26"},{"uid":"1ddc8440-20"}]},"1ddc8440-20":{"id":"/src/reconcile.ts","moduleParts":{"index.js":"1ddc8440-21"},"imported":[{"uid":"1ddc8440-18"}],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-22":{"id":"/src/resource.ts","moduleParts":{"index.js":"1ddc8440-23"},"imported":[{"uid":"1ddc8440-8"},{"uid":"1ddc8440-16"},{"uid":"1ddc8440-6"}],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-24":{"id":"/src/watch.ts","moduleParts":{"index.js":"1ddc8440-25"},"imported":[{"uid":"1ddc8440-8"}],"importedBy":[{"uid":"1ddc8440-26"}]},"1ddc8440-26":{"id":"/src/index.ts","moduleParts":{"index.js":"1ddc8440-27"},"imported":[{"uid":"1ddc8440-0"},{"uid":"1ddc8440-2"},{"uid":"1ddc8440-10"},{"uid":"1ddc8440-12"},{"uid":"1ddc8440-14"},{"uid":"1ddc8440-8"},{"uid":"1ddc8440-20"},{"uid":"1ddc8440-22"},{"uid":"1ddc8440-4"},{"uid":"1ddc8440-16"},{"uid":"1ddc8440-18"},{"uid":"1ddc8440-6"},{"uid":"1ddc8440-24"}],"importedBy":[],"isEntry":true}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
+    const data = {"version":2,"tree":{"name":"root","children":[{"name":"index.js","children":[{"name":"src","children":[{"uid":"22680e1b-1","name":"batch.ts"},{"uid":"22680e1b-3","name":"cell.ts"},{"uid":"22680e1b-5","name":"scope.ts"},{"uid":"22680e1b-7","name":"tracking.ts"},{"uid":"22680e1b-9","name":"effect.ts"},{"uid":"22680e1b-11","name":"computed.ts"},{"uid":"22680e1b-13","name":"createSelector.ts"},{"uid":"22680e1b-15","name":"debug.ts"},{"uid":"22680e1b-17","name":"signal.ts"},{"uid":"22680e1b-19","name":"store.ts"},{"uid":"22680e1b-21","name":"reconcile.ts"},{"uid":"22680e1b-23","name":"resource.ts"},{"uid":"22680e1b-25","name":"watch.ts"},{"uid":"22680e1b-27","name":"index.ts"}]}]}],"isRoot":true},"nodeParts":{"22680e1b-1":{"renderedLength":2427,"gzipLength":977,"brotliLength":0,"metaUid":"22680e1b-0"},"22680e1b-3":{"renderedLength":1636,"gzipLength":786,"brotliLength":0,"metaUid":"22680e1b-2"},"22680e1b-5":{"renderedLength":1977,"gzipLength":786,"brotliLength":0,"metaUid":"22680e1b-4"},"22680e1b-7":{"renderedLength":2227,"gzipLength":858,"brotliLength":0,"metaUid":"22680e1b-6"},"22680e1b-9":{"renderedLength":7391,"gzipLength":2397,"brotliLength":0,"metaUid":"22680e1b-8"},"22680e1b-11":{"renderedLength":4548,"gzipLength":1464,"brotliLength":0,"metaUid":"22680e1b-10"},"22680e1b-13":{"renderedLength":1810,"gzipLength":833,"brotliLength":0,"metaUid":"22680e1b-12"},"22680e1b-15":{"renderedLength":2469,"gzipLength":1092,"brotliLength":0,"metaUid":"22680e1b-14"},"22680e1b-17":{"renderedLength":2626,"gzipLength":1125,"brotliLength":0,"metaUid":"22680e1b-16"},"22680e1b-19":{"renderedLength":2879,"gzipLength":1056,"brotliLength":0,"metaUid":"22680e1b-18"},"22680e1b-21":{"renderedLength":2109,"gzipLength":867,"brotliLength":0,"metaUid":"22680e1b-20"},"22680e1b-23":{"renderedLength":1029,"gzipLength":475,"brotliLength":0,"metaUid":"22680e1b-22"},"22680e1b-25":{"renderedLength":1249,"gzipLength":582,"brotliLength":0,"metaUid":"22680e1b-24"},"22680e1b-27":{"renderedLength":0,"gzipLength":0,"brotliLength":0,"metaUid":"22680e1b-26"}},"nodeMetas":{"22680e1b-0":{"id":"/src/batch.ts","moduleParts":{"index.js":"22680e1b-1"},"imported":[],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-10"},{"uid":"22680e1b-16"},{"uid":"22680e1b-6"}]},"22680e1b-2":{"id":"/src/cell.ts","moduleParts":{"index.js":"22680e1b-3"},"imported":[],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-4":{"id":"/src/scope.ts","moduleParts":{"index.js":"22680e1b-5"},"imported":[],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-10"},{"uid":"22680e1b-8"}]},"22680e1b-6":{"id":"/src/tracking.ts","moduleParts":{"index.js":"22680e1b-7"},"imported":[{"uid":"22680e1b-0"}],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-10"},{"uid":"22680e1b-12"},{"uid":"22680e1b-8"},{"uid":"22680e1b-22"},{"uid":"22680e1b-16"}]},"22680e1b-8":{"id":"/src/effect.ts","moduleParts":{"index.js":"22680e1b-9"},"imported":[{"uid":"22680e1b-4"},{"uid":"22680e1b-6"}],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-10"},{"uid":"22680e1b-12"},{"uid":"22680e1b-22"},{"uid":"22680e1b-24"}]},"22680e1b-10":{"id":"/src/computed.ts","moduleParts":{"index.js":"22680e1b-11"},"imported":[{"uid":"22680e1b-0"},{"uid":"22680e1b-8"},{"uid":"22680e1b-4"},{"uid":"22680e1b-6"}],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-12":{"id":"/src/createSelector.ts","moduleParts":{"index.js":"22680e1b-13"},"imported":[{"uid":"22680e1b-8"},{"uid":"22680e1b-6"}],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-14":{"id":"/src/debug.ts","moduleParts":{"index.js":"22680e1b-15"},"imported":[],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-16"}]},"22680e1b-16":{"id":"/src/signal.ts","moduleParts":{"index.js":"22680e1b-17"},"imported":[{"uid":"22680e1b-0"},{"uid":"22680e1b-14"},{"uid":"22680e1b-6"}],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-22"},{"uid":"22680e1b-18"}]},"22680e1b-18":{"id":"/src/store.ts","moduleParts":{"index.js":"22680e1b-19"},"imported":[{"uid":"22680e1b-16"}],"importedBy":[{"uid":"22680e1b-26"},{"uid":"22680e1b-20"}]},"22680e1b-20":{"id":"/src/reconcile.ts","moduleParts":{"index.js":"22680e1b-21"},"imported":[{"uid":"22680e1b-18"}],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-22":{"id":"/src/resource.ts","moduleParts":{"index.js":"22680e1b-23"},"imported":[{"uid":"22680e1b-8"},{"uid":"22680e1b-16"},{"uid":"22680e1b-6"}],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-24":{"id":"/src/watch.ts","moduleParts":{"index.js":"22680e1b-25"},"imported":[{"uid":"22680e1b-8"}],"importedBy":[{"uid":"22680e1b-26"}]},"22680e1b-26":{"id":"/src/index.ts","moduleParts":{"index.js":"22680e1b-27"},"imported":[{"uid":"22680e1b-0"},{"uid":"22680e1b-2"},{"uid":"22680e1b-10"},{"uid":"22680e1b-12"},{"uid":"22680e1b-14"},{"uid":"22680e1b-8"},{"uid":"22680e1b-20"},{"uid":"22680e1b-22"},{"uid":"22680e1b-4"},{"uid":"22680e1b-16"},{"uid":"22680e1b-18"},{"uid":"22680e1b-6"},{"uid":"22680e1b-24"}],"importedBy":[],"isEntry":true}},"env":{"rollup":"4.23.0"},"options":{"gzip":true,"brotli":false,"sourcemap":false}};
 
     const run = () => {
       const width = window.innerWidth;

package/lib/index.js

@@ -1,24 +1,53 @@
 //#region src/batch.ts
+const __DEV__ = process.env.NODE_ENV !== "production";
 let batchDepth = 0;
-const setA = /* @__PURE__ */ new Set();
-const setB = /* @__PURE__ */ new Set();
-let pendingNotifications = setA;
+const pendingRecomputes = /* @__PURE__ */ new Set();
+const pendingEffects = /* @__PURE__ */ new Set();
+const _nextEffectPass = /* @__PURE__ */ new Set();
+let _visitedThisPass = null;
+const _recomputes = /* @__PURE__ */ new WeakSet();
+const MAX_PASSES = 32;
+/**
+* Mark a callback as a computed recompute (called from computed.ts at
+* creation time). Routes future enqueues into the recompute queue so they
+* settle before any effects fire.
+*/
+function _markRecompute(fn) {
+	_recomputes.add(fn);
+}
 function batch(fn) {
 	batchDepth++;
 	try {
 		fn();
 	} finally {
 		batchDepth--;
-		if (batchDepth === 0 && pendingNotifications.size > 0) {
+		if (batchDepth === 0 && (pendingRecomputes.size > 0 || pendingEffects.size > 0)) {
 			batchDepth = 1;
 			try {
-				while (pendingNotifications.size > 0) {
-					const flush = pendingNotifications;
-					pendingNotifications = flush === setA ? setB : setA;
-					for (const notify of flush) notify();
-					flush.clear();
+				let effectPass = 0;
+				while (pendingRecomputes.size > 0 || pendingEffects.size > 0) {
+					for (const r of pendingRecomputes) r();
+					pendingRecomputes.clear();
+					if (pendingEffects.size > 0) {
+						if (++effectPass > MAX_PASSES) {
+							if (__DEV__) console.warn(`[pyreon] batch effect flush exceeded MAX_PASSES (32) — possible infinite re-enqueue loop. ${pendingEffects.size} pending effects dropped. See packages/core/reactivity/src/batch.ts for the multi-pass flush contract.`);
+							break;
+						}
+						_visitedThisPass = /* @__PURE__ */ new Set();
+						for (const notify of pendingEffects) {
+							_visitedThisPass.add(notify);
+							notify();
+						}
+						pendingEffects.clear();
+						for (const next of _nextEffectPass) pendingEffects.add(next);
+						_nextEffectPass.clear();
+					}
 				}
 			} finally {
+				pendingRecomputes.clear();
+				pendingEffects.clear();
+				_nextEffectPass.clear();
+				_visitedThisPass = null;
 				batchDepth = 0;
 			}
 		}
@@ -28,7 +57,9 @@ function isBatching() {
 	return batchDepth > 0;
 }
 function enqueuePendingNotification(notify) {
-	pendingNotifications.add(notify);
+	if (_recomputes.has(notify)) pendingRecomputes.add(notify);
+	else if (_visitedThisPass !== null && _visitedThisPass.has(notify)) _nextEffectPass.add(notify);
+	else pendingEffects.add(notify);
 }
 /**
 * Returns a Promise that resolves after all currently-pending microtasks have flushed.
@@ -273,6 +304,17 @@ function runUntracked(fn) {
 //#endregion
 //#region src/effect.ts
 const _countSink$2 = globalThis;
+let _snapshotCapture = null;
+/**
+* Register a capture/restore pair so reactivity-layer effects (`_bind`,
+* `renderEffect`, `effect`) can preserve external context (e.g. the core
+* provide/useContext stack) across signal-driven re-runs. Called by
+* `@pyreon/core`'s context module at import time. Idempotent — calling again
+* replaces the previously registered hook.
+*/
+function setSnapshotCapture(hook) {
+	_snapshotCapture = hook;
+}
 let _cleanupCollector = null;
 /**
 * Register a cleanup function inside an effect. The cleanup runs:
@@ -295,11 +337,17 @@ function onCleanup(fn) {
 	if (_cleanupCollector) _cleanupCollector.push(fn);
 }
 let _innerEffectCollector = null;
-let _errorHandler = (err) => {
+const _errorBridge = globalThis;
+function _defaultErrorHandler(err) {
 	console.error("[pyreon] Unhandled effect error:", err);
+}
+let _userErrorHandler;
+const _errorHandler = (err) => {
+	(_userErrorHandler ?? _defaultErrorHandler)(err);
+	_errorBridge.__pyreon_report_error__?.(err, "effect");
 };
 function setErrorHandler(fn) {
-	_errorHandler = fn;
+	_userErrorHandler = fn;
 }
 /** Remove an effect from all dependency subscriber sets (local deps array). */
 function cleanupLocalDeps$1(deps, fn) {
@@ -312,7 +360,11 @@ function cleanupLocalDeps$1(deps, fn) {
 	}
 }
 function effect(fn) {
+	if (process.env.NODE_ENV !== "production") {
+		if (fn.constructor && fn.constructor.name === "AsyncFunction") console.warn("[pyreon] effect() received an async function. Signal reads after the first `await` are NOT tracked — only the synchronous prefix is. Read every tracked signal BEFORE any await, or split into separate effects, or use `watch(source, asyncCb)` for async-in-callback patterns.");
+	}
 	const scope = getCurrentScope();
+	const snapshot = _snapshotCapture ? _snapshotCapture.capture() : null;
 	let disposed = false;
 	let isFirstRun = true;
 	let cleanup;
@@ -347,7 +399,7 @@ function effect(fn) {
 	};
 	const run = () => {
 		if (disposed) return;
-		if (import.meta.env?.DEV === true) _countSink$2.__pyreon_count__?.("reactivity.effectRun");
+		if (process.env.NODE_ENV !== "production") _countSink$2.__pyreon_count__?.("reactivity.effectRun");
 		runCleanup();
 		const outerCollector = _innerEffectCollector;
 		const myInners = [];
@@ -357,7 +409,7 @@ function effect(fn) {
 			setDepsCollector(deps);
 			const collected = [];
 			_cleanupCollector = collected;
-			cleanup = withTracking(run, fn) || void 0;
+			cleanup = withTracking(run, isFirstRun || snapshot === null || _snapshotCapture === null ? fn : () => _snapshotCapture.restore(snapshot, fn)) || void 0;
 			_cleanupCollector = null;
 			if (collected.length > 0) cleanups = collected;
 			setDepsCollector(null);
@@ -411,9 +463,11 @@ function effect(fn) {
 function _bind(fn) {
 	const deps = [];
 	let disposed = false;
+	const snapshot = _snapshotCapture ? _snapshotCapture.capture() : null;
 	const run = () => {
 		if (disposed) return;
-		fn();
+		if (snapshot !== null && _snapshotCapture) _snapshotCapture.restore(snapshot, fn);
+		else fn();
 	};
 	setDepsCollector(deps);
 	withTracking(run, fn);
@@ -446,9 +500,14 @@ function renderEffectFullTrack(deps, run, fn) {
 	}
 }
 function renderEffect(fn) {
+	if (process.env.NODE_ENV !== "production") {
+		if (fn.constructor && fn.constructor.name === "AsyncFunction") console.warn("[pyreon] renderEffect() received an async function. Signal reads after the first `await` are NOT tracked — only the synchronous prefix is. Read every tracked signal BEFORE any await, or split into separate effects, or use `watch(source, asyncCb)` for async-in-callback patterns.");
+	}
 	const deps = [];
 	let disposed = false;
 	let isFirstRun = true;
+	const snapshot = _snapshotCapture ? _snapshotCapture.capture() : null;
+	const trackedFn = snapshot !== null && _snapshotCapture ? () => _snapshotCapture.restore(snapshot, fn) : fn;
 	const run = () => {
 		if (disposed) return;
 		if (isFirstRun) {
@@ -461,7 +520,7 @@ function renderEffect(fn) {
 				_restoreActiveEffect();
 				setDepsCollector(null);
 			}
-		} else renderEffectFullTrack(deps, run, fn);
+		} else renderEffectFullTrack(deps, run, trackedFn);
 	};
 	run();
 	const dispose = () => {
@@ -491,6 +550,9 @@ function trackWithLocalDeps(deps, effect, fn) {
 	return result;
 }
 function computed(fn, options) {
+	if (process.env.NODE_ENV !== "production") {
+		if (fn.constructor && fn.constructor.name === "AsyncFunction") console.warn("[pyreon] computed() received an async function. The result type becomes `Computed<Promise<T>>`, and signal reads after the first `await` are NOT tracked. Use `createResource` for async-derived state, or compute synchronously over a signal that holds the awaited value.");
+	}
 	return options?.equals ? computedWithEquals(fn, options.equals) : computedLazy(fn);
 }
 /**
@@ -517,10 +579,11 @@ function computedLazy(fn) {
 		if (host._s) notifySubscribers(host._s);
 		if (directFns) for (const f of directFns) f?.();
 	};
+	_markRecompute(recompute);
 	const read = () => {
 		trackSubscriber(host);
 		if (dirty) {
-			if (import.meta.env?.DEV === true) _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
+			if (process.env.NODE_ENV !== "production") _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
 			try {
 				if (tracked) {
 					setSkipDepsCollection(true);
@@ -576,7 +639,7 @@ function computedWithEquals(fn, equals) {
 	let directFns = null;
 	const recompute = () => {
 		if (disposed) return;
-		if (import.meta.env?.DEV === true) _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
+		if (process.env.NODE_ENV !== "production") _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
 		cleanupLocalDeps(deps, recompute);
 		try {
 			const next = trackWithLocalDeps(deps, recompute, fn);
@@ -591,10 +654,11 @@ function computedWithEquals(fn, equals) {
 		if (host._s) notifySubscribers(host._s);
 		if (directFns) for (const f of directFns) f?.();
 	};
+	_markRecompute(recompute);
 	const read = () => {
 		trackSubscriber(host);
 		if (dirty) {
-			if (import.meta.env?.DEV === true) _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
+			if (process.env.NODE_ENV !== "production") _countSink$1.__pyreon_count__?.("reactivity.computedRecompute");
 			cleanupLocalDeps(deps, recompute);
 			try {
 				value = trackWithLocalDeps(deps, recompute, fn);
@@ -793,14 +857,13 @@ function inspectSignal(sig) {
 
 //#endregion
 //#region src/signal.ts
-const __DEV__ = typeof process !== "undefined" && process?.env?.NODE_ENV !== "production";
 const _countSink = globalThis;
 function _peek() {
 	return this._v;
 }
 function _set(newValue) {
 	if (Object.is(this._v, newValue)) return;
-	if (import.meta.env?.DEV === true) _countSink.__pyreon_count__?.("reactivity.signalWrite");
+	if (process.env.NODE_ENV !== "production") _countSink.__pyreon_count__?.("reactivity.signalWrite");
 	const prev = this._v;
 	this._v = newValue;
 	if (isTracing()) _notifyTraceListeners(this, prev, newValue);
@@ -860,9 +923,9 @@ function _debug() {
 * update, subscribe) are shared across all signals — not per-signal closures.
 */
 function signal(initialValue, options) {
-	if (import.meta.env?.DEV === true) _countSink.__pyreon_count__?.("reactivity.signalCreate");
+	if (process.env.NODE_ENV !== "production") _countSink.__pyreon_count__?.("reactivity.signalCreate");
 	const read = ((...args) => {
-		if (__DEV__ && args.length > 0) console.warn("[Pyreon] signal() was called with an argument. Use signal.set(value) or signal.update(fn) to write. signal(value) only reads — the argument is ignored.");
+		if (process.env.NODE_ENV !== "production" && args.length > 0) console.warn("[Pyreon] signal() was called with an argument. Use signal.set(value) or signal.update(fn) to write. signal(value) only reads — the argument is ignored.");
 		trackSubscriber(read);
 		return read._v;
 	});
@@ -1124,5 +1187,5 @@ function watch(source, callback, opts = {}) {
 }
 
 //#endregion
-export { Cell, EffectScope, _bind, batch, cell, computed, createResource, createSelector, createStore, effect, effectScope, getCurrentScope, inspectSignal, isStore, nextTick, onCleanup, onSignalUpdate, reconcile, renderEffect, runUntracked, runUntracked as untrack, setCurrentScope, setErrorHandler, signal, watch, why };
+export { Cell, EffectScope, _bind, batch, cell, computed, createResource, createSelector, createStore, effect, effectScope, getCurrentScope, inspectSignal, isStore, nextTick, onCleanup, onSignalUpdate, reconcile, renderEffect, runUntracked, runUntracked as untrack, setCurrentScope, setErrorHandler, setSnapshotCapture, signal, watch, why };
 //# sourceMappingURL=index.js.map

package/lib/types/index.d.ts

@@ -191,6 +191,19 @@ declare function inspectSignal<T>(sig: Signal<T>): SignalDebugInfo<T>;
 interface Effect {
   dispose(): void;
 }
+interface ReactiveSnapshotCapture {
+  capture: () => unknown;
+  /** Run `fn` with the previously-captured snapshot active. */
+  restore: <T>(snap: unknown, fn: () => T) => T;
+}
+/**
+ * Register a capture/restore pair so reactivity-layer effects (`_bind`,
+ * `renderEffect`, `effect`) can preserve external context (e.g. the core
+ * provide/useContext stack) across signal-driven re-runs. Called by
+ * `@pyreon/core`'s context module at import time. Idempotent — calling again
+ * replaces the previously registered hook.
+ */
+declare function setSnapshotCapture(hook: ReactiveSnapshotCapture | null): void;
 /**
  * Register a cleanup function inside an effect. The cleanup runs:
  * - Before the effect re-runs (when dependencies change)
@@ -373,5 +386,5 @@ interface WatchOptions {
  */
 declare function watch<T>(source: () => T, callback: (newVal: T, oldVal: T | undefined) => void | (() => void), opts?: WatchOptions): () => void;
 //#endregion
-export { Cell, type Computed, type ComputedOptions, type Effect, EffectScope, type ReadonlySignal, type Resource, type Signal, type SignalDebugInfo, type SignalOptions, type WatchOptions, _bind, batch, cell, computed, createResource, createSelector, createStore, effect, effectScope, getCurrentScope, inspectSignal, isStore, nextTick, onCleanup, onSignalUpdate, reconcile, renderEffect, runUntracked, runUntracked as untrack, setCurrentScope, setErrorHandler, signal, watch, why };
+export { Cell, type Computed, type ComputedOptions, type Effect, EffectScope, type ReactiveSnapshotCapture, type ReadonlySignal, type Resource, type Signal, type SignalDebugInfo, type SignalOptions, type WatchOptions, _bind, batch, cell, computed, createResource, createSelector, createStore, effect, effectScope, getCurrentScope, inspectSignal, isStore, nextTick, onCleanup, onSignalUpdate, reconcile, renderEffect, runUntracked, runUntracked as untrack, setCurrentScope, setErrorHandler, setSnapshotCapture, signal, watch, why };
 //# sourceMappingURL=index2.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pyreon/reactivity",
-  "version": "0.14.0",
+  "version": "0.15.0",
   "description": "Signals-based reactivity system for Pyreon",
   "homepage": "https://github.com/pyreon/pyreon/tree/main/packages/reactivity#readme",
   "bugs": {
@@ -14,6 +14,7 @@
   },
   "files": [
     "lib",
+    "!lib/**/*.map",
     "src",
     "README.md",
     "LICENSE"
@@ -33,9 +34,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "devDependencies": {
-    "@pyreon/manifest": "0.13.1"
-  },
   "scripts": {
     "build": "vl_rolldown_build",
     "dev": "vl_rolldown_build-watch",
@@ -43,5 +41,8 @@
     "typecheck": "tsc --noEmit",
     "lint": "oxlint .",
     "prepublishOnly": "bun run build"
+  },
+  "devDependencies": {
+    "@pyreon/manifest": "0.13.1"
   }
 }

package/src/batch.ts

@@ -1,15 +1,66 @@
 // Batch multiple signal updates into a single notification pass.
-// Uses a Set so the same subscriber is never flushed more than once per batch,
-// even if multiple signals it depends on change within the same batch.
+// Two-tier flush: computed recomputes drain first (within-pass Set-dedup),
+// THEN effects drain (multi-pass with cross-pass re-fire support).
+//
+// Dev-mode invariant gate: see https://github.com/pyreon/pyreon/blob/main/packages/core/reactivity/src/tests/batch.test.ts
+// for the property-based test that fuzzes random cascade graphs against this
+// invariant. The build-time gate folds to dead code in production bundles.
+const __DEV__ = process.env.NODE_ENV !== 'production'
 
 let batchDepth = 0
 
-// Two pre-allocated Sets swapped on each flush — avoids allocating a new Set()
-// on every batch exit. The "active" set collects enqueued notifications; on flush
-// we swap to the other set and iterate the captured one, then clear it for reuse.
-const setA = new Set<() => void>()
-const setB = new Set<() => void>()
-let pendingNotifications = setA
+// Two-tier queue design:
+//
+// 1. **`pendingRecomputes`** — computed.recompute callbacks. Drained FIRST in
+//    a cascading-iteration loop: cascading recomputes enqueued during a
+//    drain land in the same Set (Set.add idempotency dedupes), iteration
+//    visits added entries (JS Set iteration semantics), and the recompute
+//    layer settles before any effect fires. This guarantees effects always
+//    read fully-propagated computed values.
+//
+// 2. **`pendingEffects`** — effect.run callbacks. Drained SECOND, multi-pass.
+//    Within a single pass, Set.add idempotency gives us within-pass dedup
+//    (diamond / multi-dep selector). Across passes (entries re-enqueued
+//    AFTER being visited in the current pass — see `_visitedThisPass`), they
+//    fire AGAIN — needed for control flow that re-renders based on its own
+//    dispatch (e.g. ErrorBoundary's handler calling `error.set(err)` during
+//    the same run that mounted the throwing child). MAX_PASSES caps total
+//    passes at 32 to prevent pathological infinite re-enqueue loops.
+//
+// **Why two tiers, not one Set:**
+//   - Single-Set iteration (the prior design) worked for shallow cascades
+//     because the cascading recompute → effect re-enqueue happened BEFORE
+//     iteration reached the effect. For deep cascades (3+ hops), iteration
+//     reached the effect (with its stale upstream value) BEFORE the cascade
+//     finished propagating. Effect read stale values; subsequent cascade
+//     re-enqueues were dropped by Set.add idempotency.
+//   - Splitting recomputes from effects fixes this: all computed recomputes
+//     settle before any effect runs. The cascade-asymmetry contract from
+//     PR #381 is preserved (effects still fire once per batched change),
+//     AND deep-cascade correctness is added (effects always read settled
+//     values).
+//   - Multi-pass effect drain unblocks ErrorBoundary's "re-fire after
+//     dispatching from inside own run" pattern without breaking the
+//     single-fire contract for non-self-dispatching effects.
+//
+// **How a callback gets routed:** computed registers its `recompute` via
+// `_markRecompute(fn)` at creation time. The internal `_recomputes` WeakSet
+// tracks them. `enqueuePendingNotification` checks the WeakSet to route.
+const pendingRecomputes = new Set<() => void>()
+const pendingEffects = new Set<() => void>()
+const _nextEffectPass = new Set<() => void>()
+let _visitedThisPass: Set<() => void> | null = null
+const _recomputes = new WeakSet<() => void>()
+const MAX_PASSES = 32
+
+/**
+ * Mark a callback as a computed recompute (called from computed.ts at
+ * creation time). Routes future enqueues into the recompute queue so they
+ * settle before any effects fire.
+ */
+export function _markRecompute(fn: () => void): void {
+  _recomputes.add(fn)
+}
 
 export function batch(fn: () => void): void {
   batchDepth++
@@ -17,34 +68,72 @@ export function batch(fn: () => void): void {
     fn()
   } finally {
     batchDepth--
-    if (batchDepth === 0 && pendingNotifications.size > 0) {
+    if (batchDepth === 0 && (pendingRecomputes.size > 0 || pendingEffects.size > 0)) {
       // Keep batching active during flush so cascade-notifications emitted
-      // by flushing subscribers enqueue into the pending Set (and dedupe
-      // against what's already queued) instead of firing inline. The
-      // while-loop drains any cascade rounds until the graph is stable.
-      //
-      // Without this, a diamond dependency (a → b, c → d → effect) re-fires
-      // the apex effect TWICE per signal write: the first notification path
-      // through `b` reaches `effect`, whose read clears `d`'s dirty flag;
-      // then when `c` is notified (still in the first flush round), it
-      // re-dirties `d`, which re-notifies `effect`. Keeping batchDepth at 1
-      // during flush routes those cascade-notifications through the Set,
-      // which dedupes on `d`'s recompute and on `effect`'s run.
-      //
-      // See `packages/internals/perf-harness/src/tests/diamond-probe.test.ts`
-      // for the empirical probe that caught this.
+      // by flushing subscribers enqueue into the same queues (dedup against
+      // already-queued entries) instead of firing inline.
       batchDepth = 1
       try {
-        while (pendingNotifications.size > 0) {
-          // Swap to the other pre-allocated Set before flushing so new
-          // enqueues during notification land in the alternate Set, not
-          // mixed into the current iteration.
-          const flush = pendingNotifications
-          pendingNotifications = flush === setA ? setB : setA
-          for (const notify of flush) notify()
-          flush.clear()
+        // Outer loop: alternate between tier-1 (recomputes) and tier-2
+        // (effects) until both queues are empty. An effect can write a
+        // signal whose subscribers include lazy `computed.recompute`s — those
+        // get enqueued into pendingRecomputes mid-effect, and we need to
+        // drain them BEFORE the next effect pass so downstream effects see
+        // the propagated dirty flag. MAX_PASSES caps the OUTER loop —
+        // counts effect-tier passes only since recomputes converge by
+        // `equals` short-circuit and don't infinite-loop in practice.
+        let effectPass = 0
+        while (pendingRecomputes.size > 0 || pendingEffects.size > 0) {
+          // Tier 1: drain all recomputes via cascading iteration. Set
+          // semantics visit entries added during iteration; Set.add
+          // idempotency dedupes diamond cascades. Recomputes converge by
+          // `equals` short-circuit (computedWithEquals returns early when
+          // value is unchanged) and computedLazy's `if (dirty) return`
+          // guard prevents re-fire.
+          for (const r of pendingRecomputes) r()
+          pendingRecomputes.clear()
+
+          // Tier 2: drain ONE pass of effects in multi-pass mode. Within-
+          // pass dedup preserved by Set.add idempotency on entries not yet
+          // visited this pass. Cross-pass re-fire enabled by routing
+          // already-visited entries to `_nextEffectPass` (handled in
+          // `enqueuePendingNotification`). After the pass, loop back to
+          // tier 1 to drain any recomputes the effects enqueued.
+          if (pendingEffects.size > 0) {
+            if (++effectPass > MAX_PASSES) {
+              if (__DEV__) {
+                // oxlint-disable-next-line no-console
+                console.warn(
+                  '[pyreon] batch effect flush exceeded MAX_PASSES (32) — possible infinite re-enqueue loop. ' +
+                    `${pendingEffects.size} pending effects dropped. ` +
+                    'See packages/core/reactivity/src/batch.ts for the multi-pass flush contract.',
+                )
+              }
+              break
+            }
+            _visitedThisPass = new Set<() => void>()
+            for (const notify of pendingEffects) {
+              _visitedThisPass.add(notify)
+              notify()
+            }
+            // Promote next-pass entries to pending for the next iteration.
+            pendingEffects.clear()
+            for (const next of _nextEffectPass) pendingEffects.add(next)
+            _nextEffectPass.clear()
+          }
         }
       } finally {
+        // Clear ALWAYS — even if a notify threw mid-iteration. Without this,
+        // the unflushed remainder leaks into the next batch and refires
+        // (audit bug #19). Effects wrap their callbacks in try/catch
+        // internally so this is rarely reachable in practice, but raw
+        // signal subscribers (signal.subscribe) and lower-level consumers
+        // can throw straight through, and a future refactor that swallows
+        // less aggressively would silently regress without this guard.
+        pendingRecomputes.clear()
+        pendingEffects.clear()
+        _nextEffectPass.clear()
+        _visitedThisPass = null
         batchDepth = 0
       }
     }
@@ -55,8 +144,22 @@ export function isBatching(): boolean {
   return batchDepth > 0
 }
 
+export function enquePendingNotificationDeprecated(): void {
+  // Kept as a comment placeholder — actual export is below. (Empty body to
+  // keep this file's exports list stable across the refactor.)
+}
+
 export function enqueuePendingNotification(notify: () => void): void {
-  pendingNotifications.add(notify)
+  // Route based on callback kind. Computed recomputes go to tier-1 queue,
+  // effects to tier-2. Within tier 2, already-visited-this-pass entries
+  // route to next-pass for cross-pass re-fire (ErrorBoundary's pattern).
+  if (_recomputes.has(notify)) {
+    pendingRecomputes.add(notify)
+  } else if (_visitedThisPass !== null && _visitedThisPass.has(notify)) {
+    _nextEffectPass.add(notify)
+  } else {
+    pendingEffects.add(notify)
+  }
 }
 
 /**

package/src/computed.ts

@@ -1,3 +1,4 @@
+import { _markRecompute } from './batch'
 import { _errorHandler } from './effect'
 import { getCurrentScope } from './scope'
 import {
@@ -10,9 +11,6 @@ import {
 } from './tracking'
 
 // Dev-time counter sink — see packages/internals/perf-harness for contract.
-interface ViteMeta {
-  readonly env?: { readonly DEV?: boolean }
-}
 const _countSink = globalThis as { __pyreon_count__?: (name: string, n?: number) => void }
 
 export interface Computed<T> {
@@ -54,6 +52,21 @@ function trackWithLocalDeps<T>(deps: Set<() => void>[], effect: () => void, fn:
 }
 
 export function computed<T>(fn: () => T, options?: ComputedOptions<T>): Computed<T> {
+  // Dev warning for async computed callbacks (audit bug #1 — extension).
+  // `computed(async () => …)` returns `Computed<Promise<T>>`, which silently
+  // breaks every consumer that expects `Computed<T>`. There's no scenario
+  // where async makes sense here — the recompute fires synchronously and
+  // tracks signals only in the synchronous prefix. For async-derived
+  // state, use `createResource` or a `signal<T>` updated from an effect.
+  if (process.env.NODE_ENV !== 'production') {
+    if (fn.constructor && fn.constructor.name === 'AsyncFunction') {
+      // oxlint-disable-next-line no-console
+      console.warn(
+        '[pyreon] computed() received an async function. The result type becomes `Computed<Promise<T>>`, and signal reads after the first `await` are NOT tracked. ' +
+          'Use `createResource` for async-derived state, or compute synchronously over a signal that holds the awaited value.',
+      )
+    }
+  }
   return options?.equals ? computedWithEquals(fn, options.equals) : computedLazy(fn)
 }
 
@@ -82,11 +95,12 @@ function computedLazy<T>(fn: () => T): Computed<T> {
     if (host._s) notifySubscribers(host._s)
     if (directFns) for (const f of directFns) f?.()
   }
+  _markRecompute(recompute)
 
   const read = (): T => {
     trackSubscriber(host)
     if (dirty) {
-      if ((import.meta as ViteMeta).env?.DEV === true)
+      if (process.env.NODE_ENV !== 'production')
         _countSink.__pyreon_count__?.('reactivity.computedRecompute')
       try {
         if (tracked) {
@@ -153,7 +167,7 @@ function computedWithEquals<T>(fn: () => T, equals: (prev: T, next: T) => boolea
 
   const recompute = () => {
     if (disposed) return
-    if ((import.meta as ViteMeta).env?.DEV === true)
+    if (process.env.NODE_ENV !== 'production')
       _countSink.__pyreon_count__?.('reactivity.computedRecompute')
     cleanupLocalDeps(deps, recompute)
     try {
@@ -169,11 +183,12 @@ function computedWithEquals<T>(fn: () => T, equals: (prev: T, next: T) => boolea
     if (host._s) notifySubscribers(host._s)
     if (directFns) for (const f of directFns) f?.()
   }
+  _markRecompute(recompute)
 
   const read = (): T => {
     trackSubscriber(host)
     if (dirty) {
-      if ((import.meta as ViteMeta).env?.DEV === true)
+      if (process.env.NODE_ENV !== 'production')
         _countSink.__pyreon_count__?.('reactivity.computedRecompute')
       cleanupLocalDeps(deps, recompute)
       try {