@deslop/workbench 0.0.332 → 0.0.343

package/dist/server.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env -S node --max-old-space-size=8192
+#!/usr/bin/env -S node --max-old-space-size=16384 --heapsnapshot-near-heap-limit=3 --report-on-fatalerror
 import { createRequire } from "node:module";
 import * as Http from "node:http";
 import { createServer } from "node:http";
@@ -4562,7 +4562,7 @@ const isSome$1 = (fa) => fa._tag === "Some";
 /** @internal */
 const none$1 = /*#__PURE__*/ Object.create(NoneProto);
 /** @internal */
-const some$2 = (value) => {
+const some$1 = (value) => {
 	const a = Object.create(SomeProto);
 	a.value = value;
 	return a;
@@ -5061,7 +5061,7 @@ const none = () => none$1;
 * @category constructors
 * @since 2.0.0
 */
-const some$1 = some$2;
+const some = some$1;
 /**
 * Checks whether an `Option` is `None` (absent).
 *
@@ -5153,7 +5153,7 @@ const isSome = isSome$1;
 * @category pattern matching
 * @since 2.0.0
 */
-const match$5 = /*#__PURE__*/ dual(2, (self, { onNone, onSome }) => isNone(self) ? onNone() : onSome(self.value));
+const match$4 = /*#__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`.
 *
@@ -5256,7 +5256,7 @@ const orElse$3 = /*#__PURE__*/ dual(2, (self, that) => isNone(self) ? that() : s
 * @category converting
 * @since 4.0.0
 */
-const fromNullishOr = (a) => a == null ? none() : some$1(a);
+const fromNullishOr = (a) => a == null ? none() : some(a);
 /**
 * Converts a possibly `undefined` value into an `Option`, leaving `null`
 * as a valid `Some`.
@@ -5291,7 +5291,7 @@ const fromNullishOr = (a) => a == null ? none() : some$1(a);
 * @category converting
 * @since 4.0.0
 */
-const fromUndefinedOr = (a) => a === void 0 ? none() : some$1(a);
+const fromUndefinedOr = (a) => a === void 0 ? none() : some(a);
 /**
 * Extracts the value from a `Some`, or returns `undefined` for `None`.
 *
@@ -5355,7 +5355,7 @@ const getOrUndefined$1 = /*#__PURE__*/ getOrElse$1(constUndefined);
 * @category mapping
 * @since 2.0.0
 */
-const map$9 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : some$1(f(self.value)));
+const map$9 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : some(f(self.value)));
 /**
 * Applies a function that returns an `Option` to the value of a `Some`,
 * flattening the result. Returns `None` if the input is `None`.
@@ -5442,7 +5442,7 @@ const flatMap$6 = /*#__PURE__*/ dual(2, (self, f) => isNone(self) ? none() : f(s
 * @category filtering
 * @since 2.0.0
 */
-const filter$2 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some$1(self.value) : none());
+const filter$2 = /*#__PURE__*/ dual(2, (self, predicate) => isNone(self) ? none() : predicate(self.value) ? some(self.value) : none());
 //#endregion
 //#region ../../node_modules/.pnpm/effect@4.0.0-beta.74/node_modules/effect/dist/Result.js
 /**
@@ -5501,37 +5501,6 @@ const succeed$7 = succeed$8;
 */
 const fail$7 = fail$8;
 /**
-* Provides a pre-built failed `Result` whose failure value is `undefined`.
-*
-* **When to use**
-*
-* Use when a failure should act only as a control signal and no failure value
-* is needed.
-*
-* **Details**
-*
-* This is equivalent to `Result.fail(undefined)` with type
-* `Result<never, void>`, but reuses a shared `Failure` wrapper instead of
-* allocating one each time.
-*
-* **Example** (Using a failure without a payload)
-*
-* ```ts
-* import { Result } from "effect"
-*
-* const result = Result.failVoid
-*
-* console.log(Result.isFailure(result))
-* // Output: true
-* ```
-*
-* @see {@link fail} to create a Failure with a specific value
-*
-* @category constructors
-* @since 4.0.0
-*/
-const failVoid = /*#__PURE__*/ fail$7(void 0);
-/**
 * Checks whether a value is a `Result` (either `Success` or `Failure`).
 *
 * **When to use**
@@ -5658,7 +5627,7 @@ const isSuccess$1 = isSuccess$2;
 * @category pattern matching
 * @since 2.0.0
 */
-const match$4 = /*#__PURE__*/ dual(2, (self, { onFailure, onSuccess }) => isFailure$1(self) ? onFailure(self.failure) : onSuccess(self.success));
+const match$3 = /*#__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
 /**
@@ -5725,6 +5694,57 @@ const headUnsafe = (self) => {
 	if (result.done) throw new Error("headUnsafe: empty iterable");
 	return result.value;
 };
+/**
+* Returns the first element that satisfies the specified
+* predicate, or `None` if no such element exists.
+*
+* **Example** (Finding the first match)
+*
+* ```ts
+* import { Iterable, Option } from "effect"
+*
+* const numbers = [1, 3, 4, 6, 8]
+* const firstEven = Iterable.findFirst(numbers, (x) => x % 2 === 0)
+* console.log(firstEven) // Option.some(4)
+*
+* const firstGreaterThan10 = Iterable.findFirst(numbers, (x) => x > 10)
+* console.log(firstGreaterThan10) // Option.none()
+*
+* // With index
+* const letters = ["a", "b", "c", "d"]
+* const atEvenIndex = Iterable.findFirst(letters, (_, i) => i % 2 === 0)
+* console.log(atEvenIndex) // Option.some("a")
+*
+* // Type refinement
+* const mixed: Array<string | number> = [1, "hello", 2, "world"]
+* const firstString = Iterable.findFirst(
+*   mixed,
+*   (x): x is string => typeof x === "string"
+* )
+* console.log(firstString) // Option.some("hello")
+*
+* // Transform during search
+* const findSquareRoot = Iterable.findFirst([1, 4, 9, 16], (x) => {
+*   const sqrt = Math.sqrt(x)
+*   return Number.isInteger(sqrt) ? Option.some(sqrt) : Option.none()
+* })
+* console.log(findSquareRoot) // Option.some(1)
+* ```
+*
+* @category elements
+* @since 2.0.0
+*/
+const findFirst$3 = /*#__PURE__*/ dual(2, (self, f) => {
+	let i = 0;
+	for (const a of self) {
+		const o = f(a, i);
+		if (isBoolean(o)) {
+			if (o) return some(a);
+		} else if (isSome(o)) return o;
+		i++;
+	}
+	return none();
+});
 const constEmpty = { [Symbol.iterator]() {
 	return constEmptyIterator;
 } };
@@ -6176,7 +6196,7 @@ const ensure = (self) => Array$1.isArray(self) ? self : [self];
 * @category pattern matching
 * @since 2.0.0
 */
-const match$3 = /*#__PURE__*/ dual(2, (self, { onEmpty, onNonEmpty }) => isReadonlyArrayNonEmpty(self) ? onNonEmpty(self) : onEmpty());
+const match$2 = /*#__PURE__*/ dual(2, (self, { onEmpty, onNonEmpty }) => isReadonlyArrayNonEmpty(self) ? onNonEmpty(self) : onEmpty());
 /**
 * Adds a single element to the end of an iterable, returning a `NonEmptyArray`.
 *
@@ -6368,7 +6388,7 @@ const clamp = (i, as) => Math.floor(Math.min(Math.max(0, i), as.length));
 */
 const get$10 = /*#__PURE__*/ dual(2, (self, index) => {
 	const i = Math.floor(index);
-	return isOutOfBounds(i, self) ? none() : some$1(self[i]);
+	return isOutOfBounds(i, self) ? none() : some(self[i]);
 });
 /**
 * Reads an element at the given index, throwing if the index is out of bounds.
@@ -6472,7 +6492,7 @@ const headNonEmpty = /*#__PURE__*/ getUnsafe$1(0);
 * @category getters
 * @since 2.0.0
 */
-const last = (self) => isReadonlyArrayNonEmpty(self) ? some$1(lastNonEmpty(self)) : none();
+const last = (self) => isReadonlyArrayNonEmpty(self) ? some(lastNonEmpty(self)) : none();
 /**
 * Returns the last element of a `NonEmptyReadonlyArray` directly (no `Option`
 * wrapper).
@@ -6519,45 +6539,6 @@ const lastNonEmpty = (self) => self[self.length - 1];
 */
 const tailNonEmpty = (self) => self.slice(1);
 /**
-* Takes elements from the start while the predicate holds, stopping at the
-* first element that fails.
-*
-* **When to use**
-*
-* Use to keep the leading elements of an iterable while each element satisfies
-* a predicate, returning the retained prefix as an array.
-*
-* **Details**
-*
-* - Supports refinements for type narrowing.
-* - The predicate receives `(element, index)`.
-*
-* **Example** (Taking while condition holds)
-*
-* ```ts
-* import { Array } from "effect"
-*
-* console.log(Array.takeWhile([1, 3, 2, 4, 1, 2], (x) => x < 4)) // [1, 3, 2]
-* ```
-*
-* @see {@link take} for keeping a fixed number of leading elements
-* @see {@link dropWhile} for removing the matching prefix and keeping the rest
-* @see {@link span} for splitting the matching prefix from the remaining elements
-*
-* @category getters
-* @since 2.0.0
-*/
-const takeWhile = /*#__PURE__*/ dual(2, (self, predicate) => {
-	let i = 0;
-	const out = [];
-	for (const a of self) {
-		if (!predicate(a, i)) break;
-		out.push(a);
-		i++;
-	}
-	return out;
-});
-/**
 * Removes the first `n` elements, creating a new array.
 *
 * **When to use**
@@ -6619,6 +6600,37 @@ const dropRight = /*#__PURE__*/ dual(2, (self, n) => {
 	return input.slice(0, input.length - clamp(n, input));
 });
 /**
+* Returns the first element matching a predicate, refinement, or mapping
+* function, wrapped in `Option`.
+*
+* **When to use**
+*
+* Use to scan an iterable in iteration order and return the first selected
+* element or mapped value as an `Option`.
+*
+* **Details**
+*
+* - Accepts a predicate `(a, i) => boolean`, a refinement, or a function
+*   `(a, i) => Option<B>` for simultaneous find-and-transform.
+* - Returns `Option.none()` if no element matches.
+*
+* **Example** (Finding the first match)
+*
+* ```ts
+* import { Array } from "effect"
+*
+* console.log(Array.findFirst([1, 2, 3, 4, 5], (x) => x > 3)) // Option.some(4)
+* ```
+*
+* @see {@link findLast} — search from the end
+* @see {@link findFirstIndex} — get the index instead
+* @see {@link findFirstWithIndex} — get both element and index
+*
+* @category elements
+* @since 2.0.0
+*/
+const findFirst$2 = findFirst$3;
+/**
 * Reverses an iterable into a new array.
 *
 * **When to use**
@@ -6925,35 +6937,6 @@ const getSomes = (self) => {
 	return out;
 };
 /**
-* Extracts all success values from an iterable of `Result`s, discarding
-* failures.
-*
-* **When to use**
-*
-* Use to collect only success values from `Result` values while discarding
-* failures.
-*
-* **Example** (Extracting successes)
-*
-* ```ts
-* import { Array, Result } from "effect"
-*
-* console.log(Array.getSuccesses([Result.succeed(1), Result.fail("err"), Result.succeed(2)]))
-* // [1, 2]
-* ```
-*
-* @see {@link getFailures} — extract failure values
-* @see {@link separate} — split into failures and successes
-*
-* @category filtering
-* @since 4.0.0
-*/
-const getSuccesses = (self) => {
-	const out = [];
-	for (const a of self) if (isSuccess$1(a)) out.push(a.success);
-	return out;
-};
-/**
 * Keeps only elements satisfying a predicate (or refinement).
 *
 * **When to use**
@@ -7036,26 +7019,6 @@ const reduce = /*#__PURE__*/ dual(3, (self, b, f) => fromIterable$2(self).reduce
 */
 const every = /*#__PURE__*/ dual(2, (self, refinement) => self.every(refinement));
 /**
-* Checks whether at least one element satisfies the predicate. Narrows the type
-* to `NonEmptyReadonlyArray` on success.
-*
-* **Example** (Testing for any match)
-*
-* ```ts
-* import { Array } from "effect"
-*
-* console.log(Array.some([1, 3, 4], (x) => x % 2 === 0)) // true
-* console.log(Array.some([1, 3, 5], (x) => x % 2 === 0)) // false
-* ```
-*
-* @see {@link every} — test if all elements match
-* @see {@link contains} — test for a specific value
-*
-* @category elements
-* @since 2.0.0
-*/
-const some = /*#__PURE__*/ dual(2, (self, predicate) => self.some(predicate));
-/**
 * Creates an `Equivalence` for arrays based on an element `Equivalence`. Two
 * arrays are equivalent when they have the same length and all elements are
 * pairwise equivalent.
@@ -7701,8 +7664,8 @@ const serviceNotFoundError = (service) => {
 * @since 2.0.0
 */
 const getOption = /*#__PURE__*/ dual(2, (self, service) => {
-	if (self.mapUnsafe.has(service.key)) return some$1(self.mapUnsafe.get(service.key));
-	return isReference(service) ? some$1(getDefaultValue(service)) : none();
+	if (self.mapUnsafe.has(service.key)) return some(self.mapUnsafe.get(service.key));
+	return isReference(service) ? some(getDefaultValue(service)) : none();
 });
 /**
 * Merges two `Context`s into one.
@@ -8252,7 +8215,7 @@ const weeks = (weeks) => make$61(weeks * 6048e5);
 * @category getters
 * @since 2.0.0
 */
-const toMillis = (self) => match$2(fromInputUnsafe(self), {
+const toMillis = (self) => match$1(fromInputUnsafe(self), {
 	onMillis: identity,
 	onNanos: (nanos) => Number(nanos) / 1e6,
 	onInfinity: () => Infinity,
@@ -8273,7 +8236,7 @@ const toMillis = (self) => match$2(fromInputUnsafe(self), {
 * @category getters
 * @since 2.0.0
 */
-const toSeconds = (self) => match$2(fromInputUnsafe(self), {
+const toSeconds = (self) => match$1(fromInputUnsafe(self), {
 	onMillis: (millis) => millis / 1e3,
 	onNanos: (nanos) => Number(nanos) / 1e9,
 	onInfinity: () => Infinity,
@@ -8336,7 +8299,7 @@ const toNanosUnsafe = (input) => {
 * @category pattern matching
 * @since 2.0.0
 */
-const match$2 = /*#__PURE__*/ dual(2, (self, options) => {
+const match$1 = /*#__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);
@@ -9538,7 +9501,7 @@ const suspend$3 = /*#__PURE__*/ makePrimitive({
 	}
 });
 /** @internal */
-const fromResult$1 = /*#__PURE__*/ match$4({
+const fromResult$1 = /*#__PURE__*/ match$3({
 	onFailure: fail$6,
 	onSuccess: succeed$6
 });
@@ -9557,7 +9520,7 @@ const yieldNow$1 = /*#__PURE__*/ (/* @__PURE__ */ makePrimitive({
 	}
 }))(0);
 /** @internal */
-const succeedSome$1 = (a) => succeed$6(some$1(a));
+const succeedSome$1 = (a) => succeed$6(some(a));
 /** @internal */
 const succeedNone$1 = /*#__PURE__*/ succeed$6(/*#__PURE__*/ none());
 /** @internal */
@@ -9653,6 +9616,43 @@ const defineFunctionLength = (length, fn) => Object.defineProperty(fn, "length",
 	value: length,
 	configurable: true
 });
+const fnStackCleaner = /*#__PURE__*/ makeStackCleaner(2);
+/** @internal */
+const fn$1 = function() {
+	const nameFirst = typeof arguments[0] === "string";
+	const name = nameFirst ? arguments[0] : "Effect.fn";
+	const spanOptions = nameFirst ? arguments[1] : void 0;
+	const prevLimit = globalThis.Error.stackTraceLimit;
+	globalThis.Error.stackTraceLimit = 2;
+	const defError = new globalThis.Error();
+	globalThis.Error.stackTraceLimit = prevLimit;
+	if (nameFirst) return (body, ...pipeables) => makeFn(name, body, defError, pipeables, nameFirst, spanOptions);
+	return makeFn(name, arguments[0], defError, Array.prototype.slice.call(arguments, 1), nameFirst, spanOptions);
+};
+const makeFn = (name, bodyOrOptions, defError, pipeables, addSpan, spanOptions) => {
+	const body = typeof bodyOrOptions === "function" ? bodyOrOptions : pipeables.pop().bind(bodyOrOptions.self);
+	return defineFunctionLength(body.length, function(...args) {
+		let result = suspend$3(() => {
+			const iter = body.apply(this, arguments);
+			return isEffect$1(iter) ? iter : fromIteratorUnsafe(iter);
+		});
+		for (let i = 0; i < pipeables.length; i++) result = pipeables[i](result, ...args);
+		if (!isEffect$1(result)) return result;
+		const prevLimit = globalThis.Error.stackTraceLimit;
+		globalThis.Error.stackTraceLimit = 2;
+		const callError = new globalThis.Error();
+		globalThis.Error.stackTraceLimit = prevLimit;
+		return updateService$1(addSpan ? useSpan$1(name, spanOptions, (span) => provideParentSpan(result, span)) : result, CurrentStackFrame, (prev) => ({
+			name,
+			stack: fnStackCleaner(() => callError.stack),
+			parent: {
+				name: `${name} (definition)`,
+				stack: fnStackCleaner(() => defError.stack),
+				parent: prev
+			}
+		}));
+	});
+};
 /** @internal */
 const fnUntracedEager$1 = (body, ...pipeables) => defineFunctionLength(body.length, pipeables.length === 0 ? function() {
 	return fromIteratorEagerUnsafe(() => body.apply(this, arguments));
@@ -9712,7 +9712,7 @@ const as$1 = /*#__PURE__*/ dual(2, (self, value) => {
 	return flatMap$4(self, (_) => b);
 });
 /** @internal */
-const asSome$1 = (self) => map$6(self, some$1);
+const asSome = (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 */
@@ -9829,7 +9829,7 @@ const exitAsVoidAll = (exits) => {
 	return failures.length === 0 ? exitVoid : exitFailCause(causeFromReasons(failures));
 };
 /** @internal */
-const exitGetSuccess = (self) => exitIsSuccess(self) ? some$1(self.value) : none();
+const exitGetSuccess = (self) => exitIsSuccess(self) ? some(self.value) : none();
 /** @internal */
 const service$1 = (service) => service;
 /** @internal */
@@ -9871,7 +9871,7 @@ const provideServiceImpl = (self, service, implementation) => updateContext$1(se
 	return add(s, service, implementation);
 });
 /** @internal */
-const when$3 = /*#__PURE__*/ dual(2, (self, condition) => flatMap$4(condition, (pass) => pass ? asSome$1(self) : succeedNone$1));
+const when$3 = /*#__PURE__*/ dual(2, (self, condition) => flatMap$4(condition, (pass) => pass ? asSome(self) : succeedNone$1));
 /** @internal */
 const forever$1 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, options) => whileLoop$1({
 	while: constTrue,
@@ -9954,9 +9954,9 @@ const ignore$2 = /*#__PURE__*/ dual((args) => isEffect$1(args[0]), (self, option
 	});
 });
 /** @internal */
-const option$2 = (self) => match$1(self, {
+const option$2 = (self) => match(self, {
 	onFailure: none,
-	onSuccess: some$1
+	onSuccess: some
 });
 /** @internal */
 const result$1 = (self) => matchEager(self, {
@@ -9987,7 +9987,7 @@ const matchEffect$2 = /*#__PURE__*/ dual(2, (self, options) => matchCauseEffect$
 	onSuccess: options.onSuccess
 }));
 /** @internal */
-const match$1 = /*#__PURE__*/ dual(2, (self, options) => matchEffect$2(self, {
+const match = /*#__PURE__*/ dual(2, (self, options) => matchEffect$2(self, {
 	onFailure: (error) => sync$1(() => options.onFailure(error)),
 	onSuccess: (value) => sync$1(() => options.onSuccess(value))
 }));
@@ -9999,7 +9999,7 @@ const matchEager = /*#__PURE__*/ dual(2, (self, options) => {
 		if (isFailure$1(error)) return self;
 		return exitSucceed(options.onFailure(error.success));
 	}
-	return match$1(self, options);
+	return match(self, options);
 });
 /** @internal */
 const exit$1 = (self) => effectIsExit(self) ? exitSucceed(self) : exitPrimitive(self);
@@ -10019,7 +10019,7 @@ const exitPrimitive = /*#__PURE__*/ makePrimitive({
 /** @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$1(self), as$1(sleep$1(duration), none())));
+const timeoutOption$1 = /*#__PURE__*/ dual(2, (self, duration) => raceFirst$1(asSome(self), as$1(sleep$1(duration), none())));
 /** @internal */
 const ScopeTypeId = "~effect/Scope";
 /** @internal */
@@ -10263,7 +10263,7 @@ const findFirst$1 = /*#__PURE__*/ dual((args) => isIterable(args[0]) && !isEffec
 	return succeed$6(none());
 }));
 const findFirstLoop = (iterator, index, predicate, value) => flatMap$4(predicate(value, index), (keep) => {
-	if (keep) return succeed$6(some$1(value));
+	if (keep) return succeed$6(some(value));
 	const next = iterator.next();
 	if (!next.done) return findFirstLoop(iterator, index + 1, predicate, next.value);
 	return succeed$6(none());
@@ -10597,12 +10597,12 @@ const NoopSpanProto = {
 const noopSpan = (options) => Object.assign(Object.create(NoopSpanProto), options);
 const filterDisablePropagation = (span) => {
 	if (!span) return none();
-	return get$9(span.annotations, DisablePropagation) ? span._tag === "Span" ? filterDisablePropagation(getOrUndefined$1(span.parent)) : none() : some$1(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$9(options.annotations, DisablePropagation);
-	const parent = options?.parent !== void 0 ? some$1(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.currentSpan);
+	const parent = options?.parent !== void 0 ? some(options.parent) : options?.root ? none() : filterDisablePropagation(fiber.currentSpan);
 	let span;
 	if (disablePropagation) span = noopSpan({
 		name,
@@ -10681,6 +10681,13 @@ const withSpan$1 = function() {
 	return (self, ...args) => useSpan$1(name, fnArg ? fnArg(...args) : options, (span) => withParentSpan$1(self, span, traceOptions));
 };
 /** @internal */
+const annotateCurrentSpan$1 = (...args) => withFiber$1((fiber) => {
+	const span = fiber.currentSpanLocal;
+	if (span) if (args.length === 1) for (const [key, value] of Object.entries(args[0])) span.attribute(key, value);
+	else span.attribute(args[0], args[1]);
+	return void_$3;
+});
+/** @internal */
 const ClockRef = /*#__PURE__*/ Reference("effect/Clock", { defaultValue: () => new ClockImpl() });
 const MAX_TIMER_MILLIS = 2 ** 31 - 1;
 var ClockImpl = class {
@@ -13870,12 +13877,12 @@ const nextPow2 = (n) => {
 * @since 2.0.0
 */
 const parse$2 = (s) => {
-	if (s === "NaN") return some$1(NaN);
-	if (s === "Infinity") return some$1(Infinity);
-	if (s === "-Infinity") return some$1(-Infinity);
+	if (s === "NaN") return some(NaN);
+	if (s === "Infinity") return some(Infinity);
+	if (s === "-Infinity") return some(-Infinity);
 	if (s.trim() === "") return none();
 	const n = Number$4(s);
-	return Number$4.isNaN(n) ? none() : some$1(n);
+	return Number$4.isNaN(n) ? none() : some(n);
 };
 globalThis.String;
 /**
@@ -13976,6 +13983,24 @@ const split$1 = /*#__PURE__*/ dual(2, (self, separator) => {
 	return isArrayNonEmpty$1(out) ? out : [self];
 });
 /**
+* Returns `true` if `searchString` appears as a substring of `self`, at one or more positions that are
+* greater than or equal to `position`; otherwise, returns `false`.
+*
+* **Example** (Checking for substrings)
+*
+* ```ts
+* import { pipe, String } from "effect"
+* import * as assert from "node:assert"
+*
+* assert.deepStrictEqual(pipe("hello world", String.includes("world")), true)
+* assert.deepStrictEqual(pipe("hello world", String.includes("foo")), false)
+* ```
+*
+* @category predicates
+* @since 2.0.0
+*/
+const includes = (searchString, position) => (self) => self.includes(searchString, position);
+/**
 * Returns `true` if the string starts with the specified search string.
 *
 * **Example** (Checking string prefixes)
@@ -15799,24 +15824,6 @@ 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)
@@ -17561,6 +17568,31 @@ const interruptibleMask = interruptibleMask$1;
 */
 const forever = forever$1;
 /**
+* Adds an annotation to the current span if available.
+*
+* **Example** (Annotating the current span)
+*
+* ```ts
+* import { Effect } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   yield* Effect.annotateCurrentSpan("userId", "123")
+*   yield* Effect.annotateCurrentSpan({
+*     operation: "user-lookup",
+*     timestamp: Date.now()
+*   })
+*   yield* Effect.log("User lookup completed")
+*   return "success"
+* })
+*
+* const traced = Effect.withSpan(program, "user-operation")
+* ```
+*
+* @category tracing
+* @since 2.0.0
+*/
+const annotateCurrentSpan = annotateCurrentSpan$1;
+/**
 * Create a new span for tracing, and automatically close it when the effect
 * completes.
 *
@@ -18040,6 +18072,37 @@ const runSyncExit = runSyncExit$1;
 */
 const fnUntraced = fnUntraced$1;
 /**
+* Creates a traced function with an optional span name and `SpanOptionsNoTrace` that adds spans and stack frames, plus pipeable post-processing that receives the Effect and the original arguments.
+*
+* **Details**
+*
+* Pipeable functions run after the body and can transform the resulting Effect.
+*
+* **Example** (Defining traced effect functions)
+*
+* ```ts
+* import { Console, Effect } from "effect"
+*
+* // Create a named span and post-process the returned Effect.
+* const greet = Effect.fn("greet")(
+*   function*(name: string) {
+*     yield* Console.log(`Hello, ${name}`)
+*     return name.length
+*   },
+*   Effect.map((length) => length + 1)
+* )
+*
+* const program = Effect.gen(function*() {
+*   const result = yield* greet("Ada")
+*   yield* Console.log(`Length: ${result}`)
+* })
+* ```
+*
+* @category functions
+* @since 3.11.0
+*/
+const fn = fn$1;
+/**
 * Retrieves the `Clock` service from the context and provides it to the
 * specified effectful function.
 *
@@ -19192,14 +19255,14 @@ var OneOf = class extends Base$1 {
 };
 function makeFilterIssue(input, entry) {
 	if (isIssue(entry)) return entry;
-	if (typeof entry === "string") return new InvalidValue(some$1(input), { message: entry });
-	const inner = typeof entry.issue === "string" ? new InvalidValue(some$1(input), { message: entry.issue }) : entry.issue;
+	if (typeof entry === "string") return new InvalidValue(some(input), { message: entry });
+	const inner = typeof entry.issue === "string" ? new InvalidValue(some(input), { message: entry.issue }) : entry.issue;
 	return new Pointer(entry.path, inner);
 }
 /** @internal */
 function makeSingle(input, out) {
 	if (out === void 0) return;
-	if (typeof out === "boolean") return out ? void 0 : new InvalidValue(some$1(input));
+	if (typeof out === "boolean") return out ? void 0 : new InvalidValue(some(input));
 	return makeFilterIssue(input, out);
 }
 /** @internal */
@@ -19207,7 +19270,7 @@ function make$55(input, ast, out) {
 	if (Array.isArray(out)) {
 		if (isReadonlyArrayNonEmpty(out)) {
 			if (out.length === 1) return makeFilterIssue(input, out[0]);
-			return new Composite(ast, some$1(input), map$7(out, (entry) => makeFilterIssue(input, entry)));
+			return new Composite(ast, some(input), map$7(out, (entry) => makeFilterIssue(input, entry)));
 		}
 		return;
 	}
@@ -19684,7 +19747,7 @@ function transformOptional(f) {
 function withDefault$1(defaultValue) {
 	return new Getter((o) => {
 		const filtered = filter$2(o, isNotUndefined);
-		return isSome(filtered) ? succeed$3(filtered) : mapEager(defaultValue, some$1);
+		return isSome(filtered) ? succeed$3(filtered) : mapEager(defaultValue, some);
 	});
 }
 /**
@@ -19747,8 +19810,8 @@ function Number$3() {
 }
 function parseJson(options) {
 	return onSome((input) => try_({
-		try: () => some$1(JSON.parse(input, options?.reviver)),
-		catch: (e) => new InvalidValue(some$1(input), { message: globalThis.String(e) })
+		try: () => some(JSON.parse(input, options?.reviver)),
+		catch: (e) => new InvalidValue(some(input), { message: globalThis.String(e) })
 	}));
 }
 /**
@@ -19785,8 +19848,8 @@ function parseJson(options) {
 */
 function stringifyJson(options) {
 	return onSome((input) => try_({
-		try: () => some$1(JSON.stringify(input, options?.replacer, options?.space)),
-		catch: (e) => new InvalidValue(some$1(input), { message: globalThis.String(e) })
+		try: () => some(JSON.stringify(input, options?.replacer, options?.space)),
+		catch: (e) => new InvalidValue(some(input), { message: globalThis.String(e) })
 	}));
 }
 /**
@@ -20805,7 +20868,7 @@ var Declaration = class Declaration extends Base {
 		const run = this.run(this.typeParameters);
 		return (oinput, options) => {
 			if (isNone(oinput)) return succeedNone;
-			return mapEager(run(oinput.value, this, options), some$1);
+			return mapEager(run(oinput.value, this, options), some);
 		};
 	}
 	/** @internal */
@@ -21296,7 +21359,7 @@ var Arrays = class Arrays extends Base {
 				else return yield* fail$3(new Composite(ast, oinput, [issue]));
 			}
 			if (state.issues) return yield* fail$3(new Composite(ast, oinput, state.issues));
-			return some$1(state.output);
+			return some(state.output);
 		});
 	}
 	/** @internal */
@@ -21312,7 +21375,7 @@ var Arrays = class Arrays extends Base {
 };
 const parseArray = /*#__PURE__*/ iterateEager()({
 	onItem(s, item, i) {
-		const value = i < s.len ? some$1(item) : none();
+		const value = i < s.len ? some(item) : none();
 		return s.getParser(s.tailThreshold, i).parser(value, s.options);
 	},
 	step(s, _, exit, i) {
@@ -21516,14 +21579,14 @@ var Objects = class Objects extends Base {
 		if (ast.propertySignatures.length === 0 && ast.indexSignatures.length === 0) return fromRefinement(ast, isNotNullish);
 		const parseIndexes = indexCount > 0 ? iterateEager()({
 			onItem: fnUntracedEager(function* (s, [key, is]) {
-				const effKey = recur(indexSignatureParameterFromString(is.parameter))(some$1(key), s.options);
+				const effKey = recur(indexSignatureParameterFromString(is.parameter))(some(key), s.options);
 				const exitKey = effectIsExit(effKey) ? effKey : yield* exit(effKey);
 				if (exitKey._tag === "Failure") {
 					const eff = wrapPropertyKeyIssue(s, ast, key, exitKey);
 					if (eff) yield* eff;
 					return;
 				}
-				const value = some$1(s.input[key]);
+				const value = some(s.input[key]);
 				const effValue = recur(is.type)(value, s.options);
 				const exitValue = effectIsExit(effValue) ? effValue : yield* exit(effValue);
 				if (exitValue._tag === "Failure") {
@@ -21593,9 +21656,9 @@ var Objects = class Objects extends Base {
 				const keys = (inputKeys ?? Reflect.ownKeys(input)).concat(expectedKeys);
 				const preserved = {};
 				for (const key of keys) if (Object.hasOwn(out, key)) set$7(preserved, key, out[key]);
-				return some$1(preserved);
+				return some(preserved);
 			}
-			return some$1(out);
+			return some(out);
 		});
 	}
 	rebuild(recur, flipMerge) {
@@ -21627,7 +21690,7 @@ var Objects = class Objects extends Base {
 };
 const parseProperties = /*#__PURE__*/ iterateEager()({
 	onItem(s, p) {
-		const value = Object.hasOwn(s.input, p.name) ? some$1(s.input[p.name]) : none();
+		const value = Object.hasOwn(s.input, p.name) ? some(s.input[p.name]) : none();
 		return p.parser(value, s.options);
 	},
 	step(s, p, exit) {
@@ -22427,7 +22490,7 @@ function isJson(u) {
 	}
 }
 /** @internal */
-const Json = /*#__PURE__*/ new Declaration([], () => (input, ast) => isJson(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), {
+const Json = /*#__PURE__*/ new Declaration([], () => (input, ast) => isJson(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), {
 	typeConstructor: { _tag: "effect/Json" },
 	generation: {
 		runtime: `Schema.Json`,
@@ -22460,7 +22523,7 @@ function isStringTree(u) {
 	}
 }
 /** @internal */
-const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declaration([], () => (input, ast) => isStringTree(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), {
+const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declaration([], () => (input, ast) => isStringTree(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), {
 	expected: "StringTree",
 	toCodecStringTree: () => new Link(unknown, passthrough())
 }), /*#__PURE__*/ passthrough());
@@ -22481,7 +22544,7 @@ const unknownToStringTree = /*#__PURE__*/ new Link(/* @__PURE__ */ new Declarati
 */
 function nominal() {
 	return Object.assign((input) => input, {
-		option: (input) => some$1(input),
+		option: (input) => some(input),
 		result: (input) => succeed$7(input),
 		is: (_) => true
 	});
@@ -25946,7 +26009,7 @@ var SemaphoreImpl = class {
 		return (self) => uninterruptibleMask$1((restore) => {
 			if (this.free < n) return succeedNone$1;
 			this.taken += n;
-			return onExitPrimitive$1(restore(asSome$1(self)), () => {
+			return onExitPrimitive$1(restore(asSome(self)), () => {
 				this.updateTakenUnsafe(getCurrentFiber(), (taken) => taken - n);
 			}, true);
 		});
@@ -26328,7 +26391,7 @@ const fromIteratorArray = (iterator, chunkSize = DefaultChunkSize) => fromPull$1
 			const state = iter.next();
 			if (state.done) {
 				if (buffer.length === 0) return done(state.value);
-				done$15 = some$1(state.value);
+				done$15 = some(state.value);
 				break;
 			}
 			buffer.push(state.value);
@@ -26368,7 +26431,7 @@ const fromIterableArray = (iterable, chunkSize = DefaultChunkSize) => fromIterat
 * @category constructors
 * @since 2.0.0
 */
-const succeed$2 = (value) => fromEffect(succeed$3(value));
+const succeed$2 = (value) => fromEffect$1(succeed$3(value));
 /**
 * Represents a `Channel` that emits no elements.
 *
@@ -26511,7 +26574,7 @@ const die = (defect) => failCause(die$2(defect));
 * @category constructors
 * @since 2.0.0
 */
-const fromEffect = (effect) => fromPull$1(sync(() => {
+const fromEffect$1 = (effect) => fromPull$1(sync(() => {
 	let done$14 = false;
 	return suspend$2(() => {
 		if (done$14) return done();
@@ -27349,7 +27412,7 @@ const splitLines$1 = () => fromTransform$1((upstream, _scope) => sync(() => {
 			onSuccess: loop,
 			onFailure: failCause$2,
 			onDone: (leftover) => {
-				done$13 = some$1(leftover);
+				done$13 = some(leftover);
 				if (stringBuilder.length > 0 || midCRLF) {
 					const last = stringBuilder;
 					stringBuilder = "";
@@ -27924,10 +27987,10 @@ const empty$9 = () => {
 * @since 2.0.0
 */
 const get$7 = /*#__PURE__*/ dual(2, (self, key) => {
-	if (self.backing.has(key)) return some$1(self.backing.get(key));
+	if (self.backing.has(key)) return some(self.backing.get(key));
 	else if (isSimpleKey(key)) return none();
 	const refKey = referentialKeysCache.get(self);
-	if (refKey !== void 0) return self.backing.has(refKey) ? some$1(self.backing.get(refKey)) : none();
+	if (refKey !== void 0) return self.backing.has(refKey) ? some(self.backing.get(refKey)) : none();
 	const hash$5 = hash(key);
 	const bucket = self.buckets.get(hash$5);
 	if (bucket === void 0) return none();
@@ -27939,7 +28002,7 @@ const getFromBucket = (self, bucket, key) => {
 	for (let i = 0, len = bucket.length; i < len; i++) if (equals$2(key, bucket[i])) {
 		const refKey = bucket[i];
 		referentialKeysCache.set(key, refKey);
-		return some$1(self.backing.get(refKey));
+		return some(self.backing.get(refKey));
 	}
 	return none();
 };
@@ -28752,6 +28815,28 @@ const isStream = (u) => hasProperty(u, TypeId$29);
 */
 const fromChannel = fromChannel$2;
 /**
+* Creates a stream from an effect.
+*
+* **Example** (Creating a stream from an effect)
+*
+* ```ts
+* import { Console, Effect, Stream } from "effect"
+*
+* const program = Effect.gen(function*() {
+*   const stream = Stream.fromEffect(Effect.succeed(42))
+*   const values = yield* Stream.runCollect(stream)
+*   yield* Console.log(values)
+* })
+*
+* Effect.runPromise(program)
+* // Output: [ 42 ]
+* ```
+*
+* @category constructors
+* @since 2.0.0
+*/
+const fromEffect = (effect) => fromChannel(fromEffect$1(map$4(effect, of)));
+/**
 * Creates a stream from an effect producing a value of type `A` which repeats forever.
 *
 * **Example** (Repeating an effect forever)
@@ -29684,7 +29769,7 @@ const aggregateWithin = /*#__PURE__*/ dual(3, (self, sink, schedule) => fromChan
 	});
 	const catchSinkHalt = flatMap$2(([value, leftover_]) => {
 		if (!sinkHasInput && buffer.state._tag === "Done") return done();
-		lastOutput = some$1(value);
+		lastOutput = some(value);
 		leftover = leftover_;
 		return succeed$3(of(value));
 	});
@@ -30238,7 +30323,7 @@ const make$42 = (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$5({
+		}), match$4({
 			onNone: () => done(),
 			onSome: (buf) => {
 				totalBytesRead += BigInt(buf.length);
@@ -31788,7 +31873,7 @@ var LeafNode = class LeafNode extends Node {
 		return 1;
 	}
 	get(_shift, hash, key) {
-		if (this.hash === hash && equals$2(this.key, key)) return some$1(this.value);
+		if (this.hash === hash && equals$2(this.key, key)) return some(this.value);
 		return none();
 	}
 	has(_shift, hash, key) {
@@ -31841,7 +31926,7 @@ var CollisionNode = class CollisionNode extends Node {
 	}
 	get(_shift, hash, key) {
 		if (this.hash !== hash) return none();
-		for (const [k, v] of this.entries) if (equals$2(k, key)) return some$1(v);
+		for (const [k, v] of this.entries) if (equals$2(k, key)) return some(v);
 		return none();
 	}
 	has(_shift, hash, key) {
@@ -32512,22 +32597,6 @@ 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
 /**
@@ -32791,7 +32860,7 @@ const mergeParseOptions = (options, overrideOptions) => overrideOptions === void
 /** @internal */
 function run(ast) {
 	const parser = recur$1(ast);
-	return (input, options) => flatMapEager(parser(some$1(input), options ?? defaultParseOptions), (oa) => {
+	return (input, options) => flatMapEager(parser(some(input), options ?? defaultParseOptions), (oa) => {
 		if (oa._tag === "None") return fail$3(new InvalidValue(oa));
 		return succeed$3(oa.value);
 	});
@@ -33026,7 +33095,7 @@ function declareConstructor() {
 * @since 3.10.0
 */
 function declare(is, annotations) {
-	return declareConstructor()([], () => (input, ast) => is(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some$1(input))), annotations);
+	return declareConstructor()([], () => (input, ast) => is(input) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input))), annotations);
 }
 /**
 * Returns `true` if `u` is a {@link SchemaError}.
@@ -33076,25 +33145,6 @@ 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, returning an `Option` that is
 * `Some` with the decoded value on success or `None` on failure.
 *
@@ -33150,25 +33200,6 @@ 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.
 *
@@ -33891,15 +33922,15 @@ function isInt(annotations) {
 */
 function CauseReason(error, defect) {
 	return make$35(declareConstructor()([error, defect], ([error, defect]) => (input, ast, options) => {
-		if (!isReason(input)) return fail$3(new InvalidType(ast, some$1(input)));
+		if (!isReason(input)) return fail$3(new InvalidType(ast, some(input)));
 		switch (input._tag) {
 			case "Fail": return mapBothEager(decodeUnknownEffect$1(error)(input.error, options), {
 				onSuccess: makeFailReason,
-				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["error"], issue)])
+				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["error"], issue)])
 			});
 			case "Die": return mapBothEager(decodeUnknownEffect$1(defect)(input.defect, options), {
 				onSuccess: makeDieReason,
-				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["defect"], issue)])
+				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["defect"], issue)])
 			});
 			case "Interrupt": return succeed$3(input);
 		}
@@ -33994,10 +34025,10 @@ function Cause(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$1(input)));
+			if (!isCause(input)) return fail$3(new InvalidType(ast, some(input)));
 			return mapBothEager(decodeUnknownEffect$1(failures)(input.reasons, options), {
 				onSuccess: fromReasons,
-				onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["failures"], issue)])
+				onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["failures"], issue)])
 			});
 		};
 	}, {
@@ -34101,15 +34132,15 @@ function Exit(value, error, defect) {
 	], ([value, error, defect]) => {
 		const cause = Cause(error, defect);
 		return (input, ast, options) => {
-			if (!isExit(input)) return fail$3(new InvalidType(ast, some$1(input)));
+			if (!isExit(input)) return fail$3(new InvalidType(ast, some(input)));
 			switch (input._tag) {
 				case "Success": return mapBothEager(decodeUnknownEffect$1(value)(input.value, options), {
 					onSuccess: succeed$5,
-					onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["value"], issue)])
+					onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["value"], issue)])
 				});
 				case "Failure": return mapBothEager(decodeUnknownEffect$1(cause)(input.cause, options), {
 					onSuccess: failCause$3,
-					onFailure: (issue) => new Composite(ast, some$1(input), [new Pointer(["cause"], issue)])
+					onFailure: (issue) => new Composite(ast, some(input), [new Pointer(["cause"], issue)])
 				});
 			}
 		};
@@ -34337,7 +34368,7 @@ function getClassSchemaFactory(from, identifier, annotations) {
 		if (memo === void 0) {
 			const transformation = getClassTransformation(self);
 			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$1(input)));
+				return input instanceof self || hasProperty(input, getClassTypeId(identifier)) ? succeed$3(input) : fail$3(new InvalidType(ast, some(input)));
 			}, {
 				identifier,
 				[ClassTypeId]: ([from]) => new Link(from, transformation),
@@ -35964,7 +35995,7 @@ const setUrlParams = /*#__PURE__*/ dual(2, (self, input) => makeWith$1(self.meth
 * @category combinators
 * @since 4.0.0
 */
-const setHash = /*#__PURE__*/ dual(2, (self, hash) => makeWith$1(self.method, self.url, self.urlParams, some$1(hash), self.headers, self.body));
+const setHash = /*#__PURE__*/ dual(2, (self, hash) => makeWith$1(self.method, self.url, self.urlParams, some(hash), self.headers, self.body));
 /**
 * Sets the request body and updates `Content-Type` and `Content-Length` headers from the body metadata when available.
 *
@@ -36259,7 +36290,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$5(span.parent, {
+	b3: `${span.traceId}-${span.spanId}-${span.sampled ? "1" : "0"}${match$4(span.parent, {
 		onNone: () => "",
 		onSome: (parent) => `-${parent.spanId}`
 	})}`,
@@ -36298,7 +36329,7 @@ const b3 = (headers) => {
 	if (!("b3" in headers)) return none();
 	const parts = headers["b3"].split("-");
 	if (parts.length < 2) return none();
-	return some$1(externalSpan({
+	return some(externalSpan({
 		traceId: parts[0],
 		spanId: parts[1],
 		sampled: parts[2] ? parts[2] === "1" : true
@@ -36317,7 +36348,7 @@ const b3 = (headers) => {
 */
 const xb3 = (headers) => {
 	if (!headers["x-b3-traceid"] || !headers["x-b3-spanid"]) return none();
-	return some$1(externalSpan({
+	return some(externalSpan({
 		traceId: headers["x-b3-traceid"],
 		spanId: headers["x-b3-spanid"],
 		sampled: headers["x-b3-sampled"] ? headers["x-b3-sampled"] === "1" : true
@@ -36343,7 +36374,7 @@ const w3c = (headers) => {
 	switch (version) {
 		case "00":
 			if (w3cTraceId.test(traceId) === false || w3cSpanId.test(spanId) === false) return none();
-			return some$1(externalSpan({
+			return some(externalSpan({
 				traceId,
 				spanId,
 				sampled: (parseInt(flags, 16) & 1) === 1
@@ -37791,7 +37822,7 @@ const causeResponseStripped = (cause) => {
 		}
 		return true;
 	});
-	return [response ?? internalServerError, failures.length > 0 ? some$1(fromReasons(failures)) : none()];
+	return [response ?? internalServerError, failures.length > 0 ? some(fromReasons(failures)) : none()];
 };
 const internalServerError = /*#__PURE__*/ empty({ status: 500 });
 const succeedInternalServerError = /*#__PURE__*/ succeed$3(internalServerError);
@@ -39560,7 +39591,7 @@ const toURL = (self) => {
 	const host = self.headers.host ?? "localhost";
 	const protocol = self.headers["x-forwarded-proto"] === "https" ? "https" : "http";
 	try {
-		return some$1(new URL(self.url, `${protocol}://${host}`));
+		return some(new URL(self.url, `${protocol}://${host}`));
 	} catch {
 		return none();
 	}
@@ -39887,7 +39918,7 @@ const toString = (self) => {
 */
 var Generator = class extends Service()("effect/http/Etag/Generator") {};
 const fromFileInfo = (info) => {
-	const mtime = match$5(info.mtime, {
+	const mtime = match$4(info.mtime, {
 		onNone: () => "0",
 		onSome: (mtime) => mtime.getTime().toString(16)
 	});
@@ -40305,7 +40336,7 @@ const RouteTypeId = "~effect/http/HttpRouter/Route";
 const makeRoute = (options) => ({
 	...options,
 	uninterruptible: options.uninterruptible ?? false,
-	prefix: typeof options.prefix === "string" ? some$1(options.prefix) : options.prefix ?? none(),
+	prefix: typeof options.prefix === "string" ? some(options.prefix) : options.prefix ?? none(),
 	[RouteTypeId]: RouteTypeId
 });
 /**
@@ -40360,7 +40391,7 @@ const prefixPath = /*#__PURE__*/ dual(2, (self, prefix) => {
 const prefixRoute = /*#__PURE__*/ dual(2, (self, prefix) => makeRoute({
 	...self,
 	path: prefixPath(self.path, prefix),
-	prefix: match$5(self.prefix, {
+	prefix: match$4(self.prefix, {
 		onNone: () => prefix,
 		onSome: (existingPrefix) => prefixPath(existingPrefix, prefix)
 	})
@@ -40636,7 +40667,7 @@ function isStreamSchema(schema) {
 }
 /** @internal */
 function getStreamSchemas(schema) {
-	return isStreamSchema(schema) ? some$1({
+	return isStreamSchema(schema) ? some({
 		success: schema.success,
 		error: schema.error
 	}) : none();
@@ -44940,7 +44971,7 @@ const withDefault = /*#__PURE__*/ dual(2, (self, defaultValue) => {
 * @category combinators
 * @since 2.0.0
 */
-const option = (self) => self.pipe(map(some$1), withDefault(none()));
+const option = (self) => self.pipe(map(some), withDefault(none()));
 /**
 * Constructs a `Config<T>` from a value matching `Wrap<T>`.
 *
@@ -48966,10 +48997,10 @@ const makeFile = /*#__PURE__*/ (() => {
 				}), (bytesRead) => {
 					if (bytesRead === 0) return none();
 					this.position = position + BigInt(bytesRead);
-					if (bytesRead === sizeNumber) return some$1(buffer);
+					if (bytesRead === sizeNumber) return some(buffer);
 					const dst = Buffer.allocUnsafeSlow(bytesRead);
 					buffer.copy(dst, 0, 0, bytesRead);
-					return some$1(dst);
+					return some(dst);
 				});
 			});
 		}
@@ -49068,7 +49099,7 @@ const makeFileInfo = (stat) => ({
 	uid: fromNullishOr(stat.uid),
 	gid: fromNullishOr(stat.gid),
 	size: Size(stat.size),
-	blksize: stat.blksize !== void 0 ? some$1(Size(stat.blksize)) : none(),
+	blksize: stat.blksize !== void 0 ? some(Size(stat.blksize)) : none(),
 	blocks: fromNullishOr(stat.blocks)
 });
 const stat = /*#__PURE__*/ (() => {
@@ -51631,39 +51662,6 @@ const layerFileSystem = (directory) => effect(KeyValueStore)(gen(function* () {
 		})
 	});
 }));
-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$1(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
 /**
@@ -52221,38 +52219,49 @@ var GitDiffSegment = class extends Class("GitDiffSegment")({
 	type: Literals(["commit", "worktree"])
 }) {};
 var GitDiff = class extends Class("GitDiff")({
+	fileContent: optional(String$1),
 	filePath: String$1,
 	patch: String$1,
 	segments: ArraySchema(GitDiffSegment),
 	status: GitDiffStatus
 }) {};
-const GitReviewFrom = Union([Struct({
-	ref: String$1,
-	type: Literal("ref")
-}), Struct({
-	base: String$1,
-	type: Literal("merge-base")
-})]);
-const GitReviewTo = Union([Struct({
-	ref: String$1,
-	type: Literal("ref")
-}), Struct({ type: Literal("worktree") })]);
+const GitReviewTarget = Union([
+	Struct({ _tag: Literal("changes") }),
+	Struct({ _tag: Literal("local") }),
+	Struct({ _tag: Literal("branch") }),
+	Struct({
+		_tag: Literal("commit"),
+		hash: String$1
+	})
+]);
 var GitCommit = class extends Class("GitCommit")({
 	hash: String$1,
-	parents: ArraySchema(String$1),
 	shortHash: String$1,
-	subject: String$1,
-	wip: Boolean$1
+	subject: String$1
 }) {};
 var GitReviewMetadata = class extends Class("GitReviewMetadata")({
-	base: String$1,
-	branch: String$1,
-	commits: ArraySchema(GitCommit),
-	defaultBranch: String$1,
+	branchCommits: ArraySchema(GitCommit),
 	dirty: Boolean$1,
+	localCommits: ArraySchema(GitCommit),
 	prUrl: optional(String$1),
 	unpushedCommits: Boolean$1
 }) {};
+var GitReviewMark = class extends Class("GitReviewMark")({
+	filePath: String$1,
+	fingerprint: String$1,
+	segmentId: String$1
+}) {};
+var GitReviewComment = class extends Class("GitReviewComment")({
+	body: String$1,
+	filePath: String$1,
+	lineNumber: Number$1,
+	resolved: Boolean$1,
+	side: optional(Literals(["additions", "deletions"]))
+}) {};
+var GitReviewState = class extends Class("GitReviewState")({
+	comments: ArraySchema(GitReviewComment),
+	marks: ArraySchema(GitReviewMark)
+}) {};
 var GitHubReviewThread = class extends Class("GitHubReviewThread")({
 	body: String$1,
 	filePath: String$1,
@@ -52298,15 +52307,55 @@ var GitWorktreeStatus = class extends Class("GitWorktreeStatus")({
 	unpushedCommits: Boolean$1,
 	untracked: Boolean$1
 }) {};
-var GitWorktree$1 = class extends Class("GitWorktree")({
+var GitWorktree = class extends Class("GitWorktree")({
 	branch: optional(String$1),
 	root: String$1,
 	status: optional(GitWorktreeStatus)
 }) {};
 var GitProject = class extends Class("GitProject")({
 	repository: GitRepository,
-	worktrees: ArraySchema(GitWorktree$1)
+	worktrees: ArraySchema(GitWorktree)
 }) {};
+function gitReviewCommentKey(input) {
+	return `${input.filePath}:${input.side ?? "additions"}:${input.lineNumber}`;
+}
+function gitReviewMarkKey(input) {
+	return `${input.filePath}:${input.fingerprint}`;
+}
+function gitReviewStateSaveComment(state, comment) {
+	const key = gitReviewCommentKey(comment);
+	return new GitReviewState({
+		comments: append$1(filter$1(state.comments, (currentComment) => gitReviewCommentKey(currentComment) !== key), new GitReviewComment({
+			...comment,
+			resolved: false
+		})),
+		marks: state.marks
+	});
+}
+function gitReviewStateResolveComment(state, input) {
+	const key = gitReviewCommentKey(input);
+	return new GitReviewState({
+		comments: map$7(state.comments, (comment) => gitReviewCommentKey(comment) === key ? new GitReviewComment({
+			...comment,
+			resolved: true
+		}) : comment),
+		marks: state.marks
+	});
+}
+function gitReviewStateMark(state, marks) {
+	const keys = new Set(map$7(marks, gitReviewMarkKey));
+	return new GitReviewState({
+		comments: state.comments,
+		marks: appendAll(filter$1(state.marks, (mark) => !keys.has(gitReviewMarkKey(mark))), marks)
+	});
+}
+function gitReviewStateUnmark(state, marks) {
+	const keys = new Set(map$7(marks, gitReviewMarkKey));
+	return new GitReviewState({
+		comments: state.comments,
+		marks: filter$1(state.marks, (mark) => !keys.has(gitReviewMarkKey(mark)))
+	});
+}
 //#endregion
 //#region ../../packages/terminal/src/schema.ts
 var TerminalError = class extends TaggedErrorClass()("TerminalError", {
@@ -52340,6 +52389,14 @@ const TerminalUpdate = Union([Struct({
 }), TerminalEvent]);
 //#endregion
 //#region src/rpcs/contracts.ts
+const CreateWorktreeSource = Union([
+	Struct({ _tag: Literal("local") }),
+	Struct({
+		_tag: Literal("remote"),
+		remote: String$1
+	}),
+	Struct({ _tag: Literal("new") })
+]);
 const TerminalPayload = Struct({
 	args: optional(ArraySchema(String$1)),
 	command: optional(String$1),
@@ -52373,22 +52430,6 @@ const AgentSession = Struct({
 	state: TerminalState,
 	uuid: String$1
 });
-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,
-	resolved: optional(Boolean$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({
@@ -52423,71 +52464,56 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 	success: GitBranchesSnapshot
 }), make$18("review.metadata", {
 	error: GitError,
-	payload: Struct({
-		base: optional(String$1),
-		cwd: String$1
-	}),
+	payload: Struct({ cwd: String$1 }),
 	success: GitReviewMetadata
-}), make$18("review.watchRange", {
+}), make$18("review.diffs", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
-		from: GitReviewFrom,
-		to: GitReviewTo
+		target: GitReviewTarget
 	}),
 	stream: true,
 	success: ArraySchema(GitDiff)
 }), make$18("review.state.watch", {
 	error: GitError,
-	payload: Struct({
-		base: String$1,
-		cwd: String$1
-	}),
+	payload: Struct({ cwd: String$1 }),
 	stream: true,
-	success: ReviewState
+	success: GitReviewState
 }), make$18("review.state.mark", {
 	error: GitError,
 	payload: Struct({
-		base: String$1,
 		cwd: String$1,
-		marks: ArraySchema(ReviewMark)
+		marks: ArraySchema(GitReviewMark)
 	})
 }), make$18("review.state.unmark", {
 	error: GitError,
 	payload: Struct({
-		base: String$1,
 		cwd: String$1,
-		marks: ArraySchema(ReviewMark)
+		marks: ArraySchema(GitReviewMark)
 	})
 }), make$18("review.comments.save", {
 	error: GitError,
 	payload: Struct({
-		base: String$1,
-		comment: ReviewComment,
+		comment: GitReviewComment,
 		cwd: String$1
 	})
 }), make$18("review.comments.resolve", {
 	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", {
+}), make$18("review.commit", {
 	error: GitError,
 	payload: Struct({
 		cwd: String$1,
 		message: String$1
 	})
-}), make$18("review.commitAndPush", {
+}), make$18("review.push", {
 	error: GitError,
-	payload: Struct({
-		base: String$1,
-		cwd: String$1,
-		message: String$1
-	})
+	payload: Struct({ cwd: String$1 })
 }), make$18("review.githubThreads", {
 	error: GitError,
 	payload: Struct({ cwd: String$1 }),
@@ -52498,43 +52524,17 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 		cwd: String$1,
 		threadId: String$1
 	})
-}), make$18("review.stageFile", {
-	error: GitError,
-	payload: Struct({
-		cwd: String$1,
-		filePath: String$1
-	})
-}), make$18("review.unstageFile", {
-	error: GitError,
-	payload: Struct({
-		cwd: String$1,
-		filePath: String$1
-	})
-}), make$18("review.discardFile", {
-	error: GitError,
-	payload: Struct({
-		cwd: String$1,
-		filePath: String$1
-	})
 }), make$18("projects.createWorktree", {
 	error: GitError,
 	payload: Struct({
-		baseBranch: String$1,
 		branch: String$1,
 		cwd: String$1,
-		mode: Literals([
-			"existing-local",
-			"existing-remote",
-			"new-local"
-		])
+		source: CreateWorktreeSource
 	}),
 	success: String$1
 }), make$18("projects.deleteWorktree", {
 	error: GitError,
-	payload: Struct({
-		cwd: String$1,
-		force: Boolean$1
-	})
+	payload: Struct({ cwd: String$1 })
 }), make$18("runs.portless", {
 	error: TerminalError,
 	payload: Struct({ cwd: String$1 }),
@@ -52581,22 +52581,47 @@ var RpcContracts = class extends make$15(make$18("agents.create", {
 })) {};
 //#endregion
 //#region ../../packages/git/src/service.ts
-const makeGitExecutor = gen(function* () {
-	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
+var GitCommand = class extends Service()("@deslop/git/service/GitCommand", { make: gen(function* () {
+	const spawner = yield* ChildProcessSpawner;
+	const string = fn("GitCommand.string")(function* (cwd, args) {
+		yield* annotateCurrentSpan({
+			command: args[0] ?? "git",
+			cwd
+		});
+		return yield* scoped$3(gen(function* () {
+			const handle = yield* pipe(spawner.spawn(make$40("git", args, {
+				cwd,
+				stderr: "pipe",
+				stdout: "pipe"
+			})), mapError$2((cause) => new GitError({ cause })));
+			const output = yield* all({
+				stderr: pipe(decodeText(handle.stderr), mkString, orElseSucceed(() => "")),
+				stdout: pipe(decodeText(handle.stdout), mkString, orElseSucceed(() => ""))
+			}, { concurrency: "unbounded" });
+			const exitCode = yield* pipe(handle.exitCode, mapError$2((cause) => new GitError({ cause })));
+			if (exitCode !== ExitCode(0)) return yield* new GitError({ cause: new Error(output.stderr || output.stdout || `git ${join$2(" ")(args)} exited with ${exitCode}`) });
+			return output.stdout;
+		})).pipe(withSpan("git.command", { attributes: {
+			command: args[0] ?? "git",
+			cwd
+		} }));
+	});
 	return {
-		lines: fnUntraced(function* (cwd, args) {
-			return yield* pipe((yield* ChildProcessSpawner.useSync((spawner) => spawner.lines))(make$40("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
+		lines: fn("GitCommand.lines")(function* (cwd, args) {
+			return pipe(yield* string(cwd, args), split$1(/\r?\n/u), filter$1(isNonEmpty$1));
 		}),
-		string: fnUntraced(function* (cwd, args) {
-			return yield* pipe(execString(make$40("git", args, { cwd })), mapError$2((cause) => new GitError({ cause })));
-		})
+		string
 	};
-});
-function toArgs(to) {
-	return to.type === "ref" ? [to.ref] : empty$13();
-}
+}) }) {
+	static layer = effect(this, this.make);
+};
+const excludedDiscoveryEntries = new Set([
+	".git",
+	"dist",
+	"node_modules"
+]);
 function segmentsByFile(segments) {
-	return reduce(segments, empty$6(), (groups, segment) => modifyAt(groups, segment.filePath, (current) => some$1(append$1(getOrElse$1(current, () => empty$13()), segment))));
+	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);
@@ -52609,18 +52634,60 @@ function diffFromPatchChunk(chunk, segments) {
 		status
 	});
 }
-function isWipSubject(subject) {
-	return subject === "wip" || startsWith("wip: ")(subject);
+function withDisplayedPatchSegments(diffs, id, type) {
+	return map$7(diffs, (diff) => new GitDiff({
+		fileContent: diff.fileContent,
+		filePath: diff.filePath,
+		patch: diff.patch,
+		segments: [new GitDiffSegment({
+			filePath: diff.filePath,
+			fingerprint: diff.patch,
+			id,
+			type
+		})],
+		status: diff.status
+	}));
+}
+function commitFromLogLine(line) {
+	const parts = split$1("\0")(line);
+	return new GitCommit({
+		hash: parts[0],
+		shortHash: parts[1] ?? "",
+		subject: parts[2] ?? ""
+	});
+}
+function parseWorktreeRecords(output) {
+	const records = [];
+	let current = {
+		hasHead: false,
+		root: ""
+	};
+	for (const field of split$1("\0")(output)) if (startsWith("worktree ")(field)) {
+		if (isNonEmpty$1(current.root) && current.hasHead) records.push(current);
+		current = {
+			hasHead: false,
+			root: replace(/^worktree\s+/u, "")(field)
+		};
+	} else if (startsWith("HEAD ")(field)) current = {
+		...current,
+		hasHead: true
+	};
+	else if (startsWith("branch refs/heads/")(field)) current = {
+		...current,
+		branch: replace(/^branch\s+refs\/heads\//u, "")(field)
+	};
+	if (isNonEmpty$1(current.root) && current.hasHead) records.push(current);
+	return records;
 }
 var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", { make: gen(function* () {
-	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
-	const git = yield* makeGitExecutor;
+	const git = yield* GitCommand;
 	const fs = yield* FileSystem;
 	const path = yield* Path$1;
 	const home = yield* pipe(string("HOME"), withDefault(process.cwd()));
 	const projects = yield* make$3(empty$13());
 	const run = runForkWith(yield* context$1());
-	const getDefaultBranch = fnUntraced(function* (cwd) {
+	const getDefaultBranch = fn("GitWorkspace.getDefaultBranch")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
 		return yield* pipe(git.string(cwd, [
 			"symbolic-ref",
 			"--short",
@@ -52631,16 +52698,26 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 			"main"
 		]), as("main"), catchTag("GitError", () => succeed$3("master")))));
 	});
-	const getWorktreeStatus = fnUntraced(function* (cwd, branch) {
-		const counts = yield* pipe(git.string(cwd, [
+	const getWorktreeStatus = fn("GitWorkspace.getWorktreeStatus")(function* (cwd, branch) {
+		yield* annotateCurrentSpan({
+			branch: branch ?? "",
+			cwd
+		});
+		const upstream = branch === void 0 ? none() : yield* pipe(git.string(cwd, [
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			`${branch}@{u}`
+		]), map$4(flow(trim, some)), orElseSucceed(() => none()));
+		const counts = isNone(upstream) ? ["0", "0"] : yield* pipe(git.string(cwd, [
 			"rev-list",
 			"--left-right",
 			"--count",
-			`origin/${branch ?? ""}...HEAD`
+			`${upstream.value}...HEAD`
 		]), map$4(flow(trim, split$1(/\s+/u))), orElseSucceed(() => ["0", "0"]));
 		return new GitWorktreeStatus({
 			ahead: getOrElse$1(parse$2(counts[1] ?? "0"), () => 0),
-			behind: getOrElse$1(parse$2(counts[0]), () => 0),
+			behind: getOrElse$1(parse$2(counts[0] ?? "0"), () => 0),
 			dirtyTracked: yield* pipe(git.lines(cwd, [
 				"status",
 				"--porcelain",
@@ -52654,79 +52731,62 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 			]), map$4((lines) => !isReadonlyArrayEmpty(lines)), orElseSucceed(() => false))
 		});
 	});
-	const collectRepositoriesFromRoots = fnUntraced(function* (roots, repositories) {
-		return yield* match$3(roots, {
+	const collectRepositoriesFromRoots = fn("GitWorkspace.collectRepositoriesFromRoots")(function* (roots, repositories) {
+		yield* annotateCurrentSpan({
+			repositoryCount: length(repositories),
+			rootCount: length(roots)
+		});
+		return yield* match$2(roots, {
 			onEmpty: () => succeed$3(repositories),
 			onNonEmpty: (remainingRoots) => {
 				const root = remainingRoots[0];
 				return pipe(fs.readDirectory(root), orElseSucceed(() => empty$13()), flatMap$2((entries) => {
-					if (contains(entries, ".git")) return pipe(git.string(root, [
-						"rev-parse",
-						"--path-format=absolute",
-						"--git-common-dir"
-					]), map$4(trim), map$4((gitDirectory) => succeed$7(new GitRepository({
-						gitDirectory,
-						root
-					}))), orElseSucceed(() => failVoid), flatMap$2((repository) => collectRepositoriesFromRoots(drop$1(remainingRoots, 1), append$1(repositories, repository))));
-					return pipe(entries, filter$1((entry) => !(new Set([
-						".git",
-						".next",
-						".turbo",
-						"build",
-						"coverage",
-						"dist",
-						"node_modules"
-					]).has(entry) || startsWith(".")(entry) && entry !== ".git")), forEach$1((entry) => pipe(fs.stat(path.join(root, entry)), map$4((info) => info.type === "Directory" ? path.join(root, entry) : ""), orElseSucceed(() => ""))), flatMap$2((nextRoots) => collectRepositoriesFromRoots(pipe(nextRoots, filter$1(isNonEmpty$1), appendAll(drop$1(roots, 1))), repositories)));
+					if (contains(entries, ".git")) return pipe(all({
+						gitDirectory: pipe(git.string(root, [
+							"rev-parse",
+							"--path-format=absolute",
+							"--git-common-dir"
+						]), map$4(trim)),
+						worktrees: pipe(git.string(root, [
+							"worktree",
+							"list",
+							"--porcelain",
+							"-z"
+						]), map$4(parseWorktreeRecords))
+					}, { concurrency: "unbounded" }), map$4((repository) => new GitRepository({
+						gitDirectory: repository.gitDirectory,
+						root: repository.worktrees[0]?.root ?? root
+					})), option$1, flatMap$2((repository) => collectRepositoriesFromRoots(drop$1(remainingRoots, 1), pipe(repository, match$4({
+						onNone: () => repositories,
+						onSome: (value) => append$1(repositories, value)
+					})))));
+					return pipe(entries, filter$1((entry) => !excludedDiscoveryEntries.has(entry) && !(startsWith(".")(entry) && entry !== ".git")), forEach$1((entry) => pipe(fs.stat(path.join(root, entry)), map$4((info) => info.type === "Directory" ? path.join(root, entry) : ""), orElseSucceed(() => ""))), flatMap$2((nextRoots) => collectRepositoriesFromRoots(pipe(nextRoots, filter$1(isNonEmpty$1), appendAll(drop$1(roots, 1))), repositories)));
 				}));
 			}
 		});
 	});
-	const listWorktrees = fnUntraced(function* (cwd) {
-		return yield* pipe(yield* git.lines(cwd, [
+	const listWorktrees = fn("GitWorkspace.listWorktrees")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
+		yield* git.string(cwd, ["worktree", "prune"]);
+		const worktrees = yield* pipe(git.string(cwd, [
 			"worktree",
 			"list",
-			"--porcelain"
-		]), reduce({
-			currentBranch: "",
-			currentRoot: "",
-			hasCurrentCommit: false,
-			worktrees: empty$13()
-		}, (state, line) => {
-			if (startsWith("worktree ")(line)) return {
-				currentBranch: "",
-				currentRoot: replace(/^worktree\s+/u, "")(line),
-				hasCurrentCommit: false,
-				worktrees: isNonEmpty$1(state.currentRoot) && state.hasCurrentCommit ? append$1(state.worktrees, {
-					branch: state.currentBranch,
-					root: state.currentRoot
-				}) : state.worktrees
-			};
-			if (startsWith("HEAD ")(line)) return {
-				currentBranch: state.currentBranch,
-				currentRoot: state.currentRoot,
-				hasCurrentCommit: true,
-				worktrees: state.worktrees
-			};
-			if (startsWith("branch refs/heads/")(line)) return {
-				currentBranch: replace(/^branch\s+refs\/heads\//u, "")(line),
-				currentRoot: state.currentRoot,
-				hasCurrentCommit: state.hasCurrentCommit,
-				worktrees: state.worktrees
-			};
-			return state;
-		}), (state) => isNonEmpty$1(state.currentRoot) && state.hasCurrentCommit ? append$1(state.worktrees, {
-			branch: state.currentBranch,
-			root: state.currentRoot
-		}) : state.worktrees, forEach$1((worktree) => pipe(getWorktreeStatus(worktree.root, isNonEmpty$1(worktree.branch) ? worktree.branch : void 0), map$4((status) => new GitWorktree$1({
-			branch: isNonEmpty$1(worktree.branch) ? worktree.branch : void 0,
+			"--porcelain",
+			"-z"
+		]), flatMap$2((output) => pipe(sync(() => parseWorktreeRecords(output)), withSpan("GitWorkspace.parseWorktrees", { attributes: { cwd } }))));
+		yield* annotateCurrentSpan({ worktreeCount: length(worktrees) });
+		return yield* forEach$1(worktrees, (worktree) => pipe(getWorktreeStatus(worktree.root, worktree.branch), map$4((status) => new GitWorktree({
+			branch: worktree.branch,
 			root: worktree.root,
 			status
-		})))));
+		}))));
 	});
-	const listRepositoriesFrom = fnUntraced(function* (cwd) {
-		return yield* pipe(fs.realPath(cwd), orElseSucceed(() => cwd), flatMap$2((root) => collectRepositoriesFromRoots([root], empty$13())), map$4((repositories) => pipe(repositories, getSuccesses, dedupeWith((left, right) => left.gitDirectory === right.gitDirectory))));
+	const listRepositoriesFrom = fn("GitWorkspace.listRepositoriesFrom")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
+		return yield* pipe(fs.realPath(cwd), orElseSucceed(() => cwd), flatMap$2((root) => collectRepositoriesFromRoots([root], empty$13())), map$4((repositories) => pipe(repositories, dedupeWith((left, right) => left.gitDirectory === right.gitDirectory || left.root === right.root))));
 	});
-	const listProjectsFrom = fnUntraced(function* (cwd) {
+	const listProjectsFrom = fn("GitWorkspace.listProjectsFrom")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
 		return pipe(yield* pipe(listRepositoriesFrom(cwd), flatMap$2(forEach$1((repository) => option$1(pipe(listWorktrees(repository.root), map$4((discoveredWorktrees) => new GitProject({
 			repository: new GitRepository({
 				gitDirectory: repository.gitDirectory,
@@ -52735,17 +52795,15 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 			worktrees: sortWith(discoveredWorktrees, (worktree) => `${worktree.root === (discoveredWorktrees[0]?.root ?? repository.root) ? "0" : "1"}:${worktree.branch ?? ""}:${worktree.root}`, String$5)
 		})))), { concurrency: "unbounded" }))), getSomes, sortWith((project) => project.repository.root, String$5));
 	});
-	const refreshProjects = fnUntraced(function* () {
+	const refreshProjects = fn("GitWorkspace.refreshProjects")(function* () {
+		yield* annotateCurrentSpan({ cwd: home });
 		yield* set(projects, yield* listProjectsFrom(home));
 	});
 	yield* refreshProjects();
-	yield* acquireRelease(sync(() => NFS.watch(home, () => {
-		run(refreshProjects());
-	})), (watcher) => sync(() => {
-		watcher.close();
-	}));
+	yield* acquireRelease(sync(() => NFS.watch(home, () => void run(refreshProjects()))), (watcher) => sync(() => watcher.close()));
 	return {
-		branches: fnUntraced(function* (cwd) {
+		branches: fn("GitWorkspace.branches")(function* (cwd) {
+			yield* annotateCurrentSpan({ cwd });
 			return new GitBranchesSnapshot({
 				branches: yield* pipe(git.lines(cwd, [
 					"for-each-ref",
@@ -52766,30 +52824,15 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 				defaultBranch: yield* getDefaultBranch(cwd)
 			});
 		}),
-		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$40("git", [
-				"clone",
-				"--depth",
-				"1",
-				"--single-branch",
-				input.url,
-				targetDirectory
-			], { cwd: input.cwd })), asVoid, catch_$2(() => pipe(execString(make$40("git", [
-				"-C",
-				targetDirectory,
-				"pull",
-				"--ff-only"
-			])), asVoid, mapError$2((cause) => new GitError({
-				cause,
-				message: `failed to update ${targetDirectory} from ${input.url}`
-			})))));
-		}),
-		createWorktree: fnUntraced(function* (input) {
+		createWorktree: fn("GitWorkspace.createWorktree")(function* (input) {
+			yield* annotateCurrentSpan({
+				branch: input.branch,
+				cwd: input.cwd
+			});
 			const targetDirectory = path.join(home, ".deslop", "worktrees", `${replaceAll(/[^a-zA-Z0-9._-]+/gu, "-")(path.basename(input.cwd))}-${replaceAll(/[^a-zA-Z0-9._-]+/gu, "-")(input.branch)}-${yield* nextIntBetween(1e5, 999999)}`);
 			yield* pipe(fs.makeDirectory(path.dirname(targetDirectory), { recursive: true }), ignore$1);
-			if (input.mode === "existing-local") {
+			if (input.source._tag === "local") {
+				yield* annotateCurrentSpan({ source: "local" });
 				yield* pipe(git.string(input.cwd, [
 					"worktree",
 					"add",
@@ -52799,116 +52842,220 @@ var GitWorkspace = class extends Service()("@deslop/git/service/GitWorkspace", {
 				yield* refreshProjects();
 				return targetDirectory;
 			}
-			if (input.mode === "existing-remote") {
+			if (input.source._tag === "remote") {
+				const remoteBranch = `${input.source.remote}/${input.branch}`;
+				yield* annotateCurrentSpan({
+					remote: input.source.remote,
+					source: "remote"
+				});
 				yield* pipe(git.string(input.cwd, [
 					"fetch",
-					"--all",
-					"--prune"
-				]), ignore$1);
+					"--prune",
+					input.source.remote
+				]), asVoid);
 				yield* pipe(git.string(input.cwd, [
 					"worktree",
 					"add",
 					"-b",
 					input.branch,
 					targetDirectory,
-					input.baseBranch
+					remoteBranch
 				]), asVoid);
 				yield* refreshProjects();
 				return targetDirectory;
 			}
+			const defaultBranch = yield* getDefaultBranch(input.cwd);
+			yield* annotateCurrentSpan({ source: "new" });
 			yield* pipe(git.string(input.cwd, [
 				"worktree",
 				"add",
 				"-b",
 				input.branch,
 				targetDirectory,
-				input.baseBranch
+				`origin/${defaultBranch}`
 			]), asVoid);
 			yield* refreshProjects();
 			return targetDirectory;
 		}),
-		deleteWorktree: fnUntraced(function* (input) {
-			const worktree = yield* pipe(git.lines(input.cwd, [
+		deleteWorktree: fn("GitWorkspace.deleteWorktree")(function* (input) {
+			yield* annotateCurrentSpan({ cwd: input.cwd });
+			const worktrees = yield* pipe(git.string(input.cwd, [
 				"worktree",
 				"list",
-				"--porcelain"
-			]), map$4((lines) => pipe(lines, reduce({
-				branch: "",
-				currentBranch: "",
-				currentRoot: "",
-				found: false,
-				mainRoot: input.cwd
-			}, (state, line) => {
-				if (state.found) return state;
-				if (startsWith("worktree ")(line)) return {
-					branch: state.branch,
-					currentBranch: "",
-					currentRoot: replace(/^worktree\s+/u, "")(line),
-					found: state.found,
-					mainRoot: state.mainRoot === input.cwd ? replace(/^worktree\s+/u, "")(line) : state.mainRoot
-				};
-				if (startsWith("branch refs/heads/")(line)) return {
-					branch: state.currentRoot === input.cwd ? replace(/^branch\s+refs\/heads\//u, "")(line) : state.branch,
-					currentBranch: replace(/^branch\s+refs\/heads\//u, "")(line),
-					currentRoot: state.currentRoot,
-					found: state.currentRoot === input.cwd,
-					mainRoot: state.mainRoot
-				};
-				return state;
-			}), (state) => ({
-				branch: isNonEmpty$1(state.branch) ? state.branch : void 0,
-				mainRoot: state.mainRoot
-			}))));
-			yield* pipe(git.string(worktree.mainRoot, [
+				"--porcelain",
+				"-z"
+			]), map$4(parseWorktreeRecords));
+			const mainRoot = worktrees[0]?.root ?? input.cwd;
+			const branch = pipe(worktrees, findFirst$2((worktree) => worktree.root === input.cwd), getOrUndefined$1)?.branch;
+			yield* pipe(git.string(mainRoot, [
 				"worktree",
 				"remove",
-				...input.force ? ["--force"] : [],
+				"--force",
 				input.cwd
 			]), asVoid);
-			if (isNotUndefined(worktree.branch)) yield* pipe(git.string(worktree.mainRoot, [
+			if (isNotUndefined(branch)) yield* pipe(git.string(mainRoot, [
 				"branch",
 				"-D",
-				worktree.branch
+				branch
 			]), ignore$1);
 			yield* refreshProjects();
 		}),
 		listProjectsFrom,
 		listRepositoriesFrom,
 		listWorktrees,
-		projects
+		projects,
+		refreshProjects
 	};
 }) }) {
 	static layer = effect(this, this.make);
 };
-var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { make: fnUntraced(function* (config) {
-	const execString = yield* ChildProcessSpawner.useSync((spawner) => spawner.string);
-	const git = yield* makeGitExecutor;
+var GitMaintenance = class extends Service()("@deslop/git/service/GitMaintenance", { make: gen(function* () {
+	const git = yield* GitCommand;
 	const fs = yield* FileSystem;
 	const path = yield* Path$1;
-	const hasWorktreeChanges = pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => !isReadonlyArrayEmpty(lines)));
-	const resolveFrom = fnUntraced(function* (from) {
-		if (from.type === "ref") return from.ref;
-		return yield* pipe(git.string(config.cwd, [
-			"merge-base",
-			from.base,
-			"HEAD"
-		]), map$4(trim));
+	const home = yield* pipe(string("HOME"), withDefault(process.cwd()));
+	const maintenanceLock = yield* make$47(1);
+	const collectRepositoriesFromRoots = fn("GitMaintenance.collectRepositoriesFromRoots")(function* (roots, repositories) {
+		yield* annotateCurrentSpan({
+			repositoryCount: length(repositories),
+			rootCount: length(roots)
+		});
+		return yield* match$2(roots, {
+			onEmpty: () => succeed$3(repositories),
+			onNonEmpty: (remainingRoots) => {
+				const root = remainingRoots[0];
+				return pipe(fs.readDirectory(root), orElseSucceed(() => empty$13()), flatMap$2((entries) => {
+					if (contains(entries, ".git")) return pipe(all({
+						gitDirectory: pipe(git.string(root, [
+							"rev-parse",
+							"--path-format=absolute",
+							"--git-common-dir"
+						]), map$4(trim)),
+						worktrees: pipe(git.string(root, [
+							"worktree",
+							"list",
+							"--porcelain",
+							"-z"
+						]), map$4(parseWorktreeRecords))
+					}, { concurrency: "unbounded" }), map$4((repository) => new GitRepository({
+						gitDirectory: repository.gitDirectory,
+						root: repository.worktrees[0]?.root ?? root
+					})), option$1, flatMap$2((repository) => collectRepositoriesFromRoots(drop$1(remainingRoots, 1), pipe(repository, match$4({
+						onNone: () => repositories,
+						onSome: (value) => append$1(repositories, value)
+					})))));
+					return pipe(entries, filter$1((entry) => !excludedDiscoveryEntries.has(entry) && !(startsWith(".")(entry) && entry !== ".git")), forEach$1((entry) => pipe(fs.stat(path.join(root, entry)), map$4((info) => info.type === "Directory" ? path.join(root, entry) : ""), orElseSucceed(() => ""))), flatMap$2((nextRoots) => collectRepositoriesFromRoots(pipe(nextRoots, filter$1(isNonEmpty$1), appendAll(drop$1(roots, 1))), repositories)));
+				}));
+			}
+		});
+	});
+	const listRepositoriesFrom = fn("GitMaintenance.listRepositoriesFrom")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
+		return yield* pipe(fs.realPath(cwd), orElseSucceed(() => cwd), flatMap$2((root) => collectRepositoriesFromRoots([root], empty$13())), map$4((repositories) => pipe(repositories, dedupeWith((left, right) => left.gitDirectory === right.gitDirectory || left.root === right.root))));
+	});
+	const maintain = fn("GitMaintenance.maintain")(function* (cwd) {
+		yield* annotateCurrentSpan({ cwd });
+		yield* pipe(gen(function* () {
+			const repositories = yield* listRepositoriesFrom(cwd);
+			yield* annotateCurrentSpan({ repositoryCount: length(repositories) });
+			yield* forEach$1(repositories, (repository) => gen(function* () {
+				yield* pipe(git.string(repository.root, [
+					"fetch",
+					"--all",
+					"--prune"
+				]), asVoid, withSpan("GitMaintenance.fetch", { attributes: { cwd: repository.root } }));
+				const worktrees = parseWorktreeRecords(yield* git.string(repository.root, [
+					"worktree",
+					"list",
+					"--porcelain",
+					"-z"
+				]));
+				yield* forEach$1(yield* git.lines(repository.root, [
+					"for-each-ref",
+					"refs/heads",
+					"--format=%(refname:short)%00%(upstream:short)%00%(upstream:track)%00%(worktreepath)"
+				]), (row) => pipe(gen(function* () {
+					const fields = split$1("\0")(row);
+					const branch = fields[0];
+					const upstream = fields[1] ?? "";
+					const track = fields[2] ?? "";
+					const worktreePath = fields[3] ?? pipe(worktrees, findFirst$2((worktree) => worktree.branch === branch), map$9((worktree) => worktree.root), getOrElse$1(() => ""));
+					yield* annotateCurrentSpan({
+						branch,
+						cwd: repository.root
+					});
+					if (isEmpty$1(branch)) return;
+					if (track === "[gone]") {
+						if (isNonEmpty$1(worktreePath)) yield* pipe(git.string(repository.root, [
+							"worktree",
+							"remove",
+							"--force",
+							worktreePath
+						]), asVoid, withSpan("GitMaintenance.deleteWorktree", { attributes: {
+							branch,
+							cwd: repository.root
+						} }));
+						yield* pipe(git.string(repository.root, [
+							"branch",
+							"-D",
+							branch
+						]), asVoid, withSpan("GitMaintenance.deleteBranch", { attributes: {
+							branch,
+							cwd: repository.root
+						} }));
+						return;
+					}
+					if (isEmpty$1(upstream) || !includes("behind")(track) || includes("ahead")(track)) return;
+					if (isNonEmpty$1(worktreePath)) {
+						yield* pipe(git.string(worktreePath, [
+							"merge",
+							"--ff-only",
+							upstream
+						]), ignore$1, withSpan("GitMaintenance.fastForwardWorktree", { attributes: {
+							branch,
+							cwd: worktreePath
+						} }));
+						return;
+					}
+					yield* pipe(git.string(repository.root, [
+						"merge-base",
+						"--is-ancestor",
+						branch,
+						upstream
+					]), andThen(git.string(repository.root, [
+						"branch",
+						"-f",
+						branch,
+						upstream
+					])), ignore$1, withSpan("GitMaintenance.fastForwardBranch", { attributes: {
+						branch,
+						cwd: repository.root
+					} }));
+				}), withSpan("GitMaintenance.classifyBranch", { attributes: { cwd: repository.root } })), { concurrency: "unbounded" });
+			}), { concurrency: "unbounded" });
+		}), withPermit(maintenanceLock));
 	});
+	yield* pipe(maintain(home), ignore$1, andThen(sleep(seconds(180))), forever, forkScoped);
+	return { maintain };
+}) }) {
+	static layer = effect(this, this.make);
+};
+var GitReview = class extends Service()("@deslop/git/service/GitReview", { make: fn("GitReview.make")(function* (config) {
+	const spawner = yield* ChildProcessSpawner;
+	const git = yield* GitCommand;
+	const fs = yield* FileSystem;
+	const path = yield* Path$1;
+	const hasWorktreeChanges = pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => !isReadonlyArrayEmpty(lines)));
 	function diffsFromPatch(patch, segments) {
 		const groupedSegments = segmentsByFile(segments);
-		return pipe(patch.split(/(?=^diff --git )/mu), filter$1(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
-		}));
+		return pipe(patch.split(/(?=^diff --git )/mu), filter$1((chunk) => /^diff --git /u.test(chunk)), map$7((chunk) => diffFromPatchChunk(chunk, groupedSegments)));
 	}
-	const gitDiffs = fnUntraced(function* (input) {
-		return diffsFromPatch(yield* git.string(config.cwd, [
+	const gitDiffs = fn("GitReview.gitDiffs")(function* (input) {
+		yield* annotateCurrentSpan({
+			cwd: config.cwd,
+			segmentCount: length(input.segments)
+		});
+		const diffs = diffsFromPatch(yield* git.string(config.cwd, [
 			"diff",
 			...input.args,
 			"--ignore-all-space",
@@ -52916,54 +53063,53 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"--ignore-cr-at-eol",
 			"--patch",
 			"--find-renames",
-			"-U999999",
 			"--no-ext-diff"
 		]), input.segments);
+		yield* annotateCurrentSpan({ diffCount: length(diffs) });
+		return diffs;
+	});
+	const commitDiffs = fn("GitReview.commitDiffs")(function* (hash) {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
+		const diffs = diffsFromPatch(yield* git.string(config.cwd, [
+			"diff-tree",
+			"--root",
+			"--first-parent",
+			"-m",
+			"--patch",
+			"--ignore-all-space",
+			"--ignore-blank-lines",
+			"--ignore-cr-at-eol",
+			"--find-renames",
+			"--no-ext-diff",
+			hash
+		]), empty$13());
+		yield* annotateCurrentSpan({ diffCount: length(diffs) });
+		return diffs;
 	});
 	const untrackedDiffs = pipe(git.lines(config.cwd, [
 		"ls-files",
 		"--others",
 		"--exclude-standard"
-	]), flatMap$2((files) => forEach$1(files, (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$2("\n"))}`,
-		segments: [new GitDiffSegment({
+	]), flatMap$2((files) => forEach$1(files, (filePath) => pipe(fs.readFileString(path.join(config.cwd, filePath)), orElseSucceed(() => ""), map$4((content) => {
+		const 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$2("\n"))}`;
+		return new GitDiff({
 			filePath,
-			fingerprint: content,
-			id: "HEAD->worktree",
-			type: "worktree"
-		})],
-		status: "added"
-	}))), { concurrency: "unbounded" })));
-	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$1(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$1(isNonEmpty$1))[0] ?? `${commit}^`}->${commit}`;
-			return pipe(drop$1(lines, 1), filter$1(isNonEmpty$1), map$7((filePath) => new GitDiffSegment({
+			patch,
+			segments: [new GitDiffSegment({
 				filePath,
-				fingerprint: `${id}:${filePath}`,
-				id,
-				type: "commit"
-			})));
-		}));
-	});
-	const reviewRangeDiffs = fnUntraced(function* (input) {
-		const from = yield* resolveFrom(input.from);
-		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({
+				fingerprint: patch,
+				id: "HEAD->worktree",
+				type: "worktree"
+			})],
+			status: "added"
+		});
+	})), { concurrency: "unbounded" })));
+	const worktreeDiffs = gen(function* () {
+		if (isReadonlyArrayEmpty(yield* git.lines(config.cwd, ["status", "--porcelain"]))) return empty$13();
+		return yield* pipe(all([gitDiffs({
 			args: ["HEAD"],
 			segments: empty$13()
-		}), map$7((diff) => {
+		}), untrackedDiffs], { concurrency: "unbounded" }), map$4(([trackedDiffs, untracked]) => appendAll(map$7(trackedDiffs, (diff) => {
 			const segment = new GitDiffSegment({
 				filePath: diff.filePath,
 				fingerprint: diff.patch,
@@ -52976,41 +53122,95 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 				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({
+		}), untracked)));
+	}).pipe(withSpan("GitReview.worktreeDiffs", { attributes: { cwd: config.cwd } }));
+	const fileContent = fn("GitReview.fileContent")(function* (input) {
+		yield* annotateCurrentSpan({
+			cwd: config.cwd,
+			filePath: input.filePath,
+			target: input.target._tag
+		});
+		if (input.target._tag !== "commit") return yield* pipe(fs.readFileString(path.join(config.cwd, input.filePath)), orElseSucceed(() => ""));
+		return yield* pipe(git.string(config.cwd, ["show", `${input.target.hash}:${input.filePath}`]), orElseSucceed(() => ""));
+	});
+	const withFileContent = fn("GitReview.withFileContent")(function* (input) {
+		const contents = yield* forEach$1(input.diffs, (diff) => pipe(fileContent({
 			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);
+			target: input.target
+		}), map$4((content) => [diff.filePath, content])), { concurrency: "unbounded" });
+		const contentByFilePath = new Map(contents);
+		return map$7(input.diffs, (diff) => contentByFilePath.has(diff.filePath) ? new GitDiff({
+			fileContent: contentByFilePath.get(diff.filePath),
+			filePath: diff.filePath,
+			patch: diff.patch,
+			segments: diff.segments,
+			status: diff.status
+		}) : diff);
+	});
+	const reviewDiffs = fn("GitReview.reviewDiffs")(function* (target) {
+		yield* annotateCurrentSpan({
+			cwd: config.cwd,
+			target: target._tag
+		});
+		if (target._tag === "changes") return yield* withFileContent({
+			diffs: yield* worktreeDiffs,
+			target
+		});
+		if (target._tag === "commit") {
+			const id = `${target.hash}^->${target.hash}`;
+			const diffsWithSegments = withDisplayedPatchSegments(yield* commitDiffs(target.hash), id, "commit");
+			yield* annotateCurrentSpan({ diffCount: length(diffsWithSegments) });
+			return yield* withFileContent({
+				diffs: diffsWithSegments,
+				target
+			});
+		}
+		const base = target._tag === "local" ? yield* localBase() : yield* branchDiffBase();
+		const diffsWithSegments = withDisplayedPatchSegments(yield* aggregateDiffs(base), `${base}->worktree`, "worktree");
+		yield* annotateCurrentSpan({ diffCount: length(diffsWithSegments) });
+		return yield* withFileContent({
+			diffs: diffsWithSegments,
+			target
+		});
 	});
-	const ghString = fnUntraced(function* (args) {
-		return yield* pipe(execString(make$40("gh", args, { cwd: config.cwd })), mapError$2((cause) => new GitError({ cause })));
+	const ghString = fn("gh.string")(function* (args) {
+		yield* annotateCurrentSpan({
+			command: args[0] ?? "gh",
+			cwd: config.cwd
+		});
+		return yield* scoped$3(gen(function* () {
+			const handle = yield* pipe(spawner.spawn(make$40("gh", args, {
+				cwd: config.cwd,
+				stderr: "pipe",
+				stdout: "pipe"
+			})), mapError$2((cause) => new GitError({ cause })));
+			const output = yield* all({
+				stderr: pipe(decodeText(handle.stderr), mkString, orElseSucceed(() => "")),
+				stdout: pipe(decodeText(handle.stdout), mkString, orElseSucceed(() => ""))
+			}, { concurrency: "unbounded" });
+			const exitCode = yield* pipe(handle.exitCode, mapError$2((cause) => new GitError({ cause })));
+			if (exitCode !== ExitCode(0)) return yield* new GitError({ cause: new Error(output.stderr || output.stdout || `gh ${join$2(" ")(args)} exited with ${exitCode}`) });
+			return output.stdout;
+		})).pipe(withSpan("gh.command", { attributes: {
+			command: args[0] ?? "gh",
+			cwd: config.cwd
+		} }));
 	});
 	const currentBranch = pipe(git.string(config.cwd, ["branch", "--show-current"]), map$4(trim));
 	const defaultBranchName = pipe(git.string(config.cwd, [
 		"symbolic-ref",
 		"--short",
 		"refs/remotes/origin/HEAD"
-	]), map$4(flow(trim, replace(/^origin\//u, ""))));
-	const branchBase = fnUntraced(function* (defaultBranch) {
+	]), map$4(flow(trim, replace(/^origin\//u, ""))), catchTag("GitError", () => pipe(git.string(config.cwd, [
+		"rev-parse",
+		"--verify",
+		"main"
+	]), as("main"), catchTag("GitError", () => succeed$3("master")))));
+	const branchBase = fn("GitReview.branchBase")(function* (defaultBranch) {
+		yield* annotateCurrentSpan({
+			cwd: config.cwd,
+			defaultBranch
+		});
 		return yield* pipe([`origin/${defaultBranch}`, defaultBranch], findFirst((candidate) => pipe(git.string(config.cwd, [
 			"rev-parse",
 			"--verify",
@@ -53024,19 +53224,9 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		"url",
 		"--jq",
 		".url"
-	]), map$4(trim), map$4((url) => isNonEmpty$1(url) ? some$1(url) : none()), catchTag("GitError", () => succeed$3(none())));
-	function commitFromLogLine(line) {
-		const parts = split$1("\0")(line);
-		const subject = parts[2] ?? "";
-		return new GitCommit({
-			hash: parts[0],
-			parents: pipe(parts[3] ?? "", split$1(" "), filter$1(isNonEmpty$1)),
-			shortHash: parts[1] ?? "",
-			subject,
-			wip: isWipSubject(subject)
-		});
-	}
-	const commits = fnUntraced(function* (base) {
+	]), map$4(trim), map$4((url) => isNonEmpty$1(url) ? some(url) : none()), catchTag("GitError", () => succeed$3(none())));
+	const commits = fn("GitReview.commits")(function* (base) {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
 		const from = yield* pipe(git.string(config.cwd, [
 			"merge-base",
 			base,
@@ -53045,59 +53235,82 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 		return yield* pipe(git.lines(config.cwd, [
 			"log",
 			"--max-count=80",
-			"--format=%H%x00%h%x00%s%x00%P",
+			"--format=%H%x00%h%x00%s",
 			`${from}..HEAD`
 		]), map$4(map$7(commitFromLogLine)));
 	});
+	const commitsBetween = fn("GitReview.commitsBetween")(function* (from, to) {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
+		return yield* pipe(git.lines(config.cwd, [
+			"log",
+			"--max-count=80",
+			"--format=%H%x00%h%x00%s",
+			`${from}..${to}`
+		]), map$4(map$7(commitFromLogLine)));
+	});
 	const firstParentCommits = pipe(git.lines(config.cwd, [
 		"log",
 		"--first-parent",
 		"--max-count=80",
-		"--format=%H%x00%h%x00%s%x00%P",
+		"--format=%H%x00%h%x00%s",
 		"HEAD"
 	]), map$4(map$7(commitFromLogLine)));
-	const pushCurrentBranch = gen(function* () {
-		const branch = yield* currentBranch;
-		yield* pipe(git.string(config.cwd, [
-			"push",
-			"-u",
-			"origin",
-			`HEAD:${branch}`
-		]), asVoid);
-	});
-	const hasPushableCommits = pipe(gen(function* () {
-		const remoteBranch = `origin/${yield* currentBranch}`;
-		if (yield* pipe(git.string(config.cwd, [
+	const hasPushableCommits = pipe(fn("GitReview.pushableCommitCount")(function* () {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
+		const upstream = yield* pipe(git.string(config.cwd, [
 			"rev-parse",
-			"--verify",
-			remoteBranch
-		]), as(true), orElseSucceed(() => false))) return yield* git.lines(config.cwd, [
-			"log",
-			"--format=%s",
-			`${remoteBranch}..HEAD`
-		]);
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{u}"
+		]), map$4(flow(trim, some)), orElseSucceed(() => none()));
+		if (isSome(upstream)) return yield* pipe(git.string(config.cwd, [
+			"rev-list",
+			"--count",
+			`${upstream.value}..HEAD`
+		]), map$4(flow(trim, parse$2, getOrElse$1(() => 0))));
 		const base = yield* branchBase(yield* defaultBranchName);
 		const from = yield* pipe(git.string(config.cwd, [
 			"merge-base",
 			base,
 			"HEAD"
 		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
-		return yield* git.lines(config.cwd, [
-			"log",
-			"--format=%s",
+		return yield* pipe(git.string(config.cwd, [
+			"rev-list",
+			"--count",
 			`${from}..HEAD`
-		]);
-	}), map$4((subjects) => !some(subjects, isWipSubject) && !isReadonlyArrayEmpty(subjects)));
-	const createDraftPr = pipe(ghString([
-		"pr",
-		"create",
-		"--draft",
-		"--fill"
-	]), map$4((output) => {
-		const url = output.match(/https?:\/\/\S+/u)?.[0] ?? trim(output);
-		return isNonEmpty$1(url) ? some$1(url) : none();
-	}));
+		]), map$4(flow(trim, parse$2, getOrElse$1(() => 0))));
+	})(), map$4((count) => count > 0));
+	const localBase = fn("GitReview.localBase")(function* () {
+		const upstream = yield* pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{u}"
+		]), map$4(flow(trim, some)), orElseSucceed(() => none()));
+		if (isSome(upstream)) return upstream.value;
+		const base = yield* branchBase(yield* defaultBranchName);
+		return yield* pipe(git.string(config.cwd, [
+			"merge-base",
+			base,
+			"HEAD"
+		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
+	});
+	const branchDiffBase = fn("GitReview.branchDiffBase")(function* () {
+		const base = yield* branchBase(yield* defaultBranchName);
+		return yield* pipe(git.string(config.cwd, [
+			"merge-base",
+			base,
+			"HEAD"
+		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
+	});
+	const aggregateDiffs = fn("GitReview.aggregateDiffs")(function* (base) {
+		return appendAll(yield* gitDiffs({
+			args: [base],
+			segments: empty$13()
+		}), yield* untrackedDiffs);
+	});
 	const prReviewThreads = gen(function* () {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
 		const pr = yield* pipe(ghString([
 			"pr",
 			"view",
@@ -53105,7 +53318,7 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"number",
 			"--jq",
 			".number"
-		]), map$4(flow(trim, parse$2)), flatMap$2(match$5({
+		]), map$4(flow(trim, parse$2)), flatMap$2(match$4({
 			onNone: () => new GitError({ message: "No PR found." }),
 			onSome: succeed$3
 		})));
@@ -53152,10 +53365,12 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			"-F",
 			`number=${pr}`
 		]);
-		return pipe((yield* pipe(decodeUnknownEffect(fromJsonString(GitHubReviewThreadsResponse))(response), mapError$2((cause) => new GitError({
+		const threads = (yield* pipe(decodeUnknownEffect(fromJsonString(GitHubReviewThreadsResponse))(response), mapError$2((cause) => new GitError({
 			cause,
 			message: "Failed to parse GitHub review threads."
-		})))).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [], flatMap$5((thread) => pipe(thread.comments.nodes, map$7((comment) => new GitHubReviewThread({
+		})))).data?.repository?.pullRequest?.reviewThreads?.nodes ?? [];
+		yield* annotateCurrentSpan({ threadCount: length(threads) });
+		return pipe(threads, flatMap$5((thread) => pipe(thread.comments.nodes, map$7((comment) => new GitHubReviewThread({
 			body: comment.body,
 			filePath: comment.path,
 			id: thread.id,
@@ -53164,75 +53379,31 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 			side: thread.diffSide === "LEFT" ? "deletions" : "additions",
 			url: comment.url
 		})))));
-	});
+	}).pipe(withSpan("GitReview.reviewThreads", { attributes: { cwd: config.cwd } }));
 	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) {
-			const oldestWip = pipe(yield* commits(input.base), takeWhile((commit) => commit.wip), last, getOrUndefined$1);
-			const dirty = yield* hasWorktreeChanges;
-			if (oldestWip) yield* pipe(git.string(config.cwd, [
-				"reset",
-				"--soft",
-				`${oldestWip.hash}^`
-			]), asVoid);
-			else if (!dirty) return yield* new GitError({ message: "No changes to commit." });
-			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
-			yield* pipe(git.string(config.cwd, [
-				"commit",
-				"-m",
-				input.message
-			]), asVoid);
-			yield* pushCurrentBranch;
-			if (yield* hasPushableCommits) return yield* new GitError({ message: "Push completed but the branch still has unpushed commits." });
-			if ((yield* currentBranch) !== (yield* defaultBranchName) && isNone(yield* branchPrUrl)) yield* createDraftPr;
-		}),
 		commits,
-		createWipCommit: fnUntraced(function* (message) {
-			if (!(yield* hasWorktreeChanges)) return yield* new GitError({ message: "No changes to commit." });
-			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid);
-			const subject = pipe(message, trim, (value) => isEmpty$1(value) ? "wip" : `wip: ${value}`);
-			yield* pipe(git.string(config.cwd, [
-				"commit",
-				"-m",
-				subject
-			]), asVoid);
-		}),
-		discardFile: fnUntraced(function* (filePath) {
-			yield* pipe(git.string(config.cwd, [
-				"reset",
-				"HEAD",
-				"--",
-				filePath
-			]), ignore$1);
-			yield* pipe(git.string(config.cwd, [
-				"restore",
-				"--worktree",
-				"--source=HEAD",
-				"--",
-				filePath
-			]), ignore$1);
-			yield* pipe(git.string(config.cwd, [
-				"clean",
-				"-fd",
-				"--",
-				filePath
-			]), asVoid);
-		}),
-		metadata: fnUntraced(function* (input) {
+		metadata: fn("GitReview.metadata")(function* () {
+			yield* annotateCurrentSpan({ cwd: config.cwd });
 			const branch = yield* currentBranch;
 			const defaultBranch = yield* defaultBranchName;
-			const base = input?.base ?? (yield* branchBase(defaultBranch));
+			const branchBaseRef = yield* branchDiffBase();
+			const localCommits = yield* commitsBetween(yield* localBase(), "HEAD");
+			const branchCommitCandidates = branch === defaultBranch ? yield* firstParentCommits : yield* commits(branchBaseRef);
+			const localCommitHashes = new Set(map$7(localCommits, (commit) => commit.hash));
 			return new GitReviewMetadata({
-				base,
-				branch,
-				commits: branch === defaultBranch ? yield* firstParentCommits : yield* commits(base),
-				defaultBranch,
+				branchCommits: filter$1(branchCommitCandidates, (commit) => !localCommitHashes.has(commit.hash)),
 				dirty: yield* hasWorktreeChanges,
+				localCommits,
 				prUrl: getOrUndefined$1(yield* branchPrUrl),
 				unpushedCommits: yield* hasPushableCommits
 			});
 		}),
-		resolveReviewThread: fnUntraced(function* (threadId) {
+		resolveReviewThread: fn("GitReview.resolveReviewThread")(function* (threadId) {
+			yield* annotateCurrentSpan({
+				cwd: config.cwd,
+				threadId
+			});
 			yield* pipe(ghString([
 				"api",
 				"graphql",
@@ -53249,24 +53420,141 @@ var GitWorktree = class extends Service()("@deslop/git/service/GitWorktree", { m
 				`threadId=${threadId}`
 			]), asVoid);
 		}),
-		reviewRangeDiffs,
+		reviewDiffs,
 		reviewThreads: pipe(prReviewThreads, catchTag("GitError", () => succeed$3(empty$13()))),
-		stageFile: fnUntraced(function* (filePath) {
+		watchReviewDiffs: (target) => {
+			const diffs = pipe(reviewDiffs(target), catchTag("GitError", () => succeed$3(empty$13())));
+			if (target._tag === "commit") return fromEffect(diffs);
+			return fromEffect(diffs).pipe(concat(pipe(worktreeChanges, mapEffect(() => diffs))), changesWith((left, right) => length(left) === length(right) && every(left, (leftDiff, index) => isNotUndefined(right[index]) && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)));
+		}
+	};
+}) }) {
+	static layer = flow(this.make, effect(this));
+};
+var GitCommitAction = class extends Service()("@deslop/git/service/GitCommitAction", { make: fn("GitCommitAction.make")(function* (config) {
+	const spawner = yield* ChildProcessSpawner;
+	const git = yield* GitCommand;
+	const ghString = fn("gh.string")(function* (args) {
+		yield* annotateCurrentSpan({
+			command: args[0] ?? "gh",
+			cwd: config.cwd
+		});
+		return yield* scoped$3(gen(function* () {
+			const handle = yield* pipe(spawner.spawn(make$40("gh", args, {
+				cwd: config.cwd,
+				stderr: "pipe",
+				stdout: "pipe"
+			})), mapError$2((cause) => new GitError({ cause })));
+			const output = yield* all({
+				stderr: pipe(decodeText(handle.stderr), mkString, orElseSucceed(() => "")),
+				stdout: pipe(decodeText(handle.stdout), mkString, orElseSucceed(() => ""))
+			}, { concurrency: "unbounded" });
+			const exitCode = yield* pipe(handle.exitCode, mapError$2((cause) => new GitError({ cause })));
+			if (exitCode !== ExitCode(0)) return yield* new GitError({ cause: new Error(output.stderr || output.stdout || `gh ${join$2(" ")(args)} exited with ${exitCode}`) });
+			return output.stdout;
+		})).pipe(withSpan("gh.command", { attributes: {
+			command: args[0] ?? "gh",
+			cwd: config.cwd
+		} }));
+	});
+	const hasWorktreeChanges = pipe(git.lines(config.cwd, ["status", "--porcelain"]), map$4((lines) => !isReadonlyArrayEmpty(lines)));
+	const currentBranch = pipe(git.string(config.cwd, ["branch", "--show-current"]), map$4(trim));
+	const defaultBranchName = pipe(git.string(config.cwd, [
+		"symbolic-ref",
+		"--short",
+		"refs/remotes/origin/HEAD"
+	]), map$4(flow(trim, replace(/^origin\//u, ""))), catchTag("GitError", () => pipe(git.string(config.cwd, [
+		"rev-parse",
+		"--verify",
+		"main"
+	]), as("main"), catchTag("GitError", () => succeed$3("master")))));
+	const branchBase = fn("GitCommitAction.branchBase")(function* (defaultBranch) {
+		yield* annotateCurrentSpan({
+			cwd: config.cwd,
+			defaultBranch
+		});
+		return yield* pipe([`origin/${defaultBranch}`, defaultBranch], findFirst((candidate) => pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--verify",
+			candidate
+		]), as(true), orElseSucceed(() => false))), map$4(getOrElse$1(() => "HEAD")));
+	});
+	const branchPrUrl = pipe(ghString([
+		"pr",
+		"view",
+		"--json",
+		"url",
+		"--jq",
+		".url"
+	]), map$4(trim), map$4((url) => isNonEmpty$1(url) ? some(url) : none()), catchTag("GitError", () => succeed$3(none())));
+	const hasPushableCommits = pipe(fn("GitCommitAction.pushableCommitCount")(function* () {
+		yield* annotateCurrentSpan({ cwd: config.cwd });
+		const upstream = yield* pipe(git.string(config.cwd, [
+			"rev-parse",
+			"--abbrev-ref",
+			"--symbolic-full-name",
+			"@{u}"
+		]), map$4(flow(trim, some)), orElseSucceed(() => none()));
+		if (isSome(upstream)) return yield* pipe(git.string(config.cwd, [
+			"rev-list",
+			"--count",
+			`${upstream.value}..HEAD`
+		]), map$4(flow(trim, parse$2, getOrElse$1(() => 0))));
+		const base = yield* branchBase(yield* defaultBranchName);
+		const from = yield* pipe(git.string(config.cwd, [
+			"merge-base",
+			base,
+			"HEAD"
+		]), map$4(trim), catchTag("GitError", () => succeed$3(base)));
+		return yield* pipe(git.string(config.cwd, [
+			"rev-list",
+			"--count",
+			`${from}..HEAD`
+		]), map$4(flow(trim, parse$2, getOrElse$1(() => 0))));
+	})(), map$4((count) => count > 0));
+	const createDraftPr = pipe(ghString([
+		"pr",
+		"create",
+		"--draft",
+		"--fill"
+	]), map$4((output) => {
+		const url = output.match(/https?:\/\/\S+/u)?.[0] ?? trim(output);
+		return isNonEmpty$1(url) ? some(url) : none();
+	}));
+	return {
+		commit: fn("GitCommitAction.commit")(function* (message) {
+			yield* annotateCurrentSpan({ cwd: config.cwd });
+			const dirty = yield* hasWorktreeChanges;
+			yield* annotateCurrentSpan({ dirty });
+			if (!dirty) return yield* new GitError({ message: "No changes to commit." });
+			if (isEmpty$1(trim(message))) return yield* new GitError({ message: "Commit message required." });
+			yield* pipe(git.string(config.cwd, ["add", "-A"]), asVoid, withSpan("GitCommitAction.stageAll"));
 			yield* pipe(git.string(config.cwd, [
-				"add",
-				"--",
-				filePath
-			]), asVoid);
+				"commit",
+				"-m",
+				message
+			]), asVoid, withSpan("GitCommitAction.create"));
 		}),
-		unstageFile: fnUntraced(function* (filePath) {
+		push: fn("GitCommitAction.push")(function* () {
+			yield* annotateCurrentSpan({ cwd: config.cwd });
+			if (!(yield* hasPushableCommits)) return yield* new GitError({ message: "No unpushed commits." });
+			const branch = yield* currentBranch;
+			yield* annotateCurrentSpan({ branch });
 			yield* pipe(git.string(config.cwd, [
-				"reset",
-				"HEAD",
-				"--",
-				filePath
-			]), asVoid);
-		}),
-		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) => isNotUndefined(right[index]) && leftDiff.filePath === right[index].filePath && leftDiff.status === right[index].status && leftDiff.patch === right[index].patch)))
+				"push",
+				"-u",
+				"origin",
+				`HEAD:${branch}`
+			]), asVoid, withSpan("GitCommitAction.push", { attributes: {
+				branch,
+				cwd: config.cwd
+			} }));
+			if (yield* hasPushableCommits) return yield* new GitError({ message: "Push completed but the branch still has unpushed commits." });
+			if (branch !== (yield* defaultBranchName) && isNone(yield* branchPrUrl)) yield* pipe(createDraftPr, withSpan("GitCommitAction.createDraftPr", { attributes: {
+				branch,
+				cwd: config.cwd
+			} }));
+		})
 	};
 }) }) {
 	static layer = flow(this.make, effect(this));
@@ -53887,7 +54175,7 @@ var Terminal = class extends Service()("@deslop/terminal/service/Terminal", { ma
 			}
 		});
 	});
-	yield* pipe(fromQueue(resizeQueue), groupedWithin(32, millis(16)), runForEach((items) => pipe(last(fromIterable$2(items)), match$5({
+	yield* pipe(fromQueue(resizeQueue), groupedWithin(32, millis(16)), runForEach((items) => pipe(last(fromIterable$2(items)), match$4({
 		onNone: () => void_$1,
 		onSome: resizeProcess
 	}))), forkScoped);
@@ -53960,7 +54248,7 @@ const TerminalSessionKey = Struct({
 	env: optional(Record(String$1, String$1)),
 	sessionId: optional(String$1)
 });
-const emptyReviewState = new ReviewState({
+const emptyReviewState = new GitReviewState({
 	comments: empty$13(),
 	marks: empty$13()
 });
@@ -53985,32 +54273,31 @@ function terminalSessionInput(session) {
 		sessionId: session.sessionId
 	};
 }
-function commentKey(input) {
-	return `${input.filePath}:${input.side ?? "additions"}:${input.lineNumber}`;
-}
-function markKey(input) {
-	return `${input.filePath}:${input.segmentId}:${input.fingerprint}`;
-}
 const TerminalSessions = make$46({
 	idleTimeToLive: infinity,
 	lookup: fnUntraced(function* (config) {
 		return get$9(yield* buildWithScope(Terminal.layer(config), yield* scope), Terminal);
 	})
 });
-const GitWorktreeSessions = make$46({
+const GitReviewSessions = make$46({
+	idleTimeToLive: zero$1,
+	lookup: fnUntraced(function* (cwd) {
+		return get$9(yield* buildWithScope(pipe(GitReview.layer({ cwd }), provide$2(GitCommand.layer)), yield* scope), GitReview);
+	})
+});
+const GitCommitSessions = make$46({
 	idleTimeToLive: minutes(5),
 	lookup: fnUntraced(function* (cwd) {
-		return get$9(yield* buildWithScope(GitWorktree.layer({ cwd }), yield* scope), GitWorktree);
+		return get$9(yield* buildWithScope(pipe(GitCommitAction.layer({ cwd }), provide$2(GitCommand.layer)), yield* scope), GitCommitAction);
 	})
 });
 const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 	const git = yield* GitWorkspace;
 	const terminals = yield* TerminalSessions;
-	const gitWorktrees = yield* GitWorktreeSessions;
-	const fs = yield* FileSystem;
+	const gitReviews = yield* GitReviewSessions;
+	const gitCommits = yield* GitCommitSessions;
 	const portless = yield* Portless;
 	const portlessScripts = yield* make$38(empty$6());
-	const reviewStore = toSchemaStore(yield* KeyValueStore, ReviewState);
 	const portlessWorktrees = yield* make$46({
 		idleTimeToLive: infinity,
 		lookup: fnUntraced(function* (cwd) {
@@ -54049,27 +54336,16 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 	const getTerminal = fnUntraced(function* (input) {
 		return yield* pipe(terminalSession(input), map$4(terminalSessionInput), flatMap$2((session) => get$6(terminals, session)));
 	});
-	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(() => emptyReviewState)), orElseSucceed(() => emptyReviewState));
-	});
-	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) {
+	const reviewStates = yield* make$46({ lookup: fnUntraced(function* () {
+		return yield* make$3(emptyReviewState);
+	}) });
+	const updateReviewState = fn("RpcHandlers.updateReviewState")(function* (cwd, f) {
+		yield* annotateCurrentSpan({ cwd });
 		return yield* pipe(scoped$3(gen(function* () {
-			const key = yield* reviewStateKey(input);
-			const state = yield* modify(yield* get$6(reviewStates, key), (current) => {
+			yield* modify(yield* get$6(reviewStates, cwd), (current) => {
 				const next = f(current);
 				return [next, next];
 			});
-			yield* reviewStore.set(`review-state/${key}`, state);
 		})), mapError$2((cause) => new GitError({ cause })));
 	});
 	const agents = yield* make$3(empty$6());
@@ -54118,9 +54394,9 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 					cwd: agentSession.cwd,
 					uuid: agentSession.uuid
 				});
-				yield* update(agents, (sessions) => modifyAt(sessions, key, match$5({
+				yield* update(agents, (sessions) => modifyAt(sessions, key, match$4({
 					onNone: () => none(),
-					onSome: (session) => some$1({
+					onSome: (session) => some({
 						...session,
 						state
 					})
@@ -54142,53 +54418,29 @@ const RpcHandlers = RpcContracts.toLayer(gen(function* () {
 		"projects.createWorktree": (payload) => git.createWorktree(payload),
 		"projects.deleteWorktree": (payload) => git.deleteWorktree(payload),
 		"projects.watch": () => unwrap$1(map$4(get(git.projects), (projects) => pipe(make$43(projects), concat(drop(1)(changes(git.projects)))))),
-		"review.comments.resolve": (payload) => updateReviewState(payload, (state) => {
-			const key = commentKey(payload);
-			return new ReviewState({
-				comments: filter$1(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$1(state.comments, (comment) => commentKey(comment) !== key), new ReviewComment({
-					...payload.comment,
-					resolved: false
-				})),
-				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$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.githubThreads": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.reviewThreads)),
-		"review.githubThreads.resolve": (payload) => pipe(get$6(gitWorktrees, payload.cwd), flatMap$2((worktree) => worktree.resolveReviewThread(payload.threadId))),
-		"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$1(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$1(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.watchRange": (payload) => unwrap$1(pipe(get$6(gitWorktrees, payload.cwd), map$4((worktree) => worktree.watchReviewRangeDiffs({
-			from: payload.from,
-			to: payload.to
-		})))),
+		"review.comments.resolve": (payload) => pipe(updateReviewState(payload.cwd, (state) => gitReviewStateResolveComment(state, payload)), withSpan("RpcHandlers.review.comments.resolve", { attributes: {
+			cwd: payload.cwd,
+			filePath: payload.filePath
+		} })),
+		"review.comments.save": (payload) => pipe(updateReviewState(payload.cwd, (state) => gitReviewStateSaveComment(state, payload.comment)), withSpan("RpcHandlers.review.comments.save", { attributes: {
+			cwd: payload.cwd,
+			filePath: payload.comment.filePath
+		} })),
+		"review.commit": (payload) => pipe(get$6(gitCommits, payload.cwd), flatMap$2((commit) => commit.commit(payload.message))),
+		"review.diffs": (payload) => unwrap$1(pipe(get$6(gitReviews, payload.cwd), map$4((review) => review.watchReviewDiffs(payload.target)))),
+		"review.githubThreads": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.reviewThreads)),
+		"review.githubThreads.resolve": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.resolveReviewThread(payload.threadId))),
+		"review.metadata": (payload) => pipe(get$6(gitReviews, payload.cwd), flatMap$2((review) => review.metadata())),
+		"review.push": (payload) => pipe(get$6(gitCommits, payload.cwd), flatMap$2((commit) => commit.push())),
+		"review.state.mark": (payload) => pipe(updateReviewState(payload.cwd, (state) => gitReviewStateMark(state, payload.marks)), withSpan("RpcHandlers.review.state.mark", { attributes: {
+			cwd: payload.cwd,
+			markCount: length(payload.marks)
+		} })),
+		"review.state.unmark": (payload) => pipe(updateReviewState(payload.cwd, (state) => gitReviewStateUnmark(state, payload.marks)), withSpan("RpcHandlers.review.state.unmark", { attributes: {
+			cwd: payload.cwd,
+			markCount: length(payload.marks)
+		} })),
+		"review.state.watch": (payload) => unwrap$1(pipe(get$6(reviewStates, payload.cwd), flatMap$2((ref) => pipe(get(ref), map$4((state) => concat(drop(1)(changes(ref)))(make$43(state))))))),
 		"runs.portless": (payload) => get$6(portlessWorktrees, payload.cwd),
 		"terminal.resize": (payload) => pipe(getTerminal(TerminalSessionKey.make(payload)), flatMap$2((sessionTerminal) => sessionTerminal.resize({
 			cols: payload.cols,
@@ -60296,19 +60548,19 @@ var require_getMachineId = /* @__PURE__ */ __commonJSMin(((exports) => {
 	async function getMachineId() {
 		if (!getMachineIdImpl) switch (process$1.platform) {
 			case "darwin":
-				getMachineIdImpl = (await import("./getMachineId-darwin-BYjMzwa2.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
+				getMachineIdImpl = (await import("./getMachineId-darwin-fwMRmXNE.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
 				break;
 			case "linux":
-				getMachineIdImpl = (await import("./getMachineId-linux-7FQ_TPIw.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
+				getMachineIdImpl = (await import("./getMachineId-linux-BglPdw6k.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
 				break;
 			case "freebsd":
-				getMachineIdImpl = (await import("./getMachineId-bsd-DYUtJhPR.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
+				getMachineIdImpl = (await import("./getMachineId-bsd-8V0SSHI2.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
 				break;
 			case "win32":
-				getMachineIdImpl = (await import("./getMachineId-win-BxTTz_Ds.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
+				getMachineIdImpl = (await import("./getMachineId-win-Bvbq3C3K.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
 				break;
 			default:
-				getMachineIdImpl = (await import("./getMachineId-unsupported-CqYci84U.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
+				getMachineIdImpl = (await import("./getMachineId-unsupported-B6r8oWEG.mjs").then((m) => /* @__PURE__ */ __toESM(m.default))).getMachineId;
 				break;
 		}
 		return getMachineIdImpl();
@@ -67760,7 +68012,7 @@ const isSampled = (traceFlags) => (traceFlags & TraceFlags.SAMPLED) === TraceFla
 const getOtelParent = (tracer, context, annotations) => {
 	const otelParent = tracer.getSpan(context)?.spanContext();
 	if (!otelParent) return none();
-	return some$1(externalSpan({
+	return some(externalSpan({
 		spanId: otelParent.spanId,
 		traceId: otelParent.traceId,
 		sampled: (otelParent.traceFlags & 1) === 1,
@@ -70971,7 +71223,7 @@ var import_src = (/* @__PURE__ */ __commonJSMin(((exports) => {
 	});
 })))();
 function OtelLayer(serviceName) {
-	return unwrap$4(map$4(option(string("VITE_OTEL_URL")), match$5({
+	return unwrap$4(map$4(option(string("VITE_OTEL_URL")), match$4({
 		onNone: () => empty$11,
 		onSome: (url) => layer(() => ({
 			resource: { serviceName },
@@ -70981,7 +71233,7 @@ function OtelLayer(serviceName) {
 }
 //#endregion
 //#region src/lib/serverRuntime.ts
-const LiveLayers = pipe(empty$11, provideMerge(RpcHandlers), provideMerge(Portless.layer), 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));
+const LiveLayers = pipe(empty$11, provideMerge(RpcHandlers), provideMerge(Portless.layer), provideMerge(pipe(GitWorkspace.layer, provide$2(GitCommand.layer))), provideMerge(pipe(GitMaintenance.layer, provide$2(GitCommand.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 src/main.server.ts
 runMain(pipe(serve(mergeAll$1(layerHttp({