@deslop/workbench 0.0.300 → 0.0.305

package/dist/server.js

@@ -9,14 +9,14 @@ import { Duplex, Readable } from "node:stream";
 import { Readable as Readable$1 } from "stream";
 import { createRequire as createRequire$1 } from "module";
 import * as fs from "fs";
-import * as path from "path";
+import * as path$1 from "path";
 import * as zlib from "zlib";
 import * as Crypto$1 from "node:crypto";
 import { randomUUID } from "node:crypto";
 import * as NFS from "node:fs";
 import * as OS from "node:os";
 import * as Path from "node:path";
-import { join } from "node:path";
+import path, { join } from "node:path";
 import * as NodeStreamP from "node:stream/promises";
 import { pipeline } from "node:stream/promises";
 import { readFile } from "node:fs/promises";
@@ -4360,7 +4360,7 @@ const done$2 = (value) => {
 * @category constructors
 * @since 2.0.0
 */
-const make$64 = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
+const make$65 = (isEquivalent) => (self, that) => self === that || isEquivalent(self, that);
 const isStrictEquivalent = (x, y) => x === y;
 /**
 * Creates an equivalence relation that uses strict equality (`===`) to compare values.
@@ -4473,7 +4473,7 @@ const strictEqual = () => isStrictEquivalent;
 * @since 4.0.0
 */
 function Tuple$1(elements) {
-	return make$64((self, that) => {
+	return make$65((self, that) => {
 		if (self.length !== that.length) return false;
 		for (let i = 0; i < self.length; i++) if (!elements[i](self[i], that[i])) return false;
 		return true;
@@ -4483,7 +4483,7 @@ function Tuple$1(elements) {
 * @since 4.0.0
 */
 function Array_(item) {
-	return make$64((self, that) => {
+	return make$65((self, that) => {
 		if (self.length !== that.length) return false;
 		for (let i = 0; i < self.length; i++) if (!item(self[i], that[i])) return false;
 		return true;
@@ -4501,9 +4501,9 @@ const isArrayNonEmpty$1 = (self) => self.length > 0;
 /**
 * @since 2.0.0
 */
-const TypeId$50 = "~effect/data/Option";
+const TypeId$51 = "~effect/data/Option";
 const CommonProto$1 = {
-	[TypeId$50]: { _A: (_) => _ },
+	[TypeId$51]: { _A: (_) => _ },
 	...PipeInspectableProto,
 	[Symbol.iterator]() {
 		return new SingleShotGen(this);
@@ -4554,7 +4554,7 @@ const NoneProto = /*#__PURE__*/ Object.assign(/*#__PURE__*/ Object.create(Common
 	}
 });
 /** @internal */
-const isOption = (input) => hasProperty(input, TypeId$50);
+const isOption = (input) => hasProperty(input, TypeId$51);
 /** @internal */
 const isNone$1 = (fa) => fa._tag === "None";
 /** @internal */
@@ -4569,9 +4569,9 @@ const some$1 = (value) => {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/internal/result.js
-const TypeId$49 = "~effect/data/Result";
+const TypeId$50 = "~effect/data/Result";
 const CommonProto = {
-	[TypeId$49]: {
+	[TypeId$50]: {
 		/* v8 ignore next 2 */
 		_A: (_) => _,
 		_E: (_) => _
@@ -4622,7 +4622,7 @@ const FailureProto = /*#__PURE__*/ Object.assign(/*#__PURE__*/ Object.create(Com
 	}
 });
 /** @internal */
-const isResult = (input) => hasProperty(input, TypeId$49);
+const isResult = (input) => hasProperty(input, TypeId$50);
 /** @internal */
 const isFailure$2 = (result) => result._tag === "Failure";
 /** @internal */
@@ -4756,7 +4756,7 @@ const succeed$8 = (success) => {
 * @category constructors
 * @since 2.0.0
 */
-function make$63(compare) {
+function make$64(compare) {
 	return (self, that) => self === that ? 0 : compare(self, that);
 }
 /**
@@ -4789,7 +4789,7 @@ function make$63(compare) {
 * @category instances
 * @since 4.0.0
 */
-const String$5 = /*#__PURE__*/ make$63((self, that) => self < that ? -1 : 1);
+const String$5 = /*#__PURE__*/ make$64((self, that) => self < that ? -1 : 1);
 /**
 * Order instance for numbers that compares them numerically.
 *
@@ -4824,7 +4824,7 @@ const String$5 = /*#__PURE__*/ make$63((self, that) => self < that ? -1 : 1);
 * @category instances
 * @since 4.0.0
 */
-const Number$5 = /*#__PURE__*/ make$63((self, that) => {
+const Number$5 = /*#__PURE__*/ make$64((self, that) => {
 	if (globalThis.Number.isNaN(self) && globalThis.Number.isNaN(that)) return 0;
 	if (globalThis.Number.isNaN(self)) return -1;
 	if (globalThis.Number.isNaN(that)) return 1;
@@ -4863,7 +4863,7 @@ const Number$5 = /*#__PURE__*/ make$63((self, that) => {
 * @category mapping
 * @since 2.0.0
 */
-const mapInput = /*#__PURE__*/ dual(2, (self, f) => make$63((b1, b2) => self(f(b1), f(b2))));
+const mapInput = /*#__PURE__*/ dual(2, (self, f) => make$64((b1, b2) => self(f(b1), f(b2))));
 /**
 * Checks whether one value is strictly less than another according to the given order.
 *
@@ -5153,7 +5153,7 @@ const isSome = isSome$1;
 * @category pattern matching
 * @since 2.0.0
 */
-const match$4 = /*#__PURE__*/ dual(2, (self, { onNone, onSome }) => isNone(self) ? onNone() : onSome(self.value));
+const match$5 = /*#__PURE__*/ dual(2, (self, { onNone, onSome }) => isNone(self) ? onNone() : onSome(self.value));
 /**
 * Extracts the value from a `Some`, or evaluates a fallback thunk on `None`.
 *
@@ -5401,7 +5401,7 @@ const map$9 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : some(f(
 * @category sequencing
 * @since 2.0.0
 */
-const flatMap$5 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : f(self.value));
+const flatMap$6 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : f(self.value));
 /**
 * Filters an `Option` using a predicate. Returns `None` if the predicate is
 * not satisfied or the input is `None`.
@@ -5664,7 +5664,7 @@ const isSuccess$1 = isSuccess$2;
 * @category pattern matching
 * @since 2.0.0
 */
-const match$3 = /*#__PURE__*/ dual(2, (self, { onFailure, onSuccess }) => isFailure$1(self) ? onFailure(self.failure) : onSuccess(self.success));
+const match$4 = /*#__PURE__*/ dual(2, (self, { onFailure, onSuccess }) => isFailure$1(self) ? onFailure(self.failure) : onSuccess(self.success));
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Tuple.js
 /**
@@ -5694,7 +5694,7 @@ const match$3 = /*#__PURE__*/ dual(2, (self, { onFailure, onSuccess }) => isFail
 * @category constructors
 * @since 2.0.0
 */
-const make$62 = (...elements) => elements;
+const make$63 = (...elements) => elements;
 /**
 * Creates an `Equivalence` for tuples by comparing corresponding elements
 * using the provided per-position `Equivalence`s. Two tuples are equivalent
@@ -5852,7 +5852,7 @@ const toEntries = /*#__PURE__*/ (/* @__PURE__ */ dual(2, (self, f) => {
 * @category guards
 * @since 2.0.0
 */
-const has$2 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key));
+const has$3 = /*#__PURE__*/ dual(2, (self, key) => Object.hasOwn(self, key));
 /**
 * Maps a record into another record by applying a transformation function to each of its values.
 *
@@ -5929,7 +5929,7 @@ const keys = (self) => Object.keys(self);
 * @since 2.0.0
 */
 const isSubrecordBy = (equivalence) => dual(2, (self, that) => {
-	for (const key of keys(self)) if (!has$2(that, key) || !equivalence(self[key], that[key])) return false;
+	for (const key of keys(self)) if (!has$3(that, key) || !equivalence(self[key], that[key])) return false;
 	return true;
 });
 /**
@@ -6176,7 +6176,7 @@ const ensure = (self) => Array$1.isArray(self) ? self : [self];
 * @category pattern matching
 * @since 2.0.0
 */
-const match$2 = /*#__PURE__*/ dual(2, (self, { onEmpty, onNonEmpty }) => isReadonlyArrayNonEmpty(self) ? onNonEmpty(self) : onEmpty());
+const match$3 = /*#__PURE__*/ dual(2, (self, { onEmpty, onNonEmpty }) => isReadonlyArrayNonEmpty(self) ? onNonEmpty(self) : onEmpty());
 /**
 * Adds a single element to the end of an iterable, returning a `NonEmptyArray`.
 *
@@ -6465,35 +6465,6 @@ const drop$1 = /*#__PURE__*/ dual(2, (self, n) => {
 	return input.slice(clamp(n, input), input.length);
 });
 /**
-* Removes the last `n` elements, creating a new array.
-*
-* **When to use**
-*
-* Use to remove the last `n` elements from an iterable.
-*
-* **Details**
-*
-* `n` is clamped to `[0, length]`.
-*
-* **Example** (Dropping from the end)
-*
-* ```ts
-* import { Array } from "effect"
-*
-* console.log(Array.dropRight([1, 2, 3, 4, 5], 2)) // [1, 2, 3]
-* ```
-*
-* @see {@link drop} — remove from the start
-* @see {@link takeRight} — keep from the end
-*
-* @category getters
-* @since 2.0.0
-*/
-const dropRight = /*#__PURE__*/ dual(2, (self, n) => {
-	const input = fromIterable$2(self);
-	return input.slice(0, input.length - clamp(n, input));
-});
-/**
 * Reverses an iterable into a new array.
 *
 * **When to use**
@@ -6747,6 +6718,42 @@ const of = (a) => [a];
 */
 const map$7 = /*#__PURE__*/ dual(2, (self, f) => self.map(f));
 /**
+* Maps each element to an array and flattens the results into a single array.
+*
+* **When to use**
+*
+* Use to map each element to zero or more values and concatenate the results in
+* one pass.
+*
+* **Details**
+*
+* - The function receives `(element, index)`.
+* - Returns `NonEmptyArray` when both input and mapped arrays are non-empty.
+*
+* **Example** (FlatMapping an array)
+*
+* ```ts
+* import { Array } from "effect"
+*
+* console.log(Array.flatMap([1, 2, 3], (x) => [x, x * 2])) // [1, 2, 2, 4, 3, 6]
+* ```
+*
+* @see {@link map} — transform without flattening
+* @see {@link flatten} — flatten without mapping
+*
+* @category sequencing
+* @since 2.0.0
+*/
+const flatMap$5 = /*#__PURE__*/ dual(2, (self, f) => {
+	if (isReadonlyArrayEmpty(self)) return [];
+	const out = [];
+	for (let i = 0; i < self.length; i++) {
+		const inner = f(self[i], i);
+		for (let j = 0; j < inner.length; j++) out.push(inner[j]);
+	}
+	return out;
+});
+/**
 * Extracts all `Some` values from an iterable of `Option`s, discarding `None`s.
 *
 * **When to use**
@@ -7127,7 +7134,7 @@ const ServiceProto = {
 	.../*#__PURE__*/ Prototype({
 		label: "Service",
 		evaluate(fiber) {
-			return exitSucceed(get$8(fiber.context, this));
+			return exitSucceed(get$9(fiber.context, this));
 		}
 	}),
 	toJSON() {
@@ -7141,17 +7148,17 @@ const ServiceProto = {
 		return self;
 	},
 	context(self) {
-		return make$61(this, self);
+		return make$62(this, self);
 	},
 	use(f) {
-		return withFiber$1((fiber) => f(get$8(fiber.context, this)));
+		return withFiber$1((fiber) => f(get$9(fiber.context, this)));
 	},
 	useSync(f) {
-		return withFiber$1((fiber) => exitSucceed(f(get$8(fiber.context, this))));
+		return withFiber$1((fiber) => exitSucceed(f(get$9(fiber.context, this))));
 	}
 };
 const ReferenceTypeId = "~effect/Context/Reference";
-const TypeId$48 = "~effect/Context";
+const TypeId$49 = "~effect/Context";
 /**
 * Creates a `Context` from an existing service map without validating or
 * copying it.
@@ -7186,7 +7193,7 @@ const makeUnsafe$8 = (mapUnsafe) => {
 };
 const Proto$15 = {
 	...PipeInspectableProto,
-	[TypeId$48]: { _Services: (_) => _ },
+	[TypeId$49]: { _Services: (_) => _ },
 	toJSON() {
 		return {
 			_id: "Context",
@@ -7238,7 +7245,7 @@ const Proto$15 = {
 * @category guards
 * @since 2.0.0
 */
-const isContext = (u) => hasProperty(u, TypeId$48);
+const isContext = (u) => hasProperty(u, TypeId$49);
 /**
 * Checks whether the provided argument is a `Reference`.
 *
@@ -7296,7 +7303,7 @@ const emptyContext = /*#__PURE__*/ makeUnsafe$8(/*#__PURE__*/ new Map());
 * @category constructors
 * @since 2.0.0
 */
-const make$61 = (key, service) => makeUnsafe$8(new Map([[key.key, service]]));
+const make$62 = (key, service) => makeUnsafe$8(new Map([[key.key, service]]));
 /**
 * Adds a service to a given `Context`.
 *
@@ -7486,7 +7493,7 @@ const getUnsafe = /*#__PURE__*/ dual(2, (self, service) => {
 * @category getters
 * @since 2.0.0
 */
-const get$8 = getUnsafe;
+const get$9 = getUnsafe;
 /**
 * Gets the value for a `Context.Reference`, returning its cached default when
 * the context does not contain an override.
@@ -7742,7 +7749,7 @@ const withMapUnsafe = (self, f) => {
 const Reference = Service;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Duration.js
-const TypeId$47 = "~effect/time/Duration";
+const TypeId$48 = "~effect/time/Duration";
 const bigint0$2 = /*#__PURE__*/ BigInt(0);
 const bigint1e3 = /*#__PURE__*/ BigInt(1e3);
 const bigint1e6 = /*#__PURE__*/ BigInt(1e6);
@@ -7801,13 +7808,13 @@ const fromInputUnsafe = (input) => {
 		}
 		case "object": {
 			if (input === null) break;
-			if (TypeId$47 in input) return input;
+			if (TypeId$48 in input) return input;
 			if (Array.isArray(input)) {
 				if (input.length !== 2 || !input.every(isNumber)) return invalid(input);
 				if (Number.isNaN(input[0]) || Number.isNaN(input[1])) return zero$1;
 				if (input[0] === -Infinity || input[1] === -Infinity) return negativeInfinity;
 				if (input[0] === Infinity || input[1] === Infinity) return infinity;
-				return make$60(BigInt(Math.round(input[0] * 1e9)) + BigInt(Math.round(input[1])));
+				return make$61(BigInt(Math.round(input[0] * 1e9)) + BigInt(Math.round(input[1])));
 			}
 			const obj = input;
 			let millis = 0;
@@ -7817,11 +7824,11 @@ const fromInputUnsafe = (input) => {
 			if (obj.minutes) millis += obj.minutes * 6e4;
 			if (obj.seconds) millis += obj.seconds * 1e3;
 			if (obj.milliseconds) millis += obj.milliseconds;
-			if (!obj.microseconds && !obj.nanoseconds) return make$60(millis);
+			if (!obj.microseconds && !obj.nanoseconds) return make$61(millis);
 			let nanos = BigInt(millis) * bigint1e6;
 			if (obj.microseconds) nanos += BigInt(obj.microseconds) * bigint1e3;
 			if (obj.nanoseconds) nanos += BigInt(obj.nanoseconds);
-			return make$60(nanos);
+			return make$61(nanos);
 		}
 	}
 	return invalid(input);
@@ -7836,7 +7843,7 @@ const zeroDurationValue = {
 const infinityDurationValue = { _tag: "Infinity" };
 const negativeInfinityDurationValue = { _tag: "NegativeInfinity" };
 const DurationProto = {
-	[TypeId$47]: TypeId$47,
+	[TypeId$48]: TypeId$48,
 	[symbol$3]() {
 		return structure(this.value);
 	},
@@ -7880,7 +7887,7 @@ const DurationProto = {
 		return pipeArguments(this, arguments);
 	}
 };
-const make$60 = (input) => {
+const make$61 = (input) => {
 	const duration = Object.create(DurationProto);
 	if (typeof input === "number") if (isNaN(input) || input === 0 || Object.is(input, -0)) duration.value = zeroDurationValue;
 	else if (!Number.isFinite(input)) duration.value = input > 0 ? infinityDurationValue : negativeInfinityDurationValue;
@@ -7914,7 +7921,7 @@ const make$60 = (input) => {
 * @category guards
 * @since 2.0.0
 */
-const isDuration = (u) => hasProperty(u, TypeId$47);
+const isDuration = (u) => hasProperty(u, TypeId$48);
 /**
 * Checks whether a Duration is finite (not infinite).
 *
@@ -7968,7 +7975,7 @@ const isZero$1 = (self) => {
 * @category constructors
 * @since 2.0.0
 */
-const zero$1 = /*#__PURE__*/ make$60(0);
+const zero$1 = /*#__PURE__*/ make$61(0);
 /**
 * A Duration representing infinite time.
 *
@@ -7983,7 +7990,7 @@ const zero$1 = /*#__PURE__*/ make$60(0);
 * @category constructors
 * @since 2.0.0
 */
-const infinity = /*#__PURE__*/ make$60(Infinity);
+const infinity = /*#__PURE__*/ make$61(Infinity);
 /**
 * A Duration representing negative infinite time.
 *
@@ -7998,7 +8005,7 @@ const infinity = /*#__PURE__*/ make$60(Infinity);
 * @category constructors
 * @since 4.0.0
 */
-const negativeInfinity = /*#__PURE__*/ make$60(-Infinity);
+const negativeInfinity = /*#__PURE__*/ make$61(-Infinity);
 /**
 * Creates a Duration from nanoseconds.
 *
@@ -8014,7 +8021,7 @@ const negativeInfinity = /*#__PURE__*/ make$60(-Infinity);
 * @category constructors
 * @since 2.0.0
 */
-const nanos = (nanos) => make$60(nanos);
+const nanos = (nanos) => make$61(nanos);
 /**
 * Creates a Duration from microseconds.
 *
@@ -8030,7 +8037,7 @@ const nanos = (nanos) => make$60(nanos);
 * @category constructors
 * @since 2.0.0
 */
-const micros = (micros) => make$60(micros * bigint1e3);
+const micros = (micros) => make$61(micros * bigint1e3);
 /**
 * Creates a Duration from milliseconds.
 *
@@ -8046,7 +8053,7 @@ const micros = (micros) => make$60(micros * bigint1e3);
 * @category constructors
 * @since 2.0.0
 */
-const millis = (millis) => make$60(millis);
+const millis = (millis) => make$61(millis);
 /**
 * Creates a Duration from seconds.
 *
@@ -8062,7 +8069,7 @@ const millis = (millis) => make$60(millis);
 * @category constructors
 * @since 2.0.0
 */
-const seconds = (seconds) => make$60(seconds * 1e3);
+const seconds = (seconds) => make$61(seconds * 1e3);
 /**
 * Creates a Duration from minutes.
 *
@@ -8078,7 +8085,7 @@ const seconds = (seconds) => make$60(seconds * 1e3);
 * @category constructors
 * @since 2.0.0
 */
-const minutes = (minutes) => make$60(minutes * 6e4);
+const minutes = (minutes) => make$61(minutes * 6e4);
 /**
 * Creates a Duration from hours.
 *
@@ -8094,7 +8101,7 @@ const minutes = (minutes) => make$60(minutes * 6e4);
 * @category constructors
 * @since 2.0.0
 */
-const hours = (hours) => make$60(hours * 36e5);
+const hours = (hours) => make$61(hours * 36e5);
 /**
 * Creates a Duration from days.
 *
@@ -8110,7 +8117,7 @@ const hours = (hours) => make$60(hours * 36e5);
 * @category constructors
 * @since 2.0.0
 */
-const days = (days) => make$60(days * 864e5);
+const days = (days) => make$61(days * 864e5);
 /**
 * Creates a Duration from weeks.
 *
@@ -8126,7 +8133,7 @@ const days = (days) => make$60(days * 864e5);
 * @category constructors
 * @since 2.0.0
 */
-const weeks = (weeks) => make$60(weeks * 6048e5);
+const weeks = (weeks) => make$61(weeks * 6048e5);
 /**
 * Converts a Duration to milliseconds.
 *
@@ -8142,7 +8149,7 @@ const weeks = (weeks) => make$60(weeks * 6048e5);
 * @category getters
 * @since 2.0.0
 */
-const toMillis = (self) => match$1(fromInputUnsafe(self), {
+const toMillis = (self) => match$2(fromInputUnsafe(self), {
 	onMillis: identity,
 	onNanos: (nanos) => Number(nanos) / 1e6,
 	onInfinity: () => Infinity,
@@ -8163,7 +8170,7 @@ const toMillis = (self) => match$1(fromInputUnsafe(self), {
 * @category getters
 * @since 2.0.0
 */
-const toSeconds = (self) => match$1(fromInputUnsafe(self), {
+const toSeconds = (self) => match$2(fromInputUnsafe(self), {
 	onMillis: (millis) => millis / 1e3,
 	onNanos: (nanos) => Number(nanos) / 1e9,
 	onInfinity: () => Infinity,
@@ -8226,7 +8233,7 @@ const toNanosUnsafe = (input) => {
 * @category pattern matching
 * @since 2.0.0
 */
-const match$1 = /*#__PURE__*/ dual(2, (self, options) => {
+const match$2 = /*#__PURE__*/ dual(2, (self, options) => {
 	switch (self.value._tag) {
 		case "Millis": return options.onMillis(self.value.millis);
 		case "Nanos": return options.onNanos(self.value.nanos);
@@ -8328,7 +8335,7 @@ const toPredicate = (self) => (input) => !isFailure$1(self(input));
 * @category constructors
 * @since 4.0.0
 */
-const has$1 = (key) => (input) => input.has(key) ? succeed$7(input) : fail$7(input);
+const has$2 = (key) => (input) => input.has(key) ? succeed$7(input) : fail$7(input);
 /**
 * Composes two filters sequentially, feeding the output of the first into the second.
 *
@@ -8682,7 +8689,7 @@ var ParentSpan = class extends Service()(ParentSpanKey) {};
 * @category constructors
 * @since 2.0.0
 */
-const make$59 = (options) => options;
+const make$60 = (options) => options;
 /**
 * Creates an `ExternalSpan` from trace and span identifiers, defaulting
 * `sampled` to `true` and annotations to an empty context when they are not
@@ -8827,7 +8834,7 @@ const TracerKey = "effect/Tracer";
 * @category references
 * @since 2.0.0
 */
-const Tracer = /*#__PURE__*/ Reference(TracerKey, { defaultValue: () => make$59({ span: (options) => new NativeSpan(options) }) });
+const Tracer = /*#__PURE__*/ Reference(TracerKey, { defaultValue: () => make$60({ span: (options) => new NativeSpan(options) }) });
 /**
 * Default in-memory `Span` implementation used by the native tracer. It
 * generates span and trace identifiers, stores attributes, events, and links,
@@ -9237,7 +9244,7 @@ var FiberImpl = class {
 	interruptUnsafe(fiberId, annotations) {
 		if (this._exit) return;
 		let cause = causeInterrupt(fiberId);
-		if (this.currentStackFrame) cause = causeAnnotate(cause, make$61(StackTraceKey, this.currentStackFrame));
+		if (this.currentStackFrame) cause = causeAnnotate(cause, make$62(StackTraceKey, this.currentStackFrame));
 		if (annotations) cause = causeAnnotate(cause, annotations);
 		this._interruptedCause = this._interruptedCause ? causeCombine(this._interruptedCause, cause) : cause;
 		if (this.interruptible) this.evaluate(failCause$5(this._interruptedCause));
@@ -9428,7 +9435,7 @@ const suspend$3 = /*#__PURE__*/ makePrimitive({
 	}
 });
 /** @internal */
-const fromResult$1 = /*#__PURE__*/ match$3({
+const fromResult$1 = /*#__PURE__*/ match$4({
 	onFailure: fail$6,
 	onSuccess: succeed$6
 });
@@ -9602,7 +9609,7 @@ const as$1 = /*#__PURE__*/ dual(2, (self, value) => {
 	return flatMap$4(self, (_) => b);
 });
 /** @internal */
-const asSome = (self) => map$6(self, some);
+const asSome$1 = (self) => map$6(self, some);
 /** @internal */
 const andThen$1 = /*#__PURE__*/ dual(2, (self, f) => flatMap$4(self, (a) => isEffect$1(f) ? f : internalCall(() => f(a))));
 /** @internal */
@@ -9761,7 +9768,7 @@ const provideServiceImpl = (self, service, implementation) => updateContext$1(se
 	return add(s, service, implementation);
 });
 /** @internal */
-const when$1 = /*#__PURE__*/ dual(2, (self, condition) => flatMap$4(condition, (pass) => pass ? asSome(self) : succeedNone$1));
+const when$1 = /*#__PURE__*/ dual(2, (self, condition) => flatMap$4(condition, (pass) => pass ? asSome$1(self) : succeedNone$1));
 /** @internal */
 const forever$2 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, options) => whileLoop$1({
 	while: constTrue,
@@ -9844,7 +9851,7 @@ const ignore$2 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, option
 	});
 });
 /** @internal */
-const option$2 = (self) => match(self, {
+const option$2 = (self) => match$1(self, {
 	onFailure: none,
 	onSuccess: some
 });
@@ -9877,7 +9884,7 @@ const matchEffect$2 = /*#__PURE__*/ dual(2, (self, options) => matchCauseEffect$
 	onSuccess: options.onSuccess
 }));
 /** @internal */
-const match = /*#__PURE__*/ dual(2, (self, options) => matchEffect$2(self, {
+const match$1 = /*#__PURE__*/ dual(2, (self, options) => matchEffect$2(self, {
 	onFailure: (error) => sync$1(() => options.onFailure(error)),
 	onSuccess: (value) => sync$1(() => options.onSuccess(value))
 }));
@@ -9889,7 +9896,7 @@ const matchEager = /*#__PURE__*/ dual(2, (self, options) => {
 		if (isFailure$1(error)) return self;
 		return exitSucceed(options.onFailure(error.success));
 	}
-	return match(self, options);
+	return match$1(self, options);
 });
 /** @internal */
 const exit$1 = (self) => effectIsExit(self) ? exitSucceed(self) : exitPrimitive(self);
@@ -9907,11 +9914,9 @@ const exitPrimitive = /*#__PURE__*/ makePrimitive({
 	}
 });
 /** @internal */
-const delay$1 = /*#__PURE__*/ dual(2, (self, duration) => andThen$1(sleep$1(duration), self));
-/** @internal */
 const timeoutOrElse$1 = /*#__PURE__*/ dual(2, (self, options) => raceFirst$1(self, flatMap$4(sleep$1(options.duration), options.orElse)));
 /** @internal */
-const timeoutOption$1 = /*#__PURE__*/ dual(2, (self, duration) => raceFirst$1(asSome(self), as$1(sleep$1(duration), none())));
+const timeoutOption$1 = /*#__PURE__*/ dual(2, (self, duration) => raceFirst$1(asSome$1(self), as$1(sleep$1(duration), none())));
 /** @internal */
 const ScopeTypeId = "~effect/Scope";
 /** @internal */
@@ -10489,11 +10494,11 @@ const NoopSpanProto = {
 const noopSpan = (options) => Object.assign(Object.create(NoopSpanProto), options);
 const filterDisablePropagation = (span) => {
 	if (!span) return none();
-	return get$8(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some(span);
+	return get$9(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some(span);
 };
 /** @internal */
 const makeSpanUnsafe = (fiber, name, options) => {
-	const disablePropagation = !fiber.getRef(TracerEnabled$1) || options?.annotations && get$8(options.annotations, DisablePropagation);
+	const disablePropagation = !fiber.getRef(TracerEnabled$1) || options?.annotations && get$9(options.annotations, DisablePropagation);
 	const parent = options?.parent !== void 0 ? some(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.currentSpan);
 	let span;
 	if (disablePropagation) span = noopSpan({
@@ -10778,6 +10783,8 @@ function interruptChildrenPatch() {
 	fiberMiddleware.interruptChildren ??= fiberInterruptChildren;
 }
 /** @internal */
+const undefined_$2 = /*#__PURE__*/ succeed$6(void 0);
+/** @internal */
 const reportCauseUnsafe = (fiber, cause, defectsOnly) => {
 	const reporters = fiber.getRef(CurrentErrorReporters);
 	if (reporters.size === 0) return;
@@ -10791,7 +10798,7 @@ const reportCauseUnsafe = (fiber, cause, defectsOnly) => {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Deferred.js
-const TypeId$46 = "~effect/Deferred";
+const TypeId$47 = "~effect/Deferred";
 /**
 * Checks whether a value is a `Deferred`.
 *
@@ -10803,9 +10810,9 @@ const TypeId$46 = "~effect/Deferred";
 * @category guards
 * @since 4.0.0
 */
-const isDeferred = (u) => hasProperty(u, TypeId$46);
+const isDeferred = (u) => hasProperty(u, TypeId$47);
 const DeferredProto = {
-	[TypeId$46]: {
+	[TypeId$47]: {
 		_A: identity,
 		_E: identity
 	},
@@ -11617,7 +11624,7 @@ const Scope = scopeTag;
 * @category constructors
 * @since 2.0.0
 */
-const make$58 = scopeMake;
+const make$59 = scopeMake;
 /**
 * Creates a new `Scope` synchronously without wrapping it in an `Effect`.
 * This is useful when you need a scope immediately but should be used with caution
@@ -11847,14 +11854,14 @@ const close = scopeClose;
 const closeUnsafe = scopeCloseUnsafe;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Layer.js
-const TypeId$45 = "~effect/Layer";
+const TypeId$46 = "~effect/Layer";
 const MemoMapTypeId = "~effect/Layer/MemoMap";
 const memoMapReuse = (entry, scope) => {
 	entry.observers++;
 	return andThen$1(scopeAddFinalizerExit(scope, (exit) => entry.finalizer(exit)), entry.effect);
 };
 const LayerProto = {
-	[TypeId$45]: {
+	[TypeId$46]: {
 		_ROut: identity,
 		_E: identity,
 		_RIn: identity
@@ -12187,8 +12194,8 @@ const buildWithScope = /*#__PURE__*/ dual(2, (self, scope) => withFiber$1((fiber
 * @since 2.0.0
 */
 const succeed$4 = function() {
-	if (arguments.length === 1) return (resource) => succeedContext(make$61(arguments[0], resource));
-	return succeedContext(make$61(arguments[0], arguments[1]));
+	if (arguments.length === 1) return (resource) => succeedContext(make$62(arguments[0], resource));
+	return succeedContext(make$62(arguments[0], arguments[1]));
 };
 /**
 * Constructs a layer that provides all services in an already available
@@ -12305,7 +12312,7 @@ const effect = function() {
 	if (arguments.length === 1) return (effect) => effectImpl(arguments[0], effect);
 	return effectImpl(arguments[0], arguments[1]);
 };
-const effectImpl = (service, effect) => effectContext(map$6(effect, (value) => make$61(service, value)));
+const effectImpl = (service, effect) => effectContext(map$6(effect, (value) => make$62(service, value)));
 /**
 * Constructs a layer from an effect that produces all services in a `Context`.
 *
@@ -12404,7 +12411,7 @@ const effectDiscard = (effect) => effectContext(as$1(effect, empty$12()));
 */
 const unwrap$4 = (self) => {
 	const service = Service("effect/Layer/unwrap");
-	return flatMap$3(effect(service)(self), get$8(service));
+	return flatMap$3(effect(service)(self), get$9(service));
 };
 const mergeAllEffect = (layers, memoMap, scope) => {
 	const parentScope = forkUnsafe(scope, "parallel");
@@ -13649,11 +13656,11 @@ const Clock = ClockRef;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/internal/dateTime.js
 /** @internal */
-const TypeId$44 = "~effect/time/DateTime";
+const TypeId$45 = "~effect/time/DateTime";
 /** @internal */
 const TimeZoneTypeId = "~effect/time/DateTime/TimeZone";
 const Proto$14 = {
-	[TypeId$44]: TypeId$44,
+	[TypeId$45]: TypeId$45,
 	pipe() {
 		return pipeArguments(this, arguments);
 	},
@@ -14218,7 +14225,7 @@ const matchEffect$1 = /*#__PURE__*/ dual(2, (self, options) => matchCauseEffect$
 *
 * @since 2.0.0
 */
-const TypeId$43 = "~effect/Schedule";
+const TypeId$44 = "~effect/Schedule";
 /**
 * Context reference containing metadata for the currently running schedule step.
 *
@@ -14243,7 +14250,7 @@ const CurrentMetadata = /*#__PURE__*/ Reference("effect/Schedule/CurrentMetadata
 	elapsedSincePrevious: 0
 }) });
 const ScheduleProto = {
-	[TypeId$43]: {
+	[TypeId$44]: {
 		_Out: identity,
 		_In: identity,
 		_Env: identity
@@ -14272,7 +14279,7 @@ const ScheduleProto = {
 * @category guards
 * @since 2.0.0
 */
-const isSchedule = (u) => hasProperty(u, TypeId$43);
+const isSchedule = (u) => hasProperty(u, TypeId$44);
 /**
 * Creates a Schedule from a step function that returns a Pull.
 *
@@ -14676,7 +14683,7 @@ const MetricRegistry = /*#__PURE__*/ Reference("~effect/observability/Metric/Met
 * @since 4.0.0
 */
 const snapshotUnsafe = (context) => {
-	const registry = get$8(context, MetricRegistry);
+	const registry = get$9(context, MetricRegistry);
 	return Array.from(registry.values()).map(({ hooks, ...meta }) => ({
 		...meta,
 		state: hooks.get(context)
@@ -15259,6 +15266,7 @@ const suspend$2 = suspend$3;
 */
 const sync = sync$1;
 const void_$1 = void_$3;
+const undefined_$1 = undefined_$2;
 /**
 * Creates an `Effect` from a callback-based asynchronous API.
 *
@@ -15928,6 +15936,24 @@ const map$4 = map$6;
 */
 const as = as$1;
 /**
+* Maps the success value of an `Effect` to `Some`, preserving failures.
+*
+* **Example** (Wrapping success in Option.some)
+*
+* ```ts
+* import { Effect } from "effect"
+*
+* const program = Effect.asSome(Effect.succeed(42))
+*
+* Effect.runPromise(program).then(console.log)
+* // { _id: 'Option', _tag: 'Some', value: 42 }
+* ```
+*
+* @category mapping
+* @since 2.0.0
+*/
+const asSome = asSome$1;
+/**
 * Maps the success value of an `Effect` to `void`, preserving failures.
 *
 * **Example** (Discarding success values)
@@ -16471,28 +16497,6 @@ const timeoutOption = timeoutOption$1;
 */
 const timeoutOrElse = timeoutOrElse$1;
 /**
-* Returns an effect that is delayed from this effect by the specified
-* `Duration`.
-*
-* **Example** (Delaying an effect)
-*
-* ```ts
-* import { Console, Effect } from "effect"
-*
-* const program = Effect.delay(
-*   Console.log("Delayed message"),
-*   "1 second"
-* )
-*
-* Effect.runFork(program)
-* // Waits 1 second, then prints: "Delayed message"
-* ```
-*
-* @category delays & timeouts
-* @since 2.0.0
-*/
-const delay = delay$1;
-/**
 * Returns an effect that suspends the current fiber for the specified duration
 * without blocking a JavaScript thread.
 *
@@ -18851,7 +18855,7 @@ const redactedRegistry = /*#__PURE__*/ new WeakMap();
 *
 * @since 3.3.0
 */
-const TypeId$42 = "~effect/data/Redacted";
+const TypeId$43 = "~effect/data/Redacted";
 /**
 * Returns `true` if a value is a `Redacted` wrapper.
 *
@@ -18879,7 +18883,7 @@ const TypeId$42 = "~effect/data/Redacted";
 * @category refinements
 * @since 3.3.0
 */
-const isRedacted = (u) => hasProperty(u, TypeId$42);
+const isRedacted = (u) => hasProperty(u, TypeId$43);
 /**
 * Creates a `Redacted` wrapper for a sensitive value.
 *
@@ -18905,14 +18909,14 @@ const isRedacted = (u) => hasProperty(u, TypeId$42);
 * @category constructors
 * @since 3.3.0
 */
-const make$55 = (value, options) => {
+const make$56 = (value, options) => {
 	const self = Object.create(Proto$13);
 	if (options?.label) self.label = options.label;
 	redactedRegistry.set(self, value);
 	return self;
 };
 const Proto$13 = {
-	[TypeId$42]: { _A: (_) => _ },
+	[TypeId$43]: { _A: (_) => _ },
 	label: void 0,
 	...PipeInspectableProto,
 	toJSON() {
@@ -18930,7 +18934,7 @@ const Proto$13 = {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/SchemaIssue.js
-const TypeId$41 = "~effect/SchemaIssue/Issue";
+const TypeId$42 = "~effect/SchemaIssue/Issue";
 /**
 * Returns `true` if the given value is an {@link Issue}.
 *
@@ -18961,10 +18965,10 @@ const TypeId$41 = "~effect/SchemaIssue/Issue";
 * @since 4.0.0
 */
 function isIssue(u) {
-	return hasProperty(u, TypeId$41);
+	return hasProperty(u, TypeId$42);
 }
 var Base$1 = class {
-	[TypeId$41] = TypeId$41;
+	[TypeId$42] = TypeId$42;
 	toString() {
 		return defaultFormatter(this);
 	}
@@ -19413,7 +19417,7 @@ function makeSingle(input, out) {
 	return makeFilterIssue(input, out);
 }
 /** @internal */
-function make$54(input, ast, out) {
+function make$55(input, ast, out) {
 	if (Array.isArray(out)) {
 		if (isReadonlyArrayNonEmpty(out)) {
 			if (out.length === 1) return makeFilterIssue(input, out[0]);
@@ -20092,9 +20096,9 @@ function split(options) {
 *
 * @since 2.0.0
 */
-const TypeId$40 = "~effect/BigDecimal";
+const TypeId$41 = "~effect/BigDecimal";
 const BigDecimalProto = {
-	[TypeId$40]: TypeId$40,
+	[TypeId$41]: TypeId$41,
 	[symbol$3]() {
 		const normalized = normalize(this);
 		return combine$1(hash(normalized.value), number$1(normalized.scale));
@@ -20140,7 +20144,7 @@ const BigDecimalProto = {
 * @category guards
 * @since 2.0.0
 */
-const isBigDecimal = (u) => hasProperty(u, TypeId$40);
+const isBigDecimal = (u) => hasProperty(u, TypeId$41);
 /**
 * Creates a `BigDecimal` from a `bigint` value and a scale.
 *
@@ -20168,7 +20172,7 @@ const isBigDecimal = (u) => hasProperty(u, TypeId$40);
 * @category constructors
 * @since 2.0.0
 */
-const make$53 = (value, scale) => {
+const make$54 = (value, scale) => {
 	const o = Object.create(BigDecimalProto);
 	o.value = value;
 	o.scale = scale;
@@ -20181,7 +20185,7 @@ const make$53 = (value, scale) => {
 */
 const makeNormalizedUnsafe = (value, scale) => {
 	if (value !== bigint0 && value % bigint10 === bigint0) throw new RangeError("Value must be normalized");
-	const o = make$53(value, scale);
+	const o = make$54(value, scale);
 	o.normalized = o;
 	return o;
 };
@@ -20264,8 +20268,8 @@ const normalize = (self) => {
 * @since 2.0.0
 */
 const scale = /*#__PURE__*/ dual(2, (self, scale) => {
-	if (scale > self.scale) return make$53(self.value * bigint10 ** BigInt(scale - self.scale), scale);
-	if (scale < self.scale) return make$53(self.value / bigint10 ** BigInt(self.scale - scale), scale);
+	if (scale > self.scale) return make$54(self.value * bigint10 ** BigInt(scale - self.scale), scale);
+	if (scale < self.scale) return make$54(self.value / bigint10 ** BigInt(self.scale - scale), scale);
 	return self;
 });
 /**
@@ -20289,7 +20293,7 @@ const scale = /*#__PURE__*/ dual(2, (self, scale) => {
 * @category math
 * @since 2.0.0
 */
-const abs = (n) => n.value < bigint0 ? make$53(-n.value, n.scale) : n;
+const abs = (n) => n.value < bigint0 ? make$54(-n.value, n.scale) : n;
 /**
 * Provides an `Equivalence` instance for `BigDecimal` that determines equality between BigDecimal values.
 *
@@ -20314,7 +20318,7 @@ const abs = (n) => n.value < bigint0 ? make$53(-n.value, n.scale) : n;
 * @category instances
 * @since 2.0.0
 */
-const Equivalence$2 = /*#__PURE__*/ make$64((self, that) => {
+const Equivalence$2 = /*#__PURE__*/ make$65((self, that) => {
 	if (self.scale > that.scale) return scale(that, self.scale).value === self.value;
 	if (self.scale < that.scale) return scale(self, that.scale).value === that.value;
 	return self.value === that.value;
@@ -20475,7 +20479,7 @@ const isZero = (n) => n.value === bigint0;
 const isNegative = (n) => n.value < bigint0;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/SchemaTransformation.js
-const TypeId$39 = "~effect/SchemaTransformation/Transformation";
+const TypeId$40 = "~effect/SchemaTransformation/Transformation";
 /**
 * Represents a bidirectional transformation between a decoded type `T` and an encoded
 * type `E`, built from a pair of `Getter`s.
@@ -20518,7 +20522,7 @@ const TypeId$39 = "~effect/SchemaTransformation/Transformation";
 * @since 4.0.0
 */
 var Transformation = class Transformation {
-	[TypeId$39] = TypeId$39;
+	[TypeId$40] = TypeId$40;
 	_tag = "Transformation";
 	decode;
 	encode;
@@ -20564,7 +20568,7 @@ var Transformation = class Transformation {
 * @since 4.0.0
 */
 function isTransformation(u) {
-	return hasProperty(u, TypeId$39);
+	return hasProperty(u, TypeId$40);
 }
 /**
 * Constructs a `Transformation` from an object with `decode` and `encode`
@@ -20597,7 +20601,7 @@ function isTransformation(u) {
 * @category constructors
 * @since 3.10.0
 */
-const make$52 = (options) => {
+const make$53 = (options) => {
 	if (isTransformation(options)) return options;
 	return new Transformation(options.decode, options.encode);
 };
@@ -20946,7 +20950,7 @@ var Context = class {
 		this.annotations = annotations;
 	}
 };
-const TypeId$38 = "~effect/Schema";
+const TypeId$39 = "~effect/Schema";
 /**
 * Represents the abstract base class for all {@link AST} node variants.
 *
@@ -20968,7 +20972,7 @@ const TypeId$38 = "~effect/Schema";
 * @since 4.0.0
 */
 var Base = class {
-	[TypeId$38] = TypeId$38;
+	[TypeId$39] = TypeId$39;
 	annotations;
 	checks;
 	encoding;
@@ -22203,7 +22207,7 @@ var FilterGroup = class FilterGroup extends Class$3 {
 };
 /** @internal */
 function makeFilter$1(filter, annotations, aborted = false) {
-	return new Filter((input, ast, options) => make$54(input, ast, filter(input, ast, options)), annotations, aborted);
+	return new Filter((input, ast, options) => make$55(input, ast, filter(input, ast, options)), annotations, aborted);
 }
 /**
 * Creates a {@link Filter} that validates strings by running `RegExp.test`.
@@ -22731,7 +22735,7 @@ function nominal() {
 *
 * @since 4.0.0
 */
-const TypeId$37 = "~effect/platform/PlatformError";
+const TypeId$38 = "~effect/platform/PlatformError";
 /**
 * Error data for an invalid argument passed to a platform API.
 *
@@ -22841,7 +22845,7 @@ var PlatformError = class extends TaggedError("PlatformError") {
 	*
 	* @since 4.0.0
 	*/
-	[TypeId$37] = TypeId$37;
+	[TypeId$38] = TypeId$38;
 	get message() {
 		return this.reason.message;
 	}
@@ -23138,7 +23142,7 @@ const makeUnsafe$4 = makeLatchUnsafe;
 * @category constructors
 * @since 4.0.0
 */
-const make$51 = makeLatch;
+const make$52 = makeLatch;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/MutableList.js
 /**
@@ -23210,7 +23214,7 @@ const Empty$2 = /*#__PURE__*/ Symbol.for("effect/MutableList/Empty");
 * @category constructors
 * @since 2.0.0
 */
-const make$50 = () => ({
+const make$51 = () => ({
 	head: void 0,
 	tail: void 0,
 	length: 0
@@ -23626,9 +23630,9 @@ const filter$1 = (self, f) => {
 const remove$5 = (self, value) => filter$1(self, (v) => v !== value);
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/MutableRef.js
-const TypeId$36 = "~effect/MutableRef";
+const TypeId$37 = "~effect/MutableRef";
 const MutableRefProto = {
-	[TypeId$36]: TypeId$36,
+	[TypeId$37]: TypeId$37,
 	...PipeInspectableProto,
 	toJSON() {
 		return {
@@ -23666,7 +23670,7 @@ const MutableRefProto = {
 * @category constructors
 * @since 2.0.0
 */
-const make$49 = (value) => {
+const make$50 = (value) => {
 	const ref = Object.create(MutableRefProto);
 	ref.current = value;
 	return ref;
@@ -23703,7 +23707,7 @@ const make$49 = (value) => {
 * @category general
 * @since 2.0.0
 */
-const get$7 = (self) => self.current;
+const get$8 = (self) => self.current;
 /**
 * Sets the MutableRef to a new value and returns the reference.
 *
@@ -23814,7 +23818,7 @@ const set$6 = /*#__PURE__*/ dual(2, (self, value) => {
 *
 * @since 2.0.0
 */
-const TypeId$35 = "~effect/PubSub";
+const TypeId$36 = "~effect/PubSub";
 const SubscriptionTypeId = "~effect/PubSub/Subscription";
 /**
 * Creates a PubSub with a custom atomic implementation and strategy.
@@ -23839,7 +23843,7 @@ const SubscriptionTypeId = "~effect/PubSub/Subscription";
 * @category constructors
 * @since 4.0.0
 */
-const make$48 = (options) => sync(() => makePubSubUnsafe(options.atomicPubSub(), /* @__PURE__ */ new Map(), makeUnsafe$6(), makeUnsafe$4(false), make$49(false), options.strategy()));
+const make$49 = (options) => sync(() => makePubSubUnsafe(options.atomicPubSub(), /* @__PURE__ */ new Map(), makeUnsafe$6(), makeUnsafe$4(false), make$50(false), options.strategy()));
 /**
 * Creates a bounded `PubSub` that applies backpressure when it reaches
 * capacity.
@@ -23871,7 +23875,7 @@ const make$48 = (options) => sync(() => makePubSubUnsafe(options.atomicPubSub(),
 * @category constructors
 * @since 2.0.0
 */
-const bounded$1 = (capacity) => make$48({
+const bounded$1 = (capacity) => make$49({
 	atomicPubSub: () => makeAtomicBounded(capacity),
 	strategy: () => new BackPressureStrategy()
 });
@@ -23909,7 +23913,7 @@ const bounded$1 = (capacity) => make$48({
 * @category constructors
 * @since 2.0.0
 */
-const unbounded$1 = (options) => make$48({
+const unbounded$1 = (options) => make$49({
 	atomicPubSub: () => makeAtomicUnbounded(options),
 	strategy: () => new DroppingStrategy()
 });
@@ -24156,7 +24160,7 @@ const publishUnsafe = /*#__PURE__*/ dual(2, (self, value) => {
 * @since 2.0.0
 */
 const subscribe = (self) => uninterruptible(contextWith((services) => {
-	const localScope = get$8(services, Scope);
+	const localScope = get$9(services, Scope);
 	const scope = forkUnsafe(self.scope);
 	const subscription = makeSubscriptionUnsafe(self.pubsub, self.subscribers, self.strategy);
 	return addFinalizer$1(scope, unsubscribe(subscription)).pipe(andThen(addFinalizerExit(localScope, (exit) => close(scope, exit))), as(subscription));
@@ -24325,7 +24329,7 @@ const removeSubscribers = (subscribers, subscription, pollers) => {
 	set.delete(pollers);
 	if (set.size === 0) subscribers.delete(subscription);
 };
-const makeSubscriptionUnsafe = (pubsub, subscribers, strategy) => new SubscriptionImpl(pubsub, subscribers, pubsub.subscribe(), make$50(), makeUnsafe$4(false), make$49(false), strategy, pubsub.replayWindow());
+const makeSubscriptionUnsafe = (pubsub, subscribers, strategy) => new SubscriptionImpl(pubsub, subscribers, pubsub.subscribe(), make$51(), makeUnsafe$4(false), make$50(false), strategy, pubsub.replayWindow());
 var BoundedPubSubArb = class {
 	array;
 	publisherIndex = 0;
@@ -24880,7 +24884,7 @@ var SubscriptionImpl = class {
 	}
 };
 var PubSubImpl = class {
-	[TypeId$35] = { _A: identity };
+	[TypeId$36] = { _A: identity };
 	pubsub;
 	subscribers;
 	scope;
@@ -24929,7 +24933,7 @@ const ensureCapacity = (capacity) => {
 * @since 4.0.0
 */
 var BackPressureStrategy = class {
-	publishers = /*#__PURE__*/ make$50();
+	publishers = /*#__PURE__*/ make$51();
 	get shutdown() {
 		return withFiber((fiber) => forEach$1(takeAll$2(this.publishers), ([_, deferred, last]) => last ? interruptWith(deferred, fiber.id) : void_$1, {
 			concurrency: "unbounded",
@@ -24942,7 +24946,7 @@ var BackPressureStrategy = class {
 			this.offerUnsafe(elements, deferred);
 			this.onPubSubEmptySpaceUnsafe(pubsub, subscribers);
 			this.completeSubscribersUnsafe(pubsub, subscribers);
-			return (get$7(isShutdown) ? interrupt$1 : _await(deferred)).pipe(onInterrupt(() => {
+			return (get$8(isShutdown) ? interrupt$1 : _await(deferred)).pipe(onInterrupt(() => {
 				this.removeUnsafe(deferred);
 				return void_$1;
 			}));
@@ -25227,7 +25231,7 @@ const emptyReplayWindow = {
 *
 * @since 3.8.0
 */
-const TypeId$34 = "~effect/Queue";
+const TypeId$35 = "~effect/Queue";
 const EnqueueTypeId = "~effect/Queue/Enqueue";
 const DequeueTypeId = "~effect/Queue/Dequeue";
 const variance$1 = {
@@ -25235,7 +25239,7 @@ const variance$1 = {
 	_E: identity
 };
 const QueueProto = {
-	[TypeId$34]: variance$1,
+	[TypeId$35]: variance$1,
 	[EnqueueTypeId]: variance$1,
 	[DequeueTypeId]: variance$1,
 	...PipeInspectableProto,
@@ -25289,12 +25293,12 @@ const QueueProto = {
 * @category constructors
 * @since 4.0.0
 */
-const make$47 = (options) => withFiber$1((fiber) => {
+const make$48 = (options) => withFiber$1((fiber) => {
 	const self = Object.create(QueueProto);
 	self.dispatcher = fiber.currentDispatcher;
 	self.capacity = options?.capacity ?? Number.POSITIVE_INFINITY;
 	self.strategy = options?.strategy ?? "suspend";
-	self.messages = make$50();
+	self.messages = make$51();
 	self.scheduleRunning = false;
 	self.state = {
 		_tag: "Open",
@@ -25332,7 +25336,7 @@ const make$47 = (options) => withFiber$1((fiber) => {
 * @category constructors
 * @since 2.0.0
 */
-const bounded = (capacity) => make$47({ capacity });
+const bounded = (capacity) => make$48({ capacity });
 /**
 * Creates an unbounded queue that can grow to any size without blocking producers.
 *
@@ -25368,7 +25372,7 @@ const bounded = (capacity) => make$47({ capacity });
 * @category constructors
 * @since 2.0.0
 */
-const unbounded = () => make$47();
+const unbounded = () => make$48();
 /**
 * Adds a message to the queue. Returns `false` if the queue is done.
 *
@@ -26119,7 +26123,7 @@ var SemaphoreImpl = class {
 		return (self) => uninterruptibleMask$1((restore) => {
 			if (this.free < n) return succeedNone$1;
 			this.taken += n;
-			return onExitPrimitive$1(restore(asSome(self)), () => {
+			return onExitPrimitive$1(restore(asSome$1(self)), () => {
 				this.updateTakenUnsafe(getCurrentFiber(), (taken) => taken - n);
 			}, true);
 		});
@@ -26158,7 +26162,7 @@ var SemaphoreImpl = class {
 * @category constructors
 * @since 4.0.0
 */
-const make$46 = (permits) => sync$1(() => new SemaphoreImpl(permits));
+const make$47 = (permits) => sync$1(() => new SemaphoreImpl(permits));
 /**
 * Runs an effect with a single permit and releases the permit when the effect
 * completes.
@@ -26261,7 +26265,7 @@ const withPermit = (self, effect) => {
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$33 = "~effect/Channel";
+const TypeId$34 = "~effect/Channel";
 /**
 * Checks whether a value is a `Channel`.
 *
@@ -26278,9 +26282,9 @@ const TypeId$33 = "~effect/Channel";
 * @category guards
 * @since 3.5.4
 */
-const isChannel = (u) => hasProperty(u, TypeId$33);
+const isChannel = (u) => hasProperty(u, TypeId$34);
 const ChannelProto = {
-	[TypeId$33]: {
+	[TypeId$34]: {
 		_Env: identity,
 		_InErr: identity,
 		_InElem: identity,
@@ -26406,7 +26410,7 @@ const toTransform = (channel) => channel.transform;
 * @since 4.0.0
 */
 const DefaultChunkSize = 4096;
-const asyncQueue = (scope, f, options) => make$47({
+const asyncQueue = (scope, f, options) => make$48({
 	capacity: options?.bufferSize,
 	strategy: options?.strategy
 }).pipe(tap((queue) => addFinalizer$1(scope, shutdown(queue))), tap((queue) => forkIn(provide$3(f(queue), scope), scope)));
@@ -27421,7 +27425,7 @@ const orDie$1 = (self) => catch_$1(self, die);
 const mergeAll = /*#__PURE__*/ dual(2, (channels, { bufferSize = 16, concurrency, switch: switch_ = false }) => fromTransformBracket(fnUntraced(function* (upstream, scope, forkedScope) {
 	const concurrencyN = concurrency === "unbounded" ? Number.MAX_SAFE_INTEGER : Math.max(1, concurrency);
 	const semaphore = switch_ ? void 0 : makeUnsafe$3(concurrencyN);
-	const doneLatch = yield* make$51(true);
+	const doneLatch = yield* make$52(true);
 	const fibers = /* @__PURE__ */ new Set();
 	const queue = yield* bounded(bufferSize);
 	yield* addFinalizer$1(forkedScope, shutdown(queue));
@@ -27860,14 +27864,14 @@ const runFold = /*#__PURE__*/ dual(3, (self, initial, f) => suspend$2(() => {
 const toPullScoped = (self, scope) => toTransform(self)(done(), scope);
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/internal/stream.js
-const TypeId$32 = "~effect/Stream";
+const TypeId$33 = "~effect/Stream";
 const streamVariance = {
 	_R: identity,
 	_E: identity,
 	_A: identity
 };
 const StreamProto = {
-	[TypeId$32]: streamVariance,
+	[TypeId$33]: streamVariance,
 	pipe() {
 		return pipeArguments(this, arguments);
 	}
@@ -27880,7 +27884,7 @@ const fromChannel$2 = (channel) => {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Sink.js
-const TypeId$31 = "~effect/Sink";
+const TypeId$32 = "~effect/Sink";
 const endVoid = /*#__PURE__*/ succeed$3([void 0]);
 const sinkVariance = {
 	_A: identity,
@@ -27890,7 +27894,7 @@ const sinkVariance = {
 	_R: identity
 };
 const SinkProto = {
-	[TypeId$31]: sinkVariance,
+	[TypeId$32]: sinkVariance,
 	pipe() {
 		return pipeArguments(this, arguments);
 	}
@@ -27913,7 +27917,7 @@ const SinkProto = {
 * @category guards
 * @since 4.0.0
 */
-const isSink = (u) => hasProperty(u, TypeId$31);
+const isSink = (u) => hasProperty(u, TypeId$32);
 /**
 * Creates a sink from a `Channel`.
 *
@@ -28062,9 +28066,9 @@ const forEachArray = (f) => fromTransform((upstream) => upstream.pipe(flatMap$2(
 const unwrap$2 = (effect) => fromChannel$1(unwrap$3(map$4(effect, toChannel$1)));
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/MutableHashMap.js
-const TypeId$30 = "~effect/collections/MutableHashMap";
+const TypeId$31 = "~effect/collections/MutableHashMap";
 const MutableHashMapProto = {
-	[TypeId$30]: TypeId$30,
+	[TypeId$31]: TypeId$31,
 	[Symbol.iterator]() {
 		return this.backing[Symbol.iterator]();
 	},
@@ -28154,7 +28158,7 @@ const empty$9 = () => {
 * @category elements
 * @since 2.0.0
 */
-const get$6 = /*#__PURE__*/ dual(2, (self, key) => {
+const get$7 = /*#__PURE__*/ dual(2, (self, key) => {
 	if (self.backing.has(key)) return some(self.backing.get(key));
 	else if (isSimpleKey(key)) return none();
 	const refKey = referentialKeysCache.get(self);
@@ -28201,7 +28205,7 @@ const getFromBucket = (self, bucket, key) => {
 * @category elements
 * @since 2.0.0
 */
-const has = /*#__PURE__*/ dual(2, (self, key) => isSome(get$6(self, key)));
+const has$1 = /*#__PURE__*/ dual(2, (self, key) => isSome(get$7(self, key)));
 /**
 * Sets a key-value pair in the MutableHashMap, mutating the map in place.
 * If the key already exists, its value is updated.
@@ -28432,9 +28436,9 @@ const size = (self) => self.backing.size;
 *
 * @since 3.5.0
 */
-const TypeId$29 = "~effect/RcMap";
+const TypeId$30 = "~effect/RcMap";
 const makeUnsafe$2 = (options) => ({
-	[TypeId$29]: TypeId$29,
+	[TypeId$30]: TypeId$30,
 	lookup: options.lookup,
 	context: options.context,
 	scope: options.scope,
@@ -28494,9 +28498,9 @@ const makeUnsafe$2 = (options) => ({
 * @category models
 * @since 3.5.0
 */
-const make$45 = (options) => withFiber((fiber) => {
+const make$46 = (options) => withFiber((fiber) => {
 	const context = fiber.context;
-	const scope = get$8(context, Scope);
+	const scope = get$9(context, Scope);
 	const self = makeUnsafe$2({
 		lookup: options.lookup,
 		context,
@@ -28554,11 +28558,11 @@ const make$45 = (options) => withFiber((fiber) => {
 * @category combinators
 * @since 3.5.0
 */
-const get$5 = /*#__PURE__*/ dual(2, (self, key) => uninterruptibleMask((restore) => {
+const get$6 = /*#__PURE__*/ dual(2, (self, key) => uninterruptibleMask((restore) => {
 	if (self.state._tag === "Closed") return interrupt$1;
 	const state = self.state;
 	const parent = getCurrent();
-	const o = get$6(state.map, key);
+	const o = get$7(state.map, key);
 	let entry;
 	if (o._tag === "Some") {
 		entry = o.value;
@@ -28588,7 +28592,7 @@ const get$5 = /*#__PURE__*/ dual(2, (self, key) => uninterruptibleMask((restore)
 const release = (self, key, entry) => withFiber((fiber) => {
 	entry.refCount--;
 	if (entry.refCount > 0) return void_$1;
-	else if (self.state._tag === "Closed" || !has(self.state.map, key) || isZero$1(entry.idleTimeToLive)) {
+	else if (self.state._tag === "Closed" || !has$1(self.state.map, key) || isZero$1(entry.idleTimeToLive)) {
 		if (self.state._tag === "Open") remove$4(self.state.map, key);
 		return close(entry.scope, void_$2);
 	} else if (!isFinite$1(entry.idleTimeToLive)) return void_$1;
@@ -28611,7 +28615,7 @@ const release = (self, key, entry) => withFiber((fiber) => {
 });
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/internal/rcRef.js
-const TypeId$28 = "~effect/RcRef";
+const TypeId$29 = "~effect/RcRef";
 const stateEmpty = { _tag: "Empty" };
 const stateClosed = { _tag: "Closed" };
 const variance = {
@@ -28619,7 +28623,7 @@ const variance = {
 	_E: identity
 };
 var RcRefImpl = class {
-	[TypeId$28] = variance;
+	[TypeId$29] = variance;
 	pipe() {
 		return pipeArguments(this, arguments);
 	}
@@ -28637,9 +28641,9 @@ var RcRefImpl = class {
 	}
 };
 /** @internal */
-const make$44 = (options) => withFiber((fiber) => {
+const make$45 = (options) => withFiber((fiber) => {
 	const context = fiber.context;
-	const scope = get$8(context, Scope);
+	const scope = get$9(context, Scope);
 	const ref = new RcRefImpl(options.acquire, context, scope, options.idleTimeToLive ? fromInputUnsafe(options.idleTimeToLive) : void 0);
 	return as(addFinalizerExit(scope, () => {
 		const close$1 = ref.state._tag === "Acquired" ? close(ref.state.scope, void_$2) : void_$1;
@@ -28671,7 +28675,7 @@ const getState = (self) => uninterruptibleMask((restore) => {
 	}
 });
 /** @internal */
-const get$4 = /*#__PURE__*/ fnUntraced(function* (self_) {
+const get$5 = /*#__PURE__*/ fnUntraced(function* (self_) {
 	const self = self_;
 	const state = yield* getState(self);
 	const scope$6 = yield* scope;
@@ -28740,7 +28744,7 @@ const get$4 = /*#__PURE__*/ fnUntraced(function* (self_) {
 * @category constructors
 * @since 3.5.0
 */
-const make$43 = make$44;
+const make$44 = make$45;
 /**
 * Gets the value from an `RcRef`, acquiring it first if needed.
 *
@@ -28784,7 +28788,7 @@ const make$43 = make$44;
 * @category combinators
 * @since 3.5.0
 */
-const get$3 = get$4;
+const get$4 = get$5;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Stream.js
 /**
@@ -28884,7 +28888,7 @@ const get$3 = get$4;
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$27 = "~effect/Stream";
+const TypeId$28 = "~effect/Stream";
 /**
 * Checks whether a value is a Stream.
 *
@@ -28909,7 +28913,7 @@ const TypeId$27 = "~effect/Stream";
 * @category guards
 * @since 4.0.0
 */
-const isStream = (u) => hasProperty(u, TypeId$27);
+const isStream = (u) => hasProperty(u, TypeId$28);
 /**
 * Creates a stream from a array-emitting `Channel`.
 *
@@ -28957,42 +28961,6 @@ const fromChannel = fromChannel$2;
 */
 const fromEffectRepeat = (effect) => fromPull(succeed$3(map$4(effect, of)));
 /**
-* Creates a stream that emits `void` immediately once, then emits another
-* `void` after each specified interval.
-*
-* **Example** (Emitting ticks on an interval)
-*
-* ```ts
-* import { Console, Effect, Stream } from "effect"
-*
-* const program = Effect.gen(function*() {
-*   const ticks = yield* Stream.tick("200 millis").pipe(
-*     Stream.take(3),
-*     Stream.runCollect
-*   )
-*   yield* Console.log(ticks)
-* })
-*
-* Effect.runPromise(program)
-* // Output: [ undefined, undefined, undefined ]
-* ```
-*
-* @category constructors
-* @since 2.0.0
-*/
-const tick = (interval) => fromPull(sync(() => {
-	let first = true;
-	const effect = succeed$3(of(void 0));
-	const delayed = delay(effect, interval);
-	return suspend$2(() => {
-		if (first) {
-			first = false;
-			return effect;
-		}
-		return delayed;
-	});
-}));
-/**
 * Creates a stream from a pull effect, such as one produced by `Stream.toPull`.
 *
 * **Details**
@@ -29154,7 +29122,7 @@ const empty$8 = /*#__PURE__*/ fromChannel(empty$10);
 * @category constructors
 * @since 2.0.0
 */
-const make$42 = (...values) => fromArray(values);
+const make$43 = (...values) => fromArray(values);
 /**
 * Creates a lazily constructed stream.
 *
@@ -30321,7 +30289,7 @@ const toReadableStreamEffect = /*#__PURE__*/ dual((args) => isStream(args[0]), (
 *
 * @since 4.0.0
 */
-const TypeId$26 = "~effect/platform/FileSystem";
+const TypeId$27 = "~effect/platform/FileSystem";
 /**
 * Creates a `Size` from various numeric input types.
 *
@@ -30429,9 +30397,9 @@ const FileSystem = /*#__PURE__*/ Service("effect/platform/FileSystem");
 * @category constructors
 * @since 4.0.0
 */
-const make$41 = (impl) => FileSystem.of({
+const make$42 = (impl) => FileSystem.of({
 	...impl,
-	[TypeId$26]: TypeId$26,
+	[TypeId$27]: TypeId$27,
 	exists: (path) => pipe(impl.access(path), as(true), catchTag("PlatformError", (e) => e.reason._tag === "NotFound" ? succeed$3(false) : fail$3(e))),
 	readFileString: (path, encoding) => flatMap$2(impl.readFile(path), (_) => try_({
 		try: () => new TextDecoder(encoding).decode(_),
@@ -30452,7 +30420,7 @@ const make$41 = (impl) => FileSystem.of({
 		return fromPull(succeed$3(flatMap$2(suspend$2(() => {
 			if (bytesToRead !== void 0 && bytesToRead <= totalBytesRead) return done();
 			return bytesToRead !== void 0 && bytesToRead - totalBytesRead < chunkSize ? file.readAlloc(bytesToRead - totalBytesRead) : readChunk;
-		}), match$4({
+		}), match$5({
 			onNone: () => done(),
 			onSome: (buf) => {
 				totalBytesRead += BigInt(buf.length);
@@ -30605,7 +30573,7 @@ var WatchBackend = class extends Service()("effect/platform/FileSystem/WatchBack
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$25 = "~effect/platform/Path";
+const TypeId$26 = "~effect/platform/Path";
 /**
 * Service tag for accessing the current `Path` implementation.
 *
@@ -30734,7 +30702,7 @@ const makeHandle = (params) => Object.assign(Object.create(HandleProto), params)
 * @category models
 * @since 4.0.0
 */
-const make$40 = (spawn) => {
+const make$41 = (spawn) => {
 	const streamString = (command, options) => spawn(command).pipe(map$4((handle) => decodeText(options?.includeStderr === true ? handle.all : handle.stdout)), unwrap$1);
 	const streamLines = (command, options) => splitLines(streamString(command, options));
 	return ChildProcessSpawner.of({
@@ -30798,7 +30766,7 @@ var ChildProcessSpawner = class extends Service()("effect/process/ChildProcessSp
 *
 * @since 4.0.0
 */
-const TypeId$24 = "~effect/unstable/process/ChildProcess";
+const TypeId$25 = "~effect/unstable/process/ChildProcess";
 const Proto$12 = {
 	.../*#__PURE__*/ Prototype({
 		label: "Command",
@@ -30806,7 +30774,7 @@ const Proto$12 = {
 			return getUnsafe(fiber.context, ChildProcessSpawner).spawn(this);
 		}
 	}),
-	[TypeId$24]: TypeId$24
+	[TypeId$25]: TypeId$25
 };
 const makeStandardCommand = (command, args, options) => Object.assign(Object.create(Proto$12), {
 	_tag: "StandardCommand",
@@ -30845,7 +30813,7 @@ const makeStandardCommand = (command, args, options) => Object.assign(Object.cre
 * @category constructors
 * @since 4.0.0
 */
-const make$39 = function make(...args) {
+const make$40 = function make(...args) {
 	if (isTemplateString(args[0])) {
 		const [templates, ...expressions] = args;
 		const tokens = parseTemplates(templates, expressions);
@@ -31230,7 +31198,7 @@ const readableToPullUnsafe = (options) => {
 	const readable = options.readable;
 	if (readable.readableEnded) return succeed$3(done());
 	const closeOnDone = options.closeOnDone ?? true;
-	const exit = options.exit ?? make$49(void 0);
+	const exit = options.exit ?? make$50(void 0);
 	const latch = makeUnsafe$4(false);
 	function onReadable() {
 		latch.openUnsafe();
@@ -31567,7 +31535,7 @@ const layer$22 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(f
 					const stdinConfig = resolveStdinOption(command.options);
 					const sourceStream = unwrap$1(succeed$3(getSourceStream(handles[handles.length - 1], options.from)));
 					const toOption = options.to ?? "stdin";
-					if (toOption === "stdin") handles.push(yield* spawnCommand(make$39(command.command, command.args, {
+					if (toOption === "stdin") handles.push(yield* spawnCommand(make$40(command.command, command.args, {
 						...command.options,
 						stdin: {
 							...stdinConfig,
@@ -31579,7 +31547,7 @@ const layer$22 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(f
 						if (isNotUndefined(fd)) {
 							const fdName$1 = fdName(fd);
 							const existingFds = command.options.additionalFds ?? {};
-							handles.push(yield* spawnCommand(make$39(command.command, command.args, {
+							handles.push(yield* spawnCommand(make$40(command.command, command.args, {
 								...command.options,
 								additionalFds: {
 									...existingFds,
@@ -31589,7 +31557,7 @@ const layer$22 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(f
 									}
 								}
 							})));
-						} else handles.push(yield* spawnCommand(make$39(command.command, command.args, {
+						} else handles.push(yield* spawnCommand(make$40(command.command, command.args, {
 							...command.options,
 							stdin: {
 								...stdinConfig,
@@ -31620,7 +31588,7 @@ const layer$22 = /*#__PURE__*/ effect(ChildProcessSpawner, /* @__PURE__ */ gen(f
 			}
 		}
 	});
-	return make$40(spawnCommand);
+	return make$41(spawnCommand);
 }));
 /**
 * Flattens a `Command` into an array of `StandardCommand`s along with pipe
@@ -31750,7 +31718,7 @@ const RefProto = {
 */
 const makeUnsafe$1 = (value) => {
 	const self = Object.create(RefProto);
-	self.ref = make$49(value);
+	self.ref = make$50(value);
 	return self;
 };
 /**
@@ -31777,7 +31745,7 @@ const makeUnsafe$1 = (value) => {
 * @category constructors
 * @since 2.0.0
 */
-const make$37 = (value) => sync(() => makeUnsafe$1(value));
+const make$38 = (value) => sync(() => makeUnsafe$1(value));
 /**
 * Gets the current value of the Ref.
 *
@@ -31802,7 +31770,7 @@ const make$37 = (value) => sync(() => makeUnsafe$1(value));
 * @category getters
 * @since 2.0.0
 */
-const get$2 = (self) => sync(() => self.ref.current);
+const get$3 = (self) => sync(() => self.ref.current);
 /**
 * Sets the value of the Ref to the specified value.
 *
@@ -32367,7 +32335,7 @@ var HashMapImpl = class {
 			const thatImpl = that;
 			if (this.size !== thatImpl.size) return false;
 			for (const [key, value] of this) {
-				const otherValue = pipe(that, get$1(key));
+				const otherValue = pipe(that, get$2(key));
 				if (isNone(otherValue) || !equals$2(value, otherValue.value)) return false;
 			}
 			return true;
@@ -32402,10 +32370,14 @@ const isHashMap = (u) => hasProperty(u, HashMapTypeId);
 /** @internal */
 const empty$7 = () => new HashMapImpl(false, 0, emptyNode, 0);
 /** @internal */
-const get$1 = /*#__PURE__*/ dual(2, (self, key) => {
+const get$2 = /*#__PURE__*/ dual(2, (self, key) => {
 	return self._root.get(0, hash(key), key);
 });
 /** @internal */
+const has = /*#__PURE__*/ dual(2, (self, key) => {
+	return self._root.has(0, hash(key), key);
+});
+/** @internal */
 const set$3 = /*#__PURE__*/ dual(3, (self, key, value) => {
 	const impl = self;
 	const hash$2 = hash(key);
@@ -32441,6 +32413,12 @@ const values$1 = (self) => {
 	};
 };
 /** @internal */
+const modifyAt$1 = /*#__PURE__*/ dual(3, (self, key, f) => {
+	const updated = f(get$2(self, key));
+	if (isNone(updated)) return has(self, key) ? remove$3(self, key) : self;
+	return set$3(self, key, updated.value);
+});
+/** @internal */
 const remove$3 = /*#__PURE__*/ dual(2, (self, key) => {
 	const impl = self;
 	const hash$3 = hash(key);
@@ -32550,6 +32528,29 @@ const remove$3 = /*#__PURE__*/ dual(2, (self, key) => {
 */
 const empty$6 = empty$7;
 /**
+* Looks up the value for the specified key in the `HashMap` safely using the
+* internal hashing function.
+*
+* **Example** (Looking up values)
+*
+* ```ts
+* import { HashMap } from "effect"
+*
+* const map = HashMap.make(["a", 1], ["b", 2])
+*
+* console.log(HashMap.get(map, "a")) // Option.some(1)
+* console.log(HashMap.get(map, "c")) // Option.none()
+*
+* // Using pipe syntax
+* const value = HashMap.get("b")(map)
+* console.log(value) // Option.some(2)
+* ```
+*
+* @category elements
+* @since 2.0.0
+*/
+const get$1 = get$2;
+/**
 * Sets the specified key to the specified value using the internal hashing
 * function.
 *
@@ -32590,6 +32591,34 @@ const set$2 = set$3;
 */
 const values = values$1;
 /**
+* Sets or removes the specified key using an update function.
+*
+* **Details**
+*
+* The update function receives `Some(value)` when the key exists or `None`
+* when it does not. Returning `Some(newValue)` stores the value, and returning
+* `None` removes the key or leaves it absent.
+*
+* **Example** (Updating values with Options)
+*
+* ```ts
+* import { HashMap, Option } from "effect"
+*
+* const map = HashMap.make(["a", 1], ["b", 2])
+*
+* // Increment existing value or set to 1 if not present
+* const updateFn = (option: Option.Option<number>) =>
+*   Option.isSome(option) ? Option.some(option.value + 1) : Option.some(1)
+*
+* const updated = HashMap.modifyAt(map, "a", updateFn)
+* console.log(HashMap.get(updated, "a")) // Option.some(2)
+* ```
+*
+* @category transforming
+* @since 2.0.0
+*/
+const modifyAt = modifyAt$1;
+/**
 * Removes the entry for the specified key in the `HashMap` using the internal
 * hashing function.
 *
@@ -32665,6 +32694,22 @@ const lambda = (f) => f;
 * @since 4.0.0
 */
 const map$1 = /*#__PURE__*/ dual(2, (self, f) => self === void 0 ? void 0 : f(self));
+/**
+* Pattern matches on an `A | undefined` value, running `onDefined` when the
+* value is present or evaluating `onUndefined` when the value is `undefined`.
+*
+* **When to use**
+*
+* Use when you need to turn an `A | undefined` into a non-optional result by
+* handling both the defined and undefined branches in one expression.
+*
+* @see {@link map} for transforming defined values while preserving `undefined`
+* @see {@link getOrThrowWith} for throwing when the value is `undefined` instead of returning a fallback branch
+*
+* @category pattern matching
+* @since 4.0.0
+*/
+const match = /*#__PURE__*/ dual(2, (self, { onDefined, onUndefined }) => self === void 0 ? onUndefined() : onDefined(self));
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/SchemaParser.js
 /**
@@ -32793,7 +32838,7 @@ function makeOption(schema) {
 * @category constructors
 * @since 4.0.0
 */
-function make$36(schema) {
+function make$37(schema) {
 	const parser = makeEffect(schema);
 	return (input, options) => {
 		return runSync(mapErrorEager(parser(input, options), (issue) => new Error(issue.toString(), { cause: issue })));
@@ -32999,9 +33044,9 @@ const recur$1 = /*#__PURE__*/ memoize((ast) => {
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/internal/schema/schema.js
 /** @internal */
-const TypeId$23 = "~effect/Schema/Schema";
+const TypeId$24 = "~effect/Schema/Schema";
 const SchemaProto = {
-	[TypeId$23]: TypeId$23,
+	[TypeId$24]: TypeId$24,
 	pipe() {
 		return pipeArguments(this, arguments);
 	},
@@ -33016,13 +33061,13 @@ const SchemaProto = {
 	}
 };
 /** @internal */
-function make$35(ast, options) {
+function make$36(ast, options) {
 	const self = Object.create(SchemaProto);
 	if (options) Object.assign(self, options);
 	self.ast = ast;
-	self.rebuild = (ast) => make$35(ast, options);
+	self.rebuild = (ast) => make$36(ast, options);
 	self.makeEffect = flow(makeEffect(self), mapErrorEager((issue) => new SchemaError(issue)));
-	self.make = make$36(self);
+	self.make = make$37(self);
 	self.makeOption = makeOption(self);
 	return self;
 }
@@ -33072,7 +33117,7 @@ function makeReorder(getPriority) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Schema.js
-const TypeId$22 = TypeId$23;
+const TypeId$23 = TypeId$24;
 /**
 * Creates a schema for a **parametric** type (a generic container such as
 * `Array<A>`, `Option<A>`, etc.) by accepting a list of type-parameter schemas
@@ -33124,7 +33169,7 @@ const TypeId$22 = TypeId$23;
 */
 function declareConstructor() {
 	return (typeParameters, run, annotations) => {
-		return make$34(new Declaration(typeParameters.map(getAST), (typeParameters) => run(typeParameters.map((ast) => make$34(ast))), annotations));
+		return make$35(new Declaration(typeParameters.map(getAST), (typeParameters) => run(typeParameters.map((ast) => make$35(ast))), annotations));
 	};
 }
 /**
@@ -33209,6 +33254,25 @@ function decodeUnknownEffect(schema, options) {
 	};
 }
 /**
+* Decodes a typed input (the schema's `Encoded` type) against a schema,
+* returning an `Effect` that succeeds with the decoded value or fails with a
+* {@link SchemaError}.
+*
+* **When to use**
+*
+* Use when the input is already typed as the schema's `Encoded` type.
+*
+* **Details**
+*
+* For `unknown` input use {@link decodeUnknownEffect}.
+* Options may be provided either when creating the decoder or when applying it;
+* application options override creation options.
+*
+* @category decoding
+* @since 4.0.0
+*/
+const decodeEffect = decodeUnknownEffect;
+/**
 * Decodes an `unknown` input against a schema synchronously, returning the
 * decoded value or throwing an `Error` whose cause contains the schema issue.
 *
@@ -33282,6 +33346,25 @@ function encodeUnknownEffect(schema, options) {
 	};
 }
 /**
+* Encodes a typed input (the schema's `Type`) against a schema, returning an
+* `Effect` that succeeds with the encoded value or fails with a
+* {@link SchemaError}.
+*
+* **When to use**
+*
+* Use when the input is already typed as the schema's `Type`.
+*
+* **Details**
+*
+* For `unknown` input use {@link encodeUnknownEffect}.
+* Options may be provided either when creating the encoder or when applying it;
+* application options override creation options.
+*
+* @category encoding
+* @since 4.0.0
+*/
+const encodeEffect = encodeUnknownEffect;
+/**
 * Encodes a typed input (the schema's `Type`) against a schema synchronously,
 * throwing a {@link SchemaError} on failure.
 *
@@ -33317,7 +33400,7 @@ const encodeSync = encodeSync$1;
 * @category constructors
 * @since 3.10.0
 */
-const make$34 = make$35;
+const make$35 = make$36;
 /**
 * Checks whether a value is a `Schema`.
 *
@@ -33325,7 +33408,7 @@ const make$34 = make$35;
 * @since 3.10.0
 */
 function isSchema(u) {
-	return hasProperty(u, TypeId$22) && u[TypeId$22] === TypeId$22;
+	return hasProperty(u, TypeId$23) && u[TypeId$23] === TypeId$23;
 }
 /**
 * Creates an exact optional key schema for struct fields. Unlike `optional`,
@@ -33349,7 +33432,7 @@ function isSchema(u) {
 * @category combinators
 * @since 4.0.0
 */
-const optionalKey = /*#__PURE__*/ lambda((schema) => make$34(optionalKey$1(schema.ast), { schema }));
+const optionalKey = /*#__PURE__*/ lambda((schema) => make$35(optionalKey$1(schema.ast), { schema }));
 /**
 * Marks a struct field as optional, allowing the key to be absent or
 * `undefined`.
@@ -33399,7 +33482,7 @@ const optional = /*#__PURE__*/ lambda((self) => optionalKey(UndefinedOr(self)));
 * @since 3.10.0
 */
 function Literal(literal) {
-	const out = make$34(new Literal$1(literal), {
+	const out = make$35(new Literal$1(literal), {
 		literal,
 		transform(to) {
 			return out.pipe(decodeTo(Literal(to), {
@@ -33416,7 +33499,7 @@ function Literal(literal) {
 * @category schemas
 * @since 3.10.0
 */
-const Never = /*#__PURE__*/ make$34(never);
+const Never = /*#__PURE__*/ make$35(never);
 /**
 * Schema for the `any` type. Accepts any value without validation.
 *
@@ -33424,7 +33507,7 @@ const Never = /*#__PURE__*/ make$34(never);
 * @category schemas
 * @since 3.10.0
 */
-const Any = /*#__PURE__*/ make$34(any);
+const Any = /*#__PURE__*/ make$35(any);
 /**
 * Schema for the `unknown` type. Accepts any value without validation.
 *
@@ -33432,7 +33515,7 @@ const Any = /*#__PURE__*/ make$34(any);
 * @category schemas
 * @since 3.10.0
 */
-const Unknown = /*#__PURE__*/ make$34(unknown);
+const Unknown = /*#__PURE__*/ make$35(unknown);
 /**
 * Schema for the `undefined` literal. Validates that the input is strictly `undefined`.
 *
@@ -33440,14 +33523,14 @@ const Unknown = /*#__PURE__*/ make$34(unknown);
 * @category schemas
 * @since 3.10.0
 */
-const Undefined = /*#__PURE__*/ make$34(undefined_);
+const Undefined = /*#__PURE__*/ make$35(undefined_);
 /**
 * Schema for `string` values. Validates that the input is `typeof` `"string"`.
 *
 * @category schemas
 * @since 4.0.0
 */
-const String$1 = /*#__PURE__*/ make$34(string$1);
+const String$1 = /*#__PURE__*/ make$35(string$1);
 /**
 * Schema for `number` values, including `NaN`, `Infinity`, and `-Infinity`.
 *
@@ -33462,7 +33545,7 @@ const String$1 = /*#__PURE__*/ make$34(string$1);
 * @category schemas
 * @since 4.0.0
 */
-const Number$1 = /*#__PURE__*/ make$34(number);
+const Number$1 = /*#__PURE__*/ make$35(number);
 /**
 * Schema for `boolean` values. Validates that the input is `typeof` `"boolean"`.
 *
@@ -33475,16 +33558,16 @@ const Number$1 = /*#__PURE__*/ make$34(number);
 * @category boolean
 * @since 4.0.0
 */
-const Boolean$1 = /*#__PURE__*/ make$34(boolean);
+const Boolean$1 = /*#__PURE__*/ make$35(boolean);
 /**
 * Schema for the `void` type. Accepts `undefined` as the encoded value.
 *
 * @category schemas
 * @since 3.10.0
 */
-const Void = /*#__PURE__*/ make$34(void_);
+const Void = /*#__PURE__*/ make$35(void_);
 function makeStruct(ast, fields) {
-	return make$34(ast, {
+	return make$35(ast, {
 		fields,
 		mapFields(f, options) {
 			const fields = f(this.fields);
@@ -33551,13 +33634,13 @@ function Struct(fields) {
 */
 function Record(key, value, options) {
 	const keyValueCombiner = options?.keyValueCombiner?.decode || options?.keyValueCombiner?.encode ? new KeyValueCombiner(options.keyValueCombiner.decode, options.keyValueCombiner.encode) : void 0;
-	return make$34(record(key.ast, value.ast, keyValueCombiner), {
+	return make$35(record(key.ast, value.ast, keyValueCombiner), {
 		key,
 		value
 	});
 }
 function makeTuple(ast, elements) {
-	return make$34(ast, {
+	return make$35(ast, {
 		elements,
 		mapElements(f, options) {
 			const elements = f(this.elements);
@@ -33569,9 +33652,9 @@ function makeTuple(ast, elements) {
 * @category constructors
 * @since 4.0.0
 */
-const ArraySchema = /*#__PURE__*/ lambda((schema) => make$34(new Arrays(false, [], [schema.ast]), { value: schema }));
+const ArraySchema = /*#__PURE__*/ lambda((schema) => make$35(new Arrays(false, [], [schema.ast]), { value: schema }));
 function makeUnion(ast, members) {
-	return make$34(ast, {
+	return make$35(ast, {
 		members,
 		mapMembers(f, options) {
 			const members = f(this.members);
@@ -33624,7 +33707,7 @@ function Union(members, options) {
 */
 function Literals(literals) {
 	const members = literals.map(Literal);
-	return make$34(union(members, "anyOf", void 0), {
+	return make$35(union(members, "anyOf", void 0), {
 		literals,
 		members,
 		mapMembers(f) {
@@ -33647,7 +33730,7 @@ function Literals(literals) {
 const UndefinedOr = /*#__PURE__*/ lambda((self) => Union([self, Undefined]));
 function decodeTo(to, transformation) {
 	return (from) => {
-		return make$34(decodeTo$1(from.ast, to.ast, transformation ? make$52(transformation) : passthrough()), {
+		return make$35(decodeTo$1(from.ast, to.ast, transformation ? make$53(transformation) : passthrough()), {
 			from,
 			to
 		});
@@ -33681,7 +33764,7 @@ function decodeTo(to, transformation) {
 * @since 3.10.0
 */
 function withConstructorDefault(defaultValue) {
-	return (schema) => make$34(withConstructorDefault$1(schema.ast, mapErrorEager(defaultValue, (e) => e.issue)), { schema });
+	return (schema) => make$35(withConstructorDefault$1(schema.ast, mapErrorEager(defaultValue, (e) => e.issue)), { schema });
 }
 /**
 * Combines a {@link Literal} schema with {@link withConstructorDefault}, making it ideal
@@ -33790,7 +33873,7 @@ function instanceOf(constructor, annotations) {
 */
 function link$1() {
 	return (encodeTo, transformation) => {
-		return new Link(encodeTo.ast, make$52(transformation));
+		return new Link(encodeTo.ast, make$53(transformation));
 	};
 }
 /**
@@ -33988,7 +34071,7 @@ function isInt(annotations) {
 * @since 4.0.0
 */
 function CauseReason(error, defect) {
-	return make$34(declareConstructor()([error, defect], ([error, defect]) => (input, ast, options) => {
+	return make$35(declareConstructor()([error, defect], ([error, defect]) => (input, ast, options) => {
 		if (!isReason(input)) return fail$3(new InvalidType(ast, some(input)));
 		switch (input._tag) {
 			case "Fail": return mapBothEager(decodeUnknownEffect$1(error)(input.error, options), {
@@ -34089,7 +34172,7 @@ function causeReasonToFormatter(error, defect) {
 * @since 3.10.0
 */
 function Cause(error, defect) {
-	return make$34(declareConstructor()([error, defect], ([error, defect]) => {
+	return make$35(declareConstructor()([error, defect], ([error, defect]) => {
 		const failures = ArraySchema(CauseReason(error, defect));
 		return (input, ast, options) => {
 			if (!isCause(input)) return fail$3(new InvalidType(ast, some(input)));
@@ -34192,7 +34275,7 @@ const Defect = /*#__PURE__*/ Union([/*#__PURE__*/ ErrorJsonEncoded.pipe(/*#__PUR
 * @since 3.10.0
 */
 function Exit(value, error, defect) {
-	return make$34(declareConstructor()([
+	return make$35(declareConstructor()([
 		value,
 		error,
 		defect
@@ -34373,7 +34456,7 @@ function makeClass(Inherited, identifier, struct$1, annotations, proto) {
 				disableChecks: true
 			});
 		}
-		static [TypeId$22] = TypeId$22;
+		static [TypeId$23] = TypeId$23;
 		get [ClassTypeId]() {
 			return ClassTypeId;
 		}
@@ -34434,7 +34517,7 @@ function getClassSchemaFactory(from, identifier, annotations) {
 	return (self) => {
 		if (memo === void 0) {
 			const transformation = getClassTransformation(self);
-			const to = make$34(new Declaration([from.ast], () => (input, ast) => {
+			const to = make$35(new Declaration([from.ast], () => (input, ast) => {
 				return input instanceof self || hasProperty(input, getClassTypeId(identifier)) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input)));
 			}, {
 				identifier,
@@ -34587,7 +34670,7 @@ const TaggedErrorClass = (identifier) => {
 * @since 4.0.0
 */
 function toCodecJson(schema) {
-	return make$34(toCodecJsonTop(schema.ast));
+	return make$35(toCodecJsonTop(schema.ast));
 }
 const toCodecJsonTop = /*#__PURE__*/ toCodec((ast) => {
 	const out = toCodecJsonBase(ast, toCodecJsonTop);
@@ -34598,7 +34681,7 @@ function toCodecJsonBase(ast, recur) {
 		case "Declaration": {
 			const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec;
 			if (isFunction(getLink)) {
-				const link = getLink(isDeclaration(ast) ? ast.typeParameters.map((tp) => make$35(toEncoded(tp))) : []);
+				const link = getLink(isDeclaration(ast) ? ast.typeParameters.map((tp) => make$36(toEncoded(tp))) : []);
 				const to = recur(link.to);
 				return replaceEncoding(ast, to === link.to ? [link] : [new Link(to, link.transformation)]);
 			}
@@ -34627,7 +34710,7 @@ function toCodecJsonBase(ast, recur) {
 	return ast;
 }
 function toCodecStringTree(schema, options) {
-	return make$34(toCodecEnsureArray(options?.keepDeclarations === true ? serializerStringTreeKeepDeclarations(schema.ast) : serializerStringTree(schema.ast)));
+	return make$35(toCodecEnsureArray(options?.keepDeclarations === true ? serializerStringTreeKeepDeclarations(schema.ast) : serializerStringTree(schema.ast)));
 }
 function getStringTreePriority(ast) {
 	switch (ast._tag) {
@@ -34646,7 +34729,7 @@ function serializerTree(ast, recur, onMissingAnnotation) {
 		case "Declaration": {
 			const getLink = ast.annotations?.toCodecJson ?? ast.annotations?.toCodec;
 			if (isFunction(getLink)) {
-				const link = getLink(isDeclaration(ast) ? ast.typeParameters.map((tp) => make$34(recur(toEncoded(tp)))) : []);
+				const link = getLink(isDeclaration(ast) ? ast.typeParameters.map((tp) => make$35(recur(toEncoded(tp)))) : []);
 				const to = recur(link.to);
 				return replaceEncoding(ast, to === link.to ? [link] : [new Link(to, link.transformation)]);
 			}
@@ -34773,11 +34856,11 @@ function onSerializerEnsureArray(ast) {
 *
 * @since 4.0.0
 */
-const TypeId$21 = "~effect/http/Cookies";
+const TypeId$22 = "~effect/http/Cookies";
 const CookieTypeId = "~effect/http/Cookies/Cookie";
 TaggedError("CookieError");
 const Proto$11 = {
-	[TypeId$21]: TypeId$21,
+	[TypeId$22]: TypeId$22,
 	...BaseProto,
 	toJSON() {
 		return {
@@ -35102,12 +35185,12 @@ const tryDecodeURIComponent = (str) => {
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$20 = /*#__PURE__*/ Symbol.for("~effect/http/Headers");
+const TypeId$21 = /*#__PURE__*/ Symbol.for("~effect/http/Headers");
 const Proto$10 = /*#__PURE__*/ Object.create(null);
 Object.defineProperties(Proto$10, {
-	[TypeId$20]: { value: TypeId$20 },
+	[TypeId$21]: { value: TypeId$21 },
 	[symbolRedactable]: { value(context) {
-		return redact(this, get$8(context, CurrentRedactedNames));
+		return redact(this, get$9(context, CurrentRedactedNames));
 	} },
 	toJSON: { value() {
 		return redact$1(this);
@@ -35121,7 +35204,7 @@ Object.defineProperties(Proto$10, {
 	toString: { value: BaseProto.toString },
 	[NodeInspectSymbol]: { value: BaseProto[NodeInspectSymbol] }
 });
-const make$33 = (input) => Object.assign(Object.create(Proto$10), input);
+const make$34 = (input) => Object.assign(Object.create(Proto$10), input);
 /**
 * Provides an `Equivalence` instance that compares `Headers` by header names
 * and string values.
@@ -35181,7 +35264,7 @@ const fromRecordUnsafe = (input) => Object.setPrototypeOf(input, Proto$10);
 * @since 4.0.0
 */
 const set$1 = /*#__PURE__*/ dual(3, (self, key, value) => {
-	const out = make$33(self);
+	const out = make$34(self);
 	out[key.toLowerCase()] = value;
 	return out;
 });
@@ -35195,7 +35278,7 @@ const set$1 = /*#__PURE__*/ dual(3, (self, key, value) => {
 * @category combinators
 * @since 4.0.0
 */
-const setAll$1 = /*#__PURE__*/ dual(2, (self, headers) => make$33({
+const setAll$1 = /*#__PURE__*/ dual(2, (self, headers) => make$34({
 	...self,
 	...fromInput$1(headers)
 }));
@@ -35210,7 +35293,7 @@ const setAll$1 = /*#__PURE__*/ dual(2, (self, headers) => make$33({
 * @since 4.0.0
 */
 const merge = /*#__PURE__*/ dual(2, (self, headers) => {
-	const out = make$33(self);
+	const out = make$34(self);
 	Object.assign(out, headers);
 	return out;
 });
@@ -35225,7 +35308,7 @@ const merge = /*#__PURE__*/ dual(2, (self, headers) => {
 * @since 4.0.0
 */
 const remove$1 = /*#__PURE__*/ dual(2, (self, key) => {
-	const out = make$33(self);
+	const out = make$34(self);
 	delete out[key.toLowerCase()];
 	return out;
 });
@@ -35244,8 +35327,8 @@ const redact = /*#__PURE__*/ dual(2, (self, key) => {
 	const modify = (key) => {
 		if (typeof key === "string") {
 			const k = key.toLowerCase();
-			if (k in self) out[k] = make$55(self[k]);
-		} else for (const name in self) if (key.test(name)) out[name] = make$55(self[name]);
+			if (k in self) out[k] = make$56(self[k]);
+		} else for (const name in self) if (key.test(name)) out[name] = make$56(self[name]);
 	};
 	if (Array.isArray(key)) for (let i = 0; i < key.length; i++) modify(key[i]);
 	else modify(key);
@@ -35300,7 +35383,7 @@ const CurrentRedactedNames = /*#__PURE__*/ Reference("effect/Headers/CurrentReda
 *
 * @since 4.0.0
 */
-const TypeId$19 = "~effect/http/HttpClientError";
+const TypeId$20 = "~effect/http/HttpClientError";
 /**
 * Error wrapper for HTTP client failures, exposing the failed request and the optional response through its `reason`.
 *
@@ -35320,7 +35403,7 @@ var HttpClientError = class extends TaggedError("HttpClientError") {
 	*
 	* @since 4.0.0
 	*/
-	[TypeId$19] = TypeId$19;
+	[TypeId$20] = TypeId$20;
 	/**
 	* HTTP request associated with the client failure.
 	*
@@ -35443,7 +35526,7 @@ var EmptyBodyError = class extends TaggedError("EmptyBodyError") {
 		return formatMessage(formatReason(this._tag), this.description, info);
 	}
 };
-ErrorClass(TypeId$19)({
+ErrorClass(TypeId$20)({
 	_tag: /*#__PURE__*/ tag("HttpError"),
 	kind: /*#__PURE__*/ Literals([
 		"EncodeError",
@@ -35495,10 +35578,10 @@ ErrorClass(TypeId$19)({
 *
 * @since 4.0.0
 */
-const TypeId$18 = "~effect/http/UrlParams";
+const TypeId$19 = "~effect/http/UrlParams";
 const Proto$9 = {
 	...PipeInspectableProto,
-	[TypeId$18]: TypeId$18,
+	[TypeId$19]: TypeId$19,
 	[Symbol.iterator]() {
 		return this.params[Symbol.iterator]();
 	},
@@ -35525,7 +35608,7 @@ const Proto$9 = {
 * @category constructors
 * @since 4.0.0
 */
-const make$32 = (params) => {
+const make$33 = (params) => {
 	const self = Object.create(Proto$9);
 	self.params = params;
 	return self;
@@ -35548,7 +35631,7 @@ const fromInput = (input) => {
 		const [keys, value] = parsed[i];
 		out.push([`${keys[0]}[${keys.slice(1).join("][")}]`, value]);
 	} else out.push(parsed[i]);
-	return make$32(out);
+	return make$33(out);
 };
 const fromInputNested = (input) => {
 	const entries = typeof input[Symbol.iterator] === "function" ? fromIterable$2(input) : Object.entries(input);
@@ -35572,7 +35655,7 @@ const fromInputNested = (input) => {
 * @category instances
 * @since 4.0.0
 */
-const Equivalence = /*#__PURE__*/ make$64((a, b) => arrayEquivalence(a.params, b.params));
+const Equivalence = /*#__PURE__*/ make$65((a, b) => arrayEquivalence(a.params, b.params));
 const arrayEquivalence = /*#__PURE__*/ makeEquivalence(/*#__PURE__*/ makeEquivalence$2([/*#__PURE__*/ strictEqual(), /*#__PURE__*/ strictEqual()]));
 /**
 * An empty `UrlParams` value.
@@ -35580,7 +35663,7 @@ const arrayEquivalence = /*#__PURE__*/ makeEquivalence(/*#__PURE__*/ makeEquival
 * @category constructors
 * @since 4.0.0
 */
-const empty$3 = /*#__PURE__*/ make$32([]);
+const empty$3 = /*#__PURE__*/ make$33([]);
 /**
 * Sets multiple query parameters from input.
 *
@@ -35696,12 +35779,12 @@ const baseUrl = () => {
 *
 * @since 4.0.0
 */
-const TypeId$17 = "~effect/http/HttpBody";
+const TypeId$18 = "~effect/http/HttpBody";
 TaggedError("HttpBodyError");
 var Proto$8 = class {
-	[TypeId$17];
+	[TypeId$18];
 	constructor() {
-		this[TypeId$17] = TypeId$17;
+		this[TypeId$18] = TypeId$18;
 	}
 	[NodeInspectSymbol]() {
 		return this.toJSON();
@@ -35928,9 +36011,9 @@ const allShort = [
 ];
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/unstable/http/HttpClientRequest.js
-const TypeId$16 = "~effect/http/HttpClientRequest";
+const TypeId$17 = "~effect/http/HttpClientRequest";
 const Proto$7 = {
-	[TypeId$16]: TypeId$16,
+	[TypeId$17]: TypeId$17,
 	...BaseProto,
 	toJSON() {
 		return {
@@ -35976,7 +36059,7 @@ const empty$1 = /*#__PURE__*/ makeWith$1("GET", "", empty$3, /*#__PURE__*/ none(
 * @category constructors
 * @since 4.0.0
 */
-const make$31 = (method) => (url, options) => modify(empty$1, {
+const make$32 = (method) => (url, options) => modify$1(empty$1, {
 	method,
 	url,
 	...options ?? void 0
@@ -35987,7 +36070,7 @@ const make$31 = (method) => (url, options) => modify(empty$1, {
 * @category combinators
 * @since 4.0.0
 */
-const modify = /*#__PURE__*/ dual(2, (self, options) => {
+const modify$1 = /*#__PURE__*/ dual(2, (self, options) => {
 	let result = self;
 	if (options.method) result = setMethod(result, options.method);
 	if (options.url) result = setUrl(result, options.url);
@@ -36113,7 +36196,7 @@ const setBody$1 = /*#__PURE__*/ dual(2, (self, body) => {
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$15 = "~effect/http/HttpIncomingMessage";
+const TypeId$16 = "~effect/http/HttpIncomingMessage";
 /**
 * Context reference for the optional maximum size allowed when reading an incoming message body.
 *
@@ -36191,7 +36274,7 @@ const inspect = (self, that) => {
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$14 = "~effect/http/HttpClientResponse";
+const TypeId$15 = "~effect/http/HttpClientResponse";
 /**
 * Wraps a Web `Response` and its original `HttpClientRequest` as an `HttpClientResponse`.
 *
@@ -36200,16 +36283,16 @@ const TypeId$14 = "~effect/http/HttpClientResponse";
 */
 const fromWeb$1 = (request, source) => new WebHttpClientResponse(request, source);
 var WebHttpClientResponse = class extends Class$2 {
+	[TypeId$16];
 	[TypeId$15];
-	[TypeId$14];
 	request;
 	source;
 	constructor(request, source) {
 		super();
 		this.request = request;
 		this.source = source;
+		this[TypeId$16] = TypeId$16;
 		this[TypeId$15] = TypeId$15;
-		this[TypeId$14] = TypeId$14;
 	}
 	toJSON() {
 		return inspect(this, {
@@ -36357,7 +36440,7 @@ var WebHttpClientResponse = class extends Class$2 {
 * @since 4.0.0
 */
 const toHeaders = (span) => fromRecordUnsafe({
-	b3: `${span.traceId}-${span.spanId}-${span.sampled ? "1" : "0"}${match$4(span.parent, {
+	b3: `${span.traceId}-${span.spanId}-${span.sampled ? "1" : "0"}${match$5(span.parent, {
 		onNone: () => "",
 		onSome: (parent) => `-${parent.spanId}`
 	})}`,
@@ -36451,7 +36534,7 @@ const w3c = (headers) => {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/unstable/http/HttpClient.js
-const TypeId$13 = "~effect/http/HttpClient";
+const TypeId$14 = "~effect/http/HttpClient";
 /**
 * Service tag for the default outgoing HTTP client service.
 *
@@ -36491,7 +36574,7 @@ const makeWith = (postprocess, preprocess) => {
 	return self;
 };
 const Proto$6 = {
-	[TypeId$13]: TypeId$13,
+	[TypeId$14]: TypeId$14,
 	pipe() {
 		return pipeArguments(this, arguments);
 	},
@@ -36500,7 +36583,7 @@ const Proto$6 = {
 		return { _id: "effect/HttpClient" };
 	},
 	.../*#__PURE__*/ Object.fromEntries(/*#__PURE__*/ allShort.map(([fullMethod, method]) => [method, function(url, options) {
-		return this.execute(make$31(fullMethod)(url, options));
+		return this.execute(make$32(fullMethod)(url, options));
 	}]))
 };
 /**
@@ -36513,7 +36596,7 @@ const Proto$6 = {
 * @category constructors
 * @since 4.0.0
 */
-const make$30 = (f) => makeWith((effect) => flatMap$2(effect, (request) => withFiber((fiber) => {
+const make$31 = (f) => makeWith((effect) => flatMap$2(effect, (request) => withFiber((fiber) => {
 	const scopedController = scopedRequests.get(request);
 	const controller = scopedController ?? new AbortController();
 	const urlResult = makeUrl(request.url, request.urlParams, getOrUndefined$1(request.hash));
@@ -36628,8 +36711,8 @@ var InterruptibleResponse = class {
 		this.original = original;
 		this.controller = controller;
 	}
-	[TypeId$14] = TypeId$14;
 	[TypeId$15] = TypeId$15;
+	[TypeId$16] = TypeId$16;
 	applyInterrupt(effect) {
 		return suspend$2(() => {
 			responseRegistry.unregister(this.original);
@@ -36756,7 +36839,7 @@ function parse$1(input) {
 const FULL_PATH_REGEXP = /^https?:\/\/.*?\//;
 const OPTIONAL_PARAM_REGEXP = /(\/:[^/()]*?)\?(\/?)/;
 /** @internal */
-const make$29 = (options = {}) => new RouterImpl(options);
+const make$30 = (options = {}) => new RouterImpl(options);
 var RouterImpl = class {
 	constructor(options = {}) {
 		this.options = {
@@ -37275,7 +37358,7 @@ const httpMethods = [
 * @since 1.0.0
 * @category constructors
 */
-const make$28 = make$29;
+const make$29 = make$30;
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/ErrorReporter.js
 /**
@@ -37313,14 +37396,14 @@ const make$28 = make$29;
 const ignore = "~effect/ErrorReporter/ignore";
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/unstable/http/HttpServerResponse.js
-const TypeId$12 = "~effect/http/HttpServerResponse";
+const TypeId$13 = "~effect/http/HttpServerResponse";
 /**
 * Returns `true` when the supplied value is an `HttpServerResponse`.
 *
 * @category guards
 * @since 4.0.0
 */
-const isHttpServerResponse = (u) => hasProperty(u, TypeId$12);
+const isHttpServerResponse = (u) => hasProperty(u, TypeId$13);
 /**
 * Creates an empty HTTP response.
 *
@@ -37453,7 +37536,7 @@ const setBody = /*#__PURE__*/ dual(2, (self, body) => makeResponse({
 }));
 const Proto$5 = {
 	...PipeInspectableProto,
-	[TypeId$12]: TypeId$12,
+	[TypeId$13]: TypeId$13,
 	[ignore]: true,
 	toJSON() {
 		return {
@@ -37651,7 +37734,7 @@ const toResponseOrElseDefect = (u, orElse) => {
 *
 * @since 4.0.0
 */
-const TypeId$11 = "~effect/http/HttpServerError";
+const TypeId$12 = "~effect/http/HttpServerError";
 /**
 * Tagged error for failures that occur while handling an HTTP server request.
 *
@@ -37672,7 +37755,7 @@ var HttpServerError = class extends TaggedError("HttpServerError") {
 		});
 		else super(props);
 	}
-	[TypeId$11] = TypeId$11;
+	[TypeId$12] = TypeId$12;
 	stack = `${this.name}: ${this.message}`;
 	get request() {
 		return this.reason.request;
@@ -37948,7 +38031,7 @@ const exitResponse = (exit) => {
 *
 * @since 2.0.0
 */
-const TypeId$10 = "~effect/FiberSet";
+const TypeId$11 = "~effect/FiberSet";
 /**
 * Checks whether a value is a FiberSet.
 *
@@ -37968,9 +38051,9 @@ const TypeId$10 = "~effect/FiberSet";
 * @category refinements
 * @since 2.0.0
 */
-const isFiberSet = (u) => hasProperty(u, TypeId$10);
+const isFiberSet = (u) => hasProperty(u, TypeId$11);
 const Proto$4 = {
-	[TypeId$10]: TypeId$10,
+	[TypeId$11]: TypeId$11,
 	[Symbol.iterator]() {
 		if (this.state._tag === "Closed") return empty$14();
 		return this.state.backing[Symbol.iterator]();
@@ -38023,7 +38106,7 @@ const makeUnsafe = (backing, deferred) => {
 * @category constructors
 * @since 2.0.0
 */
-const make$27 = () => acquireRelease(sync(() => makeUnsafe(/* @__PURE__ */ new Set(), makeUnsafe$7())), (set) => suspend$2(() => {
+const make$28 = () => acquireRelease(sync(() => makeUnsafe(/* @__PURE__ */ new Set(), makeUnsafe$7())), (set) => suspend$2(() => {
 	const state = set.state;
 	if (state._tag === "Closed") return void_$1;
 	set.state = { _tag: "Closed" };
@@ -38031,7 +38114,7 @@ const make$27 = () => acquireRelease(sync(() => makeUnsafe(/* @__PURE__ */ new S
 	return interruptAll(fibers).pipe(into(set.deferred));
 }));
 const internalFiberId = -1;
-const isInternalInterruption = /*#__PURE__*/ toPredicate(/*#__PURE__*/ compose(filterInterruptors, /*#__PURE__*/ has$1(internalFiberId)));
+const isInternalInterruption = /*#__PURE__*/ toPredicate(/*#__PURE__*/ compose(filterInterruptors, /*#__PURE__*/ has$2(internalFiberId)));
 /**
 * Adds an existing fiber to the `FiberSet` using a synchronous, unsafe
 * mutation.
@@ -38149,7 +38232,7 @@ const join$1 = (self) => _await(self.deferred);
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$9 = "~effect/socket/Socket";
+const TypeId$10 = "~effect/socket/Socket";
 /**
 * Service tag for bidirectional socket transports.
 *
@@ -38169,8 +38252,8 @@ const Socket = /*#__PURE__*/ Service("effect/socket/Socket");
 * @category constructors
 * @since 4.0.0
 */
-const make$26 = (options) => Socket.of({
-	[TypeId$9]: TypeId$9,
+const make$27 = (options) => Socket.of({
+	[TypeId$10]: TypeId$10,
 	runRaw: options.runRaw,
 	run: options.run ?? ((handler, opts) => options.runRaw((data) => typeof data === "string" ? handler(encoder.encode(data)) : data instanceof Uint8Array ? handler(data) : handler(new Uint8Array(data)), opts)),
 	runString: options.runString ?? (options.run ? (handler, opts) => options.run((data) => handler(decoder$1.decode(data)), opts) : (handler, opts) => options.runRaw((data) => typeof data === "string" ? handler(data) : data instanceof Uint8Array ? handler(decoder$1.decode(data)) : handler(decoder$1.decode(new Uint8Array(data))), opts)),
@@ -38382,7 +38465,7 @@ const fromWebSocket = (acquire, options) => withFiber((fiber) => {
 	const acquireContext = fiber.context;
 	const closeCodeIsError = options?.closeCodeIsError ?? defaultCloseCodeIsError;
 	const runRaw = (handler, opts) => scopedWith(fnUntraced(function* (scope) {
-		const fiberSet = yield* make$27().pipe(provide$3(scope));
+		const fiberSet = yield* make$28().pipe(provide$3(scope));
 		const ws = yield* provide$3(acquire, scope);
 		const run = yield* provideService(runtime(fiberSet)(), WebSocket$1, ws);
 		let open = false;
@@ -38442,7 +38525,7 @@ const fromWebSocket = (acquire, options) => withFiber((fiber) => {
 		if (isCloseEvent(chunk)) ws.close(chunk.code, chunk.reason);
 		else ws.send(chunk);
 	}));
-	return succeed$3(make$26({
+	return succeed$3(make$27({
 		runRaw,
 		writer: succeed$3(write)
 	}));
@@ -38910,7 +38993,7 @@ const constValueChars = [
 	1,
 	1
 ];
-function make$25() {
+function make$26() {
 	const decoder = new TextDecoder();
 	const state = {
 		state: State$1.key,
@@ -39087,7 +39170,7 @@ function makeState(needle_) {
 		matchIndex: 0
 	};
 }
-function make$24(needle, callback, seed) {
+function make$25(needle, callback, seed) {
 	const state = makeState(needle);
 	if (seed !== void 0) {
 		state.previousChunk = seed;
@@ -39196,7 +39279,7 @@ function parseBoundary(headers) {
 	return parse(headers["content-type"]).parameters.boundary;
 }
 function noopOnChunk(_chunk) {}
-function make$23({ headers, onFile: onPart, onField, onError, onDone, isFile = defaultIsFile$1, maxParts = Infinity, maxTotalSize = Infinity, maxPartSize = Infinity, maxFieldSize = 1024 * 1024 }) {
+function make$24({ headers, onFile: onPart, onField, onError, onDone, isFile = defaultIsFile$1, maxParts = Infinity, maxTotalSize = Infinity, maxPartSize = Infinity, maxFieldSize = 1024 * 1024 }) {
 	const boundary = parseBoundary(headers);
 	if (boundary === void 0) {
 		onError({ _tag: "InvalidBoundary" });
@@ -39223,8 +39306,8 @@ function make$23({ headers, onFile: onPart, onField, onError, onDone, isFile = d
 		state.isFile = true;
 		state.onChunk = noopOnChunk;
 	}
-	const headerParser = make$25();
-	const split = make$24(`\r\n--${boundary}`, function(index, chunk) {
+	const headerParser = make$26();
+	const split = make$25(`\r\n--${boundary}`, function(index, chunk) {
 		if (index === 0) {
 			skipBody();
 			return;
@@ -39335,7 +39418,7 @@ function decodeField$1(info, value) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/multipasta@0.2.7/node_modules/multipasta/dist/esm/index.js
-const make$22 = make$23;
+const make$23 = make$24;
 const defaultIsFile = defaultIsFile$1;
 const decodeField = decodeField$1;
 //#endregion
@@ -39387,7 +39470,7 @@ const decodeField = decodeField$1;
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$8 = "~effect/http/Multipart";
+const TypeId$9 = "~effect/http/Multipart";
 const MultipartErrorTypeId = "~effect/http/Multipart/MultipartError";
 /**
 * Error reason carried by a `MultipartError`.
@@ -39451,7 +39534,7 @@ var MultipartError = class MultipartError extends TaggedError("MultipartError")
 * @since 4.0.0
 */
 const makeConfig = (headers) => withFiber((fiber) => {
-	const mimeTypes = get$8(fiber.context, FieldMimeTypes);
+	const mimeTypes = get$9(fiber.context, FieldMimeTypes);
 	return succeed$3({
 		headers,
 		maxParts: fiber.getRef(MaxParts),
@@ -39462,10 +39545,10 @@ const makeConfig = (headers) => withFiber((fiber) => {
 	});
 });
 var PartBase$1 = class extends Class$2 {
-	[TypeId$8];
+	[TypeId$9];
 	constructor() {
 		super();
-		this[TypeId$8] = TypeId$8;
+		this[TypeId$9] = TypeId$9;
 	}
 };
 const defaultWriteFile = (path, file) => flatMap$2(FileSystem, (fs) => mapError$2(run$1(file.content, fs.sink(path)), (cause) => MultipartError.fromReason("InternalError", cause)));
@@ -39582,7 +39665,7 @@ const FieldMimeTypes = /*#__PURE__*/ Reference("effect/http/Multipart/FieldMimeT
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$7 = "~effect/http/HttpServerRequest";
+const TypeId$8 = "~effect/http/HttpServerRequest";
 /**
 * Service tag for the active server-side HTTP request.
 *
@@ -39715,7 +39798,7 @@ const requestPreResponseHandlers = /*#__PURE__*/ new WeakMap();
 * @category constructors
 * @since 4.0.0
 */
-const make$21 = (middleware) => middleware;
+const make$22 = (middleware) => middleware;
 const loggerDisabledRequests = /*#__PURE__*/ new WeakSet();
 const stripSearchAndHash = (url) => {
 	const queryIndex = url.indexOf("?");
@@ -39755,7 +39838,7 @@ const SpanNameGenerator = /*#__PURE__*/ Reference("@effect/platform/HttpMiddlewa
 * @category Logger
 * @since 4.0.0
 */
-const logger = /*#__PURE__*/ make$21((httpApp) => withFiber((fiber) => {
+const logger = /*#__PURE__*/ make$22((httpApp) => withFiber((fiber) => {
 	const request = getUnsafe(fiber.context, HttpServerRequest);
 	const path = stripSearchAndHash(request.url);
 	return withLogSpan(flatMap$2(exit(httpApp), (exit) => {
@@ -39781,7 +39864,7 @@ const logger = /*#__PURE__*/ make$21((httpApp) => withFiber((fiber) => {
 * @category Tracer
 * @since 4.0.0
 */
-const tracer = /*#__PURE__*/ make$21((httpApp) => withFiber((fiber) => {
+const tracer = /*#__PURE__*/ make$22((httpApp) => withFiber((fiber) => {
 	const request = getUnsafe(fiber.context, HttpServerRequest);
 	if (!fiber.getRef(TracerEnabled) || fiber.getRef(TracerDisabledWhen)(request)) return httpApp;
 	const span = makeSpanUnsafe(fiber, fiber.getRef(SpanNameGenerator)(request), {
@@ -39825,7 +39908,7 @@ const tracer = /*#__PURE__*/ make$21((httpApp) => withFiber((fiber) => {
 * @category Proxying
 * @since 4.0.0
 */
-const xForwardedHeaders = /*#__PURE__*/ make$21((httpApp) => updateService(httpApp, HttpServerRequest, (request) => request.headers["x-forwarded-host"] ? request.modify({
+const xForwardedHeaders = /*#__PURE__*/ make$22((httpApp) => updateService(httpApp, HttpServerRequest, (request) => request.headers["x-forwarded-host"] ? request.modify({
 	headers: set$1(request.headers, "host", request.headers["x-forwarded-host"]),
 	remoteAddress: fromNullishOr(request.headers["x-forwarded-for"]?.split(",")[0].trim())
 }) : request));
@@ -39955,7 +40038,7 @@ const toString = (self) => {
 */
 var Generator = class extends Service()("effect/http/Etag/Generator") {};
 const fromFileInfo = (info) => {
-	const mtime = match$4(info.mtime, {
+	const mtime = match$5(info.mtime, {
 		onNone: () => "0",
 		onSome: (mtime) => mtime.getTime().toString(16)
 	});
@@ -40059,7 +40142,7 @@ var HttpPlatform = class extends Service()("effect/http/HttpPlatform") {};
 * @category constructors
 * @since 4.0.0
 */
-const make$20 = /*#__PURE__*/ fnUntraced(function* (impl) {
+const make$21 = /*#__PURE__*/ fnUntraced(function* (impl) {
 	const fs = yield* FileSystem;
 	const etagGen = yield* Generator;
 	return HttpPlatform.of({
@@ -40139,7 +40222,7 @@ var HttpServer = class extends Service()("effect/http/HttpServer") {};
 * @category constructors
 * @since 4.0.0
 */
-const make$19 = (options) => options;
+const make$20 = (options) => options;
 /**
 * Creates a layer that starts serving an HTTP response effect with the current
 * `HttpServer`.
@@ -40238,7 +40321,7 @@ const withLogAddress = (layer) => effectDiscard(logAddress).pipe(provideMerge(la
 *
 * @since 4.0.0
 */
-const TypeId$6 = "~effect/http/HttpRouter";
+const TypeId$7 = "~effect/http/HttpRouter";
 /**
 * Service tag for the HTTP router used while constructing an HTTP application.
 * Route and middleware layers require this service to register themselves with
@@ -40259,8 +40342,8 @@ const HttpRouter = /*#__PURE__*/ Service("effect/http/HttpRouter");
 * @category HttpRouter
 * @since 4.0.0
 */
-const make$18 = /*#__PURE__*/ gen(function* () {
-	const router = make$28(yield* RouterConfig);
+const make$19 = /*#__PURE__*/ gen(function* () {
+	const router = make$29(yield* RouterConfig);
 	const middleware = /* @__PURE__ */ new Set();
 	const addAll = (routes) => contextWith((context) => {
 		const middleware = getMiddleware(context);
@@ -40285,7 +40368,7 @@ const make$18 = /*#__PURE__*/ gen(function* () {
 		return void_$1;
 	});
 	return HttpRouter.of({
-		[TypeId$6]: TypeId$6,
+		[TypeId$7]: TypeId$7,
 		prefixed(prefix) {
 			return HttpRouter.of({
 				...this,
@@ -40368,7 +40451,7 @@ var RouteContext = class extends Service()("effect/http/HttpRouter/RouteContext"
 * @category HttpRouter
 * @since 4.0.0
 */
-const layer$20 = /*#__PURE__*/ effect(HttpRouter)(make$18);
+const layer$20 = /*#__PURE__*/ effect(HttpRouter)(make$19);
 const RouteTypeId = "~effect/http/HttpRouter/Route";
 const makeRoute = (options) => ({
 	...options,
@@ -40428,7 +40511,7 @@ const prefixPath = /*#__PURE__*/ dual(2, (self, prefix) => {
 const prefixRoute = /*#__PURE__*/ dual(2, (self, prefix) => makeRoute({
 	...self,
 	path: prefixPath(self.path, prefix),
-	prefix: match$4(self.prefix, {
+	prefix: match$5(self.prefix, {
 		onNone: () => prefix,
 		onSome: (existingPrefix) => prefixPath(existingPrefix, prefix)
 	})
@@ -40519,7 +40602,7 @@ var MiddlewareImpl = class MiddlewareImpl {
 			const stack = [context.mapUnsafe.get(fnContextKey)];
 			if (this.dependencies) {
 				const memoMap = yield* CurrentMemoMap;
-				const scope = get$8(context, Scope);
+				const scope = get$9(context, Scope);
 				const depsContext = yield* buildWithMemoMap(this.dependencies, memoMap, scope);
 				stack.push(...getMiddleware(depsContext));
 			}
@@ -40718,7 +40801,7 @@ const schema$1 = /*#__PURE__*/ declare(isStream);
 * @since 4.0.0
 */
 function Stream(success, error) {
-	return make$34(schema$1.ast, {
+	return make$35(schema$1.ast, {
 		[StreamSchemaTypeId]: StreamSchemaTypeId,
 		success,
 		error
@@ -40740,7 +40823,7 @@ var ClientAbort = class extends Service()("effect/rpc/RpcSchema/ClientAbort") {
 };
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/unstable/rpc/Rpc.js
-const TypeId$5 = "~effect/rpc/Rpc";
+const TypeId$6 = "~effect/rpc/Rpc";
 /**
 * Represents server-side metadata for the client associated with an RPC request.
 *
@@ -40770,7 +40853,7 @@ var ServerClient = class {
 	}
 };
 const Proto$3 = {
-	[TypeId$5]: TypeId$5,
+	[TypeId$6]: TypeId$6,
 	pipe() {
 		return pipeArguments(this, arguments);
 	},
@@ -40872,7 +40955,7 @@ const makeProto$1 = (options) => {
 * @category constructors
 * @since 4.0.0
 */
-const make$17 = (tag, options) => {
+const make$18 = (tag, options) => {
 	const successSchema = options?.success ?? Void;
 	const errorSchema = options?.error ?? Never;
 	const defectSchema = options?.defect ?? Defect;
@@ -43127,7 +43210,7 @@ var require_detect_libc = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 //#region ../../node_modules/.pnpm/node-gyp-build-optional-packages@5.2.2/node_modules/node-gyp-build-optional-packages/node-gyp-build.js
 var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var fs$1 = __require("fs");
-	var path$1 = __require("path");
+	var path$2 = __require("path");
 	var url = __require("url");
 	var os$1 = __require("os");
 	var runtimeRequire = typeof __webpack_require__ === "function" ? __non_webpack_require__ : __require;
@@ -43147,30 +43230,30 @@ var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		return runtimeRequire(load.resolve(dir));
 	}
 	load.resolve = load.path = function(dir) {
-		dir = path$1.resolve(dir || ".");
+		dir = path$2.resolve(dir || ".");
 		var packageName = "";
 		var packageNameError;
 		try {
-			packageName = runtimeRequire(path$1.join(dir, "package.json")).name;
+			packageName = runtimeRequire(path$2.join(dir, "package.json")).name;
 			var varName = packageName.toUpperCase().replace(/-/g, "_");
 			if (process.env[varName + "_PREBUILD"]) dir = process.env[varName + "_PREBUILD"];
 		} catch (err) {
 			packageNameError = err;
 		}
 		if (!prebuildsOnly) {
-			var release = getFirst(path$1.join(dir, "build/Release"), matchBuild);
+			var release = getFirst(path$2.join(dir, "build/Release"), matchBuild);
 			if (release) return release;
-			var debug = getFirst(path$1.join(dir, "build/Debug"), matchBuild);
+			var debug = getFirst(path$2.join(dir, "build/Debug"), matchBuild);
 			if (debug) return debug;
 		}
 		var prebuild = resolve(dir);
 		if (prebuild) return prebuild;
-		var nearby = resolve(path$1.dirname(process.execPath));
+		var nearby = resolve(path$2.dirname(process.execPath));
 		if (nearby) return nearby;
 		var platformPackage = (packageName[0] == "@" ? "" : "@" + packageName + "/") + packageName + "-" + platform + "-" + arch;
 		var packageResolutionError;
 		try {
-			return resolveFile(path$1.dirname(__require("module").createRequire(url.pathToFileURL(path$1.join(dir, "package.json"))).resolve(platformPackage)));
+			return resolveFile(path$2.dirname(__require("module").createRequire(url.pathToFileURL(path$2.join(dir, "package.json"))).resolve(platformPackage)));
 		} catch (error) {
 			packageResolutionError = error;
 		}
@@ -43190,13 +43273,13 @@ var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		if (packageResolutionError) errMessage += "Error resolving package: " + packageResolutionError.message + "\n";
 		throw new Error(errMessage);
 		function resolve(dir) {
-			var tuple = readdirSync(path$1.join(dir, "prebuilds")).map(parseTuple).filter(matchTuple(platform, arch)).sort(compareTuples)[0];
+			var tuple = readdirSync(path$2.join(dir, "prebuilds")).map(parseTuple).filter(matchTuple(platform, arch)).sort(compareTuples)[0];
 			if (!tuple) return;
-			return resolveFile(path$1.join(dir, "prebuilds", tuple.name));
+			return resolveFile(path$2.join(dir, "prebuilds", tuple.name));
 		}
 		function resolveFile(prebuilds) {
 			var winner = readdirSync(prebuilds).map(parseTags).filter(matchTags(runtime, abi)).sort(compareTags(runtime))[0];
-			if (winner) return path$1.join(prebuilds, winner.file);
+			if (winner) return path$2.join(prebuilds, winner.file);
 		}
 	};
 	function readdirSync(dir) {
@@ -43208,7 +43291,7 @@ var require_node_gyp_build = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	}
 	function getFirst(dir, filter) {
 		var files = readdirSync(dir).filter(filter);
-		return files[0] && path$1.join(dir, files[0]);
+		return files[0] && path$2.join(dir, files[0]);
 	}
 	function matchBuild(name) {
 		return /\.node$/.test(name);
@@ -43513,7 +43596,7 @@ const withRun = () => (f) => suspend$2(() => {
 * @category type IDs
 * @since 4.0.0
 */
-const TypeId$4 = "~effect/Stdio";
+const TypeId$5 = "~effect/Stdio";
 /**
 * Service tag for process standard I/O.
 *
@@ -43528,7 +43611,7 @@ const TypeId$4 = "~effect/Stdio";
 * @category services
 * @since 4.0.0
 */
-const Stdio = /*#__PURE__*/ Service(TypeId$4);
+const Stdio = /*#__PURE__*/ Service(TypeId$5);
 /**
 * Creates a `Stdio` service implementation from the provided fields and
 * attaches the `Stdio` type identifier.
@@ -43549,8 +43632,8 @@ const Stdio = /*#__PURE__*/ Service(TypeId$4);
 * @category constructors
 * @since 4.0.0
 */
-const make$16 = (options) => ({
-	[TypeId$4]: TypeId$4,
+const make$17 = (options) => ({
+	[TypeId$5]: TypeId$5,
 	...options
 });
 //#endregion
@@ -43571,9 +43654,9 @@ const makeNoSerialization = /*#__PURE__*/ fnUntraced(function* (group, options)
 	const concurrency = options.concurrency ?? "unbounded";
 	const disableFatalDefects = options.disableFatalDefects ?? false;
 	const services = yield* context$1();
-	const scope = get$8(services, Scope);
+	const scope = get$9(services, Scope);
 	const trackFiber = runIn(forkUnsafe(scope, "parallel"));
-	const concurrencySemaphore = concurrency === "unbounded" ? void 0 : yield* make$46(concurrency);
+	const concurrencySemaphore = concurrency === "unbounded" ? void 0 : yield* make$47(concurrency);
 	const clients = /* @__PURE__ */ new Map();
 	let isShutdown = false;
 	const shutdownLatch = makeUnsafe$4(false);
@@ -43808,10 +43891,10 @@ const applyMiddleware = (context, handler, options) => {
 * @category server
 * @since 4.0.0
 */
-const make$15 = /*#__PURE__*/ fnUntraced(function* (group, options) {
+const make$16 = /*#__PURE__*/ fnUntraced(function* (group, options) {
 	const { disconnects, end, run, send, supportsAck, supportsSpanPropagation, supportsTransferables } = yield* Protocol;
 	const services = yield* context$1();
-	const scope = yield* make$58();
+	const scope = yield* make$59();
 	const server = yield* makeNoSerialization(group, {
 		...options,
 		disableClientAcks: !supportsAck,
@@ -43956,7 +44039,7 @@ const make$15 = /*#__PURE__*/ fnUntraced(function* (group, options) {
 * @category server
 * @since 4.0.0
 */
-const layer$19 = (group, options) => effectDiscard(forkScoped(make$15(group, options)));
+const layer$19 = (group, options) => effectDiscard(forkScoped(make$16(group, options)));
 /**
 * Creates a RPC server that registers a HTTP route with a `HttpRouter`.
 *
@@ -44041,7 +44124,7 @@ const makeProtocolWithHttpEffect = /*#__PURE__*/ gen(function* () {
 	const serialization = yield* RpcSerialization;
 	const includesFraming = serialization.includesFraming;
 	const isBinary = !serialization.contentType.includes("json");
-	const disconnects = yield* make$47();
+	const disconnects = yield* make$48();
 	let writeRequest;
 	let clientId = 0;
 	const clients = /* @__PURE__ */ new Map();
@@ -44054,7 +44137,7 @@ const makeProtocolWithHttpEffect = /*#__PURE__*/ gen(function* () {
 		const requestHeaders = Object.entries(request.headers);
 		const data = yield* orDie$2(isBinary ? map$4(request.arrayBuffer, (buf) => new Uint8Array(buf)) : request.text);
 		const id = clientId++;
-		const queue = yield* make$47();
+		const queue = yield* make$48();
 		const parser = serialization.makeUnsafe();
 		const requestIds = [];
 		const offer$1 = (data) => typeof data === "string" ? offer(queue, encoder.encode(data)) : offer(queue, data);
@@ -44165,7 +44248,7 @@ const layerProtocolHttp = (options) => {
 };
 const makeSocketProtocol = /*#__PURE__*/ gen(function* () {
 	const serialization = yield* RpcSerialization;
-	const disconnects = yield* make$47();
+	const disconnects = yield* make$48();
 	let clientId = 0;
 	const clients = /* @__PURE__ */ new Map();
 	const clientIds = /* @__PURE__ */ new Set();
@@ -44337,7 +44420,7 @@ const RpcGroupProto = {
 		});
 	},
 	annotateRpcs(service, value) {
-		return this.annotateRpcsMerge(make$61(service, value));
+		return this.annotateRpcsMerge(make$62(service, value));
 	},
 	annotateMerge(context) {
 		return makeProto({
@@ -44364,7 +44447,7 @@ const makeProto = (options) => Object.assign(function() {}, RpcGroupProto, {
 * @category groups
 * @since 4.0.0
 */
-const make$14 = (...rpcs) => makeProto({
+const make$15 = (...rpcs) => makeProto({
 	requests: new Map(rpcs.map((rpc) => [rpc._tag, rpc])),
 	annotations: empty$12()
 });
@@ -44640,7 +44723,7 @@ const Proto$2 = {
 * @category constructors
 * @since 2.0.0
 */
-function make$13(get, mapInput, prefix) {
+function make$14(get, mapInput, prefix) {
 	const self = Object.create(Proto$2);
 	self.get = get;
 	self.mapInput = mapInput;
@@ -44706,7 +44789,7 @@ function fromEnv(options) {
 		...import.meta.env
 	};
 	const trie = buildEnvTrie(env);
-	return make$13((path) => succeed$3(nodeAtEnv(trie, env, path)));
+	return make$14((path) => succeed$3(nodeAtEnv(trie, env, path)));
 }
 function buildEnvTrie(env) {
 	const root = {};
@@ -44742,7 +44825,7 @@ function trieNodeAt(root, path) {
 }
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Config.js
-const TypeId$3 = "~effect/Config";
+const TypeId$4 = "~effect/Config";
 /**
 * Returns `true` if `u` is a `Config` instance.
 *
@@ -44763,7 +44846,7 @@ const TypeId$3 = "~effect/Config";
 * @category guards
 * @since 2.0.0
 */
-const isConfig = (u) => hasProperty(u, TypeId$3);
+const isConfig = (u) => hasProperty(u, TypeId$4);
 /**
 * Represents the error type produced when config loading or validation fails.
 *
@@ -44807,7 +44890,7 @@ const Proto$1 = {
 			return this.parse(fiber.getRef(ConfigProvider));
 		}
 	}),
-	[TypeId$3]: TypeId$3,
+	[TypeId$4]: TypeId$4,
 	toJSON() {
 		return { _id: "Config" };
 	}
@@ -44847,7 +44930,7 @@ const Proto$1 = {
 * @category constructors
 * @since 4.0.0
 */
-function make$12(parse) {
+function make$13(parse) {
 	const self = Object.create(Proto$1);
 	self.parse = parse;
 	return self;
@@ -44883,7 +44966,7 @@ function make$12(parse) {
 * @since 2.0.0
 */
 const map = /*#__PURE__*/ dual(2, (self, f) => {
-	return make$12((provider) => map$4(self.parse(provider), f));
+	return make$13((provider) => map$4(self.parse(provider), f));
 });
 /**
 * Provides a fallback config when parsing fails with a `ConfigError`.
@@ -44917,7 +45000,7 @@ const map = /*#__PURE__*/ dual(2, (self, f) => {
 * @since 2.0.0
 */
 const orElse = /*#__PURE__*/ dual(2, (self, that) => {
-	return make$12((provider) => catch_$2(self.parse(provider), (error) => that(error).parse(provider)));
+	return make$13((provider) => catch_$2(self.parse(provider), (error) => that(error).parse(provider)));
 });
 function isMissingDataOnly(issue) {
 	switch (issue._tag) {
@@ -45042,7 +45125,7 @@ const option = (self) => self.pipe(map(some), withDefault(none()));
 */
 const unwrap = (wrapped) => {
 	if (isConfig(wrapped)) return wrapped;
-	return make$12((provider) => {
+	return make$13((provider) => {
 		return all(Object.entries(wrapped).map(([key, config]) => unwrap(config).parse(provider).pipe(map$4((value) => [key, value])))).pipe(map$4(Object.fromEntries));
 	});
 };
@@ -45159,7 +45242,7 @@ function schema(codec, path) {
 	const decodeUnknownEffect = decodeUnknownEffect$1(codecStringTree);
 	const codecStringTreeEncoded = toEncoded(codecStringTree.ast);
 	const defaultPath = typeof path === "string" ? [path] : path ?? [];
-	return make$12((provider) => {
+	return make$13((provider) => {
 		const path = provider.prefix ? [...provider.prefix, ...defaultPath] : defaultPath;
 		return recur(codecStringTreeEncoded, provider, defaultPath).pipe(flatMapEager((tree) => decodeUnknownEffect(tree).pipe(mapErrorEager((issue) => new SchemaError(path.length > 0 ? new Pointer(path, issue) : issue)))), mapErrorEager((cause) => new ConfigError(cause)));
 	});
@@ -45193,7 +45276,7 @@ const Port = /*#__PURE__*/ Int.check(/*#__PURE__*/ isBetween({
 * @since 2.0.0
 */
 function fail(err) {
-	return make$12(() => fail$3(new ConfigError(err)));
+	return make$13(() => fail$3(new ConfigError(err)));
 }
 /**
 * Creates a config that always succeeds with the given value, ignoring the
@@ -45218,7 +45301,7 @@ function fail(err) {
 * @since 2.0.0
 */
 function succeed(value) {
-	return make$12(() => succeed$3(value));
+	return make$13(() => succeed$3(value));
 }
 /**
 * Creates a config for a single string value.
@@ -49193,7 +49276,7 @@ const watchNode = (path) => callback((queue) => acquireRelease(sync(() => {
 	});
 	return watcher;
 }), (watcher) => sync(() => watcher.close())));
-const watch = (backend, path) => stat(path).pipe(map$4((stat) => backend.pipe(flatMap$5((_) => _.register(path, stat)), getOrElse$1(() => watchNode(path)))), unwrap$1);
+const watch = (backend, path) => stat(path).pipe(map$4((stat) => backend.pipe(flatMap$6((_) => _.register(path, stat)), getOrElse$1(() => watchNode(path)))), unwrap$1);
 const writeFile = (path, data, options) => callback$1((resume, signal) => {
 	try {
 		NFS.writeFile(path, data, {
@@ -49208,7 +49291,7 @@ const writeFile = (path, data, options) => callback$1((resume, signal) => {
 		resume(fail$3(handleBadArgument("writeFile")(err)));
 	}
 });
-const makeFileSystem = /*#__PURE__*/ map$4(/*#__PURE__*/ serviceOption(WatchBackend), (backend) => make$41({
+const makeFileSystem = /*#__PURE__*/ map$4(/*#__PURE__*/ serviceOption(WatchBackend), (backend) => make$42({
 	access,
 	chmod,
 	chown,
@@ -49325,13 +49408,13 @@ var NodeHttpIncomingMessage = class extends Class$2 {
 	*
 	* @since 4.0.0
 	*/
-	[TypeId$15];
+	[TypeId$16];
 	source;
 	onError;
 	remoteAddressOverride;
 	constructor(source, onError, remoteAddressOverride) {
 		super();
-		this[TypeId$15] = TypeId$15;
+		this[TypeId$16] = TypeId$16;
 		this.source = source;
 		this.onError = onError;
 		this.remoteAddressOverride = remoteAddressOverride;
@@ -49478,7 +49561,7 @@ var RequestInit = class extends Service()("effect/http/FetchHttpClient/RequestIn
 * @category layers
 * @since 4.0.0
 */
-const layer$16 = /*#__PURE__*/ layerMergedContext(/*#__PURE__*/ succeed$3(/* @__PURE__ */ make$30((request, url, signal, fiber) => {
+const layer$16 = /*#__PURE__*/ layerMergedContext(/*#__PURE__*/ succeed$3(/* @__PURE__ */ make$31((request, url, signal, fiber) => {
 	const fetch = fiber.getRef(Fetch);
 	const options = fiber.context.mapUnsafe.get(RequestInit.key) ?? {};
 	let headers = options.headers ? merge(fromInput$1(options.headers), request.headers) : request.headers;
@@ -49538,7 +49621,7 @@ const layer$16 = /*#__PURE__*/ layerMergedContext(/*#__PURE__*/ succeed$3(/* @__
 * @category constructors
 * @since 4.0.0
 */
-const make$11 = /*#__PURE__*/ make$20({
+const make$12 = /*#__PURE__*/ make$21({
 	fileResponse(path, status, statusText, headers, start, end, contentLength) {
 		return raw(contentLength === 0 ? Readable.from([]) : NFS.createReadStream(path, {
 			start,
@@ -49571,7 +49654,7 @@ const make$11 = /*#__PURE__*/ make$20({
 * @category layers
 * @since 4.0.0
 */
-const layer$15 = /*#__PURE__*/ pipe(/*#__PURE__*/ effect(HttpPlatform)(make$11), /*#__PURE__*/ provide$2(layer$17), /*#__PURE__*/ provide$2(layer$21));
+const layer$15 = /*#__PURE__*/ pipe(/*#__PURE__*/ effect(HttpPlatform)(make$12), /*#__PURE__*/ provide$2(layer$17), /*#__PURE__*/ provide$2(layer$21));
 //#endregion
 //#region ../../node_modules/.pnpm/multipasta@0.2.7/node_modules/multipasta/dist/esm/node.js
 var MultipastaStream = class extends Duplex {
@@ -49582,7 +49665,7 @@ var MultipastaStream = class extends Duplex {
 		super({ readableObjectMode: true });
 		let currentError;
 		let currentFile;
-		this._parser = make$22({
+		this._parser = make$23({
 			...config,
 			onField: (info, value) => {
 				if (currentError !== void 0) return;
@@ -49637,7 +49720,7 @@ var MultipastaStream = class extends Duplex {
 		callback();
 	}
 };
-const make$10 = (config) => new MultipastaStream(config);
+const make$11 = (config) => new MultipastaStream(config);
 var FileStream = class extends Readable {
 	info;
 	_parent;
@@ -49700,7 +49783,7 @@ var FileStream = class extends Readable {
 */
 const stream = (source, headers) => makeConfig(headers).pipe(map$4((config) => fromReadable({
 	evaluate() {
-		const parser = make$10(config);
+		const parser = make$11(config);
 		source.pipe(parser);
 		return parser;
 	},
@@ -49719,10 +49802,10 @@ const persisted = (source, headers) => toPersisted(stream(source, headers), (pat
 }));
 const convertPart = (part) => part._tag === "Field" ? new FieldImpl(part.info, part.value) : new FileImpl(part);
 var PartBase = class extends Class$2 {
-	[TypeId$8];
+	[TypeId$9];
 	constructor() {
 		super();
-		this[TypeId$8] = TypeId$8;
+		this[TypeId$9] = TypeId$9;
 	}
 };
 var FieldImpl = class extends PartBase {
@@ -49844,7 +49927,7 @@ function convertError(cause) {
 *
 * @since 4.0.0
 */
-const TypeId$2 = "~effect/platform/Crypto";
+const TypeId$3 = "~effect/platform/Crypto";
 /**
 * Service tag for platform cryptography.
 *
@@ -49902,7 +49985,7 @@ const Crypto = /*#__PURE__*/ Service("effect/Crypto");
 * @category constructors
 * @since 4.0.0
 */
-const make$9 = (impl) => {
+const make$10 = (impl) => {
 	const randomBytesUnsafe = impl.randomBytes;
 	const randomBytes = (size) => map$4(validateSize("randomBytes", size), randomBytesUnsafe);
 	const nextDoubleUnsafe = () => {
@@ -49911,7 +49994,7 @@ const make$9 = (impl) => {
 	};
 	const nextIntUnsafe = () => Math.floor(nextDoubleUnsafe() * (Number.MAX_SAFE_INTEGER - Number.MIN_SAFE_INTEGER + 1)) + Number.MIN_SAFE_INTEGER;
 	return Crypto.of({
-		[TypeId$2]: TypeId$2,
+		[TypeId$3]: TypeId$3,
 		randomBytes,
 		nextDoubleUnsafe,
 		nextIntUnsafe,
@@ -50041,7 +50124,7 @@ const digest = (algorithm, data) => try_({
 * @category layers
 * @since 1.0.0
 */
-const layer$13 = /* @__PURE__ */ succeed$4(Crypto, /* @__PURE__ */ make$9({
+const layer$13 = /* @__PURE__ */ succeed$4(Crypto, /* @__PURE__ */ make$10({
 	randomBytes: Crypto$1.randomBytes,
 	digest
 }));
@@ -50131,7 +50214,7 @@ const toFileUrl = (path) => try_({
 * @since 4.0.0
 */
 const layer$11 = /* @__PURE__ */ succeed$4(Path$1)({
-	[TypeId$25]: TypeId$25,
+	[TypeId$26]: TypeId$26,
 	...Path,
 	fromFileUrl,
 	toFileUrl
@@ -50172,7 +50255,7 @@ const layer$11 = /* @__PURE__ */ succeed$4(Path$1)({
 * @category layers
 * @since 4.0.0
 */
-const layer$9 = /* @__PURE__ */ succeed$4(Stdio, /*#__PURE__*/ make$16({
+const layer$9 = /* @__PURE__ */ succeed$4(Stdio, /*#__PURE__*/ make$17({
 	args: /*#__PURE__*/ sync(() => process.argv.slice(2)),
 	stdout: (options) => fromWritable({
 		evaluate: () => process.stdout,
@@ -50207,7 +50290,7 @@ const layer$9 = /* @__PURE__ */ succeed$4(Stdio, /*#__PURE__*/ make$16({
 }));
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Terminal.js
-const TypeId$1 = "~effect/platform/Terminal";
+const TypeId$2 = "~effect/platform/Terminal";
 ErrorClass("QuitError")({ _tag: /*#__PURE__*/ tag("QuitError") });
 /**
 * Service tag for command-line input and output services.
@@ -50239,9 +50322,9 @@ const Terminal$1 = /*#__PURE__*/ Service("effect/platform/Terminal");
 * @category constructors
 * @since 4.0.0
 */
-const make$7 = (impl) => Terminal$1.of({
+const make$8 = (impl) => Terminal$1.of({
 	...impl,
-	[TypeId$1]: TypeId$1
+	[TypeId$2]: TypeId$2
 });
 /**
 * Provides the default process-backed `Terminal` service, ending key input on
@@ -50253,7 +50336,7 @@ const make$7 = (impl) => Terminal$1.of({
 const layer$8 = /*#__PURE__*/ effect(Terminal$1, /*#__PURE__*/ (/* @__PURE__ */ fnUntraced(function* (shouldQuit = defaultShouldQuit) {
 	const stdin = process.stdin;
 	const stdout = process.stdout;
-	const rlRef = yield* make$43({ acquire: acquireRelease(sync(() => {
+	const rlRef = yield* make$44({ acquire: acquireRelease(sync(() => {
 		const rl = readline.createInterface({
 			input: stdin,
 			escapeCodeTimeout: 50
@@ -50268,8 +50351,8 @@ const layer$8 = /*#__PURE__*/ effect(Terminal$1, /*#__PURE__*/ (/* @__PURE__ */
 	const columns = sync(() => stdout.columns ?? 0);
 	const rows = sync(() => stdout.rows ?? 0);
 	const readInput = gen(function* () {
-		yield* get$3(rlRef);
-		const queue = yield* make$47();
+		yield* get$4(rlRef);
+		const queue = yield* make$48();
 		const handleKeypress = (s, k) => {
 			const userInput = {
 				input: fromUndefinedOr(s),
@@ -50287,7 +50370,7 @@ const layer$8 = /*#__PURE__*/ effect(Terminal$1, /*#__PURE__*/ (/* @__PURE__ */
 		stdin.on("keypress", handleKeypress);
 		return queue;
 	});
-	const readLine = scoped$3(flatMap$2(get$3(rlRef), (readlineInterface) => callback$1((resume) => {
+	const readLine = scoped$3(flatMap$2(get$4(rlRef), (readlineInterface) => callback$1((resume) => {
 		const onLine = (line) => resume(succeed$3(line));
 		readlineInterface.once("line", onLine);
 		return sync(() => readlineInterface.off("line", onLine));
@@ -50300,7 +50383,7 @@ const layer$8 = /*#__PURE__*/ effect(Terminal$1, /*#__PURE__*/ (/* @__PURE__ */
 			cause: err
 		}))));
 	}));
-	return make$7({
+	return make$8({
 		columns,
 		rows,
 		readInput,
@@ -50363,7 +50446,7 @@ const layer$6 = /*#__PURE__*/ provideMerge(layer$22, /*#__PURE__*/ mergeAll$1(la
 * @category constructors
 * @since 4.0.0
 */
-const make$5 = /*#__PURE__*/ fnUntraced(function* (evaluate, options) {
+const make$6 = /*#__PURE__*/ fnUntraced(function* (evaluate, options) {
 	const scope$2 = yield* scope;
 	const server = evaluate();
 	const shutdown = yield* callback$1((resume) => {
@@ -50392,7 +50475,7 @@ const make$5 = /*#__PURE__*/ fnUntraced(function* (evaluate, options) {
 	const wss = yield* acquireRelease(sync(() => new import_websocket_server.default({ noServer: true })), (wss) => callback$1((resume) => {
 		wss.close(() => resume(void_$1));
 	})).pipe(provide$3(scope$2), cached);
-	return make$19({
+	return make$20({
 		address: typeof address === "string" ? {
 			_tag: "UnixAddress",
 			path: address
@@ -50481,7 +50564,7 @@ const makeUpgradeHandler = (lazyWss, httpEffect, options) => {
 	});
 };
 var ServerRequestImpl = class ServerRequestImpl extends NodeHttpIncomingMessage {
-	[TypeId$7];
+	[TypeId$8];
 	response;
 	upgradeEffect;
 	url;
@@ -50491,7 +50574,7 @@ var ServerRequestImpl = class ServerRequestImpl extends NodeHttpIncomingMessage
 			request: this,
 			cause
 		}) }), remoteAddressOverride);
-		this[TypeId$7] = TypeId$7;
+		this[TypeId$8] = TypeId$8;
 		this.response = response;
 		this.upgradeEffect = upgradeEffect;
 		this.url = url;
@@ -50559,7 +50642,7 @@ const layerHttpServices = /*#__PURE__*/ mergeAll$1(layer$15, layerWeak, layer$6)
 * @category layers
 * @since 4.0.0
 */
-const layerConfig = (evaluate, options) => mergeAll$1(effect(HttpServer)(flatMap$2(unwrap(options), (options) => make$5(evaluate, options))), layerHttpServices);
+const layerConfig = (evaluate, options) => mergeAll$1(effect(HttpServer)(flatMap$2(unwrap(options), (options) => make$6(evaluate, options))), layerHttpServices);
 const handleResponse = (request, response) => {
 	const nodeResponse = request.resolvedResponse;
 	if (nodeResponse.writableEnded) return void_$1;
@@ -51157,7 +51240,7 @@ const CurrentLoggers = CurrentLoggers$1;
 * @category constructors
 * @since 2.0.0
 */
-const make$4 = loggerMake;
+const make$5 = loggerMake;
 /**
 * Creates a `Layer` which will overwrite the current set of loggers with the
 * specified array of `loggers`.
@@ -51283,6 +51366,182 @@ const nextIntBetween = (min, max, options) => {
 	});
 };
 //#endregion
+//#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/unstable/persistence/KeyValueStore.js
+/**
+* Effectful key/value storage for persistence backends.
+*
+* This module defines the `KeyValueStore` service used by the persistence
+* package when a simple string or binary store is enough. It is useful for
+* lightweight durable state, browser storage, local file-backed data, SQL
+* tables, test stores, and as the storage primitive underneath higher-level
+* persistence APIs.
+*
+* Values are stored as strings or `Uint8Array`s, and `toSchemaStore` adds a
+* schema-aware JSON layer for typed values. Schema changes can make existing
+* JSON fail to decode, and `prefix` should be used to separate namespaces when
+* several logical stores share the same backend. This service does not provide
+* native TTL support; higher-level persistence layers encode expiration
+* metadata in stored values when they need TTLs.
+*
+* Backend behavior is intentionally small but not identical: Web Storage is
+* string-only, `makeStringOnly` stores binary values as base64, filesystem
+* keys become encoded file names, SQL stores value type metadata in a table,
+* and the memory layer is process-local. Choose keys, prefixes, table names,
+* and value formats with those backend constraints in mind.
+*
+* @since 4.0.0
+*/
+const TypeId$1 = "~effect/persistence/KeyValueStore";
+const ErrorTypeId = "~effect/persistence/KeyValueStore/KeyValueStoreError";
+/**
+* Error raised by key/value store operations, including the failed method,
+* optional key, message, and cause.
+*
+* @category errors
+* @since 4.0.0
+*/
+var KeyValueStoreError = class extends TaggedError("KeyValueStoreError") {
+	/**
+	* Marks this value as a key-value store error for runtime guards.
+	*
+	* @since 4.0.0
+	*/
+	[ErrorTypeId] = ErrorTypeId;
+};
+/**
+* Service tag for string and binary key/value storage.
+*
+* **When to use**
+*
+* Use to access or provide the persistence store used for lightweight durable
+* state.
+*
+* @category services
+* @since 4.0.0
+*/
+const KeyValueStore = /*#__PURE__*/ Service("effect/persistence/KeyValueStore");
+/**
+* Constructs a `KeyValueStore` from primitive store operations.
+*
+* **Details**
+*
+* Default implementations are derived for `has`, `isEmpty`, `modify`, and
+* `modifyUint8Array` unless they are provided in the options.
+*
+* @category constructors
+* @since 4.0.0
+*/
+const make$4 = (options) => KeyValueStore.of({
+	[TypeId$1]: TypeId$1,
+	has: (key) => map$4(options.get(key), isNotUndefined),
+	isEmpty: map$4(options.size, (size) => size === 0),
+	modify: (key, f) => flatMap$2(options.get(key), (o) => {
+		if (o === void 0) return undefined_$1;
+		const newValue = f(o);
+		return as(options.set(key, newValue), newValue);
+	}),
+	modifyUint8Array: (key, f) => flatMap$2(options.getUint8Array(key), (o) => {
+		if (o === void 0) return undefined_$1;
+		const newValue = f(o);
+		return as(options.set(key, newValue), newValue);
+	}),
+	...options
+});
+/**
+* Provides a `KeyValueStore` backed by files in the specified directory.
+*
+* **Details**
+*
+* The directory is created if needed, and each key is encoded as a file name.
+*
+* @category layers
+* @since 4.0.0
+*/
+const layerFileSystem = (directory) => effect(KeyValueStore)(gen(function* () {
+	const fs = yield* FileSystem;
+	const path = yield* Path$1;
+	const keyPath = (key) => path.join(directory, encodeURIComponent(key));
+	if (!(yield* fs.exists(directory))) yield* fs.makeDirectory(directory, { recursive: true });
+	return make$4({
+		get: (key) => catchTag(fs.readFileString(keyPath(key)), "PlatformError", (cause) => cause.reason._tag === "NotFound" ? undefined_$1 : fail$3(new KeyValueStoreError({
+			method: "get",
+			key,
+			message: `Unable to get item with key ${key}`,
+			cause
+		}))),
+		getUint8Array: (key) => catchTag(fs.readFile(keyPath(key)), "PlatformError", (cause) => cause.reason._tag === "NotFound" ? undefined_$1 : fail$3(new KeyValueStoreError({
+			method: "getUint8Array",
+			key,
+			message: `Unable to get item with key ${key}`,
+			cause
+		}))),
+		set: (key, value) => mapError$2(typeof value === "string" ? fs.writeFileString(keyPath(key), value) : fs.writeFile(keyPath(key), value), (cause) => new KeyValueStoreError({
+			method: "set",
+			key,
+			message: `Unable to set item with key ${key}`,
+			cause
+		})),
+		remove: (key) => mapError$2(fs.remove(keyPath(key)), (cause) => new KeyValueStoreError({
+			method: "remove",
+			key,
+			message: `Unable to remove item with key ${key}`,
+			cause
+		})),
+		has: (key) => mapError$2(fs.exists(keyPath(key)), (cause) => new KeyValueStoreError({
+			method: "has",
+			key,
+			message: `Unable to check existence of item with key ${key}`,
+			cause
+		})),
+		clear: mapError$2(andThen(fs.remove(directory, { recursive: true }), fs.makeDirectory(directory, { recursive: true })), (cause) => new KeyValueStoreError({
+			method: "clear",
+			message: `Unable to clear storage`,
+			cause
+		})),
+		size: matchEffect(fs.readDirectory(directory), {
+			onSuccess: (files) => succeed$3(files.length),
+			onFailure: (cause) => fail$3(new KeyValueStoreError({
+				method: "size",
+				message: `Unable to get size`,
+				cause
+			}))
+		})
+	});
+}));
+const SchemaStoreTypeId = "~effect/persistence/KeyValueStore/SchemaStore";
+/**
+* Adapts a `KeyValueStore` into a `SchemaStore` using the schema's JSON codec.
+*
+* @category SchemaStore
+* @since 4.0.0
+*/
+const toSchemaStore = (self, schema) => {
+	const jsonSchema = fromJsonString(toCodecJson(schema));
+	const decode = decodeEffect(jsonSchema);
+	const encode = encodeEffect(jsonSchema);
+	const get = (key) => flatMap$2(self.get(key), match({
+		onUndefined: () => succeedNone,
+		onDefined: (value) => asSome(decode(value))
+	}));
+	const set = (key, value) => flatMap$2(encode(value), (json) => self.set(key, json));
+	const modify = (key, f) => flatMap$2(get(key), (o) => {
+		if (isNone(o)) return succeedNone;
+		const newValue = f(o.value);
+		return as(set(key, newValue), some(newValue));
+	});
+	return {
+		[SchemaStoreTypeId]: SchemaStoreTypeId,
+		get,
+		set,
+		modify,
+		remove: self.remove,
+		clear: self.clear,
+		size: self.size,
+		has: self.has,
+		isEmpty: self.isEmpty
+	};
+};
+//#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/SubscriptionRef.js
 /**
 * The `SubscriptionRef` module combines a fiber-safe mutable reference with a
@@ -51445,6 +51704,37 @@ const setUnsafe = (self, value) => {
 	publishUnsafe(self.pubsub, value);
 };
 /**
+* Modifies the `SubscriptionRef` atomically with a function that computes a
+* return value and a new value, notifying subscribers of the change.
+*
+* **Example** (Modifying a value)
+*
+* ```ts
+* import { Effect, SubscriptionRef } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   const ref = yield* SubscriptionRef.make(10)
+*
+*   const result = yield* SubscriptionRef.modify(ref, (n) => [
+*     `Old value was ${n}`,
+*     n * 2
+*   ])
+*   console.log(result)
+*
+*   const newValue = yield* SubscriptionRef.get(ref)
+*   console.log("New value:", newValue)
+* })
+* ```
+*
+* @category modifications
+* @since 2.0.0
+*/
+const modify = /*#__PURE__*/ dual(2, (self, modify) => self.semaphore.withPermit(sync(() => {
+	const [b, newValue] = modify(self.value);
+	setUnsafe(self, newValue);
+	return b;
+})));
+/**
 * Sets the value of the `SubscriptionRef`, notifying all subscribers of the
 * change.
 *
@@ -51833,9 +52123,16 @@ const GitDiffStatus = Literals([
 	"renamed"
 ]);
 const GitDiffScope = Literals(["staged-to-worktree", "head-to-staged"]);
+var GitDiffSegment = class extends Class("GitDiffSegment")({
+	filePath: String$1,
+	fingerprint: String$1,
+	id: String$1,
+	type: Literals(["commit", "worktree"])
+}) {};
 var GitDiff = class extends Class("GitDiff")({
 	filePath: String$1,
 	patch: String$1,
+	segments: ArraySchema(GitDiffSegment),
 	status: GitDiffStatus
 }) {};
 const GitReviewFrom = Union([Struct({
@@ -51958,7 +52255,22 @@ const AgentSession = Struct({
 	label: String$1,
 	uuid: String$1
 });
-var RpcContracts = class extends make$14(make$17("agents.create", {
+var ReviewMark = class extends Class("ReviewMark")({
+	filePath: String$1,
+	fingerprint: String$1,
+	segmentId: String$1
+}) {};
+var ReviewComment = class extends Class("ReviewComment")({
+	body: String$1,
+	filePath: String$1,
+	lineNumber: Number$1,
+	side: optional(Literals(["additions", "deletions"]))
+}) {};
+var ReviewState = class extends Class("ReviewState")({
+	comments: ArraySchema(ReviewComment),
+	marks: ArraySchema(ReviewMark)
+}) {};
+var RpcContracts = class extends make$15(make$18("agents.create", {
 	error: TerminalError,
 	payload: Struct({
 		args: ArraySchema(String$1),
@@ -51972,25 +52284,25 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 		label: String$1
 	}),
 	success: AgentSession
-}), make$17("agents.remove", {
+}), make$18("agents.remove", {
 	error: TerminalError,
 	payload: Struct({
 		cwd: String$1,
 		uuid: String$1
 	})
-}), make$17("agents.watch", {
+}), make$18("agents.watch", {
 	error: TerminalError,
 	payload: Struct({ cwd: String$1 }),
 	stream: true,
 	success: ArraySchema(AgentSession)
-}), make$17("projects.watch", {
+}), make$18("projects.watch", {
 	stream: true,
 	success: ArraySchema(GitProject)
-}), make$17("projects.branches", {
+}), make$18("projects.branches", {
 	error: GitError,
 	payload: Struct({ cwd: String$1 }),
 	success: GitBranchesSnapshot
-}), make$17("review.watch", {
+}), make$18("review.watch", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
@@ -51998,14 +52310,14 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 	}),
 	stream: true,
 	success: ArraySchema(GitDiff)
-}), make$17("review.metadata", {
+}), make$18("review.metadata", {
 	error: GitError,
 	payload: Struct({
 		base: optional(String$1),
 		cwd: String$1
 	}),
 	success: GitReviewMetadata
-}), make$17("review.watchRange", {
+}), make$18("review.watchRange", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
@@ -52014,38 +52326,76 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 	}),
 	stream: true,
 	success: ArraySchema(GitDiff)
-}), make$17("review.createWipCommit", {
+}), make$18("review.state.watch", {
+	error: GitError,
+	payload: Struct({
+		base: String$1,
+		cwd: String$1
+	}),
+	stream: true,
+	success: ReviewState
+}), make$18("review.state.mark", {
+	error: GitError,
+	payload: Struct({
+		base: String$1,
+		cwd: String$1,
+		marks: ArraySchema(ReviewMark)
+	})
+}), make$18("review.state.unmark", {
+	error: GitError,
+	payload: Struct({
+		base: String$1,
+		cwd: String$1,
+		marks: ArraySchema(ReviewMark)
+	})
+}), make$18("review.comments.save", {
+	error: GitError,
+	payload: Struct({
+		base: String$1,
+		comment: ReviewComment,
+		cwd: String$1
+	})
+}), make$18("review.comments.delete", {
+	error: GitError,
+	payload: Struct({
+		base: String$1,
+		cwd: String$1,
+		filePath: String$1,
+		lineNumber: Number$1,
+		side: optional(Literals(["additions", "deletions"]))
+	})
+}), make$18("review.createWipCommit", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		message: String$1
 	})
-}), make$17("review.commitAndPush", {
+}), make$18("review.commitAndPush", {
 	error: GitError,
 	payload: Struct({
 		base: String$1,
 		cwd: String$1,
 		message: String$1
 	})
-}), make$17("review.stageFile", {
+}), make$18("review.stageFile", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		filePath: String$1
 	})
-}), make$17("review.unstageFile", {
+}), make$18("review.unstageFile", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		filePath: String$1
 	})
-}), make$17("review.discardFile", {
+}), make$18("review.discardFile", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		filePath: String$1
 	})
-}), make$17("projects.createWorktree", {
+}), make$18("projects.createWorktree", {
 	error: GitError,
 	payload: Struct({
 		baseBranch: String$1,
@@ -52058,13 +52408,13 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 		])
 	}),
 	success: String$1
-}), make$17("projects.deleteWorktree", {
+}), make$18("projects.deleteWorktree", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		force: Boolean$1
 	})
-}), make$17("runs.scripts", {
+}), make$18("runs.scripts", {
 	error: TerminalError,
 	payload: Struct({ cwd: String$1 }),
 	success: ArraySchema(Struct({
@@ -52072,7 +52422,7 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 		name: String$1,
 		tasks: ArraySchema(String$1)
 	}))
-}), make$17("terminal.write", {
+}), make$18("terminal.write", {
 	error: TerminalError,
 	payload: Struct({
 		args: optional(ArraySchema(String$1)),
@@ -52082,7 +52432,7 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 		sessionId: optional(String$1)
 	}),
 	success: TerminalState
-}), make$17("terminal.resize", {
+}), make$18("terminal.resize", {
 	error: TerminalError,
 	payload: Struct({
 		args: optional(ArraySchema(String$1)),
@@ -52093,20 +52443,20 @@ var RpcContracts = class extends make$14(make$17("agents.create", {
 		sessionId: optional(String$1)
 	}),
 	success: TerminalState
-}), make$17("terminal.restart", {
+}), make$18("terminal.restart", {
 	error: TerminalError,
 	payload: TerminalPayload,
 	success: TerminalState
-}), make$17("terminal.stop", {
+}), make$18("terminal.stop", {
 	error: TerminalError,
 	payload: TerminalPayload,
 	success: TerminalState
-}), make$17("terminal.ports", {
+}), make$18("terminal.ports", {
 	error: TerminalError,
 	payload: TerminalPayload,
 	stream: true,
 	success: ArraySchema(Number$1)
-}), make$17("terminal.watch", {
+}), make$18("terminal.watch", {
 	error: TerminalError,
 	payload: TerminalPayload,
 	stream: true,
@@ -52118,10 +52468,10 @@ const makeGitExecutor = gen(function* () {
 	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
 	return {
 		lines: fnUntraced(function* (cwd, args) {
-			return yield* pipe((yield* ChildProcessSpawner.useSync((spawner) => spawner.lines))(make$39("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
+			return yield* pipe((yield* ChildProcessSpawner.useSync((spawner) => spawner.lines))(make$40("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
 		}),
 		string: fnUntraced(function* (cwd, args) {
-			return yield* pipe(execString(make$39("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
+			return yield* pipe(execString(make$40("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
 		})
 	};
 });
@@ -52168,7 +52518,7 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 		});
 	});
 	const collectRepositoriesFromRoots = fnUntraced(function* (roots, repositories) {
-		return yield* match$2(roots, {
+		return yield* match$3(roots, {
 			onEmpty: () => succeed$3(repositories),
 			onNonEmpty: (roots) => pipe(fs.readDirectory(roots[0]), orElseSucceed(() => empty$13()), flatMap$2((entries) => {
 				if (contains(entries, ".git")) return pipe(git.string(roots[0], [
@@ -52275,14 +52625,14 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 		clone: fnUntraced(function* (input) {
 			const targetDirectory = path.isAbsolute(input.directory) ? input.directory : path.join(input.cwd, input.directory);
 			yield* pipe(fs.makeDirectory(targetDirectory, { recursive: true }), ignore$1);
-			yield* pipe(execString(make$39("git", [
+			yield* pipe(execString(make$40("git", [
 				"clone",
 				"--depth",
 				"1",
 				"--single-branch",
 				input.url,
 				targetDirectory
-			], { cwd: input.cwd })), asVoid, catch_$2(() => pipe(execString(make$39("git", [
+			], { cwd: input.cwd })), asVoid, catch_$2(() => pipe(execString(make$40("git", [
 				"-C",
 				targetDirectory,
 				"pull",
@@ -52404,15 +52754,46 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 	function toArgs(to) {
 		return to.type === "ref" ? [to.ref] : empty$13();
 	}
-	function statusFromNameStatus(line) {
-		if (startsWith("A")(line)) return "added";
-		if (startsWith("D")(line)) return "deleted";
-		if (startsWith("R")(line)) return "renamed";
-		return "modified";
+	function segmentsByFile(segments) {
+		return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some(append$1(getOrElse$1(current, () => empty$13()), segment))));
+	}
+	function diffFromPatchChunk(chunk, segments) {
+		const deleted = /^deleted file mode /mu.test(chunk);
+		const filePath = (deleted ? chunk.match(/^--- a\/(.+)$/mu)?.[1] : void 0) ?? chunk.match(/^\+\+\+ b\/(.+)$/mu)?.[1] ?? chunk.match(/^--- a\/(.+)$/mu)?.[1] ?? chunk.match(/^diff --git a\/.+ b\/(.+)$/mu)?.[1] ?? "";
+		const status = /^new file mode /mu.test(chunk) ? "added" : deleted ? "deleted" : /^rename (from|to) /mu.test(chunk) ? "renamed" : "modified";
+		return new GitDiff({
+			filePath,
+			patch: chunk,
+			segments: getOrElse$1(get$1(segments, filePath), () => empty$13()),
+			status
+		});
 	}
-	function filePathFromNameStatus(line) {
-		return pipe(line, split$1("	"), last, getOrUndefined$1) ?? "";
+	function diffsFromPatch(patch, segments) {
+		const groupedSegments = segmentsByFile(segments);
+		return pipe(patch.split(/(?=^diff --git )/mu), filter$2(isNonEmpty$1), map$7((chunk) => diffFromPatchChunk(chunk, groupedSegments)));
+	}
+	function attachSegments(diffs, segments) {
+		const groupedSegments = segmentsByFile(segments);
+		return map$7(diffs, (diff) => new GitDiff({
+			filePath: diff.filePath,
+			patch: diff.patch,
+			segments: getOrElse$1(get$1(groupedSegments, diff.filePath), () => empty$13()),
+			status: diff.status
+		}));
 	}
+	const gitDiffs = fnUntraced(function* (input) {
+		return diffsFromPatch(yield* git.string(config.cwd, [
+			"diff",
+			...input.args,
+			"--ignore-all-space",
+			"--ignore-blank-lines",
+			"--ignore-cr-at-eol",
+			"--patch",
+			"--find-renames",
+			"-U999999",
+			"--no-ext-diff"
+		]), input.segments);
+	});
 	const untrackedDiffs = gen(function* () {
 		return yield* forEach$1(yield* git.lines(config.cwd, [
 			"ls-files",
@@ -52421,70 +52802,88 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		]), (filePath) => pipe(fs.readFileString(path.join(config.cwd, filePath)), orElseSucceed(() => ""), map$4((content) => new GitDiff({
 			filePath,
 			patch: `diff --git a/${filePath} b/${filePath}\nnew file mode 100644\n--- /dev/null\n+++ b/${filePath}\n@@ -0,0 +1,${length(split$1("\n")(content))} @@\n${pipe(split$1("\n")(content), map$7((line) => `+${line}`), join$3("\n"))}`,
+			segments: [new GitDiffSegment({
+				filePath,
+				fingerprint: content,
+				id: "HEAD->worktree",
+				type: "worktree"
+			})],
 			status: "added"
 		}))), { concurrency: "unbounded" });
 	});
 	const reviewDiffs = fnUntraced(function* (scope) {
-		const args = scope === "head-to-staged" ? [
-			"diff",
-			"--cached",
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
-			"--name-status"
-		] : [
-			"diff",
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
-			"--name-status"
-		];
-		const diffs = yield* pipe(git.lines(config.cwd, args), flatMap$2(forEach$1((line) => pipe(git.string(config.cwd, appendAll(dropRight(args, 1), [
-			"--patch",
-			"--find-renames",
-			"-U999999",
-			"--no-ext-diff",
-			"--",
-			filePathFromNameStatus(line)
-		])), map$4((patch) => new GitDiff({
-			filePath: filePathFromNameStatus(line),
-			patch,
-			status: statusFromNameStatus(line)
-		}))), { concurrency: "unbounded" })));
+		const diffs = yield* gitDiffs({
+			args: scope === "head-to-staged" ? ["--cached"] : empty$13(),
+			segments: empty$13()
+		});
 		if (scope === "head-to-staged") return diffs;
 		return yield* pipe(untrackedDiffs, map$4(appendAll(diffs)));
 	});
+	const commitSegmentDiffs = fnUntraced(function* (input) {
+		return pipe((yield* git.string(config.cwd, [
+			"log",
+			"--reverse",
+			"--format=%x00DESLOP-COMMIT%x00%H%x00%P",
+			"--find-renames",
+			"--name-only",
+			`${input.from}..${input.to}`
+		])).split("\0DESLOP-COMMIT\0"), filter$2(isNonEmpty$1), flatMap$5((entry) => {
+			const lines = split$1("\n")(entry);
+			const header = lines[0] ?? "";
+			const parts = split$1("\0")(header);
+			const commit = parts[0] ?? "";
+			const id = `${pipe(parts[1] ?? "", split$1(" "), filter$2(isNonEmpty$1))[0] ?? `${commit}^`}->${commit}`;
+			return pipe(drop$1(lines, 1), filter$2(isNonEmpty$1), map$7((filePath) => new GitDiffSegment({
+				filePath,
+				fingerprint: `${id}:${filePath}`,
+				id,
+				type: "commit"
+			})));
+		}));
+	});
 	const reviewRangeDiffs = fnUntraced(function* (input) {
 		const from = yield* resolveFrom(input.from);
-		const args = [
-			"diff",
-			from,
-			...toArgs(input.to),
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
-			"--name-status"
-		];
-		const diffs = yield* pipe(git.lines(config.cwd, args), flatMap$2(forEach$1((line) => pipe(git.string(config.cwd, [
-			"diff",
-			from,
-			...toArgs(input.to),
-			"--ignore-all-space",
-			"--ignore-blank-lines",
-			"--ignore-cr-at-eol",
-			"--patch",
-			"--find-renames",
-			"-U999999",
-			"--no-ext-diff",
-			"--",
-			filePathFromNameStatus(line)
-		]), map$4((patch) => new GitDiff({
-			filePath: filePathFromNameStatus(line),
-			patch,
-			status: statusFromNameStatus(line)
-		}))), { concurrency: "unbounded" })));
-		if (input.to.type === "ref") return diffs;
-		return yield* pipe(untrackedDiffs, map$4(appendAll(diffs)));
+		const to = input.to.type === "ref" ? input.to.ref : "HEAD";
+		if (from === "HEAD" && input.to.type === "worktree") return yield* pipe(untrackedDiffs, map$4(appendAll(pipe(yield* gitDiffs({
+			args: ["HEAD"],
+			segments: empty$13()
+		}), map$7((diff) => {
+			const segment = new GitDiffSegment({
+				filePath: diff.filePath,
+				fingerprint: diff.patch,
+				id: "HEAD->worktree",
+				type: "worktree"
+			});
+			return new GitDiff({
+				filePath: diff.filePath,
+				patch: diff.patch,
+				segments: [segment],
+				status: diff.status
+			});
+		})))));
+		const [commitSegments, trackedWorktreeDiffs, untracked, diffs] = yield* all([
+			commitSegmentDiffs({
+				from,
+				to
+			}),
+			input.to.type === "worktree" ? gitDiffs({
+				args: ["HEAD"],
+				segments: empty$13()
+			}) : succeed$3(empty$13()),
+			input.to.type === "worktree" ? untrackedDiffs : succeed$3(empty$13()),
+			gitDiffs({
+				args: [from, ...toArgs(input.to)],
+				segments: empty$13()
+			})
+		], { concurrency: "unbounded" });
+		const diffsWithSegments = attachSegments(diffs, appendAll(commitSegments, pipe(trackedWorktreeDiffs, map$7((diff) => new GitDiffSegment({
+			filePath: diff.filePath,
+			fingerprint: diff.patch,
+			id: "HEAD->worktree",
+			type: "worktree"
+		})), appendAll(flatMap$5(untracked, (diff) => diff.segments)))));
+		if (input.to.type === "ref") return diffsWithSegments;
+		return appendAll(diffsWithSegments, untracked);
 	});
 	const suggestBase = gen(function* () {
 		return yield* pipe([
@@ -52526,6 +52925,7 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			});
 		})));
 	});
+	const worktreeChanges = pipe(make$43(void 0), merge$1(pipe(fs.watch(config.cwd), catch_(() => empty$8), map$2(() => void 0))), debounce(millis(50)));
 	return {
 		commitAndPush: fnUntraced(function* (input) {
 			if (yield* hasWorktreeChanges) return yield* fail$3(new GitError({ message: "Create a WIP commit before squashing." }));
@@ -52610,8 +53010,8 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 				filePath
 			]), asVoid);
 		}),
-		watchReviewDiffs: (scope) => pipe(fs.watch(config.cwd), catch_(() => empty$8), merge$1(tick(millis(250))), debounce(millis(50)), mapEffect(() => pipe(reviewDiffs(scope), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch))),
-		watchReviewRangeDiffs: (input) => pipe(fs.watch(config.cwd), catch_(() => empty$8), merge$1(tick(millis(250))), debounce(millis(50)), mapEffect(() => pipe(reviewRangeDiffs(input), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
+		watchReviewDiffs: (scope) => pipe(worktreeChanges, mapEffect(() => pipe(reviewDiffs(scope), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch))),
+		watchReviewRangeDiffs: (input) => pipe(worktreeChanges, mapEffect(() => pipe(reviewRangeDiffs(input), catchTag("GitError", () => succeed$3(empty$13())))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => right[index] !== void 0 && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
 	};
 }) }) {
 	static layer = flow(this.make, effect(this));
@@ -52623,7 +53023,7 @@ function parseProcessParents(output) {
 		const columns = split$1(/\s+/)(trim(line));
 		const pid = Number(columns[0]);
 		const ppid = Number(columns[1]);
-		return Number.isFinite(pid) && Number.isFinite(ppid) ? succeed$7(make$62(pid, ppid)) : failVoid;
+		return Number.isFinite(pid) && Number.isFinite(ppid) ? succeed$7(make$63(pid, ppid)) : failVoid;
 	})));
 }
 function parseListeningPorts(output) {
@@ -52653,7 +53053,7 @@ function descendantsOf(ancestorPid, parents) {
 	return pipe(fromIterable$2(parents.keys()), filter$2((pid) => pid !== ancestorPid && isDescendant(pid, ancestorPid, parents)));
 }
 const commandString = fnUntraced(function* (command, args, message) {
-	return yield* pipe((yield* ChildProcessSpawner.useSync((spawner) => spawner.string))(make$39(command, args)), mapError$2((cause) => new TerminalError({
+	return yield* pipe((yield* ChildProcessSpawner.useSync((spawner) => spawner.string))(make$40(command, args)), mapError$2((cause) => new TerminalError({
 		cause,
 		message
 	})));
@@ -52729,13 +53129,13 @@ function completeSignalData(input) {
 var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { make: fnUntraced(function* (config) {
 	const dataQueue = yield* unbounded();
 	const events = yield* bounded$1({ capacity: 256 });
-	const lifecycleLock = yield* make$46(1);
-	const screenLock = yield* make$46(1);
-	const sequenceRef = yield* make$37(0);
-	const signalBuffer = yield* make$37("");
-	const portOwners = yield* make$37(/* @__PURE__ */ new Map());
-	const processRef = yield* make$37(void 0);
-	const sizeRef = yield* make$37({
+	const lifecycleLock = yield* make$47(1);
+	const screenLock = yield* make$47(1);
+	const sequenceRef = yield* make$38(0);
+	const signalBuffer = yield* make$38("");
+	const portOwners = yield* make$38(/* @__PURE__ */ new Map());
+	const processRef = yield* make$38(void 0);
+	const sizeRef = yield* make$38({
 		cols: 120,
 		rows: 32
 	});
@@ -52766,7 +53166,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 	const requestSnapshot = withPermit(screenLock, gen(function* () {
 		return {
 			data: serialize.serialize({ scrollback: 1e4 }),
-			sequence: yield* get$2(sequenceRef)
+			sequence: yield* get$3(sequenceRef)
 		};
 	}));
 	function setState(state) {
@@ -52814,12 +53214,12 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		for (const match of data.matchAll(/\x1b\]9;4;([^\x07\x1b]*)(?:\x07|\x1b\\)/gu)) runFork(setActiveState(match[1] === "0" ? "idle" : "running"));
 	}
 	const readBufferedSignals = fnUntraced(function* (data) {
-		const next = completeSignalData(`${yield* get$2(signalBuffer)}${data}`);
+		const next = completeSignalData(`${yield* get$3(signalBuffer)}${data}`);
 		yield* set$4(signalBuffer, next.pending);
 		readSignals(next.complete);
 	});
 	const interruptProcessTree = fnUntraced(function* (subprocess, signal) {
-		const descendants = yield* pipe(all([readProcessParents, get$2(portOwners)]), map$4(([parents, owners]) => dedupe([...descendantsOf(subprocess.pid, parents), ...fromIterable$2(owners.values())])), timeoutOption("250 millis"), map$4((option) => getOrElse$1(option, empty$13)), catch_$2(() => succeed$3(empty$13())));
+		const descendants = yield* pipe(all([readProcessParents, get$3(portOwners)]), map$4(([parents, owners]) => dedupe([...descendantsOf(subprocess.pid, parents), ...fromIterable$2(owners.values())])), timeoutOption("250 millis"), map$4((option) => getOrElse$1(option, empty$13)), catch_$2(() => succeed$3(empty$13())));
 		yield* sync(() => {
 			try {
 				if (nodeProcess.platform !== "win32") nodeProcess.kill(-subprocess.pid, signal);
@@ -52853,7 +53253,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		yield* setPorts([]);
 	});
 	const stopProcess = fnUntraced(function* (state) {
-		const handle = yield* get$2(processRef);
+		const handle = yield* get$3(processRef);
 		if (!handle) {
 			if (state) yield* setState(state);
 			return;
@@ -52871,7 +53271,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 			screen.reset();
 		}), andThen(publish$1({ type: "reset" }))));
 		yield* startRun;
-		const size = yield* get$2(sizeRef);
+		const size = yield* get$3(sizeRef);
 		const subprocess = yield* try_({
 			catch: (cause) => new TerminalError({
 				cause,
@@ -52894,7 +53294,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 			}),
 			exit: subprocess.onExit((event) => {
 				runFork(withPermit(lifecycleLock, gen(function* () {
-					if ((yield* get$2(processRef)) !== handle) return;
+					if ((yield* get$3(processRef)) !== handle) return;
 					yield* clearProcess(handle);
 					if (autostart) {
 						yield* pipe(sleep("1 second"), andThen(spawnProcess()), catch_$2(() => setState("failed")));
@@ -52925,7 +53325,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 	}));
 	if (autostart) yield* pipe(startProcess(), withPermit(lifecycleLock), catch_$2(() => setState("failed")));
 	yield* pipe(gen(function* () {
-		const process = yield* get$2(processRef);
+		const process = yield* get$3(processRef);
 		if (!process?.process.pid) {
 			yield* set$4(portOwners, /* @__PURE__ */ new Map());
 			yield* setPorts([]);
@@ -52941,13 +53341,13 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		yield* setPorts(nextPorts);
 	}), ignore$1, repeat(spaced("1 second")), forkScoped);
 	const resize = fnUntraced(function* (nextSize) {
-		const size = yield* get$2(sizeRef);
+		const size = yield* get$3(sizeRef);
 		if (size.cols === nextSize.cols && size.rows === nextSize.rows) return;
 		yield* set$4(sizeRef, nextSize);
 		yield* withPermit(screenLock, sync(() => {
 			screen.resize(nextSize.cols, nextSize.rows);
 		}));
-		const process = yield* get$2(processRef);
+		const process = yield* get$3(processRef);
 		if (!process) return;
 		yield* try_({
 			catch: (cause) => new TerminalError({
@@ -52960,7 +53360,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 		});
 	});
 	const write = fnUntraced(function* (data) {
-		const process = yield* get$2(processRef);
+		const process = yield* get$3(processRef);
 		if (!process) return;
 		yield* try_({
 			catch: (cause) => new TerminalError({
@@ -53058,7 +53458,7 @@ function splitParallelCommands(script) {
 			...state,
 			current: state.current + char
 		};
-		return pipe(liftPredicate(trim(state.current), isNonEmpty$1), match$4({
+		return pipe(liftPredicate(trim(state.current), isNonEmpty$1), match$5({
 			onNone: () => ({
 				...state,
 				current: ""
@@ -53070,7 +53470,7 @@ function splitParallelCommands(script) {
 			})
 		}));
 	}));
-	return pipe(liftPredicate(trim(state.current), isNonEmpty$1), match$4({
+	return pipe(liftPredicate(trim(state.current), isNonEmpty$1), match$5({
 		onNone: () => state.commands,
 		onSome: (command) => [...state.commands, command]
 	}));
@@ -53087,22 +53487,59 @@ const AgentSessionKey = Struct({
 	cwd: String$1,
 	uuid: String$1
 });
-const TerminalSessions = make$45({
+const TerminalSessions = make$46({
 	idleTimeToLive: infinity,
 	lookup: fnUntraced(function* (config) {
-		return get$8(yield* buildWithScope(Terminal.layer(config), yield* scope), Terminal);
+		return get$9(yield* buildWithScope(Terminal.layer(config), yield* scope), Terminal);
 	})
 });
-const GitWorktreeSessions = make$45({
+const GitWorktreeSessions = make$46({
 	idleTimeToLive: minutes(5),
 	lookup: fnUntraced(function* (cwd) {
-		return get$8(yield* buildWithScope(GitWorktree.layer({ cwd }), yield* scope), GitWorktree);
+		return get$9(yield* buildWithScope(GitWorktree.layer({ cwd }), yield* scope), GitWorktree);
 	})
 });
 const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 	const git = yield* GitWorkspace;
 	const terminals = yield* TerminalSessions;
 	const gitWorktrees = yield* GitWorktreeSessions;
+	const fs = yield* FileSystem;
+	const reviewStore = toSchemaStore(yield* KeyValueStore, ReviewState);
+	const reviewStateKey = fnUntraced(function* (input) {
+		const root = yield* pipe(fs.realPath(input.cwd), orElseSucceed(() => input.cwd));
+		return Buffer.from(`${root}\u0000${input.base}`, "utf8").toString("base64url");
+	});
+	const readReviewState = fnUntraced(function* (key) {
+		return yield* pipe(reviewStore.get(`review-state/${key}`), map$4(getOrElse$1(() => new ReviewState({
+			comments: empty$13(),
+			marks: empty$13()
+		}))), orElseSucceed(() => new ReviewState({
+			comments: empty$13(),
+			marks: empty$13()
+		})));
+	});
+	const reviewStates = yield* make$46({
+		idleTimeToLive: minutes(5),
+		lookup: fnUntraced(function* (key) {
+			return yield* make$3(yield* readReviewState(key));
+		})
+	});
+	const updateReviewState = fnUntraced(function* (input, f) {
+		return yield* pipe(scoped$3(gen(function* () {
+			const key = yield* reviewStateKey(input);
+			const state = yield* modify(yield* get$6(reviewStates, key), (current) => {
+				const next = f(current);
+				return [next, next];
+			});
+			yield* reviewStore.set(`review-state/${key}`, state);
+		})), mapError$2((cause) => new GitError({ cause })));
+	});
+	function commentKey(input) {
+		return `${input.filePath}:${input.side ?? "additions"}:${input.lineNumber}`;
+	}
+	function markKey(input) {
+		return `${input.filePath}:${input.segmentId}:${input.fingerprint}`;
+	}
 	const agents = yield* make$3(empty$6());
 	return RpcContracts.of({
 		"agents.create": (payload) => gen(function* () {
@@ -53119,7 +53556,7 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 				cwd: session.cwd,
 				uuid: session.uuid
 			}), session));
-			const terminal = yield* get$5(terminals, TerminalSessionKey.make({
+			const terminal = yield* get$6(terminals, TerminalSessionKey.make({
 				args: session.args,
 				command: session.command,
 				cwd: session.cwd,
@@ -53136,22 +53573,51 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 			cwd: payload.cwd,
 			uuid: payload.uuid
 		}))),
-		"agents.watch": (payload) => unwrap$1(pipe(get(agents), map$4((current) => pipe(make$42(current), concat(drop(1)(changes(agents))), map$2((sessions) => pipe(fromIterable$2(values(sessions)), filter$2((session) => session.cwd === payload.cwd))))))),
+		"agents.watch": (payload) => unwrap$1(pipe(get(agents), map$4((current) => pipe(make$43(current), concat(drop(1)(changes(agents))), map$2((sessions) => pipe(fromIterable$2(values(sessions)), filter$2((session) => session.cwd === payload.cwd))))))),
 		"projects.branches": (payload) => git.branches(payload.cwd),
 		"projects.createWorktree": (payload) => git.createWorktree(payload),
 		"projects.deleteWorktree": (payload) => git.deleteWorktree(payload),
-		"projects.watch": () => unwrap$1(pipe(get(git.projects), map$4((projects) => pipe(make$42(projects), concat(drop(1)(changes(git.projects))))))),
-		"review.commitAndPush": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.commitAndPush({
+		"projects.watch": () => unwrap$1(pipe(get(git.projects), map$4((projects) => pipe(make$43(projects), concat(drop(1)(changes(git.projects))))))),
+		"review.comments.delete": (payload) => updateReviewState(payload, (state) => {
+			const key = commentKey(payload);
+			return new ReviewState({
+				comments: filter$2(state.comments, (comment) => commentKey(comment) !== key),
+				marks: state.marks
+			});
+		}),
+		"review.comments.save": (payload) => updateReviewState(payload, (state) => {
+			const key = commentKey(payload.comment);
+			return new ReviewState({
+				comments: append$1(filter$2(state.comments, (comment) => commentKey(comment) !== key), payload.comment),
+				marks: state.marks
+			});
+		}),
+		"review.commitAndPush": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.commitAndPush({
 			base: payload.base,
 			message: payload.message
 		}))),
-		"review.createWipCommit": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.createWipCommit(payload.message))),
-		"review.discardFile": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.discardFile(payload.filePath))),
-		"review.metadata": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.metadata({ base: payload.base }))),
-		"review.stageFile": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.stageFile(payload.filePath))),
-		"review.unstageFile": (payload) => pipe(get$5(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.unstageFile(payload.filePath))),
-		"review.watch": (payload) => unwrap$1(pipe(get$5(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewDiffs(payload.scope)))),
-		"review.watchRange": (payload) => unwrap$1(pipe(get$5(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewRangeDiffs({
+		"review.createWipCommit": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.createWipCommit(payload.message))),
+		"review.discardFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.discardFile(payload.filePath))),
+		"review.metadata": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.metadata({ base: payload.base }))),
+		"review.stageFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.stageFile(payload.filePath))),
+		"review.state.mark": (payload) => updateReviewState(payload, (state) => {
+			const keys = new Set(map$7(payload.marks, markKey));
+			return new ReviewState({
+				comments: state.comments,
+				marks: appendAll(filter$2(state.marks, (mark) => !keys.has(markKey(mark))), payload.marks)
+			});
+		}),
+		"review.state.unmark": (payload) => updateReviewState(payload, (state) => {
+			const keys = new Set(map$7(payload.marks, markKey));
+			return new ReviewState({
+				comments: state.comments,
+				marks: filter$2(state.marks, (mark) => !keys.has(markKey(mark)))
+			});
+		}),
+		"review.state.watch": (payload) => unwrap$1(pipe(reviewStateKey(payload), flatMap$2((key) => get$6(reviewStates, key)), flatMap$2((ref) => pipe(get(ref), map$4((state) => concat(drop(1)(changes(ref)))(make$43(state))))))),
+		"review.unstageFile": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.unstageFile(payload.filePath))),
+		"review.watch": (payload) => unwrap$1(pipe(get$6(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewDiffs(payload.scope)))),
+		"review.watchRange": (payload) => unwrap$1(pipe(get$6(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewRangeDiffs({
 			from: payload.from,
 			to: payload.to
 		})))),
@@ -53166,15 +53632,15 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 			name,
 			tasks: splitParallelCommands(command)
 		}))))),
-		"terminal.ports": (payload) => unwrap$1(pipe(get$5(terminals, TerminalSessionKey.make(payload)), map$4((terminal) => terminal.ports))),
-		"terminal.resize": (payload) => pipe(get$5(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.resize({
+		"terminal.ports": (payload) => unwrap$1(pipe(get$6(terminals, TerminalSessionKey.make(payload)), map$4((terminal) => terminal.ports))),
+		"terminal.resize": (payload) => pipe(get$6(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.resize({
 			cols: payload.cols,
 			rows: payload.rows
 		}))),
-		"terminal.restart": (payload) => pipe(get$5(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.restart())),
-		"terminal.stop": (payload) => pipe(get$5(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.stop())),
-		"terminal.watch": (payload) => unwrap$1(pipe(get$5(terminals, TerminalSessionKey.make(payload)), map$4((terminal) => terminal.updates))),
-		"terminal.write": (payload) => pipe(get$5(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.write(payload.data)))
+		"terminal.restart": (payload) => pipe(get$6(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.restart())),
+		"terminal.stop": (payload) => pipe(get$6(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.stop())),
+		"terminal.watch": (payload) => unwrap$1(pipe(get$6(terminals, TerminalSessionKey.make(payload)), map$4((terminal) => terminal.updates))),
+		"terminal.write": (payload) => pipe(get$6(terminals, TerminalSessionKey.make(payload)), flatMap$2((terminal) => terminal.write(payload.data)))
 	});
 }));
 //#endregion
@@ -62591,7 +63057,7 @@ const make$1 = /*#__PURE__*/ gen(function* () {
 	const loggerProvider = yield* OtelLoggerProvider;
 	const clock = yield* Clock;
 	const otelLogger = loggerProvider.getLogger("@effect/opentelemetry");
-	return make$4((options) => {
+	return make$5((options) => {
 		const attributes = { fiberId: options.fiber.id };
 		const span = getOrUndefined(options.fiber.context, ParentSpan);
 		if (isNotUndefined(span)) {
@@ -66604,7 +67070,7 @@ var OtelTraceState = class extends Service()("@effect/opentelemetry/Tracer/OtelT
 * @category constructors
 * @since 4.0.0
 */
-const make = /*#__PURE__*/ map$4(/*#__PURE__*/ service(OtelTracer), (tracer) => make$59({
+const make = /*#__PURE__*/ map$4(/*#__PURE__*/ service(OtelTracer), (tracer) => make$60({
 	span(options) {
 		return new OtelSpan(context, trace, tracer, options);
 	},
@@ -69785,7 +70251,7 @@ function readFileFromEnv(signalSpecificEnvVar, nonSignalSpecificEnvVar, warningM
 	const nonSignalSpecificPath = (0, import_src$1.getStringFromEnv)(nonSignalSpecificEnvVar);
 	const filePath = signalSpecificPath ?? nonSignalSpecificPath;
 	if (filePath != null) try {
-		return fs.readFileSync(path.resolve(process.cwd(), filePath));
+		return fs.readFileSync(path$1.resolve(process.cwd(), filePath));
 	} catch {
 		diag.warn(warningMessage);
 		return;
@@ -69947,7 +70413,7 @@ var import_src = (/* @__PURE__ */ __commonJSMin(((exports) => {
 	});
 })))();
 function OtelLayer(serviceName) {
-	return unwrap$4(map$4(option(string("VITE_OTEL_URL")), match$4({
+	return unwrap$4(map$4(option(string("VITE_OTEL_URL")), match$5({
 		onNone: () => empty$11,
 		onSome: (url) => layer(() => ({
 			resource: { serviceName },
@@ -69957,7 +70423,7 @@ function OtelLayer(serviceName) {
 }
 //#endregion
 //#region src/lib/serverRuntime.ts
-const LiveLayers = pipe(empty$11, provideMerge(RpcHandlers), provideMerge(GitWorkspace.layer), provideMerge(OtelLayer("workbench-server")), provideMerge(layer$16), provideMerge(layerMsgPack));
+const LiveLayers = pipe(empty$11, provideMerge(RpcHandlers), provideMerge(GitWorkspace.layer), provideMerge(unwrap$4(pipe(string("HOME"), withDefault(process.cwd()), map$4((home) => layerFileSystem(path.join(home, ".deslop")))))), provideMerge(OtelLayer("workbench-server")), provideMerge(layer$16), provideMerge(layerMsgPack));
 //#endregion
 //#region ../../packages/browser/src/http.ts
 const INJECTED_HEAD = `<script>